SetPrinterInfo

chrome/app/breakpad_win.cc

Index: chrome/app/breakpad_win.cc
diff --git a/chrome/app/breakpad_win.cc b/chrome/app/breakpad_win.cc
index 9bd8e1ec669e3d713e951565c58fe258b92e74e1..ccacbc99af5f2b58e68f1c9359948d8e5eb99bae 100644
--- a/chrome/app/breakpad_win.cc
+++ b/chrome/app/breakpad_win.cc
@@ -74,6 +74,7 @@ static size_t g_num_of_extensions_offset;
 static size_t g_extension_ids_offset;
 static size_t g_client_id_offset;
 static size_t g_gpu_info_offset;
+static size_t g_printer_info_offset;
 static size_t g_num_of_views_offset;
 static size_t g_num_switches_offset;
 static size_t g_switches_offset;
@@ -257,19 +258,29 @@ google_breakpad::CustomClientInfo* GetCustomInfo(const std::wstring& exe_path,
         base::StringPrintf(L"extension-%i", i + 1).c_str(), L""));
   }
 
-  // Add empty values for the gpu_info. We'll put the actual values
-  // when we collect them at this location.
+  // Add empty values for the gpu_info. We'll put the actual values when we
+  // collect them at this location.
   g_gpu_info_offset = g_custom_entries->size();
-  g_custom_entries->push_back(
-      google_breakpad::CustomInfoEntry(L"gpu-venid", L""));
-  g_custom_entries->push_back(
-      google_breakpad::CustomInfoEntry(L"gpu-devid", L""));
-  g_custom_entries->push_back(
-      google_breakpad::CustomInfoEntry(L"gpu-driver", L""));
-  g_custom_entries->push_back(
-      google_breakpad::CustomInfoEntry(L"gpu-psver", L""));
-  g_custom_entries->push_back(
-      google_breakpad::CustomInfoEntry(L"gpu-vsver", L""));
+  static const wchar_t* const kGpuEntries[] = {
+    L"gpu-venid",
+    L"gpu-devid",
+    L"gpu-driver",
+    L"gpu-psver",
+    L"gpu-vsver",
+  };
+  for (size_t i = 0; i < arraysize(kGpuEntries); ++i) {
+    g_custom_entries->push_back(
+        google_breakpad::CustomInfoEntry(kGpuEntries[i], L""));
+  }
+
+  // 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();
+  for (size_t i = 0; i < kMaxReportedPrinterRecords; ++i) {
+    g_custom_entries->push_back(
+        google_breakpad::CustomInfoEntry(
+            base::StringPrintf(L"prn-info-%i", i).c_str(), L""));

[eroman, 2012/03/14 02:12:49]

size_t is an unsigned type, i don't think it is correct to use the %i format
string. Would be best to just make "i" an int counter.

Also note that for consistency with the other entries you should use i+1.

[Vitaly Buka (NO REVIEWS), 2012/03/14 20:37:42]

Done.

+  }
 
   // Read the id from registry. If reporting has never been enabled
   // the result will be empty string. Its OK since when user enables reporting
@@ -487,21 +498,34 @@ extern "C" void __declspec(dllexport) __cdecl SetGpuInfo(
   if (!g_custom_entries)
     return;
 
-  base::wcslcpy((*g_custom_entries)[g_gpu_info_offset].value,
-                vendor_id,
-                google_breakpad::CustomInfoEntry::kValueMaxLength);
-  base::wcslcpy((*g_custom_entries)[g_gpu_info_offset+1].value,
-                device_id,
-                google_breakpad::CustomInfoEntry::kValueMaxLength);
-  base::wcslcpy((*g_custom_entries)[g_gpu_info_offset+2].value,
-                driver_version,
-                google_breakpad::CustomInfoEntry::kValueMaxLength);
-  base::wcslcpy((*g_custom_entries)[g_gpu_info_offset+3].value,
-                pixel_shader_version,
-                google_breakpad::CustomInfoEntry::kValueMaxLength);
-  base::wcslcpy((*g_custom_entries)[g_gpu_info_offset+4].value,
-                vertex_shader_version,
+  const wchar_t* info[] = {
+    vendor_id,
+    device_id,
+    driver_version,
+    pixel_shader_version,
+    vertex_shader_version
+  };
+
+  for (size_t i = 0; i < arraysize(info); ++i) {
+    base::wcslcpy((*g_custom_entries)[g_gpu_info_offset + i].value,
+                  info[i],
+                  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(info.size() <= kMaxReportedPrinterRecords);
+  for (size_t i = 0; i < std::min(kMaxReportedPrinterRecords, info.size());
+       ++i) {
+    base::wcslcpy((*g_custom_entries)[g_printer_info_offset + i].value,
+                info[i].c_str(),
                 google_breakpad::CustomInfoEntry::kValueMaxLength);
+  }
 }
 
 extern "C" void __declspec(dllexport) __cdecl SetNumberOfViews(