Home Explore Help
Register Sign In
Apq
/
winscp
mirror of https://github.com/winscp/winscp.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

JCL 2.8.5677 (46230863)

Source commit: b6a0a02b42954f3f39daf4fbcc56377947918300
Martin Prikryl 4 months ago
parent
5dda53f478
commit
cfd13d0b81
4 changed files with 340 additions and 266 deletions
Unified View Show Diff Stats
  1. 7 0
      source/packages/jcl/JclBase.pas
  2. 12 12
      source/packages/jcl/JclDebug.pas
  3. 24 24
      source/packages/jcl/JclPeImage.pas
  4. 297 230
      source/packages/jcl/JclSysInfo.pas

+ 7 - 0
source/packages/jcl/JclBase.pas
View File 

@@ -137,6 +137,13 @@ type
 
   TBytes = array of Byte;

   TBytes = array of Byte;

 {$ENDIF ~COMPILER11_UP}

 {$ENDIF ~COMPILER11_UP}

 

 

+type

+  {$IFDEF RTL360_UP}

+  TJclListSize = NativeInt;

+  {$ELSE}

+  TJclListSize = Integer;

+  {$ENDIF ~RTL360_UP}

+

 // Redefinition of PByteArray to avoid range check exceptions.

 // Redefinition of PByteArray to avoid range check exceptions.

 type

 type

   TJclByteArray = array [0..MaxInt div SizeOf(Byte) - 1] of Byte;

   TJclByteArray = array [0..MaxInt div SizeOf(Byte) - 1] of Byte;

+ 12 - 12
source/packages/jcl/JclDebug.pas
View File 

@@ -99,7 +99,7 @@ type
 
     FDynamicBuild: Boolean;

     FDynamicBuild: Boolean;

     FSystemModulesOnly: Boolean;

     FSystemModulesOnly: Boolean;

     FRefCount: Integer;

     FRefCount: Integer;

-    function GetItems(Index: Integer): TJclModuleInfo;

+    function GetItems(Index: TJclListSize): TJclModuleInfo;

     function GetModuleFromAddress(Addr: Pointer): TJclModuleInfo;

     function GetModuleFromAddress(Addr: Pointer): TJclModuleInfo;

   protected

   protected

     procedure BuildModulesList;

     procedure BuildModulesList;

@@ -110,7 +110,7 @@ type
 
     function IsSystemModuleAddress(Addr: Pointer): Boolean;

     function IsSystemModuleAddress(Addr: Pointer): Boolean;

     function IsValidModuleAddress(Addr: Pointer): Boolean;

     function IsValidModuleAddress(Addr: Pointer): Boolean;

     property DynamicBuild: Boolean read FDynamicBuild;

     property DynamicBuild: Boolean read FDynamicBuild;

-    property Items[Index: Integer]: TJclModuleInfo read GetItems;

+    property Items[Index: TJclListSize]: TJclModuleInfo read GetItems;

     property ModuleFromAddress[Addr: Pointer]: TJclModuleInfo read GetModuleFromAddress;

     property ModuleFromAddress[Addr: Pointer]: TJclModuleInfo read GetModuleFromAddress;

   end;

   end;

 

 

@@ -495,7 +495,7 @@ type
 
   TJclDebugInfoList = class(TObjectList)

   TJclDebugInfoList = class(TObjectList)

   private

   private

     function GetItemFromModule(const Module: HMODULE): TJclDebugInfoSource;

     function GetItemFromModule(const Module: HMODULE): TJclDebugInfoSource;

-    function GetItems(Index: Integer): TJclDebugInfoSource;

+    function GetItems(Index: TJclListSize): TJclDebugInfoSource;

   protected

   protected

     function CreateDebugInfo(const Module: HMODULE): TJclDebugInfoSource;

     function CreateDebugInfo(const Module: HMODULE): TJclDebugInfoSource;

   public

   public

@@ -508,7 +508,7 @@ type
 
     class procedure NeedInfoSourceClassList;

     class procedure NeedInfoSourceClassList;

     function GetLocationInfo(const Addr: Pointer; out Info: TJclLocationInfo): Boolean;

     function GetLocationInfo(const Addr: Pointer; out Info: TJclLocationInfo): Boolean;

     property ItemFromModule[const Module: HMODULE]: TJclDebugInfoSource read GetItemFromModule;

     property ItemFromModule[const Module: HMODULE]: TJclDebugInfoSource read GetItemFromModule;

-    property Items[Index: Integer]: TJclDebugInfoSource read GetItems;

+    property Items[Index: TJclListSize]: TJclDebugInfoSource read GetItems;

   end;

   end;

 

 

   // Various source location implementations

   // Various source location implementations

@@ -688,7 +688,7 @@ type
 
     {$IFDEF CPU64}

     {$IFDEF CPU64}

     procedure CaptureBackTrace;

     procedure CaptureBackTrace;

     {$ENDIF CPU64}

     {$ENDIF CPU64}

-    function GetItems(Index: Integer): TJclStackInfoItem;

+    function GetItems(Index: TJclListSize): TJclStackInfoItem;

     function NextStackFrame(var StackFrame: PStackFrame; var StackInfo: TStackInfo): Boolean;

     function NextStackFrame(var StackFrame: PStackFrame; var StackInfo: TStackInfo): Boolean;

     procedure StoreToList(const StackInfo: TStackInfo);

     procedure StoreToList(const StackInfo: TStackInfo);

     procedure TraceStackFrames;

     procedure TraceStackFrames;

@@ -715,7 +715,7 @@ type
 
       IncludeAddressOffset: Boolean = False; IncludeStartProcLineOffset: Boolean = False;

       IncludeAddressOffset: Boolean = False; IncludeStartProcLineOffset: Boolean = False;

       IncludeVAddress: Boolean = False);

       IncludeVAddress: Boolean = False);

     property DelayedTrace: Boolean read FDelayedTrace;

     property DelayedTrace: Boolean read FDelayedTrace;

-    property Items[Index: Integer]: TJclStackInfoItem read GetItems; default;

+    property Items[Index: TJclListSize]: TJclStackInfoItem read GetItems; default;

     property IgnoreLevels: Integer read FIgnoreLevels;

     property IgnoreLevels: Integer read FIgnoreLevels;

     property Count: Integer read GetCount;

     property Count: Integer read GetCount;

     property Raw: Boolean read FRaw;

     property Raw: Boolean read FRaw;

@@ -812,13 +812,13 @@ type
 
   TJclExceptFrameList = class(TJclStackBaseList)

   TJclExceptFrameList = class(TJclStackBaseList)

   private

   private

     FIgnoreLevels: Integer;

     FIgnoreLevels: Integer;

-    function GetItems(Index: Integer): TJclExceptFrame;

+    function GetItems(Index: TJclListSize): TJclExceptFrame;

   protected

   protected

     function AddFrame(AFrame: PExcFrame): TJclExceptFrame;

     function AddFrame(AFrame: PExcFrame): TJclExceptFrame;

   public

   public

     constructor Create(AIgnoreLevels: Integer);

     constructor Create(AIgnoreLevels: Integer);

     procedure TraceExceptionFrames;

     procedure TraceExceptionFrames;

-    property Items[Index: Integer]: TJclExceptFrame read GetItems;

+    property Items[Index: TJclListSize]: TJclExceptFrame read GetItems;

     property IgnoreLevels: Integer read FIgnoreLevels write FIgnoreLevels;

     property IgnoreLevels: Integer read FIgnoreLevels write FIgnoreLevels;

   end;

   end;

 

 

@@ -1303,7 +1303,7 @@ begin
 
     Add(Result);

     Add(Result);

 end;

 end;

 

 

-function TJclModuleInfoList.GetItems(Index: Integer): TJclModuleInfo;

+function TJclModuleInfoList.GetItems(Index: TJclListSize): TJclModuleInfo;

 begin

 begin

   Result := TJclModuleInfo(Get(Index));

   Result := TJclModuleInfo(Get(Index));

 end;

 end;

