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

Timestamp:

Sep 23, 2010 12:57:52 PM (14 years ago)

Author:

vboxsync

Message:

com/string: Remove bool conversion operator and other convenience error operators. They are hiding programming errors (like incorrect empty string checks, and in one case a free of the wrong pointer).

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

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

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

@@ -162 +162 @@
                             {
                                 Bstr value1;
-                                hrc = machine->GetExtraData(Bstr("VRDP/DisconnectOnGuestLogout"), value1.asOutParam());
+                                hrc = machine->GetExtraData(Bstr("VRDP/DisconnectOnGuestLogout").raw(),
+                                                            value1.asOutParam());
                                 if (SUCCEEDED(hrc) && value1 == "1")
                                 {
@@ -798 +799 @@
         if (id.isEmpty())
         {
-            rc = virtualBox->FindMachine(Bstr(name), m.asOutParam());
+            rc = virtualBox->FindMachine(Bstr(name).raw(), m.asOutParam());
             if (FAILED(rc))
             {
@@ -812 +813 @@
         {
             /* Use the GUID. */
-            rc = virtualBox->GetMachine(id, m.asOutParam());
+            rc = virtualBox->GetMachine(id.raw(), m.asOutParam());
             if (FAILED(rc))
             {
@@ -1054 +1055 @@
             {
                 Bstr bstr = vrdpPort;
-                CHECK_ERROR_BREAK(vrdpServer, COMSETTER(Ports)(bstr));
+                CHECK_ERROR_BREAK(vrdpServer, COMSETTER(Ports)(bstr.raw()));
             }
             /* set VRDP address if requested by the user */
             if (vrdpAddress != NULL)
             {
-                CHECK_ERROR_BREAK(vrdpServer, COMSETTER(NetAddress)(Bstr(vrdpAddress)));
+                CHECK_ERROR_BREAK(vrdpServer, COMSETTER(NetAddress)(Bstr(vrdpAddress).raw()));
             }
             /* enable VRDP server (only if currently disabled) */

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

@@ -115 +115 @@
 
         // find ID by name
-        CHECK_ERROR_BREAK(virtualBox, FindMachine(Bstr(name), m.asOutParam()));
+        CHECK_ERROR_BREAK(virtualBox, FindMachine(Bstr(name).raw(),
+                                                  m.asOutParam()));
 
         if (!strcmp(operation, "on"))
@@ -122 +123 @@
             RTPrintf ("Opening a new (remote) session...\n");
             CHECK_ERROR_BREAK (m,
-                               LaunchVMProcess(session, Bstr("vrdp"),
+                               LaunchVMProcess(session, Bstr("vrdp").raw(),
                                                NULL, progress.asOutParam()));