Alexandre Julliard : user32: Use standard dlopen() instead of the libwine wrappers.

Alexandre Julliard julliard at winehq.org
Tue Apr 7 15:27:15 CDT 2020


Module: wine
Branch: master
Commit: b88730d8af0c08e4e5e67b7108313ebc1ab051f5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b88730d8af0c08e4e5e67b7108313ebc1ab051f5

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Apr  6 22:39:31 2020 +0200

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

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/user32/cursoricon.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c
index 6413d22d03..eca6dc58c3 100644
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -48,7 +48,6 @@
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
-#include "wine/library.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(cursor);
 WINE_DECLARE_DEBUG_CHANNEL(icon);
@@ -148,13 +147,13 @@ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT;
 
 static BOOL WINAPI load_libpng( INIT_ONCE *once, void *param, void **context )
 {
-    if (!(libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)))
+    if (!(libpng_handle = dlopen( SONAME_LIBPNG, RTLD_NOW )))
     {
         WARN( "failed to load %s\n", SONAME_LIBPNG );
         return TRUE;
     }
 #define LOAD_FUNCPTR(f) \
-    if ((p##f = wine_dlsym(libpng_handle, #f, NULL, 0)) == NULL) \
+    if ((p##f = dlsym(libpng_handle, #f)) == NULL) \
     { \
         WARN( "%s not found in %s\n", #f, SONAME_LIBPNG ); \
         libpng_handle = NULL; \




More information about the wine-cvs mailing list