aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added code to detect Windows version from KERNEL32.DLL if OS is

Browse Source 
falsely identifying itself as Windows 8.
This commit is contained in:
Natalia Portillo
2017-09-11 02:52:48 +01:00
parent d4add54b53
commit 2a60465e8e
1 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
DiscImageChef.Interop/DetectOS.cs
View File

@@ -38,6 +38,8 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Diagnostics;
using System.IO;
namespace DiscImageChef.Interop namespace DiscImageChef.Interop
{ {
@@ -214,6 +216,33 @@ namespace DiscImageChef.Interop
return IntPtr.Size == 4; return IntPtr.Size == 4;
} }
public static string GetVersion()
{
string environ = Environment.OSVersion.Version.ToString();
switch(GetRealPlatformID())
{
case PlatformID.MacOSX:
if(Environment.OSVersion.Version.Major == 1)
{
if(Environment.OSVersion.Version.Minor == 3)
return "10.0";
if(Environment.OSVersion.Version.Minor == 4)
return "10.1";
goto default;
}
return string.Format("10.{0}.{1}", Environment.OSVersion.Version.Major - 4, Environment.OSVersion.Version.Minor);
case PlatformID.Win32NT:
// From Windows 8.1 the reported version is simply falsified...
if((Environment.OSVersion.Version.Major == 6 && Environment.OSVersion.Version.Major >= 2) ||
Environment.OSVersion.Version.Major > 6)
return FileVersionInfo.GetVersionInfo(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "KERNEL32.DLL")).ProductVersion;
return environ;
default:
return environ;
}
}
public static string GetPlatformName(PlatformID id, string version = null) public static string GetPlatformName(PlatformID id, string version = null)
{ {
switch(id) switch(id)
@@ -239,6 +268,18 @@ namespace DiscImageChef.Interop
case PlatformID.Linux: case PlatformID.Linux:
return "Linux"; return "Linux";
case PlatformID.MacOSX: case PlatformID.MacOSX:
if(!string.IsNullOrEmpty(version))
{
string[] pieces = version.Split(new [] { '.' });
if(pieces.Length >= 2 && int.TryParse(pieces[1], out int minor))
{
if(minor >= 12)
return "macOS";
if(minor >= 8)
return "OS X";
return "Mac OS X";
}
}
return "macOS"; return "macOS";
case PlatformID.Minix: case PlatformID.Minix:
return "MINIX"; return "MINIX";
@@ -292,7 +333,7 @@ namespace DiscImageChef.Interop
return "Windows Vista"; return "Windows Vista";
if(version.StartsWith("6.1", StringComparison.Ordinal)) if(version.StartsWith("6.1", StringComparison.Ordinal))
return "Windows 7"; return "Windows 7";
if(version.StartsWith("6.1", StringComparison.Ordinal)) if(version.StartsWith("6.2", StringComparison.Ordinal))
return "Windows 8"; return "Windows 8";
if(version.StartsWith("6.3", StringComparison.Ordinal)) if(version.StartsWith("6.3", StringComparison.Ordinal))
return "Windows 8.1"; return "Windows 8.1";