mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-09-02 04:13:34 +00:00
- 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
This commit is contained in:
@@ -1791,7 +1791,7 @@ NtUserSBGetParms(
|
||||
DWORD Unknown2,
|
||||
DWORD Unknown3);
|
||||
|
||||
DWORD
|
||||
BOOL
|
||||
NTAPI
|
||||
NtUserScrollDC(
|
||||
HDC hDC,
|
||||
|
||||
@@ -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_);
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user