June 2011 - Wine-commits - list.winehq.org

Ričardas Barkauskas : ddraw: Separate IDirectDrawSurface and IDirectDrawSurface7 reference counts.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 5f6d7021aa14aaaefe87dca36ac76cefb766bf16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6d7021aa14aaaefe87dca36… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Jun 21 00:15:55 2011 +0300 ddraw: Separate IDirectDrawSurface and IDirectDrawSurface7 reference counts. --- dlls/ddraw/ddraw.c | 19 +++++++++++++++++ dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 2 + dlls/ddraw/main.c | 10 +++++--- dlls/ddraw/surface.c | 47 ++++++++++++++++++++++++++++++++----------- dlls/ddraw/tests/dsurface.c | 10 ++++---- 6 files changed, 68 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f6d7021aa14aaaefe87d…

1 0

Ričardas Barkauskas : ddraw: Move IDirect3DTexture and IDirect3DTexture2 to IDirectDrawSurface reference counts .
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 90112e97eae128bbd8ade6dfccdd12bf91b4d0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=90112e97eae128bbd8ade6dfc… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Jun 21 00:14:30 2011 +0300 ddraw: Move IDirect3DTexture and IDirect3DTexture2 to IDirectDrawSurface reference counts. --- dlls/ddraw/surface.c | 8 ++++---- dlls/ddraw/tests/dsurface.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index aac680c..b027940 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -329,7 +329,7 @@ static ULONG WINAPI d3d_texture2_AddRef(IDirect3DTexture2 *iface) IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_AddRef(&This->IDirectDrawSurface7_iface); + return ddraw_surface1_AddRef(&This->IDirectDrawSurface_iface); } static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) @@ -337,7 +337,7 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_AddRef(&This->IDirectDrawSurface7_iface); + return ddraw_surface1_AddRef(&This->IDirectDrawSurface_iface); } /***************************************************************************** @@ -606,7 +606,7 @@ static ULONG WINAPI d3d_texture2_Release(IDirect3DTexture2 *iface) IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_Release(&This->IDirectDrawSurface7_iface); + return ddraw_surface1_Release(&This->IDirectDrawSurface_iface); } static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface) @@ -614,7 +614,7 @@ static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface) IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_Release(&This->IDirectDrawSurface7_iface); + return ddraw_surface1_Release(&This->IDirectDrawSurface_iface); } /***************************************************************************** diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 3af6e6d..0c9cd16 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1111,29 +1111,29 @@ static void IFaceRefCount(void) if (SUCCEEDED(ret)) { ref = getRefcount((IUnknown *) tex); - todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ok(ref == 2, "Refcount is %u, expected 2\n", ref); ref = getRefcount((IUnknown *) surf); - todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ok(ref == 2, "Refcount is %u, expected 2\n", ref); IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture2, (void **) &tex2); ref = getRefcount((IUnknown *) tex); - todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + ok(ref == 3, "Refcount is %u, expected 3\n", ref); ref = getRefcount((IUnknown *) tex2); - todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + ok(ref == 3, "Refcount is %u, expected 3\n", ref); ref = getRefcount((IUnknown *) surf); - todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + ok(ref == 3, "Refcount is %u, expected 3\n", ref); IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawGammaControl, (void **) &gamma); ref = getRefcount((IUnknown *) gamma); todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); ref = IDirect3DTexture2_Release(tex2); /* Release the texture */ - todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ok(ref == 2, "Refcount is %u, expected 2\n", ref); ref = getRefcount((IUnknown *) surf); - todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ok(ref == 2, "Refcount is %u, expected 2\n", ref); ref = IDirect3DTexture_Release(tex); /* Release the texture */ - todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + ok(ref == 1, "Refcount is %u, expected 1\n", ref); ref = getRefcount((IUnknown *) surf); ok(ref == 1, "Refcount is %u, expected 1\n", ref);

1 0

