Cleanup return value wrapping.

apitrace · May 9, 2012 · 3a259b8 · 3a259b8
1 parent f9e11f9
commit 3a259b8
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/wrappers/trace.py b/wrappers/trace.py
@@ -416,7 +416,6 @@ def traceFunctionImpl(self, function):
             print '    %s _result;' % function.type
         self.traceFunctionImplBody(function)
         if function.type is not stdapi.Void:
-            self.wrapRet(function, "_result")
             print '    return _result;'
         print '}'
         print
@@ -437,6 +436,8 @@ def traceFunctionImplBody(self, function):
         if function.type is not stdapi.Void:
             self.serializeRet(function, "_result")
         print '    trace::localWriter.endLeave();'
+        if function.type is not stdapi.Void:
+            self.wrapRet(function, "_result")
 
     def invokeFunction(self, function, prefix='_', suffix=''):
         if function.type is stdapi.Void:
@@ -589,11 +590,11 @@ def implementWrapperInterfaceMethodBody(self, interface, base, method):
                 self.wrapArg(method, arg)
 
         if method.type is not stdapi.Void:
-            print '    trace::localWriter.beginReturn();'
-            self.serializeValue(method.type, "_result")
-            print '    trace::localWriter.endReturn();'
-            self.wrapValue(method.type, '_result')
+            self.serializeRet(method, '_result')
         print '    trace::localWriter.endLeave();'
+        if method.type is not stdapi.Void:
+            self.wrapRet(method, '_result')
+
         if method.name == 'Release':
             assert method.type is not stdapi.Void
             print '    if (!_result)'