April 2011 - Wine-Commits - list.winehq.org

Huw Davies : rpcrt4: Handle non-conformant bogus structures.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: e0a60312d1aaa2e4e38d40c7cd32f27c4267c98c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a60312d1aaa2e4e38d40c7c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 27 09:53:38 2011 +0100 rpcrt4: Handle non-conformant bogus structures. --- dlls/rpcrt4/ndr_stubless.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 82a72aa..9edebf8 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -980,6 +980,11 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) case RPC_FC_STRUCT: size = *(const WORD*)(pFormat + 2); break; + case RPC_FC_BOGUS_STRUCT: + size = *(const WORD*)(pFormat + 2); + if(*(const WORD*)(pFormat + 4)) + FIXME("Unhandled conformant description\n"); + break; case RPC_FC_CARRAY: size = *(const WORD*)(pFormat + 2); ComputeConformance(pStubMsg, NULL, pFormat + 4, 0);

1 0

Michael Stefaniuc : shell32/tests: COM cleanup in shlfolder.c.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: 1da5c9d17f1157f501d20d4f3375bedda0687493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da5c9d17f1157f501d20d4f3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 26 23:45:13 2011 +0200 shell32/tests: COM cleanup in shlfolder.c. --- dlls/shell32/tests/shlfolder.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index cc68280..681a28f 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2965,7 +2965,7 @@ cleanup: /**************************************************************/ /* IUnknown implementation for counting QueryInterface calls. */ typedef struct { - const IUnknownVtbl *lpVtbl; + IUnknown IUnknown_iface; struct if_count { REFIID id; LONG count; @@ -2973,9 +2973,14 @@ typedef struct { LONG unknown; } IUnknownImpl; +static inline IUnknownImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, IUnknownImpl, IUnknown_iface); +} + static HRESULT WINAPI unk_fnQueryInterface(IUnknown *iunk, REFIID riid, void** punk) { - IUnknownImpl *This = (IUnknownImpl*)iunk; + IUnknownImpl *This = impl_from_IUnknown(iunk); UINT i, found; for(i = found = 0; This->ifaces[i].id != NULL; i++) { @@ -3042,7 +3047,7 @@ static void test_SHGetIDListFromObject(void) ok(hres == E_NOINTERFACE, "Got %x\n", hres); punkimpl = HeapAlloc(GetProcessHeap(), 0, sizeof(IUnknownImpl)); - punkimpl->lpVtbl = &vt_IUnknown; + punkimpl->IUnknown_iface.lpVtbl = &vt_IUnknown; punkimpl->ifaces = ifaces; punkimpl->unknown = 0; @@ -3213,7 +3218,7 @@ static void test_SHGetItemFromObject(void) ok(hres == E_NOINTERFACE, "Got 0x%08x\n", hres); punkimpl = HeapAlloc(GetProcessHeap(), 0, sizeof(IUnknownImpl)); - punkimpl->lpVtbl = &vt_IUnknown; + punkimpl->IUnknown_iface.lpVtbl = &vt_IUnknown; punkimpl->ifaces = ifaces; punkimpl->unknown = 0;

1 0

Nikolay Sivov : comctl32/syslink: Call default procedure directly when needed.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: f79c4d6fa289c1ef2149dde92caec6a8dde2f266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f79c4d6fa289c1ef2149dde92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 24 07:49:33 2011 +0400 comctl32/syslink: Call default procedure directly when needed. --- dlls/comctl32/syslink.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 573619e..c13267e 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1564,7 +1564,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, infoPtr = (SYSLINK_INFO *)GetWindowLongPtrW(hwnd, 0); if (!infoPtr && message != WM_CREATE) - goto HandleDefaultMessage; + return DefWindowProcW(hwnd, message, wParam, lParam); switch(message) { case WM_PRINTCLIENT: @@ -1588,8 +1588,8 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, SetCursor(LoadCursorW(0, (LPCWSTR)IDC_HAND)); return TRUE; } - /* let the default window proc handle this message */ - goto HandleDefaultMessage; + + return DefWindowProcW(hwnd, message, wParam, lParam); } case WM_SIZE: @@ -1615,7 +1615,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, case WM_SETTEXT: SYSLINK_SetText(infoPtr, (LPWSTR)lParam); - goto HandleDefaultMessage; + return DefWindowProcW(hwnd, message, wParam, lParam); case WM_LBUTTONDOWN: { @@ -1645,8 +1645,9 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, SYSKEY_SelectNextPrevLink(infoPtr, shift); return 0; } + default: + return DefWindowProcW(hwnd, message, wParam, lParam); } - goto HandleDefaultMessage; } case WM_GETDLGCODE: @@ -1777,7 +1778,6 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, return 0; default: -HandleDefaultMessage: if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message)) { ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam );

