[PATCH 0/3] MR10703: opengl32: Misc client-side handle table fixes.

[Rémi Bernon (＠rbernon)]

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

[PATCH 1/3] opengl32: Fix incorrect cleanup when GLsync creation fails.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/opengl32/wgl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 51c8129d473..d05de9382c8 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -1963,7 +1963,7 @@ GLsync WINAPI glCreateSyncFromCLeventARB( struct _cl_context *context, struct _c
     assert( args.ret == ptr->user_data || !args.ret );
 
     if (!status && args.ret) return UlongToHandle( ptr->handle );
-    free_client_context( ptr );
+    free_client_sync( ctx, ptr );
     return NULL;
 }
 
@@ -2003,7 +2003,7 @@ GLsync WINAPI glFenceSync( GLenum condition, GLbitfield flags )
     assert( args.ret == ptr->user_data || !args.ret );
 
     if (!status && args.ret) return UlongToHandle( ptr->handle );
-    free_client_context( ptr );
+    free_client_sync( ctx, ptr );
     return NULL;
 }
 
@@ -2025,7 +2025,7 @@ GLsync WINAPI glImportSyncEXT( GLenum external_sync_type, GLintptr external_sync
     assert( args.ret == ptr->user_data || !args.ret );
 
     if (!status && args.ret) return UlongToHandle( ptr->handle );
-    free_client_context( ptr );
+    free_client_sync( ctx, ptr );
     return NULL;
 }
 
-- 
GitLab


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

[PATCH 2/3] opengl32: Avoid leaking client syncs on context destruction.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/opengl32/wgl.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index d05de9382c8..9fe9fa3b55a 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -306,6 +306,14 @@ static struct handle_entry *alloc_client_context(void)
 static void free_client_context( struct handle_entry *ptr )
 {
     struct context *context = context_from_opengl_client_context( ptr->context );
+
+    for (int i = 0; i < context->syncs.count; i++)
+    {
+        struct handle_entry *entry = context->syncs.handles + i;
+        if (LOWORD(entry->handle) == 0xffff) continue;
+        free( entry->user_data );
+    }
+
     free_handle( &contexts, ptr );
     free( context );
 }
-- 
GitLab


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

[PATCH 3/3] opengl32: Move wgl_cs entry / exit out of handle functions.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

The sync handle table doesn't need them.
---
 dlls/opengl32/wgl.c | 67 ++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 9fe9fa3b55a..6c3383d72da 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -145,8 +145,6 @@ static struct handle_entry *alloc_handle( struct handle_table *table, void *user
     struct handle_entry *ptr = NULL;
     WORD generation;
 
-    EnterCriticalSection( &wgl_cs );
-
     if ((ptr = table->next_free)) table->next_free = ptr->next_free;
     else if (table->count < ARRAY_SIZE(table->handles)) ptr = table->handles + table->count++;
     else ptr = NULL;
@@ -158,19 +156,15 @@ static struct handle_entry *alloc_handle( struct handle_table *table, void *user
         ptr->user_data = user_data;
     }
 
-    LeaveCriticalSection( &wgl_cs );
-
     if (!ptr) RtlSetLastWin32Error( ERROR_NOT_ENOUGH_MEMORY );
     return ptr;
 }
 
 static void free_handle( struct handle_table *table, struct handle_entry *ptr )
 {
-    EnterCriticalSection( &wgl_cs );
     ptr->handle |= 0xffff;
     ptr->next_free = table->next_free;
     table->next_free = ptr;
-    LeaveCriticalSection( &wgl_cs );
 }
 
 static struct handle_entry *get_handle_ptr( struct handle_table *table, HANDLE handle )
@@ -178,19 +172,20 @@ static struct handle_entry *get_handle_ptr( struct handle_table *table, HANDLE h
     WORD index = LOWORD( handle ) - 1;
     struct handle_entry *ptr = table->handles + index;
 
-    EnterCriticalSection( &wgl_cs );
-    if (index >= table->count || ULongToHandle( ptr->handle ) != handle) ptr = NULL;
-    LeaveCriticalSection( &wgl_cs );
-
-    if (!ptr) RtlSetLastWin32Error( ERROR_INVALID_HANDLE );
-    return ptr;
+    if (index < table->count && ULongToHandle( ptr->handle ) == handle) return ptr;
+    RtlSetLastWin32Error( ERROR_INVALID_HANDLE );
+    return NULL;
 }
 
 static struct opengl_client_pbuffer *pbuffer_from_handle( HPBUFFERARB handle )
 {
     struct handle_entry *ptr;
-    if (!(ptr = get_handle_ptr( &pbuffers, handle ))) return NULL;
-    return ptr->pbuffer;
+
+    EnterCriticalSection( &wgl_cs );
+    ptr = get_handle_ptr( &pbuffers, handle );
+    LeaveCriticalSection( &wgl_cs );
+
+    return ptr ? ptr->pbuffer : NULL;
 }
 
 BOOL get_pbuffer_from_handle( HPBUFFERARB handle, HPBUFFERARB *obj )
