From 3d3f7c7088a2bb693aea643c0bd79e6ba5c6f800 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 22 Nov 2015 23:18:53 +0100
Subject: [PATCH] Added patch to change value for WM_MDICALCCHILDSCROLL to
 0x003f.

---
 patch-tools/changelog                         |  1 +
 patches/patchinstall.sh                       | 18 +++++++-
 ...lue-for-WM_MDICALCCHILDSCROLL-to-0x0.patch | 45 +++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 patches/user32-WM_MDICALCCHILDSCROLL/0001-user32-Change-value-for-WM_MDICALCCHILDSCROLL-to-0x0.patch

diff --git a/patch-tools/changelog b/patch-tools/changelog
index a200eae1..4ac19d78 100644
--- a/patch-tools/changelog
+++ b/patch-tools/changelog
@@ -5,6 +5,7 @@ wine-staging (1.8~rc1) UNRELEASED; urgency=low
     unload_registry
     wineserver call (accepted upstream).
   * Added patch to improve detection of symbol charset for old truetype fonts.
+  * Added patch to change value for WM_MDICALCCHILDSCROLL to 0x003f.
  -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 15 Nov 2015 21:20:51 +0100
 
 wine-staging (1.7.55) unstable; urgency=low
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index e79a2713..08bdd6e5 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "39f2ed321d87d888ac3f81e764d0e5c661db74ea"
+	echo "b5c0c46cfc0c8590d797d8cbe08b3f0a8cfe751e"
 }
 
 # Show version information
@@ -288,6 +288,7 @@ patch_enable_all ()
 	enable_user32_Refresh_MDI_Menus="$1"
 	enable_user32_ScrollWindowEx="$1"
 	enable_user32_SetCoalescableTimer="$1"
+	enable_user32_WM_MDICALCCHILDSCROLL="$1"
 	enable_user32_WndProc="$1"
 	enable_uxtheme_GTK_Theming="$1"
 	enable_version_VerQueryValue="$1"
@@ -972,6 +973,9 @@ patch_enable ()
 		user32-SetCoalescableTimer)
 			enable_user32_SetCoalescableTimer="$2"
 			;;
+		user32-WM_MDICALCCHILDSCROLL)
+			enable_user32_WM_MDICALCCHILDSCROLL="$2"
+			;;
 		user32-WndProc)
 			enable_user32_WndProc="$2"
 			;;
@@ -5604,6 +5608,18 @@ if test "$enable_user32_SetCoalescableTimer" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset user32-WM_MDICALCCHILDSCROLL
+# |
+# | Modified files:
+# |   *	dlls/user32/mdi.c, dlls/user32/tests/win.c
+# |
+if test "$enable_user32_WM_MDICALCCHILDSCROLL" -eq 1; then
+	patch_apply user32-WM_MDICALCCHILDSCROLL/0001-user32-Change-value-for-WM_MDICALCCHILDSCROLL-to-0x0.patch
+	(
+		echo '+    { "Dmitry Timoshkov", "user32: Change value for WM_MDICALCCHILDSCROLL to 0x003f.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset user32-WndProc
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/patches/user32-WM_MDICALCCHILDSCROLL/0001-user32-Change-value-for-WM_MDICALCCHILDSCROLL-to-0x0.patch b/patches/user32-WM_MDICALCCHILDSCROLL/0001-user32-Change-value-for-WM_MDICALCCHILDSCROLL-to-0x0.patch
new file mode 100644
index 00000000..b5c1ee4a
--- /dev/null
+++ b/patches/user32-WM_MDICALCCHILDSCROLL/0001-user32-Change-value-for-WM_MDICALCCHILDSCROLL-to-0x0.patch
@@ -0,0 +1,45 @@
+From 3a234761ed79e75dfb9d9ae68812ef11ea3dcecd Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Fri, 20 Nov 2015 16:38:22 +0800
+Subject: user32: Change value for WM_MDICALCCHILDSCROLL to 0x003f.
+
+This appears to be what Windows uses.
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
+---
+ dlls/user32/mdi.c       | 2 +-
+ dlls/user32/tests/win.c | 2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
+index b5a0473..46a68ab8 100644
+--- a/dlls/user32/mdi.c
++++ b/dlls/user32/mdi.c
+@@ -103,7 +103,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mdi);
+ 
+ #define MDI_MAXTITLELENGTH      0xa1
+ 
+-#define WM_MDICALCCHILDSCROLL   0x10ac /* this is exactly what Windows uses */
++#define WM_MDICALCCHILDSCROLL   0x003f /* this is exactly what Windows uses */
+ 
+ /* "More Windows..." definitions */
+ #define MDI_MOREWINDOWSLIMIT    9       /* after this number of windows, a "More Windows..."
+diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
+index fc6505f..9901789 100644
+--- a/dlls/user32/tests/win.c
++++ b/dlls/user32/tests/win.c
+@@ -2115,11 +2115,9 @@ static void test_mdi(void)
+                 gotit = TRUE;
+             }
+             else
+-todo_wine
+                 ok(msg.hwnd != mdi_client, "message %04x should not be posted to mdiclient\n", msg.message);
+             DispatchMessageA(&msg);
+         }
+-todo_wine
+         ok(gotit, "message 0x003f should appear after SetWindowPos\n");
+ 
+         si.cbSize = sizeof(si);
+-- 
+2.6.2
+