crypt32/tests: remove win9x hacks
Austin English
austinenglish at gmail.com
Fri Feb 25 16:29:59 CST 2011
--
-Austin
-------------- next part --------------
diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c
index 67ebe11..e4b7deb 100644
--- a/dlls/crypt32/tests/store.c
+++ b/dlls/crypt32/tests/store.c
@@ -959,8 +959,7 @@ static void testRegStore(void)
if (context)
certCount++;
} while (context != NULL);
- ok(certCount == 1 ||
- broken(certCount == 2), /* win9x */
+ ok(certCount == 1,
"Expected 1 certificates, got %d\n", certCount);
/* Try again with the correct hash... */
@@ -1161,10 +1160,7 @@ static void testSystemStore(void)
/* Check opening a bogus store */
store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0,
CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, BogusW);
- ok((!store ||
- broken(store != 0)) && /* win9x */
- GetLastError() == ERROR_FILE_NOT_FOUND,
- "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError());
+ ok(!store, "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError());
store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0,
CERT_SYSTEM_STORE_CURRENT_USER, BogusW);
ok(store != 0, "CertOpenStore failed: %08x\n", GetLastError());
@@ -1762,9 +1758,7 @@ static void testMessageStore(void)
blob.pbData = (LPBYTE)hashBareContent;
SetLastError(0xdeadbeef);
store = CertOpenStore(CERT_STORE_PROV_PKCS7, 0, 0, 0, &blob);
- ok(!store &&
- (GetLastError() == CRYPT_E_ASN1_BADTAG ||
- GetLastError() == OSS_DATA_ERROR), /* win9x */
+ ok(!store && (GetLastError() == CRYPT_E_ASN1_BADTAG),
"Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError());
}
More information about the wine-patches
mailing list