Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 23:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync shell32/shelllink to wine 1.1.32

Browse source 
svn path=/trunk/; revision=44079
This commit is contained in:
Christoph von Wittich 2009-11-10 20:09:00 +00:00
parent 31baf39ed3
commit 1526c2358d
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/dll/win32/shell32/shelllink.c
View file

@ -219,35 +219,35 @@ static HRESULT ShellLink_QueryInterface( IShellLinkImpl *This, REFIID riid, LPV
} }
else if(IsEqualIID(riid, &IID_IShellLinkW)) else if(IsEqualIID(riid, &IID_IShellLinkW))
{ {
*ppvObj = (void *)&(This->lpvtblw); *ppvObj = &(This->lpvtblw);
} }
else if(IsEqualIID(riid, &IID_IPersistFile)) else if(IsEqualIID(riid, &IID_IPersistFile))
{ {
*ppvObj = (void *)&(This->lpvtblPersistFile); *ppvObj = &(This->lpvtblPersistFile);
} }
else if(IsEqualIID(riid, &IID_IPersistStream)) else if(IsEqualIID(riid, &IID_IPersistStream))
{ {
*ppvObj = (void *)&(This->lpvtblPersistStream); *ppvObj = &(This->lpvtblPersistStream);
} }
else if(IsEqualIID(riid, &IID_IShellLinkDataList)) else if(IsEqualIID(riid, &IID_IShellLinkDataList))
{ {
*ppvObj = (void *)&(This->lpvtblShellLinkDataList); *ppvObj = &(This->lpvtblShellLinkDataList);
} }
else if(IsEqualIID(riid, &IID_IShellExtInit)) else if(IsEqualIID(riid, &IID_IShellExtInit))
{ {
*ppvObj = (void *)&(This->lpvtblShellExtInit); *ppvObj = &(This->lpvtblShellExtInit);
} }
else if(IsEqualIID(riid, &IID_IContextMenu)) else if(IsEqualIID(riid, &IID_IContextMenu))
{ {
*ppvObj = (void *)&(This->lpvtblContextMenu); *ppvObj = &(This->lpvtblContextMenu);
} }
else if(IsEqualIID(riid, &IID_IObjectWithSite)) else if(IsEqualIID(riid, &IID_IObjectWithSite))
{ {
*ppvObj = (void *)&(This->lpvtblObjectWithSite); *ppvObj = &(This->lpvtblObjectWithSite);
} }
else if(IsEqualIID(riid, &IID_IShellPropSheetExt)) else if(IsEqualIID(riid, &IID_IShellPropSheetExt))
{ {
*ppvObj = (void *)&(This->lpvtblPropSheetExt); *ppvObj = &(This->lpvtblPropSheetExt);
} }
if(*ppvObj) if(*ppvObj)
@ -299,7 +299,7 @@ static ULONG ShellLink_Release( IShellLinkImpl *This )
if (This->pPidl) if (This->pPidl)
ILFree(This->pPidl); ILFree(This->pPidl);
LocalFree((HANDLE)This); LocalFree(This);
return 0; return 0;
} }
@ -308,7 +308,7 @@ static HRESULT ShellLink_GetClassID( IShellLinkImpl *This, CLSID *pclsid )
{ {
TRACE("%p %p\n", This, pclsid); TRACE("%p %p\n", This, pclsid);
memcpy( pclsid, &CLSID_ShellLink, sizeof (CLSID) ); *pclsid = CLSID_ShellLink;
return S_OK; return S_OK;
} }
@ -1651,6 +1651,8 @@ static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA * iface, LPCSTR pszFile)
TRACE("(%p)->(path=%s)\n",This, pszFile); TRACE("(%p)->(path=%s)\n",This, pszFile);
if (!pszFile) return E_INVALIDARG;
str = HEAP_strdupAtoW(GetProcessHeap(), 0, pszFile); str = HEAP_strdupAtoW(GetProcessHeap(), 0, pszFile);
if( !str ) if( !str )
return E_OUTOFMEMORY; return E_OUTOFMEMORY;