[PATCH v10 5/7] win32u: Lock display devices while applying display settings.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/win32u/sysparams.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index 6258ebf2549..6ad6f7551d9 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -2259,10 +2259,8 @@ static DEVMODEW *get_display_settings( const WCHAR *devname, const DEVMODEW *dev
     struct adapter *adapter;
     BOOL ret;

-    if (!lock_display_devices()) return NULL;
-
     /* allocate an extra mode for easier iteration */
-    if (!(displays = calloc( list_count( &adapters ) + 1, sizeof(DEVMODEW) ))) goto done;
+    if (!(displays = calloc( list_count( &adapters ) + 1, sizeof(DEVMODEW) ))) return NULL;
     mode = displays;

LIST_FOR_EACH_ENTRY( adapter, &adapters, struct adapter, entry )
@@ -2275,7 +2273,11 @@ static DEVMODEW *get_display_settings( const WCHAR *devname, const DEVMODEW *dev
         {
             if (!devname) ret = adapter_get_registry_settings( adapter, mode );
             else ret = adapter_get_current_settings( adapter, mode );
-            if (!ret) goto done;
+            if (!ret)
+            {
+                free( displays );
+                return NULL;
+            }
         }

lstrcpyW( mode->dmDeviceName, adapter->dev.device_name );
@@ -2283,13 +2285,7 @@ static DEVMODEW *get_display_settings( const WCHAR *devname, const DEVMODEW *dev
         mode = NEXT_DEVMODEW(mode);
     }

-    unlock_display_devices();
     return displays;
-
-done:
-    unlock_display_devices();
-    free( displays );
-    return NULL;
 }

static INT offset_length( POINT offset )
@@ -2486,11 +2482,16 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod
     DEVMODEW *displays;
     LONG ret;

-    displays = get_display_settings( devname, devmode );
-    if (!displays) return DISP_CHANGE_FAILED;
+    if (!lock_display_devices()) return DISP_CHANGE_FAILED;
+    if (!(displays = get_display_settings( devname, devmode )))
+    {
+        unlock_display_devices();
+        return DISP_CHANGE_FAILED;
+    }

if (all_detached_settings( displays ))
     {
+        unlock_display_devices();
         WARN( "Detaching all modes is not permitted.\n" );
         free( displays );
         return DISP_CHANGE_SUCCESSFUL;
@@ -2499,6 +2500,7 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod
     place_all_displays( displays );

ret = user_driver->pChangeDisplaySettings( displays, hwnd, flags, lparam );
+    unlock_display_devices();

free( displays );
     if (ret) return ret;