[PATCH 6/7] opengl32: Use generated thunk for wglQueryCurrentRendererStringWINE.

[Jacek Caban]

From: Jacek Caban

---
 dlls/opengl32/make_opengl   |  1 -
 dlls/opengl32/unix_thunks.c | 17 ++++++++++++++++-
 dlls/opengl32/unix_thunks.h |  2 --
 dlls/opengl32/unix_wgl.c    | 19 -------------------
 4 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index d88385c63ea..46adda28787 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -234,7 +234,6 @@ my %manual_wow64_thunks =
      "wglGetPbufferDCARB" => 1,
      "wglGetProcAddress" => 1,
      "wglGetProcAddress" => 1,
-     "wglQueryCurrentRendererStringWINE" => 1,
      "wglQueryRendererStringWINE" => 1,
     );
 my %manual_wow64_wrappers =
diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c
index 10c6975d9ec..62560aaf4ba 100644
--- a/dlls/opengl32/unix_thunks.c
+++ b/dlls/opengl32/unix_thunks.c
@@ -26766,7 +26766,7 @@ static NTSTATUS ext_wglQueryCurrentRendererIntegerWINE( void *args )
     return STATUS_SUCCESS;
 }

-NTSTATUS ext_wglQueryCurrentRendererStringWINE( void *args )
+static NTSTATUS ext_wglQueryCurrentRendererStringWINE( void *args )
 {
     struct wglQueryCurrentRendererStringWINE_params *params = args;
     const struct opengl_funcs *funcs = params->teb->glTable;
@@ -78506,6 +78506,21 @@ static NTSTATUS wow64_ext_wglQueryCurrentRendererIntegerWINE( void *args )
     return STATUS_SUCCESS;
 }

+static NTSTATUS wow64_ext_wglQueryCurrentRendererStringWINE( void *args )
+{
+    struct
+    {
+        PTR32 teb;
+        GLenum attribute;
+        PTR32 ret;
+    } *params = args;
+    TEB *teb = get_teb64( params->teb );
+    const GLchar *ret;
+    const struct opengl_funcs *funcs = teb->glTable;
+    ret = funcs->p_wglQueryCurrentRendererStringWINE( params->attribute );
+    return return_wow64_string( ret, &params->ret );
+}
+
 static NTSTATUS wow64_ext_wglQueryPbufferARB( void *args )
 {
     struct
diff --git a/dlls/opengl32/unix_thunks.h b/dlls/opengl32/unix_thunks.h
index 57de518e9ec..1f349514e6f 100644
--- a/dlls/opengl32/unix_thunks.h
+++ b/dlls/opengl32/unix_thunks.h
@@ -78,7 +78,5 @@ extern NTSTATUS ext_wglCreatePbufferARB( void *args );
 extern NTSTATUS wow64_ext_wglCreatePbufferARB( void *args );
 extern NTSTATUS ext_wglGetPbufferDCARB( void *args );
 extern NTSTATUS wow64_ext_wglGetPbufferDCARB( 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 );
diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c
index 68abe019ac0..5f9050d8f4d 100644
--- a/dlls/opengl32/unix_wgl.c
+++ b/dlls/opengl32/unix_wgl.c
@@ -1540,25 +1540,6 @@ NTSTATUS wow64_ext_glPathGlyphIndexRangeNV( void *args )
     return status;
 }

-NTSTATUS wow64_ext_wglQueryCurrentRendererStringWINE( void *args )
-{
-    struct
-    {
-        PTR32 teb;
-        GLenum attribute;
-        PTR32 ret;
-    } *params32 = args;
-    struct wglQueryCurrentRendererStringWINE_params params =
-    {
-        .teb = get_teb64(params32->teb),
-        .attribute = params32->attribute,
-    };
-    NTSTATUS status;
-
-    if ((status = ext_wglQueryCurrentRendererStringWINE( &params ))) return status;
-    return return_wow64_string( params.ret, &params32->ret );
-}
-
 NTSTATUS wow64_ext_wglQueryRendererStringWINE( void *args )
 {
     struct