[ros-diffs] [mkupfer] 43316: - fix typo in registry key name - fix wrong argument order in SystemParametersInfo call - use static variables instead of multiple strings - fix wrong pointer access in sysparams

Author: mkupfer
Date: Wed Oct  7 02:07:30 2009
New Revision: 43316

URL: http://svn.reactos.org/svn/reactos?rev=43316&view=rev
Log:
- fix typo in registry key name
- fix wrong argument order in SystemParametersInfo call
- use static variables instead of multiple strings
- fix wrong pointer access in sysparams

Modified:
    trunk/reactos/boot/bootdata/hivedef_arm.inf
    trunk/reactos/boot/bootdata/hivedef_i386.inf
    trunk/reactos/dll/cpl/main/mouse.c
    trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c

Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.…
==============================================================================
--- trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] Wed Oct  7 02:07:30 2009
@@ -30,7 +30,7 @@
 HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,""
 HKCU,"Control Panel\Desktop","FontSmoothing",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","UserPreferencesMask",3,10,00,00,80
 HKCU,"Control Panel\Desktop","LowPowerActive",,"0"
 HKCU,"Control Panel\Desktop","MenuShowDelay",2,"400"
 HKCU,"Control Panel\Desktop","WheelScrollLines",2,"3"

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] Wed Oct  7 02:07:30 2009
@@ -30,7 +30,7 @@
 HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,""
 HKCU,"Control Panel\Desktop","FontSmoothing",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","UserPreferencesMask",3,10,00,00,80
 HKCU,"Control Panel\Desktop","LowPowerActive",,"0"
 HKCU,"Control Panel\Desktop","MenuShowDelay",2,"400"
 HKCU,"Control Panel\Desktop","WheelScrollLines",2,"3"

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 02:07:30 2009
@@ -384,9 +384,9 @@
                 //SetDoubleClickTime(pButtonData->g_DoubleClickSpeed);
 
 #if (WINVER >= 0x0500)
-                SystemParametersInfo(SPI_SETMOUSECLICKLOCK,
pButtonData->g_ClickLockEnabled, NULL, SPIF_SENDCHANGE);
+                SystemParametersInfo(SPI_SETMOUSECLICKLOCK, 0,
&pButtonData->g_ClickLockEnabled, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
                 if (pButtonData->g_ClickLockEnabled)
-                   SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME,
pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE);
+                   SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME,
pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
 #endif
             }
             else if (lppsn->hdr.code == PSN_RESET)

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
02:07:30 2009
@@ -70,6 +70,7 @@
 #if (_WIN32_WINNT >= 0x0600)
 static const WCHAR* VAL_SCRLLCHARS = L"WheelScrollChars";
 #endif
+static const WCHAR* VAL_USERPREFMASK = L"UserPreferencesMask";
 
 static const WCHAR* KEY_MDALIGN = L"Software\\Microsoft\\Windows
NT\\CurrentVersion\\Windows";
 static const WCHAR* VAL_MDALIGN = L"MenuDropAlignment";
@@ -515,7 +516,7 @@
 SpiSetUserPref(DWORD dwMask, PVOID pvValue, FLONG fl)
 {
     DWORD dwRegMask;
-    BOOL bValue = pvValue ? 1 : 0;
+    BOOL bValue = *(BOOL *)pvValue;
 
     REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION);
 
@@ -527,7 +528,7 @@
     {
         /* Read current value */
         RegReadUserSetting(KEY_DESKTOP,
-                           L"UserPreferencesMask",
+                           VAL_USERPREFMASK,
                            REG_BINARY,
                            &dwRegMask,
                            sizeof(DWORD));
@@ -537,7 +538,7 @@
 
         /* write back value */
         RegWriteUserSetting(KEY_DESKTOP,
-                            L"UserPreferencesMask",
+                            VAL_USERPREFMASK,
                             REG_BINARY,
                             &dwRegMask,
                             sizeof(DWORD));