summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/service/cloud_print/cdd_conversion_win.cc2
-rw-r--r--chrome/service/cloud_print/print_system_win.cc2
-rw-r--r--printing/backend/print_backend_win.cc13
-rw-r--r--printing/backend/printing_info_win.cc19
-rw-r--r--printing/backend/printing_info_win.h25
-rw-r--r--printing/backend/win_helper.cc2
-rw-r--r--printing/backend/win_helper.h5
-rw-r--r--printing/printing_context_win.cc41
-rw-r--r--printing/printing_context_win_unittest.cc35
9 files changed, 53 insertions, 91 deletions
diff --git a/chrome/service/cloud_print/cdd_conversion_win.cc b/chrome/service/cloud_print/cdd_conversion_win.cc
index f71ed64..b57ae90 100644
--- a/chrome/service/cloud_print/cdd_conversion_win.cc
+++ b/chrome/service/cloud_print/cdd_conversion_win.cc
@@ -23,7 +23,7 @@ scoped_ptr<DEVMODE[]> CjtToDevMode(const base::string16& printer_name,
return scoped_ptr<DEVMODE[]>();
printing::ScopedPrinterHandle printer;
- if (!printer.OpenPrinter(printer_name.c_str()))
+ if (!printer.OpenPrinter(printer_name))
return scoped_ptr<DEVMODE[]>();
scoped_ptr<DEVMODE[]> scoped_dev_mode;
diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc
index 8d585d3..56a4425 100644
--- a/chrome/service/cloud_print/print_system_win.cc
+++ b/chrome/service/cloud_print/print_system_win.cc
@@ -756,7 +756,7 @@ bool PrintSystemWin::GetJobDetails(const std::string& printer_name,
DCHECK(job_details);
printing::ScopedPrinterHandle printer_handle;
std::wstring printer_name_wide = base::UTF8ToWide(printer_name);
- printer_handle.OpenPrinter(printer_name_wide.c_str());
+ printer_handle.OpenPrinter(printer_name_wide);
DCHECK(printer_handle.IsValid());
bool ret = false;
if (printer_handle.IsValid()) {
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc
index b23407c..ec52c99 100644
--- a/printing/backend/print_backend_win.cc
+++ b/printing/backend/print_backend_win.cc
@@ -213,7 +213,7 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults(
const std::string& printer_name,
PrinterSemanticCapsAndDefaults* printer_info) {
ScopedPrinterHandle printer_handle;
- if (!printer_handle.OpenPrinter(base::UTF8ToWide(printer_name).c_str())) {
+ if (!printer_handle.OpenPrinter(base::UTF8ToWide(printer_name))) {
LOG(WARNING) << "Failed to open printer, error = " << GetLastError();
return false;
}
@@ -226,8 +226,9 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults(
DCHECK_EQ(name, base::UTF8ToUTF16(printer_name));
PrinterSemanticCapsAndDefaults caps;
- UserDefaultDevMode user_settings;
- if (user_settings.Init(printer_handle)) {
+
+ scoped_ptr<DEVMODE[]> user_settings = CreateDevMode(printer_handle, NULL);
+ if (user_settings) {
if (user_settings.get()->dmFields & DM_COLOR)
caps.color_default = (user_settings.get()->dmColor == DMCOLOR_COLOR);
@@ -312,7 +313,7 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults(
printer_info->caps_mime_type = "text/xml";
}
ScopedPrinterHandle printer_handle;
- if (printer_handle.OpenPrinter(printer_name_wide.c_str())) {
+ if (printer_handle.OpenPrinter(printer_name_wide)) {
scoped_ptr<DEVMODE[]> devmode_out(CreateDevMode(printer_handle, NULL));
if (!devmode_out)
return false;
@@ -343,7 +344,7 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults(
std::string PrintBackendWin::GetPrinterDriverInfo(
const std::string& printer_name) {
ScopedPrinterHandle printer;
- if (!printer.OpenPrinter(base::UTF8ToWide(printer_name).c_str())) {
+ if (!printer.OpenPrinter(base::UTF8ToWide(printer_name))) {
return std::string();
}
return GetDriverInfo(printer);
@@ -351,7 +352,7 @@ std::string PrintBackendWin::GetPrinterDriverInfo(
bool PrintBackendWin::IsValidPrinter(const std::string& printer_name) {
ScopedPrinterHandle printer_handle;
- return printer_handle.OpenPrinter(base::UTF8ToWide(printer_name).c_str());
+ return printer_handle.OpenPrinter(base::UTF8ToWide(printer_name));
}
scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
diff --git a/printing/backend/printing_info_win.cc b/printing/backend/printing_info_win.cc
index 0e45094..e759639 100644
--- a/printing/backend/printing_info_win.cc
+++ b/printing/backend/printing_info_win.cc
@@ -44,23 +44,4 @@ uint8* GetPrinterInfo(HANDLE printer, int level) {
} // namespace internal
-UserDefaultDevMode::UserDefaultDevMode() : dev_mode_(NULL) {
-}
-
-bool UserDefaultDevMode::Init(HANDLE printer) {
- if (info_9_.Init(printer))
- dev_mode_ = info_9_.get()->pDevMode;
-
- if (!dev_mode_ && info_8_.Init(printer))
- dev_mode_ = info_8_.get()->pDevMode;
-
- if (!dev_mode_ && info_2_.Init(printer))
- dev_mode_ = info_2_.get()->pDevMode;
-
- return dev_mode_ != NULL;
-}
-
-UserDefaultDevMode::~UserDefaultDevMode() {
-}
-
} // namespace printing
diff --git a/printing/backend/printing_info_win.h b/printing/backend/printing_info_win.h
index 931ae6d..1134194 100644
--- a/printing/backend/printing_info_win.h
+++ b/printing/backend/printing_info_win.h
@@ -58,34 +58,9 @@ class DriverInfo {
typedef internal::PrinterInfo<PRINTER_INFO_2, 2> PrinterInfo2;
typedef internal::PrinterInfo<PRINTER_INFO_5, 5> PrinterInfo5;
-typedef internal::PrinterInfo<PRINTER_INFO_8, 8> PrinterInfo8;
-typedef internal::PrinterInfo<PRINTER_INFO_9, 9> PrinterInfo9;
typedef internal::DriverInfo<DRIVER_INFO_6, 6> DriverInfo6;
-// Retrieves DEVMODE from PRINTER_INFO_* structures.
-// Requests in following order:
-// 9 (user-default),
-// 8 (admin-default),
-// 2 (printer-default).
-class PRINTING_EXPORT UserDefaultDevMode {
- public:
- UserDefaultDevMode();
- ~UserDefaultDevMode();
-
- bool Init(HANDLE printer);
-
- const DEVMODE* get() const {
- return dev_mode_;
- }
-
- private:
- PrinterInfo2 info_2_;
- PrinterInfo8 info_8_;
- PrinterInfo9 info_9_;
- const DEVMODE* dev_mode_;
-};
-
} // namespace printing
#endif // PRINTING_BACKEND_PRINTING_INFO_WIN_H_
diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc
index a16228b..53ccf58 100644
--- a/printing/backend/win_helper.cc
+++ b/printing/backend/win_helper.cc
@@ -395,7 +395,7 @@ scoped_ptr<DEVMODE[]> XpsTicketToDevMode(const base::string16& printer_name,
}
printing::ScopedPrinterHandle printer;
- if (!printer.OpenPrinter(printer_name.c_str()))
+ if (!printer.OpenPrinter(printer_name))
return scoped_dev_mode.Pass();
base::win::ScopedComPtr<IStream> pt_stream;
diff --git a/printing/backend/win_helper.h b/printing/backend/win_helper.h
index 9b998d7..ef407b3 100644
--- a/printing/backend/win_helper.h
+++ b/printing/backend/win_helper.h
@@ -46,10 +46,11 @@ class ScopedPrinterHandle
: public base::win::GenericScopedHandle<PrinterHandleTraits,
base::win::VerifierTraits> {
public:
- bool OpenPrinter(const wchar_t* printer) {
+ bool OpenPrinter(const base::string16& printer) {
HANDLE temp_handle;
// ::OpenPrinter may return error but assign some value into handle.
- if (::OpenPrinter(const_cast<LPTSTR>(printer), &temp_handle, NULL)) {
+ if (::OpenPrinter(const_cast<wchar_t*>(printer.c_str()), &temp_handle,
+ NULL)) {
Set(temp_handle);
}
return IsValid();
diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc
index 7c381ca..4397577 100644
--- a/printing/printing_context_win.cc
+++ b/printing/printing_context_win.cc
@@ -269,7 +269,7 @@ PrintingContext::Result PrintingContextWin::UseDefaultSettings() {
(void)::EnumPrinters(PRINTER_ENUM_LOCAL|PRINTER_ENUM_CONNECTIONS,
NULL, 2, NULL, 0, &bytes_needed, &count_returned);
if (bytes_needed) {
- DCHECK(bytes_needed >= count_returned * sizeof(PRINTER_INFO_2));
+ DCHECK_GE(bytes_needed, count_returned * sizeof(PRINTER_INFO_2));
scoped_ptr<BYTE[]> printer_info_buffer(new BYTE[bytes_needed]);
BOOL ret = ::EnumPrinters(PRINTER_ENUM_LOCAL|PRINTER_ENUM_CONNECTIONS,
NULL, 2, printer_info_buffer.get(),
@@ -277,17 +277,21 @@ PrintingContext::Result PrintingContextWin::UseDefaultSettings() {
&count_returned);
if (ret && count_returned) { // have printers
// Open the first successfully found printer.
- for (DWORD count = 0; count < count_returned; ++count) {
- PRINTER_INFO_2* info_2 = reinterpret_cast<PRINTER_INFO_2*>(
- printer_info_buffer.get() + count * sizeof(PRINTER_INFO_2));
- std::wstring printer_name = info_2->pPrinterName;
- if (info_2->pDevMode == NULL || printer_name.length() == 0)
+ const PRINTER_INFO_2* info_2 =
+ reinterpret_cast<PRINTER_INFO_2*>(printer_info_buffer.get());
+ const PRINTER_INFO_2* info_2_end = info_2 + count_returned;
+ for (; info_2 < info_2_end; ++info_2) {
+ ScopedPrinterHandle printer;
+ if (!printer.OpenPrinter(info_2->pPrinterName))
continue;
- if (!AllocateContext(printer_name, info_2->pDevMode, &context_))
- break;
- if (InitializeSettings(*info_2->pDevMode, printer_name,
- NULL, 0, false)) {
- break;
+ scoped_ptr<DEVMODE[]> dev_mode = CreateDevMode(printer, NULL);
+ if (!dev_mode || !AllocateContext(info_2->pPrinterName, dev_mode.get(),
+ &context_)) {
+ continue;
+ }
+ if (InitializeSettings(*dev_mode.get(), info_2->pPrinterName, NULL, 0,
+ false)) {
+ return OK;
}
ReleaseContext();
}
@@ -336,15 +340,13 @@ PrintingContext::Result PrintingContextWin::UpdatePrinterSettings(
DCHECK(!external_preview) << "Not implemented";
ScopedPrinterHandle printer;
- LPWSTR device_name_wide =
- const_cast<wchar_t*>(settings_.device_name().c_str());
- if (!printer.OpenPrinter(device_name_wide))
+ if (!printer.OpenPrinter(settings_.device_name()))
return OnError();
// Make printer changes local to Chrome.
// See MSDN documentation regarding DocumentProperties.
scoped_ptr<DEVMODE[]> scoped_dev_mode =
- CreateDevModeWithColor(printer, device_name_wide,
+ CreateDevModeWithColor(printer, settings_.device_name(),
settings_.color() != GRAY);
if (!scoped_dev_mode)
return OnError();
@@ -404,7 +406,7 @@ PrintingContext::Result PrintingContextWin::InitWithSettings(
// TODO(maruel): settings_.ToDEVMODE()
ScopedPrinterHandle printer;
- if (!printer.OpenPrinter(settings_.device_name().c_str())) {
+ if (!printer.OpenPrinter(settings_.device_name())) {
return FAILED;
}
@@ -588,15 +590,14 @@ bool PrintingContextWin::GetPrinterSettings(HANDLE printer,
const std::wstring& device_name) {
DCHECK(!in_print_job_);
- UserDefaultDevMode user_settings;
+ scoped_ptr<DEVMODE[]> dev_mode = CreateDevMode(printer, NULL);
- if (!user_settings.Init(printer) ||
- !AllocateContext(device_name, user_settings.get(), &context_)) {
+ if (!dev_mode || !AllocateContext(device_name, dev_mode.get(), &context_)) {
ResetSettings();
return false;
}
- return InitializeSettings(*user_settings.get(), device_name, NULL, 0, false);
+ return InitializeSettings(*dev_mode.get(), device_name, NULL, 0, false);
}
// static
diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc
index 0590229..b28d996 100644
--- a/printing/printing_context_win_unittest.cc
+++ b/printing/printing_context_win_unittest.cc
@@ -12,24 +12,27 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "printing/backend/printing_info_win.h"
+#include "printing/backend/win_helper.h"
#include "printing/printing_test.h"
#include "printing/printing_context.h"
#include "printing/printing_context_win.h"
#include "printing/print_settings.h"
#include "testing/gtest/include/gtest/gtest.h"
+namespace printing {
+
// This test is automatically disabled if no printer is available.
class PrintingContextTest : public PrintingTest<testing::Test> {
public:
- void PrintSettingsCallback(printing::PrintingContext::Result result) {
+ void PrintSettingsCallback(PrintingContext::Result result) {
result_ = result;
}
protected:
- printing::PrintingContext::Result result() const { return result_; }
+ PrintingContext::Result result() const { return result_; }
private:
- printing::PrintingContext::Result result_;
+ PrintingContext::Result result_;
};
// This is a fake PrintDlgEx implementation that sets the right fields in
@@ -46,9 +49,9 @@ HRESULT WINAPI PrintDlgExMock(LPPRINTDLGEX lppd) {
lppd->lpPageRanges[0].nToPage = 5;
// Painful paperwork.
- std::wstring printer_name = PrintingContextTest::GetDefaultPrinter();
- HANDLE printer;
- if (!OpenPrinter(const_cast<wchar_t*>(printer_name.c_str()), &printer, NULL))
+ base::string16 printer_name = PrintingContextTest::GetDefaultPrinter();
+ ScopedPrinterHandle printer;
+ if (!printer.OpenPrinter(printer_name))
return E_FAIL;
scoped_ptr<uint8[]> buffer;
@@ -58,7 +61,7 @@ HRESULT WINAPI PrintDlgExMock(LPPRINTDLGEX lppd) {
lppd->hDevMode = NULL;
lppd->hDevNames = NULL;
- printing::PrinterInfo2 info_2;
+ PrinterInfo2 info_2;
if (info_2.Init(printer)) {
dev_mode = info_2.get()->pDevMode;
}
@@ -67,7 +70,7 @@ HRESULT WINAPI PrintDlgExMock(LPPRINTDLGEX lppd) {
goto Cleanup;
}
- if (!printing::PrintingContextWin::AllocateContext(printer_name, dev_mode,
+ if (!PrintingContextWin::AllocateContext(printer_name, dev_mode,
&lppd->hDC)) {
result = E_FAIL;
goto Cleanup;
@@ -137,7 +140,6 @@ Cleanup:
GlobalFree(lppd->hDevNames);
}
}
- ClosePrinter(printer);
return result;
}
@@ -145,12 +147,11 @@ TEST_F(PrintingContextTest, Base) {
if (IsTestCaseDisabled())
return;
- printing::PrintSettings settings;
+ PrintSettings settings;
settings.set_device_name(GetDefaultPrinter());
// Initialize it.
- scoped_ptr<printing::PrintingContext> context(
- printing::PrintingContext::Create(std::string()));
- EXPECT_EQ(printing::PrintingContext::OK, context->InitWithSettings(settings));
+ scoped_ptr<PrintingContext> context(PrintingContext::Create(std::string()));
+ EXPECT_EQ(PrintingContext::OK, context->InitWithSettings(settings));
// The print may lie to use and may not support world transformation.
// Verify right now.
@@ -165,12 +166,14 @@ TEST_F(PrintingContextTest, PrintAll) {
return;
std::string dummy_locale;
- printing::PrintingContextWin context(dummy_locale);
+ PrintingContextWin context(dummy_locale);
context.SetPrintDialog(&PrintDlgExMock);
context.AskUserForSettings(
NULL, 123, false, base::Bind(&PrintingContextTest::PrintSettingsCallback,
base::Unretained(this)));
- EXPECT_EQ(printing::PrintingContext::OK, result());
- printing::PrintSettings settings = context.settings();
+ EXPECT_EQ(PrintingContext::OK, result());
+ PrintSettings settings = context.settings();
EXPECT_EQ(settings.ranges().size(), 0);
}
+
+} // namespace printing
generated by cgit v1.1 at 2024-07-04 01:07:22 +0000