Revert "[NTUSER] Enable SM_CXICON etc. settings from registry (#7679)" (#7682)

This reverts commit 3b3741c10a 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

@@ -5,7 +5,6 @@
  * FILE:             win32ss/user/ntuser/metric.c
  * PROGRAMER:        Casper S. Hornstrup ([email protected])
  *                   Timo Kreuzer ([email protected])
- *                   Katayama Hirofumi MZ ([email protected])
  */
 
 #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;

win32ss/user/ntuser/sysparams.c

@@ -4,7 +4,6 @@
  * PURPOSE:          System parameters functions
  * FILE:             win32ss/user/ntuser/sysparams.c
  * PROGRAMER:        Timo Kreuzer ([email protected])
- *                   Katayama Hirofumi MZ ([email protected])
  */
 
 // 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);

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