Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 07:46:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace MmCopyFromCaller with probing and seh.

Browse source 
svn path=/trunk/; revision=23988
This commit is contained in:
Saveliy Tretiakov 2006-09-09 13:19:03 +00:00
parent e6bb607c6f
commit 68c6a664cf
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
reactos/subsystems/win32/win32k/ntuser/painting.c
View file

@ -1380,7 +1380,7 @@ BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxW
PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon); PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon);
BOOL BOOL
IntDrawSysMenuButton( UserDrawSysMenuButton(
PWINDOW_OBJECT pWnd, PWINDOW_OBJECT pWnd,
HDC hDc, HDC hDc,
LPRECT lpRc, LPRECT lpRc,
@ -1421,7 +1421,7 @@ IntDrawSysMenuButton(
} }
BOOL BOOL
IntDrawCaptionText(HDC hDc, UserDrawCaptionText(HDC hDc,
const PUNICODE_STRING Text, const PUNICODE_STRING Text,
const LPRECT lpRc, const LPRECT lpRc,
UINT uFlags) UINT uFlags)
@ -1672,7 +1672,7 @@ BOOL UserDrawCaption(
{ {
r.top ++; r.top ++;
r.left -= --IconWidth; r.left -= --IconWidth;
IntDrawSysMenuButton(pWnd, hMemDc, &r, FALSE); UserDrawSysMenuButton(pWnd, hMemDc, &r, FALSE);
r.left += IconWidth; r.left += IconWidth;
r.top --; r.top --;
} }
@ -1705,7 +1705,7 @@ BOOL UserDrawCaption(
} }
} }
IntDrawCaptionText(hMemDc, &pWnd->WindowName, &r, uFlags); UserDrawCaptionText(hMemDc, &pWnd->WindowName, &r, uFlags);
} }
if(!NtGdiBitBlt(hDc, lpRc->left, lpRc->top, if(!NtGdiBitBlt(hDc, lpRc->left, lpRc->top,
@ -1737,13 +1737,7 @@ NtUserDrawCaption(HWND hWnd,
{ {
PWINDOW_OBJECT pWnd; PWINDOW_OBJECT pWnd;
RECT SafeRect; RECT SafeRect;
BOOL Ret; BOOL Ret = FALSE;
if(!NT_SUCCESS(MmCopyFromCaller(&SafeRect, lpRc, sizeof(RECT))))
{
DPRINT1("%s: MmCopyFromCaller failed!", __FUNCTION__);
return FALSE;
}
UserEnterExclusive(); UserEnterExclusive();
@ -1753,7 +1747,17 @@ NtUserDrawCaption(HWND hWnd,
return FALSE; return FALSE;
} }
Ret = UserDrawCaption(pWnd, hDc, &SafeRect, uFlags); _SEH_TRY
{
ProbeForRead(lpRc, sizeof(RECT), sizeof(ULONG));
RtlCopyMemory(&SafeRect, lpRc, sizeof(RECT));
Ret = UserDrawCaption(pWnd, hDc, &SafeRect, uFlags);
}
_SEH_HANDLE
{
SetLastNtError(_SEH_GetExceptionCode());
}
_SEH_END;
UserLeave(); UserLeave();
return Ret; return Ret;