[PATCH 2/3] opengl32: Use generated PE thunks for memory mapping functions.

[Jacek Caban]

From: Jacek Caban

---
 dlls/opengl32/make_opengl   |  21 +++-----
 dlls/opengl32/thunks.c      |  70 ++++++++++++++++++++++---
 dlls/opengl32/unix_thunks.c |  21 +++-----
 dlls/opengl32/unix_thunks.h |  14 ++---
 dlls/opengl32/unix_wgl.c    |  64 +++++++++++-----------
 dlls/opengl32/unixlib.h     |  21 --------
 dlls/opengl32/wgl.c         | 102 ------------------------------------
 7 files changed, 115 insertions(+), 198 deletions(-)

diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index 97a3a1fb950..ed75fa8634f 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -173,13 +173,6 @@ my %manual_win_thunks =
     (
      "glGetString" => 1,
      "glGetStringi" => 1,
-     "glMapBuffer" => 1,
-     "glMapBufferARB" => 1,
-     "glMapBufferRange" => 1,
-     "glMapNamedBuffer" => 1,
-     "glMapNamedBufferEXT" => 1,
-     "glMapNamedBufferRange" => 1,
-     "glMapNamedBufferRangeEXT" => 1,
      "glUnmapBuffer" => 1,
      "glUnmapBufferARB" => 1,
      "glUnmapNamedBuffer" => 1,
@@ -298,13 +291,13 @@ my %manual_wow64_wrappers =
      "glGetNamedBufferPointervEXT" => 0,
      "glGetSynciv" => 0,
      "glIsSync" => 0,
-     "glMapBuffer" => 1,
-     "glMapBufferARB" => 1,
-     "glMapBufferRange" => 1,
-     "glMapNamedBuffer" => 1,
-     "glMapNamedBufferEXT" => 1,
-     "glMapNamedBufferRange" => 1,
-     "glMapNamedBufferRangeEXT" => 1,
+     "glMapBuffer" => 0,
+     "glMapBufferARB" => 0,
+     "glMapBufferRange" => 0,
+     "glMapNamedBuffer" => 0,
+     "glMapNamedBufferEXT" => 0,
+     "glMapNamedBufferRange" => 0,
+     "glMapNamedBufferRangeEXT" => 0,
      "glUnmapBuffer" => 1,
      "glUnmapBufferARB" => 1,
      "glUnmapNamedBuffer" => 1,
diff --git a/dlls/opengl32/thunks.c b/dlls/opengl32/thunks.c
index 319d6e0c359..94f2df1878e 100644
--- a/dlls/opengl32/thunks.c
+++ b/dlls/opengl32/thunks.c
@@ -12138,6 +12138,33 @@ static void WINAPI glMap2xOES( GLenum target, GLfixed u1, GLfixed u2, GLint ustr
     if ((status = UNIX_CALL( glMap2xOES, &args ))) WARN( "glMap2xOES returned %#lx\n", status );
 }

+static void * WINAPI glMapBuffer( GLenum target, GLenum access )
+{
+    struct glMapBuffer_params args = { .teb = NtCurrentTeb(), .target = target, .access = access };
+    NTSTATUS status;
+    TRACE( "target %d, access %d\n", target, access );
+    if ((status = UNIX_CALL( glMapBuffer, &args ))) WARN( "glMapBuffer returned %#lx\n", status );
+    return args.ret;
+}
+
+static void * WINAPI glMapBufferARB( GLenum target, GLenum access )
+{
+    struct glMapBufferARB_params args = { .teb = NtCurrentTeb(), .target = target, .access = access };
+    NTSTATUS status;
+    TRACE( "target %d, access %d\n", target, access );
+    if ((status = UNIX_CALL( glMapBufferARB, &args ))) WARN( "glMapBufferARB returned %#lx\n", status );
+    return args.ret;
+}
+
+static void * WINAPI glMapBufferRange( GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access )
+{
+    struct glMapBufferRange_params args = { .teb = NtCurrentTeb(), .target = target, .offset = offset, .length = length, .access = access };
+    NTSTATUS status;
+    TRACE( "target %d, offset %Id, length %Id, access %d\n", target, offset, length, access );
+    if ((status = UNIX_CALL( glMapBufferRange, &args ))) WARN( "glMapBufferRange returned %#lx\n", status );
+    return args.ret;
+}
+
 static void WINAPI glMapControlPointsNV( GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void *points )
 {
     struct glMapControlPointsNV_params args = { .teb = NtCurrentTeb(), .target = target, .index = index, .type = type, .ustride = ustride, .vstride = vstride, .uorder = uorder, .vorder = vorder, .packed = packed, .points = points };
@@ -12162,6 +12189,42 @@ static void WINAPI glMapGrid2xOES( GLint n, GLfixed u1, GLfixed u2, GLfixed v1,
     if ((status = UNIX_CALL( glMapGrid2xOES, &args ))) WARN( "glMapGrid2xOES returned %#lx\n", status );
 }

+static void * WINAPI glMapNamedBuffer( GLuint buffer, GLenum access )
+{
+    struct glMapNamedBuffer_params args = { .teb = NtCurrentTeb(), .buffer = buffer, .access = access };
+    NTSTATUS status;
+    TRACE( "buffer %d, access %d\n", buffer, access );
+    if ((status = UNIX_CALL( glMapNamedBuffer, &args ))) WARN( "glMapNamedBuffer returned %#lx\n", status );
+    return args.ret;
+}
+
+static void * WINAPI glMapNamedBufferEXT( GLuint buffer, GLenum access )
+{
+    struct glMapNamedBufferEXT_params args = { .teb = NtCurrentTeb(), .buffer = buffer, .access = access };
+    NTSTATUS status;
+    TRACE( "buffer %d, access %d\n", buffer, access );
+    if ((status = UNIX_CALL( glMapNamedBufferEXT, &args ))) WARN( "glMapNamedBufferEXT returned %#lx\n", status );
+    return args.ret;
+}
+
+static void * WINAPI glMapNamedBufferRange( GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access )
+{
+    struct glMapNamedBufferRange_params args = { .teb = NtCurrentTeb(), .buffer = buffer, .offset = offset, .length = length, .access = access };
+    NTSTATUS status;
+    TRACE( "buffer %d, offset %Id, length %Id, access %d\n", buffer, offset, length, access );
+    if ((status = UNIX_CALL( glMapNamedBufferRange, &args ))) WARN( "glMapNamedBufferRange returned %#lx\n", status );
+    return args.ret;
+}
+
+static void * WINAPI glMapNamedBufferRangeEXT( GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access )
+{
+    struct glMapNamedBufferRangeEXT_params args = { .teb = NtCurrentTeb(), .buffer = buffer, .offset = offset, .length = length, .access = access };
+    NTSTATUS status;
+    TRACE( "buffer %d, offset %Id, length %Id, access %d\n", buffer, offset, length, access );
+    if ((status = UNIX_CALL( glMapNamedBufferRangeEXT, &args ))) WARN( "glMapNamedBufferRangeEXT returned %#lx\n", status );
+    return args.ret;
+}
+
 static void * WINAPI glMapObjectBufferATI( GLuint buffer )
 {
     struct glMapObjectBufferATI_params args = { .teb = NtCurrentTeb(), .buffer = buffer };
@@ -24298,13 +24361,6 @@ static BOOL WINAPI wglSwapIntervalEXT( int interval )
 }

extern const GLubyte * WINAPI glGetStringi( GLenum name, GLuint index );
-extern void * WINAPI glMapBuffer( GLenum target, GLenum access );
-extern void * WINAPI glMapBufferARB( GLenum target, GLenum access );
-extern void * WINAPI glMapBufferRange( GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access );
-extern void * WINAPI glMapNamedBuffer( GLuint buffer, GLenum access );
-extern void * WINAPI glMapNamedBufferEXT( GLuint buffer, GLenum access );
-extern void * WINAPI glMapNamedBufferRange( GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access );
-extern void * WINAPI glMapNamedBufferRangeEXT( GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access );
 extern GLboolean WINAPI glUnmapBuffer( GLenum target );
 extern GLboolean WINAPI glUnmapBufferARB( GLenum target );
 extern GLboolean WINAPI glUnmapNamedBuffer( GLuint buffer );
diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c
index abec508aafb..6c2be9b763c 100644
--- a/dlls/opengl32/unix_thunks.c
+++ b/dlls/opengl32/unix_thunks.c
@@ -53900,10 +53900,9 @@ static NTSTATUS wow64_ext_glMapBuffer( void *args )
         GLenum target;
         GLenum access;
         PTR32 ret;
-        PTR32 client_ptr;
     } *params = args;
     TEB *teb = get_teb64( params->teb );
-    params->ret = wow64_glMapBuffer( teb, params->target, params->access, &params->client_ptr );
+    params->ret = wow64_glMapBuffer( teb, params->target, params->access );
     set_context_attribute( teb, -1 /* unsupported */, NULL, 0 );
     return STATUS_SUCCESS;
 }
