February 2011 - Wine-commits

Huw Davies : oleaut32: Rewrite ITypeInfo_GetDocumentation proxy/ stub to return only the information that is requested.
by Alexandre Julliard 10 Feb '11

10 Feb '11

Module: wine Branch: master Commit: ef05072e27e3cd3e2eb1a8bee92eb0ea73233126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef05072e27e3cd3e2eb1a8bee… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 9 13:10:32 2011 +0000 oleaut32: Rewrite ITypeInfo_GetDocumentation proxy/stub to return only the information that is requested. --- dlls/oleaut32/usrmarshal.c | 66 ++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 002c2b7..f83b908 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1651,49 +1651,49 @@ HRESULT __RPC_STUB ITypeInfo_Invoke_Stub( return E_FAIL; } -HRESULT CALLBACK ITypeInfo_GetDocumentation_Proxy( - ITypeInfo* This, - MEMBERID memid, - BSTR* pBstrName, - BSTR* pBstrDocString, - DWORD* pdwHelpContext, - BSTR* pBstrHelpFile) +HRESULT CALLBACK ITypeInfo_GetDocumentation_Proxy(ITypeInfo *This, MEMBERID memid, + BSTR *name, BSTR *doc_string, + DWORD *help_context, BSTR *help_file) { - DWORD help_context; - BSTR name, doc_string, help_file; + DWORD dummy_help_context, flags = 0; + BSTR dummy_name, dummy_doc_string, dummy_help_file; HRESULT hr; - TRACE("(%p, %08x, %p, %p, %p, %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + TRACE("(%p, %08x, %p, %p, %p, %p)\n", This, memid, name, doc_string, help_context, help_file); - /* FIXME: presumably refPtrFlags is supposed to be a bitmask of which ptrs we actually want? */ - hr = ITypeInfo_RemoteGetDocumentation_Proxy(This, memid, 0, &name, &doc_string, &help_context, &help_file); - if(SUCCEEDED(hr)) - { - if(pBstrName) *pBstrName = name; - else SysFreeString(name); + if(!name) name = &dummy_name; + else flags = 1; - if(pBstrDocString) *pBstrDocString = doc_string; - else SysFreeString(doc_string); + if(!doc_string) doc_string = &dummy_doc_string; + else flags |= 2; - if(pBstrHelpFile) *pBstrHelpFile = help_file; - else SysFreeString(help_file); + if(!help_context) help_context = &dummy_help_context; + else flags |= 4; + + if(!help_file) help_file = &dummy_help_file; + else flags |= 8; + + hr = ITypeInfo_RemoteGetDocumentation_Proxy(This, memid, flags, name, doc_string, help_context, help_file); + + /* We don't need to free the dummy BSTRs since the stub ensures that these will be NULLs. */ - if(pdwHelpContext) *pdwHelpContext = help_context; - } return hr; } -HRESULT __RPC_STUB ITypeInfo_GetDocumentation_Stub( - ITypeInfo* This, - MEMBERID memid, - DWORD refPtrFlags, - BSTR* pBstrName, - BSTR* pBstrDocString, - DWORD* pdwHelpContext, - BSTR* pBstrHelpFile) +HRESULT __RPC_STUB ITypeInfo_GetDocumentation_Stub(ITypeInfo *This, MEMBERID memid, + DWORD flags, BSTR *name, BSTR *doc_string, + DWORD *help_context, BSTR *help_file) { - TRACE("(%p, %08x, %08x, %p, %p, %p, %p)\n", This, memid, refPtrFlags, pBstrName, pBstrDocString, - pdwHelpContext, pBstrHelpFile); - return ITypeInfo_GetDocumentation(This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + TRACE("(%p, %08x, %08x, %p, %p, %p, %p)\n", This, memid, flags, name, doc_string, help_context, help_file); + + *name = *doc_string = *help_file = NULL; + *help_context = 0; + + if(!(flags & 1)) name = NULL; + if(!(flags & 2)) doc_string = NULL; + if(!(flags & 4)) help_context = NULL; + if(!(flags & 8)) help_file = NULL; + + return ITypeInfo_GetDocumentation(This, memid, name, doc_string, help_context, help_file); } HRESULT CALLBACK ITypeInfo_GetDllEntry_Proxy(

1 0

Hans Leidekker : msi: Get rid of msi_component_set_state and msi_feature_set_state.
by Alexandre Julliard 10 Feb '11

10 Feb '11

Module: wine Branch: master Commit: ba9f1f770a57a4e0cd9947ce7102c270b2318052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9f1f770a57a4e0cd9947ce7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 10 15:56:15 2011 +0100 msi: Get rid of msi_component_set_state and msi_feature_set_state. --- dlls/msi/action.c | 229 ++++++++++++++++++---------------------------- dlls/msi/dialog.c | 2 +- dlls/msi/files.c | 38 ++++---- dlls/msi/helpers.c | 30 +++++-- dlls/msi/install.c | 2 +- dlls/msi/msipriv.h | 2 - dlls/msi/tests/package.c | 4 +- 7 files changed, 133 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba9f1f770a57a4e0cd994…

1 0

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

10 Feb '11

Module: wine Branch: master Commit: e77d27a2eb0c413d516d0f505d60f95ac97cc557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e77d27a2eb0c413d516d0f505… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:51 2011 -0800 gdiplus/tests: Make sure to use return values (LLVM/Clang). --- dlls/gdiplus/tests/graphics.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 940dbef..e07b889 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -593,6 +593,7 @@ static void test_BeginContainer2(void) GdipSetClipRect(graphics, 2, 4, 6, 8, CombineModeReplace); status = GdipEndContainer(graphics, cont2); + expect(Ok, status); GdipGetClipBounds(graphics, &clip); ok(fabs(defClip[0] - clip.X) < 0.0001 && @@ -604,6 +605,7 @@ static void test_BeginContainer2(void) clip.X, clip.Y, clip.Width, clip.Height); status = GdipEndContainer(graphics, cont1); + expect(Ok, status); /* nesting */ status = GdipBeginContainer2(graphics, &cont1); @@ -1757,6 +1759,7 @@ static void test_get_set_clip(void) rect.Height = rect.Width = 100.0; status = GdipCreateRegionRect(&rect, &clip); + expect(Ok, status); /* NULL arguments */ status = GdipGetClip(NULL, NULL); @@ -1878,6 +1881,7 @@ static void test_textcontrast(void) status = GdipGetTextContrast(graphics, NULL); expect(InvalidParameter, status); status = GdipGetTextContrast(graphics, &contrast); + expect(Ok, status); expect(4, contrast); GdipDeleteGraphics(graphics);

1 0

Austin English : gdiplus/tests: Remove redundant assignments (LLVM/Clang).
by Alexandre Julliard 10 Feb '11

10 Feb '11

Module: wine Branch: master Commit: 2ebcaf1a5108d713553db2d7ac37315192e3bf84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ebcaf1a5108d713553db2d7a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:54 2011 -0800 gdiplus/tests: Remove redundant assignments (LLVM/Clang). --- dlls/gdiplus/tests/graphics.c | 176 ++++++++++++++++++++-------------------- 1 files changed, 88 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ebcaf1a5108d713553db…

1 0

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

10 Feb '11

Module: wine Branch: master Commit: c549e34255819330862cb8d716b97418e7ddcafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c549e34255819330862cb8d71… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:54 2011 -0800 ntdll/tests: Make sure return value is used (LLVM/Clang). --- dlls/ntdll/tests/reg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 1cad29e..8f44a1d 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -637,6 +637,7 @@ static void test_NtDeleteKey(void) InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); status = pNtOpenKey(&hkey, am, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); status = pNtDeleteKey(hkey); ok(status == STATUS_SUCCESS, "NtDeleteKey Failed: 0x%08x\n", status);

1 0

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

10 Feb '11

Module: wine Branch: master Commit: 0161db5e87a233454342710e38978351797a22a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0161db5e87a233454342710e3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:51 2011 -0800 mshtml/tests: Make sure return value is used (LLVM/Clang). --- dlls/mshtml/tests/events.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 07476bc..b883f8b 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -984,6 +984,7 @@ static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, L ok(hres == S_OK, "get_document failed: %08x\n", hres); hres = IHTMLDocument2_get_readyState(iframe_doc, &str2); + ok(hres == S_OK, "get_document failed: %08x\n", hres); ok(!lstrcmpW(str, str2), "unexpected document readyState %s\n", wine_dbgstr_w(str2)); SysFreeString(str2);

1 0

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

10 Feb '11

Module: wine Branch: master Commit: 7868edd86e1f3bfc19c48d17003b1cfd97bb92c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7868edd86e1f3bfc19c48d170… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:47 2011 -0800 secur32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/secur32/tests/secur32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 0ad6f0f..6a46e9b 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -118,7 +118,7 @@ static void testGetUserNameExA(void) } if (0) /* Crashes on Windows */ - rc = pGetUserNameExA(NameSamCompatible, NULL, NULL); + pGetUserNameExA(NameSamCompatible, NULL, NULL); size = 0; rc = pGetUserNameExA(NameSamCompatible, NULL, &size); @@ -128,7 +128,7 @@ static void testGetUserNameExA(void) if (0) /* Crashes on Windows with big enough size */ { /* Returned size is already big enough */ - rc = pGetUserNameExA(NameSamCompatible, NULL, &size); + pGetUserNameExA(NameSamCompatible, NULL, &size); } size = 0; @@ -165,7 +165,7 @@ static void testGetUserNameExW(void) } if (0) /* Crashes on Windows */ - rc = pGetUserNameExW(NameSamCompatible, NULL, NULL); + pGetUserNameExW(NameSamCompatible, NULL, NULL); size = 0; rc = pGetUserNameExW(NameSamCompatible, NULL, &size); @@ -175,7 +175,7 @@ static void testGetUserNameExW(void) if (0) /* Crashes on Windows with big enough size */ { /* Returned size is already big enough */ - rc = pGetUserNameExW(NameSamCompatible, NULL, &size); + pGetUserNameExW(NameSamCompatible, NULL, &size); } size = 0;

