From d9b6f26b7b6b4ed2a61967725575ce0aaa932843 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 6 Apr 2020 11:47:33 +0200 Subject: [PATCH] kernel32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard --- dlls/kernel32/term.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index b8877d40356..581b6467dad 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -41,7 +41,6 @@ #include #include #include "console_private.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(console); @@ -175,17 +174,17 @@ static BOOL TERM_bind_libcurses(void) static const char ncname[] = SONAME_LIBCURSES; #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); return FALSE; } -#define LOAD_FUNCPTR(f) \ - if((p_##f = wine_dlsym(nc_handle, #f, NULL, 0)) == NULL) \ - { \ - WARN("Can't find symbol %s\n", #f); \ - goto sym_not_found; \ +#define LOAD_FUNCPTR(f) \ + if((p_##f = dlsym(nc_handle, #f)) == NULL) \ + { \ + WARN("Can't find symbol %s\n", #f); \ + goto sym_not_found; \ } LOAD_FUNCPTR(putp) @@ -202,7 +201,7 @@ sym_not_found: "Wine cannot find certain functions that it needs inside the " CURSES_NAME "\nlibrary. To enable Wine to use " CURSES_NAME " please upgrade your " CURSES_NAME "\nlibraries\n"); - wine_dlclose(nc_handle, NULL, 0); + dlclose(nc_handle); nc_handle = NULL; return FALSE; }