Skip to content

Commit 287bd60

Browse files
committed
[win32k]
- Fix SPI_SETMOUSESPEED - Patch by Edijs Kolesnikovics, [email protected] svn path=/trunk/; revision=55758
1 parent dcb742b commit 287bd60

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

reactos/subsystems/win32/win32k/ntuser/sysparams.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static const WCHAR* VAL_SWAP = L"SwapMouseButtons";
4545
static const WCHAR* VAL_HOVERTIME = L"MouseHoverTime";
4646
static const WCHAR* VAL_HOVERWIDTH = L"MouseHoverWidth";
4747
static const WCHAR* VAL_HOVERHEIGHT = L"MouseHoverHeight";
48-
//static const WCHAR* VAL_SENSITIVITY = L"MouseSensitivity";
48+
static const WCHAR* VAL_SENSITIVITY = L"MouseSensitivity";
4949

5050
static const WCHAR* KEY_DESKTOP = L"Control Panel\\Desktop";
5151
static const WCHAR* VAL_SCRTO = L"ScreenSaveTimeOut";
@@ -220,7 +220,8 @@ SpiUpdatePerUserSystemParameters()
220220
/* Load mouse settings */
221221
gspv.caiMouse.FirstThreshold = SpiLoadMouse(VAL_MOUSE1, 6);
222222
gspv.caiMouse.SecondThreshold = SpiLoadMouse(VAL_MOUSE2, 10);
223-
gspv.caiMouse.Acceleration = gspv.iMouseSpeed = SpiLoadMouse(VAL_MOUSE3, 1);
223+
gspv.caiMouse.Acceleration = SpiLoadMouse(VAL_MOUSE3, 1);
224+
gspv.iMouseSpeed = SpiLoadMouse(VAL_SENSITIVITY, 10);
224225
gspv.bMouseBtnSwap = SpiLoadMouse(VAL_SWAP, 0);
225226
gspv.bSnapToDefBtn = SpiLoadMouse(VAL_SNAPDEFBTN, 0);
226227
gspv.iMouseTrails = SpiLoadMouse(VAL_MOUSETRAILS, 0);
@@ -1262,8 +1263,13 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl)
12621263
return SpiGetInt(pvParam, &gspv.iMouseSpeed, fl);
12631264

12641265
case SPI_SETMOUSESPEED:
1265-
// vgl SETMOUSE
1266-
return SpiSetInt(&gspv.iMouseSpeed, uiParam, KEY_MOUSE, VAL_MOUSE3, fl);
1266+
{
1267+
/* Allowed range is [1:20] */
1268+
if ((INT_PTR)pvParam < 1 || (INT_PTR)pvParam > 20)
1269+
return 0;
1270+
else
1271+
return SpiSetInt(&gspv.iMouseSpeed, (INT_PTR)pvParam, KEY_MOUSE, VAL_SENSITIVITY, fl);
1272+
}
12671273

12681274
case SPI_GETSCREENSAVERRUNNING:
12691275
return SpiGetInt(pvParam, &gspv.bScrSaverRunning, fl);

0 commit comments

Comments
 (0)