Merge branch 'modules'

diff --combined wrappers/trace.py
index bb0f675a547231f3e94d7370d31f3c6fe33cf3c6,79156acafbd328086f6ea021c41bf5c64a8ce2d7..e35108b273920561b0c87a950dbd2a41606d2086
--- 1/wrappers/trace.py
--- 2/wrappers/trace.py
+++ b/wrappers/trace.py
@@@ -426,8 -426,9 +426,9 @@@ class Tracer
          self.header(api)
  
          # Includes
-         for header in api.headers:
-             print header
+         for module in api.modules:
+             for header in module.headers:
+                 print header
          print
  
          # Generate the serializer functions
@@@ -442,8 -443,10 +443,10 @@@
          # Function wrappers
          self.interface = None
          self.base = None
-         map(self.traceFunctionDecl, api.functions)
-         map(self.traceFunctionImpl, api.functions)
+         for function in api.getAllFunctions():
+             self.traceFunctionDecl(function)
+         for function in api.getAllFunctions():
+             self.traceFunctionImpl(function)
          print
  
          self.footer(api)
@@@ -538,7 -541,7 +541,7 @@@
              return 'true'
          if str(function.type) == 'HRESULT':
              return 'SUCCEEDED(_result)'
 -        return 'false'
 +        return 'true'
  
      def serializeArg(self, function, arg):
          print '    trace::localWriter.beginArg(%u);' % (arg.index,)