From 5cd099290c5333206e25fd3a27e1344b70105881 Mon Sep 17 00:00:00 2001 From: Saulius Krasuckas Date: Tue, 8 Nov 2005 19:57:41 +0000 Subject: [PATCH] Win98 fails another way when user isn't logged in. --- dlls/advapi32/tests/crypt.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index cc36e10a054..1b307baa1b8 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -154,6 +154,7 @@ static void test_acquire_context(void) { BOOL result; HCRYPTPROV hProv; + DWORD GLE; /* Provoke all kinds of error conditions (which are easy to provoke). * The order of the error tests seems to match Windows XP's rsaenh.dll CSP, @@ -185,7 +186,12 @@ static void test_acquire_context(void) hProv = 0; SetLastError(0xdeadbeef); result = pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); - ok(result && (GetLastError() == ERROR_ENVVAR_NOT_FOUND || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_RING2_STACK_IN_USE || GetLastError() == NTE_FAIL), "%d/%ld\n", result, GetLastError()); + GLE = GetLastError(); + ok(result && (GLE == ERROR_ENVVAR_NOT_FOUND || + GLE == ERROR_SUCCESS || + GLE == ERROR_RING2_STACK_IN_USE || + GLE == NTE_FAIL || + GLE == ERROR_NOT_LOGGED_ON), "%d/%ld\n", result, GLE); if (hProv) pCryptReleaseContext(hProv, 0); @@ -194,7 +200,12 @@ static void test_acquire_context(void) hProv = 0; SetLastError(0xdeadbeef); result = pCryptAcquireContextA(&hProv, szKeySet, "", PROV_RSA_FULL, 0); - ok(result && (GetLastError() == ERROR_ENVVAR_NOT_FOUND || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_RING2_STACK_IN_USE || GetLastError() == NTE_FAIL), "%d/%ld\n", result, GetLastError()); + GLE = GetLastError(); + ok(result && (GLE == ERROR_ENVVAR_NOT_FOUND || + GLE == ERROR_SUCCESS || + GLE == ERROR_RING2_STACK_IN_USE || + GLE == NTE_FAIL || + GLE == ERROR_NOT_LOGGED_ON), "%d/%ld\n", result, GetLastError()); if (hProv) pCryptReleaseContext(hProv, 0);