Alexandre Julliard : crypt32: Use standard dlopen() instead of the libwine wrappers.
Alexandre Julliard
julliard at winehq.org
Mon Apr 6 15:53:20 CDT 2020
Module: wine
Branch: master
Commit: 12157fac9f4e33a8cd14bf7c728635eba04ed042
URL: https://source.winehq.org/git/wine.git/?a=commit;h=12157fac9f4e33a8cd14bf7c728635eba04ed042
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Apr 6 11:44:59 2020 +0200
crypt32: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/crypt32/pfx.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c
index a515585586..711cf76de2 100644
--- a/dlls/crypt32/pfx.c
+++ b/dlls/crypt32/pfx.c
@@ -31,7 +31,6 @@
#include "wine/debug.h"
#include "wine/heap.h"
-#include "wine/library.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
@@ -72,14 +71,14 @@ BOOL gnutls_initialize(void)
{
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" );
return FALSE;
}
#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 ); \
goto fail; \
@@ -114,7 +113,7 @@ BOOL gnutls_initialize(void)
return TRUE;
fail:
- wine_dlclose( libgnutls_handle, NULL, 0 );
+ dlclose( libgnutls_handle );
libgnutls_handle = NULL;
return FALSE;
}
@@ -122,7 +121,7 @@ fail:
void gnutls_uninitialize(void)
{
pgnutls_global_deinit();
- wine_dlclose( libgnutls_handle, NULL, 0 );
+ dlclose( libgnutls_handle );
libgnutls_handle = NULL;
}
More information about the wine-cvs
mailing list