Changeset 169 for trunk/Packages

Timestamp:

Jan 22, 2018, 11:00:53 AM (7 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.

Location:

trunk/Packages/Common

Files:

• UApplicationInfo.pas (modified) (4 diffs)
• UCommon.pas (modified) (6 diffs)
• URegistry.pas (modified) (4 diffs)
• UScaleDPI.pas (modified) (1 diff)

trunk/Packages/Common/UApplicationInfo.pas

@@ -14 +14 @@
   TApplicationInfo = class(TComponent)
   private
+    FDescription: string;
     FIdentification: Byte;
     FLicense: string;
@@ -33 +34 @@
     constructor Create(AOwner: TComponent); override;
     property Version: string read GetVersion;
+    function GetRegistryContext: TRegistryContext;
   published
     property Identification: Byte read FIdentification write FIdentification;
@@ -45 +47 @@
     property EmailContact: string read FEmailContact write FEmailContact;
     property AppName: string read FAppName write FAppName;
+    property Description: string read FDescription write FDescription;
     property ReleaseDate: TDateTime read FReleaseDate write FReleaseDate;
     property RegistryKey: string read FRegistryKey write FRegistryKey;
@@ -79 +82 @@
 end;
 
+function TApplicationInfo.GetRegistryContext: TRegistryContext;
+begin
+  Result := TRegistryContext.Create(RegistryRoot, RegistryKey);
+end;
+
 end.

trunk/Packages/Common/UCommon.pas

@@ -63 +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;
@@ -70 +70 @@
 function GetDirCount(Dir: string): Integer;
 function MergeArray(A, B: array of string): TArrayOfString;
+function LoadFileToStr(const FileName: TFileName): AnsiString;
 
 
@@ -111 +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
-    DeleteFile(Path + UTF8Encode(SearchRec.Name));
+    DeleteFile(Path + SearchRec.Name);
 
     Find := SysUtils.FindNext(SearchRec);
@@ -428 +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;
@@ -455 +459 @@
 procedure OpenFileInShell(FileName: string);
 begin
-  ExecuteProgram('cmd.exe /c start "' + FileName + '"');
+  ExecuteProgram('cmd.exe', ['/c', 'start', FileName]);
 end;
 
@@ -492 +496 @@
 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
+    FileStream.Free;
+  end;
+end;
+
 
 

trunk/Packages/Common/URegistry.pas

@@ -9 +9 @@
 
 type
-  TRegistryRoot = (rrKeyClassesRoot = HKEY($80000000),
-    rrKeyCurrentUser = HKEY($80000001),
-    rrKeyLocalMachine = HKEY($80000002),
-    rrKeyUsers = HKEY($80000003),
-    rrKeyPerformanceData = HKEY($80000004),
-    rrKeyCurrentConfig = HKEY($80000005),
-    rrKeyDynData = HKEY($80000006));
+  TRegistryRoot = (rrKeyClassesRoot, rrKeyCurrentUser, rrKeyLocalMachine,
+    rrKeyUsers, rrKeyPerformanceData, rrKeyCurrentConfig, rrKeyDynData);
 
   { TRegistryContext }
@@ -23 +18 @@
     Key: string;
     class operator Equal(A, B: TRegistryContext): Boolean;
+    function Create(RootKey: TRegistryRoot; Key: string): TRegistryContext; overload;
+    function Create(RootKey: HKEY; Key: string): TRegistryContext; overload;
   end;
 
@@ -43 +40 @@
   end;
 
-function RegContext(RootKey: HKEY; Key: string): TRegistryContext;
-
+const
+  RegistryRootHKEY: array[TRegistryRoot] of HKEY = (HKEY_CLASSES_ROOT,
+    HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_PERFORMANCE_DATA,
+    HKEY_CURRENT_CONFIG, HKEY_DYN_DATA);
 
 implementation
 
-function RegContext(RootKey: HKEY; Key: string): TRegistryContext;
-begin
-  Result.RootKey := RootKey;
-  Result.Key := Key;
-end;
 
 { TRegistryContext }
@@ -59 +53 @@
 begin
   Result := (A.Key = B.Key) and (A.RootKey = B.RootKey);
+end;
+
+function TRegistryContext.Create(RootKey: TRegistryRoot; Key: string): TRegistryContext;
+begin
+  Result.RootKey := RegistryRootHKEY[RootKey];
+  Result.Key := Key;
+end;
+
+function TRegistryContext.Create(RootKey: HKEY; Key: string): TRegistryContext;
+begin
+  Result.RootKey := RootKey;
+  Result.Key := Key;
 end;
 

trunk/Packages/Common/UScaleDPI.pas

@@ -325 +325 @@
       AutoSize := False;
       Height := ScaleY(Height, FromDPI.Y);
+      AutoSize := True;
     end;
     EndUpdate;