February 2011 - Wine-commits

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

07 Feb '11

Module: wine Branch: master Commit: 13b0e284b3b966e6f7804ee9a8afd1b3ad0073cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b0e284b3b966e6f7804ee9a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 22:26:10 2011 -0800 rsaenh/tests: Make sure to use return values (LLVM/Clang). --- dlls/rsaenh/tests/rsaenh.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index fab959c..cef7d65 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1248,6 +1248,7 @@ static void test_rc2(void) dwKeyLen = 1025; SetLastError(0xdeadbeef); result = CryptSetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (LPBYTE)&dwKeyLen, 0); + ok(!result, "CryptSetKeyParam failed: %08x\n", GetLastError()); dwLen = sizeof(dwKeyLen); CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); @@ -2483,6 +2484,7 @@ static void test_rsa_round_trip(void) exportedKey = HeapAlloc(GetProcessHeap(), 0, keyLen); result = CryptExportKey(keyExchangeKey, 0, PRIVATEKEYBLOB, 0, exportedKey, &keyLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); /* destroy the key... */ CryptDestroyKey(keyExchangeKey); CryptDestroyKey(signKey); @@ -2922,22 +2924,23 @@ static void test_key_initialization(void) { result = CryptAcquireContext(&prov1, szContainer, szProvider, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); } dwLen = (DWORD)sizeof(abPlainPrivateKey); result = CryptImportKey(prov1, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); dwLen = (DWORD)sizeof(abSessionKey); result = CryptImportKey(prov1, abSessionKey, dwLen, hKeyExchangeKey, 0, &hSessionKey); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); /* Once the key has been imported, subsequently acquiring a context with * the same name will allow retrieving the key. */ result = CryptAcquireContext(&prov2, szContainer, szProvider, PROV_RSA_FULL, 0); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); result = CryptGetUserKey(prov2, AT_KEYEXCHANGE, &hKey); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptGetUserKey failed: %08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); CryptReleaseContext(prov2, 0);

1 0

Austin English : shdocvw/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 84b900dabd3457788130fe805fa3859663aeef9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=84b900dabd3457788130fe805… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 22:39:18 2011 -0800 shdocvw/tests: Make sure to use return value (LLVM/Clang). --- dlls/shdocvw/tests/intshcut.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index 0b90cf7..e8afb74 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -257,6 +257,7 @@ static void test_ReadAndWriteProperties(void) hr = urlAFromFile->lpVtbl->GetURL(urlAFromFile, &url); + ok(hr == S_OK, "Unable to get url from file, hr=0x%x\n", hr); ok(lstrcmp(url, testurl) == 0, "Wrong url read from file: %s\n",url);

1 0

