Alexandre Julliard : glu32: 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: 55e1e0c525022b2bcc18d0d4862df56195a6645a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e1e0c525022b2bcc18d0d4862df56195a6645a
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Apr 6 11:46:18 2020 +0200
glu32: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/glu32/glu.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c
index 8f0a360ff9..827b1012bb 100644
--- a/dlls/glu32/glu.c
+++ b/dlls/glu32/glu.c
@@ -27,7 +27,6 @@
#include "wine/wgl.h"
#include "wine/glu.h"
-#include "wine/library.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(glu);
@@ -116,12 +115,10 @@ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT;
static BOOL WINAPI load_libglu( INIT_ONCE *once, void *param, void **context )
{
#ifdef SONAME_LIBGLU
- char error[256];
-
- if ((libglu_handle = wine_dlopen( SONAME_LIBGLU, RTLD_NOW, error, sizeof(error) )))
+ if ((libglu_handle = dlopen( SONAME_LIBGLU, RTLD_NOW )))
TRACE( "loaded %s\n", SONAME_LIBGLU );
else
- ERR( "Failed to load %s: %s\n", SONAME_LIBGLU, error );
+ ERR( "Failed to load %s: %s\n", SONAME_LIBGLU, dlerror() );
#else
ERR( "libGLU is needed but support was not included at build time\n" );
#endif
@@ -133,7 +130,7 @@ static void *load_glufunc( const char *name )
void *ret;
if (!InitOnceExecuteOnce( &init_once, load_libglu, NULL, NULL )) return NULL;
- if (!(ret = wine_dlsym( libglu_handle, name, NULL, 0 ))) ERR( "Can't find %s\n", name );
+ if (!(ret = dlsym( libglu_handle, name ))) ERR( "Can't find %s\n", name );
return ret;
}
More information about the wine-cvs
mailing list