Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[akhaldi] 62141: [CMAKE] * Improve the dummy definitions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 12 22:12:52 2014 New Revision: 62141 URL: http://svn.reactos.org/svn/reactos?rev=62141&view=rev Log: [CMAKE] * Improve the dummy definitions. Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=62141&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Wed Feb 12 22:12:52 2014 @@ -329,7 +329,7 @@ endforeach() endmacro() else() - macro(add_pch _target_name _FILE) + macro(add_pch _target _pch _sources) endmacro() endif() Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=62141… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Wed Feb 12 22:12:52 2014 @@ -157,7 +157,7 @@ endforeach() endmacro() else() - macro(add_pch _target_name _FILE) + macro(add_pch _target _pch _sources) endmacro() endif()

10 years, 7 months

[hbelusca] 62140: [REACTOS] Go fully to Win2k3 SP2 version reporting. CORE-6611 #resolve #comment Fixed in r62140.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Feb 12 20:03:57 2014 New Revision: 62140 URL: http://svn.reactos.org/svn/reactos?rev=62140&view=rev Log: [REACTOS] Go fully to Win2k3 SP2 version reporting. CORE-6611 #resolve #comment Fixed in r62140. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/include/psdk/ntverp.h trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Wed Feb 12 20:03:57 2014 @@ -1143,8 +1143,8 @@ ; ReactOS specific - by default we report ourselves as Server for the user, ; but we can also report as Workstation if some application needs it. HKLM,"SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version","ReportAsWorkstation",0x00010001,0x00000000 -; Some installers check for SP1 -HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000100 +; Some installers check for SP2 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000200 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll" HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x00000012 Modified: trunk/reactos/include/psdk/ntverp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntverp.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/ntverp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntverp.h [iso-8859-1] Wed Feb 12 20:03:57 2014 @@ -14,10 +14,10 @@ */ // -// Windows NT Build 3790.1830 +// Windows NT Build 3790.3959 // #define VER_PRODUCTBUILD 3790 -#define VER_PRODUCTBUILD_QFE 1830 +#define VER_PRODUCTBUILD_QFE 3959 // // Windows NT Version 5.2 Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=621… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Feb 12 20:03:57 2014 @@ -1072,12 +1072,12 @@ /* Setup initial system settings */ CmGetSystemControlValues(LoaderBlock->RegistryBase, CmControlVector); - /* Load static defaults for Service Pack 1 and add our SVN revision */ + /* Load static defaults for Service Pack 2 and add our SVN revision */ /* Format of CSD : SPMajor - SPMinor */ - CmNtCSDVersion = 0x100 | (KERNEL_VERSION_BUILD_HEX << 16); + CmNtCSDVersion = 0x200 | (KERNEL_VERSION_BUILD_HEX << 16); CmNtCSDReleaseType = 0; - /* Set Service Pack data for Service Pack 1 */ + /* Set Service Pack data for Service Pack 2 */ CmNtSpBuildNumber = VER_PRODUCTBUILD_QFE; if (!(CmNtCSDVersion & 0xFFFF0000)) {

10 years, 7 months

[akhaldi] 62139: [CMAKE] * *Significantly* speedup our GCC and MSVC builds by bringing-in precompiled headers support. * Grab RosBE 2.1.1, set PCH to 1 and enjoy ; ) CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 12 19:55:12 2014 New Revision: 62139 URL: http://svn.reactos.org/svn/reactos?rev=62139&view=rev Log: [CMAKE] * *Significantly* speedup our GCC and MSVC builds by bringing-in precompiled headers support. * Grab RosBE 2.1.1, set PCH to 1 and enjoy ;) CORE-7716 Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=62139&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Wed Feb 12 19:55:12 2014 @@ -297,67 +297,36 @@ # Macros if(PCH) - macro(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename) - # Add the precompiled header to the build - get_filename_component(_FILE ${_header_filename} NAME) - set(_gch_filename "${_FILE}.gch") - list(APPEND ${_out_compile_flags} -c ${_header_filename} -o ${_gch_filename}) - - # This gets us our includes - get_directory_property(DIRINC INCLUDE_DIRECTORIES) - foreach(item ${DIRINC}) - list(APPEND ${_out_compile_flags} -I${item}) + macro(add_pch _target _pch _sources) + # When including x.h GCC looks for x.h.gch first + set(_pch_final_name "${_target}_pch.h") + set(_gch ${CMAKE_CURRENT_BINARY_DIR}/${_pch_final_name}.gch) + + if(IS_CPP) + set(_pch_language CXX) + else() + set(_pch_language C) + endif() + + # Build the precompiled header + # HEADER_FILE_ONLY FALSE: force compiling the header + # EXTERNAL_SOURCE TRUE: don't use the .gch file when linking + set_source_files_properties(${_pch} PROPERTIES + HEADER_FILE_ONLY FALSE + LANGUAGE ${_pch_language} + EXTERNAL_SOURCE TRUE + OBJECT_LOCATION ${_gch}) + + if(ENABLE_CCACHE) + set(_ccache_flag "-fpch-preprocess") + endif() + + # Include the gch in the specified source files, skipping the pch file itself + list(REMOVE_ITEM ${_sources} ${_pch}) + foreach(_src ${${_sources}}) + set_property(SOURCE ${_src} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_ccache_flag} -Winvalid-pch -Werror=invalid-pch -include ${_pch_final_name}") + set_property(SOURCE ${_src} APPEND PROPERTY OBJECT_DEPENDS ${_gch}) endforeach() - - # This our definitions - get_directory_property(_compiler_flags DEFINITIONS) - list(APPEND ${_out_compile_flags} ${_compiler_flags}) - - # This gets any specific definitions that were added with set-target-property - get_target_property(_target_defs ${_target_name} COMPILE_DEFINITIONS) - if(_target_defs) - foreach(item ${_target_defs}) - list(APPEND ${_out_compile_flags} -D${item}) - endforeach() - endif() - - if(IS_CPP) - list(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS}) - else() - list(APPEND ${_out_compile_flags} ${CMAKE_C_FLAGS}) - endif() - - separate_arguments(${_out_compile_flags}) - endmacro() - - macro(add_pch _target_name _FILE) - set(_header_filename ${CMAKE_CURRENT_SOURCE_DIR}/${_FILE}) - get_filename_component(_basename ${_FILE} NAME) - set(_gch_filename ${_basename}.gch) - _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename}) - - if(IS_CPP) - set(__lang CXX) - set(__compiler ${CCACHE} ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}) - else() - set(__lang C) - set(__compiler ${CCACHE} ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}) - endif() - - add_custom_command(OUTPUT ${_gch_filename} - COMMAND ${__compiler} ${_args} - IMPLICIT_DEPENDS ${__lang} ${_header_filename} - DEPENDS ${_header_filename} ${ARGN}) - get_target_property(_src_files ${_target_name} SOURCES) - add_target_compile_flags(${_target_name} "-fpch-preprocess -Winvalid-pch -Wno-error=invalid-pch") - foreach(_item in ${_src_files}) - get_source_file_property(__src_lang ${_item} LANGUAGE) - if(__src_lang STREQUAL __lang) - set_source_files_properties(${_item} PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_gch_filename}) - endif() - endforeach() - #set dependency checking : depends on precompiled header only which already depends on deeper header - set_target_properties(${_target_name} PROPERTIES IMPLICIT_DEPENDS_INCLUDE_TRANSFORM "\"${_basename}\"=;<${_basename}>=") endmacro() else() macro(add_pch _target_name _FILE) Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=62139… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Wed Feb 12 19:55:12 2014 @@ -54,7 +54,8 @@ # - TODO: C4133: incompatible types # - C4229: modifiers on data are ignored # - C4700: uninitialized variable usage -add_compile_flags("/we4013 /we4022 /we4047 /we4098 /we4113 /we4129 /we4229 /we4700") +# - C4603: macro is not defined or definition is different after precompiled header use +add_compile_flags("/we4013 /we4022 /we4047 /we4098 /we4113 /we4129 /we4229 /we4700 /we4603") # Enable warnings above the default level, but don't treat them as errors: # - C4115: named type definition in parentheses @@ -118,8 +119,47 @@ set(CMAKE_ASM_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) -macro(add_pch _target_name _FILE) -endmacro() +if(PCH) + macro(add_pch _target _pch _sources) + set(_gch ${CMAKE_CURRENT_BINARY_DIR}/${_target}.pch) + + if(IS_CPP) + set(_pch_language CXX) + set(_cl_lang_flag "/TP") + else() + set(_pch_language C) + set(_cl_lang_flag "/TC") + endif() + + if(MSVC_IDE) + set(_pch_path_name_flag "/Fp${_gch}") + endif() + + # Build the precompiled header + # HEADER_FILE_ONLY FALSE: force compiling the header + set_source_files_properties(${_pch} PROPERTIES + HEADER_FILE_ONLY FALSE + LANGUAGE ${_pch_language} + COMPILE_FLAGS "${_cl_lang_flag} /Yc /Fp${_gch}" + OBJECT_OUTPUTS ${_gch}) + + # Prevent a race condition related to writing to the PDB files between the PCH and the excluded list of source files + get_target_property(_target_sources ${_target} SOURCES) + list(REMOVE_ITEM _target_sources ${_pch}) + foreach(_target_src ${_target_sources}) + set_property(SOURCE ${_target_src} APPEND PROPERTY OBJECT_DEPENDS ${_gch}) + endforeach() + + # Use the precompiled header with the specified source files, skipping the pch itself + list(REMOVE_ITEM ${_sources} ${_pch}) + foreach(_src ${${_sources}}) + set_property(SOURCE ${_src} APPEND_STRING PROPERTY COMPILE_FLAGS " /FI${_gch} /Yu${_gch} ${_pch_path_name_flag}") + endforeach() + endmacro() +else() + macro(add_pch _target_name _FILE) + endmacro() +endif() function(set_entrypoint _module _entrypoint) if(${_entrypoint} STREQUAL "0")

10 years, 7 months

