Changeset 45680 in vbox for trunk/src

Timestamp:

Apr 23, 2013 1:00:08 PM (12 years ago)

Author:

vboxsync

Message:

Main/VRDEServer: Back out code to disable VRDE server if no graphics controller is present. Would be inconsistent behavior, as it blocks other input/output channels which still exist.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• include/VRDEServerImpl.h (modified) (1 diff)
• src-client/ConsoleVRDPServer.cpp (modified) (1 diff)
• src-server/VRDEServerImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -16572 +16572 @@
   <interface
     name="IVRDEServer" extends="$unknown"
-    uuid="e129c465-b575-48ea-adbb-49cbd9d3d458"
+    uuid="d38de40a-c2c1-4e95-b5a4-167b05f5694c"
     wsmap="managed"
     >
-    <attribute name="checkPrerequisites" type="boolean" readonly="yes">
-      <desc>Checks if the prerequisites for running the VRDE server are
-      fulfilled, returns @c true if they are.</desc>
-    </attribute>
 
     <attribute name="enabled" type="boolean">

trunk/src/VBox/Main/include/VRDEServerImpl.h

@@ -66 +66 @@
 
     // IVRDEServer properties
-    STDMETHOD(COMGETTER(CheckPrerequisites))(BOOL *aCheckPrerequisites);
     STDMETHOD(COMGETTER(Enabled))(BOOL *aEnabled);
     STDMETHOD(COMSETTER(Enabled))(BOOL aEnable);

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

@@ -1432 +1432 @@
 
     /*
-     * Check if the prerequisites for VRDE are present.
-     */
-    BOOL fPrerequisites;
-    HRESULT hrc = server->COMGETTER(CheckPrerequisites)(&fPrerequisites);
-    AssertComRCReturn(hrc, Global::vboxStatusCodeFromCOM(hrc));
-    if (!fPrerequisites)
-    {
-        LogRel(("VRDE: prerequisite missing, skipped start\n"));
-        return VINF_SUCCESS;
-    }
-
-    /*
      * Check if VRDE is enabled.
      */
     BOOL fEnabled;
-    hrc = server->COMGETTER(Enabled)(&fEnabled);
+    HRESULT hrc = server->COMGETTER(Enabled)(&fEnabled);
     AssertComRCReturn(hrc, Global::vboxStatusCodeFromCOM(hrc));
     if (!fEnabled)

trunk/src/VBox/Main/src-server/VRDEServerImpl.cpp

@@ -245 +245 @@
 // IVRDEServer properties
 /////////////////////////////////////////////////////////////////////////////
-
-STDMETHODIMP VRDEServer::COMGETTER(CheckPrerequisites)(BOOL *aCheckPrerequisites)
-{
-    CheckComArgOutPointerValid(aCheckPrerequisites);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    BOOL res = TRUE;
-    GraphicsControllerType_T graphicsController = GraphicsControllerType_Null;
-    HRESULT rc = mParent->COMGETTER(GraphicsControllerType)(&graphicsController);
-    if (SUCCEEDED(rc))
-        res &= (graphicsController != GraphicsControllerType_Null);
-    else
-        res = FALSE;
-
-    *aCheckPrerequisites = res;
-
-    return S_OK;
-}
 
 STDMETHODIMP VRDEServer::COMGETTER(Enabled)(BOOL *aEnabled)