Ričardas Barkauskas : ddraw: Separate IDirectDrawGammaControl reference count.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: e5d69ba9237de0d461c5896d4377606c23700c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d69ba9237de0d461c5896d4… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Jun 28 02:53:17 2011 +0300 ddraw: Separate IDirectDrawGammaControl reference count. --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 22 +++++++++++++++++----- dlls/ddraw/tests/dsurface.c | 4 ++-- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index fe736b2..c73743a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -161,7 +161,7 @@ struct IDirectDrawSurfaceImpl const IDirect3DTexture2Vtbl *IDirect3DTexture2_vtbl; const IDirect3DTextureVtbl *IDirect3DTexture_vtbl; - LONG ref7, ref4, ref3, ref2, ref1, iface_count; + LONG ref7, ref4, ref3, ref2, ref1, iface_count, gamma_count; IUnknown *ifaceToRelease; int version; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b027940..ffda68c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -111,7 +111,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, } else if( IsEqualGUID(riid, &IID_IDirectDrawGammaControl) ) { - IUnknown_AddRef(iface); + IDirectDrawGammaControl_AddRef(&This->IDirectDrawGammaControl_iface); *obj = &This->IDirectDrawGammaControl_iface; TRACE("(%p) returning IDirectDrawGammaControl interface at %p\n", This, *obj); return S_OK; @@ -318,10 +318,16 @@ static ULONG WINAPI ddraw_surface1_AddRef(IDirectDrawSurface *iface) static ULONG WINAPI ddraw_gamma_control_AddRef(IDirectDrawGammaControl *iface) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawGammaControl(iface); + ULONG refcount = InterlockedIncrement(&This->gamma_count); - TRACE("iface %p.\n", iface); + TRACE("iface %p increasing refcount to %u.\n", iface, refcount); + + if (refcount == 1) + { + ddraw_surface_add_iface(This); + } - return ddraw_surface7_AddRef(&This->IDirectDrawSurface7_iface); + return refcount; } static ULONG WINAPI d3d_texture2_AddRef(IDirect3DTexture2 *iface) @@ -595,10 +601,16 @@ static ULONG WINAPI ddraw_surface1_Release(IDirectDrawSurface *iface) static ULONG WINAPI ddraw_gamma_control_Release(IDirectDrawGammaControl *iface) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawGammaControl(iface); + ULONG refcount = InterlockedDecrement(&This->gamma_count); - TRACE("iface %p.\n", iface); + TRACE("iface %p decreasing refcount to %u.\n", iface, refcount); + + if (refcount == 0) + { + ddraw_surface_release_iface(This); + } - return ddraw_surface7_Release(&This->IDirectDrawSurface7_iface); + return refcount; } static ULONG WINAPI d3d_texture2_Release(IDirect3DTexture2 *iface) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 0c9cd16..b1a2940 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1125,7 +1125,7 @@ static void IFaceRefCount(void) IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawGammaControl, (void **) &gamma); ref = getRefcount((IUnknown *) gamma); - todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + ok(ref == 1, "Refcount is %u, expected 1\n", ref); ref = IDirect3DTexture2_Release(tex2); /* Release the texture */ ok(ref == 2, "Refcount is %u, expected 2\n", ref); @@ -1138,7 +1138,7 @@ static void IFaceRefCount(void) ok(ref == 1, "Refcount is %u, expected 1\n", ref); ref = IDirectDrawGammaControl_Release(gamma); /* Release the gamma control */ - todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + ok(ref == 0, "Refcount is %u, expected 0\n", ref); } ref = IDirectDrawSurface2_Release(surf2); /* Release one of the 2 surf2 interfaces */

1 0

