Changeset 6935 in vbox for trunk/src/VBox

Timestamp:

Feb 13, 2008 4:43:19 PM (17 years ago)

Author:

vboxsync

Message:

Main: Changed 'defined (RT_OS_WINDOWS)' => '!defined (VBOX_WITH_XPCOM)' in relevant places, for clarity (not XPCOM is possible only on Windows so far).

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (1 diff)
• ProgressImpl.cpp (modified) (2 diffs)
• VirtualBoxBase.cpp (modified) (7 diffs)
• VirtualBoxErrorInfoImpl.cpp (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (1 diff)
• include/VirtualBoxBase.h (modified) (37 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -70 +70 @@
     bool afPciDeviceNo[15] = {false};
 
-#if defined(RT_OS_WINDOWS)
+#if !defined (VBOX_WITH_XPCOM)
     {
         /* initialize COM */

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -770 +770 @@
 
 #if !defined (VBOX_WITH_XPCOM)
-#if defined (RT_OS_WINDOWS)
 
         ComPtr <IErrorInfo> err;
@@ -781 +780 @@
         }
 
-#endif // !defined (RT_OS_WINDOWS)
 #else // !defined (VBOX_WITH_XPCOM)
 

trunk/src/VBox/Main/VirtualBoxBase.cpp

@@ -19 +19 @@
 
 #if !defined (VBOX_WITH_XPCOM)
-#if defined (RT_OS_WINDOWS)
 #include <windows.h>
 #include <dbghelp.h>
-#endif
 #else // !defined (VBOX_WITH_XPCOM)
 #include <nsIServiceManager.h>
@@ -672 +670 @@
 
 #if !defined (VBOX_WITH_XPCOM)
-#if defined (RT_OS_WINDOWS)
 
         ComPtr <IVirtualBoxErrorInfo> curInfo;
@@ -708 +705 @@
             rc = ::SetErrorInfo (0, err);
 
-#endif
 #else // !defined (VBOX_WITH_XPCOM)
 
@@ -937 +933 @@
 /**
  * Uninitializes all dependent children registered with #addDependentChild().
- * 
- * Typically called from the uninit() method. Note that this method will call 
- * uninit() methods of child objects. If these methods need to call the parent 
- * object during initialization, uninitDependentChildren() must be called before 
- * the relevant part of the parent is uninitialized, usually at the begnning of 
- * the parent uninitialization sequence. 
+ *
+ * Typically called from the uninit() method. Note that this method will call
+ * uninit() methods of child objects. If these methods need to call the parent
+ * object during initialization, uninitDependentChildren() must be called before
+ * the relevant part of the parent is uninitialized, usually at the begnning of
+ * the parent uninitialization sequence.
  */
 void VirtualBoxBaseWithChildrenNEXT::uninitDependentChildren()
@@ -1003 +999 @@
  * Returns a pointer to the dependent child corresponding to the given
  * interface pointer (used as a key in the map of dependent children) or NULL
- * if the interface pointer doesn't correspond to any child registered using 
- * #addDependentChild(). 
- *  
- * Note that ComPtr <IUnknown> is used as an argument instead of IUnknown * in 
- * order to guarantee IUnknown identity and disambiguation by doing 
- * QueryInterface (IUnknown) rather than a regular C cast. 
+ * if the interface pointer doesn't correspond to any child registered using
+ * #addDependentChild().
+ *
+ * Note that ComPtr <IUnknown> is used as an argument instead of IUnknown * in
+ * order to guarantee IUnknown identity and disambiguation by doing
+ * QueryInterface (IUnknown) rather than a regular C cast.
  *
  * @param aUnk  Pointer to map to the dependent child object.
@@ -1081 +1077 @@
 
 /**
- * Uninitializes all dependent children registered with 
- * #addDependentChild(). 
- *
- * @note This method will call uninit() methods of children. If these 
+ * Uninitializes all dependent children registered with
+ * #addDependentChild().
+ *
+ * @note This method will call uninit() methods of children. If these
  *       methods access the parent object, uninitDependentChildren() must be
  *       called either at the beginning of the parent uninitialization
@@ -1188 +1184 @@
     if (RT_FAILURE (vrc))
         throw ENoConversion (FmtStr ("'%s' is not Guid (%Vrc)", aValue, vrc));
-        
+
     return com::Guid (uuid);
 }

trunk/src/VBox/Main/VirtualBoxErrorInfoImpl.cpp

@@ -84 +84 @@
 
 #if !defined (VBOX_WITH_XPCOM)
-#if defined (RT_OS_WINDOWS)
 
 /**
@@ -139 +138 @@
 }
 
-#endif // defined (RT_OS_WINDOWS)
 #else // !defined (VBOX_WITH_XPCOM)
 

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -3354 +3354 @@
         if (aHardDisk->storageType() == HardDiskStorageType_VirtualDiskImage)
 #if !defined (VBOX_WITH_XPCOM)
-#if defined(RT_OS_WINDOWS)
             /// @todo (dmik) stupid BSTR declaration lacks the BCSTR counterpart
             const_cast <BSTR> (aFilePathFull) = aHardDisk->asVDI()->filePathFull();
-#endif
 #else
             aFilePathFull = aHardDisk->asVDI()->filePathFull();

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -41 +41 @@
 #include <map>
 
-#if defined (RT_OS_WINDOWS)
+#if !defined (VBOX_WITH_XPCOM)
 
 #include <atlcom.h>
@@ -117 +117 @@
 };
 
-#endif // defined (RT_OS_WINDOWS)
+#endif // !defined (VBOX_WITH_XPCOM)
 
 // macros
@@ -432 +432 @@
 
 class ATL_NO_VTABLE VirtualBoxBaseNEXT_base
-#ifdef RT_OS_WINDOWS
+#if !defined (VBOX_WITH_XPCOM)
     : public CComObjectRootEx <CComMultiThreadModel>
 #else
@@ -476 +476 @@
         return addCaller (aState, true /* aLimited */);
     }