Austin English : usp10/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: fe628d493259f509de64f562ca52892b6025e0e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe628d493259f509de64f562c… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 22:48:59 2011 -0800 usp10/tests: Make sure to use return value (LLVM/Clang). --- dlls/usp10/tests/usp10.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 06e9289..8a06bd9 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -467,6 +467,7 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 /* This test determines that the pointer returned by ScriptGetProperties is valid * by checking a known value in the table */ hr = ScriptGetProperties(&ppSp, &iMaxProps); + ok(hr == S_OK, "ScriptGetProperties failed: 0x%08x\n", hr); trace("number of script properties %d\n", iMaxProps); ok (iMaxProps > 0, "Number of scripts returned should not be 0\n"); if (iMaxProps > 0) @@ -489,7 +490,6 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue * ie. ScriptItemize has succeeded and that pItem has been set */ cInChars = 5; - cMaxItems = 255; if (hr == 0) { psc = NULL; /* must be null on first call */ cChars = cInChars; @@ -556,7 +556,7 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", hr); } } - hr = ScriptFreeCache( &psc); + ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); } @@ -696,7 +696,7 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) ok (cnt == cInChars, "Translation not correct. WCHAR %d - %04x != %04x\n", cnt, pwOutGlyphs[cnt], pwOutGlyphs3[cnt]); - hr = ScriptFreeCache( &psc); + ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); cInChars = cChars = 4; @@ -727,7 +727,7 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) ok(pwOutGlyphs3[7] == pwOutGlyphs2[7], "glyph not mirrored correctly\n"); ok(pwOutGlyphs3[8] == pwOutGlyphs2[8], "glyph not mirrored correctly\n"); - hr = ScriptFreeCache( &psc); + ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); } @@ -842,7 +842,6 @@ static void test_ScriptTextOut(HDC hdc) if (hr == 0) { psc = NULL; /* must be null on first call */ cChars = cInChars; - cMaxGlyphs = cInChars; cMaxGlyphs = 256; hr = ScriptShape(hdc, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, @@ -958,11 +957,9 @@ static void test_ScriptTextOut2(HDC hdc) /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue * ie. ScriptItemize has succeeded and that pItem has been set */ cInChars = 5; - cMaxItems = 255; if (hr == 0) { psc = NULL; /* must be null on first call */ cChars = cInChars; - cMaxGlyphs = cInChars; cMaxGlyphs = 256; hr = ScriptShape(hdc2, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, @@ -1036,11 +1033,9 @@ static void test_ScriptTextOut3(HDC hdc) /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue * ie. ScriptItemize has succeeded and that pItem has been set */ cInChars = 2; - cMaxItems = 255; if (hr == 0) { psc = NULL; /* must be null on first call */ cChars = cInChars; - cMaxGlyphs = cInChars; cMaxGlyphs = 256; hr = ScriptShape(hdc, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, @@ -1427,6 +1422,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) /* having a leading rtl character seems to confuse usp */ /* this looks to be a windows bug we should emulate */ hr = ScriptStringCPtoX(ssa, 0, TRUE, &X); + ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); X--; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); @@ -1437,6 +1433,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) else { hr = ScriptStringCPtoX(ssa, 0, FALSE, &X); + ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); X--; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); @@ -1447,9 +1444,15 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) /* Check beyond the end boundary of the whole string */ if (rtl[String_len-1]) + { hr = ScriptStringCPtoX(ssa, String_len-1, FALSE, &X); + ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + } else + { hr = ScriptStringCPtoX(ssa, String_len-1, TRUE, &X); + ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + } X++; hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr);

1 0

Austin English : wininet/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 5da40467c89123897663c67c5875cab3bec1eaa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da40467c89123897663c67c5… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 22:52:25 2011 -0800 wininet/tests: Make sure to use return value (LLVM/Clang). --- dlls/wininet/tests/internet.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e179dca..48379f7 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -304,6 +304,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -315,6 +316,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com/foobar", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -326,6 +328,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com/foobar/", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -337,6 +340,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com/foo/bar", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -348,6 +352,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com/barfoo", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -359,6 +364,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com/barfoo/", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -370,6 +376,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com/bar/foo", NULL, buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n");

1 0

Austin English : comcat/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

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 : dinput/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: d6d749f4d755a3dae162a34dd951d6f1f8c1903a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d749f4d755a3dae162a34dd… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 16:01:15 2011 -0800 dinput/tests: Make sure to use return value (LLVM/Clang). --- dlls/dinput/tests/joystick.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index a60d6e2..194069d 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -489,6 +489,7 @@ static BOOL CALLBACK EnumJoysticks( hr = IDirectInputDevice_Acquire(pJoystick); ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); hr = IDirectInputDevice2_GetProperty(pJoystick, DIPROP_AUTOCENTER, &diprop_word.diph); + ok(hr==DI_OK,"IDirectInputDevice2_GetProperty() failed: %08x\n", hr); /* Device gain (DIPROP_FFGAIN). * From MSDN:

1 0

Austin English : credui/tests: Make sure to use return value (LLVM/Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: c56ce79160687d85b61d8c0304271e6a174436c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56ce79160687d85b61d8c030… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 16:05:09 2011 -0800 credui/tests: Make sure to use return value (LLVM/Clang). --- dlls/credui/tests/credui.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/credui/tests/credui.c b/dlls/credui/tests/credui.c index 969b096..18fc5bc 100644 --- a/dlls/credui/tests/credui.c +++ b/dlls/credui/tests/credui.c @@ -83,7 +83,10 @@ static void test_CredUIPromptForCredentials(void) &save, CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); if (ret == ERROR_SUCCESS) + { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + } credui_info.pszCaptionText = wszCaption1; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, @@ -93,7 +96,10 @@ static void test_CredUIPromptForCredentials(void) &save, CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); if (ret == ERROR_SUCCESS) + { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + } credui_info.pszCaptionText = wszCaption2; ret = CredUIPromptForCredentialsW(&credui_info, wszServerName, NULL, 0, @@ -102,7 +108,11 @@ static void test_CredUIPromptForCredentials(void) NULL, CREDUI_FLAGS_INCORRECT_PASSWORD|CREDUI_FLAGS_EXPECT_CONFIRMATION); ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); if (ret == ERROR_SUCCESS) + { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + } + save = TRUE; credui_info.pszCaptionText = wszCaption3; @@ -122,7 +132,11 @@ static void test_CredUIPromptForCredentials(void) ok(ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "CredUIPromptForCredentials failed with error %d\n", ret); ok(!save, "save flag should have been untouched\n"); if (ret == ERROR_SUCCESS) + { ret = CredUIConfirmCredentialsW(wszServerName, FALSE); + ok(ret == ERROR_SUCCESS, "CredUIConfirmCredentials failed with error %d\n", ret); + } + } }

1 0

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

07 Feb '11

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 : cryptnet/tests: Make sure to use return value (LLVM/Clang) .
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 66ebabaee1c892d0dae236d2a4cde18a3edca7b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ebabaee1c892d0dae236d2a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 16:07:10 2011 -0800 cryptnet/tests: Make sure to use return value (LLVM/Clang). --- dlls/cryptnet/tests/cryptnet.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 64491e7..113406c 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -357,6 +357,7 @@ static void test_retrieveObjectByUrl(void) cert = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, NULL); + ok(ret, "CryptRetrieveObjectByUrlA failed: %d\n", GetLastError()); ok(cert && cert != (PCCERT_CONTEXT)0xdeadbeef, "Expected a cert\n"); if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef) CertFreeCertificateContext(cert); @@ -560,7 +561,7 @@ static void test_verifyRevocation(void) if (0) { /* Crash */ - ret = pCertVerifyRevocation(0, 0, 0, NULL, 0, NULL, NULL); + pCertVerifyRevocation(0, 0, 0, NULL, 0, NULL, NULL); } SetLastError(0xdeadbeef); ret = pCertVerifyRevocation(0, 0, 0, NULL, 0, NULL, &status);

