Alexandre Julliard : msgsm32.acm: Use standard dlopen() instead of the libwine wrappers.
Alexandre Julliard
julliard at winehq.org
Mon Apr 6 15:53:21 CDT 2020
Module: wine
Branch: master
Commit: 4d0034e869a2a8754ee6d900b41609fd65a2b470
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d0034e869a2a8754ee6d900b41609fd65a2b470
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Apr 6 11:48:12 2020 +0200
msgsm32.acm: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msgsm32.acm/msgsm32.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c
index cbf396f3b4..bd54aa4fb3 100644
--- a/dlls/msgsm32.acm/msgsm32.c
+++ b/dlls/msgsm32.acm/msgsm32.c
@@ -42,7 +42,6 @@
#include "mmreg.h"
#include "msacm.h"
#include "msacmdrv.h"
-#include "wine/library.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(gsm);
@@ -58,8 +57,8 @@ FUNCPTR(gsm_encode);
FUNCPTR(gsm_decode);
#define LOAD_FUNCPTR(f) \
- if((p##f = wine_dlsym(libgsm_handle, #f, NULL, 0)) == NULL) { \
- wine_dlclose(libgsm_handle, NULL, 0); \
+ if((p##f = dlsym(libgsm_handle, #f)) == NULL) { \
+ dlclose(libgsm_handle); \
libgsm_handle = NULL; \
return FALSE; \
}
@@ -69,9 +68,7 @@ FUNCPTR(gsm_decode);
*/
static BOOL GSM_drvLoad(void)
{
- char error[128];
-
- libgsm_handle = wine_dlopen(SONAME_LIBGSM, RTLD_NOW, error, sizeof(error));
+ libgsm_handle = dlopen(SONAME_LIBGSM, RTLD_NOW);
if (libgsm_handle)
{
LOAD_FUNCPTR(gsm_create);
@@ -83,7 +80,7 @@ static BOOL GSM_drvLoad(void)
}
else
{
- ERR("Couldn't load " SONAME_LIBGSM ": %s\n", error);
+ ERR("Couldn't load " SONAME_LIBGSM ": %s\n", dlerror());
return FALSE;
}
}
@@ -94,7 +91,7 @@ static BOOL GSM_drvLoad(void)
static LRESULT GSM_drvFree(void)
{
if (libgsm_handle)
- wine_dlclose(libgsm_handle, NULL, 0);
+ dlclose(libgsm_handle);
return 1;
}
More information about the wine-cvs
mailing list