[ros-diffs] [dquintana] 62962: [RSHELL] * Fix compiling with the system classes selected instead of the custom ones. CORE-7586

Author: dquintana
Date: Fri Apr 25 10:45:28 2014
New Revision: 62962

URL: http://svn.reactos.org/svn/reactos?rev=62962&view=rev
Log:
[RSHELL]
* Fix compiling with the system classes selected instead of the custom ones.
CORE-7586

Modified:
    branches/shell-experiments/base/shell/rshell/CMenuBand.cpp
    branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp
    branches/shell-experiments/base/shell/rshell/CMenuSite.cpp

Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp	[iso-8859-1] Fri Apr 25
10:45:28 2014
@@ -35,6 +35,7 @@
 extern "C"
 HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv)
 {
+    HRESULT hr;
 #if USE_SYSTEM_MENUBAND
     hr = CoCreateInstance(CLSID_MenuBand,
         NULL,
@@ -48,13 +49,13 @@
     if (!site)
         return E_OUTOFMEMORY;
 
-    HRESULT hr = site->QueryInterface(riid, ppv);
+    hr = site->QueryInterface(riid, ppv);
 
     if (FAILED_UNEXPECTEDLY(hr))
         site->Release();
+#endif
 
     return hr;
-#endif
 }
 
 CMenuBand::CMenuBand() :
@@ -308,6 +309,7 @@
 
     return S_OK;
 }
+
 HRESULT STDMETHODCALLTYPE  CMenuBand::GetBandInfo(
     DWORD dwBandID,
     DWORD dwViewMode,
@@ -337,20 +339,20 @@
 
     if (m_dwFlags & SMINIT_VERTICAL)
     {
-        pdbi->ptMinSize.x = max(minStatic.cx, minStatic.cx) + 20;
-        pdbi->ptMinSize.y = minStatic.cy + minStatic.cy;
+        pdbi->ptMinSize.x = max(minStatic.cx, minShlFld.cx) + 20;
+        pdbi->ptMinSize.y = minStatic.cy + minShlFld.cy;
         pdbi->ptMaxSize.x = max(maxStatic.cx, maxShlFld.cx) + 20;
         pdbi->ptMaxSize.y = maxStatic.cy + maxShlFld.cy;
         pdbi->dwModeFlags = DBIMF_VARIABLEHEIGHT;
     }
     else
     {
-        pdbi->ptMinSize.x = minStatic.cx + minStatic.cx;
-        pdbi->ptMinSize.y = max(minStatic.cy, minStatic.cy);
+        pdbi->ptMinSize.x = minStatic.cx + minShlFld.cx;
+        pdbi->ptMinSize.y = max(minStatic.cy, minShlFld.cy);
         pdbi->ptMaxSize.x = maxStatic.cx + maxShlFld.cx;
         pdbi->ptMaxSize.y = max(maxStatic.cy, maxShlFld.cy);
     }
-    pdbi->ptIntegral.x = max(intStatic.cx, intStatic.cx);
+    pdbi->ptIntegral.x = max(intStatic.cx, intShlFld.cx);
     pdbi->ptIntegral.y = max(intStatic.cy, intShlFld.cy);
     pdbi->ptActual = pdbi->ptMinSize;
 
@@ -469,7 +471,7 @@
             {
                 _KeyboardItemChange(VK_HOME);
             }
-            else if (nCmdexecopt == -2) // last
+            else // last
             {
                 _KeyboardItemChange(VK_END);
             }

Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp	[iso-8859-1] Fri Apr 25
10:45:28 2014
@@ -30,6 +30,7 @@
 extern "C"
 HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv)
 {
+    HRESULT hr;
 #if USE_SYSTEM_MENUDESKBAR
     hr = CoCreateInstance(CLSID_MenuDeskBar,
         NULL,
@@ -43,13 +44,13 @@
     if (!deskbar)
         return E_OUTOFMEMORY;
 
-    HRESULT hr = deskbar->QueryInterface(riid, ppv);
+    hr = deskbar->QueryInterface(riid, ppv);
 
     if (FAILED_UNEXPECTEDLY(hr))
         deskbar->Release();
 
+#endif
     return hr;
-#endif
 }
 
 CMenuDeskBar::CMenuDeskBar() :

Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuSite.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMenuSite.cpp	[iso-8859-1] Fri Apr 25
10:45:28 2014
@@ -28,6 +28,7 @@
 extern "C"
 HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv)
 {
+    HRESULT hr;
 #if USE_SYSTEM_MENUSITE
     hr = CoCreateInstance(CLSID_MenuBandSite,
         NULL,
@@ -41,13 +42,13 @@
     if (!site)
         return E_OUTOFMEMORY;
 
-    HRESULT hr = site->QueryInterface(riid, ppv);
+    hr = site->QueryInterface(riid, ppv);
 
     if (FAILED_UNEXPECTEDLY(hr))
         site->Release();
+#endif
 
     return hr;
-#endif
 }
 
 CMenuSite::CMenuSite() :