Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 62264: [kernel32] don't set LastError in VerifyConsoleIoHandle
by cwittich＠svn.reactos.org 20 Feb '14

20 Feb '14

Author: cwittich Date: Thu Feb 20 19:15:54 2014 New Revision: 62264 URL: http://svn.reactos.org/svn/reactos?rev=62264&view=rev Log: [kernel32] don't set LastError in VerifyConsoleIoHandle Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] Thu Feb 20 19:15:54 2014 @@ -796,7 +796,6 @@ sizeof(CONSOLE_VERIFYHANDLE)); if (!NT_SUCCESS(Status)) { - BaseSetLastNTError(Status); return FALSE; }

1 0

[dquintana] 62263: [RSHELL] * Improve the layout of the class definitions to make the important details easier to find. * Rename private (non-COM) class methods to more appropriate names, including...
by dquintana＠svn.reactos.org 20 Feb '14

20 Feb '14

Author: dquintana Date: Thu Feb 20 16:18:49 2014 New Revision: 62263 URL: http://svn.reactos.org/svn/reactos?rev=62263&view=rev Log: [RSHELL] * Improve the layout of the class definitions to make the important details easier to find. * Rename private (non-COM) class methods to more appropriate names, including a prefix. * CMenuBand: Make one submenu close before showing another one. This may not be happening in the same exact way windows does it. CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuSite.cpp branches/shell-experiments/base/shell/rshell/precomp.h Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Thu Feb 20 16:18:49 2014 @@ -21,9 +21,9 @@ #include <windowsx.h> #include <shlwapi_undoc.h> +#define TBSTYLE_EX_VERTICAL 4 + WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); - -#define TBSTYLE_EX_VERTICAL 4 #define TIMERID_HOTTRACK 1 #define SUBCLASS_ID_MENUBAND 1 @@ -35,47 +35,49 @@ class CMenuToolbarBase { +protected: + CMenuBand * m_menuBand; + HWND m_hwnd; + DWORD m_dwMenuFlags; + INT m_hotItem; + WNDPROC m_SubclassOld; + +private: + static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + public: CMenuToolbarBase(CMenuBand *menuBand); virtual ~CMenuToolbarBase() {} + HRESULT IsWindowOwner(HWND hwnd); HRESULT CreateToolbar(HWND hwndParent, DWORD dwFlags); HRESULT GetWindow(HWND *phwnd); HRESULT ShowWindow(BOOL fShow); HRESULT Close(); - BOOL IsWindowOwner(HWND hwnd) { return m_hwnd && m_hwnd == hwnd; } - virtual HRESULT FillToolbar() = 0; virtual HRESULT PopupItem(UINT uItem) = 0; virtual HRESULT HasSubMenu(UINT uItem) = 0; + virtual HRESULT OnContextMenu(NMMOUSE * rclick) = 0; virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); - virtual HRESULT OnContextMenu(NMMOUSE * rclick) = 0; - - HRESULT OnHotItemChange(const NMTBHOTITEM * hot); HRESULT PopupSubMenu(UINT index, IShellMenu* childShellMenu); HRESULT PopupSubMenu(UINT index, HMENU menu); HRESULT DoContextMenu(IContextMenu* contextMenu); - HRESULT ChildTrack(DWORD dwSelectType); - - static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + HRESULT ChangeHotItem(DWORD changeType); + HRESULT OnHotItemChange(const NMTBHOTITEM * hot); + protected: - - static const UINT WM_USER_SHOWPOPUPMENU = WM_USER + 1; - LRESULT CALLBACK SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - - CMenuBand *m_menuBand; - HWND m_hwnd; - DWORD m_dwMenuFlags; - INT m_hotItem; - WNDPROC m_SubclassOld; }; -class CMenuStaticToolbar : public CMenuToolbarBase -{ +class CMenuStaticToolbar : + public CMenuToolbarBase +{ +private: + HMENU m_hmenu; + public: CMenuStaticToolbar(CMenuBand *menuBand); virtual ~CMenuStaticToolbar() {} @@ -89,12 +91,16 @@ virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); virtual HRESULT OnContextMenu(NMMOUSE * rclick); +}; + +class CMenuSFToolbar : + public CMenuToolbarBase +{ private: - HMENU m_hmenu; -}; - -class CMenuSFToolbar : public CMenuToolbarBase -{ + IShellFolder * m_shellFolder; + LPCITEMIDLIST m_idList; + HKEY m_hKey; + public: CMenuSFToolbar(CMenuBand *menuBand); virtual ~CMenuSFToolbar(); @@ -109,11 +115,7 @@ virtual HRESULT OnContextMenu(NMMOUSE * rclick); private: - LPITEMIDLIST GetPidlFromId(UINT uItem, INT* pIndex); - - IShellFolder * m_shellFolder; - LPCITEMIDLIST m_idList; - HKEY m_hKey; + LPITEMIDLIST GetPidlFromId(UINT uItem, INT* pIndex = NULL); }; class CMenuBand : @@ -131,127 +133,31 @@ public IWinEventHandler, public IShellMenuAcc { +private: + CMenuFocusManager * m_focusManager; + CMenuStaticToolbar * m_staticToolbar; + CMenuSFToolbar * m_SFToolbar; + + CComPtr<IOleWindow> m_site; + CComPtr<IShellMenuCallback> m_psmc; + CComPtr<IMenuPopup> m_childMenu; + + UINT m_uId; + UINT m_uIdAncestor; + DWORD m_dwFlags; + PVOID m_UserData; + HMENU m_hmenu; + HWND m_menuOwner; + + BOOL m_useBigIcons; + HWND m_topLevelWindow; + + CMenuToolbarBase * m_hotBar; + INT m_hotItem; + public: CMenuBand(); ~CMenuBand(); - -private: - 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; - HWND m_menuOwner; - - BOOL m_useBigIcons; - - HWND m_topLevelWindow; - - CMenuFocusManager * m_focusManager; - - CMenuToolbarBase * m_hotBar; - INT m_hotItem; - -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); - HRESULT CallCBWithPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam); - HRESULT TrackPopup(HMENU popup, INT x, INT y); - HRESULT GetTopLevelWindow(HWND*topLevel); - HRESULT OnHotItemChanged(CMenuToolbarBase * tb, INT id); - HRESULT ChildTrack(DWORD reason); - - BOOL UseBigIcons() { - return m_useBigIcons; - } DECLARE_NOT_AGGREGATABLE(CMenuBand) DECLARE_PROTECT_FINAL_CONSTRUCT() @@ -275,6 +181,101 @@ COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc) END_COM_MAP() + // *** 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 _CallCBWithItemId(UINT Id, UINT uMsg, WPARAM wParam, LPARAM lParam); + HRESULT _CallCBWithItemPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam); + HRESULT _TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y); + HRESULT _GetTopLevelWindow(HWND*topLevel); + HRESULT _OnHotItemChanged(CMenuToolbarBase * tb, INT id); + HRESULT _MenuItemHotTrack(DWORD changeType); + HRESULT _OnPopupSubMenu(IMenuPopup * popup); + + BOOL UseBigIcons() + { + return m_useBigIcons; + } + private: HRESULT _CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam, UINT id = 0, LPITEMIDLIST pidl = NULL); }; @@ -425,19 +426,19 @@ case VK_MENU: case VK_LMENU: case VK_RMENU: - m_currentBand->ChildTrack(MPOS_FULLCANCEL); + m_currentBand->_MenuItemHotTrack(MPOS_FULLCANCEL); break; case VK_LEFT: - m_currentBand->ChildTrack(MPOS_SELECTLEFT); + m_currentBand->_MenuItemHotTrack(MPOS_SELECTLEFT); break; case VK_RIGHT: - m_currentBand->ChildTrack(MPOS_SELECTRIGHT); + m_currentBand->_MenuItemHotTrack(MPOS_SELECTRIGHT); break; case VK_UP: - m_currentBand->ChildTrack(VK_UP); + m_currentBand->_MenuItemHotTrack(VK_UP); break; case VK_DOWN: - m_currentBand->ChildTrack(VK_DOWN); + m_currentBand->_MenuItemHotTrack(VK_DOWN); break; } break; @@ -488,7 +489,7 @@ } HWND newFocus; - hr = newBand->GetTopLevelWindow(&newFocus); + hr = newBand->_GetTopLevelWindow(&newFocus); if (FAILED(hr)) return hr; @@ -557,6 +558,11 @@ m_hwnd(NULL), m_dwMenuFlags(0) { +} + +HRESULT CMenuToolbarBase::IsWindowOwner(HWND hwnd) +{ + return (m_hwnd && m_hwnd == hwnd) ? S_OK : S_FALSE; } HRESULT CMenuToolbarBase::ShowWindow(BOOL fShow) @@ -670,6 +676,7 @@ case WM_TIMER: if (wParam == TIMERID_HOTTRACK) { + m_menuBand->_OnPopupSubMenu(NULL); PopupItem(m_hotItem); KillTimer(hWnd, TIMERID_HOTTRACK); } @@ -684,8 +691,8 @@ { KillTimer(m_hwnd, TIMERID_HOTTRACK); m_hotItem = -1; - m_menuBand->OnHotItemChanged(NULL, -1); - m_menuBand->ChildTrack(MPOS_CHILDTRACKING); + m_menuBand->_OnHotItemChanged(NULL, -1); + m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING); } else if (m_hotItem != hot->idNew) { @@ -693,14 +700,12 @@ { DWORD elapsed = 0; SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0); - - SetTimer(m_hwnd, TIMERID_HOTTRACK, elapsed, NULL); } m_hotItem = hot->idNew; - m_menuBand->OnHotItemChanged(this, m_hotItem); - m_menuBand->ChildTrack(MPOS_CHILDTRACKING); + m_menuBand->_OnHotItemChanged(this, m_hotItem); + m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING); } return S_OK; } @@ -773,6 +778,8 @@ popup->Popup(&pt, &rcl, MPPF_TOP | MPPF_RIGHT); + m_menuBand->_OnPopupSubMenu(popup); + return S_OK; } @@ -789,7 +796,7 @@ HMENU popup = GetSubMenu(menu, index); - m_menuBand->TrackPopup(popup, b.x, b.y); + m_menuBand->_TrackSubMenuUsingTrackPopupMenu(popup, b.x, b.y); return S_OK; } @@ -826,12 +833,12 @@ HRESULT CMenuToolbarBase::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - m_menuBand->OnSelect(MPOS_EXECUTE); - return S_OK; -} - - -HRESULT CMenuToolbarBase::ChildTrack(DWORD dwSelectType) + theResult = 0; + return m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE); +} + + +HRESULT CMenuToolbarBase::ChangeHotItem(DWORD dwSelectType) { int prev = SendMessage(m_hwnd, TB_GETHOTITEM, 0, 0); int index = -1; @@ -894,7 +901,7 @@ if (prev != index) { SendMessage(m_hwnd, TB_SETHOTITEM, index, 0); - return m_menuBand->OnHotItemChanged(this, m_hotItem); + return m_menuBand->_OnHotItemChanged(this, m_hotItem); } return S_OK; } @@ -914,7 +921,7 @@ if (prev != index) { SendMessage(m_hwnd, TB_SETHOTITEM, -1, 0); - m_menuBand->OnHotItemChanged(NULL, -1); + m_menuBand->_OnHotItemChanged(NULL, -1); } return S_FALSE; } @@ -997,7 +1004,7 @@ SMINFO * sminfo = new SMINFO(); sminfo->dwMask = SMIM_ICON | SMIM_FLAGS; - if (SUCCEEDED(m_menuBand->CallCBWithId(info.wID, SMC_GETINFO, 0, reinterpret_cast<LPARAM>(sminfo)))) + if (SUCCEEDED(m_menuBand->_CallCBWithItemId(info.wID, SMC_GETINFO, 0, reinterpret_cast<LPARAM>(sminfo)))) { tbb.iBitmap = sminfo->iIcon; tbb.dwData = reinterpret_cast<DWORD_PTR>(sminfo); @@ -1021,7 +1028,7 @@ HRESULT CMenuStaticToolbar::OnContextMenu(NMMOUSE * rclick) { CComPtr<IContextMenu> contextMenu; - HRESULT hr = m_menuBand->CallCBWithId(rclick->dwItemSpec, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IContextMenu), reinterpret_cast<LPARAM>(&contextMenu)); + HRESULT hr = m_menuBand->_CallCBWithItemId(rclick->dwItemSpec, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IContextMenu), reinterpret_cast<LPARAM>(&contextMenu)); if (hr != S_OK) return hr; @@ -1030,7 +1037,7 @@ HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - HRESULT hr = m_menuBand->CallCBWithId(wParam, SMC_EXEC, 0, 0); + HRESULT hr = m_menuBand->_CallCBWithItemId(wParam, SMC_EXEC, 0, 0); if (FAILED(hr)) return hr; @@ -1045,7 +1052,7 @@ int index = SendMessage(m_hwnd, TB_GETBUTTONINFO, uItem, reinterpret_cast<LPARAM>(&info)); if (index < 0) return E_FAIL; - + TBBUTTON btn = { 0 }; SendMessage(m_hwnd, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn)); @@ -1060,7 +1067,7 @@ else { CComPtr<IShellMenu> shellMenu; - HRESULT hr = m_menuBand->CallCBWithId(uItem, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IShellMenu), reinterpret_cast<LPARAM>(&shellMenu)); + HRESULT hr = m_menuBand->_CallCBWithItemId(uItem, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IShellMenu), reinterpret_cast<LPARAM>(&shellMenu)); if (FAILED(hr)) return hr; @@ -1215,7 +1222,9 @@ HRESULT CMenuSFToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - return m_menuBand->CallCBWithPidl(GetPidlFromId(wParam, NULL), SMC_SFEXEC, 0, 0); + HRESULT hr = m_menuBand->_CallCBWithItemPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0); + + return CMenuToolbarBase::OnCommand(wParam, lParam, theResult); } HRESULT CMenuSFToolbar::PopupItem(UINT uItem) @@ -1227,7 +1236,7 @@ int index; CComPtr<IShellMenuCallback> psmc; CComPtr<IShellMenu> shellMenu; - + LPITEMIDLIST pidl = GetPidlFromId(uItem, &index); if (!pidl) @@ -1272,7 +1281,7 @@ { HRESULT hr; CComPtr<IShellItem> psi; - SHCreateShellItem(NULL, m_shellFolder, GetPidlFromId(uItem, NULL), &psi); + SHCreateShellItem(NULL, m_shellFolder, GetPidlFromId(uItem), &psi); SFGAOF attrs; hr = psi->GetAttributes(SFGAO_FOLDER, &attrs); @@ -1289,7 +1298,8 @@ m_SFToolbar(NULL), m_useBigIcons(FALSE), m_hotBar(NULL), - m_hotItem(-1) + m_hotItem(-1), + m_childMenu(NULL) { m_focusManager = CMenuFocusManager::AcquireManager(); } @@ -1297,12 +1307,6 @@ CMenuBand::~CMenuBand() { CMenuFocusManager::ReleaseManager(m_focusManager); - - if (m_site) - m_site->Release(); - - if (m_psmc) - m_psmc->Release(); if (m_staticToolbar) delete m_staticToolbar; @@ -1317,9 +1321,6 @@ UINT uIdAncestor, DWORD dwFlags) { - if (m_psmc) - m_psmc->Release(); - m_psmc = psmc; m_uId = uId; m_uIdAncestor = uIdAncestor; @@ -1327,8 +1328,6 @@ if (m_psmc) { - m_psmc->AddRef(); - _CallCB(SMC_CREATE, 0, reinterpret_cast<LPARAM>(&m_UserData)); } @@ -1408,22 +1407,19 @@ HWND hwndParent; HRESULT hr; - if (m_site != NULL) - m_site->Release(); + m_site = NULL; if (pUnkSite == NULL) return S_OK; hwndParent = NULL; hr = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &m_site)); - if (SUCCEEDED(hr)) - { - m_site->Release(); - - hr = m_site->GetWindow(&hwndParent); - if (FAILED(hr)) - return hr; - } + if (FAILED(hr)) + return hr; + + hr = m_site->GetWindow(&hwndParent); + if (FAILED(hr)) + return hr; if (!::IsWindow(hwndParent)) return E_FAIL; @@ -1765,7 +1761,7 @@ HRESULT STDMETHODCALLTYPE CMenuBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) { if (IsEqualIID(guidService, SID_SMenuBandChild) || - IsEqualIID(guidService, SID_SMenuBandBottom) || + IsEqualIID(guidService, SID_SMenuBandBottom) || IsEqualIID(guidService, SID_SMenuBandBottomSelected)) return this->QueryInterface(riid, ppvObject); WARN("Unknown service requested %s\n", wine_dbgstr_guid(&guidService)); @@ -1780,7 +1776,19 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnSelect(DWORD dwSelectType) { - return S_OK; + if (dwSelectType != MPOS_CANCELLEVEL) + { + if (dwSelectType == MPOS_SELECTLEFT) + { + dwSelectType = MPOS_CANCELLEVEL; + } + CComPtr<IMenuPopup> pmp; + HRESULT hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); + if (FAILED(hr)) + return hr; + return pmp->OnSelect(dwSelectType); + } + return S_FALSE; } HRESULT STDMETHODCALLTYPE CMenuBand::SetSubMenu(IMenuPopup *pmp, BOOL fSet) @@ -1876,12 +1884,12 @@ { case WM_COMMAND: - if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK) { return m_staticToolbar->OnCommand(wParam, lParam, theResult); } - if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd)) + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK) { return m_SFToolbar->OnCommand(wParam, lParam, theResult); } @@ -1898,12 +1906,12 @@ case TBN_HOTITEMCHANGE: hot = reinterpret_cast<LPNMTBHOTITEM>(hdr); - if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK) { return m_staticToolbar->OnHotItemChange(hot); } - if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd)) + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK) { return m_SFToolbar->OnHotItemChange(hot); } @@ -1913,12 +1921,12 @@ case NM_RCLICK: rclick = reinterpret_cast<LPNMMOUSE>(hdr); - if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK) { return m_staticToolbar->OnContextMenu(rclick); } - if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd)) + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK) { return m_SFToolbar->OnContextMenu(rclick); } @@ -1971,10 +1979,10 @@ HRESULT STDMETHODCALLTYPE CMenuBand::IsWindowOwner(HWND hWnd) { - if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK) return S_OK; - if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd)) + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK) return S_OK; return S_FALSE; @@ -2052,12 +2060,12 @@ return S_OK; } -HRESULT CMenuBand::CallCBWithId(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam) +HRESULT CMenuBand::_CallCBWithItemId(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam) { return _CallCB(uMsg, wParam, lParam, id); } -HRESULT CMenuBand::CallCBWithPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam) +HRESULT CMenuBand::_CallCBWithItemPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam) { return _CallCB(uMsg, wParam, lParam, 0, pidl); } @@ -2091,80 +2099,81 @@ return hr; } -HRESULT CMenuBand::TrackPopup(HMENU popup, INT x, INT y) +HRESULT CMenuBand::_TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y) { ::TrackPopupMenu(popup, 0, x, y, 0, m_menuOwner, NULL); return S_OK; } -HRESULT CMenuBand::GetTopLevelWindow(HWND*topLevel) +HRESULT CMenuBand::_GetTopLevelWindow(HWND*topLevel) { *topLevel = m_topLevelWindow; return S_OK; } -HRESULT CMenuBand::OnHotItemChanged(CMenuToolbarBase * tb, INT id) +HRESULT CMenuBand::_OnHotItemChanged(CMenuToolbarBase * tb, INT id) { if (m_hotBar && m_hotBar != tb) - m_hotBar->ChildTrack(-1); + m_hotBar->ChangeHotItem(-1); m_hotBar = tb; m_hotItem = id; return S_OK; } -HRESULT CMenuBand::ChildTrack(DWORD dwSelectType) +HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType) { HRESULT hr; - if (dwSelectType == VK_DOWN) + + if (changeType == VK_DOWN) { if (m_SFToolbar && (m_hotBar == m_SFToolbar || m_hotBar == NULL)) { - hr = m_SFToolbar->ChildTrack(dwSelectType); + hr = m_SFToolbar->ChangeHotItem(VK_DOWN); if (hr == S_FALSE) { if (m_staticToolbar) - return m_staticToolbar->ChildTrack(VK_HOME); + return m_staticToolbar->ChangeHotItem(VK_HOME); else - return m_SFToolbar->ChildTrack(VK_HOME); + return m_SFToolbar->ChangeHotItem(VK_HOME); } return hr; } else if (m_staticToolbar && m_hotBar == m_staticToolbar) { - hr = m_staticToolbar->ChildTrack(dwSelectType); + hr = m_staticToolbar->ChangeHotItem(VK_DOWN); if (hr == S_FALSE) { if (m_SFToolbar) - return m_SFToolbar->ChildTrack(VK_HOME); + return m_SFToolbar->ChangeHotItem(VK_HOME); else - return m_staticToolbar->ChildTrack(VK_HOME); + return m_staticToolbar->ChangeHotItem(VK_HOME); } return hr; } } - else if (dwSelectType == VK_UP) + else if (changeType == VK_UP) { if (m_staticToolbar && (m_hotBar == m_staticToolbar || m_hotBar == NULL)) { - hr = m_staticToolbar->ChildTrack(dwSelectType); + hr = m_staticToolbar->ChangeHotItem(VK_DOWN); if (hr == S_FALSE) { if (m_SFToolbar) - return m_SFToolbar->ChildTrack(VK_END); + return m_SFToolbar->ChangeHotItem(VK_END); else - return m_staticToolbar->ChildTrack(VK_END); + return m_staticToolbar->ChangeHotItem(VK_END); } return hr; } else if (m_SFToolbar && m_hotBar == m_SFToolbar) { - hr = m_SFToolbar->ChildTrack(dwSelectType); + hr = m_SFToolbar->ChangeHotItem(VK_UP); if (hr == S_FALSE) { if (m_staticToolbar) - return m_staticToolbar->ChildTrack(VK_END); + return m_staticToolbar->ChangeHotItem(VK_END); else - return m_SFToolbar->ChildTrack(VK_END); + return m_SFToolbar->ChangeHotItem(VK_END); } return hr; } @@ -2175,7 +2184,24 @@ hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); if (FAILED(hr)) return hr; - pmp->OnSelect(dwSelectType); - } - return S_OK; -} + pmp->OnSelect(changeType); + } + return S_OK; +} + + +HRESULT CMenuBand::_OnPopupSubMenu(IMenuPopup * popup) +{ + if (m_childMenu) + { + HRESULT hr = m_childMenu->OnSelect(MPOS_CANCELLEVEL); + if (FAILED(hr)) + return hr; + } + m_childMenu = popup; + if (m_childMenu) + { + return m_childMenu->SetSubMenu(this, TRUE); + } + return S_OK; +} Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Thu Feb 20 16:18:49 2014 @@ -43,10 +43,6 @@ public IBanneredBar, public IInitializeObject { -public: - CMenuDeskBar(); - ~CMenuDeskBar(); - private: CComPtr<IUnknown> m_Site; CComPtr<IUnknown> m_Client; @@ -58,47 +54,8 @@ HBITMAP m_Banner; 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); + CMenuDeskBar(); + ~CMenuDeskBar(); DECLARE_NOT_AGGREGATABLE(CMenuDeskBar) DECLARE_PROTECT_FINAL_CONSTRUCT() @@ -106,10 +63,10 @@ DECLARE_WND_CLASS_EX(_T("BaseBar"), CS_SAVEBITS | CS_DROPSHADOW, COLOR_3DFACE) BEGIN_MSG_MAP(CMenuDeskBar) - MESSAGE_HANDLER(WM_SIZE, OnSize) - MESSAGE_HANDLER(WM_NOTIFY, OnNotify) - MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged) - MESSAGE_HANDLER(WM_PAINT, OnPaint) + MESSAGE_HANDLER(WM_SIZE, _OnSize) + MESSAGE_HANDLER(WM_NOTIFY, _OnNotify) + MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, _OnWindowPosChanged) + MESSAGE_HANDLER(WM_PAINT, _OnPaint) END_MSG_MAP() BEGIN_COM_MAP(CMenuDeskBar) @@ -125,13 +82,54 @@ COM_INTERFACE_ENTRY_IID(IID_IInitializeObject, IInitializeObject) END_COM_MAP() + // *** 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); + private: - // message handlers - LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT _OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT _OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT _OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT _OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); }; extern "C" @@ -331,7 +329,7 @@ return m_Site->QueryInterface(riid, ppvSite); } -LRESULT CMenuDeskBar::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +LRESULT CMenuDeskBar::_OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { if (m_Client) { @@ -352,7 +350,7 @@ return 0; } -LRESULT CMenuDeskBar::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +LRESULT CMenuDeskBar::_OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { CComPtr<IWinEventHandler> winEventHandler; LRESULT result; @@ -368,12 +366,12 @@ return result; } -LRESULT CMenuDeskBar::OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +LRESULT CMenuDeskBar::_OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { return 0; } -LRESULT CMenuDeskBar::OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +LRESULT CMenuDeskBar::_OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { bHandled = FALSE; @@ -432,6 +430,7 @@ if (FAILED(hr)) return hr; + // Windows calls this, but it appears to be unimplemented? hr = dbc->SetModeDBC(1); // Allow it to fail with E_NOTIMPL. @@ -481,7 +480,7 @@ // HACK: The bar needs to be notified of the size AFTER it is shown. // Quick & dirty way of getting it done. BOOL bHandled; - OnSize(WM_SIZE, 0, 0, bHandled); + _OnSize(WM_SIZE, 0, 0, bHandled); UIActivateIO(TRUE, NULL); @@ -502,7 +501,7 @@ return hr; BOOL bHandled; - OnSize(WM_SIZE, 0, 0, bHandled); + _OnSize(WM_SIZE, 0, 0, bHandled); return hr; } @@ -519,7 +518,7 @@ m_Banner = hBitmap; BOOL bHandled; - OnSize(WM_SIZE, 0, 0, bHandled); + _OnSize(WM_SIZE, 0, 0, bHandled); return S_OK; } @@ -534,6 +533,7 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect( DWORD dwSelectType) { + CComPtr<IMenuPopup> pmp; CComPtr<IDeskBarClient> dbc; HRESULT hr; @@ -542,6 +542,13 @@ case MPOS_EXECUTE: case MPOS_FULLCANCEL: case MPOS_CANCELLEVEL: + hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IMenuPopup, &pmp)); + if (FAILED(hr)) + return hr; + + hr = pmp->OnSelect(MPOS_CANCELLEVEL); + if (FAILED(hr)) + return hr; hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); if (FAILED(hr)) @@ -558,7 +565,6 @@ if (dwSelectType == MPOS_CANCELLEVEL) break; - dwSelectType = MPOS_CANCELLEVEL; case MPOS_SELECTLEFT: case MPOS_SELECTRIGHT: /*CComPtr<IMenuPopup> pmp; Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] Thu Feb 20 16:18:49 2014 @@ -24,23 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(menusite); -#if 0 -bool _assert(bool cond, LPCSTR expr, LPCSTR file, DWORD line, LPCSTR func) -{ -#if DBG - if (!cond) - { - wine_dbg_printf("%s(%d): Assertion failed '%s', at %s", file, line, expr, func); - DebugBreak(); - } -#endif - return cond; -} -#define DBGASSERT(x) _assert(!!(x), #x, __FILE__, __LINE__, __FUNCSIG__) -#else -#define DBGASSERT(x) (!!(x)) -#endif - class CMenuSite : public CComObjectRootEx<CComMultiThreadModelNoCS>, public CWindowImpl<CMenuSite, CWindow, CControlWinTraits>, @@ -52,6 +35,7 @@ public IWinEventHandler, public IServiceProvider { +private: CComPtr<IUnknown> m_DeskBarSite; CComPtr<IUnknown> m_BandObject; CComPtr<IDeskBand> m_DeskBand; @@ -200,12 +184,19 @@ HRESULT STDMETHODCALLTYPE CMenuSite::AddBand(IUnknown * punk) { + HRESULT hr; + +#define TO_HRESULT(x) ((HRESULT)(S_OK+(x))) + if (SHIsSameObject(punk, m_BandObject)) - return S_OK + 0; - - IUnknown_SetSite(m_BandObject, NULL); - - BOOL result = m_hWndBand != NULL; + return TO_HRESULT(0); + + if (m_BandObject) + { + hr = IUnknown_SetSite(m_BandObject, NULL); + if (FAILED(hr)) + return hr; + } m_BandObject = NULL; m_DeskBand = NULL; @@ -213,19 +204,29 @@ m_hWndBand = NULL; if (!punk) - return result ? S_OK + 0 : E_FAIL; - - DBGASSERT(SUCCEEDED(punk->QueryInterface(IID_PPV_ARG(IDeskBand, &m_DeskBand)))); - DBGASSERT(SUCCEEDED(punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_WinEventHandler)))); - - IUnknown_SetSite(punk, this->ToIUnknown()); - IUnknown_GetWindow(punk, &m_hWndBand); + return TO_HRESULT(0); + + hr = punk->QueryInterface(IID_PPV_ARG(IDeskBand, &m_DeskBand)); + if (FAILED(hr)) + return hr; + + hr = punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_WinEventHandler)); + if (FAILED(hr)) + return hr; + + hr = IUnknown_SetSite(punk, this->ToIUnknown()); + if (FAILED(hr)) + return hr; + + hr = IUnknown_GetWindow(punk, &m_hWndBand); + if (FAILED(hr)) + return hr; m_BandObject = punk; punk->AddRef(); - return S_OK + 0; + return TO_HRESULT(0); } HRESULT STDMETHODCALLTYPE CMenuSite::EnumBands(UINT uBand, DWORD* pdwBandID) @@ -245,7 +246,7 @@ HRESULT STDMETHODCALLTYPE CMenuSite::GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv) { - if (!DBGASSERT(dwBandID == 0) || m_BandObject == NULL) + if (dwBandID != 0 || m_BandObject == NULL) { *ppv = NULL; return E_NOINTERFACE; @@ -277,7 +278,8 @@ HRESULT STDMETHODCALLTYPE CMenuSite::GetWindow(HWND *phwnd) { - DBGASSERT(IsWindow()); + if (!IsWindow()) + return E_FAIL; *phwnd = m_hWnd; @@ -305,8 +307,8 @@ HRESULT STDMETHODCALLTYPE CMenuSite::QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) { - DBGASSERT(dwBandID == 0); - DBGASSERT(!IsBadWritePtr(ppstb, sizeof(*ppstb))); + if (dwBandID != 0) + return E_FAIL; if (!m_BandObject) { @@ -338,15 +340,17 @@ return IUnknown_QueryService(m_BandObject, guidService, riid, ppvObject); } - DBGASSERT(m_DeskBarSite); + if (!m_DeskBarSite) + return E_FAIL; return IUnknown_QueryService(m_DeskBarSite, guidService, riid, ppvObject); } HRESULT STDMETHODCALLTYPE CMenuSite::QueryStatus(const GUID * pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) { - if (!DBGASSERT(m_DeskBarSite)) - return E_FAIL; + if (!m_DeskBarSite) + return E_FAIL; + return IUnknown_QueryStatus(m_DeskBarSite, *pguidCmdGroup, cCmds, prgCmds, pCmdText); } @@ -382,7 +386,7 @@ m_DeskBand->CloseDW(0); } - IUnknown_SetSite(m_BandObject, NULL); + hr = IUnknown_SetSite(m_BandObject, NULL); m_BandObject = NULL; m_DeskBand = 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] Thu Feb 20 16:18:49 2014 @@ -3,9 +3,9 @@ #define USE_SYSTEM_MENUSITE 0 #define USE_SYSTEM_MENUBAND 0 -#define WRAP_MENUDESKBAR 0 -#define WRAP_MENUSITE 0 -#define WRAP_MENUBAND 0 +#define WRAP_MENUDESKBAR 1 +#define WRAP_MENUSITE 1 +#define WRAP_MENUBAND 1 #include <stdio.h> #include <tchar.h>

