Fixed coping printer names.

printing/backend/print_backend_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 "printing/backend/print_backend.h"
 
 #include <objidl.h>
 #include <winspool.h>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 41 matching lines @@
                const wchar_t* port,
                const DEVMODE* devmode,
                PrinterSemanticCapsAndDefaults* caps) {
   static const size_t kToUm = 100;  // Windows uses 0.1mm.
   static const size_t kMaxPaperName = 64;
 
   struct PaperName {
     wchar_t chars[kMaxPaperName];
   };
 
+  DCHECK_EQ(sizeof(PaperName), sizeof(wchar_t) * kMaxPaperName);

[Noam Samuel, 2014/02/05 18:37:56]

Very minor nit: This DCHECK seems superflous

+
   // Paper
   std::vector<PaperName> names;
   GetDeviceCapabilityArray(printer, port, DC_PAPERNAMES, &names);
 
   std::vector<POINT> sizes;
   GetDeviceCapabilityArray(printer, port, DC_PAPERSIZE, &sizes);
 
   std::vector<WORD> ids;
   GetDeviceCapabilityArray(printer, port, DC_PAPERS, &ids);
 
   DCHECK_EQ(ids.size(), sizes.size());
   DCHECK_EQ(names.size(), sizes.size());
 
   if (ids.size() != sizes.size())
     ids.clear();
   if (names.size() != sizes.size())
     names.clear();
 
   for (size_t i = 0; i < sizes.size(); ++i) {
     PrinterSemanticCapsAndDefaults::Paper paper;
     paper.size_um.SetSize(sizes[i].x * kToUm, sizes[i].y * kToUm);
     if (!names.empty()) {
-      paper.name.assign(&names[i].chars, &names[i].chars + kMaxPaperName);
+      const wchar_t* name_start = names[i].chars;
+      base::string16 tmp_name(name_start, kMaxPaperName);
       // Trim trailing zeros.
-      paper.name = paper.name.c_str();
+      tmp_name = tmp_name.c_str();
+      paper.name = base::WideToUTF8(tmp_name);
     }
     caps->papers.push_back(paper);
   }
 
   if (devmode) {
     short default_id = 0;
     gfx::Size default_size;
 
     if ((devmode->dmFields & DM_PAPERSIZE) == DM_PAPERSIZE)
       default_id = devmode->dmPaperSize;
     if ((devmode->dmFields & DM_PAPERWIDTH) == DM_PAPERWIDTH)
       default_size.set_width(devmode->dmPaperWidth * kToUm);
     if ((devmode->dmFields & DM_PAPERLENGTH) == DM_PAPERLENGTH)
       default_size.set_height(devmode->dmPaperLength * kToUm);
 
     if (default_size.IsEmpty()) {
       for (size_t i = 0; i < ids.size(); ++i) {
         if (ids[i] == default_id) {
           PrinterSemanticCapsAndDefaults::Paper paper;
           paper.size_um.SetSize(sizes[i].x * kToUm, sizes[i].y * kToUm);
           if (!names.empty()) {
-            paper.name.assign(&names[i].chars, &names[i].chars + kMaxPaperName);
+            const wchar_t* name_start = names[i].chars;
+            base::string16 tmp_name(name_start, kMaxPaperName);
             // Trim trailing zeros.
-            paper.name = paper.name.c_str();
+            tmp_name = tmp_name.c_str();
+            paper.name = base::WideToUTF8(tmp_name);
           }
           caps->default_paper = paper;
           break;
         }
       }
     } else {
       caps->default_paper.size_um = default_size;
     }
   }
 }
@@ skipping 236 matching lines @@
   ScopedPrinterHandle printer_handle;
   return printer_handle.OpenPrinter(base::UTF8ToWide(printer_name).c_str());
 }
 
 scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
     const base::DictionaryValue* print_backend_settings) {
   return new PrintBackendWin;
 }
 
 }  // namespace printing