Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 15:15:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CONSOLE.CPL]

Browse source 
Fix setting default parameters.

svn path=/trunk/; revision=62720
This commit is contained in:
Hermès Bélusca-Maïto 2014-04-12 15:02:02 +00:00
parent 9d33160552
commit f5431ba0ec
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reactos/dll/cpl/console/console.c
View file

@ -296,22 +296,6 @@ InitApplet(HWND hWnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
return 0;
}
/* Check that we are really going to modify GUI terminal information... */
if (pSharedInfo->TerminalInfo.Size != sizeof(GUI_CONSOLE_INFO) ||
pSharedInfo->TerminalInfo.TermInfo == 0)
{
/* ... it's not the case, bail out */
/* Cleanup */
HeapFree(GetProcessHeap(), 0, pConInfo);
/* Close the section */
UnmapViewOfFile(pSharedInfo);
CloseHandle(hSection);
return 0;
}
/* Find the console window and whether we set the default parameters */
pConInfo->hConsoleWindow = pSharedInfo->hConsoleWindow;
pConInfo->ShowDefaultParams = pSharedInfo->ShowDefaultParams;
@ -333,6 +317,13 @@ InitApplet(HWND hWnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
* Copy the shared data into our allocated buffer, and
* de-offsetize the address of terminal-specific information.
*/
/* Check that we are really going to modify GUI terminal information */
// FIXME: Do something clever, for example copy the UI-independent part
// and init the UI-dependent part to some default values...
ASSERT(pSharedInfo->TerminalInfo.Size == sizeof(GUI_CONSOLE_INFO));
ASSERT(pSharedInfo->TerminalInfo.TermInfo);
RtlCopyMemory(pConInfo, pSharedInfo, sizeof(CONSOLE_PROPS) + sizeof(GUI_CONSOLE_INFO));
pConInfo->TerminalInfo.TermInfo = (PVOID)((ULONG_PTR)pConInfo + (ULONG_PTR)pConInfo->TerminalInfo.TermInfo);
}