Module: wine Branch: master Commit: 68fec9028ce022be92892bd98d7c389e82b83003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fec9028ce022be92892bd98d... Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 13 19:40:30 2007 +0100 crypt32/tests: Use GetModuleHandle and skip. --- dlls/crypt32/tests/base64.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 6cc8df9..1610288 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -132,8 +132,6 @@ static void testBinaryToStringA(void) BOOL ret; DWORD strLen = 0, i; - if (!pCryptBinaryToStringA) return; - ret = pCryptBinaryToStringA(NULL, 0, 0, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); @@ -320,8 +318,6 @@ static void testStringToBinaryA(void) BOOL ret; DWORD bufLen = 0, i; - if (!pCryptStringToBinaryA) return; - ret = pCryptStringToBinaryA(NULL, 0, 0, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); @@ -443,7 +439,7 @@ static void testStringToBinaryA(void) START_TEST(base64) { - HMODULE lib = LoadLibraryA("crypt32"); + HMODULE lib = GetModuleHandleA("crypt32"); if (lib) { @@ -452,9 +448,14 @@ START_TEST(base64) pCryptStringToBinaryA = (CryptStringToBinaryAFunc)GetProcAddress(lib, "CryptStringToBinaryA"); - testBinaryToStringA(); - testStringToBinaryA(); + if (pCryptBinaryToStringA) + testBinaryToStringA(); + else + skip("CryptBinaryToStringA is not available\n"); - FreeLibrary(lib); + if (pCryptStringToBinaryA) + testStringToBinaryA(); + else + skip("CryptStringToBinaryA is not available\n"); } }