Juan Lang : crypt32: Accept ERROR_BADKEY in addition to ERROR_INVALID_HANDLE.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jul 2 09:52:06 CDT 2007


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

Author: Juan Lang <juan.lang at gmail.com>
Date:   Fri Jun 29 12:56:43 2007 -0700

crypt32: Accept ERROR_BADKEY in addition to ERROR_INVALID_HANDLE.

---

 dlls/crypt32/tests/store.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c
index 84eba11..549c0c6 100644
--- a/dlls/crypt32/tests/store.c
+++ b/dlls/crypt32/tests/store.c
@@ -595,14 +595,16 @@ static void testRegStore(void)
     HCERTSTORE store;
     LONG rc;
     HKEY key = NULL;
-    DWORD disp;
+    DWORD disp, GLE;
 
     store = CertOpenStore(CERT_STORE_PROV_REG, 0, 0, 0, NULL);
-    ok(!store && GetLastError() == ERROR_INVALID_HANDLE,
-     "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
+    GLE = GetLastError();
+    ok(!store && (GLE == ERROR_INVALID_HANDLE || GLE == ERROR_BADKEY),
+     "Expected ERROR_INVALID_HANDLE or ERROR_BADKEY, got %d\n", GLE);
     store = CertOpenStore(CERT_STORE_PROV_REG, 0, 0, 0, key);
-    ok(!store && GetLastError() == ERROR_INVALID_HANDLE,
-     "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
+    GLE = GetLastError();
+    ok(!store && (GLE == ERROR_INVALID_HANDLE || GLE == ERROR_BADKEY),
+     "Expected ERROR_INVALID_HANDLE or ERROR_BADKEY, got %d\n", GLE);
 
     /* Opening up any old key works.. */
     key = HKEY_CURRENT_USER;




More information about the wine-cvs mailing list