[PATCH v2 4/5] win32u: Open adapters in NtGdiDdDDIEnumAdapters2 outside of the display devices lock.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/win32u/sysparams.c | 84 ++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 44 deletions(-)

diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index 173df2ee73b..dd6e6a89c87 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -6659,79 +6659,75 @@ NTSTATUS WINAPI NtUserDisplayConfigGetDeviceInfo( DISPLAYCONFIG_DEVICE_INFO_HEAD
 NTSTATUS WINAPI NtGdiDdDDIEnumAdapters2( D3DKMT_ENUMADAPTERS2 *desc )
 {
     D3DKMT_OPENADAPTERFROMLUID open_adapter_from_luid;
-    static const ULONG max_adapters = 34;
+    struct gpu *gpu, *current_gpus[34];
     D3DKMT_CLOSEADAPTER close_adapter;
     NTSTATUS status = STATUS_SUCCESS;
-    ULONG idx = 0, count;
-    struct gpu *gpu;
+    UINT idx = 0, count = 0;

TRACE( "(%p)\n", desc );

if (!desc) return STATUS_INVALID_PARAMETER;

-    if (!desc->pAdapters)
+    if (!lock_display_devices()) return STATUS_UNSUCCESSFUL;
+    LIST_FOR_EACH_ENTRY( gpu, &gpus, struct gpu, entry )
     {
-        desc->NumAdapters = max_adapters;
-        return STATUS_SUCCESS;
+        if (desc->pAdapters) current_gpus[count] = gpu_acquire( gpu );
+        if (count++ >= ARRAY_SIZE(current_gpus))
+        {
+            WARN( "Too many adapters (%u), only up to %zu can be enumerated.\n",
+                  count, ARRAY_SIZE(current_gpus) );
+            break;
+        }
     }
+    unlock_display_devices();

-    if (!lock_display_devices()) return STATUS_UNSUCCESSFUL;
-
-    if ((count = list_count( &gpus )) > max_adapters)
+    if (!desc->pAdapters)
     {
-        WARN( "Too many adapters (%u), only up to %u can be enumerated.\n",
-              (unsigned int)count, (unsigned int)max_adapters );
-        count = max_adapters;
+        desc->NumAdapters = ARRAY_SIZE(current_gpus);
+        return STATUS_SUCCESS;
     }

if (count > desc->NumAdapters)
     {
-        status = STATUS_BUFFER_TOO_SMALL;
-        goto done;
+        while (count) gpu_release( current_gpus[--count] );
+        return STATUS_BUFFER_TOO_SMALL;
     }

-    LIST_FOR_EACH_ENTRY( gpu, &gpus, struct gpu, entry )
+    for (idx = 0; idx < count; idx++)
     {
-        if (gpu->luid.LowPart || gpu->luid.HighPart)
+        if (!gpu->luid.LowPart && !gpu->luid.HighPart)
         {
-            open_adapter_from_luid.AdapterLuid = gpu->luid;
-
-            /* give the GDI driver a chance to be notified about new adapter handle */
-            if (NT_SUCCESS( NtGdiDdDDIOpenAdapterFromLuid( &open_adapter_from_luid ) ))
-            {
-                desc->pAdapters[idx].hAdapter = open_adapter_from_luid.hAdapter;
-                desc->pAdapters[idx].AdapterLuid = gpu->luid;
-                desc->pAdapters[idx].NumOfSources = gpu->adapter_count;
-                desc->pAdapters[idx].bPrecisePresentRegionsPreferred = FALSE;
-                idx += 1;
-                continue;
-            }
-            else
-            {
-                ERR( "Failed to open adapter %u from LUID.\n", (unsigned int)idx );
-            }
+            ERR( "Adapter %u does not have a LUID.\n", idx );
+            status = STATUS_UNSUCCESSFUL;
+            break;
         }
-        else
+        open_adapter_from_luid.AdapterLuid = gpu->luid;
+
+        /* give the GDI driver a chance to be notified about new adapter handle */
+        if ((status = NtGdiDdDDIOpenAdapterFromLuid( &open_adapter_from_luid )))
         {
-            ERR( "Adapter %u does not have a LUID.\n", (unsigned int)idx );
+            ERR( "Failed to open adapter %u from LUID, status %#x.\n", idx, (UINT)status );
+            break;
         }

-        while (idx--)
+        desc->pAdapters[idx].hAdapter = open_adapter_from_luid.hAdapter;
+        desc->pAdapters[idx].AdapterLuid = gpu->luid;
+        desc->pAdapters[idx].NumOfSources = gpu->adapter_count;
+        desc->pAdapters[idx].bPrecisePresentRegionsPreferred = FALSE;
+    }
+
+    if (idx != count)
+    {
+        while (idx)
         {
-            close_adapter.hAdapter = desc->pAdapters[idx].hAdapter;
+            close_adapter.hAdapter = desc->pAdapters[--idx].hAdapter;
             NtGdiDdDDICloseAdapter( &close_adapter );
         }

memset( desc->pAdapters, 0, desc->NumAdapters * sizeof(D3DKMT_ADAPTERINFO) );
-        status = STATUS_UNSUCCESSFUL;
-        break;
     }
+    desc->NumAdapters = idx;

-done:
-    if (status == STATUS_SUCCESS)
-        desc->NumAdapters = idx;
-
-    unlock_display_devices();
-
+    while (count) gpu_release( current_gpus[--count] );
     return status;
 }