From 4fb2477927d757adb8ea4ae72eb63bc491041b23 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 9 Sep 2014 22:47:34 +0200 Subject: [PATCH] Removed patch to fix uninitialized cch member in GetMenuItemInfo (accepted upstream). --- README.md | 2 +- debian/changelog | 1 + patches/Makefile | 19 ------------ ...cch-member-in-GetMenuItemInfo-when-p.patch | 31 ------------------- patches/user32-GetMenuItemInfo/definition | 4 --- 5 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 patches/user32-GetMenuItemInfo/0001-user32-Also-set-cch-member-in-GetMenuItemInfo-when-p.patch delete mode 100644 patches/user32-GetMenuItemInfo/definition diff --git a/README.md b/README.md index 1af10e9c..f90d03fa 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Included bugfixes and improvements * Fix for programs leaking wndproc slots ([Wine Bug #32451](http://bugs.winehq.org/show_bug.cgi?id=32451 "Multiple GOG.com installer bundles show a broken/unresponsive dialog window during installation (installer process running out of wndproc slots)")) * Fix issue with invisible dragimages in ImageList ([Wine Bug #36761](http://bugs.winehq.org/show_bug.cgi?id=36761 "Imagelist invisible dragimage")) * Fix unintentional leaks with ntdll internals -* Fix unitialized cch value when calling GetMenuItemInfo with a null pointer ([Wine Bug #34642](http://bugs.winehq.org/show_bug.cgi?id=34642 "Adobe Premiere Pro 2.0 exits silently on startup ('GetMenuItemInfo' must zero out 'cch' if mask doesn't specify 'MIIM_TYPE')")) +* ~~Fix unitialized cch value when calling GetMenuItemInfo with a null pointer~~ ([Wine Bug #34642](http://bugs.winehq.org/show_bug.cgi?id=34642 "Adobe Premiere Pro 2.0 exits silently on startup ('GetMenuItemInfo' must zero out 'cch' if mask doesn't specify 'MIIM_TYPE')")) * Games For Windows Live 1.x expects a valid linker version in the PE header ([Wine Bug #28768](http://bugs.winehq.org/show_bug.cgi?id=28768 "Multiple GFWL (Games For Windows Live) 1.x games crash on startup (Kane & Lynch: Dead Men)")) * GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](http://bugs.winehq.org/show_bug.cgi?id=15980 "Rhapsody 2 crashes on startup (GetSecurityInfo returns NULL DACL for process object)")) * Implement a Microsoft Yahei replacement font ([Wine Bug #13829](http://bugs.winehq.org/show_bug.cgi?id=13829 "Wine does not have CJK fonts")) diff --git a/debian/changelog b/debian/changelog index 887f0ffc..f34d0da8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ wine-compholio (1.7.27) UNRELEASED; urgency=low * Fixed some issues in the patches for GetSystemTimes. * Removed patch to use assembly wrapper for TLS callbacks (accepted upstream). + * Removed patch to fix uninitialized cch struct member in GetMenuItemInfo. -- Erich E. Hoover Mon, 08 Sep 2014 21:14:36 +0200 wine-compholio (1.7.26) unstable; urgency=low diff --git a/patches/Makefile b/patches/Makefile index 705eaaac..f423a8f8 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -62,7 +62,6 @@ PATCHLIST := \ shell32-RunDLL_CallEntry16.ok \ shell32-SHCreateSessionKey.ok \ shlwapi-UrlCombine.ok \ - user32-GetMenuItemInfo.ok \ user32-GetSystemMetrics.ok \ user32-GetTipText.ok \ user32-WndProc.ok \ @@ -972,24 +971,6 @@ shlwapi-UrlCombine.ok: echo '+ { "shlwapi-UrlCombine", "Sebastian Lackner", "Workaround for broken implementation of shlwapi url functions." },'; \ ) > shlwapi-UrlCombine.ok -# Patchset user32-GetMenuItemInfo -# | -# | Included patches: -# | * Also set cch member in GetMenuItemInfo when passing a null pointer. [by Michael Müller] -# | -# | This patchset fixes the following Wine bugs: -# | * [#34642] Fix unitialized cch value when calling GetMenuItemInfo with a null pointer -# | -# | Modified files: -# | * dlls/user32/menu.c -# | -.INTERMEDIATE: user32-GetMenuItemInfo.ok -user32-GetMenuItemInfo.ok: - $(call APPLY_FILE,user32-GetMenuItemInfo/0001-user32-Also-set-cch-member-in-GetMenuItemInfo-when-p.patch) - @( \ - echo '+ { "user32-GetMenuItemInfo", "Michael Müller", "Also set cch member in GetMenuItemInfo when passing a null pointer." },'; \ - ) > user32-GetMenuItemInfo.ok - # Patchset user32-GetSystemMetrics # | # | Included patches: diff --git a/patches/user32-GetMenuItemInfo/0001-user32-Also-set-cch-member-in-GetMenuItemInfo-when-p.patch b/patches/user32-GetMenuItemInfo/0001-user32-Also-set-cch-member-in-GetMenuItemInfo-when-p.patch deleted file mode 100644 index 0d345444..00000000 --- a/patches/user32-GetMenuItemInfo/0001-user32-Also-set-cch-member-in-GetMenuItemInfo-when-p.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c91c8456d92e0761f0b6df345c4547b54db63d86 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sun, 7 Sep 2014 20:14:36 +0200 -Subject: user32: Also set cch member in GetMenuItemInfo when passing a null - pointer. - ---- - 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 93bee49..9e05dd4 100644 ---- a/dlls/user32/menu.c -+++ b/dlls/user32/menu.c -@@ -4583,12 +4583,12 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, - if ((lpmii->fMask & (MIIM_TYPE|MIIM_STRING))) { - if( !menu->text ) { - if(lpmii->dwTypeData && lpmii->cch) { -- lpmii->cch = 0; - if( unicode) - *((WCHAR *)lpmii->dwTypeData) = 0; - else - *((CHAR *)lpmii->dwTypeData) = 0; - } -+ lpmii->cch = 0; - } else { - int len; - if (unicode) --- -1.9.1 - diff --git a/patches/user32-GetMenuItemInfo/definition b/patches/user32-GetMenuItemInfo/definition deleted file mode 100644 index 09f2a6ab..00000000 --- a/patches/user32-GetMenuItemInfo/definition +++ /dev/null @@ -1,4 +0,0 @@ -Author: Michael Müller -Subject: Also set cch member in GetMenuItemInfo when passing a null pointer. -Revision: 1 -Fixes: [34642] Fix unitialized cch value when calling GetMenuItemInfo with a null pointer