[RSHELL] Use STDMETHOD macro and keyword override (#6575)

For simplicity and short typing.
JIRA issue: CORE-19469
- Replace "virtual HRESULT
  STDMETHODCALLTYPE m" with
  "STDMETHOD(m)" (m is a method name).
- Replace "virtual t STDMETHODCALLTYPE
  m" with "STDMETHOD_(t, m)"
  (t is a type. m is a method name).
- Use "override" keyword as possible.
This commit is contained in:
Katayama Hirofumi MZ 2024-03-03 10:14:05 +09:00 committed by GitHub
parent b2d56cf364
commit 5627da4205
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -32,127 +32,96 @@ class CQuickLaunchBand :
CQuickLaunchBand(); CQuickLaunchBand();
virtual ~CQuickLaunchBand(); virtual ~CQuickLaunchBand();
STDMETHOD(ContainsWindow)(IN HWND hWnd);
// ATL construct // ATL construct
HRESULT FinalConstruct(); HRESULT FinalConstruct();
// IObjectWithSite // IObjectWithSite
virtual STDMETHODIMP GetSite( STDMETHOD(GetSite)(
IN REFIID riid, IN REFIID riid,
OUT void **ppvSite OUT void **ppvSite) override;
);
virtual STDMETHODIMP SetSite( STDMETHOD(SetSite)(IN IUnknown *pUnkSite) override;
IN IUnknown *pUnkSite
);
// IDeskBand // IDeskBand
virtual STDMETHODIMP GetWindow( STDMETHOD(GetWindow)(OUT HWND *phwnd) override;
OUT HWND *phwnd
);
virtual STDMETHODIMP ContextSensitiveHelp( STDMETHOD(ContextSensitiveHelp)(IN BOOL fEnterMode) override;
IN BOOL fEnterMode
);
virtual STDMETHODIMP ShowDW( STDMETHOD(ShowDW)(IN BOOL bShow) override;
IN BOOL bShow
);
virtual STDMETHODIMP CloseDW( STDMETHOD(CloseDW)(IN DWORD dwReserved) override;
IN DWORD dwReserved
);
virtual STDMETHODIMP ResizeBorderDW( STDMETHOD(ResizeBorderDW)(
LPCRECT prcBorder, LPCRECT prcBorder,
IUnknown *punkToolbarSite, IUnknown *punkToolbarSite,
BOOL fReserved BOOL fReserved) override;
);
virtual STDMETHODIMP GetBandInfo( STDMETHOD(GetBandInfo)(
IN DWORD dwBandID, IN DWORD dwBandID,
IN DWORD dwViewMode, IN DWORD dwViewMode,
IN OUT DESKBANDINFO *pdbi IN OUT DESKBANDINFO *pdbi) override;
);
// IPersistStream // IPersistStream
virtual STDMETHODIMP GetClassID( STDMETHOD(GetClassID)(OUT CLSID *pClassID) override;
OUT CLSID *pClassID
);
virtual STDMETHODIMP GetSizeMax( STDMETHOD(GetSizeMax)(OUT ULARGE_INTEGER *pcbSize) override;
OUT ULARGE_INTEGER *pcbSize
);
virtual STDMETHODIMP IsDirty(); STDMETHOD(IsDirty)() override;
virtual STDMETHODIMP Load( STDMETHOD(Load)(IN IStream *pStm) override;
IN IStream *pStm
);
virtual STDMETHODIMP Save( STDMETHOD(Save)(
IN IStream *pStm, IN IStream *pStm,
IN BOOL fClearDirty IN BOOL fClearDirty) override;
);
// IWinEventHandler // IWinEventHandler
virtual STDMETHODIMP ContainsWindow( STDMETHOD(OnWinEvent)(
IN HWND hWnd
);
virtual STDMETHODIMP OnWinEvent(
HWND hWnd, HWND hWnd,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,
LPARAM lParam, LPARAM lParam,
LRESULT *theResult LRESULT *theResult) override;
);
virtual STDMETHODIMP IsWindowOwner( STDMETHOD(IsWindowOwner)(HWND hWnd) override;
HWND hWnd
);
// IOleCommandTarget // IOleCommandTarget
virtual STDMETHODIMP Exec( STDMETHOD(Exec)(
IN const GUID *pguidCmdGroup, IN const GUID *pguidCmdGroup,
IN DWORD nCmdID, IN DWORD nCmdID,
IN DWORD nCmdexecopt, IN DWORD nCmdexecopt,
IN VARIANT *pvaIn, IN VARIANT *pvaIn,
IN OUT VARIANT *pvaOut IN OUT VARIANT *pvaOut) override;
);
virtual STDMETHODIMP QueryStatus( STDMETHOD(QueryStatus)(
IN const GUID *pguidCmdGroup, IN const GUID *pguidCmdGroup,
IN ULONG cCmds, IN ULONG cCmds,
IN OUT OLECMD prgCmds[], IN OUT OLECMD prgCmds[],
IN OUT OLECMDTEXT *pCmdText IN OUT OLECMDTEXT *pCmdText) override;
);
// IContextMenu // IContextMenu
virtual STDMETHODIMP GetCommandString( STDMETHOD(GetCommandString)(
UINT_PTR idCmd, UINT_PTR idCmd,
UINT uFlags, UINT uFlags,
UINT *pwReserved, UINT *pwReserved,
LPSTR pszName, LPSTR pszName,
UINT cchMax UINT cchMax) override;
);
virtual STDMETHODIMP InvokeCommand( STDMETHOD(InvokeCommand)(LPCMINVOKECOMMANDINFO pici) override;
LPCMINVOKECOMMANDINFO pici
);
virtual STDMETHODIMP QueryContextMenu( STDMETHOD(QueryContextMenu)(
HMENU hmenu, HMENU hmenu,
UINT indexMenu, UINT indexMenu,
UINT idCmdFirst, UINT idCmdFirst,
UINT idCmdLast, UINT idCmdLast,
UINT uFlags UINT uFlags) override;
);
//***************************************************************************************************** //*****************************************************************************************************