system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 08:54:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

opengl32: Use the Unix call helpers.

Browse source
This commit is contained in:
Alexandre Julliard 2022-11-25 10:14:36 +01:00
parent 3b50ca0ff8
commit e9c065e590
3 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/opengl32/make_opengl
View file

@ -1054,8 +1054,7 @@ print OUT " GLsizei length;\n";
print OUT " const GLchar *message;\n";
print OUT "};\n\n";
print OUT "extern unixlib_handle_t unixlib_handle DECLSPEC_HIDDEN;\n";
print OUT "#define UNIX_CALL( func, params ) __wine_unix_call( unixlib_handle, unix_ ## func, params )\n\n";
print OUT "#define UNIX_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )\n\n";
print OUT "#endif /* __WINE_OPENGL32_UNIXLIB_H */\n";
close OUT;

3
dlls/opengl32/unixlib.h
View file

@ -25351,7 +25351,6 @@ struct wine_gl_debug_message_params
const GLchar *message;
};
extern unixlib_handle_t unixlib_handle DECLSPEC_HIDDEN;
#define UNIX_CALL( func, params ) __wine_unix_call( unixlib_handle, unix_ ## func, params )
#define UNIX_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )
#endif /* __WINE_OPENGL32_UNIXLIB_H */

12
dlls/opengl32/wgl.c
View file

@ -39,8 +39,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(opengl);
WINE_DECLARE_DEBUG_CHANNEL(fps);
unixlib_handle_t unixlib_handle = 0;
static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} };
#ifndef _WIN64
@ -1257,8 +1255,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
switch(reason)
{
case DLL_PROCESS_ATTACH:
if ((status = NtQueryVirtualMemory( GetCurrentProcess(), hinst, MemoryWineUnixFuncs,
&unixlib_handle, sizeof(unixlib_handle), NULL )))
if ((status = __wine_init_unix_call()))
{
ERR( "Failed to load unixlib, status %#lx\n", status );
return FALSE;
@ -1276,12 +1273,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
break;
case DLL_PROCESS_DETACH:
if (!unixlib_handle) return TRUE;
if ((status = UNIX_CALL( process_detach, NULL )))
{
WARN( "Failed to detach opengl32 unixlib, status %#lx\n", status );
return FALSE;
}
UNIX_CALL( process_detach, NULL );
#ifndef _WIN64
cleanup_wow64_strings();
#endif