@@ -3987,7 +3987,7 @@ begin
 
   end;

   end;

 end;

 end;

 

 

-function TJclDebugInfoList.GetItems(Index: Integer): TJclDebugInfoSource;

+function TJclDebugInfoList.GetItems(Index: TJclListSize): TJclDebugInfoSource;

 begin

 begin

   Result := TJclDebugInfoSource(Get(Index));

   Result := TJclDebugInfoSource(Get(Index));

 end;

 end;

@@ -5816,7 +5816,7 @@ begin
 
   end;

   end;

 end;

 end;

 

 

-function TJclStackInfoList.GetItems(Index: Integer): TJclStackInfoItem;

+function TJclStackInfoList.GetItems(Index: TJclListSize): TJclStackInfoItem;

 begin

 begin

   ForceStackTracing;

   ForceStackTracing;

   Result := TJclStackInfoItem(Get(Index));

   Result := TJclStackInfoItem(Get(Index));

@@ -6833,7 +6833,7 @@ begin
 
   Add(Result);

   Add(Result);

 end;

 end;

 

 

-function TJclExceptFrameList.GetItems(Index: Integer): TJclExceptFrame;

+function TJclExceptFrameList.GetItems(Index: TJclListSize): TJclExceptFrame;

 begin

 begin

   Result := TJclExceptFrame(Get(Index));

   Result := TJclExceptFrame(Get(Index));

 end;

 end;

+ 24 - 24
source/packages/jcl/JclPeImage.pas
View File 

@@ -152,7 +152,7 @@ type
 
     FThunkData: Pointer;

     FThunkData: Pointer;

     function GetCount: Integer;

     function GetCount: Integer;

     function GetFileName: TFileName;

     function GetFileName: TFileName;

-    function GetItems(Index: Integer): TJclPeImportFuncItem;

+    function GetItems(Index: TJclListSize): TJclPeImportFuncItem;

     function GetName: string;

     function GetName: string;

     function GetThunkData32: PImageThunkData32;

     function GetThunkData32: PImageThunkData32;

     function GetThunkData64: PImageThunkData64;

     function GetThunkData64: PImageThunkData64;

@@ -172,7 +172,7 @@ type
 
     property ImportDescriptor: Pointer read FImportDescriptor;

     property ImportDescriptor: Pointer read FImportDescriptor;

     property ImportDirectoryIndex: Integer read FImportDirectoryIndex;

     property ImportDirectoryIndex: Integer read FImportDirectoryIndex;

     property ImportKind: TJclPeImportKind read FImportKind;

     property ImportKind: TJclPeImportKind read FImportKind;

-    property Items[Index: Integer]: TJclPeImportFuncItem read GetItems; default;

+    property Items[Index: TJclListSize]: TJclPeImportFuncItem read GetItems; default;

     property Name: string read GetName;

     property Name: string read GetName;

     property OriginalName: string read FName;

     property OriginalName: string read FName;

     // use the following properties

     // use the following properties

@@ -193,7 +193,7 @@ type
 
     FUniqueNamesList: TStringList;

     FUniqueNamesList: TStringList;

     function GetAllItemCount: Integer;

     function GetAllItemCount: Integer;

     function GetAllItems(Index: Integer): TJclPeImportFuncItem;

     function GetAllItems(Index: Integer): TJclPeImportFuncItem;

-    function GetItems(Index: Integer): TJclPeImportLibItem;

+    function GetItems(Index: TJclListSize): TJclPeImportLibItem;

     function GetUniqueLibItemCount: Integer;

     function GetUniqueLibItemCount: Integer;

     function GetUniqueLibItems(Index: Integer): TJclPeImportLibItem;

     function GetUniqueLibItems(Index: Integer): TJclPeImportLibItem;

     function GetUniqueLibNames(Index: Integer): string;

     function GetUniqueLibNames(Index: Integer): string;

@@ -214,7 +214,7 @@ type
 
     property AllItems[Index: Integer]: TJclPeImportFuncItem read GetAllItems;

     property AllItems[Index: Integer]: TJclPeImportFuncItem read GetAllItems;

     property AllItemCount: Integer read GetAllItemCount;

     property AllItemCount: Integer read GetAllItemCount;

     property FilterModuleName: string read FFilterModuleName write SetFilterModuleName;

     property FilterModuleName: string read FFilterModuleName write SetFilterModuleName;

-    property Items[Index: Integer]: TJclPeImportLibItem read GetItems; default;

+    property Items[Index: TJclListSize]: TJclPeImportLibItem read GetItems; default;

     property LinkerProducer: TJclPeLinkerProducer read FLinkerProducer;

     property LinkerProducer: TJclPeLinkerProducer read FLinkerProducer;

     property UniqueLibItemCount: Integer read GetUniqueLibItemCount;

     property UniqueLibItemCount: Integer read GetUniqueLibItemCount;

     property UniqueLibItemFromName[const Name: string]: TJclPeImportLibItem read GetUniqueLibItemFromName;

     property UniqueLibItemFromName[const Name: string]: TJclPeImportLibItem read GetUniqueLibItemFromName;

@@ -279,7 +279,7 @@ type
 
     FSorted: Boolean;

     FSorted: Boolean;

     FTotalResolveCheck: TJclPeResolveCheck;

     FTotalResolveCheck: TJclPeResolveCheck;

     function GetForwardedLibsList: TStrings;

     function GetForwardedLibsList: TStrings;

-    function GetItems(Index: Integer): TJclPeExportFuncItem;

+    function GetItems(Index: TJclListSize): TJclPeExportFuncItem;

     function GetItemFromAddress(Address: DWORD): TJclPeExportFuncItem;

     function GetItemFromAddress(Address: DWORD): TJclPeExportFuncItem;

     function GetItemFromOrdinal(Ordinal: DWORD): TJclPeExportFuncItem;

     function GetItemFromOrdinal(Ordinal: DWORD): TJclPeExportFuncItem;

     function GetItemFromName(const Name: string): TJclPeExportFuncItem;

     function GetItemFromName(const Name: string): TJclPeExportFuncItem;

@@ -304,7 +304,7 @@ type
 
     property ExportDir: PImageExportDirectory read FExportDir;

     property ExportDir: PImageExportDirectory read FExportDir;

     property ForwardedLibsList: TStrings read GetForwardedLibsList;

     property ForwardedLibsList: TStrings read GetForwardedLibsList;

     property FunctionCount: DWORD read FFunctionCount;

     property FunctionCount: DWORD read FFunctionCount;

-    property Items[Index: Integer]: TJclPeExportFuncItem read GetItems; default;

+    property Items[Index: TJclListSize]: TJclPeExportFuncItem read GetItems; default;

     property ItemFromAddress[Address: DWORD]: TJclPeExportFuncItem read GetItemFromAddress;

     property ItemFromAddress[Address: DWORD]: TJclPeExportFuncItem read GetItemFromAddress;

     property ItemFromName[const Name: string]: TJclPeExportFuncItem read GetItemFromName;

     property ItemFromName[const Name: string]: TJclPeExportFuncItem read GetItemFromName;

     property ItemFromOrdinal[Ordinal: DWORD]: TJclPeExportFuncItem read GetItemFromOrdinal;

     property ItemFromOrdinal[Ordinal: DWORD]: TJclPeExportFuncItem read GetItemFromOrdinal;

@@ -399,7 +399,7 @@ type
 
   private

   private

     FDirectory: PImageResourceDirectory;

     FDirectory: PImageResourceDirectory;

     FParentItem: TJclPeResourceItem;

     FParentItem: TJclPeResourceItem;

-    function GetItems(Index: Integer): TJclPeResourceItem;

+    function GetItems(Index: TJclListSize): TJclPeResourceItem;

   protected

   protected

     procedure CreateList(AParentItem: TJclPeResourceItem);

     procedure CreateList(AParentItem: TJclPeResourceItem);

   public

   public

