December 2009 - Wine-commits

Andrew Nguyen : dxdiagn: Make the IDxDiag* interfaces conform to the IUnknown:: QueryInterface contract.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: d36e3b4a1d71ca4decbbebd6fd4053fbec94bbb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36e3b4a1d71ca4decbbebd6f… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Dec 22 04:14:56 2009 -0600 dxdiagn: Make the IDxDiag* interfaces conform to the IUnknown::QueryInterface contract. --- dlls/dxdiagn/container.c | 3 +++ dlls/dxdiagn/provider.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 621579b..e02d1d1 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -33,6 +33,8 @@ HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFII { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + if (!ppobj) return E_INVALIDARG; + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDxDiagContainer)) { IUnknown_AddRef(iface); @@ -41,6 +43,7 @@ HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFII } WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 88d67b6..21bb32d 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -48,6 +48,8 @@ static HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, { IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + if (!ppobj) return E_INVALIDARG; + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDxDiagProvider)) { IUnknown_AddRef(iface); @@ -56,6 +58,7 @@ static HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, } WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Andrew Nguyen : dxdiagn: Fail class instantiation if aggregation is requested.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: b0e3c91c0a6e9e1ec767697e45919f04aa13fe3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e3c91c0a6e9e1ec767697e4… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Dec 22 04:15:07 2009 -0600 dxdiagn: Fail class instantiation if aggregation is requested. --- dlls/dxdiagn/provider.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 21bb32d..0795910 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -139,12 +139,12 @@ HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, R IDxDiagProviderImpl* provider; TRACE("(%p, %s, %p)\n", punkOuter, debugstr_guid(riid), ppobj); - + + *ppobj = NULL; + if (punkOuter) return CLASS_E_NOAGGREGATION; + provider = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagProviderImpl)); - if (NULL == provider) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + if (NULL == provider) return E_OUTOFMEMORY; provider->lpVtbl = &DxDiagProvider_Vtbl; provider->ref = 0; /* will be inited with QueryInterface */ return IDxDiagProviderImpl_QueryInterface ((PDXDIAGPROVIDER)provider, riid, ppobj);

1 0