-    
+
     /**
      *  Smart class that automatically increases the number of callers of the
@@ -497 +497 @@
      *  @note It is preferrable to use the AutoCaller and AutoLimitedCaller
      *        classes than specify the @a aLimited argument, for better
-     *        self-descriptiveness. 
+     *        self-descriptiveness.
      */
     template <bool aLimited>
@@ -613 +613 @@
      */
     typedef AutoCallerBase <false> AutoCaller;
-    
+
     /**
      *  Smart class that automatically increases the number of limited callers
@@ -638 +638 @@
      */
     typedef AutoCallerBase <true> AutoLimitedCaller;
-    
+
 protected:
 
@@ -692 +692 @@
 
         enum Status { Failed = 0x0, Succeeded = 0x1, Limited = 0x2 };
-    
+
         AutoInitSpan (VirtualBoxBaseNEXT_base *aObj, Status aStatus = Failed);
         ~AutoInitSpan();
@@ -726 +726 @@
 
         /** Returns the current initialization status. */
-        Status status() { return mStatus; } 
+        Status status() { return mStatus; }
 
     private:
@@ -928 +928 @@
 /// @todo (dmik) remove after we switch to VirtualBoxBaseNEXT completely
 class ATL_NO_VTABLE VirtualBoxBase : public VirtualBoxBaseNEXT_base
-//#ifdef RT_OS_WINDOWS
+//#if !defined (VBOX_WITH_XPCOM)
 //    : public CComObjectRootEx<CComMultiThreadModel>
 //#else
@@ -1098 +1098 @@
 protected:
 
-    inline static HRESULT setError (HRESULT aResultCode, const GUID &aIID,
+    static HRESULT setError (HRESULT aResultCode, const GUID &aIID,
                                     const Bstr &aComponent,
                                     const Bstr &aText)
@@ -1106 +1106 @@
     }
 
