Changeset 26322 in vbox

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.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxHeadless/VBoxHeadless.cpp (modified) (24 diffs)
• VBoxSDL/VBoxSDL.cpp (modified) (27 diffs)

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

@@ -71 +71 @@
 #define LogError(m,rc) \
     do { \
-        Log (("VBoxHeadless: ERROR: " m " [rc=0x%08X]\n", rc)); \
-        RTPrintf ("%s\n", m); \
+        Log(("VBoxHeadless: ERROR: " m " [rc=0x%08X]\n", rc)); \
+        RTPrintf("%s\n", m); \
     } while (0)
 
@@ -90 +90 @@
 {
 public:
-    StateChangeEvent (MachineState_T state) : mState (state) {}
+    StateChangeEvent(MachineState_T state) : mState(state) {}
 protected:
     void *handler()
     {
-        LogFlow (("VBoxHeadless: StateChangeEvent: %d\n", mState));
+        LogFlow(("VBoxHeadless: StateChangeEvent: %d\n", mState));
         /* post the termination event if the machine has been PoweredDown/Saved/Aborted */
         if (mState < MachineState_Running)
-            gEventQ->postEvent (NULL);
+            gEventQ->postEvent(NULL);
         return 0;
     }
@@ -275 +275 @@
 public:
 
-    ConsoleCallback ()
+    ConsoleCallback()
     {
 #ifndef VBOX_WITH_XPCOM
@@ -302 +302 @@
     VBOX_SCRIPTABLE_DISPATCH_IMPL(IConsoleCallback)
 
-    STDMETHOD(OnMousePointerShapeChange) (BOOL visible, BOOL alpha, ULONG xHot, ULONG yHot,
-                                          ULONG width, ULONG height, BYTE *shape)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnMouseCapabilityChange) (BOOL supportsAbsolute, BOOL needsHostCursor)
+    STDMETHOD(OnMousePointerShapeChange)(BOOL visible, BOOL alpha, ULONG xHot, ULONG yHot,
+                                         ULONG width, ULONG height, BYTE *shape)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnMouseCapabilityChange)(BOOL supportsAbsolute, BOOL needsHostCursor)
     {
         /* Emit absolute mouse event to actually enable the host mouse cursor. */
@@ -328 +328 @@
     }
 
-    STDMETHOD(OnStateChange) (MachineState_T machineState)
-    {
-        gEventQ->postEvent (new StateChangeEvent (machineState));
-        return S_OK;
-    }
-
-    STDMETHOD(OnExtraDataChange) (BSTR key)
+    STDMETHOD(OnStateChange)(MachineState_T machineState)
+    {
+        gEventQ->postEvent(new StateChangeEvent(machineState));
+        return S_OK;
+    }
+
+    STDMETHOD(OnExtraDataChange)(BSTR key)
     {
         return S_OK;
@@ -344 +344 @@
     }
 
-    STDMETHOD(OnNetworkAdapterChange) (INetworkAdapter *aNetworkAdapter)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnSerialPortChange) (ISerialPort *aSerialPort)
-    {
-        return S_OK;
-    }
-
-    STDMETHOD(OnParallelPortChange) (IParallelPort *aParallelPort)
+    STDMETHOD(OnNetworkAdapterChange)(INetworkAdapter *aNetworkAdapter)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnSerialPortChange)(ISerialPort *aSerialPort)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnParallelPortChange)(IParallelPort *aParallelPort)
     {
         return S_OK;
@@ -412 +412 @@
     }
 
