Module: wine Branch: master Commit: bdc309b9492820b91816ad6b0e1b60424e25df0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc309b9492820b91816ad6b0e...
Author: Hans Leidekker hans@codeweavers.com Date: Tue Jan 31 12:08:25 2017 +0100
wintrust/tests: Disable a test that crashes on 64-bit Windows 10.
Signed-off-by: Hans Leidekker hans@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wintrust/tests/crypt.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 503831e..5a4344b 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -203,17 +203,11 @@ static void test_context(void) "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
/* NULL GUID */ + if (0) { /* crashes on 64-bit win10 */ ret = pCryptCATAdminAcquireContext(&hca, NULL, 0); ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n");
- /* All NULL */ - SetLastError(0xdeadbeef); - ret = pCryptCATAdminReleaseContext(NULL, 0); - ok(!ret, "Expected failure\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - /* Proper release */ SetLastError(0xdeadbeef); ret = pCryptCATAdminReleaseContext(hca, 0); @@ -225,6 +219,14 @@ static void test_context(void) ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + + /* All NULL */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminReleaseContext(NULL, 0); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
/* NULL context handle and dummy GUID */ SetLastError(0xdeadbeef);