[EXPLORER] Use STDMETHODIMP and override (#7645)

Follow the standard way.
JIRA issue: CORE-19469
- Use STDMETHODIMP and override keyword
  instead of virtual HRESULT STDMETHODCALLTYPE.
- Delete CTaskBand::ProcessMessage and
  CTaskBand::ContainsWindow methods.
  I think they are useless.
This commit is contained in:
Katayama Hirofumi MZ 2025-01-21 10:03:52 +09:00 committed by GitHub
parent 56988ffbf8
commit 853b8ebd02
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 201 additions and 149 deletions

View file

@ -3490,21 +3490,24 @@ HandleTrayContextMenu:
* with it (especially positioning of desktop icons)
*/
virtual ULONG STDMETHODCALLTYPE GetState()
STDMETHODIMP_(ULONG)
GetState() override
{
/* FIXME: Return ABS_ flags? */
TRACE("IShellDesktopTray::GetState() unimplemented!\n");
return 0;
}
virtual HRESULT STDMETHODCALLTYPE GetTrayWindow(OUT HWND *phWndTray)
STDMETHODIMP
GetTrayWindow(OUT HWND *phWndTray) override
{
TRACE("IShellDesktopTray::GetTrayWindow(0x%p)\n", phWndTray);
*phWndTray = m_hWnd;
return S_OK;
}
virtual HRESULT STDMETHODCALLTYPE RegisterDesktopWindow(IN HWND hWndDesktop)
STDMETHODIMP
RegisterDesktopWindow(IN HWND hWndDesktop) override
{
TRACE("IShellDesktopTray::RegisterDesktopWindow(0x%p)\n", hWndDesktop);
@ -3512,7 +3515,8 @@ HandleTrayContextMenu:
return S_OK;
}
virtual HRESULT STDMETHODCALLTYPE Unknown(IN DWORD dwUnknown1, IN DWORD dwUnknown2)
STDMETHODIMP
Unknown(IN DWORD dwUnknown1, IN DWORD dwUnknown2) override
{
TRACE("IShellDesktopTray::Unknown(%u,%u) unimplemented!\n", dwUnknown1, dwUnknown2);
return S_OK;
@ -3524,7 +3528,10 @@ HandleTrayContextMenu:
return S_OK;
}
HRESULT WINAPI GetWindow(HWND* phwnd)
// *** IOleWindow methods ***
STDMETHODIMP
GetWindow(HWND* phwnd) override
{
if (!phwnd)
return E_INVALIDARG;
@ -3532,7 +3539,8 @@ HandleTrayContextMenu:
return S_OK;
}
HRESULT WINAPI ContextSensitiveHelp(BOOL fEnterMode)
STDMETHODIMP
ContextSensitiveHelp(BOOL fEnterMode) override
{
return E_NOTIMPL;
}
@ -3572,12 +3580,12 @@ public:
return S_OK;
}
virtual HRESULT STDMETHODCALLTYPE
QueryContextMenu(HMENU hPopup,
UINT indexMenu,
UINT idCmdFirst,
UINT idCmdLast,
UINT uFlags)
STDMETHODIMP
QueryContextMenu(HMENU hPopup,
UINT indexMenu,
UINT idCmdFirst,
UINT idCmdLast,
UINT uFlags) override
{
HMENU hMenuBase;
@ -3632,8 +3640,8 @@ public:
return S_OK;
}
virtual HRESULT STDMETHODCALLTYPE
InvokeCommand(LPCMINVOKECOMMANDINFO lpici)
STDMETHODIMP
InvokeCommand(LPCMINVOKECOMMANDINFO lpici) override
{
UINT uiCmdId = PtrToUlong(lpici->lpVerb);
if (uiCmdId != 0)
@ -3662,12 +3670,13 @@ public:
return S_OK;
}
virtual HRESULT STDMETHODCALLTYPE
GetCommandString(UINT_PTR idCmd,
STDMETHODIMP
GetCommandString(
UINT_PTR idCmd,
UINT uType,
UINT *pwReserved,
LPSTR pszName,
UINT cchMax)
UINT cchMax) override
{
return E_NOTIMPL;
}