Rémi Bernon : winemac.drv: Check for non-primary adapter earlier in macdrv_ChangeDisplaySettingsEx.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 75fa51e5552180445a4efd93d4921ee7226d1adf
URL:    https://gitlab.winehq.org/wine/wine/-/commit/75fa51e5552180445a4efd93d4921ee...

Author: Rémi Bernon 
Date:   Tue Aug 30 12:06:02 2022 +0200

winemac.drv: Check for non-primary adapter earlier in macdrv_ChangeDisplaySettingsEx.

---

dlls/winemac.drv/display.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
index fa611a4c662..46246754005 100644
--- a/dlls/winemac.drv/display.c
+++ b/dlls/winemac.drv/display.c
@@ -840,6 +840,11 @@ LONG macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode,
         devname = primary_adapter;
         devmode = &default_mode;
     }
+    else if (wcsicmp(primary_adapter, devname))
+    {
+        FIXME("Changing non-primary adapter settings is currently unsupported.\n");
+        return DISP_CHANGE_SUCCESSFUL;
+    }

if (is_detached_mode(devmode))
     {
@@ -880,11 +885,6 @@ LONG macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode,
     if (best_display_mode)
     {
         if (flags & (CDS_TEST | CDS_NORESET)) ret = DISP_CHANGE_SUCCESSFUL;
-        else if (wcsicmp(primary_adapter, devname))
-        {
-            FIXME("Changing non-primary adapter settings is currently unsupported.\n");
-            ret = DISP_CHANGE_SUCCESSFUL;
-        }
         else if (macdrv_set_display_mode(&displays[0], best_display_mode))
         {
             int mode_bpp = display_mode_bits_per_pixel(best_display_mode);