@@ -407,7 +407,7 @@ type
 
       ADirectory: PImageResourceDirectory);

       ADirectory: PImageResourceDirectory);

     function FindName(const Name: string): TJclPeResourceItem;

     function FindName(const Name: string): TJclPeResourceItem;

     property Directory: PImageResourceDirectory read FDirectory;

     property Directory: PImageResourceDirectory read FDirectory;

-    property Items[Index: Integer]: TJclPeResourceItem read GetItems; default;

+    property Items[Index: TJclListSize]: TJclPeResourceItem read GetItems; default;

     property ParentItem: TJclPeResourceItem read FParentItem;

     property ParentItem: TJclPeResourceItem read FParentItem;

   end;

   end;

 

 

@@ -450,7 +450,7 @@ type
 
   TJclPeRelocList = class(TJclPeImageBaseList)

   TJclPeRelocList = class(TJclPeImageBaseList)

   private

   private

     FAllItemCount: Integer;

     FAllItemCount: Integer;

-    function GetItems(Index: Integer): TJclPeRelocEntry;

+    function GetItems(Index: TJclListSize): TJclPeRelocEntry;

     function GetAllItems(Index: Integer): TJclPeRelocation;

     function GetAllItems(Index: Integer): TJclPeRelocation;

   protected

   protected

     procedure CreateList;

     procedure CreateList;

@@ -458,19 +458,19 @@ type
 
     constructor Create(AImage: TJclPeImage);

     constructor Create(AImage: TJclPeImage);

     property AllItems[Index: Integer]: TJclPeRelocation read GetAllItems;

     property AllItems[Index: Integer]: TJclPeRelocation read GetAllItems;

     property AllItemCount: Integer read FAllItemCount;

     property AllItemCount: Integer read FAllItemCount;

-    property Items[Index: Integer]: TJclPeRelocEntry read GetItems; default;

+    property Items[Index: TJclListSize]: TJclPeRelocEntry read GetItems; default;

   end;

   end;

 

 

   // Debug section related classes

   // Debug section related classes

   TJclPeDebugList = class(TJclPeImageBaseList)

   TJclPeDebugList = class(TJclPeImageBaseList)

   private

   private

-    function GetItems(Index: Integer): TImageDebugDirectory;

+    function GetItems(Index: TJclListSize): TImageDebugDirectory;

     function IsTD32DebugInfo(DebugDir: PImageDebugDirectory): Boolean;

     function IsTD32DebugInfo(DebugDir: PImageDebugDirectory): Boolean;

   protected

   protected

     procedure CreateList;

     procedure CreateList;

   public

   public

     constructor Create(AImage: TJclPeImage);

     constructor Create(AImage: TJclPeImage);

-    property Items[Index: Integer]: TImageDebugDirectory read GetItems; default;

+    property Items[Index: TJclListSize]: TImageDebugDirectory read GetItems; default;

   end;

   end;

 

 

   // Certificates section related classes

   // Certificates section related classes

@@ -486,12 +486,12 @@ type
 
 

 

   TJclPeCertificateList = class(TJclPeImageBaseList)

   TJclPeCertificateList = class(TJclPeImageBaseList)

   private

   private

-    function GetItems(Index: Integer): TJclPeCertificate;

+    function GetItems(Index: TJclListSize): TJclPeCertificate;

   protected

   protected

     procedure CreateList;

     procedure CreateList;

   public

   public

     constructor Create(AImage: TJclPeImage);

     constructor Create(AImage: TJclPeImage);

-    property Items[Index: Integer]: TJclPeCertificate read GetItems; default;

+    property Items[Index: TJclListSize]: TJclPeCertificate read GetItems; default;

   end;

   end;

 

 

   // Common Language Runtime section related classes

   // Common Language Runtime section related classes

@@ -1045,7 +1045,7 @@ type
 
 

 

   TJclPeMapImgHooks = class(TObjectList)

   TJclPeMapImgHooks = class(TObjectList)

   private

   private

-    function GetItems(Index: Integer): TJclPeMapImgHookItem;

+    function GetItems(Index: TJclListSize): TJclPeMapImgHookItem;

     function GetItemFromOriginalAddress(OriginalAddress: Pointer): TJclPeMapImgHookItem;

     function GetItemFromOriginalAddress(OriginalAddress: Pointer): TJclPeMapImgHookItem;

     function GetItemFromNewAddress(NewAddress: Pointer): TJclPeMapImgHookItem;

     function GetItemFromNewAddress(NewAddress: Pointer): TJclPeMapImgHookItem;

   public

   public

@@ -1057,7 +1057,7 @@ type
 
     procedure UnhookAll;

     procedure UnhookAll;

     function UnhookByNewAddress(NewAddress: Pointer): Boolean;

     function UnhookByNewAddress(NewAddress: Pointer): Boolean;

     procedure UnhookByBaseAddress(BaseAddress: Pointer);

     procedure UnhookByBaseAddress(BaseAddress: Pointer);

-    property Items[Index: Integer]: TJclPeMapImgHookItem read GetItems; default;

+    property Items[Index: TJclListSize]: TJclPeMapImgHookItem read GetItems; default;

     property ItemFromOriginalAddress[OriginalAddress: Pointer]: TJclPeMapImgHookItem read GetItemFromOriginalAddress;

     property ItemFromOriginalAddress[OriginalAddress: Pointer]: TJclPeMapImgHookItem read GetItemFromOriginalAddress;

     property ItemFromNewAddress[NewAddress: Pointer]: TJclPeMapImgHookItem read GetItemFromNewAddress;

     property ItemFromNewAddress[NewAddress: Pointer]: TJclPeMapImgHookItem read GetItemFromNewAddress;

   end;

   end;

@@ -1639,7 +1639,7 @@ begin
 
   Result := Image.ExpandModuleName(Name);

   Result := Image.ExpandModuleName(Name);

 end;

 end;

 

 

-function TJclPeImportLibItem.GetItems(Index: Integer): TJclPeImportFuncItem;

+function TJclPeImportLibItem.GetItems(Index: TJclListSize): TJclPeImportFuncItem;

 begin

 begin

   Result := TJclPeImportFuncItem(Get(Index));

   Result := TJclPeImportFuncItem(Get(Index));

 end;

 end;

@@ -1899,7 +1899,7 @@ begin
 
   Result := TJclPeImportFuncItem(FAllItemsList[Index]);

   Result := TJclPeImportFuncItem(FAllItemsList[Index]);

 end;

 end;

 

 

-function TJclPeImportList.GetItems(Index: Integer): TJclPeImportLibItem;

+function TJclPeImportList.GetItems(Index: TJclListSize): TJclPeImportLibItem;

 begin

 begin

   Result := TJclPeImportLibItem(Get(Index));

   Result := TJclPeImportLibItem(Get(Index));

 end;

 end;

@@ -2512,7 +2512,7 @@ begin
 
     end;

     end;

 end;

 end;

 

 

-function TJclPeExportFuncList.GetItems(Index: Integer): TJclPeExportFuncItem;

+function TJclPeExportFuncList.GetItems(Index: TJclListSize): TJclPeExportFuncItem;

 begin

 begin

   Result := TJclPeExportFuncItem(Get(Index));

   Result := TJclPeExportFuncItem(Get(Index));

 end;

 end;

@@ -2803,7 +2803,7 @@ begin
 
     end;

     end;

 end;

 end;

 

 

-function TJclPeResourceList.GetItems(Index: Integer): TJclPeResourceItem;

+function TJclPeResourceList.GetItems(Index: TJclListSize): TJclPeResourceItem;

 begin

 begin

   Result := TJclPeResourceItem(Get(Index));

   Result := TJclPeResourceItem(Get(Index));

 end;

 end;

@@ -3004,7 +3004,7 @@ begin
 
   end;

   end;

 end;

 end;

 

 

-function TJclPeRelocList.GetItems(Index: Integer): TJclPeRelocEntry;

+function TJclPeRelocList.GetItems(Index: TJclListSize): TJclPeRelocEntry;

 begin

 begin

   Result := TJclPeRelocEntry(Get(Index));

   Result := TJclPeRelocEntry(Get(Index));

 end;

 end;

