Changeset 35913 in vbox

Timestamp:

Feb 9, 2011 12:44:03 PM (14 years ago)

Author:

vboxsync

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

69940

Message:

Main: pass in safearrays as SAFEARRAY*

Location:

trunk

Files:

• include/VBox/com/array.h (modified) (3 diffs)
• include/VBox/com/defs.h (modified) (3 diffs)
• src/VBox/Main/idl/comimpl.xsl (modified) (1 diff)
• src/VBox/Main/idl/midl.xsl (modified) (2 diffs)

trunk/include/VBox/com/array.h

@@ -619 +619 @@
 
         AssertReturnVoid (aArg != NULL);
-        SAFEARRAY *arg = *aArg;
+        SAFEARRAY *arg = aArg;
 
         if (arg)
@@ -1025 +1025 @@
 
     /** Internal function Never call it directly. */
-    SAFEARRAY ** __asInParam() { return &m.arr; }
+    SAFEARRAY * __asInParam() { return m.arr; }
 
     /** Internal function Never call it directly. */
@@ -1519 +1519 @@
 
         AssertReturnVoid (aArg != NULL);
-        SAFEARRAY *arg = *aArg;
+        SAFEARRAY *arg = aArg;
 
         if (arg)

trunk/include/VBox/com/defs.h

@@ -137 +137 @@
  * @param aArg  Parameter/attribute name.
  */
-#define ComSafeArrayIn(aType, aArg)     SAFEARRAY **aArg
+#define ComSafeArrayIn(aType, aArg)     SAFEARRAY *aArg
 
 /**
@@ -143 +143 @@
  * which makes it impossible to use it for reading safearray data.
  */
-#define ComSafeArrayInIsNull(aArg)      ((aArg) == NULL || *(aArg) == NULL)
+#define ComSafeArrayInIsNull(aArg)      ((aArg) == NULL)
 
 /**
@@ -194 +194 @@
  * @param aArg Parameter name to wrap.
  */
-#define ComSafeGUIDArrayIn(aArg)        SAFEARRAY **aArg
+#define ComSafeGUIDArrayIn(aArg)        SAFEARRAY *aArg
 
 /**

trunk/src/VBox/Main/idl/comimpl.xsl

@@ -294 +294 @@
          </xsl:variable>
          <xsl:value-of select="       '#ifdef RT_OS_WINDOWS&#10;'"/>
-         <xsl:value-of select="       '              SAFEARRAY **    aPtr = va_arg(args, SAFEARRAY **);&#10;'"/>
+         <xsl:value-of select="       '              SAFEARRAY *    aPtr = va_arg(args, SAFEARRAY *);&#10;'"/>
          <xsl:value-of select="concat('              com::SafeArray&lt;', $elemtype,'&gt;   aArr(aPtr);&#10;')"/>
          <xsl:value-of select="       '#else&#10;'"/>

trunk/src/VBox/Main/idl/midl.xsl

@@ -687 +687 @@
     <xsl:otherwise>in</xsl:otherwise>
   </xsl:choose>
-  <xsl:if test="@safearray='yes'">
-    <!-- VB supports only [in, out], [out] and [out, retval] arrays -->
-    <xsl:if test="@dir='in'">, out</xsl:if>
-  </xsl:if>
   <xsl:text>] </xsl:text>
   <xsl:if test="@safearray='yes'">
@@ -699 +695 @@
     <xsl:text>)</xsl:text>
   </xsl:if>
-  <xsl:if test="@dir='out' or @dir='return' or @safearray='yes'">
+  <xsl:if test="@dir='out' or @dir='return'">
     <xsl:text> *</xsl:text>
   </xsl:if>