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

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Mon Apr  6 22:39:03 2020 +0200

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

Signed-off-by: Alexandre Julliard

---

dlls/sane.ds/sane_main.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c
index 0cf211d098..1df6cb9ba2 100644
--- a/dlls/sane.ds/sane_main.c
+++ b/dlls/sane.ds/sane_main.c
@@ -26,7 +26,6 @@

#include "sane_i.h"
 #include "wine/debug.h"
-#include "wine/library.h"

WINE_DEFAULT_DEBUG_CHANNEL(twain);

@@ -59,22 +58,22 @@ static void *libsane_handle;
 static void close_libsane(void *h)
 {
     if (h)
-        wine_dlclose(h, NULL, 0);
+        dlclose(h);
 }

static void *open_libsane(void)
 {
     void *h;

-    h = wine_dlopen(SONAME_LIBSANE, RTLD_GLOBAL | RTLD_NOW, NULL, 0);
+    h = dlopen(SONAME_LIBSANE, RTLD_GLOBAL | RTLD_NOW);
     if (!h)
     {
-        WARN("dlopen(%s) failed\n", SONAME_LIBSANE);
+        WARN("failed to load %s; %s\n", SONAME_LIBSANE, dlerror());
         return NULL;
     }

#define LOAD_FUNCPTR(f) \
-    if((p##f = wine_dlsym(h, #f, NULL, 0)) == NULL) { \
+    if((p##f = dlsym(h, #f)) == NULL) { \
         close_libsane(h); \
         ERR("Could not dlsym %s\n", #f); \
         return NULL; \