1 0

Michael Stefaniuc : msxml3: COM cleanup in domdoc.c.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: 31057e4b75931360009d26c66e61922a77ee7a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31057e4b75931360009d26c66… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 26 23:47:48 2011 +0200 msxml3: COM cleanup in domdoc.c. --- dlls/msxml3/domdoc.c | 97 +++++++++++++++++++++++++------------------------ 1 files changed, 49 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31057e4b75931360009d2…

1 0

André Hentschel : winedbg: Fill the dbg_internal_var array for ARM.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: b7ea0cb0840334f93bbd9ffa2de980fa5c573863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7ea0cb0840334f93bbd9ffa2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 26 23:10:42 2011 +0200 winedbg: Fill the dbg_internal_var array for ARM. --- programs/winedbg/be_arm.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 732b581..0379bd9 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -76,7 +76,24 @@ static void be_arm_print_segment_info(HANDLE hThread, const CONTEXT* ctx) static struct dbg_internal_var be_arm_ctx[] = { - {0, NULL, 0, dbg_itype_none} + {CV_ARM_R0 + 0, "r0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R0), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 1, "r1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R1), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 2, "r2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R2), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 3, "r3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R3), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 4, "r4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R4), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 5, "r5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R5), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 6, "r6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R6), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 7, "r7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R7), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 8, "r8", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R8), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 9, "r9", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R9), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 10, "r10", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R10), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 11, "r11", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Fp), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 12, "r12", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Ip), dbg_itype_unsigned_int}, + {CV_ARM_SP, "sp", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Sp), dbg_itype_unsigned_int}, + {CV_ARM_LR, "lr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Lr), dbg_itype_unsigned_int}, + {CV_ARM_PC, "pc", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Pc), dbg_itype_unsigned_int}, + {CV_ARM_CPSR, "cpsr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Cpsr), dbg_itype_unsigned_int}, + {0, NULL, 0, dbg_itype_none} }; static unsigned be_arm_is_step_over_insn(const void* insn)

1 0

