From 8a0c14b1455b2c140697393e1070d4b6a7cf38ca Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 27 Sep 2015 03:46:31 +0200
Subject: [PATCH] Added patch to fix calculation of listbox size when
 horizontal scrollbar is present.

---
 README.md                              |  3 ++-
 debian/changelog                       |  2 ++
 patches/patchinstall.sh                | 19 +++++++++++++++++++
 patches/user32-ListBox_Size/definition |  1 +
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 patches/user32-ListBox_Size/definition

diff --git a/README.md b/README.md
index 0b226017..ebb6e05a 100644
--- a/README.md
+++ b/README.md
@@ -39,10 +39,11 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features included in the next upcoming release [5]:**
+**Bug fixes and features included in the next upcoming release [6]:**
 
 * Add implementation for msidb commandline tool
 * Codepage conversion should fail when destination length is < 0
+* 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))
 * Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory
diff --git a/debian/changelog b/debian/changelog
index fc71588a..508bf62e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ wine-staging (1.7.52) UNRELEASED; urgency=low
   * Added patch to implement semi-stub for d3d8 swapchain effect
     D3DSWAPEFFECT_COPY_VSYNC.
   * Added patch to reduce stack usage of virtual memory functions.
+  * Added patch to fix calculation of listbox size when horizontal scrollbar is
+    present.
   * Removed patch to fix possible memory leak in netprofm init_networks (fixed
     upstream).
   * Removed patch for stub of dwmapi.DwmUpdateThumbnailProperties (accepted
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 8174a3de..63eb74f2 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -271,6 +271,7 @@ patch_enable_all ()
 	enable_user32_DrawTextExW="$1"
 	enable_user32_GetSystemMetrics="$1"
 	enable_user32_Invalidate_Key_State="$1"
+	enable_user32_ListBox_Size="$1"
 	enable_user32_Mouse_Message_Hwnd="$1"
 	enable_user32_Painting="$1"
 	enable_user32_ScrollWindowEx="$1"
@@ -908,6 +909,9 @@ patch_enable ()
 		user32-Invalidate_Key_State)
 			enable_user32_Invalidate_Key_State="$2"
 			;;
+		user32-ListBox_Size)
+			enable_user32_ListBox_Size="$2"
+			;;
 		user32-Mouse_Message_Hwnd)
 			enable_user32_Mouse_Message_Hwnd="$2"
 			;;
@@ -5323,6 +5327,21 @@ if test "$enable_user32_Invalidate_Key_State" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset user32-ListBox_Size
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#38142] Fix calculation of listbox size when horizontal scrollbar is present
+# |
+# | Modified files:
+# |   *	dlls/user32/listbox.c
+# |
+if test "$enable_user32_ListBox_Size" -eq 1; then
+	patch_apply user32-ListBox_Size/0001-user32-Fix-calculation-of-listbox-size-when-horizont.patch
+	(
+		echo '+    { "Michael Müller", "user32: Fix calculation of listbox size when horizontal scrollbar is present.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset user32-Mouse_Message_Hwnd
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/patches/user32-ListBox_Size/definition b/patches/user32-ListBox_Size/definition
new file mode 100644
index 00000000..910f102a
--- /dev/null
+++ b/patches/user32-ListBox_Size/definition
@@ -0,0 +1 @@
+Fixes: [38142] Fix calculation of listbox size when horizontal scrollbar is present