summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2014-06-18 15:03:25 +0100
committerJose Fonseca <jfonseca@vmware.com>2014-06-18 15:03:25 +0100
commit0b5390db2bca71212ee66507861adcd2e3ddcb4f (patch)
tree63ad58692bef9f5da309f8fc8fbaf78ab67ebc22 /cli
parent159d62dde1a7b05fdc8a77ded4b4fec81e47bcc7 (diff)
inject: Handle Windows API Sets.
This is the proper fix for issue #122 and #172. Windows 8.x's gdi32.dll was getting LoadLibrary/GetProcAddress from API-MS-WIN-CORE-LIBRARYLOADER-L1-?-?.DLL instead of kernel32.dll, hence bypassing our hooks.
Diffstat (limited to 'cli')
-rw-r--r--cli/cli_trace.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/cli/cli_trace.cpp b/cli/cli_trace.cpp
index a01b389b..e5b0cfdc 100644
--- a/cli/cli_trace.cpp
+++ b/cli/cli_trace.cpp
@@ -137,14 +137,9 @@ traceProgram(trace::API api,
#if defined(_WIN32)
/*
* Use DLL injection method on Windows, even for APIs that don't stricly
- * need it. Except when tracing OpenGL on Windows 8, as the injection
- * method seems to have troubles tracing the internal
- * gdi32.dll!SwapBuffers -> opengl32.dll!wglSwapBuffer calls, per github
- * issue #172.
+ * need it.
*/
- if (api != trace::API_GL || !IsWindows8OrGreater()) {
- useInject = true;
- }
+ useInject = true;
if (useInject) {
args.push_back("inject");