From 374363363dfb276e29e2b55880f9b2dd6fbc5c3e Mon Sep 17 00:00:00 2001
From: Matthias Kupfer <mkupfer@reactos.org>
Date: Sun, 4 Oct 2009 19:28:52 +0000
Subject: [PATCH] - remove double entry in inf - load mouse settings - TODO:
 mouse settings doesn't work properly, but read and set works

svn path=/trunk/; revision=43288
---
 reactos/boot/bootdata/hivedef_i386.inf        |  1 -
 .../win32/win32k/ntuser/sysparams.c           | 29 ++++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/reactos/boot/bootdata/hivedef_i386.inf b/reactos/boot/bootdata/hivedef_i386.inf
index ed70cd50af8..de2259734a3 100644
--- a/reactos/boot/bootdata/hivedef_i386.inf
+++ b/reactos/boot/bootdata/hivedef_i386.inf
@@ -23,7 +23,6 @@ HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,""
 HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000"
 HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,""
 HKCU,"Control Panel\Desktop","FontSmoothing",2,"0"
-HKCU,"Control Panel\Desktop","DragFullWindows",2,"0"
 HKCU,"Control Panel\Desktop","SmoothScroll",3,00,00,00,00
 HKCU,"Control Panel\Desktop","UserPreferenceMask",3,10,00,00,80
 HKCU,"Control Panel\Desktop","LowPowerActive",,"0"
diff --git a/reactos/subsystems/win32/win32k/ntuser/sysparams.c b/reactos/subsystems/win32/win32k/ntuser/sysparams.c
index be7c16672d0..7759692bdd6 100644
--- a/reactos/subsystems/win32/win32k/ntuser/sysparams.c
+++ b/reactos/subsystems/win32/win32k/ntuser/sysparams.c
@@ -216,11 +216,25 @@ SpiUpdatePerUserSystemParameters()
     /* Load desktop settings */
     gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0);
 
+    /* Load mouse settings */
+    gspv.bMouseBtnSwap = SpiLoadInt(KEY_MOUSE, VAL_SWAP, 0);
+    gspv.iMouseSpeed = SpiLoadInt(KEY_MOUSE, VAL_MOUSE3, 1);
+    gspv.iDblClickTime = SpiLoadInt(KEY_MOUSE, VAL_DBLCLKTIME, 500);
+    gspv.iDblClickWidth = SpiLoadInt(KEY_MOUSE, VAL_DBLCLKWIDTH, 4);
+    gspv.iDblClickHeight = SpiLoadInt(KEY_MOUSE, VAL_DBLCLKHEIGHT, 4);
+
     /* Some hardcoded values for now */
+    gspv.iMouseHoverTime = 80;
+    gspv.iMouseHoverWidth = 4;
+    gspv.iMouseHoverHeight = 4;
+    gspv.iWheelScrollLines = 3;
+#if (_WIN32_WINNT >= 0x0600)
+    gspv.uiWheelScrollChars = 1;
+#endif
+
     gspv.tmCaptionFont.tmAveCharWidth = 6;
     gspv.bBeep = TRUE;
     gspv.bFlatMenu = FALSE;
-    gspv.iDblClickTime = 500;
     gspv.uiFocusBorderWidth = 1;
     gspv.uiFocusBorderHeight = 1;
     gspv.bMenuDropAlign = 1;
@@ -228,19 +242,6 @@ SpiUpdatePerUserSystemParameters()
     gspv.dwUserPrefMask = UPM_DEFAULT;
     gspv.dwMenuShowDelay = 100;
 
-    gspv.bMouseBtnSwap = FALSE;
-    gspv.iMouseSpeed = 10;
-    gspv.iMouseHoverTime = 80;
-    gspv.iMouseHoverWidth = 4;
-    gspv.iMouseHoverHeight = 4;
-    gspv.iDblClickTime = 500;
-    gspv.iDblClickWidth = 4;
-    gspv.iDblClickHeight = 4;
-    gspv.iWheelScrollLines = 3;
-#if (_WIN32_WINNT >= 0x0600)
-    gspv.uiWheelScrollChars = 1;
-#endif
-
     gspv.iScrSaverTimeout = 10;
     gspv.bScrSaverActive = FALSE;
     gspv.bScrSaverRunning = FALSE;