Author: mkupfer
Date: Wed Oct 7 20:22:25 2009
New Revision: 43327
URL:
http://svn.reactos.org/svn/reactos?rev=43327&view=rev
Log:
- revert SPI_SETCLICKLOCK
- small optimization in mgsqueue
Modified:
trunk/reactos/dll/cpl/main/mouse.c
trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c
Modified: trunk/reactos/dll/cpl/main/mouse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=4…
==============================================================================
--- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Wed Oct 7 20:22:25 2009
@@ -384,7 +384,7 @@
//SetDoubleClickTime(pButtonData->g_DoubleClickSpeed);
#if (WINVER >= 0x0500)
- SystemParametersInfo(SPI_SETMOUSECLICKLOCK, 0,
&pButtonData->g_ClickLockEnabled, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+ SystemParametersInfo(SPI_SETMOUSECLICKLOCK, 0,
(PVOID)pButtonData->g_ClickLockEnabled, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
if (pButtonData->g_ClickLockEnabled)
SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME,
pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
#endif
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Wed Oct 7
20:22:25 2009
@@ -274,21 +274,18 @@
if(Remove)
{
+ CurInfo->LastBtnDownX = Msg->pt.x;
+ CurInfo->LastBtnDownY = Msg->pt.y;
+ CurInfo->ButtonsDown = Msg->message;
if (Res)
{
CurInfo->LastBtnDown = 0;
- CurInfo->LastBtnDownX = Msg->pt.x;
- CurInfo->LastBtnDownY = Msg->pt.y;
CurInfo->LastClkWnd = NULL;
- CurInfo->ButtonsDown = Msg->message;
}
else
{
- CurInfo->LastBtnDownX = Msg->pt.x;
- CurInfo->LastBtnDownY = Msg->pt.y;
CurInfo->LastClkWnd = (HANDLE)Msg->hwnd;
CurInfo->LastBtnDown = Msg->time;
- CurInfo->ButtonsDown = Msg->message;
}
}
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Wed Oct 7
20:22:25 2009
@@ -529,7 +529,7 @@
SpiSetUserPref(DWORD dwMask, PVOID pvValue, FLONG fl)
{
DWORD dwRegMask;
- BOOL bValue = *(BOOL *)pvValue;
+ BOOL bValue = (BOOL)pvValue;
REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION);
@@ -1323,7 +1323,7 @@
return SpiGetUserPref(UPM_CLICKLOCK, pvParam, fl);
case SPI_SETMOUSECLICKLOCK:
- gspv.bMouseClickLock = *(BOOL*) pvParam;
+ gspv.bMouseClickLock = (BOOL)pvParam;
return SpiSetUserPref(UPM_CLICKLOCK, pvParam, fl);
case SPI_GETMOUSEVANISH: