From cc61c90372decff35efc1c0319959d6e4dedbe03 Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Thu, 23 Jul 2020 03:11:15 +0200 Subject: [PATCH] Cedar/SW.c: remove "install_src.dat" file check Previously, the file needed to be present in order for the setup to work. This commit removes the requirement so that the setup can be ran from the build directory without the need to copy the file (which is now removed from the repository). --- src/Cedar/SW.c | 9 --------- src/bin/hamcore/install_src.dat | 1 - src/bin/hamcore/strtable_cn.stb | 1 - src/bin/hamcore/strtable_en.stb | 1 - src/bin/hamcore/strtable_ja.stb | 1 - src/bin/hamcore/strtable_ko.stb | 1 - src/bin/hamcore/strtable_pt_br.stb | 2 +- src/bin/hamcore/strtable_ru.stb | 1 - src/bin/hamcore/strtable_tw.stb | 1 - src/bin/install_src.dat | 1 - 10 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 src/bin/hamcore/install_src.dat delete mode 100644 src/bin/install_src.dat diff --git a/src/Cedar/SW.c b/src/Cedar/SW.c index 26c8ebd0..45812a5c 100644 --- a/src/Cedar/SW.c +++ b/src/Cedar/SW.c @@ -289,8 +289,6 @@ bool SwAddBasicFilesToList(LIST *o, char *component_name) return false; } - Add(o, SwNewSfxFile("install_src.dat", L"|install_src.dat")); - return true; } @@ -5633,13 +5631,6 @@ UINT SwWelcomeDlg(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, WIZARD *wiz break; case WM_WIZ_NEXT: - if (IsFileExistsW(L"@install_src.dat") == false) - { - // Vpnsetup.exe is launched from other than the installation source - MsgBoxEx(hWnd, MB_ICONSTOP, _UU("SW_NOT_INSTALL_SRC")); - break; - } - if (MsIsKB3033929RequiredAndMissing()) { // KB3033929 is missing diff --git a/src/bin/hamcore/install_src.dat b/src/bin/hamcore/install_src.dat deleted file mode 100644 index 553c049f..00000000 --- a/src/bin/hamcore/install_src.dat +++ /dev/null @@ -1 +0,0 @@ -TanakaJiro!!! \ No newline at end of file diff --git a/src/bin/hamcore/strtable_cn.stb b/src/bin/hamcore/strtable_cn.stb index 3a00ce62..e5143bee 100644 --- a/src/bin/hamcore/strtable_cn.stb +++ b/src/bin/hamcore/strtable_cn.stb @@ -7178,7 +7178,6 @@ SW_DIR_DST_IS_SYSTEM_MODE 同样的软件已经在指定目录中以系统模 SW_DIR_DST_IS_USER_MODE 同样的软件已经在指定目录中以用户模式安装。\r\n\r\n请指定另外一个目录。 SW_SYSTEM_MODE_ALREADY_INSTALLED 本软件 "%s" 以系统模式被安装在这台电脑上。\r\n\r\n同样的软件以用户模式和系统模式安装在同一台电脑上会发生冲突。\r\n\r\n您确定要以用户模式继续进行安装？ -SW_NOT_INSTALL_SRC 安装程序已在一个外部的安装源执行。\r\n\r\n不能再继续安装。 SW_SETUPLOG_CORRUPTED "setuplog.dat" 文件已被破坏。 SW_MSI_UNINSTALL_FAILED 之前的版本 %s (产品号: "%S")已安装。 Windows安装工具卸载旧版本失败。\r\n\r\n请您手动卸载并且重启本安装工具。 SW_MSI_UNINSTALL_REBOOT_REQUIRED Windows 安装工具已经卸载旧版本 %s。请重启电脑。\r\n\r\n点击结束按钮并且手动重启电脑，然后在电脑重启后，重启本安装工具。 diff --git a/src/bin/hamcore/strtable_en.stb b/src/bin/hamcore/strtable_en.stb index 326b8e89..0a800128 100644 --- a/src/bin/hamcore/strtable_en.stb +++ b/src/bin/hamcore/strtable_en.stb @@ -7171,7 +7171,6 @@ SW_DIR_DST_IS_SYSTEM_MODE The same software is already installed on the spec SW_DIR_DST_IS_USER_MODE The same software is already installed on the specified directory as the User Mode.\r\n\r\nPlease specify another directory. SW_SYSTEM_MODE_ALREADY_INSTALLED The software "%s" is already installed on this computer as the System Mode.\r\n\r\nBoth the System Mode and the User Mode installation of the same software on the same computer will conflict.\r\n\r\nDo you really want to continue the installation as the User Mode? -SW_NOT_INSTALL_SRC The setup program has been executed from outside an install source.\r\n\r\nUnable to continue the installation. SW_SETUPLOG_CORRUPTED The "setuplog.dat" file is broken. SW_MSI_UNINSTALL_FAILED The older version of %s (Product Code: "%S") is installed. Windows Installer failed to uninstall this older version.\r\n\r\nPlease uninstall this older version manually and restart this installer again. SW_MSI_UNINSTALL_REBOOT_REQUIRED Windows Installer has uninstalled the older version of %s. The reboot of computer is required.\r\n\r\nPress Finish button and reboot the computer MANUALLY, and restart this installer after the reboot. diff --git a/src/bin/hamcore/strtable_ja.stb b/src/bin/hamcore/strtable_ja.stb index 7e7d6fa3..7016c72e 100644 --- a/src/bin/hamcore/strtable_ja.stb +++ b/src/bin/hamcore/strtable_ja.stb @@ -7173,7 +7173,6 @@ SW_DIR_DST_IS_SYSTEM_MODE 指定されたディレクトリにはすでに SW_DIR_DST_IS_USER_MODE 指定されたディレクトリにはすでに本ソフトウェアがユーザーモードでインストールされています。\r\n\r\n別のディレクトリを指定してください。 SW_SYSTEM_MODE_ALREADY_INSTALLED ソフトウェア 「%s」 はすでにこのコンピュータにシステムモードでインストールされています。\r\n\r\n同一コンピュータに同一コンポーネントをシステムモードとユーザーモードの両方でインストールする場合は競合が発生する場合があります。\r\n\r\n本当にユーザーモードでインストールを実行しますか? -SW_NOT_INSTALL_SRC セットアッププログラムがインストールソース以外から起動されました。\r\n\r\nインストールを続行できません。 SW_SETUPLOG_CORRUPTED setuplog.dat ファイルが破損しています。 SW_MSI_UNINSTALL_FAILED %s の古いバージョン (製品コード: "%S") を Windows Installer でアンインストールしようとしましたが、アンインストールに失敗しました。\r\n\r\nこのバージョンを手動でアンインストールしてから、再度このインストーラを起動してください。 SW_MSI_UNINSTALL_REBOOT_REQUIRED %s の古いバージョンを Windows Installer でアンインストールしました。コンピュータの再起動が必要です。\r\n\r\n「完了」をクリックしてから手動でコンピュータを再起動し、その後もう一度このインストーラを起動してください。 diff --git a/src/bin/hamcore/strtable_ko.stb b/src/bin/hamcore/strtable_ko.stb index 864d8a0b..60cdfba8 100644 --- a/src/bin/hamcore/strtable_ko.stb +++ b/src/bin/hamcore/strtable_ko.stb @@ -7149,7 +7149,6 @@ SW_DIR_DST_IS_SYSTEM_MODE 지정된 디렉토리에 이미 소프트웨어가 SW_DIR_DST_IS_USER_MODE 지정된 디렉토리에 이미 소프트웨어가 사용자 모드로 설치되어 있습니다. \r\n\r\n 다른 디렉토리를 지정하십시오. SW_SYSTEM_MODE_ALREADY_INSTALLED 소프트웨어 '%s'는 이미이 컴퓨터 시스템 모드로 설치되어 있습니다. \r\n\r\n 동일한 컴퓨터에 동일한 구성 요소를 시스템 모드와 사용자 모드에서 설치하는 경우 충돌이 발생할 수 있습니다. \r\n\r\n 정말 사용자 모드에서 설치를 실행 하시겠습니까? -SW_NOT_INSTALL_SRC 설치 프로그램이 설치 소스 이외에서 시작되었습니다. \r\n\r\n 설치를 계속할 수 없습니다. SW_SETUPLOG_CORRUPTED setuplog.dat 파일이 손상되어 있습니다. SW_MSI_UNINSTALL_FAILED %s의 이전 버전 (제품 코드:"%S")을 Windows Installer에서 제거하려고했지만 제거에 실패했습니다. \r\n\r\n이 버전을 수동으로 제거하고 다시 설치 프로그램을 시작하십시오. SW_MSI_UNINSTALL_REBOOT_REQUIRED %s의 이전 버전을 Windows Installer에서 제거했습니다. 컴퓨터를 다시 시작해야합니다. \r\n\r\n "완료"를 클릭하여 수동으로 컴퓨터를 다시 시작한 다음 다시 설치 프로그램을 시작하십시오. diff --git a/src/bin/hamcore/strtable_pt_br.stb b/src/bin/hamcore/strtable_pt_br.stb index c5c6ea90..b5f9c434 100644 --- a/src/bin/hamcore/strtable_pt_br.stb +++ b/src/bin/hamcore/strtable_pt_br.stb @@ -6897,7 +6897,7 @@ SW_DIR_DST_IS_BROKEN Unable to read a file "%s" which is on the specified direct SW_DIR_DST_IS_SYSTEM_MODE The same software is already installed on the specified directory as the System Mode.\r\n\r\nPlease specify another directory. SW_DIR_DST_IS_USER_MODE The same software is already installed on the specified directory as the User Mode.\r\n\r\nPlease specify another directory. SW_SYSTEM_MODE_ALREADY_INSTALLED The software "%s" is already installed on this computer as the System Mode.\r\n\r\nBoth the System Mode and the User Mode installation of the same software on the same computer will conflict.\r\n\r\nDo you really want to continue the installation as the User Mode? -SW_NOT_INSTALL_SRC The setup program has been executed from outside an install source.\r\n\r\nUnable to continue the installation. + SW_SETUPLOG_CORRUPTED The "setuplog.dat" file is broken. SW_MSI_UNINSTALL_FAILED The older version of %s (Product Code: "%S") is installed. Windows Installer failed to uninstall this older version.\r\n\r\nPlease uninstall this older version manually and restart this installer again. SW_MSI_UNINSTALL_REBOOT_REQUIRED Windows Installer has uninstalled the older version of %s. The reboot of computer is required.\r\n\r\nPress Finish button and reboot the computer MANUALLY, and restart this installer after the reboot. diff --git a/src/bin/hamcore/strtable_ru.stb b/src/bin/hamcore/strtable_ru.stb index 55e4a734..255c402e 100644 --- a/src/bin/hamcore/strtable_ru.stb +++ b/src/bin/hamcore/strtable_ru.stb @@ -7158,7 +7158,6 @@ SW_DIR_DST_IS_SYSTEM_MODE The same software is already installed on the spec SW_DIR_DST_IS_USER_MODE The same software is already installed on the specified directory as the User Mode.\r\n\r\nPlease specify another directory. SW_SYSTEM_MODE_ALREADY_INSTALLED The software "%s" is already installed on this computer as the System Mode.\r\n\r\nBoth the System Mode and the User Mode installation of the same software on the same computer will conflict.\r\n\r\nDo you really want to continue the installation as the User Mode? -SW_NOT_INSTALL_SRC The setup program has been executed from outside an install source.\r\n\r\nUnable to continue the installation. SW_SETUPLOG_CORRUPTED The "setuplog.dat" file is broken. SW_MSI_UNINSTALL_FAILED The older version of %s (Product Code: "%S") is installed. Windows Installer failed to uninstall this older version.\r\n\r\nPlease uninstall this older version manually and restart this installer again. SW_MSI_UNINSTALL_REBOOT_REQUIRED Windows Installer has uninstalled the older version of %s. The reboot of computer is required.\r\n\r\nPress Finish button and reboot the computer MANUALLY, and restart this installer after the reboot. diff --git a/src/bin/hamcore/strtable_tw.stb b/src/bin/hamcore/strtable_tw.stb index 9e98bdc8..7cbaa0ba 100644 --- a/src/bin/hamcore/strtable_tw.stb +++ b/src/bin/hamcore/strtable_tw.stb @@ -7180,7 +7180,6 @@ SW_DIR_DST_IS_SYSTEM_MODE 同樣的軟體已經在指定目錄中以系統模 SW_DIR_DST_IS_USER_MODE 同樣的軟體已經在指定目錄中以使用者模式安裝。\r\n\r\n請指定另外一個目錄。 SW_SYSTEM_MODE_ALREADY_INSTALLED 本軟體 "%s" 以系統模式被安裝在這台電腦上。\r\n\r\n同樣的軟體以使用者模式和系統模式安裝在同一台電腦上會發生衝突。\r\n\r\n您確定要以使用者模式繼續進行安裝？ -SW_NOT_INSTALL_SRC 安裝程式已在一個外部的安裝源執行。\r\n\r\n不能再繼續安裝。 SW_SETUPLOG_CORRUPTED "setuplog.dat" 檔已被破壞。 SW_MSI_UNINSTALL_FAILED 之前的版本 %s (產品號: "%S")已安裝。 Windows安裝工具移除舊版本失敗。\r\n\r\n請您手動移除並且重啟本安裝工具。 SW_MSI_UNINSTALL_REBOOT_REQUIRED Windows 安裝工具已經移除舊版本 %s。請重啟電腦。\r\n\r\n點擊結束按鈕並且手動重啟電腦，然後在電腦重啟後，重啟本安裝工具。 diff --git a/src/bin/install_src.dat b/src/bin/install_src.dat deleted file mode 100644 index 553c049f..00000000 --- a/src/bin/install_src.dat +++ /dev/null @@ -1 +0,0 @@ -TanakaJiro!!! \ No newline at end of file