From 0fd869efa8e5cb5b67805915b1cad4b2c1864034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Fri, 16 Jan 2004 15:39:28 +0000 Subject: [PATCH] Don't use RECTL structure in ntoskrnl svn path=/trunk/; revision=7686 --- reactos/ntoskrnl/include/internal/ex.h | 5 +++- reactos/subsys/win32k/eng/mouse.c | 34 ++++++++++++++++------ reactos/subsys/win32k/objects/cursoricon.c | 18 ++++++++++-- 3 files changed, 44 insertions(+), 13 deletions(-) diff --git a/reactos/ntoskrnl/include/internal/ex.h b/reactos/ntoskrnl/include/internal/ex.h index c7f0cb14c6c..67789c91c64 100644 --- a/reactos/ntoskrnl/include/internal/ex.h +++ b/reactos/ntoskrnl/include/internal/ex.h @@ -25,7 +25,10 @@ typedef struct _SYSTEM_CURSORINFO LONG x, y; BOOL SafetySwitch; UINT SafetyRemoveCount; - RECTL PointerRect; + LONG PointerRectLeft; + LONG PointerRectTop; + LONG PointerRectRight; + LONG PointerRectBottom; FAST_MUTEX CursorMutex; CURSORCLIP_INFO CursorClipInfo; PVOID CurIconHandleTable; diff --git a/reactos/subsys/win32k/eng/mouse.c b/reactos/subsys/win32k/eng/mouse.c index 6a5f4e6f1b4..5bc44f1b26a 100644 --- a/reactos/subsys/win32k/eng/mouse.c +++ b/reactos/subsys/win32k/eng/mouse.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: mouse.c,v 1.53 2004/01/16 13:18:23 gvg Exp $ +/* $Id: mouse.c,v 1.54 2004/01/16 15:39:28 gvg Exp $ * * PROJECT: ReactOS kernel * PURPOSE: Mouse @@ -135,10 +135,10 @@ MouseSafetyOnDrawStart(PSURFOBJ SurfObj, PSURFGDI SurfGDI, LONG HazardX1, tmp = HazardY2; HazardY2 = HazardY1; HazardY1 = tmp; } - if (CurInfo->PointerRect.right >= HazardX1 - && CurInfo->PointerRect.left <= HazardX2 - && CurInfo->PointerRect.bottom >= HazardY1 - && CurInfo->PointerRect.top <= HazardY2) + if (CurInfo->PointerRectRight >= HazardX1 + && CurInfo->PointerRectLeft <= HazardX2 + && CurInfo->PointerRectBottom >= HazardY1 + && CurInfo->PointerRectTop <= HazardY2) { /* Mouse is not allowed to move if GDI is busy drawing */ ExAcquireFastMutex(&CurInfo->CursorMutex); @@ -158,6 +158,15 @@ MouseSafetyOnDrawStart(PSURFOBJ SurfObj, PSURFGDI SurfGDI, LONG HazardX1, return(TRUE); } +STATIC VOID FASTCALL +SetPointerRect(PSYSTEM_CURSORINFO CurInfo, PRECTL PointerRect) +{ + CurInfo->PointerRectLeft = PointerRect->left; + CurInfo->PointerRectRight = PointerRect->right; + CurInfo->PointerRectTop = PointerRect->top; + CurInfo->PointerRectBottom = PointerRect->bottom; +} + INT FASTCALL MouseSafetyOnDrawEnd(PSURFOBJ SurfObj, PSURFGDI SurfGDI) /* @@ -166,6 +175,7 @@ MouseSafetyOnDrawEnd(PSURFOBJ SurfObj, PSURFGDI SurfGDI) { PSYSTEM_CURSORINFO CurInfo; BOOL MouseEnabled = FALSE; + RECTL PointerRect; if(IntGetWindowStationObject(InputWindowStation)) { @@ -208,7 +218,8 @@ MouseSafetyOnDrawEnd(PSURFOBJ SurfObj, PSURFGDI SurfGDI) ObDereferenceObject(InputWindowStation); return FALSE; } - SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &CurInfo->PointerRect); + SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &PointerRect); + SetPointerRect(CurInfo, &PointerRect); CurInfo->SafetySwitch = FALSE; } @@ -229,6 +240,7 @@ MouseMoveCursor(LONG X, LONG Y) MSG Msg; LARGE_INTEGER LargeTickCount; ULONG TickCount; + RECTL PointerRect; if(!InputWindowStation) return FALSE; @@ -260,7 +272,8 @@ MouseMoveCursor(LONG X, LONG Y) if(CurInfo->Enabled) { ExAcquireFastMutex(&CurInfo->CursorMutex); - SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &CurInfo->PointerRect); + SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &PointerRect); + SetPointerRect(CurInfo, &PointerRect); ExReleaseFastMutex(&CurInfo->CursorMutex); } /* send MOUSEMOVE message */ @@ -301,6 +314,7 @@ MouseGDICallBack(PMOUSE_INPUT_DATA Data, ULONG InputCount) PSURFOBJ SurfObj; PSURFGDI SurfGDI; MSG Msg; + RECTL PointerRect; hDC = IntGetScreenDC(); @@ -417,7 +431,8 @@ MouseGDICallBack(PMOUSE_INPUT_DATA Data, ULONG InputCount) ((mouse_ox != CurInfo->x) || (mouse_oy != CurInfo->y))) { ExAcquireFastMutex(&CurInfo->CursorMutex); - SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &CurInfo->PointerRect); + SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &PointerRect); + SetPointerRect(CurInfo, &PointerRect); ExReleaseFastMutex(&CurInfo->CursorMutex); mouse_cx = 0; mouse_cy = 0; @@ -444,7 +459,8 @@ MouseGDICallBack(PMOUSE_INPUT_DATA Data, ULONG InputCount) ((mouse_ox != CurInfo->x) || (mouse_oy != CurInfo->y))) { ExAcquireFastMutex(&CurInfo->CursorMutex); - SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &CurInfo->PointerRect); + SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &PointerRect); + SetPointerRect(CurInfo, &PointerRect); ExReleaseFastMutex(&CurInfo->CursorMutex); } } diff --git a/reactos/subsys/win32k/objects/cursoricon.c b/reactos/subsys/win32k/objects/cursoricon.c index 3198964f536..abce83e6a49 100644 --- a/reactos/subsys/win32k/objects/cursoricon.c +++ b/reactos/subsys/win32k/objects/cursoricon.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: cursoricon.c,v 1.41 2004/01/16 13:18:23 gvg Exp $ */ +/* $Id: cursoricon.c,v 1.42 2004/01/16 15:39:28 gvg Exp $ */ #undef WIN32_LEAN_AND_MEAN @@ -87,6 +87,15 @@ IntCopyBitmap(HBITMAP bmp) return ret; } +STATIC VOID FASTCALL +SetPointerRect(PSYSTEM_CURSORINFO CurInfo, PRECTL PointerRect) +{ + CurInfo->PointerRectLeft = PointerRect->left; + CurInfo->PointerRectRight = PointerRect->right; + CurInfo->PointerRectTop = PointerRect->top; + CurInfo->PointerRectBottom = PointerRect->bottom; +} + #define COLORCURSORS_ALLOWED FALSE HCURSOR FASTCALL IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL ForceChange) @@ -102,6 +111,7 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL Fo HBITMAP hMask = (HBITMAP)0, hColor = (HBITMAP)0; PSURFOBJ soMask = NULL, soColor = NULL; PXLATEOBJ XlateObj = NULL; + RECTL PointerRect; CurInfo = &WinStaObject->SystemCursor; OldCursor = CurInfo->CurrentCursorObject; @@ -136,8 +146,9 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL Fo 0, CurInfo->x, CurInfo->y, - &CurInfo->PointerRect, + &PointerRect, SPS_CHANGE); + SetPointerRect(CurInfo, &PointerRect); CurInfo->CurrentCursorObject = NewCursor; /* i.e. CurrentCursorObject = NULL */ CurInfo->ShowingCursor = 0; @@ -210,8 +221,9 @@ IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL Fo NewCursor->IconInfo.yHotspot, CurInfo->x, CurInfo->y, - &CurInfo->PointerRect, + &PointerRect, SPS_CHANGE); + SetPointerRect(CurInfo, &PointerRect); if(hMask) {