Reply to thread

Message

<blockquote data-quote="xGDI" data-source="post: 862025" data-attributes="member: 120998">Sorry, misunderstood your question <img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" class="smilie smilie--sprite smilie--sprite1" alt=":)" title="Smile&nbsp; &nbsp; :)" loading="lazy" data-shortname=":)" />&nbsp;I added in OSInfo.cs to the OSList enum Windows8Server and Windows8:[CODE]&nbsp; &nbsp; public enum OSList&nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; /// Windows 95/98, NT4.0, 2000&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;/summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; Windows2000andPrevious,&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; /// Windows XP x86&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;/summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; WindowsXp,&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; /// Windows XP x64&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;/summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; WindowsXp64,&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; /// Windows Vista&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;/summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; WindowsVista,&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; /// Windows 7&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;/summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; Windows7,&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; /// Windows 2003 Server&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;/summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; Windows2003,&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; /// Windows 2003 R2 Server&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;/summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; Windows2003R2,&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; /// Windows 2008 Server&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;/summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; Windows2008,&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; /// Windows 2008 R2 Server&nbsp; &nbsp; &nbsp; &nbsp; ///&lt;/summary&gt;&nbsp; &nbsp; &nbsp; &nbsp; Windows2008R2,&nbsp; &nbsp; &nbsp; &nbsp; Windows8Server,&nbsp; &nbsp; &nbsp; &nbsp; Windows8&nbsp; &nbsp; }[/CODE]&nbsp;Changed the GetOSNameI function:[CODE]&nbsp; &nbsp; public static OSList GetOSName()&nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; switch (OsVersionInt())&nbsp; &nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; case 51:&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; return OSList.WindowsXp;&nbsp; &nbsp; &nbsp; &nbsp; case 52:&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; if (OSProductType == NT_WORKSTATION)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; return OSList.WindowsXp64;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; }&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; return GetSystemMetrics(SM_SERVERR2) ? OSList.Windows2003R2 : OSList.Windows2003;&nbsp; &nbsp; &nbsp; &nbsp; case 60:&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; return OSProductType == NT_WORKSTATION ? OSList.WindowsVista : OSList.Windows2008;&nbsp; &nbsp; &nbsp; &nbsp; case 61:&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; return OSProductType == NT_WORKSTATION ? OSList.Windows7 : OSList.Windows2008R2;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; case 62:&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; return OSProductType == NT_WORKSTATION ? OSList.Windows8 : OSList.Windows8Server;&nbsp; &nbsp; &nbsp; }&nbsp; &nbsp; &nbsp; return OSList.Windows2000andPrevious;&nbsp; &nbsp; }[/CODE]and also changed the GetOSSupported function:[CODE]&nbsp; &nbsp; public static OsSupport GetOSSupported()&nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; int minSp;&nbsp; &nbsp; &nbsp; int minBuild;&nbsp; &nbsp; &nbsp; switch (GetOSName())&nbsp; &nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; case OSList.WindowsXp:&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; minSp = 3;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; minBuild = 2600;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; break;&nbsp; &nbsp; &nbsp; &nbsp; case OSList.WindowsVista:&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; minSp = 2;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; minBuild = 6000;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; break;&nbsp; &nbsp; &nbsp; &nbsp; case OSList.Windows7:&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; minSp = 0;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; minBuild = 7600;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; break;&nbsp; &nbsp; &nbsp; &nbsp; case OSList.Windows8:&nbsp; &nbsp; &nbsp; &nbsp; case OSList.Windows8Server:&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; return OsSupport.FullySupported;&nbsp; &nbsp; &nbsp; &nbsp; case OSList.Windows2003:&nbsp; &nbsp; &nbsp; &nbsp; case OSList.Windows2003R2:&nbsp; &nbsp; &nbsp; &nbsp; case OSList.Windows2008:&nbsp; &nbsp; &nbsp; &nbsp; case OSList.Windows2008R2:&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; return OsSupport.NotSupported;&nbsp; &nbsp; &nbsp; &nbsp; default:&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; // Windows2000andPrevious and WindowsXp64&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; return OsSupport.Blocked;&nbsp; &nbsp; &nbsp; }&nbsp; &nbsp; &nbsp; if (OSServicePackMajor &lt; minSp || OSBuildVersion &lt; minBuild)&nbsp; &nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; return OsSupport.Blocked;&nbsp; &nbsp; &nbsp; }&nbsp; &nbsp; &nbsp; //&nbsp; &nbsp; &nbsp; // Final service packs have OSServicePackMinor == 0&nbsp; &nbsp; &nbsp; // Unfortunately Windows7 SP1 RC report 0 even if it's not final: added check on the string description&nbsp; &nbsp; &nbsp; //&nbsp; &nbsp; &nbsp; return (OSServicePackMinor != 0 || OSServicePackDesc.Contains(&quot;, v.&quot;))&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; ? OsSupport.NotSupported&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; : OsSupport.FullySupported;&nbsp; &nbsp; }[/CODE]</blockquote>

