crypt32/tests/ctl: remove win9x hacks

Austin English austinenglish at gmail.com
Tue Jul 26 18:22:12 CDT 2011


https://testbot.winehq.org/JobDetails.pl?Key=12877

-- 
-Austin
-------------- next part --------------
diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c
index 978ccda..ffa3133 100644
--- a/dlls/crypt32/tests/ctl.c
+++ b/dlls/crypt32/tests/ctl.c
@@ -119,17 +119,15 @@ static void testCreateCTL(void)
     ctl = CertCreateCTLContext(X509_ASN_ENCODING, NULL, 0);
     ok(!ctl &&
      (GetLastError() == ERROR_INVALID_DATA ||
-      GetLastError() == OSS_MORE_INPUT), /* win9x */
-     "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(),
-     GetLastError());
+      broken(GetLastError() == OSS_MORE_INPUT)), /* NT4 */
+      "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError());
     /* An empty CTL can't be created.. */
     SetLastError(0xdeadbeef);
     ctl = CertCreateCTLContext(X509_ASN_ENCODING, emptyCTL, sizeof(emptyCTL));
     ok(!ctl &&
      (GetLastError() == ERROR_INVALID_DATA ||
-      GetLastError() == OSS_DATA_ERROR), /* win9x */
-     "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(),
-     GetLastError());
+      broken(GetLastError() == OSS_DATA_ERROR)), /* NT4 */
+      "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError());
     /* Nor can any of these "signed" CTLs whose inner content OID isn't
      * szOID_CTL.
      */
@@ -137,29 +135,26 @@ static void testCreateCTL(void)
     ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTL, sizeof(signedCTL));
     ok(!ctl &&
      (GetLastError() == ERROR_INVALID_DATA ||
-      GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */ ||
-      GetLastError() == ERROR_SUCCESS /* some win98 */),
-     "expected ERROR_INVALID_DATA, CRYPT_E_UNEXPECTED_MSG_TYPE, or ERROR_SUCCESS, got %d (0x%08x)\n", GetLastError(),
-     GetLastError());
+      broken(GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE) /* NT4 */ ||
+      broken(GetLastError() == ERROR_SUCCESS /* NT4 */)),
+      "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError());
     SetLastError(0xdeadbeef);
     ctl = CertCreateCTLContext(X509_ASN_ENCODING, ctlWithOneEntry,
      sizeof(ctlWithOneEntry));
     ok(!ctl &&
      (GetLastError() == ERROR_INVALID_DATA ||
-      GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */ ||
-      GetLastError() == OSS_DATA_ERROR /* some win98 */ ||
-      GetLastError() == ERROR_SUCCESS /* some win98 */),
-     "expected ERROR_INVALID_DATA, CRYPT_E_UNEXPECTED_MSG_TYPE, OSS_DATA_ERROR, or ERROR_SUCCESS, got %d (0x%08x)\n", GetLastError(),
-     GetLastError());
+      broken(GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* NT4 */) ||
+      broken(GetLastError() == OSS_DATA_ERROR /* NT4 */) ||
+      broken(GetLastError() == ERROR_SUCCESS /* NT4 */)),
+      "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError());
     SetLastError(0xdeadbeef);
     ctl = CertCreateCTLContext(X509_ASN_ENCODING,
      signedCTLWithSubjectAlgorithm, sizeof(signedCTLWithSubjectAlgorithm));
     ok(!ctl &&
      (GetLastError() == ERROR_INVALID_DATA ||
-      GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */ ||
-      GetLastError() == ERROR_SUCCESS /* some win98 */),
-     "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(),
-     GetLastError());
+      broken(GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* NT4 */) ||
+      broken(GetLastError() == ERROR_SUCCESS /* NT4 */)),
+      "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError());
     /* This signed CTL with the appropriate inner content type can be decoded.
      */
     ctl = CertCreateCTLContext(X509_ASN_ENCODING,
@@ -248,15 +243,12 @@ static void testCTLProperties(void)
     /* An implicit property */
     ret = CertGetCTLContextProperty(ctl, CERT_ACCESS_STATE_PROP_ID, NULL,
      &size);
-    ok(ret || broken(GetLastError() == CRYPT_E_NOT_FOUND /* some win98 */),
-     "CertGetCTLContextProperty failed: %08x\n", GetLastError());
+    ok(ret, "CertGetCTLContextProperty failed: %08x\n", GetLastError());
     ret = CertGetCTLContextProperty(ctl, CERT_ACCESS_STATE_PROP_ID, &access,
      &size);
-    ok(ret || broken(GetLastError() == CRYPT_E_NOT_FOUND /* some win98 */),
-     "CertGetCTLContextProperty failed: %08x\n", GetLastError());
+    ok(ret, "CertGetCTLContextProperty failed: %08x\n", GetLastError());
     if (ret)
-        ok(!(access & CERT_ACCESS_STATE_WRITE_PERSIST_FLAG),
-         "Didn't expect a persisted cert\n");
+        ok(!(access & CERT_ACCESS_STATE_WRITE_PERSIST_FLAG), "Didn't expect a persisted cert\n");
 
     checkHash(signedCTLWithCTLInnerContent,
      sizeof(signedCTLWithCTLInnerContent), CALG_SHA1, ctl, CERT_HASH_PROP_ID);
@@ -382,20 +374,9 @@ static void testAddCTLToStore(void)
      signedCTLWithCTLInnerContentAndBadSig,
      sizeof(signedCTLWithCTLInnerContentAndBadSig), CERT_STORE_ADD_NEW,
      NULL);
-    if (ret)
-    {
-        /* win9x */
-        ok(GetLastError() == CRYPT_E_NOT_FOUND ||
-           GetLastError() == OSS_DATA_ERROR /* some win98 */,
-           "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError());
-    }
-    else
-    {
-        ok(!ret && (GetLastError() == CRYPT_E_EXISTS ||
-           GetLastError() == OSS_DATA_ERROR),
-           "expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret,
-           GetLastError());
-    }
+    ok((!ret || broken(ret) /* NT4 */) && 
+       (GetLastError() == CRYPT_E_EXISTS || broken(GetLastError() == CRYPT_E_NOT_FOUND /* NT4 */)),
+       "expected CRYPT_E_EXISTS, got %d %08x\n", GetLastError(), GetLastError());
     CertCloseStore(store, 0);
 
     store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,


More information about the wine-patches mailing list