February 2011 - Wine-commits

Austin English : advapi32/tests: Remove useless assignments (LLVM/Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: a19ce2080e1fc19c1db6c4543a9c1003a9a2ef1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19ce2080e1fc19c1db6c4543… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:05:49 2011 -0800 advapi32/tests: Remove useless assignments (LLVM/Clang). --- dlls/advapi32/tests/security.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 5db4354..e1f06c8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1533,7 +1533,7 @@ static void test_LookupAccountSid(void) acc_sizeA = 0; dom_sizeA = MAX_PATH; accountA[0] = 0; - ret = LookupAccountSidA(NULL, pUsersSid, accountA, &acc_sizeA, domainA, &dom_sizeA, &use); + LookupAccountSidA(NULL, pUsersSid, accountA, &acc_sizeA, domainA, &dom_sizeA, &use); /* this can fail or succeed depending on OS version but the size will always be returned */ ok(acc_sizeA == real_acc_sizeA + 1, "LookupAccountSidA() Expected acc_size = %u, got %u\n", @@ -1542,7 +1542,7 @@ static void test_LookupAccountSid(void) /* try a 0 sized account buffer */ acc_sizeA = 0; dom_sizeA = MAX_PATH; - ret = LookupAccountSidA(NULL, pUsersSid, NULL, &acc_sizeA, domainA, &dom_sizeA, &use); + LookupAccountSidA(NULL, pUsersSid, NULL, &acc_sizeA, domainA, &dom_sizeA, &use); /* this can fail or succeed depending on OS version but the size will always be returned */ ok(acc_sizeA == real_acc_sizeA + 1, "LookupAccountSid() Expected acc_size = %u, got %u\n", @@ -1561,7 +1561,7 @@ static void test_LookupAccountSid(void) dom_sizeA = 0; acc_sizeA = MAX_PATH; accountA[0] = 0; - ret = LookupAccountSidA(NULL, pUsersSid, accountA, &acc_sizeA, domainA, &dom_sizeA, &use); + LookupAccountSidA(NULL, pUsersSid, accountA, &acc_sizeA, domainA, &dom_sizeA, &use); /* this can fail or succeed depending on OS version but the size will always be returned */ ok(dom_sizeA == real_dom_sizeA + 1, "LookupAccountSidA() Expected dom_size = %u, got %u\n", @@ -1570,7 +1570,7 @@ static void test_LookupAccountSid(void) /* try a 0 sized domain buffer */ dom_sizeA = 0; acc_sizeA = MAX_PATH; - ret = LookupAccountSidA(NULL, pUsersSid, accountA, &acc_sizeA, NULL, &dom_sizeA, &use); + LookupAccountSidA(NULL, pUsersSid, accountA, &acc_sizeA, NULL, &dom_sizeA, &use); /* this can fail or succeed depending on OS version but the size will always be returned */ ok(dom_sizeA == real_dom_sizeA + 1, "LookupAccountSidA() Expected dom_size = %u, got %u\n", @@ -1604,7 +1604,7 @@ static void test_LookupAccountSid(void) acc_sizeW = 0; dom_sizeW = MAX_PATH; accountW[0] = 0; - ret = LookupAccountSidW(NULL, pUsersSid, accountW, &acc_sizeW, domainW, &dom_sizeW, &use); + LookupAccountSidW(NULL, pUsersSid, accountW, &acc_sizeW, domainW, &dom_sizeW, &use); /* this can fail or succeed depending on OS version but the size will always be returned */ ok(acc_sizeW == real_acc_sizeW + 1, "LookupAccountSidW() Expected acc_size = %u, got %u\n", @@ -1613,7 +1613,7 @@ static void test_LookupAccountSid(void) /* try a 0 sized account buffer */ acc_sizeW = 0; dom_sizeW = MAX_PATH; - ret = LookupAccountSidW(NULL, pUsersSid, NULL, &acc_sizeW, domainW, &dom_sizeW, &use); + LookupAccountSidW(NULL, pUsersSid, NULL, &acc_sizeW, domainW, &dom_sizeW, &use); /* this can fail or succeed depending on OS version but the size will always be returned */ ok(acc_sizeW == real_acc_sizeW + 1, "LookupAccountSidW() Expected acc_size = %u, got %u\n", @@ -1632,7 +1632,7 @@ static void test_LookupAccountSid(void) dom_sizeW = 0; acc_sizeW = MAX_PATH; accountW[0] = 0; - ret = LookupAccountSidW(NULL, pUsersSid, accountW, &acc_sizeW, domainW, &dom_sizeW, &use); + LookupAccountSidW(NULL, pUsersSid, accountW, &acc_sizeW, domainW, &dom_sizeW, &use); /* this can fail or succeed depending on OS version but the size will always be returned */ ok(dom_sizeW == real_dom_sizeW + 1, "LookupAccountSidW() Expected dom_size = %u, got %u\n", @@ -1641,7 +1641,7 @@ static void test_LookupAccountSid(void) /* try a 0 sized domain buffer */ dom_sizeW = 0; acc_sizeW = MAX_PATH; - ret = LookupAccountSidW(NULL, pUsersSid, accountW, &acc_sizeW, NULL, &dom_sizeW, &use); + LookupAccountSidW(NULL, pUsersSid, accountW, &acc_sizeW, NULL, &dom_sizeW, &use); /* this can fail or succeed depending on OS version but the size will always be returned */ ok(dom_sizeW == real_dom_sizeW + 1, "LookupAccountSidW() Expected dom_size = %u, got %u\n", @@ -1662,7 +1662,9 @@ static void test_LookupAccountSid(void) /* Test LookupAccountSid with Sid retrieved from token information. This assumes this process is running under the account of the current user.*/ ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &hToken); + ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); ret = GetTokenInformation(hToken, TokenUser, NULL, 0, &cbti); + ok(!ret, "GetTokenInformation failed with error %d\n", GetLastError()); ptiUser = HeapAlloc(GetProcessHeap(), 0, cbti); if (GetTokenInformation(hToken, TokenUser, ptiUser, cbti, &cbti)) { @@ -3089,7 +3091,6 @@ static void test_SetSecurityDescriptorControl (PSECURITY_DESCRIPTOR sec) GetSecurityDescriptorControl(sec, &test, &dwRevision); expect_eq(test, ctrl, int, "%x"); - ctrl = ref; setOrClear ^= bitOfInterest; SetLastError (0xbebecaca); pSetSecurityDescriptorControl (sec, bitOfInterest, setOrClear);

1 0

Austin English : crypt32/tests: Make sure to use return values (LLVM/Clang) .
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: e48b34cdb3aadaaea3760857807cabab8c519c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48b34cdb3aadaaea37608578… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:05:55 2011 -0800 crypt32/tests: Make sure to use return values (LLVM/Clang). --- dlls/crypt32/tests/chain.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index d11dece..eeb322d 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3857,9 +3857,11 @@ static void test_CERT_CHAIN_PARA_cbSize(void) ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain0_0, sizeof(chain0_0), CERT_STORE_ADD_ALWAYS, NULL); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain0_1, sizeof(chain0_1), CERT_STORE_ADD_ALWAYS, &cert); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); for (i = 0; i < sizeof(CERT_CHAIN_PARA) + 2; i++) {

1 0

Austin English : gdiplus/tests: Make sure to use return values (LLVM/Clang) .
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 1a24d1c0f1cb22c076ee412c50f621de150ee910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a24d1c0f1cb22c076ee412c5… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:06:06 2011 -0800 gdiplus/tests: Make sure to use return values (LLVM/Clang). --- dlls/gdiplus/tests/brush.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 655d80c..5eed607 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -311,6 +311,7 @@ static void test_gradientgetrect(void) if (status == Ok) { status = GdipGetMatrixElements(transform, elements); + expect(Ok, status); expectf(1.0, elements[0]); expectf(1.0, elements[1]); expectf(-1.0, elements[2]); @@ -319,6 +320,7 @@ static void test_gradientgetrect(void) expectf(-50.50, elements[5]); } status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, status); /* vertical gradient */ pt1.X = pt1.Y = pt2.X = 0.0; pt2.Y = 10.0; @@ -336,6 +338,7 @@ static void test_gradientgetrect(void) if (status == Ok) { status = GdipGetMatrixElements(transform, elements); + expect(Ok, status); expectf(0.0, elements[0]); expectf(1.0, elements[1]); expectf(-1.0, elements[2]); @@ -344,6 +347,7 @@ static void test_gradientgetrect(void) expectf(5.0, elements[5]); } status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, status); /* horizontal gradient */ pt1.X = pt1.Y = pt2.Y = 0.0; pt2.X = 10.0; @@ -361,6 +365,7 @@ static void test_gradientgetrect(void) if (status == Ok) { status = GdipGetMatrixElements(transform, elements); + expect(Ok, status); expectf(1.0, elements[0]); expectf(0.0, elements[1]); expectf(0.0, elements[2]); @@ -369,6 +374,7 @@ static void test_gradientgetrect(void) expectf(0.0, elements[5]); } status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, status); /* slope = -1 */ pt1.X = pt1.Y = 0.0; pt2.X = 20.0; @@ -387,6 +393,7 @@ static void test_gradientgetrect(void) if (status == Ok) { status = GdipGetMatrixElements(transform, elements); + expect(Ok, status); expectf(1.0, elements[0]); expectf(-1.0, elements[1]); expectf(1.0, elements[2]); @@ -395,6 +402,7 @@ static void test_gradientgetrect(void) expectf(10.0, elements[5]); } status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, status); /* slope = 1/100 */ pt1.X = pt1.Y = 0.0; pt2.X = 100.0; @@ -413,6 +421,7 @@ static void test_gradientgetrect(void) if (status == Ok) { status = GdipGetMatrixElements(transform, elements); + expect(Ok,status); expectf(1.0, elements[0]); expectf(0.01, elements[1]); expectf(-0.02, elements[2]); @@ -421,6 +430,7 @@ static void test_gradientgetrect(void) /* expectf(-1.0, elements[5]); */ } status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok,status); /* zero height rect */ rectf.X = rectf.Y = 10.0; rectf.Width = 100.0; @@ -453,6 +463,7 @@ static void test_gradientgetrect(void) if (status == Ok) { status = GdipGetMatrixElements(transform, elements); + expect(Ok,status); expectf(1.0, elements[0]); expectf(0.0, elements[1]); expectf(0.0, elements[2]); @@ -461,6 +472,7 @@ static void test_gradientgetrect(void) expectf(0.0, elements[5]); } status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok,status); /* passing negative Width/Height to LinearGradientModeHorizontal */ rectf.X = rectf.Y = 10.0; rectf.Width = rectf.Height = -100.0; @@ -479,6 +491,7 @@ static void test_gradientgetrect(void) if (status == Ok) { status = GdipGetMatrixElements(transform, elements); + expect(Ok,status); expectf(1.0, elements[0]); expectf(0.0, elements[1]); expectf(0.0, elements[2]); @@ -487,6 +500,7 @@ static void test_gradientgetrect(void) expectf(0.0, elements[5]); } status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok,status); GdipDeleteMatrix(transform); }