@@ -53916,10 +53915,9 @@ static NTSTATUS wow64_ext_glMapBufferARB( void *args )
         GLenum target;
         GLenum access;
         PTR32 ret;
-        PTR32 client_ptr;
     } *params = args;
     TEB *teb = get_teb64( params->teb );
-    params->ret = wow64_glMapBufferARB( teb, params->target, params->access, &params->client_ptr );
+    params->ret = wow64_glMapBufferARB( teb, params->target, params->access );
     set_context_attribute( teb, -1 /* unsupported */, NULL, 0 );
     return STATUS_SUCCESS;
 }
@@ -53934,10 +53932,9 @@ static NTSTATUS wow64_ext_glMapBufferRange( void *args )
         PTR32 length;
         GLbitfield access;
         PTR32 ret;
-        PTR32 client_ptr;
     } *params = args;
     TEB *teb = get_teb64( params->teb );
-    params->ret = wow64_glMapBufferRange( teb, params->target, (GLintptr)ULongToPtr(params->offset), (GLsizeiptr)ULongToPtr(params->length), params->access, &params->client_ptr );
+    params->ret = wow64_glMapBufferRange( teb, params->target, (GLintptr)ULongToPtr(params->offset), (GLsizeiptr)ULongToPtr(params->length), params->access );
     set_context_attribute( teb, -1 /* unsupported */, NULL, 0 );
     return STATUS_SUCCESS;
 }
