Create a new window for the top popup menu on every new menu tracking,

dlls/user/controls.h

@@ -44,7 +44,6 @@ extern BOOL MENU_IsMenuActive(void);
 extern HMENU MENU_GetSysMenu(HWND hWndOwner, HMENU hSysPopup);
 extern UINT MENU_GetMenuBarHeight( HWND hwnd, UINT menubarWidth,
                                      INT orgX, INT orgY );
-extern BOOL MENU_PatchResidentPopup( HQUEUE16, struct tagWND* );
 extern void MENU_TrackMouseMenuBar( struct tagWND *wnd, INT ht, POINT pt );
 extern void MENU_TrackKbdMenuBar( struct tagWND *wnd, UINT wParam, INT vkey );
 extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect,

windows/user.c

@@ -117,9 +117,6 @@ static void USER_QueueCleanup( HQUEUE16 hQueue )
             desktop->hmemTaskQ = GetTaskQueue16( nextTask );
         }
 
-        /* Patch resident popup menu window */
-        MENU_PatchResidentPopup( hQueue, NULL );
-
         TIMER_RemoveQueueTimers( hQueue );
 
         HOOK_FreeQueueHooks( hQueue );

windows/win.c

@@ -1379,9 +1379,6 @@ BOOL WINAPI DestroyWindow( HWND hwnd )
 
     if( !(wndPtr->dwStyle & WS_CHILD) )
     {
-      /* make sure top menu popup doesn't get destroyed */
-      MENU_PatchResidentPopup( (HQUEUE16)0xFFFF, wndPtr );
-
       for (;;)
       {
         WND *siblingPtr = WIN_LockWndPtr(wndPtr->parent->child);  /* First sibling */