Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-04 09:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER]

Browse source 
- Fix incorrect virtual function override of Entry::do_context_menu. CID 1630

svn path=/trunk/; revision=54493
This commit is contained in:
Thomas Faber 2011-11-24 13:12:56 +00:00
parent 618bd5e652
commit 251e9afb18
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/shell/explorer/shell/shellfs.cpp
View file

@ -221,14 +221,14 @@ BOOL ShellEntry::launch_entry(HWND hwnd, UINT nCmdShow)
} }
HRESULT ShellEntry::do_context_menu(HWND hwnd, LPPOINT pptScreen, CtxMenuInterfaces& cm_ifs) HRESULT ShellEntry::do_context_menu(HWND hwnd, const POINT& pptScreen, CtxMenuInterfaces& cm_ifs)
{ {
ShellDirectory* dir = static_cast<ShellDirectory*>(_up); ShellDirectory* dir = static_cast<ShellDirectory*>(_up);
ShellFolder folder = dir? dir->_folder: GetDesktopFolder(); ShellFolder folder = dir? dir->_folder: GetDesktopFolder();
LPCITEMIDLIST pidl = _pidl; LPCITEMIDLIST pidl = _pidl;
return ShellFolderContextMenu(folder, hwnd, 1, &pidl, pptScreen->x, pptScreen->y, cm_ifs); return ShellFolderContextMenu(folder, hwnd, 1, &pidl, pptScreen.x, pptScreen.y, cm_ifs);
} }

2
reactos/base/shell/explorer/shell/shellfs.h
View file

@ -36,7 +36,7 @@ struct ShellEntry : public Entry
virtual ShellPath create_absolute_pidl() const; virtual ShellPath create_absolute_pidl() const;
virtual HRESULT GetUIObjectOf(HWND hWnd, REFIID riid, LPVOID* ppvOut); virtual HRESULT GetUIObjectOf(HWND hWnd, REFIID riid, LPVOID* ppvOut);
virtual BOOL launch_entry(HWND hwnd, UINT nCmdShow=SW_SHOWNORMAL); virtual BOOL launch_entry(HWND hwnd, UINT nCmdShow=SW_SHOWNORMAL);
virtual HRESULT do_context_menu(HWND hwnd, LPPOINT pptScreen, CtxMenuInterfaces& cm_ifs); virtual HRESULT do_context_menu(HWND hwnd, const POINT& pptScreen, CtxMenuInterfaces& cm_ifs);
virtual ShellFolder get_shell_folder() const; virtual ShellFolder get_shell_folder() const;
IShellFolder* get_parent_folder() const; IShellFolder* get_parent_folder() const;