ddraw: Get new window size from the primary output after display mode changes.

MonitorFromWindow() may return a different monitor if switching to a smaller display mode. Fix Railroad Tycoon II crashes. Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ddraw: Get new window size from the primary output after display mode changes.
079caeaa · Zhiyi Zhang · Alexandre Julliard · 8805f042 · 079caeaa
Commit 079caeaa authored May 29, 2020 by Zhiyi Zhang Committed by Alexandre Julliard May 28, 2020
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 7 deletions

ddraw.c dlls/ddraw/ddraw.c +4 -7

No files found.
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -4926,8 +4926,7 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par
 static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent)
 {
    struct ddraw *ddraw = ddraw_from_device_parent(device_parent);
-    MONITORINFO monitor_info;
+    struct wined3d_output_desc output_desc;
-    HMONITOR monitor;
    RECT *r;
    TRACE("device_parent %p.\n", device_parent);
@@ -4938,15 +4937,13 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic
        return;
    }
-    monitor = MonitorFromWindow(ddraw->swapchain_window, MONITOR_DEFAULTTOPRIMARY);
+    if (FAILED(wined3d_output_get_desc(ddraw->wined3d_output, &output_desc)))
-    monitor_info.cbSize = sizeof(monitor_info);
-    if (!GetMonitorInfoW(monitor, &monitor_info))
    {
-        ERR("Failed to get monitor info.\n");
+        ERR("Failed to get output description.\n");
        return;
    }
-    r = &monitor_info.rcMonitor;
+    r = &output_desc.desktop_rect;
    TRACE("Resizing window %p to %s.\n", ddraw->swapchain_window, wine_dbgstr_rect(r));
    if (!SetWindowPos(ddraw->swapchain_window, HWND_TOP, r->left, r->top,