From bf3b8cd27304ccb06f168229eba150b8cb7101a3 Mon Sep 17 00:00:00 2001
From: Giannis Adamopoulos <gadamopoulos@reactos.org>
Date: Fri, 31 Mar 2017 22:27:13 +0000
Subject: [PATCH] [WIN32K] -Store the flat menus setting and the drop shadow
 setting in the UserPreferencesMask registry value.

svn path=/trunk/; revision=74256
---
 reactos/win32ss/user/ntuser/sysparams.c | 10 ++++------
 reactos/win32ss/user/ntuser/sysparams.h |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/reactos/win32ss/user/ntuser/sysparams.c b/reactos/win32ss/user/ntuser/sysparams.c
index 6865efd767a..ab0412606a0 100644
--- a/reactos/win32ss/user/ntuser/sysparams.c
+++ b/reactos/win32ss/user/ntuser/sysparams.c
@@ -289,11 +289,9 @@ SpiUpdatePerUserSystemParameters(VOID)
 
     gspv.tmCaptionFont.tmAveCharWidth = 6;
     gspv.bBeep = TRUE;
-    gspv.bFlatMenu = FALSE;
     gspv.uiFocusBorderWidth = 1;
     gspv.uiFocusBorderHeight = 1;
     gspv.bMenuDropAlign = 1;
-    gspv.bDropShadow = 1;
     gspv.dwMenuShowDelay = 100;
     gspv.dwForegroundFlashCount = 3;
 
@@ -1624,16 +1622,16 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl)
             return SpiSetBool(&gspv.bMouseVanish, uiParam, KEY_MOUSE, L"", fl);
 
         case SPI_GETFLATMENU:
-            return SpiGetInt(pvParam, &gspv.bFlatMenu, fl);
+            return SpiGetUserPref(UPM_FLATMENU, pvParam, fl);
 
         case SPI_SETFLATMENU:
-            return SpiSetBool(&gspv.bFlatMenu, (BOOL)pvParam, KEY_MOUSE, L"", fl);
+            return SpiSetUserPref(UPM_FLATMENU, pvParam, fl);
 
         case SPI_GETDROPSHADOW:
-            return SpiGetInt(pvParam, &gspv.bDropShadow, fl);
+            return SpiGetUserPref(UPM_DROPSHADOW, pvParam, fl);
 
         case SPI_SETDROPSHADOW:
-            return SpiSetBool(&gspv.bDropShadow, uiParam, KEY_MOUSE, L"", fl);
+            return SpiSetUserPref(UPM_DROPSHADOW, pvParam, fl);
 
         case SPI_GETBLOCKSENDINPUTRESETS:
             return SpiGetInt(pvParam, &gspv.bBlockSendInputResets, fl);
diff --git a/reactos/win32ss/user/ntuser/sysparams.h b/reactos/win32ss/user/ntuser/sysparams.h
index 9a81b69ac5c..28e9d94536d 100644
--- a/reactos/win32ss/user/ntuser/sysparams.h
+++ b/reactos/win32ss/user/ntuser/sysparams.h
@@ -29,6 +29,8 @@ typedef enum _USERPREFMASKS
     UPM_TOOLTIPFADE = 0x1000,
     UPM_CURSORSHADOW = 0x2000,
     UPM_CLICKLOCK = 0x8000,
+    UPM_FLATMENU = 0x20000,
+    UPM_DROPSHADOW = 0x40000,
     // room for more
     UPM_UIEFFECTS = 0x80000000,
     UPM_DEFAULT = 0x80003E9E
@@ -124,9 +126,7 @@ typedef struct _SPIVALUES
     UINT uiFontSmoothingOrientation;
     BOOL bDragFullWindows;
     BOOL bMenuDropAlign;
-    BOOL bFlatMenu;
     DWORD dwMenuShowDelay;
-    BOOL bDropShadow;
     BOOL bBlockSendInputResets;
 #if(_WIN32_WINNT >= 0x0600)
     BOOL bClearType;