shell32: Remove unnecessary WINAPI and some casts.
This commit is contained in:
parent
d64697a34e
commit
81b9a83d83
|
@ -617,7 +617,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 *iface, HWN
|
|||
} else if ((IsEqualIID(riid,&IID_IShellLinkW) || IsEqualIID(riid,&IID_IShellLinkA))
|
||||
&& (cidl == 1)) {
|
||||
pidl = ILCombine(This->pidlRoot, apidl[0]);
|
||||
hr = IShellLink_ConstructFromFile(NULL, riid, pidl,(LPVOID*)&pObj);
|
||||
hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj);
|
||||
SHFree(pidl);
|
||||
} else {
|
||||
hr = E_NOINTERFACE;
|
||||
|
|
|
@ -86,7 +86,6 @@ HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *
|
|||
HRESULT WINAPI IShellDispatch_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||
HRESULT WINAPI IShellItem_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||
HRESULT WINAPI IShellLink_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||
HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||
HRESULT WINAPI ISF_Desktop_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||
HRESULT WINAPI ISF_MyComputer_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||
HRESULT WINAPI ISF_NetworkPlaces_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||
|
@ -109,6 +108,7 @@ HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIco
|
|||
HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN;
|
||||
HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;
|
||||
|
||||
HRESULT IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, IUnknown **ppv) DECLSPEC_HIDDEN;
|
||||
|
||||
LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN;
|
||||
LPEXTRACTICONW IExtractIconW_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN;
|
||||
|
|
|
@ -1295,8 +1295,8 @@ static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWor
|
|||
/**************************************************************************
|
||||
* IShellLink_ConstructFromFile
|
||||
*/
|
||||
HRESULT WINAPI IShellLink_ConstructFromFile( IUnknown* pUnkOuter, REFIID riid,
|
||||
LPCITEMIDLIST pidl, LPVOID* ppv)
|
||||
HRESULT IShellLink_ConstructFromFile( IUnknown* pUnkOuter, REFIID riid,
|
||||
LPCITEMIDLIST pidl, IUnknown **ppv)
|
||||
{
|
||||
IShellLinkW* psl;
|
||||
|
||||
|
@ -1318,7 +1318,7 @@ HRESULT WINAPI IShellLink_ConstructFromFile( IUnknown* pUnkOuter, REFIID riid,
|
|||
hr = E_FAIL;
|
||||
|
||||
if (SUCCEEDED(hr))
|
||||
*ppv = psl;
|
||||
*ppv = (IUnknown*)psl;
|
||||
|
||||
IPersistFile_Release(ppf);
|
||||
}
|
||||
|
|
|
@ -562,7 +562,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface,
|
|||
IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1))
|
||||
{
|
||||
pidl = ILCombine (This->pidlRoot, apidl[0]);
|
||||
hr = IShellLink_ConstructFromFile(NULL, riid, pidl, (LPVOID*)&pObj);
|
||||
hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj);
|
||||
SHFree (pidl);
|
||||
}
|
||||
else
|
||||
|
|
|
@ -690,7 +690,7 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface,
|
|||
} else if ((IsEqualIID(riid,&IID_IShellLinkW) ||
|
||||
IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) {
|
||||
pidl = ILCombine (This->pidlRoot, apidl[0]);
|
||||
hr = IShellLink_ConstructFromFile(NULL, riid, pidl, (LPVOID*)&pObj);
|
||||
hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj);
|
||||
SHFree (pidl);
|
||||
} else {
|
||||
hr = E_NOINTERFACE;
|
||||
|
|
|
@ -563,7 +563,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface,
|
|||
IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1))
|
||||
{
|
||||
pidl = ILCombine (This->pidlRoot, apidl[0]);
|
||||
hr = IShellLink_ConstructFromFile(NULL, riid, pidl, (LPVOID*) &pObj);
|
||||
hr = IShellLink_ConstructFromFile(NULL, riid, pidl, &pObj);
|
||||
SHFree (pidl);
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue