Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-20 07:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* 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
This commit is contained in:
David Quintana 2014-02-13 23:49:19 +00:00
parent c486aa0a00
commit c57c04a7c2
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/shell/rshell/CMakeLists.txt
View file

@ -35,6 +35,8 @@ add_importlibs(rshell
kernel32 kernel32
ntdll) ntdll)
add_cd_file(TARGET rshell DESTINATION reactos FOR all)
add_custom_command(TARGET rshell POST_BUILD add_custom_command(TARGET rshell POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy COMMAND "${CMAKE_COMMAND}" -E copy
"$<TARGET_FILE:rshell>" "$<TARGET_FILE:rshell>"

2
base/shell/rshell/CMenuBand.cpp
View file

@ -22,7 +22,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand);
#define WRAP_LOG 1 #define WRAP_LOG 0
extern "C" BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList); extern "C" BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList);

11
base/shell/rshell/CMenuDeskBar.cpp
View file

@ -24,7 +24,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar); WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar);
#define WRAP_LOG 1 #define WRAP_LOG 0
typedef CWinTraits< typedef CWinTraits<
WS_POPUP | WS_DLGFRAME | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, WS_POPUP | WS_DLGFRAME | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
@ -643,7 +643,7 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite(IUnknown *pUnkSite)
} }
// get window handle of parent // 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)) if (FAILED(hr))
return hr; return hr;
@ -847,6 +847,13 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP
rc.right -= rc.left; rc.right -= rc.left;
rc.bottom -= rc.top; 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 x = ppt->x;
int y = ppt->y - rc.bottom; int y = ppt->y - rc.bottom;
int cx = rc.right; int cx = rc.right;