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
4d0034e8
Commit
4d0034e8
authored
Apr 06, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msgsm32.acm: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
cf19a7ac
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
8 deletions
+5
-8
msgsm32.c
dlls/msgsm32.acm/msgsm32.c
+5
-8
No files found.
dlls/msgsm32.acm/msgsm32.c
View file @
4d0034e8
...
@@ -42,7 +42,6 @@
...
@@ -42,7 +42,6 @@
#include "mmreg.h"
#include "mmreg.h"
#include "msacm.h"
#include "msacm.h"
#include "msacmdrv.h"
#include "msacmdrv.h"
#include "wine/library.h"
#include "wine/debug.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
gsm
);
WINE_DEFAULT_DEBUG_CHANNEL
(
gsm
);
...
@@ -58,8 +57,8 @@ FUNCPTR(gsm_encode);
...
@@ -58,8 +57,8 @@ FUNCPTR(gsm_encode);
FUNCPTR
(
gsm_decode
);
FUNCPTR
(
gsm_decode
);
#define LOAD_FUNCPTR(f) \
#define LOAD_FUNCPTR(f) \
if((p##f =
wine_dlsym(libgsm_handle, #f, NULL, 0
)) == NULL) { \
if((p##f =
dlsym(libgsm_handle, #f
)) == NULL) { \
wine_dlclose(libgsm_handle, NULL, 0
); \
dlclose(libgsm_handle
); \
libgsm_handle = NULL; \
libgsm_handle = NULL; \
return FALSE; \
return FALSE; \
}
}
...
@@ -69,9 +68,7 @@ FUNCPTR(gsm_decode);
...
@@ -69,9 +68,7 @@ FUNCPTR(gsm_decode);
*/
*/
static
BOOL
GSM_drvLoad
(
void
)
static
BOOL
GSM_drvLoad
(
void
)
{
{
char
error
[
128
];
libgsm_handle
=
dlopen
(
SONAME_LIBGSM
,
RTLD_NOW
);
libgsm_handle
=
wine_dlopen
(
SONAME_LIBGSM
,
RTLD_NOW
,
error
,
sizeof
(
error
));
if
(
libgsm_handle
)
if
(
libgsm_handle
)
{
{
LOAD_FUNCPTR
(
gsm_create
);
LOAD_FUNCPTR
(
gsm_create
);
...
@@ -83,7 +80,7 @@ static BOOL GSM_drvLoad(void)
...
@@ -83,7 +80,7 @@ static BOOL GSM_drvLoad(void)
}
}
else
else
{
{
ERR
(
"Couldn't load "
SONAME_LIBGSM
": %s
\n
"
,
error
);
ERR
(
"Couldn't load "
SONAME_LIBGSM
": %s
\n
"
,
dlerror
()
);
return
FALSE
;
return
FALSE
;
}
}
}
}
...
@@ -94,7 +91,7 @@ static BOOL GSM_drvLoad(void)
...
@@ -94,7 +91,7 @@ static BOOL GSM_drvLoad(void)
static
LRESULT
GSM_drvFree
(
void
)
static
LRESULT
GSM_drvFree
(
void
)
{
{
if
(
libgsm_handle
)
if
(
libgsm_handle
)
wine_dlclose
(
libgsm_handle
,
NULL
,
0
);
dlclose
(
libgsm_handle
);
return
1
;
return
1
;
}
}
...
...
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