@@ -3060,7 +3060,7 @@ begin
 
   end;

   end;

 end;

 end;

 

 

-function TJclPeDebugList.GetItems(Index: Integer): TImageDebugDirectory;

+function TJclPeDebugList.GetItems(Index: TJclListSize): TImageDebugDirectory;

 begin

 begin

   Result := PImageDebugDirectory(Get(Index))^;

   Result := PImageDebugDirectory(Get(Index))^;

 end;

 end;

@@ -3102,7 +3102,7 @@ begin
 
   end;

   end;

 end;

 end;

 

 

-function TJclPeCertificateList.GetItems(Index: Integer): TJclPeCertificate;

+function TJclPeCertificateList.GetItems(Index: TJclListSize): TJclPeCertificate;

 begin

 begin

   Result := TJclPeCertificate(Get(Index));

   Result := TJclPeCertificate(Get(Index));

 end;

 end;

@@ -6480,7 +6480,7 @@ begin
 
     end;

     end;

 end;

 end;

 

 

-function TJclPeMapImgHooks.GetItems(Index: Integer): TJclPeMapImgHookItem;

+function TJclPeMapImgHooks.GetItems(Index: TJclListSize): TJclPeMapImgHookItem;

 begin

 begin

   Result := TJclPeMapImgHookItem(Get(Index));

   Result := TJclPeMapImgHookItem(Get(Index));

 end;

 end;

+ 297 - 230
source/packages/jcl/JclSysInfo.pas
View File 

