github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 13:10:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added "Windows 8" for the OS information, also fixed that it always says "WinNT32" or something like that.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2221 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-10-29 15:16:55 +00:00
commit 43fd418d6f
1 changed files with 125 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

113
Greenshot/Helpers/EnvironmentInfo.cs
View file

@ -42,7 +42,7 @@ namespace Greenshot.Helpers {
if (isWindows.HasValue) {
return isWindows.Value;
}
isWindows = Environment.OSVersion.Platform.ToString().StartsWith("Windows");
isWindows = Environment.OSVersion.Platform.ToString().StartsWith("Win");
return isWindows.Value;
}
}
@ -74,7 +74,7 @@ namespace Greenshot.Helpers {
}
if (IsWindows) {
environment.Append(String.Format("OS: {0} {1} {2} x{3} modus Version = {4}", OSInfo.Name, OSInfo.Edition, OSInfo.ServicePack, OSInfo.Bits, OSInfo.VersionString));
environment.Append(String.Format("OS: {0} {1} {2} (x{3}) {4}", OSInfo.Name, OSInfo.Edition, OSInfo.ServicePack, OSInfo.Bits, OSInfo.VersionString));
if (newline) {
environment.AppendLine();
} else {
@ -415,12 +415,11 @@ namespace Greenshot.Helpers {
/// <summary>
/// Gets the name of the operating system running on this computer.
/// </summary>
static public string Name
{
get
{
if (s_Name != null)
static public string Name {
get {
if (s_Name != null) {
return s_Name; //***** RETURN *****//
}
string name = "unknown";
@ -428,31 +427,29 @@ namespace Greenshot.Helpers {
OSVERSIONINFOEX osVersionInfo = new OSVERSIONINFOEX();
osVersionInfo.dwOSVersionInfoSize = Marshal.SizeOf( typeof( OSVERSIONINFOEX ) );
if (GetVersionEx( ref osVersionInfo ))
{
if (GetVersionEx( ref osVersionInfo )) {
int majorVersion = osVersion.Version.Major;
int minorVersion = osVersion.Version.Minor;
switch (osVersion.Platform)
{
byte productType = osVersionInfo.wProductType;
short suiteMask = osVersionInfo.wSuiteMask;
switch (osVersion.Platform) {
case PlatformID.Win32Windows:
{
if (majorVersion == 4)
{
if (majorVersion == 4) {
string csdVersion = osVersionInfo.szCSDVersion;
switch (minorVersion)
{
switch (minorVersion) {
case 0:
if (csdVersion == "B" || csdVersion == "C")
if (csdVersion == "B" || csdVersion == "C") {
name = "Windows 95 OSR2";
else
} else {
name = "Windows 95";
}
break;
case 10:
if (csdVersion == "A")
if (csdVersion == "A") {
name = "Windows 98 Second Edition";
else
} else {
name = "Windows 98";
}
break;
case 90:
name = "Windows Me";
@ -460,20 +457,13 @@ namespace Greenshot.Helpers {
}
}
break;
}
case PlatformID.Win32NT:
{
byte productType = osVersionInfo.wProductType;
switch (majorVersion)
{
switch (majorVersion) {
case 3:
name = "Windows NT 3.51";
break;
case 4:
switch (productType)
{
switch (productType) {
case 1:
name = "Windows NT 4.0";
break;
@ -483,36 +473,73 @@ namespace Greenshot.Helpers {
}
break;
case 5:
switch (minorVersion)
{
switch (minorVersion) {
case 0:
name = "Windows 2000";
break;
case 1:
switch (suiteMask) {
case 0x0200:
name = "Windows XP Professional";
break;
default:
name = "Windows XP";
break;
}
break;
case 2:
switch (suiteMask) {
case 0x0200:
name = "Windows XP Professional x64";
break;
case 0x0002:
name = "Windows Server 2003 Enterprise";
break;
case 0x0080:
name = "Windows Server 2003 Data Center";
break;
case 0x0400:
name = "Windows Server 2003 Web Edition";
break;
case unchecked ((short)0x8000):
name = "Windows Home Server";
break;
default:
name = "Windows Server 2003";
break;
}
break;
}
break;
case 6:
switch (minorVersion)
{
switch (minorVersion) {
case 0:
name = "Windows Vista";
break;
case 1:
name = "Windows 7";
break;
switch (productType) {
case 3:
name = "Windows Server 2008";
break;
default:
name = "Windows Vista";
break;
}
break;
case 1:
switch (productType) {
case 3:
name = "Windows Server 2008 R2";
break;
default:
name = "Windows 7";
break;
}
break;
case 2:
name = "Windows 8";
break;
}
break;
}
break;
}
}
@ -655,11 +682,9 @@ namespace Greenshot.Helpers {
/// <summary>
/// Gets the full version string of the operating system running on this computer.
/// </summary>
static public string VersionString
{
get
{
return Environment.OSVersion.Version.ToString();
static public string VersionString {
get {
return string.Format("{0}.{1} build {3} revision {2:X}", Environment.OSVersion.Version.Major, Environment.OSVersion.Version.Minor, Environment.OSVersion.Version.Revision, Environment.OSVersion.Version.Build);
}
}
#endregion STRING