From 3dfd4574a3cefd473acd7fd3931f6b1978bf84e6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jose.r.fonseca@gmail.com>
Date: Sat, 3 Nov 2012 16:58:34 +0000
Subject: [PATCH] Rename d3dsize.hpp to d3d9size.hpp

---
 helpers/{d3dsize.hpp => d3d9size.hpp} | 6 +++---
 retrace/d3dretrace.py                 | 2 +-
 wrappers/d3d9shader.cpp               | 2 +-
 wrappers/d3d9trace.py                 | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename helpers/{d3dsize.hpp => d3d9size.hpp} (99%)

diff --git a/helpers/d3dsize.hpp b/helpers/d3d9size.hpp
similarity index 99%
rename from helpers/d3dsize.hpp
rename to helpers/d3d9size.hpp
index 156fdd2..0041e25 100644
--- a/helpers/d3dsize.hpp
+++ b/helpers/d3d9size.hpp
@@ -30,8 +30,8 @@
  * Auxiliary functions to compute the size of array/blob arguments.
  */
 
-#ifndef _D3D_SIZE_HPP_
-#define _D3D_SIZE_HPP_
+#ifndef _D3D9SIZE_HPP_
+#define _D3D9SIZE_HPP_
 
 
 /* We purposedly don't include any D3D header, so that this header can be used
@@ -376,4 +376,4 @@ _getLockInfo(IDirect3DVolumeTexture9 *pTexture, UINT Level, const D3DLOCKED_BOX
 #endif /* DIRECT3D_VERSION >= 0x0900 */
 
 
-#endif /* _D3D_SIZE_HPP_ */
+#endif /* _D3D9SIZE_HPP_ */
diff --git a/retrace/d3dretrace.py b/retrace/d3dretrace.py
index 87fdd2e..14b92ab 100644
--- a/retrace/d3dretrace.py
+++ b/retrace/d3dretrace.py
@@ -104,7 +104,7 @@ if __name__ == '__main__':
 #include <iostream>
 
 #include "d3d9imports.hpp"
-#include "d3dsize.hpp"
+#include "d3d9size.hpp"
 #include "d3dretrace.hpp"
 
 '''
diff --git a/wrappers/d3d9shader.cpp b/wrappers/d3d9shader.cpp
index f44cad3..b2a39f6 100644
--- a/wrappers/d3d9shader.cpp
+++ b/wrappers/d3d9shader.cpp
@@ -29,7 +29,7 @@
 
 #include "d3d9shader.hpp"
 #include "d3d9imports.hpp"
-#include "d3dsize.hpp"
+#include "d3d9size.hpp"
 
 
 typedef HRESULT
diff --git a/wrappers/d3d9trace.py b/wrappers/d3d9trace.py
index 6ee059f..df39927 100644
--- a/wrappers/d3d9trace.py
+++ b/wrappers/d3d9trace.py
@@ -41,6 +41,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:
@@ -76,7 +77,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
     print '''
-- 
2.43.0