diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 0dc76929..dcee59e5 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -289,6 +289,7 @@ patch_enable_all () enable_user32_FlashWindowEx="$1" enable_user32_GetSystemMetrics="$1" enable_user32_Implement_CascadeWindows="$1" + enable_user32_InternalGetWindowIcon="$1" enable_user32_LR_LOADFROMFILE="$1" enable_user32_ListBox_Size="$1" enable_user32_LoadKeyboardLayoutEx="$1" @@ -990,6 +991,9 @@ patch_enable () user32-Implement-CascadeWindows) enable_user32_Implement_CascadeWindows="$2" ;; + user32-InternalGetWindowIcon) + enable_user32_InternalGetWindowIcon="$2" + ;; user32-LR_LOADFROMFILE) enable_user32_LR_LOADFROMFILE="$2" ;; @@ -6165,6 +6169,21 @@ if test "$enable_user32_Implement_CascadeWindows" -eq 1; then ) >> "$patchlist" fi +# Patchset user32-InternalGetWindowIcon +# | +# | This patchset fixes the following Wine bugs: +# | * [#47915] user32: AddInternalGetWindowIcon stub. +# | +# | Modified files: +# | * dlls/user32/user32.spec, dlls/user32/win.c +# | +if test "$enable_user32_InternalGetWindowIcon" -eq 1; then + patch_apply user32-InternalGetWindowIcon/0001-user32-AddInternalGetWindowIcon-stub.patch + ( + printf '%s\n' '+ { "David Torok", "user32: AddInternalGetWindowIcon stub.", 1 },'; + ) >> "$patchlist" +fi + # Patchset user32-LR_LOADFROMFILE # | # | This patchset fixes the following Wine bugs: diff --git a/patches/user32-InternalGetWindowIcon/0001-user32-AddInternalGetWindowIcon-stub.patch b/patches/user32-InternalGetWindowIcon/0001-user32-AddInternalGetWindowIcon-stub.patch new file mode 100644 index 00000000..3de291dd --- /dev/null +++ b/patches/user32-InternalGetWindowIcon/0001-user32-AddInternalGetWindowIcon-stub.patch @@ -0,0 +1,43 @@ +From 58ef0f2b6938fbec5add8bb671afe1d81ab534fc Mon Sep 17 00:00:00 2001 +From: David Torok <dt@zeroitlab.com> +Date: Mon, 14 Oct 2019 10:37:49 +1100 +Subject: [PATCH] user32: AddInternalGetWindowIcon stub. + +--- + dlls/user32/user32.spec | 1 + + dlls/user32/win.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec +index f9a4ae26df..2c4d0d252a 100644 +--- a/dlls/user32/user32.spec ++++ b/dlls/user32/user32.spec +@@ -444,6 +444,7 @@ + @ stdcall InsertMenuItemA(long long long ptr) + @ stdcall InsertMenuItemW(long long long ptr) + @ stdcall InsertMenuW(long long long long ptr) ++@ stdcall InternalGetWindowIcon(long long) + @ stdcall InternalGetWindowText(long long long) + @ stdcall IntersectRect(ptr ptr ptr) + @ stdcall InvalidateRect(long ptr long) +diff --git a/dlls/user32/win.c b/dlls/user32/win.c +index 3323ed3e41..8231acc0f1 100644 +--- a/dlls/user32/win.c ++++ b/dlls/user32/win.c +@@ -2887,6 +2887,13 @@ INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) + return strlen(lpString); + } + ++/******************************************************************* ++ * InternalGetWindowIcon (USER32.@) ++ */ ++INT WINAPI InternalGetWindowIcon(HWND hwnd, UINT iconType ) ++{ ++ return NULL; ++} + + /******************************************************************* + * InternalGetWindowText (USER32.@) +-- +2.17.1 + diff --git a/patches/user32-InternalGetWindowIcon/definition b/patches/user32-InternalGetWindowIcon/definition new file mode 100644 index 00000000..1e29d1cf --- /dev/null +++ b/patches/user32-InternalGetWindowIcon/definition @@ -0,0 +1 @@ +Fixes: [47915] user32: AddInternalGetWindowIcon stub.