Changeset 50117 in vbox for trunk

Timestamp:

Jan 20, 2014 2:05:02 PM (11 years ago)

Author:

vboxsync

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

91661

Message:

Main+Frontends: clear out some cruft code, outdated EventQueue stuff and whitespace cleanup

Location:

trunk/src/VBox

Files:

• Frontends/VBoxHeadless/testcase/tstHeadless.cpp (modified) (12 diffs)
• Frontends/VBoxManage/VBoxManageUSB.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/globals/COMDefs.h (modified) (41 diffs)
• Main/glue/initterm.cpp (modified) (8 diffs)
• Main/src-server/xpcom/server_module.cpp (modified) (13 diffs)
• Main/testcase/tstAPI.cpp (modified) (3 diffs)
• Main/testcase/tstOVF.cpp (modified) (3 diffs)
• Main/testcase/tstVBoxAPIXPCOM.cpp (modified) (2 diffs)
• Main/webservice/websrv-cpp.xsl (modified) (2 diffs)

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 #include <VBox/com/ErrorInfo.h>
 #include <VBox/com/errorprint.h>
-#include <VBox/com/EventQueue.h>
 
 #include <VBox/com/VirtualBox.h>
@@ -38 +37 @@
  *  Entry point.
  */
-int main (int argc, char **argv)
+int main(int argc, char **argv)
 {
     // initialize VBox Runtime
@@ -56 +55 @@
     if (!name || !operation)
     {
-        RTPrintf ("\nUsage:\n\n"
-                  "%s <machine_name> [on|off|pause|resume]\n\n",
-                  argv [0]);
+        RTPrintf("\nUsage:\n\n"
+                 "%s <machine_name> [on|off|pause|resume]\n\n",
+                 argv [0]);
         return 0;
     }
 
-    RTPrintf ("\n");
-    RTPrintf ("tstHeadless STARTED.\n");
-
-    RTPrintf ("VM name   : {%s}\n"
-              "Operation : %s\n\n",
-              name, operation);
+    RTPrintf("\n");
+    RTPrintf("tstHeadless STARTED.\n");
+
+    RTPrintf("VM name   : {%s}\n"
+             "Operation : %s\n\n",
+             name, operation);
 
     HRESULT rc;
@@ -83 +82 @@
         ComPtr <ISession> session;
 
-        RTPrintf ("Creating VirtualBox object...\n");
-        rc = virtualBox.createLocalObject (CLSID_VirtualBox);
+        RTPrintf("Creating VirtualBox object...\n");
+        rc = virtualBox.createLocalObject(CLSID_VirtualBox);
         if (FAILED(rc))
             RTPrintf("ERROR: failed to create the VirtualBox object!\n");
@@ -94 +93 @@
         }
 
-        if (FAILED (rc))
+        if (FAILED(rc))
         {
             com::ErrorInfo info;
@@ -106 +105 @@
             break;
         }
-
-        // create the event queue
-        // (here it is necessary only to process remaining XPCOM/IPC events
-        // after the session is closed)
-        EventQueue eventQ;
 
         ComPtr <IMachine> m;
