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

[NTUSER] Fix issue when cursor/caret is static

Browse source 
Also remove the check that Windows doesn't do.

CORE-17929
This commit is contained in:
Jose Carlos Jesus 2022-01-14 19:32:52 +00:00 committed by Stanislav Motylkov
parent c0eb407130
commit 9701bbcf6d
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
win32ss/user/ntuser/caret.c
View file

@ -10,11 +10,6 @@
#include <win32k.h> #include <win32k.h>
DBG_DEFAULT_CHANNEL(UserCaret); DBG_DEFAULT_CHANNEL(UserCaret);
/* DEFINES *****************************************************************/
#define MIN_CARETBLINKRATE 100
#define MAX_CARETBLINKRATE 10000
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
VOID FASTCALL VOID FASTCALL
@ -189,13 +184,6 @@ IntSetCaretBlinkTime(UINT uMSeconds)
{ {
/* Don't save the new value to the registry! */ /* Don't save the new value to the registry! */
/* Windows doesn't do this check */
if((uMSeconds < MIN_CARETBLINKRATE) || (uMSeconds > MAX_CARETBLINKRATE))
{
EngSetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
gpsi->dtCaretBlink = uMSeconds; gpsi->dtCaretBlink = uMSeconds;
return TRUE; return TRUE;
@ -300,7 +288,15 @@ BOOL FASTCALL co_UserShowCaret(PWND Window OPTIONAL)
{ {
IntNotifyWinEvent(EVENT_OBJECT_SHOW, pWnd, OBJID_CARET, OBJID_CARET, 0); IntNotifyWinEvent(EVENT_OBJECT_SHOW, pWnd, OBJID_CARET, OBJID_CARET, 0);
} }
IntSetTimer(pWnd, IDCARETTIMER, gpsi->dtCaretBlink, CaretSystemTimerProc, TMRF_SYSTEM); if ((INT)gpsi->dtCaretBlink > 0)
{
IntSetTimer(pWnd, IDCARETTIMER, gpsi->dtCaretBlink, CaretSystemTimerProc, TMRF_SYSTEM);
}
else if (ThreadQueue->CaretInfo.Visible)
{
ThreadQueue->CaretInfo.Showing = 1;
co_IntDrawCaret(pWnd, &ThreadQueue->CaretInfo);
}
} }
return TRUE; return TRUE;
} }
@ -366,7 +362,7 @@ NtUserCreateCaret(
ThreadQueue->CaretInfo.Visible = 0; ThreadQueue->CaretInfo.Visible = 0;
ThreadQueue->CaretInfo.Showing = 0; ThreadQueue->CaretInfo.Showing = 0;
IntSetTimer( Window, IDCARETTIMER, gpsi->dtCaretBlink, CaretSystemTimerProc, TMRF_SYSTEM ); IntSetTimer(Window, IDCARETTIMER, gpsi->dtCaretBlink, CaretSystemTimerProc, TMRF_SYSTEM);
IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window, OBJID_CARET, CHILDID_SELF, 0); IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window, OBJID_CARET, CHILDID_SELF, 0);