Changeset 192 for trunk/Packages/Common/URegistry.pas

Timestamp:

May 1, 2018, 10:18:03 AM (7 years ago)

Author:

chronos

Message:

• Modified: Updated newer Common package files.

File:

• trunk/Packages/Common/URegistry.pas (modified) (4 diffs)

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;