Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-06 17:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

* use ConsoleInfo struct directly

Browse source 
* change type in global struct (avoid buffer overflow when reading value from registry)

svn path=/trunk/; revision=23918
This commit is contained in:
Johannes Anderwald 2006-09-04 21:26:49 +00:00
parent 94b07b79db
commit 478f24b02b
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reactos/dll/win32/console/console.c
View file

@ -192,14 +192,14 @@ InitApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
else
{
/* use current info */
PConsoleInfo pSharedInfo = MapViewOfFile((HANDLE)wParam,
FILE_MAP_ALL_ACCESS,
0,
0,
sizeof(ConsoleInfo));
PConsoleInfo pSharedInfo = (PConsoleInfo)wParam;
/* copy options */
if (pSharedInfo)
if (IsBadReadPtr((const void *)pSharedInfo, sizeof(ConsoleInfo)))
{
/* use defaults */
InitConsoleDefaults(pConInfo);
}
else
{
pConInfo->InsertMode = pSharedInfo->InsertMode;
pConInfo->HistoryBufferSize = pSharedInfo->HistoryBufferSize;
@ -255,8 +255,6 @@ CPlApplet(
LPARAM lParam1,
LPARAM lParam2)
{
int i = (int)lParam1;
switch(uMsg)
{
case CPL_INIT:
@ -270,14 +268,14 @@ CPlApplet(
case CPL_INQUIRE:
{
CPLINFO *CPlInfo = (CPLINFO*)lParam2;
CPlInfo->idIcon = Applets[i].idIcon;
CPlInfo->idName = Applets[i].idName;
CPlInfo->idInfo = Applets[i].idDescription;
CPlInfo->idIcon = Applets[0].idIcon;
CPlInfo->idName = Applets[0].idName;
CPlInfo->idInfo = Applets[0].idDescription;
break;
}
case CPL_DBLCLK:
{
Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2);
Applets[0].AppletProc(hwndCPl, uMsg, lParam1, lParam2);
break;
}
}

2
reactos/dll/win32/console/console.h
View file

@ -25,7 +25,7 @@ typedef struct TAGConsoleInfo
HWND hConsoleWindow;
TCHAR szProcessName[MAX_PATH];
BOOLEAN AppliedConfig;
BOOLEAN UseRasterFonts;
DWORD UseRasterFonts;
DWORD FontSize;
DWORD FontWeight;
FONTSIGNATURE FontSignature;