mirror of
https://github.com/reactos/reactos.git
synced 2026-06-08 08:52:59 +08:00
[FORMATTING] Remove trailing whitespace. Addendum to 34593d93.
Excluded: 3rd-party code (incl. wine) and most of the win32ss.
This commit is contained in:
@@ -419,7 +419,7 @@ CDefView::~CDefView()
|
||||
::DeleteObject(m_viewinfo_data.hbmBack);
|
||||
m_viewinfo_data.hbmBack = NULL;
|
||||
}
|
||||
|
||||
|
||||
if (m_hWnd)
|
||||
{
|
||||
DestroyViewWindow();
|
||||
@@ -1309,10 +1309,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);
|
||||
|
||||
if (m_FolderSettings.ViewMode == FVM_DETAILS || m_FolderSettings.ViewMode == FVM_LIST)
|
||||
@@ -1429,7 +1429,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));
|
||||
@@ -1450,7 +1450,7 @@ HRESULT CDefView::OpenSelectedItems()
|
||||
InvokeContextMenuCommand(uCommand);
|
||||
|
||||
cleanup:
|
||||
|
||||
|
||||
if (hMenu)
|
||||
DestroyMenu(hMenu);
|
||||
|
||||
@@ -1475,7 +1475,7 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b
|
||||
TRACE("(%p)\n", this);
|
||||
|
||||
m_hContextMenu = CreatePopupMenu();
|
||||
if (!m_hContextMenu)
|
||||
if (!m_hContextMenu)
|
||||
return E_FAIL;
|
||||
|
||||
if (lParam != ~0) // unless app key (menu key) was pressed
|
||||
@@ -1537,7 +1537,7 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b
|
||||
/* We have to drop it somewhere.. */
|
||||
pt.x = pt.y = 0;
|
||||
}
|
||||
|
||||
|
||||
m_ListView.ClientToScreen(&pt);
|
||||
x = pt.x;
|
||||
y = pt.y;
|
||||
@@ -1576,7 +1576,7 @@ LRESULT CDefView::OnExplorerCommand(UINT uCommand, BOOL bUseSelection)
|
||||
HMENU hMenu;
|
||||
|
||||
hMenu = CreatePopupMenu();
|
||||
if (!hMenu)
|
||||
if (!hMenu)
|
||||
return 0;
|
||||
|
||||
hResult = GetItemObject( bUseSelection ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM));
|
||||
@@ -1759,7 +1759,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);
|
||||
@@ -2050,7 +2050,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))))
|
||||
{
|
||||
@@ -2280,7 +2280,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);
|
||||
@@ -2775,7 +2775,7 @@ HRESULT STDMETHODCALLTYPE CDefView::GetSpacing(POINT *ppt)
|
||||
{
|
||||
TRACE("(%p)->(%p)\n", this, ppt);
|
||||
|
||||
if (!m_ListView)
|
||||
if (!m_ListView)
|
||||
return S_FALSE;
|
||||
|
||||
if (ppt)
|
||||
@@ -2882,7 +2882,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;
|
||||
@@ -3076,7 +3076,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));
|
||||
}
|
||||
@@ -3086,7 +3086,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;
|
||||
@@ -3172,7 +3172,7 @@ HRESULT STDMETHODCALLTYPE CDefView::SetAutomationObject(IDispatch *disp)
|
||||
FIXME("(%p)->(%p) stub\n", this, disp);
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
|
||||
/**********************************************************
|
||||
* ISVOleCmdTarget_QueryStatus (IOleCommandTarget)
|
||||
*/
|
||||
@@ -3384,7 +3384,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};
|
||||
@@ -3572,8 +3572,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)
|
||||
@@ -3614,7 +3614,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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user