Author: dquintana
Date: Thu Feb 13 23:49:19 2014
New Revision: 62156
URL:
http://svn.reactos.org/svn/reactos?rev=62156&view=rev
Log:
[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
Modified:
branches/shell-experiments/base/shell/rshell/CMakeLists.txt
branches/shell-experiments/base/shell/rshell/CMenuBand.cpp
branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp
Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] Thu Feb 13
23:49:19 2014
@@ -35,6 +35,8 @@
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>"
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] Thu Feb 13
23:49:19 2014
@@ -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);
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] Thu Feb 13
23:49:19 2014
@@ -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 @@
}
// 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 @@
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;