ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Fix remaining cases of implementation pointer being returned.

This commit is contained in:
Nikolay Sivov 2013-09-04 10:12:30 +04:00 committed by Alexandre Julliard
parent af3a20d2ea
commit 725b069e68
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shell32/shfldr_desktop.c
View File

@ -112,7 +112,7 @@ static HRESULT WINAPI ISF_Desktop_fnQueryInterface(
IsEqualIID (riid, &IID_IShellFolder) ||
IsEqualIID (riid, &IID_IShellFolder2))
{
*ppvObj = This;
*ppvObj = &This->IShellFolder2_iface;
}
else if (IsEqualIID (riid, &IID_IPersist) ||
IsEqualIID (riid, &IID_IPersistFolder) ||

2
dlls/shell32/shfldr_mycomp.c
View File

@ -140,7 +140,7 @@ static HRESULT WINAPI ISF_MyComputer_fnQueryInterface (IShellFolder2 *iface,
IsEqualIID (riid, &IID_IShellFolder) ||
IsEqualIID (riid, &IID_IShellFolder2))
{
*ppvObj = This;
*ppvObj = &This->IShellFolder2_iface;
}
else if (IsEqualIID (riid, &IID_IPersist) ||
IsEqualIID (riid, &IID_IPersistFolder) ||

2
dlls/shell32/shfldr_netplaces.c
View File

@ -133,7 +133,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnQueryInterface (IShellFolder2 *iface,
IsEqualIID (riid, &IID_IShellFolder) ||
IsEqualIID (riid, &IID_IShellFolder2))
{
*ppvObj = This;
*ppvObj = &This->IShellFolder2_iface;
}
else if (IsEqualIID (riid, &IID_IPersist) ||
IsEqualIID (riid, &IID_IPersistFolder) ||

2
dlls/shell32/shfldr_printers.c
View File

@ -80,7 +80,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnQueryInterface(IShellFolder2 *ifac
IsEqualIID (riid, &IID_IShellFolder) ||
IsEqualIID (riid, &IID_IShellFolder2))
{
*ppvObj = This;
*ppvObj = &This->IShellFolder2_iface;
}
else if (IsEqualIID (riid, &IID_IPersist) ||
IsEqualIID (riid, &IID_IPersistFolder) ||

14
dlls/shell32/shlview.c
View File

@ -1751,17 +1751,11 @@ static HRESULT WINAPI IShellView_fnQueryInterface(IShellView2 *iface, REFIID rii
*ppvObj = NULL;
if(IsEqualIID(riid, &IID_IUnknown))
if(IsEqualIID(riid, &IID_IUnknown) ||
IsEqualIID(riid, &IID_IShellView) ||
IsEqualIID(riid, &IID_IShellView2))
{
*ppvObj = This;
}
else if(IsEqualIID(riid, &IID_IShellView))
{
*ppvObj = This;
}
else if(IsEqualIID(riid, &IID_IShellView2))
{
*ppvObj = This;
*ppvObj = &This->IShellView2_iface;
}
else if(IsEqualIID(riid, &IID_IShellFolderView))
{

2
dlls/shell32/shlview_cmenu.c
View File

@ -78,7 +78,7 @@ static HRESULT WINAPI ContextMenu_QueryInterface(IContextMenu3 *iface, REFIID ri
IsEqualIID(riid, &IID_IContextMenu2) ||
IsEqualIID(riid, &IID_IContextMenu3))
{
*ppvObj = This;
*ppvObj = &This->IContextMenu3_iface;
}
else if (IsEqualIID(riid, &IID_IShellExtInit)) /*IShellExtInit*/
{