Author: jimtabor Date: Mon May 26 18:57:30 2008 New Revision: 33722
URL: http://svn.reactos.org/svn/reactos?rev=33722&view=rev Log: Removed NtGdi rect calls.
Modified: trunk/reactos/subsystems/win32/win32k/objects/rect.c
Modified: trunk/reactos/subsystems/win32/win32k/objects/rect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/rect.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/rect.c [iso-8859-1] Mon May 26 18:57:30 2008 @@ -31,67 +31,10 @@ Rect->left = Rect->right = Rect->top = Rect->bottom = 0; }
-BOOL STDCALL -NtGdiSetEmptyRect(PRECT UnsafeRect) -{ - RECT Rect; - NTSTATUS Status = STATUS_SUCCESS; - - IntGdiSetEmptyRect(&Rect); - - _SEH_TRY - { - ProbeForWrite(UnsafeRect, - sizeof(RECT), - 1); - *UnsafeRect = Rect; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - return TRUE; -} - BOOL FASTCALL IntGdiIsEmptyRect(const RECT* Rect) { return(Rect->left >= Rect->right || Rect->top >= Rect->bottom); -} - -BOOL STDCALL -NtGdiIsEmptyRect(const RECT* UnsafeRect) -{ - RECT Rect = {0}; - NTSTATUS Status = STATUS_SUCCESS; - - _SEH_TRY - { - ProbeForRead(UnsafeRect, - sizeof(RECT), - 1); - Rect = *UnsafeRect; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - return IntGdiIsEmptyRect(&Rect); }
VOID FASTCALL @@ -101,53 +44,6 @@ Rect->right += x; Rect->top += y; Rect->bottom += y; -} - -BOOL STDCALL -NtGdiOffsetRect(LPRECT UnsafeRect, INT x, INT y) -{ - RECT Rect = {0}; - NTSTATUS Status = STATUS_SUCCESS; - - _SEH_TRY - { - ProbeForRead(UnsafeRect, - sizeof(RECT), - 1); - Rect = *UnsafeRect; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - IntGdiOffsetRect(&Rect, x, y); - - _SEH_TRY - { - ProbeForWrite(UnsafeRect, - sizeof(RECT), - 1); - *UnsafeRect = Rect; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - return TRUE; }
BOOL FASTCALL @@ -183,61 +79,6 @@ return TRUE; }
-BOOL STDCALL -NtGdiUnionRect(PRECT UnsafeDest, const RECT* UnsafeSrc1, const RECT* UnsafeSrc2) -{ - RECT Dest, Src1 = {0}, Src2 = {0}; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret; - - _SEH_TRY - { - ProbeForRead(UnsafeSrc1, - sizeof(RECT), - 1); - ProbeForRead(UnsafeSrc2, - sizeof(RECT), - 1); - Src1 = *UnsafeSrc1; - Src2 = *UnsafeSrc2; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - Ret = IntGdiUnionRect(&Dest, &Src1, &Src2); - - if (Ret) - { - _SEH_TRY - { - ProbeForWrite(UnsafeDest, - sizeof(RECT), - 1); - *UnsafeDest = Dest; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - } - - return Ret; -} - VOID FASTCALL IntGdiSetRect(PRECT Rect, INT left, INT top, INT right, INT bottom) { @@ -245,35 +86,6 @@ Rect->top = top; Rect->right = right; Rect->bottom = bottom; -} - -BOOL STDCALL -NtGdiSetRect(PRECT UnsafeRect, INT left, INT top, INT right, INT bottom) -{ - RECT Rect; - NTSTATUS Status = STATUS_SUCCESS; - - IntGdiSetRect(&Rect, left, top, right, bottom); - - _SEH_TRY - { - ProbeForWrite(UnsafeRect, - sizeof(RECT), - 1); - *UnsafeRect = Rect; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - return TRUE; }
BOOL FASTCALL @@ -295,59 +107,5 @@ return TRUE; }
-BOOL STDCALL -NtGdiIntersectRect(PRECT UnsafeDest, const RECT* UnsafeSrc1, const RECT* UnsafeSrc2) -{ - RECT Dest, Src1, Src2 = {0}; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret; - - _SEH_TRY - { - ProbeForRead(UnsafeSrc1, - sizeof(RECT), - 1); - ProbeForRead(UnsafeSrc2, - sizeof(RECT), - 1); - Src1 = *UnsafeSrc1; - Src2 = *UnsafeSrc2; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - Ret = IntGdiIntersectRect(&Dest, &Src2, &Src2); - - if (Ret) - { - _SEH_TRY - { - ProbeForWrite(UnsafeDest, - sizeof(RECT), - 1); - *UnsafeDest = Dest; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - } - - return Ret; -}
/* EOF */