| Index: cloud_print/virtual_driver/win/install/setup.cc
|
| diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc
|
| index 6ee31096b7ef1338e3c5ccb0e44d16dd6548e1e6..48e32a4e1798670efc1fd1256f3f22db4b60589b 100644
|
| --- a/cloud_print/virtual_driver/win/install/setup.cc
|
| +++ b/cloud_print/virtual_driver/win/install/setup.cc
|
| @@ -20,12 +20,12 @@
|
|
|
| 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;
|
| }
|
|
|
| @@ -141,7 +141,7 @@ DWORDLONG GetVersionNumber() {
|
| return retval;
|
| }
|
|
|
| -HRESULT InstallGpd() {
|
| +HRESULT InstallPpd() {
|
| DRIVER_INFO_6 driver_info = {0};
|
| HRESULT result = S_OK;
|
|
|
| @@ -149,10 +149,10 @@ HRESULT InstallGpd() {
|
| 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 xps_path = driver_dir.Append(L"mxdwdrv.dll");
|
| + FilePath ui_path = driver_dir.Append(L"PS5UI.DLL");
|
| FilePath ui_help_path = driver_dir.Append(L"unidrv.hlp");
|
| - result = GetGpdPath(&source_path);
|
| + result = GetPpdPath(&source_path);
|
| if (!SUCCEEDED(result)) {
|
| return result;
|
| }
|
| @@ -190,7 +190,7 @@ HRESULT InstallGpd() {
|
| return S_OK;
|
| }
|
|
|
| -HRESULT UninstallGpd() {
|
| +HRESULT UninstallPpd() {
|
| int tries = 10;
|
| string16 driver_name = cloud_print::LoadLocalString(IDS_DRIVER_NAME);
|
| while (!DeletePrinterDriverEx(NULL,
|
| @@ -268,9 +268,9 @@ HRESULT InstallVirtualDriver(void) {
|
| 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();
|
| @@ -285,12 +285,12 @@ 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);
|
|
|