[PATCH v10 04/10] opengl32: Do not store debug message callback in kernel callback table.

[Torge Matthies]

From: Torge Matthies

Signed-off-by: Torge Matthies 
---
 dlls/opengl32/make_opengl   | 14 +++++++++++++-
 dlls/opengl32/unix_thunks.c |  2 ++
 dlls/opengl32/unix_wgl.c    | 15 ++++++++++-----
 dlls/opengl32/unixlib.h     |  9 +++++++++
 dlls/opengl32/wgl.c         | 10 +++++-----
 dlls/wow64win/user.c        |  8 --------
 include/ntuser.h            |  2 --
 include/wine/wgl_driver.h   |  2 +-
 8 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index 78368ec6c2f..a77661684b9 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -796,10 +796,19 @@ print OUT "#define WIN32_NO_STATUS\n";
 print OUT "#include "windef.h"\n";
 print OUT "#include "winbase.h"\n";
 print OUT "#include "winternl.h"\n";
-print OUT "#include "wingdi.h"\n\n";
+print OUT "#include "wingdi.h"\n";
+print OUT "#include "ntuser.h"\n\n";
 print OUT "#include "wine/wgl.h"\n";
 print OUT "#include "wine/unixlib.h"\n\n";

+print OUT "struct wine_gl_debug_message_params;\n\n";
+
+print OUT "struct wglInit_params\n";
+print OUT "{\n";
+print OUT "    BOOL (*WINAPI call_opengl_debug_message_callback)( struct wine_gl_debug_message_params *params,";
+print OUT " ULONG size );\n";
+print OUT "};\n\n";
+
 foreach (sort keys %wgl_functions)
 {
     next if defined $manual_win_functions{$_};
@@ -818,6 +827,7 @@ foreach (sort keys %ext_functions)

print OUT "enum unix_funcs\n";
 print OUT "{\n";
+print OUT "    unix_wglInit,\n";
 foreach (sort keys %wgl_functions)
 {
     next if defined $manual_win_functions{$_};
@@ -936,6 +946,7 @@ print OUT "#include "wingdi.h"\n\n";
 print OUT "#include "unixlib.h"\n\n";
 print OUT "#include "opengl_ext.h"\n\n";

+print OUT "extern NTSTATUS wgl_wglInit( void *args ) DECLSPEC_HIDDEN;\n";
 foreach (sort keys %wgl_functions)
 {
     next if defined $manual_win_functions{$_};
@@ -970,6 +981,7 @@ foreach (sort keys %ext_functions)

print OUT "const unixlib_function_t __wine_unix_call_funcs[] =\n";
 print OUT "{\n";
+print OUT "    &wgl_wglInit,\n";
 foreach (sort keys %wgl_functions)
 {
     next if defined $manual_win_functions{$_};
diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c
index 86af754b278..be0caeed7eb 100644
--- a/dlls/opengl32/unix_thunks.c
+++ b/dlls/opengl32/unix_thunks.c
@@ -13,6 +13,7 @@

#include "opengl_ext.h"

+extern NTSTATUS wgl_wglInit( void *args ) DECLSPEC_HIDDEN;
 extern NTSTATUS wgl_wglCopyContext( void *args ) DECLSPEC_HIDDEN;
 extern NTSTATUS wgl_wglCreateContext( void *args ) DECLSPEC_HIDDEN;
 extern NTSTATUS wgl_wglDeleteContext( void *args ) DECLSPEC_HIDDEN;
@@ -24172,6 +24173,7 @@ static NTSTATUS ext_wglSwapIntervalEXT( void *args )

const unixlib_function_t __wine_unix_call_funcs[] =
 {
+    &wgl_wglInit,
     &wgl_wglCopyContext,
     &wgl_wglCreateContext,
     &wgl_wglDeleteContext,
diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c
index 4771205a47e..c56ddf43093 100644
--- a/dlls/opengl32/unix_wgl.c
+++ b/dlls/opengl32/unix_wgl.c
@@ -35,6 +35,8 @@

#include "wine/debug.h"

+static BOOL (*WINAPI call_opengl_debug_message_callback)( struct wine_gl_debug_message_params *params, ULONG size );
+
 struct wgl_handle wgl_handles[MAX_WGL_HANDLES];
 static struct wgl_handle *next_free;
 static unsigned int handle_count;
@@ -408,16 +410,12 @@ static void gl_debug_message_callback( GLenum source, GLenum type, GLuint id, GL
         .length = length,
         .message = message,
     };
-    BOOL (WINAPI *callback)( struct wine_gl_debug_message_params *params, ULONG size );
-    void **kernel_callback_table;

struct wgl_handle *ptr = (struct wgl_handle *)userParam;
     if (!(params.user_callback = ptr->u.context->debug_callback)) return;
     params.user_data = ptr->u.context->debug_user;

-    kernel_callback_table = NtCurrentTeb()->Peb->KernelCallbackTable;
-    callback = kernel_callback_table[NtUserCallOpenGLDebugMessageCallback];
-    callback( &params, sizeof(params) );
+    call_opengl_debug_message_callback( &params, sizeof(params) );
 }

static void WINAPI wrap_glDebugMessageCallback( GLDEBUGPROC callback, const void *userParam )
@@ -456,6 +454,13 @@ static void WINAPI wrap_glDebugMessageCallbackARB( GLDEBUGPROCARB callback, cons
     funcs->ext.p_glDebugMessageCallbackARB( gl_debug_message_callback, ptr );
 }

+NTSTATUS wgl_wglInit( void *args )
+{
+    struct wglInit_params *params = args;
+    call_opengl_debug_message_callback = params->call_opengl_debug_message_callback;
+    return STATUS_SUCCESS;
+}
+
 NTSTATUS wgl_wglCopyContext( void *args )
 {
     struct wglCopyContext_params *params = args;
diff --git a/dlls/opengl32/unixlib.h b/dlls/opengl32/unixlib.h
index 68e66b47a3a..46de5c4a277 100644
--- a/dlls/opengl32/unixlib.h
+++ b/dlls/opengl32/unixlib.h
@@ -12,10 +12,18 @@
 #include "winbase.h"
 #include "winternl.h"
 #include "wingdi.h"
+#include "ntuser.h"

#include "wine/wgl.h"
 #include "wine/unixlib.h"

+struct wine_gl_debug_message_params;
+
+struct wglInit_params
+{
+    BOOL (*WINAPI call_opengl_debug_message_callback)( struct wine_gl_debug_message_params *params, ULONG size );
+};
+
 struct wglCopyContext_params
 {
     HGLRC hglrcSrc;
@@ -22293,6 +22301,7 @@ struct wglSwapIntervalEXT_params

enum unix_funcs
 {
+    unix_wglInit,
     unix_wglCopyContext,
     unix_wglCreateContext,
     unix_wglDeleteContext,
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index d5b0a78b916..89d9b1b85ef 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -1228,16 +1228,16 @@ static BOOL WINAPI call_opengl_debug_message_callback( struct wine_gl_debug_mess
  */
 BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 {
-    void **kernel_callback_table;
-
     switch(reason)
     {
     case DLL_PROCESS_ATTACH:
+    {
+        struct wglInit_params args = { (void*)call_opengl_debug_message_callback, };
+
         NtCurrentTeb()->glTable = &null_opengl_funcs;

-        kernel_callback_table = NtCurrentTeb()->Peb->KernelCallbackTable;
-        kernel_callback_table[NtUserCallOpenGLDebugMessageCallback] = call_opengl_debug_message_callback;
-        break;
+        return !UNIX_CALL( wglInit, &args );
+    }
     case DLL_THREAD_ATTACH:
         NtCurrentTeb()->glTable = &null_opengl_funcs;
         break;
diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c
index ddb3966a0b0..6276e8d8e1d 100644
--- a/dlls/wow64win/user.c
+++ b/dlls/wow64win/user.c
@@ -1045,12 +1045,6 @@ static NTSTATUS WINAPI wow64_NtUserThunkLock( void *arg, ULONG size )
     return dispatch_callback( NtUserThunkLock, arg, size );
 }

-static NTSTATUS WINAPI wow64_NtUserCallOpenGLDebugMessageCallback( void *arg, ULONG size )
-{
-    FIXME( "\n" );
-    return 0;
-}
-
 static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst0( void *arg, ULONG size )
 {
     return dispatch_callback( NtUserDriverCallbackFirst + 0, arg, size );
@@ -1127,8 +1121,6 @@ user_callback user_callbacks[] =
     /* win16 hooks */
     wow64_NtUserCallFreeIcon,
     wow64_NtUserThunkLock,
-    /* OpenGL support */
-    wow64_NtUserCallOpenGLDebugMessageCallback,
     /* Driver-specific callbacks */
     wow64_NtUserDriverCallbackFirst0,
     wow64_NtUserDriverCallbackFirst1,
diff --git a/include/ntuser.h b/include/ntuser.h
index 1065b5e3e92..343d22bd9bd 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -51,8 +51,6 @@ enum
     /* win16 hooks */
     NtUserCallFreeIcon,
     NtUserThunkLock,
-    /* OpenGL support */
-    NtUserCallOpenGLDebugMessageCallback,
     /* Driver-specific callbacks */
     NtUserDriverCallbackFirst,
     NtUserDriverCallbackLast = NtUserDriverCallbackFirst + 9,
diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h
index 36b1f384ddf..24ade7399c7 100644
--- a/include/wine/wgl_driver.h
+++ b/include/wine/wgl_driver.h
@@ -7,7 +7,7 @@
 #define WINE_GLAPI
 #endif

-#define WINE_WGL_DRIVER_VERSION 21
+#define WINE_WGL_DRIVER_VERSION 22

struct wgl_context;
 struct wgl_pbuffer;