Dump return values.

diff --git a/base.py b/base.py
index 22ffae5f9d571105a5c173fae02ab08784046935..abc0aaac8bd4a309e09e5af320f1b503af80047a 100644 (file)
--- a/base.py
+++ b/base.py
@@ -220,12 +220,18 @@ class Interface(Type):
                     type.dump(name)
                     print '    g_pLog->EndParam();'
             print '    %sm_pInstance->%s(%s);' % (result, method.name, ', '.join([str(name) for type, name in method.args]))
-            print '    g_pLog->EndCall();'
             for type, name in method.args:
                 if type.isoutput():
+                    print '    g_pLog->BeginParam("%s", "%s");' % (name, type)
+                    type.dump(name)
+                    print '    g_pLog->EndParam();'
                     type.wrap_instance(name)
             if method.type is not Void:
+                print '    g_pLog->BeginReturn("%s");' % method.type
+                type.dump("result")
+                print '    g_pLog->EndReturn();'
                 method.type.wrap_instance('result')
+            print '    g_pLog->EndCall();'
             if method.name == 'QueryInterface':
                 print '    if(*ppvObj == m_pInstance)'
                 print '        *ppvObj = this;'

diff --git a/d3dtrace.xsl b/d3dtrace.xsl
index 9528be77ce9a99c45cc58be984880c869ad8e9ab..cf95452f3974bc33b3c2209f0290945ab55f295b 100644 (file)
--- a/d3dtrace.xsl
+++ b/d3dtrace.xsl
@@ -24,8 +24,9 @@
                                <xsl:value-of select="@name"/>
                        </span>
                        <xsl:text>(</xsl:text>
-                       <xsl:apply-templates/>
+                       <xsl:apply-templates select="param"/>
                        <xsl:text>)</xsl:text>
+                       <xsl:apply-templates select="return"/>
                </li>
        </xsl:template>
 
@@ -46,4 +47,11 @@
                </xsl:if>
        </xsl:template>
 
+       <xsl:template match="return">
+               <xsl:text> = </xsl:text>
+               <span class="lit">
+                       <xsl:value-of select="."/>
+               </span>
+       </xsl:template>
+
 </xsl:transform>