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

[RSHELL] Fix indentation (#7238)

Browse source 
Reduce coding stress.
JIRA issue: CORE-18462
Just fix indentation.
This commit is contained in:
Katayama Hirofumi MZ 2024-08-11 23:35:02 +09:00 • committed by GitHub
parent 9ee30c57fd
commit bf681c3a7c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 247 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

476
base/shell/rshell/CQuickLaunchBand.cpp
View file

@ -6,7 +6,6 @@
* PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official@hotmail.com> * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official@hotmail.com>
*/ */
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#define _INC_WINDOWS #define _INC_WINDOWS
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
@ -40,29 +39,29 @@ HRESULT WINAPI RSHELL_CISFBand_CreateInstance(REFIID riid, void** ppv);
const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } }; const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } };
// Componenet Category Registration // Componenet Category Registration
HRESULT RegisterComCat() HRESULT RegisterComCat()
{
CComPtr<ICatRegister> pcr;
HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr));
if (SUCCEEDED(hr))
{ {
CComPtr<ICatRegister> pcr; CATID catid = CATID_DeskBand;
HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid);
if (SUCCEEDED(hr))
{
CATID catid = CATID_DeskBand;
hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid);
}
return hr;
} }
return hr;
}
HRESULT UnregisterComCat() HRESULT UnregisterComCat()
{
CComPtr<ICatRegister> pcr;
HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr));
if (SUCCEEDED(hr))
{ {
CComPtr<ICatRegister> pcr; CATID catid = CATID_DeskBand;
HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); hr = pcr->UnRegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid);
if (SUCCEEDED(hr))
{
CATID catid = CATID_DeskBand;
hr = pcr->UnRegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid);
}
return hr;
} }
return hr;
}
// Pidl Browser // Pidl Browser
/*++ /*++
@ -79,28 +78,28 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0
* @return The PIDL to selected folder. * @return The PIDL to selected folder.
* *
*--*/ *--*/
LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL) LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL)
{
CComHeapPtr<ITEMIDLIST> pidlRoot;
WCHAR path[MAX_PATH];
if (nCSIDL)
{ {
CComHeapPtr<ITEMIDLIST> pidlRoot; SHGetSpecialFolderLocation(hwnd, nCSIDL, &pidlRoot);
WCHAR path[MAX_PATH];
if (nCSIDL)
{
SHGetSpecialFolderLocation(hwnd, nCSIDL, &pidlRoot);
}
BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 };
LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi);
return pidlSelected;
} }
BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 };
LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi);
return pidlSelected;
}
// CQuickLaunchBand // CQuickLaunchBand
CQuickLaunchBand::CQuickLaunchBand() {} CQuickLaunchBand::CQuickLaunchBand() {}
CQuickLaunchBand::~CQuickLaunchBand() {} CQuickLaunchBand::~CQuickLaunchBand() {}
/*****************************************************************************/ /*****************************************************************************/
// ATL Construct // ATL Construct
@ -112,260 +111,259 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0
* @return The error code. * @return The error code.
* *
*--*/ *--*/
HRESULT CQuickLaunchBand::FinalConstruct() HRESULT CQuickLaunchBand::FinalConstruct()
{ {
HRESULT hr = RSHELL_CISFBand_CreateInstance(IID_PPV_ARG(IUnknown, &m_punkISFB)); HRESULT hr = RSHELL_CISFBand_CreateInstance(IID_PPV_ARG(IUnknown, &m_punkISFB));
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return hr;
CComPtr<IShellFolderBand> pISFB;
hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IShellFolderBand, &pISFB));
if (FAILED_UNEXPECTEDLY(hr))
return hr;
CComPtr<IShellFolder> pISF;
hr = SHGetDesktopFolder(&pISF);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
CComHeapPtr<ITEMIDLIST> pidl(PidlBrowse(m_hWndBro, CSIDL_DESKTOP));
if (pidl == NULL)
return E_FAIL;
pISFB->InitializeSFB(pISF, pidl);
return hr; return hr;
}
CComPtr<IShellFolderBand> pISFB;
hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IShellFolderBand, &pISFB));
if (FAILED_UNEXPECTEDLY(hr))
return hr;
CComPtr<IShellFolder> pISF;
hr = SHGetDesktopFolder(&pISF);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
CComHeapPtr<ITEMIDLIST> pidl(PidlBrowse(m_hWndBro, CSIDL_DESKTOP));
if (pidl == NULL)
return E_FAIL;
pISFB->InitializeSFB(pISF, pidl);
return hr;
}
// IObjectWithSite // IObjectWithSite
STDMETHODIMP CQuickLaunchBand::SetSite(IUnknown *pUnkSite) STDMETHODIMP CQuickLaunchBand::SetSite(IUnknown *pUnkSite)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IObjectWithSite> pIOWS; CComPtr<IObjectWithSite> pIOWS;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pIOWS->SetSite(pUnkSite); return pIOWS->SetSite(pUnkSite);
} }
STDMETHODIMP CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID **ppvSite) STDMETHODIMP CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID **ppvSite)
{ {
CComPtr<IObjectWithSite> pIOWS; CComPtr<IObjectWithSite> pIOWS;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pIOWS->GetSite(riid, ppvSite); return pIOWS->GetSite(riid, ppvSite);
} }
/*****************************************************************************/ /*****************************************************************************/
// IDeskBand // IDeskBand
STDMETHODIMP CQuickLaunchBand::GetWindow(OUT HWND *phwnd) STDMETHODIMP CQuickLaunchBand::GetWindow(OUT HWND *phwnd)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBand> pIDB; CComPtr<IDeskBand> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pIDB->GetWindow(phwnd); return pIDB->GetWindow(phwnd);
} }
STDMETHODIMP CQuickLaunchBand::ContextSensitiveHelp(IN BOOL fEnterMode) STDMETHODIMP CQuickLaunchBand::ContextSensitiveHelp(IN BOOL fEnterMode)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBand> pIDB; CComPtr<IDeskBand> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pIDB->ContextSensitiveHelp(fEnterMode); return pIDB->ContextSensitiveHelp(fEnterMode);
} }
STDMETHODIMP CQuickLaunchBand::ShowDW(IN BOOL bShow) STDMETHODIMP CQuickLaunchBand::ShowDW(IN BOOL bShow)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBand> pIDB; CComPtr<IDeskBand> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pIDB->ShowDW(bShow); return pIDB->ShowDW(bShow);
} }
STDMETHODIMP CQuickLaunchBand::CloseDW(IN DWORD dwReserved) STDMETHODIMP CQuickLaunchBand::CloseDW(IN DWORD dwReserved)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBand> pIDB; CComPtr<IDeskBand> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pIDB->CloseDW(dwReserved); return pIDB->CloseDW(dwReserved);
} }
STDMETHODIMP CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) STDMETHODIMP CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBand> pIDB; CComPtr<IDeskBand> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pIDB->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved); return pIDB->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved);
} }
STDMETHODIMP CQuickLaunchBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) STDMETHODIMP CQuickLaunchBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBand> pIDB; CComPtr<IDeskBand> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pIDB->GetBandInfo(dwBandID, dwViewMode, pdbi); return pIDB->GetBandInfo(dwBandID, dwViewMode, pdbi);
} }
/*****************************************************************************/ /*****************************************************************************/
// IPersistStream // IPersistStream
STDMETHODIMP CQuickLaunchBand::GetClassID(OUT CLSID *pClassID) STDMETHODIMP CQuickLaunchBand::GetClassID(OUT CLSID *pClassID)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IPersistStream> pIPS; CComPtr<IPersistStream> pIPS;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pIPS->GetClassID(pClassID); return pIPS->GetClassID(pClassID);
} }
STDMETHODIMP CQuickLaunchBand::IsDirty() STDMETHODIMP CQuickLaunchBand::IsDirty()
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IPersistStream> pIPS; CComPtr<IPersistStream> pIPS;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pIPS->IsDirty(); return pIPS->IsDirty();
} }
STDMETHODIMP CQuickLaunchBand::Load(IN IStream *pStm) STDMETHODIMP CQuickLaunchBand::Load(IN IStream *pStm)
{ {
CComPtr<IPersistStream> pIPS; CComPtr<IPersistStream> pIPS;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pIPS->Load(pStm); return pIPS->Load(pStm);
} }
STDMETHODIMP CQuickLaunchBand::Save(IN IStream *pStm, IN BOOL fClearDirty) STDMETHODIMP CQuickLaunchBand::Save(IN IStream *pStm, IN BOOL fClearDirty)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IPersistStream> pIPS; CComPtr<IPersistStream> pIPS;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pIPS->Save(pStm, fClearDirty); return pIPS->Save(pStm, fClearDirty);
} }
STDMETHODIMP CQuickLaunchBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize) STDMETHODIMP CQuickLaunchBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize)
{ {
CComPtr<IPersistStream> pIPS; CComPtr<IPersistStream> pIPS;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pIPS->GetSizeMax(pcbSize);
}
return pIPS->GetSizeMax(pcbSize);
}
/*****************************************************************************/ /*****************************************************************************/
// IWinEventHandler // IWinEventHandler
STDMETHODIMP CQuickLaunchBand::ContainsWindow(IN HWND hWnd) STDMETHODIMP CQuickLaunchBand::ContainsWindow(IN HWND hWnd)
{ {
return E_NOTIMPL; return E_NOTIMPL;
} }
STDMETHODIMP CQuickLaunchBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) STDMETHODIMP CQuickLaunchBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IWinEventHandler> pWEH; CComPtr<IWinEventHandler> pWEH;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult);
} }
STDMETHODIMP CQuickLaunchBand::IsWindowOwner(HWND hWnd) STDMETHODIMP CQuickLaunchBand::IsWindowOwner(HWND hWnd)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IWinEventHandler> pWEH; CComPtr<IWinEventHandler> pWEH;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pWEH->IsWindowOwner(hWnd); return pWEH->IsWindowOwner(hWnd);
} }
/*****************************************************************************/ /*****************************************************************************/
// *** IOleCommandTarget methods *** // *** IOleCommandTarget methods ***
STDMETHODIMP CQuickLaunchBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) STDMETHODIMP CQuickLaunchBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IOleCommandTarget> pOCT; CComPtr<IOleCommandTarget> pOCT;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pOCT->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); return pOCT->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText);
} }
STDMETHODIMP CQuickLaunchBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) STDMETHODIMP CQuickLaunchBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IOleCommandTarget> pOCT; CComPtr<IOleCommandTarget> pOCT;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
} }
/*****************************************************************************/ /*****************************************************************************/
// *** IContextMenu *** // *** IContextMenu ***
STDMETHODIMP CQuickLaunchBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax) STDMETHODIMP CQuickLaunchBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IContextMenu> pICM; CComPtr<IContextMenu> pICM;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax); return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax);
} }
STDMETHODIMP CQuickLaunchBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici) STDMETHODIMP CQuickLaunchBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IContextMenu> pICM; CComPtr<IContextMenu> pICM;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pICM->InvokeCommand(pici); return pICM->InvokeCommand(pici);
} }
STDMETHODIMP CQuickLaunchBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) STDMETHODIMP CQuickLaunchBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IContextMenu> pICM; CComPtr<IContextMenu> pICM;
HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM));
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return pICM->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); return pICM->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
} }

