crypt32/tests/crl: remove win9x hacks

Austin English austinenglish at gmail.com
Tue Jul 26 17:39:51 CDT 2011


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

-- 
-Austin
-------------- next part --------------
diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c
index fb7b6e4..69ab60b 100644
--- a/dlls/crypt32/tests/crl.c
+++ b/dlls/crypt32/tests/crl.c
@@ -176,7 +176,7 @@ static void testAddCRL(void)
      "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08x\n", GLE);
 
     /* Weird--bad add disposition leads to an access violation in Windows.
-     * Both tests crash on some win9x boxes.
+     * Both tests crash on some NT4 boxes.
      */
     if (0)
     {
@@ -466,7 +466,7 @@ static void testFindCRL(void)
     /* Try various find flags */
     context = pCertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_SIGNATURE_FLAG,
      CRL_FIND_ISSUED_BY, cert, NULL);
-    ok(!context || broken(context != NULL /* Win9x */), "unexpected context\n");
+    ok(!context || broken(context != NULL /* NT4 */), "unexpected context\n");
     /* The CRL doesn't have an AKI extension, so it matches any cert */
     context = pCertFindCRLInStore(store, 0, CRL_FIND_ISSUED_BY_AKI_FLAG,
      CRL_FIND_ISSUED_BY, cert, NULL);
@@ -487,7 +487,7 @@ static void testFindCRL(void)
     issuedForPara.pIssuerCert = cert;
     context = pCertFindCRLInStore(store, 0, 0, CRL_FIND_ISSUED_FOR,
      &issuedForPara, NULL);
-    ok(context != NULL || broken(!context /* Win9x, NT4 */),
+    ok(context != NULL || broken(!context /* NT4 */),
      "Expected a context\n");
     if (context)
     {
@@ -530,12 +530,12 @@ static void testFindCRL(void)
      * match cert's issuer, but verisignCRL does not, so the expected count
      * is 0.
      */
-    ok(count == 3 || broken(count == 0 /* NT4, Win9x */),
+    ok(count == 3 || broken(count == 0 /* NT4 */),
      "expected 3 matching CRLs, got %d\n", count);
     /* Only v1CRLWithIssuerAndEntry and v2CRLWithIssuingDistPoint contain
      * entries, so the count of CRL entries that match cert is 2.
      */
-    ok(revoked_count == 2 || broken(revoked_count == 0 /* NT4, Win9x */),
+    ok(revoked_count == 2 || broken(revoked_count == 0 /* NT4 */),
      "expected 2 matching CRL entries, got %d\n", revoked_count);
 
     CertFreeCertificateContext(cert);
@@ -591,7 +591,7 @@ static void testFindCRL(void)
                 revoked_count++;
         }
     } while (context);
-    ok(count == 1 || broken(count == 0 /* Win9x, NT4 */),
+    ok(count == 1 || broken(count == 0 /* NT4 */),
      "expected 1 matching CRLs, got %d\n", count);
     ok(revoked_count == 0, "expected 0 matching CRL entries, got %d\n",
      revoked_count);
@@ -631,9 +631,9 @@ static void testFindCRL(void)
                 revoked_count++;
         }
     } while (context);
-    ok(count == 1 || broken(count == 0 /* Win9x, NT4 */),
+    ok(count == 1 || broken(count == 0 /* NT4 */),
      "expected 1 matching CRLs, got %d\n", count);
-    ok(revoked_count == 1 || broken(revoked_count == 0 /* Win9x, NT4 */),
+    ok(revoked_count == 1 || broken(revoked_count == 0 /* NT4 */),
      "expected 1 matching CRL entries, got %d\n", revoked_count);
 
     /* Test CRL_FIND_ISSUED_BY flags */
@@ -702,7 +702,7 @@ static void testFindCRL(void)
                 revoked_count++;
         }
     } while (context);
-    ok(count == 0 || broken(count == 1 /* Win9x */),
+    ok(count == 0 || broken(count == 1 /* NT4 */),
      "expected 0 matching CRLs, got %d\n", count);
     ok(revoked_count == 0, "expected 0 matching CRL entries, got %d\n",
      revoked_count);


More information about the wine-patches mailing list