[QUOTE="xGDI, post: 862025, member: 120998"] Sorry, misunderstood your question :) I added in OSInfo.cs to the OSList enum Windows8Server and Windows8: [CODE] public enum OSList { ///<summary> /// Windows 95/98, NT4.0, 2000 ///</summary> Windows2000andPrevious, ///<summary> /// Windows XP x86 ///</summary> WindowsXp, ///<summary> /// Windows XP x64 ///</summary> WindowsXp64, ///<summary> /// Windows Vista ///</summary> WindowsVista, ///<summary> /// Windows 7 ///</summary> Windows7, ///<summary> /// Windows 2003 Server ///</summary> Windows2003, ///<summary> /// Windows 2003 R2 Server ///</summary> Windows2003R2, ///<summary> /// Windows 2008 Server ///</summary> Windows2008, ///<summary> /// Windows 2008 R2 Server ///</summary> Windows2008R2, Windows8Server, Windows8 }[/CODE] Changed the GetOSNameI function: [CODE] public static OSList GetOSName() { switch (OsVersionInt()) { case 51: return OSList.WindowsXp; case 52: if (OSProductType == NT_WORKSTATION) { return OSList.WindowsXp64; } return GetSystemMetrics(SM_SERVERR2) ? OSList.Windows2003R2 : OSList.Windows2003; case 60: return OSProductType == NT_WORKSTATION ? OSList.WindowsVista : OSList.Windows2008; case 61: return OSProductType == NT_WORKSTATION ? OSList.Windows7 : OSList.Windows2008R2; case 62: return OSProductType == NT_WORKSTATION ? OSList.Windows8 : OSList.Windows8Server; } return OSList.Windows2000andPrevious; } [/CODE] and also changed the GetOSSupported function: [CODE] public static OsSupport GetOSSupported() { int minSp; int minBuild; switch (GetOSName()) { case OSList.WindowsXp: minSp = 3; minBuild = 2600; break; case OSList.WindowsVista: minSp = 2; minBuild = 6000; break; case OSList.Windows7: minSp = 0; minBuild = 7600; break; case OSList.Windows8: case OSList.Windows8Server: return OsSupport.FullySupported; case OSList.Windows2003: case OSList.Windows2003R2: case OSList.Windows2008: case OSList.Windows2008R2: return OsSupport.NotSupported; default: // Windows2000andPrevious and WindowsXp64 return OsSupport.Blocked; } if (OSServicePackMajor < minSp || OSBuildVersion < minBuild) { return OsSupport.Blocked; } // // Final service packs have OSServicePackMinor == 0 // Unfortunately Windows7 SP1 RC report 0 even if it's not final: added check on the string description // return (OSServicePackMinor != 0 || OSServicePackDesc.Contains(", v.")) ? OsSupport.NotSupported : OsSupport.FullySupported; } [/CODE] [/QUOTE]

Verification