[dquintana] 62138: [RSHELL] * Port the implementation of CMenuDeskBar to rshell (still disabled by default). * Begin implementing missing features: - Notify the band of the icon size change from Se...

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Feb 12 19:46:24 2014 New Revision: 62138 URL: http://svn.reactos.org/svn/reactos?rev=62138&view=rev Log: [RSHELL] * Port the implementation of CMenuDeskBar to rshell (still disabled by default). * Begin implementing missing features: - Notify the band of the icon size change from SetIconSize. Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/dll/win32/shell32/folders/desktop.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] Wed Feb 12 19:46:24 2014 @@ -28,6 +28,7 @@ add_importlibs(rshell shlwapi shell32 + gdi32 ole32 user32 msvcrt 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] Wed Feb 12 19:46:24 2014 @@ -19,12 +19,21 @@ */ #include "precomp.h" #include "wraplog.h" +#include <atlwin.h> WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar); #define WRAP_LOG 1 +typedef CWinTraits< + WS_POPUP | WS_DLGFRAME | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, + WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_PALETTEWINDOW +> CMenuWinTraits; + class CMenuDeskBar : +#if !WRAP_LOG + public CWindowImpl<CMenuDeskBar, CWindow, CMenuWinTraits>, +#endif public CComCoClass<CMenuDeskBar>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IOleCommandTarget, @@ -54,6 +63,20 @@ IBanneredBar * m_IBanneredBar; IInitializeObject * m_IInitializeObject; #else + + CComPtr<IUnknown> m_Site; + CComPtr<IUnknown> m_Client; + HWND m_ClientWindow; + bool m_Vertical; + bool m_Visible; + int m_NeededSize; // width or height + + DWORD m_IconSize; + HBITMAP m_Banner; + + // used by resize tracking loop + bool m_Tracking; + POINT m_LastLocation; #endif public: @@ -99,9 +122,37 @@ virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(LPRECT prc); + // message handlers + LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnCancelMode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnCaptureChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); DECLARE_NOT_AGGREGATABLE(CMenuDeskBar) DECLARE_PROTECT_FINAL_CONSTRUCT() + +#if !WRAP_LOG + DECLARE_WND_CLASS_EX(_T("BaseBar"), 0, COLOR_3DFACE) +#endif + + BEGIN_MSG_MAP(CMenuDeskBar) + MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_NOTIFY, OnNotify) + MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) + MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) + MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) + MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) + MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged) + MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged) + MESSAGE_HANDLER(WM_ACTIVATE, OnActivate) +/* MESSAGE_HANDLER(WM_PAINT, OnPaint) */ + END_MSG_MAP() BEGIN_COM_MAP(CMenuDeskBar) COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup) @@ -135,6 +186,7 @@ return hr; } +#if WRAP_LOG CMenuDeskBar::CMenuDeskBar() { HRESULT hr; @@ -392,3 +444,484 @@ WrapLogExit("CMenuDeskBar::OnPosRectChangeDB() = %08x\n", hr); return hr; } +#else + +CMenuDeskBar::CMenuDeskBar() : + m_ClientWindow(NULL), + m_Vertical(true), + m_Visible(false), + m_NeededSize(200), + m_Tracking(false) +{ +} + +CMenuDeskBar::~CMenuDeskBar() +{ +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetWindow(HWND *lphwnd) +{ + if (lphwnd == NULL) + return E_POINTER; + *lphwnd = m_hWnd; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::ContextSensitiveHelp(BOOL fEnterMode) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus) +{ + // forward to owner + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, + OLECMD prgCmds[], OLECMDTEXT *pCmdText) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, + DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + if (IsEqualIID(*pguidCmdGroup, CGID_Explorer)) + { + } + else if (IsEqualIID(*pguidCmdGroup, IID_IDeskBarClient)) + { + switch (nCmdID) + { + case 0: + // hide current band + break; + case 2: + break; + case 3: + break; + } + } + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) +{ + CComPtr<IServiceProvider> serviceProvider; + HRESULT hResult; + + if (m_Site == NULL) + return E_FAIL; + hResult = m_Site->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); + if (FAILED(hResult)) + return hResult; + // called for SID_STopLevelBrowser, IID_IBrowserService to find top level browser + // called for SID_IWebBrowserApp, IID_IConnectionPointContainer + // connection point called for DIID_DWebBrowserEvents2 to establish connection + return serviceProvider->QueryService(guidService, riid, ppvObject); +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::UIActivateIO(BOOL fActivate, LPMSG lpMsg) +{ + // forward to contained bar + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::HasFocusIO() +{ + // forward to contained bar + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::TranslateAcceleratorIO(LPMSG lpMsg) +{ + // forward to contained bar + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient(IUnknown *punkClient) +{ + CComPtr<IDeskBarClient> pDeskBandClient; + HRESULT hResult; + + if (m_hWnd == NULL) + { + HWND ownerWindow = NULL; + if (m_Site) + { + IOleWindow * oleWindow; + + hResult = m_Site->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); + if (SUCCEEDED(hResult)) + hResult = oleWindow->GetWindow(&ownerWindow); + + if (!::IsWindow(ownerWindow)) + return E_FAIL; + } + + Create(ownerWindow); + } + + if (punkClient == NULL) + m_Client.Release(); + else + { + hResult = punkClient->QueryInterface(IID_IUnknown, reinterpret_cast<void **>(&m_Client)); + if (FAILED(hResult)) + return hResult; + + hResult = m_Client->QueryInterface(IID_IDeskBarClient, (VOID**) &pDeskBandClient); + if (FAILED(hResult)) + return hResult; + + hResult = pDeskBandClient->SetDeskBarSite(static_cast<IDeskBar*>(this)); + if (FAILED(hResult)) + return hResult; + + } + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetClient(IUnknown **ppunkClient) +{ + if (ppunkClient == NULL) + return E_POINTER; + *ppunkClient = m_Client; + if (m_Client.p != NULL) + m_Client.p->AddRef(); + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnPosRectChangeDB(LPRECT prc) +{ + if (prc == NULL) + return E_POINTER; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite(IUnknown *pUnkSite) +{ + return S_OK; + CComPtr<IServiceProvider> serviceProvider; + CComPtr<IProfferService> profferService; + HRESULT hResult; + CComPtr<IOleWindow> oleWindow; + HWND ownerWindow; + + + m_Site.Release(); + if (pUnkSite == NULL) + { + return S_OK; + } + + if (m_hWnd == NULL) + { + // get window handle of parent + hResult = pUnkSite->QueryInterface(IID_ITrayPriv, reinterpret_cast<void **>(&m_Site)); + if (FAILED(hResult)) + return hResult; + + hResult = pUnkSite->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); + if (SUCCEEDED(hResult)) + hResult = oleWindow->GetWindow(&ownerWindow); + + if (!::IsWindow(ownerWindow)) + return E_FAIL; + + Create(ownerWindow); + } + else + { + //Set Owner ? + } + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetSite(REFIID riid, void **ppvSite) +{ + if (ppvSite == NULL) + return E_POINTER; + *ppvSite = m_Site; + if (m_Site.p != NULL) + m_Site.p->AddRef(); + return S_OK; +} + +LRESULT CMenuDeskBar::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + HRESULT hr; + + if (m_Client) + { + CComPtr<IOleWindow> pOw; + hr = m_Client->QueryInterface(IID_PPV_ARG(IOleWindow, &pOw)); + if (FAILED(hr)) + { + ERR("IUnknown_QueryInterface pBs failed: %x\n", hr); + return 0; + } + + HWND clientWnd; + pOw->GetWindow(&clientWnd); + + RECT rc; + + GetClientRect(&rc); + + if (m_Banner != NULL) + { + SIZE sz; + ::GetBitmapDimensionEx(m_Banner, &sz); + rc.left += sz.cx; + } + + ::SetWindowPos(clientWnd, NULL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, 0); + } + + return 0; +} + +LRESULT CMenuDeskBar::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + CComPtr<IWinEventHandler> winEventHandler; + LRESULT result; + HRESULT hResult; + + result = 0; + if (m_Client.p != NULL) + { + hResult = m_Client->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&winEventHandler)); + if (SUCCEEDED(hResult) && winEventHandler.p != NULL) + hResult = winEventHandler->OnWinEvent(NULL, uMsg, wParam, lParam, &result); + } + return result; +} + +LRESULT CMenuDeskBar::OnLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + SetCapture(); + m_Tracking = true; + m_LastLocation.x = LOWORD(lParam); + m_LastLocation.y = HIWORD(lParam); + return 0; +} + +LRESULT CMenuDeskBar::OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + ReleaseCapture(); + m_Tracking = false; + return 0; +} + +LRESULT CMenuDeskBar::OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + POINT newLocation; + //int delta; + + if (m_Tracking) + { + newLocation.x = (short) LOWORD(lParam); + newLocation.y = (short) HIWORD(lParam); + m_LastLocation = newLocation; + } + return 0; +} + +LRESULT CMenuDeskBar::OnCancelMode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + m_Tracking = false; + return 0; +} + +LRESULT CMenuDeskBar::OnCaptureChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + m_Tracking = false; + return 0; +} + +LRESULT CMenuDeskBar::OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + return 0; +} + +LRESULT CMenuDeskBar::OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + if (LOWORD(wParam) == WA_INACTIVE) + { + //DestroyWindow(); + //ShowWindow(SW_HIDE); + } + return 0; +} + +LRESULT CMenuDeskBar::OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + TRACE("OnPaint\n"); + + if (m_Banner && !m_IconSize) + { + BITMAP bm; + PAINTSTRUCT ps; + HDC hdc = BeginPaint(&ps); + + HDC hdcMem = ::CreateCompatibleDC(hdc); + HGDIOBJ hbmOld = ::SelectObject(hdcMem, m_Banner); + + ::GetObject(m_Banner, sizeof(bm), &bm); + + TRACE("Painting banner: %d by %d\n", bm.bmWidth, bm.bmHeight); + + if (!::BitBlt(hdc, 0, 0, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCCOPY)) + WARN("BitBlt failed\n"); + + ::SelectObject(hdcMem, hbmOld); + ::DeleteDC(hdcMem); + + EndPaint(&ps); + } + + return 0; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags) +{ + //ENTER >> CMenuDeskBar<03901CC0>::Popup(POINTL *ppt=00B3F428, RECTL *prcExclude=00B3F418, MP_POPUPFLAGS dwFlags=80000000) + // ENTER >> CMenuBand<00D2CCF8>::QueryService + + // ENTER >> CMenuBand<00D2CCF8>::ShowDW(BOOL fShow=1) + // ENTER >> CMenuDeskBar<03901CC0>::GetSite(REFIID riid={4622AD10-FF23-11D0-8D34-00A0C90F2719}, PVOID *ppvSite=03901D4C) + // -- *ppvSite=00BDEA90 + // EXIT <<< CMenuDeskBar::GetSite() = 00000000 + // ENTER >> CMenuBand<00D2CCF8>::SetMenu(HMENU hmenu=593F0A07, HWND hwnd=00000000, DWORD dwFlags=20000000) + // EXIT <<< CMenuBand::SetMenu() = 00000000 + // EXIT <<< CMenuBand::ShowDW() = 00000000 + // ENTER >> CMenuBand<00D2CCF8>::GetBandInfo(DWORD dwBandID=0, DWORD dwViewMode=0, DESKBANDINFO *pdbi=00B3F0F0) + // EXIT <<< CMenuBand::GetBandInfo() = 00000000 + // ENTER >> CMenuBand<00D2CCF8>::QueryService(REFGUID guidService={ED9CC020-08B9-11D1-9823-00C04FD91972}, REFIID riid={B722BCCB-4E68-101B-A2BC-00AA00404770}, void **ppvObject=00B3F304) + // -- SID is SID_SMenuBandChild. Using QueryInterface of self instead of wrapped object. + // -- *ppvObject=00D2CD08 + // EXIT <<< CMenuBand::QueryService() = 00000000 + // ENTER >> CMenuBand<00D2CCF8>::Exec(const GUID *pguidCmdGroup=76BAE1FC, DWORD nCmdID=19, DWORD nCmdexecopt=0, VARIANT *pvaIn=00000000, VARIANT *pvaOut=00000000) + // -- *pguidCmdGroup={5B4DAE26-B807-11D0-9815-00C04FD91972} + // EXIT <<< CMenuBand::Exec() = 00000001 + // ENTER >> CMenuBand<00D2CCF8>::OnPosRectChangeDB(RECT *prc=00B3E630) + // -- *prc={L: 0, T: 0, R: 218, B: 305} + // EXIT <<< CMenuBand::OnPosRectChangeDB() = 00000000 + // ENTER >> CMenuBand<00D2CCF8>::UIActivateIO(BOOL fActivate=1, LPMSG lpMsg=00000000) + // EXIT <<< CMenuBand::UIActivateIO() = 00000001 + //EXIT <<< CMenuDeskBar::Popup() = 00000000 + HRESULT hr; + IServiceProvider * sp; + IOleCommandTarget * oct; + IInputObject * io; + + hr = m_Client->QueryInterface(IID_PPV_ARG(IServiceProvider, &sp)); + if (FAILED(hr)) + return hr; + + hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io)); + if (FAILED(hr)) + return hr; + + hr = sp->QueryService(SID_SMenuBandChild, IID_PPV_ARG(IOleCommandTarget, &oct)); + if (FAILED(hr)) + { + sp->Release(); + return hr; + } + + // Unknown meaning + const int CMD = 19; + const int CMD_EXEC_OPT = 0; + + hr = oct->Exec(&CLSID_MenuBand, CMD, CMD_EXEC_OPT, NULL, NULL); + + oct->Release(); + sp->Release(); + return hr; + + // FIXME: everything! + const int hackWidth = 200; + const int hackHeight = 400; + RECT r = { ppt->x, ppt->y - hackHeight, ppt->x + hackWidth, ppt->y }; + if (this->m_hWnd == NULL) + { + this->Create(NULL, &r); + } + this->SetWindowPos(NULL, r.left, r.top, r.right - r.left, r.bottom - r.top, SWP_SHOWWINDOW); + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetIconSize(THIS_ DWORD iIcon) +{ + HRESULT hr; + IServiceProvider * sp; + IOleCommandTarget * oct; + + m_IconSize = iIcon; + + hr = m_Client->QueryInterface(IID_PPV_ARG(IServiceProvider, &sp)); + if (FAILED(hr)) + return hr; + + hr = sp->QueryService(SID_SMenuBandChild, IID_PPV_ARG(IOleCommandTarget, &oct)); + if (FAILED(hr)) + { + sp->Release(); + return hr; + } + + // Unknown meaning + const int CMD = 16; + const int CMD_EXEC_OPT = 2; + + hr = oct->Exec(&CLSID_MenuBand, CMD, CMD_EXEC_OPT, NULL, NULL); + + oct->Release(); + sp->Release(); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetIconSize(THIS_ DWORD* piIcon) +{ + if (piIcon) + *piIcon = m_IconSize; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetBitmap(THIS_ HBITMAP hBitmap) +{ + m_Banner = hBitmap; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetBitmap(THIS_ HBITMAP* phBitmap) +{ + if (phBitmap) + *phBitmap = m_Banner; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect( + DWORD dwSelectType) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu( + IMenuPopup *pmp, + BOOL fSet) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::Initialize(THIS) +{ + return S_OK; +} + +#endif Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Wed Feb 12 19:46:24 2014 @@ -1451,7 +1451,7 @@ else { InitFormatEtc (formatetc, CF_HDROP, TYMED_HGLOBAL); - if SUCCEEDED(pDataObject->QueryGetData(&formatetc)); + if (SUCCEEDED(pDataObject->QueryGetData(&formatetc))) { passthroughtofs = TRUE; }

10 years, 7 months

[akhaldi] 62137: [CMAKE] * Speedup GCC and MSVC builds by making use of the new ninja deps mode. * It will be in effect once you update to RosBE 2.1.1. It's disabled now in the transition phase. CO...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 12 19:36:19 2014 New Revision: 62137 URL: http://svn.reactos.org/svn/reactos?rev=62137&view=rev Log: [CMAKE] * Speedup GCC and MSVC builds by making use of the new ninja deps mode. * It will be in effect once you update to RosBE 2.1.1. It's disabled now in the transition phase. CORE-7887 Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=62137&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Wed Feb 12 19:36:19 2014 @@ -26,6 +26,10 @@ set(CMAKE_COLOR_MAKEFILE OFF) #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) set(CMAKE_SKIP_INSTALL_RULES ON) + +if(NOT DEFINED CMAKE_DISABLE_NINJA_DEPSLOG) + set(CMAKE_DISABLE_NINJA_DEPSLOG TRUE) +endif() if(NOT ARCH) set(ARCH i386) Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=62137… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Wed Feb 12 19:36:19 2014 @@ -83,13 +83,19 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE") +if(CMAKE_DISABLE_NINJA_DEPSLOG) + set(cl_includes_flag "") +else() + set(cl_includes_flag "/showIncludes") +endif() + if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS")) # for VS builds we'll only have en-US in resource files add_definitions(/DLANGUAGE_EN_US) else() set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") set(CMAKE_ASM_COMPILE_OBJECT - "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") endif()

10 years, 7 months

[akhaldi] 62136: [CMAKE] * Disable the generation of unneeded installation rules. This speeds up build and reduces the build folder files count/overall size. * It will be in effect once you update ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 12 19:25:45 2014 New Revision: 62136 URL: http://svn.reactos.org/svn/reactos?rev=62136&view=rev Log: [CMAKE] * Disable the generation of unneeded installation rules. This speeds up build and reduces the build folder files count/overall size. * It will be in effect once you update to RosBE 2.1.1. CORE-7888 #resolve Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=62136&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Wed Feb 12 19:25:45 2014 @@ -25,6 +25,7 @@ set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) set(CMAKE_COLOR_MAKEFILE OFF) #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) +set(CMAKE_SKIP_INSTALL_RULES ON) if(NOT ARCH) set(ARCH i386)

10 years, 7 months

[akhaldi] 62135: [CMAKE/GCC] * Improve the ccache check.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Feb 12 18:36:46 2014 New Revision: 62135 URL: http://svn.reactos.org/svn/reactos?rev=62135&view=rev Log: [CMAKE/GCC] * Improve the ccache check. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=62135&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Wed Feb 12 18:36:46 2014 @@ -1,6 +1,6 @@ # Show a note about ccache build -if(CCACHE STREQUAL "ccache") +if(ENABLE_CCACHE) message("-- Enabling ccache build - done") endif()

10 years, 7 months

