Jacek Caban : secur32: Fixed dynamic loading in schannel test.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Wed Mar 12 18:34:55 2008 +0100

secur32: Fixed dynamic loading in schannel test.

---

dlls/secur32/tests/schannel.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
index dec9368..b19590a 100644
--- a/dlls/secur32/tests/schannel.c
+++ b/dlls/secur32/tests/schannel.c
@@ -28,14 +28,15 @@
 #include "wine/test.h"

static HMODULE secdll, crypt32dll;
-static SECURITY_STATUS (SEC_ENTRY * pAcquireCredentialsHandleA)(SEC_CHAR*, SEC_CHAR*,
-                            ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp);
+
+static ACQUIRE_CREDENTIALS_HANDLE_FN_A pAcquireCredentialsHandleA;
+static FREE_CREDENTIALS_HANDLE_FN pFreeCredentialsHandle;
+
 static PCCERT_CONTEXT (WINAPI *pCertCreateCertificateContext)(DWORD,const BYTE*,DWORD);
 static BOOL (WINAPI *pCertFreeCertificateContext)(PCCERT_CONTEXT);
 static BOOL (WINAPI *pCertSetCertificateContextProperty)(PCCERT_CONTEXT,DWORD,DWORD,const void*);
-static SECURITY_STATUS (SEC_ENTRY * pFreeCredentialsHandle)(PCredHandle);

-static BOOL (WINAPI * pCryptAcquireContextW)(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD);
+static BOOL (WINAPI *pCryptAcquireContextW)(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD);
 static BOOL (WINAPI *pCryptDestroyKey)(HCRYPTKEY);
 static BOOL (WINAPI *pCryptImportKey)(HCRYPTPROV,CONST BYTE*,DWORD,HCRYPTKEY,DWORD,HCRYPTKEY*);
 static BOOL (WINAPI *pCryptReleaseContext)(HCRYPTPROV,ULONG_PTR);
@@ -105,12 +106,13 @@ static const BYTE selfSignedCert[] = {

static void InitFunctionPtrs(void)
 {
-    HMODULE advapi32dll = GetModuleHandleA("advapi32.dll");
+    HMODULE advapi32dll;

crypt32dll = LoadLibraryA("crypt32.dll");
     secdll = LoadLibraryA("secur32.dll");
     if(!secdll)
         secdll = LoadLibraryA("security.dll");
+    advapi32dll = GetModuleHandleA("advapi32.dll");

#define GET_PROC(h, func)  p ## func = (void*)GetProcAddress(h, #func)

@@ -127,6 +129,7 @@ static void InitFunctionPtrs(void)

GET_PROC(crypt32dll, CertFreeCertificateContext);
     GET_PROC(crypt32dll, CertSetCertificateContextProperty);
+    GET_PROC(crypt32dll, CertCreateCertificateContext);

#undef GET_PROC
 }