Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-08 02:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ConSrv]

Browse source 
- Move CreateSysMenu after creating the main window. This is a hax fix for CORE-8129.

svn path=/trunk/; revision=63595
This commit is contained in:
James Tabor 2014-06-13 01:49:29 +00:00
parent a9746d12cb
commit 50e8eb2f87
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
View file

@ -250,7 +250,8 @@ AppendMenuItems(HMENU hMenu,
} while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].wCmdID == 0)); } while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].wCmdID == 0));
} }
static VOID //static
VOID
CreateSysMenu(HWND hWnd) CreateSysMenu(HWND hWnd)
{ {
MENUITEMINFOW mii; MENUITEMINFOW mii;
@ -587,7 +588,7 @@ OnNcCreate(HWND hWnd, LPCREATESTRUCTW Create)
SetWindowLongPtrW(GuiData->hWindow, GWLP_USERDATA, (DWORD_PTR)GuiData); SetWindowLongPtrW(GuiData->hWindow, GWLP_USERDATA, (DWORD_PTR)GuiData);
SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL);
CreateSysMenu(GuiData->hWindow); //CreateSysMenu(GuiData->hWindow);
DPRINT("OnNcCreate - setting start event\n"); DPRINT("OnNcCreate - setting start event\n");
SetEvent(GuiData->hGuiInitEvent); SetEvent(GuiData->hGuiInitEvent);

5
reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
View file

@ -140,7 +140,8 @@ InvalidateCell(PGUI_CONSOLE_DATA GuiData,
VOID VOID
SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen); SwitchFullScreen(PGUI_CONSOLE_DATA GuiData, BOOL FullScreen);
VOID
CreateSysMenu(HWND hWnd);
static LRESULT CALLBACK static LRESULT CALLBACK
GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
@ -199,6 +200,8 @@ GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
GuiConsoleMoveWindow(GuiData); // FIXME: This MUST be done via the CreateWindowExW call. GuiConsoleMoveWindow(GuiData); // FIXME: This MUST be done via the CreateWindowExW call.
SendMessageW(GuiData->hWindow, PM_RESIZE_TERMINAL, 0, 0); SendMessageW(GuiData->hWindow, PM_RESIZE_TERMINAL, 0, 0);
CreateSysMenu(GuiData->hWindow);
/* Switch to full-screen mode if necessary */ /* Switch to full-screen mode if necessary */
// FIXME: Move elsewhere, it cause misdrawings of the window. // FIXME: Move elsewhere, it cause misdrawings of the window.
if (GuiData->GuiInfo.FullScreen) SwitchFullScreen(GuiData, TRUE); if (GuiData->GuiInfo.FullScreen) SwitchFullScreen(GuiData, TRUE);

1
reactos/win32ss/user/winsrv/init.c
View file

@ -32,6 +32,7 @@ KeyboardHookProc(int nCode,
WPARAM wParam, WPARAM wParam,
LPARAM lParam) LPARAM lParam)
{ {
DPRINT1("KeyboardHookProc Processing!\n");
return CallNextHookEx(hhk, nCode, wParam, lParam); return CallNextHookEx(hhk, nCode, wParam, lParam);
} }
/*** END - HACK from win32csr... ***/ /*** END - HACK from win32csr... ***/