Changeset 300 in vbox for trunk/src/VBox

Timestamp:

Jan 25, 2007 2:30:37 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

17847

Message:

Another attempt to solve the VRDP initialization problem

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (3 diffs)
• ConsoleVRDPServer.cpp (modified) (2 diffs)
• include/ConsoleVRDPServer.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3020 +3020 @@
             {
                 rc = E_FAIL;
+            }
+            else
+            {
+                mConsoleVRDPServer->SetCallback ();
             }
         }
@@ -6168 +6172 @@
         }
 
-        /*
-         * Create the VM
-         */
-        PVM pVM;
-        /*
-         *  leave the lock since EMT will call Console. It's safe because
-         *  mMachineState is either Starting or Restoring state here.
-         */
-        alock.leave();
-
-        vrc = VMR3Create (task->mSetVMErrorCallback, task.get(),
-                          task->mConfigConstructor, task.get(),
-                          &pVM);
-
-        alock.enter();
-
 #ifdef VBOX_VRDP
         if (VBOX_SUCCESS (vrc))
         {
-            /* Start the VRDP server after the VM is created. */
+            /* Create the VRDP server. In case of headless operation, this will
+             * also create the framebuffer, required at VM creation.
+             */
             ConsoleVRDPServer *server = console->consoleVRDPServer();
             Assert (server);
@@ -6216 +6206 @@
                          vrc, errMsg.raw()));
                 hrc = setError (E_FAIL, errMsg);
+                break;
             }
+        }
+#endif /* VBOX_VRDP */
+
+        /*
+         * Create the VM
+         */
+        PVM pVM;
+        /*
+         *  leave the lock since EMT will call Console. It's safe because
+         *  mMachineState is either Starting or Restoring state here.
+         */
+        alock.leave();
+
+        vrc = VMR3Create (task->mSetVMErrorCallback, task.get(),
+                          task->mConfigConstructor, task.get(),
+                          &pVM);
+
+        alock.enter();
+
+#ifdef VBOX_VRDP
+        {
+            /* Enable client connections to the server. */
+            ConsoleVRDPServer *server = console->consoleVRDPServer();
+            server->SetCallback ();
         }
 #endif /* VBOX_VRDP */

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -127 +127 @@
                 framebuffer? VRDP_EXTERNAL_FRAMEBUFFER: VRDP_INTERNAL_FRAMEBUFFER);
 
-            mpfnVRDPSetCallback (mhServer, mConsole->getVrdpServerCallback (), mConsole);
-
             LogFlow(("Framebuffer %p set for the VRDP server\n", framebuffer));
             
@@ -144 +142 @@
 #endif
     return rc;
+}
+
+void ConsoleVRDPServer::SetCallback (void)
+{
+    /* This is called after VM is created and allows the server to accept client connection. */
+    if (mhServer && mpfnVRDPSetCallback)
+    {
+        mpfnVRDPSetCallback (mhServer, mConsole->getVrdpServerCallback (), mConsole);
+    }
 }
 

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

@@ -38 +38 @@
 
     int Launch (void);
+    void SetCallback (void);
     void Stop (void);