[dquintana] 62134: [MPLAY32] * Remove from build while it hangs VS2013. [EXPLORER-NEW] * Hack it to work on Windows 7, even if an existing explorer is already running. * Move start menu popup to it...

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Feb 12 17:48:49 2014 New Revision: 62134 URL: http://svn.reactos.org/svn/reactos?rev=62134&view=rev Log: [MPLAY32] * Remove from build while it hangs VS2013. [EXPLORER-NEW] * Hack it to work on Windows 7, even if an existing explorer is already running. * Move start menu popup to its own function, for easier debugging. * Maybe-fix a drawing issue if no theme is selected. [RSHELL] * Added wrapper for CMenuBand * The cmake script should not use a hardcoded path * Better name for the log file. CORE-7886 Added: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp (with props) Modified: branches/shell-experiments/base/applications/CMakeLists.txt branches/shell-experiments/base/shell/explorer-new/explorer.c branches/shell-experiments/base/shell/explorer-new/trayntfy.c branches/shell-experiments/base/shell/explorer-new/traywnd.c branches/shell-experiments/base/shell/rshell/CMakeLists.txt branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/base/shell/rshell/precomp.h branches/shell-experiments/base/shell/rshell/wraplog.cpp Modified: branches/shell-experiments/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… ============================================================================== --- branches/shell-experiments/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/applications/CMakeLists.txt [iso-8859-1] Wed Feb 12 17:48:49 2014 @@ -16,7 +16,6 @@ add_subdirectory(logoff) add_subdirectory(magnify) add_subdirectory(mmc) -add_subdirectory(mplay32) add_subdirectory(msconfig) add_subdirectory(mscutils) add_subdirectory(mstsc) Modified: branches/shell-experiments/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] Wed Feb 12 17:48:49 2014 @@ -407,7 +407,7 @@ ProcessStartupItems(); - if (GetShellWindow() == NULL) + //if (GetShellWindow() == NULL) CreateShellDesktop = TRUE; /* FIXME - initialize SSO Thread */ @@ -415,7 +415,7 @@ if (CreateShellDesktop) { /* Initialize shell dde support */ - ShellDDEInit(TRUE); + //ShellDDEInit(TRUE); /* Initialize shell icons */ FileIconInit(TRUE); @@ -430,15 +430,15 @@ left screen corner, but is also needed in order to receive HSHELL_* notification messages (which are required for taskbar buttons to work right) */ - HideMinimizedWindows(TRUE); + /*HideMinimizedWindows(TRUE); if (Tray != NULL) - hShellDesktop = DesktopCreateWindow(Tray); + hShellDesktop = DesktopCreateWindow(Tray);*/ } - /* WinXP: Notify msgina to hide the welcome screen */ - if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) - SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); + ///* WinXP: Notify msgina to hide the welcome screen */ + //if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) + // SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); } else { Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] Wed Feb 12 17:48:49 2014 @@ -1717,6 +1717,8 @@ TrayNotifyWnd_UpdateTheme(This); return 0; case WM_ERASEBKGND: + if (!This->TrayTheme) + goto HandleDefaultMessage; return TrayNotifyWnd_DrawBackground(hwnd, uMsg, wParam, Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] Wed Feb 12 17:48:49 2014 @@ -2070,6 +2070,42 @@ } CloseHandle(CreateThread(NULL, 0, RunFileDlgThread, This, 0, NULL)); +} + +static void PopupStartMenu(IN ITrayWindowImpl *This) +{ + if (This->StartMenuPopup != NULL) + { + POINTL pt; + RECTL rcExclude; + DWORD dwFlags = 0; + + if (GetWindowRect(This->hwndStart, + (RECT*) &rcExclude)) + { + if (ITrayWindowImpl_IsPosHorizontal(This)) + { + pt.x = rcExclude.left; + pt.y = rcExclude.top; + dwFlags |= MPPF_BOTTOM; + } + else + { + if (This->Position == ABE_LEFT) + pt.x = rcExclude.left; + else + pt.x = rcExclude.right; + + pt.y = rcExclude.bottom; + dwFlags |= MPPF_BOTTOM; + } + + IMenuPopup_Popup(This->StartMenuPopup, + &pt, + &rcExclude, + dwFlags); + } + } } static LRESULT CALLBACK @@ -2566,38 +2602,7 @@ case WM_COMMAND: if ((HWND)lParam == This->hwndStart) { - if (This->StartMenuPopup != NULL) - { - POINTL pt; - RECTL rcExclude; - DWORD dwFlags = 0; - - if (GetWindowRect(This->hwndStart, - (RECT*)&rcExclude)) - { - if (ITrayWindowImpl_IsPosHorizontal(This)) - { - pt.x = rcExclude.left; - pt.y = rcExclude.top; - dwFlags |= MPPF_BOTTOM; - } - else - { - if (This->Position == ABE_LEFT) - pt.x = rcExclude.left; - else - pt.x = rcExclude.right; - - pt.y = rcExclude.bottom; - dwFlags |= MPPF_BOTTOM; - } - - IMenuPopup_Popup(This->StartMenuPopup, - &pt, - &rcExclude, - dwFlags); - } - } + PopupStartMenu(This); break; } 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] Wed Feb 12 17:48:49 2014 @@ -9,6 +9,7 @@ list(APPEND SOURCE CDesktopBrowser.cpp CMenuBand.cpp + CMenuDeskBar.cpp CMenuSite.cpp CStartMenu.cpp misc.cpp @@ -36,5 +37,5 @@ add_custom_command(TARGET rshell POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:rshell>" - "G:/reactos/vs12/reactos/base/shell/explorer-new/$<CONFIGURATION>/$<TARGET_FILE_NAME:rshell>" + "$<TARGET_FILE_DIR:explorer_new>/$<TARGET_FILE_NAME:rshell>" COMMENT "Copying to output directory") 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] Wed Feb 12 17:48:49 2014 @@ -22,7 +22,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); -#define WRAP_LOG 0 +#define WRAP_LOG 1 extern "C" BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList); Added: 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 (added) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Wed Feb 12 17:48:49 2014 @@ -0,0 +1,394 @@ +/* +* Shell Menu Desk Bar +* +* Copyright 2014 David Quintana +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +*/ +#include "precomp.h" +#include "wraplog.h" + +WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar); + +#define WRAP_LOG 1 + +class CMenuDeskBar : + public CComCoClass<CMenuDeskBar>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IOleCommandTarget, + public IServiceProvider, + public IInputObjectSite, + public IInputObject, + public IMenuPopup, + public IObjectWithSite, + public IBanneredBar, + public IInitializeObject +{ +public: + CMenuDeskBar(); + ~CMenuDeskBar(); + +private: +#if WRAP_LOG + IUnknown * m_IUnknown; + IMenuPopup * m_IMenuPopup; + IOleCommandTarget * m_IOleCommandTarget; + IServiceProvider * m_IServiceProvider; + IDeskBar * m_IDeskBar; + IOleWindow * m_IOleWindow; + IInputObjectSite * m_IInputObjectSite; + IInputObject * m_IInputObject; + IObjectWithSite * m_IObjectWithSite; + IBanneredBar * m_IBanneredBar; + IInitializeObject * m_IInitializeObject; +#else +#endif + +public: + // *** IMenuPopup methods *** + virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags); + virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType); + virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet); + + // *** IOleWindow methods *** + virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); + virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); + + // *** IObjectWithSite methods *** + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite); + + // *** IBanneredBar methods *** + virtual HRESULT STDMETHODCALLTYPE SetIconSize(DWORD iIcon); + virtual HRESULT STDMETHODCALLTYPE GetIconSize(DWORD* piIcon); + virtual HRESULT STDMETHODCALLTYPE SetBitmap(HBITMAP hBitmap); + virtual HRESULT STDMETHODCALLTYPE GetBitmap(HBITMAP* phBitmap); + + // *** IInitializeObject methods *** + virtual HRESULT STDMETHODCALLTYPE Initialize(THIS); + + // *** IOleCommandTarget methods *** + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + + // *** IServiceProvider methods *** + virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); + + // *** IInputObjectSite methods *** + virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(LPUNKNOWN lpUnknown, BOOL bFocus); + + // *** IInputObject methods *** + virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL bActivating, LPMSG lpMsg); + virtual HRESULT STDMETHODCALLTYPE HasFocusIO(THIS); + virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); + + // *** IDeskBar methods *** + virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient); + virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); + virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(LPRECT prc); + + + DECLARE_NOT_AGGREGATABLE(CMenuDeskBar) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CMenuDeskBar) + COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) + COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) + COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IMenuPopup) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IMenuPopup) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IBanneredBar, IBanneredBar) + COM_INTERFACE_ENTRY_IID(IID_IInitializeObject, IInitializeObject) + END_COM_MAP() +}; + +extern "C" +HRESULT CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + + CMenuDeskBar * deskbar = new CComObject<CMenuDeskBar>(); + + if (!deskbar) + return E_OUTOFMEMORY; + + HRESULT hr = deskbar->QueryInterface(riid, ppv); + + if (FAILED(hr)) + deskbar->Release(); + + return hr; +} + +CMenuDeskBar::CMenuDeskBar() +{ + HRESULT hr; + WrapLogOpen(); + + hr = CoCreateInstance(CLSID_MenuDeskBar, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IMenuPopup, &m_IMenuPopup)); + hr = m_IMenuPopup->QueryInterface(IID_PPV_ARG(IUnknown, &m_IUnknown)); + + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_IOleCommandTarget)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_IServiceProvider)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IDeskBar, &m_IDeskBar)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IOleWindow, &m_IOleWindow)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IInputObjectSite, &m_IInputObjectSite)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IInputObject, &m_IInputObject)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IObjectWithSite, &m_IObjectWithSite)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IBanneredBar, &m_IBanneredBar)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IInitializeObject, &m_IInitializeObject)); +} + +CMenuDeskBar::~CMenuDeskBar() +{ + m_IUnknown->Release(); + m_IMenuPopup->Release(); + m_IOleCommandTarget->Release(); + m_IServiceProvider->Release(); + m_IDeskBar->Release(); + m_IOleWindow->Release(); + m_IInputObjectSite->Release(); + m_IInputObject->Release(); + m_IObjectWithSite->Release(); + m_IBanneredBar->Release(); + m_IInitializeObject->Release(); + + WrapLogClose(); +} + +// *** IMenuPopup methods *** +HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags) +{ + WrapLogEnter("CMenuDeskBar<%p>::Popup(POINTL *ppt=%p, RECTL *prcExclude=%p, MP_POPUPFLAGS dwFlags=%08x)\n", this, ppt, prcExclude, dwFlags); + HRESULT hr = m_IMenuPopup->Popup(ppt, prcExclude, dwFlags); + WrapLogExit("CMenuDeskBar::Popup() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect(DWORD dwSelectType) +{ + WrapLogEnter("CMenuDeskBar<%p>::OnSelect(DWORD dwSelectType=%08x)\n", this, dwSelectType); + HRESULT hr = m_IMenuPopup->OnSelect(dwSelectType); + WrapLogExit("CMenuDeskBar::OnSelect() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu(IMenuPopup *pmp, BOOL fSet) +{ + WrapLogEnter("CMenuDeskBar<%p>::SetSubMenu(IMenuPopup *pmp=%p, BOOL fSet=%d)\n", this, pmp, fSet); + HRESULT hr = m_IMenuPopup->SetSubMenu(pmp, fSet); + WrapLogExit("CMenuDeskBar::SetSubMenu() = %08x\n", hr); + return hr; +} + +// *** IOleWindow methods *** +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetWindow(HWND *phwnd) +{ + WrapLogEnter("CMenuDeskBar<%p>::GetWindow(HWND *phwnd=%p)\n", this, phwnd); + HRESULT hr = m_IOleWindow->GetWindow(phwnd); + if (phwnd) WrapLogMsg("*phwnd=%p\n", *phwnd); + WrapLogExit("CMenuDeskBar::GetWindow() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::ContextSensitiveHelp(BOOL fEnterMode) +{ + WrapLogEnter("CMenuDeskBar<%p>::ContextSensitiveHelp(BOOL fEnterMode=%d)\n", this, fEnterMode); + HRESULT hr = m_IOleWindow->ContextSensitiveHelp(fEnterMode); + WrapLogExit("CMenuDeskBar::ContextSensitiveHelp() = %08x\n", hr); + return hr; +} + +// *** IObjectWithSite methods *** +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite(IUnknown *pUnkSite) +{ + WrapLogEnter("CMenuDeskBar<%p>::SetSite(IUnknown *pUnkSite=%p)\n", this, pUnkSite); + HRESULT hr = m_IObjectWithSite->SetSite(pUnkSite); + WrapLogExit("CMenuDeskBar::SetSite() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetSite(REFIID riid, PVOID *ppvSite) +{ + WrapLogEnter("CMenuDeskBar<%p>::GetSite(REFIID riid=%s, PVOID *ppvSite=%p)\n", this, Wrap(riid), ppvSite); + HRESULT hr = m_IObjectWithSite->GetSite(riid, ppvSite); + if (ppvSite) WrapLogMsg("*ppvSite=%p\n", *ppvSite); + WrapLogExit("CMenuDeskBar::GetSite() = %08x\n", hr); + return hr; +} + +// *** IBanneredBar methods *** +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetIconSize(DWORD iIcon) +{ + WrapLogEnter("CMenuDeskBar<%p>::SetIconSize(DWORD iIcon=%d)\n", this, iIcon); + HRESULT hr = m_IBanneredBar->SetIconSize(iIcon); + WrapLogExit("CMenuDeskBar::SetIconSize() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetIconSize(DWORD* piIcon) +{ + WrapLogEnter("CMenuDeskBar<%p>::GetIconSize(DWORD* piIcon=%p)\n", this, piIcon); + HRESULT hr = m_IBanneredBar->GetIconSize(piIcon); + if (piIcon) WrapLogMsg("*piIcon=%d\n", *piIcon); + WrapLogExit("CMenuDeskBar::GetIconSize() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetBitmap(HBITMAP hBitmap) +{ + WrapLogEnter("CMenuDeskBar<%p>::SetBitmap(HBITMAP hBitmap=%p)\n", this, hBitmap); + HRESULT hr = m_IBanneredBar->SetBitmap(hBitmap); + WrapLogExit("CMenuDeskBar::SetBitmap() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetBitmap(HBITMAP* phBitmap) +{ + WrapLogEnter("CMenuDeskBar<%p>::GetBitmap(HBITMAP* phBitmap=%p)\n", this, phBitmap); + HRESULT hr = m_IBanneredBar->GetBitmap(phBitmap); + if (phBitmap) WrapLogMsg("*phBitmap=%p\n", *phBitmap); + WrapLogExit("CMenuDeskBar::GetBitmap() = %08x\n", hr); + return hr; +} + + +// *** IInitializeObject methods *** +HRESULT STDMETHODCALLTYPE CMenuDeskBar::Initialize(THIS) +{ + WrapLogEnter("CMenuDeskBar<%p>::Initialize()\n", this); + HRESULT hr = m_IInitializeObject->Initialize(); + WrapLogExit("CMenuDeskBar::Initialize() = %08x\n", hr); + return hr; +} + +// *** IOleCommandTarget methods *** +HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) +{ + WrapLogEnter("CMenuDeskBar<%p>::QueryStatus(const GUID *pguidCmdGroup=%p, ULONG cCmds=%u, prgCmds=%p, pCmdText=%p)\n", this, pguidCmdGroup, cCmds, prgCmds, pCmdText); + HRESULT hr = m_IOleCommandTarget->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); + if (pguidCmdGroup) WrapLogMsg("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup)); + WrapLogExit("CMenuDeskBar::QueryStatus() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + //bool b; + + WrapLogEnter("CMenuDeskBar<%p>::Exec(const GUID *pguidCmdGroup=%p, DWORD nCmdID=%d, DWORD nCmdexecopt=%d, VARIANT *pvaIn=%p, VARIANT *pvaOut=%p)\n", this, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + + //if (pguidCmdGroup && IsEqualGUID(*pguidCmdGroup, CLSID_MenuBand)) + //{ + // if (nCmdID == 19) // popup + // { + // b = true; + // } + //} + + + if (pguidCmdGroup) WrapLogMsg("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup)); + HRESULT hr = m_IOleCommandTarget->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + WrapLogExit("CMenuDeskBar::Exec() = %08x\n", hr); + return hr; +} + +// *** IServiceProvider methods *** +HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) +{ + WrapLogEnter("CMenuDeskBar<%p>::QueryService(REFGUID guidService=%s, REFIID riid=%s, void **ppvObject=%p)\n", this, Wrap(guidService), Wrap(riid), ppvObject); + + //if (IsEqualIID(guidService, SID_SMenuBandChild)) + //{ + // WrapLogMsg("SID is SID_SMenuBandChild. Using QueryInterface of self instead of wrapped object.\n"); + // HRESULT hr = this->QueryInterface(riid, ppvObject); + // if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject); + // WrapLogExit("CMenuDeskBar::QueryService() = %08x\n", hr); + // return hr; + //} + //else + { + WrapLogMsg("SID not identified.\n"); + } + HRESULT hr = m_IServiceProvider->QueryService(guidService, riid, ppvObject); + if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject); + WrapLogExit("CMenuDeskBar::QueryService() = %08x\n", hr); + return hr; +} + +// *** IInputObjectSite methods *** +HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(LPUNKNOWN lpUnknown, BOOL bFocus) +{ + WrapLogEnter("CMenuDeskBar<%p>::OnFocusChangeIS(LPUNKNOWN lpUnknown=%p, BOOL bFocus=%d)\n", this, lpUnknown, bFocus); + HRESULT hr = m_IInputObjectSite->OnFocusChangeIS(lpUnknown, bFocus); + WrapLogExit("CMenuDeskBar::OnFocusChangeIS() = %08x\n", hr); + return hr; +} + +// *** IInputObject methods *** +HRESULT STDMETHODCALLTYPE CMenuDeskBar::UIActivateIO(BOOL bActivating, LPMSG lpMsg) +{ + WrapLogEnter("CMenuDeskBar<%p>::UIActivateIO(BOOL bActivating=%d, LPMSG lpMsg=%p)\n", this, bActivating, lpMsg); + HRESULT hr = m_IInputObject->UIActivateIO(bActivating, lpMsg); + WrapLogExit("CMenuDeskBar::UIActivateIO() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::HasFocusIO(THIS) +{ + WrapLogEnter("CMenuDeskBar<%p>::HasFocusIO()\n", this); + HRESULT hr = m_IInputObject->HasFocusIO(); + WrapLogExit("CMenuDeskBar::HasFocusIO() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::TranslateAcceleratorIO(LPMSG lpMsg) +{ + WrapLogEnter("CMenuDeskBar<%p>::TranslateAcceleratorIO(LPMSG lpMsg=%p)\n", this, lpMsg); + if (lpMsg) WrapLogMsg("*lpMsg=%s\n", Wrap(*lpMsg)); + HRESULT hr = m_IInputObject->TranslateAcceleratorIO(lpMsg); + WrapLogExit("CMenuDeskBar::TranslateAcceleratorIO() = %08x\n", hr); + return hr; +} + +// *** IDeskBar methods *** +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient(IUnknown *punkClient) +{ + WrapLogEnter("CMenuDeskBar<%p>::SetClient(IUnknown *punkClient=%p)\n", this, punkClient); + HRESULT hr = m_IDeskBar->SetClient(punkClient); + WrapLogExit("CMenuDeskBar::SetClient() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetClient(IUnknown **ppunkClient) +{ + WrapLogEnter("CMenuDeskBar<%p>::GetClient(IUnknown **ppunkClient=%p)\n", this, ppunkClient); + HRESULT hr = m_IDeskBar->GetClient(ppunkClient); + if (ppunkClient) WrapLogMsg("*ppunkClient=%p\n", *ppunkClient); + WrapLogExit("CMenuDeskBar::GetClient() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnPosRectChangeDB(LPRECT prc) +{ + WrapLogEnter("CMenuDeskBar<%p>::OnPosRectChangeDB(RECT *prc=%p)\n", this, prc); + HRESULT hr = m_IDeskBar->OnPosRectChangeDB(prc); + if (prc) WrapLogMsg("*prc=%s\n", Wrap(*prc)); + WrapLogExit("CMenuDeskBar::OnPosRectChangeDB() = %08x\n", hr); + return hr; +} Propchange: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Wed Feb 12 17:48:49 2014 @@ -270,7 +270,7 @@ if (FAILED(hr)) return NULL; -#if 1 +#if 0 hr = CoCreateInstance(CLSID_MenuBandSite, NULL, CLSCTX_INPROC_SERVER, @@ -281,10 +281,14 @@ if (FAILED(hr)) return NULL; +#if 0 hr = CoCreateInstance(CLSID_MenuDeskBar, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IDeskBar, &pDeskBar)); +#else + hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar)); +#endif if (FAILED(hr)) return NULL; Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Wed Feb 12 17:48:49 2014 @@ -30,5 +30,6 @@ #define SMC_EXEC 4 extern "C" INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT bSimulateDoc); +extern "C" HRESULT CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); extern "C" HRESULT CMenuSite_Constructor(REFIID riid, LPVOID *ppv); extern "C" HRESULT CMenuBand_Constructor(REFIID riid, LPVOID *ppv); Modified: branches/shell-experiments/base/shell/rshell/wraplog.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/wraplog.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/wraplog.cpp [iso-8859-1] Wed Feb 12 17:48:49 2014 @@ -13,7 +13,7 @@ { if (openCount == 0) { - log = fopen("G:\\CMenuBand.log", "w"); + log = fopen("G:\\RShellWrap.log", "w"); nTemps = 0; callLevel = 0; }

