From 2d2e718b2b38bb982265b9e892a7f61adddc1ae6 Mon Sep 17 00:00:00 2001 From: Juan Lang Date: Wed, 11 Feb 2009 20:34:27 -0800 Subject: [PATCH] crypt32: Fix a couple test failures on some Windows 98 systems. --- dlls/crypt32/tests/oid.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index fb4607d783b..9c9a0bd7b8c 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -221,7 +221,8 @@ static void test_oidFunctionSet(void) ret = CryptGetOIDFunctionAddress(set1, X509_ASN_ENCODING, X509_CERT, 0, &funcAddr, &hFuncAddr); - ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + ok((!ret && GetLastError() == ERROR_FILE_NOT_FOUND) || + broken(ret) /* some Win98 */, "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); } } @@ -273,8 +274,10 @@ static void test_installOIDFunctionAddress(void) */ ret = CryptGetOIDFunctionAddress(set, X509_ASN_ENCODING, 0, 0, (void **)&funcAddr, &hFuncAddr); - ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(!ret && (GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == E_INVALIDARG /* some Win98 */), + "Expected ERROR_FILE_NOT_FOUND or E_INVALIDARG, got %d\n", + GetLastError()); ret = CryptGetOIDFunctionAddress(set, X509_ASN_ENCODING, X509_CERT, 0, (void **)&funcAddr, &hFuncAddr); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, -- 2.11.4.GIT