February 2011 - Wine-Commits

Austin English : crypt32/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 179a01f2e2c44880a546c9ecec28c407139f77c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=179a01f2e2c44880a546c9ece… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 16:06:38 2011 -0800 crypt32/tests: Make sure to use return value (LLVM/Clang). --- dlls/crypt32/tests/base64.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index dd85be4..39fa2e1 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -151,6 +151,7 @@ static void testBinaryToStringA(void) ret = pCryptBinaryToStringA(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BINARY, str, &strLen2); + ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); ok(strLen == strLen2, "Expected length %d, got %d\n", strLen, strLen2); ok(!memcmp(str, tests[i].toEncode, tests[i].toEncodeLen), @@ -187,6 +188,7 @@ static void testBinaryToStringA(void) ret = pCryptBinaryToStringA(testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen, CRYPT_STRING_BINARY | CRYPT_STRING_NOCR, str, &strLen2); + ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); ok(strLen == strLen2, "Expected length %d, got %d\n", strLen, strLen2); ok(!memcmp(str, testsNoCR[i].toEncode, testsNoCR[i].toEncodeLen), @@ -287,6 +289,7 @@ static void decodeAndCompareBase64_A(LPCSTR toDecode, LPCSTR header, ret = pCryptStringToBinaryA(str, 0, useFormat, buf, &bufLen, &skipped, &usedFormat); + ok(ret, "CryptStringToBinaryA failed: %d\n", GetLastError()); ok(skipped == strlen(garbage), "Expected %d characters of \"%s\" skipped when trying format %08x, got %d (used format is %08x)\n", lstrlenA(garbage), str, useFormat, skipped, usedFormat);

1 0

Austin English : comcat/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 453405e2b4a78fcf81a7c9407fd32ce100b45fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=453405e2b4a78fcf81a7c9407… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 15:46:45 2011 -0800 comcat/tests: Make sure to use return value (LLVM/Clang). --- dlls/comcat/tests/comcat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index 029d2e3..cf0b7c1 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -104,6 +104,7 @@ static void do_enum(void) ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); + ok (hr == S_FALSE,"Expected S_FALSE, got 0x%08x", hr); ok (fetched == 0,"Fetched wrong number of guids %u\n",fetched); IEnumGUID_Release(pIEnum); @@ -113,6 +114,7 @@ static void do_enum(void) ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); + ok (hr == S_OK,"Expected S_OK, got 0x%08x", hr); ok (fetched == 1,"Fetched wrong number of guids %u\n",fetched); ok (IsEqualGUID(the_guid,&wanted_guid),"Guids do not match\n");

1 0

