rms/amneziawg-windows-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amneziawg-windows-client.git synced 2026-05-17 08:15:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from amnezia-vpn/master

Browse Source 
backport of unsafe rebranding code
This commit is contained in:
Roman Zakharchuk
2024-05-07 08:16:46 +02:00
committed by GitHub
parent 4d6ac50083 6376956676
commit fcd89ab88a
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
installer/customactions.c
View File

@@ -15,7 +15,7 @@
#include <tchar.h>
#define MANAGER_SERVICE_NAME TEXT("AmneziaWGManager")
#define TUNNEL_SERVICE_PREFIX TEXT("WireGuardTunnel$")
#define TUNNEL_SERVICE_PREFIX TEXT("AmneziaWGTunnel$")
enum log_level { LOG_LEVEL_INFO, LOG_LEVEL_WARN, LOG_LEVEL_ERR, LOG_LEVEL_MSIERR };
@@ -38,15 +38,15 @@ static void log_messagef(MSIHANDLE installer, enum log_level level, const TCHAR
switch (level) {
case LOG_LEVEL_INFO:
template = TEXT("WireGuard: [1]");
template = TEXT("AmneziaWG: [1]");
type = INSTALLMESSAGE_INFO;
break;
case LOG_LEVEL_WARN:
template = TEXT("WireGuard warning: [1]");
template = TEXT("AmneziaWG warning: [1]");
type = INSTALLMESSAGE_INFO;
break;
case LOG_LEVEL_ERR:
template = TEXT("WireGuard error: [1]");
template = TEXT("AmneziaWG error: [1]");
type = INSTALLMESSAGE_ERROR;
break;
case LOG_LEVEL_MSIERR:
@@ -259,7 +259,7 @@ __declspec(dllexport) UINT __stdcall LaunchApplicationAndAbort(MSIHANDLE install
if (!path[0] || !PathAppend(path, TEXT("amneziawg.exe")))
goto out;
log_messagef(installer, LOG_LEVEL_INFO, TEXT("Launching %1"), path);
if (!CreateProcess(path, TEXT("wireguard"), NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) {
if (!CreateProcess(path, TEXT("amneziawg"), NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) {
log_errorf(installer, LOG_LEVEL_WARN, GetLastError(), TEXT("Failed to create \"%1\" process"), path);
goto out;
}

2
installer/wireguard.wxs
View File

@@ -65,7 +65,7 @@
-->
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.PlatformProgramFilesFolder)">
<Directory Id="WireGuardFolder" Name="WireGuard" />
<Directory Id="WireGuardFolder" Name="AmneziaWG" />
</Directory>
<Directory Id="ProgramMenuFolder" />
</Directory>

2
manager/install.go
View File

@@ -165,7 +165,7 @@ func InstallTunnel(configPath string) error {
StartType: mgr.StartAutomatic,
ErrorControl: mgr.ErrorNormal,
Dependencies: []string{"Nsi", "TcpIp"},
DisplayName: "WireGuard Tunnel: " + name,
DisplayName: "AmneziaWG Tunnel: " + name,
SidType: windows.SERVICE_SID_TYPE_UNRESTRICTED,
}
service, err = m.CreateService(serviceName, path, config, "/tunnelservice", configPath)