1 0

[dquintana] 62262: [RSHELL] * CMenuBand: Implement rudimentary support for changing the hot item with the keyboard (up/down). The code can probable be simpler, and some corner cases need to be fixe...
by dquintana＠svn.reactos.org 20 Feb '14

20 Feb '14

Author: dquintana Date: Thu Feb 20 12:12:42 2014 New Revision: 62262 URL: http://svn.reactos.org/svn/reactos?rev=62262&view=rev Log: [RSHELL] * CMenuBand: Implement rudimentary support for changing the hot item with the keyboard (up/down). The code can probable be simpler, and some corner cases need to be fixed, but it works. * CMenuDeskBar: Attempt to redesign OnSelect to better match the windows behaviour, which is still mostly unknown. * Make the log results more readable. CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp branches/shell-experiments/base/shell/rshell/wraplog.cpp branches/shell-experiments/base/shell/rshell/wraplog.h Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Thu Feb 20 12:12:42 2014 @@ -58,6 +58,8 @@ HRESULT PopupSubMenu(UINT index, HMENU menu); HRESULT DoContextMenu(IContextMenu* contextMenu); + HRESULT ChildTrack(DWORD dwSelectType); + static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); protected: @@ -153,6 +155,9 @@ CMenuFocusManager * m_focusManager; + CMenuToolbarBase * m_hotBar; + INT m_hotItem; + public: // *** IDeskBand methods *** @@ -241,6 +246,8 @@ HRESULT CallCBWithPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam); HRESULT TrackPopup(HMENU popup, INT x, INT y); HRESULT GetTopLevelWindow(HWND*topLevel); + HRESULT OnHotItemChanged(CMenuToolbarBase * tb, INT id); + HRESULT ChildTrack(DWORD reason); BOOL UseBigIcons() { return m_useBigIcons; @@ -418,19 +425,19 @@ case VK_MENU: case VK_LMENU: case VK_RMENU: - m_currentBand->OnSelect(MPOS_FULLCANCEL); + m_currentBand->ChildTrack(MPOS_FULLCANCEL); break; case VK_LEFT: - m_currentBand->OnSelect(MPOS_SELECTLEFT); + m_currentBand->ChildTrack(MPOS_SELECTLEFT); break; case VK_RIGHT: - m_currentBand->OnSelect(MPOS_SELECTRIGHT); + m_currentBand->ChildTrack(MPOS_SELECTRIGHT); break; case VK_UP: - //m_currentBand->ChildTrack(VK_UP); + m_currentBand->ChildTrack(VK_UP); break; case VK_DOWN: - //m_currentBand->ChildTrack(VK_DOWN); + m_currentBand->ChildTrack(VK_DOWN); break; } break; @@ -676,6 +683,9 @@ if (hot->dwFlags & HICF_LEAVING) { KillTimer(m_hwnd, TIMERID_HOTTRACK); + m_hotItem = -1; + m_menuBand->OnHotItemChanged(NULL, -1); + m_menuBand->ChildTrack(MPOS_CHILDTRACKING); } else if (m_hotItem != hot->idNew) { @@ -684,13 +694,14 @@ DWORD elapsed = 0; SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0); - m_hotItem = hot->idNew; SetTimer(m_hwnd, TIMERID_HOTTRACK, elapsed, NULL); } - } - - m_menuBand->OnSelect(MPOS_CHILDTRACKING); + + m_hotItem = hot->idNew; + m_menuBand->OnHotItemChanged(this, m_hotItem); + m_menuBand->ChildTrack(MPOS_CHILDTRACKING); + } return S_OK; } @@ -817,6 +828,95 @@ { m_menuBand->OnSelect(MPOS_EXECUTE); return S_OK; +} + + +HRESULT CMenuToolbarBase::ChildTrack(DWORD dwSelectType) +{ + int prev = SendMessage(m_hwnd, TB_GETHOTITEM, 0, 0); + int index = -1; + + if (dwSelectType != 0xFFFFFFFF) + { + int count = SendMessage(m_hwnd, TB_BUTTONCOUNT, 0, 0); + + if (m_hotItem >= 0) + { + TBBUTTONINFO info = { 0 }; + info.cbSize = sizeof(TBBUTTONINFO); + info.dwMask = 0; + index = SendMessage(m_hwnd, TB_GETBUTTONINFO, m_hotItem, reinterpret_cast<LPARAM>(&info)); + } + + if (dwSelectType == VK_HOME) + { + index = 0; + dwSelectType = VK_DOWN; + } + else if (dwSelectType == VK_END) + { + index = count - 1; + dwSelectType = VK_UP; + } + else if (index < 0) + { + if (dwSelectType == VK_UP) + { + index = count - 1; + } + else if (dwSelectType == VK_DOWN) + { + index = 0; + } + } + else + { + if (dwSelectType == VK_UP) + { + index--; + } + else if (dwSelectType == VK_DOWN) + { + index++; + } + } + + TBBUTTON btn = { 0 }; + while (index >= 0 && index < count) + { + DWORD res = SendMessage(m_hwnd, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn)); + if (!res) + return E_FAIL; + + if (btn.dwData) + { + m_hotItem = btn.idCommand; + if (prev != index) + { + SendMessage(m_hwnd, TB_SETHOTITEM, index, 0); + return m_menuBand->OnHotItemChanged(this, m_hotItem); + } + return S_OK; + } + + if (dwSelectType == VK_UP) + { + index--; + } + else if (dwSelectType == VK_DOWN) + { + index++; + } + } + } + + m_hotItem = -1; + if (prev != index) + { + SendMessage(m_hwnd, TB_SETHOTITEM, -1, 0); + m_menuBand->OnHotItemChanged(NULL, -1); + } + return S_FALSE; } BOOL @@ -1026,7 +1126,7 @@ tbb.fsStyle |= BTNS_DROPDOWN; } - tbb.idCommand = i++; + tbb.idCommand = ++i; tbb.iString = (INT_PTR) MenuString; tbb.iBitmap = index; tbb.dwData = reinterpret_cast<DWORD_PTR>(ILClone(item)); @@ -1187,7 +1287,9 @@ m_psmc(NULL), m_staticToolbar(NULL), m_SFToolbar(NULL), - m_useBigIcons(FALSE) + m_useBigIcons(FALSE), + m_hotBar(NULL), + m_hotItem(-1) { m_focusManager = CMenuFocusManager::AcquireManager(); } @@ -1561,25 +1663,31 @@ HRESULT STDMETHODCALLTYPE CMenuBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) { HRESULT hr; - CComPtr<IMenuPopup> pmp; hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); if (FAILED(hr)) return hr; - hr = pmp->SetSubMenu(this, TRUE); - if (FAILED(hr)) - return hr; - - CComPtr<IOleWindow> pTopLevelWindow; - hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IOleWindow, &pTopLevelWindow)); - if (FAILED(hr)) - return hr; - - hr = pTopLevelWindow->GetWindow(&m_topLevelWindow); - if (FAILED(hr)) - return hr; + hr = pmp->SetSubMenu(this, fActivate); + if (FAILED(hr)) + return hr; + + if (fActivate) + { + CComPtr<IOleWindow> pTopLevelWindow; + hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IOleWindow, &pTopLevelWindow)); + if (FAILED(hr)) + return hr; + + hr = pTopLevelWindow->GetWindow(&m_topLevelWindow); + if (FAILED(hr)) + return hr; + } + else + { + m_topLevelWindow = NULL; + } return S_FALSE; } @@ -1672,11 +1780,6 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnSelect(DWORD dwSelectType) { - CComPtr<IMenuPopup> pmp; - HRESULT hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); - if (FAILED(hr)) - return hr; - pmp->OnSelect(dwSelectType); return S_OK; } @@ -1998,4 +2101,81 @@ { *topLevel = m_topLevelWindow; return S_OK; -} +} + +HRESULT CMenuBand::OnHotItemChanged(CMenuToolbarBase * tb, INT id) +{ + if (m_hotBar && m_hotBar != tb) + m_hotBar->ChildTrack(-1); + m_hotBar = tb; + m_hotItem = id; + return S_OK; +} + +HRESULT CMenuBand::ChildTrack(DWORD dwSelectType) +{ + HRESULT hr; + if (dwSelectType == VK_DOWN) + { + if (m_SFToolbar && (m_hotBar == m_SFToolbar || m_hotBar == NULL)) + { + hr = m_SFToolbar->ChildTrack(dwSelectType); + if (hr == S_FALSE) + { + if (m_staticToolbar) + return m_staticToolbar->ChildTrack(VK_HOME); + else + return m_SFToolbar->ChildTrack(VK_HOME); + } + return hr; + } + else if (m_staticToolbar && m_hotBar == m_staticToolbar) + { + hr = m_staticToolbar->ChildTrack(dwSelectType); + if (hr == S_FALSE) + { + if (m_SFToolbar) + return m_SFToolbar->ChildTrack(VK_HOME); + else + return m_staticToolbar->ChildTrack(VK_HOME); + } + return hr; + } + } + else if (dwSelectType == VK_UP) + { + if (m_staticToolbar && (m_hotBar == m_staticToolbar || m_hotBar == NULL)) + { + hr = m_staticToolbar->ChildTrack(dwSelectType); + if (hr == S_FALSE) + { + if (m_SFToolbar) + return m_SFToolbar->ChildTrack(VK_END); + else + return m_staticToolbar->ChildTrack(VK_END); + } + return hr; + } + else if (m_SFToolbar && m_hotBar == m_SFToolbar) + { + hr = m_SFToolbar->ChildTrack(dwSelectType); + if (hr == S_FALSE) + { + if (m_staticToolbar) + return m_staticToolbar->ChildTrack(VK_END); + else + return m_SFToolbar->ChildTrack(VK_END); + } + return hr; + } + } + else + { + CComPtr<IMenuPopup> pmp; + hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); + if (FAILED(hr)) + return hr; + pmp->OnSelect(dwSelectType); + } + return S_OK; +} Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Thu Feb 20 12:12:42 2014 @@ -228,9 +228,6 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) { - if (m_Site == NULL) - return E_FAIL; - if (IsEqualGUID(guidService, SID_SMenuPopup) || IsEqualGUID(guidService, SID_SMenuBandParent) || IsEqualGUID(guidService, SID_STopLevelBrowser)) @@ -238,6 +235,9 @@ return this->QueryInterface(riid, ppvObject); } + if (m_Site == NULL) + return E_NOINTERFACE; + return IUnknown_QueryService(m_Site, guidService, riid, ppvObject); } @@ -333,8 +333,6 @@ LRESULT CMenuDeskBar::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - HRESULT hr; - if (m_Client) { RECT rc; @@ -538,31 +536,13 @@ { CComPtr<IDeskBarClient> dbc; HRESULT hr; - - bool bubbleUp = false; - bool cancel = false; switch (dwSelectType) { + case MPOS_EXECUTE: case MPOS_FULLCANCEL: - case MPOS_EXECUTE: - bubbleUp = true; - cancel = true; - break; case MPOS_CANCELLEVEL: - cancel = true; - break; - case MPOS_SELECTLEFT: - case MPOS_SELECTRIGHT: - // if unhandled, spread upwards? - bubbleUp = true; - break; - case MPOS_CHILDTRACKING: - break; - } - - if (cancel) - { + hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); if (FAILED(hr)) return hr; @@ -574,12 +554,23 @@ SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); UIActivateIO(FALSE, NULL); - } - - if (bubbleUp && m_SubMenuParent) - { - hr = m_SubMenuParent->OnSelect(MPOS_CANCELLEVEL); // why?? - return hr; + + if (dwSelectType == MPOS_CANCELLEVEL) + break; + + dwSelectType = MPOS_CANCELLEVEL; + case MPOS_SELECTLEFT: + case MPOS_SELECTRIGHT: + /*CComPtr<IMenuPopup> pmp; + hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IMenuPopup, &pmp)); + if (FAILED(hr)) + return hr;*/ + + hr = m_SubMenuParent->OnSelect(dwSelectType); + if (FAILED(hr)) + return hr; + case MPOS_CHILDTRACKING: + break; } return S_OK; Modified: branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp [iso-8859-1] Thu Feb 20 12:12:42 2014 @@ -60,6 +60,8 @@ CComPtr<IShellMenu > m_IShellMenu; CComPtr<IWinEventHandler > m_IWinEventHandler; CComPtr<IShellMenuAcc > m_IShellMenuAcc; + + IUnknown * m_site; public: @@ -247,7 +249,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::GetSubMenu()\n", this); HRESULT hr = m_IShellMenu2->GetSubMenu(); - WrapLogExit("CMenuBandWrap::GetSubMenu() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::GetSubMenu()", hr); return hr; } @@ -255,7 +257,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::SetToolbar()\n", this); HRESULT hr = m_IShellMenu2->SetToolbar(); - WrapLogExit("CMenuBandWrap::SetToolbar() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::SetToolbar()", hr); return hr; } @@ -263,7 +265,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::SetMinWidth()\n", this); HRESULT hr = m_IShellMenu2->SetMinWidth(); - WrapLogExit("CMenuBandWrap::SetMinWidth() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::SetMinWidth()", hr); return hr; } @@ -271,7 +273,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::SetNoBorder()\n", this); HRESULT hr = m_IShellMenu2->SetNoBorder(); - WrapLogExit("CMenuBandWrap::SetNoBorder() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::SetNoBorder()", hr); return hr; } @@ -279,7 +281,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::SetTheme()\n", this); HRESULT hr = m_IShellMenu2->SetTheme(); - WrapLogExit("CMenuBandWrap::SetTheme() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::SetTheme()", hr); return hr; } @@ -289,7 +291,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::GetTop()\n", this); HRESULT hr = m_IShellMenuAcc->GetTop(); - WrapLogExit("CMenuBandWrap::GetTop() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::GetTop()", hr); return hr; } @@ -297,7 +299,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::GetBottom()\n", this); HRESULT hr = m_IShellMenuAcc->GetBottom(); - WrapLogExit("CMenuBandWrap::GetBottom() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::GetBottom()", hr); return hr; } @@ -305,7 +307,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::GetBottom()\n", this); HRESULT hr = m_IShellMenuAcc->GetBottom(); - WrapLogExit("CMenuBandWrap::GetBottom() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::GetBottom()", hr); return hr; } @@ -313,7 +315,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::GetBottom()\n", this); HRESULT hr = m_IShellMenuAcc->GetBottom(); - WrapLogExit("CMenuBandWrap::GetBottom() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::GetBottom()", hr); return hr; } @@ -321,7 +323,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::GetBottom()\n", this); HRESULT hr = m_IShellMenuAcc->GetBottom(); - WrapLogExit("CMenuBandWrap::GetBottom() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::GetBottom()", hr); return hr; } @@ -329,7 +331,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::GetBottom()\n", this); HRESULT hr = m_IShellMenuAcc->GetBottom(); - WrapLogExit("CMenuBandWrap::GetBottom() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::GetBottom()", hr); return hr; } @@ -337,7 +339,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::GetBottom()\n", this); HRESULT hr = m_IShellMenuAcc->GetBottom(); - WrapLogExit("CMenuBandWrap::GetBottom() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::GetBottom()", hr); return hr; } @@ -346,7 +348,7 @@ { WrapLogEnter("CMenuBandWrap<%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("CMenuBandWrap::GetBandInfo() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::GetBandInfo()", hr); return hr; } @@ -355,7 +357,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::ShowDW(BOOL fShow=%d)\n", this, fShow); HRESULT hr = m_IDockingWindow->ShowDW(fShow); - WrapLogExit("CMenuBandWrap::ShowDW() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::ShowDW()", hr); return hr; } @@ -363,17 +365,17 @@ { WrapLogEnter("CMenuBandWrap<%p>::CloseDW(DWORD dwReserved=%d)\n", this, dwReserved); HRESULT hr = m_IDockingWindow->CloseDW(dwReserved); - WrapLogExit("CMenuBandWrap::CloseDW() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::CloseDW()", hr); return hr; } HRESULT STDMETHODCALLTYPE CMenuBandWrap::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) { WrapLogEnter("CMenuBandWrap<%p>::ResizeBorderDW(LPCRECT prcBorder=%p, IUnknown *punkToolbarSite=%p, BOOL fReserved=%d)\n", this, prcBorder, punkToolbarSite, fReserved); - if (prcBorder) WrapLogMsg("*prcBorder=%s\n", Wrap(*prcBorder)); + if (prcBorder) WrapLogPre("*prcBorder=%s\n", Wrap(*prcBorder)); HRESULT hr = m_IDockingWindow->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved); - if (prcBorder) WrapLogMsg("*prcBorder=%s\n", Wrap(*prcBorder)); - WrapLogExit("CMenuBandWrap::ResizeBorderDW() = %08x\n", hr); + if (prcBorder) WrapLogPost("*prcBorder=%s\n", Wrap(*prcBorder)); + WrapLogExit("CMenuBandWrap::ResizeBorderDW()", hr); return hr; } @@ -382,15 +384,15 @@ { WrapLogEnter("CMenuBandWrap<%p>::GetWindow(HWND *phwnd=%p)\n", this, phwnd); HRESULT hr = m_IOleWindow->GetWindow(phwnd); - if (phwnd) WrapLogMsg("*phwnd=%p\n", *phwnd); - WrapLogExit("CMenuBandWrap::GetWindow() = %08x\n", hr); + if (phwnd) WrapLogPost("*phwnd=%p\n", *phwnd); + WrapLogExit("CMenuBandWrap::GetWindow()", hr); return hr; } HRESULT STDMETHODCALLTYPE CMenuBandWrap::ContextSensitiveHelp(BOOL fEnterMode) { WrapLogEnter("CMenuBandWrap<%p>::ContextSensitiveHelp(BOOL fEnterMode=%d)\n", this, fEnterMode); HRESULT hr = m_IOleWindow->ContextSensitiveHelp(fEnterMode); - WrapLogExit("CMenuBandWrap::ContextSensitiveHelp() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::ContextSensitiveHelp()", hr); return hr; } @@ -399,7 +401,7 @@ { //WrapLogEnter("CMenuBandWrap<%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("CMenuBandWrap::OnWinEvent() = %08x\n", hr); + //WrapLogExit("CMenuBandWrap::OnWinEvent()", hr); return hr; } @@ -407,7 +409,7 @@ { //WrapLogEnter("CMenuBandWrap<%p>::IsWindowOwner(HWND hWnd=%08x)\n", this, hWnd); HRESULT hr = m_IWinEventHandler->IsWindowOwner(hWnd); - //WrapLogExit("CMenuBandWrap::IsWindowOwner() = %08x\n", hr); + //WrapLogExit("CMenuBandWrap::IsWindowOwner()", hr); return hr; } @@ -416,7 +418,8 @@ { WrapLogEnter("CMenuBandWrap<%p>::SetSite(IUnknown *pUnkSite=%p)\n", this, pUnkSite); HRESULT hr = m_IObjectWithSite->SetSite(pUnkSite); - WrapLogExit("CMenuBandWrap::SetSite() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::SetSite()", hr); + m_site = pUnkSite; return hr; } @@ -424,8 +427,8 @@ { WrapLogEnter("CMenuBandWrap<%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("CMenuBandWrap::GetSite() = %08x\n", hr); + if (ppvSite) WrapLogPost("*ppvSite=%p\n", *ppvSite); + WrapLogExit("CMenuBandWrap::GetSite()", hr); return hr; } @@ -434,7 +437,17 @@ { WrapLogEnter("CMenuBandWrap<%p>::UIActivateIO(BOOL fActivate=%d, LPMSG lpMsg=%p)\n", this, fActivate, lpMsg); HRESULT hr = m_IInputObject->UIActivateIO(fActivate, lpMsg); - WrapLogExit("CMenuBandWrap::UIActivateIO() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::UIActivateIO()", hr); + + HRESULT hrt; + CComPtr<IMenuPopup> pmp; + + hrt = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); + if (FAILED(hrt)) + return hr; + + hrt = pmp->SetSubMenu(this, fActivate); + return hr; } @@ -442,16 +455,16 @@ { WrapLogEnter("CMenuBandWrap<%p>::HasFocusIO()\n", this); HRESULT hr = m_IInputObject->HasFocusIO(); - WrapLogExit("CMenuBandWrap::HasFocusIO() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::HasFocusIO()", hr); return hr; } HRESULT STDMETHODCALLTYPE CMenuBandWrap::TranslateAcceleratorIO(LPMSG lpMsg) { WrapLogEnter("CMenuBandWrap<%p>::TranslateAcceleratorIO(LPMSG lpMsg=%p)\n", this, lpMsg); - if (lpMsg) WrapLogMsg("*lpMsg=%s\n", Wrap(*lpMsg)); + if (lpMsg) WrapLogPre("*lpMsg=%s\n", Wrap(*lpMsg)); HRESULT hr = m_IInputObject->TranslateAcceleratorIO(lpMsg); - WrapLogExit("CMenuBandWrap::TranslateAcceleratorIO() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::TranslateAcceleratorIO()", hr); return hr; } @@ -460,28 +473,28 @@ { WrapLogEnter("CMenuBandWrap<%p>::IsDirty()\n", this); HRESULT hr = m_IPersistStream->IsDirty(); - WrapLogExit("CMenuBandWrap::IsDirty() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::IsDirty()", hr); return hr; } HRESULT STDMETHODCALLTYPE CMenuBandWrap::Load(IStream *pStm) { WrapLogEnter("CMenuBandWrap<%p>::Load(IStream *pStm=%p)\n", this, pStm); HRESULT hr = m_IPersistStream->Load(pStm); - WrapLogExit("CMenuBandWrap::Load() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::Load()", hr); return hr; } HRESULT STDMETHODCALLTYPE CMenuBandWrap::Save(IStream *pStm, BOOL fClearDirty) { WrapLogEnter("CMenuBandWrap<%p>::Save(IStream *pStm=%p, BOOL fClearDirty=%d)\n", this, pStm, fClearDirty); HRESULT hr = m_IPersistStream->Save(pStm, fClearDirty); - WrapLogExit("CMenuBandWrap::Save() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::Save()", hr); return hr; } HRESULT STDMETHODCALLTYPE CMenuBandWrap::GetSizeMax(ULARGE_INTEGER *pcbSize) { WrapLogEnter("CMenuBandWrap<%p>::GetSizeMax(ULARGE_INTEGER *pcbSize=%p)\n", this, pcbSize); HRESULT hr = m_IPersistStream->GetSizeMax(pcbSize); - WrapLogExit("CMenuBandWrap::GetSizeMax() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::GetSizeMax()", hr); return hr; } @@ -490,8 +503,8 @@ { WrapLogEnter("CMenuBandWrap<%p>::GetClassID(CLSID *pClassID=%p)\n", this, pClassID); HRESULT hr = m_IPersist->GetClassID(pClassID); - if (pClassID) WrapLogMsg("*pClassID=%s\n", Wrap(*pClassID)); - WrapLogExit("CMenuBandWrap::GetClassID() = %08x\n", hr); + if (pClassID) WrapLogPost("*pClassID=%s\n", Wrap(*pClassID)); + WrapLogExit("CMenuBandWrap::GetClassID()", hr); return hr; } @@ -500,17 +513,17 @@ { WrapLogEnter("CMenuBandWrap<%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("CMenuBandWrap::QueryStatus() = %08x\n", hr); + if (pguidCmdGroup) WrapLogPost("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup)); + WrapLogExit("CMenuBandWrap::QueryStatus()", hr); return hr; } HRESULT STDMETHODCALLTYPE CMenuBandWrap::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { WrapLogEnter("CMenuBandWrap<%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) WrapLogMsg("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup)); + if (pguidCmdGroup) WrapLogPre("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup)); HRESULT hr = m_IOleCommandTarget->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); - WrapLogExit("CMenuBandWrap::Exec() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::Exec()", hr); return hr; } @@ -521,56 +534,56 @@ if (IsEqualIID(guidService, SID_SMenuBandChild)) { - WrapLogMsg("SID is SID_SMenuBandChild. Using QueryInterface of self instead of wrapped object.\n"); + WrapLogPre("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); if (SUCCEEDED(hr)) { - WrapLogExit("CMenuBandWrap::QueryService() = %08x\n", hr); + if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject); + WrapLogExit("CMenuBandWrap::QueryService()", hr); return hr; } else { - WrapLogMsg("QueryInterface on wrapper failed. Handing over to innter object.\n"); + WrapLogPre("QueryInterface on wrapper failed. Handing over to innter object.\n"); } } else if (IsEqualIID(guidService, SID_SMenuBandBottom)) { - WrapLogMsg("SID is SID_SMenuBandBottom. Using QueryInterface of self instead of wrapped object.\n"); + WrapLogPre("SID is SID_SMenuBandBottom. Using QueryInterface of self instead of wrapped object.\n"); HRESULT hr = this->QueryInterface(riid, ppvObject); - if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject); if (SUCCEEDED(hr)) { - WrapLogExit("CMenuBandWrap::QueryService() = %08x\n", hr); + if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject); + WrapLogExit("CMenuBandWrap::QueryService()", hr); return hr; } else { - WrapLogMsg("QueryInterface on wrapper failed. Handing over to innter object.\n"); + WrapLogPre("QueryInterface on wrapper failed. Handing over to innter object.\n"); } } else if (IsEqualIID(guidService, SID_SMenuBandBottomSelected)) { - WrapLogMsg("SID is SID_SMenuBandBottomSelected. Using QueryInterface of self instead of wrapped object.\n"); + WrapLogPre("SID is SID_SMenuBandBottomSelected. Using QueryInterface of self instead of wrapped object.\n"); HRESULT hr = this->QueryInterface(riid, ppvObject); - if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject); if (SUCCEEDED(hr)) { - WrapLogExit("CMenuBandWrap::QueryService() = %08x\n", hr); + if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject); + WrapLogExit("CMenuBandWrap::QueryService()", hr); return hr; } else { - WrapLogMsg("QueryInterface on wrapper failed. Handing over to innter object.\n"); + WrapLogPre("QueryInterface on wrapper failed. Handing over to innter object.\n"); } } else { - WrapLogMsg("SID not identified.\n"); + WrapLogPre("SID not identified.\n"); } HRESULT hr = m_IServiceProvider->QueryService(guidService, riid, ppvObject); - if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject); - WrapLogExit("CMenuBandWrap::QueryService() = %08x\n", hr); + if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject); + WrapLogExit("CMenuBandWrap::QueryService()", hr); return hr; } @@ -580,7 +593,7 @@ { WrapLogEnter("CMenuBandWrap<%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("CMenuBandWrap::Popup() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::Popup()", hr); return hr; } @@ -588,7 +601,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::OnSelect(DWORD dwSelectType=%08x)\n", this, dwSelectType); HRESULT hr = m_IMenuPopup->OnSelect(dwSelectType); - WrapLogExit("CMenuBandWrap::OnSelect() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::OnSelect()", hr); return hr; } @@ -596,7 +609,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::SetSubMenu(IMenuPopup *pmp=%p, BOOL fSet=%d)\n", this, pmp, fSet); HRESULT hr = m_IMenuPopup->SetSubMenu(pmp, fSet); - WrapLogExit("CMenuBandWrap::SetSubMenu() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::SetSubMenu()", hr); return hr; } @@ -606,7 +619,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::SetClient(IUnknown *punkClient=%p)\n", this, punkClient); HRESULT hr = m_IDeskBar->SetClient(punkClient); - WrapLogExit("CMenuBandWrap::SetClient() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::SetClient()", hr); return hr; } @@ -614,8 +627,8 @@ { WrapLogEnter("CMenuBandWrap<%p>::GetClient(IUnknown **ppunkClient=%p)\n", this, ppunkClient); HRESULT hr = m_IDeskBar->GetClient(ppunkClient); - if (ppunkClient) WrapLogMsg("*ppunkClient=%p\n", *ppunkClient); - WrapLogExit("CMenuBandWrap::GetClient() = %08x\n", hr); + if (ppunkClient) WrapLogPost("*ppunkClient=%p\n", *ppunkClient); + WrapLogExit("CMenuBandWrap::GetClient()", hr); return hr; } @@ -623,8 +636,8 @@ { WrapLogEnter("CMenuBandWrap<%p>::OnPosRectChangeDB(RECT *prc=%p)\n", this, prc); HRESULT hr = m_IDeskBar->OnPosRectChangeDB(prc); - if (prc) WrapLogMsg("*prc=%s\n", Wrap(*prc)); - WrapLogExit("CMenuBandWrap::OnPosRectChangeDB() = %08x\n", hr); + if (prc) WrapLogPost("*prc=%s\n", Wrap(*prc)); + WrapLogExit("CMenuBandWrap::OnPosRectChangeDB()", hr); return hr; } @@ -634,7 +647,7 @@ { //WrapLogEnter("CMenuBandWrap<%p>::IsMenuMessage(MSG *pmsg=%p)\n", this, pmsg); HRESULT hr = m_IMenuBand->IsMenuMessage(pmsg); - //WrapLogExit("CMenuBandWrap::IsMenuMessage() = %08x\n", hr); + //WrapLogExit("CMenuBandWrap::IsMenuMessage()", hr); return hr; } @@ -651,7 +664,7 @@ { WrapLogEnter("CMenuBandWrap<%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("CMenuBandWrap::Initialize() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::Initialize()", hr); return hr; } @@ -659,11 +672,11 @@ { WrapLogEnter("CMenuBandWrap<%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("CMenuBandWrap::GetMenuInfo() = %08x\n", hr); + if (ppsmc) WrapLogPost("*ppsmc=%p\n", *ppsmc); + if (puId) WrapLogPost("*puId=%u\n", *puId); + if (puIdAncestor) WrapLogPost("*puIdAncestor=%u\n", *puIdAncestor); + if (pdwFlags) WrapLogPost("*pdwFlags=%08x\n", *pdwFlags); + WrapLogExit("CMenuBandWrap::GetMenuInfo()", hr); return hr; } @@ -671,7 +684,7 @@ { WrapLogEnter("CMenuBandWrap<%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("CMenuBandWrap::SetShellFolder() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::SetShellFolder()", hr); return hr; } @@ -679,10 +692,10 @@ { WrapLogEnter("CMenuBandWrap<%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("CMenuBandWrap::GetShellFolder() = %08x\n", hr); + if (pdwFlags) WrapLogPost("*pdwFlags=%08x\n", *pdwFlags); + if (ppidl) WrapLogPost("*ppidl=%p\n", *ppidl); + if (ppv) WrapLogPost("*ppv=%p\n", *ppv); + WrapLogExit("CMenuBandWrap::GetShellFolder()", hr); return hr; } @@ -690,7 +703,7 @@ { WrapLogEnter("CMenuBandWrap<%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("CMenuBandWrap::SetMenu() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::SetMenu()", hr); return hr; } @@ -698,10 +711,10 @@ { WrapLogEnter("CMenuBandWrap<%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("CMenuBandWrap::GetMenu() = %08x\n", hr); + if (phmenu) WrapLogPost("*phmenu=%p\n", *phmenu); + if (phwnd) WrapLogPost("*phwnd=%p\n", *phwnd); + if (pdwFlags) WrapLogPost("*pdwFlags=%08x\n", *pdwFlags); + WrapLogExit("CMenuBandWrap::GetMenu()", hr); return hr; } @@ -709,7 +722,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::InvalidateItem(LPSMDATA psmd=%p, DWORD dwFlags=%08x)\n", this, psmd, dwFlags); HRESULT hr = m_IShellMenu->InvalidateItem(psmd, dwFlags); - WrapLogExit("CMenuBandWrap::InvalidateItem() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::InvalidateItem()", hr); return hr; } @@ -717,7 +730,7 @@ { WrapLogEnter("CMenuBandWrap<%p>::GetState(LPSMDATA psmd=%p)\n", this, psmd); HRESULT hr = m_IShellMenu->GetState(psmd); - WrapLogExit("CMenuBandWrap::GetState() = %08x\n", hr); + WrapLogExit("CMenuBandWrap::GetState()", hr); return hr; } @@ -725,6 +738,6 @@ { WrapLogEnter("CMenuBandWrap<%p>::SetMenuToolbar(IUnknown *punk=%p, DWORD dwFlags=%08x)\n", this, punk, dwFlags); HRESULT hr = m_IShellMenu->SetMenuToolbar(punk, dwFlags); - WrapLogExit("CMenuBandWrap::SetMenuToolbar() = %08x\n", hr); - return hr; -} + WrapLogExit("CMenuBandWrap::SetMenuToolbar()", hr); + return hr; +} Modified: branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp [iso-8859-1] Thu Feb 20 12:12:42 2014 @@ -174,7 +174,7 @@ { WrapLogEnter("CMenuDeskBarWrap<%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("CMenuDeskBarWrap::Popup() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::Popup()", hr); return hr; } @@ -182,7 +182,7 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::OnSelect(DWORD dwSelectType=%08x)\n", this, dwSelectType); HRESULT hr = m_IMenuPopup->OnSelect(dwSelectType); - WrapLogExit("CMenuDeskBarWrap::OnSelect() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::OnSelect()", hr); return hr; } @@ -190,7 +190,7 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::SetSubMenu(IMenuPopup *pmp=%p, BOOL fSet=%d)\n", this, pmp, fSet); HRESULT hr = m_IMenuPopup->SetSubMenu(pmp, fSet); - WrapLogExit("CMenuDeskBarWrap::SetSubMenu() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::SetSubMenu()", hr); return hr; } @@ -199,8 +199,8 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::GetWindow(HWND *phwnd=%p)\n", this, phwnd); HRESULT hr = m_IOleWindow->GetWindow(phwnd); - if (phwnd) WrapLogMsg("*phwnd=%p\n", *phwnd); - WrapLogExit("CMenuDeskBarWrap::GetWindow() = %08x\n", hr); + if (phwnd) WrapLogPost("*phwnd=%p\n", *phwnd); + WrapLogExit("CMenuDeskBarWrap::GetWindow()", hr); return hr; } @@ -208,7 +208,7 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::ContextSensitiveHelp(BOOL fEnterMode=%d)\n", this, fEnterMode); HRESULT hr = m_IOleWindow->ContextSensitiveHelp(fEnterMode); - WrapLogExit("CMenuDeskBarWrap::ContextSensitiveHelp() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::ContextSensitiveHelp()", hr); return hr; } @@ -217,7 +217,7 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::SetSite(IUnknown *pUnkSite=%p)\n", this, pUnkSite); HRESULT hr = m_IObjectWithSite->SetSite(pUnkSite); - WrapLogExit("CMenuDeskBarWrap::SetSite() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::SetSite()", hr); return hr; } @@ -225,8 +225,8 @@ { WrapLogEnter("CMenuDeskBarWrap<%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("CMenuDeskBarWrap::GetSite() = %08x\n", hr); + if (ppvSite) WrapLogPost("*ppvSite=%p\n", *ppvSite); + WrapLogExit("CMenuDeskBarWrap::GetSite()", hr); return hr; } @@ -235,7 +235,7 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::SetIconSize(DWORD iIcon=%d)\n", this, iIcon); HRESULT hr = m_IBanneredBar->SetIconSize(iIcon); - WrapLogExit("CMenuDeskBarWrap::SetIconSize() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::SetIconSize()", hr); return hr; } @@ -243,8 +243,8 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::GetIconSize(DWORD* piIcon=%p)\n", this, piIcon); HRESULT hr = m_IBanneredBar->GetIconSize(piIcon); - if (piIcon) WrapLogMsg("*piIcon=%d\n", *piIcon); - WrapLogExit("CMenuDeskBarWrap::GetIconSize() = %08x\n", hr); + if (piIcon) WrapLogPost("*piIcon=%d\n", *piIcon); + WrapLogExit("CMenuDeskBarWrap::GetIconSize()", hr); return hr; } @@ -252,7 +252,7 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::SetBitmap(HBITMAP hBitmap=%p)\n", this, hBitmap); HRESULT hr = m_IBanneredBar->SetBitmap(hBitmap); - WrapLogExit("CMenuDeskBarWrap::SetBitmap() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::SetBitmap()", hr); return hr; } @@ -260,8 +260,8 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::GetBitmap(HBITMAP* phBitmap=%p)\n", this, phBitmap); HRESULT hr = m_IBanneredBar->GetBitmap(phBitmap); - if (phBitmap) WrapLogMsg("*phBitmap=%p\n", *phBitmap); - WrapLogExit("CMenuDeskBarWrap::GetBitmap() = %08x\n", hr); + if (phBitmap) WrapLogPost("*phBitmap=%p\n", *phBitmap); + WrapLogExit("CMenuDeskBarWrap::GetBitmap()", hr); return hr; } @@ -271,7 +271,7 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::Initialize()\n", this); HRESULT hr = m_IInitializeObject->Initialize(); - WrapLogExit("CMenuDeskBarWrap::Initialize() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::Initialize()", hr); return hr; } @@ -280,17 +280,17 @@ { WrapLogEnter("CMenuDeskBarWrap<%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("CMenuDeskBarWrap::QueryStatus() = %08x\n", hr); + if (pguidCmdGroup) WrapLogPost("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup)); + WrapLogExit("CMenuDeskBarWrap::QueryStatus()", hr); return hr; } HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { WrapLogEnter("CMenuDeskBarWrap<%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) WrapLogMsg("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup)); + if (pguidCmdGroup) WrapLogPost("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup)); HRESULT hr = m_IOleCommandTarget->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); - WrapLogExit("CMenuDeskBarWrap::Exec() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::Exec()", hr); return hr; } @@ -301,56 +301,56 @@ if (IsEqualIID(guidService, SID_SMenuPopup)) { - WrapLogMsg("SID is SID_SMenuPopup. Using QueryInterface of self instead of wrapped object.\n"); + WrapLogPre("SID is SID_SMenuPopup. Using QueryInterface of self instead of wrapped object.\n"); HRESULT hr = this->QueryInterface(riid, ppvObject); - if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject); if (SUCCEEDED(hr)) { - WrapLogExit("CMenuDeskBarWrap::QueryService() = %08x\n", hr); + if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject); + WrapLogExit("CMenuDeskBarWrap::QueryService()", hr); return hr; } else { - WrapLogMsg("QueryInterface on wrapper failed. Handing over to innter object.\n"); + WrapLogPre("QueryInterface on wrapper failed. Handing over to innter object.\n"); } } else if (IsEqualIID(guidService, SID_SMenuBandParent)) { - WrapLogMsg("SID is SID_SMenuBandParent. Using QueryInterface of self instead of wrapped object.\n"); + WrapLogPre("SID is SID_SMenuBandParent. Using QueryInterface of self instead of wrapped object.\n"); HRESULT hr = this->QueryInterface(riid, ppvObject); - if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject); if (SUCCEEDED(hr)) { - WrapLogExit("CMenuDeskBarWrap::QueryService() = %08x\n", hr); + if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject); + WrapLogExit("CMenuDeskBarWrap::QueryService()", hr); return hr; } else { - WrapLogMsg("QueryInterface on wrapper failed. Handing over to innter object.\n"); + WrapLogPre("QueryInterface on wrapper failed. Handing over to innter object.\n"); } } else if (IsEqualIID(guidService, SID_STopLevelBrowser)) { - WrapLogMsg("SID is SID_STopLevelBrowser. Using QueryInterface of self instead of wrapped object.\n"); + WrapLogPre("SID is SID_STopLevelBrowser. Using QueryInterface of self instead of wrapped object.\n"); HRESULT hr = this->QueryInterface(riid, ppvObject); - if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject); if (SUCCEEDED(hr)) { - WrapLogExit("CMenuDeskBarWrap::QueryService() = %08x\n", hr); + if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject); + WrapLogExit("CMenuDeskBarWrap::QueryService()", hr); return hr; } else { - WrapLogMsg("QueryInterface on wrapper failed. Handing over to innter object.\n"); + WrapLogPre("QueryInterface on wrapper failed. Handing over to innter object.\n"); } } else { - WrapLogMsg("SID not identified. Calling wrapped object's QueryService.\n"); + WrapLogPre("SID not identified. Calling wrapped object's QueryService.\n"); } HRESULT hr = m_IServiceProvider->QueryService(guidService, riid, ppvObject); - if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject); - WrapLogExit("CMenuDeskBarWrap::QueryService() = %08x\n", hr); + if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject); + WrapLogExit("CMenuDeskBarWrap::QueryService()", hr); return hr; } @@ -359,7 +359,7 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::OnFocusChangeIS(LPUNKNOWN lpUnknown=%p, BOOL bFocus=%d)\n", this, lpUnknown, bFocus); HRESULT hr = m_IInputObjectSite->OnFocusChangeIS(lpUnknown, bFocus); - WrapLogExit("CMenuDeskBarWrap::OnFocusChangeIS() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::OnFocusChangeIS()", hr); return hr; } @@ -368,7 +368,7 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::UIActivateIO(BOOL bActivating=%d, LPMSG lpMsg=%p)\n", this, bActivating, lpMsg); HRESULT hr = m_IInputObject->UIActivateIO(bActivating, lpMsg); - WrapLogExit("CMenuDeskBarWrap::UIActivateIO() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::UIActivateIO()", hr); return hr; } @@ -376,16 +376,16 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::HasFocusIO()\n", this); HRESULT hr = m_IInputObject->HasFocusIO(); - WrapLogExit("CMenuDeskBarWrap::HasFocusIO() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::HasFocusIO()", hr); return hr; } HRESULT STDMETHODCALLTYPE CMenuDeskBarWrap::TranslateAcceleratorIO(LPMSG lpMsg) { WrapLogEnter("CMenuDeskBarWrap<%p>::TranslateAcceleratorIO(LPMSG lpMsg=%p)\n", this, lpMsg); - if (lpMsg) WrapLogMsg("*lpMsg=%s\n", Wrap(*lpMsg)); + if (lpMsg) WrapLogPre("*lpMsg=%s\n", Wrap(*lpMsg)); HRESULT hr = m_IInputObject->TranslateAcceleratorIO(lpMsg); - WrapLogExit("CMenuDeskBarWrap::TranslateAcceleratorIO() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::TranslateAcceleratorIO()", hr); return hr; } @@ -394,7 +394,7 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::SetClient(IUnknown *punkClient=%p)\n", this, punkClient); HRESULT hr = m_IDeskBar->SetClient(punkClient); - WrapLogExit("CMenuDeskBarWrap::SetClient() = %08x\n", hr); + WrapLogExit("CMenuDeskBarWrap::SetClient()", hr); CComPtr<IDeskBarClient> dbc; punkClient->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); @@ -407,8 +407,8 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::GetClient(IUnknown **ppunkClient=%p)\n", this, ppunkClient); HRESULT hr = m_IDeskBar->GetClient(ppunkClient); - if (ppunkClient) WrapLogMsg("*ppunkClient=%p\n", *ppunkClient); - WrapLogExit("CMenuDeskBarWrap::GetClient() = %08x\n", hr); + if (ppunkClient) WrapLogPost("*ppunkClient=%p\n", *ppunkClient); + WrapLogExit("CMenuDeskBarWrap::GetClient()", hr); return hr; } @@ -416,7 +416,7 @@ { WrapLogEnter("CMenuDeskBarWrap<%p>::OnPosRectChangeDB(RECT *prc=%p)\n", this, prc); HRESULT hr = m_IDeskBar->OnPosRectChangeDB(prc); - if (prc) WrapLogMsg("*prc=%s\n", Wrap(*prc)); - WrapLogExit("CMenuDeskBarWrap::OnPosRectChangeDB() = %08x\n", hr); - return hr; -} + if (prc) WrapLogPost("*prc=%s\n", Wrap(*prc)); + WrapLogExit("CMenuDeskBarWrap::OnPosRectChangeDB()", hr); + return hr; +} Modified: branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp [iso-8859-1] Thu Feb 20 12:12:42 2014 @@ -165,7 +165,7 @@ { WrapLogEnter("CMenuSiteWrap<%p>::AddBand(IUnknown * punk=%p)\n", this, punk); HRESULT hr = m_IBandSite->AddBand(punk); - WrapLogExit("CMenuSiteWrap::AddBand() = %08x\n", hr); + WrapLogExit("CMenuSiteWrap::AddBand()", hr); return hr; } @@ -173,8 +173,8 @@ { WrapLogEnter("CMenuSiteWrap<%p>::EnumBands(UINT uBand=%u, DWORD* pdwBandID=%p)\n", this, uBand, pdwBandID); HRESULT hr = m_IBandSite->EnumBands(uBand, pdwBandID); - if (pdwBandID) WrapLogMsg("*pdwBandID=%d\n", *pdwBandID); - WrapLogExit("CMenuSiteWrap::EnumBands() = %08x\n", hr); + if (pdwBandID) WrapLogPost("*pdwBandID=%d\n", *pdwBandID); + WrapLogExit("CMenuSiteWrap::EnumBands()", hr); return hr; } @@ -182,9 +182,9 @@ { WrapLogEnter("CMenuSiteWrap<%p>::QueryBand(DWORD dwBandID=%d, IDeskBand **ppstb=%p, DWORD *pdwState=%p, LPWSTR pszName=%p, int cchName=%p)\n", this, dwBandID, ppstb, pdwState, pszName, cchName); HRESULT hr = m_IBandSite->QueryBand(dwBandID, ppstb, pdwState, pszName, cchName); - if (ppstb) WrapLogMsg("*ppstb=%p\n", *ppstb); - if (pdwState) WrapLogMsg("*pdwState=%d\n", *pdwState); - WrapLogExit("CMenuSiteWrap::QueryBand() = %08x\n", hr); + if (ppstb) WrapLogPost("*ppstb=%p\n", *ppstb); + if (pdwState) WrapLogPost("*pdwState=%d\n", *pdwState); + WrapLogExit("CMenuSiteWrap::QueryBand()", hr); return hr; } @@ -192,8 +192,8 @@ { WrapLogEnter("CMenuSiteWrap<%p>::GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv)\n", this, dwBandID, riid, ppv); HRESULT hr = m_IBandSite->GetBandObject(dwBandID, riid, ppv); - if (ppv) WrapLogMsg("*ppv=%p\n", *ppv); - WrapLogExit("CMenuSiteWrap::GetBandObject() = %08x\n", hr); + if (ppv) WrapLogPost("*ppv=%p\n", *ppv); + WrapLogExit("CMenuSiteWrap::GetBandObject()", hr); return hr; } @@ -201,8 +201,8 @@ { WrapLogEnter("CMenuSiteWrap<%p>::GetBandSiteInfo(BANDSITEINFO *pbsinfo=%p)\n", this, pbsinfo); HRESULT hr = m_IBandSite->GetBandSiteInfo(pbsinfo); - if (pbsinfo) WrapLogMsg("*pbsinfo=%p\n", *pbsinfo); - WrapLogExit("CMenuSiteWrap::GetBandSiteInfo() = %08x\n", hr); + if (pbsinfo) WrapLogPost("*pbsinfo=%p\n", *pbsinfo); + WrapLogExit("CMenuSiteWrap::GetBandSiteInfo()", hr); return hr; } @@ -210,16 +210,16 @@ { WrapLogEnter("CMenuSiteWrap<%p>::RemoveBand(DWORD dwBandID=%d)\n", this, dwBandID); HRESULT hr = m_IBandSite->RemoveBand(dwBandID); - WrapLogExit("CMenuSiteWrap::RemoveBand() = %08x\n", hr); + WrapLogExit("CMenuSiteWrap::RemoveBand()", hr); return hr; } HRESULT STDMETHODCALLTYPE CMenuSiteWrap::SetBandSiteInfo(const BANDSITEINFO *pbsinfo) { WrapLogEnter("CMenuSiteWrap<%p>::SetBandSiteInfo(const BANDSITEINFO *pbsinfo=%p)\n", this, pbsinfo); - //if (phwnd) WrapLogMsg("*pbsinfo=%s\n", Wrap(*pbsinfo)); + //if (phwnd) WrapLogPost("*pbsinfo=%s\n", Wrap(*pbsinfo)); HRESULT hr = m_IBandSite->SetBandSiteInfo(pbsinfo); - WrapLogExit("CMenuSiteWrap::SetBandSiteInfo() = %08x\n", hr); + WrapLogExit("CMenuSiteWrap::SetBandSiteInfo()", hr); return hr; } @@ -227,7 +227,7 @@ { WrapLogEnter("CMenuSiteWrap<%p>::SetBandState(DWORD dwBandID=%d, DWORD dwMask=%08x, DWORD dwState=%d)\n", this, dwBandID, dwMask, dwState); HRESULT hr = m_IBandSite->SetBandState(dwBandID, dwMask, dwState); - WrapLogExit("CMenuSiteWrap::SetBandState() = %08x\n", hr); + WrapLogExit("CMenuSiteWrap::SetBandState()", hr); return hr; } @@ -236,8 +236,8 @@ { WrapLogEnter("CMenuSiteWrap<%p>::SetDeskBarSite(IUnknown *punkSite=%p)\n", this, punkSite); HRESULT hr = m_IDeskBarClient->SetDeskBarSite(punkSite); - if (punkSite) WrapLogMsg("*punkSite=%p\n", *punkSite); - WrapLogExit("CMenuSiteWrap::SetDeskBarSite() = %08x\n", hr); + if (punkSite) WrapLogPost("*punkSite=%p\n", *punkSite); + WrapLogExit("CMenuSiteWrap::SetDeskBarSite()", hr); return hr; } @@ -245,7 +245,7 @@ { WrapLogEnter("CMenuSiteWrap<%p>::SetModeDBC(DWORD dwMode=%d)\n", this, dwMode); HRESULT hr = m_IDeskBarClient->SetModeDBC(dwMode); - WrapLogExit("CMenuSiteWrap::SetModeDBC() = %08x\n", hr); + WrapLogExit("CMenuSiteWrap::SetModeDBC()", hr); return hr; } @@ -253,8 +253,8 @@ { WrapLogEnter("CMenuSiteWrap<%p>::GetSize(DWORD dwWhich=%d, LPRECT prc=%p)\n", this, dwWhich, prc); HRESULT hr = m_IDeskBarClient->GetSize(dwWhich, prc); - if (prc) WrapLogMsg("*prc=%s\n", Wrap(*prc)); - WrapLogExit("CMenuSiteWrap::GetSize() = %08x\n", hr); + if (prc) WrapLogPost("*prc=%s\n", Wrap(*prc)); + WrapLogExit("CMenuSiteWrap::GetSize()", hr); return hr; } @@ -262,7 +262,7 @@ { WrapLogEnter("CMenuSiteWrap<%p>::UIActivateDBC(DWORD dwState=%d)\n", this, dwState); HRESULT hr = m_IDeskBarClient->UIActivateDBC(dwState); - WrapLogExit("CMenuSiteWrap::UIActivateDBC() = %08x\n", hr); + WrapLogExit("CMenuSiteWrap::UIActivateDBC()", hr); return hr; } @@ -271,8 +271,8 @@ { WrapLogEnter("CMenuSiteWrap<%p>::GetWindow(HWND *phwnd=%p)\n", this, phwnd); HRESULT hr = m_IOleWindow->GetWindow(phwnd); - if (phwnd) WrapLogMsg("*phwnd=%p\n", *phwnd); - WrapLogExit("CMenuSiteWrap::GetWindow() = %08x\n", hr); + if (phwnd) WrapLogPost("*phwnd=%p\n", *phwnd); + WrapLogExit("CMenuSiteWrap::GetWindow()", hr); return hr; } @@ -280,7 +280,7 @@ { WrapLogEnter("CMenuSiteWrap<%p>::ContextSensitiveHelp(BOOL fEnterMode=%d)\n", this, fEnterMode); HRESULT hr = m_IOleWindow->ContextSensitiveHelp(fEnterMode); - WrapLogExit("CMenuSiteWrap::ContextSensitiveHelp() = %08x\n", hr); + WrapLogExit("CMenuSiteWrap::ContextSensitiveHelp()", hr); return hr; } @@ -289,17 +289,17 @@ { WrapLogEnter("CMenuSiteWrap<%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("CMenuSiteWrap::QueryStatus() = %08x\n", hr); + if (pguidCmdGroup) WrapLogPost("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup)); + WrapLogExit("CMenuSiteWrap::QueryStatus()", hr); return hr; } HRESULT STDMETHODCALLTYPE CMenuSiteWrap::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { WrapLogEnter("CMenuSiteWrap<%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) WrapLogMsg("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup)); + if (pguidCmdGroup) WrapLogPre("*pguidCmdGroup=%s\n", Wrap(*pguidCmdGroup)); HRESULT hr = m_IOleCommandTarget->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); - WrapLogExit("CMenuSiteWrap::Exec() = %08x\n", hr); + WrapLogExit("CMenuSiteWrap::Exec()", hr); return hr; } @@ -308,7 +308,7 @@ { WrapLogEnter("CMenuSiteWrap<%p>::UIActivateIO(BOOL fActivate=%d, LPMSG lpMsg=%p)\n", this, fActivate, lpMsg); HRESULT hr = m_IInputObject->UIActivateIO(fActivate, lpMsg); - WrapLogExit("CMenuSiteWrap::UIActivateIO() = %08x\n", hr); + WrapLogExit("CMenuSiteWrap::UIActivateIO()", hr); return hr; } @@ -316,16 +316,16 @@ { WrapLogEnter("CMenuSiteWrap<%p>::HasFocusIO()\n", this); HRESULT hr = m_IInputObject->HasFocusIO(); - WrapLogExit("CMenuSiteWrap::HasFocusIO() = %08x\n", hr); + WrapLogExit("CMenuSiteWrap::HasFocusIO()", hr); return hr; } HRESULT STDMETHODCALLTYPE CMenuSiteWrap::TranslateAcceleratorIO(LPMSG lpMsg) { WrapLogEnter("CMenuSiteWrap<%p>::TranslateAcceleratorIO(LPMSG lpMsg=%p)\n", this, lpMsg); - if (lpMsg) WrapLogMsg("*lpMsg=%s\n", Wrap(*lpMsg)); + if (lpMsg) WrapLogPre("*lpMsg=%s\n", Wrap(*lpMsg)); HRESULT hr = m_IInputObject->TranslateAcceleratorIO(lpMsg); - WrapLogExit("CMenuSiteWrap::TranslateAcceleratorIO() = %08x\n", hr); + WrapLogExit("CMenuSiteWrap::TranslateAcceleratorIO()", hr); return hr; } @@ -334,7 +334,7 @@ { WrapLogEnter("CMenuSiteWrap<%p>::OnFocusChangeIS(LPUNKNOWN lpUnknown=%p, BOOL bFocus=%d)\n", this, lpUnknown, bFocus); HRESULT hr = m_IInputObjectSite->OnFocusChangeIS(lpUnknown, bFocus); - WrapLogExit("CMenuSiteWrap::OnFocusChangeIS() = %08x\n", hr); + WrapLogExit("CMenuSiteWrap::OnFocusChangeIS()", hr); return hr; } @@ -343,7 +343,7 @@ { //WrapLogEnter("CMenuSiteWrap<%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("CMenuSiteWrap::OnWinEvent() = %08x\n", hr); + //WrapLogExit("CMenuSiteWrap::OnWinEvent()", hr); return hr; } @@ -351,7 +351,7 @@ { //WrapLogEnter("CMenuSiteWrap<%p>::IsWindowOwner(HWND hWnd=%08x)\n", this, hWnd); HRESULT hr = m_IWinEventHandler->IsWindowOwner(hWnd); - //WrapLogExit("CMenuSiteWrap::IsWindowOwner() = %08x\n", hr); + //WrapLogExit("CMenuSiteWrap::IsWindowOwner()", hr); return hr; } @@ -360,7 +360,7 @@ { WrapLogEnter("CMenuSiteWrap<%p>::QueryService(REFGUID guidService=%s, REFIID riid=%s, void **ppvObject=%p)\n", this, Wrap(guidService), Wrap(riid), ppvObject); HRESULT hr = m_IServiceProvider->QueryService(guidService, riid, ppvObject); - if (ppvObject) WrapLogMsg("*ppvObject=%p\n", *ppvObject); - WrapLogExit("CMenuSiteWrap::QueryService() = %08x\n", hr); - return hr; -} + if (ppvObject) WrapLogPost("*ppvObject=%p\n", *ppvObject); + WrapLogExit("CMenuSiteWrap::QueryService()", hr); + return hr; +} 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] Thu Feb 20 12:12:42 2014 @@ -30,12 +30,37 @@ } } -void __cdecl WrapLogMsg(_Printf_format_string_ const char* msg, ...) +void __cdecl WrapLogPrint(_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 WrapLogPre(_Printf_format_string_ const char* msg, ...) +{ + va_list args; + for (int i = 0; i < callLevel; i++) + fputs(" ", log); + fputs("pre: ", log); + va_start(args, msg); + vfprintf(log, msg, args); + va_end(args); + fflush(log); + nTemps = 0; +} + +void __cdecl WrapLogPost(_Printf_format_string_ const char* msg, ...) +{ + va_list args; + for (int i = 0; i < callLevel; i++) + fputs(" ", log); + fputs("post: ", log); va_start(args, msg); vfprintf(log, msg, args); va_end(args); @@ -48,7 +73,7 @@ va_list args; for (int i = 0; i < callLevel; i++) fputs(" ", log); - fputs("ENTER >> ", log); + fputs("CALL ", log); va_start(args, msg); vfprintf(log, msg, args); va_end(args); @@ -57,18 +82,25 @@ nTemps = 0; } -void __cdecl WrapLogExit(_Printf_format_string_ const char* msg, ...) +void __cdecl WrapLogExit(const char* msg, HRESULT code) { - va_list args; + //if (FAILED(code)) + // WrapLogPrint("RETURN %s = %08x\n", msg, code); + //else if (code == S_OK) + // WrapLogPrint("RETURN %s = S_OK\n", msg); + //else if (code == S_FALSE) + // WrapLogPrint("RETURN %s = S_FALSE\n", msg); + //else + // WrapLogPrint("RETURN %s = %d\n", msg, code); + if (FAILED(code)) + WrapLogPrint("RETURN %08x\n", code); + else if (code == S_OK) + WrapLogPrint("RETURN S_OK\n"); + else if (code == S_FALSE) + WrapLogPrint("RETURN S_FALSE\n"); + else + WrapLogPrint("RETURN %d\n", code); 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> Modified: 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 [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/wraplog.h [iso-8859-1] Thu Feb 20 12:12:42 2014 @@ -2,9 +2,10 @@ void WrapLogOpen(); void WrapLogClose(); -void __cdecl WrapLogMsg(_Printf_format_string_ const char* msg, ...); +void __cdecl WrapLogPre(_Printf_format_string_ const char* msg, ...); +void __cdecl WrapLogPost(_Printf_format_string_ const char* msg, ...); void __cdecl WrapLogEnter(_Printf_format_string_ const char* msg, ...); -void __cdecl WrapLogExit(_Printf_format_string_ const char* msg, ...); +void __cdecl WrapLogExit(const char* msg, HRESULT code); template <class T> LPSTR Wrap(const T& value);

