Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-21 12:40:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NETSHELL]

Browse source 
- Do not display a message box in CLanStatus::QueryInterface. Fixes hang when running com_apitest:netshell
- Change the order of some interfaces in CNetworkConnections to make com_apitest slightly happier

svn path=/trunk/; revision=67314
This commit is contained in:
Thomas Faber 2015-04-19 22:16:34 +00:00
parent a04d175469
commit a7e56b4256
2 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/shellext/netshell/lanstatusui.cpp
View file

@ -1132,7 +1132,7 @@ CLanStatus::QueryInterface(
AddRef(); AddRef();
return S_OK; return S_OK;
} }
MessageBoxW(NULL, L"IOleCommandTarget_fnQueryInterface", NULL, MB_OK);
return E_NOINTERFACE; return E_NOINTERFACE;
} }

32
reactos/dll/shellext/netshell/shfldr_netconnect.cpp
View file

@ -27,8 +27,8 @@
*/ */
class CNetworkConnections final : class CNetworkConnections final :
public IShellFolder2,
public IPersistFolder2, public IPersistFolder2,
public IShellFolder2,
public IShellExecuteHookW public IShellExecuteHookW
{ {
public: public:
@ -170,26 +170,22 @@ HRESULT WINAPI CNetworkConnections::QueryInterface(REFIID riid, LPVOID *ppvObj)
*ppvObj = NULL; *ppvObj = NULL;
if (IsEqualIID(riid, IID_IUnknown) || if (IsEqualIID(riid, IID_IUnknown) ||
IsEqualIID(riid, IID_IShellFolder) || IsEqualIID (riid, IID_IPersist) ||
IsEqualIID(riid, IID_IShellFolder2)) IsEqualIID (riid, IID_IPersistFolder) ||
{ IsEqualIID (riid, IID_IPersistFolder2))
*ppvObj = static_cast<IShellFolder2*>(this);
}
else if (IsEqualIID (riid, IID_IPersistFolder) ||
IsEqualIID (riid, IID_IPersistFolder2))
{ {
*ppvObj = static_cast<IPersistFolder2*>(this); *ppvObj = static_cast<IPersistFolder2*>(this);
} }
else if (IsEqualIID(riid, IID_IShellFolder) ||
IsEqualIID(riid, IID_IShellFolder2))
{
*ppvObj = static_cast<IShellFolder2*>(this);
}
else if (IsEqualIID(riid, IID_IShellExecuteHookW)) else if (IsEqualIID(riid, IID_IShellExecuteHookW))
{ {
*ppvObj = static_cast<IShellExecuteHookW*>(this); *ppvObj = static_cast<IShellExecuteHookW*>(this);
} }
#if 0
else if (IsEqualIID(riid, IID_IPersistIDList))
{
//*ppvObj = static_cast<IPersistIDList*>(this);
}
#endif
if (*ppvObj) if (*ppvObj)
{ {
AddRef(); AddRef();
@ -197,11 +193,9 @@ HRESULT WINAPI CNetworkConnections::QueryInterface(REFIID riid, LPVOID *ppvObj)
} }
/* TODO: /* TODO:
* IID_IPersistFreeThreadedObject * IID_IShellExtInit
* IID_IBrowserFrameOptions * IID_IOleCommandTarget
* IID_IShellIconOverlay * IID_IShellFolderViewCB
* IID_IPersistIDList
* IID_IPersist
*/ */
return E_NOINTERFACE; return E_NOINTERFACE;