-    inline static HRESULT addError (HRESULT aResultCode, const GUID &aIID,
+    static HRESULT addError (HRESULT aResultCode, const GUID &aIID,
                                     const Bstr &aComponent,
                                     const Bstr &aText)
@@ -1159 +1159 @@
 class ATL_NO_VTABLE VirtualBoxSupportErrorInfoImpl
     : protected VirtualBoxSupportErrorInfoImplBase
-#if defined (RT_OS_WINDOWS)
+#if !defined (VBOX_WITH_XPCOM)
     , public ISupportErrorInfo
 #else
@@ -1166 +1166 @@
 public:
 
-#if defined (RT_OS_WINDOWS)
+#if !defined (VBOX_WITH_XPCOM)
     STDMETHOD(InterfaceSupportsErrorInfo) (REFIID riid)
     {
@@ -1197 +1197 @@
         return bSupports ? S_OK : S_FALSE;
     }
-#endif // defined (RT_OS_WINDOWS)
+#endif // !defined (VBOX_WITH_XPCOM)
 
 protected:
@@ -1241 +1241 @@
      *      error argument.
      */
-    inline static HRESULT setError (HRESULT aResultCode, const GUID &aIID,
-                                    const wchar_t *aComponent,
-                                    const char *aText, ...)
+    static HRESULT setError (HRESULT aResultCode, const GUID &aIID,
+                             const wchar_t *aComponent,
+                             const char *aText, ...)
     {
         va_list args;
@@ -1259 +1259 @@
      *  attribute of the new error info object.
      */
-    inline static HRESULT addError (HRESULT aResultCode, const GUID &aIID,
-                                    const wchar_t *aComponent,
-                                    const char *aText, ...)
+    static HRESULT addError (HRESULT aResultCode, const GUID &aIID,
+                             const wchar_t *aComponent,
+                             const char *aText, ...)
     {
         va_list args;
@@ -1294 +1294 @@
      *  </code>
      */
-    inline static HRESULT setError (HRESULT aResultCode, const char *aText, ...)
+    static HRESULT setError (HRESULT aResultCode, const char *aText, ...)
     {
         va_list args;
@@ -1310 +1310 @@
      *  attribute of the new error info object.
      */
-    inline static HRESULT addError (HRESULT aResultCode, const char *aText, ...)
+    static HRESULT addError (HRESULT aResultCode, const char *aText, ...)
     {
         va_list args;
@@ -1329 +1329 @@
      *  and #setError (HRESULT, const char *, ...)  for details.
      */
-    inline static HRESULT setErrorV (HRESULT aResultCode, const char *aText,
-                                     va_list aArgs)
+    static HRESULT setErrorV (HRESULT aResultCode, const char *aText,
+                              va_list aArgs)
     {
         HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setError
@@ -1343 +1343 @@
      *  attribute of the new error info object.
      */
-    inline static HRESULT addErrorV (HRESULT aResultCode, const char *aText,
-                                     va_list aArgs)
+    static HRESULT addErrorV (HRESULT aResultCode, const char *aText,
+                              va_list aArgs)
     {
         HRESULT rc = VirtualBoxSupportErrorInfoImplBase::addError
@@ -1358 +1358 @@
      *
      *  This method is preferred iy you have a ready (translated and formatted)
-     *  Bstr string, because it omits an extra conversion Utf8Str -> Bstr. 
+     *  Bstr string, because it omits an extra conversion Utf8Str -> Bstr.
      *
      *  See #setError (HRESULT, const GUID &, const wchar_t *, const char *text, ...)
      *  and #setError (HRESULT, const char *, ...)  for details.
      */
-    inline static HRESULT setErrorBstr (HRESULT aResultCode, const Bstr &aText)
+    static HRESULT setErrorBstr (HRESULT aResultCode, const Bstr &aText)
     {
         HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setError
@@ -1376 +1376 @@
      *  attribute of the new error info object.
      */
-    inline static HRESULT addErrorBstr (HRESULT aResultCode, const Bstr &aText)
+    static HRESULT addErrorBstr (HRESULT aResultCode, const Bstr &aText)
     {
         HRESULT rc = VirtualBoxSupportErrorInfoImplBase::addError
@@ -1392 +1392 @@
      *  for details.
      */
-    inline static HRESULT setError (HRESULT aResultCode, const GUID &aIID,
-                                    const char *aText, ...)
+    static HRESULT setError (HRESULT aResultCode, const GUID &aIID,
+                             const char *aText, ...)
     {
         va_list args;
@@ -1409 +1409 @@
      *  attribute of the new error info object.
      */
-    inline static HRESULT addError (HRESULT aResultCode, const GUID &aIID,
-                                    const char *aText, ...)
+    static HRESULT addError (HRESULT aResultCode, const GUID &aIID,
+                             const char *aText, ...)
     {
         va_list args;
@@ -1471 +1471 @@
  *  if #addDependentChild() or #removeDependentChild() are used incorrectly
  *  (called at inappropriate times). Check the above rules once more.
- *  
+ *
  *  @deprecated Use VirtualBoxBaseWithChildrenNEXT for new classes.
  */
@@ -1549 +1549 @@
 
 /**
- *  
+ *
  * Base class to track VirtualBoxBaseNEXT chlidren of the component.
- *  
- * This class is a preferrable VirtualBoxBase replacement for components that 
- * operate with collections of child components. It gives two useful 
- * possibilities: 
- *
- * <ol><li> 
- *      Given an IUnknown instance, it's possible to quickly determine 
+ *
+ * This class is a preferrable VirtualBoxBase replacement for components that
+ * operate with collections of child components. It gives two useful
+ * possibilities:
+ *
+ * <ol><li>
+ *      Given an IUnknown instance, it's possible to quickly determine
  *      whether this instance represents a child object created by the given
  *      component, and if so, get a valid VirtualBoxBase pointer to the child
@@ -1595 +1595 @@
  *
  * Note that children added by #addDependentChild() are <b>weakly</b> referenced
- * (i.e. AddRef() is not called), so when a child object is deleted externally 
- * (because it's reference count goes to zero), it will automatically remove 
+ * (i.e. AddRef() is not called), so when a child object is deleted externally
+ * (because it's reference count goes to zero), it will automatically remove
  * itself from the map of dependent children provided that it follows the rules
- * described here. 
- *
- * @note Once again: because of weak referencing, deadlocks and assertions are 
+ * described here.
+ *
+ * @note Once again: because of weak referencing, deadlocks and assertions are
  *       very likely if #addDependentChild() or #removeDependentChild() are used
  *       incorrectly (called at inappropriate times). Check the above rules once
  *       more.
- *  
- * @todo This is a VirtualBoxBaseWithChildren equivalent that uses the 
+ *
+ * @todo This is a VirtualBoxBaseWithChildren equivalent that uses the
  *       VirtualBoxBaseNEXT implementation. Will completely supercede
  *       VirtualBoxBaseWithChildren after the old VirtualBoxBase implementation
@@ -1622 +1622 @@
 
     /**
-     * Adds the given child to the map of dependent children. 
+     * Adds the given child to the map of dependent children.
      *
      * Typically called from the child's init() method, from within the
      * AutoInitSpan scope.  Otherwise, VirtualBoxBase::AutoCaller must be
-     * used on @a aChild to make sure it is not uninitialized during this 
+     * used on @a aChild to make sure it is not uninitialized during this
      * method's call.
      *
-     * @param aChild    Child object to add (must inherit VirtualBoxBase AND 
+     * @param aChild    Child object to add (must inherit VirtualBoxBase AND
      *                  implement some interface).
      */
@@ -1640 +1640 @@
 
     /**
-     * Removes the given child from the map of dependent children. 
-     *  
-     * Make sure this method is called after the child has successfully entered 
-     * AutoUninitSpan and outside the child lock. 
-     *  
-     * If called not from within the AutoUninitSpan scope, 
-     * VirtualBoxBase::AutoCaller must be used on @a aChild to make sure it is 
-     * not uninitialized during this method's call. 
+     * Removes the given child from the map of dependent children.
+     *
+     * Make sure this method is called after the child has successfully entered
+     * AutoUninitSpan and outside the child lock.
+     *
+     * If called not from within the AutoUninitSpan scope,
+     * VirtualBoxBase::AutoCaller must be used on @a aChild to make sure it is
+     * not uninitialized during this method's call.
      *
      * @param aChild    Child object to remove (must inherit VirtualBoxBase AND
@@ -1707 +1707 @@
  *  @param C    type of child objects (must inherit VirtualBoxBase AND
  *              implement some interface)
- *  
+ *
  *  @deprecated Use VirtualBoxBaseWithTypedChildrenNEXT for new classes.
  */
@@ -1844 +1844 @@
  * Base class to track component's chlidren of the particular type.
  *
- * This class is similar to VirtualBoxBaseWithChildren, with the exception that 
- * all children must be of the same type. For this reason, it's not necessary to 
- * use a map to store children, so a list is used instead. 
+ * This class is similar to VirtualBoxBaseWithChildren, with the exception that
+ * all children must be of the same type. For this reason, it's not necessary to
+ * use a map to store children, so a list is used instead.
  *
  * As opposed to VirtualBoxBaseWithChildren, children added by
- * #addDependentChild() are <b>strongly</b> referenced, so that they cannot be 
- * externally deleted until #removeDependentChild() is called. For this 
- * reason, strict rules of calling #removeDependentChild() don't apply to 
- * instances of this class -- it can be called anywhere in the child's uninit() 
- * implementation. 
- *
- * @param C Type of child objects (must inherit VirtualBoxBase AND implementsome 
+ * #addDependentChild() are <b>strongly</b> referenced, so that they cannot be
+ * externally deleted until #removeDependentChild() is called. For this
+ * reason, strict rules of calling #removeDependentChild() don't apply to
+ * instances of this class -- it can be called anywhere in the child's uninit()
+ * implementation.
+ *
+ * @param C Type of child objects (must inherit VirtualBoxBase AND implementsome
  *          interface).
- *  
- * @todo This is a VirtualBoxBaseWithChildren equivalent that uses the 
+ *
+ * @todo This is a VirtualBoxBaseWithChildren equivalent that uses the
  *       VirtualBoxBaseNEXT implementation. Will completely supercede
  *       VirtualBoxBaseWithChildren after the old VirtualBoxBase implementation
@@ -1875 +1875 @@
 
     /**
-     * Adds the given child to the list of dependent children. 
-     * 
-     * VirtualBoxBase::AutoCaller must be used on @a aChild to make sure it is 
+     * Adds the given child to the list of dependent children.
+     *
+     * VirtualBoxBase::AutoCaller must be used on @a aChild to make sure it is
      * not uninitialized during this method's call.
      *
@@ -1895 +1895 @@
 
     /**
-     * Removes the given child from the list of dependent children. 
-     * 
-     * VirtualBoxBase::AutoCaller must be used on @a aChild to make sure it is 
-     * not uninitialized during this method's call. 
+     * Removes the given child from the list of dependent children.
+     *
+     * VirtualBoxBase::AutoCaller must be used on @a aChild to make sure it is
+     * not uninitialized during this method's call.
      *
      *  @param aChild   the child object to remove (must inherit VirtualBoxBase
@@ -1917 +1917 @@
 
     /**
-     * Returns an internal lock handle used to lock the list of children 
-     * returned by #dependentChildren(). This lock is to be used by AutoLock as 
-     * follows: 
-     * <code> 
+     * Returns an internal lock handle used to lock the list of children
+     * returned by #dependentChildren(). This lock is to be used by AutoLock as
+     * follows:
+     * <code>
      *      AutoLock alock (dependentChildrenLock());
      * </code>
@@ -1927 +1927 @@
 
     /**
-     * Returns the read-only list of all dependent children. 
-     *  
-     * @note Access the returned list (iterate, get size etc.) only after doing 
+     * Returns the read-only list of all dependent children.
+     *
+     * @note Access the returned list (iterate, get size etc.) only after doing
      *       AutoLock alock (dependentChildrenLock())!
      */
@@ -2210 +2210 @@
 #if defined VBOX_MAIN_SETTINGS_ADDONS
 
-/** 
+/**
  * Settinsg API additions.
  */