1 0

[akhaldi] 62261: [GETUNAME][TAPIUI] * Add Albanian translation. By Ardit Dani, corrected by me. CORE-7924 #resolve #comment Committed in r62261. Thanks !
by akhaldi＠svn.reactos.org 20 Feb '14

20 Feb '14

Author: akhaldi Date: Thu Feb 20 11:05:27 2014 New Revision: 62261 URL: http://svn.reactos.org/svn/reactos?rev=62261&view=rev Log: [GETUNAME][TAPIUI] * Add Albanian translation. By Ardit Dani, corrected by me. CORE-7924 #resolve #comment Committed in r62261. Thanks ! Added: trunk/reactos/dll/win32/getuname/lang/sq-AL.rc (with props) trunk/reactos/dll/win32/tapiui/lang/sq-AL.rc (with props) Modified: trunk/reactos/dll/win32/getuname/getuname.rc trunk/reactos/dll/win32/tapiui/tapiui.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/getuname/getuname.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/getunam… Added: trunk/reactos/dll/win32/getuname/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/lang/sq… Added: trunk/reactos/dll/win32/tapiui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/sq-A… Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rc…

1 0

[cwittich] 62260: [kernel32] sync TIME_CompTimeZoneID with wine 1.7.11
by cwittich＠svn.reactos.org 19 Feb '14

