Remove explicit `unsafe` from `windows-installer`

1 files changed, 10 insertions, 22 deletions

diff --git a/windows-installer/src/windows.rs b/windows-installer/src/windows.rs
index 1b74b074b3..07e4587728 100644
--- a/windows-installer/src/windows.rs
+++ b/windows-installer/src/windows.rs
@@ -7,7 +7,7 @@
 //! * `WIN_ARM64_INSTALLER` - a path to the ARM64 Windows installer
 use anyhow::{bail, Context};
 use std::{
-    ffi::{c_ushort, OsStr},
+    ffi::OsStr,
     io::{self, Write},
     num::NonZero,
     process::{Command, ExitStatus},
@@ -16,11 +16,7 @@ use std::{
 use tempfile::TempPath;
 use windows_sys::{
     w,
-    Win32::System::{
-        LibraryLoader::{FindResourceW, LoadResource, LockResource, SizeofResource},
-        SystemInformation::{IMAGE_FILE_MACHINE_AMD64, IMAGE_FILE_MACHINE_ARM64},
-        Threading::IsWow64Process2,
-    },
+    Win32::System::LibraryLoader::{FindResourceW, LoadResource, LockResource, SizeofResource},
 };
 
 /// Import resource constants from `resource.rs`. This is automatically generated by the build
@@ -124,22 +120,14 @@ enum Architecture {
 
 /// Return native architecture (ignoring WOW64)
 fn get_native_arch() -> anyhow::Result<Architecture> {
-    let mut running_arch: c_ushort = 0;
-    let mut native_arch: c_ushort = 0;
-
-    // SAFETY: Trivially safe, since we provide the required arguments. `hprocess == 0` is
-    // undocumented but refers to the current process.
-    let result = unsafe { IsWow64Process2(0, &mut running_arch, &mut native_arch) };
-    if result == 0 {
-        bail!(
-            "Failed to get native architecture: {}",
-            io::Error::last_os_error()
-        );
-    }
+    let Some(arch) =
+        talpid_platform_metadata::get_native_arch().context("Failed to get native architecture")?
+    else {
+        bail!("Unable to detect native architecture (most likely unsupported)");
+    };
 
-    match native_arch {
-        IMAGE_FILE_MACHINE_AMD64 => Ok(Architecture::X64),
-        IMAGE_FILE_MACHINE_ARM64 => Ok(Architecture::Arm64),
-        other => bail!("unsupported architecture: {other}"),
+    match arch {
+        talpid_platform_metadata::Architecture::X86 => Ok(Architecture::X64),
+        talpid_platform_metadata::Architecture::Arm64 => Ok(Architecture::Arm64),
     }
 }