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

Timestamp:

Mar 22, 2018, 8:31:19 PM (7 years ago)

Author:

chronos

Message:

• Modified: Update Common and CollTranslator packages to fix build under Lazarus 1.8.
• Fixed: Some memory leaks.

File:

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

trunk/Packages/Common/UCommon.pas

@@ -6 +6 @@
 
 uses
-  {$IFDEF Windows}Windows,{$ENDIF}
+  {$ifdef Windows}Windows,{$endif}
+  {$ifdef Linux}baseunix,{$endif}
   Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf,
   FileUtil; //, ShFolder, ShellAPI;
@@ -62 +63 @@
 procedure OpenWebPage(URL: string);
 procedure OpenFileInShell(FileName: string);
-procedure ExecuteProgram(CommandLine: string);
+procedure ExecuteProgram(Executable: string; Parameters: array of string);
 procedure FreeThenNil(var Obj);
+function RemoveQuotes(Text: string): string;
+function ComputerName: string;
+function OccurenceOfChar(What: Char; Where: string): Integer;
+function GetDirCount(Dir: string): Integer;
+function MergeArray(A, B: array of string): TArrayOfString;
+function LoadFileToStr(const FileName: TFileName): AnsiString;
 
 
@@ -105 +112 @@
   Path := IncludeTrailingPathDelimiter(APath);
 
-  Find := FindFirst(UTF8Decode(Path + AFileSpec), faAnyFile xor faDirectory, SearchRec);
+  Find := FindFirst(Path + AFileSpec, faAnyFile xor faDirectory, SearchRec);
   while Find = 0 do begin
-    DeleteFileUTF8(Path + UTF8Encode(SearchRec.Name));
+    DeleteFile(Path + SearchRec.Name);
 
     Find := SysUtils.FindNext(SearchRec);
@@ -286 +293 @@
   L: LongWord;
 begin
-
   L := MAX_USERNAME_LENGTH + 2;
   SetLength(Result, L);
@@ -301 +307 @@
   end;
 end;
-
+{$endif}
+
+function ComputerName: string;
+{$ifdef mswindows}
+const
+ INFO_BUFFER_SIZE = 32767;
+var
+  Buffer : array[0..INFO_BUFFER_SIZE] of WideChar;
+  Ret : DWORD;
+begin
+  Ret := INFO_BUFFER_SIZE;
+  If (GetComputerNameW(@Buffer[0],Ret)) then begin
+    Result := UTF8Encode(WideString(Buffer));
+  end
+  else begin
+    Result := 'ERROR_NO_COMPUTERNAME_RETURNED';
+  end;
+end;
+{$endif}
+{$ifdef unix}
+var
+  Name: UtsName;
+begin
+  fpuname(Name);
+  Result := Name.Nodename;
+end;
+{$endif}
+
+{$ifdef windows}
 function LoggedOnUserNameEx(Format: TUserNameFormat): string;
 const
@@ -395 +429 @@
 end;
 
-procedure ExecuteProgram(CommandLine: string);
+procedure ExecuteProgram(Executable: string; Parameters: array of string);
 var
   Process: TProcess;
+  I: Integer;
 begin
   try
     Process := TProcess.Create(nil);
-    Process.CommandLine := CommandLine;
+    Process.Executable := Executable;
+    for I := 0 to Length(Parameters) - 1 do
+      Process.Parameters.Add(Parameters[I]);
     Process.Options := [poNoConsole];
     Process.Execute;
@@ -416 +453 @@
 
 procedure OpenWebPage(URL: string);
-var
-  Process: TProcess;
-  Browser, Params: string;
 begin
   OpenURL(URL);
-  {try
-    Process := TProcess.Create(nil);
-    Browser := '';
-    //FindDefaultBrowser(Browser, Params);
-    //Process.Executable := Browser;
-    //Process.Parameters.Add(Format(Params, [ApplicationInfo.HomePage]);
-    Process.CommandLine := 'cmd.exe /c start ' + URL;
-    Process.Options := [poNoConsole];
-    Process.Execute;
+end;
+
+procedure OpenFileInShell(FileName: string);
+begin
+  ExecuteProgram('cmd.exe', ['/c', 'start', FileName]);
+end;
+
+function RemoveQuotes(Text: string): string;
+begin
+  Result := Text;
+  if (Pos('"', Text) = 1) and (Text[Length(Text)] = '"') then
+    Result := Copy(Text, 2, Length(Text) - 2);
+end;
+
+function OccurenceOfChar(What: Char; Where: string): Integer;
+var
+  I: Integer;
+begin
+  Result := 0;
+  for I := 1 to Length(Where) do
+    if Where[I] = What then Inc(Result);
+end;
+
+function GetDirCount(Dir: string): Integer;
+begin
+  Result := OccurenceOfChar(DirectorySeparator, Dir);
+  if Copy(Dir, Length(Dir), 1) = DirectorySeparator then
+    Dec(Result);
+end;
+
+function MergeArray(A, B: array of string): TArrayOfString;
+var
+  I: Integer;
+begin
+  SetLength(Result, Length(A) + Length(B));
+  for I := 0 to Length(A) - 1 do
+    Result[I] := A[I];
+  for I := 0 to Length(B) - 1 do
+    Result[Length(A) + I] := B[I];
+end;
+
+function LoadFileToStr(const FileName: TFileName): AnsiString;
+var
+  FileStream: TFileStream;
+  Read: Integer;
+begin
+  Result := '';
+  FileStream := TFileStream.Create(FileName, fmOpenRead);
+  try
+    if FileStream.Size > 0 then begin
+      SetLength(Result, FileStream.Size);
+      Read := FileStream.Read(Pointer(Result)^, FileStream.Size);
+      SetLength(Result, Read);
+    end;
   finally
-    Process.Free;
-  end;}
-end;
-
-procedure OpenFileInShell(FileName: string);
-begin
-  ExecuteProgram('cmd.exe /c start "' + FileName + '"');
-end;
+    FileStream.Free;
+  end;
+end;
+
+
 
 initialization