Marcus Meissner : dxdiag: Removed unused endptr assignment (Coverity).
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 8598b121d65a2aad57df606fe93fb130e144ea5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8598b121d65a2aad57df606fe… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 28 08:31:30 2011 +0200 dxdiag: Removed unused endptr assignment (Coverity). --- programs/dxdiag/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index 54bb84f..3ced122 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -80,7 +80,7 @@ static BOOL process_file_name(const WCHAR *cmdline, enum output_type output_type filename[len] = '\0'; /* Append an extension appropriate for the output type if the filename does not have one. */ - if (!(endptr = strrchrW(filename, '.'))) + if (!strrchrW(filename, '.')) { const WCHAR *filename_ext = get_output_extension(output_type);

1 0

Marcus Meissner : comctl32: Fixed strncpy (Coverity).
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 6b90f27d8f97fcc468e8e09eaedd1bea15f4cecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b90f27d8f97fcc468e8e09ea… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 28 09:15:13 2011 +0200 comctl32: Fixed strncpy (Coverity). --- dlls/comctl32/tests/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 324473d..faa9553 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1225,7 +1225,7 @@ static void test_itemedit(void) r = TreeView_SelectItem(hTree, NULL); expect(TRUE, r); /* alter text */ - strncpy(buff, "x", sizeof(buff)/sizeof(CHAR)); + strcpy(buff, "x"); r = SendMessage(edit, WM_SETTEXT, 0, (LPARAM)buff); expect(TRUE, r); r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit);

1 0

Marcus Meissner : server: Do not promote lparam to signed int (Coverity).
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 67320c448b6d498724678b568e4b00dca1499356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67320c448b6d498724678b568… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 28 09:37:04 2011 +0200 server: Do not promote lparam to signed int (Coverity). --- server/queue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/queue.c b/server/queue.c index 6dee8f5..5dd4bf3 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1617,7 +1617,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg->type = MSG_HARDWARE; msg->win = get_user_full_handle( win ); - msg->lparam = (input->kbd.scan << 16) | 1; /* repeat count */ + msg->lparam = (input->kbd.scan << 16) | 1u; /* repeat count */ msg->time = input->kbd.time; msg->result = NULL; msg->data = msg_data;

1 0

André Hentschel : user32: Use more meaningful variable names.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 7521ae42916706842cb7450e51cfc3bd4ea9edbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7521ae42916706842cb7450e5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 25 00:09:11 2011 +0200 user32: Use more meaningful variable names. --- dlls/user32/misc.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 4b38dd2..5fc601a 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -593,9 +593,9 @@ BOOL WINAPI User32InitializeImmEntryTable(LPVOID ptr) * WINNLSGetIMEHotkey [USER32.@] * */ -UINT WINAPI WINNLSGetIMEHotkey(HWND hUnknown1) +UINT WINAPI WINNLSGetIMEHotkey(HWND hwnd) { - FIXME("hUnknown1 %p: stub!\n", hUnknown1); + FIXME("hwnd %p: stub!\n", hwnd); return 0; /* unknown */ } @@ -603,9 +603,9 @@ UINT WINAPI WINNLSGetIMEHotkey(HWND hUnknown1) * WINNLSEnableIME [USER32.@] * */ -BOOL WINAPI WINNLSEnableIME(HWND hUnknown1, BOOL bUnknown2) +BOOL WINAPI WINNLSEnableIME(HWND hwnd, BOOL enable) { - FIXME("hUnknown1 %p bUnknown2 %d: stub!\n", hUnknown1, bUnknown2); + FIXME("hwnd %p enable %d: stub!\n", hwnd, enable); return TRUE; /* success (?) */ } @@ -613,9 +613,9 @@ BOOL WINAPI WINNLSEnableIME(HWND hUnknown1, BOOL bUnknown2) * WINNLSGetEnableStatus [USER32.@] * */ -BOOL WINAPI WINNLSGetEnableStatus(HWND hUnknown1) +BOOL WINAPI WINNLSGetEnableStatus(HWND hwnd) { - FIXME("hUnknown1 %p: stub!\n", hUnknown1); + FIXME("hwnd %p: stub!\n", hwnd); return TRUE; /* success (?) */ } @@ -623,9 +623,9 @@ BOOL WINAPI WINNLSGetEnableStatus(HWND hUnknown1) * SendIMEMessageExA [USER32.@] * */ -LRESULT WINAPI SendIMEMessageExA(HWND p1, LPARAM p2) +LRESULT WINAPI SendIMEMessageExA(HWND hwnd, LPARAM lparam) { - FIXME("(%p,%lx): stub\n", p1, p2); + FIXME("(%p,%lx): stub\n", hwnd, lparam); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -634,9 +634,9 @@ LRESULT WINAPI SendIMEMessageExA(HWND p1, LPARAM p2) * SendIMEMessageExW [USER32.@] * */ -LRESULT WINAPI SendIMEMessageExW(HWND p1, LPARAM p2) +LRESULT WINAPI SendIMEMessageExW(HWND hwnd, LPARAM lparam) { - FIXME("(%p,%lx): stub\n", p1, p2); + FIXME("(%p,%lx): stub\n", hwnd, lparam); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; }

1 0

Ričardas Barkauskas : ddraw: Use ddraw_surface_release_iface to destroy leftover surfaces.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: c7e5e6d2b520312320a18b447472b0b8d32d295e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e5e6d2b520312320a18b447… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Jun 28 01:06:16 2011 +0300 ddraw: Use ddraw_surface_release_iface to destroy leftover surfaces. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/main.c | 7 +++---- dlls/ddraw/surface.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index e15219d..1a8dc20 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -212,6 +212,7 @@ HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) DECLSPEC_H void ddraw_surface_destroy(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN; HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw, DDSURFACEDESC2 *desc, UINT mip_level, WINED3DSURFTYPE surface_type, UINT version) DECLSPEC_HIDDEN; +ULONG ddraw_surface_release_iface(IDirectDrawSurfaceImpl *This) DECLSPEC_HIDDEN; static inline IDirectDrawSurfaceImpl *surface_from_texture1(IDirect3DTexture *iface) { diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 36c0ef7..37404d8 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -752,7 +752,7 @@ DestroyCallback(IDirectDrawSurface7 *surf, void *context) { IDirectDrawSurfaceImpl *Impl = impl_from_IDirectDrawSurface7(surf); - ULONG ref, ref3, ref2; + ULONG ref, ref3, ref2, iface_count; ref = IDirectDrawSurface7_Release(surf); /* For the EnumSurfaces */ IDirectDrawSurface3_AddRef(&Impl->IDirectDrawSurface3_iface); @@ -769,9 +769,8 @@ DestroyCallback(IDirectDrawSurface7 *surf, return DDENUMRET_OK; /* Destroy the surface */ - while (ref) ref = IDirectDrawSurface7_Release(surf); - while (ref3) ref3 = IDirectDrawSurface3_Release(&Impl->IDirectDrawSurface3_iface); - while (ref2) ref2 = IDirectDrawSurface2_Release(&Impl->IDirectDrawSurface2_iface); + iface_count = ddraw_surface_release_iface(Impl); + while (iface_count) iface_count = ddraw_surface_release_iface(Impl); return DDENUMRET_OK; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 102aa55..e391b3d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -449,7 +449,7 @@ static void ddraw_surface_cleanup(IDirectDrawSurfaceImpl *surface) IUnknown_Release(ifaceToRelease); } -static void ddraw_surface_release_iface(IDirectDrawSurfaceImpl *This) +ULONG ddraw_surface_release_iface(IDirectDrawSurfaceImpl *This) { ULONG iface_count = InterlockedDecrement(&This->iface_count); TRACE("%p decreasing iface count to %u.\n", This, iface_count); @@ -462,7 +462,7 @@ static void ddraw_surface_release_iface(IDirectDrawSurfaceImpl *This) { WARN("(%p) Attempt to destroy a surface that is not a complex root\n", This); LeaveCriticalSection(&ddraw_cs); - return; + return iface_count; } if (This->wined3d_texture) /* If it's a texture, destroy the wined3d texture. */ wined3d_texture_decref(This->wined3d_texture); @@ -471,7 +471,7 @@ static void ddraw_surface_release_iface(IDirectDrawSurfaceImpl *This) LeaveCriticalSection(&ddraw_cs); } - return; + return iface_count; } /*****************************************************************************

1 0

Ričardas Barkauskas : ddraw: Fix SetRenderTarget behaviour on failure.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 3b50ad82ad8b95538f3dd73979e602f19620a72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b50ad82ad8b95538f3dd7397… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Jun 28 02:32:04 2011 +0300 ddraw: Fix SetRenderTarget behaviour on failure. --- dlls/ddraw/device.c | 40 ++++++++++++++++++++++++---------------- dlls/ddraw/tests/d3d.c | 27 ++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7a5d735..9699939 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1826,17 +1826,10 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetCurrentViewport(IDirect3DDevice2 * D3D_OK on success, for details see IWineD3DDevice::SetRenderTarget * *****************************************************************************/ -static HRESULT -IDirect3DDeviceImpl_7_SetRenderTarget(IDirect3DDevice7 *iface, - IDirectDrawSurface7 *NewTarget, - DWORD Flags) +static HRESULT d3d_device_set_render_target(IDirect3DDeviceImpl *This, IDirectDrawSurfaceImpl *Target) { - IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; - IDirectDrawSurfaceImpl *Target = unsafe_impl_from_IDirectDrawSurface7(NewTarget); HRESULT hr; - TRACE("iface %p, target %p, flags %#x.\n", iface, NewTarget, Flags); - EnterCriticalSection(&ddraw_cs); /* Flags: Not used */ @@ -1846,7 +1839,7 @@ IDirect3DDeviceImpl_7_SetRenderTarget(IDirect3DDevice7 *iface, LeaveCriticalSection(&ddraw_cs); return D3D_OK; } - + This->target = Target; hr = wined3d_device_set_render_target(This->wined3d_device, 0, Target ? Target->wined3d_surface : NULL, FALSE); if(hr != D3D_OK) @@ -1854,14 +1847,27 @@ IDirect3DDeviceImpl_7_SetRenderTarget(IDirect3DDevice7 *iface, LeaveCriticalSection(&ddraw_cs); return hr; } - IDirectDrawSurface7_AddRef(NewTarget); - IDirectDrawSurface7_Release(&This->target->IDirectDrawSurface7_iface); - This->target = Target; IDirect3DDeviceImpl_UpdateDepthStencil(This); LeaveCriticalSection(&ddraw_cs); return D3D_OK; } +static HRESULT +IDirect3DDeviceImpl_7_SetRenderTarget(IDirect3DDevice7 *iface, + IDirectDrawSurface7 *NewTarget, + DWORD Flags) +{ + IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; + IDirectDrawSurfaceImpl *Target = unsafe_impl_from_IDirectDrawSurface7(NewTarget); + + TRACE("iface %p, target %p, flags %#x.\n", iface, NewTarget, Flags); + /* Flags: Not used */ + + IDirectDrawSurface7_AddRef(NewTarget); + IDirectDrawSurface7_Release(&This->target->IDirectDrawSurface7_iface); + return d3d_device_set_render_target(This, Target); +} + static HRESULT WINAPI IDirect3DDeviceImpl_7_SetRenderTarget_FPUSetup(IDirect3DDevice7 *iface, IDirectDrawSurface7 *NewTarget, @@ -1893,8 +1899,9 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_SetRenderTarget(IDirect3DDevice3 *if TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, Flags); - return IDirect3DDevice7_SetRenderTarget((IDirect3DDevice7 *)This, - Target ? &Target->IDirectDrawSurface7_iface : NULL, Flags); + IDirectDrawSurface4_AddRef(NewRenderTarget); + IDirectDrawSurface4_Release(&This->target->IDirectDrawSurface4_iface); + return d3d_device_set_render_target(This, Target); } static HRESULT WINAPI IDirect3DDeviceImpl_2_SetRenderTarget(IDirect3DDevice2 *iface, @@ -1905,8 +1912,9 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetRenderTarget(IDirect3DDevice2 *if TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, Flags); - return IDirect3DDevice7_SetRenderTarget((IDirect3DDevice7 *)This, - Target ? &Target->IDirectDrawSurface7_iface : NULL, Flags); + IDirectDrawSurface_AddRef(NewRenderTarget); + IDirectDrawSurface_Release(&This->target->IDirectDrawSurface_iface); + return d3d_device_set_render_target(This, Target); } /***************************************************************************** diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f975612..19a7961 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3260,10 +3260,11 @@ static void ComputeSphereVisibility(void) static void SetRenderTargetTest(void) { HRESULT hr; - IDirectDrawSurface7 *newrt, *failrt, *oldrt; + IDirectDrawSurface7 *newrt, *failrt, *oldrt, *temprt; D3DVIEWPORT7 vp; DDSURFACEDESC2 ddsd, ddsd2; DWORD stateblock; + ULONG refcount; memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); @@ -3307,11 +3308,34 @@ static void SetRenderTargetTest(void) hr = IDirect3DDevice7_GetRenderTarget(lpD3DDevice, &oldrt); ok(hr == DD_OK, "IDirect3DDevice7_GetRenderTarget failed, hr=0x%08x\n", hr); + refcount = getRefcount((IUnknown*) oldrt); + todo_wine ok(refcount == 3, "Refcount should be 3, returned is %d\n", refcount); + + refcount = getRefcount((IUnknown*) failrt); + ok(refcount == 1, "Refcount should be 1, returned is %d\n", refcount); + hr = IDirect3DDevice7_SetRenderTarget(lpD3DDevice, failrt, 0); ok(hr != D3D_OK, "IDirect3DDevice7_SetRenderTarget succeeded\n"); + refcount = getRefcount((IUnknown*) oldrt); + todo_wine ok(refcount == 2, "Refcount should be 2, returned is %d\n", refcount); + + refcount = getRefcount((IUnknown*) failrt); + ok(refcount == 2, "Refcount should be 2, returned is %d\n", refcount); + + hr = IDirect3DDevice7_GetRenderTarget(lpD3DDevice, &temprt); + ok(hr == DD_OK, "IDirect3DDevice7_GetRenderTarget failed, hr=0x%08x\n", hr); + ok(failrt == temprt, "Wrong iface returned\n"); + + refcount = getRefcount((IUnknown*) failrt); + ok(refcount == 3, "Refcount should be 3, returned is %d\n", refcount); + hr = IDirect3DDevice7_SetRenderTarget(lpD3DDevice, newrt, 0); ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderTarget failed, hr=0x%08x\n", hr); + + refcount = getRefcount((IUnknown*) failrt); + ok(refcount == 2, "Refcount should be 2, returned is %d\n", refcount); + memset(&vp, 0xff, sizeof(vp)); hr = IDirect3DDevice7_GetViewport(lpD3DDevice, &vp); ok(hr == D3D_OK, "IDirect3DDevice7_GetViewport failed, hr=0x%08x\n", hr); @@ -3377,6 +3401,7 @@ static void SetRenderTargetTest(void) IDirectDrawSurface7_Release(oldrt); IDirectDrawSurface7_Release(newrt); IDirectDrawSurface7_Release(failrt); + IDirectDrawSurface7_Release(failrt); } static const UINT *expect_messages;

1 0

Ričardas Barkauskas : ddraw: Separate IDirectDrawSurface4 reference count.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 9190d349d20694007e236fecfae93da232ecd003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9190d349d20694007e236fecf… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Jun 28 02:34:23 2011 +0300 ddraw: Separate IDirectDrawSurface4 reference count. --- dlls/ddraw/ddraw.c | 7 +++++++ dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 2 ++ dlls/ddraw/main.c | 7 +++++-- dlls/ddraw/surface.c | 43 +++++++++++++++++++++++++++++++++++-------- dlls/ddraw/tests/dsurface.c | 14 +++++++------- 6 files changed, 57 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c3e1a38..d039388 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2051,6 +2051,8 @@ static HRESULT WINAPI ddraw4_GetGDISurface(IDirectDraw4 *iface, IDirectDrawSurfa } surface_impl = impl_from_IDirectDrawSurface7(surface7); *surface = &surface_impl->IDirectDrawSurface4_iface; + IDirectDrawSurface4_AddRef(*surface); + IDirectDrawSurface7_Release(surface7); return hr; } @@ -3809,6 +3811,9 @@ static HRESULT CALLBACK EnumSurfacesCallback2Thunk(IDirectDrawSurface7 *surface, IDirectDrawSurfaceImpl *surface_impl = impl_from_IDirectDrawSurface7(surface); struct surfacescallback2_context *cbcontext = context; + IDirectDrawSurface4_AddRef(&surface_impl->IDirectDrawSurface4_iface); + IDirectDrawSurface7_Release(surface); + return cbcontext->func(&surface_impl->IDirectDrawSurface4_iface, surface_desc, cbcontext->context); } @@ -4266,6 +4271,8 @@ static HRESULT WINAPI ddraw4_DuplicateSurface(IDirectDraw4 *iface, IDirectDrawSu } dst_impl = impl_from_IDirectDrawSurface7(dst7); *dst = &dst_impl->IDirectDrawSurface4_iface; + IDirectDrawSurface4_AddRef(*dst); + IDirectDrawSurface7_Release(dst7); return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1a8dc20..92dad30 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -161,7 +161,7 @@ struct IDirectDrawSurfaceImpl const IDirect3DTexture2Vtbl *IDirect3DTexture2_vtbl; const IDirect3DTextureVtbl *IDirect3DTexture_vtbl; - LONG ref, ref3, ref2, iface_count; + LONG ref, ref4, ref3, ref2, iface_count; IUnknown *ifaceToRelease; int version; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9699939..a019bec 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1970,6 +1970,8 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetRenderTarget(IDirect3DDevice3 *if if(hr != D3D_OK) return hr; RenderTargetImpl = impl_from_IDirectDrawSurface7(RenderTarget7); *RenderTarget = &RenderTargetImpl->IDirectDrawSurface4_iface; + IDirectDrawSurface4_AddRef(*RenderTarget); + IDirectDrawSurface7_Release(RenderTarget7); return D3D_OK; } diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 37404d8..8d161f5 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -752,14 +752,17 @@ DestroyCallback(IDirectDrawSurface7 *surf, void *context) { IDirectDrawSurfaceImpl *Impl = impl_from_IDirectDrawSurface7(surf); - ULONG ref, ref3, ref2, iface_count; + ULONG ref, ref4, ref3, ref2, iface_count; ref = IDirectDrawSurface7_Release(surf); /* For the EnumSurfaces */ + IDirectDrawSurface4_AddRef(&Impl->IDirectDrawSurface4_iface); + ref4 = IDirectDrawSurface4_Release(&Impl->IDirectDrawSurface4_iface); IDirectDrawSurface3_AddRef(&Impl->IDirectDrawSurface3_iface); ref3 = IDirectDrawSurface3_Release(&Impl->IDirectDrawSurface3_iface); IDirectDrawSurface2_AddRef(&Impl->IDirectDrawSurface2_iface); ref2 = IDirectDrawSurface2_Release(&Impl->IDirectDrawSurface2_iface); - WARN("Surface %p has an reference counts of %d 3: %d 2: %d\n", Impl, ref, ref3, ref2); + WARN("Surface %p has an reference counts of %u 4: %u 3: %u 2: %u\n", + Impl, ref, ref4, ref3, ref2); /* Skip surfaces which are attached somewhere or which are * part of a complex compound. They will get released when destroying diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e391b3d..248aa37 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -83,7 +83,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, } else if (IsEqualGUID(riid, &IID_IDirectDrawSurface4)) { - IUnknown_AddRef(iface); + IDirectDrawSurface4_AddRef(&This->IDirectDrawSurface4_iface); *obj = &This->IDirectDrawSurface4_iface; TRACE("(%p) returning IDirectDrawSurface4 interface at %p\n", This, *obj); return S_OK; @@ -258,9 +258,16 @@ static ULONG WINAPI ddraw_surface7_AddRef(IDirectDrawSurface7 *iface) static ULONG WINAPI ddraw_surface4_AddRef(IDirectDrawSurface4 *iface) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p.\n", iface); + ULONG refcount = InterlockedIncrement(&This->ref4); - return ddraw_surface7_AddRef(&This->IDirectDrawSurface7_iface); + TRACE("iface %p increasing refcount to %u.\n", iface, refcount); + + if (refcount == 1) + { + ddraw_surface_add_iface(This); + } + + return refcount; } static ULONG WINAPI ddraw_surface3_AddRef(IDirectDrawSurface3 *iface) @@ -349,8 +356,8 @@ void ddraw_surface_destroy(IDirectDrawSurfaceImpl *This) * because the 2nd surface was addref()ed when the app * called GetAttachedSurface */ - WARN("(%p): Destroying surface with refcounts %d 3: %d 2: %d\n", This, This->ref, - This->ref3, This->ref2); + WARN("(%p): Destroying surface with refcounts %d 4: %d 3: %d 2: %d\n", + This, This->ref, This->ref4, This->ref3, This->ref2); } if (This->wined3d_surface) @@ -521,9 +528,16 @@ static ULONG WINAPI ddraw_surface7_Release(IDirectDrawSurface7 *iface) static ULONG WINAPI ddraw_surface4_Release(IDirectDrawSurface4 *iface) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p.\n", iface); + ULONG refcount = InterlockedDecrement(&This->ref4); - return ddraw_surface7_Release(&This->IDirectDrawSurface7_iface); + TRACE("iface %p decreasing refcount to %u.\n", iface, refcount); + + if (refcount == 0) + { + ddraw_surface_release_iface(This); + } + + return refcount; } static ULONG WINAPI ddraw_surface3_Release(IDirectDrawSurface3 *iface) @@ -726,6 +740,8 @@ static HRESULT WINAPI ddraw_surface4_GetAttachedSurface(IDirectDrawSurface4 *ifa } attachment_impl = impl_from_IDirectDrawSurface7(attachment7); *attachment = &attachment_impl->IDirectDrawSurface4_iface; + ddraw_surface4_AddRef(*attachment); + ddraw_surface7_Release(attachment7); return hr; } @@ -2282,6 +2298,9 @@ static HRESULT CALLBACK EnumCallback2(IDirectDrawSurface7 *surface, DDSURFACEDES IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(surface); const struct callback_info2 *info = context; + ddraw_surface4_AddRef(&This->IDirectDrawSurface4_iface); + ddraw_surface7_Release(surface); + return info->callback(&This->IDirectDrawSurface4_iface, surface_desc, info->context); } @@ -5143,11 +5162,19 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr surface->IDirectDrawGammaControl_iface.lpVtbl = &ddraw_gamma_control_vtbl; surface->IDirect3DTexture2_vtbl = &d3d_texture2_vtbl; surface->IDirect3DTexture_vtbl = &d3d_texture1_vtbl; - surface->ref = 1; surface->iface_count = 1; surface->version = version; surface->ddraw = ddraw; + if (version == 4) + { + surface->ref4 = 1; + } + else + { + surface->ref = 1; + } + copy_to_surfacedesc2(&surface->surface_desc, desc); surface->first_attached = surface; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 4cfe469..62532dd 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1096,7 +1096,7 @@ static void IFaceRefCount(void) IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface4, (void **) &surf4); ref = getRefcount((IUnknown *) surf4); - todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + ok(ref == 1, "Refcount is %u, expected 1\n", ref); IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface7, (void **) &surf7a); ref = getRefcount((IUnknown *) surf7a); @@ -1151,7 +1151,7 @@ static void IFaceRefCount(void) ok(ref == 0, "Refcount is %u, expected 0\n", ref); ref = IDirectDrawSurface4_Release(surf4); - todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + ok(ref == 0, "Refcount is %u, expected 0\n", ref); ref = IDirectDrawSurface7_Release(surf7a); todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); @@ -3135,9 +3135,9 @@ static void GetDCTest(void) ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); ref = getRefcount((IUnknown *) surf); - todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + ok(ref == 1, "Refcount is %u, expected 1\n", ref); ref = getRefcount((IUnknown *) surf4); - todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + ok(ref == 1, "Refcount is %u, expected 1\n", ref); hr = IDirectDrawSurface4_GetDC(surf4, &dc); ok(SUCCEEDED(hr), "GetDC failed, hr %#x.\n", hr); @@ -3150,11 +3150,11 @@ static void GetDCTest(void) ok(tmp == surf, "Expected surface %p, got %p.\n\n", surf, tmp); ref = getRefcount((IUnknown *) surf); - todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ok(ref == 2, "Refcount is %u, expected 2\n", ref); ref = getRefcount((IUnknown *) tmp); - todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ok(ref == 2, "Refcount is %u, expected 2\n", ref); ref = getRefcount((IUnknown *) surf4); - todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + ok(ref == 1, "Refcount is %u, expected 1\n", ref); hr = IDirectDrawSurface4_ReleaseDC(surf4, dc); ok(SUCCEEDED(hr), "ReleaseDC failed, hr %#x.\n", hr);

1 0