wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Nikolay Sivov : comctl32/tests: Remove practically unused parameters from test functions.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: f6b3376ec70f583c381722214290808fd3118fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b3376ec70f583c381722214… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 23 23:37:34 2011 +0400 comctl32/tests: Remove practically unused parameters from test functions. --- dlls/comctl32/tests/tab.c | 88 +++++++++++++++++++++++++------------------- 1 files changed, 50 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 5bd2ea0..bf705a5 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -63,6 +63,7 @@ static HFONT hFont; static DRAWITEMSTRUCT g_drawitem; +static HWND parent_wnd; static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -643,8 +644,23 @@ static void test_tab(INT nMinTabWidth) DeleteObject(hFont); } -static void test_curfocus(HWND parent_wnd, INT nTabs) +static void test_width(void) { + trace ("Testing with default MinWidth\n"); + test_tab(-1); + trace ("Testing with MinWidth set to -3\n"); + test_tab(-3); + trace ("Testing with MinWidth set to 24\n"); + test_tab(24); + trace ("Testing with MinWidth set to 54\n"); + test_tab(54); + trace ("Testing with MinWidth set to 94\n"); + test_tab(94); +} + +static void test_curfocus(void) +{ + const INT nTabs = 5; INT focusIndex; HWND hTab; @@ -676,8 +692,9 @@ static void test_curfocus(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_cursel(HWND parent_wnd, INT nTabs) +static void test_cursel(void) { + const INT nTabs = 5; INT selectionIndex; INT focusIndex; TCITEM tcItem; @@ -728,8 +745,9 @@ static void test_cursel(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_extendedstyle(HWND parent_wnd, INT nTabs) +static void test_extendedstyle(void) { + const INT nTabs = 5; DWORD prevExtendedStyle; DWORD extendedStyle; HWND hTab; @@ -762,8 +780,9 @@ static void test_extendedstyle(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_unicodeformat(HWND parent_wnd, INT nTabs) +static void test_unicodeformat(void) { + const INT nTabs = 5; INT unicodeFormat; HWND hTab; @@ -793,9 +812,10 @@ static void test_unicodeformat(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_getset_item(HWND parent_wnd, INT nTabs) +static void test_getset_item(void) { char szText[32] = "New Label"; + const INT nTabs = 5; TCITEM tcItem; LPARAM lparam; DWORD ret; @@ -935,10 +955,11 @@ static void test_getset_item(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_getset_tooltips(HWND parent_wnd, INT nTabs) +static void test_getset_tooltips(void) { - HWND hTab, toolTip; char toolTipText[32] = "ToolTip Text Test"; + const INT nTabs = 5; + HWND hTab, toolTip; hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, nTabs); ok(hTab != NULL, "Failed to create tab control\n"); @@ -958,8 +979,9 @@ static void test_getset_tooltips(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_misc(HWND parent_wnd, INT nTabs) +static void test_misc(void) { + const INT nTabs = 5; HWND hTab; RECT rTab; INT nTabsRetrieved; @@ -1019,7 +1041,7 @@ static void test_misc(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_adjustrect(HWND parent_wnd) +static void test_adjustrect(void) { HWND hTab; INT r; @@ -1036,7 +1058,7 @@ static void test_adjustrect(HWND parent_wnd) expect(-1, r); } -static void test_insert_focus(HWND parent_wnd) +static void test_insert_focus(void) { HWND hTab; INT nTabsRetrieved; @@ -1102,7 +1124,7 @@ static void test_insert_focus(HWND parent_wnd) DestroyWindow(hTab); } -static void test_delete_focus(HWND parent_wnd) +static void test_delete_focus(void) { HWND hTab; INT nTabsRetrieved; @@ -1214,7 +1236,7 @@ static void test_removeimage(void) DestroyIcon(hicon); } -static void test_delete_selection(HWND parent_wnd) +static void test_delete_selection(void) { HWND hTab; DWORD ret; @@ -1236,7 +1258,7 @@ static void test_delete_selection(HWND parent_wnd) DestroyWindow(hTab); } -static void test_TCM_SETITEMEXTRA(HWND parent_wnd) +static void test_TCM_SETITEMEXTRA(void) { HWND hTab; DWORD ret; @@ -1273,7 +1295,7 @@ static void test_TCM_SETITEMEXTRA(HWND parent_wnd) DestroyWindow(hTab); } -static void test_TCS_OWNERDRAWFIXED(HWND parent_wnd) +static void test_TCS_OWNERDRAWFIXED(void) { LPARAM lparam, lparam2; TCITEMA item; @@ -1370,7 +1392,6 @@ static void test_TCS_OWNERDRAWFIXED(HWND parent_wnd) START_TEST(tab) { - HWND parent_wnd; LOGFONTA logfont; lstrcpyA(logfont.lfFaceName, "Arial"); @@ -1382,38 +1403,29 @@ START_TEST(tab) InitCommonControls(); - trace ("Testing with default MinWidth\n"); - test_tab(-1); - trace ("Testing with MinWidth set to -3\n"); - test_tab(-3); - trace ("Testing with MinWidth set to 24\n"); - test_tab(24); - trace ("Testing with MinWidth set to 54\n"); - test_tab(54); - trace ("Testing with MinWidth set to 94\n"); - test_tab(94); + test_width(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); parent_wnd = createParentWindow(); ok(parent_wnd != NULL, "Failed to create parent window!\n"); - test_curfocus(parent_wnd, 5); - test_cursel(parent_wnd, 5); - test_extendedstyle(parent_wnd, 5); - test_unicodeformat(parent_wnd, 5); - test_getset_item(parent_wnd, 5); - test_getset_tooltips(parent_wnd, 5); - test_misc(parent_wnd, 5); + test_curfocus(); + test_cursel(); + test_extendedstyle(); + test_unicodeformat(); + test_getset_item(); + test_getset_tooltips(); + test_misc(); - test_adjustrect(parent_wnd); + test_adjustrect(); - test_insert_focus(parent_wnd); - test_delete_focus(parent_wnd); - test_delete_selection(parent_wnd); + test_insert_focus(); + test_delete_focus(); + test_delete_selection(); test_removeimage(); - test_TCM_SETITEMEXTRA(parent_wnd); - test_TCS_OWNERDRAWFIXED(parent_wnd); + test_TCM_SETITEMEXTRA(); + test_TCS_OWNERDRAWFIXED(); DestroyWindow(parent_wnd); }

1 0

Michael Stefaniuc : msxml3: COM cleanup in domdoc.c.
by Alexandre Julliard 27 Apr '11

27 Apr '11

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

Michael Stefaniuc : shell32/tests: COM cleanup in shlfolder.c.
by Alexandre Julliard 27 Apr '11

27 Apr '11

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

André Hentschel : winedbg: Copy the x86 implementation of fetch_integer for ARM.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: ac3ed42601f24e9bc79629f34ee8204cb7684738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3ed42601f24e9bc79629f34… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 26 23:11:06 2011 +0200 winedbg: Copy the x86 implementation of fetch_integer for ARM. --- programs/winedbg/be_arm.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 0379bd9..f34ecc7 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -191,8 +191,21 @@ static int be_arm_adjust_pc_for_break(CONTEXT* ctx, BOOL way) static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, unsigned ext_sign, LONGLONG* ret) { - dbg_printf("be_arm_fetch_integer: not done\n"); - return FALSE; + if (size != 1 && size != 2 && size != 4 && size != 8) return FALSE; + + memset(ret, 0, sizeof(*ret)); /* clear unread bytes */ + /* FIXME: this assumes that debuggee and debugger use the same + * integral representation + */ + if (!memory_read_value(lvalue, size, ret)) return FALSE; + + /* propagate sign information */ + if (ext_sign && size < 8 && (*ret >> (size * 8 - 1)) != 0) + { + ULONGLONG neg = -1; + *ret |= neg << (size * 8); + } + return TRUE; } static int be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size,

1 0

André Hentschel : winedbg: Fill the dbg_internal_var array for ARM.
by Alexandre Julliard 27 Apr '11

27 Apr '11

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 : msxml3: Mark internal symbols as hidden.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: 1ef0fca7960486067921a7df040842e78a239546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef0fca7960486067921a7df0… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Apr 26 18:41:22 2011 +0200 msxml3: Mark internal symbols as hidden. --- dlls/msxml3/msxml_private.h | 190 +++++++++++++++++++++--------------------- dlls/msxml3/xslpattern.h | 10 +- dlls/msxml3/xslpattern.l | 2 + dlls/msxml3/xslpattern.y | 2 + 4 files changed, 104 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ef0fca7960486067921a…

1 0

Marcus Meissner : shell32: Mark internal symbols as hidden.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: 448569624835379b0700a66b7882e67091931340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=448569624835379b0700a66b7… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Apr 26 19:23:52 2011 +0200 shell32: Mark internal symbols as hidden. --- dlls/shell32/cpanel.h | 4 +- dlls/shell32/debughlp.h | 6 +- dlls/shell32/ebrowser.c | 2 +- dlls/shell32/enumidlist.h | 6 +- dlls/shell32/pidl.h | 88 +++++++++++++------------- dlls/shell32/shell32_main.h | 140 +++++++++++++++++++++--------------------- dlls/shell32/shfldr.h | 24 ++++---- dlls/shell32/xdg.h | 22 ++++---- 8 files changed, 146 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=448569624835379b0700a…

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSurface::Unmap() implementations .
by Alexandre Julliard 27 Apr '11

27 Apr '11

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

Henri Verbeet : wined3d: Merge the IWineD3DSurface::Map() implementations.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: 825341e7c2421adac0a2144f512c60bf563ec4c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825341e7c2421adac0a2144f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 19:24:18 2011 +0200 wined3d: Merge the IWineD3DSurface::Map() implementations. --- dlls/wined3d/surface.c | 386 +++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 182 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=825341e7c2421adac0a21…

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSurface::Release() implementations.
by Alexandre Julliard 27 Apr '11

27 Apr '11

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

← Newer
1
...
8
9
10
11
12
13
14
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011