capi2032: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
3caa333127
commit
e39b3a2faf
|
@ -37,7 +37,6 @@
|
||||||
#ifdef HAVE_CAPI20_H
|
#ifdef HAVE_CAPI20_H
|
||||||
# include <capi20.h>
|
# include <capi20.h>
|
||||||
#endif
|
#endif
|
||||||
#include "wine/library.h"
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
#include "cap20wxx.h"
|
#include "cap20wxx.h"
|
||||||
|
|
||||||
|
@ -61,12 +60,12 @@ static void load_functions(void) {
|
||||||
|
|
||||||
if (pcapi20_register) /* loaded already */
|
if (pcapi20_register) /* loaded already */
|
||||||
return;
|
return;
|
||||||
capi_handle = wine_dlopen(SONAME_LIBCAPI20, RTLD_NOW, NULL, 0);
|
capi_handle = dlopen(SONAME_LIBCAPI20, RTLD_NOW);
|
||||||
if(!capi_handle) {
|
if(!capi_handle) {
|
||||||
FIXME("Wine cannot find the library %s, capi2032.dll not working.\n", SONAME_LIBCAPI20);
|
FIXME("Wine cannot find the library %s, capi2032.dll not working.\n", SONAME_LIBCAPI20);
|
||||||
return;
|
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_register);
|
||||||
LOAD_FUNCPTR(capi20_release);
|
LOAD_FUNCPTR(capi20_release);
|
||||||
LOAD_FUNCPTR(capi20_put_message);
|
LOAD_FUNCPTR(capi20_put_message);
|
||||||
|
|
Loading…
Reference in New Issue