From efe9ba18cae424568f67e7004ad986453f47b422 Mon Sep 17 00:00:00 2001
From: Kingtous <kingtous@qq.com>
Date: Sat, 21 Jan 2023 13:02:46 +0800
Subject: [PATCH 1/2] fix: --install cannot be invoke caused by singleton

---
 flutter/windows/runner/main.cpp | 49 ++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/flutter/windows/runner/main.cpp b/flutter/windows/runner/main.cpp
index d76b8c040..7437b0344 100644
--- a/flutter/windows/runner/main.cpp
+++ b/flutter/windows/runner/main.cpp
@@ -1,20 +1,21 @@
 #include <flutter/dart_project.h>
 #include <flutter/flutter_view_controller.h>
-#include <windows.h>
 #include <tchar.h>
+#include <uni_links_desktop/uni_links_desktop_plugin.h>
+#include <windows.h>
+
+#include <algorithm>
 #include <iostream>
 
 #include "flutter_window.h"
 #include "utils.h"
-// #include <bitsdojo_window_windows/bitsdojo_window_plugin.h>
-
-#include <uni_links_desktop/uni_links_desktop_plugin.h>
 
 typedef char** (*FUNC_RUSTDESK_CORE_MAIN)(int*);
 typedef void (*FUNC_RUSTDESK_FREE_ARGS)( char**, int);
 const char* uniLinksPrefix = "rustdesk://";
+/// Note: `--server`, `--service` are already handled in [core_main.rs].
+const std::vector<std::string> parameters_white_list = {"--install"};
 
-// auto bdw = bitsdojo_window_configure(BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP);
 int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
                       _In_ wchar_t *command_line, _In_ int show_command)
 {
@@ -40,6 +41,10 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
   }
   std::vector<std::string> command_line_arguments =
       GetCommandLineArguments();
+  // Remove possible trailing whitespace from command line arguments
+  for (auto& argument : command_line_arguments) {
+    argument.erase(argument.find_last_not_of(" \n\r\t"));
+  }
 
   int args_len = 0;
   char** c_args = rustdesk_core_main(&args_len);
@@ -51,21 +56,33 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
   std::vector<std::string> rust_args(c_args, c_args + args_len);
   free_c_args(c_args, args_len);
 
-  // uni links dispatch
+  // Uri links dispatch
   HWND hwnd = ::FindWindow(_T("FLUTTER_RUNNER_WIN32_WINDOW"), _T("RustDesk"));
   if (hwnd != NULL) {
-    if (!command_line_arguments.empty()) {
-      // Dispatch command line arguments
-      DispatchToUniLinksDesktop(hwnd);
-    } else {
-      // Not called with arguments, or just open the app shortcut on desktop. 
-      // So we just show the main window instead.
-      ::ShowWindow(hwnd, SW_NORMAL);
-      ::SetForegroundWindow(hwnd);
+    // Allow multiple flutter instances when being executed by parameters
+    // contained in whitelists.
+    bool allow_multiple_instances = false;
+    for (auto& whitelist_param : parameters_white_list) {
+      allow_multiple_instances =
+          allow_multiple_instances ||
+          std::find(command_line_arguments.begin(),
+                    command_line_arguments.end(),
+                    whitelist_param) != command_line_arguments.end();
+    }
+    if (!allow_multiple_instances) {
+      if (!command_line_arguments.empty()) {
+        // Dispatch command line arguments
+        DispatchToUniLinksDesktop(hwnd);
+      } else {
+        // Not called with arguments, or just open the app shortcut on desktop.
+        // So we just show the main window instead.
+        ::ShowWindow(hwnd, SW_NORMAL);
+        ::SetForegroundWindow(hwnd);
+      }
+      return EXIT_FAILURE;
     }
-    return EXIT_FAILURE;
   }
-  
+
   // Attach to console when present (e.g., 'flutter run') or create a
   // new console when running with a debugger.
   if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent())

From d493a6c27a026807fb1c674dde883a1fc33a12b3 Mon Sep 17 00:00:00 2001
From: Kingtous <kingtous@qq.com>
Date: Sat, 21 Jan 2023 13:16:07 +0800
Subject: [PATCH 2/2] opt: add --cm

---
 flutter/windows/runner/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flutter/windows/runner/main.cpp b/flutter/windows/runner/main.cpp
index 7437b0344..b7fa64dc0 100644
--- a/flutter/windows/runner/main.cpp
+++ b/flutter/windows/runner/main.cpp
@@ -14,7 +14,7 @@ typedef char** (*FUNC_RUSTDESK_CORE_MAIN)(int*);
 typedef void (*FUNC_RUSTDESK_FREE_ARGS)( char**, int);
 const char* uniLinksPrefix = "rustdesk://";
 /// Note: `--server`, `--service` are already handled in [core_main.rs].
-const std::vector<std::string> parameters_white_list = {"--install"};
+const std::vector<std::string> parameters_white_list = {"--install", "--cm"};
 
 int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
                       _In_ wchar_t *command_line, _In_ int show_command)