mirror of
https://github.com/reactos/reactos.git
synced 2025-04-20 20:36:35 +00:00
[SHELL32]: CShellLink fixups Part 1:
- Use STDMETHODCALLTYPE for the interface methods calling convention; - Use the naming convention "m_Member" for the class members (note that I haven't applied the convention for some members: because they will go away in the next commits); - Use _countof() where needed; - Make the ANSI CShellLink::GetIconLocation call the UNICODE version; - Move some functions around to put them closer to the functions that call them; - Very minor code formatting. CORE-12682 svn path=/trunk/; revision=73573
This commit is contained in:
Hermès Bélusca-Maïto
parent
749f780aef
commit
0aeb3f07b1
2 changed files with 538 additions and 569 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -39,7 +39,7 @@ class CShellLink :
|
||||||
public IShellPropSheetExt
|
public IShellPropSheetExt
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
/* link file formats */
|
/* Link file formats */
|
||||||
|
|
||||||
#include "pshpack1.h"
|
#include "pshpack1.h"
|
||||||
|
|
||||||
|
|
@ -54,119 +54,128 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/* data structures according to the information in the link */
|
/* data structures according to the information in the link */
|
||||||
LPITEMIDLIST pPidl;
|
|
||||||
WORD wHotKey;
|
WORD wHotKey;
|
||||||
SYSTEMTIME time1;
|
SYSTEMTIME time1;
|
||||||
SYSTEMTIME time2;
|
SYSTEMTIME time2;
|
||||||
SYSTEMTIME time3;
|
SYSTEMTIME time3;
|
||||||
|
|
||||||
DWORD iShowCmd;
|
DWORD iShowCmd;
|
||||||
LPWSTR sIcoPath;
|
|
||||||
INT iIcoNdx;
|
INT iIcoNdx;
|
||||||
LPWSTR sPath;
|
|
||||||
LPWSTR sArgs;
|
/* Cached data set according to m_Header.dwFlags (SHELL_LINK_DATA_FLAGS) */
|
||||||
LPWSTR sWorkDir;
|
|
||||||
LPWSTR sDescription;
|
LPITEMIDLIST m_pPidl;
|
||||||
LPWSTR sPathRel;
|
|
||||||
|
/* Link tracker information */
|
||||||
|
LPWSTR m_sPath;
|
||||||
|
volume_info volume;
|
||||||
|
|
||||||
|
LPWSTR m_sDescription;
|
||||||
|
LPWSTR m_sPathRel;
|
||||||
|
LPWSTR m_sWorkDir;
|
||||||
|
LPWSTR m_sArgs;
|
||||||
|
LPWSTR m_sIcoPath;
|
||||||
|
BOOL m_bRunAs;
|
||||||
|
BOOL m_bDirty;
|
||||||
|
|
||||||
LPWSTR sProduct;
|
LPWSTR sProduct;
|
||||||
LPWSTR sComponent;
|
LPWSTR sComponent;
|
||||||
volume_info volume;
|
|
||||||
LPWSTR sLinkPath;
|
LPWSTR m_sLinkPath;
|
||||||
BOOL bRunAs;
|
INT m_iIdOpen; /* ID of the "Open" entry in the context menu */
|
||||||
BOOL bDirty;
|
|
||||||
INT iIdOpen; /* id of the "Open" entry in the context menu */
|
CComPtr<IUnknown> m_site;
|
||||||
CComPtr<IUnknown> site;
|
CComPtr<IDropTarget> m_DropTarget;
|
||||||
CComPtr<IDropTarget> mDropTarget;
|
|
||||||
public:
|
public:
|
||||||
CShellLink();
|
CShellLink();
|
||||||
~CShellLink();
|
~CShellLink();
|
||||||
LPWSTR ShellLink_GetAdvertisedArg(LPCWSTR str);
|
HRESULT SetAdvertiseInfo(LPCWSTR str);
|
||||||
HRESULT ShellLink_SetAdvertiseInfo(LPCWSTR str);
|
|
||||||
static INT_PTR CALLBACK SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
static INT_PTR CALLBACK SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
|
||||||
|
|
||||||
// IPersistFile
|
// IPersistFile
|
||||||
virtual HRESULT WINAPI GetClassID(CLSID *pclsid);
|
virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pclsid);
|
||||||
virtual HRESULT WINAPI IsDirty();
|
virtual HRESULT STDMETHODCALLTYPE IsDirty();
|
||||||
virtual HRESULT WINAPI Load(LPCOLESTR pszFileName, DWORD dwMode);
|
virtual HRESULT STDMETHODCALLTYPE Load(LPCOLESTR pszFileName, DWORD dwMode);
|
||||||
virtual HRESULT WINAPI Save(LPCOLESTR pszFileName, BOOL fRemember);
|
virtual HRESULT STDMETHODCALLTYPE Save(LPCOLESTR pszFileName, BOOL fRemember);
|
||||||
virtual HRESULT WINAPI SaveCompleted(LPCOLESTR pszFileName);
|
virtual HRESULT STDMETHODCALLTYPE SaveCompleted(LPCOLESTR pszFileName);
|
||||||
virtual HRESULT WINAPI GetCurFile(LPOLESTR *ppszFileName);
|
virtual HRESULT STDMETHODCALLTYPE GetCurFile(LPOLESTR *ppszFileName);
|
||||||
|
|
||||||
// IPersistStream
|
// IPersistStream
|
||||||
// virtual WINAPI HRESULT GetClassID(CLSID *pclsid);
|
// virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pclsid);
|
||||||
// virtual HRESULT WINAPI IsDirty();
|
// virtual HRESULT STDMETHODCALLTYPE IsDirty();
|
||||||
virtual HRESULT WINAPI Load(IStream *stm);
|
virtual HRESULT STDMETHODCALLTYPE Load(IStream *stm);
|
||||||
virtual HRESULT WINAPI Save(IStream *stm, BOOL fClearDirty);
|
virtual HRESULT STDMETHODCALLTYPE Save(IStream *stm, BOOL fClearDirty);
|
||||||
virtual HRESULT WINAPI GetSizeMax(ULARGE_INTEGER *pcbSize);
|
virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize);
|
||||||
|
|
||||||
// IShellLinkA
|
// IShellLinkA
|
||||||
virtual HRESULT WINAPI GetPath(LPSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags);
|
virtual HRESULT STDMETHODCALLTYPE GetPath(LPSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags);
|
||||||
virtual HRESULT WINAPI GetIDList(LPITEMIDLIST * ppidl);
|
virtual HRESULT STDMETHODCALLTYPE GetIDList(LPITEMIDLIST *ppidl);
|
||||||
virtual HRESULT WINAPI SetIDList(LPCITEMIDLIST pidl);
|
virtual HRESULT STDMETHODCALLTYPE SetIDList(LPCITEMIDLIST pidl);
|
||||||
virtual HRESULT WINAPI GetDescription(LPSTR pszName,INT cchMaxName);
|
virtual HRESULT STDMETHODCALLTYPE GetDescription(LPSTR pszName, INT cchMaxName);
|
||||||
virtual HRESULT WINAPI SetDescription(LPCSTR pszName);
|
virtual HRESULT STDMETHODCALLTYPE SetDescription(LPCSTR pszName);
|
||||||
virtual HRESULT WINAPI GetWorkingDirectory(LPSTR pszDir,INT cchMaxPath);
|
virtual HRESULT STDMETHODCALLTYPE GetWorkingDirectory(LPSTR pszDir, INT cchMaxPath);
|
||||||
virtual HRESULT WINAPI SetWorkingDirectory(LPCSTR pszDir);
|
virtual HRESULT STDMETHODCALLTYPE SetWorkingDirectory(LPCSTR pszDir);
|
||||||
virtual HRESULT WINAPI GetArguments(LPSTR pszArgs,INT cchMaxPath);
|
virtual HRESULT STDMETHODCALLTYPE GetArguments(LPSTR pszArgs, INT cchMaxPath);
|
||||||
virtual HRESULT WINAPI SetArguments(LPCSTR pszArgs);
|
virtual HRESULT STDMETHODCALLTYPE SetArguments(LPCSTR pszArgs);
|
||||||
virtual HRESULT WINAPI GetHotkey(WORD *pwHotkey);
|
virtual HRESULT STDMETHODCALLTYPE GetHotkey(WORD *pwHotkey);
|
||||||
virtual HRESULT WINAPI SetHotkey(WORD wHotkey);
|
virtual HRESULT STDMETHODCALLTYPE SetHotkey(WORD wHotkey);
|
||||||
virtual HRESULT WINAPI GetShowCmd(INT *piShowCmd);
|
virtual HRESULT STDMETHODCALLTYPE GetShowCmd(INT *piShowCmd);
|
||||||
virtual HRESULT WINAPI SetShowCmd(INT iShowCmd);
|
virtual HRESULT STDMETHODCALLTYPE SetShowCmd(INT iShowCmd);
|
||||||
virtual HRESULT WINAPI GetIconLocation(LPSTR pszIconPath,INT cchIconPath,INT *piIcon);
|
virtual HRESULT STDMETHODCALLTYPE GetIconLocation(LPSTR pszIconPath, INT cchIconPath, INT *piIcon);
|
||||||
virtual HRESULT WINAPI SetIconLocation(LPCSTR pszIconPath,INT iIcon);
|
virtual HRESULT STDMETHODCALLTYPE SetIconLocation(LPCSTR pszIconPath, INT iIcon);
|
||||||
virtual HRESULT WINAPI SetRelativePath(LPCSTR pszPathRel, DWORD dwReserved);
|
virtual HRESULT STDMETHODCALLTYPE SetRelativePath(LPCSTR pszPathRel, DWORD dwReserved);
|
||||||
virtual HRESULT WINAPI Resolve(HWND hwnd, DWORD fFlags);
|
virtual HRESULT STDMETHODCALLTYPE Resolve(HWND hwnd, DWORD fFlags);
|
||||||
virtual HRESULT WINAPI SetPath(LPCSTR pszFile);
|
virtual HRESULT STDMETHODCALLTYPE SetPath(LPCSTR pszFile);
|
||||||
|
|
||||||
// IShellLinkW
|
// IShellLinkW
|
||||||
virtual HRESULT WINAPI GetPath(LPWSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags);
|
virtual HRESULT STDMETHODCALLTYPE GetPath(LPWSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags);
|
||||||
// virtual HRESULT WINAPI GetIDList(LPITEMIDLIST *ppidl);
|
// virtual HRESULT STDMETHODCALLTYPE GetIDList(LPITEMIDLIST *ppidl);
|
||||||
// virtual HRESULT WINAPI SetIDList(LPCITEMIDLIST pidl);
|
// virtual HRESULT STDMETHODCALLTYPE SetIDList(LPCITEMIDLIST pidl);
|
||||||
virtual HRESULT WINAPI GetDescription(LPWSTR pszName, INT cchMaxName);
|
virtual HRESULT STDMETHODCALLTYPE GetDescription(LPWSTR pszName, INT cchMaxName);
|
||||||
virtual HRESULT WINAPI SetDescription(LPCWSTR pszName);
|
virtual HRESULT STDMETHODCALLTYPE SetDescription(LPCWSTR pszName);
|
||||||
virtual HRESULT WINAPI GetWorkingDirectory(LPWSTR pszDir, INT cchMaxPath);
|
virtual HRESULT STDMETHODCALLTYPE GetWorkingDirectory(LPWSTR pszDir, INT cchMaxPath);
|
||||||
virtual HRESULT WINAPI SetWorkingDirectory(LPCWSTR pszDir);
|
virtual HRESULT STDMETHODCALLTYPE SetWorkingDirectory(LPCWSTR pszDir);
|
||||||
virtual HRESULT WINAPI GetArguments(LPWSTR pszArgs,INT cchMaxPath);
|
virtual HRESULT STDMETHODCALLTYPE GetArguments(LPWSTR pszArgs, INT cchMaxPath);
|
||||||
virtual HRESULT WINAPI SetArguments(LPCWSTR pszArgs);
|
virtual HRESULT STDMETHODCALLTYPE SetArguments(LPCWSTR pszArgs);
|
||||||
// virtual HRESULT WINAPI GetHotkey(WORD *pwHotkey);
|
// virtual HRESULT STDMETHODCALLTYPE GetHotkey(WORD *pwHotkey);
|
||||||
// virtual HRESULT WINAPI SetHotkey(WORD wHotkey);
|
// virtual HRESULT STDMETHODCALLTYPE SetHotkey(WORD wHotkey);
|
||||||
// virtual HRESULT WINAPI GetShowCmd(INT *piShowCmd);
|
// virtual HRESULT STDMETHODCALLTYPE GetShowCmd(INT *piShowCmd);
|
||||||
// virtual HRESULT WINAPI SetShowCmd(INT iShowCmd);
|
// virtual HRESULT STDMETHODCALLTYPE SetShowCmd(INT iShowCmd);
|
||||||
virtual HRESULT WINAPI GetIconLocation(LPWSTR pszIconPath,INT cchIconPath,INT *piIcon);
|
virtual HRESULT STDMETHODCALLTYPE GetIconLocation(LPWSTR pszIconPath, INT cchIconPath, INT *piIcon);
|
||||||
virtual HRESULT WINAPI SetIconLocation(LPCWSTR pszIconPath,INT iIcon);
|
virtual HRESULT STDMETHODCALLTYPE SetIconLocation(LPCWSTR pszIconPath, INT iIcon);
|
||||||
virtual HRESULT WINAPI SetRelativePath(LPCWSTR pszPathRel, DWORD dwReserved);
|
virtual HRESULT STDMETHODCALLTYPE SetRelativePath(LPCWSTR pszPathRel, DWORD dwReserved);
|
||||||
// virtual HRESULT WINAPI Resolve(HWND hwnd, DWORD fFlags);
|
// virtual HRESULT STDMETHODCALLTYPE Resolve(HWND hwnd, DWORD fFlags);
|
||||||
virtual HRESULT WINAPI SetPath(LPCWSTR pszFile);
|
virtual HRESULT STDMETHODCALLTYPE SetPath(LPCWSTR pszFile);
|
||||||
|
|
||||||
// IShellLinkDataList
|
// IShellLinkDataList
|
||||||
virtual HRESULT WINAPI AddDataBlock(void *pDataBlock);
|
virtual HRESULT STDMETHODCALLTYPE AddDataBlock(void *pDataBlock);
|
||||||
virtual HRESULT WINAPI CopyDataBlock(DWORD dwSig, void **ppDataBlock);
|
virtual HRESULT STDMETHODCALLTYPE CopyDataBlock(DWORD dwSig, void **ppDataBlock);
|
||||||
virtual HRESULT WINAPI RemoveDataBlock(DWORD dwSig);
|
virtual HRESULT STDMETHODCALLTYPE RemoveDataBlock(DWORD dwSig);
|
||||||
virtual HRESULT WINAPI GetFlags(DWORD *pdwFlags);
|
virtual HRESULT STDMETHODCALLTYPE GetFlags(DWORD *pdwFlags);
|
||||||
virtual HRESULT WINAPI SetFlags(DWORD dwFlags);
|
virtual HRESULT STDMETHODCALLTYPE SetFlags(DWORD dwFlags);
|
||||||
|
|
||||||
// IShellExtInit
|
// IShellExtInit
|
||||||
virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID);
|
virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID);
|
||||||
|
|
||||||
// IContextMenu
|
// IContextMenu
|
||||||
virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags);
|
virtual HRESULT STDMETHODCALLTYPE QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags);
|
||||||
virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici);
|
virtual HRESULT STDMETHODCALLTYPE InvokeCommand(LPCMINVOKECOMMANDINFO lpici);
|
||||||
virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax);
|
virtual HRESULT STDMETHODCALLTYPE GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax);
|
||||||
|
|
||||||
// IShellPropSheetExt
|
// IShellPropSheetExt
|
||||||
virtual HRESULT WINAPI AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam);
|
virtual HRESULT STDMETHODCALLTYPE AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam);
|
||||||
virtual HRESULT WINAPI ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam);
|
virtual HRESULT STDMETHODCALLTYPE ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam);
|
||||||
|
|
||||||
// IObjectWithSite
|
// IObjectWithSite
|
||||||
virtual HRESULT WINAPI SetSite(IUnknown *punk);
|
virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *punk);
|
||||||
virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite);
|
virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID iid, void **ppvSite);
|
||||||
|
|
||||||
// IDropTarget
|
// IDropTarget
|
||||||
virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
|
virtual HRESULT STDMETHODCALLTYPE DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
|
||||||
virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
|
virtual HRESULT STDMETHODCALLTYPE DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
|
||||||
virtual HRESULT WINAPI DragLeave();
|
virtual HRESULT STDMETHODCALLTYPE DragLeave();
|
||||||
virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
|
virtual HRESULT STDMETHODCALLTYPE Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);
|
||||||
|
|
||||||
DECLARE_REGISTRY_RESOURCEID(IDR_SHELLLINK)
|
DECLARE_REGISTRY_RESOURCEID(IDR_SHELLLINK)
|
||||||
DECLARE_NOT_AGGREGATABLE(CShellLink)
|
DECLARE_NOT_AGGREGATABLE(CShellLink)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue