snapdiff: Drop the --version option

[apitrace] / wgltrace.py

diff --git a/wgltrace.py b/wgltrace.py
index f1377ca7fb74f3e154f785c7d05e7ca73957f3b0..cf2cc97e401206cd45d630cc601efeda6882ff24 100644 (file)
--- a/wgltrace.py
+++ b/wgltrace.py
@@ -27,9 +27,9 @@
 """WGL tracing code generator."""
 
 
-from stdapi import API
-from glapi import glapi
-from wglapi import wglapi
+from specs.stdapi import API
+from specs.glapi import glapi
+from specs.wglapi import wglapi
 from dispatch import function_pointer_type, function_pointer_value
 from gltrace import GlTracer
 from codegen import *
@@ -37,9 +37,6 @@ from codegen import *
 
 class WglTracer(GlTracer):
 
-    def get_function_address(self, function):
-        return '__%s' % (function.name,)
-
     def wrap_ret(self, function, instance):
         GlTracer.wrap_ret(self, function, instance)
 
@@ -56,7 +53,7 @@ class WglTracer(GlTracer):
                 print '    %s = (%s)&%s;' % (instance, function.type, f.name);
         
             def handle_default():
-                print '    OS::DebugMessage("apitrace: unknown function \\"%s\\"\\n", lpszProc);'
+                print '    os::log("apitrace: warning: unknown function \\"%s\\"\\n", lpszProc);'
 
             string_switch('lpszProc', func_dict.keys(), handle_case, handle_default)
             print '    }'
@@ -69,13 +66,13 @@ if __name__ == '__main__':
     print '#include <string.h>'
     print '#include <windows.h>'
     print
-    print '#include "trace_write.hpp"'
+    print '#include "trace_writer.hpp"'
     print '#include "os.hpp"'
     print
     print '''
 static HINSTANCE g_hDll = NULL;
 
-static PROC
+PROC
 __getPublicProcAddress(LPCSTR lpProcName)
 {
     if (!g_hDll) {