Skip to content

Commit

Permalink
Fixed coping printer names.
Browse files Browse the repository at this point in the history
TBR=noamsml

Review URL: https://codereview.chromium.org/155663002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249085 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
vitalybuka@chromium.org committed Feb 5, 2014
1 parent 1f2a143 commit 33f137f
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions printing/backend/print_backend_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ void LoadPaper(const wchar_t* printer,
wchar_t chars[kMaxPaperName];
};

DCHECK_EQ(sizeof(PaperName), sizeof(wchar_t) * kMaxPaperName);

// Paper
std::vector<PaperName> names;
GetDeviceCapabilityArray(printer, port, DC_PAPERNAMES, &names);
Expand All @@ -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);
}
Expand All @@ -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;
Expand Down

0 comments on commit 33f137f

Please sign in to comment.