Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 12:29:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NETSHELL] Use STDMETHOD macro and keyword override (#6568)

Browse source 
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-02 21:38:52 +09:00 committed by GitHub
parent 24fb46c405
commit b2d56cf364
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dll/shellext/netshell/connectmanager.h
View file

@ -18,13 +18,13 @@ class CNetConnectionManager:
HRESULT EnumerateINetConnections(); HRESULT EnumerateINetConnections();
// INetConnectionManager // INetConnectionManager
virtual HRESULT WINAPI EnumConnections(NETCONMGR_ENUM_FLAGS Flags, IEnumNetConnection **ppEnum); STDMETHOD(EnumConnections)(NETCONMGR_ENUM_FLAGS Flags, IEnumNetConnection **ppEnum) override;
// IEnumNetConnection // IEnumNetConnection
virtual HRESULT WINAPI Next(ULONG celt, INetConnection **rgelt, ULONG *pceltFetched); STDMETHOD(Next)(ULONG celt, INetConnection **rgelt, ULONG *pceltFetched) override;
virtual HRESULT WINAPI Skip(ULONG celt); STDMETHOD(Skip)(ULONG celt) override;
virtual HRESULT WINAPI Reset(); STDMETHOD(Reset)() override;
virtual HRESULT WINAPI Clone(IEnumNetConnection **ppenum); STDMETHOD(Clone)(IEnumNetConnection **ppenum) override;
private: private:
PINetConnectionItem m_pHead; PINetConnectionItem m_pHead;
@ -54,13 +54,13 @@ class CNetConnection:
HRESULT WINAPI Initialize(PINetConnectionItem pItem); HRESULT WINAPI Initialize(PINetConnectionItem pItem);
// INetConnection // INetConnection
HRESULT WINAPI Connect(); STDMETHOD(Connect)() override;
HRESULT WINAPI Disconnect(); STDMETHOD(Disconnect)() override;
HRESULT WINAPI Delete(); STDMETHOD(Delete)() override;
HRESULT WINAPI Duplicate(LPCWSTR pszwDuplicateName, INetConnection **ppCon); STDMETHOD(Duplicate)(LPCWSTR pszwDuplicateName, INetConnection **ppCon) override;
HRESULT WINAPI GetProperties(NETCON_PROPERTIES **ppProps); STDMETHOD(GetProperties)(NETCON_PROPERTIES **ppProps) override;
HRESULT WINAPI GetUiObjectClassId(CLSID *pclsid); STDMETHOD(GetUiObjectClassId)(CLSID *pclsid) override;
HRESULT WINAPI Rename(LPCWSTR pszwDuplicateName); STDMETHOD(Rename)(LPCWSTR pszwDuplicateName) override;
DECLARE_NOT_AGGREGATABLE(CNetConnection) DECLARE_NOT_AGGREGATABLE(CNetConnection)
DECLARE_PROTECT_FINAL_CONSTRUCT() DECLARE_PROTECT_FINAL_CONSTRUCT()

8
dll/shellext/netshell/enumlist.cpp
View file

@ -137,10 +137,10 @@ class CEnumIDList:
HRESULT Initialize(); HRESULT Initialize();
// IEnumIDList // IEnumIDList
virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt, PITEMID_CHILD *rgelt, ULONG *pceltFetched); STDMETHOD(Next)(ULONG celt, PITEMID_CHILD *rgelt, ULONG *pceltFetched) override;
virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt); STDMETHOD(Skip)(ULONG celt) override;
virtual HRESULT STDMETHODCALLTYPE Reset(); STDMETHOD(Reset)() override;
virtual HRESULT STDMETHODCALLTYPE Clone(IEnumIDList **ppenum); STDMETHOD(Clone)(IEnumIDList **ppenum) override;
private: private:
BOOL AddToEnumList(PITEMID_CHILD pidl); BOOL AddToEnumList(PITEMID_CHILD pidl);

12
dll/shellext/netshell/lanconnectui.h
View file

@ -31,16 +31,16 @@ class CNetConnectionPropertyUi:
~CNetConnectionPropertyUi(); ~CNetConnectionPropertyUi();
// INetConnectionPropertyUi2 // INetConnectionPropertyUi2
virtual HRESULT WINAPI AddPages(HWND hwndParent, LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam); STDMETHOD(AddPages)(HWND hwndParent, LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) override;
virtual HRESULT WINAPI GetIcon(DWORD dwSize, HICON *phIcon); STDMETHOD(GetIcon)(DWORD dwSize, HICON *phIcon) override;
// INetLanConnectionUiInfo // INetLanConnectionUiInfo
virtual HRESULT WINAPI GetDeviceGuid(GUID *pGuid); STDMETHOD(GetDeviceGuid)(GUID *pGuid) override;
// INetConnectionConnectUi // INetConnectionConnectUi
virtual HRESULT WINAPI SetConnection(INetConnection* pCon); STDMETHOD(SetConnection)(INetConnection* pCon) override;
virtual HRESULT WINAPI Connect(HWND hwndParent, DWORD dwFlags); STDMETHOD(Connect)(HWND hwndParent, DWORD dwFlags) override;
virtual HRESULT WINAPI Disconnect(HWND hwndParent, DWORD dwFlags); STDMETHOD(Disconnect)(HWND hwndParent, DWORD dwFlags) override;
private: private:
BOOL GetINetCfgComponent(INetCfg *pNCfg, INetCfgComponent ** pOut); BOOL GetINetCfgComponent(INetCfg *pNCfg, INetCfgComponent ** pOut);

