From bf764e83e01e7443e6cc54572001e1c98c357465 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Thu, 30 Jun 2022 10:38:01 -0300 Subject: [PATCH] feat(utils): expose `windows_version` function (#4534) --- .changes/expose-windows-version.md | 5 +++++ core/tauri-utils/src/platform.rs | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .changes/expose-windows-version.md diff --git a/.changes/expose-windows-version.md b/.changes/expose-windows-version.md new file mode 100644 index 000000000..fa0b53962 --- /dev/null +++ b/.changes/expose-windows-version.md @@ -0,0 +1,5 @@ +--- +"tauri-utils": patch +--- + +Expose `platform::windows_version` function. diff --git a/core/tauri-utils/src/platform.rs b/core/tauri-utils/src/platform.rs index 22620803f..fbefab772 100644 --- a/core/tauri-utils/src/platform.rs +++ b/core/tauri-utils/src/platform.rs @@ -198,7 +198,7 @@ pub fn resource_dir(package_info: &PackageInfo, env: &Env) -> crate::Result bool { - if let Some(v) = get_windows_ver() { + if let Some(v) = windows_version() { // windows 7 is 6.1 if v.0 == 6 && v.1 == 1 { return true; @@ -240,8 +240,8 @@ mod windows_platform { }; } - /// Returns a tuple of (major, minor, buildnumber) - fn get_windows_ver() -> Option<(u32, u32, u32)> { + /// Returns a tuple of (major, minor, buildnumber) for the Windows version. + pub fn windows_version() -> Option<(u32, u32, u32)> { type RtlGetVersion = unsafe extern "system" fn(*mut OSVERSIONINFOW) -> i32; let handle = get_function!("ntdll.dll", RtlGetVersion); if let Some(rtl_get_version) = handle {