ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

glu32: Use standard dlopen() instead of the libwine wrappers. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-04-06 11:46:18 +02:00
parent 907aaf9e72
commit 55e1e0c525
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/glu32/glu.c
View File

@ -27,7 +27,6 @@
#include "wine/wgl.h" #include "wine/wgl.h"
#include "wine/glu.h" #include "wine/glu.h"
#include "wine/library.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(glu); 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 ) static BOOL WINAPI load_libglu( INIT_ONCE *once, void *param, void **context )
{ {
#ifdef SONAME_LIBGLU #ifdef SONAME_LIBGLU
char error[256]; if ((libglu_handle = dlopen( SONAME_LIBGLU, RTLD_NOW )))
if ((libglu_handle = wine_dlopen( SONAME_LIBGLU, RTLD_NOW, error, sizeof(error) )))
TRACE( "loaded %s\n", SONAME_LIBGLU ); TRACE( "loaded %s\n", SONAME_LIBGLU );
else else
ERR( "Failed to load %s: %s\n", SONAME_LIBGLU, error ); ERR( "Failed to load %s: %s\n", SONAME_LIBGLU, dlerror() );
#else #else
ERR( "libGLU is needed but support was not included at build time\n" ); ERR( "libGLU is needed but support was not included at build time\n" );
#endif #endif
@ -133,7 +130,7 @@ static void *load_glufunc( const char *name )
void *ret; void *ret;
if (!InitOnceExecuteOnce( &init_once, load_libglu, NULL, NULL )) return NULL; 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; return ret;
} }