Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(936)

Unified Diff: printing/backend/print_backend_win.cc

Issue 155663002: Fixed coping printer names. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/backend/print_backend_win.cc
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc
index c47c65d82c3e52ea53748a115d9bb2b9e9f749e0..aaf8da1acd8199d8963e1fda7298c29fca8127e9 100644
--- a/printing/backend/print_backend_win.cc
+++ b/printing/backend/print_backend_win.cc
@@ -59,6 +59,8 @@ void LoadPaper(const wchar_t* printer,
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);
@@ -81,9 +83,11 @@ void LoadPaper(const wchar_t* printer,
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);
}
@@ -105,9 +109,11 @@ void LoadPaper(const wchar_t* printer,
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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698