Octavian Voicu : wined3d: Add missing ckey, fx, and pal directdraw caps.

Alexandre Julliard julliard at winehq.org
Tue Oct 5 14:41:47 CDT 2010


Module: wine
Branch: stable
Commit: ba35dab7126ddfe1b2764cc749948fe73d7a1353
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ba35dab7126ddfe1b2764cc749948fe73d7a1353

Author: Octavian Voicu <octavian.voicu at gmail.com>
Date:   Wed Sep  1 16:44:11 2010 +0300

wined3d: Add missing ckey, fx, and pal directdraw caps.
(cherry picked from commit f9cdd5097fc5bb2cbfcc4e0c9ce2b39496b48f44)

---

 dlls/wined3d/directx.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 268fee1..81e7561 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -4217,7 +4217,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
     int ps_selected_mode;
     struct shader_caps shader_caps;
     struct fragment_caps fragment_caps;
-    DWORD ckey_caps, blit_caps, fx_caps;
+    DWORD ckey_caps, blit_caps, fx_caps, pal_caps;
 
     TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType: %x, pCaps: %p)\n", This, Adapter, DeviceType, pCaps);
 
@@ -4744,6 +4744,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
                                         WINEDDCAPS_COLORKEY                 |
                                         WINEDDCAPS_COLORKEYHWASSIST         |
                                         WINEDDCAPS_ALIGNBOUNDARYSRC;
+    pal_caps =                          WINEDDPCAPS_8BIT                    |
+                                        WINEDDPCAPS_PRIMARYSURFACE;
 
     /* Fill the ddraw caps structure */
     pCaps->DirectDrawCaps.Caps =        WINEDDCAPS_GDI                      |
@@ -4754,6 +4756,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
                                         WINEDDCAPS2_PRIMARYGAMMA             |
                                         WINEDDCAPS2_WIDESURFACES             |
                                         WINEDDCAPS2_CANRENDERWINDOWED;
+    pCaps->DirectDrawCaps.CKeyCaps =    ckey_caps;
+    pCaps->DirectDrawCaps.FXCaps =      fx_caps;
+    pCaps->DirectDrawCaps.PalCaps =     pal_caps;
     pCaps->DirectDrawCaps.SVBCaps =     blit_caps;
     pCaps->DirectDrawCaps.SVBCKeyCaps = ckey_caps;
     pCaps->DirectDrawCaps.SVBFXCaps =   fx_caps;




More information about the wine-cvs mailing list