summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2024-04-08 15:54:36 +0200
committerDavid Lönnhager <david.l@mullvad.net>2024-04-08 16:17:34 +0200
commitd175e1594ce9802ce362865a0c453ac0ebdd24ae (patch)
treed662cc102c91dcd8baf8c92efa873c77b09e5b97
parent6868d3c3336a8289c56fdd978ad61ef8a19a7155 (diff)
downloadmullvadvpn-d175e1594ce9802ce362865a0c453ac0ebdd24ae.tar.xz
mullvadvpn-d175e1594ce9802ce362865a0c453ac0ebdd24ae.zip
Expose 'marketing' Windows version
-rw-r--r--talpid-platform-metadata/src/windows.rs20
1 files changed, 14 insertions, 6 deletions
diff --git a/talpid-platform-metadata/src/windows.rs b/talpid-platform-metadata/src/windows.rs
index 6dc474227b..1df2cb0f12 100644
--- a/talpid-platform-metadata/src/windows.rs
+++ b/talpid-platform-metadata/src/windows.rs
@@ -80,20 +80,28 @@ impl WindowsVersion {
return "Server".to_owned();
}
+ match self.release_version() {
+ (major, 0) => major.to_string(),
+ (major, minor) => format!("{major}.{minor}"),
+ }
+ }
+
+ /// Release version. E.g. `(10, 0)` for Windows 10, or `(8, 0)` for Windows 8.1.
+ pub fn release_version(&self) -> (u32, u32) {
// Check https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions#Personal_computer_versions 'Release version' column
// for the correct NT versions for specific windows releases.
match (self.major_version(), self.minor_version()) {
- (6, 1) => "7".into(),
- (6, 2) => "8".into(),
- (6, 3) => "8.1".into(),
+ (6, 1) => (7, 0),
+ (6, 2) => (8, 0),
+ (6, 3) => (8, 1),
(10, 0) => {
if self.build_number() < 22000 {
- "10".into()
+ (10, 0)
} else {
- "11".into()
+ (11, 0)
}
}
- (major, minor) => format!("{}.{}", major, minor),
+ (major, minor) => (major, minor),
}
}