Initialize the various menu global variables on demand instead of at

dlls/user/controls.h

@@ -56,9 +56,7 @@ extern BOOL DESKTOP_SetPattern( LPCWSTR pattern );
 extern HWND ICONTITLE_Create( HWND hwnd );
 
 /* menu controls */
-extern BOOL MENU_Init(void);
 extern HWND 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_SetMenu(HWND, HMENU);

dlls/user/user_main.c

@@ -179,9 +179,6 @@ static BOOL process_attach(void)
     /* Initialize built-in window classes */
     CLASS_RegisterBuiltinClasses();
 
-    /* Initialize menus */
-    if (!MENU_Init()) return FALSE;
-
     /* Initialize message spying */
     if (!SPY_Init()) return FALSE;
 

dlls/user/win.c

@@ -976,7 +976,9 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, ATOM classAtom,
     wndPtr->userdata       = 0;
     wndPtr->hIcon          = 0;
     wndPtr->hIconSmall     = 0;
-    wndPtr->hSysMenu       = (wndPtr->dwStyle & WS_SYSMENU) ? MENU_GetSysMenu( hwnd, (HMENU)-1 ) : 0;
+    wndPtr->hSysMenu       = 0;
+
+    if (wndPtr->dwStyle & WS_SYSMENU) SetSystemMenu( hwnd, 0 );
 
     /*
      * Correct the window styles.