[ros-diffs] [tfaber] 67314: [NETSHELL] - 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...

[tfaber]

Author: tfaber
Date: Sun Apr 19 22:16:34 2015
New Revision: 67314

URL: http://svn.reactos.org/svn/reactos?rev=67314&view=rev
Log:
[NETSHELL]
- 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

Modified:
    trunk/reactos/dll/shellext/netshell/lanstatusui.cpp
    trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp

Modified: trunk/reactos/dll/shellext/netshell/lanstatusui.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lanstatusui.cpp?rev=67314&r1=67313&r2=67314&view=diff
==============================================================================
--- trunk/reactos/dll/shellext/netshell/lanstatusui.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/netshell/lanstatusui.cpp [iso-8859-1] Sun Apr 19 
22:16:34 2015
@@ -1132,7 +1132,7 @@
         AddRef();
         return S_OK;
     }
-    MessageBoxW(NULL, L"IOleCommandTarget_fnQueryInterface", NULL, MB_OK);
+
     return E_NOINTERFACE;
 }
 

Modified: trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp?rev=67314&r1=67313&r2=67314&view=diff
==============================================================================
--- trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp   [iso-8859-1] 
(original)
+++ trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp   [iso-8859-1] 
Sun Apr 19 22:16:34 2015
@@ -27,8 +27,8 @@
 */
 
 class CNetworkConnections final :
+    public IPersistFolder2,
     public IShellFolder2,
-    public IPersistFolder2,
     public IShellExecuteHookW
 {
     public:
@@ -170,26 +170,22 @@
     *ppvObj = NULL;
 
     if (IsEqualIID(riid, IID_IUnknown) ||
-        IsEqualIID(riid, IID_IShellFolder) ||
-        IsEqualIID(riid, IID_IShellFolder2))
+        IsEqualIID (riid, IID_IPersist) ||
+        IsEqualIID (riid, IID_IPersistFolder) ||
+        IsEqualIID (riid, IID_IPersistFolder2))
+    {
+        *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_IPersistFolder) ||
-             IsEqualIID (riid, IID_IPersistFolder2))
-    {
-        *ppvObj = static_cast<IPersistFolder2*>(this);
-    }
     else if (IsEqualIID(riid, IID_IShellExecuteHookW))
     {
         *ppvObj = static_cast<IShellExecuteHookW*>(this);
     }
-#if 0
-    else if (IsEqualIID(riid, IID_IPersistIDList))
-    {
-        //*ppvObj = static_cast<IPersistIDList*>(this);
-    }
-#endif
+
     if (*ppvObj)
     {
         AddRef();
@@ -197,11 +193,9 @@
     }
 
     /* TODO:
-     * IID_IPersistFreeThreadedObject
-     * IID_IBrowserFrameOptions
-     * IID_IShellIconOverlay
-     * IID_IPersistIDList
-     * IID_IPersist
+     * IID_IShellExtInit
+     * IID_IOleCommandTarget
+     * IID_IShellFolderViewCB
      */
 
     return E_NOINTERFACE;