Handle variations of LockRect.

[apitrace] / wrappers / d3d9trace.py

diff --git a/wrappers/d3d9trace.py b/wrappers/d3d9trace.py
index 804e90f20bd282a721bb6497e3a3da3d70eaa92e..b2afdf9b9dce4e2de92c6ea58aaaa1edf903e694 100644 (file)
--- a/wrappers/d3d9trace.py
+++ b/wrappers/d3d9trace.py
@@ -25,45 +25,65 @@
 
 
 from dlltrace import DllTracer
-from specs.d3d9 import d3d9
+from specs.d3d9 import d3d9, D3DSHADER9
 
 
 class D3D9Tracer(DllTracer):
 
     def serializeArgValue(self, function, arg):
         # Dump shaders as strings
-        if function.name in ('CreateVertexShader', 'CreatePixelShader') and arg.name == 'pFunction':
+        if arg.type is D3DSHADER9:
             print '    DumpShader(trace::localWriter, %s);' % (arg.name)
             return
 
         DllTracer.serializeArgValue(self, function, arg)
 
+    bufferInterfaceNames = [
+        'IDirect3DVertexBuffer9',
+        'IDirect3DIndexBuffer9',
+    ]
+
     def declareWrapperInterfaceVariables(self, interface):
         DllTracer.declareWrapperInterfaceVariables(self, interface)
         
-        if interface.name == 'IDirect3DVertexBuffer9':
-            print '    UINT m_SizeToLock;'
+        if interface.name in self.bufferInterfaceNames or \
+           interface.getMethodByName('LockRect') is not None:
+            print '    size_t _LockedSize;'
             print '    VOID *m_pbData;'
 
+
     def implementWrapperInterfaceMethodBody(self, interface, base, method):
-        if interface.name == 'IDirect3DVertexBuffer9' and method.name == 'Unlock':
+        if interface.name in self.bufferInterfaceNames and method.name == 'Unlock' or \
+           method.name == 'UnlockRect':
             print '    if (m_pbData) {'
-            self.emit_memcpy('(LPBYTE)m_pbData', '(LPBYTE)m_pbData', 'm_SizeToLock')
+            self.emit_memcpy('(LPBYTE)m_pbData', '(LPBYTE)m_pbData', '_LockedSize')
             print '    }'
 
         DllTracer.implementWrapperInterfaceMethodBody(self, interface, base, method)
 
-        if interface.name == 'IDirect3DVertexBuffer9' and method.name == 'Lock':
-            # FIXME: handle recursive locks
-            print '    if (__result == D3D_OK && !(Flags & D3DLOCK_READONLY)) {'
-            print '        if (SizeToLock) {'
-            print '            m_SizeToLock = SizeToLock;'
-            print '        } else {'
-            print '            D3DVERTEXBUFFER_DESC Desc;'
-            print '            m_pInstance->GetDesc(&Desc);'
-            print '            m_SizeToLock = Desc.Size;'
-            print '        }'
-            print '        m_pbData = *ppbData;'
+        if interface.name in self.bufferInterfaceNames and method.name == 'Lock' or \
+           method.name == 'LockRect':
+
+            print '    if (SUCCEEDED(_result) && !(Flags & D3DLOCK_READONLY)) {'
+            if interface.name in self.bufferInterfaceNames:
+                # FIXME: handle recursive locks
+                getDescMethod = interface.getMethodByName('GetDesc')
+                descArg = getDescMethod.args[0]
+                assert descArg.output
+                descType = getDescMethod.args[0].type.type
+                print '        if (SizeToLock) {'
+                print '            _LockedSize = SizeToLock;'
+                print '        } else {'
+                print '            %s Desc;' % descType
+                print '            m_pInstance->GetDesc(&Desc);'
+                print '            _LockedSize = Desc.Size;'
+                print '        }'
+                print '        m_pbData = *ppbData;'
+            elif method.name == 'LockRect':
+                print '        _LockedSize = _getLockSize(_this, %s);' % ', '.join(method.argNames()[:-1])
+                print '        m_pbData = pLockedRect->pBits;'
+            else:
+                raise NotImplementedError
             print '    } else {'
             print '        m_pbData = NULL;'
             print '    }'
@@ -76,6 +96,7 @@ if __name__ == '__main__':
     print '#include "os.hpp"'
     print
     print '#include "d3d9imports.hpp"'
+    print '#include "d3dsize.hpp"'
     print '#include "d3dshader.hpp"'
     print
     print '''