Changeset 10709 in vbox

Timestamp:

Jul 16, 2008 7:23:38 PM (16 years ago)

Author:

vboxsync

Message:

Main: SafeArray: Added SafeArrayTraits <const PRUnichar *> to make sure there is no unnecessary const violation. Note that the parameter to the ComSafeArray template must be now INPTR BSTR for input BSTR array parameters.

File:

• trunk/include/VBox/com/array.h (modified) (2 diffs)

trunk/include/VBox/com/array.h

@@ -153 +153 @@
  * supported and therefore cannot be used as element types.
  *
+ * In order to pass input BSTR array parameters delcared using the
+ * ComSafeArrayIn (INPTR BSTR, aParam) macro to the SafeArray<> constructor
+ * using the ComSafeArrayInArg() macro, you should use INPTR BSTR as the
+ * SafeArray<> template argument, not just BSTR.
+ *
  * Arrays of interface pointers are also supported but they require to use a
  * special SafeArray implementation, com::SafeIfacePointer, which takes the
@@ -265 +270 @@
         return const_cast <const PRUnichar **> (aArr);
     }
+    static const PRUnichar **__asInParam_Arr (const PRUnichar **aArr) { return aArr; }
+};
+
+template<>
+struct SafeArrayTraits <const PRUnichar *>
+{
+protected:
+
+    static void Init (const PRUnichar * &aElem) { aElem = NULL; }
+    static void Uninit (const PRUnichar * &aElem)
+    {
+        if (aElem)
+        {
+            ::SysFreeString (const_cast <PRUnichar *> (aElem));
+            aElem = NULL;
+        }
+    }
+
+    static void Copy (const PRUnichar * aFrom, const PRUnichar * &aTo)
+    {
+        AssertCompile (sizeof (PRUnichar) == sizeof (OLECHAR));
+        aTo = aFrom ? ::SysAllocString ((const OLECHAR *) aFrom) : NULL;
+    }
+
+public:
+
+    /* Magic to workaround strict rules of par. 4.4.4 of the C++ standard */
     static const PRUnichar **__asInParam_Arr (const PRUnichar **aArr) { return aArr; }
 };