10 years, 7 months

[dquintana] 62133: [RSHELL] * Separate the wrapper logging code to its own file, to facilitate further debugging in other classes.

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Feb 12 16:54:58 2014 New Revision: 62133 URL: http://svn.reactos.org/svn/reactos?rev=62133&view=rev Log: [RSHELL] * Separate the wrapper logging code to its own file, to facilitate further debugging in other classes. Added: branches/shell-experiments/base/shell/rshell/wraplog.cpp (with props) branches/shell-experiments/base/shell/rshell/wraplog.h (with props) Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt branches/shell-experiments/base/shell/rshell/CMenuBand.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] Wed Feb 12 16:54:58 2014 @@ -12,6 +12,7 @@ CMenuSite.cpp CStartMenu.cpp misc.cpp + wraplog.cpp ${CMAKE_CURRENT_BINARY_DIR}/rshell.def) add_library(rshell SHARED ${SOURCE}) 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] Wed Feb 12 16:54:58 2014 @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "precomp.h" +#include "wraplog.h" WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); @@ -272,118 +273,6 @@ #if WRAP_LOG -#include <stdio.h> - -static UINT openCount = 0; -static UINT callLevel; -static FILE*log; - -static UINT nTemps; -static CHAR strTemp[10][256]; - -static void WrapLogOpen() -{ - if (openCount == 0) - { - log = fopen("G:\\CMenuBand.log", "w"); - nTemps = 0; - callLevel = 0; - } - openCount++; -} - -static void WrapLogClose() -{ - openCount--; - if (openCount == 0) - { - fclose(log); - log = NULL; - } -} - -static void __cdecl WrapLogMsg(_Printf_format_string_ const char* msg, ...) -{ - va_list args; - for (int i = 0; i < callLevel; i++) - fputs(" ", log); - fputs("-- ", log); - va_start(args, msg); - vfprintf(log, msg, args); - va_end(args); - fflush(log); - nTemps = 0; -} - -static void __cdecl WrapLogEnter(_Printf_format_string_ const char* msg, ...) -{ - va_list args; - for (int i = 0; i < callLevel; i++) - fputs(" ", log); - fputs("ENTER >> ", log); - va_start(args, msg); - vfprintf(log, msg, args); - va_end(args); - fflush(log); - callLevel++; - nTemps = 0; -} - -static void __cdecl WrapLogExit(_Printf_format_string_ const char* msg, ...) -{ - va_list args; - callLevel--; - for (int i = 0; i < callLevel; i++) - fputs(" ", log); - fputs("EXIT <<< ", log); - va_start(args, msg); - vfprintf(log, msg, args); - va_end(args); - fflush(log); - nTemps = 0; -} - -template <class T> -static LPSTR Wrap(const T& value); - -template <> -static LPSTR Wrap<GUID>(REFGUID guid) -{ - LPSTR cGuid = strTemp[nTemps++]; - sprintf(cGuid, "{%08lX-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX}", - guid.Data1, guid.Data2, guid.Data3, - guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], - guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); - return cGuid; -} - -template <> -static LPSTR Wrap<RECT>(const RECT& rect) -{ - LPSTR cGuid = strTemp[nTemps++]; - sprintf(cGuid, "{L: %d, T: %d, R: %d, B: %d}", - rect.left, rect.top, rect.right, rect.bottom); - return cGuid; -} - -template <> -static LPSTR Wrap<OLECMD>(const OLECMD& cmd) -{ - LPSTR cGuid = strTemp[nTemps++]; - sprintf(cGuid, "{ID: %d, F: %d}", - cmd.cmdID, cmd.cmdf); - return cGuid; -} - -template <> -static LPSTR Wrap<MSG>(const MSG& msg) -{ - LPSTR cGuid = strTemp[nTemps++]; - sprintf(cGuid, "{HWND: %d, Code: %d, W: %p, L: %p, T: %d, P.X: %d, P.Y: %d}", - msg.hwnd, msg.message, msg.wParam, msg.lParam, msg.time, msg.pt.x, msg.pt.y); - return cGuid; -} - CMenuBand::CMenuBand() { HRESULT hr; Added: branches/shell-experiments/base/shell/rshell/wraplog.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/wraplog.cpp (added) +++ branches/shell-experiments/base/shell/rshell/wraplog.cpp [iso-8859-1] Wed Feb 12 16:54:58 2014 @@ -0,0 +1,117 @@ +#include "precomp.h" +#include "wraplog.h" +#include <stdio.h> + +static UINT openCount = 0; +static UINT callLevel; +static FILE*log; + +static UINT nTemps; +static CHAR strTemp[10][256]; + +void WrapLogOpen() +{ + if (openCount == 0) + { + log = fopen("G:\\CMenuBand.log", "w"); + nTemps = 0; + callLevel = 0; + } + openCount++; +} + +void WrapLogClose() +{ + openCount--; + if (openCount == 0) + { + fclose(log); + log = NULL; + } +} + +void __cdecl WrapLogMsg(_Printf_format_string_ const char* msg, ...) +{ + va_list args; + for (int i = 0; i < callLevel; i++) + fputs(" ", log); + fputs("-- ", log); + va_start(args, msg); + vfprintf(log, msg, args); + va_end(args); + fflush(log); + nTemps = 0; +} + +void __cdecl WrapLogEnter(_Printf_format_string_ const char* msg, ...) +{ + va_list args; + for (int i = 0; i < callLevel; i++) + fputs(" ", log); + fputs("ENTER >> ", log); + va_start(args, msg); + vfprintf(log, msg, args); + va_end(args); + fflush(log); + callLevel++; + nTemps = 0; +} + +void __cdecl WrapLogExit(_Printf_format_string_ const char* msg, ...) +{ + va_list args; + callLevel--; + for (int i = 0; i < callLevel; i++) + fputs(" ", log); + fputs("EXIT <<< ", log); + va_start(args, msg); + vfprintf(log, msg, args); + va_end(args); + fflush(log); + nTemps = 0; +} + +template <class T> +LPSTR Wrap(const T& value); + +template <> +LPSTR Wrap<GUID>(REFGUID guid) +{ + LPSTR cGuid = strTemp[nTemps++]; + StringCchPrintfA(cGuid, _countof(strTemp[0]), + "{%08lX-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX}", + guid.Data1, guid.Data2, guid.Data3, + guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], + guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); + return cGuid; +} + +template <> +LPSTR Wrap<RECT>(const RECT& rect) +{ + LPSTR cGuid = strTemp[nTemps++]; + StringCchPrintfA(cGuid, _countof(strTemp[0]), + "{L: %d, T: %d, R: %d, B: %d}", + rect.left, rect.top, rect.right, rect.bottom); + return cGuid; +} + +template <> +LPSTR Wrap<OLECMD>(const OLECMD& cmd) +{ + LPSTR cGuid = strTemp[nTemps++]; + StringCchPrintfA(cGuid, _countof(strTemp[0]), + "{ID: %d, F: %d}", + cmd.cmdID, cmd.cmdf); + return cGuid; +} + +template <> +LPSTR Wrap<MSG>(const MSG& msg) +{ + LPSTR cGuid = strTemp[nTemps++]; + StringCchPrintfA(cGuid, _countof(strTemp[0]), + "{HWND: %d, Code: %d, W: %p, L: %p, T: %d, P.X: %d, P.Y: %d}", + msg.hwnd, msg.message, msg.wParam, msg.lParam, msg.time, msg.pt.x, msg.pt.y); + return cGuid; +} Propchange: branches/shell-experiments/base/shell/rshell/wraplog.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/base/shell/rshell/wraplog.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/wraplog.h (added) +++ branches/shell-experiments/base/shell/rshell/wraplog.h [iso-8859-1] Wed Feb 12 16:54:58 2014 @@ -0,0 +1,10 @@ +#pragma once + +void WrapLogOpen(); +void WrapLogClose(); +void __cdecl WrapLogMsg(_Printf_format_string_ const char* msg, ...); +void __cdecl WrapLogEnter(_Printf_format_string_ const char* msg, ...); +void __cdecl WrapLogExit(_Printf_format_string_ const char* msg, ...); + +template <class T> +LPSTR Wrap(const T& value); Propchange: branches/shell-experiments/base/shell/rshell/wraplog.h ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 7 months

