From: Jacek Caban jacek@codeweavers.com
--- dlls/opengl32/make_opengl | 1 - dlls/opengl32/unix_thunks.c | 16 +++++++++++++++- dlls/opengl32/unix_thunks.h | 2 -- dlls/opengl32/unix_wgl.c | 17 ----------------- 4 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index f3ce26e77ad..d88385c63ea 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -231,7 +231,6 @@ my %manual_wow64_thunks = "glUnmapNamedBuffer" => 1, "glUnmapNamedBufferEXT" => 1, "wglCreatePbufferARB" => 1, - "wglGetExtensionsStringEXT" => 1, "wglGetPbufferDCARB" => 1, "wglGetProcAddress" => 1, "wglGetProcAddress" => 1, diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 1df390a2c65..10c6975d9ec 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -26706,7 +26706,7 @@ static NTSTATUS ext_wglGetExtensionsStringARB( void *args ) return STATUS_SUCCESS; }
-NTSTATUS ext_wglGetExtensionsStringEXT( void *args ) +static NTSTATUS ext_wglGetExtensionsStringEXT( void *args ) { struct wglGetExtensionsStringEXT_params *params = args; const struct opengl_funcs *funcs = params->teb->glTable; @@ -78409,6 +78409,20 @@ static NTSTATUS wow64_ext_wglGetExtensionsStringARB( void *args ) return return_wow64_string( ret, ¶ms->ret ); }
+static NTSTATUS wow64_ext_wglGetExtensionsStringEXT( void *args ) +{ + struct + { + PTR32 teb; + PTR32 ret; + } *params = args; + TEB *teb = get_teb64( params->teb ); + const char *ret; + const struct opengl_funcs *funcs = teb->glTable; + ret = funcs->p_wglGetExtensionsStringEXT(); + return return_wow64_string( ret, ¶ms->ret ); +} + static NTSTATUS wow64_ext_wglGetPixelFormatAttribfvARB( void *args ) { struct diff --git a/dlls/opengl32/unix_thunks.h b/dlls/opengl32/unix_thunks.h index 4568018ee09..57de518e9ec 100644 --- a/dlls/opengl32/unix_thunks.h +++ b/dlls/opengl32/unix_thunks.h @@ -76,8 +76,6 @@ extern NTSTATUS ext_glUnmapNamedBufferEXT( void *args ); extern NTSTATUS wow64_ext_glUnmapNamedBufferEXT( void *args ); extern NTSTATUS ext_wglCreatePbufferARB( void *args ); extern NTSTATUS wow64_ext_wglCreatePbufferARB( 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_wglQueryCurrentRendererStringWINE( void *args ); diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 7b9ad090b35..68abe019ac0 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -1540,23 +1540,6 @@ NTSTATUS wow64_ext_glPathGlyphIndexRangeNV( void *args ) return status; }
-NTSTATUS wow64_ext_wglGetExtensionsStringEXT( void *args ) -{ - struct - { - PTR32 teb; - PTR32 ret; - } *params32 = args; - struct wglGetExtensionsStringEXT_params params = - { - .teb = get_teb64(params32->teb), - }; - NTSTATUS status; - - if ((status = ext_wglGetExtensionsStringEXT( ¶ms ))) return status; - return return_wow64_string( params.ret, ¶ms32->ret ); -} - NTSTATUS wow64_ext_wglQueryCurrentRendererStringWINE( void *args ) { struct