1 0

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

10 Feb '11

Module: wine Branch: master Commit: a85adf3152082eb2403a75f38bdc24d1f0af1d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85adf3152082eb2403a75f38… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:30 2011 -0800 msi/tests: Make sure to use return values (LLVM/Clang). --- dlls/msi/tests/package.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index cc7be1e..80a573c 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -753,6 +753,7 @@ static MSIHANDLE create_package_db(void) ok( res == ERROR_SUCCESS , "Failed to commit database\n" ); res = set_summary_info(hdb); + ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", res); res = run_query( hdb, "CREATE TABLE `Directory` ( " @@ -2446,9 +2447,12 @@ static void test_formatrecord2(void) buffer[0] = 0; sz = sizeof buffer; r = MsiFormatRecord( hpkg, hrec, buffer, &sz ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); r = MsiRecordSetString(hrec, 0, "[foo][1]"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); r = MsiRecordSetString(hrec, 1, "hoo"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); sz = sizeof buffer; r = MsiFormatRecord(hpkg, hrec, buffer, &sz); ok( sz == 3, "size wrong\n"); @@ -2456,6 +2460,7 @@ static void test_formatrecord2(void) ok( r == ERROR_SUCCESS, "format failed\n"); r = MsiRecordSetString(hrec, 0, "x[~]x"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); sz = sizeof buffer; r = MsiFormatRecord(hpkg, hrec, buffer, &sz); ok( sz == 3, "size wrong\n"); @@ -2463,7 +2468,9 @@ static void test_formatrecord2(void) ok( r == ERROR_SUCCESS, "format failed\n"); r = MsiRecordSetString(hrec, 0, "[foo.$%}][1]"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); r = MsiRecordSetString(hrec, 1, "hoo"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); sz = sizeof buffer; r = MsiFormatRecord(hpkg, hrec, buffer, &sz); ok( sz == 3, "size wrong\n"); @@ -2471,6 +2478,7 @@ static void test_formatrecord2(void) ok( r == ERROR_SUCCESS, "format failed\n"); r = MsiRecordSetString(hrec, 0, "[\\[]"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); sz = sizeof buffer; r = MsiFormatRecord(hpkg, hrec, buffer, &sz); ok( sz == 1, "size wrong\n"); @@ -2479,6 +2487,7 @@ static void test_formatrecord2(void) SetEnvironmentVariable("FOO", "BAR"); r = MsiRecordSetString(hrec, 0, "[%FOO]"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); sz = sizeof buffer; r = MsiFormatRecord(hpkg, hrec, buffer, &sz); ok( sz == 3, "size wrong\n"); @@ -2486,7 +2495,9 @@ static void test_formatrecord2(void) ok( r == ERROR_SUCCESS, "format failed\n"); r = MsiRecordSetString(hrec, 0, "[[1]]"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); r = MsiRecordSetString(hrec, 1, "%FOO"); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); sz = sizeof buffer; r = MsiFormatRecord(hpkg, hrec, buffer, &sz); ok( sz == 3, "size wrong\n"); @@ -8416,11 +8427,13 @@ static void test_appsearch_reglocator(void) sprintf(path, "\"%s\\FileName1\" -option", CURR_DIR); res = RegSetValueExA(hklm, "value16", 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1); + ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", res); space = (strchr(CURR_DIR, ' ')) ? TRUE : FALSE; sprintf(path, "%s\\FileName1 -option", CURR_DIR); res = RegSetValueExA(hklm, "value17", 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1); + ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", res); hdb = create_package_db(); ok(hdb, "Expected a valid database handle\n"); @@ -9637,6 +9650,7 @@ static void test_featureparents(void) /* msidbFeatureAttributesFavorLocal:msidbComponentAttributesOptional */ r = add_component_entry( hdb, "'lepus', '', 'TARGETDIR', 2, '', 'lepus_file'" ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); r = add_feature_components_entry( hdb, "'zodiac', 'leo'" ); ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); @@ -10095,11 +10109,13 @@ static void test_installprops(void) res = GetSystemMetrics(SM_CXSCREEN); size = MAX_PATH; r = MsiGetProperty(hpkg, "ScreenX", buf, &size); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); res = GetSystemMetrics(SM_CYSCREEN); size = MAX_PATH; r = MsiGetProperty(hpkg, "ScreenY", buf, &size); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); if (pGetSystemInfo && pSHGetFolderPathA)