1 0

Austin English : comctl32/tests: Make sure to use return value (LLVM/Clang) .
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 3391c28d410eddd5ed2f9cdb85f19b8d7196e5a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3391c28d410eddd5ed2f9cdb8… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 16:08:42 2011 -0800 comctl32/tests: Make sure to use return value (LLVM/Clang). --- dlls/comctl32/tests/imagelist.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index bbb7d85..28b21a4 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -751,7 +751,6 @@ static INT DIB_GetWidthBytes( int width, int bpp ) case 32: words = width; break; default: - words=0; trace("Unknown depth %d, please report.\n", bpp ); assert(0); break; @@ -1616,7 +1615,7 @@ static void test_IImageList_Draw(void) if (0) { /* crashes on native */ - hr = IImageList_Draw(imgl, NULL); + IImageList_Draw(imgl, NULL); } memset(&imldp, 0, sizeof (imldp)); @@ -1691,8 +1690,8 @@ static void test_IImageList_Merge(void) if (0) { /* null cases that crash on native */ - hr = IImageList_Merge(imgl1, -1, NULL, 0, 0, 0, &IID_IImageList, (void**)&merge); - hr = IImageList_Merge(imgl1, -1, (IUnknown*) imgl2, 0, 0, 0, &IID_IImageList, NULL); + IImageList_Merge(imgl1, -1, NULL, 0, 0, 0, &IID_IImageList, (void**)&merge); + IImageList_Merge(imgl1, -1, (IUnknown*) imgl2, 0, 0, 0, &IID_IImageList, NULL); } /* If himl1 has no images, merge still succeeds */ @@ -1805,7 +1804,7 @@ static void test_IImageList_Clone(void) if (0) { /* crashes on native */ - hr = IImageList_Clone(imgl, &IID_IImageList, NULL); + IImageList_Clone(imgl, &IID_IImageList, NULL); } hr = IImageList_Clone(imgl, &IID_IImageList, (void**)&imgl2); @@ -1829,7 +1828,7 @@ static void test_IImageList_GetBkColor(void) if (0) { /* crashes on native */ - hr = IImageList_GetBkColor(imgl, NULL); + IImageList_GetBkColor(imgl, NULL); } hr = IImageList_GetBkColor(imgl, &color); @@ -1851,7 +1850,7 @@ static void test_IImageList_SetBkColor(void) if (0) { /* crashes on native */ - hr = IImageList_SetBkColor(imgl, RGB(0, 0, 0), NULL); + IImageList_SetBkColor(imgl, RGB(0, 0, 0), NULL); } hr = IImageList_SetBkColor(imgl, CLR_NONE, &color); @@ -1881,7 +1880,7 @@ static void test_IImageList_GetImageCount(void) if (0) { /* crashes on native */ - hr = IImageList_GetImageCount(imgl, NULL); + IImageList_GetImageCount(imgl, NULL); } count = -1;

1 0