19 Feb '14

Author: cwittich Date: Wed Feb 19 21:01:25 2014 New Revision: 62260 URL: http://svn.reactos.org/svn/reactos?rev=62260&view=rev Log: [kernel32] sync TIME_CompTimeZoneID with wine 1.7.11 Modified: trunk/reactos/dll/win32/kernel32/wine/timezone.c Modified: trunk/reactos/dll/win32/kernel32/wine/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/timezone.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/timezone.c [iso-8859-1] Wed Feb 19 21:01:25 2014 @@ -120,7 +120,7 @@ DWORD TIME_CompTimeZoneID( const TIME_ZONE_INFORMATION *pTZinfo, FILETIME *lpFileTime, BOOL islocal ) { - int ret; + int ret, year; BOOL beforeStandardDate, afterDaylightDate; DWORD retval = TIME_ZONE_ID_INVALID; LONGLONG llTime = 0; /* initialized to prevent gcc complaining */ @@ -145,20 +145,29 @@ if (!islocal) { FILETIME2LL( lpFileTime, llTime ); - llTime -= ( pTZinfo->Bias + pTZinfo->DaylightBias ) - * (LONGLONG)TICKSPERMIN; + llTime -= pTZinfo->Bias * (LONGLONG)TICKSPERMIN; LL2FILETIME( llTime, &ftTemp) lpFileTime = &ftTemp; } FileTimeToSystemTime(lpFileTime, &SysTime); + year = SysTime.wYear; + + if (!islocal) { + llTime -= pTZinfo->DaylightBias * (LONGLONG)TICKSPERMIN; + LL2FILETIME( llTime, &ftTemp) + FileTimeToSystemTime(lpFileTime, &SysTime); + } - /* check for daylight savings */ - ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->StandardDate); - if (ret == -2) - return TIME_ZONE_ID_INVALID; - - beforeStandardDate = ret < 0; + /* check for daylight savings */ + if(year == SysTime.wYear) { + ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->StandardDate); + if (ret == -2) + return TIME_ZONE_ID_INVALID; + + beforeStandardDate = ret < 0; + } else + beforeStandardDate = SysTime.wYear < year; if (!islocal) { llTime -= ( pTZinfo->StandardBias - pTZinfo->DaylightBias ) @@ -167,11 +176,14 @@ FileTimeToSystemTime(lpFileTime, &SysTime); } - ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->DaylightDate); - if (ret == -2) - return TIME_ZONE_ID_INVALID; - - afterDaylightDate = ret >= 0; + if(year == SysTime.wYear) { + ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->DaylightDate); + if (ret == -2) + return TIME_ZONE_ID_INVALID; + + afterDaylightDate = ret >= 0; + } else + afterDaylightDate = SysTime.wYear > year; retval = TIME_ZONE_ID_STANDARD; if( pTZinfo->DaylightDate.wMonth < pTZinfo->StandardDate.wMonth ) {

