Alexandre Julliard : capi2032: 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: e39b3a2faff8fd9a3aa4807c7035be310e215a89
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e39b3a2faff8fd9a3aa4807c7035be310e215a89
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Apr 6 11:44:41 2020 +0200
capi2032: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/capi2032/cap20wxx.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/capi2032/cap20wxx.c b/dlls/capi2032/cap20wxx.c
index a6f3e3fc95..6f22a020f3 100644
--- a/dlls/capi2032/cap20wxx.c
+++ b/dlls/capi2032/cap20wxx.c
@@ -37,7 +37,6 @@
#ifdef HAVE_CAPI20_H
# include <capi20.h>
#endif
-#include "wine/library.h"
#include "wine/debug.h"
#include "cap20wxx.h"
@@ -61,12 +60,12 @@ static void load_functions(void) {
if (pcapi20_register) /* loaded already */
return;
- capi_handle = wine_dlopen(SONAME_LIBCAPI20, RTLD_NOW, NULL, 0);
+ capi_handle = dlopen(SONAME_LIBCAPI20, RTLD_NOW);
if(!capi_handle) {
FIXME("Wine cannot find the library %s, capi2032.dll not working.\n", SONAME_LIBCAPI20);
return;
}
-#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(capi_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return;}
+#define LOAD_FUNCPTR(f) if((p##f = dlsym(capi_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); return;}
LOAD_FUNCPTR(capi20_register);
LOAD_FUNCPTR(capi20_release);
LOAD_FUNCPTR(capi20_put_message);
More information about the wine-cvs
mailing list