Paul Vriens : advapi32/tests: Use GetModuleHandle and skip.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Mar 13 16:56:41 CDT 2007


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

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Tue Mar 13 19:41:01 2007 +0100

advapi32/tests: Use GetModuleHandle and skip.

---

 dlls/advapi32/tests/crypt_sha.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/advapi32/tests/crypt_sha.c b/dlls/advapi32/tests/crypt_sha.c
index 33fd430..e8cd557 100644
--- a/dlls/advapi32/tests/crypt_sha.c
+++ b/dlls/advapi32/tests/crypt_sha.c
@@ -51,12 +51,16 @@ static void test_sha_ctx(void)
    ULONG result[5];
    ULONG result_correct[5] = {0xe014f93, 0xe09791ec, 0x6dcf96c8, 0x8e9385fc, 0x1611c1bb};
 
-   hmod = LoadLibrary("advapi32.dll");
+   hmod = GetModuleHandleA("advapi32.dll");
    pA_SHAInit = GetProcAddress(hmod, "A_SHAInit");
    pA_SHAUpdate = GetProcAddress(hmod, "A_SHAUpdate");
    pA_SHAFinal = GetProcAddress(hmod, "A_SHAFinal");
 
-   if (!pA_SHAInit || !pA_SHAUpdate || !pA_SHAFinal) return;
+   if (!pA_SHAInit || !pA_SHAUpdate || !pA_SHAFinal)
+   {
+      skip("A_SHAInit and/or A_SHAUpdate and/or A_SHAFinal are not available\n");
+      return;
+   }
 
    RtlZeroMemory(&ctx, sizeof(ctx));
    pA_SHAInit(&ctx);
@@ -71,8 +75,6 @@ static void test_sha_ctx(void)
    pA_SHAFinal(&ctx, result);
    ok(!ctxcmp(&ctx, &ctx_initialized), "context hasn't been reinitialized\n");
    ok(!memcmp(result, result_correct, sizeof(result)), "incorrect result\n");
-
-   FreeLibrary(hmod);
 }
 
 START_TEST(crypt_sha)




More information about the wine-cvs mailing list