3
base/shell/rshell/CQuickLaunchBand.h
View file

@ -27,8 +27,7 @@ class CQuickLaunchBand :
HWND m_hWndBro; HWND m_hWndBro;
CComPtr<IUnknown> m_punkISFB; CComPtr<IUnknown> m_punkISFB;
public: public:
CQuickLaunchBand(); CQuickLaunchBand();
virtual ~CQuickLaunchBand(); virtual ~CQuickLaunchBand();

19
base/shell/rshell/misc.cpp
View file

@ -56,13 +56,13 @@
extern "C" extern "C"
{ {
extern HINSTANCE shell32_hInstance; extern HINSTANCE shell32_hInstance;
HRESULT WINAPI RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv); HRESULT WINAPI RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv);
HRESULT WINAPI RSHELL_CMenuDeskBar_CreateInstance(REFIID riid, LPVOID *ppv); HRESULT WINAPI RSHELL_CMenuDeskBar_CreateInstance(REFIID riid, LPVOID *ppv);
HRESULT WINAPI RSHELL_CMenuSite_CreateInstance(REFIID riid, LPVOID *ppv); HRESULT WINAPI RSHELL_CMenuSite_CreateInstance(REFIID riid, LPVOID *ppv);
HRESULT WINAPI RSHELL_CMenuBand_CreateInstance(REFIID riid, LPVOID *ppv); HRESULT WINAPI RSHELL_CMenuBand_CreateInstance(REFIID riid, LPVOID *ppv);
HRESULT WINAPI RSHELL_CMergedFolder_CreateInstance(REFIID riid, LPVOID *ppv); HRESULT WINAPI RSHELL_CMergedFolder_CreateInstance(REFIID riid, LPVOID *ppv);
} }
DWORD WINAPI WinList_Init(void) DWORD WINAPI WinList_Init(void)
@ -263,9 +263,9 @@ public:
STDAPI STDAPI
DllGetClassObject( DllGetClassObject(
REFCLSID rclsid, REFCLSID rclsid,
REFIID riid, REFIID riid,
LPVOID *ppv) LPVOID *ppv)
{ {
if (!ppv) if (!ppv)
return E_INVALIDARG; return E_INVALIDARG;
@ -281,4 +281,3 @@ VOID WINAPI ShowFolderOptionsDialog(UINT Page, BOOL Async)
wsprintfA(buf, "rundll32.exe shell32.dll,Options_RunDLL %u", Page); wsprintfA(buf, "rundll32.exe shell32.dll,Options_RunDLL %u", Page);
WinExec(buf, SW_SHOW); WinExec(buf, SW_SHOW);
} }