[ros-diffs] [reactos] 01/01: [SHELL32] Remove some unused members and comment out some unused Wine code. CORE-11799 (#94)

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce4ecd604d3962a8dc11d5...

commit ce4ecd604d3962a8dc11d52cfa8673b950ed490c
Author: Amine Khaldi [e-mail]
AuthorDate: Fri Oct 27 23:51:44 2017 +0100

[SHELL32] Remove some unused members and comment out some unused Wine code. CORE-11799 (#94)
---
 dll/win32/shell32/shellmenu/CMenuFocusManager.h | 1 -
 dll/win32/shell32/shellmenu/CMenuToolbars.cpp   | 1 -
 dll/win32/shell32/shellmenu/CMenuToolbars.h     | 1 -
 dll/win32/shell32/wine/shellole.c               | 4 ++--
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dll/win32/shell32/shellmenu/CMenuFocusManager.h b/dll/win32/shell32/shellmenu/CMenuFocusManager.h
index d74ed1296d..50575ce968 100644
--- a/dll/win32/shell32/shellmenu/CMenuFocusManager.h
+++ b/dll/win32/shell32/shellmenu/CMenuFocusManager.h
@@ -77,7 +77,6 @@ private:
     INT   m_selectedItem;
     DWORD m_selectedItemFlags;

-    BOOL m_isLButtonDown;
     BOOL m_movedSinceDown;
     HWND m_windowAtDown;

diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
index 3d046ba4d5..0b13432359 100644
--- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
+++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
@@ -256,7 +256,6 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu
 CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) :
     m_pager(this, 1),
     m_useFlatMenus(FALSE),
-    m_SubclassOld(NULL),
     m_disableMouseTrack(FALSE),
     m_timerEnabled(FALSE),
     m_menuBand(menuBand),
diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.h b/dll/win32/shell32/shellmenu/CMenuToolbars.h
index fcbd62855f..6463166d25 100644
--- a/dll/win32/shell32/shellmenu/CMenuToolbars.h
+++ b/dll/win32/shell32/shellmenu/CMenuToolbars.h
@@ -32,7 +32,6 @@ class CMenuToolbarBase :
 private:
     HFONT   m_marlett;
     BOOL    m_useFlatMenus;
-    WNDPROC m_SubclassOld;
     BOOL    m_disableMouseTrack;
     BOOL    m_timerEnabled;

diff --git a/dll/win32/shell32/wine/shellole.c b/dll/win32/shell32/wine/shellole.c
index 8d58a00da0..ae9a39bb8f 100644
--- a/dll/win32/shell32/wine/shellole.c
+++ b/dll/win32/shell32/wine/shellole.c
@@ -365,6 +365,8 @@ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf)
  *  When the CreateInstance of the cf is called the callback is executed.
  */

+#ifndef __REACTOS__
+
 typedef struct
 {
     IClassFactory               IClassFactory_iface;
@@ -380,8 +382,6 @@ static inline IDefClFImpl *impl_from_IClassFactory(IClassFactory *iface)
    return CONTAINING_RECORD(iface, IDefClFImpl, IClassFactory_iface);
 }

-#ifndef __REACTOS__
-
 static const IClassFactoryVtbl dclfvt;

/**************************************************************************