Changeset 29363 in vbox

Timestamp:

May 11, 2010 3:12:07 PM (15 years ago)

Author:

vboxsync

Message:

Added 'restart' parameter to OnVRDPServerChange notification.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (3 diffs)
• SessionImpl.cpp (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/ConsoleImpl.h (modified) (1 diff)
• include/MachineImpl.h (modified) (2 diffs)
• include/SessionImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3878 +3878 @@
  * @note Locks this object for writing.
  */
-HRESULT Console::onVRDPServerChange()
+HRESULT Console::onVRDPServerChange(BOOL aRestart)
 {
     AutoCaller autoCaller(this);
@@ -3899 +3899 @@
         ComAssertComRCRetRC(rc);
 
-        /* VRDP server may call this Console object back from other threads (VRDP INPUT or OUTPUT). */
-        alock.leave();
-
-        if (vrdpEnabled)
-        {
-            // If there was no VRDP server started the 'stop' will do nothing.
-            // However if a server was started and this notification was called,
-            // we have to restart the server.
-            mConsoleVRDPServer->Stop();
-
-            if (RT_FAILURE(mConsoleVRDPServer->Launch()))
+        if (aRestart)
+        {
+            /* VRDP server may call this Console object back from other threads (VRDP INPUT or OUTPUT). */
+            alock.leave();
+
+            if (vrdpEnabled)
             {
-                rc = E_FAIL;
+                // If there was no VRDP server started the 'stop' will do nothing.
+                // However if a server was started and this notification was called,
+                // we have to restart the server.
+                mConsoleVRDPServer->Stop();
+
+                if (RT_FAILURE(mConsoleVRDPServer->Launch()))
+                {
+                    rc = E_FAIL;
+                }
+                else
+                {
+                    mConsoleVRDPServer->EnableConnections();
+                }
             }
             else
             {
-                mConsoleVRDPServer->EnableConnections();
+                mConsoleVRDPServer->Stop();
             }
-        }
-        else
-        {
-            mConsoleVRDPServer->Stop();
-        }
-
-        alock.enter();
+
+            alock.enter();
+        }
     }
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -8929 +8929 @@
 
         if (flModifications & IsModified_VRDPServer)
-            that->onVRDPServerChange();
+            that->onVRDPServerChange(/* aRestart */ TRUE);
         if (flModifications & IsModified_USB)
             that->onUSBControllerChange();
@@ -10565 +10565 @@
  *  @note Locks this object for reading.
  */
-HRESULT SessionMachine::onVRDPServerChange()
+HRESULT SessionMachine::onVRDPServerChange(BOOL aRestart)
 {
     LogFlowThisFunc(("\n"));
@@ -10582 +10582 @@
         return S_OK;
 
-    return directControl->OnVRDPServerChange();
+    return directControl->OnVRDPServerChange(aRestart);
 }
 

trunk/src/VBox/Main/SessionImpl.cpp

@@ -582 +582 @@
 }
 
-STDMETHODIMP Session::OnVRDPServerChange()
+STDMETHODIMP Session::OnVRDPServerChange(BOOL aRestart)
 {
     LogFlowThisFunc(("\n"));
@@ -593 +593 @@
     AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE);
 
-    return mConsole->onVRDPServerChange();
+    return mConsole->onVRDPServerChange(aRestart);
 }
 

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

@@ -13148 +13148 @@
   <interface
      name="IInternalSessionControl" extends="$unknown"
-     uuid="cc8d63a0-568e-45dd-9bf6-6354049ece1e"
+     uuid="ab161f72-e4b3-44e6-a919-2256474bda66"
      internal="yes"
      wsmap="suppress"
@@ -13341 +13341 @@
 
       </desc>
+      <param name="restart" type="boolean" dir="in">
+        <desc>Flag whether the server must be restarted</desc>
+      </param>
     </method>
 

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

@@ -175 +175 @@
     HRESULT onMediumChange(IMediumAttachment *aMediumAttachment, BOOL aForce);
     HRESULT onCPUChange(ULONG aCPU, BOOL aRemove);
-    HRESULT onVRDPServerChange();
+    HRESULT onVRDPServerChange(BOOL aRestart);
     HRESULT onUSBControllerChange();
     HRESULT onSharedFolderChange(BOOL aGlobal);

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

@@ -605 +605 @@
     virtual HRESULT onSerialPortChange(ISerialPort * /* serialPort */) { return S_OK; }
     virtual HRESULT onParallelPortChange(IParallelPort * /* parallelPort */) { return S_OK; }
-    virtual HRESULT onVRDPServerChange() { return S_OK; }
+    virtual HRESULT onVRDPServerChange(BOOL /* aRestart */) { return S_OK; }
     virtual HRESULT onUSBControllerChange() { return S_OK; }
     virtual HRESULT onStorageControllerChange() { return S_OK; }
@@ -943 +943 @@
     HRESULT onParallelPortChange(IParallelPort *parallelPort);
     HRESULT onCPUChange(ULONG aCPU, BOOL aRemove);
-    HRESULT onVRDPServerChange();
+    HRESULT onVRDPServerChange(BOOL aRestart);
     HRESULT onUSBControllerChange();
     HRESULT onUSBDeviceAttach(IUSBDevice *aDevice,

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

@@ -93 +93 @@
     STDMETHOD(OnMediumChange)(IMediumAttachment *aMediumAttachment, BOOL aForce);
     STDMETHOD(OnCPUChange)(ULONG aCPU, BOOL aRemove);
-    STDMETHOD(OnVRDPServerChange)();
+    STDMETHOD(OnVRDPServerChange)(BOOL aRestart);
     STDMETHOD(OnUSBControllerChange)();
     STDMETHOD(OnSharedFolderChange)(BOOL aGlobal);