From: Jacek Caban jacek@codeweavers.com
--- dlls/opengl32/make_opengl | 1 + dlls/opengl32/unix_thunks.h | 31 +++++++++++++++++++++++++++++++ dlls/opengl32/unix_wgl.c | 29 ----------------------------- 3 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 7fa17fd1ac9..63ab5924694 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -1294,6 +1294,7 @@ foreach (sort keys %ext_functions) next if $_ =~ /^egl/; # unix-side only API next if defined $manual_win_functions{$_}; next unless defined $manual_wow64_thunks{$_}; + print OUT "extern NTSTATUS ext_$_( void *args );\n"; print OUT "extern NTSTATUS wow64_ext_$_( void *args );\n"; }
diff --git a/dlls/opengl32/unix_thunks.h b/dlls/opengl32/unix_thunks.h index 8e2ac49d847..d893d015597 100644 --- a/dlls/opengl32/unix_thunks.h +++ b/dlls/opengl32/unix_thunks.h @@ -7,36 +7,67 @@ extern NTSTATUS wow64_wgl_wglDeleteContext( void *args ); extern NTSTATUS wow64_wgl_wglGetProcAddress( void *args ); extern NTSTATUS wow64_wgl_wglMakeCurrent( void *args ); extern NTSTATUS wow64_gl_glGetString( void *args ); +extern NTSTATUS ext_glClientWaitSync( void *args ); extern NTSTATUS wow64_ext_glClientWaitSync( void *args ); +extern NTSTATUS ext_glDeleteSync( void *args ); extern NTSTATUS wow64_ext_glDeleteSync( void *args ); +extern NTSTATUS ext_glFenceSync( void *args ); extern NTSTATUS wow64_ext_glFenceSync( void *args ); +extern NTSTATUS ext_glGetBufferPointerv( void *args ); extern NTSTATUS wow64_ext_glGetBufferPointerv( void *args ); +extern NTSTATUS ext_glGetBufferPointervARB( void *args ); extern NTSTATUS wow64_ext_glGetBufferPointervARB( void *args ); +extern NTSTATUS ext_glGetNamedBufferPointerv( void *args ); extern NTSTATUS wow64_ext_glGetNamedBufferPointerv( void *args ); +extern NTSTATUS ext_glGetNamedBufferPointervEXT( void *args ); extern NTSTATUS wow64_ext_glGetNamedBufferPointervEXT( void *args ); +extern NTSTATUS ext_glGetStringi( void *args ); extern NTSTATUS wow64_ext_glGetStringi( void *args ); +extern NTSTATUS ext_glGetSynciv( void *args ); extern NTSTATUS wow64_ext_glGetSynciv( void *args ); +extern NTSTATUS ext_glIsSync( void *args ); extern NTSTATUS wow64_ext_glIsSync( void *args ); +extern NTSTATUS ext_glMapBuffer( void *args ); extern NTSTATUS wow64_ext_glMapBuffer( void *args ); +extern NTSTATUS ext_glMapBufferARB( void *args ); extern NTSTATUS wow64_ext_glMapBufferARB( void *args ); +extern NTSTATUS ext_glMapBufferRange( void *args ); extern NTSTATUS wow64_ext_glMapBufferRange( void *args ); +extern NTSTATUS ext_glMapNamedBuffer( void *args ); extern NTSTATUS wow64_ext_glMapNamedBuffer( void *args ); +extern NTSTATUS ext_glMapNamedBufferEXT( void *args ); extern NTSTATUS wow64_ext_glMapNamedBufferEXT( void *args ); +extern NTSTATUS ext_glMapNamedBufferRange( void *args ); extern NTSTATUS wow64_ext_glMapNamedBufferRange( void *args ); +extern NTSTATUS ext_glMapNamedBufferRangeEXT( void *args ); extern NTSTATUS wow64_ext_glMapNamedBufferRangeEXT( void *args ); +extern NTSTATUS ext_glPathGlyphIndexRangeNV( void *args ); extern NTSTATUS wow64_ext_glPathGlyphIndexRangeNV( void *args ); +extern NTSTATUS ext_glUnmapBuffer( void *args ); extern NTSTATUS wow64_ext_glUnmapBuffer( void *args ); +extern NTSTATUS ext_glUnmapBufferARB( void *args ); extern NTSTATUS wow64_ext_glUnmapBufferARB( void *args ); +extern NTSTATUS ext_glUnmapNamedBuffer( void *args ); extern NTSTATUS wow64_ext_glUnmapNamedBuffer( void *args ); +extern NTSTATUS ext_glUnmapNamedBufferEXT( void *args ); extern NTSTATUS wow64_ext_glUnmapNamedBufferEXT( void *args ); +extern NTSTATUS ext_glWaitSync( void *args ); extern NTSTATUS wow64_ext_glWaitSync( void *args ); +extern NTSTATUS ext_wglCreateContextAttribsARB( void *args ); extern NTSTATUS wow64_ext_wglCreateContextAttribsARB( void *args ); +extern NTSTATUS ext_wglCreatePbufferARB( void *args ); extern NTSTATUS wow64_ext_wglCreatePbufferARB( void *args ); +extern NTSTATUS ext_wglGetExtensionsStringARB( void *args ); extern NTSTATUS wow64_ext_wglGetExtensionsStringARB( void *args ); +extern NTSTATUS ext_wglGetExtensionsStringEXT( void *args ); extern NTSTATUS wow64_ext_wglGetExtensionsStringEXT( void *args ); +extern NTSTATUS ext_wglGetPbufferDCARB( void *args ); extern NTSTATUS wow64_ext_wglGetPbufferDCARB( void *args ); +extern NTSTATUS ext_wglMakeContextCurrentARB( void *args ); extern NTSTATUS wow64_ext_wglMakeContextCurrentARB( void *args ); +extern NTSTATUS ext_wglQueryCurrentRendererStringWINE( void *args ); extern NTSTATUS wow64_ext_wglQueryCurrentRendererStringWINE( void *args ); +extern NTSTATUS ext_wglQueryRendererStringWINE( void *args ); extern NTSTATUS wow64_ext_wglQueryRendererStringWINE( void *args );
#endif diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 471eb4b9003..c9af47f50d0 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -1389,35 +1389,6 @@ NTSTATUS get_pixel_formats( void *args )
typedef ULONG PTR32;
-extern NTSTATUS ext_glClientWaitSync( void *args ); -extern NTSTATUS ext_glDeleteSync( void *args ); -extern NTSTATUS ext_glFenceSync( void *args ); -extern NTSTATUS ext_glGetBufferPointerv( void *args ); -extern NTSTATUS ext_glGetBufferPointervARB( void *args ); -extern NTSTATUS ext_glGetNamedBufferPointerv( void *args ); -extern NTSTATUS ext_glGetNamedBufferPointervEXT( void *args ); -extern NTSTATUS ext_glGetSynciv( void *args ); -extern NTSTATUS ext_glIsSync( void *args ); -extern NTSTATUS ext_glMapBuffer( void *args ); - -extern NTSTATUS ext_glUnmapBuffer( void *args ); -extern NTSTATUS ext_glUnmapBufferARB( void *args ); -extern NTSTATUS ext_glUnmapNamedBuffer( void *args ); -extern NTSTATUS ext_glUnmapNamedBufferEXT( void *args ); - -extern NTSTATUS ext_glMapBufferARB( void *args ); -extern NTSTATUS ext_glMapBufferRange( void *args ); -extern NTSTATUS ext_glMapNamedBuffer( void *args ); -extern NTSTATUS ext_glMapNamedBufferEXT( void *args ); -extern NTSTATUS ext_glMapNamedBufferRange( void *args ); -extern NTSTATUS ext_glMapNamedBufferRangeEXT( void *args ); -extern NTSTATUS ext_glPathGlyphIndexRangeNV( void *args ); -extern NTSTATUS ext_glWaitSync( void *args ); -extern NTSTATUS ext_wglGetExtensionsStringARB( void *args ); -extern NTSTATUS ext_wglGetExtensionsStringEXT( void *args ); -extern NTSTATUS ext_wglQueryCurrentRendererStringWINE( void *args ); -extern NTSTATUS ext_wglQueryRendererStringWINE( void *args ); - struct wow64_string_entry { const char *str;