Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix VGA display corruption caused by mouse pointer

Browse source 
svn path=/trunk/; revision=7649
This commit is contained in:
Gé van Geldorp 2004-01-15 16:29:10 +00:00
parent 9595c8617b
commit 077f983899
3 changed files with 35 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/ntoskrnl/include/internal/ex.h
View file

@ -23,7 +23,8 @@ typedef struct _SYSTEM_CURSORINFO
BOOL SwapButtons; BOOL SwapButtons;
UINT ButtonsDown; UINT ButtonsDown;
LONG x, y; LONG x, y;
BOOL SafetySwitch, SafetySwitch2; BOOL SafetySwitch;
UINT SafetyRemoveCount;
FAST_MUTEX CursorMutex; FAST_MUTEX CursorMutex;
CURSORCLIP_INFO CursorClipInfo; CURSORCLIP_INFO CursorClipInfo;
PVOID CurIconHandleTable; PVOID CurIconHandleTable;

62
reactos/subsys/win32k/eng/mouse.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: mouse.c,v 1.51 2003/12/21 21:26:29 weiden Exp $ /* $Id: mouse.c,v 1.52 2004/01/15 16:29:10 gvg Exp $
* *
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* PURPOSE: Mouse * PURPOSE: Mouse
@ -100,10 +100,6 @@ MouseSafetyOnDrawStart(PSURFOBJ SurfObj, PSURFGDI SurfGDI, LONG HazardX1,
} }
else else
return FALSE; return FALSE;
ExAcquireFastMutexUnsafe(&CurInfo->CursorMutex);
CurInfo->SafetySwitch2 = TRUE;
ExReleaseFastMutexUnsafe(&CurInfo->CursorMutex);
if (SurfObj == NULL) if (SurfObj == NULL)
{ {
@ -146,10 +142,17 @@ MouseSafetyOnDrawStart(PSURFOBJ SurfObj, PSURFGDI SurfGDI, LONG HazardX1,
&& CurInfo->y - (INT) Cursor->IconInfo.yHotspot <= HazardY2) && CurInfo->y - (INT) Cursor->IconInfo.yHotspot <= HazardY2)
{ {
/* Mouse is not allowed to move if GDI is busy drawing */ /* Mouse is not allowed to move if GDI is busy drawing */
ExAcquireFastMutexUnsafe(&CurInfo->CursorMutex); ExAcquireFastMutex(&CurInfo->CursorMutex);
if (0 != CurInfo->SafetyRemoveCount++)
{
/* Was already removed */
ExReleaseFastMutex(&CurInfo->CursorMutex);
ObDereferenceObject(InputWindowStation);
return FALSE;
}
CurInfo->SafetySwitch = TRUE; CurInfo->SafetySwitch = TRUE;
SurfGDI->MovePointer(SurfObj, -1, -1, &MouseRect); SurfGDI->MovePointer(SurfObj, -1, -1, &MouseRect);
ExReleaseFastMutexUnsafe(&CurInfo->CursorMutex); ExReleaseFastMutex(&CurInfo->CursorMutex);
} }
ObDereferenceObject(InputWindowStation); ObDereferenceObject(InputWindowStation);
@ -173,11 +176,10 @@ MouseSafetyOnDrawEnd(PSURFOBJ SurfObj, PSURFGDI SurfGDI)
else else
return FALSE; return FALSE;
ExAcquireFastMutex(&CurInfo->CursorMutex);
if(SurfObj == NULL) if(SurfObj == NULL)
{ {
ExAcquireFastMutexUnsafe(&CurInfo->CursorMutex); ExReleaseFastMutex(&CurInfo->CursorMutex);
CurInfo->SafetySwitch2 = FALSE;
ExReleaseFastMutexUnsafe(&CurInfo->CursorMutex);
ObDereferenceObject(InputWindowStation); ObDereferenceObject(InputWindowStation);
return FALSE; return FALSE;
} }
@ -186,9 +188,7 @@ MouseSafetyOnDrawEnd(PSURFOBJ SurfObj, PSURFGDI SurfGDI)
if (SurfObj->iType != STYPE_DEVICE || MouseEnabled == FALSE) if (SurfObj->iType != STYPE_DEVICE || MouseEnabled == FALSE)
{ {
ExAcquireFastMutexUnsafe(&CurInfo->CursorMutex); ExReleaseFastMutex(&CurInfo->CursorMutex);
CurInfo->SafetySwitch2 = FALSE;
ExReleaseFastMutexUnsafe(&CurInfo->CursorMutex);
ObDereferenceObject(InputWindowStation); ObDereferenceObject(InputWindowStation);
return(FALSE); return(FALSE);
} }
@ -196,25 +196,25 @@ MouseSafetyOnDrawEnd(PSURFOBJ SurfObj, PSURFGDI SurfGDI)
if (SPS_ACCEPT_NOEXCLUDE == SurfGDI->PointerStatus) if (SPS_ACCEPT_NOEXCLUDE == SurfGDI->PointerStatus)
{ {
/* Hardware cursor, it wasn't removed so need to restore it */ /* Hardware cursor, it wasn't removed so need to restore it */
ExAcquireFastMutexUnsafe(&CurInfo->CursorMutex); ExReleaseFastMutex(&CurInfo->CursorMutex);
CurInfo->SafetySwitch2 = FALSE;
ExReleaseFastMutexUnsafe(&CurInfo->CursorMutex);
ObDereferenceObject(InputWindowStation); ObDereferenceObject(InputWindowStation);
return(FALSE); return(FALSE);
} }
ExAcquireFastMutexUnsafe(&CurInfo->CursorMutex);
if (CurInfo->SafetySwitch) if (CurInfo->SafetySwitch)
{ {
if (1 < CurInfo->SafetyRemoveCount--)
{
/* Someone else removed it too, let them restore it */
ExReleaseFastMutex(&CurInfo->CursorMutex);
ObDereferenceObject(InputWindowStation);
return FALSE;
}
SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &MouseRect); SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &MouseRect);
CurInfo->SafetySwitch = FALSE; CurInfo->SafetySwitch = FALSE;
CurInfo->SafetySwitch2 = FALSE;
} }
else
{ ExReleaseFastMutex(&CurInfo->CursorMutex);
CurInfo->SafetySwitch2 = FALSE;
}
ExReleaseFastMutexUnsafe(&CurInfo->CursorMutex);
ObDereferenceObject(InputWindowStation); ObDereferenceObject(InputWindowStation);
return(TRUE); return(TRUE);
} }
@ -262,9 +262,9 @@ MouseMoveCursor(LONG X, LONG Y)
CurInfo->y = Y; CurInfo->y = Y;
if(CurInfo->Enabled) if(CurInfo->Enabled)
{ {
ExAcquireFastMutexUnsafe(&CurInfo->CursorMutex); ExAcquireFastMutex(&CurInfo->CursorMutex);
SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &MouseRect); SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &MouseRect);
ExReleaseFastMutexUnsafe(&CurInfo->CursorMutex); ExReleaseFastMutex(&CurInfo->CursorMutex);
} }
/* send MOUSEMOVE message */ /* send MOUSEMOVE message */
KeQueryTickCount(&LargeTickCount); KeQueryTickCount(&LargeTickCount);
@ -417,12 +417,12 @@ MouseGDICallBack(PMOUSE_INPUT_DATA Data, ULONG InputCount)
Moved = (0 != mouse_cx) || (0 != mouse_cy); Moved = (0 != mouse_cx) || (0 != mouse_cy);
if(Moved && MouseEnabled) if(Moved && MouseEnabled)
{ {
if (!CurInfo->SafetySwitch && !CurInfo->SafetySwitch2 && if (!CurInfo->SafetySwitch && 0 == CurInfo->SafetyRemoveCount &&
((mouse_ox != CurInfo->x) || (mouse_oy != CurInfo->y))) ((mouse_ox != CurInfo->x) || (mouse_oy != CurInfo->y)))
{ {
ExAcquireFastMutexUnsafe(&CurInfo->CursorMutex); ExAcquireFastMutex(&CurInfo->CursorMutex);
SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &MouseRect); SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &MouseRect);
ExReleaseFastMutexUnsafe(&CurInfo->CursorMutex); ExReleaseFastMutex(&CurInfo->CursorMutex);
mouse_cx = 0; mouse_cx = 0;
mouse_cy = 0; mouse_cy = 0;
} }
@ -444,12 +444,12 @@ MouseGDICallBack(PMOUSE_INPUT_DATA Data, ULONG InputCount)
Msg.lParam = MAKELPARAM(CurInfo->x, CurInfo->y); Msg.lParam = MAKELPARAM(CurInfo->x, CurInfo->y);
MsqInsertSystemMessage(&Msg, TRUE); MsqInsertSystemMessage(&Msg, TRUE);
if (!CurInfo->SafetySwitch && !CurInfo->SafetySwitch2 && if (!CurInfo->SafetySwitch && 0 == CurInfo->SafetyRemoveCount &&
((mouse_ox != CurInfo->x) || (mouse_oy != CurInfo->y))) ((mouse_ox != CurInfo->x) || (mouse_oy != CurInfo->y)))
{ {
ExAcquireFastMutexUnsafe(&CurInfo->CursorMutex); ExAcquireFastMutex(&CurInfo->CursorMutex);
SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &MouseRect); SurfGDI->MovePointer(SurfObj, CurInfo->x, CurInfo->y, &MouseRect);
ExReleaseFastMutexUnsafe(&CurInfo->CursorMutex); ExReleaseFastMutex(&CurInfo->CursorMutex);
} }
} }

4
reactos/subsys/win32k/ntuser/winsta.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Id: winsta.c,v 1.54 2003/12/13 22:38:29 weiden Exp $ * $Id: winsta.c,v 1.55 2004/01/15 16:29:10 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -410,7 +410,7 @@ NtUserCreateWindowStation(
/* FIXME: Obtain the following information from the registry */ /* FIXME: Obtain the following information from the registry */
WindowStationObject->SystemCursor.SwapButtons = FALSE; WindowStationObject->SystemCursor.SwapButtons = FALSE;
WindowStationObject->SystemCursor.SafetySwitch = FALSE; WindowStationObject->SystemCursor.SafetySwitch = FALSE;
WindowStationObject->SystemCursor.SafetySwitch2 = TRUE; WindowStationObject->SystemCursor.SafetyRemoveCount = 0;
WindowStationObject->SystemCursor.DblClickSpeed = 500; WindowStationObject->SystemCursor.DblClickSpeed = 500;
WindowStationObject->SystemCursor.DblClickWidth = 4; WindowStationObject->SystemCursor.DblClickWidth = 4;
WindowStationObject->SystemCursor.DblClickHeight = 4; WindowStationObject->SystemCursor.DblClickHeight = 4;