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

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

Nikolay Sivov : comctl32/syslink: Call default procedure directly when needed.
by Alexandre Julliard 27 Apr '11

27 Apr '11

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

Huw Davies : rpcrt4: Handle non-conformant bogus structures.
by Alexandre Julliard 27 Apr '11

27 Apr '11

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

Tim Hentenaar : user32: GetTabbedTextExtent() returns non-zero value when nCount == 0.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: a415974b2efd97e41dab7ef61d4385c754fcc8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a415974b2efd97e41dab7ef61… Author: Tim Hentenaar <tim(a)hentenaar.com> Date: Sat Apr 23 07:36:12 2011 -0400 user32: GetTabbedTextExtent() returns non-zero value when nCount == 0. --- dlls/user32/tests/text.c | 3 +++ dlls/user32/text.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 88ea6b5..b45a312 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -617,6 +617,9 @@ static void test_TabbedText(void) ret = GetTextMetricsA( hdc, &tm); ok( ret, "GetTextMetrics error %u\n", GetLastError()); + extent = GetTabbedTextExtentA( hdc, "x", 0, 1, tabs); + ok( extent == 0, "GetTabbedTextExtentA returned non-zero on nCount == 0\n"); + extent = GetTabbedTextExtentA( hdc, "x", 1, 1, tabs); cx = LOWORD( extent); cy = HIWORD( extent); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index e34877f..c9ded68 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1281,6 +1281,8 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, int i, j; int start = x; + if (!lpstr || count == 0) return 0; + if (!lpTabPos) cTabStops=0;

1 0

André Hentschel : dbghelp: Implement sparc_map_dwarf_register.
by Alexandre Julliard 27 Apr '11

27 Apr '11

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

Marcus Meissner : twain_32: Mark some functions static and other internal ones hidden.
by Alexandre Julliard 27 Apr '11

27 Apr '11

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 27 Apr '11

27 Apr '11

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: Rename "pCaps" to "caps".
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: a05841bd1a8abacdff80e8ae6cebfa7caa9c1ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05841bd1a8abacdff80e8ae6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 19:24:15 2011 +0200 wined3d: Rename "pCaps" to "caps". --- dlls/wined3d/arb_program_shader.c | 32 ++++++++-------- dlls/wined3d/glsl_shader.c | 22 ++++++------ dlls/wined3d/nvidia_texture_shader.c | 63 ++++++++++++++++----------------- dlls/wined3d/state.c | 50 +++++++++++++------------- 4 files changed, 83 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a05841bd1a8abacdff80e…

1 0

Henri Verbeet : wined3d: Only invalidate the INDRAWABLE location for onscreen surfaces in surface_realize_palette ().
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: d9ace3c9f72512046dc7d1a01a75ce97aefdb69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ace3c9f72512046dc7d1a01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 26 19:24:16 2011 +0200 wined3d: Only invalidate the INDRAWABLE location for onscreen surfaces in surface_realize_palette(). For offscreen surfaces this might actually remove the texture we just loaded. --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d03a72..143333d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -611,7 +611,8 @@ static void surface_realize_palette(IWineD3DSurfaceImpl *surface) surface_load_location(surface, SFLAG_INTEXTURE, NULL); /* We want to force a palette refresh, so mark the drawable as not being up to date */ - surface_modify_location(surface, SFLAG_INDRAWABLE, FALSE); + if (!surface_is_offscreen(surface)) + surface_modify_location(surface, SFLAG_INDRAWABLE, FALSE); } else {

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