Skip to content

W
wine-winehq
Commit d23b0888 authored by Austin English's avatar Austin English Committed by Alexandre Julliard
Browse files
Options

wintrust/tests: Remove win9x hacks.

parent 1dae68e7
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
dlls/wintrust/tests/asn.c
View file @ d23b0888
...@@ -150,7 +150,7 @@ static void test_encodeSPCLink(void) ...@@ -150,7 +150,7 @@ static void test_encodeSPCLink(void)
CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size);
ok(!ret && ok(!ret &&
(GetLastError() == CRYPT_E_INVALID_IA5_STRING || (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()); "Expected CRYPT_E_INVALID_IA5_STRING, got %08x\n", GetLastError());
/* Unlike the crypt32 string encoding routines, size is not set to the /* Unlike the crypt32 string encoding routines, size is not set to the
* index of the first invalid character. * index of the first invalid character.
...@@ -298,7 +298,7 @@ static void test_decodeSPCLink(void) ...@@ -298,7 +298,7 @@ static void test_decodeSPCLink(void)
NULL, &buf, &size); NULL, &buf, &size);
ok(!ret && ok(!ret &&
(GetLastError() == CRYPT_E_BAD_ENCODE || (GetLastError() == CRYPT_E_BAD_ENCODE ||
GetLastError() == OSS_DATA_ERROR /* Win9x */), GetLastError() == OSS_DATA_ERROR /* WinNT */),
"Expected CRYPT_E_BAD_ENCODE, got %08x\n", GetLastError()); "Expected CRYPT_E_BAD_ENCODE, got %08x\n", GetLastError());
} }
......
dlls/wintrust/tests/crypt.c
View file @ d23b0888
...@@ -893,8 +893,7 @@ static void test_cdf_parsing(void) ...@@ -893,8 +893,7 @@ static void test_cdf_parsing(void)
catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback);
ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n");
todo_wine todo_wine
ok(GetLastError() == ERROR_SHARING_VIOLATION || ok(GetLastError() == ERROR_SHARING_VIOLATION,
broken(GetLastError() == ERROR_SUCCESS), /* win9x */
"Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
DeleteFileA(cdffileA); DeleteFileA(cdffileA);
...@@ -909,8 +908,7 @@ static void test_cdf_parsing(void) ...@@ -909,8 +908,7 @@ static void test_cdf_parsing(void)
catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback);
ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n");
todo_wine todo_wine
ok(GetLastError() == ERROR_SHARING_VIOLATION || ok(GetLastError() == ERROR_SHARING_VIOLATION,
broken(GetLastError() == ERROR_SUCCESS), /* win9x */
"Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
DeleteFileA(cdffileA); DeleteFileA(cdffileA);
ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n"); ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n");
...@@ -925,8 +923,7 @@ static void test_cdf_parsing(void) ...@@ -925,8 +923,7 @@ static void test_cdf_parsing(void)
catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback);
ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n");
todo_wine todo_wine
ok(GetLastError() == ERROR_SHARING_VIOLATION || ok(GetLastError() == ERROR_SHARING_VIOLATION,
broken(GetLastError() == ERROR_SUCCESS), /* win9x */
"Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
DeleteFileA(cdffileA); DeleteFileA(cdffileA);
ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n"); ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment