Changeset 55 for trunk

Timestamp:

Aug 23, 2012, 6:43:26 AM (12 years ago)

Author:

chronos

Message:

• Modified: Update Common package.

Location:

trunk

Files:

• Packages/Common/UCommon.pas (modified) (3 diffs)
• Packages/Common/ULastOpenedList.pas (modified) (5 diffs)
• Packages/Common/UMemory.pas (modified) (2 diffs)
• Packages/Common/URegistry.pas (modified) (3 diffs)
• UCore.pas (modified) (2 diffs)

trunk/Packages/Common/UCommon.pas

@@ -7 +7 @@
 uses
   {$IFDEF Windows}Windows,{$ENDIF}
-  Classes, SysUtils, StrUtils, Dialogs, Process,
+  Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf,
   FileUtil; //, ShFolder, ShellAPI;
 
@@ -404 +404 @@
   Browser, Params: string;
 begin
-  try
+  OpenURL(URL);
+  {try
     Process := TProcess.Create(nil);
     Browser := '';
@@ -415 +416 @@
   finally
     Process.Free;
-  end;
+  end;}
 end;
 

trunk/Packages/Common/ULastOpenedList.pas

@@ -23 +23 @@
     destructor Destroy; override;
     procedure LoadToMenuItem(MenuItem: TMenuItem; ClickAction: TNotifyEvent);
-    procedure LoadFromRegistry(Root: HKEY; Key: string);
-    procedure SaveToRegistry(Root: HKEY; Key: string);
+    procedure LoadFromRegistry(Context: TRegistryContext);
+    procedure SaveToRegistry(Context: TRegistryContext);
     procedure AddItem(FileName: string);
   published
@@ -87 +87 @@
 end;
 
-procedure TLastOpenedList.LoadFromRegistry(Root: HKEY; Key: string);
+procedure TLastOpenedList.LoadFromRegistry(Context: TRegistryContext);
 var
   I: Integer;
@@ -96 +96 @@
   with Registry do
   try
-    RootKey := Root;
-    OpenKey(Key, True);
+    RootKey := Context.RootKey;
+    OpenKey(Context.Key, True);
     Items.Clear;
     I := 0;
@@ -112 +112 @@
 end;
 
-procedure TLastOpenedList.SaveToRegistry(Root: HKEY; Key: string);
+procedure TLastOpenedList.SaveToRegistry(Context: TRegistryContext);
 var
   I: Integer;
@@ -120 +120 @@
   with Registry do
   try
-    RootKey := Root;
-    OpenKey(Key, True);
+    RootKey := Context.RootKey;
+    OpenKey(Context.Key, True);
     for I := 0 to Items.Count - 1 do
       WriteString('File' + IntToStr(I), UTF8Decode(Items[I]));

trunk/Packages/Common/UMemory.pas

@@ -24 +24 @@
     constructor Create;
     destructor Destroy; override;
+    procedure WriteMemory(Position: Integer; Memory: TMemory);
+    procedure ReadMemory(Position: Integer; Memory: TMemory);
     property Data: PByte read FData;
     property Size: Integer read FSize write SetSize;
@@ -108 +110 @@
 end;
 
+procedure TMemory.WriteMemory(Position: Integer; Memory: TMemory);
+begin
+  Move(Memory.FData, PByte(@FData + Position)^, Memory.Size);
+end;
+
+procedure TMemory.ReadMemory(Position: Integer; Memory: TMemory);
+begin
+  Move(PByte(@FData + Position)^, Memory.FData, Memory.Size);
+end;
+
 end.
 

trunk/Packages/Common/URegistry.pas

@@ -17 +17 @@
     rrKeyDynData = HKEY($80000006));
 
+  TRegistryContext = record
+    RootKey: HKEY;
+    Key: string;
+  end;
+
   { TRegistryEx }
 
@@ -29 +34 @@
       DefaultValue: Double): Double;
     function DeleteKeyRecursive(const Key: string): Boolean;
+    function OpenKey(const Key: string; CanCreate: Boolean): Boolean;
   end;
 
+function RegContext(RootKey: HKEY; Key: string): TRegistryContext;
+
+
 implementation
+
+function RegContext(RootKey: HKEY; Key: string): TRegistryContext;
+begin
+  Result.RootKey := RootKey;
+  Result.Key := Key;
+end;
 
 { TRegistryEx }
@@ -83 +98 @@
 end;
 
+function TRegistryEx.OpenKey(const Key: string; CanCreate: Boolean): Boolean;
+begin
+  {$IFDEF Linux}
+  CloseKey;
+  {$ENDIF}
+  Result := inherited OpenKey(Key, CanCreate);
+end;
+
 function TRegistryEx.ReadBoolWithDefault(const Name: string;
   DefaultValue: Boolean): Boolean;

trunk/UCore.pas

@@ -74 +74 @@
     Free;
   end;
-  LastOpenedList.LoadFromRegistry(Root, Key);
+  LastOpenedList.LoadFromRegistry(RegContext(Root, Key));
   Targets.LoadFromRegistry(Root, Key);
 end;
@@ -81 +81 @@
 begin
   Targets.SaveToRegistry(Root, Key);
-  LastOpenedList.SaveToRegistry(Root, Key);
+  LastOpenedList.SaveToRegistry(RegContext(Root, Key));
   with TRegistryEx.Create do
   try