Huw Davies : dssenh/tests: The default container may already exist.

[Alexandre Julliard]

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

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Fri Nov  4 11:20:08 2016 +0000

dssenh/tests: The default container may already exist.

Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/dssenh/tests/dssenh.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c
index feb9a30..df5a1d1 100644
--- a/dlls/dssenh/tests/dssenh.c
+++ b/dlls/dssenh/tests/dssenh.c
@@ -86,10 +86,13 @@ static void test_acquire_context(void)
 
     result = CryptAcquireContextA(
         &hProv, NULL, MS_DEF_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_NEWKEYSET);
-    ok(result, "Expected no errors.\n");
+    ok(result || GetLastError() == NTE_EXISTS, "Expected no errors or NTE_EXISTS\n");
 
-    result = CryptReleaseContext(hProv, 0);
-    ok(result, "Expected release of the provider.\n");
+    if (result)
+    {
+        result = CryptReleaseContext(hProv, 0);
+        ok(result, "Expected release of the provider.\n");
+    }
 
     result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, 0);
     ok(result, "Expected no errors.\n");