ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 14:48:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed getting windows version. The former function is no longer working on Windows 10. Also fixed the struct to use correct win32 names

Browse Source
This commit is contained in:
zhibog
2020-10-24 00:14:01 +02:00
parent feeb342c00
commit 4c4112fbc7
3 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/os_windows.odin
+16 -17
View File
@@ -160,40 +160,39 @@ _alloc_command_line_arguments :: proc() -> []string {
return arg_list;
}
get_windows_version_ansi :: proc() -> win32.OSVERSIONINFOEXW {
get_windows_version_w :: proc() -> win32.OSVERSIONINFOEXW {
osvi : win32.OSVERSIONINFOEXW;
osvi.os_version_info_size = size_of(win32.OSVERSIONINFOEXW);
win32.GetVersionExW(&osvi);
osvi.dwOSVersionInfoSize = size_of(win32.OSVERSIONINFOEXW);
win32.RtlGetVersion(&osvi);
return osvi;
}
is_windows_xp :: proc() -> bool {
osvi := get_windows_version_ansi();
return (osvi.major_version == 5 && osvi.minor_version == 1);
osvi := get_windows_version_w();
return (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1);
}
is_windows_vista :: proc() -> bool {
osvi := get_windows_version_ansi();
return (osvi.major_version == 6 && osvi.minor_version == 0);
osvi := get_windows_version_w();
return (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0);
}
is_windows_7 :: proc() -> bool {
osvi := get_windows_version_ansi();
return (osvi.major_version == 6 && osvi.minor_version == 1);
osvi := get_windows_version_w();
return (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1);
}
is_windows_8 :: proc() -> bool {
osvi := get_windows_version_ansi();
return (osvi.major_version == 6 && osvi.minor_version == 2);
osvi := get_windows_version_w();
return (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 2);
}
is_windows_8_1 :: proc() -> bool {
osvi := get_windows_version_ansi();
return (osvi.major_version == 6 && osvi.minor_version == 3);
osvi := get_windows_version_w();
return (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 3);
}
is_windows_10 :: proc() -> bool {
osvi := get_windows_version_ansi();
return (osvi.major_version == 10 && osvi.minor_version == 0);
}
osvi := get_windows_version_w();
return (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0);
}