Changeset 26322 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Feb 8, 2010 11:08:02 AM (15 years ago)

Author:

vboxsync

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

57403

Message:

Frontends/VBoxSDL+VBoxHeadless: code cleanup, reorganize code a little.

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (27 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -991 +991 @@
     }
 
-    rc = com::Initialize();
-    if (FAILED(rc))
-    {
-        RTPrintf("Error: COM initialization failed, rc = 0x%x!\n", rc);
-        return 1;
-    }
-
-    do
-    {
-    // scopes all the stuff till shutdown
-    ////////////////////////////////////////////////////////////////////////////
-
-    ComPtr <IVirtualBox> virtualBox;
-    ComPtr <ISession> session;
-    bool sessionOpened = false;
-
-    rc = virtualBox.createLocalObject (CLSID_VirtualBox);
-    if (FAILED(rc))
-    {
-        com::ErrorInfo info;
-        if (info.isFullAvailable())
-            PrintError("Failed to create VirtualBox object",
-                       info.getText().raw(), info.getComponent().raw());
-        else
-            RTPrintf("Failed to create VirtualBox object! No error information available (rc = 0x%x).\n", rc);
-        break;
-    }
-    rc = session.createInprocObject (CLSID_Session);
-    if (FAILED(rc))
-    {
-        RTPrintf("Failed to create session object, rc = 0x%x!\n", rc);
-        break;
-    }
-
-    EventQueue* eventQ = com::EventQueue::getMainEventQueue();
-
-    /* Get the number of network adapters */
-    ULONG NetworkAdapterCount = 0;
-    ComPtr <ISystemProperties> sysInfo;
-    virtualBox->COMGETTER(SystemProperties) (sysInfo.asOutParam());
-    sysInfo->COMGETTER (NetworkAdapterCount) (&NetworkAdapterCount);
-
     // command line argument parsing stuff
     for (int curArg = 1; curArg < argc; curArg++)
@@ -1046 +1004 @@
             {
                 RTPrintf("Error: VM not specified (UUID or name)!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             // first check if a UUID was supplied
@@ -1062 +1019 @@
             {
                 RTPrintf("Error: missing argument for comment!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
         }
@@ -1072 +1028 @@
             {
                 RTPrintf("Error: missing argument for boot drive!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             switch (argv[curArg][0])
@@ -1104 +1059 @@
                 {
                     RTPrintf("Error: wrong argument for boot drive!\n");
-                    rc = E_FAIL;
-                    break;
+                    return 1;
                 }
             }
-            if (FAILED (rc))
-                break;
         }
         else if (   !strcmp(argv[curArg], "--memory")
@@ -1118 +1070 @@
             {
                 RTPrintf("Error: missing argument for memory size!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             memorySize = atoi(argv[curArg]);
@@ -1129 +1080 @@
             {
                 RTPrintf("Error: missing argument for vram size!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             vramSize = atoi(argv[curArg]);
@@ -1154 +1104 @@
             {
                 RTPrintf("Error: missing arguments for fixed video mode!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             fixedWidth  = atoi(argv[++curArg]);
@@ -1183 +1132 @@
             {
                 RTPrintf("Error: missing a string of disabled hostkey combinations\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             gHostKeyDisabledCombinations = argv[curArg];
@@ -1194 +1142 @@
                     RTPrintf("Error: <hostkey> + '%c' is not a valid combination\n",
                              gHostKeyDisabledCombinations[i]);
-                    rc = E_FAIL;
-                    break;
+                    return 1;
                 }
             }
-            if (rc == E_FAIL)
-                break;
         }
         else if (   !strcmp(argv[curArg], "--nograbonclick")
@@ -1217 +1162 @@
             {
                 RTPrintf("Error: missing file name for --pidfile!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             gpszPidFile = argv[curArg];
@@ -1228 +1172 @@
             {
                 RTPrintf("Error: missing file name for first hard disk!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             /* resolve it. */
@@ -1237 +1180 @@
             {
                 RTPrintf("Error: The path to the specified harddisk, '%s', could not be resolved.\n", argv[curArg]);
-                rc = E_FAIL;
-                break;
+                return 1;
             }
         }
@@ -1247 +1189 @@
             {
                 RTPrintf("Error: missing file/device name for first floppy disk!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             /* resolve it. */
@@ -1256 +1197 @@
             {
                 RTPrintf("Error: The path to the specified floppy disk, '%s', could not be resolved.\n", argv[curArg]);
-                rc = E_FAIL;
-                break;
+                return 1;
             }
         }
@@ -1266 +1206 @@
             {
                 RTPrintf("Error: missing file/device name for cdrom!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             /* resolve it. */
@@ -1275 +1214 @@
             {
                 RTPrintf("Error: The path to the specified cdrom, '%s', could not be resolved.\n", argv[curArg]);
-                rc = E_FAIL;
-                break;
+                return 1;
             }
         }
@@ -1320 +1258 @@
             {
                 RTPrintf("Error: missing font file name for secure label!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             secureLabelFontFile = argv[curArg];
@@ -1331 +1268 @@
             {
                 RTPrintf("Error: missing font point size for secure label!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             secureLabelPointSize = atoi(argv[curArg]);
@@ -1342 +1278 @@
             {
                 RTPrintf("Error: missing font pixel offset for secure label!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             secureLabelFontOffs = atoi(argv[curArg]);
@@ -1353 +1288 @@
             {
                 RTPrintf("Error: missing text color value for secure label!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             sscanf(argv[curArg], "%X", &secureLabelColorFG);
@@ -1364 +1298 @@
             {
                 RTPrintf("Error: missing background color value for secure label!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             sscanf(argv[curArg], "%X", &secureLabelColorBG);
@@ -1407 +1340 @@
             {
                 RTPrintf("Error: missing the rate value for the --warpdrive option!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             u32WarpDrive = RTStrToUInt32(argv[curArg]);
@@ -1414 +1346 @@
             {
                 RTPrintf("Error: the warp drive rate is restricted to [2..20000]. (%d)\n", u32WarpDrive);
-                rc = E_FAIL;
-                break;
+                return 1;
             }
         }
@@ -1433 +1364 @@
             {
                 RTPrintf("Error: not enough arguments for host keys!\n");
-                rc = E_FAIL;
-                break;
+                return 1;
             }
             gHostKeySym1 = atoi(argv[curArg++]);
@@ -1455 +1385 @@
         }
     }
+
+    rc = com::Initialize();
     if (FAILED(rc))
+    {
+        RTPrintf("Error: COM initialization failed, rc = 0x%x!\n", rc);
+        return 1;
+    }
+
+    do
+    {
+    // scopes all the stuff till shutdown
+    ////////////////////////////////////////////////////////////////////////////
+
+    ComPtr <IVirtualBox> virtualBox;
+    ComPtr <ISession> session;
+    bool sessionOpened = false;
+
+    rc = virtualBox.createLocalObject (CLSID_VirtualBox);
+    if (FAILED(rc))
+    {
+        com::ErrorInfo info;
+        if (info.isFullAvailable())
+            PrintError("Failed to create VirtualBox object",
+                       info.getText().raw(), info.getComponent().raw());
+        else
+            RTPrintf("Failed to create VirtualBox object! No error information available (rc = 0x%x).\n", rc);
         break;
+    }
+    rc = session.createInprocObject (CLSID_Session);
+    if (FAILED(rc))
+    {
+        RTPrintf("Failed to create session object, rc = 0x%x!\n", rc);
+        break;
+    }
+
+    EventQueue* eventQ = com::EventQueue::getMainEventQueue();
 
     /*
@@ -2922 +2886 @@
     LogFlow(("Returning from main()!\n"));
     RTLogFlush(NULL);
-    return FAILED (rc) ? 1 : 0;
+    return FAILED(rc) ? 1 : 0;
 }