1 0

[dquintana] 62259: [RSHELL] * CMenuDeskBar: Use the submenu pointer to pass on the cancel events. Windows appears to call this with code=2 (cancellevel). * CMenuBand: Begin implementing a focus man...
by dquintana＠svn.reactos.org 19 Feb '14

19 Feb '14

Author: dquintana Date: Wed Feb 19 20:35:50 2014 New Revision: 62259 URL: http://svn.reactos.org/svn/reactos?rev=62259&view=rev Log: [RSHELL] * CMenuDeskBar: Use the submenu pointer to pass on the cancel events. Windows appears to call this with code=2 (cancellevel). * CMenuBand: Begin implementing a focus manager for the menu windows. This class will take care of handling mouse and keyboard interactions, including closing the start menu and submenus when the user clicks outside the menu window. CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/precomp.h 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 19 20:35:50 2014 @@ -31,6 +31,7 @@ extern "C" BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList); class CMenuBand; +class CMenuFocusManager; class CMenuToolbarBase { @@ -149,6 +150,8 @@ BOOL m_useBigIcons; HWND m_topLevelWindow; + + CMenuFocusManager * m_focusManager; public: @@ -237,6 +240,7 @@ HRESULT CallCBWithId(UINT Id, UINT uMsg, WPARAM wParam, LPARAM lParam); HRESULT CallCBWithPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam); HRESULT TrackPopup(HMENU popup, INT x, INT y); + HRESULT GetTopLevelWindow(HWND*topLevel); BOOL UseBigIcons() { return m_useBigIcons; @@ -268,6 +272,261 @@ HRESULT _CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam, UINT id = 0, LPITEMIDLIST pidl = NULL); }; +class CMenuFocusManager : + public CComCoClass<CMenuFocusManager>, + public CComObjectRootEx<CComMultiThreadModelNoCS> +{ +private: + static DWORD TlsIndex; + + static CMenuFocusManager * GetManager() + { + return reinterpret_cast<CMenuFocusManager *>(TlsGetValue(TlsIndex)); + } + +public: + static CMenuFocusManager * AcquireManager() + { + CMenuFocusManager * obj = NULL; + + if (!TlsIndex) + { + if ((TlsIndex = TlsAlloc()) == TLS_OUT_OF_INDEXES) + return NULL; + } + + obj = GetManager(); + + if (!obj) + { + obj = new CComObject<CMenuFocusManager>(); + TlsSetValue(TlsIndex, obj); + } + + obj->AddRef(); + + return obj; + } + + static void ReleaseManager(CMenuFocusManager * obj) + { + if (!obj->Release()) + { + TlsSetValue(TlsIndex, NULL); + } + } + +private: + static LRESULT CALLBACK s_GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam) + { + return GetManager()->GetMsgHook(nCode, wParam, lParam); + } + +private: + // TODO: make dynamic +#define MAX_RECURSE 100 + CMenuBand* m_bandStack[MAX_RECURSE]; + int m_bandCount; + + HRESULT PushToArray(CMenuBand * item) + { + if (m_bandCount >= MAX_RECURSE) + return E_OUTOFMEMORY; + + m_bandStack[m_bandCount++] = item; + return S_OK; + } + + HRESULT PopFromArray(CMenuBand ** pItem) + { + if (pItem) + *pItem = NULL; + + if (m_bandCount <= 0) + return E_FAIL; + + m_bandCount--; + + if (pItem) + *pItem = m_bandStack[m_bandCount]; + + return S_OK; + } + + HRESULT PeekArray(CMenuBand ** pItem) + { + if (!pItem) + return E_FAIL; + + *pItem = NULL; + + if (m_bandCount <= 0) + return E_FAIL; + + *pItem = m_bandStack[m_bandCount - 1]; + + return S_OK; + } + +protected: + CMenuFocusManager() : + m_currentBand(NULL), + m_currentFocus(NULL), + m_bandCount(0) + { + m_threadId = GetCurrentThreadId(); + } + + ~CMenuFocusManager() + { + } + +public: + + DECLARE_NOT_AGGREGATABLE(CMenuFocusManager) + DECLARE_PROTECT_FINAL_CONSTRUCT() + BEGIN_COM_MAP(CMenuFocusManager) + END_COM_MAP() + +private: + CMenuBand * m_currentBand; + HWND m_currentFocus; + HHOOK m_hHook; + DWORD m_threadId; + + LRESULT GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam) + { + if (nCode < 0) + return CallNextHookEx(m_hHook, nCode, wParam, lParam); + + BOOL callNext = TRUE; + BOOL fRemoved = wParam; + MSG* msg = reinterpret_cast<MSG*>(lParam); + + if (nCode == HC_ACTION) + { + // Do whatever is necessary here + + switch (msg->message) + { + case WM_CLOSE: + break; + case WM_SYSKEYDOWN: + case WM_KEYDOWN: + switch (msg->wParam) + { + case VK_MENU: + case VK_LMENU: + case VK_RMENU: + m_currentBand->OnSelect(MPOS_FULLCANCEL); + break; + case VK_LEFT: + m_currentBand->OnSelect(MPOS_SELECTLEFT); + break; + case VK_RIGHT: + m_currentBand->OnSelect(MPOS_SELECTRIGHT); + break; + case VK_UP: + //m_currentBand->ChildTrack(VK_UP); + break; + case VK_DOWN: + //m_currentBand->ChildTrack(VK_DOWN); + break; + } + break; + case WM_CHAR: + //if (msg->wParam >= 'a' && msg->wParam <= 'z') + //{ + // callNext = FALSE; + // PostMessage(m_currentFocus, WM_SYSCHAR, wParam, lParam); + //} + break; + case WM_ACTIVATE: + break; + + } + + if (!callNext) + return 0; + } + + return CallNextHookEx(m_hHook, nCode, wParam, lParam); + } + + HRESULT PlaceHooks(HWND window) + { + //SetCapture(window); + m_hHook = SetWindowsHookEx(WH_GETMESSAGE, s_GetMsgHook, NULL, m_threadId); + return S_OK; + } + + HRESULT RemoveHooks(HWND window) + { + UnhookWindowsHookEx(m_hHook); + //ReleaseCapture(); + return S_OK; + } + + HRESULT UpdateFocus(CMenuBand * newBand) + { + HRESULT hr; + + hr = RemoveHooks(m_currentFocus); + + if (FAILED(hr) || !newBand) + { + m_currentFocus = NULL; + m_currentBand = NULL; + return S_OK; + } + + HWND newFocus; + hr = newBand->GetTopLevelWindow(&newFocus); + if (FAILED(hr)) + return hr; + + hr = PlaceHooks(m_currentFocus); + if (FAILED(hr)) + return hr; + + m_currentFocus = newFocus; + m_currentBand = newBand; + + return S_OK; + } + +public: + HRESULT PushMenu(CMenuBand * mb) + { + HRESULT hr; + + hr = PushToArray(mb); + if (FAILED(hr)) + return hr; + + return UpdateFocus(mb); + } + + HRESULT PopMenu(CMenuBand * mb) + { + CMenuBand * mbc; + HRESULT hr; + + hr = PopFromArray(&mbc); + if (FAILED(hr)) + return hr; + + if (mb != mbc) + return E_FAIL; + + hr = PeekArray(&mbc); + + return UpdateFocus(mbc); + } +}; + +DWORD CMenuFocusManager::TlsIndex = 0; + extern "C" HRESULT CMenuBand_Constructor(REFIID riid, LPVOID *ppv) { @@ -930,10 +1189,13 @@ m_SFToolbar(NULL), m_useBigIcons(FALSE) { + m_focusManager = CMenuFocusManager::AcquireManager(); } CMenuBand::~CMenuBand() { + CMenuFocusManager::ReleaseManager(m_focusManager); + if (m_site) m_site->Release(); @@ -1258,9 +1520,18 @@ return hr; if (fShow) - return _CallCB(SMC_INITMENU, 0, 0); - - return S_OK; + { + hr = _CallCB(SMC_INITMENU, 0, 0); + if (FAILED(hr)) + return hr; + } + + if (fShow) + hr = m_focusManager->PushMenu(this); + else + hr = m_focusManager->PopMenu(this); + + return hr; } HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved) @@ -1722,3 +1993,9 @@ ::TrackPopupMenu(popup, 0, x, y, 0, m_menuOwner, NULL); return S_OK; } + +HRESULT CMenuBand::GetTopLevelWindow(HWND*topLevel) +{ + *topLevel = m_topLevelWindow; + return S_OK; +} 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 19 20:35:50 2014 @@ -576,14 +576,11 @@ UIActivateIO(FALSE, NULL); } - //if (bubbleUp && m_Site) - //{ - // CComPtr<IMenuPopup> pmp; - // HRESULT hr = IUnknown_QueryService(m_Site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); - // if (FAILED(hr)) - // return hr; - // pmp->OnSelect(dwSelectType); - //} + if (bubbleUp && m_SubMenuParent) + { + hr = m_SubMenuParent->OnSelect(MPOS_CANCELLEVEL); // why?? + return hr; + } return S_OK; } 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 19 20:35:50 2014 @@ -3,9 +3,9 @@ #define USE_SYSTEM_MENUSITE 0 #define USE_SYSTEM_MENUBAND 0 -#define WRAP_MENUDESKBAR 1 -#define WRAP_MENUSITE 1 -#define WRAP_MENUBAND 1 +#define WRAP_MENUDESKBAR 0 +#define WRAP_MENUSITE 0 +#define WRAP_MENUBAND 0 #include <stdio.h> #include <tchar.h>

