Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-20 17:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32]

Browse source 
- CDefaultContextMenu: Fix some cosmetic issues.

svn path=/trunk/; revision=72328
This commit is contained in:
Giannis Adamopoulos 2016-08-18 14:01:44 +00:00
parent 4c322eaeef
commit 2f6cecc6f1
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/dll/win32/shell32/CDefaultContextMenu.cpp
View file

@ -339,7 +339,7 @@ HasClipboardData()
BOOL bRet = FALSE; BOOL bRet = FALSE;
CComPtr<IDataObject> pDataObj; CComPtr<IDataObject> pDataObj;
if(SUCCEEDED(OleGetClipboard(&pDataObj))) if (SUCCEEDED(OleGetClipboard(&pDataObj)))
{ {
STGMEDIUM medium; STGMEDIUM medium;
FORMATETC formatetc; FORMATETC formatetc;
@ -348,7 +348,7 @@ HasClipboardData()
/* Set the FORMATETC structure*/ /* Set the FORMATETC structure*/
InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL);
if(SUCCEEDED(pDataObj->GetData(&formatetc, &medium))) if (SUCCEEDED(pDataObj->GetData(&formatetc, &medium)))
{ {
bRet = TRUE; bRet = TRUE;
ReleaseStgMedium(&medium); ReleaseStgMedium(&medium);
@ -1002,7 +1002,7 @@ CDefaultContextMenu::NotifyShellViewWindow(LPCMINVOKECOMMANDINFO lpcmi, BOOL bRe
HRESULT hr; HRESULT hr;
if (!m_site) if (!m_site)
return E_FAIL;; return E_FAIL;
/* Get a pointer to the shell browser */ /* Get a pointer to the shell browser */
hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellView, &psv)); hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellView, &psv));
@ -1020,7 +1020,7 @@ CDefaultContextMenu::DoRefresh(
LPCMINVOKECOMMANDINFO lpcmi) LPCMINVOKECOMMANDINFO lpcmi)
{ {
if (!m_site) if (!m_site)
return E_FAIL;; return E_FAIL;
/* Get a pointer to the shell view */ /* Get a pointer to the shell view */
CComPtr<IShellView> psv; CComPtr<IShellView> psv;
@ -1210,7 +1210,7 @@ CDefaultContextMenu::DoCopyOrCut(
HRESULT hr; HRESULT hr;
hr = SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)); hr = SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj));
if(FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return hr; return hr;
if (!bCopy) if (!bCopy)
@ -1321,7 +1321,7 @@ CDefaultContextMenu::DoProperties(
else if (_ILIsBitBucket(pidlChild)) else if (_ILIsBitBucket(pidlChild))
{ {
/* FIXME: detect the drive path of bitbucket if appropiate */ /* FIXME: detect the drive path of bitbucket if appropiate */
if(!SH_ShowRecycleBinProperties(L'C')) if (!SH_ShowRecycleBinProperties(L'C'))
hr = E_FAIL; hr = E_FAIL;
} }
else else
@ -1564,7 +1564,7 @@ CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl,
BOOL bHasPath = SHGetPathFromIDListW(pidlFull, wszPath); BOOL bHasPath = SHGetPathFromIDListW(pidlFull, wszPath);
WCHAR wszDir[MAX_PATH]; WCHAR wszDir[MAX_PATH];
if(bHasPath) if (bHasPath)
{ {
wcscpy(wszDir, wszPath); wcscpy(wszDir, wszPath);
PathRemoveFileSpec(wszDir); PathRemoveFileSpec(wszDir);
@ -1819,7 +1819,7 @@ CDefaultContextMenu::HandleMenuMsg2(
{ {
DRAWITEMSTRUCT* pDrawStruct = reinterpret_cast<DRAWITEMSTRUCT*>(lParam); DRAWITEMSTRUCT* pDrawStruct = reinterpret_cast<DRAWITEMSTRUCT*>(lParam);
PDynamicShellEntry pEntry = GetDynamicEntry(pDrawStruct->itemID); PDynamicShellEntry pEntry = GetDynamicEntry(pDrawStruct->itemID);
if(pEntry) if (pEntry)
SHForwardContextMenuMsg(pEntry->pCM, uMsg, wParam, lParam, plResult, TRUE); SHForwardContextMenuMsg(pEntry->pCM, uMsg, wParam, lParam, plResult, TRUE);
break; break;
} }
@ -1827,7 +1827,7 @@ CDefaultContextMenu::HandleMenuMsg2(
{ {
MEASUREITEMSTRUCT* pMeasureStruct = reinterpret_cast<MEASUREITEMSTRUCT*>(lParam); MEASUREITEMSTRUCT* pMeasureStruct = reinterpret_cast<MEASUREITEMSTRUCT*>(lParam);
PDynamicShellEntry pEntry = GetDynamicEntry(pMeasureStruct->itemID); PDynamicShellEntry pEntry = GetDynamicEntry(pMeasureStruct->itemID);
if(pEntry) if (pEntry)
SHForwardContextMenuMsg(pEntry->pCM, uMsg, wParam, lParam, plResult, TRUE); SHForwardContextMenuMsg(pEntry->pCM, uMsg, wParam, lParam, plResult, TRUE);
break; break;
} }