Merge branch 'master' into dxva

[apitrace] / wrappers / d3d9trace.py

diff --git a/wrappers/d3d9trace.py b/wrappers/d3d9trace.py
index 17ebe197d872a17b5dcf779dbcc0b123676861af..33f6e9d9dfbfa18b5fae730d31fb0552803925b6 100644 (file)
--- a/wrappers/d3d9trace.py
+++ b/wrappers/d3d9trace.py
@@ -43,6 +43,7 @@ class D3D9Tracer(DllTracer):
     def enumWrapperInterfaceVariables(self, interface):
         variables = DllTracer.enumWrapperInterfaceVariables(self, interface)
         
+        # Add additional members to track locks
         if interface.getMethodByName('Lock') is not None or \
            interface.getMethodByName('LockRect') is not None or \
            interface.getMethodByName('LockBox') is not None:
@@ -84,7 +85,7 @@ if __name__ == '__main__':
     print '#include "os.hpp"'
     print
     print '#include "d3d9imports.hpp"'
-    print '#include "d3dsize.hpp"'
+    print '#include "d3d9size.hpp"'
     print '#include "d3d9shader.hpp"'
     print '#include "dxvaint.h"'
     print