[PATCH v11 5/8] winemac.drv: Avoid calling back to win32u to find the primary adapter.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/winemac.drv/display.c | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
index ad746320ba9..1d675a49ef2 100644
--- a/dlls/winemac.drv/display.c
+++ b/dlls/winemac.drv/display.c
@@ -685,24 +685,6 @@ void check_retina_status(void)
     }
 }

-static BOOL get_primary_adapter(WCHAR *name)
-{
-    DISPLAY_DEVICEW dd;
-    DWORD i;
-
-    dd.cb = sizeof(dd);
-    for (i = 0; !NtUserEnumDisplayDevices(NULL, i, &dd, 0); ++i)
-    {
-        if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
-        {
-            lstrcpyW(name, dd.DeviceName);
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-
 static BOOL is_detached_mode(const DEVMODEW *mode)
 {
     return mode->dmFields & DM_POSITION &&
@@ -765,13 +747,22 @@ static CGDisplayModeRef find_best_display_mode(DEVMODEW *devmode, CFArrayRef dis
     return best_display_mode;
 }

+static BOOL is_primary_display( DEVMODEW *mode )
+{
+    if (is_detached_mode( mode )) return FALSE;
+    return mode->dmFields & DM_POSITION &&
+           mode->dmFields & DM_PELSWIDTH &&
+           mode->dmFields & DM_PELSHEIGHT &&
+           mode->dmPosition.x == 0 &&
+           mode->dmPosition.y == 0;
+}
+
 /***********************************************************************
  *              ChangeDisplaySettings  (MACDRV.@)
  *
  */
 LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, HWND hwnd, DWORD flags, LPVOID lpvoid)
 {
-    WCHAR primary_adapter[CCHDEVICENAME];
     LONG ret = DISP_CHANGE_SUCCESSFUL;
     DEVMODEW *mode;
     int bpp;
@@ -785,9 +776,6 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, HWND hwnd, DWORD flags, L

init_original_display_mode();

-    if (!get_primary_adapter(primary_adapter))
-        return DISP_CHANGE_FAILED;
-
     if (macdrv_get_displays(&macdrv_displays, &num_displays))
         return DISP_CHANGE_FAILED;

@@ -804,7 +792,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, HWND hwnd, DWORD flags, L

for (mode = displays; mode->dmSize && !ret; mode = NEXT_DEVMODEW(mode))
     {
-        if (wcsicmp(primary_adapter, mode->dmDeviceName))
+        if (!is_primary_display(mode))
         {
             FIXME("Changing non-primary adapter settings is currently unsupported.\n");
             continue;