4
dll/shellext/netshell/lanstatusui.h
View file

@ -40,8 +40,8 @@ class CLanStatus:
CLanStatus(); CLanStatus();
// IOleCommandTarget // IOleCommandTarget
virtual HRESULT WINAPI QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText); STDMETHOD(QueryStatus)(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText) override;
virtual HRESULT WINAPI Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); STDMETHOD(Exec)(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) override;
private: private:
HRESULT InitializeNetTaskbarNotifications(); HRESULT InitializeNetTaskbarNotifications();

72
dll/shellext/netshell/shfldr_netconnect.h
View file

@ -22,43 +22,43 @@ class CNetworkConnections:
~CNetworkConnections(); ~CNetworkConnections();
// IPersistFolder2 // IPersistFolder2
virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); STDMETHOD(GetClassID)(CLSID *lpClassId) override;
virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidl); STDMETHOD(Initialize)(PCIDLIST_ABSOLUTE pidl) override;
virtual HRESULT WINAPI GetCurFolder(PIDLIST_ABSOLUTE *pidl); STDMETHOD(GetCurFolder)(PIDLIST_ABSOLUTE *pidl) override;
// IShellFolder // IShellFolder
virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); STDMETHOD(ParseDisplayName)(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes) override;
virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); STDMETHOD(EnumObjects)(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) override;
virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); STDMETHOD(BindToObject)(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) override;
virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); STDMETHOD(BindToStorage)(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) override;
virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); STDMETHOD(CompareIDs)(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) override;
virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); STDMETHOD(CreateViewObject)(HWND hwndOwner, REFIID riid, LPVOID *ppvOut) override;
virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); STDMETHOD(GetAttributesOf)(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) override;
virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); STDMETHOD(GetUIObjectOf)(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) override;
virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); STDMETHOD(GetDisplayNameOf)(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) override;
virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); STDMETHOD(SetNameOf)(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) override;
// IShellFolder2 // IShellFolder2
virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); STDMETHOD(GetDefaultSearchGUID)(GUID *pguid) override;
virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); STDMETHOD(EnumSearches)(IEnumExtraSearch **ppenum) override;
virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); STDMETHOD(GetDefaultColumn)(DWORD dwRes, ULONG *pSort, ULONG *pDisplay) override;
virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); STDMETHOD(GetDefaultColumnState)(UINT iColumn, DWORD *pcsFlags) override;
virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); STDMETHOD(GetDetailsEx)(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) override;
virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); STDMETHOD(GetDetailsOf)(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) override;
virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); STDMETHOD(MapColumnToSCID)(UINT column, SHCOLUMNID *pscid) override;
// IShellExtInit // IShellExtInit
virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); STDMETHOD(Initialize)(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) override;
// IOleCommandTarget // IOleCommandTarget
virtual HRESULT WINAPI Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); STDMETHOD(Exec)(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) override;
virtual HRESULT WINAPI QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText); STDMETHOD(QueryStatus)(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) override;
// IShellFolderViewCB // IShellFolderViewCB
virtual HRESULT WINAPI MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam); STDMETHOD(MessageSFVCB)(UINT uMsg, WPARAM wParam, LPARAM lParam) override;
// IShellExecuteHookW // IShellExecuteHookW
virtual HRESULT WINAPI Execute(LPSHELLEXECUTEINFOW pei); STDMETHOD(Execute)(LPSHELLEXECUTEINFOW pei) override;
private: private:
@ -103,23 +103,23 @@ class CNetConUiObject:
HRESULT WINAPI Initialize(PCUITEMID_CHILD pidl, IOleCommandTarget *lpOleCmd); HRESULT WINAPI Initialize(PCUITEMID_CHILD pidl, IOleCommandTarget *lpOleCmd);
// IContextMenu3 // IContextMenu3
virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); STDMETHOD(QueryContextMenu)(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) override;
virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici); STDMETHOD(InvokeCommand)(LPCMINVOKECOMMANDINFO lpici) override;
virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax); STDMETHOD(GetCommandString)(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax) override;
virtual HRESULT WINAPI HandleMenuMsg( UINT uMsg, WPARAM wParam, LPARAM lParam); STDMETHOD(HandleMenuMsg)( UINT uMsg, WPARAM wParam, LPARAM lParam) override;
virtual HRESULT WINAPI HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult); STDMETHOD(HandleMenuMsg2)(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) override;
// IObjectWithSite // IObjectWithSite
virtual HRESULT WINAPI SetSite(IUnknown *punk); STDMETHOD(SetSite)(IUnknown *punk) override;
virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite); STDMETHOD(GetSite)(REFIID iid, void **ppvSite) override;
// IQueryInfo // IQueryInfo
virtual HRESULT WINAPI GetInfoFlags(DWORD *pdwFlags); STDMETHOD(GetInfoFlags)(DWORD *pdwFlags) override;
virtual HRESULT WINAPI GetInfoTip(DWORD dwFlags, WCHAR **ppwszTip); STDMETHOD(GetInfoTip)(DWORD dwFlags, WCHAR **ppwszTip) override;
// IExtractIconW // IExtractIconW
virtual HRESULT STDMETHODCALLTYPE GetIconLocation(UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags); STDMETHOD(GetIconLocation)(UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) override;
virtual HRESULT STDMETHODCALLTYPE Extract(LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); STDMETHOD(Extract)(LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) override;
BEGIN_COM_MAP(CNetConUiObject) BEGIN_COM_MAP(CNetConUiObject)
COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu3) COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu3)