1 0

[hbelusca] 62258: [FAST486] - When pushing 16-bit value, check only low word of ESP (i.e. SP). - Don't forget to clear high word of EIP, for the Jump instruction of group 4 (0xFF).
by hbelusca＠svn.reactos.org 19 Feb '14

19 Feb '14

Author: hbelusca Date: Wed Feb 19 20:24:53 2014 New Revision: 62258 URL: http://svn.reactos.org/svn/reactos?rev=62258&view=rev Log: [FAST486] - When pushing 16-bit value, check only low word of ESP (i.e. SP). - Don't forget to clear high word of EIP, for the Jump instruction of group 4 (0xFF). Modified: branches/ntvdm/lib/fast486/common.inl branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Wed Feb 19 20:24:53 2014 @@ -296,7 +296,7 @@ USHORT ShortValue = LOWORD(Value); /* Check if SP is 1 */ - if (State->GeneralRegs[FAST486_REG_ESP].Long == 1) + if (State->GeneralRegs[FAST486_REG_ESP].LowWord == 1) { Fast486Exception(State, FAST486_EXCEPTION_SS); return FALSE; Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Wed Feb 19 20:24:53 2014 @@ -1632,6 +1632,9 @@ { /* Set the IP to the address */ State->InstPtr.LowWord = Value; + + /* Clear the top half of EIP */ + State->InstPtr.Long &= 0xFFFF; } else if (ModRegRm.Register == 5) {

