Paul Vriens : wintrust/tests: Fix test crash on Win9x.
Alexandre Julliard
julliard at winehq.org
Fri Dec 19 11:19:11 CST 2008
Module: wine
Branch: master
Commit: ff833ee255db9222a94b1e4805608337cbb82fa4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff833ee255db9222a94b1e4805608337cbb82fa4
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Thu Dec 18 17:06:54 2008 +0100
wintrust/tests: Fix test crash on Win9x.
---
dlls/wintrust/tests/crypt.c | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c
index 0b7f825..397daff 100644
--- a/dlls/wintrust/tests/crypt.c
+++ b/dlls/wintrust/tests/crypt.c
@@ -116,12 +116,6 @@ static void test_context(void)
CHAR windir[MAX_PATH], catroot[MAX_PATH], catroot2[MAX_PATH], dummydir[MAX_PATH];
DWORD attrs;
- if (!pCryptCATAdminAcquireContext || !pCryptCATAdminReleaseContext)
- {
- skip("CryptCATAdminAcquireContext and/or CryptCATAdminReleaseContext are not available\n");
- return;
- }
-
/* When CryptCATAdminAcquireContext is successful it will create
* several directories if they don't exist:
*
@@ -262,12 +256,6 @@ static void test_calchash(void)
CHAR temp[MAX_PATH];
DWORD written;
- if (!pCryptCATAdminCalcHashFromFileHandle)
- {
- skip("CryptCATAdminCalcHashFromFileHandle is not available\n");
- return;
- }
-
/* All NULL */
SetLastError(0xdeadbeef);
ret = pCryptCATAdminCalcHashFromFileHandle(NULL, NULL, NULL, 0);
@@ -438,6 +426,12 @@ START_TEST(crypt)
InitFunctionPtrs();
+ if (!pCryptCATAdminAcquireContext)
+ {
+ win_skip("CryptCATAdmin functions are not available\n");
+ return;
+ }
+
myARGC = winetest_get_mainargs(&myARGV);
strcpy(selfname, myARGV[0]);
More information about the wine-cvs
mailing list