Revert 223610 "Set the printer info in crash reports using the c..."

trunk/src/chrome/app/breakpad_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/app/breakpad_win.h"
 
 #include <shellapi.h>
 #include <tchar.h>
 #include <userenv.h>
 #include <windows.h>
@@ skipping 87 matching lines @@
 
 EXCEPTION_POINTERS g_surrogate_exception_pointers = {0};
 EXCEPTION_RECORD g_surrogate_exception_record = {0};
 CONTEXT g_surrogate_context = {0};
 
 typedef NTSTATUS (WINAPI* NtTerminateProcessPtr)(HANDLE ProcessHandle,
                                                  NTSTATUS ExitStatus);
 char* g_real_terminate_process_stub = NULL;
 
 static size_t g_client_id_offset = 0;
+static size_t g_printer_info_offset = 0;
 static size_t g_num_switches_offset = 0;
 static size_t g_switches_offset = 0;
 static size_t g_dynamic_keys_offset = 0;
 typedef std::map<std::wstring, google_breakpad::CustomInfoEntry*>
     DynamicEntriesMap;
 DynamicEntriesMap* g_dynamic_entries = NULL;
 // Allow for 128 entries. POSIX uses 64 entries of 256 bytes, so Windows needs
 // 256 entries of 64 bytes to match. See CustomInfoEntry::kValueMaxLength in
 // Breakpad.
 const size_t kMaxDynamicEntries = 256;
@@ skipping 332 matching lines @@
       L"profile-type", GetProfileType().c_str()));
 
   if (g_deferred_crash_uploads)
     g_custom_entries->push_back(
         google_breakpad::CustomInfoEntry(L"deferred-upload", L"true"));
 
   if (!special_build.empty())
     g_custom_entries->push_back(google_breakpad::CustomInfoEntry(
         L"special", UTF16ToWide(special_build).c_str()));
 
+  // Add empty values for the prn_info-*. We'll put the actual values when we
+  // collect them at this location.
+  g_printer_info_offset = g_custom_entries->size();
+  // one-based index for the name suffix.
+  for (size_t i = 1; i <= kMaxReportedPrinterRecords; ++i) {
+    g_custom_entries->push_back(
+        google_breakpad::CustomInfoEntry(
+            base::StringPrintf(L"prn-info-%d", i).c_str(), L""));
+  }
+
   // Read the id from registry. If reporting has never been enabled
   // the result will be empty string. Its OK since when user enables reporting
   // we will insert the new value at this location.
   std::wstring guid =
       base::UTF16ToWide(breakpad::GetBreakpadClient()->GetCrashGUID());
   g_client_id_offset = g_custom_entries->size();
   g_custom_entries->push_back(
       google_breakpad::CustomInfoEntry(L"guid", guid.c_str()));
 
   // Add empty values for the command line switches. We will fill them with
@@ skipping 165 matching lines @@
     return;
 
   if (!g_custom_entries)
     return;
 
   base::wcslcpy((*g_custom_entries)[g_client_id_offset].value,
                 client_id,
                 google_breakpad::CustomInfoEntry::kValueMaxLength);
 }
 
+extern "C" void __declspec(dllexport) __cdecl SetPrinterInfo(
+    const wchar_t* printer_info) {
+  if (!g_custom_entries)
+    return;
+  std::vector<string16> info;
+  base::SplitString(printer_info, L';', &info);
+  DCHECK_LE(info.size(), kMaxReportedPrinterRecords);
+  info.resize(kMaxReportedPrinterRecords);
+  for (size_t i = 0; i < info.size(); ++i) {
+    base::wcslcpy((*g_custom_entries)[g_printer_info_offset + i].value,
+                info[i].c_str(),
+                google_breakpad::CustomInfoEntry::kValueMaxLength);
+  }
+}
+
 // NOTE: This function is used by SyzyASAN to annotate crash reports. If you
 // change the name or signature of this function you will break SyzyASAN
 // instrumented releases of Chrome. Please contact syzygy-team@chromium.org
 // before doing so!
 extern "C" void __declspec(dllexport) __cdecl SetCrashKeyValueImpl(
     const wchar_t* key, const wchar_t* value) {
   // CustomInfoEntry limits the length of key and value. If they exceed
   // their maximum length the underlying string handling functions raise
   // an exception and prematurely trigger a crash. Truncate here.
   std::wstring safe_key(std::wstring(key).substr(
@@ skipping 351 matching lines @@
   previous_filter = SetUnhandledExceptionFilter(filter);
 }
 
 void StringVectorToCStringVector(const std::vector<std::wstring>& wstrings,
                                  std::vector<const wchar_t*>* cstrings) {
   cstrings->clear();
   cstrings->reserve(wstrings.size());
   for (size_t i = 0; i < wstrings.size(); ++i)
     cstrings->push_back(wstrings[i].c_str());
 }