Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 08:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

- SHGetAppCompatFlags() takes 4 bytes of parameters

Browse source 
- QueryInterface will return NULL for the new pointer if it fails

svn path=/trunk/; revision=11025
This commit is contained in:
Gé van Geldorp 2004-09-24 11:12:44 +00:00
parent 97037edf6b
commit b92ba82e5f
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/lib/shlwapi/ordinal.c
View file

@ -1549,16 +1549,17 @@ DWORD WINAPI IUnknown_SetSite(
LPVOID *p2) /* [out] ptr for call results */
{
DWORD ret, aa;
IUnknown *iobjectwithsite;
if (!p1) return E_FAIL;
/* see if SetSite interface exists for IObjectWithSite object */
ret = IUnknown_QueryInterface((IUnknown *)p1, (REFIID)id1, (LPVOID *)&p1);
TRACE("first IU_QI ret=%08lx, p1=%p\n", ret, p1);
ret = IUnknown_QueryInterface((IUnknown *)p1, (REFIID)id1, (LPVOID *)&iobjectwithsite);
TRACE("first IU_QI ret=%08lx, iobjectwithsite=%p\n", ret, iobjectwithsite);
if (ret) {
/* see if GetClassId interface exists for IPersistMoniker object */
ret = IUnknown_QueryInterface((IUnknown *)p1, (REFIID)id2, (LPVOID *)&aa);
ret = IUnknown_QueryInterface(p1, (REFIID)id2, (LPVOID *)&aa);
TRACE("second IU_QI ret=%08lx, aa=%08lx\n", ret, aa);
if (ret) return ret;
@ -1570,10 +1571,10 @@ DWORD WINAPI IUnknown_SetSite(
}
else {
/* fake a SetSite call */
ret = IOleWindow_GetWindow((IOleWindow *)p1, (HWND*)p2);
ret = IOleWindow_GetWindow((IOleWindow *)iobjectwithsite, (HWND*)p2);
TRACE("first IU_QI doing 0x0c ret=%08lx, *p2=%08lx\n", ret,
*(LPDWORD)p2);
IUnknown_Release((IUnknown *)p1);
IUnknown_Release((IUnknown *)iobjectwithsite);
}
return ret;
}
@ -3978,7 +3979,7 @@ VOID WINAPI FixSlashesAndColonW(LPWSTR lpwstr)
/*************************************************************************
* @ [SHLWAPI.461]
*/
DWORD WINAPI SHGetAppCompatFlags()
DWORD WINAPI SHGetAppCompatFlags(DWORD Unknown)
{
FIXME("stub\n");
return 0;

2
reactos/lib/shlwapi/shlwapi.spec
View file

@ -458,7 +458,7 @@
458 stub -noname GetLongPathNameWrapA
459 stdcall SHExpandEnvironmentStringsA(str ptr long) kernel32.ExpandEnvironmentStringsA
460 stdcall SHExpandEnvironmentStringsW(wstr ptr long) kernel32.ExpandEnvironmentStringsW
461 stdcall -noname SHGetAppCompatFlags()
461 stdcall -noname SHGetAppCompatFlags(long)
462 stub -noname UrlFixupW
463 stub -noname SHExpandEnvironmentStringsForUserA
464 stub -noname SHExpandEnvironmentStringsForUserW