Changeset 75 for trunk/Packages/Common/RegistryEx.pas

Timestamp:

Jun 4, 2024, 12:22:49 AM (5 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.
• Modified: Updated Common package.

File:

• trunk/Packages/Common/RegistryEx.pas (moved) (moved from trunk/Packages/Common/URegistry.pas ) (10 diffs)

trunk/Packages/Common/RegistryEx.pas

@@ -1 @@
-unit URegistry;
-
-{$MODE Delphi}
+unit RegistryEx;
 
 interface
@@ -9 +7 @@
 
 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 }
@@ -22 +15 @@
     RootKey: HKEY;
     Key: string;
+    class function Create(RootKey: TRegistryRoot; Key: string): TRegistryContext; static; overload;
+    class function Create(RootKey: HKEY; Key: string): TRegistryContext; static; overload;
     class operator Equal(A, B: TRegistryContext): Boolean;
   end;
@@ -32 +27 @@
     procedure SetCurrentContext(AValue: TRegistryContext);
   public
+    function ReadChar(const Name: string): Char;
+    procedure WriteChar(const Name: string; Value: Char);
     function ReadBoolWithDefault(const Name: string;
       DefaultValue: Boolean): Boolean;
     function ReadIntegerWithDefault(const Name: string; DefaultValue: Integer): Integer;
     function ReadStringWithDefault(const Name: string; DefaultValue: string): string;
+    function ReadCharWithDefault(const Name: string; DefaultValue: Char): Char;
     function ReadFloatWithDefault(const Name: string;
       DefaultValue: Double): Double;
@@ -43 +41 @@
   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 +54 @@
 begin
   Result := (A.Key = B.Key) and (A.RootKey = B.RootKey);
+end;
+
+class function TRegistryContext.Create(RootKey: TRegistryRoot; Key: string): TRegistryContext;
+begin
+  Result.RootKey := RegistryRootHKEY[RootKey];
+  Result.Key := Key;
+end;
+
+class function TRegistryContext.Create(RootKey: HKEY; Key: string): TRegistryContext;
+begin
+  Result.RootKey := RootKey;
+  Result.Key := Key;
 end;
 
@@ -79 +86 @@
     else begin
       WriteString(Name, DefaultValue);
+      Result := DefaultValue;
+    end;
+end;
+
+function TRegistryEx.ReadCharWithDefault(const Name: string; DefaultValue: Char
+  ): Char;
+begin
+  if ValueExists(Name) then Result := ReadChar(Name)
+    else begin
+      WriteChar(Name, DefaultValue);
       Result := DefaultValue;
     end;
@@ -113 +130 @@
 function TRegistryEx.OpenKey(const Key: string; CanCreate: Boolean): Boolean;
 begin
-  {$IFDEF Linux}
-  CloseKey;
+  {$IFDEF UNIX}
+  //CloseKey;
   {$ENDIF}
   Result := inherited OpenKey(Key, CanCreate);
@@ -121 +138 @@
 function TRegistryEx.GetCurrentContext: TRegistryContext;
 begin
-  Result.Key := CurrentPath;
+  Result.Key := String(CurrentPath);
   Result.RootKey := RootKey;
 end;
@@ -129 +146 @@
   RootKey := AValue.RootKey;
   OpenKey(AValue.Key, True);
+end;
+
+function TRegistryEx.ReadChar(const Name: string): Char;
+var
+  S: string;
+begin
+  S := ReadString(Name);
+  if Length(S) > 0 then Result := S[1]
+    else Result := #0;
+end;
+
+procedure TRegistryEx.WriteChar(const Name: string; Value: Char);
+begin
+  WriteString(Name, Value);
 end;