1 0

[cwittich] 62257: [kernel32] fix crash in kernel32_winetest volume
by cwittich＠svn.reactos.org 19 Feb '14

19 Feb '14

Author: cwittich Date: Wed Feb 19 19:44:05 2014 New Revision: 62257 URL: http://svn.reactos.org/svn/reactos?rev=62257&view=rev Log: [kernel32] fix crash in kernel32_winetest volume Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] Wed Feb 19 19:44:05 2014 @@ -552,6 +552,12 @@ DWORD ErrorCode; BOOL Result = FALSE; + if (!lpszFileName || !lpszVolumePathName || !cchBufferLength) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!(PathLength = GetFullPathNameW(lpszFileName, 0, NULL, NULL))) { return Result;

1 0

[hbelusca] 62256: [FAST486]: Hardcoded_values--;
by hbelusca＠svn.reactos.org 19 Feb '14

19 Feb '14

Author: hbelusca Date: Wed Feb 19 19:27:05 2014 New Revision: 62256 URL: http://svn.reactos.org/svn/reactos?rev=62256&view=rev Log: [FAST486]: Hardcoded_values--; Modified: branches/ntvdm/lib/fast486/common.inl Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Wed Feb 19 19:27:05 2014 @@ -281,7 +281,7 @@ } /* Subtract ESP by 4 */ - State->GeneralRegs[FAST486_REG_ESP].Long -= 4; + State->GeneralRegs[FAST486_REG_ESP].Long -= sizeof(ULONG); /* Store the value in SS:ESP */ return Fast486WriteMemory(State, @@ -303,7 +303,7 @@ } /* Subtract SP by 2 */ - State->GeneralRegs[FAST486_REG_ESP].LowWord -= 2; + State->GeneralRegs[FAST486_REG_ESP].LowWord -= sizeof(USHORT); /* Store the value in SS:SP */ return Fast486WriteMemory(State, @@ -319,8 +319,6 @@ Fast486StackPop(PFAST486_STATE State, PULONG Value) { - ULONG LongValue; - USHORT ShortValue; BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; /* The OPSIZE prefix toggles the size */ @@ -329,6 +327,7 @@ if (Size) { /* 32-bit size */ + ULONG LongValue; /* Check if ESP is 0xFFFFFFFF */ if (State->GeneralRegs[FAST486_REG_ESP].Long == 0xFFFFFFFF) @@ -350,7 +349,7 @@ } /* Increment ESP by 4 */ - State->GeneralRegs[FAST486_REG_ESP].Long += 4; + State->GeneralRegs[FAST486_REG_ESP].Long += sizeof(ULONG); /* Store the value in the result */ *Value = LongValue; @@ -358,6 +357,7 @@ else { /* 16-bit size */ + USHORT ShortValue; /* Check if SP is 0xFFFF */ if (State->GeneralRegs[FAST486_REG_ESP].LowWord == 0xFFFF) @@ -379,7 +379,7 @@ } /* Increment SP by 2 */ - State->GeneralRegs[FAST486_REG_ESP].LowWord += 2; + State->GeneralRegs[FAST486_REG_ESP].LowWord += sizeof(USHORT); /* Store the value in the result */ *Value = ShortValue;

1 0

[hbelusca] 62255: [FAST486]: Fix argument type.
by hbelusca＠svn.reactos.org 19 Feb '14

19 Feb '14

Author: hbelusca Date: Wed Feb 19 19:23:36 2014 New Revision: 62255 URL: http://svn.reactos.org/svn/reactos?rev=62255&view=rev Log: [FAST486]: Fix argument type. Modified: branches/ntvdm/lib/fast486/fast486.c Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Wed Feb 19 19:23:36 2014 @@ -46,7 +46,7 @@ inline VOID NTAPI -Fast486ExecutionControl(PFAST486_STATE State, INT Command) +Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command) { UCHAR Opcode; INT ProcedureCallCount = 0;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs