Added patch to refresh MDI menus when DefMDIChildProc(WM_SETTEXT) is called.

This commit is contained in:
Sebastian Lackner 2015-09-27 20:07:42 +02:00
parent 07de62088d
commit e522c26b4b
6 changed files with 57 additions and 2 deletions

View File

@ -39,7 +39,7 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
-----------------------------------
**Bug fixes and features included in the next upcoming release [7]:**
**Bug fixes and features included in the next upcoming release [8]:**
* Add implementation for msidb commandline tool
* Codepage conversion should fail when destination length is < 0
@ -47,6 +47,7 @@ Included bug fixes and improvements
* Fix calculation of listbox size when horizontal scrollbar is present ([Wine Bug #38142](https://bugs.winehq.org/show_bug.cgi?id=38142))
* Implement semi-stub for d3d8 swapchain effect D3DSWAPEFFECT_COPY_VSYNC ([Wine Bug #37587](https://bugs.winehq.org/show_bug.cgi?id=37587))
* Reduce stack usage of virtual memory functions ([Wine Bug #34558](https://bugs.winehq.org/show_bug.cgi?id=34558))
* Refresh MDI menus when DefMDIChildProc(WM_SETTEXT) is called ([Wine Bug #21855](https://bugs.winehq.org/show_bug.cgi?id=21855))
* Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory

1
debian/changelog vendored
View File

@ -13,6 +13,7 @@ wine-staging (1.7.52) UNRELEASED; urgency=low
present.
* Added patch to ignore width/height passed to edit control in WM_SIZE
message.
* Added patch to refresh MDI menus when DefMDIChildProc(WM_SETTEXT) is called.
* Removed patch to fix possible memory leak in netprofm init_networks (fixed
upstream).
* Removed patch for stub of dwmapi.DwmUpdateThumbnailProperties (accepted

View File

@ -275,6 +275,7 @@ patch_enable_all ()
enable_user32_ListBox_Size="$1"
enable_user32_Mouse_Message_Hwnd="$1"
enable_user32_Painting="$1"
enable_user32_Refresh_MDI_Menus="$1"
enable_user32_ScrollWindowEx="$1"
enable_user32_WndProc="$1"
enable_uxtheme_GTK_Theming="$1"
@ -922,6 +923,9 @@ patch_enable ()
user32-Painting)
enable_user32_Painting="$2"
;;
user32-Refresh_MDI_Menus)
enable_user32_Refresh_MDI_Menus="$2"
;;
user32-ScrollWindowEx)
enable_user32_ScrollWindowEx="$2"
;;
@ -5388,6 +5392,21 @@ if test "$enable_user32_Painting" -eq 1; then
) >> "$patchlist"
fi
# Patchset user32-Refresh_MDI_Menus
# |
# | This patchset fixes the following Wine bugs:
# | * [#21855] Refresh MDI menus when DefMDIChildProc(WM_SETTEXT) is called
# |
# | Modified files:
# | * dlls/user32/mdi.c
# |
if test "$enable_user32_Refresh_MDI_Menus" -eq 1; then
patch_apply user32-Refresh_MDI_Menus/0001-user32-Refresh-MDI-menus-when-DefMDIChildProcW-WM_SE.patch
(
echo '+ { "Sebastian Lackner", "user32: Refresh MDI menus when DefMDIChildProc(WM_SETTEXT) is called.", 1 },';
) >> "$patchlist"
fi
# Patchset user32-ScrollWindowEx
# |
# | This patchset fixes the following Wine bugs:

View File

@ -0,0 +1,33 @@
From 376bc1c96b3fe8aa79516198aa59763a762392ee Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 27 Sep 2015 19:35:05 +0200
Subject: user32: Refresh MDI menus when DefMDIChildProc(WM_SETTEXT) is
called.
---
dlls/user32/mdi.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
index 41b5077..635c8b2 100644
--- a/dlls/user32/mdi.c
+++ b/dlls/user32/mdi.c
@@ -1425,6 +1425,7 @@ LRESULT WINAPI DefMDIChildProcA( HWND hwnd, UINT message,
DefWindowProcA(hwnd, message, wParam, lParam);
if( ci->hwndChildMaximized == hwnd )
MDI_UpdateFrameText( GetParent(client), client, TRUE, NULL );
+ MDI_RefreshMenu( ci );
return 1; /* success. FIXME: check text length */
case WM_GETMINMAXINFO:
@@ -1465,6 +1466,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message,
DefWindowProcW(hwnd, message, wParam, lParam);
if( ci->hwndChildMaximized == hwnd )
MDI_UpdateFrameText( GetParent(client), client, TRUE, NULL );
+ MDI_RefreshMenu( ci );
return 1; /* success. FIXME: check text length */
case WM_GETMINMAXINFO:
--
2.5.1

View File

@ -0,0 +1 @@
Fixes: [21855] Refresh MDI menus when DefMDIChildProc(WM_SETTEXT) is called

View File

@ -2,7 +2,7 @@
# Installation: ln -s ../../precommit-hook.sh .git/hooks/pre-commit
for directory in patches debian; do
if [ ! -z "$(git status --porcelain "$directory")" ]; then
if git status --porcelain "$directory" | grep "^.[^ ]" &> /dev/null; then
echo ""
echo "*** PLEASE ADD OR STASH YOUR CHANGES IN $directory ***"
echo ""