Changeset 49678 in vbox

Timestamp:

Nov 27, 2013 12:56:31 PM (11 years ago)

Author:

vboxsync

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

90937

Message:

Main/idl/comimpl.xsl: fix long standing bug (only visible with XPCOM) where the code generator produces wrong list of implemented interfaces, causing errors with QueryInterface, plus fixing a few places where @ was used where $ is more logical

File:

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

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

@@ -196 +196 @@
       <xsl:variable name="elemtype">
         <xsl:call-template name="typeIdl2Back">
-          <xsl:with-param name="type" select="@type" />
+          <xsl:with-param name="type" select="$type" />
           <xsl:with-param name="safearray" select="''" />
           <xsl:with-param name="dir" select="'in'" />
@@ -219 +219 @@
       <xsl:variable name="elemtype">
         <xsl:call-template name="typeIdl2Back">
-             <xsl:with-param name="type" select="@type" />
+             <xsl:with-param name="type" select="$type" />
              <xsl:with-param name="safearray" select="''" />
              <xsl:with-param name="dir" select="'in'" />
@@ -328 +328 @@
 
   <xsl:choose>
-    <xsl:when test="$extends='IEvent'">
+    <xsl:when test="$name='IEvent'">
       <xsl:value-of select="       '#ifdef VBOX_WITH_XPCOM&#10;'" />
       <xsl:value-of select="concat('NS_DECL_CLASSINFO(', $impl, ')&#10;')" />
-      <xsl:value-of select="concat('NS_IMPL_THREADSAFE_ISUPPORTS',$depth,'_CI(', $impl, ', ', $name, $parents, ', IEvent)&#10;')" />
+      <xsl:value-of select="concat('NS_IMPL_THREADSAFE_ISUPPORTS',$depth,'_CI(', $impl, $parents, ', IEvent)&#10;')" />
       <xsl:value-of select="       '#endif&#10;&#10;'"/>
     </xsl:when>
@@ -339 +339 @@
         <xsl:with-param name="name" select="$extends" />
         <xsl:with-param name="depth" select="$depth+1" />
-        <xsl:with-param name="parents" select="concat($parents, ', ', @name)" />
+        <xsl:with-param name="parents" select="concat($parents, ', ', $name)" />
       </xsl:call-template>
     </xsl:when>
@@ -592 +592 @@
     <xsl:with-param name="impl" select="$implName" />
     <xsl:with-param name="name" select="@name" />
-    <xsl:with-param name="depth" select="'2'" />
+    <xsl:with-param name="depth" select="'1'" />
     <xsl:with-param name="parents" select="''" />
   </xsl:call-template>