Feat/topmost window exclude from capture

build.py

@@ -57,9 +57,9 @@ def parse_rc_features(feature):
         },
         'PrivacyMode': {
             'platform': ['windows'],
-            'zip_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.2'
-                       '/TempTopMostWindow_x64_pic_en.zip',
-            'checksum_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.2/checksum_md5',
+            'zip_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.3'
+                       '/TempTopMostWindow_x64.zip',
+            'checksum_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.3/checksum_md5',
             'include': ['WindowInjection.dll'],
         }
     }

libs/portable/src/main.rs

@@ -94,11 +94,11 @@ mod windows {
 
     // Used for privacy mode(magnifier impl).
     pub const RUNTIME_BROKER_EXE: &'static str = "C:\\Windows\\System32\\RuntimeBroker.exe";
-    pub const WIN_MAG_INJECTED_PROCESS_EXE: &'static str = "RuntimeBroker_rustdesk.exe";
+    pub const WIN_TOPMOST_INJECTED_PROCESS_EXE: &'static str = "RuntimeBroker_rustdesk.exe";
 
     pub(super) fn copy_runtime_broker(dir: &PathBuf) {
         let src = RUNTIME_BROKER_EXE;
-        let tgt = WIN_MAG_INJECTED_PROCESS_EXE;
+        let tgt = WIN_TOPMOST_INJECTED_PROCESS_EXE;
         let target_file = dir.join(tgt);
         if target_file.exists() {
             if let (Ok(src_file), Ok(tgt_file)) = (fs::read(src), fs::read(&target_file)) {

src/lang/cn.rs

@@ -568,8 +568,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("True color (4:4:4)", "真彩模式（4:4:4）"),
         ("Enable blocking user input", "允许阻止用户输入"),
         ("id_input_tip", ""),
-        ("privacy_mode_impl_mag_tip", "模式 1 (不推荐)"),
-        ("privacy_mode_impl_virtual_display_tip", "模式 2 (推荐)"),
+        ("privacy_mode_impl_mag_tip", "模式 1"),
+        ("privacy_mode_impl_virtual_display_tip", "模式 2"),
         ("Enter privacy mode", "进入隐私模式"),
         ("Exit privacy mode", "退出隐私模式"),
     ].iter().cloned().collect();

src/lang/en.rs

@@ -203,7 +203,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("elevated_switch_display_msg", "Switch to the primary display because multiple displays are not supported in elevated mode."),
         ("selinux_tip", "SELinux is enabled on your device, which may prevent RustDesk from running properly as controlled side."),
         ("id_input_tip", "You can input an ID, a direct IP, or a domain with a port (<domain>:<port>).\nIf you want to access a device on another server, please append the server address (<id>@<server_address>?key=<key_value>), for example,\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nIf you want to access a device on a public server, please input \"<id>@public\", the key is not needed for public server"),
-        ("privacy_mode_impl_mag_tip", "Mode 1 (deprecated)"),
-        ("privacy_mode_impl_virtual_display_tip", "Mode 2 (recommended)"),
+        ("privacy_mode_impl_mag_tip", "Mode 1"),
+        ("privacy_mode_impl_virtual_display_tip", "Mode 2"),
     ].iter().cloned().collect();
 }

src/lang/es.rs

@@ -568,8 +568,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("True color (4:4:4)", "Color real (4:4:4)"),
         ("Enable blocking user input", "Habilitar el bloqueo de la entrada del usuario"),
         ("id_input_tip", "Puedes introducir una ID, una IP directa o un dominio con un puerto (<dominio>:<puerto>).\nSi quieres acceder a un dispositivo en otro servidor, por favor añade la ip del servidor (<id>@<dirección_servidor>?key=<clave_valor>), por ejemplo,\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nSi quieres acceder a un dispositivo en un servidor público, por favor, introduce \"<id>@public\", la clave no es necesaria para un servidor público."),
-        ("privacy_mode_impl_mag_tip", "Modo 1 (obsoleto)"),
-        ("privacy_mode_impl_virtual_display_tip", "Modo 2 (recomendado)"),
+        ("privacy_mode_impl_mag_tip", "Modo 1"),
+        ("privacy_mode_impl_virtual_display_tip", "Modo 2"),
         ("Enter privacy mode", "Entrar al modo privado"),
         ("Exit privacy mode", "Salir del modo privado"),
     ].iter().cloned().collect();

src/lang/id.rs

@@ -568,8 +568,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("True color (4:4:4)", ""),
         ("Enable blocking user input", "Aktifkan pemblokiran input pengguna"),
         ("id_input_tip", "Anda bisa memasukkan ID, IP langsung, atau domain dengan port kostum yang sudah ditentukan (<domain>:<port>).\nJika anda ingin mengakses perangkat lain yang berbeda server, tambahkan alamat server setelah penulisan ID(<id>@<server_address>?key=<key_value>), sebagai contoh,\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nJika anda ingin mengakses perangkat yang menggunakan server publik, masukkan \"<id>@public\", server public tidak memerlukan key khusus"),
