From: Jacek Caban jacek@codeweavers.com
--- dlls/opengl32/make_opengl | 4 ++-- dlls/opengl32/unix_private.h | 37 ------------------------------------ dlls/opengl32/unix_thunks.h | 9 +++++---- 3 files changed, 7 insertions(+), 43 deletions(-)
diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 63ab5924694..a71b6067865 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -1275,18 +1275,19 @@ close OUT; # open OUT, ">unix_thunks.h" or die "cannot create unix_thunks.h"; print OUT "/* Automatically generated from http://www.opengl.org/registry files; DO NOT EDIT! */\n\n"; -print OUT "#ifdef _WIN64\n\n";
foreach (sort keys %wgl_functions) { next if defined $manual_win_functions{$_}; next unless defined $manual_wow64_thunks{$_}; + print OUT "extern NTSTATUS wgl_$_( void *args );\n"; print OUT "extern NTSTATUS wow64_wgl_$_( void *args );\n"; } foreach (sort keys %norm_functions) { next if defined $manual_win_functions{$_}; next unless defined $manual_wow64_thunks{$_}; + print OUT "extern NTSTATUS gl_$_( void *args );\n"; print OUT "extern NTSTATUS wow64_gl_$_( void *args );\n"; } foreach (sort keys %ext_functions) @@ -1298,7 +1299,6 @@ foreach (sort keys %ext_functions) print OUT "extern NTSTATUS wow64_ext_$_( void *args );\n"; }
-print OUT "\n#endif\n"; close OUT;
# diff --git a/dlls/opengl32/unix_private.h b/dlls/opengl32/unix_private.h index 46b30c33d80..683569e0f55 100644 --- a/dlls/opengl32/unix_private.h +++ b/dlls/opengl32/unix_private.h @@ -106,43 +106,6 @@ extern int wrap_wglReleasePbufferDCARB( TEB *teb, HPBUFFERARB hPbuffer, HDC hDC extern BOOL wrap_wglReleaseTexImageARB( TEB *teb, HPBUFFERARB hPbuffer, int iBuffer ); extern BOOL wrap_wglSetPbufferAttribARB( TEB *teb, HPBUFFERARB hPbuffer, const int *piAttribList );
-extern NTSTATUS wgl_wglCreateContext( void *args ); -extern NTSTATUS wgl_wglDeleteContext( void *args ); -extern NTSTATUS wgl_wglGetProcAddress( void *args ); -extern NTSTATUS wgl_wglMakeCurrent( void *args ); -extern NTSTATUS gl_glGetString( void *args ); -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_glGetStringi( void *args ); -extern NTSTATUS ext_glGetSynciv( void *args ); -extern NTSTATUS ext_glIsSync( void *args ); -extern NTSTATUS ext_glMapBuffer( 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_glUnmapBuffer( void *args ); -extern NTSTATUS ext_glUnmapBufferARB( void *args ); -extern NTSTATUS ext_glUnmapNamedBuffer( void *args ); -extern NTSTATUS ext_glUnmapNamedBufferEXT( void *args ); -extern NTSTATUS ext_glWaitSync( void *args ); -extern NTSTATUS ext_wglCreateContextAttribsARB( void *args ); -extern NTSTATUS ext_wglCreatePbufferARB( void *args ); -extern NTSTATUS ext_wglGetExtensionsStringARB( void *args ); -extern NTSTATUS ext_wglGetExtensionsStringEXT( void *args ); -extern NTSTATUS ext_wglGetPbufferDCARB( void *args ); -extern NTSTATUS ext_wglMakeContextCurrentARB( void *args ); -extern NTSTATUS ext_wglQueryCurrentRendererStringWINE( void *args ); -extern NTSTATUS ext_wglQueryRendererStringWINE( void *args ); - extern void set_context_attribute( TEB *teb, GLenum name, const void *value, size_t size );
#endif /* __WINE_OPENGL32_UNIX_PRIVATE_H */ diff --git a/dlls/opengl32/unix_thunks.h b/dlls/opengl32/unix_thunks.h index d893d015597..181415a0b46 100644 --- a/dlls/opengl32/unix_thunks.h +++ b/dlls/opengl32/unix_thunks.h @@ -1,11 +1,14 @@ /* Automatically generated from http://www.opengl.org/registry files; DO NOT EDIT! */
-#ifdef _WIN64 - +extern NTSTATUS wgl_wglCreateContext( void *args ); extern NTSTATUS wow64_wgl_wglCreateContext( void *args ); +extern NTSTATUS wgl_wglDeleteContext( void *args ); extern NTSTATUS wow64_wgl_wglDeleteContext( void *args ); +extern NTSTATUS wgl_wglGetProcAddress( void *args ); extern NTSTATUS wow64_wgl_wglGetProcAddress( void *args ); +extern NTSTATUS wgl_wglMakeCurrent( void *args ); extern NTSTATUS wow64_wgl_wglMakeCurrent( void *args ); +extern NTSTATUS gl_glGetString( void *args ); extern NTSTATUS wow64_gl_glGetString( void *args ); extern NTSTATUS ext_glClientWaitSync( void *args ); extern NTSTATUS wow64_ext_glClientWaitSync( void *args ); @@ -69,5 +72,3 @@ 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