Rémi Bernon : win32u: Load gpus from registry before adapters.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 955ddc6ea64b2618eae116f1e3889a6fbd230b0e
URL:    https://gitlab.winehq.org/wine/wine/-/commit/955ddc6ea64b2618eae116f1e3889a6...

Author: Rémi Bernon 
Date:   Tue Feb 27 14:34:26 2024 +0100

win32u: Load gpus from registry before adapters.

---

dlls/win32u/sysparams.c | 113 ++++++++++++++++++++++++------------------------
 1 file changed, 57 insertions(+), 56 deletions(-)

diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index 426eff75907..e0c89f76707 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -1528,53 +1528,6 @@ static BOOL update_display_cache_from_registry(void)

clear_display_devices();

-    for (adapter_id = 0;; adapter_id++)
-    {
-        if (!(adapter = calloc( 1, sizeof(*adapter) ))) break;
-        adapter->refcount = 1;
-        adapter->id = adapter_id;
-
-        if (!read_display_adapter_settings( adapter_id, adapter ))
-        {
-            free( adapter->modes );
-            free( adapter );
-            break;
-        }
-
-        list_add_tail( &adapters, &adapter->entry );
-        for (monitor_id = 0;; monitor_id++)
-        {
-            if (!(monitor = calloc( 1, sizeof(*monitor) ))) break;
-            if (!read_monitor_settings( adapter, monitor_id, monitor ))
-            {
-                free( monitor );
-                break;
-            }
-
-            monitor->id = monitor_id;
-            monitor->adapter = adapter_acquire( adapter );
-
-            monitor->dev.state_flags |= DISPLAY_DEVICE_ATTACHED;
-            if (adapter->dev.state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)
-            {
-                if (!IsRectEmpty(&monitor->rc_monitor)) monitor->dev.state_flags |= DISPLAY_DEVICE_ACTIVE;
-
-                LIST_FOR_EACH_ENTRY( monitor2, &monitors, struct monitor, entry )
-                {
-                    if (!(monitor2->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue;
-                    if (EqualRect( &monitor2->rc_monitor, &monitor->rc_monitor ))
-                    {
-                        monitor->is_clone = TRUE;
-                        break;
-                    }
-                }
-            }
-
-            monitor->handle = UlongToHandle( ++monitor_count );
-            list_add_tail( &monitors, &monitor->entry );
-        }
-    }
-
     if ((pci_key = reg_open_ascii_key( enum_key, "PCI" )))
     {
         unsigned int i = 0;
@@ -1613,15 +1566,6 @@ static BOOL update_display_cache_from_registry(void)
                     NtClose( prop_key );
                 }

-                LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry)
-                {
-                    if (!memcmp( &adapter->gpu_luid, &gpu->luid, sizeof(LUID) ))
-                    {
-                        adapter->gpu = gpu_acquire( gpu );
-                        gpu->adapter_count++;
-                    }
-                }
-
                 list_add_tail( &gpus, &gpu->entry );
                 NtClose( gpu_key );
             }
@@ -1632,6 +1576,63 @@ static BOOL update_display_cache_from_registry(void)
         NtClose( pci_key );
     }

+    for (adapter_id = 0;; adapter_id++)
+    {
+        if (!(adapter = calloc( 1, sizeof(*adapter) ))) break;
+        adapter->refcount = 1;
+        adapter->id = adapter_id;
+
+        if (!read_display_adapter_settings( adapter_id, adapter ))
+        {
+            free( adapter->modes );
+            free( adapter );
+            break;
+        }
+
+        LIST_FOR_EACH_ENTRY(gpu, &gpus, struct gpu, entry)
+        {
+            if (!memcmp( &adapter->gpu_luid, &gpu->luid, sizeof(LUID) ))
+            {
+                adapter->gpu = gpu_acquire( gpu );
+                gpu->adapter_count++;
+                break;
+            }
+        }
+
+        list_add_tail( &adapters, &adapter->entry );
+        for (monitor_id = 0;; monitor_id++)
+        {
+            if (!(monitor = calloc( 1, sizeof(*monitor) ))) break;
+            if (!read_monitor_settings( adapter, monitor_id, monitor ))
+            {
+                free( monitor );
+                break;
+            }
+
+            monitor->id = monitor_id;
+            monitor->adapter = adapter_acquire( adapter );
+
+            monitor->dev.state_flags |= DISPLAY_DEVICE_ATTACHED;
+            if (adapter->dev.state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)
+            {
+                if (!IsRectEmpty(&monitor->rc_monitor)) monitor->dev.state_flags |= DISPLAY_DEVICE_ACTIVE;
+
+                LIST_FOR_EACH_ENTRY( monitor2, &monitors, struct monitor, entry )
+                {
+                    if (!(monitor2->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue;
+                    if (EqualRect( &monitor2->rc_monitor, &monitor->rc_monitor ))
+                    {
+                        monitor->is_clone = TRUE;
+                        break;
+                    }
+                }
+            }
+
+            monitor->handle = UlongToHandle( ++monitor_count );
+            list_add_tail( &monitors, &monitor->entry );
+        }
+    }
+
     if ((ret = !list_empty( &adapters ) && !list_empty( &monitors )))
         last_query_display_time = key.LastWriteTime.QuadPart;
     pthread_mutex_unlock( &display_lock );