commit aab85d72bd57445eba36e7a2a2abf5f5c68a13b3
author Dmitry Timoshkov <dmitry@codeweavers.com> Mon Jan 15 20:21:15 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jan 15 20:21:15 2001 +0000
tree 3f01b44f7833e4380eaeb19d000479e5eb1a84fa
parent 50af4a381c33f435983d826c46b6664cc2998018

Initialize MENUITEMINFO structure before calling GetMenuItemInfo.

windows/mdi.c

diff --git a/windows/mdi.c b/windows/mdi.c
index 7f66fe7..13a43dc 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -1100,7 +1100,7 @@
  */
 static BOOL MDI_RestoreFrameMenu( WND *frameWnd, HWND hChild )
 {
-    MENUITEMINFOA menuInfo;
+    MENUITEMINFOW menuInfo;
     INT nItems = GetMenuItemCount(frameWnd->wIDmenu) - 1;
     UINT iId = GetMenuItemID(frameWnd->wIDmenu,nItems) ;
 
@@ -1114,10 +1114,11 @@
      * Remove the system menu, If that menu is the icon of the window
      * as it is in win95, we have to delete the bitmap.
      */
-    menuInfo.cbSize = sizeof(MENUITEMINFOA);
+    memset(&menuInfo, 0, sizeof(menuInfo));
+    menuInfo.cbSize = sizeof(menuInfo);
     menuInfo.fMask  = MIIM_DATA | MIIM_TYPE;
 
-    GetMenuItemInfoA(frameWnd->wIDmenu, 
+    GetMenuItemInfoW(frameWnd->wIDmenu, 
 		     0, 
 		     TRUE,
 		     &menuInfo);