[PATCH 5/6] winemac.drv: Set the current mode using gdi_device_manager.

[Alexandros Frantzis]

From: Alexandros Frantzis

Since setting the current mode also sets the registry settings (if not
already set), we also remove the code that manually changes the registry
settings.

Signed-off-by: Alexandros Frantzis <[e-mail]
---
 dlls/winemac.drv/display.c | 82 ++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 44 deletions(-)

diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
index b93ebaaa5e7..5aa698091a1 100644
--- a/dlls/winemac.drv/display.c
+++ b/dlls/winemac.drv/display.c
@@ -1076,45 +1076,6 @@ done:
     return (err == kCGErrorSuccess);
 }

-/***********************************************************************
- *              init_registry_display_settings
- *
- * Initialize registry display settings when new display devices are added.
- */
-static void init_registry_display_settings(void)
-{
-    DEVMODEW dm = {.dmSize = sizeof(dm)};
-    DISPLAY_DEVICEW dd = {sizeof(dd)};
-    UNICODE_STRING str;
-    DWORD i = 0;
-    int ret;
-
-    while (!NtUserEnumDisplayDevices(NULL, i++, &dd, 0))
-    {
-        RtlInitUnicodeString(&str, dd.DeviceName);
-
-        /* Skip if the device already has registry display settings */
-        if (NtUserEnumDisplaySettings(&str, ENUM_REGISTRY_SETTINGS, &dm, 0))
-            continue;
-
-        if (!NtUserEnumDisplaySettings(&str, ENUM_CURRENT_SETTINGS, &dm, 0))
-        {
-            ERR("Failed to query current display settings for %s.\n", wine_dbgstr_w(dd.DeviceName));
-            continue;
-        }
-
-        TRACE("Device %s current display mode %ux%u %ubits %uHz at %d,%d.\n",
-              wine_dbgstr_w(dd.DeviceName), (unsigned int)dm.dmPelsWidth, (unsigned int)dm.dmPelsHeight,
-              (unsigned int)dm.dmBitsPerPel, (unsigned int)dm.dmDisplayFrequency, (int)dm.dmPosition.x, (int)dm.dmPosition.y);
-
-        ret = NtUserChangeDisplaySettings(&str, &dm, NULL,
-                                          CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL);
-        if (ret != DISP_CHANGE_SUCCESSFUL)
-            ERR("Failed to save registry display settings for %s, returned %d.\n",
-                wine_dbgstr_w(dd.DeviceName), ret);
-    }
-}
-
 /***********************************************************************
  *              macdrv_displays_changed
  *
@@ -1133,7 +1094,6 @@ void macdrv_displays_changed(const macdrv_event *event)
         NtUserGetWindowThread(hwnd, NULL) == GetCurrentThreadId())
     {
         macdrv_init_display_devices(TRUE);
-        init_registry_display_settings();
         macdrv_resize_desktop();
     }
 }
@@ -1145,7 +1105,8 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage
     struct macdrv_adapter *adapters, *adapter;
     struct macdrv_monitor *monitors, *monitor;
     struct macdrv_gpu *gpus, *gpu;
-    INT gpu_count, adapter_count, monitor_count, mode_count;
+    struct macdrv_display *displays, *display;
+    INT gpu_count, adapter_count, monitor_count, mode_count, display_count;
     DEVMODEW *mode, *modes;
     DWORD len;

@@ -1179,6 +1140,7 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage

for (adapter = adapters; adapter < adapters + adapter_count; adapter++)
         {
+            DEVMODEW current_mode = { .dmSize = sizeof(current_mode) };
             struct gdi_adapter gdi_adapter =
             {
                 .id = adapter->id,
@@ -1201,17 +1163,49 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage
                 device_manager->add_monitor( &gdi_monitor, param );
             }

+            if (macdrv_get_displays(&displays, &display_count)) break;
+
+            /* Get the current mode */
+            for (display = displays; display < displays + display_count; display++)
+            {
+                if (display->displayID == adapter->id)
+                {
+                    display_get_current_mode(display, &current_mode);
+                    break;
+                }
+            }
+
+            macdrv_free_displays(displays);
+
             if (!(modes = display_get_modes(adapter->id, &mode_count))) break;
             TRACE("adapter: %#x, mode count: %d\n", adapter->id, mode_count);

/* Initialize modes */
             for (mode = modes; mode < modes + mode_count; mode++)
             {
-                TRACE("mode: %dx%dx%dbpp @%d Hz, %sstretched %sinterlaced\n", (int)mode->dmPelsWidth, (int)mode->dmPelsHeight,
+                TRACE("mode: %dx%dx%dbpp @%d Hz, %sstretched %sinterlaced, rotated %u degrees",
+                      (int)mode->dmPelsWidth, (int)mode->dmPelsHeight,
                       (int)mode->dmBitsPerPel, (int)mode->dmDisplayFrequency,
                       mode->dmDisplayFixedOutput == DMDFO_STRETCH ? "" : "un",
-                      mode->dmDisplayFlags & DM_INTERLACED ? "" : "non-");
-                device_manager->add_mode( mode, FALSE, param );
+                      mode->dmDisplayFlags & DM_INTERLACED ? "" : "non-",
+                      (unsigned int)mode->dmDisplayOrientation * 90);
+                if (mode->dmPelsWidth == current_mode.dmPelsWidth &&
+                    mode->dmPelsHeight == current_mode.dmPelsHeight &&
+                    mode->dmBitsPerPel == current_mode.dmBitsPerPel &&
+                    mode->dmDisplayFrequency == current_mode.dmDisplayFrequency &&
+                    mode->dmDisplayFixedOutput == current_mode.dmDisplayFixedOutput &&
+                    mode->dmDisplayOrientation == current_mode.dmDisplayOrientation &&
+                    mode->dmDisplayFlags == current_mode.dmDisplayFlags)
+                {
+                    TRACE(", current at %d,%d\n",
+                          (int)current_mode->dmPosition.x, (int)current_mode->dmPosition.y);
+                    device_manager->add_mode( &current_mode, TRUE, param );
+                }
+                else
+                {
+                    TRACE("\n");
+                    device_manager->add_mode( mode, FALSE, param );
+                }
             }

free(modes);