diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-10-08 10:08:50 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-10-08 10:08:50 +0200 |
| commit | e7d3bee2795b8b6bd03267906fb969b9d61ef4d0 (patch) | |
| tree | f71fe002439705bc408c795805d2e8e7f84f3157 | |
| parent | 9ba817236285e79b8d7e41d3324e2bcd0c54651d (diff) | |
| parent | 19659613623b14b26bb45535bab8f03248ae5032 (diff) | |
| download | mullvadvpn-e7d3bee2795b8b6bd03267906fb969b9d61ef4d0.tar.xz mullvadvpn-e7d3bee2795b8b6bd03267906fb969b9d61ef4d0.zip | |
Merge branch 'win-remove-downgrade-suggestion'
| -rw-r--r-- | dist-assets/windows/installer.nsh | 2 | ||||
| -rw-r--r-- | mullvad-nsis/src/lib.rs | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index c6fcf161d1..3905ab974b 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -698,7 +698,7 @@ ManifestSupportedOS "{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" # Best effort only. Ignore errors IntCmp $0 -1 customInit_compatibleWinVer customInit_compatibleWinVer +1 - MessageBox MB_ICONSTOP|MB_TOPMOST|MB_OK "Windows versions below 10 are unsupported. The last version to support Windows 7 and 8/8.1 is 2021.6." + MessageBox MB_ICONSTOP|MB_TOPMOST|MB_OK "Windows versions below 10 are unsupported." Abort customInit_compatibleWinVer: diff --git a/mullvad-nsis/src/lib.rs b/mullvad-nsis/src/lib.rs index 6bb7472eff..354677eee1 100644 --- a/mullvad-nsis/src/lib.rs +++ b/mullvad-nsis/src/lib.rs @@ -153,15 +153,13 @@ pub struct WindowsVer { /// Write OS version into `version_out` when `Status::Ok` is returned. /// /// # Safety -/// `version_out` should point to a valid `WindowsVer` +/// `version_out` must point to a valid `WindowsVer` #[unsafe(no_mangle)] pub unsafe extern "C" fn get_system_version_struct(version_out: *mut WindowsVer) -> Status { use talpid_platform_metadata::WindowsVersion; catch_and_log_unwind(|| { - // Try to retrieve the version based on the kernel image. Use normal method as fallback. - let winver = WindowsVersion::from_ntoskrnl() - .or_else(|_| WindowsVersion::new()) - .unwrap(); + // Try to retrieve the version based on the kernel image + let winver = WindowsVersion::from_ntoskrnl().unwrap(); let c_ver = WindowsVer { major_version: winver.major_version(), minor_version: winver.minor_version(), |