Changeset 434 for Common

Timestamp:

Nov 19, 2012, 2:31:00 PM (12 years ago)

Author:

chronos

Message:

• Modified: Confused TRegistryEx property Context with Context parameter in some methods.
• Fixed: TURI path was not properly handled in case of file in root directory.

Location:

Common

Files:

• UCommon.pas (modified) (3 diffs)
• URegistry.pas (modified) (4 diffs)
• USyncCounter.pas (modified) (2 diffs)
• UURI.pas (modified) (1 diff)

Common/UCommon.pas

@@ -48 +48 @@
 function LoggedOnUserNameEx(Format: TUserNameFormat): string;
 function SplitString(var Text: string; Count: Word): string;
+function GetBitCount(Variable: QWord; MaxIndex: Integer): Integer;
 function GetBit(Variable: QWord; Index: Byte): Boolean;
+procedure SetBit(var Variable: Int64; Index: Byte; State: Boolean); overload;
 procedure SetBit(var Variable: QWord; Index: Byte; State: Boolean); overload;
 procedure SetBit(var Variable: Cardinal; Index: Byte; State: Boolean); overload;
@@ -336 +338 @@
 end;
 
+function GetBitCount(Variable: QWord; MaxIndex: Integer): Integer;
+var
+  I: Integer;
+begin
+  Result := 0;
+  for I := 0 to MaxIndex - 1 do
+    if ((Variable shr I) and 1) = 1 then Inc(Result);
+end;
+
 function GetBit(Variable:QWord;Index:Byte):Boolean;
 begin
@@ -341 +352 @@
 end;
 
+procedure SetBit(var Variable: Int64; Index: Byte; State: Boolean);
+begin
+  Variable := (Variable and ((1 shl Index) xor High(QWord))) or (Int64(State) shl Index);
+end;
+
 procedure SetBit(var Variable:QWord;Index:Byte;State:Boolean); overload;
 begin
-  Variable := (Variable and ((1 shl Index) xor QWord($ffffffffffffffff))) or (QWord(State) shl Index);
+  Variable := (Variable and ((1 shl Index) xor High(QWord))) or (QWord(State) shl Index);
 end;
 
 procedure SetBit(var Variable:Cardinal;Index:Byte;State:Boolean); overload;
 begin
-  Variable := (Variable and ((1 shl Index) xor Cardinal($ffffffff))) or (Cardinal(State) shl Index);
+  Variable := (Variable and ((1 shl Index) xor High(Cardinal))) or (Cardinal(State) shl Index);
 end;
 
 procedure SetBit(var Variable:Word;Index:Byte;State:Boolean); overload;
 begin
-  Variable := (Variable and ((1 shl Index) xor Word($ffff))) or (Word(State) shl Index);
+  Variable := (Variable and ((1 shl Index) xor High(Word))) or (Word(State) shl Index);
 end;
 

Common/URegistry.pas

@@ -26 +26 @@
   TRegistryEx = class(TRegistry)
   private
-    function GetContext: TRegistryContext;
-    procedure SetContext(AValue: TRegistryContext);
+    function GetCurrentContext: TRegistryContext;
+    procedure SetCurrentContext(AValue: TRegistryContext);
   public
     function ReadBoolWithDefault(const Name: string;
@@ -37 +37 @@
     function DeleteKeyRecursive(const Key: string): Boolean;
     function OpenKey(const Key: string; CanCreate: Boolean): Boolean;
-    property Context: TRegistryContext read GetContext write SetContext;
+    property CurrentContext: TRegistryContext read GetCurrentContext write SetCurrentContext;
   end;
 
@@ -109 +109 @@
 end;
 
-function TRegistryEx.GetContext: TRegistryContext;
+function TRegistryEx.GetCurrentContext: TRegistryContext;
 begin
   Result.Key := CurrentPath;
@@ -115 +115 @@
 end;
 
-procedure TRegistryEx.SetContext(AValue: TRegistryContext);
+procedure TRegistryEx.SetCurrentContext(AValue: TRegistryContext);
 begin
   RootKey := AValue.RootKey;

Common/USyncCounter.pas

@@ -23 +23 @@
     constructor Create;
     destructor Destroy; override;
+    procedure Assign(Source: TSyncCounter);
   end;
 
@@ -71 +72 @@
 end;
 
+procedure TSyncCounter.Assign(Source: TSyncCounter);
+begin
+  Current := Source.Current;
+  Top := Source.Top;
+end;
+
 end.
 

Common/UURI.pas

@@ -326 +326 @@
     Drive := Drive + DriveSeparator;
   end else Drive := '';
-  Directory.AsString := AValue;
+  if (Drive <> '') and (AValue = '') then
+    Directory.AsString := Directory.DirSeparator
+    else Directory.AsString := AValue;
 end;