Merge branch 'union-type'

[apitrace] / common / trace_tools_trace.cpp

diff --git a/common/trace_tools_trace.cpp b/common/trace_tools_trace.cpp
index dc40896a222fee0968d8bdf4f883b863b9e1c8ed..387e2e25b97f562f7579b5eb3cd6b8e713a7499e 100644 (file)
--- a/common/trace_tools_trace.cpp
+++ b/common/trace_tools_trace.cpp
@@ -32,8 +32,8 @@
 
 #include "os_string.hpp"
 #include "os_process.hpp"
-#include "trace_resource.hpp"
 #include "trace_tools.hpp"
+#include "trace_resource.hpp"
 
 
 
@@ -44,7 +44,6 @@ namespace trace {
 #define TRACE_VARIABLE "DYLD_LIBRARY_PATH"
 #define GL_TRACE_WRAPPER  "OpenGL"
 #elif defined(_WIN32)
-#define TRACE_VARIABLE ""
 #define GL_TRACE_WRAPPER  "opengl32.dll"
 #else
 #define TRACE_VARIABLE "LD_PRELOAD"
@@ -59,59 +58,88 @@ traceProgram(API api,
              const char *output,
              bool verbose)
 {
-    const char *relPath;
-    const char *absPath;
+    const char *wrapperFilename;
+
+    /*
+     * TODO: simplify code
+     */
 
     switch (api) {
     case API_GL:
-        relPath = "wrappers/" GL_TRACE_WRAPPER;
-        absPath = APITRACE_WRAPPER_INSTALL_DIR "/" GL_TRACE_WRAPPER;
+        wrapperFilename = GL_TRACE_WRAPPER;
         break;
+#ifdef EGL_TRACE_WRAPPER
     case API_EGL:
-#ifndef EGL_TRACE_WRAPPER
-        std::cerr << "error: unsupported API\n";
-        return 1;
-#else
-        relPath = "wrappers/" EGL_TRACE_WRAPPER;
-        absPath = APITRACE_WRAPPER_INSTALL_DIR "/" EGL_TRACE_WRAPPER;
+        wrapperFilename = EGL_TRACE_WRAPPER;
+        break;
+#endif
+#ifdef _WIN32
+    case API_D3D7:
+        wrapperFilename = "ddraw.dll";
+        break;
+    case API_D3D8:
+        wrapperFilename = "d3d8.dll";
+        break;
+    case API_D3D9:
+        wrapperFilename = "d3d9.dll";
+        break;
+    case API_D3D10:
+        wrapperFilename = "d3d10.dll";
+        break;
+    case API_D3D10_1:
+        wrapperFilename = "d3d10_1.dll";
+        break;
+    case API_D3D11:
+        wrapperFilename = "d3d11.dll";
         break;
 #endif
     default:
-        std::cerr << "error: invalid API\n";
+        std::cerr << "error: unsupported API\n";
         return 1;
     }
 
-    os::String wrapper;
-    wrapper = findFile(relPath, absPath, verbose);
+    os::String wrapperPath = findWrapper(wrapperFilename);
 
-    if (!wrapper.length()) {
+    if (!wrapperPath.length()) {
+        std::cerr << "error: failed to find " << wrapperFilename << "\n";
         return 1;
     }
 
 #if defined(_WIN32)
+    /* On Windows copy the wrapper to the program directory.
+     */
+    os::String tmpWrapper(argv[0]);
+    tmpWrapper.trimFilename();
+    tmpWrapper.join(wrapperFilename);
 
-    std::cerr <<
-        "The 'apitrace trace' command is not supported for this operating system.\n"
-        "Instead, you will need to copy opengl32.dll, d3d8.dll, or d3d9.dll from\n"
-        APITRACE_WRAPPER_INSTALL_DIR "\n"
-        "to the directory with the application to trace, then run the application.\n";
+    if (verbose) {
+        std::cerr << wrapperPath << " -> " << tmpWrapper << "\n";
+    }
 
-    return 1;
+    if (tmpWrapper.exists()) {
+        std::cerr << "error: not overwriting " << tmpWrapper << "\n";
+        return 1;
+    }
 
-#else
+    if (!os::copyFile(wrapperPath, tmpWrapper, false)) {
+        std::cerr << "error: failed to copy " << wrapperPath << " into " << tmpWrapper << "\n";
+        return 1;
+    }
+#endif /* _WIN32 */
 
 #if defined(__APPLE__)
     /* On Mac OS X, using DYLD_LIBRARY_PATH, we actually set the
      * directory, not the file. */
-    wrapper.trimFilename();
+    wrapperPath.trimFilename();
 #endif
 
+#if defined(TRACE_VARIABLE)
     if (verbose) {
-        std::cerr << TRACE_VARIABLE << "=" << wrapper.str() << "\n";
+        std::cerr << TRACE_VARIABLE << "=" << wrapperPath.str() << "\n";
     }
-
     /* FIXME: Don't modify the current environment */
-    os::setEnvironment(TRACE_VARIABLE, wrapper.str());
+    os::setEnvironment(TRACE_VARIABLE, wrapperPath.str());
+#endif /* TRACE_VARIABLE */
 
     if (output) {
         os::setEnvironment("TRACE_FILE", output);
@@ -128,13 +156,18 @@ traceProgram(API api,
 
     int status = os::execute(argv);
 
+#if defined(TRACE_VARIABLE)
     os::unsetEnvironment(TRACE_VARIABLE);
+#endif
+#if defined(_WIN32)
+    os::removeFile(tmpWrapper);
+#endif
+
     if (output) {
         os::unsetEnvironment("TRACE_FILE");
     }
     
     return status;
-#endif
 
 }