crypt32/tests/message: mark NT4 results as broken

[Austin English]

-- 
-Austin
-------------- next part --------------
diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c
index be3a03b..f35de20 100644
--- a/dlls/crypt32/tests/message.c
+++ b/dlls/crypt32/tests/message.c
@@ -77,14 +77,14 @@ static void test_msg_get_signer_count(void)
     count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING, NULL, 0);
     ok(count == -1, "Expected -1, got %d\n", count);
     ok(GetLastError() == CRYPT_E_ASN1_EOD ||
-       GetLastError() == OSS_BAD_ARG, /* win9x */
+       broken(GetLastError() == OSS_BAD_ARG /* NT4 */ ),
      "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError());
     SetLastError(0xdeadbeef);
     count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING,
      dataEmptyBareContent, sizeof(dataEmptyBareContent));
     ok(count == -1, "Expected -1, got %d\n", count);
     ok(GetLastError() == CRYPT_E_ASN1_BADTAG ||
-       GetLastError() == OSS_PDU_MISMATCH, /* win9x */
+       broken(GetLastError() == OSS_PDU_MISMATCH /* NT4 */ ),
      "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError());
     SetLastError(0xdeadbeef);
     count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING,
@@ -97,12 +97,11 @@ static void test_msg_get_signer_count(void)
      signedEmptyBareContent, sizeof(signedEmptyBareContent));
     ok(count == -1, "Expected -1, got %d\n", count);
     ok(GetLastError() == CRYPT_E_ASN1_BADTAG ||
-       GetLastError() == OSS_DATA_ERROR, /* win9x */
+       broken(GetLastError() == OSS_DATA_ERROR /* NT4 */ ),
      "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError());
     count = CryptGetMessageSignerCount(PKCS_7_ASN_ENCODING,
      signedEmptyContent, sizeof(signedEmptyContent));
-    ok(count == 1 ||
-       broken(count == -1), /* win9x */
+    ok(count == 1 || broken(count == -1 /* NT4 */ ),
        "Expected 1, got %d\n", count);
 }
 
@@ -145,7 +144,7 @@ static void test_verify_detached_message_hash(void)
      NULL);
     ok(!ret &&
      (GetLastError() == CRYPT_E_ASN1_EOD ||
-      GetLastError() == OSS_BAD_ARG), /* win9x */
+      broken(GetLastError() == OSS_BAD_ARG) /* NT4 */ ),
      "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError());
     para.dwMsgEncodingType = X509_ASN_ENCODING;
     SetLastError(0xdeadbeef);
@@ -159,7 +158,7 @@ static void test_verify_detached_message_hash(void)
      NULL);
     ok(!ret &&
      (GetLastError() == CRYPT_E_ASN1_EOD ||
-      GetLastError() == OSS_BAD_ARG), /* win9x */
+      broken(GetLastError() == OSS_BAD_ARG) /* NT4 */ ),
      "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError());
     /* Curiously, passing no data to hash succeeds.. */
     ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent,
@@ -538,13 +537,13 @@ static void test_verify_message_signature(void)
     ret = CryptVerifyMessageSignature(&para, 0, NULL, 0, NULL, 0, NULL);
     ok(!ret &&
      (GetLastError() == CRYPT_E_ASN1_EOD ||
-      GetLastError() == OSS_BAD_ARG), /* win9x */
+      broken(GetLastError() == OSS_BAD_ARG) /* NT4 */ ),
      "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError());
     /* Check whether cert is set on error */
     cert = (PCCERT_CONTEXT)0xdeadbeef;
     ret = CryptVerifyMessageSignature(&para, 0, NULL, 0, NULL, 0, &cert);
     ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD ||
-    GetLastError() == OSS_BAD_ARG /* NT40 */),
+     broken(GetLastError() == OSS_BAD_ARG /* NT4 */ )),
      "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError());
     ok(cert == NULL, "Expected NULL cert\n");
     /* Check whether cbDecoded is set on error */
@@ -552,17 +551,17 @@ static void test_verify_message_signature(void)
     ret = CryptVerifyMessageSignature(&para, 0, NULL, 0, NULL, &cbDecoded,
      NULL);
     ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD ||
