Changeset 215 for trunk/Packages/Common/UCommon.pas

Timestamp:

Jan 21, 2022, 9:54:27 PM (3 years ago)

Author:

chronos

Message:

• Modified: Build under Lazarus 2.2.0.
• Modified: Updated Common package.

File:

• trunk/Packages/Common/UCommon.pas (modified) (7 diffs)

trunk/Packages/Common/UCommon.pas

@@ -6 +6 @@
 
 uses
-  {$ifdef Windows}Windows,{$endif}
-  {$ifdef Linux}baseunix,{$endif}
+  {$IFDEF WINDOWS}Windows,{$ENDIF}
+  {$IFDEF UNIX}baseunix,{$ENDIF}
   Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf,
   FileUtil; //, ShFolder, ShellAPI;
@@ -35 +35 @@
   DLLHandle1: HModule;
 
-{$IFDEF Windows}
+{$IFDEF WINDOWS}
   GetUserNameEx: procedure (NameFormat: DWORD;
     lpNameBuffer: LPSTR; nSize: PULONG); stdcall;
@@ -85 +85 @@
 function TryHexToInt(Data: string; var Value: Integer): Boolean;
 function TryBinToInt(Data: string; var Value: Integer): Boolean;
+procedure SortStrings(Strings: TStrings);
 
 
@@ -291 +292 @@
 function Explode(Separator: char; Data: string): TArrayOfString;
 begin
+  Result := nil;
   SetLength(Result, 0);
   while Pos(Separator, Data) > 0 do begin
@@ -345 +347 @@
   Name: UtsName;
 begin
+  Name := Default(UtsName);
   fpuname(Name);
   Result := Name.Nodename;
@@ -504 +507 @@
   I: Integer;
 begin
+  Result := Default(TArrayOfString);
   SetLength(Result, Length(A) + Length(B));
   for I := 0 to Length(A) - 1 do
@@ -677 +681 @@
 end;
 
+procedure SortStrings(Strings: TStrings);
+var
+  Tmp: TStringList;
+begin
+  Strings.BeginUpdate;
+  try
+    if Strings is TStringList then begin
+      TStringList(Strings).Sort;
+    end else begin
+      Tmp := TStringList.Create;
+      try
+        Tmp.Assign(Strings);
+        Tmp.Sort;
+        Strings.Assign(Tmp);
+      finally
+        Tmp.Free;
+      end;
+    end;
+  finally
+    Strings.EndUpdate;
+  end;
+end;
+
 
 initialization