diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 674afd2c..b6d7c81c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -379,6 +379,7 @@ patch_enable_all () enable_user_exe16_DlgDirList="$1" enable_user32_Auto_Radio_Button="$1" enable_user32_Combobox_WM_SIZE="$1" + enable_user32_Cursor_Size="$1" enable_user32_DM_SETDEFID="$1" enable_user32_DialogBoxParam="$1" enable_user32_Dialog_Focus="$1" @@ -1403,6 +1404,9 @@ patch_enable () user32-Combobox_WM_SIZE) enable_user32_Combobox_WM_SIZE="$2" ;; + user32-Cursor_Size) + enable_user32_Cursor_Size="$2" + ;; user32-DM_SETDEFID) enable_user32_DM_SETDEFID="$2" ;; @@ -8271,6 +8275,18 @@ if test "$enable_user32_Combobox_WM_SIZE" -eq 1; then ) >> "$patchlist" fi +# Patchset user32-Cursor_Size +# | +# | Modified files: +# | * dlls/user32/cursoricon.c +# | +if test "$enable_user32_Cursor_Size" -eq 1; then + patch_apply user32-Cursor_Size/0001-user32-Reduce-the-cursor-height-if-it-also-includes-.patch + ( + printf '%s\n' '+ { "Alexandre Julliard", "user32: Reduce the cursor height if it also includes the mask.", 1 },'; + ) >> "$patchlist" +fi + # Patchset user32-DM_SETDEFID # | # | This patchset fixes the following Wine bugs: diff --git a/patches/user32-Cursor_Size/0001-user32-Reduce-the-cursor-height-if-it-also-includes-.patch b/patches/user32-Cursor_Size/0001-user32-Reduce-the-cursor-height-if-it-also-includes-.patch new file mode 100644 index 00000000..fd35ca8b --- /dev/null +++ b/patches/user32-Cursor_Size/0001-user32-Reduce-the-cursor-height-if-it-also-includes-.patch @@ -0,0 +1,25 @@ +From 15121c7f2af09c906bcfeddd830b61ac1efa3c25 Mon Sep 17 00:00:00 2001 +From: Alexandre Julliard +Date: Mon, 24 Jul 2017 13:12:50 +0200 +Subject: user32: Reduce the cursor height if it also includes the mask. + +Signed-off-by: Alexandre Julliard +--- + dlls/user32/cursoricon.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c +index 5ee5cdfa966..252ea1f2942 100644 +--- a/dlls/user32/cursoricon.c ++++ b/dlls/user32/cursoricon.c +@@ -947,6 +947,7 @@ static BOOL CURSORICON_GetResCursorEntry( LPCVOID dir, DWORD size, int n, + *width = cursor->wWidth; + *height = cursor->wHeight; + *bits = resdir->idEntries[n].wBitCount; ++ if (*height == *width * 2) *height /= 2; + return TRUE; + } + +-- +2.13.1 +