[PATCH 3/7] opengl32: Use generated thunk for glGetStringi.

[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    | 21 ---------------------
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index e54cd5dd783..b5663438266 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -218,7 +218,6 @@ my %manual_wow64_thunks =
      "glGetBufferPointervARB" => 1,
      "glGetNamedBufferPointerv" => 1,
      "glGetNamedBufferPointervEXT" => 1,
-     "glGetStringi" => 1,
      "glMapBuffer" => 1,
      "glMapBufferARB" => 1,
      "glMapBufferRange" => 1,
diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c
index 0cb7ad4a11a..c042af5870e 100644
--- a/dlls/opengl32/unix_thunks.c
+++ b/dlls/opengl32/unix_thunks.c
@@ -10776,7 +10776,7 @@ static NTSTATUS ext_glGetStageIndexNV( void *args )
     return STATUS_SUCCESS;
 }

-NTSTATUS ext_glGetStringi( void *args )
+static NTSTATUS ext_glGetStringi( void *args )
 {
     struct glGetStringi_params *params = args;
     params->ret = wrap_glGetStringi( params->teb, params->name, params->index );
@@ -49468,6 +49468,21 @@ static NTSTATUS wow64_ext_glGetStageIndexNV( void *args )
     return STATUS_SUCCESS;
 }

+static NTSTATUS wow64_ext_glGetStringi( void *args )
+{
+    struct
+    {
+        PTR32 teb;
+        GLenum name;
+        GLuint index;
+        PTR32 ret;
+    } *params = args;
+    TEB *teb = get_teb64( params->teb );
+    const GLubyte *ret;
+    ret = wrap_glGetStringi( teb, params->name, params->index );
+    return return_wow64_string( ret, &params->ret );
+}
+
 static NTSTATUS wow64_ext_glGetSubroutineIndex( void *args )
 {
     struct
diff --git a/dlls/opengl32/unix_thunks.h b/dlls/opengl32/unix_thunks.h
index 0e887057a73..ddd20e693e5 100644
--- a/dlls/opengl32/unix_thunks.h
+++ b/dlls/opengl32/unix_thunks.h
@@ -50,8 +50,6 @@ 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_glMapBuffer( void *args );
 extern NTSTATUS wow64_ext_glMapBuffer( void *args );
 extern NTSTATUS ext_glMapBufferARB( void *args );
diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c
index 965fa488145..369c8f0a992 100644
--- a/dlls/opengl32/unix_wgl.c
+++ b/dlls/opengl32/unix_wgl.c
@@ -1511,27 +1511,6 @@ NTSTATUS wow64_wgl_wglGetProcAddress( void *args )
     return STATUS_SUCCESS;
 }

-NTSTATUS wow64_ext_glGetStringi( void *args )
-{
-    struct
-    {
-        PTR32 teb;
-        GLenum name;
-        GLuint index;
-        PTR32 ret;
-    } *params32 = args;
-    struct glGetStringi_params params =
-    {
-        .teb = get_teb64(params32->teb),
-        .name = params32->name,
-        .index = params32->index,
-    };
-    NTSTATUS status;
-
-    if ((status = ext_glGetStringi( &params ))) return status;
-    return return_wow64_string( params.ret, &params32->ret );
-}
-
 NTSTATUS wow64_ext_glPathGlyphIndexRangeNV( void *args )
 {
     struct