From a8f9ec7c2a67ccc8b06e69c81283dc739b3efdd1 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 11 Nov 2007 00:41:27 +0000 Subject: [PATCH] - NtUserScrollDC() only returns TRUE or FALSE - NtGdiBitBlt(): don't SetLastError() on invalid dc, don't DPRINT1, DPRINT is enough. - IntGdiGetClipBox(): don't SetLastError() on invalid dc svn path=/trunk/; revision=30344 --- reactos/include/reactos/win32k/ntuser.h | 2 +- reactos/subsystems/win32/win32k/ntuser/painting.c | 8 ++++---- reactos/subsystems/win32/win32k/objects/bitblt.c | 6 ++---- reactos/subsystems/win32/win32k/objects/cliprgn.c | 2 -- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h index 08b2e7a426c..243b8cbdc27 100644 --- a/reactos/include/reactos/win32k/ntuser.h +++ b/reactos/include/reactos/win32k/ntuser.h @@ -1791,7 +1791,7 @@ NtUserSBGetParms( DWORD Unknown2, DWORD Unknown3); -DWORD +BOOL NTAPI NtUserScrollDC( HDC hDC, diff --git a/reactos/subsystems/win32/win32k/ntuser/painting.c b/reactos/subsystems/win32/win32k/ntuser/painting.c index 44d11448dac..ebc4da2f22a 100644 --- a/reactos/subsystems/win32/win32k/ntuser/painting.c +++ b/reactos/subsystems/win32/win32k/ntuser/painting.c @@ -1230,7 +1230,7 @@ UserScrollDC(HDC hDC, INT dx, INT dy, const RECT *prcScroll, * @implemented */ -DWORD STDCALL +BOOL STDCALL NtUserScrollDC(HDC hDC, INT dx, INT dy, const RECT *prcUnsafeScroll, const RECT *prcUnsafeClip, HRGN hrgnUpdate, LPRECT prcUnsafeUpdate) { @@ -1276,8 +1276,8 @@ NtUserScrollDC(HDC hDC, INT dx, INT dy, const RECT *prcUnsafeScroll, prcUnsafeUpdate? &rcUpdate : NULL); if(Result == ERROR) { - /* FIXME: SetLastError? */ - RETURN(Result); + /* FIXME: Only if hRgnUpdate is invalid we should SetLastError(ERROR_INVALID_HANDLE) */ + RETURN(FALSE); } if (prcUnsafeUpdate) @@ -1299,7 +1299,7 @@ NtUserScrollDC(HDC hDC, INT dx, INT dy, const RECT *prcUnsafeScroll, } } - RETURN(Result); + RETURN(TRUE); CLEANUP: DPRINT("Leave NtUserScrollDC, ret=%i\n",_ret_); diff --git a/reactos/subsystems/win32/win32k/objects/bitblt.c b/reactos/subsystems/win32/win32k/objects/bitblt.c index 5a9a15656a8..2873a0ff929 100644 --- a/reactos/subsystems/win32/win32k/objects/bitblt.c +++ b/reactos/subsystems/win32/win32k/objects/bitblt.c @@ -196,8 +196,7 @@ NtGdiBitBlt( DCDest = DC_LockDc(hDCDest); if (NULL == DCDest) { - DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); + DPRINT("Invalid destination dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCDest); return FALSE; } if (DCDest->IsIC) @@ -215,8 +214,7 @@ NtGdiBitBlt( if (NULL == DCSrc) { DC_UnlockDc(DCDest); - DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCSrc); - SetLastWin32Error(ERROR_INVALID_HANDLE); + DPRINT("Invalid source dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCSrc); return FALSE; } if (DCSrc->IsIC) diff --git a/reactos/subsystems/win32/win32k/objects/cliprgn.c b/reactos/subsystems/win32/win32k/objects/cliprgn.c index a34e454e579..f1a043c50b2 100644 --- a/reactos/subsystems/win32/win32k/objects/cliprgn.c +++ b/reactos/subsystems/win32/win32k/objects/cliprgn.c @@ -178,14 +178,12 @@ IntGdiGetClipBox(HDC hDC, LPRECT rc) if (!(dc = DC_LockDc(hDC))) { - SetLastWin32Error(ERROR_INVALID_HANDLE); return ERROR; } if (!(Rgn = RGNDATA_LockRgn(dc->w.hGCClipRgn))) { DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_HANDLE); return ERROR; } retval = UnsafeIntGetRgnBox(Rgn, rc);