[PATCH 2/7] ddraw: Handle DDBLT_DDROPS in ddraw_surface7_Blt().
Henri Verbeet
hverbeet at codeweavers.com
Mon Feb 15 11:18:01 CST 2016
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/ddraw/surface.c | 8 ++++++++
dlls/wined3d/surface.c | 4 ----
include/wine/wined3d.h | 1 -
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index dc6ad25..6d9bed1 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1553,6 +1553,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *
return DDERR_INVALIDPARAMS;
}
+ if (Flags & DDBLT_DDROPS)
+ {
+ FIXME("DDBLT_DDROPS not implemented.\n");
+ if (DDBltFx)
+ FIXME(" rop %#x, pattern %p.\n", DDBltFx->dwDDROP, DDBltFx->u5.lpDDSPattern);
+ return DDERR_NORASTEROPHW;
+ }
+
wined3d_mutex_lock();
if (Flags & (DDBLT_COLORFILL | DDBLT_DEPTHFILL))
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 0e6bf28..33942d8 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4375,10 +4375,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
{
FIXME("DDBLT_DEPTHFILL needs to be implemented!\n");
}
- if (flags & WINEDDBLT_DDROPS)
- {
- FIXME("\tDdraw Raster Ops: %08x Pattern: %p\n", fx->dwDDROP, fx->u5.lpDDSPattern);
- }
/* Now the 'with source' blits. */
if (src_surface)
{
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 3b5e0d6..18d7a75 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1279,7 +1279,6 @@ enum wined3d_display_rotation
#define WINEDDBLT_ASYNC 0x00000200
#define WINEDDBLT_COLORFILL 0x00000400
#define WINEDDBLT_DDFX 0x00000800
-#define WINEDDBLT_DDROPS 0x00001000
#define WINEDDBLT_KEYDEST 0x00002000
#define WINEDDBLT_KEYDESTOVERRIDE 0x00004000
#define WINEDDBLT_KEYSRC 0x00008000
--
2.1.4
More information about the wine-patches
mailing list