[ros-diffs] [reactos] 01/01: Revert "[NTUSER] Enable SM_CXICON etc. settings from registry (#7679)" (#7682)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f23e70ad55cc661bc756…

commit 2f23e70ad55cc661bc756fb492535fdfab2e9921
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Wed Jan 29 21:34:19 2025 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Wed Jan 29 21:34:19 2025 +0900

    Revert "[NTUSER] Enable SM_CXICON etc. settings from registry (#7679)"
(#7682)
    
    This reverts commit 3b3741c10af77bd54184e9d271206ac017e73b34 of #7679 .
    It seems like the shell icon size is not the
    system icon size.
    
    The wide string L"Shell Small Icon Size" is detected in
    shell32.dll and themeui.dll.
    No L"Shell Small Icon Size" in win32k.sys found.
    JIRA issue: CORE-12905
---
 win32ss/user/ntuser/metric.c    |  9 ++++-----
 win32ss/user/ntuser/sysparams.c | 10 ----------
 win32ss/user/ntuser/sysparams.h |  3 ---
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c
index 4ece647717f..e070bb0fa51 100644
--- a/win32ss/user/ntuser/metric.c
+++ b/win32ss/user/ntuser/metric.c
@@ -5,7 +5,6 @@
  * FILE:             win32ss/user/ntuser/metric.c
  * PROGRAMER:        Casper S. Hornstrup (chorns(a)users.sourceforge.net)
  *                   Timo Kreuzer (timo.kreuzer(a)reactos.org)
- *                   Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com)
  */
 
 #include <win32k.h>
@@ -131,10 +130,10 @@ InitMetrics(VOID)
     piSysMet[SM_CXHTHUMB] = gspv.ncm.iScrollHeight;     // 16;
     piSysMet[SM_CYVSCROLL] = gspv.ncm.iScrollHeight;    // 16
     piSysMet[SM_CXHSCROLL] = gspv.ncm.iScrollHeight;    // 16;
-    piSysMet[SM_CXICON] = gspv.nIconSize; // 32
-    piSysMet[SM_CYICON] = gspv.nIconSize; // 32
-    piSysMet[SM_CXSMICON] = gspv.nSmallIconSize; // 16
-    piSysMet[SM_CYSMICON] = gspv.nSmallIconSize; // 16
+    piSysMet[SM_CXICON] = 32;
+    piSysMet[SM_CYICON] = 32;
+    piSysMet[SM_CXSMICON] = 16;
+    piSysMet[SM_CYSMICON] = 16;
     piSysMet[SM_CXICONSPACING] = gspv.im.iHorzSpacing;  // 64;
     piSysMet[SM_CYICONSPACING] = gspv.im.iVertSpacing;  // 64;
     piSysMet[SM_CXCURSOR] = 32;
diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c
index 538d18bb341..59cc76f13f9 100644
--- a/win32ss/user/ntuser/sysparams.c
+++ b/win32ss/user/ntuser/sysparams.c
@@ -4,7 +4,6 @@
  * PURPOSE:          System parameters functions
  * FILE:             win32ss/user/ntuser/sysparams.c
  * PROGRAMER:        Timo Kreuzer (timo.kreuzer(a)reactos.org)
- *                   Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com)
  */
 
 // TODO:
@@ -206,11 +205,6 @@ SpiFixupValues(VOID)
 //                               gspv.tmMenuFont.tmExternalLeading);
     if (gspv.iDblClickTime == 0) gspv.iDblClickTime = 500;
 
-    if (gspv.nIconSize <= 0)
-        gspv.nIconSize = 32;
-    if (gspv.nSmallIconSize <= 0)
-        gspv.nSmallIconSize = 16;
-
     // FIXME: Hack!!!
     gspv.tmMenuFont.tmHeight = 11;
     gspv.tmMenuFont.tmExternalLeading = 2;
@@ -302,10 +296,6 @@ SpiUpdatePerUserSystemParameters(VOID)
     gspv.im.iTitleWrap = SpiLoadMetric(VAL_ITWRAP, 1);
     SpiLoadFont(&gspv.im.lfFont, L"IconFont", &lf1);
 
-    /* Load icon size */
-    gspv.nIconSize = SpiLoadInt(KEY_METRIC, L"Shell Icon Size", 32);
-    gspv.nSmallIconSize = SpiLoadInt(KEY_METRIC, L"Shell Small Icon Size",
16);
-
     /* Load desktop settings */
     gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0);
     gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3);
diff --git a/win32ss/user/ntuser/sysparams.h b/win32ss/user/ntuser/sysparams.h
index dafb7f4b181..0b564f86099 100644
--- a/win32ss/user/ntuser/sysparams.h
+++ b/win32ss/user/ntuser/sysparams.h
@@ -157,9 +157,6 @@ typedef struct _SPIVALUES
     DWORD dwForegroundFlashCount;
     DWORD dwCaretWidth;
 
-    INT nIconSize;
-    INT nSmallIconSize;
-
 //    SPI_LANGDRIVER
 //    SPI_SETDESKPATTERN
 //    SPI_SETPENWINDOWS