@@ -54006,10 +54003,9 @@ static NTSTATUS wow64_ext_glMapNamedBuffer( void *args )
         GLuint buffer;
         GLenum access;
         PTR32 ret;
-        PTR32 client_ptr;
     } *params = args;
     TEB *teb = get_teb64( params->teb );
-    params->ret = wow64_glMapNamedBuffer( teb, params->buffer, params->access, &params->client_ptr );
+    params->ret = wow64_glMapNamedBuffer( teb, params->buffer, params->access );
     set_context_attribute( teb, -1 /* unsupported */, NULL, 0 );
     return STATUS_SUCCESS;
 }
@@ -54022,10 +54018,9 @@ static NTSTATUS wow64_ext_glMapNamedBufferEXT( void *args )
         GLuint buffer;
         GLenum access;
         PTR32 ret;
-        PTR32 client_ptr;
     } *params = args;
     TEB *teb = get_teb64( params->teb );
-    params->ret = wow64_glMapNamedBufferEXT( teb, params->buffer, params->access, &params->client_ptr );
+    params->ret = wow64_glMapNamedBufferEXT( teb, params->buffer, params->access );
     set_context_attribute( teb, -1 /* unsupported */, NULL, 0 );
     return STATUS_SUCCESS;
 }
@@ -54040,10 +54035,9 @@ static NTSTATUS wow64_ext_glMapNamedBufferRange( void *args )
         PTR32 length;
         GLbitfield access;
         PTR32 ret;
-        PTR32 client_ptr;
     } *params = args;
     TEB *teb = get_teb64( params->teb );
-    params->ret = wow64_glMapNamedBufferRange( teb, params->buffer, (GLintptr)ULongToPtr(params->offset), (GLsizeiptr)ULongToPtr(params->length), params->access, &params->client_ptr );
+    params->ret = wow64_glMapNamedBufferRange( teb, params->buffer, (GLintptr)ULongToPtr(params->offset), (GLsizeiptr)ULongToPtr(params->length), params->access );
     set_context_attribute( teb, -1 /* unsupported */, NULL, 0 );
     return STATUS_SUCCESS;
 }
@@ -54058,10 +54052,9 @@ static NTSTATUS wow64_ext_glMapNamedBufferRangeEXT( void *args )
         PTR32 length;
         GLbitfield access;
         PTR32 ret;
-        PTR32 client_ptr;
     } *params = args;
     TEB *teb = get_teb64( params->teb );