[dquintana] 62132: [RSHELL] * Implemented a class that wraps CMenuBand, for the purpose of logging the calls, with parameters and returned values (disabled, set WRAP_LOG to 1). * Partial (WIP) impl...

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Feb 12 16:48:36 2014 New Revision: 62132 URL: http://svn.reactos.org/svn/reactos?rev=62132&view=rev Log: [RSHELL] * Implemented a class that wraps CMenuBand, for the purpose of logging the calls, with parameters and returned values (disabled, set WRAP_LOG to 1). * Partial (WIP) implementation of CMenuBand. [ATL] * VirtualAlloc can not have a non-zero size while using MEM_RELEASE. Added: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp (with props) Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/base/shell/rshell/precomp.h branches/shell-experiments/lib/atl/atlwin.h 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] Wed Feb 12 16:48:36 2014 @@ -8,8 +8,9 @@ list(APPEND SOURCE CDesktopBrowser.cpp + CMenuBand.cpp + CMenuSite.cpp CStartMenu.cpp - CMenuSite.cpp misc.cpp ${CMAKE_CURRENT_BINARY_DIR}/rshell.def) @@ -30,3 +31,9 @@ msvcrt kernel32 ntdll) + +add_custom_command(TARGET rshell POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy + "$<TARGET_FILE:rshell>" + "G:/reactos/vs12/reactos/base/shell/explorer-new/$<CONFIGURATION>/$<TARGET_FILE_NAME:rshell>" + COMMENT "Copying to output directory") Added: 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 (added) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Wed Feb 12 16:48:36 2014 @@ -0,0 +1,1855 @@ +/* +* Shell Menu Band +* +* Copyright 2014 David Quintana +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +*/ +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); + +#define WRAP_LOG 0 + +extern "C" BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList); + +class CMenuBand; + +class CMenuToolbarBase +{ +public: + CMenuToolbarBase(CMenuBand *menuBand); + virtual ~CMenuToolbarBase() {} + + HRESULT CreateToolbar(HWND hwndParent, DWORD dwFlags); + HRESULT GetWindow(HWND *phwnd); + HRESULT ShowWindow(BOOL fShow); + HRESULT Close(); + + virtual HRESULT FillToolbar() = 0; + +protected: + + static const UINT WM_USER_SHOWPOPUPMENU = WM_USER + 1; + + CMenuBand *m_menuBand; + HWND m_hwnd; + DWORD m_dwMenuFlags; +}; + +class CMenuStaticToolbar : public CMenuToolbarBase +{ +public: + CMenuStaticToolbar(CMenuBand *menuBand); + virtual ~CMenuStaticToolbar() {} + + HRESULT SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags); + HRESULT GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); + + virtual HRESULT FillToolbar(); + +private: + HMENU m_hmenu; +}; + +class CMenuSFToolbar : public CMenuToolbarBase +{ +public: + CMenuSFToolbar(CMenuBand *menuBand); + virtual ~CMenuSFToolbar(); + + HRESULT SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags); + HRESULT GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv); + + virtual HRESULT FillToolbar(); + +private: + + IShellFolder * m_shellFolder; + LPCITEMIDLIST m_idList; + HKEY m_hKey; +}; + +class CMenuBand : + public CComCoClass<CMenuBand>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDeskBand, + public IObjectWithSite, + public IInputObject, + public IPersistStream, + public IOleCommandTarget, + public IServiceProvider, + public IMenuPopup, + public IMenuBand, + public IShellMenu2, + public IWinEventHandler, + public IShellMenuAcc +{ +public: + CMenuBand(); + ~CMenuBand(); + +private: +#if WRAP_LOG + IUnknown * m_IUnknown; + IDeskBand * m_IDeskBand; + IDockingWindow * m_IDockingWindow; + IOleWindow * m_IOleWindow; + IObjectWithSite * m_IObjectWithSite; + IInputObject * m_IInputObject; + IPersistStream * m_IPersistStream; + IPersist * m_IPersist; + IOleCommandTarget * m_IOleCommandTarget; + IServiceProvider * m_IServiceProvider; + IMenuPopup * m_IMenuPopup; + IDeskBar * m_IDeskBar; + IMenuBand * m_IMenuBand; + IShellMenu2 * m_IShellMenu2; + IShellMenu * m_IShellMenu; + IWinEventHandler * m_IWinEventHandler; + IShellMenuAcc * m_IShellMenuAcc; +#else + IOleWindow *m_site; + IShellMenuCallback *m_psmc; + + CMenuStaticToolbar *m_staticToolbar; + CMenuSFToolbar *m_SFToolbar; + + UINT m_uId; + UINT m_uIdAncestor; + DWORD m_dwFlags; + PVOID m_UserData; + HMENU m_hmenu; +#endif + + BOOL m_useBigIcons; + +public: + + // *** IDeskBand methods *** + virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi); + + // *** IDockingWindow methods *** + virtual HRESULT STDMETHODCALLTYPE ShowDW(BOOL fShow); + virtual HRESULT STDMETHODCALLTYPE CloseDW(DWORD dwReserved); + virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved); + + // *** IOleWindow methods *** + virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); + virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); + + // *** IObjectWithSite methods *** + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite); + + // *** IInputObject methods *** + virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg); + virtual HRESULT STDMETHODCALLTYPE HasFocusIO(); + virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); + + // *** IPersistStream methods *** + virtual HRESULT STDMETHODCALLTYPE IsDirty(); + virtual HRESULT STDMETHODCALLTYPE Load(IStream *pStm); + virtual HRESULT STDMETHODCALLTYPE Save(IStream *pStm, BOOL fClearDirty); + virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize); + + // *** IPersist methods *** + virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID); + + // *** IOleCommandTarget methods *** + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + + // *** IServiceProvider methods *** + virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); + + // *** IMenuPopup methods *** + virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags); + virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType); + virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet); + + // *** IDeskBar methods *** + virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient); + virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); + virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(RECT *prc); + + // *** IMenuBand methods *** + virtual HRESULT STDMETHODCALLTYPE IsMenuMessage(MSG *pmsg); + virtual HRESULT STDMETHODCALLTYPE TranslateMenuMessage(MSG *pmsg, LRESULT *plRet); + + // *** IShellMenu methods *** + virtual HRESULT STDMETHODCALLTYPE Initialize(IShellMenuCallback *psmc, UINT uId, UINT uIdAncestor, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetMenuInfo(IShellMenuCallback **ppsmc, UINT *puId, UINT *puIdAncestor, DWORD *pdwFlags); + virtual HRESULT STDMETHODCALLTYPE SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv); + virtual HRESULT STDMETHODCALLTYPE SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); + virtual HRESULT STDMETHODCALLTYPE InvalidateItem(LPSMDATA psmd, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetState(LPSMDATA psmd); + virtual HRESULT STDMETHODCALLTYPE SetMenuToolbar(IUnknown *punk, DWORD dwFlags); + + // *** IWinEventHandler methods *** + virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult); + virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd); + + // *** IShellMenu2 methods *** + virtual HRESULT STDMETHODCALLTYPE GetSubMenu(THIS); + virtual HRESULT STDMETHODCALLTYPE SetToolbar(THIS); + virtual HRESULT STDMETHODCALLTYPE SetMinWidth(THIS); + virtual HRESULT STDMETHODCALLTYPE SetNoBorder(THIS); + virtual HRESULT STDMETHODCALLTYPE SetTheme(THIS); + + // *** IShellMenuAcc methods *** + virtual HRESULT STDMETHODCALLTYPE GetTop(THIS); + virtual HRESULT STDMETHODCALLTYPE GetBottom(THIS); + virtual HRESULT STDMETHODCALLTYPE GetTracked(THIS); + virtual HRESULT STDMETHODCALLTYPE GetParentSite(THIS); + virtual HRESULT STDMETHODCALLTYPE GetState(THIS); + virtual HRESULT STDMETHODCALLTYPE DoDefaultAction(THIS); + virtual HRESULT STDMETHODCALLTYPE IsEmpty(THIS); + + HRESULT CallCBWithId(UINT Id, UINT uMsg, WPARAM wParam, LPARAM lParam); + + BOOL UseBigIcons() { + return m_useBigIcons; + } + + DECLARE_NOT_AGGREGATABLE(CMenuBand) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CMenuBand) + COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IMenuPopup) + COM_INTERFACE_ENTRY_IID(IID_IShellMenu, IShellMenu) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow) + COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup) + COM_INTERFACE_ENTRY_IID(IID_IMenuBand, IMenuBand) + COM_INTERFACE_ENTRY_IID(IID_IShellMenu2, IShellMenu2) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc) + END_COM_MAP() + +private: + HRESULT _CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam); +}; + +extern "C" +HRESULT CMenuBand_Constructor(REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + + CMenuBand * site = new CComObject<CMenuBand>(); + + if (!site) + return E_OUTOFMEMORY; + + HRESULT hr = site->QueryInterface(riid, ppv); + + if (FAILED(hr)) + site->Release(); + + return hr; +} + + +#if WRAP_LOG +#include <stdio.h> + +static UINT openCount = 0; +static UINT callLevel; +static FILE*log; + +static UINT nTemps; +static CHAR strTemp[10][256]; + +static void WrapLogOpen() +{ + if (openCount == 0) + { + log = fopen("G:\\CMenuBand.log", "w"); + nTemps = 0; + callLevel = 0; + } + openCount++; +} + +static void WrapLogClose() +{ + openCount--; + if (openCount == 0) + { + fclose(log); + log = NULL; + } +} + +static void __cdecl WrapLogMsg(_Printf_format_string_ const char* msg, ...) +{ + va_list args; + for (int i = 0; i < callLevel; i++) + fputs(" ", log); + fputs("-- ", log); + va_start(args, msg); + vfprintf(log, msg, args); + va_end(args); + fflush(log); + nTemps = 0; +} + +static void __cdecl WrapLogEnter(_Printf_format_string_ const char* msg, ...) +{ + va_list args; + for (int i = 0; i < callLevel; i++) + fputs(" ", log); + fputs("ENTER >> ", log); + va_start(args, msg); + vfprintf(log, msg, args); + va_end(args); + fflush(log); + callLevel++; + nTemps = 0; +} + +static void __cdecl WrapLogExit(_Printf_format_string_ const char* msg, ...) +{ + va_list args; + callLevel--; + for (int i = 0; i < callLevel; i++) + fputs(" ", log); + fputs("EXIT <<< ", log); + va_start(args, msg); + vfprintf(log, msg, args); + va_end(args); + fflush(log); + nTemps = 0; +} + +template <class T> +static LPSTR Wrap(const T& value); + +template <> +static LPSTR Wrap<GUID>(REFGUID guid) +{ + LPSTR cGuid = strTemp[nTemps++]; + sprintf(cGuid, "{%08lX-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX}", + guid.Data1, guid.Data2, guid.Data3, + guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], + guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); + return cGuid; +} + +template <> +static LPSTR Wrap<RECT>(const RECT& rect) +{ + LPSTR cGuid = strTemp[nTemps++]; + sprintf(cGuid, "{L: %d, T: %d, R: %d, B: %d}", + rect.left, rect.top, rect.right, rect.bottom); + return cGuid; +} + +template <> +static LPSTR Wrap<OLECMD>(const OLECMD& cmd) +{ + LPSTR cGuid = strTemp[nTemps++]; + sprintf(cGuid, "{ID: %d, F: %d}", + cmd.cmdID, cmd.cmdf); + return cGuid; +} + +template <> +static LPSTR Wrap<MSG>(const MSG& msg) +{ + LPSTR cGuid = strTemp[nTemps++]; + sprintf(cGuid, "{HWND: %d, Code: %d, W: %p, L: %p, T: %d, P.X: %d, P.Y: %d}", + msg.hwnd, msg.message, msg.wParam, msg.lParam, msg.time, msg.pt.x, msg.pt.y); + return cGuid; +} + +CMenuBand::CMenuBand() +{ + HRESULT hr; + WrapLogOpen(); + + hr = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellMenu, &m_IShellMenu)); + hr = m_IShellMenu->QueryInterface(IID_PPV_ARG(IUnknown, &m_IUnknown)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IDeskBand, &m_IDeskBand)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IDockingWindow, &m_IDockingWindow)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IOleWindow, &m_IOleWindow)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IObjectWithSite, &m_IObjectWithSite)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IInputObject, &m_IInputObject)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IPersistStream, &m_IPersistStream)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IPersist, &m_IPersist)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &m_IOleCommandTarget)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IServiceProvider, &m_IServiceProvider)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_IMenuPopup)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IDeskBar, &m_IDeskBar)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IMenuBand, &m_IMenuBand)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IShellMenu2, &m_IShellMenu2)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_IWinEventHandler)); + hr = m_IUnknown->QueryInterface(IID_PPV_ARG(IShellMenuAcc, &m_IShellMenuAcc)); +} + +CMenuBand::~CMenuBand() +{ + m_IUnknown->Release(); + m_IDeskBand->Release(); + m_IDockingWindow->Release(); + m_IOleWindow->Release(); + m_IObjectWithSite->Release(); + m_IInputObject->Release(); + m_IPersistStream->Release(); + m_IPersist->Release(); + m_IOleCommandTarget->Release(); + m_IServiceProvider->Release(); + m_IMenuPopup->Release(); + m_IDeskBar->Release(); + m_IMenuBand->Release(); + m_IShellMenu2->Release(); + m_IShellMenu->Release(); + m_IWinEventHandler->Release(); + m_IShellMenuAcc->Release(); + WrapLogClose(); +} + + +// *** IShellMenu2 methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::GetSubMenu(THIS) +{ + WrapLogEnter("CMenuBand<%p>::GetSubMenu()\n", this); + HRESULT hr = m_IShellMenu2->GetSubMenu(); + WrapLogExit("CMenuBand::GetSubMenu() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetToolbar(THIS) +{ + WrapLogEnter("CMenuBand<%p>::SetToolbar()\n", this); + HRESULT hr = m_IShellMenu2->SetToolbar(); + WrapLogExit("CMenuBand::SetToolbar() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetMinWidth(THIS) +{ + WrapLogEnter("CMenuBand<%p>::SetMinWidth()\n", this); + HRESULT hr = m_IShellMenu2->SetMinWidth(); + WrapLogExit("CMenuBand::SetMinWidth() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetNoBorder(THIS) +{ + WrapLogEnter("CMenuBand<%p>::SetNoBorder()\n", this); + HRESULT hr = m_IShellMenu2->SetNoBorder(); + WrapLogExit("CMenuBand::SetNoBorder() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetTheme(THIS) +{ + WrapLogEnter("CMenuBand<%p>::SetTheme()\n", this); + HRESULT hr = m_IShellMenu2->SetTheme(); + WrapLogExit("CMenuBand::SetTheme() = %08x\n", hr); + return hr; +} + + +// *** IShellMenuAcc methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::GetTop(THIS) +{ + WrapLogEnter("CMenuBand<%p>::GetTop()\n", this); + HRESULT hr = m_IShellMenuAcc->GetTop(); + WrapLogExit("CMenuBand::GetTop() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetBottom(THIS) +{ + WrapLogEnter("CMenuBand<%p>::GetBottom()\n", this); + HRESULT hr = m_IShellMenuAcc->GetBottom(); + WrapLogExit("CMenuBand::GetBottom() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetTracked(THIS) +{ + WrapLogEnter("CMenuBand<%p>::GetBottom()\n", this); + HRESULT hr = m_IShellMenuAcc->GetBottom(); + WrapLogExit("CMenuBand::GetBottom() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetParentSite(THIS) +{ + WrapLogEnter("CMenuBand<%p>::GetBottom()\n", this); + HRESULT hr = m_IShellMenuAcc->GetBottom(); + WrapLogExit("CMenuBand::GetBottom() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetState(THIS) +{ + WrapLogEnter("CMenuBand<%p>::GetBottom()\n", this); + HRESULT hr = m_IShellMenuAcc->GetBottom(); + WrapLogExit("CMenuBand::GetBottom() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::DoDefaultAction(THIS) +{ + WrapLogEnter("CMenuBand<%p>::GetBottom()\n", this); + HRESULT hr = m_IShellMenuAcc->GetBottom(); + WrapLogExit("CMenuBand::GetBottom() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsEmpty(THIS) +{ + WrapLogEnter("CMenuBand<%p>::GetBottom()\n", this); + HRESULT hr = m_IShellMenuAcc->GetBottom(); + WrapLogExit("CMenuBand::GetBottom() = %08x\n", hr); + return hr; +} + +// *** IDeskBand methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi) +{ + WrapLogEnter("CMenuBand<%p>::GetBandInfo(DWORD dwBandID=%d, DWORD dwViewMode=%d, DESKBANDINFO *pdbi=%p)\n", this, dwBandID, dwViewMode, pdbi); + HRESULT hr = m_IDeskBand->GetBandInfo(dwBandID, dwViewMode, pdbi); + WrapLogExit("CMenuBand::GetBandInfo() = %08x\n", hr); + return hr; +} + +// *** IDockingWindow methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::ShowDW(BOOL fShow) +{ + WrapLogEnter("CMenuBand<%p>::ShowDW(BOOL fShow=%d)\n", this, fShow); + HRESULT hr = m_IDockingWindow->ShowDW(fShow); + WrapLogExit("CMenuBand::ShowDW() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved) +{ + WrapLogEnter("CMenuBand<%p>::CloseDW(DWORD dwReserved=%d)\n", this, dwReserved); + HRESULT hr = m_IDockingWindow->CloseDW(dwReserved); + WrapLogExit("CMenuBand::CloseDW() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) +{ + WrapLogEnter("CMenuBand<%p>::ResizeBorderDW(LPCRECT prcBorder=%p, IUnknown *punkToolbarSite=%p, BOOL fReserved=%d)\n", this, prcBorder, punkToolbarSite, fReserved); + if (prcBorder) WrapLogMsg("*prcBorder=%s\n", Wrap(*prcBorder)); + HRESULT hr = m_IDockingWindow->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved); + if (prcBorder) WrapLogMsg("*prcBorder=%s\n", Wrap(*prcBorder)); + WrapLogExit("CMenuBand::ResizeBorderDW() = %08x\n", hr); + return hr; +} + +// *** IOleWindow methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::GetWindow(HWND *phwnd) +{ + WrapLogEnter("CMenuBand<%p>::GetWindow(HWND *phwnd=%p)\n", this, phwnd); + HRESULT hr = m_IOleWindow->GetWindow(phwnd); + if (phwnd) WrapLogMsg("*phwnd=%p\n", *phwnd); + WrapLogExit("CMenuBand::GetWindow() = %08x\n", hr); + return hr; +} +HRESULT STDMETHODCALLTYPE CMenuBand::ContextSensitiveHelp(BOOL fEnterMode) +{ + WrapLogEnter("CMenuBand<%p>::ContextSensitiveHelp(BOOL fEnterMode=%d)\n", this, fEnterMode); + HRESULT hr = m_IOleWindow->ContextSensitiveHelp(fEnterMode); + WrapLogExit("CMenuBand::ContextSensitiveHelp() = %08x\n", hr); + return hr; +} + +// *** IWinEventHandler methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + //WrapLogEnter("CMenuBand<%p>::OnWinEvent(HWND hWnd=%p, UINT uMsg=%u, WPARAM wParam=%08x, LPARAM lParam=%08x, LRESULT *theResult=%p)\n", this, hWnd, uMsg, wParam, lParam, theResult); + HRESULT hr = m_IWinEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); + //WrapLogExit("CMenuBand::OnWinEvent() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsWindowOwner(HWND hWnd) +{ + //WrapLogEnter("CMenuBand<%p>::IsWindowOwner(HWND hWnd=%08x)\n", this, hWnd); + HRESULT hr = m_IWinEventHandler->IsWindowOwner(hWnd); + //WrapLogExit("CMenuBand::IsWindowOwner() = %08x\n", hr); + return hr; +} + +// *** IObjectWithSite methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::SetSite(IUnknown *pUnkSite) +{ + WrapLogEnter("CMenuBand<%p>::SetSite(IUnknown *pUnkSite=%p)\n", this, pUnkSite); + HRESULT hr = m_IObjectWithSite->SetSite(pUnkSite); + WrapLogExit("CMenuBand::SetSite() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetSite(REFIID riid, PVOID *ppvSite) +{ + WrapLogEnter("CMenuBand<%p>::GetSite(REFIID riid=%s, PVOID *ppvSite=%p)\n", this, Wrap(riid), ppvSite); + HRESULT hr = m_IObjectWithSite->GetSite(riid, ppvSite); + if (ppvSite) WrapLogMsg("*ppvSite=%p\n", *ppvSite); + WrapLogExit("CMenuBand::GetSite() = %08x\n", hr); + return hr; +} + +// *** IInputObject methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) +{ + WrapLogEnter("CMenuBand<%p>::UIActivateIO(BOOL fActivate=%d, LPMSG lpMsg=%p)\n", this, fActivate, lpMsg); + HRESULT hr = m_IInputObject->UIActivateIO(fActivate, lpMsg); + WrapLogExit("CMenuBand::UIActivateIO() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::HasFocusIO() +{ + WrapLogEnter("CMenuBand<%p>::HasFocusIO()\n", this); + HRESULT hr = m_IInputObject->HasFocusIO(); + WrapLogExit("CMenuBand::HasFocusIO() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::TranslateAcceleratorIO(LPMSG lpMsg) +{ + WrapLogEnter("CMenuBand<%p>::TranslateAcceleratorIO(LPMSG lpMsg=%p)\n", this, lpMsg); + if (lpMsg) WrapLogMsg("*lpMsg=%s\n", Wrap(*lpMsg)); + HRESULT hr = m_IInputObject->TranslateAcceleratorIO(lpMsg); + WrapLogExit("CMenuBand::TranslateAcceleratorIO() = %08x\n", hr); + return hr; +} + +// *** IPersistStream methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::IsDirty() +{ + WrapLogEnter("CMenuBand<%p>::IsDirty()\n", this); + HRESULT hr = m_IPersistStream->IsDirty(); + WrapLogExit("CMenuBand::IsDirty() = %08x\n", hr); + return hr; +} +HRESULT STDMETHODCALLTYPE CMenuBand::Load(IStream *pStm) +{ + WrapLogEnter("CMenuBand<%p>::Load(IStream *pStm=%p)\n", this, pStm); + HRESULT hr = m_IPersistStream->Load(pStm); + WrapLogExit("CMenuBand::Load() = %08x\n", hr); + return hr; +} +HRESULT STDMETHODCALLTYPE CMenuBand::Save(IStream *pStm, BOOL fClearDirty) +{ + WrapLogEnter("CMenuBand<%p>::Save(IStream *pStm=%p, BOOL fClearDirty=%d)\n", this, pStm, fClearDirty); + HRESULT hr = m_IPersistStream->Save(pStm, fClearDirty); + WrapLogExit("CMenuBand::Save() = %08x\n", hr); + return hr; +} +HRESULT STDMETHODCALLTYPE CMenuBand::GetSizeMax(ULARGE_INTEGER *pcbSize) +{ + WrapLogEnter("CMenuBand<%p>::GetSizeMax(ULARGE_INTEGER *pcbSize=%p)\n", this, pcbSize); + HRESULT hr = m_IPersistStream->GetSizeMax(pcbSize); + WrapLogExit("CMenuBand::GetSizeMax() = %08x\n", hr); + return hr; +} + +// *** IPersist methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::GetClassID(CLSID *pClassID) +{ + WrapLogEnter("CMenuBand<%p>::GetClassID(CLSID *pClassID=%p)\n", this, pClassID); + HRESULT hr = m_IPersist->GetClassID(pClassID); + if (pClassID) WrapLogMsg("*pClassID=%s\n", Wrap(*pClassID)); + WrapLogExit("CMenuBand::GetClassID() = %08x\n", hr); + return hr; +} + +// *** IOleCommandTarget methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) +{ + WrapLogEnter("CMenuBand<%p>::QueryStatus(const GUID *pguidCmdGroup=%p, ULONG cCmds=%u, prgCmds=%p, pCmdText=%p)\n", this, pguidCmdGroup, cCmds, prgCmds, pCmdText); + HRESULT hr = m_IOleCommandTarget->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); + if (pguidCmdGroup) WrapLogMsg("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup)); + WrapLogExit("CMenuBand::QueryStatus() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + bool b; + + WrapLogEnter("CMenuBand<%p>::Exec(const GUID *pguidCmdGroup=%p, DWORD nCmdID=%d, DWORD nCmdexecopt=%d, VARIANT *pvaIn=%p, VARIANT *pvaOut=%p)\n", this, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + + if (pguidCmdGroup && IsEqualGUID(*pguidCmdGroup, CLSID_MenuBand)) + { + if (nCmdID == 19) // popup + { + b = true; + } + } + + + if (pguidCmdGroup) WrapLogMsg("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup)); + HRESULT hr = m_IOleCommandTarget->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + WrapLogExit("CMenuBand::Exec() = %08x\n", hr); + return hr; +} + +// *** IServiceProvider methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) +{ + WrapLogEnter("CMenuBand<%p>::QueryService(REFGUID guidService=%s, REFIID riid=%s, void **ppvObject=%p)\n", this, Wrap(guidService), Wrap(riid), ppvObject); + + if (IsEqualIID(guidService, SID_SMenuBandChild)) + { + WrapLogMsg("SID is SID_SMenuBandChild. Using QueryInterface of self instead of wrapped object.\n"); + HRESULT hr = this->QueryInterface(riid, ppvObject); + if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject); + WrapLogExit("CMenuBand::QueryService() = %08x\n", hr); + return hr; + } + else + { + WrapLogMsg("SID not identified.\n"); + } + HRESULT hr = m_IServiceProvider->QueryService(guidService, riid, ppvObject); + if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject); + WrapLogExit("CMenuBand::QueryService() = %08x\n", hr); + return hr; +} + + +// *** IMenuPopup methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags) +{ + WrapLogEnter("CMenuBand<%p>::Popup(POINTL *ppt=%p, RECTL *prcExclude=%p, MP_POPUPFLAGS dwFlags=%08x)\n", this, ppt, prcExclude, dwFlags); + HRESULT hr = m_IMenuPopup->Popup(ppt, prcExclude, dwFlags); + WrapLogExit("CMenuBand::Popup() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::OnSelect(DWORD dwSelectType) +{ + WrapLogEnter("CMenuBand<%p>::OnSelect(DWORD dwSelectType=%08x)\n", this, dwSelectType); + HRESULT hr = m_IMenuPopup->OnSelect(dwSelectType); + WrapLogExit("CMenuBand::OnSelect() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetSubMenu(IMenuPopup *pmp, BOOL fSet) +{ + WrapLogEnter("CMenuBand<%p>::SetSubMenu(IMenuPopup *pmp=%p, BOOL fSet=%d)\n", this, pmp, fSet); + HRESULT hr = m_IMenuPopup->SetSubMenu(pmp, fSet); + WrapLogExit("CMenuBand::SetSubMenu() = %08x\n", hr); + return hr; +} + + +// *** IDeskBar methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::SetClient(IUnknown *punkClient) +{ + WrapLogEnter("CMenuBand<%p>::SetClient(IUnknown *punkClient=%p)\n", this, punkClient); + HRESULT hr = m_IDeskBar->SetClient(punkClient); + WrapLogExit("CMenuBand::SetClient() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient) +{ + WrapLogEnter("CMenuBand<%p>::GetClient(IUnknown **ppunkClient=%p)\n", this, ppunkClient); + HRESULT hr = m_IDeskBar->GetClient(ppunkClient); + if (ppunkClient) WrapLogMsg("*ppunkClient=%p\n", *ppunkClient); + WrapLogExit("CMenuBand::GetClient() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::OnPosRectChangeDB(RECT *prc) +{ + WrapLogEnter("CMenuBand<%p>::OnPosRectChangeDB(RECT *prc=%p)\n", this, prc); + HRESULT hr = m_IDeskBar->OnPosRectChangeDB(prc); + if (prc) WrapLogMsg("*prc=%s\n", Wrap(*prc)); + WrapLogExit("CMenuBand::OnPosRectChangeDB() = %08x\n", hr); + return hr; +} + + +// *** IMenuBand methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::IsMenuMessage(MSG *pmsg) +{ + //WrapLogEnter("CMenuBand<%p>::IsMenuMessage(MSG *pmsg=%p)\n", this, pmsg); + HRESULT hr = m_IMenuBand->IsMenuMessage(pmsg); + //WrapLogExit("CMenuBand::IsMenuMessage() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::TranslateMenuMessage(MSG *pmsg, LRESULT *plRet) +{ + //WrapLogEnter("CMenuBand<%p>::TranslateMenuMessage(MSG *pmsg=%p, LRESULT *plRet=%p)\n", this, pmsg, plRet); + HRESULT hr = m_IMenuBand->TranslateMenuMessage(pmsg, plRet); + //WrapLogExit("CMenuBand::TranslateMenuMessage(*plRet=%d) = %08x\n", *plRet, hr); + return hr; +} + +// *** IShellMenu methods *** +HRESULT STDMETHODCALLTYPE CMenuBand::Initialize(IShellMenuCallback *psmc, UINT uId, UINT uIdAncestor, DWORD dwFlags) +{ + WrapLogEnter("CMenuBand<%p>::Initialize(IShellMenuCallback *psmc=%p, UINT uId=%u, UINT uIdAncestor=%u, DWORD dwFlags=%08x)\n", this, psmc, uId, uIdAncestor, dwFlags); + HRESULT hr = m_IShellMenu->Initialize(psmc, uId, uIdAncestor, dwFlags); + WrapLogExit("CMenuBand::Initialize() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetMenuInfo(IShellMenuCallback **ppsmc, UINT *puId, UINT *puIdAncestor, DWORD *pdwFlags) +{ + WrapLogEnter("CMenuBand<%p>::GetMenuInfo(IShellMenuCallback **ppsmc=%p, UINT *puId=%p, UINT *puIdAncestor=%p, DWORD *pdwFlags=%p)\n", this, ppsmc, puId, puIdAncestor, pdwFlags); + HRESULT hr = m_IShellMenu->GetMenuInfo(ppsmc, puId, puIdAncestor, pdwFlags); + if (ppsmc) WrapLogMsg("*ppsmc=%p\n", *ppsmc); + if (puId) WrapLogMsg("*puId=%u\n", *puId); + if (puIdAncestor) WrapLogMsg("*puIdAncestor=%u\n", *puIdAncestor); + if (pdwFlags) WrapLogMsg("*pdwFlags=%08x\n", *pdwFlags); + WrapLogExit("CMenuBand::GetMenuInfo() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags) +{ + WrapLogEnter("CMenuBand<%p>::SetShellFolder(IShellFolder *psf=%p, LPCITEMIDLIST pidlFolder=%p, HKEY hKey=%p, DWORD dwFlags=%08x)\n", this, psf, pidlFolder, hKey, dwFlags); + HRESULT hr = m_IShellMenu->SetShellFolder(psf, pidlFolder, hKey, dwFlags); + WrapLogExit("CMenuBand::SetShellFolder() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv) +{ + WrapLogEnter("CMenuBand<%p>::GetShellFolder(DWORD *pdwFlags=%p, LPITEMIDLIST *ppidl=%p, REFIID riid=%s, void **ppv=%p)\n", this, pdwFlags, ppidl, Wrap(riid), ppv); + HRESULT hr = m_IShellMenu->GetShellFolder(pdwFlags, ppidl, riid, ppv); + if (pdwFlags) WrapLogMsg("*pdwFlags=%08x\n", *pdwFlags); + if (ppidl) WrapLogMsg("*ppidl=%p\n", *ppidl); + if (ppv) WrapLogMsg("*ppv=%p\n", *ppv); + WrapLogExit("CMenuBand::GetShellFolder() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags) +{ + WrapLogEnter("CMenuBand<%p>::SetMenu(HMENU hmenu=%p, HWND hwnd=%p, DWORD dwFlags=%08x)\n", this, hmenu, hwnd, dwFlags); + HRESULT hr = m_IShellMenu->SetMenu(hmenu, hwnd, dwFlags); + WrapLogExit("CMenuBand::SetMenu() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags) +{ + WrapLogEnter("CMenuBand<%p>::GetMenu(HMENU *phmenu=%p, HWND *phwnd=%p, DWORD *pdwFlags=%p)\n", this, phmenu, phwnd, pdwFlags); + HRESULT hr = m_IShellMenu->GetMenu(phmenu, phwnd, pdwFlags); + if (phmenu) WrapLogMsg("*phmenu=%p\n", *phmenu); + if (phwnd) WrapLogMsg("*phwnd=%p\n", *phwnd); + if (pdwFlags) WrapLogMsg("*pdwFlags=%08x\n", *pdwFlags); + WrapLogExit("CMenuBand::GetMenu() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::InvalidateItem(LPSMDATA psmd, DWORD dwFlags) +{ + WrapLogEnter("CMenuBand<%p>::InvalidateItem(LPSMDATA psmd=%p, DWORD dwFlags=%08x)\n", this, psmd, dwFlags); + HRESULT hr = m_IShellMenu->InvalidateItem(psmd, dwFlags); + WrapLogExit("CMenuBand::InvalidateItem() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetState(LPSMDATA psmd) +{ + WrapLogEnter("CMenuBand<%p>::GetState(LPSMDATA psmd=%p)\n", this, psmd); + HRESULT hr = m_IShellMenu->GetState(psmd); + WrapLogExit("CMenuBand::GetState() = %08x\n", hr); + return hr; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetMenuToolbar(IUnknown *punk, DWORD dwFlags) +{ + WrapLogEnter("CMenuBand<%p>::SetMenuToolbar(IUnknown *punk=%p, DWORD dwFlags=%08x)\n", this, punk, dwFlags); + HRESULT hr = m_IShellMenu->SetMenuToolbar(punk, dwFlags); + WrapLogExit("CMenuBand::SetMenuToolbar() = %08x\n", hr); + return hr; +} +#else + +#include <windowsx.h> + +#define TBSTYLE_EX_VERTICAL 4 + +CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand) : + m_menuBand(menuBand), + m_hwnd(NULL), + m_dwMenuFlags(0) +{ +} + +HRESULT CMenuToolbarBase::ShowWindow(BOOL fShow) +{ + ::ShowWindow(m_hwnd, fShow ? SW_SHOW : SW_HIDE); + + HIMAGELIST ilBig, ilSmall; + Shell_GetImageLists(&ilBig, &ilSmall); + + if (m_menuBand->UseBigIcons()) + { + SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, (LPARAM) ilBig); + } + else + { + SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, (LPARAM) ilSmall); + } + + return S_OK; +} + +HRESULT CMenuToolbarBase::Close() +{ + DestroyWindow(m_hwnd); + m_hwnd = NULL; + return S_OK; +} + +HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags) +{ + LONG tbStyles = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | + TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | TBSTYLE_REGISTERDROP | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_CUSTOMERASE | + CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NORESIZE | CCS_TOP; + LONG tbExStyles = TBSTYLE_EX_DOUBLEBUFFER; + + if (dwFlags & SMINIT_VERTICAL) + { + tbStyles |= CCS_VERT; + tbExStyles |= TBSTYLE_EX_VERTICAL; + } + + RECT rc; + + if (!::GetClientRect(hwndParent, &rc) || (rc.left == rc.right) || (rc.top == rc.bottom)) + { + rc.left = 0; + rc.top = 0; + rc.right = 1; + rc.bottom = 1; + } + + HWND hwndToolbar = CreateWindowEx( + tbExStyles, TOOLBARCLASSNAMEW, NULL, + tbStyles, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, + hwndParent, NULL, _AtlBaseModule.GetModuleInstance(), 0); + + if (hwndToolbar == NULL) + return E_FAIL; + + ::SetParent(hwndToolbar, hwndParent); + + m_hwnd = hwndToolbar; + + /* Identify the version of the used Common Controls DLL by sending the size of the TBBUTTON structure */ + SendMessageW(m_hwnd, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + + HIMAGELIST ilBig, ilSmall; + Shell_GetImageLists(&ilBig, &ilSmall); + + //if (dwFlags & SMINIT_TOPLEVEL) + //{ + // /* Hide the placeholders for the button images */ + // SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, 0); + //} + //else + if (m_menuBand->UseBigIcons()) + { + SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, (LPARAM) ilBig); + } + else + { + SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, (LPARAM) ilSmall); + } + + return S_OK; +} + +HRESULT CMenuToolbarBase::GetWindow(HWND *phwnd) +{ + if (!phwnd) + return E_FAIL; + + *phwnd = m_hwnd; + + return S_OK; +} + +BOOL +AllocAndGetMenuString(HMENU hMenu, UINT ItemIDByPosition, WCHAR** String) +{ + int Length; + + Length = GetMenuStringW(hMenu, ItemIDByPosition, NULL, 0, MF_BYPOSITION); + + if (!Length) + return FALSE; + + /* Also allocate space for the terminating NULL character */ + ++Length; + *String = (PWSTR) HeapAlloc(GetProcessHeap(), 0, Length * sizeof(WCHAR)); + + GetMenuStringW(hMenu, ItemIDByPosition, *String, Length, MF_BYPOSITION); + + return TRUE; +} + +CMenuStaticToolbar::CMenuStaticToolbar(CMenuBand *menuBand) : + CMenuToolbarBase(menuBand), + m_hmenu(NULL) +{ +} + +HRESULT CMenuStaticToolbar::GetMenu( + HMENU *phmenu, + HWND *phwnd, + DWORD *pdwFlags) +{ + *phmenu = m_hmenu; + *phwnd = NULL; + *pdwFlags = m_dwMenuFlags; + + return S_OK; +} + +HRESULT CMenuStaticToolbar::SetMenu( + HMENU hmenu, + HWND hwnd, + DWORD dwFlags) +{ + m_hmenu = hmenu; + m_dwMenuFlags = dwFlags; + + return S_OK; +} + +HRESULT CMenuStaticToolbar::FillToolbar() +{ + int i; + PWSTR MenuString; + + int ic = GetMenuItemCount(m_hmenu); + + for (i = 0; i < ic; i++) + { + MENUITEMINFOW info; + TBBUTTON tbb = { 0 }; + tbb.fsState = TBSTATE_ENABLED; + tbb.fsStyle = BTNS_AUTOSIZE; + + info.cbSize = sizeof(info); + info.fMask = MIIM_FTYPE | MIIM_ID; + + GetMenuItemInfoW(m_hmenu, i, TRUE, &info); + + if (info.fType == MFT_STRING) + { + if (!AllocAndGetMenuString(m_hmenu, i, &MenuString)) + return E_OUTOFMEMORY; + tbb.fsStyle |= BTNS_DROPDOWN; + } + else + { + MenuString = L""; + tbb.fsStyle |= BTNS_SEP; + } + + tbb.idCommand = info.wID; + tbb.iString = (INT_PTR) MenuString; + + SMINFO sminfo; + if (info.wID >= 0 && SUCCEEDED(m_menuBand->CallCBWithId(info.wID, SMC_GETINFO, 0, (LPARAM) &sminfo))) + { + tbb.iBitmap = sminfo.iIcon; + } + + SendMessageW(m_hwnd, TB_ADDBUTTONS, 1, (LPARAM) (LPTBBUTTON) &tbb); + HeapFree(GetProcessHeap(), 0, MenuString); + } + + return S_OK; +} + +CMenuSFToolbar::CMenuSFToolbar(CMenuBand * menuBand) : + CMenuToolbarBase(menuBand), + m_shellFolder(NULL) +{ +} + +CMenuSFToolbar::~CMenuSFToolbar() +{ +} + +HRESULT CMenuSFToolbar::FillToolbar() +{ + HRESULT hr; + TBBUTTON tbb = { 0 }; + int i = 0; + PWSTR MenuString; + + tbb.fsState = TBSTATE_ENABLED; + tbb.fsStyle = BTNS_DROPDOWN | BTNS_AUTOSIZE; + + IEnumIDList * eidl; + m_shellFolder->EnumObjects(m_hwnd, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &eidl); + + LPITEMIDLIST item = (LPITEMIDLIST) CoTaskMemAlloc(sizeof(ITEMIDLIST)); + ULONG fetched; + while ((hr = eidl->Next(1, &item, &fetched)) == S_OK) + { + INT index = 0; + INT indexOpen = 0; + + IShellItem *psi; + SHCreateShellItem(NULL, m_shellFolder, item, &psi); + + hr = psi->GetDisplayName(SIGDN_NORMALDISPLAY, &MenuString); + if (FAILED(hr)) + return hr; + + index = SHMapPIDLToSystemImageListIndex(m_shellFolder, item, &indexOpen); + + tbb.idCommand = i++; + tbb.iString = (INT_PTR) MenuString; + tbb.iBitmap = index; + + SendMessageW(m_hwnd, TB_ADDBUTTONS, 1, (LPARAM) (LPTBBUTTON) &tbb); + HeapFree(GetProcessHeap(), 0, MenuString); + + } + CoTaskMemFree(item); + + return hr; +} + +HRESULT CMenuSFToolbar::SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags) +{ + m_shellFolder = psf; + m_idList = pidlFolder; + m_hKey = hKey; + m_dwMenuFlags = dwFlags; + return S_OK; +} + +HRESULT CMenuSFToolbar::GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv) +{ + HRESULT hr; + + hr = m_shellFolder->QueryInterface(riid, ppv); + if (FAILED(hr)) + return hr; + + if (pdwFlags) + *pdwFlags = m_dwMenuFlags; + + if (ppidl) + { + LPITEMIDLIST pidl = NULL; + + if (m_idList) + { + pidl = ILClone(m_idList); + if (!pidl) + { + (*(IUnknown**) ppv)->Release(); + return E_FAIL; + } + } + + *ppidl = pidl; + } + + return hr; +} + +CMenuBand::CMenuBand() : + m_site(NULL), + m_psmc(NULL), + m_staticToolbar(NULL), + m_SFToolbar(NULL), + m_useBigIcons(FALSE) +{ +} + +CMenuBand::~CMenuBand() +{ + if (m_site) + m_site->Release(); + + if (m_psmc) + m_psmc->Release(); + + if (m_staticToolbar) + delete m_staticToolbar; + + if (m_SFToolbar) + delete m_SFToolbar; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Initialize( + IShellMenuCallback *psmc, + UINT uId, + UINT uIdAncestor, + DWORD dwFlags) +{ + if (m_psmc) + m_psmc->Release(); + + m_psmc = psmc; + m_uId = uId; + m_uIdAncestor = uIdAncestor; + m_dwFlags = dwFlags; + + if (m_psmc) + { + m_psmc->AddRef(); + + _CallCB(SMC_CREATE, 0, (LPARAM) &m_UserData); + } + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetMenuInfo( + IShellMenuCallback **ppsmc, + UINT *puId, + UINT *puIdAncestor, + DWORD *pdwFlags) +{ + if (!pdwFlags) // maybe? + return E_INVALIDARG; + + if (ppsmc) + *ppsmc = m_psmc; + + if (puId) + *puId = m_uId; + + if (puIdAncestor) + *puIdAncestor = m_uIdAncestor; + + *pdwFlags = m_dwFlags; + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetMenu( + HMENU hmenu, + HWND hwnd, + DWORD dwFlags) +{ + if (m_staticToolbar == NULL) + { + m_staticToolbar = new CMenuStaticToolbar(this); + } + m_hmenu = hmenu; + + HRESULT hResult = m_staticToolbar->SetMenu(hmenu, hwnd, dwFlags); + if (FAILED(hResult)) + return hResult; + + if (m_site) + { + HWND hwndParent; + + hResult = m_site->GetWindow(&hwndParent); + if (FAILED(hResult)) + return hResult; + + hResult = m_staticToolbar->CreateToolbar(hwndParent, m_dwFlags); + if (FAILED(hResult)) + return hResult; + + hResult = m_staticToolbar->FillToolbar(); + } + + return hResult; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetMenu( + HMENU *phmenu, + HWND *phwnd, + DWORD *pdwFlags) +{ + if (m_staticToolbar == NULL) + return E_FAIL; + + return m_staticToolbar->GetMenu(phmenu, phwnd, pdwFlags); +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetSite(IUnknown *pUnkSite) +{ + HWND hwndParent; + HRESULT hResult; + + if (m_site != NULL) + m_site->Release(); + + if (pUnkSite == NULL) + return S_OK; + + hwndParent = NULL; + hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &m_site)); + if (SUCCEEDED(hResult)) + { + m_site->GetWindow(&hwndParent); + m_site->Release(); + } + if (!::IsWindow(hwndParent)) + return E_FAIL; + + if (m_staticToolbar != NULL) + { + hResult = m_staticToolbar->CreateToolbar(hwndParent, m_dwFlags); + if (FAILED(hResult)) + return hResult; + + hResult = m_staticToolbar->FillToolbar(); + } + + if (m_SFToolbar != NULL) + { + hResult = m_SFToolbar->CreateToolbar(hwndParent, m_dwFlags); + if (FAILED(hResult)) + return hResult; + + hResult = m_SFToolbar->FillToolbar(); + } + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetSite(REFIID riid, PVOID *ppvSite) +{ + if (m_site == NULL) + return E_FAIL; + + return m_site->QueryInterface(riid, ppvSite); +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetWindow( + HWND *phwnd) +{ + if (m_SFToolbar != NULL) + return m_SFToolbar->GetWindow(phwnd); + + if (m_staticToolbar != NULL) + return m_staticToolbar->GetWindow(phwnd); + + return E_FAIL; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::OnPosRectChangeDB(RECT *prc) +{ + SIZE sizeStaticX = { 0 }; + SIZE sizeShlFldX = { 0 }; + SIZE sizeStaticY = { 0 }; + SIZE sizeShlFldY = { 0 }; + HWND hwndStatic = NULL; + HWND hwndShlFld = NULL; + HRESULT hResult = S_OK; + + if (m_staticToolbar != NULL) + hResult = m_staticToolbar->GetWindow(&hwndStatic); + if (FAILED(hResult)) + return hResult; + + if (m_SFToolbar != NULL) + hResult = m_SFToolbar->GetWindow(&hwndShlFld); + if (FAILED(hResult)) + return hResult; + + if (hwndStatic == NULL && hwndShlFld == NULL) + return E_FAIL; + + if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, (LPARAM) &sizeStaticY); + if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, (LPARAM) &sizeShlFldY); + if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, FALSE, (LPARAM) &sizeStaticX); + if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, FALSE, (LPARAM) &sizeShlFldX); + + int sy = max(prc->bottom - prc->top, sizeStaticY.cy + sizeShlFldY.cy); + + if (hwndShlFld) SetWindowPos(hwndShlFld, NULL, + prc->left, + prc->top, + prc->right - prc->left, + sizeShlFldY.cy, + 0); + if (hwndStatic) SetWindowPos(hwndStatic, hwndShlFld, + prc->left, + prc->top + sizeShlFldY.cy, + prc->right - prc->left, + sy - sizeShlFldY.cy, + 0); + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetBandInfo( + DWORD dwBandID, + DWORD dwViewMode, + DESKBANDINFO *pdbi) +{ + HWND hwndStatic = NULL; + HWND hwndShlFld = NULL; + HRESULT hResult = S_OK; + + if (m_staticToolbar != NULL) + hResult = m_staticToolbar->GetWindow(&hwndStatic); + if (FAILED(hResult)) + return hResult; + + if (m_SFToolbar != NULL) + hResult = m_SFToolbar->GetWindow(&hwndShlFld); + if (FAILED(hResult)) + return hResult; + + if (hwndStatic == NULL && hwndShlFld == NULL) + return E_FAIL; + + // HACK (?) + if (pdbi->dwMask == 0) + { + pdbi->dwMask = DBIM_MINSIZE | DBIM_MAXSIZE | DBIM_INTEGRAL | DBIM_ACTUAL | DBIM_TITLE | DBIM_MODEFLAGS | DBIM_BKCOLOR; + } + + if (pdbi->dwMask & DBIM_MINSIZE) + { + SIZE sizeStatic = { 0 }; + SIZE sizeShlFld = { 0 }; + + if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, (LPARAM) &sizeStatic); + if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, (LPARAM) &sizeShlFld); + + pdbi->ptMinSize.x = 0; + pdbi->ptMinSize.y = sizeStatic.cy + sizeShlFld.cy; + } + if (pdbi->dwMask & DBIM_MAXSIZE) + { + SIZE sizeStatic = { 0 }; + SIZE sizeShlFld = { 0 }; + + if (hwndStatic) SendMessageW(hwndStatic, TB_GETMAXSIZE, 0, (LPARAM) &sizeStatic); + if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETMAXSIZE, 0, (LPARAM) &sizeShlFld); + + pdbi->ptMaxSize.x = sizeStatic.cx + sizeShlFld.cx; // ignored + pdbi->ptMaxSize.y = sizeStatic.cy + sizeShlFld.cy; + } + if (pdbi->dwMask & DBIM_INTEGRAL) + { + pdbi->ptIntegral.x = 0; + pdbi->ptIntegral.y = 0; + } + if (pdbi->dwMask & DBIM_ACTUAL) + { + SIZE sizeStatic = { 0 }; + SIZE sizeShlFld = { 0 }; + + if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, FALSE, (LPARAM) &sizeStatic); + if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, FALSE, (LPARAM) &sizeShlFld); + pdbi->ptActual.x = sizeStatic.cx + sizeShlFld.cx; + + if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, (LPARAM) &sizeStatic); + if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, (LPARAM) &sizeShlFld); + pdbi->ptActual.y = sizeStatic.cy + sizeShlFld.cy; + } + if (pdbi->dwMask & DBIM_TITLE) + wcscpy(pdbi->wszTitle, L""); + if (pdbi->dwMask & DBIM_MODEFLAGS) + pdbi->dwModeFlags = DBIMF_UNDELETEABLE; + if (pdbi->dwMask & DBIM_BKCOLOR) + pdbi->crBkgnd = 0; + return S_OK; +} + +/* IDockingWindow */ +HRESULT STDMETHODCALLTYPE CMenuBand::ShowDW(BOOL fShow) +{ + HRESULT hr = S_OK; + + if (m_staticToolbar != NULL) + hr = m_staticToolbar->ShowWindow(fShow); + if (FAILED(hr)) + return hr; + if (m_SFToolbar != NULL) + hr = m_SFToolbar->ShowWindow(fShow); + if (FAILED(hr)) + return hr; + + if (fShow) + return _CallCB(SMC_INITMENU, 0, 0); + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved) +{ + ShowDW(FALSE); + + if (m_staticToolbar != NULL) + return m_staticToolbar->Close(); + + if (m_SFToolbar != NULL) + return m_SFToolbar->Close(); + + return S_OK; +} +HRESULT STDMETHODCALLTYPE CMenuBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::ContextSensitiveHelp(BOOL fEnterMode) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::HasFocusIO() +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::TranslateAcceleratorIO(LPMSG lpMsg) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsDirty() +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Load(IStream *pStm) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Save(IStream *pStm, BOOL fClearDirty) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetSizeMax(ULARGE_INTEGER *pcbSize) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetClassID(CLSID *pClassID) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + if (!pguidCmdGroup) + return E_FAIL; + + if (IsEqualGUID(*pguidCmdGroup, CLSID_MenuBand)) + { + if (nCmdID == 16) // set (big) icon size + { + this->m_useBigIcons = TRUE; + return S_OK; + } + else if (nCmdID == 19) // popup-related + { + return S_FALSE; + } + } + + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) +{ + if (IsEqualIID(guidService, SID_SMenuBandChild)) + return this->QueryInterface(riid, ppvObject); + WARN("Unknown service requested %s\n", wine_dbgstr_guid(&guidService)); + return E_NOINTERFACE; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::OnSelect(DWORD dwSelectType) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetSubMenu(IMenuPopup *pmp, BOOL fSet) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetClient(IUnknown *punkClient) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsMenuMessage(MSG *pmsg) +{ + //UNIMPLEMENTED; + //return S_OK; + return S_FALSE; + //return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::TranslateMenuMessage(MSG *pmsg, LRESULT *plRet) +{ + //UNIMPLEMENTED; + return S_FALSE; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags) +{ + if (m_SFToolbar == NULL) + { + m_SFToolbar = new CMenuSFToolbar(this); + } + + HRESULT hResult = m_SFToolbar->SetShellFolder(psf, pidlFolder, hKey, dwFlags); + if (FAILED(hResult)) + return hResult; + + if (m_site) + { + HWND hwndParent; + + hResult = m_site->GetWindow(&hwndParent); + if (FAILED(hResult)) + return hResult; + + hResult = m_SFToolbar->CreateToolbar(hwndParent, m_dwFlags); + if (FAILED(hResult)) + return hResult; + + hResult = m_SFToolbar->FillToolbar(); + } + + return hResult; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv) +{ + if (m_SFToolbar) + return m_SFToolbar->GetShellFolder(pdwFlags, ppidl, riid, ppv); + return E_FAIL; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::InvalidateItem(LPSMDATA psmd, DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetState(LPSMDATA psmd) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetMenuToolbar(IUnknown *punk, DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsWindowOwner(HWND hWnd) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetSubMenu(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetToolbar(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetMinWidth(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetNoBorder(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetTheme(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetTop(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetBottom(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetTracked(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetParentSite(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetState(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::DoDefaultAction(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsEmpty(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT CMenuBand::CallCBWithId(UINT Id, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (!m_psmc) + return S_FALSE; + + HWND hwnd; + GetWindow(&hwnd); + + SMDATA smData = { 0 }; + smData.punk = (IShellMenu2*)this; + smData.uId = Id; + smData.uIdParent = m_uId; + smData.uIdAncestor = m_uIdAncestor; + smData.hwnd = hwnd; + if (m_staticToolbar) + { + smData.hmenu = m_hmenu; + } + smData.pvUserData = NULL; + if (m_SFToolbar) + m_SFToolbar->GetShellFolder(NULL, &smData.pidlFolder, IID_PPV_ARG(IShellFolder, &smData.psf)); + HRESULT hr = m_psmc->CallbackSM(&smData, uMsg, wParam, lParam); + ILFree(smData.pidlFolder); + if (smData.psf) + smData.psf->Release(); + return hr; +} + +HRESULT CMenuBand::_CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (!m_psmc) + return S_FALSE; + + HWND hwnd; + GetWindow(&hwnd); + + SMDATA smData = { 0 }; + smData.punk = (IShellMenu2*)this; + smData.uIdParent = m_uId; + smData.uIdAncestor = m_uIdAncestor; + smData.hwnd = hwnd; + if (m_staticToolbar) + { + smData.hmenu = m_hmenu; + } + smData.pvUserData = NULL; + if (m_SFToolbar) + m_SFToolbar->GetShellFolder(NULL, &smData.pidlFolder, IID_PPV_ARG(IShellFolder, &smData.psf)); + HRESULT hr = m_psmc->CallbackSM(&smData, uMsg, wParam, lParam); + ILFree(smData.pidlFolder); + if (smData.psf) + smData.psf->Release(); + return hr; +} + +#endif Propchange: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Wed Feb 12 16:48:36 2014 @@ -259,14 +259,18 @@ IShellFolder *shellFolder; IShellFolder *psfStartMenu; +#if 0 hr = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellMenu, &pShellMenu)); - if (FAILED(hr)) - return NULL; - -#if 0 +#else + hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); +#endif + if (FAILED(hr)) + return NULL; + +#if 1 hr = CoCreateInstance(CLSID_MenuBandSite, NULL, CLSCTX_INPROC_SERVER, Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Wed Feb 12 16:48:36 2014 @@ -30,4 +30,5 @@ #define SMC_EXEC 4 extern "C" INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT bSimulateDoc); -extern "C" HRESULT CMenuSite_Constructor(REFIID riid, LPVOID *ppv); +extern "C" HRESULT CMenuSite_Constructor(REFIID riid, LPVOID *ppv); +extern "C" HRESULT CMenuBand_Constructor(REFIID riid, LPVOID *ppv); Modified: branches/shell-experiments/lib/atl/atlwin.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/atl/atlwi… ============================================================================== --- branches/shell-experiments/lib/atl/atlwin.h [iso-8859-1] (original) +++ branches/shell-experiments/lib/atl/atlwin.h [iso-8859-1] Wed Feb 12 16:48:36 2014 @@ -164,7 +164,7 @@ ~CWndProcThunk() { - VirtualFree(m_pthunk, sizeof(thunkCode), MEM_RELEASE); + VirtualFree(m_pthunk, 0, MEM_RELEASE); } BOOL Init(WNDPROC proc, void *pThis)

10 years, 7 months

← Newer
1
...
20
21
22
23
24
25
26
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2014