Ričardas Barkauskas : ddraw: Fix ddraw4_EnumSurfaces to pass correct iface in callbacks.
Alexandre Julliard
julliard at winehq.org
Mon Jun 20 14:24:14 CDT 2011
Module: wine
Branch: master
Commit: 4c0c0d3aeb4a411d2f99ae9f953b46c09f682b60
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0c0d3aeb4a411d2f99ae9f953b46c09f682b60
Author: Ričardas Barkauskas <rbarkauskas at codeweavers.com>
Date: Sun Jun 12 13:38:32 2011 +0300
ddraw: Fix ddraw4_EnumSurfaces to pass correct iface in callbacks.
---
dlls/ddraw/ddraw.c | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index f6d4191..cadc444 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -3803,12 +3803,28 @@ static BOOL ddraw_match_surface_desc(const DDSURFACEDESC2 *requested, const DDSU
#undef DDENUMSURFACES_SEARCHTYPE
#undef DDENUMSURFACES_MATCHTYPE
+struct surfacescallback2_context
+{
+ LPDDENUMSURFACESCALLBACK2 func;
+ void *context;
+};
+
struct surfacescallback_context
{
LPDDENUMSURFACESCALLBACK func;
void *context;
};
+static HRESULT CALLBACK EnumSurfacesCallback2Thunk(IDirectDrawSurface7 *surface,
+ DDSURFACEDESC2 *surface_desc, void *context)
+{
+ IDirectDrawSurfaceImpl *surface_impl = impl_from_IDirectDrawSurface7(surface);
+ struct surfacescallback2_context *cbcontext = context;
+
+ return cbcontext->func(&surface_impl->IDirectDrawSurface4_iface,
+ surface_desc, cbcontext->context);
+}
+
static HRESULT CALLBACK EnumSurfacesCallbackThunk(IDirectDrawSurface7 *surface,
DDSURFACEDESC2 *surface_desc, void *context)
{
@@ -3890,12 +3906,16 @@ static HRESULT WINAPI ddraw4_EnumSurfaces(IDirectDraw4 *iface, DWORD flags,
DDSURFACEDESC2 *surface_desc, void *context, LPDDENUMSURFACESCALLBACK2 callback)
{
IDirectDrawImpl *This = impl_from_IDirectDraw4(iface);
+ struct surfacescallback2_context cbcontext;
TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n",
iface, flags, surface_desc, context, callback);
- return ddraw7_EnumSurfaces(&This->IDirectDraw7_iface, flags, surface_desc, context,
- (LPDDENUMSURFACESCALLBACK7)callback);
+ cbcontext.func = callback;
+ cbcontext.context = context;
+
+ return ddraw7_EnumSurfaces(&This->IDirectDraw7_iface, flags, (DDSURFACEDESC2 *)surface_desc,
+ &cbcontext, EnumSurfacesCallback2Thunk);
}
static HRESULT WINAPI ddraw3_EnumSurfaces(IDirectDraw3 *iface, DWORD flags,
More information about the wine-cvs
mailing list