@@ -276,7 +276,9 @@ type
 
    (paUnknown, // unknown processor

    (paUnknown, // unknown processor

     pax8632,   // x86 32 bit processors (some P4, Celeron, Athlon and older)

     pax8632,   // x86 32 bit processors (some P4, Celeron, Athlon and older)

     pax8664,   // x86 64 bit processors (latest P4, Celeron and Athlon64)

     pax8664,   // x86 64 bit processors (latest P4, Celeron and Athlon64)

-    paIA64);   // Itanium processors

+    paIA64,    // Itanium processors

+    paARM,     // ARM 32 bit processors

+    paARM64);  // ARM 64 bit processors

 

 

 var

 var

   { in case of additions, don't forget to update initialization section! }

   { in case of additions, don't forget to update initialization section! }

@@ -322,6 +324,12 @@ const
 
   {$EXTERNALSYM PROCESSOR_ARCHITECTURE_IA32_ON_WIN64}

   {$EXTERNALSYM PROCESSOR_ARCHITECTURE_IA32_ON_WIN64}

   PROCESSOR_ARCHITECTURE_IA64 = 6;

   PROCESSOR_ARCHITECTURE_IA64 = 6;

   {$EXTERNALSYM PROCESSOR_ARCHITECTURE_IA64}

   {$EXTERNALSYM PROCESSOR_ARCHITECTURE_IA64}

+  PROCESSOR_ARCHITECTURE_ARM = 5;

+  {$EXTERNALSYM PROCESSOR_ARCHITECTURE_ARM}

+  PROCESSOR_ARCHITECTURE_ARM64 = 12;

+  {$EXTERNALSYM PROCESSOR_ARCHITECTURE_ARM64}

+  PROCESSOR_ARCHITECTURE_UNKNOWN = $FFFF;

+  {$EXTERNALSYM PROCESSOR_ARCHITECTURE_UNKNOWN}

 

 

 const

 const

   Windows11InitialBuildNumber = 22000;

   Windows11InitialBuildNumber = 22000;

@@ -3436,9 +3444,9 @@ end;
 
 type

 type

   PEnumWndStruct = ^TEnumWndStruct;

   PEnumWndStruct = ^TEnumWndStruct;

   TEnumWndStruct = record

   TEnumWndStruct = record

-      PID: DWORD;

-      WndClassName: string;

-      ResultWnd: HWND;

+    PID: DWORD;

+    WndClassName: string;

+    ResultWnd: HWND;

   end;

   end;

 

 

 function EnumPidWinProc(Wnd: HWND; Enum: PEnumWndStruct): BOOL; stdcall;

 function EnumPidWinProc(Wnd: HWND; Enum: PEnumWndStruct): BOOL; stdcall;

@@ -3453,8 +3461,7 @@ begin
 
   begin

   begin

     CLen := Length(Enum.WndClassName)+1;

     CLen := Length(Enum.WndClassName)+1;

     C := StrAlloc(CLen);

     C := StrAlloc(CLen);

-    if (GetClassName(Wnd, C, CLen) > 0) then

-      if (C = Enum.WndClassName) then

+    if (GetClassName(Wnd, C, CLen) > 0) and (C = Enum.WndClassName) then

     begin

     begin

       Result := False;

       Result := False;

       Enum.ResultWnd := Wnd;

       Enum.ResultWnd := Wnd;

@@ -3590,88 +3597,88 @@ begin
 
               end;

               end;

           end;

           end;

         6:

         6:

-        begin

-          // Starting with Windows 8.1, the GetVersion(Ex) API is deprecated and will detect the

-          // application as Windows 8 (kernel version 6.2) until an application manifest is included

-          // See https://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx

-

-          if Win32MinorVersion = 2 then

           begin

           begin

-            ProductName := GetWindowsProductName;

-            if (Pos(RsOSVersionWin81, ProductName) = 1) or (Pos(RsOSVersionWinServer2012R2, ProductName) = 1) then

-              Win32MinorVersionEx := 3 // Windows 8.1 and Windows Server 2012R2

-            else

-            if (Pos(RsOSVersionWin8, ProductName) = 1) or (Pos(RsOSVersionWinServer2012, ProductName) = 1) then

-              Win32MinorVersionEx := 2 // Windows 8 and Windows Server 2012

-            else

+            // Starting with Windows 8.1, the GetVersion(Ex) API is deprecated and will detect the

+            // application as Windows 8 (kernel version 6.2) until an application manifest is included

+            // See https://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx

+

+            if Win32MinorVersion = 2 then

             begin

             begin

-              Win32MajorVersionEx := GetWindowsMajorVersionNumber;

-              if Win32MajorVersionEx = 6 then

-                 Win32MinorVersionEx := 4 // Windows 10 (builds < 9926) and Windows Server 2016 (builds < 10074)

+              ProductName := GetWindowsProductName;

+              if (Pos(RsOSVersionWin81, ProductName) = 1) or (Pos(RsOSVersionWinServer2012R2, ProductName) = 1) then

+                Win32MinorVersionEx := 3 // Windows 8.1 and Windows Server 2012R2

               else

               else

-              if Win32MajorVersionEx = 10 then

-                 Win32MinorVersionEx := -1 // Windows 10 (builds >= 9926) and Windows Server 2016/2019/2022 (builds >= 10074), set to -1 to escape case block

+              if (Pos(RsOSVersionWin8, ProductName) = 1) or (Pos(RsOSVersionWinServer2012, ProductName) = 1) then

+                Win32MinorVersionEx := 2 // Windows 8 and Windows Server 2012

               else

               else

-                 Win32MinorVersionEx := Win32MinorVersion;

-            end;

-          end

-          else

-            Win32MinorVersionEx := Win32MinorVersion;

-

-          case Win32MinorVersionEx of

-            0:

-              begin

-                // Windows Vista and Windows Server 2008

-                OSVersionInfoEx.dwOSVersionInfoSize := SizeOf(OSVersionInfoEx);

-                if GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then

-                  Result := wvWinVista

-                else

-                  Result := wvWinServer2008;

-              end;

-            1:

               begin

               begin

-                // Windows 7 and Windows Server 2008 R2

-                OSVersionInfoEx.dwOSVersionInfoSize := SizeOf(OSVersionInfoEx);

-                if GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then

-                  Result := wvWin7

+                Win32MajorVersionEx := GetWindowsMajorVersionNumber;

+                if Win32MajorVersionEx = 6 then

+                  Win32MinorVersionEx := 4 // Windows 10 (builds < 9926) and Windows Server 2016 (builds < 10074)

                 else

                 else

-                  Result := wvWinServer2008R2;

-              end;

-            2:

-              begin

-                // Windows 8 and Windows Server 2012

-                OSVersionInfoEx.dwOSVersionInfoSize := SizeOf(OSVersionInfoEx);

-                if GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then

-                  Result := wvWin8

+                if Win32MajorVersionEx = 10 then

+                  Win32MinorVersionEx := -1 // Windows 10 (builds >= 9926) and Windows Server 2016/2019/2022 (builds >= 10074), set to -1 to escape case block

                 else

                 else

-                  Result := wvWinServer2012;

-              end;

-            3:

-              begin

-                // Windows 8.1 and Windows Server 2012 R2

-                OSVersionInfoEx.dwOSVersionInfoSize := SizeOf(OSVersionInfoEx);

-                if GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then

-                  Result := wvWin81

-                else

-                  Result := wvWinServer2012R2;

-              end;

-            4:

-              begin

-                // Windows 10 (builds < 9926) and Windows Server 2016 (builds < 10074)

-                OSVersionInfoEx.dwOSVersionInfoSize := SizeOf(OSVersionInfoEx);

-                if GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then

-                  Result := wvWin10

-                else

-                  Result := wvWinServer2016;

+                  Win32MinorVersionEx := Win32MinorVersion;

               end;

               end;

+            end

+            else

+              Win32MinorVersionEx := Win32MinorVersion;

+

+            case Win32MinorVersionEx of

+              0:

+                begin

+                  // Windows Vista and Windows Server 2008

+                  OSVersionInfoEx.dwOSVersionInfoSize := SizeOf(OSVersionInfoEx);

+                  if GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then

+                    Result := wvWinVista

+                  else

+                    Result := wvWinServer2008;

+                end;

+              1:

+                begin

+                  // Windows 7 and Windows Server 2008 R2

+                  OSVersionInfoEx.dwOSVersionInfoSize := SizeOf(OSVersionInfoEx);

+                  if GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then

+                    Result := wvWin7

+                  else

+                    Result := wvWinServer2008R2;

+                end;

+              2:

+                begin

+                  // Windows 8 and Windows Server 2012

+                  OSVersionInfoEx.dwOSVersionInfoSize := SizeOf(OSVersionInfoEx);

+                  if GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then

+                    Result := wvWin8

+                  else

+                    Result := wvWinServer2012;

+                end;

+              3:

+                begin

+                  // Windows 8.1 and Windows Server 2012 R2

+                  OSVersionInfoEx.dwOSVersionInfoSize := SizeOf(OSVersionInfoEx);

+                  if GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then

+                    Result := wvWin81

+                  else

+                    Result := wvWinServer2012R2;

+                end;

+              4:

+                begin

+                  // Windows 10 (builds < 9926) and Windows Server 2016 (builds < 10074)

+                  OSVersionInfoEx.dwOSVersionInfoSize := SizeOf(OSVersionInfoEx);

+                  if GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then

+                    Result := wvWin10

+                  else

+                    Result := wvWinServer2016;

+                end;

+            end;

           end;

           end;

-        end;

         10:

         10:

-        begin

-          // Windows 10 if manifest is present

-          Win32MajorVersionEx := Win32MajorVersion;

-          Win32MinorVersionEx := Win32MinorVersion;

-        end;

+          begin

+            // Windows 10 if manifest is present

+            Win32MajorVersionEx := Win32MajorVersion;

+            Win32MinorVersionEx := Win32MinorVersion;

+          end;

       end;

       end;

   end;

   end;

 

 

@@ -3705,7 +3712,7 @@ begin
 
                   2009:

                   2009:

                     Result := wvWinServer2022;

                     Result := wvWinServer2022;

                 else

                 else

-                    Result := wvWinServer;

+                  Result := wvWinServer;

                 end;

                 end;

               end;

               end;

             end;

             end;

@@ -3729,111 +3736,111 @@ begin
 
   begin

   begin

    // Windows XP Editions

    // Windows XP Editions

    if Pos('Home Edition N', Edition) > 0 then

    if Pos('Home Edition N', Edition) > 0 then

-      Result := weWinXPHomeN

+     Result := weWinXPHomeN

    else

    else

    if Pos('Professional N', Edition) > 0 then

    if Pos('Professional N', Edition) > 0 then

-      Result := weWinXPProN

+     Result := weWinXPProN

    else

    else

    if Pos('Home Edition K', Edition) > 0 then

    if Pos('Home Edition K', Edition) > 0 then

-      Result := weWinXPHomeK

+     Result := weWinXPHomeK

    else

    else

    if Pos('Professional K', Edition) > 0 then

    if Pos('Professional K', Edition) > 0 then

-      Result := weWinXPProK

+     Result := weWinXPProK

    else

    else

    if Pos('Home Edition KN', Edition) > 0 then

    if Pos('Home Edition KN', Edition) > 0 then

-      Result := weWinXPHomeKN

+     Result := weWinXPHomeKN

    else

    else

    if Pos('Professional KN', Edition) > 0 then

    if Pos('Professional KN', Edition) > 0 then

-      Result := weWinXPProKN

+     Result := weWinXPProKN

    else

    else

    if Pos('Home', Edition) > 0 then

    if Pos('Home', Edition) > 0 then

-      Result := weWinXPHome

+     Result := weWinXPHome

    else

    else

    if Pos('Professional', Edition) > 0 then

    if Pos('Professional', Edition) > 0 then

-      Result := weWinXPPro

+     Result := weWinXPPro

    else

    else

    if Pos('Starter', Edition) > 0 then

    if Pos('Starter', Edition) > 0 then

-      Result := weWinXPStarter

+     Result := weWinXPStarter

    else

    else

    if Pos('Media Center', Edition) > 0 then

    if Pos('Media Center', Edition) > 0 then

-      Result := weWinXPMediaCenter

+     Result := weWinXPMediaCenter

    else

    else

    if Pos('Tablet', Edition) > 0 then

    if Pos('Tablet', Edition) > 0 then

-      Result := weWinXPTablet;

+     Result := weWinXPTablet;

   end

   end

   else

   else

   if (Pos('Windows Vista', Edition) = 1) then

   if (Pos('Windows Vista', Edition) = 1) then

   begin

   begin

    // Windows Vista Editions

    // Windows Vista Editions

    if Pos('Starter', Edition) > 0 then

    if Pos('Starter', Edition) > 0 then

-      Result := weWinVistaStarter

+     Result := weWinVistaStarter

    else

    else

    if Pos('Home Basic N', Edition) > 0 then

    if Pos('Home Basic N', Edition) > 0 then

-      Result := weWinVistaHomeBasicN

+     Result := weWinVistaHomeBasicN

    else

    else

    if Pos('Home Basic', Edition) > 0 then

    if Pos('Home Basic', Edition) > 0 then

-      Result := weWinVistaHomeBasic

+     Result := weWinVistaHomeBasic

    else

    else

    if Pos('Home Premium', Edition) > 0 then

    if Pos('Home Premium', Edition) > 0 then

-      Result := weWinVistaHomePremium

+     Result := weWinVistaHomePremium

    else

    else

    if Pos('Business N', Edition) > 0 then

    if Pos('Business N', Edition) > 0 then

-      Result := weWinVistaBusinessN

+     Result := weWinVistaBusinessN

    else

    else

    if Pos('Business', Edition) > 0 then

    if Pos('Business', Edition) > 0 then

-      Result := weWinVistaBusiness

+     Result := weWinVistaBusiness

    else

    else

    if Pos('Enterprise', Edition) > 0 then

    if Pos('Enterprise', Edition) > 0 then

-      Result := weWinVistaEnterprise

+     Result := weWinVistaEnterprise

    else

    else

    if Pos('Ultimate', Edition) > 0 then

    if Pos('Ultimate', Edition) > 0 then

-      Result := weWinVistaUltimate;

+     Result := weWinVistaUltimate;

   end

   end

   else

   else

   if Pos('Windows 7', Edition) = 1 then

   if Pos('Windows 7', Edition) = 1 then

   begin

   begin

    // Windows 7 Editions

    // Windows 7 Editions

    if Pos('Starter', Edition) > 0 then

    if Pos('Starter', Edition) > 0 then

-      Result := weWin7Starter

+     Result := weWin7Starter

    else

    else

    if Pos('Home Basic', Edition) > 0 then

    if Pos('Home Basic', Edition) > 0 then

-      Result := weWin7HomeBasic

+     Result := weWin7HomeBasic

    else

    else

    if Pos('Home Premium', Edition) > 0 then

    if Pos('Home Premium', Edition) > 0 then

-      Result := weWin7HomePremium

+     Result := weWin7HomePremium

    else

    else

    if Pos('Professional', Edition) > 0 then

    if Pos('Professional', Edition) > 0 then

-      Result := weWin7Professional

+     Result := weWin7Professional

    else

    else

    if Pos('Enterprise', Edition) > 0 then

    if Pos('Enterprise', Edition) > 0 then

-      Result := weWin7Enterprise

+     Result := weWin7Enterprise

    else

    else

    if Pos('Ultimate', Edition) > 0 then

    if Pos('Ultimate', Edition) > 0 then

-      Result := weWin7Ultimate;

+     Result := weWin7Ultimate;

   end

   end

   else

   else

   if Pos('Windows 8.1', Edition) = 1 then

   if Pos('Windows 8.1', Edition) = 1 then

   begin

   begin

    // Windows 8.1 Editions

    // Windows 8.1 Editions

    if Pos('Pro', Edition) > 0 then

    if Pos('Pro', Edition) > 0 then

-      Result := weWin81Pro

+     Result := weWin81Pro

    else

    else

    if Pos('Enterprise', Edition) > 0 then

    if Pos('Enterprise', Edition) > 0 then

-      Result := weWin81Enterprise

+     Result := weWin81Enterprise

    else

    else

-      Result := weWin81;

+     Result := weWin81;

   end

   end

   else

   else

   if Pos('Windows 8', Edition) = 1 then

   if Pos('Windows 8', Edition) = 1 then

   begin

   begin

    // Windows 8 Editions

    // Windows 8 Editions

    if Pos('Pro', Edition) > 0 then

    if Pos('Pro', Edition) > 0 then

-      Result := weWin8Pro

+     Result := weWin8Pro

    else

    else

    if Pos('Enterprise', Edition) > 0 then

    if Pos('Enterprise', Edition) > 0 then

-      Result := weWin8Enterprise

+     Result := weWin8Enterprise

    else

    else

-      Result := weWin8;

+     Result := weWin8;

   end

   end

   else

   else

   if Pos('Windows RT 8.1', Edition) = 1 then

   if Pos('Windows RT 8.1', Edition) = 1 then

@@ -3846,20 +3853,19 @@ begin
 
   begin

   begin

    // Windows 10/11 Editions

    // Windows 10/11 Editions

    if Pos('Home', Edition) > 0 then

    if Pos('Home', Edition) > 0 then

-      Result := weWin10Home

+     Result := weWin10Home

    else

    else

    if Pos('Pro', Edition) > 0 then

    if Pos('Pro', Edition) > 0 then

-      Result := weWin10Pro

+     Result := weWin10Pro

    else

    else

    if Pos('Enterprise', Edition) > 0 then

    if Pos('Enterprise', Edition) > 0 then

-      Result := weWin10Enterprise

+     Result := weWin10Enterprise

    else

    else

    if Pos('Education', Edition) > 0 then

    if Pos('Education', Edition) > 0 then

-      Result := weWin10Education

+     Result := weWin10Education

    else

    else

-      Result := weWin10;

-  end

-

+     Result := weWin10;

+  end;

 end;

 end;

 

 

 function NtProductType: TNtProductType;

 function NtProductType: TNtProductType;

@@ -4165,7 +4171,7 @@ begin
 
   // application as Windows 8 (kernel version 6.2) until an application manifest is included

   // application as Windows 8 (kernel version 6.2) until an application manifest is included

   // See https://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx

   // See https://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx

   if ((Win32MajorVersion = 6) and (Win32MinorVersion = 2)) or (Win32MajorVersion = 10) then

   if ((Win32MajorVersion = 6) and (Win32MinorVersion = 2)) or (Win32MajorVersion = 10) then

-    Result := StrToInt(ReadWindowsNTCurrentVersionStringValue('CurrentBuildNumber', IntToStr(Win32BuildNumber)))

+    Result := StrToIntDef(ReadWindowsNTCurrentVersionStringValue('CurrentBuildNumber', IntToStr(Win32BuildNumber)), Win32BuildNumber)

   else

   else

     Result := Win32BuildNumber;

     Result := Win32BuildNumber;

 end;

 end;

@@ -4173,6 +4179,7 @@ end;
 
 function GetWindowsMajorVersionNumber: Integer;

 function GetWindowsMajorVersionNumber: Integer;

 var

 var

   Ver: string;

   Ver: string;

+  I: Integer;

 begin

 begin

   // Starting with Windows 8.1, the GetVersion(Ex) API is deprecated and will detect the

   // Starting with Windows 8.1, the GetVersion(Ex) API is deprecated and will detect the

   // application as Windows 8 (kernel version 6.2) until an application manifest is included

   // application as Windows 8 (kernel version 6.2) until an application manifest is included

@@ -4185,7 +4192,11 @@ begin
 
     if Result = -1 then

     if Result = -1 then

     begin

     begin

       Ver := ReadWindowsNTCurrentVersionStringValue('CurrentVersion', IntToStr(Win32MajorVersion) + '.' + IntToStr(Win32MinorVersion));

       Ver := ReadWindowsNTCurrentVersionStringValue('CurrentVersion', IntToStr(Win32MajorVersion) + '.' + IntToStr(Win32MinorVersion));

-      Result := StrToIntDef(Copy(Ver, 1, Pos('.', Ver) - 1), 2); // don't use StrBefore because it uses StrCaseMap that may not be initialized yet

+      I := Pos('.', Ver);

+      if I > 0 then

+        Result := StrToIntDef(Copy(Ver, 1, I - 1), Win32MajorVersion) // don't use StrBefore because it uses StrCaseMap that may not be initialized yet

+      else

+        Result := StrToIntDef(Ver, Win32MajorVersion);

     end;

     end;

   end

   end

   else

   else

@@ -4195,6 +4206,7 @@ end;
 
 function GetWindowsMinorVersionNumber: Integer;

 function GetWindowsMinorVersionNumber: Integer;

 var

 var

   Ver: string;

   Ver: string;

+  I: Integer;

 begin

 begin

   // Starting with Windows 8.1, the GetVersion(Ex) API is deprecated and will detect the

   // Starting with Windows 8.1, the GetVersion(Ex) API is deprecated and will detect the

   // application as Windows 8 (kernel version 6.2) until an application manifest is included

   // application as Windows 8 (kernel version 6.2) until an application manifest is included

@@ -4207,7 +4219,11 @@ begin
 
     if Result = -1 then

     if Result = -1 then

     begin

     begin

       Ver := ReadWindowsNTCurrentVersionStringValue('CurrentVersion', IntToStr(Win32MajorVersion) + '.' + IntToStr(Win32MinorVersion));

       Ver := ReadWindowsNTCurrentVersionStringValue('CurrentVersion', IntToStr(Win32MajorVersion) + '.' + IntToStr(Win32MinorVersion));

-      Result := StrToIntDef(Copy(Ver, Pos('.', Ver) + 1, Length(Ver)), 2);  // don't use StrAfter because it uses StrCaseMap that may not be initialized yet

+      I := Pos('.', Ver);

+      if (I > 0) and (I < Length(Ver)) then

+        Result := StrToIntDef(Copy(Ver, I + 1, Length(Ver)), 2)  // don't use StrAfter because it uses StrCaseMap that may not be initialized yet

+      else

+        Result := 2;

     end;

     end;

   end

   end

   else

   else

@@ -4228,7 +4244,7 @@ var
 
   VersionInfo: TOSVersionInfoEx;

   VersionInfo: TOSVersionInfoEx;

 begin

 begin

   Result := 0;

   Result := 0;

-  if (Win32Platform = VER_PLATFORM_WIN32_NT) and (Win32MajorVersion >= 5) then

+  if (Win32Platform = VER_PLATFORM_WIN32_NT) and (Win32MajorVersion >= 5) then // 2000/XP and newer

   begin

   begin

     ResetMemory(VersionInfo, SizeOf(VersionInfo));

     ResetMemory(VersionInfo, SizeOf(VersionInfo));

     VersionInfo.dwOSVersionInfoSize := SizeOf(VersionInfo);

     VersionInfo.dwOSVersionInfoSize := SizeOf(VersionInfo);

@@ -4238,7 +4254,12 @@ begin
 
   else

   else

   begin

   begin

     SP := RegReadIntegerDef(HKEY_LOCAL_MACHINE, RegWindowsControl, 'CSDVersion', 0);

     SP := RegReadIntegerDef(HKEY_LOCAL_MACHINE, RegWindowsControl, 'CSDVersion', 0);

-    Result := StrToInt(IntToHex(SP, 4)) div 100;

+    try

+      Result := StrToInt(IntToHex(SP, 4)) div 100; // 0x0200 => 02.00 => 2

+    except

+      on EConvertError do

+        Result := 0;

+    end;

   end;

   end;

 end;

 end;

 

 

@@ -4280,45 +4301,67 @@ begin
 
   begin

   begin

     case GetWindowsReleaseId of

     case GetWindowsReleaseId of

       1507:

       1507:

-         Result := LoadResString(@RsOSVersionWin10);

+         Result := ''; // RTM

       1511:

       1511:

-         Result := LoadResString(@RsOSVersionWin10) + ' November Update';

+         Result := 'November Update';

       1607:

       1607:

-         Result := LoadResString(@RsOSVersionWin10) + ' Anniversary Update';

+         Result := 'Anniversary Update';

       1703:

       1703:

-         Result := LoadResString(@RsOSVersionWin10) + ' Creators Update';

+         Result := 'Creators Update';

       1709:

       1709:

-         Result := LoadResString(@RsOSVersionWin10) + ' Fall Creators Update';

+         Result := 'Fall Creators Update';

       1803:

       1803:

-         Result := LoadResString(@RsOSVersionWin10) + ' April 2018 Update';

+         Result := 'April 2018 Update';

       1809:

       1809:

-         Result := LoadResString(@RsOSVersionWin10) + ' October 2018 Update';

+         Result := 'October 2018 Update';

       1903:

       1903:

-         Result := LoadResString(@RsOSVersionWin10) + ' May 2019 Update';

+         Result := 'May 2019 Update';

       1909:

       1909:

-         Result := LoadResString(@RsOSVersionWin10) + ' November 2019 Update';

+         Result := 'November 2019 Update';

       2004:

       2004:

-         Result := LoadResString(@RsOSVersionWin10) + ' May 2020 Update';

+         Result := 'May 2020 Update';

       2009:

       2009:

          begin

          begin

            WindowsDisplayVersion := GetWindowsDisplayVersion;

            WindowsDisplayVersion := GetWindowsDisplayVersion;

            if WindowsDisplayVersion = '20H2' then

            if WindowsDisplayVersion = '20H2' then

-              Result := LoadResString(@RsOSVersionWin10) + ' October 2020 Update'

+             Result := 'October 2020 Update'

            else

            else

            if WindowsDisplayVersion = '21H1' then

            if WindowsDisplayVersion = '21H1' then

-              Result := LoadResString(@RsOSVersionWin10) + ' May 2021 Update'

+             Result := 'May 2021 Update'

            else

            else

            if WindowsDisplayVersion = '21H2' then

            if WindowsDisplayVersion = '21H2' then

-              Result := LoadResString(@RsOSVersionWin10) + ' November 2021 Update'

+             Result := 'November 2021 Update'

            else

            else

-              Result := LoadResString(@RsOSVersionWin10) + ' ' + WindowsDisplayVersion + ' Update';

+           if WindowsDisplayVersion = '22H2' then

+             Result := '2022 Update'

+           else

+             Result := WindowsDisplayVersion + ' Update';

          end

          end

     else

     else

-      Result := LoadResString(@RsOSVersionWin10) + ' ' + IntToStr(GetWindowsReleaseId) + ' Update';

+      Result := IntToStr(GetWindowsReleaseId) + ' Update';

     end;

     end;

+    Result := Trim(GetWindowsVersionString + ' ' + Result);

   end

   end

   else if IsWin11 then // And higher versions too?

   else if IsWin11 then // And higher versions too?

-    Result := GetWindowsVersionString + ' ' + GetWindowsDisplayVersion + ' Update'

+  begin

+    // WindowsReleaseId = 2009 for Win 11

+    Result := '';

+    WindowsDisplayVersion := GetWindowsDisplayVersion;

+    if WindowsDisplayVersion = '21H2' then

+      Result := '' // RTM

+    else

+    if WindowsDisplayVersion = '22H2' then

+      Result := '2022 Update'

+    else

+    if WindowsDisplayVersion = '23H2' then

+      Result := '2023 Update'

+    else

+    if WindowsDisplayVersion = '24H2' then

+      Result := '2024 Update'

+    else

+      Result := WindowsDisplayVersion + ' Update';

+    Result := Trim(GetWindowsVersionString + ' ' + Result);

+  end

   else

   else

     Result := '';

     Result := '';

 end;

 end;

@@ -4731,6 +4774,10 @@ begin
 
       Result := paIA64;

       Result := paIA64;

     PROCESSOR_ARCHITECTURE_AMD64:

     PROCESSOR_ARCHITECTURE_AMD64:

       Result := pax8664;

       Result := pax8664;

+    PROCESSOR_ARCHITECTURE_ARM:

+      Result := paARM;

+    PROCESSOR_ARCHITECTURE_ARM64:

+      Result := paARM64;

     else

     else

       Result := paUnknown;

       Result := paUnknown;

   end;

   end;

@@ -4738,7 +4785,7 @@ end;
 
 

 

 function IsWindows64: Boolean;

 function IsWindows64: Boolean;

 begin

 begin

-  Result := GetProcessorArchitecture in [paIA64, pax8664];

+  Result := GetProcessorArchitecture in [paIA64, pax8664, paARM64];

 end;

 end;

 

 

 function JclCheckWinVersion(Major, Minor: Integer): Boolean;

 function JclCheckWinVersion(Major, Minor: Integer): Boolean;

@@ -4988,6 +5035,7 @@ begin
 
   end;

   end;

 end;

 end;

 {$ENDIF MSWINDOWS}

 {$ENDIF MSWINDOWS}

+

 function ReadTimeStampCounter: Int64; assembler;

 function ReadTimeStampCounter: Int64; assembler;

 asm

 asm

         DW      $310F

         DW      $310F

@@ -5063,7 +5111,6 @@ begin
 
 end;

 end;

 {$ENDIF UNIX}

 {$ENDIF UNIX}

 {$IFDEF MSWINDOWS}

 {$IFDEF MSWINDOWS}

-

 var

 var

   T0, T1: Int64;

   T0, T1: Int64;

   CountFreq: Int64;

   CountFreq: Int64;

@@ -5184,7 +5231,16 @@ begin
 
     EnabledFeatures := $FFFFFFFF;

     EnabledFeatures := $FFFFFFFF;

     EnabledFeatures := EnabledFeatures shl 32;

     EnabledFeatures := EnabledFeatures shl 32;

     EnabledFeatures := EnabledFeatures or $FFFFFFFF;

     EnabledFeatures := EnabledFeatures or $FFFFFFFF;

-    EnabledFeatures := GetEnabledExtendedFeatures(EnabledFeatures);

+    try

+      EnabledFeatures := GetEnabledExtendedFeatures(EnabledFeatures);

+    except

+      on EJclError do

+      begin

+        // If the function doesn't exist (anymore) we shouldn't crash.

+        Result := [];

+        Exit;

+      end;

+    end;

     Result := [];

     Result := [];

     if (EnabledFeatures and XSTATE_MASK_LEGACY_FLOATING_POINT) <> 0 then

     if (EnabledFeatures and XSTATE_MASK_LEGACY_FLOATING_POINT) <> 0 then

       Include(Result, oefFPU);

       Include(Result, oefFPU);

@@ -5199,6 +5255,7 @@ end;
 
 {$ENDIF MSWINDOWS}

 {$ENDIF MSWINDOWS}

 

 

 function CPUID: TCpuInfo;

 function CPUID: TCpuInfo;

+

   function HasCPUIDInstruction: Boolean;

   function HasCPUIDInstruction: Boolean;

   const

   const

     ID_FLAG = $200000;

     ID_FLAG = $200000;

@@ -6389,9 +6446,13 @@ procedure UnloadSystemResourcesMeterLib;
 
 begin

 begin

   if ResmeterLibHandle <> 0 then

   if ResmeterLibHandle <> 0 then

   begin

   begin

-    FreeLibrary(ResmeterLibHandle);

-    ResmeterLibHandle := 0;

     @MyGetFreeSystemResources := nil;

     @MyGetFreeSystemResources := nil;

+    try

+      FreeLibrary(ResmeterLibHandle);

+    except

+      // Ignore any exception from the DLL's DllMain(DLL_PROCESS_DETACH) function

+    end;

+    ResmeterLibHandle := 0;

   end;

   end;

 end;

 end;

 

 

@@ -6517,98 +6578,104 @@ var
 
   Kernel32FileName: string;

   Kernel32FileName: string;

   VerFixedFileInfo: TVSFixedFileInfo;

   VerFixedFileInfo: TVSFixedFileInfo;

 begin

 begin

-  { processor information related initialization }

+  try

+    { processor information related initialization }

 

 

-  ResetMemory(SystemInfo, SizeOf(SystemInfo));

-  GetSystemInfo(SystemInfo);

-  ProcessorCount := SystemInfo.dwNumberOfProcessors;

-  AllocGranularity := SystemInfo.dwAllocationGranularity;

-  PageSize := SystemInfo.dwPageSize;

+    ResetMemory(SystemInfo, SizeOf(SystemInfo));

+    GetSystemInfo(SystemInfo);

+    ProcessorCount := SystemInfo.dwNumberOfProcessors;

+    AllocGranularity := SystemInfo.dwAllocationGranularity;

+    PageSize := SystemInfo.dwPageSize;

 

 

-  { Windows version information }

+    { Windows version information }

 

 

-  IsWinNT := Win32Platform = VER_PLATFORM_WIN32_NT;

+    IsWinNT := Win32Platform = VER_PLATFORM_WIN32_NT;

 

 

-  Kernel32FileName := GetModulePath(GetModuleHandle(kernel32));

-  VerFixedFileInfo.dwFileDateLS := 0;

-  if (not IsWinNT) and VersionFixedFileInfo(Kernel32FileName, VerFixedFileInfo) then

-    KernelVersionHi := VerFixedFileInfo.dwProductVersionMS

-  else

-    KernelVersionHi := 0;

+    Kernel32FileName := GetModulePath(GetModuleHandle(kernel32));

+    VerFixedFileInfo.dwFileDateLS := 0;

+    if not IsWinNT and VersionFixedFileInfo(Kernel32FileName, VerFixedFileInfo) then

+      KernelVersionHi := VerFixedFileInfo.dwProductVersionMS

+    else

+      KernelVersionHi := 0;

+

+    case GetWindowsVersion of

+      wvUnknown:

+        ;

+      wvWin95:

+        IsWin95 := True;

+      wvWin95OSR2:

+        IsWin95OSR2 := True;

+      wvWin98:

+        IsWin98 := True;

+      wvWin98SE:

+        IsWin98SE := True;

+      wvWinME:

+        IsWinME := True;

+      wvWinNT31:

+        begin

+          IsWinNT3 := True;

+          IsWinNT31 := True;

+        end;

+      wvWinNT35:

+        begin

+          IsWinNT3 := True;

+          IsWinNT35 := True;

+        end;

+      wvWinNT351:

+        begin

+          IsWinNT3 := True;

+          IsWinNT35 := True;

+          IsWinNT351 := True;

+        end;

+      wvWinNT4:

+        IsWinNT4 := True;

+      wvWin2000:

+        IsWin2K := True;

+      wvWinXP:

+        IsWinXP := True;

+      wvWin2003:

+        IsWin2003 := True;

+      wvWinXP64:

+        IsWinXP64 := True;

+      wvWin2003R2:

+        IsWin2003R2 := True;

+      wvWinVista:

+        IsWinVista := True;

+      wvWinServer2008:

+        IsWinServer2008 := True;

+      wvWin7:

+        IsWin7 := True;

+      wvWinServer2008R2:

+        IsWinServer2008R2 := True;

+      wvWin8:

+        IsWin8 := True;

+      wvWin8RT:

+        IsWin8RT := True;

+      wvWinServer2012:

+        IsWinServer2012 := True;

+      wvWin81:

+        IsWin81 := True;

+      wvWin81RT:

+        IsWin81RT := True;

+      wvWinServer2012R2:

+        IsWinServer2012R2 := True;

+      wvWin10:

+        IsWin10 := True;

+      wvWinServer2016:

+        IsWinServer2016 := True;

+      wvWinServer2019:

+        IsWinServer2019 := True;

+      wvWinServer2022:

+        IsWinServer2022 := True;

+      wvWinServer:

+        IsWinServer := True;

+      wvWin11:

+        IsWin11 := True;

+    end;

+  except

+    // Don't crash the application if anything goes wrong detecting the correct

+    // Windows version information.

 

 

-  case GetWindowsVersion of

-    wvUnknown:

-      ;

-    wvWin95:

-      IsWin95 := True;

-    wvWin95OSR2:

-      IsWin95OSR2 := True;

-    wvWin98:

-      IsWin98 := True;

-    wvWin98SE:

-      IsWin98SE := True;

-    wvWinME:

-      IsWinME := True;

-    wvWinNT31:

-      begin

-        IsWinNT3 := True;

-        IsWinNT31 := True;

-      end;

-    wvWinNT35:

-      begin

-        IsWinNT3 := True;

-        IsWinNT35 := True;

-      end;

-    wvWinNT351:

-      begin

-        IsWinNT3 := True;

-        IsWinNT35 := True;

-        IsWinNT351 := True;

-      end;

-    wvWinNT4:

-      IsWinNT4 := True;

-    wvWin2000:

-      IsWin2K := True;

-    wvWinXP:

-      IsWinXP := True;

-    wvWin2003:

-      IsWin2003 := True;

-    wvWinXP64:

-      IsWinXP64 := True;

-    wvWin2003R2:

-      IsWin2003R2 := True;

-    wvWinVista:

-      IsWinVista := True;

-    wvWinServer2008:

-      IsWinServer2008 := True;

-    wvWin7:

-      IsWin7 := True;

-    wvWinServer2008R2:

-      IsWinServer2008R2 := True;

-    wvWin8:

-      IsWin8 := True;

-    wvWin8RT:

-      IsWin8RT := True;

-    wvWinServer2012:

-      IsWinServer2012 := True;

-    wvWin81:

-      IsWin81 := True;

-    wvWin81RT:

-      IsWin81RT := True;

-    wvWinServer2012R2:

-      IsWinServer2012R2 := True;

-    wvWin10:

-      IsWin10 := True;

-    wvWinServer2016:

-      IsWinServer2016 := True;

-    wvWinServer2019:

-      IsWinServer2019 := True;

-    wvWinServer2022:

-      IsWinServer2022 := True;

-    wvWinServer:

-      IsWinServer := True;

-    wvWin11:

-      IsWin11 := True;

   end;

   end;

 end;

 end;