-        ("privacy_mode_impl_mag_tip", "Mode 1 (deprecated)"),
-        ("privacy_mode_impl_virtual_display_tip", "Mode 2 (direkomendasikan)"),
+        ("privacy_mode_impl_mag_tip", "Mode 1"),
+        ("privacy_mode_impl_virtual_display_tip", "Mode 2"),
         ("Enter privacy mode", "Masuk mode privasi"),
         ("Exit privacy mode", "Keluar mode privasi"),
     ].iter().cloned().collect();

src/lang/it.rs

@@ -568,8 +568,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("True color (4:4:4)", "Colore reale (4:4:4)"),
         ("Enable blocking user input", "Abilita blocco input utente"),
         ("id_input_tip", "Puoi inserire un ID, un IP diretto o un dominio con una porta (<dominio>:<porta>).\nSe vuoi accedere as un dispositivo in un altro server, aggiungi l'indirizzo del server (<id>@<indirizzo_server >?key=<valore_chiave>), ad esempio\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nSe vuoi accedere as un dispositivo in un server pubblico, inserisci \"<id>@public\", per il server pubblico la chiave non è necessaria"),
-        ("privacy_mode_impl_mag_tip", "Modo 1 (deprecato)"),
-        ("privacy_mode_impl_virtual_display_tip", "Modo 2 (consigliato)"),
+        ("privacy_mode_impl_mag_tip", "Modo 1"),
+        ("privacy_mode_impl_virtual_display_tip", "Modo 2"),
         ("Enter privacy mode", "Entra in modalità privacy"),
         ("Exit privacy mode", "Esci dalla modalità privacy"),
     ].iter().cloned().collect();

src/lang/ko.rs

@@ -568,8 +568,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("True color (4:4:4)", "트루컬러(4:4:4)"),
         ("Enable blocking user input", "사용자 입력 차단 허용"),
         ("id_input_tip", "입력된 ID, IP, 도메인과 포트(<domain>:<port>)를 입력할 수 있습니다.\n다른 서버에 있는 장치에 접속하려면 서버 주소(<id>@<server_address>?key=<key_value>)를 추가하세요"),
-        ("privacy_mode_impl_mag_tip", "모드 1(더 이상 사용되지 않음)"),
-        ("privacy_mode_impl_virtual_display_tip", "모드 2(권장)"),
+        ("privacy_mode_impl_mag_tip", "모드 1"),
+        ("privacy_mode_impl_virtual_display_tip", "모드 2"),
         ("Enter privacy mode", "개인정보 보호 모드 사용"),
         ("Exit privacy mode", "개인정보 보호 모드 종료"),
     ].iter().cloned().collect();

src/lang/lv.rs

@@ -568,8 +568,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("True color (4:4:4)", "Īstā krāsa (4:4:4)"),
         ("Enable blocking user input", "Iespējot lietotāja ievades bloķēšanu"),
         ("id_input_tip", "Varat ievadīt ID, tiešo IP vai domēnu ar portu (<domēns>:<ports>).\nJa vēlaties piekļūt ierīcei citā serverī, lūdzu, pievienojiet servera adresi (<id>@<servera_adrese>?key=<atslēgas_vērtība>), piemēram,\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nJa vēlaties piekļūt ierīcei publiskajā serverī, lūdzu, ievadiet \"<id>@public\", publiskajam serverim atslēga nav nepieciešama"),
-        ("privacy_mode_impl_mag_tip", "1. režīms (novecojis)"),
-        ("privacy_mode_impl_virtual_display_tip", "2. režīms (ieteicams)"),
+        ("privacy_mode_impl_mag_tip", "1. režīms"),
+        ("privacy_mode_impl_virtual_display_tip", "2. režīms"),
         ("Enter privacy mode", "Ieiet privātuma režīmā"),
         ("Exit privacy mode", "Iziet no privātuma režīma"),
     ].iter().cloned().collect();

src/lang/pl.rs

@@ -568,8 +568,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("True color (4:4:4)", "True color (4:4:4)"),
         ("Enable blocking user input", "Zablokuj wprowadzanie danych przez użytkownika"),
         ("id_input_tip", "Możesz wprowadzić identyfikator, bezpośredni adres IP lub domenę z portem (<adres_domenowy>:<port>).\nJeżeli chcesz uzyskać dostęp do urządzenia na innym serwerze, dołącz adres serwera (<id>@<adres_serwera>?key=<wartość_klucza>, np. \n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nJeżeli chcesz uzyskać dostęp do urządzenia na serwerze publicznym, wpisz \"<id>@public\", klucz nie jest potrzebny dla serwera publicznego."),
