https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf681c3a7c2fb499e66dd8...
commit bf681c3a7c2fb499e66dd86632f9366ed124a933 Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Sun Aug 11 23:35:02 2024 +0900 Commit: GitHub noreply@github.com CommitDate: Sun Aug 11 23:35:02 2024 +0900
[RSHELL] Fix indentation (#7238)
Reduce coding stress. JIRA issue: CORE-18462 Just fix indentation. --- base/shell/rshell/CQuickLaunchBand.cpp | 476 ++++++++++++++++----------------- base/shell/rshell/CQuickLaunchBand.h | 3 +- base/shell/rshell/misc.cpp | 19 +- 3 files changed, 247 insertions(+), 251 deletions(-)
diff --git a/base/shell/rshell/CQuickLaunchBand.cpp b/base/shell/rshell/CQuickLaunchBand.cpp index f5ae43ef7a5..1507fc6ca10 100644 --- a/base/shell/rshell/CQuickLaunchBand.cpp +++ b/base/shell/rshell/CQuickLaunchBand.cpp @@ -6,7 +6,6 @@ * PROGRAMMERS: Shriraj Sawant a.k.a SR13 sr.official@hotmail.com */
- #define WIN32_NO_STATUS #define _INC_WINDOWS #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 } };
// 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; - HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); - if (SUCCEEDED(hr)) - { - CATID catid = CATID_DeskBand; - hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); - } - return hr; + CATID catid = CATID_DeskBand; + hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); } - - HRESULT UnregisterComCat() + return hr; +} + +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; - HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr)); - if (SUCCEEDED(hr)) - { - CATID catid = CATID_DeskBand; - hr = pcr->UnRegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); - } - return hr; + CATID catid = CATID_DeskBand; + hr = pcr->UnRegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); } + return hr; +}
// Pidl Browser /*++ @@ -79,28 +78,28 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 * @return The PIDL to selected folder. * *--*/ - LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL) - { - CComHeapPtr<ITEMIDLIST> pidlRoot; +LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL) +{ + CComHeapPtr<ITEMIDLIST> pidlRoot;
- WCHAR path[MAX_PATH]; + WCHAR path[MAX_PATH];
- if (nCSIDL) - { - SHGetSpecialFolderLocation(hwnd, nCSIDL, &pidlRoot); - } + if (nCSIDL) + { + SHGetSpecialFolderLocation(hwnd, nCSIDL, &pidlRoot); + }
- BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 }; - LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi); + BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 }; + LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi);
- return pidlSelected; - } + return pidlSelected; +}
// CQuickLaunchBand
- CQuickLaunchBand::CQuickLaunchBand() {} +CQuickLaunchBand::CQuickLaunchBand() {}
- CQuickLaunchBand::~CQuickLaunchBand() {} +CQuickLaunchBand::~CQuickLaunchBand() {}
/*****************************************************************************/ // ATL Construct @@ -112,260 +111,259 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 * @return The error code. * *--*/ - HRESULT CQuickLaunchBand::FinalConstruct() - { - HRESULT hr = RSHELL_CISFBand_CreateInstance(IID_PPV_ARG(IUnknown, &m_punkISFB)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; +HRESULT CQuickLaunchBand::FinalConstruct() +{ + HRESULT hr = RSHELL_CISFBand_CreateInstance(IID_PPV_ARG(IUnknown, &m_punkISFB)); + 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<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; + 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); + CComHeapPtr<ITEMIDLIST> pidl(PidlBrowse(m_hWndBro, CSIDL_DESKTOP)); + if (pidl == NULL) + return E_FAIL; + pISFB->InitializeSFB(pISF, pidl);
- return hr; - } + return hr; +}
// IObjectWithSite - STDMETHODIMP CQuickLaunchBand::SetSite(IUnknown *pUnkSite) - { - // Internal CISFBand Calls - CComPtr<IObjectWithSite> pIOWS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::SetSite(IUnknown *pUnkSite) +{ + // Internal CISFBand Calls + CComPtr<IObjectWithSite> pIOWS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); + if (FAILED(hr)) + return hr;
- return pIOWS->SetSite(pUnkSite); - } + return pIOWS->SetSite(pUnkSite); +}
- STDMETHODIMP CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID **ppvSite) - { - CComPtr<IObjectWithSite> pIOWS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID **ppvSite) +{ + CComPtr<IObjectWithSite> pIOWS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); + if (FAILED(hr)) + return hr;
- return pIOWS->GetSite(riid, ppvSite); - } + return pIOWS->GetSite(riid, ppvSite); +}
/*****************************************************************************/ // IDeskBand - STDMETHODIMP CQuickLaunchBand::GetWindow(OUT HWND *phwnd) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::GetWindow(OUT HWND *phwnd) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr;
- return pIDB->GetWindow(phwnd); - } + return pIDB->GetWindow(phwnd); +}
- STDMETHODIMP CQuickLaunchBand::ContextSensitiveHelp(IN BOOL fEnterMode) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::ContextSensitiveHelp(IN BOOL fEnterMode) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr;
- return pIDB->ContextSensitiveHelp(fEnterMode); - } + return pIDB->ContextSensitiveHelp(fEnterMode); +}
- STDMETHODIMP CQuickLaunchBand::ShowDW(IN BOOL bShow) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::ShowDW(IN BOOL bShow) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr;
- return pIDB->ShowDW(bShow); - } + return pIDB->ShowDW(bShow); +}
- STDMETHODIMP CQuickLaunchBand::CloseDW(IN DWORD dwReserved) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::CloseDW(IN DWORD dwReserved) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr;
- return pIDB->CloseDW(dwReserved); - } + return pIDB->CloseDW(dwReserved); +}
- STDMETHODIMP CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(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) - { - // Internal CISFBand Calls - CComPtr<IDeskBand> pIDB; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) +{ + // Internal CISFBand Calls + CComPtr<IDeskBand> pIDB; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); + if (FAILED(hr)) + return hr;
- return pIDB->GetBandInfo(dwBandID, dwViewMode, pdbi); - } + return pIDB->GetBandInfo(dwBandID, dwViewMode, pdbi); +}
/*****************************************************************************/ // IPersistStream - STDMETHODIMP CQuickLaunchBand::GetClassID(OUT CLSID *pClassID) - { - // Internal CISFBand Calls - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; - - return pIPS->GetClassID(pClassID); - } +STDMETHODIMP CQuickLaunchBand::GetClassID(OUT CLSID *pClassID) +{ + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr;
- STDMETHODIMP CQuickLaunchBand::IsDirty() - { - // Internal CISFBand Calls - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; + return pIPS->GetClassID(pClassID); +}
- return pIPS->IsDirty(); - } +STDMETHODIMP CQuickLaunchBand::IsDirty() +{ + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr;
- STDMETHODIMP CQuickLaunchBand::Load(IN IStream *pStm) - { - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; + return pIPS->IsDirty(); +}
- return pIPS->Load(pStm); - } +STDMETHODIMP CQuickLaunchBand::Load(IN IStream *pStm) +{ + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr;
- STDMETHODIMP CQuickLaunchBand::Save(IN IStream *pStm, IN BOOL fClearDirty) - { - // Internal CISFBand Calls - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; + return pIPS->Load(pStm); +}
- return pIPS->Save(pStm, fClearDirty); - } +STDMETHODIMP CQuickLaunchBand::Save(IN IStream *pStm, IN BOOL fClearDirty) +{ + // Internal CISFBand Calls + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr;
- STDMETHODIMP CQuickLaunchBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize) - { - CComPtr<IPersistStream> pIPS; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); - if (FAILED(hr)) - return hr; + return pIPS->Save(pStm, fClearDirty); +}
- return pIPS->GetSizeMax(pcbSize); - } +STDMETHODIMP CQuickLaunchBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize) +{ + CComPtr<IPersistStream> pIPS; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); + if (FAILED(hr)) + return hr;
+ return pIPS->GetSizeMax(pcbSize); +}
/*****************************************************************************/ // IWinEventHandler - STDMETHODIMP CQuickLaunchBand::ContainsWindow(IN HWND hWnd) - { - return E_NOTIMPL; - } - - STDMETHODIMP CQuickLaunchBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) - { - // Internal CISFBand Calls - CComPtr<IWinEventHandler> pWEH; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); - if (FAILED(hr)) - return hr; - - return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); - } +STDMETHODIMP CQuickLaunchBand::ContainsWindow(IN HWND hWnd) +{ + return E_NOTIMPL; +} + +STDMETHODIMP CQuickLaunchBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + // Internal CISFBand Calls + CComPtr<IWinEventHandler> pWEH; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); + if (FAILED(hr)) + return hr; + + return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); +} + +STDMETHODIMP CQuickLaunchBand::IsWindowOwner(HWND hWnd) +{ + // Internal CISFBand Calls + CComPtr<IWinEventHandler> pWEH; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); + if (FAILED(hr)) + return hr;
- STDMETHODIMP CQuickLaunchBand::IsWindowOwner(HWND hWnd) - { - // Internal CISFBand Calls - CComPtr<IWinEventHandler> pWEH; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); - if (FAILED(hr)) - return hr; - - return pWEH->IsWindowOwner(hWnd); - } + return pWEH->IsWindowOwner(hWnd); +}
/*****************************************************************************/ // *** IOleCommandTarget methods *** - STDMETHODIMP CQuickLaunchBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) - { - // Internal CISFBand Calls - CComPtr<IOleCommandTarget> pOCT; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) +{ + // Internal CISFBand Calls + CComPtr<IOleCommandTarget> pOCT; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); + if (FAILED(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) - { - // Internal CISFBand Calls - CComPtr<IOleCommandTarget> pOCT; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + // Internal CISFBand Calls + CComPtr<IOleCommandTarget> pOCT; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); + if (FAILED(hr)) + return hr;
- return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); - } + return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); +}
/*****************************************************************************/ // *** IContextMenu *** - STDMETHODIMP CQuickLaunchBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax) - { - // Internal CISFBand Calls - CComPtr<IContextMenu> pICM; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax) +{ + // Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); + if (FAILED(hr)) + return hr;
- return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax); - } + return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax); +}
- STDMETHODIMP CQuickLaunchBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici) - { - // Internal CISFBand Calls - CComPtr<IContextMenu> pICM; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) - return hr; +STDMETHODIMP CQuickLaunchBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici) +{ + // Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); + if (FAILED(hr)) + return hr;
- return pICM->InvokeCommand(pici); - } + return pICM->InvokeCommand(pici); +}
- STDMETHODIMP CQuickLaunchBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) - { - // Internal CISFBand Calls - CComPtr<IContextMenu> pICM; - HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) - return hr; - - return pICM->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); - } \ No newline at end of file +STDMETHODIMP CQuickLaunchBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) +{ + // Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); + if (FAILED(hr)) + return hr; + + return pICM->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); +} diff --git a/base/shell/rshell/CQuickLaunchBand.h b/base/shell/rshell/CQuickLaunchBand.h index 01a194ac6e4..09edd433c30 100644 --- a/base/shell/rshell/CQuickLaunchBand.h +++ b/base/shell/rshell/CQuickLaunchBand.h @@ -27,8 +27,7 @@ class CQuickLaunchBand : HWND m_hWndBro; CComPtr<IUnknown> m_punkISFB;
- public: - +public: CQuickLaunchBand(); virtual ~CQuickLaunchBand();
diff --git a/base/shell/rshell/misc.cpp b/base/shell/rshell/misc.cpp index ee9fb672aa1..075daefdbe4 100644 --- a/base/shell/rshell/misc.cpp +++ b/base/shell/rshell/misc.cpp @@ -56,13 +56,13 @@
extern "C" { -extern HINSTANCE shell32_hInstance; + extern HINSTANCE shell32_hInstance;
-HRESULT WINAPI RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv); -HRESULT WINAPI RSHELL_CMenuDeskBar_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_CMergedFolder_CreateInstance(REFIID riid, LPVOID *ppv); + HRESULT WINAPI RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv); + HRESULT WINAPI RSHELL_CMenuDeskBar_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_CMergedFolder_CreateInstance(REFIID riid, LPVOID *ppv); }
DWORD WINAPI WinList_Init(void) @@ -263,9 +263,9 @@ public:
STDAPI DllGetClassObject( -REFCLSID rclsid, -REFIID riid, -LPVOID *ppv) + REFCLSID rclsid, + REFIID riid, + LPVOID *ppv) { if (!ppv) return E_INVALIDARG; @@ -281,4 +281,3 @@ VOID WINAPI ShowFolderOptionsDialog(UINT Page, BOOL Async) wsprintfA(buf, "rundll32.exe shell32.dll,Options_RunDLL %u", Page); WinExec(buf, SW_SHOW); } -
-
Katayama Hirofumi MZ