Austin English : explorerframe/tests: Don' t assign values to variables that are never checked (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 5f3ff6583928217a3d6fbd7465b9a9f1652faad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3ff6583928217a3d6fbd746… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 17:06:20 2011 -0800 explorerframe/tests: Don't assign values to variables that are never checked (LLVM/Clang). --- dlls/explorerframe/tests/nstc.c | 42 +++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 047d7cd..3ea408f 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1084,8 +1084,8 @@ static void test_basics(void) if(0) { /* Crashes under Windows 7 */ - hr = INameSpaceTreeControl_AppendRoot(pnstc, NULL, SHCONTF_FOLDERS, 0, NULL); - hr = INameSpaceTreeControl_InsertRoot(pnstc, 0, NULL, SHCONTF_FOLDERS, 0, NULL); + INameSpaceTreeControl_AppendRoot(pnstc, NULL, SHCONTF_FOLDERS, 0, NULL); + INameSpaceTreeControl_InsertRoot(pnstc, 0, NULL, SHCONTF_FOLDERS, 0, NULL); } /* Note the usage of psidesktop and psidesktop2 */ @@ -1132,7 +1132,7 @@ static void test_basics(void) if(0) { /* Crashes on native. */ - hr = INameSpaceTreeControl_GetRootItems(pnstc, NULL); + INameSpaceTreeControl_GetRootItems(pnstc, NULL); } hr = INameSpaceTreeControl_GetRootItems(pnstc, &psia); @@ -1360,7 +1360,7 @@ static void test_basics(void) if(0) { /* Crashes under Windows 7 */ - hr = INameSpaceTreeControl_GetSelectedItems(pnstc, NULL); + INameSpaceTreeControl_GetSelectedItems(pnstc, NULL); } psia = (void*)0xdeadbeef; @@ -1550,9 +1550,9 @@ static void test_basics(void) if(0) { /* Crashes under win 7 */ - hr = INameSpaceTreeControl_GetItemRect(pnstc, NULL, NULL); - hr = INameSpaceTreeControl_GetItemRect(pnstc, psitestdir, NULL); - hr = INameSpaceTreeControl_GetItemRect(pnstc, NULL, &rc); + INameSpaceTreeControl_GetItemRect(pnstc, NULL, NULL); + INameSpaceTreeControl_GetItemRect(pnstc, psitestdir, NULL); + INameSpaceTreeControl_GetItemRect(pnstc, NULL, &rc); } hr = INameSpaceTreeControl_GetItemRect(pnstc, psitestdir, &rc); @@ -1690,10 +1690,10 @@ static void test_basics(void) if(0) { /* Crashes under Windows 7 */ - hr = INameSpaceTreeControl_GetItemCustomState(pnstc, NULL, NULL); - hr = INameSpaceTreeControl_GetItemCustomState(pnstc, NULL, &cbstate); - hr = INameSpaceTreeControl_GetItemCustomState(pnstc, psitestdir, NULL); - hr = INameSpaceTreeControl_SetItemCustomState(pnstc, NULL, 0); + INameSpaceTreeControl_GetItemCustomState(pnstc, NULL, NULL); + INameSpaceTreeControl_GetItemCustomState(pnstc, NULL, &cbstate); + INameSpaceTreeControl_GetItemCustomState(pnstc, psitestdir, NULL); + INameSpaceTreeControl_SetItemCustomState(pnstc, NULL, 0); } hr = INameSpaceTreeControl_AppendRoot(pnstc, psitestdir, @@ -1807,9 +1807,9 @@ static void test_events(void) if(0) { /* Crashes native */ - hr = INameSpaceTreeControl_TreeAdvise(pnstc, NULL, NULL); - hr = INameSpaceTreeControl_TreeAdvise(pnstc, NULL, &cookie1); - hr = INameSpaceTreeControl_TreeAdvise(pnstc, (IUnknown*)pnstce, NULL); + INameSpaceTreeControl_TreeAdvise(pnstc, NULL, NULL); + INameSpaceTreeControl_TreeAdvise(pnstc, NULL, &cookie1); + INameSpaceTreeControl_TreeAdvise(pnstc, (IUnknown*)pnstce, NULL); } /* TreeAdvise in NameSpaceTreeController seems to support only one @@ -2044,12 +2044,12 @@ static void test_events(void) if(0) { /* Crashes on Windows 7 */ - hr = INameSpaceTreeControl_SetItemState(pnstc, NULL, 0, 0); - hr = INameSpaceTreeControl_GetItemState(pnstc, NULL, 0, NULL); - hr = INameSpaceTreeControl_GetItemState(pnstc, psidesktop, 0, NULL); - hr = INameSpaceTreeControl_GetItemState(pnstc, NULL, 0, &itemstate); - hr = INameSpaceTreeControl_GetItemState(pnstc, psidesktop, 0, NULL); - hr = INameSpaceTreeControl_GetItemState(pnstc, NULL, 0, &itemstate); + INameSpaceTreeControl_SetItemState(pnstc, NULL, 0, 0); + INameSpaceTreeControl_GetItemState(pnstc, NULL, 0, NULL); + INameSpaceTreeControl_GetItemState(pnstc, psidesktop, 0, NULL); + INameSpaceTreeControl_GetItemState(pnstc, NULL, 0, &itemstate); + INameSpaceTreeControl_GetItemState(pnstc, psidesktop, 0, NULL); + INameSpaceTreeControl_GetItemState(pnstc, NULL, 0, &itemstate); } itemstate = 0xDEADBEEF; @@ -2302,7 +2302,7 @@ static void test_events(void) if(0) { /* Crashes on Windows 7 */ - hr = INameSpaceTreeControl_EnsureItemVisible(pnstc, NULL); + INameSpaceTreeControl_EnsureItemVisible(pnstc, NULL); } hr = INameSpaceTreeControl_EnsureItemVisible(pnstc, psidesktop);

1 0

Austin English : advapi32/tests: Make sure to use return value (LLVM/Clang) .
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 425e7ca15d21201b646510cdff6a3b9dd75c89ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=425e7ca15d21201b646510cdf… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 15:44:40 2011 -0800 advapi32/tests: Make sure to use return value (LLVM/Clang). --- dlls/advapi32/tests/registry.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 42ff232..5316e95 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1199,6 +1199,7 @@ static void test_reg_close_key(void) * hkHandle remains changed after call to RegCloseKey */ ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkHandle); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); ret = RegCloseKey(hkHandle); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret);

