James Hawkins : advapi32: Skip tests if the default provider cannot be removed.

Alexandre Julliard julliard at winehq.org
Mon Jan 26 10:15:00 CST 2009


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

Author: James Hawkins <truiken at gmail.com>
Date:   Mon Jan 26 01:31:00 2009 -0600

advapi32: Skip tests if the default provider cannot be removed.

---

 dlls/advapi32/tests/crypt.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c
index 5a5b26e..41759d5 100644
--- a/dlls/advapi32/tests/crypt.c
+++ b/dlls/advapi32/tests/crypt.c
@@ -870,12 +870,13 @@ static void test_set_provider_ex(void)
 	/* remove the default provider and then set it to MS_DEF_PROV/PROV_RSA_FULL */
         SetLastError(0xdeadbeef);
 	result = pCryptSetProviderExA(MS_DEF_PROV, PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT | CRYPT_DELETE_DEFAULT);
-	if (!result && (GetLastError() == ERROR_ACCESS_DENIED))
+	if (!result)
 	{
+                ok( GetLastError() == ERROR_ACCESS_DENIED || broken(GetLastError() == ERROR_INVALID_PARAMETER),
+                    "wrong error %u\n", GetLastError() );
 		skip("Not enough rights to remove the default provider\n");
 		return;
 	}
-	ok(result, "%d\n", GetLastError());
 
 	result = pCryptSetProviderExA(MS_DEF_PROV, PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT);
 	ok(result, "%d\n", GetLastError());




More information about the wine-cvs mailing list