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

Unified Diff: cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc

Issue 2590433003: Re-enable building both 32 and 64 bit version of the GCP port monitor. (Closed)
Patch Set: Fix some issues with 32/64 bit installation. Created 4 years 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
Index: cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc
diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc
index 66039bc986caff63380319774023e069ef2f5849..18d12481d6232ef526636bfc396f4794d00b9d13 100644
--- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc
+++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc
@@ -74,7 +74,7 @@ HRESULT WINAPI DllRegisterServer(void) {
MONITOR_INFO_2 monitor_info = {0};
// YUCK!!! I can either copy the constant, const_cast, or define my own
// MONITOR_INFO_2 that will take const strings.
- base::FilePath dll_path(L"gcp_portmon.dll");
+ base::FilePath dll_path(cloud_print::GetPortMonitorDllName());
monitor_info.pDLLName = const_cast<LPWSTR>(dll_path.value().c_str());
monitor_info.pName = const_cast<LPWSTR>(dll_path.value().c_str());
if (AddMonitor(NULL, 2, reinterpret_cast<BYTE*>(&monitor_info))) {
@@ -88,7 +88,7 @@ HRESULT WINAPI DllUnregisterServer(void) {
if (!cloud_print::CanRegister()) {
return E_ACCESSDENIED;
}
- base::FilePath dll_path(L"gcp_portmon.dll");
+ base::FilePath dll_path(cloud_print::GetPortMonitorDllName());
if (DeleteMonitor(NULL, NULL, const_cast<LPWSTR>(dll_path.value().c_str()))) {
return S_OK;
}
« no previous file with comments | « cloud_print/virtual_driver/win/port_monitor/port_monitor.cc ('k') | cloud_print/virtual_driver/win/virtual_driver_helpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698