crypt32: Fix a test failure on Windows 7 (try 2)

Juan Lang juan.lang at gmail.com
Wed Aug 26 10:56:44 CDT 2009


I'm just intuiting that this is the preferred approach, since the last
one was rejected with no comment.  The number of possible last errors
set was almost equal to the number of Microsoft operating systems, so
apps can't possibly care what it's set to, so I'm just removing that
test.
--Juan
-------------- next part --------------
From 4fb9618732e208f4e6a7c48c9e4a3bf149b805c3 Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang at gmail.com>
Date: Wed, 26 Aug 2009 08:56:55 -0700
Subject: [PATCH 2/2] Fix a test failure on Windows 7

---
 dlls/crypt32/tests/oid.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c
index 8b680c4..030a548 100644
--- a/dlls/crypt32/tests/oid.c
+++ b/dlls/crypt32/tests/oid.c
@@ -98,16 +98,8 @@ static void testOIDToAlgID(void)
     DWORD alg;
 
     /* Test with a bogus one */
-    SetLastError(0xdeadbeef);
     alg = CertOIDToAlgId("1.2.3");
     ok(!alg, "Expected failure, got %d\n", alg);
-    ok(GetLastError() == 0xdeadbeef ||
-       GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND ||
-       GetLastError() == ERROR_INVALID_PARAMETER || /* Vista */
-       GetLastError() == ERROR_SUCCESS || /* win2k */
-       GetLastError() == ERROR_FILE_INVALID, /* another Vista */
-       "Expected ERROR_RESOURCE_NAME_NOT_FOUND, ERROR_INVALID_PARAMETER, "
-       "ERROR_SUCCESS or no error set, got %08x\n", GetLastError());
 
     for (i = 0; i < sizeof(oidToAlgID) / sizeof(oidToAlgID[0]); i++)
     {
-- 
1.6.3.2


More information about the wine-patches mailing list