[ros-diffs] [jimtabor] 63595: [ConSrv] - Move CreateSysMenu after creating the main window. This is a hax fix for CORE-8129.

Author: jimtabor
Date: Fri Jun 13 01:49:29 2014
New Revision: 63595

URL: http://svn.reactos.org/svn/reactos?rev=63595&view=rev
Log:
[ConSrv]
- Move CreateSysMenu after creating the main window. This is a hax fix for CORE-8129.

Modified:
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
    trunk/reactos/win32ss/user/winsrv/init.c

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c	[iso-8859-1]
(original)
+++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c	[iso-8859-1] Fri Jun
13 01:49:29 2014
@@ -250,7 +250,8 @@
     } while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL &&
Items[i].wCmdID == 0));
 }
 
-static VOID
+//static
+VOID
 CreateSysMenu(HWND hWnd)
 {
     MENUITEMINFOW mii;
@@ -587,7 +588,7 @@
     SetWindowLongPtrW(GuiData->hWindow, GWLP_USERDATA, (DWORD_PTR)GuiData);
 
     SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL);
-    CreateSysMenu(GuiData->hWindow);
+    //CreateSysMenu(GuiData->hWindow);
 
     DPRINT("OnNcCreate - setting start event\n");
     SetEvent(GuiData->hGuiInitEvent);

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c	[iso-8859-1]
(original)
+++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c	[iso-8859-1] Fri Jun
13 01:49:29 2014
@@ -140,7 +140,8 @@
 
 VOID
 SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen);
-
+VOID
+CreateSysMenu(HWND hWnd);
 static LRESULT CALLBACK
 GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
@@ -198,6 +199,8 @@
                 /* CAN WE DEADLOCK ?? */
                 GuiConsoleMoveWindow(GuiData); // FIXME: This MUST be done via the
CreateWindowExW call.
                 SendMessageW(GuiData->hWindow, PM_RESIZE_TERMINAL, 0, 0);
+
+                CreateSysMenu(GuiData->hWindow);
 
                 /* Switch to full-screen mode if necessary */
                 // FIXME: Move elsewhere, it cause misdrawings of the window.

Modified: trunk/reactos/win32ss/user/winsrv/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/init.c…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/init.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/init.c	[iso-8859-1] Fri Jun 13 01:49:29 2014
@@ -32,6 +32,7 @@
                  WPARAM wParam,
                  LPARAM lParam)
 {
+    DPRINT1("KeyboardHookProc Processing!\n");
     return CallNextHookEx(hhk, nCode, wParam, lParam);
 }
 /*** END - HACK from win32csr... ***/