Changeset 31008 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Jul 22, 2010 3:24:27 PM (15 years ago)

Author:

vboxsync

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

63924

Message:

Main: reorganize session APIs

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• VBoxHeadless.cpp (modified) (2 diffs)
• testcase/tstHeadless.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -803 +803 @@
         }
 
+        ComPtr<IMachine> m;
+
         /* find ID by name */
         if (id.isEmpty())
         {
-            ComPtr <IMachine> m;
             rc = virtualBox->FindMachine(Bstr(name), m.asOutParam());
             if (FAILED(rc))
@@ -823 +824 @@
 
         // open a session
-        CHECK_ERROR_BREAK(virtualBox, OpenSession(session, id));
+        CHECK_ERROR_BREAK(m, LockForSession(session, false /* fPermitShared */, NULL));
         fSessionOpened = true;
 
         /* get the console */
-        ComPtr <IConsole> console;
+        ComPtr<IConsole> console;
         CHECK_ERROR_BREAK(session, COMGETTER(Console)(console.asOutParam()));
 
-        /* get the machine */
-        ComPtr <IMachine> machine;
+        /* get the mutable machine */
+        ComPtr<IMachine> machine;
         CHECK_ERROR_BREAK(console, COMGETTER(Machine)(machine.asOutParam()));
 
-        ComPtr <IDisplay> display;
+        ComPtr<IDisplay> display;
         CHECK_ERROR_BREAK(console, COMGETTER(Display)(display.asOutParam()));
 

trunk/src/VBox/Frontends/VBoxHeadless/testcase/tstHeadless.cpp

@@ -112 +112 @@
         EventQueue eventQ;
 
+        ComPtr <IMachine> m;
+
         // find ID by name
-        Bstr id;
-        {
-            ComPtr <IMachine> m;
-            CHECK_ERROR_BREAK (virtualBox, FindMachine (Bstr (name), m.asOutParam()));
-            CHECK_ERROR_BREAK (m, COMGETTER(Id) (id.asOutParam()));
-        }
-
-        if (!strcmp (operation, "on"))
+        CHECK_ERROR_BREAK(virtualBox, FindMachine(Bstr(name), m.asOutParam()));
+
+        if (!strcmp(operation, "on"))
         {
             ComPtr <IProgress> progress;
             RTPrintf ("Opening a new (remote) session...\n");
-            CHECK_ERROR_BREAK (virtualBox,
-                               OpenRemoteSession (session, id, Bstr ("vrdp"),
-                                                  NULL, progress.asOutParam()));
+            CHECK_ERROR_BREAK (m,
+                               LaunchVMProcess(session, Bstr("vrdp"),
+                                               NULL, progress.asOutParam()));
 
             RTPrintf ("Waiting for the remote session to open...\n");
@@ -153 +150 @@
         {
             RTPrintf ("Opening an existing session...\n");
-            CHECK_ERROR_BREAK (virtualBox, OpenExistingSession (session, id));
+            CHECK_ERROR_BREAK(m, LockForSession(session, true /* fPermitShared */, NULL));
 
             ComPtr <IConsole> console;
-            CHECK_ERROR_BREAK (session, COMGETTER (Console) (console.asOutParam()));
+            CHECK_ERROR_BREAK(session, COMGETTER(Console)(console.asOutParam()));
 
             if (!strcmp (operation, "off"))