ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-04-06 22:39:03 +02:00
parent 0c43293862
commit 553a134f06
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/sane.ds/sane_main.c
View File

@ -26,7 +26,6 @@
#include "sane_i.h" #include "sane_i.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/library.h"
WINE_DEFAULT_DEBUG_CHANNEL(twain); WINE_DEFAULT_DEBUG_CHANNEL(twain);
@ -59,22 +58,22 @@ static void *libsane_handle;
static void close_libsane(void *h) static void close_libsane(void *h)
{ {
if (h) if (h)
wine_dlclose(h, NULL, 0); dlclose(h);
} }
static void *open_libsane(void) static void *open_libsane(void)
{ {
void *h; void *h;
h = wine_dlopen(SONAME_LIBSANE, RTLD_GLOBAL | RTLD_NOW, NULL, 0); h = dlopen(SONAME_LIBSANE, RTLD_GLOBAL | RTLD_NOW);
if (!h) if (!h)
{ {
WARN("dlopen(%s) failed\n", SONAME_LIBSANE); WARN("failed to load %s; %s\n", SONAME_LIBSANE, dlerror());
return NULL; return NULL;
} }
#define LOAD_FUNCPTR(f) \ #define LOAD_FUNCPTR(f) \
if((p##f = wine_dlsym(h, #f, NULL, 0)) == NULL) { \ if((p##f = dlsym(h, #f)) == NULL) { \
close_libsane(h); \ close_libsane(h); \
ERR("Could not dlsym %s\n", #f); \ ERR("Could not dlsym %s\n", #f); \
return NULL; \ return NULL; \