1 0

Austin English : shell32/tests: Don't check return values inside of if(0) ( LLVM/Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: fe067c53ddb956874b14cdfad1c293c32a7f24f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe067c53ddb956874b14cdfad… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:04:30 2011 -0800 shell32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/shell32/tests/ebrowser.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index a8da1cc..db302ad 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -749,8 +749,8 @@ static void test_initialization(void) if(0) { /* Crashes on Windows 7 */ - hr = IExplorerBrowser_Initialize(peb, NULL, NULL, NULL); - hr = IExplorerBrowser_Initialize(peb, hwnd, NULL, NULL); + IExplorerBrowser_Initialize(peb, NULL, NULL, NULL); + IExplorerBrowser_Initialize(peb, hwnd, NULL, NULL); } ZeroMemory(&rc, sizeof(RECT)); @@ -1227,7 +1227,7 @@ static void test_Advise(void) { /* Using unadvise with a previously unadvised cookie results * in a crash. */ - hr = IExplorerBrowser_Unadvise(peb, cookies[5]); + IExplorerBrowser_Unadvise(peb, cookies[5]); } /* Remove the rest. */ @@ -1566,7 +1566,7 @@ static void test_GetCurrentView(void) if(0) { /* Crashes under Windows 7 */ - hr = IExplorerBrowser_GetCurrentView(peb, NULL, NULL); + IExplorerBrowser_GetCurrentView(peb, NULL, NULL); } hr = IExplorerBrowser_GetCurrentView(peb, NULL, (void**)&punk); ok(hr == E_FAIL, "Got 0x%08x\n", hr);