-        ("privacy_mode_impl_mag_tip", "Tryb 1 (przestarzały)"),
-        ("privacy_mode_impl_virtual_display_tip", "Tryb 2 (zalecany)"),
+        ("privacy_mode_impl_mag_tip", "Tryb 1"),
+        ("privacy_mode_impl_virtual_display_tip", "Tryb 2"),
         ("Enter privacy mode", "Wejdź w tryb prywatności"),
         ("Exit privacy mode", "Wyjdź z trybu prywatności"),
     ].iter().cloned().collect();

src/lang/ru.rs

@@ -568,8 +568,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("True color (4:4:4)", "True color (4:4:4)"),
         ("Enable blocking user input", "Блокировать ввод пользователя"),
         ("id_input_tip", "Можно ввести идентификатор, прямой IP-адрес или домен с портом (<домен>:<порт>).\nЕсли необходимо получить доступ к устройству на другом сервере, добавьте адрес сервера (<id>@<адрес_сервера>?key=<ключ_значение>), например:\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nЕсли необходимо получить доступ к устройству на общедоступном сервере, введите \"<id>@public\", ключ для публичного сервера не требуется."),
-        ("privacy_mode_impl_mag_tip", "Режим 1 (устаревший)"),
-        ("privacy_mode_impl_virtual_display_tip", "Режим 2 (рекомендуемый)"),
+        ("privacy_mode_impl_mag_tip", "Режим 1"),
+        ("privacy_mode_impl_virtual_display_tip", "Режим 2"),
         ("Enter privacy mode", "Включить режим конфиденциальности"),
         ("Exit privacy mode", "Отключить режим конфиденциальности"),
     ].iter().cloned().collect();

src/lang/ua.rs

@@ -568,8 +568,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("True color (4:4:4)", "Спражній колір (4:4:4)"),
         ("Enable blocking user input", "Блокувати введення для користувача"),
         ("id_input_tip", "Ви можете ввести ID, безпосередню IP, або ж домен з портом (<домен>:<порт>).\nЯкщо ви хочете отримати доступ до пристрою на іншому сервері, будь ласка, додайте адресу сервера (<id>@<адреса_сервера>?key=<значення_ключа>), наприклад,\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nЯкщо ви хочете отримати доступ до пристрою на публічному сервері, будь ласка, введіть \"<id>@public\", ключ для публічного сервера не потрібен."),
-        ("privacy_mode_impl_mag_tip", "Режим 1 (застарілий)"),
-        ("privacy_mode_impl_virtual_display_tip", "Режим 2 (рекомендований)"),
+        ("privacy_mode_impl_mag_tip", "Режим 1"),
+        ("privacy_mode_impl_virtual_display_tip", "Режим 2"),
         ("Enter privacy mode", "Увійти в режим конфіденційності"),
         ("Exit privacy mode", "Вийти з режиму конфіденційності"),
     ].iter().cloned().collect();

src/platform/windows.cc

@@ -628,8 +628,48 @@ extern "C"
         return bSystem;
     }
 
-    void alloc_console_and_redirect() {
+    void alloc_console_and_redirect()
+    {
         AllocConsole();
         freopen("CONOUT$", "w", stdout);
     }
-} // end of extern "C"
+} // end of extern "C"
+
+extern "C"
+{
+    // https://learn.microsoft.com/en-us/windows/win32/sysinfo/targeting-your-application-at-windows-8-1
+    // https://github.com/nodejs/node-convergence-archive/blob/e11fe0c2777561827cdb7207d46b0917ef3c42a7/deps/uv/src/win/util.c#L780
+    BOOL IsWindowsVersionOrGreater(DWORD os_major,
+                                   DWORD os_minor,
+                                   DWORD build_number,
+                                   WORD service_pack_major,
+                                   WORD service_pack_minor)
+    {
+        OSVERSIONINFOEX osvi;
+        DWORDLONG condition_mask = 0;
+        int op = VER_GREATER_EQUAL;
+
+        /* Initialize the OSVERSIONINFOEX structure. */
+        ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
+        osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+        osvi.dwMajorVersion = os_major;
+        osvi.dwMinorVersion = os_minor;
+        osvi.dwBuildNumber = build_number;
+        osvi.wServicePackMajor = service_pack_major;
+        osvi.wServicePackMinor = service_pack_minor;
+
+        /* Initialize the condition mask. */
+        VER_SET_CONDITION(condition_mask, VER_MAJORVERSION, op);
+        VER_SET_CONDITION(condition_mask, VER_MINORVERSION, op);
+        VER_SET_CONDITION(condition_mask, VER_BUILDNUMBER, op);
+        VER_SET_CONDITION(condition_mask, VER_SERVICEPACKMAJOR, op);
+        VER_SET_CONDITION(condition_mask, VER_SERVICEPACKMINOR, op);
+
+        /* Perform the test. */
+        return VerifyVersionInfo(
+            &osvi,
+            VER_MAJORVERSION | VER_MINORVERSION | VER_BUILDNUMBER |
+                VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
+            condition_mask);
+    }
+}

