marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Use standard dlopen() instead of the libwine wrappers. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Alexandre Julliard 2020-04-06 11:44:59 +02:00
parent e39b3a2faf
commit 12157fac9f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/crypt32/pfx.c
View File

@ -31,7 +31,6 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/heap.h" #include "wine/heap.h"
#include "wine/library.h"
#include "wine/unicode.h" #include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt); WINE_DEFAULT_DEBUG_CHANNEL(crypt);
@ -72,14 +71,14 @@ BOOL gnutls_initialize(void)
{ {
int ret; int ret;
if (!(libgnutls_handle = wine_dlopen( SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0 ))) if (!(libgnutls_handle = dlopen( SONAME_LIBGNUTLS, RTLD_NOW )))
{ {
ERR_(winediag)( "failed to load libgnutls, no support for pfx import/export\n" ); ERR_(winediag)( "failed to load libgnutls, no support for pfx import/export\n" );
return FALSE; return FALSE;
} }
#define LOAD_FUNCPTR(f) \ #define LOAD_FUNCPTR(f) \
if (!(p##f = wine_dlsym( libgnutls_handle, #f, NULL, 0 ))) \ if (!(p##f = dlsym( libgnutls_handle, #f ))) \
{ \ { \
ERR( "failed to load %s\n", #f ); \ ERR( "failed to load %s\n", #f ); \
goto fail; \ goto fail; \
@ -114,7 +113,7 @@ BOOL gnutls_initialize(void)
return TRUE; return TRUE;
fail: fail:
wine_dlclose( libgnutls_handle, NULL, 0 ); dlclose( libgnutls_handle );
libgnutls_handle = NULL; libgnutls_handle = NULL;
return FALSE; return FALSE;
} }
@ -122,7 +121,7 @@ fail:
void gnutls_uninitialize(void) void gnutls_uninitialize(void)
{ {
pgnutls_global_deinit(); pgnutls_global_deinit();
wine_dlclose( libgnutls_handle, NULL, 0 ); dlclose( libgnutls_handle );
libgnutls_handle = NULL; libgnutls_handle = NULL;
} }