Marcus Meissner : twain_32: Mark some functions static and other internal ones hidden.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: 2c1d581cedb655f372ca4dc3e951c6adfb505746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1d581cedb655f372ca4dc3e… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Apr 26 11:10:28 2011 +0200 twain_32: Mark some functions static and other internal ones hidden. --- dlls/twain_32/dsm_ctrl.c | 4 ++++ dlls/twain_32/twain_i.h | 27 ++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index c34bd1d..b50dbc5 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -35,6 +35,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +static TW_UINT16 DSM_initialized; /* whether Source Manager is initialized */ +static TW_UINT32 DSM_sourceId; /* source id generator */ +static TW_UINT16 DSM_currentDevice; /* keep track of device during enumeration */ + struct all_devices { char *modname; TW_IDENTITY identity; diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h index ff777b6..ffe6bd9 100644 --- a/dlls/twain_32/twain_i.h +++ b/dlls/twain_32/twain_i.h @@ -39,32 +39,29 @@ typedef struct tagActiveDS DSENTRYPROC dsEntry; } activeDS; -TW_UINT16 DSM_initialized; /* whether Source Manager is initialized */ -TW_UINT16 DSM_currentState; /* current state of Source Manager */ -TW_UINT16 DSM_twCC; /* current condition code of Source Manager */ -TW_UINT32 DSM_sourceId; /* source id generator */ -TW_UINT16 DSM_currentDevice; /* keep track of device during enumeration */ +TW_UINT16 DSM_currentState DECLSPEC_HIDDEN; /* current state of Source Manager */ +TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */ -activeDS *activeSources; /* list of active data sources */ +activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */ /* Implementation of operation triplets (From Application to Source Manager) */ extern TW_UINT16 TWAIN_CloseDS - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_IdentityGetDefault - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_IdentityGetFirst - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_IdentityGetNext - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_OpenDS - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_UserSelect - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_CloseDSM - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_OpenDSM - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; extern TW_UINT16 TWAIN_GetDSMStatus - (pTW_IDENTITY pOrigin, TW_MEMREF pData); + (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN; #endif

1 0

Marcus Meissner : sane.ds: Mark internal functions as hidden.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: a247c7fd496302e10faff8f5b90feb7f71bdfed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a247c7fd496302e10faff8f5b… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Apr 26 19:11:44 2011 +0200 sane.ds: Mark internal functions as hidden. --- dlls/sane.ds/sane_i.h | 158 ++++++++++++++++++++++++------------------------ 1 files changed, 79 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a247c7fd496302e10faff…

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSurface::Unmap() implementations .
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: 34ba20fe352a3919d4dc4802f1b3c2975e4f0413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ba20fe352a3919d4dc4802f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 19:24:19 2011 +0200 wined3d: Merge the IWineD3DSurface::Unmap() implementations. --- dlls/wined3d/surface.c | 287 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 147 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34ba20fe352a3919d4dc4…

1 0

André Hentschel : dbghelp: Implement sparc_map_dwarf_register.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: dae65898e2a339a3be6e877b9bf7e458ae387837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dae65898e2a339a3be6e877b9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 26 19:00:45 2011 +0200 dbghelp: Implement sparc_map_dwarf_register. --- dlls/dbghelp/cpu_sparc.c | 13 +++++++++++-- include/cvconst.h | 13 +++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_sparc.c b/dlls/dbghelp/cpu_sparc.c index 6a788b9..3309b76 100644 --- a/dlls/dbghelp/cpu_sparc.c +++ b/dlls/dbghelp/cpu_sparc.c @@ -54,8 +54,17 @@ static BOOL sparc_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, C static unsigned sparc_map_dwarf_register(unsigned regno) { - FIXME("not done for Sparc\n"); - return 0; + if (regno <= 7) + return CV_SPARC_G0 + regno; + else if (regno >= 8 && regno <= 15) + return CV_SPARC_O0 + regno - 8; + else if (regno >= 16 && regno <= 23) + return CV_SPARC_L0 + regno - 16; + else if (regno >= 24 && regno <= 31) + return CV_SPARC_I0 + regno - 24; + + FIXME("Don't know how to map register %d\n", regno); + return CV_SPARC_NOREG; } static void* sparc_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) diff --git a/include/cvconst.h b/include/cvconst.h index d05c99b..00e64ae 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -530,6 +530,19 @@ enum CV_HREG_e CV_AMD64_R13 = 341, CV_AMD64_R14 = 342, CV_AMD64_R15 = 343, + + /* Wine extension */ + CV_SPARC_NOREG = CV_REG_NONE, + CV_SPARC_G0 = 10, /* includes g0 to g7 */ + CV_SPARC_O0 = 18, /* includes o0 to o7 */ + CV_SPARC_L0 = 26, /* includes l0 to l7 */ + CV_SPARC_I0 = 34, /* includes i0 to i7 */ + CV_SPARC_PSR = 42, + CV_SPARC_PC = 43, + CV_SPARC_NPC = 44, + CV_SPARC_Y = 45, + CV_SPARC_WIM = 46, + CV_SPARC_TBR = 47, }; typedef enum

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSurface::Release() implementations.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: a2ef014342abe381a0e77d1d2858657de926228d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ef014342abe381a0e77d1d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 19:24:17 2011 +0200 wined3d: Merge the IWineD3DSurface::Release() implementations. --- dlls/wined3d/surface.c | 124 ++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 45 insertions(+), 80 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 143333d..6942fc4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -775,6 +775,7 @@ static const struct wined3d_resource_ops surface_resource_ops = static const struct wined3d_surface_ops surface_ops = { surface_private_setup, + surface_cleanup, surface_realize_palette, surface_draw_overlay, }; @@ -895,6 +896,7 @@ static HRESULT gdi_surface_draw_overlay(IWineD3DSurfaceImpl *surface) static const struct wined3d_surface_ops gdi_surface_ops = { gdi_surface_private_setup, + surface_gdi_cleanup, gdi_surface_realize_palette, gdi_surface_draw_overlay, }; @@ -1747,6 +1749,45 @@ static ULONG WINAPI IWineD3DBaseSurfaceImpl_AddRef(IWineD3DSurface *iface) return refcount; } +/* Do not call while under the GL lock. */ +static ULONG WINAPI IWineD3DBaseSurfaceImpl_Release(IWineD3DSurface *iface) +{ + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; + ULONG refcount; + + TRACE("Surface %p, container %p of type %#x.\n", + surface, surface->container.u.base, surface->container.type); + + switch (surface->container.type) + { + case WINED3D_CONTAINER_TEXTURE: + return wined3d_texture_decref(surface->container.u.texture); + + case WINED3D_CONTAINER_SWAPCHAIN: + return wined3d_swapchain_decref(surface->container.u.swapchain); + + default: + ERR("Unhandled container type %#x.\n", surface->container.type); + case WINED3D_CONTAINER_NONE: + break; + } + + refcount = InterlockedDecrement(&surface->resource.ref); + TRACE("%p decreasing refcount to %u.\n", surface, refcount); + + if (!refcount) + { + surface_cleanup(surface); + surface->surface_ops->surface_cleanup(surface); + surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent); + + TRACE("Destroyed surface %p.\n", surface); + HeapFree(GetProcessHeap(), 0, surface); + } + + return refcount; +} + static HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPrivateData(IWineD3DSurface *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { @@ -3439,43 +3480,6 @@ static HRESULT WINAPI IWineD3DBaseSurfaceImpl_Map(IWineD3DSurface *iface, return WINED3D_OK; } -/* Do not call while under the GL lock. */ -static ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) -{ - IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; - ULONG refcount; - - TRACE("Surface %p, container %p of type %#x.\n", - surface, surface->container.u.base, surface->container.type); - - switch (surface->container.type) - { - case WINED3D_CONTAINER_TEXTURE: - return wined3d_texture_decref(surface->container.u.texture); - - case WINED3D_CONTAINER_SWAPCHAIN: - return wined3d_swapchain_decref(surface->container.u.swapchain); - - default: - ERR("Unhandled container type %#x.\n", surface->container.type); - case WINED3D_CONTAINER_NONE: - break; - } - - refcount = InterlockedDecrement(&surface->resource.ref); - TRACE("%p decreasing refcount to %u.\n", surface, refcount); - - if (!refcount) - { - surface_cleanup(surface); - surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent); - - TRACE("Destroyed surface %p.\n", surface); - HeapFree(GetProcessHeap(), 0, surface); - } - - return refcount; -} /* **************************************************** IWineD3DSurface IWineD3DResource parts follow @@ -6920,7 +6924,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = /* IUnknown */ IWineD3DBaseSurfaceImpl_QueryInterface, IWineD3DBaseSurfaceImpl_AddRef, - IWineD3DSurfaceImpl_Release, + IWineD3DBaseSurfaceImpl_Release, /* IWineD3DResource */ IWineD3DBaseSurfaceImpl_GetParent, IWineD3DBaseSurfaceImpl_SetPrivateData, @@ -7202,43 +7206,6 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } -static ULONG WINAPI IWineGDISurfaceImpl_Release(IWineD3DSurface *iface) -{ - IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; - ULONG refcount; - - TRACE("Surface %p, container %p of type %#x.\n", - surface, surface->container.u.base, surface->container.type); - - switch (surface->container.type) - { - case WINED3D_CONTAINER_TEXTURE: - return wined3d_texture_decref(surface->container.u.texture); - - case WINED3D_CONTAINER_SWAPCHAIN: - return wined3d_swapchain_decref(surface->container.u.swapchain); - - default: - ERR("Unhandled container type %#x.\n", surface->container.type); - case WINED3D_CONTAINER_NONE: - break; - } - - refcount = InterlockedDecrement(&surface->resource.ref); - TRACE("%p decreasing refcount to %u.\n", surface, refcount); - - if (!refcount) - { - surface_gdi_cleanup(surface); - surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent); - - TRACE("Destroyed surface %p.\n", surface); - HeapFree(GetProcessHeap(), 0, surface); - } - - return refcount; -} - static void WINAPI IWineGDISurfaceImpl_PreLoad(IWineD3DSurface *iface) { ERR("(%p): PreLoad is not supported on X11 surfaces!\n", iface); @@ -7499,7 +7466,7 @@ static const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = /* IUnknown */ IWineD3DBaseSurfaceImpl_QueryInterface, IWineD3DBaseSurfaceImpl_AddRef, - IWineGDISurfaceImpl_Release, + IWineD3DBaseSurfaceImpl_Release, /* IWineD3DResource */ IWineD3DBaseSurfaceImpl_GetParent, IWineD3DBaseSurfaceImpl_SetPrivateData, @@ -7543,7 +7510,6 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); - void (*cleanup)(IWineD3DSurfaceImpl *This); unsigned int resource_size; HRESULT hr; @@ -7605,13 +7571,11 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, case SURFACE_OPENGL: surface->lpVtbl = &IWineD3DSurface_Vtbl; surface->surface_ops = &surface_ops; - cleanup = surface_cleanup; break; case SURFACE_GDI: surface->lpVtbl = &IWineGDISurface_Vtbl; surface->surface_ops = &gdi_surface_ops; - cleanup = surface_gdi_cleanup; break; default: @@ -7653,7 +7617,7 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, if (FAILED(hr)) { ERR("Private setup failed, returning %#x\n", hr); - cleanup(surface); + surface->surface_ops->surface_cleanup(surface); return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0a9b36a..676f367 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2021,6 +2021,7 @@ struct wined3d_subresource_container struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct IWineD3DSurfaceImpl *surface); + void (*surface_cleanup)(struct IWineD3DSurfaceImpl *surface); void (*surface_realize_palette)(struct IWineD3DSurfaceImpl *surface); HRESULT (*surface_draw_overlay)(struct IWineD3DSurfaceImpl *surface); };

1 0