merge: 合并 dev 分支到 main 并保留本地重命名

This commit is contained in:
2025-11-24 01:02:00 -08:00
16 changed files with 1098 additions and 40 deletions
+5 -5
View File
@@ -89,13 +89,13 @@ BEGIN
BEGIN
BLOCK "040904e4"
BEGIN
VALUE "CompanyName", "BearVPN" "\0"
VALUE "FileDescription", "BearVPN" "\0"
VALUE "CompanyName", "HiFastVPN" "\0"
VALUE "FileDescription", "HiFastVPN" "\0"
VALUE "FileVersion", VERSION_AS_STRING "\0"
VALUE "InternalName", "app.baer.com" "\0"
VALUE "LegalCopyright", "Copyright (C) 2024 BearVPN. All rights reserved." "\0"
VALUE "OriginalFilename", "BearVPN.exe" "\0"
VALUE "ProductName", "BearVPN" "\0"
VALUE "LegalCopyright", "Copyright (C) 2024 HiFastVPN. All rights reserved." "\0"
VALUE "OriginalFilename", "HiFastVPN.exe" "\0"
VALUE "ProductName", "HiFastVPN" "\0"
VALUE "ProductVersion", VERSION_AS_STRING "\0"
END
END
+4 -4
View File
@@ -9,15 +9,15 @@
int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
_In_ wchar_t *command_line, _In_ int show_command) {
HANDLE hMutexInstance = CreateMutex(NULL, TRUE, L"BearVPNMutex");
HWND handle = FindWindowA(NULL, "BearVPN");
HANDLE hMutexInstance = CreateMutex(NULL, TRUE, L"HiFastVPNMutex");
HWND handle = FindWindowA(NULL, "HiFastVPN");
if (GetLastError() == ERROR_ALREADY_EXISTS) {
flutter::DartProject project(L"data");
std::vector<std::string> command_line_arguments = GetCommandLineArguments();
project.set_dart_entrypoint_arguments(std::move(command_line_arguments));
FlutterWindow window(project);
if (window.SendAppLinkToInstance(L"BearVPN")) {
if (window.SendAppLinkToInstance(L"HiFastVPN")) {
return false;
}
@@ -47,7 +47,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
FlutterWindow window(project);
Win32Window::Point origin(10, 10);
Win32Window::Size size(1280, 720);
if (!window.Create(L"BearVPN", origin, size)) {
if (!window.Create(L"HiFastVPN", origin, size)) {
return EXIT_FAILURE;
}
window.SetQuitOnClose(true);