Alexandre Julliard : ctapi32: Use standard dlopen() instead of the libwine wrappers.
Alexandre Julliard
julliard at winehq.org
Mon Apr 6 15:53:20 CDT 2020
Module: wine
Branch: master
Commit: 3b9ddb66add8a361c9288817d508c29b5ccd1f10
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b9ddb66add8a361c9288817d508c29b5ccd1f10
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Apr 6 11:45:10 2020 +0200
ctapi32: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ctapi32/ctapi32.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c
index a2dc5bca87..10adacb65d 100644
--- a/dlls/ctapi32/ctapi32.c
+++ b/dlls/ctapi32/ctapi32.c
@@ -21,7 +21,6 @@
#include "config.h"
#include "wine/port.h"
#include <string.h>
-#include "wine/library.h"
#include "wine/debug.h"
#include "windef.h"
#include "winreg.h"
@@ -72,7 +71,7 @@ static BOOL load_functions(void) {
}
TRACE("Loading library '%s'\n", soname);
- ctapi_handle = wine_dlopen(soname, RTLD_NOW, NULL, 0);
+ ctapi_handle = dlopen(soname, RTLD_NOW);
if (ctapi_handle) {
TRACE("Successfully loaded '%s'\n", soname);
}
@@ -83,7 +82,7 @@ static BOOL load_functions(void) {
return FALSE;
}
-#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ctapi_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return FALSE;}
+#define LOAD_FUNCPTR(f) if((p##f = dlsym(ctapi_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); return FALSE;}
LOAD_FUNCPTR(CT_init);
LOAD_FUNCPTR(CT_data);
LOAD_FUNCPTR(CT_close);
@@ -134,7 +133,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
break;
case DLL_PROCESS_DETACH:
if (lpvReserved) break;
- if (ctapi_handle) wine_dlclose(ctapi_handle, NULL, 0);
+ if (ctapi_handle) dlclose(ctapi_handle);
break;
}
More information about the wine-cvs
mailing list