Changeset 557 for Common/UCommon.pas

Timestamp:

Feb 15, 2022, 10:14:04 AM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.

File:

• Common/UCommon.pas (modified) (11 diffs)

Common/UCommon.pas

@@ -13 +13 @@
 type
   TArrayOfByte = array of Byte;
-  TArrayOfString = array of string;
   TExceptionEvent = procedure(Sender: TObject; E: Exception) of object;
 
@@ -51 +50 @@
 function ComputerName: string;
 procedure DeleteFiles(APath, AFileSpec: string);
+function Explode(Separator: Char; Data: string): TStringArray;
 procedure ExecuteProgram(Executable: string; Parameters: array of string);
 procedure FileDialogUpdateFilterFileType(FileDialog: TOpenDialog);
@@ -65 +65 @@
 function LoadFileToStr(const FileName: TFileName): AnsiString;
 function LoggedOnUserNameEx(Format: TUserNameFormat): string;
-function MergeArray(A, B: array of string): TArrayOfString;
+function MergeArray(A, B: array of string): TStringArray;
 function OccurenceOfChar(What: Char; Where: string): Integer;
 procedure OpenWebPage(URL: string);
@@ -291 +291 @@
 end;
 
-function Explode(Separator: char; Data: string): TArrayOfString;
-begin
-  Result := nil;
-  SetLength(Result, 0);
-  while Pos(Separator, Data) > 0 do begin
+function Explode(Separator: Char; Data: string): TStringArray;
+var
+  Index: Integer;
+begin
+  Result := Default(TStringArray);
+  repeat
+    Index := Pos(Separator, Data);
+    if Index > 0 then begin
+      SetLength(Result, Length(Result) + 1);
+      Result[High(Result)] := Copy(Data, 1, Index - 1);
+      Delete(Data, 1, Index);
+    end else Break;
+  until False;
+  if Data <> '' then begin
     SetLength(Result, Length(Result) + 1);
-    Result[High(Result)] := Copy(Data, 1, Pos(Separator, Data) - 1);
-    Delete(Data, 1, Pos(Separator, Data));
-  end;
-  SetLength(Result, Length(Result) + 1);
-  Result[High(Result)] := Data;
-end;
-
-{$IFDEF Windows}
+    Result[High(Result)] := Data;
+  end;
+end;
+
+{$IFDEF WINDOWS}
 function GetUserName: string;
 const
@@ -312 +318 @@
 begin
   L := MAX_USERNAME_LENGTH + 2;
+  Result := Default(string);
   SetLength(Result, L);
   if Windows.GetUserName(PChar(Result), L) and (L > 0) then begin
@@ -325 +332 @@
   end;
 end;
-{$endif}
+{$ENDIF}
 
 function ComputerName: string;
-{$ifdef mswindows}
+{$IFDEF WINDOWS}
 const
  INFO_BUFFER_SIZE = 32767;
@@ -343 +350 @@
   end;
 end;
-{$endif}
-{$ifdef unix}
+{$ENDIF}
+{$IFDEF UNIX}
 var
   Name: UtsName;
@@ -352 +359 @@
   Result := Name.Nodename;
 end;
-{$endif}
-
-{$ifdef windows}
+{$ENDIF}
+
+{$IFDEF WINDOWS}
 function LoggedOnUserNameEx(Format: TUserNameFormat): string;
 const
@@ -432 +439 @@
 procedure LoadLibraries;
 begin
-  {$IFDEF Windows}
+  {$IFDEF WINDOWS}
   DLLHandle1 := LoadLibrary('secur32.dll');
   if DLLHandle1 <> 0 then
@@ -443 +450 @@
 procedure FreeLibraries;
 begin
-  {$IFDEF Windows}
+  {$IFDEF WINDOWS}
   if DLLHandle1 <> 0 then FreeLibrary(DLLHandle1);
   {$ENDIF}
@@ -509 +516 @@
 end;
 
-function MergeArray(A, B: array of string): TArrayOfString;
-var
-  I: Integer;
-begin
-  Result := Default(TArrayOfString);
+function MergeArray(A, B: array of string): TStringArray;
+var
+  I: Integer;
+begin
+  Result := Default(TStringArray);
   SetLength(Result, Length(A) + Length(B));
   for I := 0 to Length(A) - 1 do