Henri Verbeet : wined3d: Cleanup IWineD3DBaseSwapChainImpl_QueryInterface() .
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: d9fefdb9173d318a702a2e822339ac643aa878bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9fefdb9173d318a702a2e822… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 21 23:17:25 2009 +0100 wined3d: Cleanup IWineD3DBaseSwapChainImpl_QueryInterface(). --- dlls/wined3d/swapchain_base.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c index 9b51e93..3c8055e 100644 --- a/dlls/wined3d/swapchain_base.c +++ b/dlls/wined3d/swapchain_base.c @@ -27,23 +27,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DSwapChain IUnknown parts follow: */ -HRESULT WINAPI IWineD3DBaseSwapChainImpl_QueryInterface(IWineD3DSwapChain *iface, REFIID riid, LPVOID *ppobj) +HRESULT WINAPI IWineD3DBaseSwapChainImpl_QueryInterface(IWineD3DSwapChain *iface, REFIID riid, void **object) { - IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; - TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IWineD3DBase) - || IsEqualGUID(riid, &IID_IWineD3DSwapChain)){ - IWineD3DSwapChain_AddRef(iface); - if(ppobj == NULL){ - ERR("Query interface called but now data allocated\n"); - return E_NOINTERFACE; - } - *ppobj = This; - return WINED3D_OK; - } - *ppobj = NULL; - return E_NOINTERFACE; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_IWineD3DSwapChain) + || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; } ULONG WINAPI IWineD3DBaseSwapChainImpl_AddRef(IWineD3DSwapChain *iface) {

1 0

Henri Verbeet : wined3d: Get rid of some redundant local variables.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: ea0af93c19643044ebb5c80d20e45ab656203fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea0af93c19643044ebb5c80d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 21 23:17:26 2009 +0100 wined3d: Get rid of some redundant local variables. E.g. "This" variables that are only used in traces. --- dlls/wined3d/basetexture.c | 6 +-- dlls/wined3d/clipper.c | 7 ++-- dlls/wined3d/cubetexture.c | 12 +++--- dlls/wined3d/device.c | 76 ++++++++++++++++++++++------------------- dlls/wined3d/directx.c | 43 ++++++++++------------- dlls/wined3d/drawprim.c | 6 +-- dlls/wined3d/query.c | 11 ++++-- dlls/wined3d/surface_base.c | 9 ++--- dlls/wined3d/swapchain_base.c | 3 +- dlls/wined3d/volumetexture.c | 21 ++++++----- 10 files changed, 96 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea0af93c19643044ebb5c…

1 0

Nikolay Sivov : kernel32/tests: Init pointers in common way, add some win_skip() while skipping.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 08a778c568f628c1ac366f06100122fbb28f8d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a778c568f628c1ac366f061… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Dec 21 20:21:16 2009 +0300 kernel32/tests: Init pointers in common way, add some win_skip() while skipping. --- dlls/kernel32/tests/path.c | 46 ++++++++++++++++++++++++++----------------- 1 files changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 1c899c8..4641c5e 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1323,6 +1323,12 @@ static void test_GetWindowsDirectory(void) static void test_NeedCurrentDirectoryForExePathA(void) { + if (!pNeedCurrentDirectoryForExePathA) + { + win_skip("NeedCurrentDirectoryForExePathA is not available\n"); + return; + } + /* Crashes in Windows */ if (0) ok(pNeedCurrentDirectoryForExePathA(NULL), "returned FALSE for NULL\n"); @@ -1344,6 +1350,12 @@ static void test_NeedCurrentDirectoryForExePathW(void) const WCHAR fullpath[] = {'c', ':', '\\', 0}; const WCHAR cmdname[] = {'c', 'm', 'd', '.', 'e', 'x', 'e', 0}; + if (!pNeedCurrentDirectoryForExePathW) + { + win_skip("NeedCurrentDirectoryForExePathW is not available\n"); + return; + } + /* Crashes in Windows */ if (0) ok(pNeedCurrentDirectoryForExePathW(NULL), "returned FALSE for NULL\n"); @@ -1444,19 +1456,23 @@ static void test_drive_letter_case(void) #undef is_upper_case_letter } +static void init_pointers(void) +{ + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); + +#define MAKEFUNC(f) (p##f = (void*)GetProcAddress(hKernel32, #f)) + MAKEFUNC(GetLongPathNameA); + MAKEFUNC(GetLongPathNameW); + MAKEFUNC(NeedCurrentDirectoryForExePathA); + MAKEFUNC(NeedCurrentDirectoryForExePathW); +#undef MAKEFUNC +} + START_TEST(path) { CHAR origdir[MAX_PATH],curdir[MAX_PATH], curDrive, otherDrive; - pGetLongPathNameA = (void*)GetProcAddress( GetModuleHandleA("kernel32.dll"), - "GetLongPathNameA" ); - pGetLongPathNameW = (void*)GetProcAddress(GetModuleHandleA("kernel32.dll") , - "GetLongPathNameW" ); - pNeedCurrentDirectoryForExePathA = - (void*)GetProcAddress( GetModuleHandleA("kernel32.dll"), - "NeedCurrentDirectoryForExePathA" ); - pNeedCurrentDirectoryForExePathW = - (void*)GetProcAddress( GetModuleHandleA("kernel32.dll"), - "NeedCurrentDirectoryForExePathW" ); + + init_pointers(); /* Report only once */ if (!pGetLongPathNameA) @@ -1474,13 +1490,7 @@ START_TEST(path) test_GetShortPathNameW(); test_GetSystemDirectory(); test_GetWindowsDirectory(); - if (pNeedCurrentDirectoryForExePathA) - { - test_NeedCurrentDirectoryForExePathA(); - } - if (pNeedCurrentDirectoryForExePathW) - { - test_NeedCurrentDirectoryForExePathW(); - } + test_NeedCurrentDirectoryForExePathA(); + test_NeedCurrentDirectoryForExePathW(); test_drive_letter_case(); }

1 0

Nikolay Sivov : kernel32: Fix SearchPath parameter validation with tests.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 6d270a1d48c193a40c5145758053b6083627fb2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d270a1d48c193a40c5145758… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Dec 21 23:00:38 2009 +0300 kernel32: Fix SearchPath parameter validation with tests. --- dlls/kernel32/path.c | 16 ++++++++- dlls/kernel32/tests/path.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 7618dc9..a304cb2 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -758,6 +758,12 @@ DWORD WINAPI SearchPathW( LPCWSTR path, LPCWSTR name, LPCWSTR ext, DWORD buflen, { DWORD ret = 0; + if (!name || !name[0]) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + /* If the name contains an explicit path, ignore the path */ if (contains_pathW(name)) @@ -827,11 +833,17 @@ DWORD WINAPI SearchPathW( LPCWSTR path, LPCWSTR name, LPCWSTR ext, DWORD buflen, DWORD WINAPI SearchPathA( LPCSTR path, LPCSTR name, LPCSTR ext, DWORD buflen, LPSTR buffer, LPSTR *lastpart ) { - WCHAR *pathW = NULL, *nameW = NULL, *extW = NULL; + WCHAR *pathW = NULL, *nameW, *extW = NULL; WCHAR bufferW[MAX_PATH]; DWORD ret; - if (!name || !(nameW = FILE_name_AtoW( name, FALSE ))) return 0; + if (!name) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!(nameW = FILE_name_AtoW( name, FALSE ))) return 0; if (path && !(pathW = FILE_name_AtoW( path, TRUE ))) return 0; if (ext && !(extW = FILE_name_AtoW( ext, TRUE ))) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 4641c5e..4c0aac5 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -57,6 +57,9 @@ static DWORD (WINAPI *pGetLongPathNameW)(LPWSTR,LPWSTR,DWORD); static BOOL (WINAPI *pNeedCurrentDirectoryForExePathA)(LPCSTR); static BOOL (WINAPI *pNeedCurrentDirectoryForExePathW)(LPCWSTR); +static DWORD (WINAPI *pSearchPathA)(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*); +static DWORD (WINAPI *pSearchPathW)(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*); + /* a structure to deal with wine todos somewhat cleanly */ typedef struct { DWORD shortlen; @@ -1456,6 +1459,76 @@ static void test_drive_letter_case(void) #undef is_upper_case_letter } +static void test_SearchPathA(void) +{ + CHAR pathA[MAX_PATH], fileA[] = "", buffA[MAX_PATH]; + CHAR *ptrA = NULL; + DWORD ret; + + if (!pSearchPathA) + { + win_skip("SearchPathA isn't available\n"); + return; + } + + GetWindowsDirectoryA(pathA, sizeof(pathA)/sizeof(CHAR)); + + /* NULL filename */ + SetLastError(0xdeadbeef); + ret = pSearchPathA(pathA, NULL, NULL, sizeof(buffA)/sizeof(CHAR), buffA, &ptrA); + ok(ret == 0, "Expected failure, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); + + /* empty filename */ + SetLastError(0xdeadbeef); + ret = pSearchPathA(pathA, fileA, NULL, sizeof(buffA)/sizeof(CHAR), buffA, &ptrA); + ok(ret == 0, "Expected failure, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == ERROR_FILE_NOT_FOUND) /* win9x */, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); +} + +static void test_SearchPathW(void) +{ + WCHAR pathW[MAX_PATH], fileW[] = { 0 }, buffW[MAX_PATH]; + WCHAR *ptrW = NULL; + DWORD ret; + + if (!pSearchPathW) + { + win_skip("SearchPathW isn't available\n"); + return; + } + + /* SearchPathW is a stub on win9x and doesn't return sane error, + so quess if it's implemented indirectly */ + SetLastError(0xdeadbeef); + GetWindowsDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SearchPathW not implemented\n"); + return; + } + +if (0) +{ + /* NULL filename, crashes on nt4 */ + SetLastError(0xdeadbeef); + ret = pSearchPathW(pathW, NULL, NULL, sizeof(buffW)/sizeof(WCHAR), buffW, &ptrW); + ok(ret == 0, "Expected failure, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); +} + + /* empty filename */ + SetLastError(0xdeadbeef); + ret = pSearchPathW(pathW, fileW, NULL, sizeof(buffW)/sizeof(WCHAR), buffW, &ptrW); + ok(ret == 0, "Expected failure, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); +} + static void init_pointers(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -1465,6 +1538,8 @@ static void init_pointers(void) MAKEFUNC(GetLongPathNameW); MAKEFUNC(NeedCurrentDirectoryForExePathA); MAKEFUNC(NeedCurrentDirectoryForExePathW); + MAKEFUNC(SearchPathA); + MAKEFUNC(SearchPathW); #undef MAKEFUNC } @@ -1493,4 +1568,6 @@ START_TEST(path) test_NeedCurrentDirectoryForExePathA(); test_NeedCurrentDirectoryForExePathW(); test_drive_letter_case(); + test_SearchPathA(); + test_SearchPathW(); }

1 0

Nikolay Sivov : comctl32/tests: Add ability to create any number of edit buddies.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 8fc96f20a33605a56e0ef72059c450eef3821e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc96f20a33605a56e0ef7205… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 22 00:37:41 2009 +0300 comctl32/tests: Add ability to create any number of edit buddies. --- dlls/comctl32/tests/updown.c | 71 +++++++++++++++++++++-------------------- 1 files changed, 36 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 236706d..df3fbbf 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -59,7 +59,7 @@ #define EDIT_SEQ_INDEX 1 #define UPDOWN_SEQ_INDEX 2 -static HWND parent_wnd, edit; +static HWND parent_wnd, g_edit; static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -242,19 +242,20 @@ static LRESULT WINAPI edit_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, static HWND create_edit_control(void) { WNDPROC oldproc; + HWND hwnd; RECT rect; GetClientRect(parent_wnd, &rect); - edit = CreateWindowExA(0, "EDIT", NULL, WS_CHILD | WS_BORDER | WS_VISIBLE, + hwnd = CreateWindowExA(0, WC_EDITA, NULL, WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, rect.right, rect.bottom, parent_wnd, NULL, GetModuleHandleA(NULL), NULL); - if (!edit) return NULL; + if (!hwnd) return NULL; - oldproc = (WNDPROC)SetWindowLongPtrA(edit, GWLP_WNDPROC, + oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)edit_subclass_proc); - SetWindowLongPtrA(edit, GWLP_USERDATA, (LONG_PTR)oldproc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); - return edit; + return hwnd; } static LRESULT WINAPI updown_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -280,7 +281,7 @@ static LRESULT WINAPI updown_subclass_proc(HWND hwnd, UINT message, WPARAM wPara return ret; } -static HWND create_updown_control(DWORD style) +static HWND create_updown_control(DWORD style, HWND buddy) { WNDPROC oldproc; HWND updown; @@ -288,7 +289,7 @@ static HWND create_updown_control(DWORD style) GetClientRect(parent_wnd, &rect); updown = CreateUpDownControl(WS_CHILD | WS_BORDER | WS_VISIBLE | style, - 0, 0, rect.right, rect.bottom, parent_wnd, 1, GetModuleHandleA(NULL), edit, + 0, 0, rect.right, rect.bottom, parent_wnd, 1, GetModuleHandleA(NULL), buddy, 100, 0, 50); if (!updown) return NULL; @@ -304,7 +305,7 @@ static void test_updown_pos(void) HWND updown; int r; - updown = create_updown_control(UDS_ALIGNRIGHT); + updown = create_updown_control(UDS_ALIGNRIGHT, g_edit); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -365,7 +366,7 @@ static void test_updown_pos32(void) int r; int low, high; - updown = create_updown_control(UDS_ALIGNRIGHT); + updown = create_updown_control(UDS_ALIGNRIGHT, g_edit); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -437,18 +438,18 @@ static void test_updown_buddy(void) { HWND updown, buddyReturn; - updown = create_updown_control(UDS_ALIGNRIGHT); + updown = create_updown_control(UDS_ALIGNRIGHT, g_edit); flush_sequences(sequences, NUM_MSG_SEQUENCES); buddyReturn = (HWND)SendMessage(updown, UDM_GETBUDDY, 0 , 0 ); - ok(buddyReturn == edit, "Expected edit handle\n"); + ok(buddyReturn == g_edit, "Expected edit handle\n"); - buddyReturn = (HWND)SendMessage(updown, UDM_SETBUDDY, (WPARAM) edit, 0); - ok(buddyReturn == edit, "Expected edit handle\n"); + buddyReturn = (HWND)SendMessage(updown, UDM_SETBUDDY, (WPARAM) g_edit, 0); + ok(buddyReturn == g_edit, "Expected edit handle\n"); buddyReturn = (HWND)SendMessage(updown, UDM_GETBUDDY, 0 , 0 ); - ok(buddyReturn == edit, "Expected edit handle\n"); + ok(buddyReturn == g_edit, "Expected edit handle\n"); ok_sequence(sequences, UPDOWN_SEQ_INDEX, test_updown_buddy_seq, "test updown buddy", TRUE); ok_sequence(sequences, EDIT_SEQ_INDEX, add_updown_with_edit_seq, "test updown buddy_edit", FALSE); @@ -462,7 +463,7 @@ static void test_updown_base(void) int r; CHAR text[10]; - updown = create_updown_control(UDS_ALIGNRIGHT); + updown = create_updown_control(UDS_ALIGNRIGHT, g_edit); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -499,18 +500,18 @@ static void test_updown_base(void) DestroyWindow(updown); /* switch base with buddy attached */ - updown = create_updown_control(UDS_SETBUDDYINT | UDS_ALIGNRIGHT); + updown = create_updown_control(UDS_SETBUDDYINT | UDS_ALIGNRIGHT, g_edit); r = SendMessage(updown, UDM_SETPOS, 0, 10); expect(50, r); - GetWindowTextA(edit, text, sizeof(text)/sizeof(CHAR)); + GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR)); ok(lstrcmpA(text, "10") == 0, "Expected '10', got '%s'\n", text); r = SendMessage(updown, UDM_SETBASE, 16, 0); expect(10, r); - GetWindowTextA(edit, text, sizeof(text)/sizeof(CHAR)); + GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR)); /* FIXME: currently hex output isn't properly formatted, but for this test only change from initial text matters */ ok(lstrcmpA(text, "10") != 0, "Expected '0x000A', got '%s'\n", text); @@ -523,7 +524,7 @@ static void test_updown_unicode(void) HWND updown; int r; - updown = create_updown_control(UDS_ALIGNRIGHT); + updown = create_updown_control(UDS_ALIGNRIGHT, g_edit); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -563,14 +564,14 @@ static void test_updown_create(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); - updown = create_updown_control(UDS_ALIGNRIGHT); + updown = create_updown_control(UDS_ALIGNRIGHT, g_edit); ok(updown != NULL, "Failed to create updown control\n"); ok_sequence(sequences, PARENT_SEQ_INDEX, add_updown_to_parent_seq, "add updown control to parent", TRUE); ok_sequence(sequences, EDIT_SEQ_INDEX, add_updown_with_edit_seq, "add updown control with edit", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); - GetWindowTextA(edit, text, MAX_PATH); + GetWindowTextA(g_edit, text, MAX_PATH); ok(lstrlenA(text) == 0, "Expected empty string\n"); ok_sequence(sequences, EDIT_SEQ_INDEX, get_edit_text_seq, "get edit text", FALSE); @@ -634,44 +635,44 @@ static void test_UDS_SETBUDDYINT(void) /* cleanup buddy */ text[0] = '\0'; - SetWindowTextA(edit, text); + SetWindowTextA(g_edit, text); /* creating without UDS_SETBUDDYINT */ - updown = create_updown_control(UDS_ALIGNRIGHT); + updown = create_updown_control(UDS_ALIGNRIGHT, g_edit); /* try to set UDS_SETBUDDYINT after creation */ style = GetWindowLongA(updown, GWL_STYLE); SetWindowLongA(updown, GWL_STYLE, style | UDS_SETBUDDYINT); style = GetWindowLongA(updown, GWL_STYLE); ok(style & UDS_SETBUDDYINT, "Expected UDS_SETBUDDY to be set\n"); SendMessage(updown, UDM_SETPOS, 0, 20); - GetWindowTextA(edit, text, sizeof(text)/sizeof(CHAR)); + GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR)); ok(lstrlenA(text) == 0, "Expected empty string\n"); DestroyWindow(updown); /* creating with UDS_SETBUDDYINT */ - updown = create_updown_control(UDS_SETBUDDYINT | UDS_ALIGNRIGHT); - GetWindowTextA(edit, text, sizeof(text)/sizeof(CHAR)); + updown = create_updown_control(UDS_SETBUDDYINT | UDS_ALIGNRIGHT, g_edit); + GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR)); /* 50 is initial value here */ ok(lstrcmpA(text, "50") == 0, "Expected '50', got '%s'\n", text); /* now remove style flag */ style = GetWindowLongA(updown, GWL_STYLE); SetWindowLongA(updown, GWL_STYLE, style & ~UDS_SETBUDDYINT); SendMessage(updown, UDM_SETPOS, 0, 20); - GetWindowTextA(edit, text, sizeof(text)/sizeof(CHAR)); + GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR)); ok(lstrcmpA(text, "20") == 0, "Expected '20', got '%s'\n", text); /* set edit text directly, check position */ strcpy(text, "10"); - SetWindowTextA(edit, text); + SetWindowTextA(g_edit, text); ret = SendMessageA(updown, UDM_GETPOS, 0, 0); expect(10, ret); strcpy(text, "11"); - SetWindowTextA(edit, text); + SetWindowTextA(g_edit, text); ret = SendMessageA(updown, UDM_GETPOS, 0, 0); expect(11, LOWORD(ret)); expect(0, HIWORD(ret)); /* set to invalid value */ strcpy(text, "21st"); - SetWindowTextA(edit, text); + SetWindowTextA(g_edit, text); ret = SendMessageA(updown, UDM_GETPOS, 0, 0); expect(11, LOWORD(ret)); expect(TRUE, HIWORD(ret)); @@ -679,7 +680,7 @@ static void test_UDS_SETBUDDYINT(void) style = GetWindowLongA(updown, GWL_STYLE); SetWindowLongA(updown, GWL_STYLE, style | UDS_SETBUDDYINT); SendMessage(updown, UDM_SETPOS, 0, 30); - GetWindowTextA(edit, text, sizeof(text)/sizeof(CHAR)); + GetWindowTextA(g_edit, text, sizeof(text)/sizeof(CHAR)); ok(lstrcmpA(text, "30") == 0, "Expected '30', got '%s'\n", text); DestroyWindow(updown); } @@ -691,8 +692,8 @@ START_TEST(updown) parent_wnd = create_parent_window(); ok(parent_wnd != NULL, "Failed to create parent window!\n"); - edit = create_edit_control(); - ok(edit != NULL, "Failed to create edit control\n"); + g_edit = create_edit_control(); + ok(g_edit != NULL, "Failed to create edit control\n"); test_updown_create(); test_updown_pos(); @@ -702,6 +703,6 @@ START_TEST(updown) test_updown_unicode(); test_UDS_SETBUDDYINT(); - DestroyWindow(edit); + DestroyWindow(g_edit); DestroyWindow(parent_wnd); }

1 0

Nikolay Sivov : comctl32/tests: Some tests for buddy procedure subclassing.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 48d42d4a93194868b5f0a02587b4b95ca789b8ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d42d4a93194868b5f0a0258… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 22 01:54:06 2009 +0300 comctl32/tests: Some tests for buddy procedure subclassing. --- dlls/comctl32/tests/updown.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index df3fbbf..c2a5a4a 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -61,6 +61,8 @@ static HWND parent_wnd, g_edit; +static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); + static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static const struct message add_updown_with_edit_seq[] = { @@ -436,7 +438,9 @@ static void test_updown_pos32(void) static void test_updown_buddy(void) { - HWND updown, buddyReturn; + HWND updown, buddyReturn, buddy; + WNDPROC proc; + DWORD style; updown = create_updown_control(UDS_ALIGNRIGHT, g_edit); @@ -455,6 +459,35 @@ static void test_updown_buddy(void) ok_sequence(sequences, EDIT_SEQ_INDEX, add_updown_with_edit_seq, "test updown buddy_edit", FALSE); DestroyWindow(updown); + + buddy = create_edit_control(); + proc = (WNDPROC)GetWindowLongPtrA(buddy, GWLP_WNDPROC); + + updown= create_updown_control(UDS_ALIGNRIGHT, buddy); + ok(proc == (WNDPROC)GetWindowLongPtrA(buddy, GWLP_WNDPROC), "No subclassing expected\n"); + + style = GetWindowLongA(updown, GWL_STYLE); + SetWindowLongA(updown, GWL_STYLE, style | UDS_ARROWKEYS); + style = GetWindowLongA(updown, GWL_STYLE); + ok(style & UDS_ARROWKEYS, "Expected UDS_ARROWKEYS\n"); + /* no subclass if UDS_ARROWKEYS set after creation */ + ok(proc == (WNDPROC)GetWindowLongPtrA(buddy, GWLP_WNDPROC), "No subclassing expected\n"); + + DestroyWindow(updown); + + updown= create_updown_control(UDS_ALIGNRIGHT | UDS_ARROWKEYS, buddy); + ok(proc != (WNDPROC)GetWindowLongPtrA(buddy, GWLP_WNDPROC), "Subclassing expected\n"); + + if (pSetWindowSubclass) + { + /* updown uses subclass helpers for buddy on >5.8x systems */ + todo_wine + ok(GetPropA(buddy, "CC32SubclassInfo") != NULL, "Expected CC32SubclassInfo property\n"); + } + + DestroyWindow(updown); + + DestroyWindow(buddy); } static void test_updown_base(void) @@ -687,6 +720,10 @@ static void test_UDS_SETBUDDYINT(void) START_TEST(updown) { + HMODULE mod = GetModuleHandleA("comctl32.dll"); + + pSetWindowSubclass = (void*)GetProcAddress(mod, (LPSTR)410); + InitCommonControls(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

Nikolay Sivov : comctl32/tests: Use win_skip() while skipping subclass tests.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 705aee525ab60cbb0f4356bf5f43560636ead99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=705aee525ab60cbb0f4356bf5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 22 01:57:20 2009 +0300 comctl32/tests: Use win_skip() while skipping subclass tests. --- dlls/comctl32/tests/subclass.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index f4d0b72..f5a74ba 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -293,7 +293,10 @@ START_TEST(subclass) pDefSubclassProc = (void*)GetProcAddress(hdll, (LPSTR)413); if(!pSetWindowSubclass || !pRemoveWindowSubclass || !pDefSubclassProc) + { + win_skip("SetWindowSubclass and friends are not available\n"); return; + } if(!RegisterWindowClasses()) assert(0);

1 0

Nikolay Sivov : comctl32/updown: Simplify buddy subclassing using SetWindowSubclass chain.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 6cc141ff59d7da8788413e0139ab5900d36ab693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc141ff59d7da8788413e013… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 22 02:42:31 2009 +0300 comctl32/updown: Simplify buddy subclassing using SetWindowSubclass chain. --- dlls/comctl32/tests/updown.c | 3 +- dlls/comctl32/updown.c | 50 ++++++++++++++++-------------------------- 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index c2a5a4a..dacc460 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -481,8 +481,7 @@ static void test_updown_buddy(void) if (pSetWindowSubclass) { /* updown uses subclass helpers for buddy on >5.8x systems */ - todo_wine - ok(GetPropA(buddy, "CC32SubclassInfo") != NULL, "Expected CC32SubclassInfo property\n"); + ok(GetPropA(buddy, "CC32SubclassInfo") != NULL, "Expected CC32SubclassInfo property\n"); } DestroyWindow(updown); diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index f6b240a..127bb40 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -100,9 +100,9 @@ typedef struct #define UPDOWN_GetInfoPtr(hwnd) ((UPDOWN_INFO *)GetWindowLongPtrW (hwnd,0)) #define COUNT_OF(a) (sizeof(a)/sizeof(a[0])) -static const WCHAR BUDDY_UPDOWN_HWND[] = { 'b', 'u', 'd', 'd', 'y', 'U', 'p', 'D', 'o', 'w', 'n', 'H', 'W', 'N', 'D', 0 }; -static const WCHAR BUDDY_SUPERCLASS_WNDPROC[] = { 'b', 'u', 'd', 'd', 'y', 'S', 'u', 'p', 'p', 'e', 'r', - 'C', 'l', 'a', 's', 's', 'W', 'n', 'd', 'P', 'r', 'o', 'c', 0 }; +/* id used for SetWindowSubclass */ +#define BUDDY_SUBCLASSID 1 + static void UPDOWN_DoAction (UPDOWN_INFO *infoPtr, int delta, int action); /*********************************************************************** @@ -518,14 +518,13 @@ static LRESULT UPDOWN_MouseWheel(UPDOWN_INFO *infoPtr, WPARAM wParam) * control. */ static LRESULT CALLBACK -UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, + UINT_PTR uId, DWORD_PTR ref_data) { - WNDPROC superClassWndProc = (WNDPROC)GetPropW(hwnd, BUDDY_SUPERCLASS_WNDPROC); - HWND upDownHwnd = GetPropW(hwnd, BUDDY_UPDOWN_HWND); - UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr(upDownHwnd); + UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr((HWND)ref_data); - TRACE("hwnd=%p, wndProc=%p, uMsg=%04x, wParam=%08lx, lParam=%08lx\n", - hwnd, superClassWndProc, uMsg, wParam, lParam); + TRACE("hwnd=%p, uMsg=%04x, wParam=%08lx, lParam=%08lx\n", + hwnd, uMsg, wParam, lParam); switch(uMsg) { @@ -542,7 +541,7 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) break; } - return CallWindowProcW( superClassWndProc, hwnd, uMsg, wParam, lParam); + return DefSubclassProc(hwnd, uMsg, wParam, lParam); } /*********************************************************************** @@ -559,7 +558,6 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) { RECT budRect; /* new coord for the buddy */ int x, width; /* new x position and width for the up-down */ - WNDPROC baseWndProc; WCHAR buddyClass[40]; HWND ret; @@ -567,20 +565,15 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) ret = infoPtr->Buddy; - /* there is already a body assigned */ - if (infoPtr->Buddy) RemovePropW(infoPtr->Buddy, BUDDY_UPDOWN_HWND); - - if(!IsWindow(bud)) - bud = 0; + /* there is already a buddy assigned */ + if (infoPtr->Buddy) RemoveWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, + BUDDY_SUBCLASSID); + if (!IsWindow(bud)) bud = NULL; /* Store buddy window handle */ infoPtr->Buddy = bud; if(bud) { - - /* keep upDown ctrl hwnd in a buddy property */ - SetPropW( bud, BUDDY_UPDOWN_HWND, infoPtr->Self); - /* Store buddy window class type */ infoPtr->BuddyType = BUDDY_TYPE_UNKNOWN; if (GetClassNameW(bud, buddyClass, COUNT_OF(buddyClass))) { @@ -590,15 +583,9 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) infoPtr->BuddyType = BUDDY_TYPE_LISTBOX; } - if (infoPtr->dwStyle & UDS_ARROWKEYS) { - /* Note that I don't clear the BUDDY_SUPERCLASS_WNDPROC property - when we reset the upDown ctrl buddy to another buddy because it is not - good to break the window proc chain. */ - if (!GetPropW(bud, BUDDY_SUPERCLASS_WNDPROC)) { - baseWndProc = (WNDPROC)SetWindowLongPtrW(bud, GWLP_WNDPROC, (LPARAM)UPDOWN_Buddy_SubclassProc); - SetPropW(bud, BUDDY_SUPERCLASS_WNDPROC, baseWndProc); - } - } + if (infoPtr->dwStyle & UDS_ARROWKEYS) + SetWindowSubclass(bud, UPDOWN_Buddy_SubclassProc, BUDDY_SUBCLASSID, + (DWORD_PTR)infoPtr->Self); /* Get the rect of the buddy relative to its parent */ GetWindowRect(infoPtr->Buddy, &budRect); @@ -892,8 +879,9 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case WM_DESTROY: Free (infoPtr->AccelVect); - if(infoPtr->Buddy) RemovePropW(infoPtr->Buddy, BUDDY_UPDOWN_HWND); - + if (infoPtr->Buddy) + RemoveWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, + BUDDY_SUBCLASSID); Free (infoPtr); SetWindowLongPtrW (hwnd, 0, 0); theme = GetWindowTheme (hwnd);

1 0