X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2Fd3d9retrace.py;h=1b89b68f5e6a159ee8f33184ee1b91b3169a2626;hb=529cf9b67e67bdd4cad619e1e9347134375d649d;hp=7030f868f17b3a98a27d0e3048f7077f412f640c;hpb=c94328ae7d1371db8a3d7711895fd6e1501d4b7c;p=apitrace diff --git a/retrace/d3d9retrace.py b/retrace/d3d9retrace.py index 7030f86..1b89b68 100644 --- a/retrace/d3d9retrace.py +++ b/retrace/d3d9retrace.py @@ -28,18 +28,21 @@ from dllretrace import DllRetracer as Retracer -import specs.stdapi as stdapi +from specs.stdapi import API from specs.d3d9 import * class D3DRetracer(Retracer): def retraceApi(self, api): + print '''static d3dretrace::D3DDumper d3d9Dumper;''' + print + print '// Swizzling mapping for lock addresses' - print 'static std::map _locks;' + print 'static std::map _maps;' print - self.table_name = 'd3dretrace::d3d_callbacks' + self.table_name = 'd3dretrace::d3d9_callbacks' Retracer.retraceApi(self, api) @@ -60,7 +63,10 @@ class D3DRetracer(Retracer): def invokeInterfaceMethod(self, interface, method): # keep track of the last used device for state dumping if interface.name in ('IDirect3DDevice9', 'IDirect3DDevice9Ex'): - print r' d3dretrace::pLastDirect3DDevice9 = _this;' + if method.name == 'Release': + print r' d3d9Dumper.unbindDevice(_this);' + else: + print r' d3d9Dumper.bindDevice(_this);' # create windows as neccessary if method.name in ('CreateDevice', 'CreateDeviceEx', 'CreateAdditionalSwapChain'): @@ -91,21 +97,15 @@ class D3DRetracer(Retracer): if method.name == 'Present': print r' d3dretrace::processEvents();' - # check errors - if str(method.type) == 'HRESULT': - print r' if (FAILED(_result)) {' - print r' retrace::warning(call) << "failed\n";' - print r' }' - if method.name in ('Lock', 'LockRect', 'LockBox'): print ' VOID *_pbData = NULL;' - print ' size_t _LockedSize = 0;' - print ' _getLockInfo(_this, %s, _pbData, _LockedSize);' % ', '.join(method.argNames()[:-1]) - print ' _locks[_this] = _pbData;' + print ' size_t _MappedSize = 0;' + print ' _getMapInfo(_this, %s, _pbData, _MappedSize);' % ', '.join(method.argNames()[:-1]) + print ' _maps[_this] = _pbData;' if method.name in ('Unlock', 'UnlockRect', 'UnlockBox'): print ' VOID *_pbData = 0;' - print ' _pbData = _locks[_this];' + print ' _pbData = _maps[_this];' print ' if (_pbData) {' print ' retrace::delRegionByPointer(_pbData);' print ' }' @@ -120,8 +120,11 @@ if __name__ == '__main__': #include "d3d9imports.hpp" #include "d3d9size.hpp" #include "d3dretrace.hpp" +#include "d3dstate.hpp" ''' + api = API() + api.addModule(d3d9) retracer = D3DRetracer() - retracer.retraceApi(d3d9) + retracer.retraceApi(api)