Merge branch 'master' into d2d

[apitrace] / d2d1trace.py

diff --git a/d2d1trace.py b/d2d1trace.py
index 37cd53e0fc207fdca46359ea5e5ec4fb1864e42b..a99abdaf8e2dc49f51ed16cbc435e41c33d860c1 100644 (file)
--- a/d2d1trace.py
+++ b/d2d1trace.py
@@ -24,13 +24,13 @@
 ##########################################################################/
 
 
-from trace import DllTracer
+from dlltrace import DllTracer
 from specs.d2d1 import d2d1
 
 
 class D2D1Tracer(DllTracer):
 
-    def wrap_arg(self, function, arg):
+    def wrapArg(self, function, arg):
         if function.name == 'D2D1CreateFactory' and arg.output:
             print '    if (*%s) {' % arg.name
             for iface in d2d1.interfaces:
@@ -39,13 +39,13 @@ class D2D1Tracer(DllTracer):
                 print '        }'
             print '    }'
 
-        DllTracer.wrap_arg(self, function, arg)
+        DllTracer.wrapArg(self, function, arg)
 
 
 if __name__ == '__main__':
     print '#define INITGUID'
     print
-    print '#include "trace_writer.hpp"'
+    print '#include "trace_writer_local.hpp"'
     print '#include "os.hpp"'
     print
     print '#include <windows.h>'