From c57c04a7c2b77f00f2b387c800eeefaced45d95d Mon Sep 17 00:00:00 2001
From: David Quintana <gigaherz@gmail.com>
Date: Thu, 13 Feb 2014 23:49:19 +0000
Subject: [PATCH] [RSHELL] * A couple small fixes before I go to bed. * Add to
 CD, so explorer_new can be run in ros, with the custom classes. CORE-7886

svn path=/branches/shell-experiments/; revision=62156
---
 base/shell/rshell/CMakeLists.txt   |  2 ++
 base/shell/rshell/CMenuBand.cpp    |  2 +-
 base/shell/rshell/CMenuDeskBar.cpp | 11 +++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/base/shell/rshell/CMakeLists.txt b/base/shell/rshell/CMakeLists.txt
index a6f8491389c..d98dad8f6e8 100644
--- a/base/shell/rshell/CMakeLists.txt
+++ b/base/shell/rshell/CMakeLists.txt
@@ -35,6 +35,8 @@ add_importlibs(rshell
     kernel32
     ntdll)
 
+add_cd_file(TARGET rshell DESTINATION reactos FOR all)
+
 add_custom_command(TARGET rshell POST_BUILD 
   COMMAND "${CMAKE_COMMAND}" -E copy 
      "$<TARGET_FILE:rshell>"
diff --git a/base/shell/rshell/CMenuBand.cpp b/base/shell/rshell/CMenuBand.cpp
index 629def1c2e8..507539b8db6 100644
--- a/base/shell/rshell/CMenuBand.cpp
+++ b/base/shell/rshell/CMenuBand.cpp
@@ -22,7 +22,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand);
 
-#define WRAP_LOG 1
+#define WRAP_LOG 0
 
 extern "C" BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList);
 
diff --git a/base/shell/rshell/CMenuDeskBar.cpp b/base/shell/rshell/CMenuDeskBar.cpp
index 497fcfd28d8..12e67ef39da 100644
--- a/base/shell/rshell/CMenuDeskBar.cpp
+++ b/base/shell/rshell/CMenuDeskBar.cpp
@@ -24,7 +24,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar);
 
-#define WRAP_LOG 1
+#define WRAP_LOG 0
 
 typedef CWinTraits<
     WS_POPUP | WS_DLGFRAME | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
@@ -643,7 +643,7 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite(IUnknown *pUnkSite)
     }
 
     // get window handle of parent
-    hr = pUnkSite->QueryInterface(IID_ITrayPriv, reinterpret_cast<void **>(&m_Site));
+    hr = pUnkSite->QueryInterface(IID_PPV_ARG(IUnknown, &m_Site));
     if (FAILED(hr))
         return hr;
 
@@ -847,6 +847,13 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP
     rc.right -= rc.left;
     rc.bottom -= rc.top;
 
+    if (m_Banner != NULL)
+    {
+        BITMAP bm;
+        ::GetObject(m_Banner, sizeof(bm), &bm);
+        rc.right += bm.bmWidth;
+    }
+
     int x = ppt->x;
     int y = ppt->y - rc.bottom;
     int cx = rc.right;