[Jcl-checkins-diff] SF.net SVN: jcl: [2010] trunk/jcl

[<ou...@us...>]

Revision: 2010
          http://svn.sourceforge.net/jcl/?rev=2010&view=rev
Author:   outchy
Date:     2007-05-18 13:16:19 -0700 (Fri, 18 May 2007)

Log Message:
-----------
Windows Longhorn is officially released as Windows Server 2008.

Modified Paths:
--------------
    trunk/jcl/install/JclInstall.pas
    trunk/jcl/source/common/JclResources.pas
    trunk/jcl/source/common/JclSysInfo.pas

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2007-05-15 08:06:05 UTC (rev 2009)
+++ trunk/jcl/install/JclInstall.pas	2007-05-18 20:16:19 UTC (rev 2010)
@@ -3337,11 +3337,11 @@
   // step 3:  inform the user and execute RegHelper
 
   // simple dialog explaining user why we need credentials
-  if Assigned(GUI) and ((not IsAdministrator) or (IsWinVista or IsWinLonghorn)) then
+  if Assigned(GUI) and ((not IsAdministrator) or (IsWinVista or IsWinServer2008)) then
     GUI.Dialog(RsHTMLHelp2Credentials, dtInformation, [drOK]);
 
   // RegHelper.exe manifest requires elevation on Vista
-  if IsAdministrator or IsWinVista or IsWinLonghorn then
+  if IsAdministrator or IsWinVista or IsWinServer2008 then
     Verb := 'open'
   else
     Verb := 'runas';

Modified: trunk/jcl/source/common/JclResources.pas
===================================================================
--- trunk/jcl/source/common/JclResources.pas	2007-05-15 08:06:05 UTC (rev 2009)
+++ trunk/jcl/source/common/JclResources.pas	2007-05-18 20:16:19 UTC (rev 2010)
@@ -1749,20 +1749,20 @@
   RsIntelCacheDescrF0 = '64-Byte Prefetching';
   RsIntelCacheDescrF1 = '128-Byte Prefetching';
 
-  RsOSVersionWin95       = 'Windows 95';
-  RsOSVersionWin95OSR2   = 'Windows 95 OSR2';
-  RsOSVersionWin98       = 'Windows 98';
-  RsOSVersionWin98SE     = 'Windows 98 SE';
-  RsOSVersionWinME       = 'Windows ME';
-  RsOSVersionWinNT3      = 'Windows NT 3.%u';
-  RsOSVersionWinNT4      = 'Windows NT 4.%u';
-  RsOSVersionWin2000     = 'Windows 2000';
-  RsOSVersionWinXP       = 'Windows XP';
-  RsOSVersionWin2003     = 'Windows Server 2003';
-  RsOSVersionWin2003R2   = 'Windows Server 2003 "R2"';
-  RsOSVersionWinXP64     = 'Windows XP x64';
-  RsOSVersionWinVista    = 'Windows Vista';
-  RsOSVersionWinLonghorn = 'Windows Server "Longhorn"';
+  RsOSVersionWin95 = 'Windows 95';
+  RsOSVersionWin95OSR2 = 'Windows 95 OSR2';
+  RsOSVersionWin98 = 'Windows 98';
+  RsOSVersionWin98SE = 'Windows 98 SE';
+  RsOSVersionWinME = 'Windows ME';
+  RsOSVersionWinNT3 = 'Windows NT 3.%u';
+  RsOSVersionWinNT4 = 'Windows NT 4.%u';
+  RsOSVersionWin2000 = 'Windows 2000';
+  RsOSVersionWinXP = 'Windows XP';
+  RsOSVersionWin2003 = 'Windows Server 2003';
+  RsOSVersionWin2003R2 = 'Windows Server 2003 "R2"';
+  RsOSVersionWinXP64 = 'Windows XP x64';
+  RsOSVersionWinVista = 'Windows Vista';
+  RsOSVersionWinServer2008 = 'Windows Server 2008';
 
   RsProductTypeWorkStation      = 'Workstation';
   RsProductTypeServer           = 'Server';

Modified: trunk/jcl/source/common/JclSysInfo.pas
===================================================================
--- trunk/jcl/source/common/JclSysInfo.pas	2007-05-15 08:06:05 UTC (rev 2009)
+++ trunk/jcl/source/common/JclSysInfo.pas	2007-05-18 20:16:19 UTC (rev 2010)
@@ -267,7 +267,7 @@
   TWindowsVersion =
    (wvUnknown, wvWin95, wvWin95OSR2, wvWin98, wvWin98SE, wvWinME,
     wvWinNT31, wvWinNT35, wvWinNT351, wvWinNT4, wvWin2000, wvWinXP,
-    wvWin2003, wvWinXP64, wvWin2003R2, wvWinVista, wvWinLonghorn);
+    wvWin2003, wvWinXP64, wvWin2003R2, wvWinVista, wvWinServer2008);
   TNtProductType =
    (ptUnknown, ptWorkStation, ptServer, ptAdvancedServer,
     ptPersonal, ptProfessional, ptDatacenterServer, ptEnterprise, ptWebEdition);
@@ -296,7 +296,7 @@
   IsWinXP64: Boolean = False;
   IsWin2003R2: Boolean = False;
   IsWinVista: Boolean = False;
-  IsWinLonghorn: Boolean = False;
+  IsWinServer2008: Boolean = False;
 
 const
   PROCESSOR_ARCHITECTURE_INTEL = 0;
@@ -2581,7 +2581,7 @@
         else
         begin
           if IsWin2k or IsWinXP or IsWin2003 or IsWin2003R2 or IsWinXP64 or
-            IsWinVista or IsWinLonghorn then
+            IsWinVista or IsWinServer2008 then
           begin
             FileName := ProcessFileName(ProcEntry.th32ProcessID);
             if FileName = '' then
@@ -3169,7 +3169,7 @@
             if GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then
               Result := wvWinVista
             else
-              Result := wvWinLonghorn;
+              Result := wvWinServer2008;
           end;
       end;
   end;
@@ -3246,7 +3246,7 @@
     end;
   end
   else
-  if IsWinXP or IsWinVista or IsWinLonghorn then // workstation
+  if IsWinXP or IsWinVista or IsWinServer2008 then // workstation
   begin
     if GetVersionEx(OSVersionInfo) then
     begin
@@ -3304,8 +3304,8 @@
       Result := RsOSVersionWin2003R2;
     wvWinXP64:
       Result := RsOSVersionWinXP64;
-    wvWinLonghorn:
-      Result := RsOSVersionWinLonghorn;
+    wvWinServer2008:
+      Result := RsOSVersionWinServer2008;
     wvWinVista:
       Result := RsOSVersionWinVista;
   else
@@ -3345,7 +3345,7 @@
   VersionInfo: TOSVersionInfoEx;
 begin
   Result := 0;
-  if IsWin2K or IsWinXP or IsWin2003 or IsWinXP64 or IsWin2003R2 or IsWinVista or IsWinLonghorn then
+  if IsWin2K or IsWinXP or IsWin2003 or IsWinXP64 or IsWin2003R2 or IsWinVista or IsWinServer2008 then
   begin
     FillChar(VersionInfo, SizeOf(VersionInfo), 0);
     VersionInfo.dwOSVersionInfoSize := SizeOf(VersionInfo);
@@ -5295,8 +5295,8 @@
       IsWin2003R2 := True;
     wvWinVista:
       IsWinVista := True;
-    wvWinLonghorn:
-      IsWinLonghorn := True;
+    wvWinServer2008:
+      IsWinServer2008 := True;
   end;
 end;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.