1 0

Austin English : msvcrt/tests: Remove useless assignment (LLVM/Clang).
by Alexandre Julliard 10 Feb '11

10 Feb '11

Module: wine Branch: master Commit: a3c1d4550c24d25065b7797806a91db2191fd6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c1d4550c24d25065b779780… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:34 2011 -0800 msvcrt/tests: Remove useless assignment (LLVM/Clang). --- dlls/msvcrt/tests/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b003f5a..c532fce 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1176,7 +1176,7 @@ static void test__strtod(void) ok(almost_equal(d, 0.1e-4736L), "d = %lf\n", d); errno = 0xdeadbeef; - d = strtod(overflow, &end); + strtod(overflow, &end); ok(errno == ERANGE, "errno = %x\n", errno); ok(end == overflow+21, "incorrect end (%d)\n", (int)(end-overflow));

1 0

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

10 Feb '11

Module: wine Branch: master Commit: f900a8b0353253d22f8ecd1b349feecb3153a74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f900a8b0353253d22f8ecd1b3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:44:04 2011 -0800 crypt32/tests: Make sure to use return values (LLVM/Clang). --- dlls/crypt32/tests/cert.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 9ee53fe..b1a993d 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -487,6 +487,8 @@ static void testCertProperties(void) size = sizeof(hashProperty); ret = CertGetCertificateContextProperty(context, CERT_HASH_PROP_ID, hashProperty, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", + GetLastError()); ok(!memcmp(hashProperty, hash, sizeof(hash)), "Unexpected hash\n"); /* Delete the (bogus) hash, and get the real one */ ret = CertSetCertificateContextProperty(context, CERT_HASH_PROP_ID, 0, @@ -1520,6 +1522,7 @@ static void testGetIssuerCert(void) /* Adding an issuer allows one (and only one) issuer to be found */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_1, sizeof(chain10_1), CERT_STORE_ADD_ALWAYS, &cert1); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == cert1, "Expected cert1 to be the issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); @@ -1530,6 +1533,7 @@ static void testGetIssuerCert(void) */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_0, sizeof(chain10_0), CERT_STORE_ADD_ALWAYS, &cert2); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == cert2, "Expected cert2 to be the first issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); @@ -1549,11 +1553,13 @@ static void testGetIssuerCert(void) /* With only the child certificate, no issuer will be found */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain7_1, sizeof(chain7_1), CERT_STORE_ADD_ALWAYS, &child); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == NULL, "Expected no issuer\n"); /* Adding an issuer allows one (and only one) issuer to be found */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_0, sizeof(chain10_0), CERT_STORE_ADD_ALWAYS, &cert1); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == cert1, "Expected cert1 to be the issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); @@ -1564,6 +1570,7 @@ static void testGetIssuerCert(void) */ ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, chain10_1, sizeof(chain10_1), CERT_STORE_ADD_ALWAYS, &cert2); + ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); parent = CertGetIssuerCertificateFromStore(store, child, NULL, &flags); ok(parent == cert2, "Expected cert2 to be the first issuer\n"); parent = CertGetIssuerCertificateFromStore(store, child, parent, &flags); @@ -2015,6 +2022,8 @@ static void testCreateSelfSignCert(void) CryptReleaseContext(csp, 0); ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); + /* do the same test with AT_KEYEXCHANGE and key info*/ memset(&info,0,sizeof(info)); @@ -2083,7 +2092,7 @@ static void testIntendedKeyUsage(void) if (0) { /* Crash */ - ret = CertGetIntendedKeyUsage(0, NULL, NULL, 0); + CertGetIntendedKeyUsage(0, NULL, NULL, 0); } ret = CertGetIntendedKeyUsage(0, &info, NULL, 0); ok(!ret, "expected failure\n"); @@ -2093,6 +2102,7 @@ static void testIntendedKeyUsage(void) ok(!ret, "expected failure\n"); ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, usage_bytes, sizeof(usage_bytes)); + ok(!ret, "expected failure\n"); info.cExtension = 1; info.rgExtension = &ext; ret = CertGetIntendedKeyUsage(X509_ASN_ENCODING, &info, NULL, 0); @@ -2251,6 +2261,8 @@ static void testKeyUsage(void) SetLastError(0xbaadcafe); size = sizeof(buf); ret = CertGetEnhancedKeyUsage(context, 0, pUsage, &size); + ok(ret || broken(!ret && GetLastError() == CRYPT_E_NOT_FOUND /* NT4 */), + "CertGetEnhancedKeyUsage failed: %08x\n", GetLastError()); ok(GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); @@ -2656,9 +2668,8 @@ static void testIsRDNAttrsInCertificateName(void) if (0) { /* Crash */ - ret = CertIsRDNAttrsInCertificateName(0, 0, NULL, NULL); - ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, - NULL); + CertIsRDNAttrsInCertificateName(0, 0, NULL, NULL); + CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, NULL); } SetLastError(0xdeadbeef); ret = CertIsRDNAttrsInCertificateName(0, 0, &name, NULL); @@ -2932,7 +2943,7 @@ static void testHashToBeSigned(void) /* Crash */ if (0) { - ret = CryptHashToBeSigned(0, 0, NULL, 0, NULL, NULL); + CryptHashToBeSigned(0, 0, NULL, 0, NULL, NULL); } SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, 0, NULL, 0, NULL, &size); @@ -2973,6 +2984,9 @@ static void testHashToBeSigned(void) ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, md5SignedEmptyCert, sizeof(md5SignedEmptyCert), hash, &size); + ok(ret || broken(!ret && GetLastError() == NTE_BAD_ALGID) /* NT4 */, + "CryptHashToBeSigned failed: %08x\n", GetLastError()); + ok(!memcmp(hash, md5SignedEmptyCertHash, size), "unexpected value\n"); } @@ -2981,9 +2995,9 @@ static void testCompareCert(void) CERT_INFO info1 = { 0 }, info2 = { 0 }; BOOL ret; - /* Crashes - ret = CertCompareCertificate(X509_ASN_ENCODING, NULL, NULL); - */ + /* Crashes */ + if (0) + CertCompareCertificate(X509_ASN_ENCODING, NULL, NULL); /* Certs with the same issuer and serial number are equal, even if they * differ in other respects (like subject).

1 0