From 2127ff030c01f57116ea0bcc8125458430bd5b16 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 29 Mar 2011 15:35:10 +0000 Subject: [PATCH] [WIN32K] Addendum to r51188: set last error, when overflow check fails. Fixes test regression. svn path=/trunk/; revision=51194 --- reactos/subsystems/win32/win32k/ntuser/ntstubs.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c index 1ec7f71ca97..c0834596f81 100644 --- a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c +++ b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c @@ -84,11 +84,11 @@ NtUserBitBltSysBmp( Ret = NtGdiBitBlt( hdc, nXDest, nYDest, - nWidth, - nHeight, + nWidth, + nHeight, hSystemBM, - nXSrc, - nYSrc, + nXSrc, + nYSrc, dwRop, 0, 0); @@ -255,7 +255,7 @@ HBRUSH APIENTRY NtUserGetControlColor( HWND hwndParent, - HWND hwnd, + HWND hwnd, HDC hdc, UINT CtlMsg) // Wine PaintRect: WM_CTLCOLORMSGBOX + hbrush { @@ -380,7 +380,7 @@ NtUserInitializeClientPfnArrays( DPRINT1("Failed reading Client Pfns from user space.\n"); SetLastNtError(Status); } - + UserLeave(); return Status; } @@ -543,8 +543,12 @@ NtUserSetSysColors( if (cElements == 0) return TRUE; + /* We need this check to prevent overflow later */ if ((ULONG)cElements >= 0x40000000) + { + EngSetLastError(ERROR_NOACCESS); return FALSE; + } UserEnterExclusive(); -- 2.17.1