src/platform/windows.rs

@@ -3,7 +3,7 @@ use crate::common::PORTABLE_APPNAME_RUNTIME_ENV_KEY;
 use crate::{
     ipc,
     license::*,
-    privacy_mode::win_mag::{self, WIN_MAG_INJECTED_PROCESS_EXE},
+    privacy_mode::win_topmost_window::{self, WIN_TOPMOST_INJECTED_PROCESS_EXE},
 };
 use hbb_common::{
     allow_err,
@@ -460,6 +460,13 @@ extern "C" {
     fn is_win_down() -> BOOL;
     fn is_local_system() -> BOOL;
     fn alloc_console_and_redirect();
+    fn IsWindowsVersionOrGreater(
+        os_major: DWORD,
+        os_minor: DWORD,
+        build_number: DWORD,
+        service_pack_major: WORD,
+        service_pack_minor: WORD,
+    ) -> BOOL;
 }
 
 extern "system" {
@@ -848,8 +855,8 @@ fn get_default_install_path() -> String {
 }
 
 pub fn check_update_broker_process() -> ResultType<()> {
-    let process_exe = win_mag::INJECTED_PROCESS_EXE;
-    let origin_process_exe = win_mag::ORIGIN_PROCESS_EXE;
+    let process_exe = win_topmost_window::INJECTED_PROCESS_EXE;
+    let origin_process_exe = win_topmost_window::ORIGIN_PROCESS_EXE;
 
     let exe_file = std::env::current_exe()?;
     let Some(cur_dir) = exe_file.parent() else {
@@ -926,8 +933,8 @@ pub fn copy_exe_cmd(src_exe: &str, exe: &str, path: &str) -> ResultType<String>
         {main_exe}
         copy /Y \"{ORIGIN_PROCESS_EXE}\" \"{path}\\{broker_exe}\"
         ",
-        ORIGIN_PROCESS_EXE = win_mag::ORIGIN_PROCESS_EXE,
-        broker_exe = win_mag::INJECTED_PROCESS_EXE,
+        ORIGIN_PROCESS_EXE = win_topmost_window::ORIGIN_PROCESS_EXE,
+        broker_exe = win_topmost_window::INJECTED_PROCESS_EXE,
     ))
 }
 
@@ -1157,7 +1164,7 @@ fn get_before_uninstall(kill_self: bool) -> String {
     reg delete HKEY_CLASSES_ROOT\\{ext} /f
     netsh advfirewall firewall delete rule name=\"{app_name} Service\"
     ",
-        broker_exe = WIN_MAG_INJECTED_PROCESS_EXE,
+        broker_exe = WIN_TOPMOST_INJECTED_PROCESS_EXE,
     )
 }
 
@@ -1283,6 +1290,25 @@ pub fn block_input(v: bool) -> (bool, String) {
     }
 }
 
+#[inline]
+pub fn is_windows_version_or_greater(
+    os_major: u32,
+    os_minor: u32,
+    build_number: u32,
+    service_pack_major: u32,
+    service_pack_minor: u32,
+) -> bool {
+    unsafe {
+        IsWindowsVersionOrGreater(
+            os_major as _,
+            os_minor as _,
+            build_number as _,
+            service_pack_major as _,
+            service_pack_minor as _,
+        ) == TRUE
+    }
+}
+
 pub fn add_recent_document(path: &str) {
     extern "C" {
         fn AddRecentDocument(path: *const u16);
@@ -2164,7 +2190,7 @@ pub fn uninstall_service(show_new_window: bool) -> bool {
     taskkill /F /IM {app_name}.exe{filter}
     ",
         app_name = crate::get_app_name(),
-        broker_exe = WIN_MAG_INJECTED_PROCESS_EXE,
+        broker_exe = WIN_TOPMOST_INJECTED_PROCESS_EXE,
     );
     if let Err(err) = run_cmds(cmds, false, "uninstall") {
         Config::set_option("stop-service".into(), "".into());
@@ -2279,7 +2305,10 @@ fn run_after_run_cmds(silent: bool) {
 pub fn try_kill_broker() {
     allow_err!(std::process::Command::new("cmd")
         .arg("/c")
-        .arg(&format!("taskkill /F /IM {}", WIN_MAG_INJECTED_PROCESS_EXE))
+        .arg(&format!(
+            "taskkill /F /IM {}",
+            WIN_TOPMOST_INJECTED_PROCESS_EXE
+        ))
         .creation_flags(winapi::um::winbase::CREATE_NO_WINDOW)
         .spawn());
 }