AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 09:29:52 +03:00
Code Releases Activity

Cedar: remove all references to binaries with "_x64" and "_ia64" suffix

Browse Source 
BuildUtil compiles the project as 32 bit and 64 bit, before building the installer package.

64 bit binaries have the "_x64" suffix and are added to the package alongside the 32 bit ones (that have no suffix).

The CMake project compiles the binaries for a single architecture and they have no suffix.

We decided that providing two separate installers is the best solution.

As for the binaries with the "_ia64" suffix: they never existed during the this repository's lifespan.
This commit is contained in:
Davide Beatrici 2020-07-27 05:46:02 +02:00
parent 24d64222ea
commit a3eb115b0a
8 changed files with 34 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Cedar/CM.c
View File

@ -1286,7 +1286,7 @@ void *CmExecUiHelperMain()
HANDLE h; HANDLE h;
wchar_t tmp[MAX_SIZE]; wchar_t tmp[MAX_SIZE];
UniFormat(tmp, sizeof(tmp), L"%s\\%S", MsGetExeDirNameW(), CiGetVpnClientExeFileName()); UniFormat(tmp, sizeof(tmp), L"%s\\%S", MsGetExeDirNameW(), CLIENT_WIN32_EXE_FILENAME);
// Start // Start
h = Win32RunExW(tmp, SVC_ARG_UIHELP_W, false); h = Win32RunExW(tmp, SVC_ARG_UIHELP_W, false);

21
src/Cedar/Client.c
View File

