[ros-diffs] [jimtabor] 63183: [User32] - Fixed more wine tests. WM_UNINITMENUPOPUP is called before destroying pop up menu window.

Author: jimtabor
Date: Wed May  7 22:25:16 2014
New Revision: 63183

URL: http://svn.reactos.org/svn/reactos?rev=63183&view=rev
Log:
[User32]
- Fixed more wine tests. WM_UNINITMENUPOPUP is called before destroying pop up menu
window.

Modified:
    trunk/reactos/win32ss/user/user32/windows/menu.c

Modified: trunk/reactos/win32ss/user/user32/windows/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/menu.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/menu.c	[iso-8859-1] Wed May  7 22:25:16
2014
@@ -2944,13 +2944,18 @@
       {
           MenuHideSubPopups(WndOwner, &SubMenuInfo, FALSE, wFlags);
           MenuSelectItem(WndOwner, &SubMenuInfo, NO_SELECTED_ITEM, SendMenuSelect,
NULL);
+
+          if (!(wFlags & TPM_NONOTIFY))
+             SendMessageW( WndOwner, WM_UNINITMENUPOPUP, (WPARAM)ItemInfo.hSubMenu,
+                                 MAKELPARAM(0, IS_SYSTEM_MENU(&SubMenuInfo)) );
+          ////
+          // Call WM_UNINITMENUPOPUP FIRST before destroy!!
+          // Fixes todo_wine User32 test menu.c line 2233 GetMenuBarInfo callback....
+          //
           DestroyWindow(SubMenuInfo.Wnd);
           SubMenuInfo.Wnd = NULL;
           MenuSetRosMenuInfo(&SubMenuInfo);
-
-          if (!(wFlags & TPM_NONOTIFY))
-             SendMessageW( WndOwner, WM_UNINITMENUPOPUP, (WPARAM)ItemInfo.hSubMenu,
-                                 MAKELPARAM(0, IS_SYSTEM_MENU(&SubMenuInfo)) );
+          ////
       }
   }
 }