[DESK]

- Fix MS VC compilation. Spotted by Michael Martin
- Remove unused definition

svn path=/trunk/; revision=52913

diff --git a/reactos/dll/cpl/desk/theme.c b/reactos/dll/cpl/desk/theme.c
index c9cc56c..9827c0e 100644 (file)
--- a/reactos/dll/cpl/desk/theme.c
+++ b/reactos/dll/cpl/desk/theme.c
@@ -120,8 +120,8 @@ VOID LoadCurrentTheme(THEME* theme)
        /* FIXME: XP seems to use grayed checkboxes to reflect differences between menu and tooltips settings
         * Just keep them in sync for now:
         */
-       theme->Effects.bTooltipAnimation  = theme->Effects.bMenuAnimation;
-       theme->Effects.bTooltipFade        = theme->Effects.bMenuFade;
+       theme->Effects.bTooltipAnimation = theme->Effects.bMenuAnimation;
+       theme->Effects.bTooltipFade     = theme->Effects.bMenuFade;
 
        /* show content of windows during dragging */
        SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, &theme->Effects.bDragFullWindows, 0);
@@ -138,6 +138,7 @@ BOOL LoadThemeFromReg(THEME* theme, INT ThemeId)
        TCHAR strValueName[10];
        HKEY hkNewSchemes, hkScheme, hkSize;
        DWORD dwType, dwLength;
+       UINT64 iSize;
        BOOL Ret = FALSE;
 
        if (!g_PresetLoaded)
@@ -190,7 +191,6 @@ BOOL LoadThemeFromReg(THEME* theme, INT ThemeId)
                                for (i = 0; i < NUM_SIZES; i++)
                                {
                                        wsprintf(strValueName, TEXT("Size #%d"), i);
-                                       UINT64 iSize;
                                        dwLength = sizeof(UINT64);
                                        if (RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&iSize, &dwLength) != ERROR_SUCCESS ||
                                                dwType != REG_QWORD || dwLength != sizeof(UINT64))

diff --git a/reactos/dll/cpl/desk/theme.h b/reactos/dll/cpl/desk/theme.h
index c7ac206..68a7a25 100644 (file)
--- a/reactos/dll/cpl/desk/theme.h
+++ b/reactos/dll/cpl/desk/theme.h
@@ -33,7 +33,6 @@
 #define NUM_SIZES 20
 #define NUM_COLORS 31
 #define MAX_TEMPLATES 50
-#define MAX_COLORNAMELENGTH 30
 #define MAX_TEMPLATENAMELENTGH 80
 
 /* Some typedefs for theme */