Rémi Bernon : winemac: Merge RESET_DEVICE_METRICS and DISPLAYCHANGE internal messages.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d49cf1021b88278fd4c37e53474f284027594724
URL:    https://gitlab.winehq.org/wine/wine/-/commit/d49cf1021b88278fd4c37e53474f284...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Mon Jun  3 10:41:19 2024 +0200

winemac: Merge RESET_DEVICE_METRICS and DISPLAYCHANGE internal messages.

---

 dlls/winemac.drv/macdrv.h | 1 -
 dlls/winemac.drv/window.c | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h
index a7905050f16..ab5b9a2667b 100644
--- a/dlls/winemac.drv/macdrv.h
+++ b/dlls/winemac.drv/macdrv.h
@@ -95,7 +95,6 @@ extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp);
 enum macdrv_window_messages
 {
     WM_MACDRV_SET_WIN_REGION = WM_WINE_FIRST_DRIVER_MSG,
-    WM_MACDRV_RESET_DEVICE_METRICS,
     WM_MACDRV_DISPLAYCHANGE,
     WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS,
 };
diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c
index 84668b44c51..35cf9255279 100644
--- a/dlls/winemac.drv/window.c
+++ b/dlls/winemac.drv/window.c
@@ -1586,8 +1586,6 @@ void macdrv_resize_desktop(void)
     if (!NtUserGetWindowRect(hwnd, ¤t_desktop_rect) ||
         !CGRectEqualToRect(cgrect_from_rect(current_desktop_rect), new_desktop_rect))
     {
-        send_message_timeout(HWND_BROADCAST, WM_MACDRV_RESET_DEVICE_METRICS, 0, 0,
-                             SMTO_ABORTIFHUNG, 2000, NULL);
         NtUserSetWindowPos(hwnd, 0, CGRectGetMinX(new_desktop_rect), CGRectGetMinY(new_desktop_rect),
                            CGRectGetWidth(new_desktop_rect), CGRectGetHeight(new_desktop_rect),
                            SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE);
@@ -2020,10 +2018,8 @@ LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
             release_win_data(data);
         }
         return 0;
-    case WM_MACDRV_RESET_DEVICE_METRICS:
-        macdrv_reset_device_metrics();
-        return 0;
     case WM_MACDRV_DISPLAYCHANGE:
+        macdrv_reset_device_metrics();
         macdrv_reassert_window_position(hwnd);
         return 0;
     case WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS: