Installer for Windows cloud print driver changed to use PPD, PPd file added

cloud_print/virtual_driver/win/install/setup.cc

 // Copyright (c) 2011 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 <winspool.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/file_version_info_win.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "base/win/scoped_handle.h"
 #include "cloud_print/virtual_driver/win/virtual_driver_consts.h"
 #include "cloud_print/virtual_driver/win/virtual_driver_helpers.h"
 #include "grit/virtual_driver_setup_resources.h"
 
 namespace {
 
-HRESULT GetGpdPath(FilePath* path) {
+HRESULT GetPpdPath(FilePath* path) {
   if (!PathService::Get(base::DIR_EXE, path)) {
     LOG(ERROR) << "Unable to get install path.";
     return ERROR_PATH_NOT_FOUND;
   }
-  *path = path->Append(L"gcp.gpd");
+  *path = path->Append(L"GCP-driver.ppd");
   return S_OK;
 }
 
 HRESULT GetPortMonitorDllPath(FilePath* path) {
   if (!PathService::Get(base::DIR_EXE, path)) {
     LOG(ERROR) << "Unable to get install path.";
     return ERROR_PATH_NOT_FOUND;
   }
   *path = path->Append(cloud_print::GetPortMonitorDllName());
   return S_OK;
@@ skipping 95 matching lines @@
     FileVersionInfoWin* version_info_win =
         static_cast<FileVersionInfoWin*>(version_info.get());
     VS_FIXEDFILEINFO* fixed_file_info = version_info_win->fixed_file_info();
     retval = fixed_file_info->dwFileVersionMS;
     retval <<= 32;
     retval |= fixed_file_info->dwFileVersionMS;
   }
   return retval;
 }
 
-HRESULT InstallGpd() {
+HRESULT InstallPpd() {
   DRIVER_INFO_6 driver_info = {0};
   HRESULT result = S_OK;
 
   // Set up paths for the files we depend on.
   FilePath source_path;
   FilePath driver_dir;
   cloud_print::GetPrinterDriverDir(&driver_dir);
   FilePath xps_path = driver_dir.Append(L"mxdwdrv.dll");
-  FilePath ui_path = driver_dir.Append(L"unidrvui.dll");
+  FilePath ui_path = driver_dir.Append(L"PS5UI.DLL");

[Albert Bodenhamer, 2011/07/28 21:42:00]

Use lowercase file name.

[abeera, 2011/07/28 21:49:47]

Done
On 2011/07/28 21:42:00, Albert Bodenhamer wrote:

   FilePath ui_help_path = driver_dir.Append(L"unidrv.hlp");
-  result = GetGpdPath(&source_path);
+  result = GetPpdPath(&source_path);
   if (!SUCCEEDED(result)) {
     return result;
   }
   // None of the print API structures likes constant strings even though they
   // don't modify the string.  const_casting is the cleanest option.
   driver_info.pDataFile = const_cast<LPWSTR>(source_path.value().c_str());
   driver_info.pHelpFile = const_cast<LPWSTR>(ui_help_path.value().c_str());
   driver_info.pDriverPath = const_cast<LPWSTR>(xps_path.value().c_str());
   driver_info.pConfigFile = const_cast<LPWSTR>(ui_path.value().c_str());
 
@@ skipping 17 matching lines @@
                           6,
                           reinterpret_cast<BYTE*>(&driver_info),
                           APD_COPY_NEW_FILES|APD_COPY_FROM_DIRECTORY)) {
     result = cloud_print::GetLastHResult();
     LOG(ERROR) << "Unable to add printer driver";
     return result;
   }
   return S_OK;
 }
 
-HRESULT UninstallGpd() {
+HRESULT UninstallPpd() {
   int tries = 10;
   string16 driver_name = cloud_print::LoadLocalString(IDS_DRIVER_NAME);
   while (!DeletePrinterDriverEx(NULL,
                                 NULL,
                                 const_cast<LPWSTR>(driver_name.c_str()),
                                 DPD_DELETE_UNUSED_FILES,
                                 0) && tries > 0) {
     if (GetLastError() == ERROR_UNKNOWN_PRINTER_DRIVER) {
       LOG(WARNING) << "Print driver is already uninstalled.";
       return S_OK;
@@ skipping 57 matching lines @@
   return S_OK;
 }
 
 HRESULT InstallVirtualDriver(void) {
   HRESULT result = S_OK;
   result = RegisterPortMonitor(true);
   if (!SUCCEEDED(result)) {
     LOG(ERROR) << "Unable to register port monitor.";
     return result;
   }
-  result = InstallGpd();
+  result = InstallPpd();
   if (!SUCCEEDED(result)) {
-    LOG(ERROR) << "Unable to install gpd.";
+    LOG(ERROR) << "Unable to install Ppd.";
     return result;
   }
   result = InstallPrinter();
   if (!SUCCEEDED(result)) {
     LOG(ERROR) << "Unable to install printer.";
     return result;
   }
   return S_OK;
 }
 
 HRESULT UninstallVirtualDriver(void) {
   HRESULT result = S_OK;
   result = UninstallPrinter();
   if (!SUCCEEDED(result)) {
-    LOG(ERROR) << "Unable to uninstall gpd.";
+    LOG(ERROR) << "Unable to uninstall Ppd.";
     return result;
   }
-  result = UninstallGpd();
+  result = UninstallPpd();
   if (!SUCCEEDED(result)) {
-    LOG(ERROR) << "Unable to remove gpd.";
+    LOG(ERROR) << "Unable to remove Ppd.";
     return result;
   }
   result = RegisterPortMonitor(false);
   if (!SUCCEEDED(result)) {
     LOG(ERROR) << "Unable to remove port monitor.";
     return result;
   }
   return S_OK;
 }
 
@@ skipping 11 matching lines @@
   } else {
     retval = InstallVirtualDriver();
   }
   if (!CommandLine::ForCurrentProcess()->HasSwitch("silent")) {
     cloud_print::DisplayWindowsMessage(NULL, retval,
         cloud_print::LoadLocalString(IDS_DRIVER_NAME));
   }
   return retval;
 }