Changeset 85305 in vbox for trunk/src/VBox/Main/idl

Timestamp:

Jul 13, 2020 10:25:50 AM (4 years ago)

Author:

vboxsync

Message:

Main/comimpl.xsl,++: Make trivial internal setters return void rather than HRESULT/S_OK. bugref:9790

File:

• trunk/src/VBox/Main/idl/comimpl.xsl (modified) (5 diffs)

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

@@ -202 +202 @@
   <xsl:param name="type"/>
   <xsl:param name="safearray"/>
+  <xsl:param name="internal"/>
 
   <xsl:choose>
@@ -220 +221 @@
     <xsl:otherwise>
       <xsl:value-of select="concat('         ', $member, ' = ', $param, ';&#10;')"/>
-      <xsl:value-of select="       '         return S_OK;&#10;'" />
+      <xsl:if test="$internal!='yes'">
+        <xsl:text>         return S_OK;&#10;</xsl:text>
+      </xsl:if>
     </xsl:otherwise>
   </xsl:choose>
@@ -507 +510 @@
         <xsl:with-param name="param" select="$pName" />
         <xsl:with-param name="safearray" select="@safearray" />
+        <xsl:with-param name="internal" select="'no'" />
       </xsl:call-template>
       <xsl:value-of select="       '    }&#10;'" />
@@ -512 +516 @@
 
     <xsl:value-of select="       '    // purely internal setter&#10;'" />
-    <xsl:value-of select="concat('    inline HRESULT set_', @name,'(',$pTypeNameIn, ')&#10;    {&#10;')" />
+    <xsl:text>    inline </xsl:text>
+    <xsl:choose>
+      <xsl:when test="(@safearray='yes') or (@type='wstring') or (@type = 'uuid')">
+        <xsl:text>HRESULT</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>void</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:value-of select="concat(' set_', @name,'(',$pTypeNameIn, ')&#10;    {&#10;')" />
     <xsl:call-template name="genSetParam">
       <xsl:with-param name="type" select="@type" />
@@ -518 +531 @@
       <xsl:with-param name="param" select="$pName" />
       <xsl:with-param name="safearray" select="@safearray" />
+      <xsl:with-param name="internal" select="'yes'" />
     </xsl:call-template>
     <xsl:value-of select="       '    }&#10;'" />