Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
553a134f
Commit
553a134f
authored
Apr 06, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sane.ds: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0c432938
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
sane_main.c
dlls/sane.ds/sane_main.c
+4
-5
No files found.
dlls/sane.ds/sane_main.c
View file @
553a134f
...
@@ -26,7 +26,6 @@
...
@@ -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;
...
@@ -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; \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment