[PATCH v6 0/1] MR2359: opengl32: fix bug abort missing convert of glUmapBuffer_params from 32bit to 64bit

[Fan WenJie (＠fanwenjie)]

Signed-off-by: Fan WenJie <fanwj(a)mail.ustc.edu.cn>

--
  v6: opengl32: fix bug abort missing convert of glUmapBuffer_params from 32bit to 64bit
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2359

[PATCH v6 1/1] opengl32: fix bug abort missing convert of glUmapBuffer_params from 32bit to 64bit

[Fan WenJie]

From: Fan WenJie <fanwj(a)mail.ustc.edu.cn>

Signed-off-by: Fan WenJie <fanwj(a)mail.ustc.edu.cn>
---
 dlls/opengl32/unix_wgl.c | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c
index 24bd904b068..6c3379b90a2 100644
--- a/dlls/opengl32/unix_wgl.c
+++ b/dlls/opengl32/unix_wgl.c
@@ -2043,14 +2043,20 @@ static NTSTATUS wow64_gl_unmap_buffer( void *args, NTSTATUS (*gl_unmap_buffer64)
         GLenum target;
         GLboolean ret;
     } *params32 = args;
+    struct glUnmapBuffer_params params =
+    {
+        .teb = get_teb64(params32->teb),
+        .target = params32->target,
+        .ret = TRUE,
+    };
     NTSTATUS status;
-    TEB *teb = get_teb64( params32->teb );
 
-    if (!(ptr = get_buffer_pointer( teb, params32->target ))) return STATUS_SUCCESS;
+    if (!(ptr = get_buffer_pointer( params.teb, params.target ))) return STATUS_SUCCESS;
 
-    status = wow64_unmap_buffer( ptr, get_buffer_param( teb, params32->target, GL_BUFFER_MAP_LENGTH ),
-                                 get_buffer_param( teb, params32->target, GL_BUFFER_ACCESS_FLAGS ) );
-    gl_unmap_buffer64( args );
+    status = wow64_unmap_buffer( ptr, get_buffer_param( params.teb, params.target, GL_BUFFER_MAP_LENGTH ),
+                                 get_buffer_param( params.teb, params.target, GL_BUFFER_ACCESS_FLAGS ) );
+    gl_unmap_buffer64( ¶ms );
+    params32->ret = params.ret;
 
     return status;
 }
@@ -2074,14 +2080,20 @@ static NTSTATUS wow64_gl_unmap_named_buffer( void *args, NTSTATUS (*gl_unmap_nam
         GLint buffer;
         GLboolean ret;
     } *params32 = args;
+    struct glUnmapNamedBuffer_params params =
+    {
+        .teb = get_teb64(params32->teb),
+        .buffer = params32->buffer,
+        .ret = TRUE,
+    };
     NTSTATUS status;
-    TEB *teb = get_teb64( params32->teb );
 
-    if (!(ptr = get_named_buffer_pointer( teb, params32->buffer ))) return STATUS_SUCCESS;
+    if (!(ptr = get_named_buffer_pointer( params.teb, params.buffer ))) return STATUS_SUCCESS;
 
-    status = wow64_unmap_buffer( ptr, get_named_buffer_param( teb, params32->buffer, GL_BUFFER_MAP_LENGTH ),
-                                 get_named_buffer_param( teb, params32->buffer, GL_BUFFER_ACCESS_FLAGS ) );
-    gl_unmap_named_buffer64( args );
+    status = wow64_unmap_buffer( ptr, get_named_buffer_param( params.teb, params.buffer, GL_BUFFER_MAP_LENGTH ),
+                                 get_named_buffer_param( params.teb, params.buffer, GL_BUFFER_ACCESS_FLAGS ) );
+    gl_unmap_named_buffer64( ¶ms );
+    params32->ret = params.ret;
 
     return status;
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2359

[Fan WenJie (＠fanwenjie)]

On Fri Mar 10 06:34:11 2023 +0000, Rémi Bernon wrote:
> I can't force push to this MR, I opened
> https://gitlab.winehq.org/wine/wine/-/merge_requests/2366 instead.
> I squash the commits. Please approve

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2359#note_26626