1 0

Joris Huizer : ws2_32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 36c76573de03d5890ae746f5cbddbe9fb5e42092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c76573de03d5890ae746f5c… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Fri Feb 4 17:20:25 2011 +0100 ws2_32/tests: Don't test function directly when reporting GetLastError(). --- dlls/ws2_32/tests/sock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9d1de46..2a8c1d2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3773,7 +3773,8 @@ static void test_WSARecv(void) ling.l_onoff = 1; ling.l_linger = 0; - ok(!setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)), "Failed to set linger %d\n", GetLastError()); + iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); + ok(!iret, "Failed to set linger %d\n", GetLastError()); iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, &ov, NULL); ok(iret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", iret, GetLastError());

1 0

Joris Huizer : user32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 26f753aec8c81e09938cc39383322aae3fdc4e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f753aec8c81e09938cc3938… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Fri Feb 4 17:10:17 2011 +0100 user32/tests: Don't test function directly when reporting GetLastError(). --- dlls/user32/tests/dde.c | 7 +++++-- dlls/user32/tests/menu.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index ea010e6..f6a0844 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1571,6 +1571,7 @@ static void test_dde_aw_transaction( BOOL client_unicode, BOOL server_unicode ) CONVINFO info; HDDEDATA hdata; BOOL conv_unicode = client_unicode; + BOOL got; static char test_cmd[] = "test dde command"; if (!(hwnd_server = create_dde_server( server_unicode ))) return; @@ -1709,7 +1710,8 @@ todo_wine { ok(err == DMLERR_NOTPROCESSED, "DdeClientTransaction returned error %x\n", err); } - ok(DdeDisconnect(hconv), "DdeDisconnect error %x\n", DdeGetLastError(dde_inst)); + got = DdeDisconnect(hconv); + ok(got, "DdeDisconnect error %x\n", DdeGetLastError(dde_inst)); info.cb = sizeof(info); ret = DdeQueryConvInfo(hconv, QID_SYNC, &info); @@ -1719,7 +1721,8 @@ todo_wine { ok(err == DMLERR_INVALIDPARAMETER, "wrong dde error %x\n", err); } - ok(DdeFreeStringHandle(dde_inst, hsz_server), "DdeFreeStringHandle error %x\n", DdeGetLastError(dde_inst)); + got = DdeFreeStringHandle(dde_inst, hsz_server); + ok(got, "DdeFreeStringHandle error %x\n", DdeGetLastError(dde_inst)); /* This call hangs on win2k SP4 and XP SP1. DdeUninitialize(dde_inst);*/ diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index aa7ebde..6a831a8 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -660,6 +660,7 @@ static void test_menu_bmp_and_string(void) MENUINFO mi= {sizeof(MENUINFO)}; MENUITEMINFOA mii= {sizeof(MENUITEMINFOA)}; int count, szidx, txtidx, bmpidx, hassub, mnuopt, ispop; + BOOL got; if( !pGetMenuInfo) { @@ -681,12 +682,14 @@ static void test_menu_bmp_and_string(void) ok( hsysmenu != NULL, "GetSystemMenu failed with error %d\n", GetLastError()); mi.fMask = MIM_STYLE; mi.dwStyle = 0; - ok( pGetMenuInfo( hsysmenu, &mi), "GetMenuInfo failed gle=%d\n", GetLastError()); + got = pGetMenuInfo( hsysmenu, &mi); + ok( got, "GetMenuInfo failed gle=%d\n", GetLastError()); ok( MNS_CHECKORBMP == mi.dwStyle, "System Menu Style is %08x, without the bit %08x\n", mi.dwStyle, MNS_CHECKORBMP); mii.fMask = MIIM_BITMAP; mii.hbmpItem = NULL; - ok( GetMenuItemInfoA( hsysmenu, SC_CLOSE, FALSE, &mii), "GetMenuItemInfoA failed gle=%d\n", GetLastError()); + got = GetMenuItemInfoA( hsysmenu, SC_CLOSE, FALSE, &mii); + ok( got, "GetMenuItemInfoA failed gle=%d\n", GetLastError()); ok( HBMMENU_POPUP_CLOSE == mii.hbmpItem, "Item info did not get the right hbitmap: got %p expected %p\n", mii.hbmpItem, HBMMENU_POPUP_CLOSE);

