[ros-diffs] [tkreuzer] 30344: - 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

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Sun Nov 11 01:41:28 CET 2007


Author: tkreuzer
Date: Sun Nov 11 03:41:27 2007
New Revision: 30344

URL: http://svn.reactos.org/svn/reactos?rev=30344&view=rev
Log:
- 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

Modified:
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/ntuser/painting.c
    trunk/reactos/subsystems/win32/win32k/objects/bitblt.c
    trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c

Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntuser.h?rev=30344&r1=30343&r2=30344&view=diff
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h Sun Nov 11 03:41:27 2007
@@ -1791,7 +1791,7 @@
   DWORD Unknown2,
   DWORD Unknown3);
 
-DWORD
+BOOL
 NTAPI
 NtUserScrollDC(
   HDC hDC,

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/painting.c?rev=30344&r1=30343&r2=30344&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Sun Nov 11 03:41:27 2007
@@ -1230,7 +1230,7 @@
  *    @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 @@
                          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 @@
       }
    }
 
-   RETURN(Result);
+   RETURN(TRUE);
 
 CLEANUP:
    DPRINT("Leave NtUserScrollDC, ret=%i\n",_ret_);

Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/bitblt.c?rev=30344&r1=30343&r2=30344&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Sun Nov 11 03:41:27 2007
@@ -196,8 +196,7 @@
 	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 @@
 			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)

Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c?rev=30344&r1=30343&r2=30344&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c Sun Nov 11 03:41:27 2007
@@ -178,14 +178,12 @@
 
    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);




More information about the Ros-diffs mailing list