@ -411,27 +411,6 @@ typedef struct CNC_CONNECT_ERROR_DLG_THREAD_PARAM
EVENT *Event; EVENT *Event;
} CNC_CONNECT_ERROR_DLG_THREAD_PARAM; } CNC_CONNECT_ERROR_DLG_THREAD_PARAM;
// Get the file name of vpnclient.exe in Win32
char *CiGetVpnClientExeFileName()
{
if (Is64() == false)
{
return CLIENT_WIN32_EXE_FILENAME;
}
else
{
if (IsX64())
{
return CLIENT_WIN32_EXE_FILENAME_X64;
}
else
{
return CLIENT_WIN32_EXE_FILENAME_IA64;
}
}
}
// Thread to stop forcibly the Certificate check dialog client // Thread to stop forcibly the Certificate check dialog client
void CncCheckCertHaltThread(THREAD *thread, void *param) void CncCheckCertHaltThread(THREAD *thread, void *param)
{ {

3
src/Cedar/Client.h
View File

@ -36,8 +36,6 @@
#define CLIENT_NOTIFY_SERVICE_INSTANCENAME GC_SW_SOFTETHER_PREFIX "vpnclient_uihelper" #define CLIENT_NOTIFY_SERVICE_INSTANCENAME GC_SW_SOFTETHER_PREFIX "vpnclient_uihelper"
#define CLIENT_WIN32_EXE_FILENAME "vpnclient.exe" #define CLIENT_WIN32_EXE_FILENAME "vpnclient.exe"
#define CLIENT_WIN32_EXE_FILENAME_X64 "vpnclient_x64.exe"
#define CLIENT_WIN32_EXE_FILENAME_IA64 "vpnclient_ia64.exe"
#define CLIENT_CUSTOM_INI_FILENAME "$custom.ini" #define CLIENT_CUSTOM_INI_FILENAME "$custom.ini"
@ -599,7 +597,6 @@ bool CtSetCommonProxySetting(CLIENT *c, INTERNET_SETTING *a);
// Internal function prototype // Internal function prototype
void CiSendGlobalPulse(CLIENT *c); void CiSendGlobalPulse(CLIENT *c);
void CiPulseRecvThread(THREAD *thread, void *param); void CiPulseRecvThread(THREAD *thread, void *param);
char *CiGetVpnClientExeFileName();
void CiServerThread(THREAD *t, void *param); void CiServerThread(THREAD *t, void *param);
void CiInitSaver(CLIENT *c); void CiInitSaver(CLIENT *c);
void CiFreeSaver(CLIENT *c); void CiFreeSaver(CLIENT *c);

37
src/Cedar/Command.c
View File

@ -886,7 +886,7 @@ void VpnCmdInitBootPath()
char tmp[MAX_PATH]; char tmp[MAX_PATH];
GetExeName(exe_path, sizeof(exe_path)); GetExeName(exe_path, sizeof(exe_path));
if (SearchStrEx(exe_path, "ham.exe", 0, false) != INFINITE || SearchStrEx(exe_path, "ham_x64.exe", 0, false) != INFINITE || SearchStrEx(exe_path, "ham_ia64.exe", 0, false) != INFINITE) if (SearchStrEx(exe_path, "ham.exe", 0, false) != INFINITE)
{ {
return; return;
} }
@ -901,7 +901,6 @@ void VpnCmdInitBootPath()
if ((CEDAR_VERSION_BUILD >= current_ver) || if ((CEDAR_VERSION_BUILD >= current_ver) ||
MsRegIsValue(REG_LOCAL_MACHINE, VPNCMD_BOOTSTRAP_REG_KEYNAME, VPNCMD_BOOTSTRAP_REG_VALUENAME_PATH) == false) MsRegIsValue(REG_LOCAL_MACHINE, VPNCMD_BOOTSTRAP_REG_KEYNAME, VPNCMD_BOOTSTRAP_REG_VALUENAME_PATH) == false)
{ {
char *src_filename;
bool b = false; bool b = false;
// Copy the vpncmdsys.exe to system32 // Copy the vpncmdsys.exe to system32
if (MsIsNt()) if (MsIsNt())
@ -913,49 +912,27 @@ void VpnCmdInitBootPath()
Format(tmp, sizeof(tmp), "%s\\vpncmd.exe", MsGetWindowsDir()); Format(tmp, sizeof(tmp), "%s\\vpncmd.exe", MsGetWindowsDir());
} }
src_filename = VPNCMD_BOOTSTRAP_FILENAME;
if (IsX64())
{
src_filename = VPNCMD_BOOTSTRAP_FILENAME_X64;
}
if (IsIA64())
{
src_filename = VPNCMD_BOOTSTRAP_FILENAME_IA64;
}
b = true;
if (MsIs64BitWindows() == false || Is64()) if (MsIs64BitWindows() == false || Is64())
{ {
if (IsFile(tmp) == false || (CEDAR_VERSION_BUILD > current_ver) || MsRegIsValue(REG_LOCAL_MACHINE, VPNCMD_BOOTSTRAP_REG_KEYNAME, VPNCMD_BOOTSTRAP_REG_VALUENAME_PATH) == false) if (IsFile(tmp) == false || (CEDAR_VERSION_BUILD > current_ver) || MsRegIsValue(REG_LOCAL_MACHINE, VPNCMD_BOOTSTRAP_REG_KEYNAME, VPNCMD_BOOTSTRAP_REG_VALUENAME_PATH) == false)
{ {
b = FileCopy(src_filename, tmp); b = FileCopy(VPNCMD_BOOTSTRAP_FILENAME, tmp);
} }
} }
else else
{ {
void *wow; void *wow = MsDisableWow64FileSystemRedirection();
wow = MsDisableWow64FileSystemRedirection(); if (IsFile(tmp) == false || (CEDAR_VERSION_BUILD > current_ver) || MsRegIsValue(REG_LOCAL_MACHINE, VPNCMD_BOOTSTRAP_REG_KEYNAME, VPNCMD_BOOTSTRAP_REG_VALUENAME_PATH) == false)
if (true)
{ {
if (IsFile(tmp) == false || (CEDAR_VERSION_BUILD > current_ver) || MsRegIsValue(REG_LOCAL_MACHINE, VPNCMD_BOOTSTRAP_REG_KEYNAME, VPNCMD_BOOTSTRAP_REG_VALUENAME_PATH) == false) b = FileCopy(VPNCMD_BOOTSTRAP_FILENAME, tmp);
{
b = FileCopy(src_filename, tmp);
}
} }
MsRestoreWow64FileSystemRedirection(wow); MsRestoreWow64FileSystemRedirection(wow);
if (true) if (IsFile(tmp) == false || (CEDAR_VERSION_BUILD > current_ver) || MsRegIsValue(REG_LOCAL_MACHINE, VPNCMD_BOOTSTRAP_REG_KEYNAME, VPNCMD_BOOTSTRAP_REG_VALUENAME_PATH) == false)
{ {
if (IsFile(tmp) == false || (CEDAR_VERSION_BUILD > current_ver) || MsRegIsValue(REG_LOCAL_MACHINE, VPNCMD_BOOTSTRAP_REG_KEYNAME, VPNCMD_BOOTSTRAP_REG_VALUENAME_PATH) == false) b = FileCopy(VPNCMD_BOOTSTRAP_FILENAME, tmp);
{
b = FileCopy(src_filename, tmp);
}
} }
} }

2
src/Cedar/Command.h
View File

@ -25,8 +25,6 @@
#define VPNCMD_BOOTSTRAP_REG_VALUENAME_VER "InstalledVersion" #define VPNCMD_BOOTSTRAP_REG_VALUENAME_VER "InstalledVersion"
#define VPNCMD_BOOTSTRAP_REG_VALUENAME_PATH "InstalledPath" #define VPNCMD_BOOTSTRAP_REG_VALUENAME_PATH "InstalledPath"
#define VPNCMD_BOOTSTRAP_FILENAME "|vpncmdsys.exe" #define VPNCMD_BOOTSTRAP_FILENAME "|vpncmdsys.exe"
#define VPNCMD_BOOTSTRAP_FILENAME_X64 "|vpncmdsys_x64.exe"
#define VPNCMD_BOOTSTRAP_FILENAME_IA64 "|vpncmdsys_ia64.exe"
// Traffic test results // Traffic test results

15
src/Cedar/SM.c
View File

@ -20028,26 +20028,17 @@ void SmInitDefaultSettingList()
{ {
MS_PROCESS *p = LIST_DATA(pl, i); MS_PROCESS *p = LIST_DATA(pl, i);
if (UniInStr(p->ExeFilenameW, L"vpnserver.exe") || UniInStr(p->ExeFilenameW, L"vpnserver_x64.exe") || if (UniInStr(p->ExeFilenameW, L"vpnserver.exe") || UniInStr(p->ExeFilenameW, L"vpnbridge.exe"))
UniInStr(p->ExeFilenameW, L"vpnserver_ia64.exe") ||
UniInStr(p->ExeFilenameW, L"vpnbridge.exe") || UniInStr(p->ExeFilenameW, L"vpnbridge_x64.exe") ||
UniInStr(p->ExeFilenameW, L"vpnbridge_ia64.exe"))
{ {
b = true; b = true;
} }
if (UniInStr(p->ExeFilenameW, L"sevpnserver.exe") || UniInStr(p->ExeFilenameW, L"sevpnserver_x64.exe") || if (UniInStr(p->ExeFilenameW, L"sevpnserver.exe") || UniInStr(p->ExeFilenameW, L"sevpnbridge.exe"))
UniInStr(p->ExeFilenameW, L"sevpnserver_ia64.exe") ||
UniInStr(p->ExeFilenameW, L"sevpnbridge.exe") || UniInStr(p->ExeFilenameW, L"sevpnbridge_x64.exe") ||
UniInStr(p->ExeFilenameW, L"sevpnbridge_ia64.exe"))
{ {
b = true; b = true;
} }
if (UniInStr(p->ExeFilenameW, L"utvpnserver.exe") || UniInStr(p->ExeFilenameW, L"utvpnserver_x64.exe") || if (UniInStr(p->ExeFilenameW, L"utvpnserver.exe") || UniInStr(p->ExeFilenameW, L"utvpnbridge.exe"))
UniInStr(p->ExeFilenameW, L"utvpnserver_ia64.exe") ||
UniInStr(p->ExeFilenameW, L"utvpnbridge.exe") || UniInStr(p->ExeFilenameW, L"utvpnbridge_x64.exe") ||
UniInStr(p->ExeFilenameW, L"utvpnbridge_ia64.exe"))
{ {
b = true; b = true;
} }

131
src/Cedar/SW.c
View File

@ -60,27 +60,18 @@ static SW_OLD_MSI old_msi_vpnbridge[] =
static char *sfx_vpn_server_bridge_files[] = static char *sfx_vpn_server_bridge_files[] =
{ {
"vpnsetup.exe", "vpnsetup.exe",
"vpnsetup_x64.exe",
"vpnserver.exe", "vpnserver.exe",
"vpnserver_x64.exe",
"vpnbridge.exe", "vpnbridge.exe",
"vpnbridge_x64.exe",
"vpnsmgr.exe", "vpnsmgr.exe",
"vpnsmgr_x64.exe",
"vpncmd.exe", "vpncmd.exe",
"vpncmd_x64.exe",
"hamcore.se2", "hamcore.se2",
}; };
static char *sfx_vpn_client_files[] = static char *sfx_vpn_client_files[] =
{ {
"vpnsetup.exe", "vpnsetup.exe",
"vpnsetup_x64.exe",
"vpnclient.exe", "vpnclient.exe",
"vpnclient_x64.exe",
"vpncmgr.exe", "vpncmgr.exe",
"vpncmgr_x64.exe",
"vpncmd.exe", "vpncmd.exe",
"vpncmd_x64.exe",
"vpninstall.exe", "vpninstall.exe",
"vpnweb.cab", "vpnweb.cab",
"hamcore.se2", "hamcore.se2",
@ -1971,7 +1962,6 @@ void SwDeleteShortcuts(SW_LOGFILE *logfile)
// Uninstall main // Uninstall main
bool SwUninstallMain(SW *sw, WIZARD_PAGE *wp, SW_COMPONENT *c) bool SwUninstallMain(SW *sw, WIZARD_PAGE *wp, SW_COMPONENT *c)
{ {
bool x64 = MsIs64BitWindows();
bool ok; bool ok;
wchar_t tmp[MAX_SIZE]; wchar_t tmp[MAX_SIZE];
UINT i; UINT i;
@ -2347,7 +2337,6 @@ LABEL_CLEANUP:
void SwDefineTasks(SW *sw, SW_TASK *t, SW_COMPONENT *c) void SwDefineTasks(SW *sw, SW_TASK *t, SW_COMPONENT *c)
{ {
wchar_t tmp[MAX_SIZE]; wchar_t tmp[MAX_SIZE];
bool x64 = MsIs64BitWindows();
wchar_t src_setup_exe_fullpath[MAX_PATH]; wchar_t src_setup_exe_fullpath[MAX_PATH];
wchar_t src_setup_exe_dir[MAX_PATH]; wchar_t src_setup_exe_dir[MAX_PATH];
wchar_t src_setup_exe_filename[MAX_PATH]; wchar_t src_setup_exe_filename[MAX_PATH];
@ -2361,7 +2350,6 @@ void SwDefineTasks(SW *sw, SW_TASK *t, SW_COMPONENT *c)
wchar_t dir_startup[MAX_PATH]; wchar_t dir_startup[MAX_PATH];
wchar_t tmp1[MAX_SIZE], tmp2[MAX_SIZE]; wchar_t tmp1[MAX_SIZE], tmp2[MAX_SIZE];
SW_TASK_COPY *setup_exe; SW_TASK_COPY *setup_exe;
SW_TASK_COPY *setup_exe_x64;
// Validate arguments // Validate arguments
if (sw == NULL || t == NULL || c == NULL) if (sw == NULL || t == NULL || c == NULL)
{ {
@ -2400,10 +2388,6 @@ void SwDefineTasks(SW *sw, SW_TASK *t, SW_COMPONENT *c)
Add(t->CopyTasks, (setup_exe = SwNewCopyTask(src_setup_exe_filename, Add(t->CopyTasks, (setup_exe = SwNewCopyTask(src_setup_exe_filename,
L"vpnsetup.exe", src_setup_exe_dir, sw->InstallDir, true, true))); L"vpnsetup.exe", src_setup_exe_dir, sw->InstallDir, true, true)));
// Add vpnsetup_x64.exe to the copy list
Add(t->CopyTasks, (setup_exe_x64 = SwNewCopyTask(L"vpnsetup_x64.exe",
L"vpnsetup_x64.exe", src_setup_exe_dir, sw->InstallDir, true, true)));
// Generate the file processing list for each component // Generate the file processing list for each component
if (c->Id == SW_CMP_VPN_SERVER) if (c->Id == SW_CMP_VPN_SERVER)
{ {
@ -2414,18 +2398,9 @@ void SwDefineTasks(SW *sw, SW_TASK *t, SW_COMPONENT *c)
CombinePathW(tmp, sizeof(tmp), sw->InstallDir, L"backup.vpn_server.config"); CombinePathW(tmp, sizeof(tmp), sw->InstallDir, L"backup.vpn_server.config");
Add(t->SetSecurityPaths, CopyUniStr(tmp)); Add(t->SetSecurityPaths, CopyUniStr(tmp));
if (x64 == false) vpnserver = SwNewCopyTask(L"vpnserver.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
{ vpncmd = SwNewCopyTask(L"vpncmd.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpnserver = SwNewCopyTask(L"vpnserver.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false); vpnsmgr = SwNewCopyTask(L"vpnsmgr.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmd = SwNewCopyTask(L"vpncmd.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpnsmgr = SwNewCopyTask(L"vpnsmgr.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
}
else
{
vpnserver = SwNewCopyTask(L"vpnserver_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmd = SwNewCopyTask(L"vpncmd_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpnsmgr = SwNewCopyTask(L"vpnsmgr_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
}
Add(t->CopyTasks, vpnserver); Add(t->CopyTasks, vpnserver);
Add(t->CopyTasks, vpncmd); Add(t->CopyTasks, vpncmd);
@ -2494,18 +2469,9 @@ void SwDefineTasks(SW *sw, SW_TASK *t, SW_COMPONENT *c)
CombinePathW(tmp, sizeof(tmp), sw->InstallDir, L"backup.vpn_bridge.config"); CombinePathW(tmp, sizeof(tmp), sw->InstallDir, L"backup.vpn_bridge.config");
Add(t->SetSecurityPaths, CopyUniStr(tmp)); Add(t->SetSecurityPaths, CopyUniStr(tmp));
if (x64 == false) vpnbridge = SwNewCopyTask(L"vpnbridge.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
{ vpncmd = SwNewCopyTask(L"vpncmd.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpnbridge = SwNewCopyTask(L"vpnbridge.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false); vpnsmgr = SwNewCopyTask(L"vpnsmgr.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmd = SwNewCopyTask(L"vpncmd.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpnsmgr = SwNewCopyTask(L"vpnsmgr.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
}
else
{
vpnbridge = SwNewCopyTask(L"vpnbridge_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmd = SwNewCopyTask(L"vpncmd_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpnsmgr = SwNewCopyTask(L"vpnsmgr_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
}
Add(t->CopyTasks, vpnbridge); Add(t->CopyTasks, vpnbridge);
Add(t->CopyTasks, vpncmd); Add(t->CopyTasks, vpncmd);
@ -2570,7 +2536,6 @@ void SwDefineTasks(SW *sw, SW_TASK *t, SW_COMPONENT *c)
// VPN Client // VPN Client
SW_TASK_COPY *ct; SW_TASK_COPY *ct;
SW_TASK_COPY *vpnclient, *vpncmd, *vpncmgr; SW_TASK_COPY *vpnclient, *vpncmd, *vpncmgr;
SW_TASK_COPY *vpnclient_gomi, *vpncmd_gomi, *vpncmgr_gomi;
SW_TASK_COPY *sfx_cache = NULL; SW_TASK_COPY *sfx_cache = NULL;
SW_TASK_COPY *vpnweb; SW_TASK_COPY *vpnweb;
SW_TASK_COPY *vpninstall; SW_TASK_COPY *vpninstall;
@ -2579,24 +2544,9 @@ void SwDefineTasks(SW *sw, SW_TASK *t, SW_COMPONENT *c)
CombinePathW(tmp, sizeof(tmp), sw->InstallDir, L"backup.vpn_client.config"); CombinePathW(tmp, sizeof(tmp), sw->InstallDir, L"backup.vpn_client.config");
Add(t->SetSecurityPaths, CopyUniStr(tmp)); Add(t->SetSecurityPaths, CopyUniStr(tmp));
if (x64 == false) vpnclient = SwNewCopyTask(L"vpnclient.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
{ vpncmd = SwNewCopyTask(L"vpncmd.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpnclient = SwNewCopyTask(L"vpnclient.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false); vpncmgr = SwNewCopyTask(L"vpncmgr.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmd = SwNewCopyTask(L"vpncmd.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmgr = SwNewCopyTask(L"vpncmgr.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpnclient_gomi = SwNewCopyTask(L"vpnclient_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmd_gomi = SwNewCopyTask(L"vpncmd_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmgr_gomi = SwNewCopyTask(L"vpncmgr_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
}
else
{
vpnclient = SwNewCopyTask(L"vpnclient_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmd = SwNewCopyTask(L"vpncmd_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmgr = SwNewCopyTask(L"vpncmgr_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpnclient_gomi = SwNewCopyTask(L"vpnclient.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmd_gomi = SwNewCopyTask(L"vpncmd.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmgr_gomi = SwNewCopyTask(L"vpncmgr.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
}
if (vpncmgr != NULL) if (vpncmgr != NULL)
{ {
@ -2625,9 +2575,6 @@ void SwDefineTasks(SW *sw, SW_TASK *t, SW_COMPONENT *c)
Add(t->CopyTasks, vpnclient); Add(t->CopyTasks, vpnclient);
Add(t->CopyTasks, vpncmd); Add(t->CopyTasks, vpncmd);
Add(t->CopyTasks, vpncmgr); Add(t->CopyTasks, vpncmgr);
Add(t->CopyTasks, vpnclient_gomi);
Add(t->CopyTasks, vpncmd_gomi);
Add(t->CopyTasks, vpncmgr_gomi);
Add(t->CopyTasks, vpnweb); Add(t->CopyTasks, vpnweb);
Add(t->CopyTasks, vpninstall); Add(t->CopyTasks, vpninstall);
@ -2711,16 +2658,8 @@ void SwDefineTasks(SW *sw, SW_TASK *t, SW_COMPONENT *c)
// VPN Server Manager (Tools Only) // VPN Server Manager (Tools Only)
SW_TASK_COPY *vpncmd, *vpnsmgr; SW_TASK_COPY *vpncmd, *vpnsmgr;
if (x64 == false) vpncmd = SwNewCopyTask(L"vpncmd.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
{ vpnsmgr = SwNewCopyTask(L"vpnsmgr.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmd = SwNewCopyTask(L"vpncmd.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpnsmgr = SwNewCopyTask(L"vpnsmgr.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
}
else
{
vpncmd = SwNewCopyTask(L"vpncmd_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpnsmgr = SwNewCopyTask(L"vpnsmgr_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
}
Add(t->CopyTasks, vpncmd); Add(t->CopyTasks, vpncmd);
Add(t->CopyTasks, vpnsmgr); Add(t->CopyTasks, vpnsmgr);
@ -2747,16 +2686,8 @@ void SwDefineTasks(SW *sw, SW_TASK *t, SW_COMPONENT *c)
// VPN Client Manager (Tools Only) // VPN Client Manager (Tools Only)
SW_TASK_COPY *vpncmd, *vpncmgr; SW_TASK_COPY *vpncmd, *vpncmgr;
if (x64 == false) vpncmd = SwNewCopyTask(L"vpncmd.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
{ vpncmgr = SwNewCopyTask(L"vpncmgr.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmd = SwNewCopyTask(L"vpncmd.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmgr = SwNewCopyTask(L"vpncmgr.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
}
else
{
vpncmd = SwNewCopyTask(L"vpncmd_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
vpncmgr = SwNewCopyTask(L"vpncmgr_x64.exe", NULL, sw->InstallSrc, sw->InstallDir, true, false);
}
Add(t->CopyTasks, vpncmd); Add(t->CopyTasks, vpncmd);
Add(t->CopyTasks, vpncmgr); Add(t->CopyTasks, vpncmgr);
@ -3042,7 +2973,6 @@ bool SwInstallMain(SW *sw, WIZARD_PAGE *wp, SW_COMPONENT *c)
UINT i; UINT i;
wchar_t tmp[MAX_SIZE * 2]; wchar_t tmp[MAX_SIZE * 2];
bool ok; bool ok;
bool x64 = MsIs64BitWindows();
// Validate arguments // Validate arguments
if (sw == NULL || wp == NULL || c == NULL) if (sw == NULL || wp == NULL || c == NULL)
{ {
@ -3098,7 +3028,7 @@ bool SwInstallMain(SW *sw, WIZARD_PAGE *wp, SW_COMPONENT *c)
void *proc_handle = NULL; void *proc_handle = NULL;
wchar_t exe[MAX_PATH]; wchar_t exe[MAX_PATH];
CombinePathW(exe, sizeof(exe), MsGetExeDirNameW(), L"vpnsetup_x64.exe"); CombinePathW(exe, sizeof(exe), MsGetExeDirNameW(), L"vpnsetup.exe");
if (MsExecuteEx2W(exe, L"/SUINSTMODE:yes", &proc_handle, true)) if (MsExecuteEx2W(exe, L"/SUINSTMODE:yes", &proc_handle, true))
{ {
@ -3669,7 +3599,7 @@ LABEL_CREATE_SHORTCUT:
// Run the vpncmd and exit immediately // Run the vpncmd and exit immediately
wchar_t fullpath[MAX_PATH]; wchar_t fullpath[MAX_PATH];
ConbinePathW(fullpath, sizeof(fullpath), sw->InstallDir, (MsIsX64() ? L"vpncmd_x64.exe" : L"vpncmd.exe")); ConbinePathW(fullpath, sizeof(fullpath), sw->InstallDir, (L"vpncmd.exe"));
RunW(fullpath, L"/?", true, false); RunW(fullpath, L"/?", true, false);
} }
@ -6103,49 +6033,34 @@ void SwDefineComponents(SW *sw)
char *vpn_server_files[] = char *vpn_server_files[] =
{ {
"vpnserver.exe", "vpnserver.exe",
"vpnserver_x64.exe",
"vpnsmgr.exe", "vpnsmgr.exe",
"vpnsmgr_x64.exe",
"vpncmd.exe", "vpncmd.exe",
"vpncmd_x64.exe",
"hamcore.se2", "hamcore.se2",
}; };
char *vpn_client_files[] = char *vpn_client_files[] =
{ {
"vpnclient.exe", "vpnclient.exe",
"vpnclient_x64.exe",
"vpncmgr.exe", "vpncmgr.exe",
"vpncmgr_x64.exe",
"vpncmd.exe", "vpncmd.exe",
"vpncmd_x64.exe",
"hamcore.se2", "hamcore.se2",
"vpninstall.exe",
"vpnweb.cab",
}; };
char *vpn_bridge_files[] = char *vpn_bridge_files[] =
{ {
"vpnbridge.exe", "vpnbridge.exe",
"vpnbridge_x64.exe",
"vpnsmgr.exe", "vpnsmgr.exe",
"vpnsmgr_x64.exe",
"vpncmd.exe", "vpncmd.exe",
"vpncmd_x64.exe",
"hamcore.se2", "hamcore.se2",
}; };
char *vpn_smgr_files[] = char *vpn_smgr_files[] =
{ {
"vpnsmgr.exe", "vpnsmgr.exe",
"vpnsmgr_x64.exe",
"vpncmd.exe", "vpncmd.exe",
"vpncmd_x64.exe",
"hamcore.se2", "hamcore.se2",
}; };
char *vpn_cmgr_files[] = char *vpn_cmgr_files[] =
{ {
"vpncmgr.exe", "vpncmgr.exe",
"vpncmgr_x64.exe",
"vpncmd.exe", "vpncmd.exe",
"vpncmd_x64.exe",
"hamcore.se2", "hamcore.se2",
}; };
// Validate arguments // Validate arguments
@ -6155,16 +6070,16 @@ void SwDefineComponents(SW *sw)
} }
// VPN Server // VPN Server
c = SwNewComponent(SW_NAME_VPNSERVER, GC_SVC_NAME_VPNSERVER, SW_CMP_VPN_SERVER, ICO_VPNSERVER, 5, (MsIsX64() ? L"vpnserver_x64.exe" : L"vpnserver.exe"), c = SwNewComponent(SW_NAME_VPNSERVER, GC_SVC_NAME_VPNSERVER, SW_CMP_VPN_SERVER, ICO_VPNSERVER, 5, L"vpnserver.exe",
SW_LONG_VPNSERVER, false, sizeof(vpn_server_files) / sizeof(char *), vpn_server_files, SW_LONG_VPNSERVER, false, sizeof(vpn_server_files) / sizeof(char *), vpn_server_files,
(MsIsX64() ? L"vpnsmgr_x64.exe" : L"vpnsmgr.exe"), _UU("SW_RUN_TEXT_VPNSMGR"), L"vpnsmgr.exe", _UU("SW_RUN_TEXT_VPNSMGR"),
old_msi_vpnserver, sizeof(old_msi_vpnserver) / sizeof(SW_OLD_MSI)); old_msi_vpnserver, sizeof(old_msi_vpnserver) / sizeof(SW_OLD_MSI));
Add(sw->ComponentList, c); Add(sw->ComponentList, c);
// VPN Client // VPN Client
c = SwNewComponent(SW_NAME_VPNCLIENT, GC_SVC_NAME_VPNCLIENT, SW_CMP_VPN_CLIENT, ICO_VPN, 6, (MsIsX64() ? L"vpnclient_x64.exe" : L"vpnclient.exe"), c = SwNewComponent(SW_NAME_VPNCLIENT, GC_SVC_NAME_VPNCLIENT, SW_CMP_VPN_CLIENT, ICO_VPN, 6, L"vpnclient.exe",
SW_LONG_VPNCLIENT, true, sizeof(vpn_client_files) / sizeof(char *), vpn_client_files, SW_LONG_VPNCLIENT, true, sizeof(vpn_client_files) / sizeof(char *), vpn_client_files,
(MsIsX64() ? L"vpncmgr_x64.exe" : L"vpncmgr.exe"), _UU("SW_RUN_TEXT_VPNCMGR"), L"vpncmgr.exe", _UU("SW_RUN_TEXT_VPNCMGR"),
old_msi_vpnclient, sizeof(old_msi_vpnclient) / sizeof(SW_OLD_MSI)); old_msi_vpnclient, sizeof(old_msi_vpnclient) / sizeof(SW_OLD_MSI));
#ifdef GC_ENABLE_VPNGATE #ifdef GC_ENABLE_VPNGATE
@ -6173,23 +6088,23 @@ void SwDefineComponents(SW *sw)
Add(sw->ComponentList, c); Add(sw->ComponentList, c);
// VPN Bridge // VPN Bridge
c = SwNewComponent(SW_NAME_VPNBRIDGE, GC_SVC_NAME_VPNBRIDGE, SW_CMP_VPN_BRIDGE, ICO_CASCADE, 7, (MsIsX64() ? L"vpnbridge_x64.exe" : L"vpnbridge.exe"), c = SwNewComponent(SW_NAME_VPNBRIDGE, GC_SVC_NAME_VPNBRIDGE, SW_CMP_VPN_BRIDGE, ICO_CASCADE, 7, L"vpnbridge.exe",
SW_LONG_VPNBRIDGE, false, sizeof(vpn_bridge_files) / sizeof(char *), vpn_bridge_files, SW_LONG_VPNBRIDGE, false, sizeof(vpn_bridge_files) / sizeof(char *), vpn_bridge_files,
(MsIsX64() ? L"vpnsmgr_x64.exe" : L"vpnsmgr.exe"), _UU("SW_RUN_TEXT_VPNSMGR"), L"vpnsmgr.exe", _UU("SW_RUN_TEXT_VPNSMGR"),
old_msi_vpnbridge, sizeof(old_msi_vpnbridge) / sizeof(SW_OLD_MSI)); old_msi_vpnbridge, sizeof(old_msi_vpnbridge) / sizeof(SW_OLD_MSI));
Add(sw->ComponentList, c); Add(sw->ComponentList, c);
// VPN Server Manager (Tools Only) // VPN Server Manager (Tools Only)
c = SwNewComponent(SW_NAME_VPNSMGR, NULL, SW_CMP_VPN_SMGR, ICO_USER_ADMIN, 8, NULL, c = SwNewComponent(SW_NAME_VPNSMGR, NULL, SW_CMP_VPN_SMGR, ICO_USER_ADMIN, 8, NULL,
SW_LONG_VPNSMGR, false, sizeof(vpn_smgr_files) / sizeof(char *), vpn_smgr_files, SW_LONG_VPNSMGR, false, sizeof(vpn_smgr_files) / sizeof(char *), vpn_smgr_files,
(MsIsX64() ? L"vpnsmgr_x64.exe" : L"vpnsmgr.exe"), _UU("SW_RUN_TEXT_VPNSMGR"), L"vpnsmgr.exe", _UU("SW_RUN_TEXT_VPNSMGR"),
NULL, 0); NULL, 0);
Add(sw->ComponentList, c); Add(sw->ComponentList, c);
// VPN Client Manager (Tools Only) // VPN Client Manager (Tools Only)
c = SwNewComponent(SW_NAME_VPNCMGR, NULL, SW_CMP_VPN_CMGR, ICO_INTERNET, 9, NULL, c = SwNewComponent(SW_NAME_VPNCMGR, NULL, SW_CMP_VPN_CMGR, ICO_INTERNET, 9, NULL,
SW_LONG_VPNCMGR, false, sizeof(vpn_cmgr_files) / sizeof(char *), vpn_cmgr_files, SW_LONG_VPNCMGR, false, sizeof(vpn_cmgr_files) / sizeof(char *), vpn_cmgr_files,
(MsIsX64() ? L"vpncmgr_x64.exe /remote" : L"vpncmgr.exe /remote"), _UU("SW_RUN_TEXT_VPNCMGR"), L"vpncmgr.exe /remote", _UU("SW_RUN_TEXT_VPNCMGR"),
NULL, 0); NULL, 0);
Add(sw->ComponentList, c); Add(sw->ComponentList, c);
} }

13
src/Cedar/WinUi.c
View File

@ -1842,25 +1842,12 @@ void RegistWindowsFirewallAll()
void RegistWindowsFirewallAllEx(char *dir) void RegistWindowsFirewallAllEx(char *dir)
{ {
MsRegistWindowsFirewallEx2(CEDAR_CLIENT_STR, "vpnclient.exe", dir); MsRegistWindowsFirewallEx2(CEDAR_CLIENT_STR, "vpnclient.exe", dir);
MsRegistWindowsFirewallEx2(CEDAR_CLIENT_STR, "vpnclient_x64.exe", dir);
MsRegistWindowsFirewallEx2(CEDAR_CLIENT_MANAGER_STR, "vpncmgr.exe", dir); MsRegistWindowsFirewallEx2(CEDAR_CLIENT_MANAGER_STR, "vpncmgr.exe", dir);
MsRegistWindowsFirewallEx2(CEDAR_CLIENT_MANAGER_STR, "vpncmgr_x64.exe", dir);
MsRegistWindowsFirewallEx2(CEDAR_MANAGER_STR, "vpnsmgr.exe", dir); MsRegistWindowsFirewallEx2(CEDAR_MANAGER_STR, "vpnsmgr.exe", dir);
MsRegistWindowsFirewallEx2(CEDAR_MANAGER_STR, "vpnsmgr_x64.exe", dir);
MsRegistWindowsFirewallEx2(CEDAR_SERVER_STR, "vpnserver.exe", dir); MsRegistWindowsFirewallEx2(CEDAR_SERVER_STR, "vpnserver.exe", dir);
MsRegistWindowsFirewallEx2(CEDAR_SERVER_STR, "vpnserver_x64.exe", dir);
MsRegistWindowsFirewallEx2(CEDAR_BRIDGE_STR, "vpnbridge.exe", dir); MsRegistWindowsFirewallEx2(CEDAR_BRIDGE_STR, "vpnbridge.exe", dir);
MsRegistWindowsFirewallEx2(CEDAR_BRIDGE_STR, "vpnbridge_x64.exe", dir);
MsRegistWindowsFirewallEx2(CEDAR_CUI_STR, "vpncmd.exe", dir); MsRegistWindowsFirewallEx2(CEDAR_CUI_STR, "vpncmd.exe", dir);
MsRegistWindowsFirewallEx2(CEDAR_CUI_STR, "vpncmd_x64.exe", dir);
MsRegistWindowsFirewallEx2(CEDAR_PRODUCT_STR, "vpntest.exe", dir); MsRegistWindowsFirewallEx2(CEDAR_PRODUCT_STR, "vpntest.exe", dir);
MsRegistWindowsFirewallEx2(CEDAR_PRODUCT_STR, "vpntest_x64.exe", dir);
} }
// Check whether the notification service is already running // Check whether the notification service is already running