Austin English : wintrust/tests: Remove win9x hacks.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d23b0888186ecf3865efbaf5e039744fafeaf18a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d23b0888186ecf3865efbaf5e0...

Author: Austin English 
Date:   Thu Feb 17 18:51:12 2011 -0800

wintrust/tests: Remove win9x hacks.

---

dlls/wintrust/tests/asn.c   |    4 ++--
 dlls/wintrust/tests/crypt.c |    9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c
index 2fa45c6..a9955ac 100644
--- a/dlls/wintrust/tests/asn.c
+++ b/dlls/wintrust/tests/asn.c
@@ -150,7 +150,7 @@ static void test_encodeSPCLink(void)
      CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size);
     ok(!ret &&
      (GetLastError() == CRYPT_E_INVALID_IA5_STRING ||
-     GetLastError() == OSS_BAD_PTR /* Win9x */),
+     GetLastError() == OSS_BAD_PTR /* WinNT */),
      "Expected CRYPT_E_INVALID_IA5_STRING, got %08x\n", GetLastError());
     /* Unlike the crypt32 string encoding routines, size is not set to the
      * index of the first invalid character.
@@ -298,7 +298,7 @@ static void test_decodeSPCLink(void)
      NULL, &buf, &size);
     ok(!ret &&
      (GetLastError() == CRYPT_E_BAD_ENCODE ||
-     GetLastError() == OSS_DATA_ERROR /* Win9x */),
+     GetLastError() == OSS_DATA_ERROR /* WinNT */),
      "Expected CRYPT_E_BAD_ENCODE, got %08x\n", GetLastError());
 }

diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c
index bb561a2..0236486 100644
--- a/dlls/wintrust/tests/crypt.c
+++ b/dlls/wintrust/tests/crypt.c
@@ -893,8 +893,7 @@ static void test_cdf_parsing(void)
     catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback);
     ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n");
     todo_wine
-    ok(GetLastError() == ERROR_SHARING_VIOLATION ||
-        broken(GetLastError() == ERROR_SUCCESS),    /* win9x */
+    ok(GetLastError() == ERROR_SHARING_VIOLATION,
         "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
     DeleteFileA(cdffileA);

@@ -909,8 +908,7 @@ static void test_cdf_parsing(void)
     catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback);
     ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n");
     todo_wine
-    ok(GetLastError() == ERROR_SHARING_VIOLATION ||
-        broken(GetLastError() == ERROR_SUCCESS),    /* win9x */
+    ok(GetLastError() == ERROR_SHARING_VIOLATION,
         "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
     DeleteFileA(cdffileA);
     ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n");
@@ -925,8 +923,7 @@ static void test_cdf_parsing(void)
     catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback);
     ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n");
     todo_wine
-    ok(GetLastError() == ERROR_SHARING_VIOLATION ||
-        broken(GetLastError() == ERROR_SUCCESS),    /* win9x */
+    ok(GetLastError() == ERROR_SHARING_VIOLATION,
         "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
     DeleteFileA(cdffileA);
     ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n");