From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Sun, 11 Nov 2012 00:22:33 +0000 (+0000)
Subject: ddraw: Remove custom tracer.
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=a6f9409e53015ef67951eea651f9c0b80e954e9a;p=apitrace

ddraw: Remove custom tracer.
---

diff --git a/specs/ddraw.py b/specs/ddraw.py
index ca540f0..7ca6783 100644
--- a/specs/ddraw.py
+++ b/specs/ddraw.py
@@ -1641,8 +1641,8 @@ ddraw.addFunctions([
     StdFunction(HRESULT, "DirectDrawCreate", [(Pointer(GUID), "lpGUID"), Out(Pointer(LPDIRECTDRAW), "lplpDD"), (LPUNKNOWN, "pUnkOuter")]),
     StdFunction(HRESULT, "DirectDrawCreateEx", [(Pointer(GUID), "lpGuid"), Out(Pointer(ObjPointer(Void)), "lplpDD"), (REFIID, "iid"), (LPUNKNOWN, "pUnkOuter")]),
     StdFunction(HRESULT, "DirectDrawCreateClipper", [(DWORD, "dwFlags"), Out(Pointer(LPDIRECTDRAWCLIPPER), "lplpDDClipper"), (LPUNKNOWN, "pUnkOuter")]),
-    StdFunction(Void, "AcquireDDThreadLock", []),
-    StdFunction(Void, "ReleaseDDThreadLock", []),
+    StdFunction(Void, "AcquireDDThreadLock", [], internal=True),
+    StdFunction(Void, "ReleaseDDThreadLock", [], internal=True),
     StdFunction(DWORD, "D3DParseUnknownCommand", [(LPVOID, "lpCmd"), Out(Pointer(LPVOID), "lpRetCmd")]),
     StdFunction(HRESULT, "DllCanUnloadNow", []),
     StdFunction(HRESULT, "DllGetClassObject", [(REFCLSID, "rclsid"), (REFIID, "riid"), Out(Pointer(ObjPointer(Void)), "ppv")]),
diff --git a/wrappers/ddrawtrace.py b/wrappers/ddrawtrace.py
index ca33a3e..7a60d46 100644
--- a/wrappers/ddrawtrace.py
+++ b/wrappers/ddrawtrace.py
@@ -28,16 +28,6 @@ from dlltrace import DllTracer
 from specs.d3d import ddraw, interfaces
 
 
-class DDrawTracer(DllTracer):
-
-    def traceFunctionImplBody(self, function):
-        if function.name in ('AcquireDDThreadLock', 'ReleaseDDThreadLock'):
-            self.invokeFunction(function)
-            return
-
-        DllTracer.traceFunctionImplBody(self, function)
-
-
 if __name__ == '__main__':
     print '#define INITGUID'
     print '#include <windows.h>'
@@ -66,5 +56,5 @@ if __name__ == '__main__':
     print '#include "trace_writer_local.hpp"'
     print '#include "os.hpp"'
     print
-    tracer = DDrawTracer('ddraw.dll')
+    tracer = DllTracer('ddraw.dll')
     tracer.traceModule(ddraw)