-    STDMETHOD(OnUSBDeviceStateChange) (IUSBDevice *aDevice, BOOL aAttached,
+    STDMETHOD(OnUSBDeviceStateChange)(IUSBDevice *aDevice, BOOL aAttached,
                                       IVirtualBoxErrorInfo *aError)
     {
@@ -418 +418 @@
     }
 
-    STDMETHOD(OnSharedFolderChange) (Scope_T aScope)
+    STDMETHOD(OnSharedFolderChange)(Scope_T aScope)
     {
         return S_OK;
@@ -437 +437 @@
     }
 
-    STDMETHOD(OnShowWindow) (ULONG64 *winId)
+    STDMETHOD(OnShowWindow)(ULONG64 *winId)
     {
         /* OnCanShowWindow() always returns FALSE, so this call should never
@@ -457 +457 @@
 
 #ifdef VBOX_WITH_XPCOM
-NS_DECL_CLASSINFO (VirtualBoxCallback)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI (VirtualBoxCallback, IVirtualBoxCallback)
-NS_DECL_CLASSINFO (ConsoleCallback)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI (ConsoleCallback, IConsoleCallback)
+NS_DECL_CLASSINFO(VirtualBoxCallback)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VirtualBoxCallback, IVirtualBoxCallback)
+NS_DECL_CLASSINFO(ConsoleCallback)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(ConsoleCallback, IConsoleCallback)
 #endif
 
@@ -597 +597 @@
  *  Entry point.
  */
-extern "C" DECLEXPORT (int) TrustedMain (int argc, char **argv, char **envp)
+extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
 #ifdef VBOX_WITH_VRDP
@@ -862 +862 @@
         {
             ComPtr <IMachine> m;
-            rc = virtualBox->FindMachine (Bstr (name), m.asOutParam());
-            if (FAILED (rc))
-            {
-                LogError ("Invalid machine name!\n", rc);
-                break;
-            }
-            m->COMGETTER(Id) (id.asOutParam());
-            AssertComRC (rc);
-            if (FAILED (rc))
-                break;
-        }
-
-        Log (("VBoxHeadless: Opening a session with machine (id={%s})...\n",
+            rc = virtualBox->FindMachine(Bstr(name), m.asOutParam());
+            if (FAILED(rc))
+            {
+                LogError("Invalid machine name!\n", rc);
+                break;
+            }
+            m->COMGETTER(Id)(id.asOutParam());
+            AssertComRC(rc);
+            if (FAILED(rc))
+                break;
+        }
+
+        Log(("VBoxHeadless: Opening a session with machine (id={%s})...\n",
               Utf8Str(id).raw()));
 
         // open a session
-        CHECK_ERROR_BREAK(virtualBox, OpenSession (session, id));
+        CHECK_ERROR_BREAK(virtualBox, OpenSession(session, id));
         fSessionOpened = true;
 
         /* get the console */
         ComPtr <IConsole> console;
-        CHECK_ERROR_BREAK(session, COMGETTER (Console) (console.asOutParam()));
+        CHECK_ERROR_BREAK(session, COMGETTER(Console)(console.asOutParam()));
 
         /* get the machine */
         ComPtr <IMachine> machine;
-        CHECK_ERROR_BREAK(console, COMGETTER(Machine) (machine.asOutParam()));
+        CHECK_ERROR_BREAK(console, COMGETTER(Machine)(machine.asOutParam()));
 
         ComPtr <IDisplay> display;
-        CHECK_ERROR_BREAK(console, COMGETTER(Display) (display.asOutParam()));
+        CHECK_ERROR_BREAK(console, COMGETTER(Display)(display.asOutParam()));
 
 #ifdef VBOX_FFMPEG
@@ -923 +923 @@
                              "you wish to use is supported on your system\n", rcc);
             }
-            if (RT_SUCCESS(rrc) && (S_OK == rcc))
+            if (RT_SUCCESS(rrc) && (rcc == S_OK))
             {
                 Log2(("VBoxHeadless: Registering framebuffer\n"));
@@ -952 +952 @@
             }
 #endif /* defined(VBOX_FFMPEG) */
-            VRDPFramebuffer *pVRDPFramebuffer = new VRDPFramebuffer ();
+            VRDPFramebuffer *pVRDPFramebuffer = new VRDPFramebuffer();
             if (!pVRDPFramebuffer)
             {
@@ -1027 +1027 @@
         /* register a callback for machine events */
         {
-            ConsoleCallback *callback = new ConsoleCallback ();
+            ConsoleCallback *callback = new ConsoleCallback();
             callback->AddRef();
-            CHECK_ERROR(console, RegisterCallback (callback));
+            CHECK_ERROR(console, RegisterCallback(callback));
             callback->Release();
-            if (FAILED (rc))
+            if (FAILED(rc))
                 break;
         }
@@ -1040 +1040 @@
         BOOL fVRDPEnabled;
         ComPtr <IVRDPServer> vrdpServer;
-        CHECK_ERROR_BREAK(machine, COMGETTER (VRDPServer) (vrdpServer.asOutParam()));
-        CHECK_ERROR_BREAK(vrdpServer, COMGETTER(Enabled) (&fVRDPEnabled));
+        CHECK_ERROR_BREAK(machine, COMGETTER(VRDPServer)(vrdpServer.asOutParam()));
+        CHECK_ERROR_BREAK(vrdpServer, COMGETTER(Enabled)(&fVRDPEnabled));
 
         if (vrdpEnabled != NULL)
@@ -1062 +1062 @@
         if (fVRDPEnable)
         {
-            Log (("VBoxHeadless: Enabling VRDP server...\n"));
+            Log(("VBoxHeadless: Enabling VRDP server...\n"));
 
             /* set VRDP port if requested by the user */
@@ -1078 +1078 @@
             if (!fVRDPEnabled)
             {
-                CHECK_ERROR_BREAK(vrdpServer, COMSETTER(Enabled) (TRUE));
+                CHECK_ERROR_BREAK(vrdpServer, COMSETTER(Enabled)(TRUE));
             }
         }
@@ -1086 +1086 @@
             if (fVRDPEnabled)
             {
-                CHECK_ERROR_BREAK(vrdpServer, COMSETTER(Enabled) (FALSE));
-            }
-        }
-#endif
-        Log (("VBoxHeadless: Powering up the machine...\n"));
+                CHECK_ERROR_BREAK(vrdpServer, COMSETTER(Enabled)(FALSE));
+            }
+        }
+#endif
+        Log(("VBoxHeadless: Powering up the machine...\n"));
 
         ComPtr <IProgress> progress;
