Re-enable building both 32 and 64 bit version of the GCP port monitor.

cloud_print/virtual_driver/win/install/setup.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 <windows.h>
 #include <setupapi.h>  // Must be included after windows.h
 #include <winspool.h>
 #include <stddef.h>
 
 #include <iomanip>
@@ skipping 35 matching lines @@
 
 base::FilePath GetSystemPath(const base::string16& binary) {
   base::FilePath path;
   if (!PathService::Get(base::DIR_SYSTEM, &path)) {
     LOG(ERROR) << "Unable to get system path.";
     return path;
   }
   return path.Append(binary);
 }
 
+base::FilePath GetNativeSystemPath(const base::string16& binary) {
+  if (!IsSystem64Bit())
+    return GetSystemPath(binary);
+  base::FilePath path;
+  // Sysnative will bypass filesystem redirection and give us
+  // the location of the 64bit system32 from a 32 bit process.
+  if (!PathService::Get(base::DIR_WINDOWS, &path)) {
+    LOG(ERROR) << "Unable to get windows path.";
+    return path;
+  }
+  return path.Append(L"sysnative").Append(binary);
+}
+
 void SpoolerServiceCommand(const char* command) {
-  base::FilePath net_path = GetSystemPath(L"net");
+  base::FilePath net_path = GetNativeSystemPath(L"net");
   if (net_path.empty())
     return;
   base::CommandLine command_line(net_path);
   command_line.AppendArg(command);
   command_line.AppendArg("spooler");
   command_line.AppendArg("/y");
 
   base::LaunchOptions options;
   options.wait = true;
   options.start_hidden = true;
   VLOG(0) << command_line.GetCommandLineString();
   base::LaunchProcess(command_line, options);
 }
 
 HRESULT RegisterPortMonitor(bool install, const base::FilePath& install_path) {
   DCHECK(install || install_path.empty());
-  base::FilePath target_path = GetSystemPath(L"gcp_portmon.dll");
+  base::FilePath target_path = GetNativeSystemPath(GetPortMonitorDllName());
   if (target_path.empty()) {
     LOG(ERROR) << "Unable to get port monitor target path.";
     return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND);
   }
   if (install) {
-    base::FilePath source_path = install_path.Append(L"gcp_portmon.dll");
+    base::FilePath source_path = install_path.Append(GetPortMonitorDllName());
     if (!base::CopyFile(source_path, target_path)) {
       LOG(ERROR) << "Unable copy port monitor dll from " << source_path.value()
                  << " to " << target_path.value();
       return GetLastHResult();
     }
   } else if (!base::PathExists(target_path)) {
     // Already removed.  Just "succeed" silently.
     return S_OK;
   }
 
-  base::FilePath regsvr32_path = GetSystemPath(L"regsvr32.exe");
+  base::FilePath regsvr32_path = GetNativeSystemPath(L"regsvr32.exe");
   if (regsvr32_path.empty()) {
     LOG(ERROR) << "Can't find regsvr32.exe.";
     return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND);
   }
 
   base::CommandLine command_line(regsvr32_path);
   command_line.AppendArg("/s");
   if (!install) {
     command_line.AppendArg("/u");
   }
 
   // Use system32 path here because otherwise ::AddMonitor would fail.
-  command_line.AppendArgPath(GetSystemPath(L"gcp_portmon.dll"));
+  command_line.AppendArgPath(GetSystemPath(GetPortMonitorDllName()));
 
   base::LaunchOptions options;
   options.wait = true;
 
   base::Process regsvr32_process =
       base::LaunchProcess(command_line.GetCommandLineString(), options);
   if (!regsvr32_process.IsValid()) {
     LOG(ERROR) << "Unable to launch regsvr32.exe.";
     return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
   }
@@ skipping 297 matching lines @@
 
   VLOG(0) << GetErrorMessage(retval) << " HRESULT=0x" << std::setbase(16)
           << retval;
 
   // Installer is silent by default as required by Google Update.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch("verbose")) {
     DisplayWindowsMessage(NULL, retval, LoadLocalString(IDS_DRIVER_NAME));
   }
   return retval;
 }