Changeset 70030 in vbox for trunk/src/VBox/Main/src-server/win

Timestamp:

Dec 8, 2017 2:09:19 PM (7 years ago)

Author:

vboxsync

Message:

Main/svcmain.cpp: Backed out r119561 as we won't try instantiate the VirtualBox object without knowing that there aren't competing instances around. This is what we're trying to fix.

File:

• trunk/src/VBox/Main/src-server/win/svcmain.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -432 +432 @@
                         if (SUCCEEDED(hrc) && pOtherVirtualBox)
                             m_pObj = pOtherVirtualBox;
-                        else
+                        else if (SUCCEEDED(hrc))
                         {
-                            /* 
-                            *  Create the instance of VirtualBox if it is primary VBoxSvc.
-                            *  Also do it if the VBoxSDS failed. 
-                            *  In this case the VBoxSVC should work as usual.
-                            */
-                            if(FAILED(hrc))
-                                LogRel(("Warning: registration in VBoxSDS failed with error: %Rhra. "
-                                        "This VBoxSVC instance will continue to work without VBoxSDS support.\n", hrc));
                             ATL::_pAtlModule->Lock();
                             ATL::CComObjectCached<VirtualBox> *p;