-        CHECK_ERROR_BREAK(console, PowerUp (progress.asOutParam()));
+        CHECK_ERROR_BREAK(console, PowerUp(progress.asOutParam()));
 
         /* wait for result because there can be errors */
-        if (SUCCEEDED(progress->WaitForCompletion (-1)))
+        if (SUCCEEDED(progress->WaitForCompletion(-1)))
         {
             LONG progressRc;
@@ -1120 +1120 @@
 #endif
 
-        Log (("VBoxHeadless: Waiting for PowerDown...\n"));
+        Log(("VBoxHeadless: Waiting for PowerDown...\n"));
 
         Event *e;
 
-        while (gEventQ->waitForEvent (&e) && e)
-          gEventQ->handleEvent (e);
-
-        Log (("VBoxHeadless: event loop has terminated...\n"));
+        while (gEventQ->waitForEvent(&e) && e)
+          gEventQ->handleEvent(e);
+
+        Log(("VBoxHeadless: event loop has terminated...\n"));
 
 #ifdef VBOX_FFMPEG
         if (pFramebuffer)
         {
-            pFramebuffer->Release ();
+            pFramebuffer->Release();
             Log(("Released framebuffer\n"));
             pFramebuffer = NULL;
@@ -1151 +1151 @@
          * unregister the callback we've registered before.
          */
-        Log (("VBoxHeadless: Closing the session...\n"));
+        Log(("VBoxHeadless: Closing the session...\n"));
         session->Close();
     }
@@ -1161 +1161 @@
     com::Shutdown();
 
-    LogFlow (("VBoxHeadless FINISHED.\n"));
+    LogFlow(("VBoxHeadless FINISHED.\n"));
 
     return rc;
@@ -1171 +1171 @@
  * Main entry point.
  */
-int main (int argc, char **argv, char **envp)
+int main(int argc, char **argv, char **envp)
 {
     // initialize VBox Runtime
@@ -1191 +1191 @@
     }
 
-    return TrustedMain (argc, argv, envp);
+    return TrustedMain(argc, argv, envp);
 }
 #endif /* !VBOX_WITH_HARDENING */

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;
 }