[ros-diffs] [mkupfer] 43288: - remove double entry in inf - load mouse settings - TODO: mouse settings doesn't work properly, but read and set works

Author: mkupfer
Date: Sun Oct  4 21:28:52 2009
New Revision: 43288

URL: http://svn.reactos.org/svn/reactos?rev=43288&view=rev
Log:
- remove double entry in inf
- load mouse settings
- TODO: mouse settings doesn't work properly, but read and set works

Modified:
    trunk/reactos/boot/bootdata/hivedef_i386.inf
    trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c

Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386…
==============================================================================
--- trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Sun Oct  4 21:28:52 2009
@@ -23,7 +23,6 @@
 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"

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] Sun Oct  4
21:28:52 2009
@@ -216,30 +216,31 @@
     /* 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;
     gspv.bDropShadow = 1;
     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;