diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index c915eb0e..1fa158f5 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -287,7 +287,6 @@ patch_enable_all () enable_stdole32_tlb_SLTG_Typelib="$1" enable_user32_DM_SETDEFID="$1" enable_user32_Dialog_Paint_Event="$1" - enable_user32_DrawMenuItem="$1" enable_user32_DrawTextExW="$1" enable_user32_FlashWindowEx="$1" enable_user32_GetSystemMetrics="$1" @@ -992,9 +991,6 @@ patch_enable () user32-Dialog_Paint_Event) enable_user32_Dialog_Paint_Event="$2" ;; - user32-DrawMenuItem) - enable_user32_DrawMenuItem="$2" - ;; user32-DrawTextExW) enable_user32_DrawTextExW="$2" ;; @@ -6260,21 +6256,6 @@ if test "$enable_user32_Dialog_Paint_Event" -eq 1; then ) >> "$patchlist" fi -# Patchset user32-DrawMenuItem -# | -# | This patchset fixes the following Wine bugs: -# | * [#40704] Add a check if the menu text is a valid string in MENU_DrawMenuItem -# | -# | Modified files: -# | * dlls/user32/menu.c -# | -if test "$enable_user32_DrawMenuItem" -eq 1; then - patch_apply user32-DrawMenuItem/0001-user32-Add-a-check-if-the-menu-text-is-a-valid-strin.patch - ( - printf '%s\n' '+ { "Dmitry Timoshkov", "user32: Add a check if the menu text is a valid string.", 1 },'; - ) >> "$patchlist" -fi - # Patchset user32-DrawTextExW # | # | This patchset fixes the following Wine bugs: diff --git a/patches/user32-DrawMenuItem/0001-user32-Add-a-check-if-the-menu-text-is-a-valid-strin.patch b/patches/user32-DrawMenuItem/0001-user32-Add-a-check-if-the-menu-text-is-a-valid-strin.patch deleted file mode 100644 index 0ebcce8e..00000000 --- a/patches/user32-DrawMenuItem/0001-user32-Add-a-check-if-the-menu-text-is-a-valid-strin.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 67313bff113c1ea8df68d6117fa17bfa10a260d2 Mon Sep 17 00:00:00 2001 -From: Dmitry Timoshkov -Date: Mon, 30 May 2016 17:14:13 +0800 -Subject: user32: Add a check if the menu text is a valid string. - -Fixes #40704. ---- - dlls/user32/menu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c -index e42d8f7..e1b78ca 100644 ---- a/dlls/user32/menu.c -+++ b/dlls/user32/menu.c -@@ -1658,7 +1658,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, - SetViewportOrgEx( hdc, origorg.x, origorg.y, NULL); - } - /* process text if present */ -- if (lpitem->text) -+ if (!IS_INTRESOURCE(lpitem->text)) - { - int i; - HFONT hfontOld = 0; --- -2.8.0 - diff --git a/patches/user32-DrawMenuItem/definition b/patches/user32-DrawMenuItem/definition deleted file mode 100644 index 061a74f6..00000000 --- a/patches/user32-DrawMenuItem/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [40704] Add a check if the menu text is a valid string in MENU_DrawMenuItem