Migrate to windows-sys

tauri-apps · Mar 12, 2024 · 5e3cc99 · 5e3cc99
1 parent 67e12d7
commit 5e3cc99
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/plugins/updater/Cargo.toml b/plugins/updater/Cargo.toml
@@ -37,11 +37,7 @@ tar = "0.4"
 
 [target."cfg(target_os = \"windows\")".dependencies]
 zip = { version = "0.6", default-features = false }
-windows = { version = "0.54", features = [
-    "Win32_System_WinRT",
-    "Win32_UI_Shell",
-    "Win32_UI_WindowsAndMessaging",
-] }
+windows-sys = { version = "0.52.0", features = ["Win32_Foundation", "Win32_UI_WindowsAndMessaging"] }
 
 [target."cfg(any(target_os = \"macos\", target_os = \"linux\"))".dependencies]
 flate2 = "1.0.27"

diff --git a/plugins/updater/src/updater.rs b/plugins/updater/src/updater.rs
@@ -514,8 +514,9 @@ impl Update {
     fn install_inner(&self, bytes: Vec<u8>) -> Result<()> {
         use std::fs;
 
-        use windows::{
-            core::{w, HSTRING},
+        use windows_sys::{
+            core::HSTRING,
+            w,
             Win32::UI::{Shell::ShellExecuteW, WindowsAndMessaging::SW_SHOW},
         };
 
@@ -575,12 +576,25 @@ impl Update {
             } else {
                 continue;
             }
-            let file = HSTRING::from(found_path.as_os_str());
-            let parameters = HSTRING::from(installer_args.join(OsStr::new(" ")));
-            let ret =
-                unsafe { ShellExecuteW(None, w!("runas"), &file, &parameters, None, SW_SHOW) };
-            if ret.0 <= 32 {
-                return Err(Error::Io(windows::core::Error::from_win32().into()));
+            let file = HSTRING::from(found_path.as_os_str().as_encoded_bytes().as_ptr() as _);
+            let parameters = HSTRING::from(
+                installer_args
+                    .join(OsStr::new(" "))
+                    .as_encoded_bytes()
+                    .as_ptr() as _,
+            );
+            let ret = unsafe {
+                ShellExecuteW(
+                    0,
+                    w!("runas"),
+                    file as _,
+                    parameters as _,
+                    std::ptr::null(),
+                    SW_SHOW,
+                )
+            };
+            if ret <= 32 {
+                return Err(Error::Io(std::io::Error::last_os_error()));
             }
             std::process::exit(0);
         }