d3dretrace: Force DWM traces to run on a window.

[apitrace] / cli / cli_retrace.cpp

diff --git a/cli/cli_retrace.cpp b/cli/cli_retrace.cpp
index a2dbd09986b86ffc5d31ab5318b02849699f8d4e..d22f719bd65d6a584c416db6010d558a6a55ac9a 100644 (file)
--- a/cli/cli_retrace.cpp
+++ b/cli/cli_retrace.cpp
@@ -35,7 +35,7 @@
 #include "os_process.hpp"
 
 #include "trace_parser.hpp"
-#include "trace_resource.hpp"
+#include "cli_resources.hpp"
 
 #include "cli.hpp"
 #include "cli_retrace.hpp"
@@ -46,6 +46,7 @@ guessApi(const char *filename)
 {
     trace::Parser p;
     if (!p.open(filename)) {
+        exit(1);
         return trace::API_UNKNOWN;
     }
     trace::Call *call;
@@ -76,10 +77,8 @@ executeRetrace(const std::vector<const char *> & opts,
     case trace::API_D3D7:
     case trace::API_D3D8:
     case trace::API_D3D9:
-    case trace::API_D3D10:
-    case trace::API_D3D10_1:
-    case trace::API_D3D11:
-        // Can be used with WINE
+    case trace::API_DXGI:
+        // Use prefix so that it can be used with WINE
         retraceName = "d3dretrace.exe";
         break;
     default:
@@ -89,7 +88,7 @@ executeRetrace(const std::vector<const char *> & opts,
     }
 
     std::vector<const char *> command;
-    os::String retracePath = trace::findProgram(retraceName);
+    os::String retracePath = findProgram(retraceName);
     if (retracePath.length()) {
         command.push_back(retracePath);
     } else {