Define all D2D/DWRITE GUIDs

[apitrace] / dwritetrace.py

diff --git a/dwritetrace.py b/dwritetrace.py
index 94f1fbfb36de60e3ea020532fb92424eabd30329..f4804337cb0a0ea55fff25062846ab95fb75faa8 100644 (file)
--- a/dwritetrace.py
+++ b/dwritetrace.py
@@ -24,42 +24,35 @@
 ##########################################################################/
 
 
-from trace import DllTracer
+from dlltrace import DllTracer
 from specs.dwrite import dwrite
 from specs.d2d1 import d2d1 # cyclic dependency
 
 
-class D2D1Tracer(DllTracer):
+class DWriteTracer(DllTracer):
 
-    def wrap_arg(self, function, arg):
-        if function.name == 'D2D1CreateFactory' and arg.output:
+    def wrapArg(self, function, arg):
+        if function.name == 'DWriteCreateFactory' and arg.output:
             print '    if (*%s) {' % arg.name
-            for iface in d2d1.interfaces:
-                print '        if (riid == IID_%s) {' % iface.name
-                print '            *%s = (%s) new Wrap%s((%s *)*%s);' % (arg.name, arg.type, iface.name, iface.name, arg.name)
+            for iface in dwrite.interfaces:
+                print '        if (iid == IID_%s) {' % iface.name
+                print '            *%s = new Wrap%s(static_cast<%s *>(*%s));' % (arg.name, iface.name, iface.name, arg.name)
                 print '        }'
             print '    }'
-
-        DllTracer.wrap_arg(self, function, arg)
+        else:
+            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>'
-    print
-    print '#include "compat.h"'
-    print
     print '#define DWRITE_EXPORT WINAPI'
     print
-    print '#include <d2d1.h>'
-    print '#include <dwrite.h>'
-    print
-    print 'DEFINE_GUID(IID_IDWriteFactory,0xb859ee5a,0xd838,0x4b5b,0xa2,0xe8,0x1a,0xdc,0x7d,0x93,0xdb,0x48);'
+    print '#include "d2dimports.hpp"'
     print
 
-    tracer = D2D1Tracer('dwrite.dll')
+    tracer = DWriteTracer('dwrite.dll')
     tracer.trace_api(dwrite)