Rémi Bernon : winemac.drv: Use the primary adapter name instead of calling back win32u.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 81406eac96adb761f67bc6564ed57bc78982ace2
URL:    https://gitlab.winehq.org/wine/wine/-/commit/81406eac96adb761f67bc6564ed57bc...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Fri Oct 21 14:00:21 2022 +0200

winemac.drv: Use the primary adapter name instead of calling back win32u.

---

 dlls/winemac.drv/display.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
index d7180a68950..7abf47ee3dd 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 &&
@@ -771,7 +753,6 @@ static CGDisplayModeRef find_best_display_mode(DEVMODEW *devmode, CFArrayRef dis
  */
 LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid)
 {
-    WCHAR primary_adapter[CCHDEVICENAME];
     LONG ret = DISP_CHANGE_SUCCESSFUL;
     DEVMODEW *mode;
     int bpp;
@@ -785,9 +766,6 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN
 
     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 +782,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN
 
     for (mode = displays; mode->dmSize && !ret; mode = NEXT_DEVMODEW(mode))
     {
-        if (wcsicmp(primary_adapter, mode->dmDeviceName))
+        if (wcsicmp(primary_name, mode->dmDeviceName))
         {
             FIXME("Changing non-primary adapter settings is currently unsupported.\n");
             continue;