1 0

Austin English : secur32/tests: Make sure a return value is used (LLVM/ Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 22c1843e08dda30a4b4bad31cb2c9bf6f2ee03b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c1843e08dda30a4b4bad31c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:04:23 2011 -0800 secur32/tests: Make sure a return value is used (LLVM/Clang). --- dlls/secur32/tests/ntlm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 027e094..ddc9462 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -968,6 +968,7 @@ static void testSignSeal(void) } sec_status = setupFakeServer(&server, sec_pkg_name); + ok(sec_status == SEC_E_OK, "setupFakeServer returned %s\n", getSecError(sec_status)); while(client_stat == SEC_I_CONTINUE_NEEDED && server_stat == SEC_I_CONTINUE_NEEDED) {

1 0

Austin English : winhttp/tests: Make sure a return value is used (LLVM/ Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 3455c78042f2dc705233d3a6bbe6e541250ba7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3455c78042f2dc705233d3a6b… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:05:28 2011 -0800 winhttp/tests: Make sure a return value is used (LLVM/Clang). --- dlls/winhttp/tests/winhttp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 37d71b8..def1367 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -871,6 +871,7 @@ static void test_secure_connection(void) { size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); + ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); if (!size) break; }

1 0

Austin English : mmdevapi/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 8b305ccbd30472c2beee83f55b534cadf591bef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b305ccbd30472c2beee83f55… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:06:14 2011 -0800 mmdevapi/tests: Make sure return values are used (LLVM/Clang). --- dlls/mmdevapi/tests/propstore.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index d0a0c86..a16dee1 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -55,10 +55,12 @@ static void test_propertystore(IPropertyStore *store) pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_Enabled, &pv); + ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_ClassGuid, &pv); + ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); }