1 0

Joris Huizer : kernel32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: fb296d120158e34896405bccf72ce2db659e0bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb296d120158e34896405bccf… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Fri Feb 4 16:49:14 2011 +0100 kernel32/tests: Don't test function directly when reporting GetLastError(). --- dlls/kernel32/tests/thread.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 6f27db1..fab01dc 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -944,7 +944,8 @@ static void test_SetThreadContext(void) ctx.Esp -= 2 * sizeof(int *); ctx.Eip = (DWORD)set_test_val; SetLastError(0xdeadbeef); - ok( SetThreadContext( thread, &ctx ), "SetThreadContext failed : (%d)\n", GetLastError() ); + ret = SetThreadContext( thread, &ctx ); + ok( ret, "SetThreadContext failed : (%d)\n", GetLastError() ); } SetLastError(0xdeadbeef);

1 0

André Hentschel : ntdll: Only use ST_FIX_ALIGN on solaris.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: e78bd6dfa11e177d1c766c1148797a59d5e6cebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e78bd6dfa11e177d1c766c114… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 4 21:44:46 2011 +0100 ntdll: Only use ST_FIX_ALIGN on solaris. --- dlls/ntdll/signal_sparc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index 318e5a9..29414d7 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -809,6 +809,7 @@ void signal_init_process(void) if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error; #endif +#ifdef __sun__ /* 'ta 6' tells the kernel to synthesize any unaligned accesses this process makes, instead of just signalling an error and terminating the process. wine-devel did not reach a conclusion on whether @@ -816,6 +817,7 @@ void signal_init_process(void) because it could obscure problems in user code */ __asm__("ta 6"); /* 6 == ST_FIX_ALIGN defined in sys/trap.h */ return; +#endif error: perror("sigaction");

1 0

Joris Huizer : imagehlp/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 922d1d88e85cd64960ae44998c280ce738c13b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=922d1d88e85cd64960ae44998… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Fri Feb 4 16:36:49 2011 +0100 imagehlp/tests: Don't test function directly when reporting GetLastError(). --- dlls/imagehlp/tests/integrity.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index 10af9fa..0785c2a 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -202,7 +202,8 @@ static void test_get_certificate(char *cert_data, int index) return; } - ok(ret = pImageGetCertificateData(hFile, index, cert, &cert_len), "Unable to retrieve certificate; err=%x\n", GetLastError()); + ret = pImageGetCertificateData(hFile, index, cert, &cert_len); + ok(ret, "Unable to retrieve certificate; err=%x\n", GetLastError()); ok(memcmp(cert->bCertificate, cert_data, cert_len - sizeof(WIN_CERTIFICATE)) == 0, "Certificate retrieved did not match original\n"); HeapFree(GetProcessHeap(), 0, cert);

1 0

Stefan Dösinger : d3d9: Use a proper window class for the query test.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: eadae86c858fb132191a317ebfaf51b3d7d86226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eadae86c858fb132191a317eb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 30 20:41:56 2011 +0100 d3d9: Use a proper window class for the query test. --- dlls/d3d9/tests/query.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/query.c b/dlls/d3d9/tests/query.c index d015353..8bcfcf6 100644 --- a/dlls/d3d9/tests/query.c +++ b/dlls/d3d9/tests/query.c @@ -255,25 +255,31 @@ START_TEST(query) { IDirect3D9 *pD3d = NULL; HWND hwnd = NULL; + WNDCLASS wc = {0}; + wc.lpfnWndProc = DefWindowProc; + wc.lpszClassName = "d3d9_test_wc"; + RegisterClass(&wc); pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); if(!pD3d) { skip("Failed to create Direct3D9 object, not running tests\n"); - return; + goto out; } - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( wc.lpszClassName, "d3d9_test", + WS_SYSMENU | WS_POPUP, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); if(!hwnd) { skip("Failed to create window\n"); - IDirect3D9_Release(pD3d); - return; + goto out; } test_query_support(pD3d, hwnd); test_occlusion_query_states(pD3d, hwnd); - DestroyWindow(hwnd); - IDirect3D9_Release(pD3d); + out: + if(pD3d) IDirect3D9_Release(pD3d); + if(hwnd) DestroyWindow(hwnd); + UnregisterClassA(wc.lpszClassName, GetModuleHandleA(NULL)); } }

1 0