Commit d9b6f26b authored by Alexandre Julliard's avatar Alexandre Julliard

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

parent 64c89517
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include <winnls.h> #include <winnls.h>
#include <wincon.h> #include <wincon.h>
#include "console_private.h" #include "console_private.h"
#include "wine/library.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(console); WINE_DEFAULT_DEBUG_CHANNEL(console);
...@@ -175,17 +174,17 @@ static BOOL TERM_bind_libcurses(void) ...@@ -175,17 +174,17 @@ static BOOL TERM_bind_libcurses(void)
static const char ncname[] = SONAME_LIBCURSES; static const char ncname[] = SONAME_LIBCURSES;
#endif #endif
if (!(nc_handle = wine_dlopen(ncname, RTLD_NOW, NULL, 0))) if (!(nc_handle = dlopen(ncname, RTLD_NOW)))
{ {
MESSAGE("Wine cannot find the " CURSES_NAME " library (%s).\n", ncname); MESSAGE("Wine cannot find the " CURSES_NAME " library (%s).\n", ncname);
return FALSE; return FALSE;
} }
#define LOAD_FUNCPTR(f) \ #define LOAD_FUNCPTR(f) \
if((p_##f = wine_dlsym(nc_handle, #f, NULL, 0)) == NULL) \ if((p_##f = dlsym(nc_handle, #f)) == NULL) \
{ \ { \
WARN("Can't find symbol %s\n", #f); \ WARN("Can't find symbol %s\n", #f); \
goto sym_not_found; \ goto sym_not_found; \
} }
LOAD_FUNCPTR(putp) LOAD_FUNCPTR(putp)
...@@ -202,7 +201,7 @@ sym_not_found: ...@@ -202,7 +201,7 @@ sym_not_found:
"Wine cannot find certain functions that it needs inside the " "Wine cannot find certain functions that it needs inside the "
CURSES_NAME "\nlibrary. To enable Wine to use " CURSES_NAME CURSES_NAME "\nlibrary. To enable Wine to use " CURSES_NAME
" please upgrade your " CURSES_NAME "\nlibraries\n"); " please upgrade your " CURSES_NAME "\nlibraries\n");
wine_dlclose(nc_handle, NULL, 0); dlclose(nc_handle);
nc_handle = NULL; nc_handle = NULL;
return FALSE; return FALSE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment