Changeset 66563 in vbox

Timestamp:

Apr 13, 2017 4:08:23 PM (7 years ago)

Author:

vboxsync

Message:

VBox/Main: ​​​bugref:3300: VBoxSVC from terminal server session is not 'visible' - fix to make WMI validation of Disabled Windows service to be optional. switched VBOX_WITH_SDS =1 temporary agian

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Main/src-client/VirtualBoxClientImpl.cpp (modified) (5 diffs)

trunk/Config.kmk

@@ -923 +923 @@
 endif
 # disabled by default
-VBOX_WITH_SDS =
+VBOX_WITH_SDS = 1
 
 

trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp

@@ -65 +65 @@
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef VBOX_WITH_SDS
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
 
 HRESULT CreateVirtualBoxThroughSDS(ComPtr<IVirtualBox> &aVirtualBox)
@@ -286 +286 @@
 {
 
-#ifdef VBOX_WITH_SDS
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
     // setup COM Security to enable impersonation
     // This works for console Virtual Box clients, GUI has own security settings
@@ -327 +327 @@
         mData.m_SemEvWatcher = NIL_RTSEMEVENT;
 
-#ifdef VBOX_WITH_SDS
-        // TODO: AM create virtual box through SDS
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
         rc = CreateVirtualBoxThroughSDS(mData.m_pVirtualBox);
 #else
@@ -441 +440 @@
     if (FAILED(hrc))
     {
-        return setError(hrcCaller, tr("Failed to get information about VBoxSDS using WMI:: %Rhrc & %Rhrc"), hrcCaller, hrc);
+        LogRelFunc(("Warning: Failed to get information about VBoxSDS using WMI:: %Rhrc & %Rhrc"), hrcCaller, hrc));
+        bIsVBoxSDSDisabled = false;
+        //return setError(hrcCaller, tr("Failed to get information about VBoxSDS using WMI:: %Rhrc & %Rhrc"), hrcCaller, hrc);
     }
     if (bIsVBoxSDSDisabled)
@@ -628 +629 @@
     LogFlowThisFunc(("\n"));
 
-#ifdef VBOX_WITH_SDS
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
     ReleaseVirtualBoxThroughSDS();
 #endif