[ros-diffs] [reactos] 01/01: [BROWSEUI][DEVMGR][EXPLORER][NTGDI][NTOBJSHEX][NTVDM][SETUPAPI] Remove/comment out some unused variables. CORE-11799 (#94)

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cb061514716fdd202ee1…

commit 5cb061514716fdd202ee11facfaad336f68a97a1
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sat Oct 28 15:04:18 2017 +0100

    [BROWSEUI][DEVMGR][EXPLORER][NTGDI][NTOBJSHEX][NTVDM][SETUPAPI] Remove/comment out
some unused variables. CORE-11799 (#94)
---
 base/shell/explorer/trayntfy.cpp      | 2 --
 dll/shellext/ntobjshex/ntobjfolder.h  | 1 -
 dll/shellext/ntobjshex/regfolder.cpp  | 2 +-
 dll/win32/browseui/brandband.cpp      | 2 +-
 dll/win32/browseui/desktopipc.cpp     | 7 +------
 dll/win32/browseui/shellbrowser.cpp   | 2 +-
 dll/win32/browseui/toolsband.cpp      | 8 +++-----
 dll/win32/devmgr/devmgmt/MainWindow.h | 1 -
 dll/win32/setupapi/devclass.c         | 2 --
 subsystems/mvdm/ntvdm/bios/vidbios.c  | 5 +++--
 subsystems/mvdm/ntvdm/cpu/callback.c  | 3 +++
 win32ss/gdi/ntgdi/freetype.c          | 1 -
 12 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp
index 366b45a0a8..c14e29161a 100644
--- a/base/shell/explorer/trayntfy.cpp
+++ b/base/shell/explorer/trayntfy.cpp
@@ -1309,7 +1309,6 @@ class CTrayNotifyWnd :
     SIZE szTrayClockMin;
     SIZE szTrayNotify;
     MARGINS ContentMargin;
-    HFONT hFontClock;
     union
     {
         DWORD dwFlags;
@@ -1326,7 +1325,6 @@ public:
         m_pager(NULL),
         m_clock(NULL),
         TrayTheme(NULL),
-        hFontClock(NULL),
         dwFlags(0)
     {
         ZeroMemory(&szTrayClockMin, sizeof(szTrayClockMin));
diff --git a/dll/shellext/ntobjshex/ntobjfolder.h b/dll/shellext/ntobjshex/ntobjfolder.h
index ef948f7621..5192e29856 100644
--- a/dll/shellext/ntobjshex/ntobjfolder.h
+++ b/dll/shellext/ntobjshex/ntobjfolder.h
@@ -14,7 +14,6 @@ class CNtObjectFolderExtractIcon :
     public IExtractIconW
 {
     PCWSTR m_NtPath;
-    PCIDLIST_ABSOLUTE m_pcidlFolder;
     PCITEMID_CHILD    m_pcidlChild;
 
 public:
diff --git a/dll/shellext/ntobjshex/regfolder.cpp b/dll/shellext/ntobjshex/regfolder.cpp
index 6ac41d4ad5..a314ad70a6 100644
--- a/dll/shellext/ntobjshex/regfolder.cpp
+++ b/dll/shellext/ntobjshex/regfolder.cpp
@@ -12,7 +12,7 @@
 const GUID CLSID_RegistryFolder = { 0x1c6d6e08, 0x2332, 0x4a7b, { 0xa9, 0x4d, 0x64, 0x32,
0xdb, 0x2b, 0x5a, 0xe6 } };
 
 // {18A4B504-F6D8-4D8A-8661-6296514C2CF0}
-static const GUID GUID_RegistryColumns = { 0x18a4b504, 0xf6d8, 0x4d8a, { 0x86, 0x61,
0x62, 0x96, 0x51, 0x4c, 0x2c, 0xf0 } };
+//static const GUID GUID_RegistryColumns = { 0x18a4b504, 0xf6d8, 0x4d8a, { 0x86, 0x61,
0x62, 0x96, 0x51, 0x4c, 0x2c, 0xf0 } };
 
 enum RegistryColumns
 {
diff --git a/dll/win32/browseui/brandband.cpp b/dll/win32/browseui/brandband.cpp
index fc209b7344..230ab942bc 100644
--- a/dll/win32/browseui/brandband.cpp
+++ b/dll/win32/browseui/brandband.cpp
@@ -43,7 +43,7 @@ inline void FillSolidRect(HDC dc, const RECT *bounds, COLORREF clr)
     ::ExtTextOut(dc, 0, 0, ETO_OPAQUE, bounds, NULL, 0, NULL);
 }
 
-static const int                            gSmallImageSize = 22;
+//static const int                            gSmallImageSize = 22;
 static const int                            gMediumImageSize = 26;
 static const int                            gLargeImageSize = 38;
 
diff --git a/dll/win32/browseui/desktopipc.cpp b/dll/win32/browseui/desktopipc.cpp
index 4afb9929e7..c82f4cd30d 100644
--- a/dll/win32/browseui/desktopipc.cpp
+++ b/dll/win32/browseui/desktopipc.cpp
@@ -33,15 +33,10 @@ class CProxyDesktop :
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public CWindowImpl < CProxyDesktop, CWindow, CFrameWinTraits >
 {
-    IEThreadParamBlock * m_Parameters;
-
-    LPITEMIDLIST m_rootPidl;
 
 public:
-    CProxyDesktop(IEThreadParamBlock * parameters) :
-        m_Parameters(parameters)
+    CProxyDesktop(IEThreadParamBlock * parameters)
     {
-
     }
 
     virtual ~CProxyDesktop()
diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp
index 25df806e79..b95a4e331d 100644
--- a/dll/win32/browseui/shellbrowser.cpp
+++ b/dll/win32/browseui/shellbrowser.cpp
@@ -167,7 +167,7 @@ HRESULT WINAPI SHBindToFolder(LPCITEMIDLIST path, IShellFolder
**newFolder)
 }
 
 static const TCHAR szCabinetWndClass[] = TEXT("CabinetWClass");
-static const TCHAR szExploreWndClass[] = TEXT("ExploreWClass");
+//static const TCHAR szExploreWndClass[] = TEXT("ExploreWClass");
 
 class CDockManager;
 class CShellBrowser;
diff --git a/dll/win32/browseui/toolsband.cpp b/dll/win32/browseui/toolsband.cpp
index 03b3609b47..1e855cb660 100644
--- a/dll/win32/browseui/toolsband.cpp
+++ b/dll/win32/browseui/toolsband.cpp
@@ -38,8 +38,6 @@ class CToolsBand :
 {
 private:
     CComPtr<IDockingWindowSite> fDockSite;
-    GUID                        fExecCommandCategory;
-    CComPtr<IOleCommandTarget>  fExecCommandTarget;
     HIMAGELIST m_himlNormal;
     HIMAGELIST m_himlHot;
 public:
@@ -163,7 +161,7 @@ static const int cutImageIndex = 5;
 static const int copyImageIndex = 6;
 static const int pasteImageIndex = 7;
 static const int undoImageIndex = 8;
-static const int redoImageIndex = 9;
+//static const int redoImageIndex = 9;
 static const int deleteImageIndex = 10;
 // 11
 // 12
@@ -186,13 +184,13 @@ static const int upImageIndex = 28;
 static const int mapDriveImageIndex = 29;
 static const int disconnectImageIndex = 30;
 // 31
-static const int viewsAltImageIndex = 32;       // same image as viewsImageIndex
+//static const int viewsAltImageIndex = 32;       // same image as viewsImageIndex
 // 33
 // 34
 // 35
 // 36
 // 37
-static const int viewsAlt2ImageIndex = 38;      // same image as viewsAltImageIndex &
viewsImageIndex
+//static const int viewsAlt2ImageIndex = 38;      // same image as viewsAltImageIndex
& viewsImageIndex
 // 39
 // 40
 // 41
diff --git a/dll/win32/devmgr/devmgmt/MainWindow.h
b/dll/win32/devmgr/devmgmt/MainWindow.h
index afd331344d..ec1633d6db 100644
--- a/dll/win32/devmgr/devmgmt/MainWindow.h
+++ b/dll/win32/devmgr/devmgmt/MainWindow.h
@@ -15,7 +15,6 @@ class CDeviceManager
     HWND m_hStatusBar;
     HWND m_hToolBar;
     HMENU m_hMenu;
-    HMENU m_hActionMenu;
     int m_CmdShow;
     BOOL m_RefreshPending;
 
diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c
index 7b5c024ac6..4982e67290 100644
--- a/dll/win32/setupapi/devclass.c
+++ b/dll/win32/setupapi/devclass.c
@@ -27,13 +27,11 @@
 
 /* Unicode constants */
 static const WCHAR BackSlash[] = {'\\',0};
-static const WCHAR Class[]  =
{'C','l','a','s','s',0};
 static const WCHAR ClassGUID[]  =
{'C','l','a','s','s','G','U','I','D',0};
 static const WCHAR ClassInstall32[]  =
{'C','l','a','s','s','I','n','s','t','a','l','l','3','2',0};
 static const WCHAR DotServices[]  =
{'.','S','e','r','v','i','c','e','s',0};
 static const WCHAR InterfaceInstall32[]  =
{'I','n','t','e','r','f','a','c','e','I','n','s','t','a','l','l','3','2',0};
 static const WCHAR SetupapiDll[]  =
{'s','e','t','u','p','a','p','i','.','d','l','l',0};
-static const WCHAR Version[]  =
{'V','e','r','s','i','o','n',0};
 
 typedef BOOL
 (WINAPI* PROPERTY_PAGE_PROVIDER) (
diff --git a/subsystems/mvdm/ntvdm/bios/vidbios.c b/subsystems/mvdm/ntvdm/bios/vidbios.c
index 052906dbe3..a2e19ac756 100644
--- a/subsystems/mvdm/ntvdm/bios/vidbios.c
+++ b/subsystems/mvdm/ntvdm/bios/vidbios.c
@@ -277,7 +277,10 @@ static VGA_REGISTERS VideoMode_320x200_256color =
  * etc...) A choice should be made at some point.
  */
 
+#if 0
+
 // This is the same as EgaPalette__HiRes
+// Unused at the moment
 static CONST COLORREF TextPalette[VGA_MAX_COLORS / 4] =
 {
     RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA,
0xAA),
@@ -346,8 +349,6 @@ static CONST COLORREF mtext_s3_palette[64] =
     RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF,
0xFF)
 };
 
-#if 0
-
 // Unused at the moment
 static CONST COLORREF CgaPalette[16] =
 {
diff --git a/subsystems/mvdm/ntvdm/cpu/callback.c b/subsystems/mvdm/ntvdm/cpu/callback.c
index 00c8979989..c5f3002703 100644
--- a/subsystems/mvdm/ntvdm/cpu/callback.c
+++ b/subsystems/mvdm/ntvdm/cpu/callback.c
@@ -31,6 +31,8 @@
 
 /* PRIVATE VARIABLES **********************************************************/
 
+#if 0
+/* FIXME: Are we going to use this somewhere? */
 static BYTE Yield[] =
 {
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
@@ -38,6 +40,7 @@ static BYTE Yield[] =
     BOP(BOP_UNSIMULATE),                        // UnSimulate16 BOP
 };
 C_ASSERT(sizeof(Yield) == 16 * sizeof(BYTE));
+#endif
 
 /* PUBLIC FUNCTIONS ***********************************************************/
 
diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c
index eb2fc7756d..5fb58cf3e4 100644
--- a/win32ss/gdi/ntgdi/freetype.c
+++ b/win32ss/gdi/ntgdi/freetype.c
@@ -48,7 +48,6 @@ extern const MATRIX gmxWorldToPageDefault;
 #define gmxWorldToDeviceDefault gmxWorldToPageDefault
 
 FT_Library  library;
-static const WORD gusEnglishUS = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US);
 
 /* special font names */
 static const UNICODE_STRING MarlettW = RTL_CONSTANT_STRING(L"Marlett");