@@ -121 +115 @@
         {
             ComPtr <IProgress> progress;
-            RTPrintf ("Opening a new (remote) session...\n");
-            CHECK_ERROR_BREAK (m,
-                               LaunchVMProcess(session, Bstr("vrdp").raw(),
-                                               NULL, progress.asOutParam()));
-
-            RTPrintf ("Waiting for the remote session to open...\n");
-            CHECK_ERROR_BREAK (progress, WaitForCompletion (-1));
+            RTPrintf("Opening a new (remote) session...\n");
+            CHECK_ERROR_BREAK(m,
+                              LaunchVMProcess(session, Bstr("vrdp").raw(),
+                                              NULL, progress.asOutParam()));
+
+            RTPrintf("Waiting for the remote session to open...\n");
+            CHECK_ERROR_BREAK(progress, WaitForCompletion(-1));
 
             BOOL completed;
-            CHECK_ERROR_BREAK (progress, COMGETTER(Completed) (&completed));
-            ASSERT (completed);
+            CHECK_ERROR_BREAK(progress, COMGETTER(Completed)(&completed));
+            ASSERT(completed);
 
             LONG resultCode;
-            CHECK_ERROR_BREAK (progress, COMGETTER(ResultCode) (&resultCode));
-            if (FAILED (resultCode))
+            CHECK_ERROR_BREAK(progress, COMGETTER(ResultCode)(&resultCode));
+            if (FAILED(resultCode))
             {
                 ProgressErrorInfo info(progress);
@@ -142 +136 @@
             else
             {
-                RTPrintf ("Remote session has been successfully opened.\n");
+                RTPrintf("Remote session has been successfully opened.\n");
             }
         }
         else
         {
-            RTPrintf ("Opening an existing session...\n");
+            RTPrintf("Opening an existing session...\n");
             CHECK_ERROR_BREAK(m, LockMachine(session, LockType_Shared));
 
@@ -153 +147 @@
             CHECK_ERROR_BREAK(session, COMGETTER(Console)(console.asOutParam()));
 
-            if (!strcmp (operation, "off"))
+            if (!strcmp(operation, "off"))
             {
                 ComPtr <IProgress> progress;
-                RTPrintf ("Powering the VM off...\n");
-                CHECK_ERROR_BREAK (console, PowerDown(progress.asOutParam()));
-
-                RTPrintf ("Waiting for the VM to power down...\n");
-                CHECK_ERROR_BREAK (progress, WaitForCompletion (-1));
+                RTPrintf("Powering the VM off...\n");
+                CHECK_ERROR_BREAK(console, PowerDown(progress.asOutParam()));
+
+                RTPrintf("Waiting for the VM to power down...\n");
+                CHECK_ERROR_BREAK(progress, WaitForCompletion(-1));
 
                 BOOL completed;
-                CHECK_ERROR_BREAK (progress, COMGETTER(Completed) (&completed));
-                ASSERT (completed);
+                CHECK_ERROR_BREAK(progress, COMGETTER(Completed)(&completed));
+                ASSERT(completed);
 
                 LONG resultCode;
-                CHECK_ERROR_BREAK (progress, COMGETTER(ResultCode) (&resultCode));
-                if (FAILED (resultCode))
+                CHECK_ERROR_BREAK(progress, COMGETTER(ResultCode)(&resultCode));
+                if (FAILED(resultCode))
                 {
                     ProgressErrorInfo info(progress);
@@ -175 +169 @@
                 else
                 {
-                    RTPrintf ("VM is powered down.\n");
+                    RTPrintf("VM is powered down.\n");
                 }
             }
             else
-            if (!strcmp (operation, "pause"))
-            {
-                RTPrintf ("Pausing the VM...\n");
-                CHECK_ERROR_BREAK (console, Pause());
-            }
-            else
-            if (!strcmp (operation, "resume"))
-            {
-                RTPrintf ("Resuming the VM...\n");
-                CHECK_ERROR_BREAK (console, Resume());
-            }
-            else
-            {
-                RTPrintf ("Invalid operation!\n");
+            if (!strcmp(operation, "pause"))
+            {
+                RTPrintf("Pausing the VM...\n");
+                CHECK_ERROR_BREAK(console, Pause());
+            }
+            else
+            if (!strcmp(operation, "resume"))
+            {
+                RTPrintf("Resuming the VM...\n");
+                CHECK_ERROR_BREAK(console, Resume());
+            }
+            else
+            {
+                RTPrintf("Invalid operation!\n");
             }
         }
@@ -200 +194 @@
     }
     while (0);
-    RTPrintf ("\n");
+    RTPrintf("\n");
 
     com::Shutdown();
 
-    RTPrintf ("tstHeadless FINISHED.\n");
+    RTPrintf("tstHeadless FINISHED.\n");
 
     return rc;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageUSB.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27 +27 @@
 
 #include <iprt/asm.h>
-
-/* missing XPCOM <-> COM wrappers */
-#ifndef STDMETHOD_
-# define STDMETHOD_(ret, meth) NS_IMETHOD_(ret) meth
-#endif
-#ifndef NS_GET_IID
-# define NS_GET_IID(I) IID_##I
-#endif
-#ifndef RT_OS_WINDOWS
-#define IUnknown nsISupports
-#endif
 
 using namespace com;
@@ -71 +60 @@
     {
         Guid guid(iid);
-        if (guid == Guid(NS_GET_IID(IUnknown)))
+        if (guid == Guid(COM_IIDOF(IUnknown)))
             *ppvObject = (IUnknown *)this;
 #ifdef RT_OS_WINDOWS
-        else if (guid == Guid(NS_GET_IID(IDispatch)))
+        else if (guid == Guid(COM_IIDOF(IDispatch)))
             *ppvObject = (IDispatch *)this;
 #endif
-        else if (guid == Guid(NS_GET_IID(IUSBDevice)))
+        else if (guid == Guid(COM_IIDOF(IUSBDevice)))
             *ppvObject = (IUSBDevice *)this;
         else

trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h

@@ -10 +10 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -49 +49 @@
     // ...
 
-    QVector <LONG> in (3);
-    in [0] = -1;
-    in [1] = -2;
-    in [2] = -3;
-
-    QVector <LONG> out;
-    QVector <LONG> ret;
-
-    ret = component.TestArrays (in, out);
+    QVector<LONG> in(3);
+    in[0] = -1;
+    in[1] = -2;
+    in[2] = -3;
+
+    QVector<LONG> out;
+    QVector<LONG> ret;
+
+    ret = component.TestArrays(in, out);
 
     for (size_t i = 0; i < ret.size(); ++ i)
-        LogFlow (("*** ret[%u]=%d\n", i, ret [i]));
+        LogFlow(("*** ret[%u]=%d\n", i, ret[i]));
 
  * @endcode
@@ -88 +88 @@
  */
 
-#if !defined (VBOX_WITH_XPCOM)
-
-#else /* !defined (VBOX_WITH_XPCOM) */
+#if !defined(VBOX_WITH_XPCOM)
+
+#else /* !defined(VBOX_WITH_XPCOM) */
 
 #include <nsXPCOM.h>
@@ -98 +98 @@
 class XPCOMEventQSocketListener;
 
-#endif /* !defined (VBOX_WITH_XPCOM) */
+#endif /* !defined(VBOX_WITH_XPCOM) */
 
 
 /* VirtualBox interfaces declarations */
-#if !defined (VBOX_WITH_XPCOM)
+#if !defined(VBOX_WITH_XPCOM)
     #include <VirtualBox.h>
-#else /* !defined (VBOX_WITH_XPCOM) */
+#else /* !defined(VBOX_WITH_XPCOM) */
     #include <VirtualBox_XPCOM.h>
-#endif /* !defined (VBOX_WITH_XPCOM) */
+#endif /* !defined(VBOX_WITH_XPCOM) */
 
 /////////////////////////////////////////////////////////////////////////////
@@ -170 +170 @@
     void fetchFromCurrentThread(IUnknown *callee, const GUID *calleeIID);
 
-    static QString getInterfaceNameFromIID (const QUuid &id);
+    static QString getInterfaceNameFromIID(const QUuid &id);
 
     bool mIsNull : 1;
@@ -210 +210 @@
     HRESULT lastRC() const { return mRC; }
 
-#if !defined (VBOX_WITH_XPCOM)
+#if !defined(VBOX_WITH_XPCOM)
 
     /** Converts a GUID value to QUuid */
-    static QUuid ToQUuid (const GUID &id)
-    {
-        return QUuid (id.Data1, id.Data2, id.Data3,
-                      id.Data4[0], id.Data4[1], id.Data4[2], id.Data4[3],
-                      id.Data4[4], id.Data4[5], id.Data4[6], id.Data4[7]);
-    }
-
-#else /* !defined (VBOX_WITH_XPCOM) */
+    static QUuid ToQUuid(const GUID &id)
+    {
+        return QUuid(id.Data1, id.Data2, id.Data3,
+                     id.Data4[0], id.Data4[1], id.Data4[2], id.Data4[3],
+                     id.Data4[4], id.Data4[5], id.Data4[6], id.Data4[7]);
+    }
+
+#else /* !defined(VBOX_WITH_XPCOM) */
 
     /** Converts a GUID value to QUuid */
-    static QUuid ToQUuid (const nsID &id)
-    {
-        return QUuid (id.m0, id.m1, id.m2,
-                      id.m3[0], id.m3[1], id.m3[2], id.m3[3],
-                      id.m3[4], id.m3[5], id.m3[6], id.m3[7]);
-    }
-
-#endif /* !defined (VBOX_WITH_XPCOM) */
+    static QUuid ToQUuid(const nsID &id)
+    {
+        return QUuid(id.m0, id.m1, id.m2,
+                     id.m3[0], id.m3[1], id.m3[2], id.m3[3],
+                     id.m3[4], id.m3[5], id.m3[6], id.m3[7]);
+    }
+
+#endif /* !defined(VBOX_WITH_XPCOM) */
 
     /* Arrays of arbitrary types */
 
     template <typename QT, typename CT>
-    static void ToSafeArray (const QVector <QT> &aVec, com::SafeArray <CT> &aArr)
-    {
-        aArr.reset (aVec.size());
+    static void ToSafeArray(const QVector<QT> &aVec, com::SafeArray<CT> &aArr)
+    {
+        aArr.reset(aVec.size());
         for (int i = 0; i < aVec.size(); ++i)
-            aArr [i] = static_cast<CT> (aVec.at (i));
+            aArr[i] = static_cast<CT>(aVec.at(i));
     }
 
     template <typename CT, typename QT>
-    static void FromSafeArray (const com::SafeArray <CT> &aArr, QVector <QT> &aVec)
-    {
-        aVec.resize (static_cast<int> (aArr.size()));
+    static void FromSafeArray(const com::SafeArray<CT> &aArr, QVector<QT> &aVec)
+    {
+        aVec.resize(static_cast<int>(aArr.size()));
         for (int i = 0; i < aVec.size(); ++i)
-            aVec [i] = static_cast<QT> (aArr [i]);
+            aVec[i] = static_cast<QT>(aArr[i]);
     }
 
     template <typename QT, typename CT>
-    static void ToSafeArray (const QVector <QT *> &aVec, com::SafeArray <CT *> &aArr)
-    {
-        Q_UNUSED (aVec);
-        Q_UNUSED (aArr);
-        AssertMsgFailedReturnVoid (("No conversion!\n"));
+    static void ToSafeArray(const QVector<QT *> &aVec, com::SafeArray<CT *> &aArr)
+    {
+        Q_UNUSED(aVec);
+        Q_UNUSED(aArr);
+        AssertMsgFailedReturnVoid(("No conversion!\n"));
     }
 
     template <typename CT, typename QT>
-    static void FromSafeArray (const com::SafeArray <CT *> &aArr, QVector <QT *> &aVec)
-    {
-        Q_UNUSED (aArr);
-        Q_UNUSED (aVec);
-        AssertMsgFailedReturnVoid (("No conversion!\n"));
+    static void FromSafeArray(const com::SafeArray<CT *> &aArr, QVector<QT *> &aVec)
+    {
+        Q_UNUSED(aArr);
+        Q_UNUSED(aVec);
+        AssertMsgFailedReturnVoid(("No conversion!\n"));
     }
 
@@ -269 +269 @@
 
     template <typename T>
-    static void ToSafeArray (const QVector <T> &aVec, com::SafeArray <T> &aArr)
-    {
-        aArr.reset (aVec.size());
+    static void ToSafeArray(const QVector<T> &aVec, com::SafeArray<T> &aArr)
+    {
+        aArr.reset(aVec.size());
         for (int i = 0; i < aVec.size(); ++i)
-            aArr [i] = aVec.at (i);
+            aArr[i] = aVec.at(i);
     }
 
     template <typename T>
-    static void FromSafeArray (const com::SafeArray <T> &aArr, QVector <T> &aVec)
-    {
-        aVec.resize (static_cast<int> (aArr.size()));
+    static void FromSafeArray(const com::SafeArray<T> &aArr, QVector<T> &aVec)
+    {
+        aVec.resize(static_cast<int>(aArr.size()));
         for (int i = 0; i < aVec.size(); ++i)
-            aVec [i] = aArr [i];
+            aVec[i] = aArr[i];
     }
 
     /* Arrays of strings */
 
-    static void ToSafeArray (const QVector <QString> &aVec,
-                             com::SafeArray <BSTR> &aArr);
-    static void FromSafeArray (const com::SafeArray <BSTR> &aArr,
-                               QVector <QString> &aVec);
+    static void ToSafeArray(const QVector<QString> &aVec,
+                            com::SafeArray<BSTR> &aArr);
+    static void FromSafeArray(const com::SafeArray<BSTR> &aArr,
+                              QVector<QString> &aVec);
 
     /* Arrays of GUID */
 
-    static void ToSafeArray (const QVector <QUuid> &aVec,
-                             com::SafeGUIDArray &aArr);
-    static void FromSafeArray (const com::SafeGUIDArray &aArr,
-                               QVector <QUuid> &aVec);
+    static void ToSafeArray(const QVector<QUuid> &aVec,
+                            com::SafeGUIDArray &aArr);
+    static void FromSafeArray(const com::SafeGUIDArray &aArr,
+                              QVector<QUuid> &aVec);
 
     /* Arrays of enums. Does a cast similar to what ENUMOut does. */
 
     template <typename QE, typename CE>
-    static void ToSafeArray (const QVector <QE> &aVec,
-                             com::SafeIfaceArray <CE> &aArr)
-    {
-        aArr.reset (static_cast <int> (aVec.size()));
+    static void ToSafeArray(const QVector<QE> &aVec,
+                            com::SafeIfaceArray<CE> &aArr)
+    {
+        aArr.reset(static_cast<int>(aVec.size()));
         for (int i = 0; i < aVec.size(); ++i)
-            aArr [i] = static_cast <CE> (aVec.at (i));
+            aArr[i] = static_cast<CE>(aVec.at(i));
     }
 
     template <typename CE, typename QE>
-    static void FromSafeArray (const com::SafeIfaceArray <CE> &aArr,
-                               QVector <QE> &aVec)
-    {
-        aVec.resize (static_cast <int> (aArr.size()));
+    static void FromSafeArray(const com::SafeIfaceArray<CE> &aArr,
+                              QVector<QE> &aVec)
+    {
+        aVec.resize(static_cast<int>(aArr.size()));
         for (int i = 0; i < aVec.size(); ++i)
-            aVec [i] = static_cast <QE> (aArr [i]);
+            aVec[i] = static_cast<QE>(aArr[i]);
     }
 
     /* Arrays of interface pointers. Note: we need a separate pair of names
      * only because the MSVC8 template matching algorithm is poor and tries to
-     * instantiate a com::SafeIfaceArray <BSTR> (!!!) template otherwise for
+     * instantiate a com::SafeIfaceArray<BSTR> (!!!) template otherwise for
      * *no* reason and fails. Note that it's also not possible to choose the
      * correct function by specifying template arguments explicitly because then
-     * it starts to try to instantiate the com::SafeArray <I> template for
+     * it starts to try to instantiate the com::SafeArray<I> template for
      * *no* reason again and fails too. Definitely, broken. Works in GCC like a
      * charm. */
 
     template <class CI, class I>
-    static void ToSafeIfaceArray (const QVector <CI> &aVec,
-                                  com::SafeIfaceArray <I> &aArr)
-    {
-        aArr.reset (static_cast<int> (aVec.size()));
+    static void ToSafeIfaceArray(const QVector<CI> &aVec,
+                                 com::SafeIfaceArray<I> &aArr)
+    {
+        aArr.reset(static_cast<int>(aVec.size()));
         for (int i = 0; i < aVec.size(); ++i)
         {
-            aArr [i] = aVec.at (i).raw();
-            if (aArr [i])
-                aArr [i]->AddRef();
+            aArr[i] = aVec.at(i).raw();
+            if (aArr[i])
+                aArr[i]->AddRef();
         }
     }
 
     template <class I, class CI>
-    static void FromSafeIfaceArray (const com::SafeIfaceArray <I> &aArr,
-                                    QVector <CI> &aVec)
-    {
-        aVec.resize (static_cast<int> (aArr.size()));
+    static void FromSafeIfaceArray(const com::SafeIfaceArray<I> &aArr,
+                                   QVector<CI> &aVec)
+    {
+        aVec.resize(static_cast<int>(aArr.size()));
         for (int i = 0; i < aVec.size(); ++i)
-            aVec [i].attach (aArr [i]);
+            aVec[i].attach(aArr[i]);
     }
 
@@ -352 +352 @@
 
     /* no arbitrary instance creations */
-    COMBase() : mRC (S_OK) {}
-
-#if defined (VBOX_WITH_XPCOM)
+    COMBase() : mRC(S_OK) {}
+
+#if defined(VBOX_WITH_XPCOM)
     static XPCOMEventQSocketListener *sSocketListener;
 #endif
@@ -363 +363 @@
     public:
 
-        BSTRIn (const QString &s) : bstr (SysAllocString ((const OLECHAR *)
+        BSTRIn(const QString &s) : bstr(SysAllocString((const OLECHAR *)
             (s.isNull() ? 0 : s.utf16()))) {}
 
@@ -369 +369 @@
         {
             if (bstr)
-                SysFreeString (bstr);
+                SysFreeString(bstr);
         }
 
@@ -384 +384 @@
     public:
 
-        BSTROut (QString &s) : str (s), bstr (0) {}
+        BSTROut(QString &s) : str(s), bstr(0) {}
 
         ~BSTROut()
         {
             if (bstr) {
-                str = QString::fromUtf16 (bstr);
-                SysFreeString (bstr);
+                str = QString::fromUtf16(bstr);
+                SysFreeString(bstr);
             }
         }
@@ -413 +413 @@
     public:
 
-        ENUMOut (QE &e) : qe (e), ce ((CE) 0) {}
-        ~ENUMOut() { qe = (QE) ce; }
+        ENUMOut(QE &e) : qe(e), ce((CE)0) {}
+        ~ENUMOut() { qe = (QE)ce; }
         operator CE *() { return &ce; }
 
@@ -423 +423 @@
     };
 
-#if !defined (VBOX_WITH_XPCOM)
+#if !defined(VBOX_WITH_XPCOM)
 
     /** Adapter to pass QUuid as input GUID params */
-    static GUID GUIDIn (const QUuid &uuid) { return uuid; }
+    static GUID GUIDIn(const QUuid &uuid) { return uuid; }
 
     /** Adapter to pass QUuid as output GUID params */
@@ -433 +433 @@
     public:
 
-        GUIDOut (QUuid &id) : uuid (id)
-        {
-            ::memset (&guid, 0, sizeof (GUID));
+        GUIDOut(QUuid &id) : uuid(id)
+        {
+            ::memset(&guid, 0, sizeof(GUID));
         }
 
         ~GUIDOut()
         {
-            uuid = QUuid (
+            uuid = QUuid(
                 guid.Data1, guid.Data2, guid.Data3,
                 guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3],
@@ -454 +454 @@
     };
 
-#else /* !defined (VBOX_WITH_XPCOM) */
+#else /* !defined(VBOX_WITH_XPCOM) */
 
     /** Adapter to pass QUuid as input GUID params */
-    static const nsID &GUIDIn (const QUuid &uuid)
+    static const nsID &GUIDIn(const QUuid &uuid)
     {
         return *(const nsID *) &uuid;
@@ -467 +467 @@
     public:
 
-        GUIDOut (QUuid &id) : uuid (id), nsid (0) {}
+        GUIDOut(QUuid &id) : uuid(id), nsid(0) {}
 
         ~GUIDOut()
@@ -473 +473 @@
             if (nsid)
             {
-                uuid = QUuid (
+                uuid = QUuid(
                     nsid->m0, nsid->m1, nsid->m2,
                     nsid->m3[0], nsid->m3[1], nsid->m3[2], nsid->m3[3],
                     nsid->m3[4], nsid->m3[5], nsid->m3[6], nsid->m3[7]);
-                nsMemory::Free (nsid);
+                nsMemory::Free(nsid);
             }
         }
@@ -489 +489 @@
     };
 
-#endif /* !defined (VBOX_WITH_XPCOM) */
-
-    static void addref (IUnknown *aIface) { if (aIface) aIface->AddRef(); }
-    static void release (IUnknown *aIface) { if (aIface) aIface->Release(); }
+#endif /* !defined(VBOX_WITH_XPCOM) */
+
+    static void addref(IUnknown *aIface) { if (aIface) aIface->AddRef(); }
+    static void release(IUnknown *aIface) { if (aIface) aIface->Release(); }
 
 protected:
@@ -523 +523 @@
 
     /* no arbitrary instance creation */
-    COMBaseWithEI() : COMBase () {};
-
-    void setErrorInfo (const COMErrorInfo &aErrInfo) { mErrInfo = aErrInfo; }
-
-    void fetchErrorInfo (IUnknown *aCallee, const GUID *aCalleeIID) const
-    {
-        mErrInfo.fetchFromCurrentThread (aCallee, aCalleeIID);
+    COMBaseWithEI() : COMBase() {};
+
+    void setErrorInfo(const COMErrorInfo &aErrInfo) { mErrInfo = aErrInfo; }
+
+    void fetchErrorInfo(IUnknown *aCallee, const GUID *aCalleeIID) const
+    {
+        mErrInfo.fetchFromCurrentThread(aCallee, aCalleeIID);
     }
 
@@ -544 +544 @@
 public:
 
-    COMResult() : mRC (S_OK) {}
+    COMResult() : mRC(S_OK) {}
 
     /**
      * Queries the current result code from the given component.
      */
-    explicit COMResult (const COMBase &aComponent)
-        : mRC (aComponent.lastRC()) {}
+    explicit COMResult(const COMBase &aComponent)
+        : mRC(aComponent.lastRC()) {}
 
     /**
@@ -563 +563 @@
      * Queries the current result code from the given component.
      */
-    COMResult &operator= (const COMBase &aComponent)
+    COMResult &operator=(const COMBase &aComponent)
     {
         mRC = aComponent.lastRC();
@@ -572 +572 @@
      * Queries the current result code and error info from the given component.
      */
-    COMResult &operator= (const COMBaseWithEI &aComponent)
+    COMResult &operator=(const COMBaseWithEI &aComponent)
     {
         mRC = aComponent.lastRC();
@@ -585 +585 @@
      * warnings).
      */
-    bool isOk() const { return SUCCEEDED (mRC); }
+    bool isOk() const { return SUCCEEDED(mRC); }
 
     /**
@@ -591 +591 @@
      * warnings.
      */
-    bool isWarning() const { return SUCCEEDED_WARNING (mRC); }
+    bool isWarning() const { return SUCCEEDED_WARNING(mRC); }
 
     /**
@@ -635 +635 @@
     }
 
-    CInterface (const CInterface &that) : B (that)
+    CInterface(const CInterface &that) : B(that)
     {
         clear();
@@ -642 +642 @@
     }
 
-    CInterface (I *aIface)
+    CInterface(I *aIface)
     {
         clear();
-        setPtr (aIface);
-        this->addref (aIface);
+        setPtr(aIface);
+        this->addref(aIface);
     }
 
@@ -658 +658 @@
 
     // utility methods
-    void createInstance (const CLSID &aClsId)
-    {
-        AssertMsg (ptr() == NULL, ("Instance is already non-NULL\n"));
+    void createInstance(const CLSID &aClsId)
+    {
+        AssertMsg(ptr() == NULL, ("Instance is already non-NULL\n"));
         if (ptr() == NULL)
         {
             I* pObj = NULL;
-#if !defined (VBOX_WITH_XPCOM)
-            B::mRC = CoCreateInstance (aClsId, NULL, CLSCTX_ALL,
-                                       _ATL_IIDOF (I), (void **) &pObj);
+#if !defined(VBOX_WITH_XPCOM)
+            B::mRC = CoCreateInstance(aClsId, NULL, CLSCTX_ALL,
+                                      _ATL_IIDOF(I), (void **)&pObj);
 #else
-            nsCOMPtr <nsIComponentManager> manager;
-            B::mRC = NS_GetComponentManager (getter_AddRefs (manager));
-            if (SUCCEEDED (B::mRC))
-                B::mRC = manager->CreateInstance (aClsId, nsnull, NS_GET_IID (I),
-                                                  (void **) &pObj);
-#endif
-
-            if (SUCCEEDED (B::mRC))
+            nsCOMPtr<nsIComponentManager> manager;
+            B::mRC = NS_GetComponentManager(getter_AddRefs(manager));
+            if (SUCCEEDED(B::mRC))
+                B::mRC = manager->CreateInstance(aClsId, nsnull, NS_GET_IID(I),
+                                                 (void **)&pObj);
+#endif
+
+            if (SUCCEEDED(B::mRC))
                setPtr(pObj);
             else
@@ -683 +683 @@
              * reasons can lead to an error (w/o providing error info), not only
              * the instance initialization code (that should always provide it) */
-            B::fetchErrorInfo (NULL, NULL);
+            B::fetchErrorInfo(NULL, NULL);
          }
     }
@@ -692 +692 @@
      */
     template <class OI>
-    void attach (OI *aIface)
+    void attach(OI *aIface)
     {
 #ifdef DEBUG
@@ -699 +699 @@
         /* be aware of self assignment */
         I* amIface = ptr();
-        this->addref (aIface);
-        this->release (amIface);
+        this->addref(aIface);
+        this->release(amIface);
         if (aIface)
         {
             amIface = NULL;
-            B::mRC = aIface->QueryInterface (COM_IIDOF (I), (void **) &amIface);
-            this->release (aIface);
+            B::mRC = aIface->QueryInterface(COM_IIDOF(I), (void **)&amIface);
+            this->release(aIface);
             setPtr(amIface);
         }
@@ -716 +716 @@
 
     /** Specialization of attach() for our own interface I. Never fails. */
-    void attach (I *aIface)
+    void attach(I *aIface)
     {
 #ifdef DEBUG
@@ -722 +722 @@
 #endif
         /* be aware of self assignment */
-        this->addref (aIface);
-        this->release (ptr());
+        this->addref(aIface);
+        this->release(ptr());
         setPtr(aIface);
         B::mRC = S_OK;
@@ -734 +734 @@
        Assert(!mDead);
 #endif
-       this->release (ptr());
+       this->release(ptr());
        setPtr(NULL);
     }
@@ -751 +751 @@
      * warnings).
      */
-    bool isOk() const { return !isNull() && SUCCEEDED (B::mRC); }
+    bool isOk() const { return !isNull() && SUCCEEDED(B::mRC); }
 
     /**
@@ -757 +757 @@
      * warnings.
      */
-    bool isWarning() const { return !isNull() && SUCCEEDED_WARNING (B::mRC); }
+    bool isWarning() const { return !isNull() && SUCCEEDED_WARNING(B::mRC); }
 
     /**
@@ -766 +766 @@
     // utility operators
 
-    CInterface &operator= (const CInterface &that)
-    {
-        attach (that.ptr());
-        B::operator= (that);
+    CInterface &operator=(const CInterface &that)
+    {
+        attach(that.ptr());
+        B::operator=(that);
         return *this;
     }
 
-    CInterface &operator= (I *aIface)
-    {
-        attach (aIface);
+    CInterface &operator=(I *aIface)
+    {
+        attach(aIface);
         return *this;
     }
@@ -788 +788 @@
     }
 
-    bool operator== (const CInterface &that) const { return ptr() == that.ptr(); }
-    bool operator!= (const CInterface &that) const { return ptr() != that.ptr(); }
+    bool operator==(const CInterface &that) const { return ptr() == that.ptr(); }
+    bool operator!=(const CInterface &that) const { return ptr() != that.ptr(); }
 
     I* ptr() const
@@ -825 +825 @@
 /////////////////////////////////////////////////////////////////////////////
 
-class CUnknown : public CInterface <IUnknown, COMBaseWithEI>
+class CUnknown : public CInterface<IUnknown, COMBaseWithEI>
 {
 public:
 
-    typedef CInterface <IUnknown, COMBaseWithEI> Base;
+    typedef CInterface<IUnknown, COMBaseWithEI> Base;
 
     CUnknown() {}
@@ -835 +835 @@
     /** Creates an instance given another CInterface-based instance. */
     template <class OI, class OB>
-    explicit CUnknown (const CInterface <OI, OB> &that)
-    {
-        attach (that.ptr());
-        if (SUCCEEDED (mRC))
+    explicit CUnknown(const CInterface<OI, OB> &that)
+    {
+        attach(that.ptr());
+        if (SUCCEEDED(mRC))
         {
             /* preserve old error info if any */
             mRC = that.lastRC();
-            setErrorInfo (that.errorInfo());
+            setErrorInfo(that.errorInfo());
         }
     }
 
     /** Constructor specialization for IUnknown. */
-    CUnknown (const CUnknown &that) : Base (that) {}
+    CUnknown(const CUnknown &that) : Base(that) {}
 
     /** Creates an instance given a foreign interface pointer. */
     template <class OI>
-    explicit CUnknown (OI *aIface)
-    {
-        attach (aIface);
+    explicit CUnknown(OI *aIface)
+    {
+        attach(aIface);
     }
 
     /** Constructor specialization for IUnknown. */
-    explicit CUnknown (IUnknown *aIface) : Base (aIface) {}
+    explicit CUnknown(IUnknown *aIface) : Base(aIface) {}
 
     /** Assigns from another CInterface-based instance. */
     template <class OI, class OB>
-    CUnknown &operator= (const CInterface <OI, OB> &that)
-    {
-        attach (that.ptr());
-        if (SUCCEEDED (mRC))
+    CUnknown &operator=(const CInterface<OI, OB> &that)
+    {
+        attach(that.ptr());
+        if (SUCCEEDED(mRC))
         {
             /* preserve old error info if any */
             mRC = that.lastRC();
-            setErrorInfo (that.errorInfo());
+            setErrorInfo(that.errorInfo());
         }
         return *this;
@@ -874 +874 @@
 
     /** Assignment specialization for CUnknown. */
-    CUnknown &operator= (const CUnknown &that)
-    {
-        Base::operator= (that);
+    CUnknown &operator=(const CUnknown &that)
+    {
+        Base::operator=(that);
         return *this;
     }
@@ -882 +882 @@
     /** Assigns from a foreign interface pointer. */
     template <class OI>
-    CUnknown &operator= (OI *aIface)
-    {
-        attach (aIface);
+    CUnknown &operator=(OI *aIface)
+    {
+        attach(aIface);
         return *this;
     }
 
     /** Assignment specialization for IUnknown. */
-    CUnknown &operator= (IUnknown *aIface)
-    {
-        Base::operator= (aIface);
+    CUnknown &operator=(IUnknown *aIface)
+    {
+        Base::operator=(aIface);
         return *this;
     }

trunk/src/VBox/Main/glue/initterm.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
 # include <objbase.h>
 
-#else /* !defined (VBOX_WITH_XPCOM) */
+#else /* !defined(VBOX_WITH_XPCOM) */
 
 # include <stdlib.h>
@@ -173 +173 @@
         return rv;
 
-    return localFile->QueryInterface(NS_GET_IID (nsIFile), (void **)aRetval);
+    return localFile->QueryInterface(NS_GET_IID(nsIFile), (void **)aRetval);
 }
 
@@ -187 +187 @@
 static unsigned int gXPCOMInitCount = 0;
 
-#else /* !defined (VBOX_WITH_XPCOM) */
+#else /* !defined(VBOX_WITH_XPCOM) */
 
 /**
@@ -199 +199 @@
 static uint32_t gCOMMainInitCount = 0;
 
-#endif /* !defined (VBOX_WITH_XPCOM) */
+#endif /* !defined(VBOX_WITH_XPCOM) */
 
 
@@ -295 +295 @@
         gCOMMainInitCount = 1;
 
-#else /* !defined (VBOX_WITH_XPCOM) */
+#else /* !defined(VBOX_WITH_XPCOM) */
 
     /* Unused here */
@@ -499 +499 @@
     }
 
-#endif /* !defined (VBOX_WITH_XPCOM) */
+#endif /* !defined(VBOX_WITH_XPCOM) */
 
     AssertComRCReturnRC(rc);
@@ -537 +537 @@
     CoUninitialize();
 
-#else /* !defined (VBOX_WITH_XPCOM) */
+#else /* !defined(VBOX_WITH_XPCOM) */
 
     nsCOMPtr<nsIEventQueue> eventQ;

trunk/src/VBox/Main/src-server/xpcom/server_module.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -92 +92 @@
  */
 
-NS_DECL_CLASSINFO (VirtualBox)
-NS_IMPL_CI_INTERFACE_GETTER1 (VirtualBox, IVirtualBox)
+NS_DECL_CLASSINFO(VirtualBox)
+NS_IMPL_CI_INTERFACE_GETTER1(VirtualBox, IVirtualBox)
 
 static nsresult vboxsvcSpawnDaemon(void)
@@ -168 +168 @@
  */
 static NS_IMETHODIMP
-VirtualBoxConstructor (nsISupports *aOuter, REFNSIID aIID,
-                       void **aResult)
+VirtualBoxConstructor(nsISupports *aOuter, REFNSIID aIID,
+                      void **aResult)
 {
     LogFlowFuncEnter();
@@ -189 +189 @@
             /* Get the directory containing XPCOM components -- the VBoxSVC
              * executable is expected in the parent directory. */
-            nsCOMPtr <nsIProperties> dirServ = do_GetService (NS_DIRECTORY_SERVICE_CONTRACTID, &rc);
+            nsCOMPtr<nsIProperties> dirServ = do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rc);
             if (NS_SUCCEEDED(rc))
             {
-                nsCOMPtr <nsIFile> componentDir;
-                rc = dirServ->Get (NS_XPCOM_COMPONENT_DIR,
-                                   NS_GET_IID (nsIFile), getter_AddRefs (componentDir));
+                nsCOMPtr<nsIFile> componentDir;
+                rc = dirServ->Get(NS_XPCOM_COMPONENT_DIR,
+                                  NS_GET_IID(nsIFile), getter_AddRefs(componentDir));
 
                 if (NS_SUCCEEDED(rc))
                 {
                     nsCAutoString path;
-                    componentDir->GetNativePath (path);
-
-                    LogFlowFunc (("component directory = \"%s\"\n", path.get()));
-                    AssertBreakStmt (path.Length() + strlen (VBoxSVC_exe) < RTPATH_MAX,
-                                     rc = NS_ERROR_FAILURE);
+                    componentDir->GetNativePath(path);
+
+                    LogFlowFunc(("component directory = \"%s\"\n", path.get()));
+                    AssertBreakStmt(path.Length() + strlen(VBoxSVC_exe) < RTPATH_MAX,
+                                    rc = NS_ERROR_FAILURE);
 
 #if defined(RT_OS_SOLARIS) && defined(VBOX_WITH_HARDENING)
                     char achKernArch[128];
-                    int cbKernArch = sysinfo (SI_ARCHITECTURE_K, achKernArch, sizeof(achKernArch));
+                    int cbKernArch = sysinfo(SI_ARCHITECTURE_K, achKernArch, sizeof(achKernArch));
                     if (cbKernArch > 0)
                     {
@@ -216 +216 @@
                         rc = NS_ERROR_UNEXPECTED;
 #else
-                    strcpy (VBoxSVCPath, path.get());
-                    RTPathStripFilename (VBoxSVCPath);
-                    strcat (VBoxSVCPath, VBoxSVC_exe);
+                    strcpy(VBoxSVCPath, path.get());
+                    RTPathStripFilename(VBoxSVCPath);
+                    strcat(VBoxSVCPath, VBoxSVC_exe);
 
                     IsVBoxSVCPathSet = true;
@@ -228 +228 @@
         }
 
-        nsCOMPtr <ipcIService> ipcServ = do_GetService (IPC_SERVICE_CONTRACTID, &rc);
+        nsCOMPtr<ipcIService> ipcServ = do_GetService(IPC_SERVICE_CONTRACTID, &rc);
         if (NS_FAILED(rc))
             break;
@@ -239 +239 @@
         do
         {
-            LogFlowFunc (("Resolving server name \"%s\"...\n", VBOXSVC_IPC_NAME));
+            LogFlowFunc(("Resolving server name \"%s\"...\n", VBOXSVC_IPC_NAME));
 
             PRUint32 serverID = 0;
-            rc = ipcServ->ResolveClientName (VBOXSVC_IPC_NAME, &serverID);
+            rc = ipcServ->ResolveClientName(VBOXSVC_IPC_NAME, &serverID);
             if (NS_FAILED(rc))
             {
-                LogFlowFunc (("Starting server \"%s\"...\n", VBoxSVCPath));
+                LogFlowFunc(("Starting server \"%s\"...\n", VBoxSVCPath));
 
                 startedOnce = true;
@@ -256 +256 @@
                 do
                 {
-                    RTThreadSleep (VBoxSVC_WaitSlice);
-                    rc = ipcServ->ResolveClientName (VBOXSVC_IPC_NAME, &serverID);
+                    RTThreadSleep(VBoxSVC_WaitSlice);
+                    rc = ipcServ->ResolveClientName(VBOXSVC_IPC_NAME, &serverID);
                     if (NS_SUCCEEDED(rc))
                         break;
@@ -276 +276 @@
             }
 
-            LogFlowFunc (("Connecting to server (ID=%d)...\n", serverID));
-
-            nsCOMPtr <ipcIDConnectService> dconServ =
-                do_GetService (IPC_DCONNECTSERVICE_CONTRACTID, &rc);
+            LogFlowFunc(("Connecting to server (ID=%d)...\n", serverID));
+
+            nsCOMPtr<ipcIDConnectService> dconServ =
+                do_GetService(IPC_DCONNECTSERVICE_CONTRACTID, &rc);
             if (NS_FAILED(rc))
                 break;
 
-            rc = dconServ->CreateInstance (serverID,
-                                           CLSID_VirtualBox,
-                                           aIID, aResult);
+            rc = dconServ->CreateInstance(serverID,
+                                          CLSID_VirtualBox,
+                                          aIID, aResult);
             if (NS_SUCCEEDED(rc))
                 break;
 
-            LogFlowFunc (("Failed to connect (rc=%Rhrc (%#08x))\n", rc, rc));
+            LogFlowFunc(("Failed to connect (rc=%Rhrc (%#08x))\n", rc, rc));
 
             /* It's possible that the server gets shut down after we
@@ -298 +298 @@
             {
                 nsresult rc2 =
-                    ipcServ->ResolveClientName (VBOXSVC_IPC_NAME, &serverID);
+                    ipcServ->ResolveClientName(VBOXSVC_IPC_NAME, &serverID);
                 if (NS_SUCCEEDED(rc2))
                     break;
 
-                LogFlowFunc (("Server seems to have terminated before "
-                              "receiving our request. Will try again.\n"));
+                LogFlowFunc(("Server seems to have terminated before receiving our request. Will try again.\n"));
             }
             else
@@ -312 +311 @@
     while (0);
 
-    LogFlowFunc (("rc=%Rhrc (%#08x), vrc=%Rrc\n", rc, rc, vrc));
+    LogFlowFunc(("rc=%Rhrc (%#08x), vrc=%Rrc\n", rc, rc, vrc));
     LogFlowFuncLeave();
 
@@ -331 +330 @@
  */
 static NS_IMETHODIMP
-VirtualBoxRegistration (nsIComponentManager *aCompMgr,
-                        nsIFile *aPath,
-                        const char *aLoaderStr,
-                        const char *aType,
-                        const nsModuleComponentInfo *aInfo)
+VirtualBoxRegistration(nsIComponentManager *aCompMgr,
+                       nsIFile *aPath,
+                       const char *aLoaderStr,
+                       const char *aType,
+                       const nsModuleComponentInfo *aInfo)
 {
     nsCAutoString modulePath;
-    aPath->GetNativePath (modulePath);
+    aPath->GetNativePath(modulePath);
     nsCAutoString moduleTarget;
-    aPath->GetNativeTarget (moduleTarget);
-
-    LogFlowFunc (("aPath=%s, aTarget=%s, aLoaderStr=%s, aType=%s\n",
-                  modulePath.get(), moduleTarget.get(), aLoaderStr, aType));
+    aPath->GetNativeTarget(moduleTarget);
+
+    LogFlowFunc(("aPath=%s, aTarget=%s, aLoaderStr=%s, aType=%s\n",
+                 modulePath.get(), moduleTarget.get(), aLoaderStr, aType));
 
     nsresult rc = NS_OK;
@@ -372 +371 @@
 };
 
-NS_IMPL_NSGETMODULE (VirtualBox_Server_Module, components)
+NS_IMPL_NSGETMODULE(VirtualBox_Server_Module, components)

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 #include <VBox/com/ErrorInfo.h>
 #include <VBox/com/errorprint.h>
-#include <VBox/com/EventQueue.h>
 
 #include <VBox/com/VirtualBox.h>
@@ -369 +368 @@
     }
 #endif
-
-    // create the event queue
-    // (here it is necessary only to process remaining XPCOM/IPC events
-    // after the session is closed)
-    EventQueue eventQ;
 
 #if 0

trunk/src/VBox/Main/testcase/tstOVF.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 #include <VBox/com/ErrorInfo.h>
 #include <VBox/com/errorprint.h>
-#include <VBox/com/EventQueue.h>
 
 #include <iprt/initterm.h>
@@ -306 +305 @@
         if (FAILED(rc)) throw MyError(rc, "failed to create a session object!\n");
 
-        // create the event queue
-        // (here it is necessary only to process remaining XPCOM/IPC events after the session is closed)
-        EventQueue eventQ;
-
         // for each testcase, we will copy the dummy VMDK image to the subdirectory with the OVF testcase
         // so that the import will find the disks it expects; this is just for testing the import since

trunk/src/VBox/Main/testcase/tstVBoxAPIXPCOM.cpp

@@ -8 +8 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -80 +80 @@
 #include <VBox/com/ErrorInfo.h>
 #include <VBox/com/errorprint.h>
-#include <VBox/com/EventQueue.h>
 
 #include <VBox/com/VirtualBox.h>

trunk/src/VBox/Main/webservice/websrv-cpp.xsl

@@ -12 +12 @@
         generated for the webservice.
 
-    Copyright (C) 2007-2013 Oracle Corporation
+    Copyright (C) 2007-2014 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
@@ -66 +66 @@
 #include <VBox/com/ErrorInfo.h>
 #include <VBox/com/errorprint.h>
-#include <VBox/com/EventQueue.h>
 #include <VBox/VBoxAuth.h>