https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ce12f0b4cd571e212102…
commit 9ce12f0b4cd571e2121027511900ff0953120bc6
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Wed Dec 25 18:12:43 2019 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Wed Dec 25 18:12:43 2019 +0900
[BOOTDATA][NTUSER] Fix some system parameters (#2162)
CORE-16547
- Add IconTitleWrap registry value.
- Modify gspv.dwMenuShowDelay initial value.
- Initialize gspv.bFastTaskSwitch as TRUE.
---
boot/bootdata/hivedef.inf | 1 +
win32ss/user/ntuser/sysparams.c | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf
index dc322952a1f..cd08b15d3ff 100644
--- a/boot/bootdata/hivedef.inf
+++ b/boot/bootdata/hivedef.inf
@@ -94,6 +94,7 @@ HKCU,"Control
Panel\Desktop\WindowMetrics","MenuHeight",2,"18"
HKCU,"Control
Panel\Desktop\WindowMetrics","BorderWidth",2,"1"
HKCU,"Control Panel\Desktop\WindowMetrics","Shell Icon
Size",2,"32"
HKCU,"Control
Panel\Desktop\WindowMetrics","IconSpacing",2,"75"
+HKCU,"Control
Panel\Desktop\WindowMetrics","IconTitleWrap",2,"1"
HKCU,"Control
Panel\Desktop\WindowMetrics","IconVerticalspacing",2,"75"
HKCU, "Control
Panel\Desktop\WindowMetrics","CaptionFont",0x00000003,f5,ff,ff,ff,00,00,00,\
00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,01,00,00,00,00,54,00,61,00,68,00,6f,00,6d,\
diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c
index 4dd882987fd..48fc5dd2085 100644
--- a/win32ss/user/ntuser/sysparams.c
+++ b/win32ss/user/ntuser/sysparams.c
@@ -152,7 +152,7 @@ SpiLoadTimeOut(VOID)
{
return 0;
}
- if (wcslen(szApplicationName) == 0) return 0;
+ if (szApplicationName[0] == 0) return 0;
return SpiLoadInt(KEY_DESKTOP, VAL_SCRTO, 600);
}
@@ -280,7 +280,7 @@ SpiUpdatePerUserSystemParameters(VOID)
gspv.im.cbSize = sizeof(ICONMETRICSW);
gspv.im.iHorzSpacing = SpiLoadMetric(VAL_ICONSPC, 64);
gspv.im.iVertSpacing = SpiLoadMetric(VAL_ICONVSPC, 64);
- gspv.im.iTitleWrap = SpiLoadMetric(VAL_ITWRAP, 0);
+ gspv.im.iTitleWrap = SpiLoadMetric(VAL_ITWRAP, 1);
SpiLoadFont(&gspv.im.lfFont, L"IconFont", &lf1);
/* Load desktop settings */
@@ -306,7 +306,7 @@ SpiUpdatePerUserSystemParameters(VOID)
gspv.uiFocusBorderWidth = 1;
gspv.uiFocusBorderHeight = 1;
gspv.bMenuDropAlign = 0;
- gspv.dwMenuShowDelay = 100;
+ gspv.dwMenuShowDelay = SpiLoadInt(KEY_DESKTOP, L"MenuShowDelay", 400);
gspv.dwForegroundFlashCount = 3;
gspv.iScrSaverTimeout = SpiLoadTimeOut();
@@ -316,6 +316,8 @@ SpiUpdatePerUserSystemParameters(VOID)
gspv.bScrSaverSecure = FALSE;
#endif
+ gspv.bFastTaskSwitch = TRUE;
+
gspv.accesstimeout.cbSize = sizeof(ACCESSTIMEOUT);
gspv.filterkeys.cbSize = sizeof(FILTERKEYS);
gspv.togglekeys.cbSize = sizeof(TOGGLEKEYS);