Get generate_dump compiling on Windows

tools/crashpad_database_util.cc

 // Copyright 2015 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 24 matching lines @@
 #include "client/settings.h"
 #include "tools/tool_support.h"
 #include "util/file/file_io.h"
 #include "util/file/file_reader.h"
 #include "util/misc/uuid.h"
 
 #if defined(OS_MACOSX)
 #include <libgen.h>
 #endif  // OS_MACOSX
 
-#if defined(OS_POSIX)
-base::FilePath::StringType UTF8ToFilePathStringType(const char* path) {
-  return path;
-}
-#elif defined(OS_WIN)
-base::FilePath::StringType UTF8ToFilePathStringType(const char* path) {
-  return base::UTF8ToUTF16(path);
-}
-#endif
-
 namespace crashpad {
 namespace {
 
 void Usage(const base::FilePath& me) {
   fprintf(stderr,
 "Usage: %" PRFilePath " [OPTION]... PID\n"
 "Operate on Crashpad crash report databases.\n"
 "\n"
 "  -d, --database=PATH             operate on the crash report database at PATH\n"
 "      --show-client-id            show the client ID\n"
@@ skipping 193 matching lines @@
 
   for (const CrashReportDatabase::Report& report : reports) {
     printf("%s%s%s\n", spaces.c_str(), report.uuid.ToString().c_str(), colon);
     if (options.show_all_report_info) {
       ShowReport(report, space_count + 2, options.utc);
     }
   }
 }
 
 int DatabaseUtilMain(int argc, char* argv[]) {
-  const base::FilePath me(
-      base::FilePath(UTF8ToFilePathStringType(argv[0])).BaseName());
+  const base::FilePath me(base::FilePath(ToolSupport::UTF8ToFilePathStringType(
+                                             argv[0])).BaseName());
 
   enum OptionFlags {
     // “Short” (single-character) options.
     kOptionDatabase = 'd',
 
     // Long options without short equivalents.
     kOptionLastChar = 255,
     kOptionShowClientID,
     kOptionShowUploadsEnabled,
     kOptionShowLastUploadAttemptTime,
@@ skipping 91 matching lines @@
         }
         options.has_set_uploads_enabled = true;
         break;
       }
       case kOptionSetLastUploadAttemptTime: {
         options.set_last_upload_attempt_time_string = optarg;
         break;
       }
       case kOptionNewReport: {
         options.new_report_paths.push_back(
-            base::FilePath(UTF8ToFilePathStringType(optarg)));
+            base::FilePath(ToolSupport::UTF8ToFilePathStringType(optarg)));
         break;
       }
       case kOptionUTC: {
         options.utc = true;
         break;
       }
       case kOptionHelp: {
         Usage(me);
         return EXIT_SUCCESS;
       }
@@ skipping 39 matching lines @@
   const size_t set_operations =
       options.has_set_uploads_enabled +
       (options.set_last_upload_attempt_time_string != nullptr);
 
   if (show_operations + set_operations == 0) {
     ToolSupport::UsageHint(me, "nothing to do");
     return EXIT_FAILURE;
   }
 
   scoped_ptr<CrashReportDatabase> database(CrashReportDatabase::Initialize(
-      base::FilePath(UTF8ToFilePathStringType(options.database))));
+      base::FilePath(ToolSupport::UTF8ToFilePathStringType(options.database))));
   if (!database) {
     return EXIT_FAILURE;
   }
 
   Settings* settings = database->GetSettings();
 
   // Handle the “show” options before the “set” options so that when they’re
   // specified together, the “show” option reflects the initial state.
 
   if (options.show_client_id) {
@@ skipping 139 matching lines @@
 
 }  // namespace
 }  // namespace crashpad
 
 #if defined(OS_POSIX)
 int main(int argc, char* argv[]) {
   return crashpad::DatabaseUtilMain(argc, argv);
 }
 #elif defined(OS_WIN)
 int wmain(int argc, wchar_t* argv[]) {
-  scoped_ptr<char*[]> argv_as_utf8(new char*[argc]);
-  std::vector<std::string> storage;
-  storage.reserve(argc);
-  for (int i = 0; i < argc; ++i) {
-    storage.push_back(base::UTF16ToUTF8(argv[i]));
-    argv_as_utf8[i] = &storage[i][0];
-  }
-  return crashpad::DatabaseUtilMain(argc, argv_as_utf8.get());
+  return crashpad::ToolSupport::Wmain(argc, argv, &crashpad::DatabaseUtilMain);

[Mark Mentovai, 2015/05/05 22:41:35]

Ah, yup, you did it. :) I think you can skip the & on DatabaseUtilMain. Same
with GenerateDumpMain in the other tool.

[scottmg, 2015/05/05 23:23:52]

Done.

 }
 #endif  // OS_POSIX