1 0

Austin English : localui/tests: Make sure to use return values (LLVM/Clang) .
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 7a87c8ac453b515ecc135a30a0a12b7eaf2b37f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a87c8ac453b515ecc135a30a… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 15:50:47 2011 -0800 localui/tests: Make sure to use return values (LLVM/Clang). --- dlls/localui/tests/localui.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index cb7a1cf..59ac3b5 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -71,9 +71,10 @@ static PORT_INFO_2W * find_portinfo2(LPWSTR pPort) if (!pi_buffer) { res = EnumPortsW(NULL, 2, NULL, 0, &pi_needed, &pi_numports); + ok(!res, "EnumPorts failed: got %d\n", res); pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed); - SetLastError(0xdeadbeef); res = EnumPortsW(NULL, 2, pi_buffer, pi_needed, &pi_needed, &pi_numports); + ok(res == 1, "EnumPorts failed: got %d\n", res); } if (pi_buffer) { pi = (PORT_INFO_2W *) pi_buffer;

1 0

Austin English : riched20/tests: Make sure return value is used (LLVM/Clang ).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 75e4e607c63ea2ca69ace1abc6bc1d6e9e384634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e4e607c63ea2ca69ace1abc… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:04:12 2011 -0800 riched20/tests: Make sure return value is used (LLVM/Clang). --- dlls/riched20/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 9456cde..a91d984 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6087,7 +6087,7 @@ static void test_EM_CHARFROMPOS(void) hwnd = new_richedit(NULL); result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"one two three four five six seven\reight"); - + ok(result == 1, "Expected 1, got %d", result); GetClientRect(hwnd, &rcClient); result = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point);

1 0

Austin English : rpcrt4/tests: Make sure return values are used (LLVM/Clang ).
by Alexandre Julliard 09 Feb '11

09 Feb '11

Module: wine Branch: master Commit: 5b25b11b05d00ae74b69a4610f6fd43bd77bef8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b25b11b05d00ae74b69a4610… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 8 16:04:19 2011 -0800 rpcrt4/tests: Make sure return values are used (LLVM/Clang). --- dlls/rpcrt4/tests/cstub.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index c1b4b37..7517a6d 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -775,6 +775,7 @@ static void test_CreateStub(IPSFactoryBuffer *ppsf) vtbl = &create_stub_test_fail_vtbl; pstub = create_stub(ppsf, &IID_if1, obj, E_NOINTERFACE); + ok(pstub == S_OK, "create_stub failed: %u\n", GetLastError()); } @@ -892,6 +893,7 @@ static void test_Connect(IPSFactoryBuffer *ppsf) obj = (IUnknown*)&new_vtbl; r = IRpcStubBuffer_Connect(pstub, obj); + ok(r == S_OK, "r %08x\n", r); ok(connect_test_base_Connect_called == 1, "connect_test_bsae_Connect called %d times\n", connect_test_base_Connect_called); ok(connect_test_orig_release_called == 3, "release called %d\n", connect_test_orig_release_called);

1 0