-    params->ret = wow64_glMapNamedBufferRangeEXT( teb, params->buffer, (GLintptr)ULongToPtr(params->offset), (GLsizeiptr)ULongToPtr(params->length), params->access, &params->client_ptr );
+    params->ret = wow64_glMapNamedBufferRangeEXT( teb, params->buffer, (GLintptr)ULongToPtr(params->offset), (GLsizeiptr)ULongToPtr(params->length), params->access );
     set_context_attribute( teb, -1 /* unsupported */, NULL, 0 );
     return STATUS_SUCCESS;
 }
diff --git a/dlls/opengl32/unix_thunks.h b/dlls/opengl32/unix_thunks.h
index 8b73b95da33..f032722bbc1 100644
--- a/dlls/opengl32/unix_thunks.h
+++ b/dlls/opengl32/unix_thunks.h
@@ -57,13 +57,13 @@ extern void wow64_glGetNamedBufferPointerv( TEB *teb, GLuint buffer, GLenum pnam
 extern void wow64_glGetNamedBufferPointervEXT( TEB *teb, GLuint buffer, GLenum pname, PTR32 *params );
 extern void wow64_glGetSynciv( TEB *teb, GLsync sync, GLenum pname, GLsizei count, GLsizei *length, GLint *values );
 extern GLboolean wow64_glIsSync( TEB *teb, GLsync sync );
-extern PTR32 wow64_glMapBuffer( TEB *teb, GLenum target, GLenum access, PTR32 *client_ptr );
-extern PTR32 wow64_glMapBufferARB( TEB *teb, GLenum target, GLenum access, PTR32 *client_ptr );
-extern PTR32 wow64_glMapBufferRange( TEB *teb, GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access, PTR32 *client_ptr );
-extern PTR32 wow64_glMapNamedBuffer( TEB *teb, GLuint buffer, GLenum access, PTR32 *client_ptr );
-extern PTR32 wow64_glMapNamedBufferEXT( TEB *teb, GLuint buffer, GLenum access, PTR32 *client_ptr );
-extern PTR32 wow64_glMapNamedBufferRange( TEB *teb, GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access, PTR32 *client_ptr );
-extern PTR32 wow64_glMapNamedBufferRangeEXT( TEB *teb, GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access, PTR32 *client_ptr );
+extern PTR32 wow64_glMapBuffer( TEB *teb, GLenum target, GLenum access );
+extern PTR32 wow64_glMapBufferARB( TEB *teb, GLenum target, GLenum access );
+extern PTR32 wow64_glMapBufferRange( TEB *teb, GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access );
+extern PTR32 wow64_glMapNamedBuffer( TEB *teb, GLuint buffer, GLenum access );
+extern PTR32 wow64_glMapNamedBufferEXT( TEB *teb, GLuint buffer, GLenum access );
+extern PTR32 wow64_glMapNamedBufferRange( TEB *teb, GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access );
+extern PTR32 wow64_glMapNamedBufferRangeEXT( TEB *teb, GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access );
 extern GLboolean wow64_glUnmapBuffer( TEB *teb, GLenum target, PTR32 *client_ptr );
 extern GLboolean wow64_glUnmapBufferARB( TEB *teb, GLenum target, PTR32 *client_ptr );
 extern GLboolean wow64_glUnmapNamedBuffer( TEB *teb, GLuint buffer, PTR32 *client_ptr );
diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c
index 4b116f5b2e3..01071f4dced 100644
--- a/dlls/opengl32/unix_wgl.c
+++ b/dlls/opengl32/unix_wgl.c
@@ -2201,11 +2201,11 @@ static BOOL buffer_vm_alloc( struct buffer *buffer, SIZE_T size )
 }

