Changeset 32727 in vbox for trunk/include/VBox/com

Timestamp:

Sep 23, 2010 2:31:31 PM (15 years ago)

Author:

vboxsync

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

66161

Message:

com/string: Windows build fixes

File:

• trunk/include/VBox/com/string.h (modified) (8 diffs)

trunk/include/VBox/com/string.h

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2009 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -38 +38 @@
 #endif
 
-#if defined (VBOX_WITH_XPCOM)
+#if defined(VBOX_WITH_XPCOM)
 # include <nsMemory.h>
 #endif
@@ -107 +107 @@
     }
 
-#if defined (VBOX_WITH_XPCOM)
+#if defined(VBOX_WITH_XPCOM)
     Bstr(const wchar_t *that)
     {
@@ -144 +144 @@
     }
 
-#if defined (VBOX_WITH_XPCOM)
+#if defined(VBOX_WITH_XPCOM)
     Bstr& operator=(const wchar_t *that)
     {
@@ -212 +212 @@
     size_t length() const { return isEmpty() ? 0 : ::RTUtf16Len((PRTUTF16)m_bstr); }
 
+#if defined(VBOX_WITH_XPCOM)
     /**
      *  Returns a pointer to the raw member UTF-16 string. If the member string is empty,
@@ -224 +225 @@
         return g_bstrEmpty;
     }
+#else
+    /**
+     *  Windows-only hack, as the automatically generated headers use BSTR.
+     *  So if we don't want to cast like crazy we have to be more loose than
+     *  on XPCOM.
+     *
+     *  Returns a pointer to the raw member UTF-16 string. If the member string is empty,
+     *  returns a pointer to a global variable containing an empty BSTR with a proper zero
+     *  length prefix so that Windows is happy.
+     */
+    BSTR raw() const
+    {
+        if (m_bstr)
+            return m_bstr;
+
+        return g_bstrEmpty;
+    }
+#endif
 
     /**
@@ -438 +457 @@
     }
 
-#if defined (VBOX_WITH_XPCOM)
+#if defined(VBOX_WITH_XPCOM)
     /**
      * Intended to assign instances to |char *| out parameters from within the
@@ -537 +556 @@
  *  The usage of this class is like the following:
  *  <code>
- *      Utf8StrFmt string ("program name = %s", argv[0]);
+ *      Utf8StrFmt string("program name = %s", argv[0]);
  *  </code>
  */