[PATCH 3/5] ddraw: Just set the palette caps in ddraw7_GetCaps().
Henri Verbeet
hverbeet at codeweavers.com
Fri Dec 13 02:07:47 CST 2013
---
dlls/ddraw/ddraw.c | 2 +-
dlls/wined3d/directx.c | 5 +----
include/wine/wined3d.h | 1 -
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index ea24eee..7aea03e 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1493,7 +1493,7 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
caps.dwCaps2 = winecaps.ddraw_caps.caps2;
caps.dwCKeyCaps = winecaps.ddraw_caps.color_key_caps;
caps.dwFXCaps = winecaps.ddraw_caps.fx_caps;
- caps.dwPalCaps = winecaps.ddraw_caps.pal_caps;
+ caps.dwPalCaps = DDPCAPS_8BIT | DDPCAPS_PRIMARYSURFACE;
caps.ddsCaps.dwCaps = winecaps.ddraw_caps.dds_caps;
caps.dwSVBCaps = winecaps.ddraw_caps.svb_caps;
caps.dwSVBCKeyCaps = winecaps.ddraw_caps.svb_color_key_caps;
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index ce08a61..29ff883 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -4105,7 +4105,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
struct shader_caps shader_caps;
struct fragment_caps fragment_caps;
struct wined3d_vertex_caps vertex_caps;
- DWORD ckey_caps, blit_caps, fx_caps, pal_caps;
+ DWORD ckey_caps, blit_caps, fx_caps;
TRACE("wined3d %p, adapter_idx %u, device_type %s, caps %p.\n",
wined3d, adapter_idx, debug_d3ddevicetype(device_type), caps);
@@ -4629,8 +4629,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
WINEDDCAPS_COLORKEY |
WINEDDCAPS_COLORKEYHWASSIST |
WINEDDCAPS_ALIGNBOUNDARYSRC;
- pal_caps = WINEDDPCAPS_8BIT |
- WINEDDPCAPS_PRIMARYSURFACE;
/* Fill the ddraw caps structure */
caps->ddraw_caps.caps = WINEDDCAPS_GDI |
@@ -4643,7 +4641,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
WINEDDCAPS2_CANRENDERWINDOWED;
caps->ddraw_caps.color_key_caps = ckey_caps;
caps->ddraw_caps.fx_caps = fx_caps;
- caps->ddraw_caps.pal_caps = pal_caps;
caps->ddraw_caps.svb_caps = blit_caps;
caps->ddraw_caps.svb_color_key_caps = ckey_caps;
caps->ddraw_caps.svb_fx_caps = fx_caps;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 1c85396..4599678 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1737,7 +1737,6 @@ struct wined3d_ddraw_caps
DWORD color_key_caps;
DWORD fx_caps;
DWORD fx_alpha_caps;
- DWORD pal_caps;
DWORD sv_caps;
DWORD svb_caps;
DWORD svb_color_key_caps;
--
1.7.10.4
More information about the wine-patches
mailing list