[PATCH 0/1] MR7397: win32u: Drop now unnecessary WM_WINE_DESKTOP_RESIZED internal message.

[Rémi Bernon]

The update_children_window_state call already updates the driver window
state on display change on every top-level window.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7397

[PATCH 1/1] win32u: Drop now unnecessary WM_WINE_DESKTOP_RESIZED internal message.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

The update_children_window_state call already updates the driver window
state on display change on every top-level window.
---
 dlls/win32u/defwnd.c       | 3 +--
 dlls/winemac.drv/display.c | 1 +
 dlls/winemac.drv/window.c  | 4 ----
 dlls/winex11.drv/window.c  | 9 ---------
 include/ntuser.h           | 1 -
 5 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c
index 7e6e9e89308..0cbb41d8604 100644
--- a/dlls/win32u/defwnd.c
+++ b/dlls/win32u/defwnd.c
@@ -3015,8 +3015,7 @@ LRESULT desktop_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,
 
         update_children_window_state( hwnd );
 
-        return send_message_timeout( HWND_BROADCAST, WM_WINE_DESKTOP_RESIZED, old_rect.left,
-                                     old_rect.top, SMTO_ABORTIFHUNG, 2000, FALSE );
+        return 0;
     }
     default:
         if (msg >= WM_USER && hwnd == get_desktop_window())
diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
index 5aad67f1809..712cea38d1b 100644
--- a/dlls/winemac.drv/display.c
+++ b/dlls/winemac.drv/display.c
@@ -809,6 +809,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN
     free_display_mode_descriptor(desc);
     CFRelease(display_modes);
     macdrv_free_displays(macdrv_displays);
+    macdrv_reset_device_metrics();
 
     return ret;
 }
diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c
index 115820ec376..05126678264 100644
--- a/dlls/winemac.drv/window.c
+++ b/dlls/winemac.drv/window.c
@@ -1662,10 +1662,6 @@ LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
             release_win_data(data);
         }
         return 0;
-    case WM_WINE_DESKTOP_RESIZED:
-        macdrv_reset_device_metrics();
-        macdrv_reassert_window_position(hwnd);
-        return 0;
     case WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS:
         activate_on_following_focus();
         TRACE("WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS time %u\n", activate_on_focus_time);
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 7ae1d8ef66a..288d174a97b 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -3273,15 +3273,6 @@ LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
             release_win_data( data );
         }
         return 0;
-    case WM_WINE_DESKTOP_RESIZED:
-        if ((data = get_win_data( hwnd )))
-        {
-            /* update the full screen state */
-            update_net_wm_states( data );
-            window_set_config( data, &data->rects.visible, FALSE );
-            release_win_data( data );
-        }
-        return 0;
     case WM_X11DRV_DELETE_TAB:
         taskbar_delete_tab( hwnd );
         return 0;
diff --git a/include/ntuser.h b/include/ntuser.h
index ae69dd65785..18b8e966132 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -617,7 +617,6 @@ enum wine_internal_message
     WM_WINE_FIRST_DRIVER_MSG = 0x80001000,  /* range of messages reserved for the USER driver */
     WM_WINE_CLIPCURSOR = 0x80001ff0, /* internal driver notification messages */
     WM_WINE_SETCURSOR,
-    WM_WINE_DESKTOP_RESIZED,
     WM_WINE_LAST_DRIVER_MSG = 0x80001fff
 };
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7397