Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-13 01:25:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.9][SHELL32] Improve Right-click copy/move/link menu

Browse source 
by porting back:
0.4.15-dev-5588-g e89675768b [SHELL32] Add 3 accelerators for IDM_DRAGFILE MENU de-DE.rc (#5001)
pick a single line only of 0.4.15-dev-984-g a5a30fc249 [SHELL32] CFSDropTarget.cpp ERR->TRACE to mute logspam
0.4.11-dev-858-g 1d55f459d6 [SHELL32] CFSDropTarget: Fix right click menu when shown over the tree view CORE-11240

and strip some EOL-whitespaces in the 3 related source-files.

CORE-11240
This commit is contained in:
Joachim Henze 2023-01-18 22:56:51 +01:00
parent e1b4dddf14
commit 8a9c4b374e
4 changed files with 54 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

38
dll/win32/shell32/CDefView.cpp
View file

@ -1174,10 +1174,10 @@ HRESULT CDefView::FillArrangeAsMenu(HMENU hmenuArrange)
}
/* Also check the menu item according to which we sort */
CheckMenuRadioItem(hmenuArrange,
0x30,
0x100,
m_sortInfo.nHeaderID + 0x30,
CheckMenuRadioItem(hmenuArrange,
0x30,
0x100,
m_sortInfo.nHeaderID + 0x30,
MF_BYCOMMAND);
return S_OK;
@ -1272,7 +1272,7 @@ HRESULT CDefView::OpenSelectedItems()
return hResult;
hMenu = CreatePopupMenu();
if (!hMenu)
if (!hMenu)
return E_FAIL;
hResult = GetItemObject(SVGIO_SELECTION, IID_PPV_ARG(IContextMenu, &m_pCM));
@ -1293,7 +1293,7 @@ HRESULT CDefView::OpenSelectedItems()
InvokeContextMenuCommand(uCommand);
cleanup:
if (hMenu)
DestroyMenu(hMenu);
@ -1321,7 +1321,7 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b
TRACE("(%p)->(0x%08x 0x%08x) stub\n", this, x, y);
m_hContextMenu = CreatePopupMenu();
if (!m_hContextMenu)
if (!m_hContextMenu)
return E_FAIL;
m_cidl = m_ListView.GetSelectedCount();
@ -1533,7 +1533,7 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand
DWORD dwCmdID;
DWORD dwCmd;
HWND hwndCmd;
int nCount;
int nCount;
dwCmdID = GET_WM_COMMAND_ID(wParam, lParam);
dwCmd = GET_WM_COMMAND_CMD(wParam, lParam);
@ -1788,7 +1788,7 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
{
dwEffect |= dwAttributes & (SFGAO_CANCOPY | SFGAO_CANLINK);
}
CComPtr<IAsyncOperation> piaso;
if (SUCCEEDED(pda->QueryInterface(IID_PPV_ARG(IAsyncOperation, &piaso))))
{
@ -1977,7 +1977,7 @@ LRESULT CDefView::OnCustomItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bH
return FALSE;
}
/* The lParam of WM_DRAWITEM WM_MEASUREITEM contain a menu id and this also needs to
/* The lParam of WM_DRAWITEM WM_MEASUREITEM contain a menu id and this also needs to
be changed to a menu identifier offset */
UINT CmdID;
HRESULT hres = SHGetMenuIdFromMenuMsg(uMsg, lParam, &CmdID);
@ -2444,7 +2444,7 @@ HRESULT STDMETHODCALLTYPE CDefView::GetSpacing(POINT *ppt)
{
TRACE("(%p)->(%p)\n", this, ppt);
if (!m_ListView)
if (!m_ListView)
return S_FALSE;
if (ppt)
@ -2545,7 +2545,7 @@ HRESULT STDMETHODCALLTYPE CDefView::CreateViewWindow3(IShellBrowser *psb, IShell
TRACE("(%p)->(shlview=%p shlbrs=%p rec=%p hwnd=%p vmode=%x flags=%x)\n", this, psvPrevious, psb, prcView, hwnd, mode, flags);
if (prcView != NULL)
TRACE("-- left=%i top=%i right=%i bottom=%i\n", prcView->left, prcView->top, prcView->right, prcView->bottom);
/* Validate the Shell Browser */
if (psb == NULL || m_hWnd)
return E_UNEXPECTED;
@ -2737,7 +2737,7 @@ HRESULT STDMETHODCALLTYPE CDefView::GetSelectedObjects(PCUITEMID_CHILD **pidl, U
{
return E_OUTOFMEMORY;
}
/* it's documented that caller shouldn't PIDLs, only array itself */
memcpy(*pidl, m_apidl, *items * sizeof(PCUITEMID_CHILD));
}
@ -2747,7 +2747,7 @@ HRESULT STDMETHODCALLTYPE CDefView::GetSelectedObjects(PCUITEMID_CHILD **pidl, U
HRESULT STDMETHODCALLTYPE CDefView::IsDropOnSource(IDropTarget *drop_target)
{
if ((m_iDragOverItem == -1 || m_pCurDropTarget == NULL) &&
if ((m_iDragOverItem == -1 || m_pCurDropTarget == NULL) &&
(m_pSourceDataObject.p))
{
return S_OK;
@ -2833,7 +2833,7 @@ HRESULT STDMETHODCALLTYPE CDefView::SetAutomationObject(IDispatch *disp)
FIXME("(%p)->(%p) stub\n", this, disp);
return E_NOTIMPL;
}
/**********************************************************
* ISVOleCmdTarget_QueryStatus (IOleCommandTarget)
*/
@ -3041,7 +3041,7 @@ HRESULT WINAPI CDefView::DragEnter(IDataObject *pDataObject, DWORD grfKeyState,
/* Get a hold on the data object for later calls to DragEnter on the sub-folders */
m_pCurDataObject = pDataObject;
HRESULT hr = drag_notify_subitem(grfKeyState, pt, pdwEffect);
HRESULT hr = drag_notify_subitem(grfKeyState, pt, pdwEffect);
if (SUCCEEDED(hr))
{
POINT ptClient = {pt.x, pt.y};
@ -3085,8 +3085,8 @@ HRESULT WINAPI CDefView::Drop(IDataObject* pDataObject, DWORD grfKeyState, POINT
ImageList_DragLeave(m_hWnd);
ImageList_EndDrag();
if ((IsDropOnSource(NULL) == S_OK) &&
(*pdwEffect & DROPEFFECT_MOVE) &&
if ((IsDropOnSource(NULL) == S_OK) &&
(*pdwEffect & DROPEFFECT_MOVE) &&
(m_grfKeyState & MK_LBUTTON))
{
if (m_pCurDropTarget)
@ -3119,7 +3119,7 @@ HRESULT WINAPI CDefView::Drop(IDataObject* pDataObject, DWORD grfKeyState, POINT
m_pCurDropTarget.Release();
}
m_pCurDataObject.Release();
m_pCurDataObject.Release();
m_iDragOverItem = 0;
return S_OK;
}