Use skiplist-based FastCallSet within trace::CallSet

[apitrace] / retrace / dllretrace.py

diff --git a/retrace/dllretrace.py b/retrace/dllretrace.py
index 926bacd250ec7017a97929aa86311e16a4a6d53a..aa7ed45ada0ffbbd143f7e42b2340828dbaede0e 100644 (file)
--- a/retrace/dllretrace.py
+++ b/retrace/dllretrace.py
@@ -37,7 +37,7 @@ class DllDispatcher(Dispatcher):
         print r'HMODULE g_h%sModule = NULL;' % (tag,)
         print r''
         print r'static PROC'
-        print r'_getPublicProcAddress(LPCSTR lpProcName) {'
+        print r'_get%sProcAddress(LPCSTR lpProcName) {' % tag
         print r'    if (!g_h%sModule) {' % tag
         print r'        if (g_sz%sDllName) {' % tag
         print r'            g_h%sModule = LoadLibraryA(g_sz%sDllName);' % (tag, tag)
@@ -59,6 +59,10 @@ class DllDispatcher(Dispatcher):
 
         Dispatcher.dispatchModule(self, module)
 
+    def getProcAddressName(self, module, function):
+        assert self.isFunctionPublic(module, function)
+        return '_get%sProcAddress' % (module.name.upper())
+
 
 class DllRetracer(Retracer):
 
@@ -68,8 +72,3 @@ class DllRetracer(Retracer):
             dispatcher.dispatchModule(module)
 
         Retracer.retraceApi(self, api)
-
-    def retraceModule(self, module):
-        api = API()
-        api.addModule(module)
-        self.retraceApi(api)