-     GetLastError() == OSS_BAD_ARG /* NT40 */),
+     broken(GetLastError() == OSS_BAD_ARG /* NT4 */ )),
      "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError());
     ok(!cbDecoded, "Expected 0\n");
     SetLastError(0xdeadbeef);
     ret = CryptVerifyMessageSignature(&para, 0, dataEmptyBareContent,
      sizeof(dataEmptyBareContent), NULL, 0, NULL);
     ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG ||
-     GetLastError() == OSS_PDU_MISMATCH /* NT40 */),
+     broken(GetLastError() == OSS_PDU_MISMATCH /* NT4 */ )),
      "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError());
     ok(GetLastError() == CRYPT_E_ASN1_BADTAG ||
-     GetLastError() == OSS_PDU_MISMATCH, /* win9x */
+     broken(GetLastError() == OSS_PDU_MISMATCH /* NT4 */ ),
      "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError());
     SetLastError(0xdeadbeef);
     ret = CryptVerifyMessageSignature(&para, 0, dataEmptyContent,
@@ -574,21 +573,21 @@ static void test_verify_message_signature(void)
      sizeof(signedEmptyBareContent), NULL, 0, NULL);
     ok(!ret &&
      (GetLastError() == CRYPT_E_ASN1_BADTAG ||
-      GetLastError() == OSS_DATA_ERROR), /* win9x */
+      broken(GetLastError() == OSS_DATA_ERROR) /* NT4 */ ),
      "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError());
     SetLastError(0xdeadbeef);
     ret = CryptVerifyMessageSignature(&para, 0, signedEmptyContent,
      sizeof(signedEmptyContent), NULL, 0, NULL);
     ok(!ret &&
      (GetLastError() == CRYPT_E_NOT_FOUND ||
-      GetLastError() == OSS_DATA_ERROR), /* win9x */
+      broken(GetLastError() == OSS_DATA_ERROR) /* NT4 */ ),
      "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError());
     SetLastError(0xdeadbeef);
     ret = CryptVerifyMessageSignature(&para, 0, signedContent,
      sizeof(signedContent), NULL, 0, NULL);
     ok(!ret &&
      (GetLastError() == CRYPT_E_NOT_FOUND ||
-      GetLastError() == OSS_DATA_ERROR), /* win9x */
+      broken(GetLastError() == OSS_DATA_ERROR) /* NT4 */ ),
      "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError());
     /* FIXME: Windows fails with CRYPT_E_NOT_FOUND for these messages, but
      * their signer certs have invalid public keys that fail to decode.  In
@@ -1037,9 +1036,9 @@ static void test_sign_message(void)
     SetLastError(0xdeadbeef);
     ret = CryptImportKey(hCryptProv, publicPrivateKeyPair,
      sizeof(publicPrivateKeyPair), 0, 0, &hKey);
-    if (!ret && GetLastError() == NTE_PERM) /* Win9x */
+    if (!ret && GetLastError() == NTE_PERM) /* NT4 */
     {
-        skip("Failed to import a key\n");
+        win_skip("Failed to import a key\n");
         if (hCryptProv)
             CryptReleaseContext(hCryptProv, 0);
         return;
@@ -1257,7 +1256,7 @@ static void test_encrypt_message(void)
      &encryptedBlobSize);
     ok(!ret &&
      (GetLastError() == CRYPT_E_UNKNOWN_ALGO ||
-      GetLastError() == E_INVALIDARG), /* Win9x */
+      broken(GetLastError() == E_INVALIDARG) /* NT4 */ ),
      "expected CRYPT_E_UNKNOWN_ALGO or E_INVALIDARG, got %08x\n",
      GetLastError());
     ok(!encryptedBlobSize, "unexpected size %d\n", encryptedBlobSize);
@@ -1269,8 +1268,7 @@ static void test_encrypt_message(void)
     encryptedBlobSize = 0;
     ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL,
      &encryptedBlobSize);
-    ok(ret ||
-     broken(!ret) /* Win9x */,
+    ok(ret || broken(!ret) /* NT4 */,
      "CryptEncryptMessage failed: %08x\n", GetLastError());
     if (ret)
     {
@@ -1311,8 +1309,7 @@ static void test_encrypt_message(void)
     encryptedBlobSize = 0;
     ret = CryptEncryptMessage(&para, 0, NULL, blob, sizeof(blob), NULL,
      &encryptedBlobSize);
-    ok(ret ||
-     broken(!ret) /* Win9x */,
+    ok(ret || broken(!ret) /* NT4 */,
      "CryptEncryptMessage failed: %08x\n", GetLastError());
     if (ret)
     {