static PTR32 wow64_map_buffer( TEB *teb, GLenum target, GLuint name, GLintptr offset,
-                               size_t length, GLbitfield access, void *ptr, PTR32 *client_ptr )
+                               size_t length, GLbitfield access, void *ptr )
 {
     struct buffer *buffer = get_target_buffer( teb, target );

-    if (!ptr && (!*client_ptr || !buffer)) return 0;
+    if (!ptr) return 0;

if (!buffer)
     {
@@ -2337,94 +2337,92 @@ void wow64_glGetNamedBufferPointervEXT( TEB *teb, GLuint buffer, GLenum pname, P
     *params = PtrToUlong(ptr);
 }

-static PTR32 wow64_gl_map_buffer( TEB *teb, GLenum target, GLenum access, PTR32 *client_ptr,
-                                  PFN_glMapBuffer gl_map_buffer64 )
+static PTR32 wow64_gl_map_buffer( TEB *teb, GLenum target, GLenum access, PFN_glMapBuffer gl_map_buffer64 )
 {
     GLbitfield range_access = map_range_flags_from_map_flags( access );
-    void *ptr = NULL;
-    PTR32 ret ;
+    void *ptr;
+    PTR32 ret;

pthread_mutex_lock( &wgl_lock );
-    if (!*client_ptr) ptr = gl_map_buffer64( target, access );
-    ret = wow64_map_buffer( teb, target, 0, 0, 0, range_access, ptr, client_ptr );
+    ptr = gl_map_buffer64( target, access );
+    ret = wow64_map_buffer( teb, target, 0, 0, 0, range_access, ptr );
     pthread_mutex_unlock( &wgl_lock );
     return ret;
 }

-PTR32 wow64_glMapBuffer( TEB *teb, GLenum target, GLenum access, PTR32 *client_ptr )
+PTR32 wow64_glMapBuffer( TEB *teb, GLenum target, GLenum access )
 {
     const struct opengl_funcs *funcs = teb->glTable;
-    return wow64_gl_map_buffer( teb, target, access, client_ptr, funcs->p_glMapBuffer );
+    return wow64_gl_map_buffer( teb, target, access, funcs->p_glMapBuffer );
 }

-PTR32 wow64_glMapBufferARB( TEB *teb, GLenum target, GLenum access, PTR32 *client_ptr )
+PTR32 wow64_glMapBufferARB( TEB *teb, GLenum target, GLenum access )
 {
     const struct opengl_funcs *funcs = teb->glTable;
-    return wow64_gl_map_buffer( teb, target, access, client_ptr, funcs->p_glMapBufferARB );
+    return wow64_gl_map_buffer( teb, target, access, funcs->p_glMapBufferARB );
 }

-PTR32 wow64_glMapBufferRange( TEB *teb, GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access, PTR32 *client_ptr )
+PTR32 wow64_glMapBufferRange( TEB *teb, GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access )
 {
     const struct opengl_funcs *funcs = teb->glTable;
-    void *ptr = NULL;
+    void *ptr;
     PTR32 ret;

pthread_mutex_lock( &wgl_lock );
-    if (!*client_ptr) ptr = funcs->p_glMapBufferRange( target, offset, length, access );
-    ret = wow64_map_buffer( teb, target, 0, offset, length, access, ptr, client_ptr );
+    ptr = funcs->p_glMapBufferRange( target, offset, length, access );
+    ret = wow64_map_buffer( teb, target, 0, offset, length, access, ptr );
     pthread_mutex_unlock( &wgl_lock );
     return ret;
 }

-static PTR32 wow64_gl_map_named_buffer( TEB *teb, GLuint name, GLenum access, PTR32 *client_ptr,
-                                        PFN_glMapNamedBuffer gl_map_named_buffer64 )
+static PTR32 wow64_gl_map_named_buffer( TEB *teb, GLuint name, GLenum access, PFN_glMapNamedBuffer gl_map_named_buffer64 )
 {
     GLbitfield range_access = map_range_flags_from_map_flags( access );
-    void *ptr = NULL;
+    void *ptr;
     PTR32 ret;

pthread_mutex_lock( &wgl_lock );
-    if (!*client_ptr) ptr = gl_map_named_buffer64( name, access );
-    ret = wow64_map_buffer( teb, 0, name, 0, 0, range_access, ptr, client_ptr );
+    ptr = gl_map_named_buffer64( name, access );
+    ret = wow64_map_buffer( teb, 0, name, 0, 0, range_access, ptr );
     pthread_mutex_unlock( &wgl_lock );
     return ret;
 }

-PTR32 wow64_glMapNamedBuffer( TEB *teb, GLuint buffer, GLenum access, PTR32 *client_ptr )
+PTR32 wow64_glMapNamedBuffer( TEB *teb, GLuint buffer, GLenum access )
 {
     const struct opengl_funcs *funcs = teb->glTable;
-    return wow64_gl_map_named_buffer( teb, buffer, access, client_ptr, funcs->p_glMapNamedBuffer );
+    return wow64_gl_map_named_buffer( teb, buffer, access, funcs->p_glMapNamedBuffer );
 }

-PTR32 wow64_glMapNamedBufferEXT( TEB *teb, GLuint buffer, GLenum access, PTR32 *client_ptr )
+PTR32 wow64_glMapNamedBufferEXT( TEB *teb, GLuint buffer, GLenum access )
 {
     const struct opengl_funcs *funcs = teb->glTable;
-    return wow64_gl_map_named_buffer( teb, buffer, access, client_ptr, funcs->p_glMapNamedBufferEXT );
+    return wow64_gl_map_named_buffer( teb, buffer, access, funcs->p_glMapNamedBufferEXT );
 }

static NTSTATUS wow64_gl_map_named_buffer_range( TEB *teb, GLuint name, GLintptr offset, GLsizeiptr length, GLbitfield access,
-                                                 PTR32 *client_ptr, PFN_glMapNamedBufferRange gl_map_named_buffer_range64 )
+                                                 PFN_glMapNamedBufferRange gl_map_named_buffer_range64 )
 {
-    void *ptr = NULL;
+    void *ptr;
     PTR32 ret;

pthread_mutex_lock( &wgl_lock );
-    if (!*client_ptr) ptr = gl_map_named_buffer_range64( name, offset, length, access );
-    ret = wow64_map_buffer( teb, 0, name, offset, length, access, ptr, client_ptr );
+    ptr = gl_map_named_buffer_range64( name, offset, length, access );
+    ret = wow64_map_buffer( teb, 0, name, offset, length, access, ptr );
     pthread_mutex_unlock( &wgl_lock );
     return ret;
 }

-PTR32 wow64_glMapNamedBufferRange( TEB *teb, GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access, PTR32 *client_ptr )
+PTR32 wow64_glMapNamedBufferRange( TEB *teb, GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access )
 {
     const struct opengl_funcs *funcs = teb->glTable;
-    return wow64_gl_map_named_buffer_range( teb, buffer, offset, length, access, client_ptr, funcs->p_glMapNamedBufferRange );
+    return wow64_gl_map_named_buffer_range( teb, buffer, offset, length, access, funcs->p_glMapNamedBufferRange );
 }

-PTR32 wow64_glMapNamedBufferRangeEXT( TEB *teb, GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access, PTR32 *client_ptr )
+PTR32 wow64_glMapNamedBufferRangeEXT( TEB *teb, GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access )
 {
     const struct opengl_funcs *funcs = teb->glTable;
-    return wow64_gl_map_named_buffer_range( teb, buffer, offset, length, access, client_ptr, funcs->p_glMapNamedBufferRangeEXT );
+    return wow64_gl_map_named_buffer_range( teb, buffer, offset, length, access, funcs->p_glMapNamedBufferRangeEXT );
 }

static void wow64_unmap_buffer( struct buffer *buffer )
diff --git a/dlls/opengl32/unixlib.h b/dlls/opengl32/unixlib.h
index db2efff8f50..649d7e8b3b8 100644
--- a/dlls/opengl32/unixlib.h
+++ b/dlls/opengl32/unixlib.h
@@ -12379,9 +12379,6 @@ struct glMapBuffer_params
     GLenum target;
     GLenum access;
     void *ret;
-#ifndef _WIN64
-    void *client_ptr;
-#endif
 };