@@ -206,19 +201,21 @@ static struct handle_entry *alloc_client_pbuffer(void)
     struct handle_entry *ptr;
 
     if (!(pbuffer = calloc( 1, sizeof(*pbuffer) ))) return NULL;
-    if (!(ptr = alloc_handle( &pbuffers, pbuffer )))
-    {
-        free( pbuffer );
-        return NULL;
-    }
 
+    EnterCriticalSection( &wgl_cs );
+    ptr = alloc_handle( &pbuffers, pbuffer );
+    LeaveCriticalSection( &wgl_cs );
+
+    if (!ptr) free( pbuffer );
     return ptr;
 }
 
 static void free_client_pbuffer( struct handle_entry *ptr )
 {
     struct opengl_client_pbuffer *pbuffer = ptr->pbuffer;
+    EnterCriticalSection( &wgl_cs );
     free_handle( &pbuffers, ptr );
+    LeaveCriticalSection( &wgl_cs );
     free( pbuffer );
 }
 
@@ -249,7 +246,11 @@ BOOL WINAPI wglDestroyPbufferARB( HPBUFFERARB handle )
 
     TRACE( "handle %p\n", handle );
 
-    if (!(ptr = get_handle_ptr( &pbuffers, handle ))) return FALSE;
+    EnterCriticalSection( &wgl_cs );
+    ptr = get_handle_ptr( &pbuffers, handle );
+    LeaveCriticalSection( &wgl_cs );
+
+    if (!ptr) return FALSE;
     args.hPbuffer = &ptr->pbuffer->obj;
 
     if ((status = UNIX_CALL( wglDestroyPbufferARB, &args ))) WARN( "wglDestroyPbufferARB returned %#lx\n", status );
@@ -272,8 +273,12 @@ static struct context *context_from_opengl_client_context( struct opengl_client_
 static struct opengl_client_context *opengl_client_context_from_handle( HGLRC handle )
 {
     struct handle_entry *ptr;
-    if (!(ptr = get_handle_ptr( &contexts, handle ))) return NULL;
-    return ptr->context;
+
+    EnterCriticalSection( &wgl_cs );
+    ptr = get_handle_ptr( &contexts, handle );
+    LeaveCriticalSection( &wgl_cs );
+
+    return ptr ? ptr->context : NULL;
 }
 
 static struct context *context_from_handle( HGLRC handle )
@@ -294,12 +299,12 @@ static struct handle_entry *alloc_client_context(void)
     struct handle_entry *ptr;
 
     if (!(context = calloc( 1, sizeof(*context) ))) return NULL;
-    if (!(ptr = alloc_handle( &contexts, context )))
-    {
-        free( context );
-        return NULL;
-    }
 
+    EnterCriticalSection( &wgl_cs );
+    ptr = alloc_handle( &contexts, context );
+    LeaveCriticalSection( &wgl_cs );
+
+    if (!ptr) free( context );
     return ptr;
 }
 
@@ -314,7 +319,9 @@ static void free_client_context( struct handle_entry *ptr )
         free( entry->user_data );
     }
 
+    EnterCriticalSection( &wgl_cs );
     free_handle( &contexts, ptr );
+    LeaveCriticalSection( &wgl_cs );
     free( context );
 }
 
@@ -377,7 +384,11 @@ BOOL WINAPI wglDeleteContext( HGLRC handle )
 
     TRACE( "handle %p\n", handle );
 
-    if (!(ptr = get_handle_ptr( &contexts, handle ))) return FALSE;
+    EnterCriticalSection( &wgl_cs );
+    ptr = get_handle_ptr( &contexts, handle );
+    LeaveCriticalSection( &wgl_cs );
+
+    if (!ptr) return FALSE;
     args.oldContext = &ptr->context->obj;
 
     if (handle && handle == teb->glCurrentRC) wglMakeCurrent( NULL, NULL );
-- 
GitLab

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