Changeset 384

Timestamp:

Jul 9, 2012, 3:58:43 PM (12 years ago)

Author:

chronos

Message:

 

Files:

• Common/Common.lpk (modified) (2 diffs)
• Common/Common.pas (modified) (2 diffs)
• Common/URegistry.pas (modified) (1 diff)
• Common/UThreading.pas (modified) (1 diff)
• CoolStreaming/UVarBlockSerializer.pas (modified) (2 diffs)
• PinConnection/UCommThread.pas (modified) (1 diff)

Common/Common.lpk

@@ -22 +22 @@
     <License Value="GNU/GPL"/>
     <Version Minor="7"/>
-    <Files Count="14">
+    <Files Count="15">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -82 +82 @@
         <UnitName Value="UXMLUtils"/>
       </Item14>
+      <Item15>
+        <Filename Value="UApplicationInfo.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="UApplicationInfo"/>
+      </Item15>
     </Files>
     <i18n>

Common/Common.pas

@@ -10 +10 @@
   StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier, UURI, UThreading, 
   UMemory, UResetableThread, UPool, ULastOpenedList, URegistry, 
-  UJobProgressView, UXMLUtils, LazarusPackageIntf;
+  UJobProgressView, UXMLUtils, UApplicationInfo, LazarusPackageIntf;
 
 implementation
@@ -19 +19 @@
   RegisterUnit('ULastOpenedList', @ULastOpenedList.Register);
   RegisterUnit('UJobProgressView', @UJobProgressView.Register);
+  RegisterUnit('UApplicationInfo', @UApplicationInfo.Register);
 end;
 

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));
 
   { TRegistryEx }

Common/UThreading.pas

@@ -303 +303 @@
   I: Integer;
 begin
+  if Terminated then Exit;
   SysUtils.Sleep(Delay mod Quantum);
   for I := 1 to (Delay div Quantum) do begin

CoolStreaming/UVarBlockSerializer.pas

@@ -40 +40 @@
     function GetVarSize: Integer;
     function GetVarCount: Integer;
+    function TryVarBlock: Boolean;
 
     // Advanced data types
@@ -450 +451 @@
 end;
 
+function TVarBlockSerializer.TryVarBlock: Boolean;
+var
+  Data: Byte;
+  StoredPosition: Integer;
+  Count: Integer;
+begin
+  if Stream.Position < Stream.Size then
+  try
+    StoredPosition := Stream.Position;
+    Data := Stream.ReadByte;
+    if Data = $ff then begin
+      if TryVarBlock then begin
+        Count := ReadVarUInt;
+        Result := Count <= Stream.Size - Stream.Position;
+      end else Result := False;
+    end else begin
+      Count := DecodeUnaryLength(Data) - 1;
+      Result := Count <= Stream.Size - Stream.Position;
+    end;
+    Stream.Position := StoredPosition;
+  except
+    raise Exception.Create(SErrorGetVarSize);
+  end else Result := False;
+end;
+
 procedure TVarBlockSerializer.WriteVarSInt(Value: Int64);
 begin

PinConnection/UCommThread.pas

@@ -125 +125 @@
 begin
   Active := False;
-  FInputBuffer.Free;
-  FInputBufferLock.Free;
-  Ext.Free;
-  Pin.Free;
-  FStatusEvent.Free;
-  FDataAvailable.Free;
-  inherited Destroy;
+  FInputBufferLock.Acquire;
+  FreeAndNil(FInputBuffer);
+  FreeAndNil(FInputBufferLock);
+  FreeAndNil(Ext);
+  FreeAndNil(Pin);
+  FreeAndNil(FStatusEvent);
+  FreeAndNil(FDataAvailable);
+  inherited;
 end;