Refactor d3d9 lock tracking code further.

[apitrace] / retrace / d3dretrace.py

diff --git a/retrace/d3dretrace.py b/retrace/d3dretrace.py
index fd0e573bb61184b8112d911727c6370c3fd2af00..cbf57d4aab981fe8f1bfa5b59a57bb73efd59661 100644 (file)
--- a/retrace/d3dretrace.py
+++ b/retrace/d3dretrace.py
@@ -71,25 +71,18 @@ class D3DRetracer(Retracer):
             print r'    }'
 
         if method.name in ('Lock', 'LockRect', 'LockBox'):
-            print '        size_t _LockedSize = _getLockSize(_this, %s);' % ', '.join(method.argNames()[:-1])
-            if method.name == 'Lock':
-                # FIXME: handle recursive locks
-                print '        VOID *_pbData = *ppbData;'
-            elif method.name == 'LockRect':
-                print '        VOID *_pbData = pLockedRect->pBits;'
-            elif method.name == 'LockBox':
-                print '        VOID *_pbData = pLockedVolume->pBits;'
-            else:
-                raise NotImplementedError
-            print '        _this->SetPrivateData(GUID_APITRACE, &_pbData, sizeof _pbData, 0);'
+            print '    VOID *_pbData = NULL;'
+            print '    size_t _LockedSize = 0;'
+            print '    _getLockInfo(_this, %s, _pbData, _LockedSize);' % ', '.join(method.argNames()[:-1])
+            print '    _this->SetPrivateData(GUID_APITRACE, &_pbData, sizeof _pbData, 0);'
         
         if method.name in ('Unlock', 'UnlockRect', 'UnlockBox'):
-            print '        VOID *_pbData = 0;'
-            print '        DWORD dwSizeOfData = sizeof _pbData;'
-            print '        _this->GetPrivateData(GUID_APITRACE, &_pbData, &dwSizeOfData);'
-            print '        if (_pbData) {'
-            print '            retrace::delRegionByPointer(_pbData);'
-            print '        }'
+            print '    VOID *_pbData = 0;'
+            print '    DWORD dwSizeOfData = sizeof _pbData;'
+            print '    _this->GetPrivateData(GUID_APITRACE, &_pbData, &dwSizeOfData);'
+            print '    if (_pbData) {'
+            print '        retrace::delRegionByPointer(_pbData);'
+            print '    }'
 
 
 if __name__ == '__main__':