struct glMapBufferARB_params
@@ -12390,9 +12387,6 @@ struct glMapBufferARB_params
     GLenum target;
     GLenum access;
     void *ret;
-#ifndef _WIN64
-    void *client_ptr;
-#endif
 };

struct glMapBufferRange_params
@@ -12403,9 +12397,6 @@ struct glMapBufferRange_params
     GLsizeiptr length;
     GLbitfield access;
     void *ret;
-#ifndef _WIN64
-    void *client_ptr;
-#endif
 };

struct glMapControlPointsNV_params
@@ -12446,9 +12437,6 @@ struct glMapNamedBuffer_params
     GLuint buffer;
     GLenum access;
     void *ret;
-#ifndef _WIN64
-    void *client_ptr;
-#endif
 };

struct glMapNamedBufferEXT_params
@@ -12457,9 +12445,6 @@ struct glMapNamedBufferEXT_params
     GLuint buffer;
     GLenum access;
     void *ret;
-#ifndef _WIN64
-    void *client_ptr;
-#endif
 };

struct glMapNamedBufferRange_params
@@ -12470,9 +12455,6 @@ struct glMapNamedBufferRange_params
     GLsizeiptr length;
     GLbitfield access;
     void *ret;
-#ifndef _WIN64
-    void *client_ptr;
-#endif
 };

