Merge remote-tracking branch 'github/master' into d2d

Conflicts:
	.gitignore
	CMakeLists.txt
	cmake/FindDirectX.cmake

1 files changed, 55 insertions, 0 deletions

diff --git a/wrappers/d2d1trace.py b/wrappers/d2d1trace.py
new file mode 100644
index 00000000..a6142852
--- /dev/null
+++ b/wrappers/d2d1trace.py
@@ -0,0 +1,55 @@
+##########################################################################
+#
+# Copyright 2008-2009 VMware, Inc.
+# All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+##########################################################################/
+
+
+from dlltrace import DllTracer
+from specs.d2d1 import d2d1
+
+
+class D2D1Tracer(DllTracer):
+
+    def wrapArg(self, function, arg):
+        if function.name == 'D2D1CreateFactory' and arg.output:
+            print '    if (*%s) {' % arg.name
+            for iface in d2d1.interfaces:
+                print '        if (riid == IID_%s) {' % iface.name
+                print '            *%s = (LPVOID) new Wrap%s((%s *)*%s);' % (arg.name, iface.name, iface.name, arg.name)
+                print '        }'
+            print '    }'
+        else:
+            DllTracer.wrapArg(self, function, arg)
+
+
+if __name__ == '__main__':
+    print '#define INITGUID'
+    print
+    print '#include "trace_writer_local.hpp"'
+    print '#include "os.hpp"'
+    print
+    print '#include "d2dimports.hpp"'
+    print
+
+    tracer = D2D1Tracer('d2d1.dll')
+    tracer.traceApi(d2d1)