struct glMapNamedBufferRangeEXT_params
@@ -12483,9 +12465,6 @@ struct glMapNamedBufferRangeEXT_params
     GLsizeiptr length;
     GLbitfield access;
     void *ret;
-#ifndef _WIN64
-    void *client_ptr;
-#endif
 };

struct glMapObjectBufferATI_params
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 0241ca16a41..a9ef28ec85d 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -1690,108 +1690,6 @@ const GLchar * WINAPI wglQueryRendererStringWINE( HDC dc, GLint renderer, GLenum
     return args.ret;
 }

-static void *gl_map_buffer( enum unix_funcs code, GLenum target, GLenum access )
-{
-    struct glMapBuffer_params args =
-    {
-        .teb = NtCurrentTeb(),
-        .target = target,
-        .access = access,
-    };
-    NTSTATUS status;
-
-    TRACE( "target %d, access %d\n", target, access );
-
-    status = WINE_UNIX_CALL( code, &args );
-    if (status) WARN( "glMapBuffer returned %#lx\n", status );
-    return args.ret;
-}
-
-void * WINAPI glMapBuffer( GLenum target, GLenum access )
-{
-    return gl_map_buffer( unix_glMapBuffer, target, access );
-}
-
-void * WINAPI glMapBufferARB( GLenum target, GLenum access )
-{
-    return gl_map_buffer( unix_glMapBufferARB, target, access );
-}
-
-void * WINAPI glMapBufferRange( GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access )
-{
-    struct glMapBufferRange_params args =
-    {
-        .teb = NtCurrentTeb(),
-        .target = target,
-        .offset = offset,
-        .length = length,
-        .access = access,
-    };
-    NTSTATUS status;
-
-    TRACE( "target %d, offset %Id, length %Id, access %d\n", target, offset, length, access );
-
-    status = UNIX_CALL( glMapBufferRange, &args );
-    if (status) WARN( "glMapBufferRange returned %#lx\n", status );
-    return args.ret;
-}
-
-static void *gl_map_named_buffer( enum unix_funcs code, GLuint buffer, GLenum access )
-{
-    struct glMapNamedBuffer_params args =
-    {
-        .teb = NtCurrentTeb(),
-        .buffer = buffer,
-        .access = access,
-    };
-    NTSTATUS status;
-
-    TRACE( "(%d, %d)\n", buffer, access );
-
-    status = WINE_UNIX_CALL( code, &args );
-    if (status) WARN( "glMapNamedBuffer returned %#lx\n", status );
-    return args.ret;
-}
-
-void * WINAPI glMapNamedBuffer( GLuint buffer, GLenum access )
-{
-    return gl_map_named_buffer( unix_glMapNamedBuffer, buffer, access );
-}
-
-void * WINAPI glMapNamedBufferEXT( GLuint buffer, GLenum access )
-{
-    return gl_map_named_buffer( unix_glMapNamedBufferEXT, buffer, access );
-}
-
-static void *gl_map_named_buffer_range( enum unix_funcs code, GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access )
-{
-    struct glMapNamedBufferRange_params args =
-    {
-        .teb = NtCurrentTeb(),
-        .buffer = buffer,
-        .offset = offset,
-        .length = length,
-        .access = access,
-    };
-    NTSTATUS status;
-
-    TRACE( "buffer %d, offset %Id, length %Id, access %d\n", buffer, offset, length, access );
-
-    status = WINE_UNIX_CALL( code, &args );
-    if (status) WARN( "glMapNamedBufferRange returned %#lx\n", status );
-    return args.ret;
-}
-
-void * WINAPI glMapNamedBufferRange( GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access )
-{
-    return gl_map_named_buffer_range( unix_glMapNamedBufferRange, buffer, offset, length, access );
-}
-
-void * WINAPI glMapNamedBufferRangeEXT( GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access )
-{
-    return gl_map_named_buffer_range( unix_glMapNamedBufferRangeEXT, buffer, offset, length, access );
-}
-
 static GLboolean gl_unmap_buffer( enum unix_funcs code, GLenum target )
 {
     struct glUnmapBuffer_params args =