jcl-checkins-diff Mailing List for JEDI Code Library (Page 76)

Brought to you by: mthoma, obones, outchy, rrossmair

jcl-checkins-diff — SVN file check-in notifications with file differences included

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr (20)	May (48)	Jun (8)	Jul (23)	Aug (41)	Sep (42)	Oct (22)	Nov (17)	Dec (36)
2007	Jan (43)	Feb (42)	Mar (17)	Apr (39)	May (16)	Jun (35)	Jul (37)	Aug (47)	Sep (49)	Oct (9)	Nov (52)	Dec (37)
2008	Jan (48)	Feb (21)	Mar (7)	Apr (2)	May (5)	Jun (17)	Jul (17)	Aug (40)	Sep (58)	Oct (38)	Nov (19)	Dec (32)
2009	Jan (67)	Feb (46)	Mar (54)	Apr (34)	May (37)	Jun (52)	Jul (67)	Aug (72)	Sep (48)	Oct (35)	Nov (27)	Dec (12)
2010	Jan (56)	Feb (46)	Mar (19)	Apr (14)	May (21)	Jun (3)	Jul (13)	Aug (48)	Sep (34)	Oct (51)	Nov (16)	Dec (32)
2011	Jan (36)	Feb (14)	Mar (12)	Apr (3)	May (5)	Jun (24)	Jul (15)	Aug (30)	Sep (21)	Oct (4)	Nov (25)	Dec (23)
2012	Jan (45)	Feb (42)	Mar (19)	Apr (14)	May (13)	Jun (7)	Jul (3)	Aug (46)	Sep (21)	Oct (10)	Nov (2)	Dec
2013	Jan (5)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 74 75 76 77 78 .. 92 > >> (Page 76 of 92)

[Jcl-checkins-diff] SF.net SVN: jcl: [2008] trunk/jcl/source/common/JclStrHashMap.pas

From: <sch...@us...> - 2007-05-15 06:49:52

Revision: 2008
          http://svn.sourceforge.net/jcl/?rev=2008&view=rev
Author:   schuettecarsten
Date:     2007-05-14 23:49:51 -0700 (Mon, 14 May 2007)

Log Message:
-----------
Fixed EIntOverflow-Exception, changes in Rev. 2007 did not really help...

Modified Paths:
--------------
    trunk/jcl/source/common/JclStrHashMap.pas

Modified: trunk/jcl/source/common/JclStrHashMap.pas
===================================================================
--- trunk/jcl/source/common/JclStrHashMap.pas	2007-05-14 11:59:00 UTC (rev 2007)
+++ trunk/jcl/source/common/JclStrHashMap.pas	2007-05-15 06:49:51 UTC (rev 2008)
@@ -246,6 +246,11 @@
   Result := True;
 end;
 
+{$IFOPT Q+}
+{$DEFINE OVERFLOWCHECKS_ON}
+{$Q-}
+{$ENDIF}
+
 function StrHash(const S: string): Cardinal;
 {$IFDEF CLR}
 begin
@@ -271,7 +276,7 @@
   I := Length(S);
   while I > 0 do
   begin
-    Cardinal(Result) := Cardinal((Result shl cOneEight) + Ord(P^));
+    Result := (Result shl cOneEight) + Ord(P^);
     Temp := Result and cHighBits;
     if Temp <> 0 then
       Result := (Result xor (Temp shr cThreeFourths)) and (not cHighBits);
@@ -306,7 +311,7 @@
   I := Length(S);
   while I > 0 do
   begin
-    Cardinal(Result) := Cardinal((Result shl cOneEight) + Ord(UpCase(P^)));
+    Result := (Result shl cOneEight) + Ord(UpCase(P^));
     Temp := Result and cHighBits;
     if Temp <> 0 then
       Result := (Result xor (Temp shr cThreeFourths)) and (not cHighBits);
@@ -349,6 +354,10 @@
 end;
 {$ENDIF CLR}
 
+{$IFDEF OVERFLOWCHECKS_ON}
+{$Q+}
+{$ENDIF}
+
 //=== { TStringHashMap } =====================================================
 
 constructor TStringHashMap.Create(ATraits: TStringHashMapTraits; AHashSize: Cardinal);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2007] trunk/jcl/source/common/JclStrHashMap.pas

From: <sch...@us...> - 2007-05-14 11:59:10

Revision: 2007
          http://svn.sourceforge.net/jcl/?rev=2007&view=rev
Author:   schuettecarsten
Date:     2007-05-14 04:59:00 -0700 (Mon, 14 May 2007)

Log Message:
-----------
Fixed another ERangeCheck-Exception in Delphi 2007

Modified Paths:
--------------
    trunk/jcl/source/common/JclStrHashMap.pas

Modified: trunk/jcl/source/common/JclStrHashMap.pas
===================================================================
--- trunk/jcl/source/common/JclStrHashMap.pas	2007-05-08 14:31:50 UTC (rev 2006)
+++ trunk/jcl/source/common/JclStrHashMap.pas	2007-05-14 11:59:00 UTC (rev 2007)
@@ -271,7 +271,7 @@
   I := Length(S);
   while I > 0 do
   begin
-    Result := (Result shl cOneEight) + Ord(P^);
+    Cardinal(Result) := Cardinal((Result shl cOneEight) + Ord(P^));
     Temp := Result and cHighBits;
     if Temp <> 0 then
       Result := (Result xor (Temp shr cThreeFourths)) and (not cHighBits);
@@ -306,7 +306,7 @@
   I := Length(S);
   while I > 0 do
   begin
-    Result := (Result shl cOneEight) + Ord(UpCase(P^));
+    Cardinal(Result) := Cardinal((Result shl cOneEight) + Ord(UpCase(P^)));
     Temp := Result and cHighBits;
     if Temp <> 0 then
       Result := (Result xor (Temp shr cThreeFourths)) and (not cHighBits);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2006] trunk/jcl/source/common/JclSysUtils.pas

From: <sch...@us...> - 2007-05-08 14:31:52

Revision: 2006
          http://svn.sourceforge.net/jcl/?rev=2006&view=rev
Author:   schuettecarsten
Date:     2007-05-08 07:31:50 -0700 (Tue, 08 May 2007)

Log Message:
-----------
Fixed ERangeCheck-Exceptions in TJclSimpleLog

Modified Paths:
--------------
    trunk/jcl/source/common/JclSysUtils.pas

Modified: trunk/jcl/source/common/JclSysUtils.pas
===================================================================
--- trunk/jcl/source/common/JclSysUtils.pas	2007-05-06 07:56:07 UTC (rev 2005)
+++ trunk/jcl/source/common/JclSysUtils.pas	2007-05-08 14:31:50 UTC (rev 2006)
@@ -3064,7 +3064,7 @@
     FLogFileName := CreateDefaultFileName
   else
     FLogFileName := ALogFileName;
-  FLogFileHandle := INVALID_HANDLE_VALUE;
+  DWord(FLogFileHandle) := INVALID_HANDLE_VALUE;
 end;
 
 function TJclSimpleLog.CreateDefaultFileName: string;
@@ -3091,14 +3091,14 @@
   if LogOpen then
   begin
     FileClose(FLogFileHandle);
-    FLogFileHandle := INVALID_HANDLE_VALUE;
+    DWord(FLogFileHandle) := INVALID_HANDLE_VALUE;
     FLogWasEmpty := False;
   end;
 end;
 
 function TJclSimpleLog.GetLogOpen: Boolean;
 begin
-  Result := FLogFileHandle <> INVALID_HANDLE_VALUE;
+  Result := DWord(FLogFileHandle) <> INVALID_HANDLE_VALUE;
 end;
 
 procedure TJclSimpleLog.OpenLog;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2005] trunk/jcl/install/JclInstall.pas

From: <ah...@us...> - 2007-05-06 07:56:12

Revision: 2005
          http://svn.sourceforge.net/jcl/?rev=2005&view=rev
Author:   ahuser
Date:     2007-05-06 00:56:07 -0700 (Sun, 06 May 2007)

Log Message:
-----------
fixed type .hhp => .hpp

Modified Paths:
--------------
    trunk/jcl/install/JclInstall.pas

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2007-05-01 05:17:05 UTC (rev 2004)
+++ trunk/jcl/install/JclInstall.pas	2007-05-06 07:56:07 UTC (rev 2005)
@@ -486,13 +486,13 @@
     'When installed, available through Project Options|Compiler|Use Debug DCUs.';
   RsHintMakeDebugVcl    = 'Make precompiled VCL units for debugging';
   RsHintMakeDebugVClx   = 'Make precompiled Visual CLX units for debugging';
-  RsHintCopyHppFiles    = 'Copy .hhp files into C++Builder''s include path.';
+  RsHintCopyHppFiles    = 'Copy .hpp files into C++Builder''s include path.';
 
   // packages
   RsHintPackages             = 'Build and eventually install JCL runtime packages (RTL, VCL and Visual ' +
     'CLX) and optional IDE experts.';
   RsHintDualPackages         = 'The same package introduce component for Delphi Win32 and C++Builder Win32';
-  RsHintCopyPackagesHppFiles = 'Output .hhp files into C++Builder''s include path instead of ' +
+  RsHintCopyPackagesHppFiles = 'Output .hpp files into C++Builder''s include path instead of ' +
     'the source paths.';
 
   // exception dialogs


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2004] trunk/jcl/source/windows/JclRegistry.pas

From: <mar...@us...> - 2007-05-01 05:17:21

Revision: 2004
          http://svn.sourceforge.net/jcl/?rev=2004&view=rev
Author:   marquardt
Date:     2007-04-30 22:17:05 -0700 (Mon, 30 Apr 2007)

Log Message:
-----------
cleanup, fold long lines

Modified Paths:
--------------
    trunk/jcl/source/windows/JclRegistry.pas

Modified: trunk/jcl/source/windows/JclRegistry.pas
===================================================================
--- trunk/jcl/source/windows/JclRegistry.pas	2007-04-26 16:23:00 UTC (rev 2003)
+++ trunk/jcl/source/windows/JclRegistry.pas	2007-05-01 05:17:05 UTC (rev 2004)
@@ -79,7 +79,7 @@
   HKPD = DelphiHKEY(HKEY_PERFORMANCE_DATA);
   HKCC = DelphiHKEY(HKEY_CURRENT_CONFIG);
   HKDD = DelphiHKEY(HKEY_DYN_DATA);
-{$ENDIF ~FPC}
+{$ENDIF FPC}
 
 const
   RegKeyDelimiter = '\';
@@ -95,94 +95,130 @@
   out DataType: Cardinal): Boolean;
 function RegReadBool(const RootKey: DelphiHKEY; const Key, Name: string): Boolean;
 function RegReadBoolDef(const RootKey: DelphiHKEY; const Key, Name: string; Def: Boolean): Boolean;
-function RegReadIntegerEx(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: Integer; RaiseException: Boolean = False): Boolean;
+function RegReadIntegerEx(const RootKey: DelphiHKEY; const Key, Name: string;
+  out RetValue: Integer; RaiseException: Boolean = False): Boolean;
 function RegReadInteger(const RootKey: DelphiHKEY; const Key, Name: string): Integer;
 function RegReadIntegerDef(const RootKey: DelphiHKEY; const Key, Name: string; Def: Integer): Integer;
-function RegReadCardinalEx(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: Cardinal; RaiseException: Boolean = False): Boolean;
+function RegReadCardinalEx(const RootKey: DelphiHKEY; const Key, Name: string;
+  out RetValue: Cardinal; RaiseException: Boolean = False): Boolean;
 function RegReadCardinal(const RootKey: DelphiHKEY; const Key, Name: string): Cardinal;
 function RegReadCardinalDef(const RootKey: DelphiHKEY; const Key, Name: string; Def: Cardinal): Cardinal;
-function RegReadDWORDEx(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: DWORD; RaiseException: Boolean = False): Boolean;
+function RegReadDWORDEx(const RootKey: DelphiHKEY; const Key, Name: string;
+  out RetValue: DWORD; RaiseException: Boolean = False): Boolean;
 function RegReadDWORD(const RootKey: DelphiHKEY; const Key, Name: string): DWORD;
 function RegReadDWORDDef(const RootKey: DelphiHKEY; const Key, Name: string; Def: DWORD): DWORD;
-function RegReadInt64Ex(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: Int64; RaiseException: Boolean = False): Boolean;
+function RegReadInt64Ex(const RootKey: DelphiHKEY; const Key, Name: string;
+  out RetValue: Int64; RaiseException: Boolean = False): Boolean;
 function RegReadInt64(const RootKey: DelphiHKEY; const Key, Name: string): Int64;
 function RegReadInt64Def(const RootKey: DelphiHKEY; const Key, Name: string; Def: Int64): Int64;
-function RegReadUInt64Ex(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: UInt64; RaiseException: Boolean = False): Boolean;
+function RegReadUInt64Ex(const RootKey: DelphiHKEY; const Key, Name: string;
+  out RetValue: UInt64; RaiseException: Boolean = False): Boolean;
 function RegReadUInt64(const RootKey: DelphiHKEY; const Key, Name: string): UInt64;
 function RegReadUInt64Def(const RootKey: DelphiHKEY; const Key, Name: string; Def: UInt64): UInt64;
-function RegReadSingleEx(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: Single; RaiseException: Boolean = False): Boolean;
+function RegReadSingleEx(const RootKey: DelphiHKEY; const Key, Name: string;
+  out RetValue: Single; RaiseException: Boolean = False): Boolean;
 function RegReadSingle(const RootKey: DelphiHKEY; const Key, Name: string): Single;
 function RegReadSingleDef(const RootKey: DelphiHKEY; const Key, Name: string; Def: Single): Single;
-function RegReadDoubleEx(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: Double; RaiseException: Boolean = False): Boolean;
+function RegReadDoubleEx(const RootKey: DelphiHKEY; const Key, Name: string;
+  out RetValue: Double; RaiseException: Boolean = False): Boolean;
 function RegReadDouble(const RootKey: DelphiHKEY; const Key, Name: string): Double;
 function RegReadDoubleDef(const RootKey: DelphiHKEY; const Key, Name: string; Def: Double): Double;
-function RegReadExtendedEx(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: Extended; RaiseException: Boolean = False): Boolean;
+function RegReadExtendedEx(const RootKey: DelphiHKEY; const Key, Name: string;
+  out RetValue: Extended; RaiseException: Boolean = False): Boolean;
 function RegReadExtended(const RootKey: DelphiHKEY; const Key, Name: string): Extended;
 function RegReadExtendedDef(const RootKey: DelphiHKEY; const Key, Name: string; Def: Extended): Extended;
 
-function RegReadStringEx(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: AnsiString; RaiseException: Boolean = False): Boolean;
+function RegReadStringEx(const RootKey: DelphiHKEY; const Key, Name: string;
+  out RetValue: AnsiString; RaiseException: Boolean = False): Boolean;
 function RegReadString(const RootKey: DelphiHKEY; const Key, Name: string): string;
 function RegReadStringDef(const RootKey: DelphiHKEY; const Key, Name: string; Def: string): string;
-function RegReadAnsiStringEx(const RootKey: DelphiHKEY; const Key, Name: AnsiString; out RetValue: AnsiString; RaiseException: Boolean = False): Boolean;
+function RegReadAnsiStringEx(const RootKey: DelphiHKEY; const Key, Name: AnsiString;
+  out RetValue: AnsiString; RaiseException: Boolean = False): Boolean;
 function RegReadAnsiString(const RootKey: DelphiHKEY; const Key, Name: AnsiString): AnsiString;
 function RegReadAnsiStringDef(const RootKey: DelphiHKEY; const Key, Name: AnsiString; Def: AnsiString): AnsiString;
-function RegReadWideStringEx(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: WideString; RaiseException: Boolean = False): Boolean;
+function RegReadWideStringEx(const RootKey: DelphiHKEY; const Key, Name: string;
+  out RetValue: WideString; RaiseException: Boolean = False): Boolean;
 function RegReadWideString(const RootKey: DelphiHKEY; const Key, Name: string): WideString;
 function RegReadWideStringDef(const RootKey: DelphiHKEY; const Key, Name: string; Def: WideString): WideString;
 
-function RegReadMultiSzEx(const RootKey: DelphiHKEY; const Key, Name: string; Value: TStrings; RaiseException: Boolean = False): Boolean; overload;
-function RegReadMultiSzEx(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: PMultiSz; RaiseException: Boolean = False): Boolean; overload;
+function RegReadMultiSzEx(const RootKey: DelphiHKEY; const Key, Name: string; Value: TStrings;
+  RaiseException: Boolean = False): Boolean; overload;
+function RegReadMultiSzEx(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: PMultiSz;
+  RaiseException: Boolean = False): Boolean; overload;
 procedure RegReadMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; Value: TStrings); overload;
 function RegReadMultiSz(const RootKey: DelphiHKEY; const Key, Name: string): PMultiSz; overload;
 procedure RegReadMultiSzDef(const RootKey: DelphiHKEY; const Key, Name: string; Value, Def: TStrings); overload;
 function RegReadMultiSzDef(const RootKey: DelphiHKEY; const Key, Name: string; Def: PMultiSz): PMultiSz; overload;
 
-function RegReadWideMultiSzEx(const RootKey: DelphiHKEY; const Key, Name: string; Value: TWideStrings; RaiseException: Boolean = False): Boolean; overload;
-function RegReadWideMultiSzEx(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: PWideMultiSz; RaiseException: Boolean = False): Boolean; overload;
+function RegReadWideMultiSzEx(const RootKey: DelphiHKEY; const Key, Name: string; Value: TWideStrings;
+  RaiseException: Boolean = False): Boolean; overload;
+function RegReadWideMultiSzEx(const RootKey: DelphiHKEY; const Key, Name: string; out RetValue: PWideMultiSz;
+  RaiseException: Boolean = False): Boolean; overload;
 procedure RegReadWideMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; Value: TWideStrings); overload;
 function RegReadWideMultiSz(const RootKey: DelphiHKEY; const Key, Name: string): PWideMultiSz; overload;
-procedure RegReadWideMultiSzDef(const RootKey: DelphiHKEY; const Key, Name: string; Value, Def: TWideStrings); overload;
-function RegReadWideMultiSzDef(const RootKey: DelphiHKEY; const Key, Name: string; Def: PWideMultiSz): PWideMultiSz; overload;
+procedure RegReadWideMultiSzDef(const RootKey: DelphiHKEY; const Key, Name: string;
+  Value, Def: TWideStrings); overload;
+function RegReadWideMultiSzDef(const RootKey: DelphiHKEY; const Key, Name: string;
+  Def: PWideMultiSz): PWideMultiSz; overload;
 
-function RegReadBinaryEx(const RootKey: DelphiHKEY; const Key, Name: string; var Value; const ValueSize: Cardinal; out DataSize: Cardinal; RaiseException: Boolean = False): Boolean;
-function RegReadBinary(const RootKey: DelphiHKEY; const Key, Name: string; var Value; const ValueSize: Cardinal): Cardinal;
+function RegReadBinaryEx(const RootKey: DelphiHKEY; const Key, Name: string; var Value; const ValueSize: Cardinal;
+  out DataSize: Cardinal; RaiseException: Boolean = False): Boolean;
+function RegReadBinary(const RootKey: DelphiHKEY; const Key, Name: string;
+  var Value; const ValueSize: Cardinal): Cardinal;
 function RegReadBinaryDef(const RootKey: DelphiHKEY; const Key, Name: string;
   var Value; const ValueSize: Cardinal; const Def: Byte): Cardinal;
 
 procedure RegWriteBool(const RootKey: DelphiHKEY; const Key, Name: string; Value: Boolean); overload;
-procedure RegWriteBool(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: Boolean); overload;
+procedure RegWriteBool(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: Boolean); overload;
 procedure RegWriteInteger(const RootKey: DelphiHKEY; const Key, Name: string; Value: Integer); overload;
-procedure RegWriteInteger(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: Integer); overload;
+procedure RegWriteInteger(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: Integer); overload;
 procedure RegWriteCardinal(const RootKey: DelphiHKEY; const Key, Name: string; Value: Cardinal); overload;
-procedure RegWriteCardinal(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: Cardinal); overload;
+procedure RegWriteCardinal(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: Cardinal); overload;
 procedure RegWriteDWORD(const RootKey: DelphiHKEY; const Key, Name: string; Value: DWORD); overload;
-procedure RegWriteDWORD(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: DWORD); overload;
+procedure RegWriteDWORD(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: DWORD); overload;
 procedure RegWriteInt64(const RootKey: DelphiHKEY; const Key, Name: string; Value: Int64); overload;
-procedure RegWriteInt64(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: Int64); overload;
+procedure RegWriteInt64(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: Int64); overload;
 procedure RegWriteUInt64(const RootKey: DelphiHKEY; const Key, Name: string; Value: UInt64); overload;
-procedure RegWriteUInt64(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: UInt64); overload;
+procedure RegWriteUInt64(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: UInt64); overload;
 procedure RegWriteSingle(const RootKey: DelphiHKEY; const Key, Name: string; Value: Single); overload;
-procedure RegWriteSingle(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: Single); overload;
+procedure RegWriteSingle(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: Single); overload;
 procedure RegWriteDouble(const RootKey: DelphiHKEY; const Key, Name: string; Value: Double); overload;
-procedure RegWriteDouble(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: Double); overload;
+procedure RegWriteDouble(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: Double); overload;
 procedure RegWriteExtended(const RootKey: DelphiHKEY; const Key, Name: string; Value: Extended); overload;
-procedure RegWriteExtended(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: Extended); overload;
+procedure RegWriteExtended(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: Extended); overload;
 
 procedure RegWriteString(const RootKey: DelphiHKEY; const Key, Name, Value: string); overload;
-procedure RegWriteString(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: string); overload;
+procedure RegWriteString(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: string); overload;
 procedure RegWriteAnsiString(const RootKey: DelphiHKEY; const Key, Name, Value: AnsiString); overload;
-procedure RegWriteAnsiString(const RootKey: DelphiHKEY; const Key, Name: AnsiString; DataType: Cardinal; Value: AnsiString); overload;
+procedure RegWriteAnsiString(const RootKey: DelphiHKEY; const Key, Name: AnsiString; DataType: Cardinal;
+  Value: AnsiString); overload;
 procedure RegWriteWideString(const RootKey: DelphiHKEY; const Key, Name: string; Value: WideString); overload;
-procedure RegWriteWideString(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: WideString); overload;
+procedure RegWriteWideString(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: WideString); overload;
 
 procedure RegWriteMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; Value: PMultiSz); overload;
 procedure RegWriteMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; const Value: TStrings); overload;
-procedure RegWriteMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: PMultiSz); overload;
-procedure RegWriteMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; const Value: TStrings); overload;
+procedure RegWriteMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: PMultiSz); overload;
+procedure RegWriteMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  const Value: TStrings); overload;
 procedure RegWriteWideMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; Value: PWideMultiSz); overload;
-procedure RegWriteWideMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; const Value: TWideStrings); overload;
-procedure RegWriteWideMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: PWideMultiSz); overload;
-procedure RegWriteWideMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; const Value: TWideStrings); overload;
+procedure RegWriteWideMultiSz(const RootKey: DelphiHKEY; const Key, Name: string;
+  const Value: TWideStrings); overload;
+procedure RegWriteWideMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: PWideMultiSz); overload;
+procedure RegWriteWideMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  const Value: TWideStrings); overload;
 
 procedure RegWriteBinary(const RootKey: DelphiHKEY; const Key, Name: string; const Value; const ValueSize: Cardinal);
 
@@ -1351,7 +1387,8 @@
   RegWriteAnsiString(RootKey, Key, Name, REG_SZ, Value);
 end;
 
-procedure RegWriteAnsiString(const RootKey: DelphiHKEY; const Key, Name: AnsiString; DataType: Cardinal; Value: AnsiString);
+procedure RegWriteAnsiString(const RootKey: DelphiHKEY; const Key, Name: AnsiString; DataType: Cardinal;
+  Value: AnsiString);
 begin
   if DataType in [REG_BINARY, REG_SZ, REG_EXPAND_SZ] then
     InternalSetData(RootKey, Key, Name, DataType, PChar(Value),
@@ -1397,7 +1434,8 @@
   RegWriteMultiSz(RootKey, Key, Name, REG_MULTI_SZ, Value);
 end;
 
-procedure RegWriteMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; const Value: TStrings);
+procedure RegWriteMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  const Value: TStrings);
 var
   Dest: PMultiSz;
 begin
@@ -1419,7 +1457,8 @@
   RegWriteWideMultiSz(RootKey, Key, Name, REG_MULTI_SZ, Value);
 end;
 
-procedure RegWriteWideMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; Value: PWideMultiSz);
+procedure RegWriteWideMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  Value: PWideMultiSz);
 begin
   if Win32Platform = VER_PLATFORM_WIN32_WINDOWS then
     DataType := REG_BINARY;
@@ -1435,7 +1474,8 @@
   RegWriteWideMultiSz(RootKey, Key, Name, REG_MULTI_SZ, Value);
 end;
 
-procedure RegWriteWideMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal; const Value: TWideStrings);
+procedure RegWriteWideMultiSz(const RootKey: DelphiHKEY; const Key, Name: string; DataType: Cardinal;
+  const Value: TWideStrings);
 var
   Dest: PWideMultiSz;
 begin
@@ -1493,7 +1533,8 @@
     List.Clear;
     if RegOpenKeyEx(RootKey, RelativeKey(RootKey, PChar(Key)), 0, KEY_READ, RegKey) = ERROR_SUCCESS then
     begin
-      if RegQueryInfoKey(RegKey, nil, nil, nil, @NumSubKeys, nil, nil, @NumSubValues, @MaxSubValueLen, nil, nil, nil) = ERROR_SUCCESS then
+      if RegQueryInfoKey(RegKey, nil, nil, nil, @NumSubKeys, nil, nil,
+        @NumSubValues, @MaxSubValueLen, nil, nil, nil) = ERROR_SUCCESS then
       begin
         SetLength(ValueName, MaxSubValueLen + 1);
         if NumSubValues <> 0 then
@@ -1529,7 +1570,8 @@
     List.Clear;
     if RegOpenKeyEx(RootKey, RelativeKey(RootKey, PChar(Key)), 0, KEY_READ, RegKey) = ERROR_SUCCESS then
     begin
-      if RegQueryInfoKey(RegKey, nil, nil, nil, @NumSubKeys, @MaxSubKeyLen, nil, nil, nil, nil, nil, nil) = ERROR_SUCCESS then
+      if RegQueryInfoKey(RegKey, nil, nil, nil,
+        @NumSubKeys, @MaxSubKeyLen, nil, nil, nil, nil, nil, nil) = ERROR_SUCCESS then
       begin
         SetLength(KeyName, MaxSubKeyLen+1);
         if NumSubKeys <> 0 then


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2003] trunk/jcl/experts/debug/dialog

From: <sch...@us...> - 2007-04-26 16:23:06

Revision: 2003
          http://svn.sourceforge.net/jcl/?rev=2003&view=rev
Author:   schuettecarsten
Date:     2007-04-26 09:23:00 -0700 (Thu, 26 Apr 2007)

Log Message:
-----------
Added lost "AutoScroll=False" in dfm files (lost in Rev 1947)
Fixed compiler warning, added changes from Rev 2001 also to ExceptDlgMail.pas

Revision Links:
--------------
    http://svn.sourceforge.net/jcl/?rev=1947&view=rev
    http://svn.sourceforge.net/jcl/?rev=2001&view=rev

Modified Paths:
--------------
    trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.dfm
    trunk/jcl/experts/debug/dialog/ExceptDlg.dfm
    trunk/jcl/experts/debug/dialog/ExceptDlg.pas
    trunk/jcl/experts/debug/dialog/ExceptDlgMail.dfm
    trunk/jcl/experts/debug/dialog/ExceptDlgMail.pas

Modified: trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.dfm	2007-04-23 15:56:38 UTC (rev 2002)
+++ trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.dfm	2007-04-26 16:23:00 UTC (rev 2003)
@@ -1,6 +1,7 @@
 object %FORMNAME%: T%FORMNAME%
   Left = 310
   Top = 255
+  AutoScroll = False
   BorderIcons = [biSystemMenu]
 %ifnot SizeableDialog  BorderStyle = bsDialog%endif
   Caption = '%FORMNAME%'

Modified: trunk/jcl/experts/debug/dialog/ExceptDlg.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlg.dfm	2007-04-23 15:56:38 UTC (rev 2002)
+++ trunk/jcl/experts/debug/dialog/ExceptDlg.dfm	2007-04-26 16:23:00 UTC (rev 2003)
@@ -1,6 +1,7 @@
 object ExceptionDialog: TExceptionDialog
   Left = 310
   Top = 255
+  AutoScroll = False
   BorderIcons = [biSystemMenu]
 
   Caption = 'ExceptionDialog'

Modified: trunk/jcl/experts/debug/dialog/ExceptDlg.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlg.pas	2007-04-23 15:56:38 UTC (rev 2002)
+++ trunk/jcl/experts/debug/dialog/ExceptDlg.pas	2007-04-26 16:23:00 UTC (rev 2003)
@@ -202,7 +202,9 @@
       CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
       Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
     end;
-  end;
+  end
+  else
+    Result := False;
 end;
 
 //============================================================================

Modified: trunk/jcl/experts/debug/dialog/ExceptDlgMail.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlgMail.dfm	2007-04-23 15:56:38 UTC (rev 2002)
+++ trunk/jcl/experts/debug/dialog/ExceptDlgMail.dfm	2007-04-26 16:23:00 UTC (rev 2003)
@@ -1,6 +1,7 @@
 object ExceptionDialogMail: TExceptionDialogMail
   Left = 310
   Top = 255
+  AutoScroll = False
   BorderIcons = [biSystemMenu]
 
   Caption = 'ExceptionDialogMail'

Modified: trunk/jcl/experts/debug/dialog/ExceptDlgMail.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlgMail.pas	2007-04-23 15:56:38 UTC (rev 2002)
+++ trunk/jcl/experts/debug/dialog/ExceptDlgMail.pas	2007-04-26 16:23:00 UTC (rev 2003)
@@ -194,12 +194,17 @@
 begin
   TApplicationHandleExceptionAddr := PeMapImgResolvePackageThunk(@TApplication.HandleException);
   SysUtilsShowExceptionAddr := PeMapImgResolvePackageThunk(@SysUtils.ShowException);
-  Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
-  if Result then
+  if Assigned(TApplicationHandleExceptionAddr) and Assigned(SysUtilsShowExceptionAddr) then
   begin
-    CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
-    Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
-  end;
+    Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
+    if Result then
+    begin
+      CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
+      Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
+    end;
+  end
+  else
+    Result := False;
 end;
 
 //============================================================================


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2002] trunk/jcl/source/common/JclSysUtils.pas

From: <ou...@us...> - 2007-04-23 16:08:31

Revision: 2002
          http://svn.sourceforge.net/jcl/?rev=2002&view=rev
Author:   outchy
Date:     2007-04-23 08:56:38 -0700 (Mon, 23 Apr 2007)

Log Message:
-----------
bug report from Arioch in newsgroups: FLogFileName should be an Integer otherwise range check errors may be generated.

Modified Paths:
--------------
    trunk/jcl/source/common/JclSysUtils.pas

Modified: trunk/jcl/source/common/JclSysUtils.pas
===================================================================
--- trunk/jcl/source/common/JclSysUtils.pas	2007-04-23 09:30:21 UTC (rev 2001)
+++ trunk/jcl/source/common/JclSysUtils.pas	2007-04-23 15:56:38 UTC (rev 2002)
@@ -506,7 +506,7 @@
 type
   TJclSimpleLog = class (TObject)
   private
-    FLogFileHandle: THandle;
+    FLogFileHandle: Integer;
     FLogFileName: string;
     FLogWasEmpty: Boolean;
     function GetLogOpen: Boolean;
@@ -3129,7 +3129,7 @@
       for I := 0 to SL.Count - 1 do
       begin
         S := StringOfChar(' ', Indent) + StrEnsureSuffix(AnsiCrLf, TrimRight(SL[I]));
-        FileWrite(Integer(FLogFileHandle), Pointer(S)^, Length(S));
+        FileWrite(FLogFileHandle, Pointer(S)^, Length(S));
       end;
     finally
       SL.Free;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2001] trunk/jcl/experts/debug/dialog

From: <sch...@us...> - 2007-04-23 09:32:21

Revision: 2001
          http://svn.sourceforge.net/jcl/?rev=2001&view=rev
Author:   schuettecarsten
Date:     2007-04-23 02:30:21 -0700 (Mon, 23 Apr 2007)

Log Message:
-----------
Fixed bug in ExceptDlg when Linker has removed TApplication.HandleException

Modified Paths:
--------------
    trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.pas
    trunk/jcl/experts/debug/dialog/ExceptDlg.pas

Modified: trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.pas	2007-04-20 17:01:29 UTC (rev 2000)
+++ trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.pas	2007-04-23 09:30:21 UTC (rev 2001)
@@ -195,12 +195,17 @@
 begin
   TApplicationHandleExceptionAddr := PeMapImgResolvePackageThunk(@TApplication.HandleException);
   SysUtilsShowExceptionAddr := PeMapImgResolvePackageThunk(@SysUtils.ShowException);
-  Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
-  if Result then
+  if Assigned(TApplicationHandleExceptionAddr) and Assigned(SysUtilsShowExceptionAddr) then
   begin
-    CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
-    Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
-  end;
+    Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
+    if Result then
+    begin
+      CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
+      Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
+    end;
+  end
+  else
+    Result := False;
 end;
 
 //============================================================================

Modified: trunk/jcl/experts/debug/dialog/ExceptDlg.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlg.pas	2007-04-20 17:01:29 UTC (rev 2000)
+++ trunk/jcl/experts/debug/dialog/ExceptDlg.pas	2007-04-23 09:30:21 UTC (rev 2001)
@@ -194,11 +194,14 @@
 begin
   TApplicationHandleExceptionAddr := PeMapImgResolvePackageThunk(@TApplication.HandleException);
   SysUtilsShowExceptionAddr := PeMapImgResolvePackageThunk(@SysUtils.ShowException);
-  Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
-  if Result then
+  if Assigned(TApplicationHandleExceptionAddr) and Assigned(SysUtilsShowExceptionAddr) then
   begin
-    CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
-    Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
+    Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
+    if Result then
+    begin
+      CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
+      Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
+    end;
   end;
 end;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2000] trunk

From: <ou...@us...> - 2007-04-20 17:01:34

Revision: 2000
          http://svn.sourceforge.net/jcl/?rev=2000&view=rev
Author:   outchy
Date:     2007-04-20 10:01:29 -0700 (Fri, 20 Apr 2007)

Log Message:
-----------
Added support for bzip2 archives based on version 1.0.4.
Static link is still experimental because of linkage issues (strange warnings and errors - see bzip2.pas near $LINK) 
However it passed tests in all modes (static link, static bind, late bind).
Added options in the installer to configure linkage mode.
Refactoring on GZipFile and UnGZipFile to allow generalization (introduction of BZip2File and UnBZip2File).

Modified Paths:
--------------
    trunk/jcl/install/JclInstall.pas
    trunk/jcl/lib/d10.net/common.exc
    trunk/jcl/lib/d9.net/common.exc
    trunk/jcl/packages/c5/JclC50.bpk
    trunk/jcl/packages/c5/JclC50.cpp
    trunk/jcl/packages/c5/JclC50.dpk
    trunk/jcl/packages/c6/Jcl.bpk
    trunk/jcl/packages/c6/Jcl.dpk
    trunk/jcl/packages/cs1/Jcl.dpk
    trunk/jcl/packages/d10/Jcl.dpk
    trunk/jcl/packages/d11/Jcl.dpk
    trunk/jcl/packages/d5/JclD50.dpk
    trunk/jcl/packages/d6/Jcl.dpk
    trunk/jcl/packages/d7/Jcl.dpk
    trunk/jcl/packages/d8/Jcl.dpk
    trunk/jcl/packages/d9/Jcl.dpk
    trunk/jcl/packages/k3/Jcl.bpk
    trunk/jcl/packages/k3/Jcl.dpk
    trunk/jcl/packages/xml/Jcl-R.xml
    trunk/jcl/source/common/JclCompression.pas
    trunk/jcl/source/common/JclResources.pas
    trunk/jcl/source/jcl.inc
    trunk/jcl/source/jcl.template.inc
    trunk/jcl/source/windows/obj/pcre/makefile.mak

Added Paths:
-----------
    trunk/jcl/source/common/bzip2.pas
    trunk/jcl/source/windows/obj/bzip2/
    trunk/jcl/source/windows/obj/bzip2/blocksort.obj
    trunk/jcl/source/windows/obj/bzip2/bzlib.obj
    trunk/jcl/source/windows/obj/bzip2/compress.obj
    trunk/jcl/source/windows/obj/bzip2/crctable.obj
    trunk/jcl/source/windows/obj/bzip2/decompress.obj
    trunk/jcl/source/windows/obj/bzip2/dirinfo.txt
    trunk/jcl/source/windows/obj/bzip2/huffman.obj
    trunk/jcl/source/windows/obj/bzip2/makefile.mak
    trunk/jcl/source/windows/obj/bzip2/randtable.obj
    trunk/jcl/source/windows/obj/pcre/dirinfo.txt
    trunk/thirdparty/bzip2/
    trunk/thirdparty/bzip2/LICENCE.txt
    trunk/thirdparty/bzip2/bzip2-1.0.4.tar.gz
    trunk/thirdparty/bzip2/how-to-update.txt

Property Changed:
----------------
    trunk/jcl/source/windows/obj/pcre/makefile.mak
    trunk/jcl/source/windows/obj/zlib/makefile.mak

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/install/JclInstall.pas	2007-04-20 17:01:29 UTC (rev 2000)
@@ -42,6 +42,7 @@
         joDefDebug,
         joDefEDI,
         joDefPCRE,
+        joDefBZip2,
         joDefThreadSafe,
         joDefDropObsoleteCode,
         joDefUnitVersioning,
@@ -59,6 +60,9 @@
         joDefPCREStaticLink,
         joDefPCRELinkDLL,
         joDefPCRELinkOnRequest,
+        joDefBZip2StaticLink,
+        joDefBZip2LinkDLL,
+        joDefBZip2LinkOnRequest,
       joEnvironment,
         joEnvLibPath,
         joEnvBrowsingPath,
@@ -361,6 +365,11 @@
   RsCaptionDefPCREStaticLink      = 'Static link to PCRE code';
   RsCaptionDefPCRELinkDLL         = 'Static bind to pcre.dll';
   RsCaptionDefPCRELinkOnRequest   = 'Late bind to pcre.dll';
+  // BZip2 options
+  RsCaptionDefBZip2               = 'BZip2 options';
+  RsCaptionDefBZip2StaticLink     = 'Static link to BZip2 code (experimental)';
+  RsCaptionDefBZip2LinkDLL        = 'Static bind to bzip2.dll';
+  RsCaptionDefBZip2LinkOnRequest  = 'Late bind to bzip2.dll';
   
   // post compilation
   RsCaptionPdbCreate  = 'Create PDB debug information';
@@ -448,6 +457,11 @@
   RsHintDefPCREStaticLink      = 'Code from PCRE is linked into JCL binaries';
   RsHintDefPCRELinkDLL         = 'JCL binaries require pcre.dll to be present';
   RsHintDefPCRELinkOnRequest   = 'JCL binaries require pcre.dll when calling PCRE functions';
+  // BZip2 options
+  RsHintDefBZip2               = 'BZip2 specific options (bzip2.pas)';
+  RsHintDefBZip2StaticLink     = 'Code from BZip2 is linked into JCL binaries';
+  RsHintDefBZip2LinkDLL        = 'JCL binaries require bzip2.dll to be present';
+  RsHintDefBZip2LinkOnRequest  = 'JCL binaries require bzip2.dll when calling PCRE functions';
 
   // post compilation
   RsHintPdbCreate  = 'Create detailed debug information for libraries';
@@ -540,6 +554,7 @@
       (Id: -1; Caption: RsCaptionDefDebug; Hint: RsHintDefDebug), // joDefDebug
       (Id: -1; Caption: RsCaptionDefEDI; Hint: RsHintDefEDI), // joDefEDI
       (Id: -1; Caption: RsCaptionDefPCRE; Hint: RsHintDefPCRE), // joDefPCRE
+      (Id: -1; Caption: RsCaptionDefBZip2; Hint: RsHintDefBZip2), // joDefBZip2
       (Id: -1; Caption: RsCaptionDefThreadSafe; Hint: RsHintDefThreadSafe), // joDefThreadSafe
       (Id: -1; Caption: RsCaptionDefDropObsoleteCode; Hint: RsHintDefDropObsoleteCode), // joDefDropObsoleteCode
       (Id: -1; Caption: RsCaptionDefUnitVersioning; Hint: RsHintDefUnitVersioning), // joDefUnitVersioning
@@ -557,6 +572,9 @@
       (Id: -1; Caption: RsCaptionDefPCREStaticLink; Hint: RsHintDefPCREStaticLink), // joDefPCREStaticLink
       (Id: -1; Caption: RsCaptionDefPCRELinkDLL; Hint: RsHintDefPCRELinkDLL), // joDefPCRELinkDLL
       (Id: -1; Caption: RsCaptionDefPCRELinkOnRequest; Hint: RsHintDefPCRELinkOnRequest), // joDefPCRELinkOnRequest
+      (Id: -1; Caption: RsCaptionDefBZip2StaticLink; Hint: RsHintDefBZip2StaticLink), // joDefBZip2StaticLink
+      (Id: -1; Caption: RsCaptionDefBZip2LinkDLL; Hint: RsHintDefBZip2LinkDLL), // joDefBZip2LinkDLL
+      (Id: -1; Caption: RsCaptionDefBZip2LinkOnRequest; Hint: RsHintDefBZip2LinkOnRequest), // joDefBZip2LinkOnRequest
       (Id: -1; Caption: RsCaptionEnvironment; Hint: RsHintEnvironment), // joEnvironment
       (Id: -1; Caption: RsCaptionEnvLibPath; Hint: RsHintEnvLibPath), // joEnvLibPath
       (Id: -1; Caption: RsCaptionEnvBrowsingPath; Hint: RsHintEnvBrowsingPath), // joEnvBrowsingPath
@@ -891,6 +909,7 @@
     if CLRVersion = '' then   // these units are not CLR compliant
     begin
       {$IFDEF MSWINDOWS}
+      // debug options
       AddOption(joDefDebug, [goNoAutoCheck], Parent);
       AddOption(joDefHookDllExceptions, [goNoAutoCheck], joDefDebug);
       AddOption(joDefDebugNoBinary, [goNoAutoCheck], joDefDebug);
@@ -899,8 +918,10 @@
       AddOption(joDefDebugNoExports, [goNoAutoCheck], joDefDebug);
       AddOption(joDefDebugNoSymbols, [goNoAutoCheck], joDefDebug);
       {$ENDIF MSWINDOWS}
+      // EDI options
       AddOption(joDefEDI, [goNoAutoCheck], Parent);
       AddOption(joDefEDIWeakPackageUnits, [goNoAutoCheck], joDefEDI);
+      // PCRE options
       AddOption(joDefPCRE, [goChecked], Parent);
       if Target.RadToolKind = brBorlandDevStudio then
       begin
@@ -910,6 +931,13 @@
       else
         AddOption(joDefPCRELinkOnRequest, [goRadioButton, goChecked], joDefPCRE);
       AddOption(joDefPCRELinkDLL, [goRadioButton], joDefPCRE);
+      // BZip2 options
+      AddOption(joDefBZip2, [goChecked], Parent);
+      {$IFDEF MSWINDOWS}
+      AddOption(joDefBZip2StaticLink, [goRadioButton], joDefBZip2);
+      {$ENDIF MSWINDOWS}
+      AddOption(joDefBZip2LinkOnRequest, [goRadioButton, goChecked], joDefBZip2);
+      AddOption(joDefBZip2LinkDLL, [goRadioButton], joDefBZip2);
     end;
   end;
 
@@ -1348,13 +1376,14 @@
     end;
 
   const
-    DefineNames: array [joDefThreadSafe..joDefPCRELinkOnRequest] of string =
+    DefineNames: array [joDefThreadSafe..joDefBZip2LinkOnRequest] of string =
       ( 'THREADSAFE', 'DROP_OBSOLETE_CODE', 'UNITVERSIONING',
         'MATH_SINGLE_PRECISION', 'MATH_DOUBLE_PRECISION', 'MATH_EXTENDED_PRECISION',
         'MATH_EXT_EXTREMEVALUES',  'HOOK_DLL_EXCEPTIONS',
         'DEBUG_NO_BINARY', 'DEBUG_NO_TD32', 'DEBUG_NO_MAP', 'DEBUG_NO_EXPORTS',
         'DEBUG_NO_SYMBOLS', 'EDI_WEAK_PACKAGE_UNITS', 'PCRE_STATICLINK',
-        'PCRE_LINKDLL', 'PCRE_LINKONREQUEST' );
+        'PCRE_LINKDLL', 'PCRE_LINKONREQUEST', 'BZIP2_STATICLINK',
+        'BZIP2_LINKDLL', 'BZIP2_LINKONREQUEST' );
   var
     Option: TJclOption;
     Defines: TStrings;

Modified: trunk/jcl/lib/d10.net/common.exc
===================================================================
--- trunk/jcl/lib/d10.net/common.exc	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/lib/d10.net/common.exc	2007-04-20 17:01:29 UTC (rev 2000)
@@ -1,3 +1,4 @@
+bzip2.pas
 Jcl8087.pas
 JclBorlandTools.pas
 JclCompression.pas

Modified: trunk/jcl/lib/d9.net/common.exc
===================================================================
--- trunk/jcl/lib/d9.net/common.exc	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/lib/d9.net/common.exc	2007-04-20 17:01:29 UTC (rev 2000)
@@ -1,3 +1,4 @@
+bzip2.pas
 Jcl8087.pas
 JclBorlandTools.pas
 JclCompression.pas

Modified: trunk/jcl/packages/c5/JclC50.bpk
===================================================================
--- trunk/jcl/packages/c5/JclC50.bpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/c5/JclC50.bpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -5,7 +5,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 27-11-2006  06:24:28 UTC
+     Last generated: 20-04-2007  16:14:41 UTC
 *****************************************************************************
 -->
 <PROJECT>
@@ -14,6 +14,7 @@
     <PROJECT value="JclC50.bpl"/>
     <OBJFILES value="
       ..\..\lib\c5\JclC50.obj
+      ..\..\lib\c5\bzip2.obj
       ..\..\lib\c5\Jcl8087.obj
       ..\..\lib\c5\JclAbstractContainers.obj
       ..\..\lib\c5\JclAlgorithms.obj

Modified: trunk/jcl/packages/c5/JclC50.cpp
===================================================================
--- trunk/jcl/packages/c5/JclC50.cpp	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/c5/JclC50.cpp	2007-04-20 17:01:29 UTC (rev 2000)
@@ -4,13 +4,14 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
             
-     Last generated: 27-11-2006  06:24:28 UTC     
+     Last generated: 20-04-2007  16:14:41 UTC     
 -----------------------------------------------------------------------------
 */
 
 #include <vcl.h>
 #pragma hdrstop
 USERES("JclC50.res");
+USEUNIT("..\..\source\common\bzip2.pas");
 USEUNIT("..\..\source\common\Jcl8087.pas");
 USEUNIT("..\..\source\common\JclAbstractContainers.pas");
 USEUNIT("..\..\source\common\JclAlgorithms.pas");

Modified: trunk/jcl/packages/c5/JclC50.dpk
===================================================================
--- trunk/jcl/packages/c5/JclC50.dpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/c5/JclC50.dpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 27-11-2006  06:24:28 UTC
+     Last generated: 20-04-2007  16:14:42 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -40,6 +40,7 @@
   ;
 
 contains
+  bzip2 in '..\..\source\common\bzip2.pas' ,
   Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
   JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
   JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,

Modified: trunk/jcl/packages/c6/Jcl.bpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.bpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/c6/Jcl.bpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -5,7 +5,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 27-11-2006  06:24:28 UTC
+     Last generated: 20-04-2007  16:14:42 UTC
 *****************************************************************************
 -->
 <PROJECT>
@@ -14,6 +14,7 @@
     <PROJECT value="JclC60.bpl"/>
     <OBJFILES value="
       ..\..\lib\c6\obj\Jcl.obj
+      ..\..\lib\c6\obj\bzip2.obj
       ..\..\lib\c6\obj\Jcl8087.obj
       ..\..\lib\c6\obj\JclAbstractContainers.obj
       ..\..\lib\c6\obj\JclAlgorithms.obj
@@ -150,6 +151,7 @@
       <FILE FILENAME="Jcl.res" FORMNAME="" UNITNAME="Jcl.res" CONTAINERID="ResTool" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="Jcl.cpp" FORMNAME="" UNITNAME="Jcl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="rtl.bpi" FORMNAME="" UNITNAME="rtl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\source\common\bzip2.pas" FORMNAME="" UNITNAME="bzip2" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\Jcl8087.pas" FORMNAME="" UNITNAME="Jcl8087" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclAbstractContainers.pas" FORMNAME="" UNITNAME="JclAbstractContainers" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclAlgorithms.pas" FORMNAME="" UNITNAME="JclAlgorithms" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

Modified: trunk/jcl/packages/c6/Jcl.dpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.dpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/c6/Jcl.dpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 27-11-2006  06:24:28 UTC
+     Last generated: 20-04-2007  16:14:43 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -39,6 +39,7 @@
   rtl
   ;
 contains
+  bzip2 in '..\..\source\common\bzip2.pas' ,
   Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
   JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
   JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,

Modified: trunk/jcl/packages/cs1/Jcl.dpk
===================================================================
--- trunk/jcl/packages/cs1/Jcl.dpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/cs1/Jcl.dpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 27-11-2006  06:24:28 UTC
+     Last generated: 20-04-2007  16:14:46 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -40,6 +40,7 @@
   ;
   
 contains
+  bzip2 in '..\..\source\common\bzip2.pas' ,
   Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
   JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
   JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,

Modified: trunk/jcl/packages/d10/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d10/Jcl.dpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/d10/Jcl.dpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 27-11-2006  06:24:28 UTC
+     Last generated: 20-04-2007  16:14:48 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -40,6 +40,7 @@
   ;
   
 contains
+  bzip2 in '..\..\source\common\bzip2.pas' ,
   Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
   JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
   JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,

Modified: trunk/jcl/packages/d11/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d11/Jcl.dpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/d11/Jcl.dpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 16-04-2007  07:23:45 UTC
+     Last generated: 20-04-2007  16:14:49 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -40,6 +40,7 @@
   ;
   
 contains
+  bzip2 in '..\..\source\common\bzip2.pas' ,
   Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
   JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
   JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,

Modified: trunk/jcl/packages/d5/JclD50.dpk
===================================================================
--- trunk/jcl/packages/d5/JclD50.dpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/d5/JclD50.dpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 27-11-2006  06:24:28 UTC
+     Last generated: 20-04-2007  16:14:44 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -40,6 +40,7 @@
   ;
 
 contains
+  bzip2 in '..\..\source\common\bzip2.pas' ,
   Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
   JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
   JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,

Modified: trunk/jcl/packages/d6/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d6/Jcl.dpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/d6/Jcl.dpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 27-11-2006  06:24:28 UTC
+     Last generated: 20-04-2007  16:14:44 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -40,6 +40,7 @@
   ;
   
 contains
+  bzip2 in '..\..\source\common\bzip2.pas' ,
   Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
   JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
   JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,

Modified: trunk/jcl/packages/d7/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d7/Jcl.dpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/d7/Jcl.dpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 27-11-2006  06:24:28 UTC
+     Last generated: 20-04-2007  16:14:45 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -40,6 +40,7 @@
   ;
   
 contains
+  bzip2 in '..\..\source\common\bzip2.pas' ,
   Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
   JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
   JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,

Modified: trunk/jcl/packages/d8/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d8/Jcl.dpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/d8/Jcl.dpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 27-11-2006  06:24:28 UTC
+     Last generated: 20-04-2007  16:14:46 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -40,6 +40,7 @@
   ;
   
 contains
+  bzip2 in '..\..\source\common\bzip2.pas' ,
   Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
   JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
   JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,

Modified: trunk/jcl/packages/d9/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d9/Jcl.dpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/d9/Jcl.dpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 27-11-2006  06:24:28 UTC
+     Last generated: 20-04-2007  16:14:47 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -40,6 +40,7 @@
   ;
   
 contains
+  bzip2 in '..\..\source\common\bzip2.pas' ,
   Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
   JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
   JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,

Modified: trunk/jcl/packages/k3/Jcl.bpk
===================================================================
--- trunk/jcl/packages/k3/Jcl.bpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/k3/Jcl.bpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -5,6 +5,7 @@
     <VERSION value="BCB.06.10"/>
     <PROJECT value="bplJcl69.so.2.0.0"/>
     <OBJFILES value="
+      ..\..\lib\k3\obj\bzip2.obj
       ..\..\lib\k3\obj\Jcl8087.obj
       ..\..\lib\k3\obj\JclAbstractContainers.obj
       ..\..\lib\k3\obj\JclAlgorithms.obj
@@ -103,6 +104,7 @@
   <FILELIST>
       <FILE FILENAME="Jcl.res" FORMNAME="" UNITNAME="Jcl.res" CONTAINERID="ResTool" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="Jcl.bpf" FORMNAME="" UNITNAME="Jcl" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../source/common/bzip2.pas" FORMNAME="" UNITNAME="bzip2" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="../../source/common/Jcl8087.pas" FORMNAME="" UNITNAME="Jcl8087" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="../../source/common/JclAbstractContainers.pas" FORMNAME="" UNITNAME="JclAbstractContainers" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="../../source/common/JclAlgorithms.pas" FORMNAME="" UNITNAME="JclAlgorithms" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

Modified: trunk/jcl/packages/k3/Jcl.dpk
===================================================================
--- trunk/jcl/packages/k3/Jcl.dpk	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/k3/Jcl.dpk	2007-04-20 17:01:29 UTC (rev 2000)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 18-03-2007  23:44:35 UTC
+     Last generated: 20-04-2007  16:14:48 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -41,6 +41,7 @@
   ;
   
 contains
+  bzip2 in '../../source/common/bzip2.pas' ,
   Jcl8087 in '../../source/common/Jcl8087.pas' ,
   JclAbstractContainers in '../../source/common/JclAbstractContainers.pas' ,
   JclAlgorithms in '../../source/common/JclAlgorithms.pas' ,

Modified: trunk/jcl/packages/xml/Jcl-R.xml
===================================================================
--- trunk/jcl/packages/xml/Jcl-R.xml	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/packages/xml/Jcl-R.xml	2007-04-20 17:01:29 UTC (rev 2000)
@@ -17,6 +17,7 @@
     <Package Name="vcljpg50" Targets="c5,d5" Condition=""/>
   </Requires>
   <Contains>
+    <File Name="..\..\source\common\bzip2.pas" Targets="JclDev" Formname="" Condition=""/>
     <File Name="..\..\source\common\Jcl8087.pas" Targets="JclDev" Formname="" Condition=""/>
     <File Name="..\..\source\common\JclAbstractContainers.pas" Targets="JclDev" Formname="" Condition=""/>
     <File Name="..\..\source\common\JclAlgorithms.pas" Targets="JclDev" Formname="" Condition=""/>

Modified: trunk/jcl/source/common/JclCompression.pas
===================================================================
--- trunk/jcl/source/common/JclCompression.pas	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/source/common/JclCompression.pas	2007-04-20 17:01:29 UTC (rev 2000)
@@ -16,6 +16,8 @@
 { All Rights Reserved.                                                                             }
 {                                                                                                  }
 { Contributors:                                                                                    }
+{   Olivier Sannier (obones)                                                                       }
+{   Florent Ouchet (outchy)                                                                        }
 {                                                                                                  }
 {**************************************************************************************************}
 {                                                                                                  }
@@ -59,7 +61,7 @@
   Libc,
   {$ENDIF HAS_UNIT_LIBC}
   SysUtils, Classes,
-  zlibh,
+  zlibh, bzip2,
   JclBase, JclStreams;
 
 {**************************************************************************************************}
@@ -356,13 +358,13 @@
   end;
 
   // BZIP2 Support
-(*
-  TJclBZIP2CompressStream = class(TJclCompressStream)
- private
+  TJclBZIP2CompressionStream = class(TJclCompressStream)
+  private
     FDeflateInitialized: Boolean;
-
+    FCompressionLevel: Integer;
   protected
-    BZLibRecord: TBZStream;
+    BZLibRecord: bz_stream;
+    procedure SetCompressionLevel(const Value: Integer);
   public
     function Flush: Integer; override;
     function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
@@ -370,15 +372,15 @@
 
     constructor Create(Destination: TStream; CompressionLevel: TJclCompressionLevel = -1);
     destructor Destroy; override;
+
+    property CompressionLevel: Integer read FCompressionLevel write SetCompressionLevel;
   end;
 
-  TJclBZIP2DecompressStream = class(TJclDecompressStream)
+  TJclBZIP2DecompressionStream = class(TJclDecompressStream)
   private
     FInflateInitialized: Boolean;
-
   protected
-    BZLibRecord: TBZStream;
-
+    BZLibRecord: bz_stream;
   public
     function Read(var Buffer; Count: Longint): Longint; override;
     function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
@@ -386,7 +388,6 @@
     constructor Create(Source: TStream); overload;
     destructor Destroy; override;
   end;
-*)
 
   EJclCompressionError = class(EJclError);
 
@@ -399,6 +400,11 @@
 function UnGZipFile(SourceFile, DestinationFile: string;
   ProgressCallback: TJclCompressStreamProgressCallback = nil; UserData: Pointer = nil): Boolean;
 
+function BZip2File(SourceFile, DestinationFile: string; CompressionLevel: Integer = 5;
+  ProgressCallback: TJclCompressStreamProgressCallback = nil; UserData: Pointer = nil): Boolean;
+function UnBZip2File(SourceFile, DestinationFile: string;
+  ProgressCallback: TJclCompressStreamProgressCallback = nil; UserData: Pointer = nil): Boolean;
+
 {$IFDEF UNITVERSIONING}
 const
   UnitVersioning: TUnitVersionInfo = (
@@ -495,24 +501,24 @@
 
 function ZLibCheck(const ErrCode: Integer): Integer;
 begin
-  Result := ErrCode;
-  if ErrCode < 0 then
-    case ErrCode of
-      Z_ERRNO:
-        raise EJclCompressionError.CreateRes(@RsCompressionZLibZErrNo);
-      Z_STREAM_ERROR:
-        raise EJclCompressionError.CreateRes(@RsCompressionZLibZStreamError);
-      Z_DATA_ERROR:
-        raise EJclCompressionError.CreateRes(@RsCompressionZLibZDataError);
-      Z_MEM_ERROR:
-        raise EJclCompressionError.CreateRes(@RsCompressionZLibZMemError);
-      Z_BUF_ERROR:
-        raise EJclCompressionError.CreateRes(@RsCompressionZLibZBufError);
-      Z_VERSION_ERROR:
-        raise EJclCompressionError.CreateRes(@RsCompressionZLibZVersionError);
-    else
-      raise EJclCompressionError.CreateRes(@RsCompressionZLibError);
-    end;
+  case ErrCode of
+    0..High(ErrCode):
+      Result := ErrCode; // no error
+    Z_ERRNO:
+      raise EJclCompressionError.CreateRes(@RsCompressionZLibZErrNo);
+    Z_STREAM_ERROR:
+      raise EJclCompressionError.CreateRes(@RsCompressionZLibZStreamError);
+    Z_DATA_ERROR:
+      raise EJclCompressionError.CreateRes(@RsCompressionZLibZDataError);
+    Z_MEM_ERROR:
+      raise EJclCompressionError.CreateRes(@RsCompressionZLibZMemError);
+    Z_BUF_ERROR:
+      raise EJclCompressionError.CreateRes(@RsCompressionZLibZBufError);
+    Z_VERSION_ERROR:
+      raise EJclCompressionError.CreateRes(@RsCompressionZLibZVersionError);
+  else
+    raise EJclCompressionError.CreateResFmt(@RsCompressionZLibError, [ErrCode]);
+  end;
 end;
 
 constructor TJclZLibCompressStream.Create(Destination: TStream; CompressionLevel: TJclCompressionLevel);
@@ -918,7 +924,7 @@
   if (gfExtraField in Flags) and (ExtraField <> '') then
   begin
     if Length(ExtraField) > High(Word) then
-      raise EJclCompressionError.CreateRes(@RsCompilationGZIPExtraFieldTooLong);
+      raise EJclCompressionError.CreateRes(@RsCompressionGZIPExtraFieldTooLong);
     ExtraFieldLength := Length(ExtraField);
     StreamWriteBuffer(ExtraFieldLength, SizeOf(ExtraFieldLength));
     StreamWriteBuffer(ExtraField[1], Length(ExtraField));
@@ -927,14 +933,14 @@
   if (gfOriginalFileName in Flags) and (OriginalFileName <> '') then
   begin
     if not CheckCString(OriginalFileName) then
-      raise EJclCompressionError.CreateRes(@RsCompilationGZIPBadString);
+      raise EJclCompressionError.CreateRes(@RsCompressionGZIPBadString);
     StreamWriteBuffer(OriginalFileName[1], Length(OriginalFileName) + 1);
   end;
 
   if (gfComment in Flags) and (Comment <> '') then
   begin
     if not CheckCString(Comment) then
-      raise EJclCompressionError.CreateRes(@RsCompilationGZIPBadString);
+      raise EJclCompressionError.CreateRes(@RsCompressionGZIPBadString);
     StreamWriteBuffer(Comment[1], Length(Comment) + 1);
   end;
 
@@ -1197,64 +1203,122 @@
 end;
 
 //=== { TJclBZLibCompressionStream } =========================================
-(*
+
 { Error checking helper }
 
 function BZIP2LibCheck(const ErrCode: Integer): Integer;
 begin
-  Result := ErrCode;
-
-  if ErrCode < 0 then
-  begin
-    case ErrCode of
-      Z_ERRNO:         raise EJclCompressionError.CreateRes(@RsCompressionZLibZErrNo);
-      Z_STREAM_ERROR:  raise EJclCompressionError.CreateRes(@RsCompressionZLibZStreamError);
-      Z_DATA_ERROR:    raise EJclCompressionError.CreateRes(@RsCompressionZLibZDataError);
-      Z_MEM_ERROR:     raise EJclCompressionError.CreateRes(@RsCompressionZLibZMemError);
-      Z_BUF_ERROR:     raise EJclCompressionError.CreateRes(@RsCompressionZLibZBufError);
-      Z_VERSION_ERROR: raise EJclCompressionError.CreateRes(@RsCompressionZLibZVersionError);
-    else
-      raise EJclCompressionError.CreateRes(@RsCompressionZLibError);
-    end;
+  case ErrCode of
+    0..High(ErrCode):
+      Result := ErrCode; // no error
+    BZ_SEQUENCE_ERROR:
+      raise EJclCompressionError.CreateRes(@RsCompressionBZIP2SequenceError);
+    BZ_PARAM_ERROR:
+      raise EJclCompressionError.CreateRes(@RsCompressionBZIP2ParameterError);
+    BZ_MEM_ERROR:
+      raise EJclCompressionError.CreateRes(@RsCompressionBZIP2MemoryError);
+    BZ_DATA_ERROR:
+      raise EJclCompressionError.CreateRes(@RsCompressionBZIP2DataError);
+    BZ_DATA_ERROR_MAGIC:
+      raise EJclCompressionError.CreateRes(@RsCompressionBZIP2HeaderError);
+    BZ_IO_ERROR:
+      raise EJclCompressionError.CreateRes(@RsCompressionBZIP2IOError);
+    BZ_UNEXPECTED_EOF:
+      raise EJclCompressionError.CreateRes(@RsCompressionBZIP2EOFError);
+    BZ_OUTBUFF_FULL:
+      raise EJclCompressionError.CreateRes(@RsCompressionBZIP2OutBuffError);
+    BZ_CONFIG_ERROR:
+      raise EJclCompressionError.CreateRes(@RsCompressionBZIP2ConfigError);
+  else
+    raise EJclCompressionError.CreateResFmt(@RsCompressionBZIP2Error, [ErrCode]);
   end;
 end;
 
-constructor TJclBZIP2CompressStream.Create(Destination: TStream; CompressionLevel: TJclCompressionLevel);
+constructor TJclBZIP2CompressionStream.Create(Destination: TStream; CompressionLevel: TJclCompressionLevel);
 begin
   inherited Create(Destination);
 
+  LoadBZip2;
+
   Assert(FBuffer <> nil);
   Assert(FBufferSize > 0);
 
   // Initialize ZLib StreamRecord
-  with BZLibRecord do
-  begin
-    bzalloc   := nil; // Use build-in memory allocation functionality
-    bzfree    := nil;
-    next_in   := nil;
-    avail_in  := 0;
-    next_out  := FBuffer;
-    avail_out := FBufferSize;
+  BZLibRecord.bzalloc   := nil; // Use build-in memory allocation functionality
+  BZLibRecord.bzfree    := nil;
+  BZLibRecord.next_in   := nil;
+  BZLibRecord.avail_in  := 0;
+  BZLibRecord.next_out  := FBuffer;
+  BZLibRecord.avail_out := FBufferSize;
 
-  end;
+  FDeflateInitialized := False;
 
-  FDeflateInitialized := False;
+  FCompressionLevel := 9;
 end;
 
-destructor TJclBZIP2CompressStream.Destroy;
+destructor TJclBZIP2CompressionStream.Destroy;
 begin
   Flush;
   if FDeflateInitialized then
-    BZIP2LibCheck(BZ2_bzCompressEnd(@BZLibRecord));
+    BZIP2LibCheck(BZ2_bzCompressEnd(BZLibRecord));
 
   inherited Destroy;
 end;
 
-function TJclBZIP2CompressStream.Write(const Buffer; Count: Longint): Longint;
+function TJclBZIP2CompressionStream.Flush: Integer;
 begin
+  Result := 0;
+
+  if FDeflateInitialized then
+  begin
+    BZLibRecord.next_in := nil;
+    BZLibRecord.avail_in := 0;
+
+    while (BZIP2LibCheck(BZ2_bzCompress(BZLibRecord, BZ_FINISH)) <> BZ_STREAM_END) and (BZLibRecord.avail_out = 0) do
+    begin
+      FStream.WriteBuffer(FBuffer^, FBufferSize);
+      Progress(Self);
+
+      BZLibRecord.next_out := FBuffer;
+      BZLibRecord.avail_out := FBufferSize;
+      Inc(Result, FBufferSize);
+    end;
+
+    if BZLibRecord.avail_out < FBufferSize then
+    begin
+      FStream.WriteBuffer(FBuffer^, FBufferSize - BZLibRecord.avail_out);
+      Progress(Self);
+      Inc(Result, FBufferSize - BZLibRecord.avail_out);
+      BZLibRecord.next_out := FBuffer;
+      BZLibRecord.avail_out := FBufferSize;
+    end;
+  end;
+end;
+
+function TJclBZIP2CompressionStream.Seek(const Offset: Int64; Origin: TSeekOrigin): Int64;
+begin
+   if (Offset = 0) and (Origin = soCurrent) then
+    Result := (BZLibRecord.total_in_hi32 shl 32) or BZLibRecord.total_in_lo32
+   else
+   if (Offset = 0) and (Origin = soBeginning) and (BZLibRecord.total_in_lo32 = 0) then
+       Result := 0
+   else
+     Result := inherited Seek(Offset, Origin);
+end;
+
+procedure TJclBZIP2CompressionStream.SetCompressionLevel(const Value: Integer);
+begin
   if not FDeflateInitialized then
+    FCompressionLevel := Value
+  else
+    raise EJclCompressionError.CreateRes(@RsCompressionBZIP2SequenceError);
+end;
+
+function TJclBZIP2CompressionStream.Write(const Buffer; Count: Longint): Longint;
+begin
+  if not FDeflateInitialized then
   begin
-    BZIP2LibCheck(BZ2_bzCompressInit(@BZLibRecord,9,0,0));
+    BZIP2LibCheck(BZ2_bzCompressInit(BZLibRecord, FCompressionLevel, 0, 0));
     FDeflateInitialized := True;
   end;
 
@@ -1263,7 +1327,7 @@
 
   while BZLibRecord.avail_in > 0 do
   begin
-    BZIP2LibCheck(BZ2_bzCompress(@BZLibRecord, BZ_RUN));
+    BZIP2LibCheck(BZ2_bzCompress(BZLibRecord, BZ_RUN));
 
     if BZLibRecord.avail_out = 0 then   // Output buffer empty. Write to stream and go on...
     begin
@@ -1277,202 +1341,203 @@
   Result := Count;
 end;
 
-function TJclBZIP2CompressStream.Flush: Integer;
-begin
-    Result := 0;
-
-    if FDeflateInitialized then
-    begin
-      BZLibRecord.next_in := nil;
-      BZLibRecord.avail_in := 0;
-
-      while (BZIP2LibCheck(BZ2_bzCompress(@BZLibRecord, BZ_FLUSH)) <> Z_STREAM_END) and (BZLibRecord.avail_out = 0) do
-      begin
-        FStream.WriteBuffer(FBuffer^, FBufferSize);
-        Progress(Self);
-
-        BZLibRecord.next_out := FBuffer;
-        BZLibRecord.avail_out := FBufferSize;
-        Result := Result + FBufferSize;
-      end;
-
-      if BZLibRecord.avail_out < FBufferSize then
-      begin
-        FStream.WriteBuffer(FBuffer^, FBufferSize-BZLibRecord.avail_out);
-        Progress(Self);
-        Result := Result + FBufferSize-BZLibRecord.avail_out;
-        BZLibRecord.next_out := FBuffer;
-        BZLibRecord.avail_out := FBufferSize;
-      end;
-    end;
-end;
-
-function TJclBZIP2CompressStream.Seek(const Offset: Int64; Origin: TSeekOrigin): Int64;
-begin
-   if (Offset = 0) and (Origin = soFromCurrent) then
-    Result := BZLibRecord.total_in_lo32
-   else
-   if (Offset = 0) and (Origin = soFromBeginning) and (BZLibRecord.total_in_lo32 = 0) then
-       Result := 0
-   else
-     Result := inherited Seek(Offset, Origin);
-end;
-
 //=== { TJclZLibDecompressionStream } ========================================
 
-constructor TJclBZIP2DecompressStream.Create(Source: TStream);
+constructor TJclBZIP2DecompressionStream.Create(Source: TStream);
 begin
   inherited Create(Source);
 
+  LoadBZip2;
+
   // Initialize ZLib StreamRecord
-  with BZLibRecord do
-  begin
-    bzalloc   := nil; // Use build-in memory allocation functionality
-    bzfree    := nil;
-    opaque    := nil;
-    next_in   := nil;
-    state     := nil;
-    avail_in  := 0;
-    next_out  := FBuffer;
-    avail_out := FBufferSize;
-  end;
+  BZLibRecord.bzalloc   := nil; // Use build-in memory allocation functionality
+  BZLibRecord.bzfree    := nil;
+  BZLibRecord.opaque    := nil;
+  BZLibRecord.next_in   := nil;
+  BZLibRecord.state     := nil;
+  BZLibRecord.avail_in  := 0;
+  BZLibRecord.next_out  := FBuffer;
+  BZLibRecord.avail_out := FBufferSize;
 
   FInflateInitialized := False;
 end;
 
-destructor TJclBZIP2DecompressStream.Destroy;
+destructor TJclBZIP2DecompressionStream.Destroy;
 begin
   if FInflateInitialized then
   begin
     FStream.Seek(-BZLibRecord.avail_in, soFromCurrent);
-    BZIP2LibCheck(BZ2_bzDecompressEnd(@BZLibRecord));
+    BZIP2LibCheck(BZ2_bzDecompressEnd(BZLibRecord));
   end;
 
   inherited Destroy;
 end;
 
-function TJclBZIP2DecompressStream.Read(var Buffer; Count: Longint): Longint;
-var
-  avail_out_ctr: Integer;
-
+function TJclBZIP2DecompressionStream.Read(var Buffer; Count: Longint): Longint;
 begin
   if not FInflateInitialized then
   begin
-    BZIP2LibCheck(BZ2_bzDecompressInit(@BZLibRecord,0,0));
+    BZIP2LibCheck(BZ2_bzDecompressInit(BZLibRecord, 0, 0));
     FInflateInitialized := True;
   end;
 
   BZLibRecord.next_out := @Buffer;
   BZLibRecord.avail_out := Count;
-  avail_out_ctr := Count;
+  Result := 0;
 
-  while avail_out_ctr > 0 do     // as long as we have data
+  while Result < Count do     // as long as we need data
   begin
-    if BZLibRecord.avail_in = 0 then
+    if BZLibRecord.avail_in = 0 then // no more compressed data
     begin
       BZLibRecord.avail_in := FStream.Read(FBuffer^, FBufferSize);
       if BZLibRecord.avail_in = 0 then
-      begin
-        Result := Count - avail_out_ctr;
         Exit;
-      end;
 
       BZLibRecord.next_in := FBuffer;
     end;
 
     if BZLibRecord.avail_in > 0 then
     begin
-      BZIP2LibCheck(BZ2_bzDecompress(@BZLibRecord));
-      avail_out_ctr := Count - BZLibRecord.avail_out;
+      BZIP2LibCheck(BZ2_bzDecompress(BZLibRecord));
+      Result := Count;
+      Dec(Result, BZLibRecord.avail_out);
     end
   end;
 
   Result := Count;
 end;
 
-function TJclBZIP2DecompressStream.Seek(const Offset: Int64; Origin: TSeekOrigin): Int64;
+function TJclBZIP2DecompressionStream.Seek(const Offset: Int64; Origin: TSeekOrigin): Int64;
 begin
-   if (Offset = 0) and (Origin = soFromCurrent) then
-    Result := BZLibRecord.total_out_lo32
+   if (Offset = 0) and (Origin = soCurrent) then
+    Result := (BZLibRecord.total_out_hi32 shl 32) or BZLibRecord.total_out_lo32
    else
      Result := inherited Seek(Offset, Origin);
 end;
-*)
 
-{ Compress to a .gz file - one liner - NEW MARCH 2007  }
+procedure InternalCompress(SourceStream: TStream; CompressStream: TJclCompressStream;
+  ProgressCallback: TJclCompressStreamProgressCallback; UserData: Pointer);
+var
+  SourceStreamSize, SourceStreamPosition: Int64;
+  Buffer: Pointer;
+  ReadBytes: Integer;
+  EofFlag: Boolean;
+begin
+  SourceStreamSize := SourceStream.Size; // source file size
+  SourceStreamPosition := 0;
 
-function GZipFile(SourceFile, DestinationFile: string; CompressionLevel: Integer = Z_DEFAULT_COMPRESSION;
-  ProgressCallback: TJclCompressStreamProgressCallback = nil; UserData: Pointer = nil): Boolean;
+  GetMem(Buffer, JclDefaultBufferSize + 2);
+  try
+    //    ZLibStream.CopyFrom(SourceStream, 0 ); // One line way to do it! may not
+    //                                     // be reliable idea to do this! also,
+    //                                       //no progress callbacks!
+    EofFlag := False;
+    while not EofFlag do
+    begin
+      if Assigned(ProgressCallback) then
+        ProgressCallback(SourceStreamSize, SourceStreamPosition, UserData);
+
+      ReadBytes := SourceStream.Read(Buffer^, JclDefaultBufferSize);
+      SourceStreamPosition := SourceStreamPosition + ReadBytes;
+
+      CompressStream.WriteBuffer(Buffer^, ReadBytes);
+
+      // short block indicates end of zlib stream
+      EofFlag := ReadBytes < JclDefaultBufferSize;
+    end;
+    //CompressStream.Flush; (called by the destructor of compression streams
+  finally
+    FreeMem(Buffer);
+  end;
+  if Assigned(ProgressCallback) then
+    ProgressCallback(SourceStreamSize, SourceStreamPosition, UserData);
+end;
+
+procedure InternalDecompress(SourceStream, DestStream: TStream;
+  DecompressStream: TJclDecompressStream;
+  ProgressCallback: TJclCompressStreamProgressCallback; UserData: Pointer);
 var
-  ZLibStream: TJclGZIPCompressionStream;
-  DestStream: TFileStream;
-  SourceStream: TFileStream;
+  SourceStreamSize: Int64;
   Buffer: Pointer;
   ReadBytes: Integer;
   EofFlag: Boolean;
-  SourceFileSize: Int64;
 begin
+  SourceStreamSize := SourceStream.Size; // source file size
+
+  GetMem(Buffer, JclDefaultBufferSize + 2);
+  try
+    //    ZLibStream.CopyFrom(SourceStream, 0 ); // One line way to do it! may not
+    //                                     // be reliable idea to do this! also,
+    //                                       //no progress callbacks!
+    EofFlag := False;
+    while not EofFlag do
+    begin
+      if Assigned(ProgressCallback) then
+        ProgressCallback(SourceStreamSize, SourceStream.Position, UserData);
+
+      ReadBytes := DecompressStream.Read(Buffer^, JclDefaultBufferSize);
+
+      DestStream.WriteBuffer(Buffer^, ReadBytes);
+
+      // short block indicates end of zlib stream
+      EofFlag := ReadBytes < JclDefaultBufferSize;
+    end;
+  finally
+    FreeMem(Buffer);
+  end;
+  if Assigned(ProgressCallback) then
+    ProgressCallback(SourceStreamSize, SourceStream.Position, UserData);
+end;
+
+{ Compress to a .gz file - one liner - NEW MARCH 2007  }
+
+function GZipFile(SourceFile, DestinationFile: string; CompressionLevel: Integer;
+  ProgressCallback: TJclCompressStreamProgressCallback; UserData: Pointer): Boolean;
+var
+  GZipStream: TJclGZIPCompressionStream;
+  DestStream: TFileStream;
+  SourceStream: TFileStream;
+  GZipStreamDateTime: TDateTime;
+begin
   Result := False;
   if not FileExists(SourceFile) then // can't copy what doesn't exist!
     Exit;
 
+  GetFileLastWrite(SourceFile, GZipStreamDateTime);
+
   {destination and source streams first and second}
   SourceStream := TFileStream.Create(SourceFile, fmOpenRead or fmShareDenyWrite);
-  SourceFileSize := SourceStream.Size; // source file size
-  DestStream := TFileStream.Create(DestinationFile, fmCreate); // see SysUtils
-  GetMem(Buffer, JclDefaultBufferSize + 2);
-
-  // (rom) initial progress callback
-  if Assigned(ProgressCallback) then
-    ProgressCallback(SourceFileSize, 0, UserData);
   try
-  {   create compressionstream third, and copy from source,
-       through zlib compress layer,
-       out through file stream}
-    ZLibStream := TJclGZIPCompressionStream.Create(DestStream, CompressionLevel);
+    DestStream := TFileStream.Create(DestinationFile, fmCreate); // see SysUtils
     try
-      //    ZLibStream.CopyFrom(SourceStream, 0 ); // One line way to do it! may not
-      //                                     // be reliable idea to do this! also,
-      //                                       //no progress callbacks!
-      EofFlag := False;
-      while not EofFlag do
-      begin
-        ReadBytes := SourceStream.Read(Buffer^, JclDefaultBufferSize);
-        ZLibStream.WriteBuffer(Buffer^, ReadBytes);
-        if ReadBytes <> JclDefaultBufferSize then
-          Break; // short block indicates end of zlib stream
-        if Assigned(ProgressCallback) then
-          ProgressCallback(SourceFileSize, SourceStream.Position, UserData);
+      {   create compressionstream third, and copy from source,
+          through zlib compress layer,
+          out through file stream}
+      GZipStream := TJclGZIPCompressionStream.Create(DestStream, CompressionLevel);
+      try
+        GZipStream.DosTime := GZipStreamDateTime;
+        InternalCompress(SourceStream, GZipStream, ProgressCallback, UserData);
+      finally
+        GZipStream.Free;
       end;
-    //DestStream.Flush; // no such thing in streams.
     finally
-      ZLibStream.Free;
+      DestStream.Free;
     end;
   finally
-    DestStream.Free;
     SourceStream.Free;
-    FreeMem(Buffer);
   end;
   Result := FileExists(DestinationFile);
-  if Result then
-  begin
-    if Assigned(ProgressCallback) then
-      ProgressCallback(SourceFileSize, SourceFileSize, UserData);
-  end;
 end;
 
 { Decompress a .gz file }
 
-function UnGZipFile(SourceFile, DestinationFile: string; ProgressCallback: TJclCompressStreamProgressCallback = nil;
-  UserData: Pointer = nil): Boolean;
+function UnGZipFile(SourceFile, DestinationFile: string;
+  ProgressCallback: TJclCompressStreamProgressCallback; UserData: Pointer): Boolean;
 var
-  ZLibStream: TJclGZIPDecompressionStream;
+  GZipStream: TJclGZIPDecompressionStream;
   DestStream: TFileStream;
   SourceStream: TFileStream;
-  Buffer: Pointer;
-  ReadBytes: Integer;
-  ZLibStreamDateTime: TDateTime;
-  SourceFileSize: Int64;
+  GZipStreamDateTime: TDateTime;
 begin
   Result := False;
   if not FileExists(SourceFile) then // can't copy what doesn't exist!
@@ -1480,48 +1545,101 @@
 
   {destination and source streams first and second}
   SourceStream := TFileStream.Create(SourceFile, {mode} fmOpenRead or fmShareDenyWrite);
-  SourceFileSize := SourceStream.Size; // source file size
-  DestStream := TFileStream.Create(DestinationFile, {mode} fmCreate); // see SysUtils
-  GetMem(Buffer, JclDefaultBufferSize + 2);
+  try
+    DestStream := TFileStream.Create(DestinationFile, {mode} fmCreate); // see SysUtils
+    try
+      {   create decompressionstream third, and copy from source,
+          through zlib decompress layer, out through file stream
+      }
+      GZipStream := TJclGZIPDecompressionStream.Create(SourceStream);
+      try
+        InternalDecompress(SourceStream, DestStream, GZipStream, ProgressCallback, UserData);
+        GZipStreamDateTime := GZipStream.DosTime;
+      finally
+        GZipStream.Free;
+      end;
+    finally
+      DestStream.Free;
+    end;
+  finally
+    SourceStream.Free;
+  end;
+  Result := FileExists(DestinationFile);
+  if Result and (GZipStreamDateTime <> 0) then
+    // preserve datetime when unpacking! (see JclFileUtils)
+    SetFileLastWrite(DestinationFile, GZipStreamDateTime);
+end;
 
-  // (rom) initial progress callback
-  if Assigned(ProgressCallback) then
-    ProgressCallback(SourceFileSize, 0, UserData);
+{ Compress to a .bz2 file - one liner }
+
+function BZip2File(SourceFile, DestinationFile: string; CompressionLevel: Integer;
+  ProgressCallback: TJclCompressStreamProgressCallback; UserData: Pointer): Boolean;
+var
+  BZip2Stream: TJclBZIP2CompressionStream;
+  DestStream: TFileStream;
+  SourceStream: TFileStream;
+begin
+  Result := False;
+  if not FileExists(SourceFile) then // can't copy what doesn't exist!
+    Exit;
+
+  {destination and source streams first and second}
+  SourceStream := TFileStream.Create(SourceFile, fmOpenRead or fmShareDenyWrite);
   try
-    {   create decompressionstream third, and copy from source,
-        through zlib decompress layer, out through file stream
-    }
-    ZLibStream := TJclGZIPDecompressionStream.Create(SourceStream);
+    DestStream := TFileStream.Create(DestinationFile, fmCreate); // see SysUtils
     try
-      { Copy in from SourceStream, through ZLibStream, and out to DestStream }
-      while not ZLibStream.FDataEnded do
-      begin
-        ReadBytes := ZLibStream.Read(Buffer^, JclDefaultBufferSize);
-        DestStream.WriteBuffer(Buffer^, ReadBytes);
-        if ReadBytes <> JclDefaultBufferSize then
-          Break; // short block indicates end of zlib stream
-        if Assigned(ProgressCallback) then
-          ProgressCallback(SourceFileSize, SourceStream.Position, UserData);
+      {   create compressionstream third, and copy from source,
+          through zlib compress layer,
+          out through file stream}
+      BZip2Stream := TJclBZIP2CompressionStream.Create(DestStream, CompressionLevel);
+      try
+        InternalCompress(SourceStream, BZip2Stream, ProgressCallback, UserData);
+      finally
+        BZip2Stream.Free;
       end;
-      ZLibStreamDateTime := ZLibStream.DosTime;
     finally
-      ZLibStream.Free;
+      DestStream.Free;
     end;
   finally
-    DestStream.Free;
     SourceStream.Free;
-    FreeMem(Buffer);
   end;
   Result := FileExists(DestinationFile);
-  if Result then
-  begin
-    // one last progress update, for when we're finished!
-    if Assigned(ProgressCallback) then
-      ProgressCallback(SourceFileSize, SourceFileSize, UserData);
+end;
 
-        // preserve datetime when unpacking! (see JclFileUtils)
-    SetFileLastWrite(DestinationFile, ZLibStreamDateTime);
+{ Decompress a .bzip2 file }
+
+function UnBZip2File(SourceFile, DestinationFile: string;
+  ProgressCallback: TJclCompressStreamProgressCallback; UserData: Pointer): Boolean;
+var
+  BZip2Stream: TJclBZIP2DecompressionStream;
+  DestStream: TFileStream;
+  SourceStream: TFileStream;
+begin
+  Result := False;
+  if not FileExists(SourceFile) then // can't copy what doesn't exist!
+    exit;
+
+  {destination and source streams first and second}
+  SourceStream := TFileStream.Create(SourceFile, {mode} fmOpenRead or fmShareDenyWrite);
+  try
+    DestStream := TFileStream.Create(DestinationFile, {mode} fmCreate); // see SysUtils
+    try
+      {   create decompressionstream third, and copy from source,
+          through zlib decompress layer, out through file stream
+      }
+      BZip2Stream := TJclBZIP2DecompressionStream.Create(SourceStream);
+      try
+        InternalDecompress(SourceStream, DestStream,  BZip2Stream, ProgressCallback, UserData);
+      finally
+        BZip2Stream.Free;
+      end;
+    finally
+      DestStream.Free;
+    end;
+  finally
+    SourceStream.Free;
   end;
+  Result := FileExists(DestinationFile);
 end;
 
 {$IFDEF UNITVERSIONING}

Modified: trunk/jcl/source/common/JclResources.pas
===================================================================
--- trunk/jcl/source/common/JclResources.pas	2007-04-18 20:57:30 UTC (rev 1999)
+++ trunk/jcl/source/common/JclResources.pas	2007-04-20 17:01:29 UTC (rev 2000)
@@ -777,18 +777,28 @@
   RsCompressionZLibZDataError        = 'zlib returned: data error';
   RsCompressionZLibZMemError         = 'zlib returned: memory error';
   RsCompressionZLibZBufError         = 'zlib returned: buffer error';
-  RsCompressionZLibZVersionError     = 'zlib returned: Version error';
-  RsCompressionZLibError             = 'ZLib error';
-  RsCompressionGZIPInvalidID         = 'GZip: Invalid ID (ID1=%.2x; ID2=%.2x)';
-  RsCompressionGZIPUnsupportedCM     = 'GZip: unsupported compression method (%d)';
-  RsCompressionGZIPHeaderCRC         = 'GZip: CRC failed, header is damaged';
-  RsCompressionGZIPDecompressing     = 'GZip: this property is not readable when the data are being decompressed';
-  RsCompressionGZIPNotDecompressed   = 'GZip: this property is not readable until the data are fully decompressed';
-  RsCompressionGZIPDataTruncated     = 'GZip: data are truncated';
-  RsCompressionGZIPInternalError     = 'GZip: internal error';
-  RsCompressionGZIPDataCRCFailed     = 'GZip: CRC failed, data are damaged';
-  RsCompilationGZIPExtraFieldTooLong = 'GZip: extra field is too long';
-  RsCompilationGZIPBadString         = 'GZip: the string contains null chars';
+  RsCompressionZLibZVersionError     = 'zlib returned: version error';
+  RsCompressionZLibError             = 'zLib returned: unknown error (%d)';
+  RsCompressionGZIPInvalidID         = 'gzip: Invalid ID (ID1=%.2x; ID2=%.2x)';
+  RsCompressionGZIPUnsupportedCM     = 'gzip: unsupported compression method (%d)';
+  RsCompressionGZIPHeaderCRC         = 'gzip: CRC failed, header is damaged';
+  RsCompressionGZIPDecompressing     = 'gzip: this property is not readable when the data are being decompressed';
+  RsCompressionGZIPNotDecompressed   = 'gzip: this property is not readable until the data are fully decompressed';
+  RsCompressionGZIPDataTruncated     = 'gzip: data are truncated';
+  RsCompressionGZIPInternalError     = 'gzip: internal error';
+  RsCompressionGZIPDataCRCFailed     = 'gzip: CRC failed, data are damaged';
+  RsCompressionGZIPExtraFieldTooLong = 'gzip: extra field is too long';
+  RsCompressionGZIPBadString         = 'gzip: the string contains null chars';
+  RsCompressionBZIP2SequenceError    = 'bzip2 returned: sequence error';
+  RsCompressionBZIP2ParameterError   = 'bzip2 returned: parameter error';
+  RsCompressionBZIP2MemoryError      = 'bzip2 returned: memory error';
+  RsCompressionBZIP2DataError        = 'bzip2 returned: data error';
+  RsCompressionBZIP2HeaderError      = 'bzip2 returned: header error';
+  RsCompressionBZIP2IOError          = 'bzip2 returned: IO error';
+  RsCompressionBZIP2EOFError         = 'bzip2 returned: unexpected end of file';
+  RsCompressionBZIP2OutBuffError     = 'bzip2 returned: out buffer is too small';
+  RsCompressionBZIP2ConfigError      = 'bzip2 returned: configuration error';
+  RsCompressionBZIP2Error            = 'bzip2 returned: unknown error (%d)';
 
 //=== JclConsole =============================================================
 resourcestring

Added: trunk/jcl/source/common/bzip2.pas
===================================================================
--- trunk/jcl/source/common/bzip2.pas	                        (rev 0)
+++ trunk/jcl/source/common/bzip2.pas	2007-04-20 17:01:29 UTC (rev 2000)
@@ -0,0 +1,467 @@
+{**************************************************************************************************}
+{                                                                                                  }
+{ Project JEDI Code Library (JCL)                                                                  }
+{                                                                                                  }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the    }
+{ License at http://www.mozilla.org/MPL/                                                           }
+{                                                                                                  }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF   }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights  }
+{ and limitations under the License.                                                               }
+{                                                                                                  }
+{ The Original Code is bzip2.pas.                                                                  }
+{                                                                                                  }
+{ The Initial Developer of the Original Code is Florent Ouchet.                                    }
+{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved.     }
+{ Portions created by Julian Seward are Copyright (C) 1996-2006 Julian Seward <js...@bz...>   }
+{                                                                                                  }
+{ Contributor(s):                                                                                  }
+{                                                                                                  }
+{ The latest release of BZIP2 is available from http://www.bzip.org/                               }
+{                                                                                                  }
+{**************************************************************************************************}
+{                                                                                                  }
+{ Header conversion of bzlib.h                                                                     }
+{                                                                                                  }
+{ Unit owner: Florent Ouchet                                                                       }
+{ Last modified: $Date$                           }
+{                                                                                                  }
+{**************************************************************************************************}
+
+
+unit bzip2;
+
+interface
+
+{$I jcl.inc}
+
+uses
+  JclBase; // PByte, PCardinal for Delphi 5 and C++Builder 5...
+
+{
+/*-------------------------------------------------------------*/
+/*--- Public header file for the library.                   ---*/
+/*---                                               bzlib.h ---*/
+/*-------------------------------------------------------------*/
+
+/* ------------------------------------------------------------------
+   This file is part of bzip2/libbzip2, a program and library for
+   lossless, block-sorting data compression.
+
+   bzip2/libbzip2 version 1.0.4 of 20 December 2006
+   Copyright (C) 1996-2006 Julian Seward <js...@bz...>
+
+   Please read the WARNING, DISCLAIMER and PATENTS sections in the
+   README file.
+
+   This program is released under the terms of the license contained
+   in the file LICENSE.
+   ------------------------------------------------------------------ */
+}
+
+const
+  BZ_RUN              = 0;
+  BZ_FLUSH            = 1;
+  BZ_FINISH           = 2;
+
+  BZ_OK               = 0;
+  BZ_RUN_OK           = 1;
+  BZ_FLUSH_OK         = 2;
+  BZ_FINISH_OK        = 3;
+  BZ_STREAM_END       = 4;
+  BZ_SEQUENCE_ERROR   = -1;
+  BZ_PARAM_ERROR      = -2;
+  BZ_MEM_ERROR        = -3;
+  BZ_DATA_ERROR       = -4;
+  BZ_DATA_ERROR_MAGIC = -5;
+  BZ_IO_ERROR         = -6;
+  BZ_UNEXPECTED_EOF   = -7;
+  BZ_OUTBUFF_FULL     = -8;
+  BZ_CONFIG_ERROR     = -9;
+
+type
+   bz_stream = record
+      next_in: PByte;
+      avail_in: Cardinal;
+      total_in_lo32: Cardinal;
+      total_in_hi32: Cardinal;
+
+      next_out: PByte;
+      avail_out: Cardinal;
+      total_out_lo32: Cardinal;
+      total_out_hi32: Cardinal;
+
+      state: Pointer;
+
+      bzalloc: function (opaque: Pointer; n, m: Integer): Pointer; cdecl; // returns n*m bytes
+      bzfree: procedure (opaque, p: Pointer); cdecl; // free p
+      opaque: Pointer;
+   end;
+
+{$IFNDEF BZIP2_LINKONREQUEST}
+//-- Core (low-level) library functions --
+
+function BZ2_bzCompressInit(var strm: bz_stream;
+  blockSize100k, verbosity, workFactor: Integer): Integer;
+  {$IFDEF BZIP2_EXPORT_STDCALL}stdcall;{$ENDIF BZIP2_EXPORT_STDCALL}
+  {$IFDEF BZIP2_EXPORT_CDECL}cdecl;{$ENDIF BZIP2_EXPORT_CDECL}
+
+function BZ2_bzCompress(var strm: bz_stream; action: Integer): Integer;
+  {$IFDEF BZIP2_EXPORT_STDCALL}stdcall;{$ENDIF BZIP2_EXPORT_STDCALL}
+  {$IFDEF BZIP2_EXPORT_CDECL}cdecl;{$ENDIF BZIP2_EXPORT_CDECL}
+
+function BZ2_bzCompressEnd(var strm: bz_stream): Integer;
+  {$IFDEF BZIP2_EXPORT_STDCALL}stdcall;{$ENDIF BZIP2_EXPORT_STDCALL}
+  {$IFDEF BZIP2_EXPORT_CDECL}cdecl;{$ENDIF BZIP2_EXPORT_CDECL}
+
+function BZ2_bzDecompressInit(var strm: bz_stream;
+  verbosity, small: Integer): Integer;
+  {$IFDEF BZIP2_EXPORT_STDCALL}stdcall;{$ENDIF BZIP2_EXPORT_STDCALL}
+  {$IFDEF...
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl: [1999] trunk/jcl/install/JclInstall.pas

From: <ou...@us...> - 2007-04-18 20:57:37

Revision: 1999
          http://svn.sourceforge.net/jcl/?rev=1999&view=rev
Author:   outchy
Date:     2007-04-18 13:57:30 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
Disabling flood of log results by uninstallation process on failure.
Delphi 2007 packages ending by *100.bpl are unregistered.

Modified Paths:
--------------
    trunk/jcl/install/JclInstall.pas

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2007-04-18 20:54:59 UTC (rev 1998)
+++ trunk/jcl/install/JclInstall.pas	2007-04-18 20:57:30 UTC (rev 1999)
@@ -123,6 +123,7 @@
     FLogLines: TJclSimpleLog;
     FDemoSectionName: string;
     FLogFileName: string;
+    FSilent: Boolean;
     procedure AddDemo(const Directory: string; const FileInfo: TSearchRec);
     procedure AddDemos(const Directory: string);
     function GetDemoList: TStringList;
@@ -174,6 +175,7 @@
     property OptionCheckedById[Id: Integer]: Boolean read GetOptionCheckedById;
     property OptionChecked[Option: TJclOption]: Boolean read GetOptionChecked;
     property LogFileName: string read FLogFileName;
+    property Silent: Boolean read FSilent write FSilent;
   end;
 
   TJclDistribution = class (TInterfacedObject, IJediProduct)
@@ -1829,7 +1831,10 @@
       {$IFDEF MSWINDOWS} and InstallExperts and InstallHelpFiles {$ENDIF MSWINDOWS}
       and InstallRepository and MakeDemos;
     if not Result then
+    begin
+      Silent := True;
       Uninstall(False);
+    end;
 
     FLogLines.CloseLog;
   finally
@@ -1954,6 +1959,8 @@
     begin
       //ioJclPackages
       UninstallPackage(FullPackageFileName(Target, JclDpk));
+      if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber = 5) then
+
       if Target.SupportsVisualCLX then
         UninstallPackage(FullPackageFileName(Target, JclVClxDpk));
       if ((Target.VersionNumber >= 6) and (Target.RadToolKind <> brBorlandDevStudio))
@@ -2096,9 +2103,12 @@
   Line: string;
   LineType: TCompileLineType;
 begin
-  Line := InstallCore.ProcessLogLine(Msg, LineType, GUIPage);
-  if Line <> '' then
-    FLogLines.Write(Line);
+  if not Silent then
+  begin
+    Line := InstallCore.ProcessLogLine(Msg, LineType, GUIPage);
+    if Line <> '' then
+      FLogLines.Write(Line);
+  end;
 end;
 
 function TJclInstallation.GetBplPath: string;
@@ -2708,12 +2718,14 @@
   if FileExists(Distribution.JclPath + PackageFileName) then
   begin
     Result := UninstallPackage(PackageFileName);
+    if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber = 5) then
+      Target.IdePackages.RemovePackage(PathAddSeparator(GetBplPath) + PathExtractFileNameNoExt(PackageFileName) + '100.bpl');
     // eventually remove old expert packages to avoid annoying package conflicts during IDE startup;
     // for simplicity, .dcp files are not handled
     BaseName := ExtractFileName(BaseName);
     BPLFileName := OldExpertBPLFileName(BaseName);
+    Target.IdePackages.RemovePackage(BPLFileName);
     FileDelete(BPLFileName);
-    Target.IdePackages.RemovePackage(BPLFileName);
   end;
 
   if FileExists(Distribution.JclPath + LibraryFileName) then
@@ -3177,6 +3189,7 @@
       AInstallation := TargetInstalls[I];
       if AInstallation.Enabled then
       begin
+        AInstallation.Silent := False;
         if (AInstallation.CLRVersion = '') and not KeepSettings then
           AInstallation.RemoveSettings;
         AInstallation.Uninstall(False);
@@ -3421,6 +3434,7 @@
     for I := 0 to TargetInstallCount - 1 do
     begin
       AInstallation := TargetInstalls[I];
+      AInstallation.Silent := False;
       if AInstallation.Enabled and (not AInstallation.RemoveSettings) or not AInstallation.Uninstall(True) then
         Success := False;
     end;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [1998] trunk/jcl/examples

From: <ou...@us...> - 2007-04-18 20:55:01

Revision: 1998
          http://svn.sourceforge.net/jcl/?rev=1998&view=rev
Author:   outchy
Date:     2007-04-18 13:54:59 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
Disabling examples that don't compile with C++Builder.

Modified Paths:
--------------
    trunk/jcl/examples/C5.exc
    trunk/jcl/examples/C6.exc
    trunk/jcl/examples/windows/delphitools/peviewer/PeResource.pas

Modified: trunk/jcl/examples/C5.exc
===================================================================
--- trunk/jcl/examples/C5.exc	2007-04-18 18:13:30 UTC (rev 1997)
+++ trunk/jcl/examples/C5.exc	2007-04-18 20:54:59 UTC (rev 1998)
@@ -1,2 +1,6 @@
+common\multimedia\MidiOutExample.dpr
 windows\clr\ClrDemo.dpr
+windows\debug\sourceloc\SourceLocExample.dpr
+windows\delphitools\peviewer\PeViewer.dpr
+windows\tasks\TaskDemo.dpr
 visclx.exc
\ No newline at end of file

Modified: trunk/jcl/examples/C6.exc
===================================================================
--- trunk/jcl/examples/C6.exc	2007-04-18 18:13:30 UTC (rev 1997)
+++ trunk/jcl/examples/C6.exc	2007-04-18 20:54:59 UTC (rev 1998)
@@ -1 +1,5 @@
+common\multimedia\MidiOutExample.dpr
+windows\debug\sourceloc\SourceLocExample.dpr
+windows\delphitools\peviewer\PeViewer.dpr
+windows\tasks\TaskDemo.dpr
 visclx.exc
\ No newline at end of file

Modified: trunk/jcl/examples/windows/delphitools/peviewer/PeResource.pas
===================================================================
--- trunk/jcl/examples/windows/delphitools/peviewer/PeResource.pas	2007-04-18 18:13:30 UTC (rev 1997)
+++ trunk/jcl/examples/windows/delphitools/peviewer/PeResource.pas	2007-04-18 20:54:59 UTC (rev 1998)
@@ -30,10 +30,7 @@
 interface
 
 uses
-  Windows, Messages, Classes, SysUtils, Graphics, ComCtrls,
-  {$IFDEF DELPHI5_UP}
-  Contnrs,
-  {$ENDIF}
+  Windows, Messages, Classes, SysUtils, Graphics, ComCtrls, Contnrs,
   JclBase, JclFileUtils, JclPeImage, JclStrings;
 
 type


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [1997] trunk/jcl/lib

From: <ou...@us...> - 2007-04-18 18:13:32

Revision: 1997
          http://svn.sourceforge.net/jcl/?rev=1997&view=rev
Author:   outchy
Date:     2007-04-18 11:13:30 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
.net compatibility: JclStringLists.pas is not compatible because of its dependency on JclPcre.pas

Modified Paths:
--------------
    trunk/jcl/lib/d10.net/common.exc
    trunk/jcl/lib/d9.net/common.exc

Modified: trunk/jcl/lib/d10.net/common.exc
===================================================================
--- trunk/jcl/lib/d10.net/common.exc	2007-04-18 17:27:51 UTC (rev 1996)
+++ trunk/jcl/lib/d10.net/common.exc	2007-04-18 18:13:30 UTC (rev 1997)
@@ -16,6 +16,7 @@
 JclSchedule.pas
 JclStreams.pas
 JclStrHashMap.pas
+JclStringLists.pas
 JclUnitVersioning.pas
 JclUnitVersioningProviders.pas
 JclValidation.pas

Modified: trunk/jcl/lib/d9.net/common.exc
===================================================================
--- trunk/jcl/lib/d9.net/common.exc	2007-04-18 17:27:51 UTC (rev 1996)
+++ trunk/jcl/lib/d9.net/common.exc	2007-04-18 18:13:30 UTC (rev 1997)
@@ -16,6 +16,7 @@
 JclSchedule.pas
 JclStreams.pas
 JclStrHashMap.pas
+JclStringLists.pas
 JclUnitVersioning.pas
 JclUnitVersioningProviders.pas
 JclValidation.pas


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [1996] trunk/jcl

From: <ou...@us...> - 2007-04-18 17:27:58

Revision: 1996
          http://svn.sourceforge.net/jcl/?rev=1996&view=rev
Author:   outchy
Date:     2007-04-18 10:27:51 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
Reworked manifest for the installer and examples (reverting previous changes).
Introducing 4 manifests for the JCL:
 - with dependency on common controls/without elevation
 - with dependency on common controls/with elevation
 - without dependency on common controls/without elevation
 - without dependency on common controls/with elevation
Minors fixes in examples (ContainerPerformance and ClrDemoTableForm), adding dcu to be ignored.
Removing some examples from exception lists.

Modified Paths:
--------------
    trunk/jcl/examples/C10.exc
    trunk/jcl/examples/C6.exc
    trunk/jcl/examples/D10.exc
    trunk/jcl/examples/D5.exc
    trunk/jcl/examples/D6.exc
    trunk/jcl/examples/D7.exc
    trunk/jcl/examples/D9.exc
    trunk/jcl/examples/common/containers/algorithms/AlgorithmsExample.dpr
    trunk/jcl/examples/common/containers/algorithms/AlgorithmsExample.res
    trunk/jcl/examples/common/containers/hashing/HashingExample.dpr
    trunk/jcl/examples/common/containers/hashing/HashingExample.res
    trunk/jcl/examples/common/containers/lists/ListExample.dpr
    trunk/jcl/examples/common/containers/lists/ListExample.res
    trunk/jcl/examples/common/containers/performance/ContainerPerformance.dpr
    trunk/jcl/examples/common/containers/performance/ContainerPerformance.res
    trunk/jcl/examples/common/containers/performance/ContainerPerformanceTests.pas
    trunk/jcl/examples/common/containers/trees/TreeExample.dpr
    trunk/jcl/examples/common/containers/trees/TreeExample.res
    trunk/jcl/examples/common/expreval/ExprEvalExample.dpr
    trunk/jcl/examples/common/expreval/ExprEvalExample.res
    trunk/jcl/examples/common/filesearch/QFileSearchDemo.dpr
    trunk/jcl/examples/common/filesearch/QFileSearchDemo.res
    trunk/jcl/examples/common/graphics/QClipLineDemo.dpr
    trunk/jcl/examples/common/graphics/QClipLineDemo.res
    trunk/jcl/examples/common/graphics/StretchGraphicExample.dpr
    trunk/jcl/examples/common/graphics/StretchGraphicExample.res
    trunk/jcl/examples/common/multimedia/MidiOutExample.dpr
    trunk/jcl/examples/common/multimedia/MidiOutExample.res
    trunk/jcl/examples/common/numformat/QNumFormatExample.dpr
    trunk/jcl/examples/common/numformat/QNumFormatExample.res
    trunk/jcl/examples/common/pcre/PCREDemo.dpr
    trunk/jcl/examples/common/pcre/PCREDemo.res
    trunk/jcl/examples/common/pcre/QPCREDemo.dpr
    trunk/jcl/examples/common/pcre/QPCREDemo.res
    trunk/jcl/examples/common/rtti/QRTTIDemo.dpr
    trunk/jcl/examples/common/rtti/RTTIExample.dpr
    trunk/jcl/examples/common/sysinfo/QEnvironmentExample.dpr
    trunk/jcl/examples/common/sysinfo/QEnvironmentExample.res
    trunk/jcl/examples/common/textreader/TextReaderExample.dpr
    trunk/jcl/examples/common/textreader/TextReaderExample.res
    trunk/jcl/examples/common/unitversioning/UnitVersioningTest.dpr
    trunk/jcl/examples/common/unitversioning/UnitVersioningTest.res
    trunk/jcl/examples/windows/ConsoleExamples.dpr
    trunk/jcl/examples/windows/appinst/AppInstExample.dpr
    trunk/jcl/examples/windows/appinst/AppInstExample.res
    trunk/jcl/examples/windows/appinst/SingleInstExample.dpr
    trunk/jcl/examples/windows/asuser/CreateProcAsUserExample.dpr
    trunk/jcl/examples/windows/asuser/CreateProcAsUserExample.res
    trunk/jcl/examples/windows/clr/ClrDemo.dpr
    trunk/jcl/examples/windows/clr/ClrDemoTableForm.pas
    trunk/jcl/examples/windows/debug/framestrack/FramesTrackExample.dpr
    trunk/jcl/examples/windows/debug/reportconverter/ExceptionReportConverter.dpr
    trunk/jcl/examples/windows/debug/reportconverter/ExceptionReportConverter.res
    trunk/jcl/examples/windows/debug/sourceloc/SourceLocExample.dpr
    trunk/jcl/examples/windows/debug/sourceloc/SourceLocExample.res
    trunk/jcl/examples/windows/debug/stacktrack/StackTrackDLLsExample.dpr
    trunk/jcl/examples/windows/debug/stacktrack/StackTrackDLLsExample.res
    trunk/jcl/examples/windows/debug/stacktrack/StackTrackExample.dpr
    trunk/jcl/examples/windows/debug/stacktrack/StackTrackExample.res
    trunk/jcl/examples/windows/debug/threadexcept/ThreadExceptExample.dpr
    trunk/jcl/examples/windows/delphitools/dependencyviewer/DependView.dpr
    trunk/jcl/examples/windows/delphitools/peviewer/PeViewer.dpr
    trunk/jcl/examples/windows/delphitools/peviewer/PeViewer.res
    trunk/jcl/examples/windows/delphitools/resfix/ResFix.dpr
    trunk/jcl/examples/windows/delphitools/resfix/ResFix.res
    trunk/jcl/examples/windows/delphitools/screenjpg/ScreenJPG.dpr
    trunk/jcl/examples/windows/delphitools/screenjpg/ScreenJPG.res
    trunk/jcl/examples/windows/delphitools/toolhelpview/ToolHelpViewer.dpr
    trunk/jcl/examples/windows/delphitools/toolhelpview/ToolHelpViewer.res
    trunk/jcl/examples/windows/edisdk/EDICOMExample.dpr
    trunk/jcl/examples/windows/edisdk/EDICOMExample.res
    trunk/jcl/examples/windows/edisdk/comserver/EDISDK.dpr
    trunk/jcl/examples/windows/filesummary/FileSummaryExample.dpr
    trunk/jcl/examples/windows/filesummary/FileSummaryExample.res
    trunk/jcl/examples/windows/fileversion/VerInfoExample.dpr
    trunk/jcl/examples/windows/lanman/LanManExample.dpr
    trunk/jcl/examples/windows/lanman/LanManExample.res
    trunk/jcl/examples/windows/locales/LocalesExample.dpr
    trunk/jcl/examples/windows/locales/LocalesExample.res
    trunk/jcl/examples/windows/mapi/MapiExample.dpr
    trunk/jcl/examples/windows/mapi/ReadMailExample.dpr
    trunk/jcl/examples/windows/mapi/ReadMailExample.res
    trunk/jcl/examples/windows/multimedia/MultiMediaExample.dpr
    trunk/jcl/examples/windows/multimedia/MultiMediaExample.res
    trunk/jcl/examples/windows/ntservice/NtSvcExample.dpr
    trunk/jcl/examples/windows/peimage/ApiHookExample.dpr
    trunk/jcl/examples/windows/peimage/ApiHookExample.res
    trunk/jcl/examples/windows/peimage/PeFuncExample.dpr
    trunk/jcl/examples/windows/peimage/UnmangleNameExample.dpr
    trunk/jcl/examples/windows/registry/RegistryExample.dpr
    trunk/jcl/examples/windows/structstorage/StructStorageExample.dpr
    trunk/jcl/examples/windows/structstorage/StructStorageExample.res
    trunk/jcl/examples/windows/sysinfo/SysInfoExample.dpr
    trunk/jcl/examples/windows/tasks/TaskDemo.dpr
    trunk/jcl/examples/windows/tasks/TaskDemo.res
    trunk/jcl/install/JediInstaller.dpr
    trunk/jcl/install/JediInstaller.res
    trunk/jcl/install/RegHelper.dpr

Added Paths:
-----------
    trunk/jcl/examples/D11.exc
    trunk/jcl/source/windows/JclCommCtrlAdmin.manifest
    trunk/jcl/source/windows/JclCommCtrlAdmin.rc
    trunk/jcl/source/windows/JclCommCtrlAdmin.res
    trunk/jcl/source/windows/JclCommCtrlAsInvoker.manifest
    trunk/jcl/source/windows/JclCommCtrlAsInvoker.rc
    trunk/jcl/source/windows/JclCommCtrlAsInvoker.res
    trunk/jcl/source/windows/JclNoDepAdmin.manifest
    trunk/jcl/source/windows/JclNoDepAdmin.rc
    trunk/jcl/source/windows/JclNoDepAdmin.res
    trunk/jcl/source/windows/JclNoDepAsInvoker.manifest
    trunk/jcl/source/windows/JclNoDepAsInvoker.rc
    trunk/jcl/source/windows/JclNoDepAsInvoker.res

Removed Paths:
-------------
    trunk/jcl/install/VistaElevate.manifest
    trunk/jcl/install/VistaElevate.rc
    trunk/jcl/install/VistaElevate.res

Property Changed:
----------------
    trunk/jcl/examples/
    trunk/jcl/examples/common/
    trunk/jcl/examples/common/containers/
    trunk/jcl/examples/common/containers/algorithms/
    trunk/jcl/examples/common/containers/hashing/
    trunk/jcl/examples/common/containers/lists/
    trunk/jcl/examples/common/containers/performance/
    trunk/jcl/examples/common/containers/trees/
    trunk/jcl/examples/common/expreval/
    trunk/jcl/examples/common/filesearch/
    trunk/jcl/examples/common/graphics/
    trunk/jcl/examples/common/multimedia/
    trunk/jcl/examples/common/numformat/
    trunk/jcl/examples/common/pcre/
    trunk/jcl/examples/common/rtti/
    trunk/jcl/examples/common/sysinfo/
    trunk/jcl/examples/common/textreader/
    trunk/jcl/examples/common/unitversioning/
    trunk/jcl/examples/dotnet/
    trunk/jcl/examples/dotnet/JCLNetDemo/
    trunk/jcl/examples/windows/
    trunk/jcl/examples/windows/appinst/
    trunk/jcl/examples/windows/asuser/
    trunk/jcl/examples/windows/clr/
    trunk/jcl/examples/windows/debug/
    trunk/jcl/examples/windows/debug/framestrack/
    trunk/jcl/examples/windows/debug/reportconverter/
    trunk/jcl/examples/windows/debug/sourceloc/
    trunk/jcl/examples/windows/debug/stacktrack/
    trunk/jcl/examples/windows/debug/threadexcept/
    trunk/jcl/examples/windows/delphitools/
    trunk/jcl/examples/windows/delphitools/common/
    trunk/jcl/examples/windows/delphitools/dependencyviewer/
    trunk/jcl/examples/windows/delphitools/peviewer/
    trunk/jcl/examples/windows/delphitools/resfix/
    trunk/jcl/examples/windows/delphitools/screenjpg/
    trunk/jcl/examples/windows/delphitools/toolhelpview/
    trunk/jcl/examples/windows/edisdk/
    trunk/jcl/examples/windows/edisdk/comserver/
    trunk/jcl/examples/windows/edisdk/vb5/
    trunk/jcl/examples/windows/filesummary/
    trunk/jcl/examples/windows/fileversion/
    trunk/jcl/examples/windows/lanman/
    trunk/jcl/examples/windows/locales/
    trunk/jcl/examples/windows/mapi/
    trunk/jcl/examples/windows/multimedia/
    trunk/jcl/examples/windows/ntfs/
    trunk/jcl/examples/windows/ntservice/
    trunk/jcl/examples/windows/peimage/
    trunk/jcl/examples/windows/registry/
    trunk/jcl/examples/windows/structstorage/
    trunk/jcl/examples/windows/sysinfo/
    trunk/jcl/examples/windows/tasks/


Property changes on: trunk/jcl/examples
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/C10.exc
===================================================================
--- trunk/jcl/examples/C10.exc	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/C10.exc	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,4 +1 @@
-common\containers\performance\ContainerPerformance.dpr
-windows\clr\ClrDemo.dpr
-windows\tasks\TaskDemo.dpr
 visclx.exc
\ No newline at end of file

Modified: trunk/jcl/examples/C6.exc
===================================================================
--- trunk/jcl/examples/C6.exc	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/C6.exc	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,3 +1 @@
-windows\clr\ClrDemo.dpr
-common\filesearch\QFileSearchDemo.dpr
-visclx.exc=STD
\ No newline at end of file
+visclx.exc
\ No newline at end of file

Modified: trunk/jcl/examples/D10.exc
===================================================================
--- trunk/jcl/examples/D10.exc	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/D10.exc	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,4 +1 @@
-common\containers\performance\ContainerPerformance.dpr
-windows\clr\ClrDemo.dpr
-windows\tasks\TaskDemo.dpr
 visclx.exc
\ No newline at end of file

Added: trunk/jcl/examples/D11.exc
===================================================================
--- trunk/jcl/examples/D11.exc	                        (rev 0)
+++ trunk/jcl/examples/D11.exc	2007-04-18 17:27:51 UTC (rev 1996)
@@ -0,0 +1 @@
+visclx.exc
\ No newline at end of file


Property changes on: trunk/jcl/examples/D11.exc
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/jcl/examples/D5.exc
===================================================================
--- trunk/jcl/examples/D5.exc	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/D5.exc	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,3 +1,2 @@
-common\containers\performance\ContainerPerformance.dpr
 windows\clr\ClrDemo.dpr
 visclx.exc
\ No newline at end of file

Modified: trunk/jcl/examples/D6.exc
===================================================================
--- trunk/jcl/examples/D6.exc	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/D6.exc	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,4 +1 @@
-common\containers\performance\ContainerPerformance.dpr
-common\filesearch\QFileSearchDemo.dpr
-windows\clr\ClrDemo.dpr
-visclx.exc=STD
\ No newline at end of file
+visclx.exc
\ No newline at end of file

Modified: trunk/jcl/examples/D7.exc
===================================================================
--- trunk/jcl/examples/D7.exc	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/D7.exc	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,4 +1 @@
-common\containers\performance\ContainerPerformance.dpr
-common\filesearch\QFileSearchDemo.dpr
-windows\clr\ClrDemo.dpr
-visclx.exc=STD
\ No newline at end of file
+visclx.exc
\ No newline at end of file

Modified: trunk/jcl/examples/D9.exc
===================================================================
--- trunk/jcl/examples/D9.exc	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/D9.exc	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,4 +1 @@
-common\containers\performance\ContainerPerformance.dpr
-windows\clr\ClrDemo.dpr
-windows\tasks\TaskDemo.dpr
 visclx.exc
\ No newline at end of file


Property changes on: trunk/jcl/examples/common
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu



Property changes on: trunk/jcl/examples/common/containers
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu



Property changes on: trunk/jcl/examples/common/containers/algorithms
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/containers/algorithms/AlgorithmsExample.dpr
===================================================================
--- trunk/jcl/examples/common/containers/algorithms/AlgorithmsExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/containers/algorithms/AlgorithmsExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -12,6 +12,7 @@
   AlgorithmsExampleMain in 'AlgorithmsExampleMain.pas' {MainForm};
 
 {$R *.res}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/containers/algorithms/AlgorithmsExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/common/containers/hashing
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/containers/hashing/HashingExample.dpr
===================================================================
--- trunk/jcl/examples/common/containers/hashing/HashingExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/containers/hashing/HashingExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -12,6 +12,7 @@
   HashingExampleMain in 'HashingExampleMain.pas' {MainForm};
 
 {$R *.res}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/containers/hashing/HashingExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/common/containers/lists
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/containers/lists/ListExample.dpr
===================================================================
--- trunk/jcl/examples/common/containers/lists/ListExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/containers/lists/ListExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -13,6 +13,7 @@
   MyObjectList in 'MyObjectList.pas';
 
 {$R *.res}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/containers/lists/ListExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/common/containers/performance
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/containers/performance/ContainerPerformance.dpr
===================================================================
--- trunk/jcl/examples/common/containers/performance/ContainerPerformance.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/containers/performance/ContainerPerformance.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -13,6 +13,7 @@
   ContainerPerformanceTests in 'ContainerPerformanceTests.pas';
 
 {$R *.res}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/containers/performance/ContainerPerformance.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/examples/common/containers/performance/ContainerPerformanceTests.pas
===================================================================
--- trunk/jcl/examples/common/containers/performance/ContainerPerformanceTests.pas	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/containers/performance/ContainerPerformanceTests.pas	2007-04-18 17:27:51 UTC (rev 1996)
@@ -35,10 +35,13 @@
   SNeedRTL140Up = 'requires RTL > 14.0';
 {$ENDIF ~RTL140_UP}
 
+var
+  Res: Integer;
+
 procedure TestList(Results: TStrings);
 var
   List: TList;
-  I, res: Integer;
+  I: Integer;
   Start: TDateTime;
 begin
   Randomize;
@@ -74,7 +77,7 @@
 var
   List: IJclList;
   It: IJclIterator;
-  I, Res: Integer;
+  I: Integer;
   Start: TDateTime;
 begin
   Randomize;
@@ -92,7 +95,7 @@
     // Slower but same for every IJclList
     It := List.First;
     while It.HasNext do
-      I := Integer(It.Next);
+      Res := Integer(It.Next);
     Results[2] := Format(ResultFormat, [(Now - Start) * MsecsPerDay]);
     Start := Now;
     for I := 0 to 200 do
@@ -116,7 +119,7 @@
 procedure TestJclLinkedList(Results: TStrings);
 var
   List: IJclList;
-  I, Res: Integer;
+  I: Integer;
   It: IJclIterator;
   Start: TDateTime;
 begin
@@ -131,7 +134,7 @@
     Start := Now;
     It := List.First;
     while It.HasNext do
-      I := Integer(It.Next);
+      Res := Integer(It.Next);
     Results[2] := Format(ResultFormat, [(Now - Start) * MsecsPerDay]);
     Start := Now;
     for I := 0 to 200 do
@@ -154,8 +157,8 @@
 
 procedure TestJclVector(Results: TStrings);
 var
-  List: TJclVector;
-  I, res: Integer;
+  List: IJclList;
+  I: Integer;
   Start: TDateTime;
 begin
   Randomize;
@@ -175,18 +178,16 @@
       Res := List.IndexOf(TObject(Random(1000000)));
     Results[3] := Format(ResultFormat, [(Now - Start) * MsecsPerDay]);
     Start := Now;
+    for I := List.Size - 1 downto 20 do
+      List.Items[I - 10] := List.Items[I];
     for I := 0 to 10 do
-    begin
-      System.Move(List.Items[10], List.Items[10 + 1],
-        (List.Size - 10) * SizeOf(TObject));
-      List.Items[10] := TObject(I);
-    end;
+      List.Items[I + 10] := TObject(I);
     Results[4] := Format(ResultFormat, [(Now - Start) * MsecsPerDay]);
     Start := Now;
     List.Clear;
     Results[5] := Format(ResultFormat, [(Now - Start) * MsecsPerDay]);
   finally
-    List.Free;
+    List := nil;
     Screen.Cursor := crDefault;
   end;
 end;
@@ -194,7 +195,7 @@
 procedure TestBucketList(Results: TStrings);
 {$IFDEF RTL140_UP}
 var
-  I, Res: Integer;
+  I: Integer;
   Start: TDateTime;
   List: TBucketList;
 begin
@@ -230,7 +231,7 @@
 procedure TestJclHashMap(Results: TStrings);
 var
   Map: IJclMap;
-  I, Res: Integer;
+  I: Integer;
   Start: TDateTime;
 begin
   Randomize;
@@ -262,7 +263,6 @@
 {$IFDEF RTL140_UP}
 var
   I: Integer;
-  Index: Integer;
   List: THashedStringList;
   Start: TDateTime;
 begin
@@ -276,7 +276,7 @@
     Results[1] := Format(ResultFormat, [(Now - Start) * MsecsPerDay]);
     Start := Now;
     for I := 0 to 100000 do
-      Index := List.IndexOf(GenId(123));
+      Res := List.IndexOf(GenId(123));
     Results[2] := Format(ResultFormat, [(Now - Start) * MsecsPerDay]);
     Start := Now;
     List.Clear;


Property changes on: trunk/jcl/examples/common/containers/trees
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/containers/trees/TreeExample.dpr
===================================================================
--- trunk/jcl/examples/common/containers/trees/TreeExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/containers/trees/TreeExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -12,6 +12,7 @@
   TreeExampleMain in 'TreeExampleMain.pas' {MainForm};
 
 {$R *.res}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/containers/trees/TreeExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/common/expreval
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/expreval/ExprEvalExample.dpr
===================================================================
--- trunk/jcl/examples/common/expreval/ExprEvalExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/expreval/ExprEvalExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,5 +1,7 @@
 program ExprEvalExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   ExprEvalExampleMain in 'ExprEvalExampleMain.pas' {Form1},
@@ -8,6 +10,7 @@
   ExprEvalExampleLogic in 'ExprEvalExampleLogic.pas';
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/expreval/ExprEvalExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/common/filesearch
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/filesearch/QFileSearchDemo.dpr
===================================================================
--- trunk/jcl/examples/common/filesearch/QFileSearchDemo.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/filesearch/QFileSearchDemo.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program QFileSearchDemo;
 
+{$I jcl.inc}
+
 uses
   QForms,
   QFileSearchDemoMain in 'QFileSearchDemoMain.pas' {FileSearchForm};
 
 {$R *.res}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/filesearch/QFileSearchDemo.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/common/graphics
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/graphics/QClipLineDemo.dpr
===================================================================
--- trunk/jcl/examples/common/graphics/QClipLineDemo.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/graphics/QClipLineDemo.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,12 +1,14 @@
 program QClipLineDemo;
 
-{%ToDo 'ClipLineDemo.todo'}
+{$I jcl.inc}
+
 uses
   QStyle,
   QForms,
   QClipLineDemoMain in 'QClipLineDemoMain.pas' {Form1};
 
 {$R *.res}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/graphics/QClipLineDemo.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/examples/common/graphics/StretchGraphicExample.dpr
===================================================================
--- trunk/jcl/examples/common/graphics/StretchGraphicExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/graphics/StretchGraphicExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program StretchGraphicExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   StretchGraphicDemoMain in 'StretchGraphicDemoMain.pas' {StretchDemoForm};
 
 {$R *.res}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/graphics/StretchGraphicExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/common/multimedia
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/multimedia/MidiOutExample.dpr
===================================================================
--- trunk/jcl/examples/common/multimedia/MidiOutExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/multimedia/MidiOutExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -6,6 +6,7 @@
   MidiOutExampleTuningDlg in 'MidiOutExampleTuningDlg.pas' {TuningDialog};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/multimedia/MidiOutExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/common/numformat
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/numformat/QNumFormatExample.dpr
===================================================================
--- trunk/jcl/examples/common/numformat/QNumFormatExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/numformat/QNumFormatExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program QNumFormatExample;
 
+{$I jcl.inc}
+
 uses
   QForms,
   QNumFormatExampleMain in 'QNumFormatExampleMain.pas' {MainForm};
 
 {$R *.res}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/numformat/QNumFormatExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/common/pcre
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/pcre/PCREDemo.dpr
===================================================================
--- trunk/jcl/examples/common/pcre/PCREDemo.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/pcre/PCREDemo.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program PCREDemo;
 
+{$I jcl.inc}
+
 uses
   Forms,
   PCREDemoMain in 'PCREDemoMain.pas' {frmMain};
 
 {$R *.res}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/pcre/PCREDemo.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/examples/common/pcre/QPCREDemo.dpr
===================================================================
--- trunk/jcl/examples/common/pcre/QPCREDemo.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/pcre/QPCREDemo.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program QPCREDemo;
 
+{$I jcl.inc}
+
 uses
   QForms,
   QPCREDemoMain in 'QPCREDemoMain.pas' {frmMain};
 
 {$R *.res}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/pcre/QPCREDemo.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/common/rtti
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/rtti/QRTTIDemo.dpr
===================================================================
--- trunk/jcl/examples/common/rtti/QRTTIDemo.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/rtti/QRTTIDemo.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program QRTTIDemo;
 
+{$I jcl.inc}
+
 uses
   QForms,
   QRTTIDemoMain in 'QRTTIDemoMain.pas' {Form1};
 
 {$R *.res}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/rtti/RTTIExample.dpr
===================================================================
--- trunk/jcl/examples/common/rtti/RTTIExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/rtti/RTTIExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program RTTIExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   RTTIDemoMain in 'RTTIDemoMain.pas' {Form1};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;


Property changes on: trunk/jcl/examples/common/sysinfo
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/sysinfo/QEnvironmentExample.dpr
===================================================================
--- trunk/jcl/examples/common/sysinfo/QEnvironmentExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/sysinfo/QEnvironmentExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program QEnvironmentExample;
 
+{$I jcl.inc}
+
 uses
   QForms,
   QEnvironmentExampleMain in 'QEnvironmentExampleMain.pas' {Form1};
 
 {$R *.res}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/sysinfo/QEnvironmentExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/common/textreader
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/textreader/TextReaderExample.dpr
===================================================================
--- trunk/jcl/examples/common/textreader/TextReaderExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/textreader/TextReaderExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program TextReaderExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   TextReaderDemoMain in 'TextReaderDemoMain.pas' {MainForm};
 
 {$R *.res}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/textreader/TextReaderExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/common/unitversioning
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/common/unitversioning/UnitVersioningTest.dpr
===================================================================
--- trunk/jcl/examples/common/unitversioning/UnitVersioningTest.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/common/unitversioning/UnitVersioningTest.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -37,6 +37,7 @@
   UnitVersioningTestMain in 'UnitVersioningTestMain.pas' {frmUnitVersioningTestMain};
 
 {$R *.res}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/common/unitversioning/UnitVersioningTest.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/dotnet
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu



Property changes on: trunk/jcl/examples/dotnet/JCLNetDemo
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu



Property changes on: trunk/jcl/examples/windows
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/ConsoleExamples.dpr
===================================================================
--- trunk/jcl/examples/windows/ConsoleExamples.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/ConsoleExamples.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,3 +1,7 @@
+program ConsoleExamples;
+
+{$APPTYPE CONSOLE}
+
 {$I jcl.inc}
 {$IFDEF SUPPORTS_PLATFORM_WARNINGS}
   {$WARN SYMBOL_PLATFORM OFF}
@@ -3,6 +7,4 @@
 {$ENDIF SUPPORTS_PLATFORM_WARNINGS}
 
-program ConsoleExamples;
-{$APPTYPE CONSOLE}
 uses
   SysUtils,
@@ -11,6 +13,8 @@
   TypInfo,
   JclConsole;
 
+{$R ..\..\source\windows\JclNoDepAsInvoker.res}
+
 type
   TCPInfoEx = packed record
     MaxCharSize: DWORD;


Property changes on: trunk/jcl/examples/windows/appinst
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/appinst/AppInstExample.dpr
===================================================================
--- trunk/jcl/examples/windows/appinst/AppInstExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/appinst/AppInstExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program AppInstExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   AppInstDemoMain in 'AppInstDemoMain.pas' {Form1};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/appinst/AppInstExample.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/examples/windows/appinst/SingleInstExample.dpr
===================================================================
--- trunk/jcl/examples/windows/appinst/SingleInstExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/appinst/SingleInstExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,11 +1,14 @@
 program SingleInstExample;
 
+{$I jcl.inc}
+
 uses
   JclAppInst, // Added JclAppInst unit
   Forms,
   SingleInstDemoMain in 'SingleInstDemoMain.pas' {Form1};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   JclAppInstances.CheckSingleInstance; // Added instance checking


Property changes on: trunk/jcl/examples/windows/asuser
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/asuser/CreateProcAsUserExample.dpr
===================================================================
--- trunk/jcl/examples/windows/asuser/CreateProcAsUserExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/asuser/CreateProcAsUserExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,14 @@
 program CreateProcAsUserExample;
 
+
+{$I jcl.inc}
+
 uses
   Forms,
   CreateProcAsUserDemoMain in 'CreateProcAsUserDemoMain.pas' {Form1};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/asuser/CreateProcAsUserExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/clr
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/clr/ClrDemo.dpr
===================================================================
--- trunk/jcl/examples/windows/clr/ClrDemo.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/clr/ClrDemo.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,5 +1,7 @@
 program ClrDemo;
 
+{$I jcl.inc}
+
 uses
   Forms,
   ClrDemoMain in 'ClrDemoMain.pas' {frmMain},
@@ -13,6 +15,7 @@
   ClrDemoCLRFrame in 'ClrDemoCLRFrame.pas' {frmCLR: TFrame};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/clr/ClrDemoTableForm.pas
===================================================================
--- trunk/jcl/examples/windows/clr/ClrDemoTableForm.pas	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/clr/ClrDemoTableForm.pas	2007-04-18 17:27:51 UTC (rev 1996)
@@ -52,7 +52,7 @@
 
 {$R *.DFM}
 
-{$DEFINE USE_JWA}
+{.$DEFINE USE_JWA}
 
 uses
   ComObj, TypInfo, ClrDemoAbstractFrame,


Property changes on: trunk/jcl/examples/windows/debug
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu



Property changes on: trunk/jcl/examples/windows/debug/framestrack
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/debug/framestrack/FramesTrackExample.dpr
===================================================================
--- trunk/jcl/examples/windows/debug/framestrack/FramesTrackExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/debug/framestrack/FramesTrackExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program FramesTrackExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   FramesTrackDemoMain in 'FramesTrackDemoMain.pas' {Form1};
 
 {$R *.RES}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;


Property changes on: trunk/jcl/examples/windows/debug/reportconverter
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/debug/reportconverter/ExceptionReportConverter.dpr
===================================================================
--- trunk/jcl/examples/windows/debug/reportconverter/ExceptionReportConverter.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/debug/reportconverter/ExceptionReportConverter.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,11 +1,14 @@
 program ExceptionReportConverter;
 
+{$I jcl.inc}
+
 uses
   Forms,
   formConverter in 'formConverter.pas' {frmConverter},
   ExceptDlgMail in '..\..\..\..\EXPERTS\DEBUG\DIALOG\EXCEPTDLGMAIL.pas' {ExceptionDialogMail};
 
 {$R *.res}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/debug/reportconverter/ExceptionReportConverter.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/debug/sourceloc
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/debug/sourceloc/SourceLocExample.dpr
===================================================================
--- trunk/jcl/examples/windows/debug/sourceloc/SourceLocExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/debug/sourceloc/SourceLocExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program SourceLocExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   SourceLocDemoMain in 'SourceLocDemoMain.pas' {Form1};
 
 {$R *.RES}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/debug/sourceloc/SourceLocExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/debug/stacktrack
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/debug/stacktrack/StackTrackDLLsExample.dpr
===================================================================
--- trunk/jcl/examples/windows/debug/stacktrack/StackTrackDLLsExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/debug/stacktrack/StackTrackDLLsExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,11 +1,14 @@
 program StackTrackDLLsExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   StackTrackDLLsDemoMain in 'StackTrackDLLsDemoMain.pas' {MainForm},
   ExceptDlg in '..\..\..\..\experts\debug\dialog\ExceptDlg.pas' {ExceptionDialog};
 
 {$R *.res}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/debug/stacktrack/StackTrackDLLsExample.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/examples/windows/debug/stacktrack/StackTrackExample.dpr
===================================================================
--- trunk/jcl/examples/windows/debug/stacktrack/StackTrackExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/debug/stacktrack/StackTrackExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program StackTrackExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   StackTrackDemoMain in 'StackTrackDemoMain.pas' {MainForm};
 
 {$R *.RES}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/debug/stacktrack/StackTrackExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/debug/threadexcept
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/debug/threadexcept/ThreadExceptExample.dpr
===================================================================
--- trunk/jcl/examples/windows/debug/threadexcept/ThreadExceptExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/debug/threadexcept/ThreadExceptExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,5 +1,7 @@
 program ThreadExceptExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   JclIdeThreadStatus in '..\..\..\..\experts\debug\threadnames\JclIdeThreadStatus.pas',
@@ -7,6 +9,7 @@
   ThreadExceptDemoMain in 'ThreadExceptDemoMain.pas' {MainForm};
 
 {$R *.res}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;


Property changes on: trunk/jcl/examples/windows/delphitools
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu



Property changes on: trunk/jcl/examples/windows/delphitools/common
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu



Property changes on: trunk/jcl/examples/windows/delphitools/dependencyviewer
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/delphitools/dependencyviewer/DependView.dpr
===================================================================
--- trunk/jcl/examples/windows/delphitools/dependencyviewer/DependView.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/delphitools/dependencyviewer/DependView.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,5 +1,7 @@
 program DependView;
 
+{$I jcl.inc}
+
 uses
   Forms,
   SysUtils,
@@ -12,6 +14,7 @@
   ExceptDlg in '..\..\..\..\experts\debug\dialog\ExceptDlg.pas' {ExceptionDialog};
 
 {$R *.RES}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;


Property changes on: trunk/jcl/examples/windows/delphitools/peviewer
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/delphitools/peviewer/PeViewer.dpr
===================================================================
--- trunk/jcl/examples/windows/delphitools/peviewer/PeViewer.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/delphitools/peviewer/PeViewer.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,5 +1,7 @@
 program PeViewer;
 
+{$I jcl.inc}
+
 uses
   Forms,
   SysUtils,
@@ -21,6 +23,7 @@
 {$R *.TLB}
 
 {$R *.RES}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/delphitools/peviewer/PeViewer.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/delphitools/resfix
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/delphitools/resfix/ResFix.dpr
===================================================================
--- trunk/jcl/examples/windows/delphitools/resfix/ResFix.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/delphitools/resfix/ResFix.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,5 +1,7 @@
 program ResFix;
 
+{$I jcl.inc}
+
 uses
   Forms,
   ResFixMain in 'ResFixMain.pas' {MainForm},
@@ -8,6 +10,7 @@
   ExceptDlg in '..\..\..\..\experts\debug\dialog\ExceptDlg.pas' {ExceptionDialog};
 
 {$R *.RES}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/delphitools/resfix/ResFix.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/delphitools/screenjpg
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/delphitools/screenjpg/ScreenJPG.dpr
===================================================================
--- trunk/jcl/examples/windows/delphitools/screenjpg/ScreenJPG.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/delphitools/screenjpg/ScreenJPG.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,5 +1,7 @@
 program ScreenJPG;
 
+{$I jcl.inc}
+
 uses
   Forms,
   Main in 'Main.pas' {MainForm},
@@ -8,6 +10,7 @@
   ExceptDlg in '..\..\..\..\experts\debug\dialog\ExceptDlg.pas' {ExceptionDialog};
 
 {$R *.RES}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/delphitools/screenjpg/ScreenJPG.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/delphitools/toolhelpview
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/delphitools/toolhelpview/ToolHelpViewer.dpr
===================================================================
--- trunk/jcl/examples/windows/delphitools/toolhelpview/ToolHelpViewer.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/delphitools/toolhelpview/ToolHelpViewer.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,5 +1,7 @@
 program ToolHelpViewer;
 
+{$I jcl.inc}
+
 uses
   Forms,
   SysUtils,
@@ -17,6 +19,7 @@
   ExceptDlg in '..\..\..\..\experts\debug\dialog\ExceptDlg.pas' {ExceptionDialog};
 
 {$R *.RES}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   try

Modified: trunk/jcl/examples/windows/delphitools/toolhelpview/ToolHelpViewer.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/edisdk
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/edisdk/EDICOMExample.dpr
===================================================================
--- trunk/jcl/examples/windows/edisdk/EDICOMExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/edisdk/EDICOMExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program EDICOMExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   EDICOMExampleMain in 'EDICOMExampleMain.pas' {Form1};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/edisdk/EDICOMExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/edisdk/comserver
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/edisdk/comserver/EDISDK.dpr
===================================================================
--- trunk/jcl/examples/windows/edisdk/comserver/EDISDK.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/edisdk/comserver/EDISDK.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,5 +1,7 @@
 library EDISDK;
 
+{$I jcl.inc}
+
 uses
   ComServ,
   EDISDK_TLB in 'EDISDK_TLB.pas',


Property changes on: trunk/jcl/examples/windows/edisdk/vb5
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu



Property changes on: trunk/jcl/examples/windows/filesummary
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/filesummary/FileSummaryExample.dpr
===================================================================
--- trunk/jcl/examples/windows/filesummary/FileSummaryExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/filesummary/FileSummaryExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program FileSummaryExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   FileSummaryDemoMain in 'FileSummaryDemoMain.pas' {FormMain};
 
 {$R *.res}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/filesummary/FileSummaryExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/fileversion
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/fileversion/VerInfoExample.dpr
===================================================================
--- trunk/jcl/examples/windows/fileversion/VerInfoExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/fileversion/VerInfoExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program VerInfoExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   VerInfoDemoMain in 'VerInfoDemoMain.pas' {Form1};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;


Property changes on: trunk/jcl/examples/windows/lanman
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/lanman/LanManExample.dpr
===================================================================
--- trunk/jcl/examples/windows/lanman/LanManExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/lanman/LanManExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program LanManExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   LanManDemoMain in 'LanManDemoMain.pas' {Form1};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAdmin.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/lanman/LanManExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/locales
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/locales/LocalesExample.dpr
===================================================================
--- trunk/jcl/examples/windows/locales/LocalesExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/locales/LocalesExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program LocalesExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   LocalesDemoMain in 'LocalesDemoMain.pas' {MainForm};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/locales/LocalesExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/mapi
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/mapi/MapiExample.dpr
===================================================================
--- trunk/jcl/examples/windows/mapi/MapiExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/mapi/MapiExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program MapiExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   MapiDemoMain in 'MapiDemoMain.pas' {MainForm};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/mapi/ReadMailExample.dpr
===================================================================
--- trunk/jcl/examples/windows/mapi/ReadMailExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/mapi/ReadMailExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program ReadMailExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   ReadMailDemoMain in 'ReadMailDemoMain.pas' {Form1};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/mapi/ReadMailExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/multimedia
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/multimedia/MultiMediaExample.dpr
===================================================================
--- trunk/jcl/examples/windows/multimedia/MultiMediaExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/multimedia/MultiMediaExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program MultiMediaExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   MultimediaDemoMain in 'MultimediaDemoMain.pas' {MainForm};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAsInvoker.res}
 
 begin
   Application.Initialize;

Modified: trunk/jcl/examples/windows/multimedia/MultiMediaExample.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/examples/windows/ntfs
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu



Property changes on: trunk/jcl/examples/windows/ntservice
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/ntservice/NtSvcExample.dpr
===================================================================
--- trunk/jcl/examples/windows/ntservice/NtSvcExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/ntservice/NtSvcExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,5 +1,7 @@
 program NtSvcExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   NtSvcDemoMain in 'NtSvcDemoMain.pas' {frmMain},
@@ -7,6 +9,7 @@
   NtSvcDemoGroups in 'NtSvcDemoGroups.pas' {frmServiceGroups};
 
 {$R *.RES}
+{$R ..\..\..\source\windows\JclCommCtrlAdmin.res}
 
 begin
   Application.Initialize;


Property changes on: trunk/jcl/examples/windows/peimage
___________________________________________________________________
Name: svn:ignore
   - makefile.mak
*.identcache
*.local
*.cfg
*.drc

   + makefile.mak
*.identcache
*.local
*.cfg
*.drc
*.dcu


Modified: trunk/jcl/examples/windows/peimage/ApiHookExample.dpr
===================================================================
--- trunk/jcl/examples/windows/peimage/ApiHookExample.dpr	2007-04-18 10:41:06 UTC (rev 1995)
+++ trunk/jcl/examples/windows/peimage/ApiHookExample.dpr	2007-04-18 17:27:51 UTC (rev 1996)
@@ -1,10 +1,13 @@
 program ApiHookExample;
 
+{$I jcl.inc}
+
 uses
   Forms,
   ApiHookDemoMain in 'ApiHookDemoMain.pas' {Form1};
 
 {$R *.RES}
+{$R ....
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl: [1995] trunk/jcl/install

From: <ou...@us...> - 2007-04-18 10:41:09

Revision: 1995
          http://svn.sourceforge.net/jcl/?rev=1995&view=rev
Author:   outchy
Date:     2007-04-18 03:41:06 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
Introducing RegHelper utility to execute operations requiring administrator privilege (HTML Help 2.0 registration)

Modified Paths:
--------------
    trunk/jcl/install/JclInstall.pas

Added Paths:
-----------
    trunk/jcl/install/RegHelper.dof
    trunk/jcl/install/RegHelper.dpr
    trunk/jcl/install/RegHelper.rc
    trunk/jcl/install/RegHelper.res
    trunk/jcl/install/VistaElevate.manifest
    trunk/jcl/install/VistaElevate.rc
    trunk/jcl/install/VistaElevate.res

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2007-04-18 10:40:36 UTC (rev 1994)
+++ trunk/jcl/install/JclInstall.pas	2007-04-18 10:41:06 UTC (rev 1995)
@@ -139,6 +139,7 @@
     function CompileCLRPackage(const Name: string): Boolean;
     {$ENDIF MSWINDOWS}
     function CompilePackage(const Name: string; InstallPackage: Boolean): Boolean;
+    function CompileApplication(FileName: string): Boolean;
     function UninstallPackage(const Name: string): Boolean;
     procedure ConfigureBpr2Mak(const PackageFileName: string);
     {$IFDEF MSWINDOWS}
@@ -160,7 +161,7 @@
     procedure Init;
     function RemoveSettings: Boolean;
     function Install: Boolean;
-    function Uninstall: Boolean;
+    function Uninstall(AUninstallHelp: Boolean): Boolean;
 
     property Distribution: TJclDistribution read FDistribution;
     property Target: TJclBorRADToolInstallation read FTarget;
@@ -200,6 +201,7 @@
     FNbInstalled: Integer;
     {$IFDEF MSWINDOWS}
     FCLRVersions: TStrings;
+    FRegHelpCommands: TStrings;
     {$ENDIF MSWINDOWS}
     FRadToolInstallations: TJclBorRADToolInstallations;
     FTargetInstalls: TObjectList;
@@ -240,9 +242,28 @@
     function CreateInstall(Target: TJclBorRADToolInstallation): Boolean;
     function GetTargetInstall(Index: Integer): TJclInstallation;
     function GetTargetInstallCount: Integer;
+    {$IFDEF MSWINDOWS}
+    procedure RegHelpInternalAdd(Command: Integer; Arguments: string; DoNotRepeatCommand: Boolean);
+    function RegHelpExecuteCommands(DisplayErrors: Boolean): Boolean;
+    procedure RegHelpClearCommands;
+    {$ENDIF MSWINDOWS}
   public
     constructor Create;
     destructor Destroy; override;
+
+    {$IFDEF MSWINDOWS}
+    procedure RegHelpCreateTransaction;
+    procedure RegHelpCommitTransaction;
+    procedure RegHelpRegisterNameSpace(const Name, Collection, Description: WideString);
+    procedure RegHelpUnregisterNameSpace(const Name: WideString);
+    procedure RegHelpRegisterHelpFile(const NameSpace, Identifier: WideString;
+      const LangId: Integer; const HxSFile, HxIFile: WideString);
+    procedure RegHelpUnregisterHelpFile(const NameSpace, Identifier: WideString;
+      const LangId: Integer);
+    procedure RegHelpPlugNameSpaceIn(const SourceNameSpace, TargetNameSpace: WideString);
+    procedure RegHelpUnPlugNameSpace(const SourceNameSpace, TargetNameSpace: WideString);
+    {$ENDIF MSWINDOWS}
+
     // IJediProduct
     procedure Init;
     procedure Install;
@@ -285,12 +306,14 @@
   TypInfo,
   JclBase, JclResources, JclSysInfo,
   {$IFDEF MSWINDOWS}
+  Windows,
   JclPeImage,
   JclRegistry,
   JclDebug,
   JclDotNet,
   JclSecurity,
   JediRegInfo,
+  JclShell,
   {$ENDIF MSWINDOWS}
   JclFileUtils, JclStrings;
 
@@ -496,6 +519,8 @@
     'environment variable, otherwise JCL packages won''t be found by the IDE.' + sLineBreak +
     'Do you want the JCL installer to add it?' + sLineBreak +
     'You will have to reboot your computer and/or to close your session to validate this change';
+  RsHtmlHelp2Credentials = 'Registering HTML Help 2.0 files requires administrator privilege to be performed' + sLineBreak +
+    'The RegHelper.exe utility will make this operation';
 
 type
   TOptionRec = record
@@ -1685,12 +1710,11 @@
 
     function RegisterHelp2Files: Boolean;
     var
-      Help2Manager: TJclHelp2Manager;
-      CurrentDir: string;
+      //CurrentDir: string;
       NameSpace, Collection, Description, Identifier, HxSFile, HxIFile: WideString;
       LangId: Integer;
     begin
-      Result := False;
+      Result := True;
       if (Target.RadToolKind <> brBorlandDevStudio) or (Target.VersionNumber < 3) then
         Exit;
 
@@ -1704,52 +1728,20 @@
       LangId := Help2LangId;
       HxSFile := Help2HxSFile;
       HxIFile := Help2HxIFile;
-    
-      CurrentDir := GetCurrentDir;
-      if SetCurrentDir(Distribution.JclPath + 'help\') then
-      try
-        Help2Manager := TJclBDSInstallation(Target).Help2Manager;
 
-        Result := Help2Manager.CreateTransaction;
-        if Result then
-          WriteLog('Transaction created')
-        else
-          WriteLog('Failed to create a transaction');
+      Distribution.RegHelpCreateTransaction;
+      Distribution.RegHelpRegisterNameSpace(NameSpace, Collection, Description);
+      Distribution.RegHelpRegisterHelpFile(NameSpace, Identifier, LangId, HxSFile, HxIFile);
+      if OptionChecked[joHelpHxSPlugin] then
+      begin
+        MarkOptionBegin(joHelpHxSPlugin);
+        Distribution.RegHelpPlugNameSpaceIn(NameSpace, TJclBDSInstallation(Target).Help2Manager.IdeNamespace);
+        MarkOptionEnd(joHelpHxSPlugin, Result);
+      end;
 
-        WriteLog('Registering namespace...');
-        Result := Result and Help2Manager.RegisterNameSpace(NameSpace, Collection, Description);
-        if Result then
-          WriteLog('...success')
-        else
-          WriteLog('...failed');
+      Distribution.RegHelpCommitTransaction;
 
-        WriteLog('Registering help file...');
-        Result := Result and Help2Manager.RegisterHelpFile(NameSpace, Identifier, LangId, HxSFile, HxIFile);
-        if Result then
-          WriteLog('...success')
-        else
-          WriteLog('...failed');
-    
-        if OptionChecked[joHelpHxSPlugin] then
-        begin
-          MarkOptionBegin(joHelpHxSPlugin);
-          WriteLog('Registering plugin...');
-          Result := Result and Help2Manager.PlugNameSpaceInBorlandHelp(NameSpace);
-          if Result then
-            WriteLog('...success')
-          else
-            WriteLog('...failed');
-          MarkOptionEnd(joHelpHxSPlugin, Result);
-        end;
-
-        Result := Result and Help2Manager.CommitTransaction;
-        if Result then
-          WriteLog('Transaction committed')
-        else
-          WriteLog('Failed to commit the transaction');
-      finally
-        SetCurrentDir(CurrentDir);
-      end;
+      WriteLog('...defered');
     end;
   begin
     Result := True;
@@ -1784,23 +1776,6 @@
   {$ENDIF MSWINDOWS}
 
   function MakeDemos: Boolean;
-    function MakeDemo(FileName: string): Boolean;
-    var
-      CfgFileName, Directory: string;
-    begin
-      Directory := ExtractFileDir(FileName);
-      FileName := ExtractFileName(FileName);
-      WriteLog(Format(RsBuildingMessage, [FileName]));
-      SetCurrentDir(Directory);
-      CfgFileName := ChangeFileExt(FileName, '.cfg');
-      StringToFile(CfgFileName, Format(
-        '-e%s' + AnsiLineBreak +    // Exe output dir
-        '-u%s' + AnsiLineBreak +    // Unit directories
-        '-i%s',                     // Include path
-        [Distribution.JclBinDir, FLibDir, Distribution.JclSourceDir]));
-      Result := Target.DCC32.Execute(FileName);
-      FileDelete(CfgFileName);
-    end;
   var
     SaveDir: string;
     Index, ID: Integer;
@@ -1820,7 +1795,7 @@
           if OptionCheckedById[ID] then
           begin
             MarkOptionBegin(ID);
-            DemoResult := MakeDemo(ADemoList.Strings[Index]);
+            DemoResult := CompileApplication(ADemoList.Strings[Index]);
             MarkOptionEnd(ID, DemoResult);
             Result := Result and DemoResult;
           end;
@@ -1854,7 +1829,7 @@
       {$IFDEF MSWINDOWS} and InstallExperts and InstallHelpFiles {$ENDIF MSWINDOWS}
       and InstallRepository and MakeDemos;
     if not Result then
-      Uninstall;
+      Uninstall(False);
 
     FLogLines.CloseLog;
   finally
@@ -1896,7 +1871,7 @@
     Result := True;
 end;
 
-function TJclInstallation.Uninstall: Boolean;
+function TJclInstallation.Uninstall(AUninstallHelp: Boolean): Boolean;
   procedure RemoveEnvironment;
   begin
     //ioJclEnvLibPath
@@ -2028,58 +2003,28 @@
 
     procedure UnregisterHelp2Files;
     var
-      Help2Manager: TJclHelp2Manager;
-      CurrentDir: string;
       NameSpace, Identifier, HxSFile, HxIFile: WideString;
       LangId: Integer;
     begin
       if (Target.RadToolKind <> brBorlandDevStudio) or (Target.VersionNumber < 3) then
         Exit;
-    
-      WriteLog('Unregistering help 2.0 files');
-    
+
+      WriteLog('Unregistering help 2.0 files...');
+
       // to avoid Write AV, data has to be copied in data segment
       NameSpace := Help2NameSpace;
       Identifier := Help2Identifier;
       LangId := Help2LangId;
       HxSFile := Help2HxSFile;
       HxIFile := Help2HxIFile;
-    
-      CurrentDir := GetCurrentDir;
-      if SetCurrentDir(Distribution.JclPath + 'help\') then
-      try
-        Help2Manager := TJclBDSInstallation(Target).Help2Manager;
-    
-        if Help2Manager.CreateTransaction then
-          WriteLog('Transaction created')
-        else
-          WriteLog('Failed to create a transaction');
-    
-        WriteLog('Unregistering plugin...');
-        if Help2Manager.UnPlugNameSpaceFromBorlandHelp(NameSpace) then
-          WriteLog('...success')
-        else
-          WriteLog('...failed');
-    
-        WriteLog('Unregistering help file...');
-        if Help2Manager.UnregisterHelpFile(NameSpace, Identifier, LangId) then
-          WriteLog('...success')
-        else
-          WriteLog('...failed');
-    
-        WriteLog('Unregistering namespace...');
-        if Help2Manager.UnregisterNameSpace(NameSpace) then
-          WriteLog('...success')
-        else
-          WriteLog('...failed');
-    
-        if Help2Manager.CommitTransaction then
-          WriteLog('Transaction committed')
-        else
-          WriteLog('Failed to commit the transaction');
-      finally
-        SetCurrentDir(CurrentDir);
-      end;
+
+      Distribution.RegHelpCreateTransaction;
+      Distribution.RegHelpUnPlugNameSpace(NameSpace, TJclBDSInstallation(Target).Help2Manager.IdeNamespace);
+      Distribution.RegHelpUnregisterHelpFile(NameSpace, Identifier, LangId);
+      Distribution.RegHelpUnregisterNameSpace(NameSpace);
+      Distribution.RegHelpCommitTransaction;
+
+      WriteLog('...defered');
     end;
 
   begin
@@ -2133,7 +2078,8 @@
     {$IFDEF MSWINDOWS}
     if not Target.IsTurboExplorer then
       UninstallExperts;
-    UninstallHelp;
+    if AUninstallHelp then
+      UninstallHelp;
     {$ENDIF MSWINDOWS}
     // TODO: ioJclCopyPackagesHppFiles
     UninstallRepository;
@@ -2518,6 +2464,25 @@
     WriteLog('...failed');
 end;
 
+function TJclInstallation.CompileApplication(FileName: string): Boolean;
+var
+  CfgFileName, Directory: string;
+begin
+  Directory := ExtractFileDir(FileName);
+  FileName := ExtractFileName(FileName);
+  WriteLog(Format(RsBuildingMessage, [FileName]));
+  SetCurrentDir(Directory);
+  CfgFileName := ChangeFileExt(FileName, '.cfg');
+  StringToFile(CfgFileName, Format(
+    '-e%s' + AnsiLineBreak +    // Exe output dir
+    '-n.' + AnsiLineBreak +    // Unit output dir
+    '-u%s;%s' + AnsiLineBreak + // Unit directories
+    '-i%s',                     // Include path
+    [Distribution.JclBinDir, FLibDir, Distribution.JclSourcePath, Distribution.JclSourceDir]));
+  Result := Target.DCC32.Execute(FileName);
+  FileDelete(CfgFileName);
+end;
+
 function TJclInstallation.UninstallPackage(const Name: string): Boolean;
 var
   PackageFileName: string;
@@ -2928,6 +2893,8 @@
 
   FTargetInstalls := TObjectList.Create;
   FTargetInstalls.OwnsObjects := True;
+
+  FRegHelpCommands := TStringList.Create;
 end;
 
 function TJclDistribution.CreateInstall(Target: TJclBorRADToolInstallation): Boolean;
@@ -2996,6 +2963,8 @@
 
   FTargetInstalls.Free;
 
+  FRegHelpCommands.Free;
+
   inherited Destroy;
 end;
 
@@ -3192,6 +3161,7 @@
         end;
       end;
     end;
+    RegHelpClearCommands;
     {$ENDIF MSWINDOWS}
 
     FNbEnabled := 0;
@@ -3209,7 +3179,7 @@
       begin
         if (AInstallation.CLRVersion = '') and not KeepSettings then
           AInstallation.RemoveSettings;
-        AInstallation.Uninstall;
+        AInstallation.Uninstall(False);
         Success := AInstallation.Install;
         if not Success then
           Break;
@@ -3217,6 +3187,10 @@
       end;
     end;
 
+    {$IFDEF MSWINDOWS}
+    Success := Success and RegHelpExecuteCommands(True);
+    {$ENDIF MSWINDOWS}
+
     if Assigned(GUI) then
     begin
       if Success then
@@ -3230,6 +3204,198 @@
   end;
 end;
 
+{$IFDEF MSWINDOWS}
+const
+  // Reg Helper constant (chronological order)
+  RHCreateTransaction   = 1;
+  RHRegisterNameSpace   = 2;
+  RHRegisterFile        = 3;
+  RHPlugNameSpace       = 4;
+  RHUnplugNameSpace     = 5;
+  RHUnregisterFile      = 6;
+  RHUnregisterNameSpace = 7;
+  RHCommitTransaction   = 8;
+
+procedure TJclDistribution.RegHelpClearCommands;
+begin
+  FRegHelpCommands.Clear;
+end;
+
+procedure TJclDistribution.RegHelpCommitTransaction;
+begin
+  RegHelpInternalAdd(RHCommitTransaction, 'commit', True);
+end;
+
+procedure TJclDistribution.RegHelpCreateTransaction;
+begin
+  RegHelpInternalAdd(RHCreateTransaction, 'create', True);
+end;
+
+function TJclDistribution.RegHelpExecuteCommands(DisplayErrors: Boolean): Boolean;
+var
+  Index: Integer;
+  Parameters, LogFileName, ProgramResult, Verb: string;
+  ResultLines: TJclMappedTextReader;
+  TargetInstall: TJclInstallation;
+begin
+  Result := True;
+  if FRegHelpCommands.Count = 0 then
+    Exit;
+
+  // step 1: compile the RegHelper utility
+
+  for Index := TargetInstallCount - 1 downto 0 do // from the end (newer releases ready for vista)
+  begin
+    TargetInstall := TargetInstalls[Index];
+    if TargetInstall.Enabled then
+    begin
+      Result := TargetInstall.CompileApplication(JclPath + 'install\RegHelper.dpr');
+      if not Result then
+      begin
+        if Assigned(GUI) then
+          GUI.Dialog('Failed to compile RegHelper utility', dtError, [drOK]);
+        Exit;
+      end;
+      Break;
+    end;
+  end;
+
+  // step 2: create parameters for the RegHelper utility
+
+  LogFileName := JclBinDir + '\RegHelper.log';
+  if FileExists(LogFileName) then
+    FileDelete(LogFileName);
+  Parameters := '-c -o' + LogFileName;
+  for Index := 0 to FRegHelpCommands.Count - 1 do
+  begin
+    case Integer(FRegHelpCommands.Objects[Index]) of
+      RHCreateTransaction:
+        Parameters := Format('%s Create', [Parameters]);
+      RHRegisterNameSpace:
+        Parameters := Format('%s "RegNameSpace;%s"', [Parameters, FRegHelpCommands.Strings[Index]]);
+      RHRegisterFile:
+        Parameters := Format('%s "RegHelpFile;%s"', [Parameters, FRegHelpCommands.Strings[Index]]);
+      RHPlugNameSpace:
+        Parameters := Format('%s "PlugNameSpace;%s"', [Parameters, FRegHelpCommands.Strings[Index]]);
+      RHUnplugNameSpace:
+        Parameters := Format('%s "UnplugNameSpace;%s"', [Parameters, FRegHelpCommands.Strings[Index]]);
+      RHUnregisterFile:
+        Parameters := Format('%s "UnregHelpFile;%s"', [Parameters, FRegHelpCommands.Strings[Index]]);
+      RHUnregisterNameSpace:
+        Parameters := Format('%s "UnregNameSpace;%s"', [Parameters, FRegHelpCommands.Strings[Index]]);
+      RHCommitTransaction:
+        Parameters := Format('%s Commit', [Parameters]);
+    else
+      if Assigned(GUI) then
+        GUI.Dialog('Fatal error: unknown reghelp command', dtError, [drOK]);
+      Exit;
+    end;
+  end;
+
+  // step 3:  inform the user and execute RegHelper
+
+  // simple dialog explaining user why we need credentials
+  if Assigned(GUI) and ((not IsAdministrator) or (IsWinVista or IsWinLonghorn)) then
+    GUI.Dialog(RsHTMLHelp2Credentials, dtInformation, [drOK]);
+
+  // RegHelper.exe manifest requires elevation on Vista
+  if IsAdministrator or IsWinVista or IsWinLonghorn then
+    Verb := 'open'
+  else
+    Verb := 'runas';
+
+  Result := JclShell.ShellExecAndWait(JclBinDir + '\RegHelper.exe', Parameters, Verb, SW_HIDE, JclPath + 'help\');
+
+  // step 4: examine output
+  if Result then
+  begin
+    if not DisplayErrors then
+      Exit;
+    Sleep(500); // wait possible antivirus lock
+    ResultLines := TJclMappedTextReader.Create(LogFileName);
+    try
+      while not ResultLines.Eof do
+      begin
+        ProgramResult := ResultLines.ReadLn;
+        if AnsiPos('ERROR', AnsiUpperCase(ProgramResult)) > 0 then
+        begin
+          Result := False;
+          if Assigned(GUI) then
+            GUI.Dialog('RegHelper raised an error while executing RegHelp command: ' + AnsiLineBreak + ProgramResult, dtError, [drCancel]);
+        end;
+      end;
+    finally
+      ResultLines.Free;
+    end;
+  end
+  else
+    GUI.Dialog('Fatal error: failed to execute RegHelp utility', dtError, [drOK]);
+end;
+
+procedure TJclDistribution.RegHelpInternalAdd(Command: Integer;
+  Arguments: string; DoNotRepeatCommand: Boolean);
+var
+  Index: Integer;
+  AObject: TObject;
+begin
+  Index := 0;
+  while Index <= FRegHelpCommands.Count do
+  begin
+    if Index = FRegHelpCommands.Count then
+    begin
+      FRegHelpCommands.AddObject(Arguments, TObject(Command));
+      Break;
+    end;
+    AObject := FRegHelpCommands.Objects[Index];
+    if (Integer(AObject) = Command) and
+      (DoNotRepeatCommand or (FRegHelpCommands.Strings[Index] = Arguments)) then
+      Break;
+    if Integer(AObject) > Command then
+    begin
+      FRegHelpCommands.InsertObject(Index, Arguments, TObject(Command));
+      Break;
+    end;
+    Inc(Index);
+  end;
+end;
+
+procedure TJclDistribution.RegHelpPlugNameSpaceIn(const SourceNameSpace,
+  TargetNameSpace: WideString);
+begin
+  RegHelpInternalAdd(RHPlugNameSpace, Format('%s;%s', [SourceNameSpace, TargetNameSpace]), False);
+end;
+
+procedure TJclDistribution.RegHelpRegisterHelpFile(const NameSpace,
+  Identifier: WideString; const LangId: Integer; const HxSFile,
+  HxIFile: WideString);
+begin
+  RegHelpInternalAdd(RHRegisterFile, Format('%s;%s;%d;%s;%s', [NameSpace, Identifier, LangId, HxSFile, HxIFile]), False);
+end;
+
+procedure TJclDistribution.RegHelpRegisterNameSpace(const Name, Collection,
+  Description: WideString);
+begin
+  RegHelpInternalAdd(RHRegisterNameSpace, Format('%s;%s;%s', [Name, Collection, Description]), False);
+end;
+
+procedure TJclDistribution.RegHelpUnPlugNameSpace(const SourceNameSpace,
+  TargetNameSpace: WideString);
+begin
+  RegHelpInternalAdd(RHUnplugNameSpace, Format('%s;%s', [SourceNameSpace, TargetNameSpace]), False);
+end;
+
+procedure TJclDistribution.RegHelpUnregisterHelpFile(const NameSpace,
+  Identifier: WideString; const LangId: Integer);
+begin
+  RegHelpInternalAdd(RHUnregisterFile, Format('%s;%s;%d', [NameSpace, Identifier, LangId]), False);
+end;
+
+procedure TJclDistribution.RegHelpUnregisterNameSpace(const Name: WideString);
+begin
+  RegHelpInternalAdd(RHUnregisterNameSpace, Name, False);
+end;
+{$ENDIF MSWINDOWS}
+
 procedure TJclDistribution.Uninstall;
 var
   I: Integer;
@@ -3247,14 +3413,22 @@
     if Assigned(GUI) then
       GUI.Status := 'Initializing JCL uninstallation process';
 
+    {$IFDEF MSWINDOWS}
+    RegHelpClearCommands;
+    {$ENDIF MSWINDOWS}
+
     Success := True;
     for I := 0 to TargetInstallCount - 1 do
     begin
       AInstallation := TargetInstalls[I];
-      if AInstallation.Enabled then
-        Success := Success and AInstallation.RemoveSettings and AInstallation.Uninstall;
+      if AInstallation.Enabled and (not AInstallation.RemoveSettings) or not AInstallation.Uninstall(True) then
+        Success := False;
     end;
 
+    {$IFDEF MSWINDOWS}
+    RegHelpExecuteCommands(False);
+    {$ENDIF MSWINDOWS}
+
     if Assigned(GUI) then
     begin
       if Success then

Added: trunk/jcl/install/RegHelper.dof
===================================================================
--- trunk/jcl/install/RegHelper.dof	                        (rev 0)
+++ trunk/jcl/install/RegHelper.dof	2007-04-18 10:41:06 UTC (rev 1995)
@@ -0,0 +1,4 @@
+[Directories]
+OutputDir=..\bin
+UnitOutputDir=.
+SearchPath=..\source;..\source\common;..\source\windows


Property changes on: trunk/jcl/install/RegHelper.dof
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/jcl/install/RegHelper.dpr
===================================================================
--- trunk/jcl/install/RegHelper.dpr	                        (rev 0)
+++ trunk/jcl/install/RegHelper.dpr	2007-04-18 10:41:06 UTC (rev 1995)
@@ -0,0 +1,331 @@
+{**************************************************************************************************}
+{                                                                                                  }
+{ Project JEDI Code Library (JCL) extension                                                        }
+{                                                                                                  }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the    }
+{ License at http://www.mozilla.org/MPL/                                                           }
+{                                                                                                  }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF   }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights  }
+{ and limitations under the License.                                                               }
+{                                                                                                  }
+{ The Original Code is RegHelper.dpr.                                                              }
+{                                                                                                  }
+{ The Initial Developer of the Original Code is Florent Ouchet.                                    }
+{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All Rights Reserved.     }
+{                                                                                                  }
+{ Contributor(s):                                                                                  }
+{                                                                                                  }
+{ Last modified: $Date$                          }
+{                                                                                                  }
+{**************************************************************************************************}
+
+program RegHelper;
+
+{$APPTYPE CONSOLE}
+
+uses
+  SysUtils, Windows, ActiveX,
+  JclAnsiStrings, JclBorlandTools, JclSysUtils;
+
+{$R VistaElevate.res}
+{$R RegHelper.res}
+
+type
+  TCommandFunc = function (const Parameters: array of string): Boolean;
+  TCommandRec = record
+    Name: string;
+    ParamCount: Integer;
+    Func: TCommandFunc;
+    Description: string;
+  end;
+
+var
+  Help2Manager: TJclHelp2Manager;
+  ShowCopyright: Boolean = True;
+  ResultFileName: string = '';
+  RegHelperOutput: TEXT;
+  DiscardFollowingCommand: Boolean = False;
+
+function CommandCreate(const Parameters: array of string): Boolean;
+begin
+  Result := Help2Manager.CreateTransaction;
+end;
+
+function CommandCommit(const Parameters: array of string): Boolean;
+begin
+  Result := Help2Manager.CommitTransaction;
+end;
+
+function CommandRegNameSpace(const Parameters: array of string): Boolean;
+var
+  NameSpace, Collection, Description: WideString;
+begin
+  NameSpace := Parameters[0];
+  Collection := Parameters[1];
+  Description := Parameters[2];
+  Result := Help2Manager.RegisterNameSpace(NameSpace, Collection, Description);
+end;
+
+function CommandUnRegNameSpace(const Parameters: array of string): Boolean;
+var
+  NameSpace: WideString;
+begin
+  NameSpace := Parameters[0];
+  Result := Help2Manager.UnregisterNameSpace(NameSpace);
+end;
+
+function CommandRegHelpFile(const Parameters: array of string): Boolean;
+var
+  NameSpace, Identifier, HxSFile, HxIFile: WideString;
+  LangId, Code: Integer;
+begin
+  Val(Parameters[2], LangId, Code);
+  Result := Code = 0;
+  if Result then
+  begin
+    NameSpace := Parameters[0];
+    Identifier := Parameters[1];
+    HxSFile := Parameters[3];
+    HxIFile := Parameters[4];
+    Result := Help2Manager.RegisterHelpFile(NameSpace, Identifier, LangId, HxSFile, HxIFile);
+  end;
+end;
+
+function CommandUnregHelpFile(const Parameters: array of string): Boolean;
+var
+  NameSpace, Identifier: WideString;
+  LangId, Code: Integer;
+begin
+  Val(Parameters[2], LangId, Code);
+  Result := Code = 0;
+  if Result then
+  begin
+    NameSpace := Parameters[0];
+    Identifier := Parameters[1];
+    Result := Help2Manager.UnregisterHelpFile(NameSpace, Identifier, LangId);
+  end;
+end;
+
+function CommandPlugNameSpace(const Parameters: array of string): Boolean;
+var
+  Source, Target: WideString;
+begin
+  Source := Parameters[0];
+  Target := Parameters[1];
+  Result := Help2Manager.PlugNameSpaceIn(Source, Target);
+end;
+
+function CommandUnplugNameSpace(const Parameters: array of string): Boolean;
+var
+  Source, Target: WideString;
+begin
+  Source := Parameters[0];
+  Target := Parameters[1];
+  Result := Help2Manager.UnPlugNameSpace(Source, Target);
+end;
+
+const
+  CommandRecs: array [0..7] of TCommandRec =
+    ( (Name: 'Create'; ParamCount: 0; Func: CommandCreate;
+       Description: '  %s' + AnsiLineBreak +
+       '    Create a new transaction'),
+      (Name: 'Commit'; ParamCount: 0; Func: CommandCommit;
+       Description: '  %s' + AnsiLineBreak +
+       '    Commit previous comands; commands are not applied until committed'),
+
+      (Name: 'RegNameSpace'; ParamCount: 3; Func: CommandRegNameSpace;
+       Description: '  %s;<NameSpace>;<Collection>;<Description>' + AnsiLineBreak +
+       '    Register a new namespace named <NameSpace> with description set to' + AnsiLineBreak +
+       '    <Description>. The <Collection> HxC file contains namespace informations.'),
+
+      (Name: 'UnregNameSpace'; ParamCount: 1; Func: CommandUnRegNameSpace;
+       Description: '  %s;<NameSpace>' + AnsiLineBreak +
+       '    Unregister namespace <NameSpace>'),
+
+      (Name: 'RegHelpFile'; ParamCount: 5; Func: CommandRegHelpFile;
+       Description: '  %s;<NameSpace>;<Identifier>;<LangId>;<HxSFile>;<HxIFile>' + AnsiLineBreak +
+       '    Register a new help file <Identifier> for namespace <NameSpace>' + AnsiLineBreak +
+       '    The <HxSFile> contains the content for this file in language <LangId>' + AnsiLineBreak +
+       '    Its index is contained in <HxIFile>'),
+
+      (Name: 'UnregHelpFile'; ParamCount: 3; Func: CommandUnregHelpFile;
+       Description: '  %s;<NameSpace>;<Identifier>;<LangId>' + AnsiLineBreak +
+       '    Unregister help file <Identifier> with language <LangId> from namespace' + AnsiLineBreak +
+       '    <NameSpace>'),
+
+      (Name: 'PlugNameSpace'; ParamCount: 2; Func: CommandPlugNameSpace;
+       Description: '  %s;<Source>;<Target>' + AnsiLineBreak +
+       '    Plug namespace <Source> in namespace <Target>'),
+
+      (Name: 'UnplugNameSpace'; ParamCount: 2; Func: CommandUnplugNameSpace;
+       Description: '  %s;<Source>;<Target>' + AnsiLineBreak +
+       '    Unplug namespace <Source> from namespace <Target>')
+    );
+
+type
+  TCommand = record
+    Func: TCommandFunc;
+    FuncName: string;
+    Parameters: array of string;
+  end;
+
+var
+  Commands: array of TCommand;
+
+procedure DisplayCopyright;
+begin
+  WriteLn(RegHelperOutput,'HTML Help 2.0 registration helper');
+  WriteLn(RegHelperOutput,'Copyright (c) 2007 Project Jedi');
+  WriteLn(RegHelperOutput,'');
+end;
+
+procedure DisplayHelp;
+var
+  Index: Integer;
+begin
+  if ShowCopyright then
+    DisplayCopyright;
+    
+  WriteLn(RegHelperOutput,'Usage ', ExtractFileName(ParamStr(0)), ' <options> <command1> <command2> ...');
+  WriteLn(RegHelperOutput,'Commands are always sequencially executed');
+  WriteLn(RegHelperOutput,'Commands cannot contain spaces or use double quotes: "<command 1>"');
+  WriteLn(RegHelperOutput,'');
+  WriteLn(RegHelperOutput,'Valid options are:');
+  WriteLn(RegHelperOutput,'  -c           do not output copyright');
+  WriteLn(RegHelperOutput,'  -o<FileName> filename to store output (defaults to stdout)');
+  WriteLn(RegHelperOutput,'  -d           discard following commands on fail');
+  WriteLn(RegHelperOutput,'Valid commands are:');
+
+  for Index := Low(CommandRecs) to high(CommandRecs) do
+  begin
+    WriteLn(RegHelperOutput,'');
+    WriteLn(RegHelperOutput,Format(CommandRecs[Index].Description, [CommandRecs[Index].Name]));
+  end;
+end;
+
+function ParseArguments: Boolean;
+  function ParseArgument(const Argument: string): Boolean;
+  var
+    FuncName, Parameters: string;
+    IndexCommand, IndexParam, ParamCount: Integer;
+  begin
+    if (Length(Argument) > 0) and (Argument[1] = '-') then
+    begin
+      // option
+      Result := True;
+      if AnsiSameText('-o', Copy(Argument, 1, 2)) then
+      begin
+        ResultFileName := Copy(Argument, 3, Length(Argument) - 2);
+        Assign(RegHelperOutput, ResultFileName);
+        Rewrite(RegHelperOutput);
+      end
+      else
+      if AnsiSameText('-c', Argument) then
+        ShowCopyright := False
+      else
+      if AnsiSameText('-d', Argument) then
+        DiscardFollowingCommand := True
+      else
+        Result := False;
+    end
+    else
+    begin
+      // command
+      Parameters := Argument;
+      FuncName := ListGetItem(Parameters, ';', 0);
+      ListDelItem(Parameters, ';', 0);
+      Result := False;
+      for IndexCommand := Low(CommandRecs) to High(CommandRecs) do
+        if AnsiSameText(FuncName, CommandRecs[IndexCommand].Name) then
+      begin
+        ParamCount := ListItemCount(Parameters, ';');
+        if ParamCount = CommandRecs[IndexCommand].ParamCount then
+        begin
+          SetLength(Commands, Length(Commands) + 1);
+          Commands[High(Commands)].Func := CommandRecs[IndexCommand].Func;
+          Commands[High(Commands)].FuncName := FuncName;
+          SetLength(Commands[High(Commands)].Parameters, ParamCount);
+          for IndexParam := 0 to ParamCount - 1 do
+            Commands[High(Commands)].Parameters[IndexParam] := ListGetItem(Parameters, ';', IndexParam);
+          Result := True;
+          Break;
+        end
+        else
+        begin
+          WriteLn(RegHelperOutput,'Error: Number of parameter is invalid for command: ', Argument);
+          Result := False;
+          Exit;
+        end;
+      end;
+    end;
+  end;
+var
+  Index: Integer;
+begin
+  Result := False;
+  for Index := 1 to ParamCount do
+  begin
+    Result := ParseArgument(ParamStr(Index));
+    if not Result then
+      Exit;
+  end;
+end;
+
+procedure ExecuteArguments;
+var
+  Index: Integer;
+begin
+  if ShowCopyright then
+    DisplayCopyright;
+
+  for Index := Low(Commands) to High(Commands) do
+  begin
+    if Commands[Index].Func(Commands[Index].Parameters) then
+      WriteLn(RegHelperOutput, 'Success ', Commands[Index].FuncName)
+    else
+    begin
+      WriteLn(RegHelperOutput,'Error executing command ', Commands[Index].FuncName);
+      if DiscardFollowingCommand then
+        Exit;
+    end;
+  end;
+end;
+
+procedure FinalizeArguments;
+var
+  Index: Integer;
+begin
+  for Index := Low(Commands) to High(Commands) do
+    SetLength(Commands[Index].Parameters, 0);
+  SetLength(Commands, 0);
+end;
+
+begin
+  try
+    CoInitialize(nil); // Help2 interfaces are COM
+    try
+      Help2Manager := TJclHelp2Manager.Create;
+      try
+        Assign(RegHelperOutput, ''); // stdout
+        Rewrite(RegHelperOutput);
+        if ParseArguments then
+          ExecuteArguments
+        else
+          DisplayHelp;
+      finally
+        FinalizeArguments;
+        Help2Manager.Free;
+        if ResultFileName <> '' then
+          Close(RegHelperOutput);
+      end;
+    finally
+      CoUninitialize;
+    end;
+
+  except
+    on E:Exception do
+      Writeln(E.Classname, ': ', E.Message);
+  end;
+end.


Property changes on: trunk/jcl/install/RegHelper.dpr
___________________________________________________________________
Name: svn:keywords
   + URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Name: svn:eol-style
   + native

Added: trunk/jcl/install/RegHelper.rc
===================================================================
--- trunk/jcl/install/RegHelper.rc	                        (rev 0)
+++ trunk/jcl/install/RegHelper.rc	2007-04-18 10:41:06 UTC (rev 1995)
@@ -0,0 +1,23 @@
+
+1 VERSIONINFO
+FILEVERSION 2,0,0,2552
+PRODUCTVERSION 2,0,0,2552
+FILEOS 0x40004
+FILETYPE 0x1
+{
+BLOCK "StringFileInfo"
+{
+	BLOCK "040904B0"
+	{
+		VALUE "CompanyName", "Project Jedi\0"
+		VALUE "FileDescription", "Help Registration Helper\0"
+		VALUE "FileVersion", "2.0.0.2552\0"
+		VALUE "InternalName", "RegHelper.exe\0"
+		VALUE "LegalCopyright", "Copyright (C) 2007 Project JEDI\0"
+		VALUE "OriginalFilename", "RegHelper.exe\0"
+		VALUE "ProductName", "Jedi Code Library\0"
+		VALUE "ProductVersion", "2.0.0.2552\0"
+	}
+}
+
+}


Property changes on: trunk/jcl/install/RegHelper.rc
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/jcl/install/RegHelper.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/install/RegHelper.res
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/jcl/install/VistaElevate.manifest
===================================================================
--- trunk/jcl/install/VistaElevate.manifest	                        (rev 0)
+++ trunk/jcl/install/VistaElevate.manifest	2007-04-18 10:41:06 UTC (rev 1995)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity
+    type="win32"
+    name="Jedi Code Library"
+    version="2.0.0.2552"
+    processorArchitecture="*"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="requireAdministrator"
+          uiAccess="false"/>
+        </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>


Property changes on: trunk/jcl/install/VistaElevate.manifest
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/jcl/install/VistaElevate.rc
===================================================================
--- trunk/jcl/install/VistaElevate.rc	                        (rev 0)
+++ trunk/jcl/install/VistaElevate.rc	2007-04-18 10:41:06 UTC (rev 1995)
@@ -0,0 +1,7 @@
+/****************************************************************************************************
+
+  VistaElevate.rc
+
+****************************************************************************************************/
+
+1 24 "VistaElevate.manifest"


Property changes on: trunk/jcl/install/VistaElevate.rc
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/jcl/install/VistaElevate.res
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/install/VistaElevate.res
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [1994] trunk/jcl/source/windows/JclShell.pas

From: <ou...@us...> - 2007-04-18 10:40:38

Revision: 1994
          http://svn.sourceforge.net/jcl/?rev=1994&view=rev
Author:   outchy
Date:     2007-04-18 03:40:36 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
New argument for ShellExecAndWait: working directory

Modified Paths:
--------------
    trunk/jcl/source/windows/JclShell.pas

Modified: trunk/jcl/source/windows/JclShell.pas
===================================================================
--- trunk/jcl/source/windows/JclShell.pas	2007-04-18 10:40:13 UTC (rev 1993)
+++ trunk/jcl/source/windows/JclShell.pas	2007-04-18 10:40:36 UTC (rev 1994)
@@ -168,7 +168,7 @@
   CmdShow: Integer = SW_SHOWNORMAL): Boolean;
 function ShellExec(Wnd: Integer; const Operation, FileName, Parameters, Directory: string; ShowCommand: Integer): Boolean;
 function ShellExecAndWait(const FileName: string; const Parameters: string = ''; const Verb: string = '';
-  CmdShow: Integer = SW_SHOWNORMAL): Boolean;
+  CmdShow: Integer = SW_SHOWNORMAL; const Directory: string = ''): Boolean;
 
 function ShellOpenAs(const FileName: string): Boolean;
 function ShellRasDial(const EntryName: string): Boolean;
@@ -1353,7 +1353,7 @@
 end;
 
 function ShellExecAndWait(const FileName: string; const Parameters: string;
-  const Verb: string; CmdShow: Integer): Boolean;
+  const Verb: string; CmdShow: Integer; const Directory: string): Boolean;
 var
   Sei: TShellExecuteInfo;
   Res: LongBool;
@@ -1367,6 +1367,7 @@
   Sei.lpParameters := PCharOrNil(Parameters);
   Sei.lpVerb := PCharOrNil(Verb);
   Sei.nShow := CmdShow;
+  Sei.lpDirectory := PCharOrNil(Directory);
   Result := ShellExecuteEx(@Sei);
   if Result then
   begin


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [1993] trunk/jcl/source/common/JclBorlandTools.pas

From: <ou...@us...> - 2007-04-18 10:40:15

Revision: 1993
          http://svn.sourceforge.net/jcl/?rev=1993&view=rev
Author:   outchy
Date:     2007-04-18 03:40:13 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
TJclHelp2Manager: new property to get IDE help namespace
CleanPackageCache: avoiding exception if key doesn't exist

Modified Paths:
--------------
    trunk/jcl/source/common/JclBorlandTools.pas

Modified: trunk/jcl/source/common/JclBorlandTools.pas
===================================================================
--- trunk/jcl/source/common/JclBorlandTools.pas	2007-04-18 10:35:43 UTC (rev 1992)
+++ trunk/jcl/source/common/JclBorlandTools.pas	2007-04-18 10:40:13 UTC (rev 1993)
@@ -246,6 +246,7 @@
     FHxRegisterSession: IHxRegisterSession;
     FHxRegister: IHxRegister;
     FHxPlugin: IHxPlugIn;
+    FIdeNameSpace: WideString;
     function RequireObject(HelpObjects: TJclHelp2Objects): Boolean;
     function GetHxPlugin: IHxPlugin;
     function GetHxRegister: IHxRegister;
@@ -272,6 +273,7 @@
     property HxRegisterSession: IHxRegisterSession read GetHxRegisterSession;
     property HxRegister: IHxRegister read GetHxRegister;
     property HxPlugin: IHxPlugin read GetHxPlugin;
+    property IdeNamespace: WideString read FIdeNameSpace;
   end;
   {$ENDIF MSWINDOWS}
 
@@ -1678,6 +1680,10 @@
   FHxRegisterSession := nil;
   FHxRegister := nil;
   FHxPlugin := nil;
+  if Assigned(Installation) then
+    FIdeNameSpace := Format(Help2BorlandNameSpace, [Installation.IDEVersionNumber])
+  else
+    FIdeNameSpace := '';
 end;
 
 constructor TJclHelp2Manager.Create;
@@ -1758,7 +1764,7 @@
   const NameSpace: WideString): Boolean;
 begin
   Result := Assigned(FInstallation) and (Installation.RadToolKind = brBorlandDevStudio) and
-    PlugNameSpaceIn(NameSpace, Format(Help2BorlandNameSpace, [Installation.IDEVersionNumber]));
+    PlugNameSpaceIn(NameSpace, IdeNamespace);
 end;
 
 function TJclHelp2Manager.RegisterHelpFile(const NameSpace, Identifier: WideString;
@@ -1847,7 +1853,7 @@
 function TJclHelp2Manager.UnPlugNameSpaceFromBorlandHelp(const NameSpace: WideString): Boolean;
 begin
   Result := Assigned(FInstallation) and (Installation.RadToolKind = brBorlandDevStudio) and
-    UnPlugNameSpace(NameSpace, Format(Help2BorlandNameSpace, [Installation.IDEVersionNumber]));
+    UnPlugNameSpace(NameSpace, IdeNamespace);
 end;
 
 function TJclHelp2Manager.UnregisterHelpFile(const NameSpace, Identifier: WideString;
@@ -4615,7 +4621,7 @@
 
 function TJclBDSInstallation.CleanPackageCache(const BinaryFileName: string): Boolean;
 var
-  FileName: string;
+  FileName, KeyName: string;
 begin
   Result := True;
 
@@ -4625,9 +4631,10 @@
 
     try
       OutputString(Format(RsCleaningPackageCache, [FileName]));
+      KeyName := PathAddSeparator(ConfigDataLocation) + PackageCacheKeyName + '\' + FileName;
 
-      Result :=  RegDeleteKeyTree(HKCU, PathAddSeparator(ConfigDataLocation) +
-        PackageCacheKeyName + '\' + FileName);
+      if RegKeyExists(HKCU, KeyName) then
+        Result := RegDeleteKeyTree(HKCU, KeyName);
 
       if Result then
         OutputString(RsCleaningOk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [1992] trunk/jcl/lib/d11

From: <ou...@us...> - 2007-04-18 10:35:45

Revision: 1992
          http://svn.sourceforge.net/jcl/?rev=1992&view=rev
Author:   outchy
Date:     2007-04-18 03:35:43 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
native eol-styles

Modified Paths:
--------------
    trunk/jcl/lib/d11/debug/dirinfo.txt

Property Changed:
----------------
    trunk/jcl/lib/d11/debug/dirinfo.txt
    trunk/jcl/lib/d11/dirinfo.txt

Modified: trunk/jcl/lib/d11/debug/dirinfo.txt
===================================================================
--- trunk/jcl/lib/d11/debug/dirinfo.txt	2007-04-18 10:32:46 UTC (rev 1991)
+++ trunk/jcl/lib/d11/debug/dirinfo.txt	2007-04-18 10:35:43 UTC (rev 1992)
@@ -1 +1 @@
-This directory is intended as a common place for debug .dcu files of Delphi 11 packages.
+This directory is intended as a common place for debug .dcu files of Delphi 11 packages.


Property changes on: trunk/jcl/lib/d11/debug/dirinfo.txt
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: trunk/jcl/lib/d11/dirinfo.txt
___________________________________________________________________
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [1991] trunk/jcl/lib/d11

From: <ou...@us...> - 2007-04-18 10:32:50

Revision: 1991
          http://svn.sourceforge.net/jcl/?rev=1991&view=rev
Author:   outchy
Date:     2007-04-18 03:32:46 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
Added standard ignore masks

Property Changed:
----------------
    trunk/jcl/lib/d11/
    trunk/jcl/lib/d11/debug/


Property changes on: trunk/jcl/lib/d11
___________________________________________________________________
Name: bugtraq:url
   + http://homepages.codegear.com/jedi/issuetracker/view.php?id=%BUGID%
Name: bugtraq:message
   + (Mantis #%BUGID%)
Name: svn:ignore
   + *.dcuil
*.dcu
*.ddp
*.bpl
*.dcp
*.lib
*.res
*.bpi

Name: bugtraq:logregex
   + [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)


Property changes on: trunk/jcl/lib/d11/debug
___________________________________________________________________
Name: bugtraq:url
   + http://homepages.codegear.com/jedi/issuetracker/view.php?id=%BUGID%
Name: bugtraq:message
   + (Mantis #%BUGID%)
Name: svn:ignore
   + *.dcuil
*.dcu
*.ddp
*.bpl
*.dcp
*.lib
*.res
*.bpi

Name: bugtraq:logregex
   + [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [1990] trunk/jcl/source/common/JclSysUtils.pas

From: <mar...@us...> - 2007-04-17 06:53:47

Revision: 1990
          http://svn.sourceforge.net/jcl/?rev=1990&view=rev
Author:   marquardt
Date:     2007-04-16 23:53:35 -0700 (Mon, 16 Apr 2007)

Log Message:
-----------
bugfix in finalization, style cleaning

Modified Paths:
--------------
    trunk/jcl/source/common/JclSysUtils.pas

Modified: trunk/jcl/source/common/JclSysUtils.pas
===================================================================
--- trunk/jcl/source/common/JclSysUtils.pas	2007-04-16 20:16:59 UTC (rev 1989)
+++ trunk/jcl/source/common/JclSysUtils.pas	2007-04-17 06:53:35 UTC (rev 1990)
@@ -402,6 +402,7 @@
   {$ENDIF FPC}
 
 {$IFNDEF CLR}
+
 const
   ABORT_EXIT_CODE = {$IFDEF MSWINDOWS} ERROR_CANCELLED {$ELSE} 1223 {$ENDIF};
 
@@ -450,6 +451,7 @@
   {$IFDEF LINUX}
   ListSeparator = ':';
   {$ENDIF LINUX}
+
 // functions to handle items in a separated list of items
 // add items at the end
 procedure ListAddItems(var List: string; const Separator, Items: string);
@@ -501,7 +503,6 @@
   end;
 
 {$IFNDEF CLR}
-
 type
   TJclSimpleLog = class (TObject)
   private
@@ -523,7 +524,6 @@
     property LogFileName: string read FLogFileName;
     property LogOpen: Boolean read GetLogOpen;
   end;
-
 {$ENDIF ~CLR}
 
 {$IFDEF UNITVERSIONING}
@@ -557,10 +557,10 @@
   {$ENDIF MSWINDOWS}
   {$ENDIF CLR}
   Contnrs,
-  JclResources, JclStrings, JclMath,
-  JclSysInfo, JclFileUtils;
+  JclFileUtils, JclMath, JclResources, JclStrings, JclSysInfo;
 
 {$IFNDEF CLR}
+
 // Pointer manipulation
 procedure GetAndFillMem(var P: Pointer; const Size: Integer; const Value: Byte);
 begin
@@ -686,7 +686,7 @@
     Inc(ProtectSize, PageSize);
 
   if mprotect(Pointer(AlignedAddress), ProtectSize,
-       PROT_READ or PROT_WRITE or PROT_EXEC) = 0 then // obtain write access
+    PROT_READ or PROT_WRITE or PROT_EXEC) = 0 then // obtain write access
   begin
     try
       Move(Buffer^, BaseAddress^, Size); // replace code
@@ -804,8 +804,9 @@
 var
   I: Integer;
 begin
-  for I := FItems.Count - 1 downto 0 do FreeItem(I);
-    FItems.Free;
+  for I := FItems.Count - 1 downto 0 do
+    FreeItem(I);
+  FItems.Free;
   inherited Destroy;
 end;
 
@@ -1089,7 +1090,6 @@
   Result := SharedFreeMem(p);
 end;
 
-
 procedure FinalizeMMFHandleList;
 var
   NextItem, Iterate: PMMFHandleList;
@@ -1399,6 +1399,7 @@
 begin
   Result := CompareText(PAnsiString(Item1)^, PAnsiString(Item2)^);
 end;
+
 {$ENDIF ~CLR}
 
 //=== Object lists ===========================================================
@@ -1437,9 +1438,10 @@
   end;
 end;
 
-{$IFNDEF CLR}
 //=== { TJclReferenceMemoryStream } ==========================================
 
+{$IFNDEF CLR}
+
 constructor TJclReferenceMemoryStream.Create(const Ptr: Pointer; Size: Longint);
 begin
   {$IFDEF MSWINDOWS}
@@ -1453,6 +1455,7 @@
 begin
   raise EJclError.CreateRes(@RsCannotWriteRefStream);
 end;
+
 {$ENDIF ~CLR}
 
 //=== { TAutoPtr } ===========================================================
@@ -1476,8 +1479,6 @@
   Result := TAutoPtr.Create(Value);
 end;
 
-{ TAutoPtr }
-
 constructor TAutoPtr.Create(AValue: TObject);
 begin
   inherited Create;
@@ -1597,6 +1598,7 @@
 {$ENDIF SUPPORTS_VARIANT}
 
 {$IFNDEF CLR}
+
 //=== Classes information and manipulation ===================================
 // Virtual Methods
 // Helper method
@@ -1850,6 +1852,7 @@
     Result := nil;
   end;
 end;
+
 {$ENDIF ~CLR}
 
 //=== Numeric formatting routines ============================================
@@ -1873,15 +1876,15 @@
   GetMantisseExponent: similar to AsString, but returns the Exponent separately as an integer
 }
 const
-{$IFDEF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_EXTENDED_PRECISION}
   BinaryPrecision = 64;
-{$ENDIF MATH_EXTENDED_PRECISION}
-{$IFDEF MATH_DOUBLE_PRECISION}
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
   BinaryPrecision = 53;
-{$ENDIF MATH_DOUBLE_PRECISION}
-{$IFDEF MATH_SINGLE_PRECISION}
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_SINGLE_PRECISION}
   BinaryPrecision = 24;
-{$ENDIF MATH_SINGLE_PRECISION}
+  {$ENDIF MATH_SINGLE_PRECISION}
 
 constructor TJclNumericFormat.Create;
 begin
@@ -2207,7 +2210,8 @@
     Dec(I);
     Inc(Digits);
     Inc(Chars);
-    if (Remainder = 0) and (SpacePadding or (Chars >= Width)) then Break;
+    if (Remainder = 0) and (SpacePadding or (Chars >= Width)) then
+      Break;
     if (Digits = DigitBlockSize) then
     begin
       Inc(Chars);
@@ -2472,13 +2476,14 @@
   StartupInfo.hStdInput := GetStdHandle(STD_INPUT_HANDLE);
   StartupInfo.hStdOutput := PipeWrite;
   StartupInfo.hStdError := PipeWrite;
-  if CreateProcess(nil, PChar(CommandLine), nil, nil, True, NORMAL_PRIORITY_CLASS, nil, nil, StartupInfo,
-    ProcessInfo) then
+  if CreateProcess(nil, PChar(CommandLine), nil, nil, True, NORMAL_PRIORITY_CLASS,
+    nil, nil, StartupInfo, ProcessInfo) then
   begin
     CloseHandle(PipeWrite);
     if AbortPtr <> nil then
       AbortPtr^ := False;
-    while ((AbortPtr = nil) or not AbortPtr^) and ReadFile(PipeRead, Buffer, BufferSize, PipeBytesRead, nil) and (PipeBytesRead > 0) do
+    while ((AbortPtr = nil) or not AbortPtr^) and
+      ReadFile(PipeRead, Buffer, BufferSize, PipeBytesRead, nil) and (PipeBytesRead > 0) do
       ProcessBuffer;
     if (AbortPtr <> nil) and AbortPtr^ then
       TerminateProcess(ProcessInfo.hProcess, Cardinal(ABORT_EXIT_CODE));
@@ -2603,6 +2608,7 @@
 {$ENDIF ~CLR}
 
 {$IFNDEF CLR}
+
 //=== Loading of modules (DLLs) ==============================================
 
 function LoadModule(var Module: TModuleHandle; FileName: string): Boolean;
@@ -2616,7 +2622,8 @@
 {$IFDEF UNIX}
 begin
   if Module = INVALID_MODULEHANDLE_VALUE then
-    Module := dlopen(PChar(FileName), RTLD_NOW);   Result := Module <> INVALID_MODULEHANDLE_VALUE;
+    Module := dlopen(PChar(FileName), RTLD_NOW);
+  Result := Module <> INVALID_MODULEHANDLE_VALUE;
 end;
 {$ENDIF UNIX}
 
@@ -2631,7 +2638,8 @@
 {$IFDEF UNIX}
 begin
   if Module = INVALID_MODULEHANDLE_VALUE then
-    Module := dlopen(PChar(FileName), Flags);   Result := Module <> INVALID_MODULEHANDLE_VALUE;
+    Module := dlopen(PChar(FileName), Flags);
+  Result := Module <> INVALID_MODULEHANDLE_VALUE;
 end;
 {$ENDIF UNIX}
 
@@ -2646,7 +2654,8 @@
 {$IFDEF UNIX}
 begin
   if Module <> INVALID_MODULEHANDLE_VALUE then
-    dlclose(Pointer(Module));   Module := INVALID_MODULEHANDLE_VALUE;
+    dlclose(Pointer(Module));
+  Module := INVALID_MODULEHANDLE_VALUE;
 end;
 {$ENDIF UNIX}
 
@@ -2679,7 +2688,8 @@
 begin
   Result := nil;
   if Module <> INVALID_MODULEHANDLE_VALUE then
-    Result := dlsym(Module, PChar(SymbolName));   Accu := Accu and (Result <> nil);
+    Result := dlsym(Module, PChar(SymbolName));
+  Accu := Accu and (Result <> nil);
 end;
 {$ENDIF UNIX}
 
@@ -2702,6 +2712,7 @@
   if Result then
     Move(Buffer, Sym^, Size);
 end;
+
 {$ENDIF ~CLR}
 
 //=== Conversion Utilities ===================================================
@@ -2798,7 +2809,7 @@
 function JclStringToGUID(const S: string): TGUID;
 begin
   if (Length(S) <> 38) or (S[1] <> '{') or (S[10] <> '-') or (S[15] <> '-') or
-      (S[20] <> '-') or (S[25] <> '-') or (S[38] <> '}') then
+    (S[20] <> '-') or (S[25] <> '-') or (S[38] <> '}') then
     {$IFDEF CLR}
     raise EJclConversionError.CreateFmt(RsInvalidGUIDString, [S]);
     {$ELSE}
@@ -3004,9 +3015,10 @@
   end;
 end;
 
+{$IFNDEF CLR}
+
 //=== { TJclIntfCriticalSection } ============================================
 
-{$IFNDEF CLR}
 constructor TJclIntfCriticalSection.Create;
 begin
   inherited Create;
@@ -3046,23 +3058,6 @@
   INVALID_HANDLE_VALUE = 0;
 {$ENDIF LINUX}
 
-procedure TJclSimpleLog.ClearLog;
-begin
-  CloseLog;
-  FLogFileHandle := FileCreate(FLogFileName);
-  FLogWasEmpty := True;
-end;
-
-procedure TJclSimpleLog.CloseLog;
-begin
-  if LogOpen then
-  begin
-    FileClose(FLogFileHandle);
-    FLogFileHandle := INVALID_HANDLE_VALUE;
-    FLogWasEmpty := False;
-  end;
-end;
-
 constructor TJclSimpleLog.Create(const ALogFileName: string);
 begin
   if ALogFileName = '' then
@@ -3074,16 +3069,33 @@
 
 function TJclSimpleLog.CreateDefaultFileName: string;
 begin
-  Result := PathExtractFileDirFixed(ParamStr(0))
-    + PathExtractFileNameNoExt(ParamStr(0)) + '_Err.log';
+  Result := PathExtractFileDirFixed(ParamStr(0)) +
+    PathExtractFileNameNoExt(ParamStr(0)) + '_Err.log';
 end;
 
 destructor TJclSimpleLog.Destroy;
 begin
   CloseLog;
-  inherited;
+  inherited Destroy;
 end;
 
+procedure TJclSimpleLog.ClearLog;
+begin
+  CloseLog;
+  FLogFileHandle := FileCreate(FLogFileName);
+  FLogWasEmpty := True;
+end;
+
+procedure TJclSimpleLog.CloseLog;
+begin
+  if LogOpen then
+  begin
+    FileClose(FLogFileHandle);
+    FLogFileHandle := INVALID_HANDLE_VALUE;
+    FLogWasEmpty := False;
+  end;
+end;
+
 function TJclSimpleLog.GetLogOpen: Boolean;
 begin
   Result := FLogFileHandle <> INVALID_HANDLE_VALUE;
@@ -3168,7 +3180,7 @@
   {$IFDEF MSWINDOWS}
   FinalizeMMFHandleList;
   {$IFDEF THREADSAFE}
-  GlobalMMFHandleListCS.Free;
+  FreeAndNil(GlobalMMFHandleListCS);
   {$ENDIF THREADSAFE}
   {$ENDIF MSWINDOWS}
   {$ENDIF ~CLR}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [1989] trunk/jcl/InstallForDelphi.bat

From: <ah...@us...> - 2007-04-16 20:17:00

Revision: 1989
          http://svn.sourceforge.net/jcl/?rev=1989&view=rev
Author:   ahuser
Date:     2007-04-16 13:16:59 -0700 (Mon, 16 Apr 2007)

Log Message:
-----------
- do not use the IDE's search paths for the installer

Modified Paths:
--------------
    trunk/jcl/InstallForDelphi.bat

Modified: trunk/jcl/InstallForDelphi.bat
===================================================================
--- trunk/jcl/InstallForDelphi.bat	2007-04-16 19:51:01 UTC (rev 1988)
+++ trunk/jcl/InstallForDelphi.bat	2007-04-16 20:16:59 UTC (rev 1989)
@@ -14,7 +14,7 @@
 
 :: compile installer
 
-build\dcc32ex.exe --use-search-paths -q -w -dJCLINSTALL -E..\bin -I..\source -U..\source\common;..\source\windows JediInstaller.dpr
+build\dcc32ex.exe -q -w -dJCLINSTALL -E..\bin -I..\source -U..\source\common;..\source\windows JediInstaller.dpr %1 %2 %3 %4 %5 %6 %7 %8
 if ERRORLEVEL 1 goto FailedCompile
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [1988] trunk/jcl/install/build

From: <ah...@us...> - 2007-04-16 19:51:04

Revision: 1988
          http://svn.sourceforge.net/jcl/?rev=1988&view=rev
Author:   ahuser
Date:     2007-04-16 12:51:01 -0700 (Mon, 16 Apr 2007)

Log Message:
-----------
Sync with original version from the JVCL

Modified Paths:
--------------
    trunk/jcl/install/build/dcc32ex.dpr
    trunk/jcl/install/build/dcc32ex.exe

Modified: trunk/jcl/install/build/dcc32ex.dpr
===================================================================
--- trunk/jcl/install/build/dcc32ex.dpr	2007-04-16 07:39:11 UTC (rev 1987)
+++ trunk/jcl/install/build/dcc32ex.dpr	2007-04-16 19:51:01 UTC (rev 1988)
@@ -1,11 +1,14 @@
 {$A8,B-,C+,D+,E-,F-,G+,H+,I+,J-,K-,L+,M-,N+,O+,P+,Q-,R-,S-,T-,U-,V+,W+,X+,Y+,Z1}
-{$WARN UNSAFE_TYPE OFF}
-{$WARN UNSAFE_CODE OFF}
-{$WARN UNSAFE_CAST OFF}
 program dcc32ex;
 
 {$APPTYPE CONSOLE}
 
+{$IF CompilerVersion >= 15.0}
+  {$WARN UNSAFE_TYPE OFF}
+  {$WARN UNSAFE_CODE OFF}
+  {$WARN UNSAFE_CAST OFF}
+{$IFEND}
+
 uses
   Windows;
 
@@ -13,6 +16,7 @@
   DxgettextDir: string;
   ExtraUnitDirs: string;
   UseSearchPaths: Boolean;
+  Verbose: Boolean;
   RequireJcl: Boolean;
   RequireJvcl: Boolean;
 
@@ -248,17 +252,16 @@
 
 type
   TTargetType = (ttNone, ttDelphi, ttBCB, ttBDS);
+
 const
   ttFirst = ttDelphi;
-  TargetNames: array[TTargetType] of PChar = (
-    'none', 'Delphi', 'C++Builder', 'Delphi'
-  );
 
 type
   TTarget = record
     Typ: TTargetType;
     Version: Integer;
     IDEVersion: Integer;
+    Name: string;
     RootDir: string;
     LibDirs: string;
     SearchPaths: string;
@@ -268,22 +271,31 @@
     InstalledJvcl: Boolean;
   end;
 
-function ReadTargetInfo(Typ: TTargetType; IDEVersion: Integer): TTarget;
+function RegReadStr(Reg: HKEY; const Name: string): string;
 var
-  Reg: HKEY;
-  RegTyp: LongWord;
-
-  function ReadStr(const Name: string): string;
-  var
-    Len: Longint;
-  begin
-    Len := MAX_PATH;
-    SetLength(Result, MAX_PATH);
-    RegQueryValueEx(Reg, PChar(Name), nil, @RegTyp, PByte(Result), @Len);
-    SetLength(Result, StrLen(PChar(Result)));
+  Len: Longint;
+  Buf: array[0..MAX_PATH] of Char;
+begin
+  Len := MAX_PATH;
+  case RegQueryValueEx(Reg, PChar(Name), nil, nil, PByte(@Buf[0]), @Len) of
+    ERROR_SUCCESS:
+      SetString(Result, Buf, Len - 1); // Len contains the #0
+    ERROR_MORE_DATA:
+      begin
+        SetLength(Result, Len);
+        if RegQueryValueEx(Reg, PChar(Name), nil, nil, PByte(Result), @Len) = ERROR_SUCCESS then
+          SetLength(Result, Len - 1) // Len contains the #0
+        else
+          Result := '';
+      end;
+  else
+    Result := '';
   end;
+end;
 
+function ReadTargetInfo(Typ: TTargetType; IDEVersion: Integer): TTarget;
 var
+  Reg: HKEY;
   IDEVersionStr: string;
   JediLibDirs, Dir, DcpDir, RootDir: string;
 begin
@@ -292,9 +304,12 @@
   Result.IDEVersion := 0;
   Result.RootDir := '';
   Result.KeyName := '';
+  Result.Name := '';
   Result.Id := '';
   Result.InstalledJcl := False;
   Result.InstalledJvcl := False;
+  Result.SearchPaths := '';
+  Result.LibDirs := '';
 
   Str(IDEVersion, IDEVersionStr);
   case Typ of
@@ -318,7 +333,7 @@
   if RegOpenKeyEx(HKEY_LOCAL_MACHINE, PChar(Result.KeyName), 0,
                   KEY_QUERY_VALUE or KEY_READ, Reg) = ERROR_SUCCESS then
   begin
-    Result.RootDir := ExcludeTrailingPathDelimiter(ReadStr('RootDir'));
+    Result.RootDir := ExcludeTrailingPathDelimiter(RegReadStr(Reg, 'RootDir'));
     RegCloseKey(Reg);
     if Result.RootDir = '' then
       Exit;
@@ -339,28 +354,47 @@
     end;
     Result.Typ := Typ;
     Result.IDEVersion := IDEVersion;
+    Result.Id := Result.Id + IntToStr(Result.Version);
+
+    Result.Name := 'Delphi ' + IntToStr(Result.Version);
+    case Result.Typ of
+      ttDelphi:
+        Result.Name := 'Delphi ' + IntToStr(Result.Version);
+      ttBCB:
+        Result.Name := 'C++Builder ' + IntToStr(Result.Version);
+      ttBDS:
+        case Result.IDEVersion of
+          1: Result.Name := 'C#Builder';
+          2: Result.Name := 'Delphi 8';
+          3: Result.Name := 'Delphi 2005';
+          4: Result.Name := 'Borland Developer Studio 2006';
+          5: Result.Name := 'CodeGear Delphi 2007 for Win32';
+        end;
+    end;
+
     Result.LibDirs := Result.RootDir + '\Lib';
-    if Typ = ttBCB then
+    if DirectoryExists(Result.RootDir + '\Lib\Obj') then
       Result.LibDirs := Result.LibDirs + ';' + Result.RootDir + '\Lib\Obj';
-    Result.Id := Result.Id + IntToStr(Result.Version);
 
 
+    { Read IDE search paths }
     if RegOpenKeyEx(HKEY_CURRENT_USER, PChar(Result.KeyName + '\Library'), 0,
                     KEY_QUERY_VALUE or KEY_READ, Reg) = ERROR_SUCCESS then
     begin
-      Result.SearchPaths := ExpandDirMacros(ExcludeTrailingPathDelimiter(ReadStr('Search Path')), Result.RootDir);
+      Result.SearchPaths := ExpandDirMacros(ExcludeTrailingPathDelimiter(RegReadStr(Reg, 'Search Path')), Result.RootDir);
       RegCloseKey(Reg);
       if UseSearchPaths then
         Result.LibDirs := Result.LibDirs + ';' + Result.SearchPaths;
     end;
 
+    { Read JCL information }
     JediLibDirs := '';
     if RequireJcl and
        (RegOpenKeyEx(HKEY_CURRENT_USER, PChar(Result.KeyName + '\Jedi\JCL'), 0,
                      KEY_QUERY_VALUE or KEY_READ, Reg) = ERROR_SUCCESS) then
     begin
-      DcpDir := ExcludeTrailingPathDelimiter(ExpandDirMacros(ExcludeTrailingPathDelimiter(ReadStr('DcpDir')), Result.RootDir));
-      RootDir := ExcludeTrailingPathDelimiter(ExpandDirMacros(ExcludeTrailingPathDelimiter(ReadStr('RootDir')), Result.RootDir));
+      DcpDir := ExcludeTrailingPathDelimiter(ExpandDirMacros(ExcludeTrailingPathDelimiter(RegReadStr(Reg, 'DcpDir')), Result.RootDir));
+      RootDir := ExcludeTrailingPathDelimiter(ExpandDirMacros(ExcludeTrailingPathDelimiter(RegReadStr(Reg, 'RootDir')), Result.RootDir));
       RegCloseKey(Reg);
       Dir := RootDir + '\lib\' + Result.Id;
       if FileExists(Dir + '\JclBase.dcu') then
@@ -372,23 +406,21 @@
         JediLibDirs := JediLibDirs + ';' +  RootDir + '\source';
         Result.InstalledJcl := True;
       end
-      else if FileExists(RootDir + '\source\common\JclBase.pas') then 
+      else if FileExists(RootDir + '\source\common\JclBase.pas') then
       begin
         JediLibDirs := JediLibDirs + ';' + RootDir + '\source;' + RootDir + '\source\common;' + RootDir + '\source\vcl;' + RootDir + '\source\visclx';
-        {$IFDEF WIN32}
         JediLibDirs := JediLibDirs + ';' + RootDir + '\source\windows';
-        {$ELSE}
-        JediLibDirs := JediLibDirs + ':' + RootDir + '\source\unix';
-        {$ENDIF WINDOWS}
         Result.InstalledJcl := True;
       end;
     end;
+
+    { Read JVCL information }
     if RequireJvcl and
        (RegOpenKeyEx(HKEY_CURRENT_USER, PChar(Result.KeyName + '\Jedi\JVCL'), 0,
                      KEY_QUERY_VALUE or KEY_READ, Reg) = ERROR_SUCCESS) then
     begin
-      DcpDir := ExcludeTrailingPathDelimiter(ExpandDirMacros(ExcludeTrailingPathDelimiter(ReadStr('DcpDir')), Result.RootDir));
-      RootDir := ExcludeTrailingPathDelimiter(ExpandDirMacros(ExcludeTrailingPathDelimiter(ReadStr('RootDir')), Result.RootDir));
+      DcpDir := ExcludeTrailingPathDelimiter(ExpandDirMacros(ExcludeTrailingPathDelimiter(RegReadStr(Reg, 'DcpDir')), Result.RootDir));
+      RootDir := ExcludeTrailingPathDelimiter(ExpandDirMacros(ExcludeTrailingPathDelimiter(RegReadStr(Reg, 'RootDir')), Result.RootDir));
       RegCloseKey(Reg);
       Dir := RootDir + '\lib\' + Result.Id;
       if FileExists(Dir + '\JVCLVer.dcu') then
@@ -473,6 +505,97 @@
   end;
 end;
 
+
+
+procedure CheckTargets(const PreferedTyp: TTargetType; const PreferedVersion: Integer; var NewestTarget: TTarget; ShowErrors: Boolean);
+var
+  PreferedTarget: TTarget;
+  IDEVersion: Integer;
+  Typ: TTargetType;
+  Target: TTarget;
+  InvalidFound: Boolean;
+  DependencyCheckFailed: Boolean;
+  ErrMsg: string;
+begin
+  PreferedTarget.Typ := ttNone;
+
+  DependencyCheckFailed := False;
+  InvalidFound := False;
+  for Typ := ttFirst to High(TTargetType) do
+  begin
+    for IDEVersion := 1 to 20 do
+    begin
+      Target := ReadTargetInfo(Typ, IDEVersion);
+      if (Target.Typ <> ttNone) and (Target.Version >= 5) then
+      begin
+        // is the target valid
+        if FileExists(Target.RootDir + '\bin\dcc32.exe') and
+           (FileExists(Target.RootDir + '\lib\System.dcu') or FileExists(Target.RootDir + '\lib\obj\System.dcu')) then
+        begin
+          if (not RequireJcl or Target.InstalledJcl) and (not RequireJvcl or Target.InstalledJvcl) then
+          begin
+            if (NewestTarget.Typ = ttNone) or (NewestTarget.Version < Target.Version) then
+              NewestTarget := Target;
+
+            if (Target.Typ = PreferedTyp) and (Target.Version = PreferedVersion) then
+              PreferedTarget := Target;
+          end
+          else
+          begin
+            if ShowErrors then
+            begin
+              WriteLn('Missing dependencies for ', Target.Name);
+              if RequireJcl and not Target.InstalledJcl then
+                WriteLn(' - JCL  is required but not installed. (http://jcl.sourceforge.net)');
+              if RequireJvcl and not Target.InstalledJvcl then
+                WriteLn(' - JVCL is required but not installed. (http://jvcl.sourceforge.net)');
+              WriteLn;
+            end;
+            DependencyCheckFailed := True;
+            InvalidFound := True;
+          end;
+        end
+        else
+        begin
+          if ShowErrors then
+          begin
+            WriteLn(Target.Name, ' is no valid installation');
+            if not DirectoryExists(Target.RootDir) then
+              WriteLn(' - RootDir registry entry is not valid')
+            else
+            begin
+              if not FileExists(Target.RootDir + '\bin\dcc32.exe') then
+                WriteLn(' - dcc32.exe missing');
+              if not (FileExists(Target.RootDir + '\lib\System.dcu') or FileExists(Target.RootDir + '\lib\obj\System.dcu')) then
+                WriteLn(' - System.dcu missing');
+            end;
+            WriteLn;
+          end;
+          InvalidFound := True;
+        end;
+      end;
+    end;
+  end;
+
+  if PreferedTarget.Typ <> ttNone then
+    NewestTarget := PreferedTarget;
+
+  if ShowErrors and (NewestTarget.Typ = ttNone) then
+  begin
+    if InvalidFound then
+    begin
+      if DependencyCheckFailed then
+        ErrMsg := 'Dependencies are missing. Please install them first.'
+      else
+        ErrMsg := 'No valid Delphi/BCB/BDS version found. Are your registry settings correct?';
+    end
+    else
+      ErrMsg := 'No Delphi/BCB/BDS version installed.';
+    WriteLn(ErrOutput, ErrMsg);
+    MessageBox(0, PChar(ErrMsg), 'dcc32ex.exe', MB_ICONERROR or MB_OK);
+  end;
+end;
+
 function SkipOption(CmdLine: PChar): PChar;
 begin
   Result := CmdLine;
@@ -536,6 +659,12 @@
 
     if (S <> '') and (S[1] = '"') then
       S := Copy(S, 2, Length(S) - 2);
+    if StartsText('--delphi-version=', S) then
+      SetEnvironmentVariable('DELPHIVERSION', PChar(Copy(S, 18, MaxInt)))
+    else
+    if SameText(S, '--verbose') then
+      Verbose := True
+    else
     if SameText(S, '--use-search-paths') then
       UseSearchPaths := True
     else
@@ -551,12 +680,7 @@
 end;
 
 var
-  Typ: TTargetType;
-  IDEVersion: Integer;
   NewestTarget: TTarget;
-  Target: TTarget;
-  InvalidFound: Boolean;
-  DependencyCheckFailed: Boolean;
   f: TextFile;
   Status: Integer;
   Dcc32Cfg, CurDir, ExtraOpts: string;
@@ -564,21 +688,16 @@
   DelphiVersion: string;
   PreferedTyp: TTargetType;
   PreferedVersion: Integer;
-  PreferedTarget: TTarget;
   Err: Integer;
-  ErrMsg: string;
+  Target: TTarget;
 begin
   CmdLine := GetCommandLine;
   CmdLine := SkipOption(CmdLine); // skip executable name
   CmdLine := ParseParams(CmdLine);
-{  UseSearchPaths := GetEnvironmentVariable('UseSeachPaths') = '1';
-  RequireJcl := GetEnvironmentVariable('RequireJCL') = '1';
-  RequireJvcl := GetEnvironmentVariable('RequireJVCL') = '1';}
 
-
   PreferedTyp := ttNone;
   PreferedVersion := 0;
-  DelphiVersion := GetEnvironmentVariable('DelphiVersion');
+  DelphiVersion := GetEnvironmentVariable('DELPHIVERSION');
   if DelphiVersion <> '' then
   begin
     Val(Copy(DelphiVersion, 2, MaxInt), PreferedVersion, Err);
@@ -595,82 +714,24 @@
         PreferedTyp := ttBDS;
     end;
   end;
-  PreferedTarget.Typ := ttNone;
 
   NewestTarget.Typ := ttNone;
-  DependencyCheckFailed := False;
-  InvalidFound := False;
-  for Typ := ttFirst to High(TTargetType) do
-  begin
-    for IDEVersion := 1 to 20 do
-    begin
-      Target := ReadTargetInfo(Typ, IDEVersion);
-      if (Target.Typ <> ttNone) and (Target.Version >= 5) then
-      begin
-        // is the target valid
-        if FileExists(Target.RootDir + '\bin\dcc32.exe') and
-           (FileExists(Target.RootDir + '\lib\System.dcu') or FileExists(Target.RootDir + '\lib\obj\System.dcu')) then
-        begin
-          if (not RequireJcl or Target.InstalledJcl) and (not RequireJvcl or Target.InstalledJvcl) then
-          begin
-            if (NewestTarget.Typ = ttNone) or (NewestTarget.Version < Target.Version) then
-              NewestTarget := Target;
+  CheckTargets(PreferedTyp, PreferedVersion, NewestTarget, Verbose);
 
-            if (Target.Typ = PreferedTyp) and (Target.Version = PreferedVersion) then
-              PreferedTarget := Target;
-          end
-          else
-          begin
-            WriteLn('Missing dependencies for ', TargetNames[Target.Typ], ' ', Target.Version);
-            if RequireJcl and not Target.InstalledJcl then
-              WriteLn(' - JCL  is required but not installed. (http://jcl.sourceforge.net)');
-            if RequireJvcl and not Target.InstalledJvcl then
-              WriteLn(' - JVCL is required but not installed. (http://jvcl.sourceforge.net)');
-            WriteLn;
-            DependencyCheckFailed := True;
-            InvalidFound := True;
-          end;
-        end
-        else
-        begin
-          WriteLn(TargetNames[Target.Typ], ' ', Target.Version, ' is no valid installation');
-          if not DirectoryExists(Target.RootDir) then
-            WriteLn(' - RootDir registry entry is not valid')
-          else
-          begin
-            if not FileExists(Target.RootDir + '\bin\dcc32.exe') then
-              WriteLn(' - dcc32.exe missing');
-            if not (FileExists(Target.RootDir + '\lib\System.dcu') or FileExists(Target.RootDir + '\lib\obj\System.dcu')) then
-              WriteLn(' - System.dcu missing');
-          end;
-          WriteLn;
-          InvalidFound := True;
-        end;
-      end;
-    end;
-  end;
-
-  if PreferedTarget.Typ <> ttNone then
-    NewestTarget := PreferedTarget;
-
   if NewestTarget.Typ = ttNone then
   begin
-    if InvalidFound then
+    if not Verbose then
     begin
-      if DependencyCheckFailed then
-        ErrMsg := 'Dependencies are missing. Please install them first.'
-      else
-        ErrMsg := 'No valid Delphi/BCB/BDS version found. Are your registry settings correct?';
-    end
-    else
-      ErrMsg := 'No Delphi/BCB/BDS version installed.';
-    WriteLn(ErrOutput, ErrMsg);
-    MessageBox(0, PChar(ErrMsg), 'dcc32ex.exe', MB_ICONERROR or MB_OK);
+      { Show detection errors and warnings }
+      NewestTarget.Typ := ttNone;
+      CheckTargets(PreferedTyp, PreferedVersion, NewestTarget, True);
+    end;
     Halt(1);
   end;
 
+
   Target := NewestTarget;
-  WriteLn('Using ', TargetNames[Target.Typ], ' ', Target.Version);
+  WriteLn('Using ', Target.Name);
   if Target.Version = 6 then
     TestDelphi6Update2(Target);
 
@@ -705,6 +766,10 @@
     Dcc32Cfg := '';
   end;
 
+  if Verbose then
+    WriteLn('Using search path: ', Target.LibDirs);
+  WriteLn;
+
   Status := Execute('"' + Target.RootDir + '\bin\dcc32.exe" ' + ExtraOpts + CmdLine, CurDir, False);
   if Dcc32Cfg <> '' then
     DeleteFile(PChar(Dcc32Cfg));
@@ -713,13 +778,15 @@
   begin
     WriteLn;
     WriteLn('Additional options (must be specified before any dcc32 parameter):');
+    WriteLn('  --delphi-version=d11   Prefer this version, overrides environment variable');
+    WriteLn('  --verbose              Show warnings and errors during the compiler detection');
     WriteLn('  --use-search-paths     Use the IDE''s search paths');
     WriteLn('  --requires-jcl         Requires an installed JCL');
     WriteLn('  --requires-jvcl        Requires an installed JVCL');
     WriteLn;
     WriteLn('Environment variables:');
-    WriteLn('  DELPHIVERSION = d10    Prefer this Delphi/BCB/BDS version');
-    WriteLn('                         (d5, d6, d7, c5, c6, d9, d10, ...)');
+    WriteLn('  DELPHIVERSION = d11    Prefer this Delphi/BCB/BDS version');
+    WriteLn('                         (d5, d6, d7, c5, c6, d9, d10, d11, ...)');
   end;
 
   ExitCode := Status;

Modified: trunk/jcl/install/build/dcc32ex.exe
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [1987] trunk/jcl/install/build/pgEdit.xml

From: <ob...@us...> - 2007-04-16 07:39:12

Revision: 1987
          http://svn.sourceforge.net/jcl/?rev=1987&view=rev
Author:   obones
Date:     2007-04-16 00:39:11 -0700 (Mon, 16 Apr 2007)

Log Message:
-----------
Added missing d11 target

Modified Paths:
--------------
    trunk/jcl/install/build/pgEdit.xml

Modified: trunk/jcl/install/build/pgEdit.xml
===================================================================
--- trunk/jcl/install/build/pgEdit.xml	2007-04-16 07:38:40 UTC (rev 1986)
+++ trunk/jcl/install/build/pgEdit.xml	2007-04-16 07:39:11 UTC (rev 1987)
@@ -70,35 +70,29 @@
         <target name="k3" pname="k3p" pdir="k3per" pathsep="/" IsClx="1"/>
         <target name="d9" pname="d9p" pdir="d9per"/>
         <target name="d10" pname="d10p" pdir="d10per"/>
+        <target name="d11"/>
       </targets>
       <aliases>
-        <alias name="VCL" value="c5,c5s,d5,d5s,c6,c6p,d6,d6p,d7,d7p,d9,d9p,d10,d10p"/>
+        <alias name="VCL" value="c5,c5s,d5,d5s,c6,c6p,d6,d6p,d7,d7p,d9,d9p,d10,d10p,d11"/>
         <alias name="VCLv5" value="c5,c5s,d5,d5s"/>
-        <alias name="VCLv6up" value="c6,c6p,d6,d6p,d7,d7p,d9,d9p,d10,d10p"/>
-
-        <alias name="D" value="d5,d5s,d6,d6p,d7,d7p,d7clx,d9,d9p,d10,d10p"/>
+        <alias name="VCLv6up" value="c6,c6p,d6,d6p,d7,d7p,d9,d9p,d10,d10p,d11"/>
+        <alias name="D" value="d5,d5s,d6,d6p,d7,d7p,d7clx,d9,d9p,d10,d10p,d11"/>
         <alias name="Dv5" value="d5,d5s"/>
-        <alias name="Dv6up" value="d6,d6p,d7,d7p,d7clx,d9,d9p,d10,d10p"/>
-
-        <alias name="C" value="c5,c5s,c6,c6p,d10,d10p"/>
+        <alias name="Dv6up" value="d6,d6p,d7,d7p,d7clx,d9,d9p,d10,d10p,d11"/>
+        <alias name="C" value="c5,c5s,c6,c6p,d10,d10p,d11"/>
         <alias name="Cv5" value="c5,c5s"/>
-        <alias name="Cv6up" value="c6,c6p,d10,d10p"/>
-
-        <alias name="DB" value="c5,d5,c6,d6,d7,d9,d10"/>
+        <alias name="Cv6up" value="c6,c6p,d10,d10p,d11"/>
+        <alias name="DB" value="c5,d5,c6,d6,d7,d9,d10,d11"/>
         <alias name="DBv5" value="c5,d5"/>
-        <alias name="DBv6up" value="c6,d6,d7,d9,d10"/>
-
-        <alias name="DBVCL" value="c5,d5,c6,d6,d7,d9,d10"/>
+        <alias name="DBv6up" value="c6,d6,d7,d9,d10,d11"/>
+        <alias name="DBVCL" value="c5,d5,c6,d6,d7,d9,d10,d11"/>
         <alias name="DBVCLv5" value="c5,d5"/>
-        <alias name="DBVCLv6up" value="c6,d6,d7,d9,d10"/>
-
+        <alias name="DBVCLv6up" value="c6,d6,d7,d9,d10,d11"/>
         <alias name="CLX" value="d7clx,k3,k3p"/>
         <alias name="DBCLX" value="d7clx,k3"/>
-        
         <alias name="allv5" value="c5,c5s,d5,d5s"/>
-        <alias name="allv6up" value="c6,c6p,d6,d6p,d7,d7p,d7clx,d9,d9p,d10,d10p"/>
-
-        <alias name="Windows" value="c5,c5s,c6,c6p,d5,d5s,d6,d6p,d7,d7p,d7clx,d9,d9p,d10,d10p"/>
+        <alias name="allv6up" value="c6,c6p,d6,d6p,d7,d7p,d7clx,d9,d9p,d10,d10p,d11"/>
+        <alias name="Windows" value="c5,c5s,c6,c6p,d5,d5s,d6,d6p,d7,d7p,d7clx,d9,d9p,d10,d10p,d11"/>
         <alias name="Linux" value="k3,k3p"/>
       </aliases>
       <ClxReplacements>
@@ -121,21 +115,22 @@
         <target name="k3" PathSep="/"/>
         <target name="d9.net" IsDotNet="1"/>
         <target name="d10.net" IsDotNet="1"/>
+        <target name="d11" IsBds="1"/>
       </targets>
       <aliases>
-        <alias name="Delphi" value="d5,d6,d7,d9,d10"/>
-        <alias name="Bcb" value="c5,c6,d10"/>
+        <alias name="Delphi" value="d5,d6,d7,d9,d10,d11"/>
+        <alias name="Bcb" value="c5,c6,d10,d11"/>
         <alias name="Kylix" value="k3"/>
-        <alias name="Windows" value="c5,c6,d5,d6,d7,d9,d10"/>
+        <alias name="Windows" value="c5,c6,d5,d6,d7,d9,d10,d11"/>
         <alias name="Linux" value="k3"/>
-        <alias name="WinDev" value="c5,c6,d5,d6,d7,d8,d9,d10,cs1"/>
-        <alias name="JclDev" value="c5,c6,d5,d6,d7,d8,d9,d10,k3,cs1"/>
-        <alias name="DelphiDev" value="d5,d6,d7,d8,d9,d10"/>
-        <alias name="WinLibSuffix" value="c6,d6,d7,d8,d9,d10,cs1"/>
-        <alias name="allLibSuffix" value="c6,d6,d7,d8,d9,d10,k3,cs1"/>
+        <alias name="WinDev" value="c5,c6,d5,d6,d7,d8,d9,d10,cs1,d11"/>
+        <alias name="JclDev" value="c5,c6,d5,d6,d7,d8,d9,d10,k3,cs1,d11"/>
+        <alias name="DelphiDev" value="d5,d6,d7,d8,d9,d10,d11"/>
+        <alias name="WinLibSuffix" value="c6,d6,d7,d8,d9,d10,cs1,d11"/>
+        <alias name="allLibSuffix" value="c6,d6,d7,d8,d9,d10,k3,cs1,d11"/>
         <alias name="Clx" value="c6,d6,d7,k3"/>
-        <alias name="Vcl" value="c6,d6,d7,d9,d10"/>
-        <alias name="Bds" value="cs1,d8,d9,d10"/>
+        <alias name="Vcl" value="c6,d6,d7,d9,d10,d11"/>
+        <alias name="Bds" value="cs1,d8,d9,d10,d11"/>
         <alias name="JclDotNet" value="d9.net,d10.net"/>
       </aliases>
     </Model>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [1986] trunk/jcl/install/build

From: <ob...@us...> - 2007-04-16 07:38:41

Revision: 1986
          http://svn.sourceforge.net/jcl/?rev=1986&view=rev
Author:   obones
Date:     2007-04-16 00:38:40 -0700 (Mon, 16 Apr 2007)

Log Message:
-----------
No more specifics for Spacely

Modified Paths:
--------------
    trunk/jcl/install/build/build.dpr
    trunk/jcl/install/build/build.exe

Modified: trunk/jcl/install/build/build.dpr
===================================================================
--- trunk/jcl/install/build/build.dpr	2007-04-16 07:34:08 UTC (rev 1985)
+++ trunk/jcl/install/build/build.dpr	2007-04-16 07:38:40 UTC (rev 1986)
@@ -30,7 +30,7 @@
 { build.exe setups the environment for a Delphi compiler }
 
 uses
-  Windows, ShlObj, Registry;
+  Windows, ShlObj;
 
 type
   TOption = record
@@ -105,7 +105,6 @@
     FLibDir: string;
     FIsPersonal: Boolean;
     FIsCLX: Boolean;
-    FIsSpacely: Boolean;
 
     function GetBDSProjectsDir: string;
     procedure ReadRegistryData;
@@ -129,7 +128,6 @@
     property Name: string read FName;
     property IsPersonal: Boolean read FIsPersonal;
     property IsCLX: Boolean read FIsCLX;
-    property IsSpacely: Boolean read FIsSpacely;
   end;
 
 var
@@ -540,7 +538,6 @@
 constructor TEdition.Create(const AEditionName, PerDirName: string);
 var
   Index: Integer;
-  reg: TRegistry;
 begin
   if UpCase(AEditionName[1]) = 'D' then
     Typ := Delphi
@@ -563,25 +560,7 @@
   if Version > 7 then
   begin
     Typ := BDS;
-
     IDEVersion := Version - 6; // D 8 = BDS 2
-    
-    // We must detect Spacely here to modify IDEVersion to be one more than the one from BDS2006
-    if (Version = 10) then
-    begin
-      reg := TRegistry.Create;
-      try
-        reg.RootKey := HKEY_CURRENT_USER;
-        FIsSpacely := reg.OpenKeyReadOnly('Software\Borland\BDS\5.0\Known IDE Packages\Delphi') and
-                      reg.ValueExists('$(BDS)\Bin\delphide100.bpl');
-
-        if IsSpacely then
-          Inc(IDEVersion);
-      finally
-        reg.Free;
-      end;
-    end;
-
     IDEVersionStr := IntToStr(IDEVersion);
   end;
 

Modified: trunk/jcl/install/build/build.exe
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [1985] trunk/jcl/packages/d11

From: <ob...@us...> - 2007-04-16 07:34:10

Revision: 1985
          http://svn.sourceforge.net/jcl/?rev=1985&view=rev
Author:   obones
Date:     2007-04-16 00:34:08 -0700 (Mon, 16 Apr 2007)

Log Message:
-----------
Much better lib suffix

Modified Paths:
--------------
    trunk/jcl/packages/d11/Jcl.dpk
    trunk/jcl/packages/d11/Jcl.dproj
    trunk/jcl/packages/d11/JclBaseExpert.dpk
    trunk/jcl/packages/d11/JclBaseExpert.dproj
    trunk/jcl/packages/d11/JclDebugExpert.dpk
    trunk/jcl/packages/d11/JclDebugExpert.dproj
    trunk/jcl/packages/d11/JclDebugExpertDLL.dproj
    trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dpk
    trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj
    trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj
    trunk/jcl/packages/d11/JclProjectAnalysisExpert.dpk
    trunk/jcl/packages/d11/JclProjectAnalysisExpert.dproj
    trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.dproj
    trunk/jcl/packages/d11/JclRepositoryExpert.dpk
    trunk/jcl/packages/d11/JclRepositoryExpert.dproj
    trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj
    trunk/jcl/packages/d11/JclSIMDViewExpert.dpk
    trunk/jcl/packages/d11/JclSIMDViewExpert.dproj
    trunk/jcl/packages/d11/JclSIMDViewExpertDLL.dproj
    trunk/jcl/packages/d11/JclThreadNameExpert.dpk
    trunk/jcl/packages/d11/JclThreadNameExpert.dproj
    trunk/jcl/packages/d11/JclThreadNameExpertDLL.dproj
    trunk/jcl/packages/d11/JclVcl.dpk
    trunk/jcl/packages/d11/JclVcl.dproj
    trunk/jcl/packages/d11/JclVersionControlExpert.dpk
    trunk/jcl/packages/d11/JclVersionControlExpert.dproj
    trunk/jcl/packages/d11/JclVersionControlExpertDLL.dproj
    trunk/jcl/packages/d11/template.dpk
    trunk/jcl/packages/d11/template.dproj

Modified: trunk/jcl/packages/d11/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d11/Jcl.dpk	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/Jcl.dpk	2007-04-16 07:34:08 UTC (rev 1985)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 15-04-2007  13:27:16 UTC
+     Last generated: 16-04-2007  07:23:45 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -31,7 +31,7 @@
 {$MINENUMSIZE 1}
 {$IMAGEBASE $48000000}
 {$DESCRIPTION 'JEDI Code Library RTL package'}
-{$LIBSUFFIX '100'}
+{$LIBSUFFIX '110'}
 {$RUNONLY}
 {$IMPLICITBUILD OFF}
 

Modified: trunk/jcl/packages/d11/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d11/Jcl.dproj	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/Jcl.dproj	2007-04-16 07:34:08 UTC (rev 1985)
@@ -1,11 +1,10 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{cdf2b35b-4ac4-400f-ac4f-0b93e4f81095}</ProjectGuid>
+    <ProjectGuid></ProjectGuid>
     <MainSource>Jcl.dpk</MainSource>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>C:\Dokumente und Einstellungen\All Users\Dokumente\RAD Studio\5.0\Bpl\Jcl100.bpl</DCC_DependencyCheckOutputName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Version>7.0</Version>
@@ -31,120 +30,61 @@
     <DCC_UnitSearchPath>..\..\lib\d11\debug;..\..\source</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\lib\d11\debug;..\..\source</DCC_ResourcePath>
     <DCC_ObjPath>..\..\lib\d11\debug;..\..\source</DCC_ObjPath>
-    <DCC_IncludePath>..\..\lib\d11\debug;..\..\source</DCC_IncludePath>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_WriteableConstants>True</DCC_WriteableConstants>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_ImageBase>48000000</DCC_ImageBase>
+    <DCC_IncludePath>..\..\lib\d11\debug;..\..\source</DCC_IncludePath>    
   </PropertyGroup>
   <ProjectExtensions>
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">2552</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1031</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys><VersionInfoKeys Name="FileDescription">JEDI Code Library RTL package</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.0.0.2552</VersionInfoKeys><VersionInfoKeys Name="InternalName">Jcl</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2007 Project JEDI</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename">Jcl110.bpl</VersionInfoKeys><VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Jcl.dpk</Source></Source>  <Package_Options>
-      <Package_Options Name="PackageDescription">JEDI Code Library RTL package</Package_Options>
-      <Package_Options Name="ImplicitBuild">False</Package_Options>
-      <Package_Options Name="DesigntimeOnly">False</Package_Options>
-      <Package_Options Name="RuntimeOnly">True</Package_Options>
-      <Package_Options Name="LibSuffix">100</Package_Options>
-    </Package_Options>
-  </Delphi.Personality></BorlandProject></BorlandProject>
+      <BorlandProject xmlns=""> 
+        <Delphi.Personality>
+          <Parameters>
+            <Parameters Name="UseLauncher">False</Parameters>
+            <Parameters Name="LoadAllSymbols">True</Parameters>
+            <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+          </Parameters>
+          <VersionInfo>
+           <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+           <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+           <VersionInfo Name="MajorVer">2</VersionInfo>
+           <VersionInfo Name="MinorVer">0</VersionInfo>
+           <VersionInfo Name="Release">0</VersionInfo>
+           <VersionInfo Name="Build">2552</VersionInfo>
+           <VersionInfo Name="Debug">False</VersionInfo>
+           <VersionInfo Name="PreRelease">False</VersionInfo>
+           <VersionInfo Name="Special">False</VersionInfo>
+           <VersionInfo Name="Private">False</VersionInfo>
+           <VersionInfo Name="DLL">False</VersionInfo>
+           <VersionInfo Name="Locale">1031</VersionInfo>
+           <VersionInfo Name="CodePage">1252</VersionInfo>
+         </VersionInfo>
+         <VersionInfoKeys>
+          <VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys>
+          <VersionInfoKeys Name="FileDescription">JEDI Code Library RTL package</VersionInfoKeys>
+          <VersionInfoKeys Name="FileVersion">2.0.0.2552</VersionInfoKeys>
+          <VersionInfoKeys Name="InternalName">Jcl</VersionInfoKeys>
+          <VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2007 Project JEDI</VersionInfoKeys>
+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+          <VersionInfoKeys Name="OriginalFilename">Jcl110.bpl</VersionInfoKeys>
+          <VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys>
+          <VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys>
+         </VersionInfoKeys>
+         <Source>
+           <Source Name="MainSource">Jcl.dpk</Source>
+         </Source>
+         <Package_Options>
+           <Package_Options Name="LibSuffix">110</Package_Options>
+         </Package_Options>
+       </Delphi.Personality>
+    </BorlandProject>
+  </BorlandProject>
   </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+  <ItemGroup />
   <ItemGroup>
     <DelphiCompile Include="Jcl.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\source\common\Jcl8087.pas" />
-    <DCCReference Include="..\..\source\common\JclAbstractContainers.pas" />
-    <DCCReference Include="..\..\source\common\JclAlgorithms.pas" />
-    <DCCReference Include="..\..\source\common\JclAnsiStrings.pas" />
-    <DCCReference Include="..\..\source\common\JclArrayLists.pas" />
-    <DCCReference Include="..\..\source\common\JclArraySets.pas" />
-    <DCCReference Include="..\..\source\common\JclBase.pas" />
-    <DCCReference Include="..\..\source\common\JclBinaryTrees.pas" />
-    <DCCReference Include="..\..\source\common\JclBorlandTools.pas" />
-    <DCCReference Include="..\..\source\common\JclComplex.pas" />
-    <DCCReference Include="..\..\source\common\JclCompression.pas" />
-    <DCCReference Include="..\..\source\common\JclContainerIntf.pas" />
-    <DCCReference Include="..\..\source\common\JclCounter.pas" />
-    <DCCReference Include="..\..\source\common\JclDateTime.pas" />
-    <DCCReference Include="..\..\source\common\JclEDI.pas" />
-    <DCCReference Include="..\..\source\common\JclEDISEF.pas" />
-    <DCCReference Include="..\..\source\common\JclEDITranslators.pas" />
-    <DCCReference Include="..\..\source\common\JclEDIXML.pas" />
-    <DCCReference Include="..\..\source\common\JclEDI_ANSIX12.pas" />
-    <DCCReference Include="..\..\source\common\JclEDI_ANSIX12_Ext.pas" />
-    <DCCReference Include="..\..\source\common\JclEDI_UNEDIFACT.pas" />
-    <DCCReference Include="..\..\source\common\JclEDI_UNEDIFACT_Ext.pas" />
-    <DCCReference Include="..\..\source\common\JclExprEval.pas" />
-    <DCCReference Include="..\..\source\common\JclFileUtils.pas" />
-    <DCCReference Include="..\..\source\common\JclHashMaps.pas" />
-    <DCCReference Include="..\..\source\common\JclHashSets.pas" />
-    <DCCReference Include="..\..\source\common\JclIniFiles.pas" />
-    <DCCReference Include="..\..\source\common\JclLinkedLists.pas" />
-    <DCCReference Include="..\..\source\common\JclLogic.pas" />
-    <DCCReference Include="..\..\source\common\JclMath.pas" />
-    <DCCReference Include="..\..\source\common\JclMIDI.pas" />
-    <DCCReference Include="..\..\source\common\JclMime.pas" />
-    <DCCReference Include="..\..\source\common\JclPCRE.pas" />
-    <DCCReference Include="..\..\source\common\JclQueues.pas" />
-    <DCCReference Include="..\..\source\common\JclResources.pas" />
-    <DCCReference Include="..\..\source\common\JclRTTI.pas" />
-    <DCCReference Include="..\..\source\common\JclSchedule.pas" />
-    <DCCReference Include="..\..\source\common\JclSimpleXml.pas" />
-    <DCCReference Include="..\..\source\common\JclStacks.pas" />
-    <DCCReference Include="..\..\source\common\JclStatistics.pas" />
-    <DCCReference Include="..\..\source\common\JclStreams.pas" />
-    <DCCReference Include="..\..\source\common\JclStrHashMap.pas" />
-    <DCCReference Include="..\..\source\common\JclStrings.pas" />
-    <DCCReference Include="..\..\source\common\JclSysInfo.pas" />
-    <DCCReference Include="..\..\source\common\JclSysUtils.pas" />
-    <DCCReference Include="..\..\source\common\JclUnitConv.pas" />
-    <DCCReference Include="..\..\source\common\JclUnitVersioning.pas" />
-    <DCCReference Include="..\..\source\common\JclUnitVersioningProviders.pas" />
-    <DCCReference Include="..\..\source\common\JclValidation.pas" />
-    <DCCReference Include="..\..\source\common\JclVectors.pas" />
-    <DCCReference Include="..\..\source\common\JclWideStrings.pas" />
-    <DCCReference Include="..\..\source\common\pcre.pas" />
-    <DCCReference Include="..\..\source\windows\Hardlinks.pas" />
-    <DCCReference Include="..\..\source\windows\JclAppInst.pas" />
-    <DCCReference Include="..\..\source\windows\JclCIL.pas" />
-    <DCCReference Include="..\..\source\windows\JclCLR.pas" />
-    <DCCReference Include="..\..\source\windows\JclCOM.pas" />
-    <DCCReference Include="..\..\source\windows\JclConsole.pas" />
-    <DCCReference Include="..\..\source\windows\JclDebug.pas" />
-    <DCCReference Include="..\..\source\windows\JclDotNet.pas" />
-    <DCCReference Include="..\..\source\windows\JclHookExcept.pas" />
-    <DCCReference Include="..\..\source\windows\JclLANMan.pas" />
-    <DCCReference Include="..\..\source\windows\JclLocales.pas" />
-    <DCCReference Include="..\..\source\windows\JclMapi.pas" />
-    <DCCReference Include="..\..\source\windows\JclMetadata.pas" />
-    <DCCReference Include="..\..\source\windows\JclMiscel.pas" />
-    <DCCReference Include="..\..\source\windows\JclMsdosSys.pas" />
-    <DCCReference Include="..\..\source\windows\JclMultimedia.pas" />
-    <DCCReference Include="..\..\source\windows\JclNTFS.pas" />
-    <DCCReference Include="..\..\source\windows\JclPeImage.pas" />
-    <DCCReference Include="..\..\source\windows\JclRegistry.pas" />
-    <DCCReference Include="..\..\source\windows\JclSecurity.pas" />
-    <DCCReference Include="..\..\source\windows\JclShell.pas" />
-    <DCCReference Include="..\..\source\windows\JclStructStorage.pas" />
-    <DCCReference Include="..\..\source\windows\JclSvcCtrl.pas" />
-    <DCCReference Include="..\..\source\windows\JclSynch.pas" />
-    <DCCReference Include="..\..\source\windows\JclTask.pas" />
-    <DCCReference Include="..\..\source\windows\JclTD32.pas" />
-    <DCCReference Include="..\..\source\windows\JclUnicode.pas" />
-    <DCCReference Include="..\..\source\windows\JclWideFormat.pas" />
-    <DCCReference Include="..\..\source\windows\JclWin32.pas" />
-    <DCCReference Include="..\..\source\windows\JclWin32Ex.pas" />
-    <DCCReference Include="..\..\source\windows\JclWinMIDI.pas" />
-    <DCCReference Include="..\..\source\windows\mscoree_TLB.pas" />
-    <DCCReference Include="..\..\source\windows\mscorlib_TLB.pas" />
-    <DCCReference Include="..\..\source\windows\MSHelpServices_TLB.pas" />
-    <DCCReference Include="..\..\source\windows\MSTask.pas" />
-    <DCCReference Include="..\..\source\windows\Snmp.pas" />
-    <DCCReference Include="..\..\source\windows\zlibh.pas" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\rtl.dcp" />
+    <DCCReference Include="rtl.dcp" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+</Project>

Modified: trunk/jcl/packages/d11/JclBaseExpert.dpk
===================================================================
--- trunk/jcl/packages/d11/JclBaseExpert.dpk	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/JclBaseExpert.dpk	2007-04-16 07:34:08 UTC (rev 1985)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
 
-     Last generated: 15-04-2007  13:27:16 UTC
+     Last generated: 16-04-2007  07:23:45 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -31,7 +31,7 @@
 {$MINENUMSIZE 1}
 {$IMAGEBASE $58000000}
 {$DESCRIPTION 'JCL Package containing common units for JCL Experts'}
-{$LIBSUFFIX '100'}
+{$LIBSUFFIX '110'}
 {$DESIGNONLY}
 {$IMPLICITBUILD OFF}
 

Modified: trunk/jcl/packages/d11/JclBaseExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclBaseExpert.dproj	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/JclBaseExpert.dproj	2007-04-16 07:34:08 UTC (rev 1985)
@@ -1,11 +1,10 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{646be861-be14-4dd2-af72-61fe4fffe434}</ProjectGuid>
+    <ProjectGuid></ProjectGuid>
     <MainSource>JclBaseExpert.dpk</MainSource>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>C:\Dokumente und Einstellungen\All Users\Dokumente\RAD Studio\5.0\Bpl\JclBaseExpert100.bpl</DCC_DependencyCheckOutputName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Version>7.0</Version>
@@ -31,52 +30,61 @@
     <DCC_UnitSearchPath>..\..\lib\d11\debug;..\..\source</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\lib\d11\debug;..\..\source</DCC_ResourcePath>
     <DCC_ObjPath>..\..\lib\d11\debug;..\..\source</DCC_ObjPath>
-    <DCC_IncludePath>..\..\lib\d11\debug;..\..\source</DCC_IncludePath>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_WriteableConstants>True</DCC_WriteableConstants>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_ImageBase>58000000</DCC_ImageBase>
+    <DCC_IncludePath>..\..\lib\d11\debug;..\..\source</DCC_IncludePath>    
   </PropertyGroup>
   <ProjectExtensions>
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">2552</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1031</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys><VersionInfoKeys Name="FileDescription">JCL Package containing common units for JCL Experts</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.0.0.2552</VersionInfoKeys><VersionInfoKeys Name="InternalName">JclBaseExpert</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2007 Project JEDI</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename">JclBaseExpert110.bpl</VersionInfoKeys><VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">JclBaseExpert.dpk</Source></Source>  <Package_Options>
-      <Package_Options Name="PackageDescription">JCL Package containing common units for JCL Experts</Package_Options>
-      <Package_Options Name="ImplicitBuild">False</Package_Options>
-      <Package_Options Name="DesigntimeOnly">True</Package_Options>
-      <Package_Options Name="RuntimeOnly">False</Package_Options>
-      <Package_Options Name="LibSuffix">100</Package_Options>
-    </Package_Options>
-  </Delphi.Personality></BorlandProject></BorlandProject>
+      <BorlandProject xmlns=""> 
+        <Delphi.Personality>
+          <Parameters>
+            <Parameters Name="UseLauncher">False</Parameters>
+            <Parameters Name="LoadAllSymbols">True</Parameters>
+            <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+          </Parameters>
+          <VersionInfo>
+           <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+           <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+           <VersionInfo Name="MajorVer">2</VersionInfo>
+           <VersionInfo Name="MinorVer">0</VersionInfo>
+           <VersionInfo Name="Release">0</VersionInfo>
+           <VersionInfo Name="Build">2552</VersionInfo>
+           <VersionInfo Name="Debug">False</VersionInfo>
+           <VersionInfo Name="PreRelease">False</VersionInfo>
+           <VersionInfo Name="Special">False</VersionInfo>
+           <VersionInfo Name="Private">False</VersionInfo>
+           <VersionInfo Name="DLL">False</VersionInfo>
+           <VersionInfo Name="Locale">1031</VersionInfo>
+           <VersionInfo Name="CodePage">1252</VersionInfo>
+         </VersionInfo>
+         <VersionInfoKeys>
+          <VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys>
+          <VersionInfoKeys Name="FileDescription">JCL Package containing common units for JCL Experts</VersionInfoKeys>
+          <VersionInfoKeys Name="FileVersion">2.0.0.2552</VersionInfoKeys>
+          <VersionInfoKeys Name="InternalName">JclBaseExpert</VersionInfoKeys>
+          <VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2007 Project JEDI</VersionInfoKeys>
+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+          <VersionInfoKeys Name="OriginalFilename">JclBaseExpert110.bpl</VersionInfoKeys>
+          <VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys>
+          <VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys>
+         </VersionInfoKeys>
+         <Source>
+           <Source Name="MainSource">JclBaseExpert.dpk</Source>
+         </Source>
+         <Package_Options>
+           <Package_Options Name="LibSuffix">110</Package_Options>
+         </Package_Options>
+       </Delphi.Personality>
+    </BorlandProject>
+  </BorlandProject>
   </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+  <ItemGroup />
   <ItemGroup>
     <DelphiCompile Include="JclBaseExpert.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\experts\common\JclOtaActionConfigureSheet.pas">
-      <Form>JclOtaActionConfigureFrame</Form>
-    </DCCReference>
-    <DCCReference Include="..\..\experts\common\JclOtaConfigurationForm.pas">
-      <Form>JclOtaOptionsForm</Form>
-    </DCCReference>
-    <DCCReference Include="..\..\experts\common\JclOtaConsts.pas" />
-    <DCCReference Include="..\..\experts\common\JclOtaExceptionForm.pas">
-      <Form>JclExpertExceptionForm</Form>
-    </DCCReference>
-    <DCCReference Include="..\..\experts\common\JclOtaResources.pas" />
-    <DCCReference Include="..\..\experts\common\JclOtaUtils.pas" />
-    <DCCReference Include="..\..\experts\common\JclOtaWizardForm.pas">
-      <Form>JclWizardForm</Form>
-    </DCCReference>
-    <DCCReference Include="..\..\experts\common\JclOtaWizardFrame.pas">
-      <Form>JclWizardFrame</Form>
-    </DCCReference>
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\designide.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\Jcl.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\rtl.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\vcl.dcp" />
+    <DCCReference Include="rtl.dcp" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+</Project>

Modified: trunk/jcl/packages/d11/JclDebugExpert.dpk
===================================================================
--- trunk/jcl/packages/d11/JclDebugExpert.dpk	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/JclDebugExpert.dpk	2007-04-16 07:34:08 UTC (rev 1985)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDebugExpert-D.xml)
 
-     Last generated: 15-04-2007  13:27:16 UTC
+     Last generated: 16-04-2007  07:23:45 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -31,7 +31,7 @@
 {$MINENUMSIZE 1}
 {$IMAGEBASE $58020000}
 {$DESCRIPTION 'JCL Debug IDE extension'}
-{$LIBSUFFIX '100'}
+{$LIBSUFFIX '110'}
 {$DESIGNONLY}
 {$IMPLICITBUILD OFF}
 

Modified: trunk/jcl/packages/d11/JclDebugExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclDebugExpert.dproj	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/JclDebugExpert.dproj	2007-04-16 07:34:08 UTC (rev 1985)
@@ -1,11 +1,10 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{bd790fa8-122a-44d8-a27d-9962021ad816}</ProjectGuid>
+    <ProjectGuid></ProjectGuid>
     <MainSource>JclDebugExpert.dpk</MainSource>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>C:\Dokumente und Einstellungen\All Users\Dokumente\RAD Studio\5.0\Bpl\JclDebugExpert100.bpl</DCC_DependencyCheckOutputName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Version>7.0</Version>
@@ -31,42 +30,61 @@
     <DCC_UnitSearchPath>..\..\lib\d11\debug;..\..\source</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\lib\d11\debug;..\..\source</DCC_ResourcePath>
     <DCC_ObjPath>..\..\lib\d11\debug;..\..\source</DCC_ObjPath>
-    <DCC_IncludePath>..\..\lib\d11\debug;..\..\source</DCC_IncludePath>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_WriteableConstants>True</DCC_WriteableConstants>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_ImageBase>58020000</DCC_ImageBase>
+    <DCC_IncludePath>..\..\lib\d11\debug;..\..\source</DCC_IncludePath>    
   </PropertyGroup>
   <ProjectExtensions>
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">2552</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1031</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys><VersionInfoKeys Name="FileDescription">JCL Debug IDE extension</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.0.0.2552</VersionInfoKeys><VersionInfoKeys Name="InternalName">JclDebugExpert</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2007 Project JEDI</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename">JclDebugExpert110.bpl</VersionInfoKeys><VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">JclDebugExpert.dpk</Source></Source>  <Package_Options>
-      <Package_Options Name="PackageDescription">JCL Debug IDE extension</Package_Options>
-      <Package_Options Name="ImplicitBuild">False</Package_Options>
-      <Package_Options Name="DesigntimeOnly">True</Package_Options>
-      <Package_Options Name="RuntimeOnly">False</Package_Options>
-      <Package_Options Name="LibSuffix">100</Package_Options>
-    </Package_Options>
-  </Delphi.Personality></BorlandProject></BorlandProject>
+      <BorlandProject xmlns=""> 
+        <Delphi.Personality>
+          <Parameters>
+            <Parameters Name="UseLauncher">False</Parameters>
+            <Parameters Name="LoadAllSymbols">True</Parameters>
+            <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+          </Parameters>
+          <VersionInfo>
+           <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+           <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+           <VersionInfo Name="MajorVer">2</VersionInfo>
+           <VersionInfo Name="MinorVer">0</VersionInfo>
+           <VersionInfo Name="Release">0</VersionInfo>
+           <VersionInfo Name="Build">2552</VersionInfo>
+           <VersionInfo Name="Debug">False</VersionInfo>
+           <VersionInfo Name="PreRelease">False</VersionInfo>
+           <VersionInfo Name="Special">False</VersionInfo>
+           <VersionInfo Name="Private">False</VersionInfo>
+           <VersionInfo Name="DLL">False</VersionInfo>
+           <VersionInfo Name="Locale">1031</VersionInfo>
+           <VersionInfo Name="CodePage">1252</VersionInfo>
+         </VersionInfo>
+         <VersionInfoKeys>
+          <VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys>
+          <VersionInfoKeys Name="FileDescription">JCL Debug IDE extension</VersionInfoKeys>
+          <VersionInfoKeys Name="FileVersion">2.0.0.2552</VersionInfoKeys>
+          <VersionInfoKeys Name="InternalName">JclDebugExpert</VersionInfoKeys>
+          <VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2007 Project JEDI</VersionInfoKeys>
+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+          <VersionInfoKeys Name="OriginalFilename">JclDebugExpert110.bpl</VersionInfoKeys>
+          <VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys>
+          <VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys>
+         </VersionInfoKeys>
+         <Source>
+           <Source Name="MainSource">JclDebugExpert.dpk</Source>
+         </Source>
+         <Package_Options>
+           <Package_Options Name="LibSuffix">110</Package_Options>
+         </Package_Options>
+       </Delphi.Personality>
+    </BorlandProject>
+  </BorlandProject>
   </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+  <ItemGroup />
   <ItemGroup>
     <DelphiCompile Include="JclDebugExpert.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\experts\debug\converter\JclDebugIdeConfigFrame.pas">
-      <Form>JclDebugIdeConfigFrame</Form>
-    </DCCReference>
-    <DCCReference Include="..\..\experts\debug\converter\JclDebugIdeImpl.pas" />
-    <DCCReference Include="..\..\experts\debug\converter\JclDebugIdeResult.pas">
-      <Form>JclDebugResultForm</Form>
-    </DCCReference>
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\designide.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\Jcl.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\JclBaseExpert.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\rtl.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\vcl.dcp" />
+    <DCCReference Include="rtl.dcp" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+</Project>

Modified: trunk/jcl/packages/d11/JclDebugExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclDebugExpertDLL.dproj	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/JclDebugExpertDLL.dproj	2007-04-16 07:34:08 UTC (rev 1985)
@@ -69,10 +69,13 @@
           <VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys>
           <VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys>
          </VersionInfoKeys>
-        <Source>
-          <Source Name="MainSource">JclDebugExpertDLL.dpr</Source>
-        </Source>
-      </Delphi.Personality>
+         <Source>
+           <Source Name="MainSource">JclDebugExpertDLL.dpr</Source>
+         </Source>
+         <Package_Options>
+           <Package_Options Name="LibSuffix">110</Package_Options>
+         </Package_Options>
+       </Delphi.Personality>
     </BorlandProject>
   </BorlandProject>
   </ProjectExtensions>

Modified: trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dpk
===================================================================
--- trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dpk	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dpk	2007-04-16 07:34:08 UTC (rev 1985)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpert-D.xml)
 
-     Last generated: 15-04-2007  13:27:16 UTC
+     Last generated: 16-04-2007  07:23:45 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -31,7 +31,7 @@
 {$MINENUMSIZE 1}
 {$IMAGEBASE $58040000}
 {$DESCRIPTION 'JCL Open and Save IDE dialogs with favorite folders'}
-{$LIBSUFFIX '100'}
+{$LIBSUFFIX '110'}
 {$DESIGNONLY}
 {$IMPLICITBUILD OFF}
 

Modified: trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj	2007-04-16 07:34:08 UTC (rev 1985)
@@ -1,11 +1,10 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{a386453b-7eca-4194-9fb0-ef11defa9aa0}</ProjectGuid>
+    <ProjectGuid></ProjectGuid>
     <MainSource>JclFavoriteFoldersExpert.dpk</MainSource>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>C:\Dokumente und Einstellungen\All Users\Dokumente\RAD Studio\5.0\Bpl\JclFavoriteFoldersExpert100.bpl</DCC_DependencyCheckOutputName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Version>7.0</Version>
@@ -31,37 +30,61 @@
     <DCC_UnitSearchPath>..\..\lib\d11\debug;..\..\source</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\lib\d11\debug;..\..\source</DCC_ResourcePath>
     <DCC_ObjPath>..\..\lib\d11\debug;..\..\source</DCC_ObjPath>
-    <DCC_IncludePath>..\..\lib\d11\debug;..\..\source</DCC_IncludePath>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_WriteableConstants>True</DCC_WriteableConstants>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_ImageBase>58040000</DCC_ImageBase>
+    <DCC_IncludePath>..\..\lib\d11\debug;..\..\source</DCC_IncludePath>    
   </PropertyGroup>
   <ProjectExtensions>
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">2552</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1031</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys><VersionInfoKeys Name="FileDescription">JCL Open and Save IDE dialogs with favorite folders</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.0.0.2552</VersionInfoKeys><VersionInfoKeys Name="InternalName">JclFavoriteFoldersExpert</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2007 Project JEDI</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename">JclFavoriteFoldersExpert110.bpl</VersionInfoKeys><VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">JclFavoriteFoldersExpert.dpk</Source></Source>  <Package_Options>
-      <Package_Options Name="PackageDescription">JCL Open and Save IDE dialogs with favorite folders</Package_Options>
-      <Package_Options Name="ImplicitBuild">False</Package_Options>
-      <Package_Options Name="DesigntimeOnly">True</Package_Options>
-      <Package_Options Name="RuntimeOnly">False</Package_Options>
-      <Package_Options Name="LibSuffix">100</Package_Options>
-    </Package_Options>
-  </Delphi.Personality></BorlandProject></BorlandProject>
+      <BorlandProject xmlns=""> 
+        <Delphi.Personality>
+          <Parameters>
+            <Parameters Name="UseLauncher">False</Parameters>
+            <Parameters Name="LoadAllSymbols">True</Parameters>
+            <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+          </Parameters>
+          <VersionInfo>
+           <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+           <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+           <VersionInfo Name="MajorVer">2</VersionInfo>
+           <VersionInfo Name="MinorVer">0</VersionInfo>
+           <VersionInfo Name="Release">0</VersionInfo>
+           <VersionInfo Name="Build">2552</VersionInfo>
+           <VersionInfo Name="Debug">False</VersionInfo>
+           <VersionInfo Name="PreRelease">False</VersionInfo>
+           <VersionInfo Name="Special">False</VersionInfo>
+           <VersionInfo Name="Private">False</VersionInfo>
+           <VersionInfo Name="DLL">False</VersionInfo>
+           <VersionInfo Name="Locale">1031</VersionInfo>
+           <VersionInfo Name="CodePage">1252</VersionInfo>
+         </VersionInfo>
+         <VersionInfoKeys>
+          <VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys>
+          <VersionInfoKeys Name="FileDescription">JCL Open and Save IDE dialogs with favorite folders</VersionInfoKeys>
+          <VersionInfoKeys Name="FileVersion">2.0.0.2552</VersionInfoKeys>
+          <VersionInfoKeys Name="InternalName">JclFavoriteFoldersExpert</VersionInfoKeys>
+          <VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2007 Project JEDI</VersionInfoKeys>
+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+          <VersionInfoKeys Name="OriginalFilename">JclFavoriteFoldersExpert110.bpl</VersionInfoKeys>
+          <VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys>
+          <VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys>
+         </VersionInfoKeys>
+         <Source>
+           <Source Name="MainSource">JclFavoriteFoldersExpert.dpk</Source>
+         </Source>
+         <Package_Options>
+           <Package_Options Name="LibSuffix">110</Package_Options>
+         </Package_Options>
+       </Delphi.Personality>
+    </BorlandProject>
+  </BorlandProject>
   </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+  <ItemGroup />
   <ItemGroup>
     <DelphiCompile Include="JclFavoriteFoldersExpert.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas" />
-    <DCCReference Include="..\..\experts\favfolders\OpenDlgFavAdapter.pas" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\designide.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\Jcl.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\JclBaseExpert.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\rtl.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\vcl.dcp" />
+    <DCCReference Include="rtl.dcp" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+</Project>

Modified: trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj	2007-04-16 07:34:08 UTC (rev 1985)
@@ -69,10 +69,13 @@
           <VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys>
           <VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys>
          </VersionInfoKeys>
-        <Source>
-          <Source Name="MainSource">JclFavoriteFoldersExpertDLL.dpr</Source>
-        </Source>
-      </Delphi.Personality>
+         <Source>
+           <Source Name="MainSource">JclFavoriteFoldersExpertDLL.dpr</Source>
+         </Source>
+         <Package_Options>
+           <Package_Options Name="LibSuffix">110</Package_Options>
+         </Package_Options>
+       </Delphi.Personality>
     </BorlandProject>
   </BorlandProject>
   </ProjectExtensions>

Modified: trunk/jcl/packages/d11/JclProjectAnalysisExpert.dpk
===================================================================
--- trunk/jcl/packages/d11/JclProjectAnalysisExpert.dpk	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/JclProjectAnalysisExpert.dpk	2007-04-16 07:34:08 UTC (rev 1985)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclProjectAnalysisExpert-D.xml)
 
-     Last generated: 15-04-2007  13:27:16 UTC
+     Last generated: 16-04-2007  07:23:45 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -31,7 +31,7 @@
 {$MINENUMSIZE 1}
 {$IMAGEBASE $58060000}
 {$DESCRIPTION 'JCL Project Analyzer'}
-{$LIBSUFFIX '100'}
+{$LIBSUFFIX '110'}
 {$DESIGNONLY}
 {$IMPLICITBUILD OFF}
 

Modified: trunk/jcl/packages/d11/JclProjectAnalysisExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclProjectAnalysisExpert.dproj	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/JclProjectAnalysisExpert.dproj	2007-04-16 07:34:08 UTC (rev 1985)
@@ -1,11 +1,10 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{7646b766-37c2-4191-9167-2b34abd15f13}</ProjectGuid>
+    <ProjectGuid></ProjectGuid>
     <MainSource>JclProjectAnalysisExpert.dpk</MainSource>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>C:\Dokumente und Einstellungen\All Users\Dokumente\RAD Studio\5.0\Bpl\JclProjectAnalysisExpert100.bpl</DCC_DependencyCheckOutputName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Version>7.0</Version>
@@ -31,39 +30,61 @@
     <DCC_UnitSearchPath>..\..\lib\d11\debug;..\..\source</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\lib\d11\debug;..\..\source</DCC_ResourcePath>
     <DCC_ObjPath>..\..\lib\d11\debug;..\..\source</DCC_ObjPath>
-    <DCC_IncludePath>..\..\lib\d11\debug;..\..\source</DCC_IncludePath>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_WriteableConstants>True</DCC_WriteableConstants>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_ImageBase>58060000</DCC_ImageBase>
+    <DCC_IncludePath>..\..\lib\d11\debug;..\..\source</DCC_IncludePath>    
   </PropertyGroup>
   <ProjectExtensions>
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">2552</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1031</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys><VersionInfoKeys Name="FileDescription">JCL Project Analyzer</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.0.0.2552</VersionInfoKeys><VersionInfoKeys Name="InternalName">JclProjectAnalysisExpert</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2007 Project JEDI</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename">JclProjectAnalysisExpert110.bpl</VersionInfoKeys><VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">JclProjectAnalysisExpert.dpk</Source></Source>  <Package_Options>
-      <Package_Options Name="PackageDescription">JCL Project Analyzer</Package_Options>
-      <Package_Options Name="ImplicitBuild">False</Package_Options>
-      <Package_Options Name="DesigntimeOnly">True</Package_Options>
-      <Package_Options Name="RuntimeOnly">False</Package_Options>
-      <Package_Options Name="LibSuffix">100</Package_Options>
-    </Package_Options>
-  </Delphi.Personality></BorlandProject></BorlandProject>
+      <BorlandProject xmlns=""> 
+        <Delphi.Personality>
+          <Parameters>
+            <Parameters Name="UseLauncher">False</Parameters>
+            <Parameters Name="LoadAllSymbols">True</Parameters>
+            <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+          </Parameters>
+          <VersionInfo>
+           <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+           <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+           <VersionInfo Name="MajorVer">2</VersionInfo>
+           <VersionInfo Name="MinorVer">0</VersionInfo>
+           <VersionInfo Name="Release">0</VersionInfo>
+           <VersionInfo Name="Build">2552</VersionInfo>
+           <VersionInfo Name="Debug">False</VersionInfo>
+           <VersionInfo Name="PreRelease">False</VersionInfo>
+           <VersionInfo Name="Special">False</VersionInfo>
+           <VersionInfo Name="Private">False</VersionInfo>
+           <VersionInfo Name="DLL">False</VersionInfo>
+           <VersionInfo Name="Locale">1031</VersionInfo>
+           <VersionInfo Name="CodePage">1252</VersionInfo>
+         </VersionInfo>
+         <VersionInfoKeys>
+          <VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys>
+          <VersionInfoKeys Name="FileDescription">JCL Project Analyzer</VersionInfoKeys>
+          <VersionInfoKeys Name="FileVersion">2.0.0.2552</VersionInfoKeys>
+          <VersionInfoKeys Name="InternalName">JclProjectAnalysisExpert</VersionInfoKeys>
+          <VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2007 Project JEDI</VersionInfoKeys>
+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+          <VersionInfoKeys Name="OriginalFilename">JclProjectAnalysisExpert110.bpl</VersionInfoKeys>
+          <VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys>
+          <VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys>
+         </VersionInfoKeys>
+         <Source>
+           <Source Name="MainSource">JclProjectAnalysisExpert.dpk</Source>
+         </Source>
+         <Package_Options>
+           <Package_Options Name="LibSuffix">110</Package_Options>
+         </Package_Options>
+       </Delphi.Personality>
+    </BorlandProject>
+  </BorlandProject>
   </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+  <ItemGroup />
   <ItemGroup>
     <DelphiCompile Include="JclProjectAnalysisExpert.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\experts\projectanalyzer\ProjAnalyzerFrm.pas">
-      <Form>ProjectAnalyzerForm</Form>
-    </DCCReference>
-    <DCCReference Include="..\..\experts\projectanalyzer\ProjAnalyzerImpl.pas" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\designide.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\Jcl.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\JclBaseExpert.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\rtl.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\vcl.dcp" />
+    <DCCReference Include="rtl.dcp" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+</Project>

Modified: trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.dproj	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.dproj	2007-04-16 07:34:08 UTC (rev 1985)
@@ -69,10 +69,13 @@
           <VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys>
           <VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys>
          </VersionInfoKeys>
-        <Source>
-          <Source Name="MainSource">JclProjectAnalysisExpertDLL.dpr</Source>
-        </Source>
-      </Delphi.Personality>
+         <Source>
+           <Source Name="MainSource">JclProjectAnalysisExpertDLL.dpr</Source>
+         </Source>
+         <Package_Options>
+           <Package_Options Name="LibSuffix">110</Package_Options>
+         </Package_Options>
+       </Delphi.Personality>
     </BorlandProject>
   </BorlandProject>
   </ProjectExtensions>

Modified: trunk/jcl/packages/d11/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d11/JclRepositoryExpert.dpk	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/JclRepositoryExpert.dpk	2007-04-16 07:34:08 UTC (rev 1985)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
 
-     Last generated: 15-04-2007  13:27:16 UTC
+     Last generated: 16-04-2007  07:23:45 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -31,7 +31,7 @@
 {$MINENUMSIZE 1}
 {$IMAGEBASE $58000000}
 {$DESCRIPTION 'JCL Package containing repository wizards'}
-{$LIBSUFFIX '100'}
+{$LIBSUFFIX '110'}
 {$DESIGNONLY}
 {$IMPLICITBUILD OFF}
 

Modified: trunk/jcl/packages/d11/JclRepositoryExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclRepositoryExpert.dproj	2007-04-15 14:58:03 UTC (rev 1984)
+++ trunk/jcl/packages/d11/JclRepositoryExpert.dproj	2007-04-16 07:34:08 UTC (rev 1985)
@@ -1,11 +1,10 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{851eae7d-f085-42a3-99c3-605a93c19023}</ProjectGuid>
+    <ProjectGuid></ProjectGuid>
     <MainSource>JclRepositoryExpert.dpk</MainSource>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>C:\Dokumente und Einstellungen\All Users\Dokumente\RAD Studio\5.0\Bpl\JclRepositoryExpert100.bpl</DCC_DependencyCheckOutputName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Version>7.0</Version>
@@ -31,57 +30,61 @@
     <DCC_UnitSearchPath>..\..\lib\d11\debug;..\..\source</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\lib\d11\debug;..\..\source</DCC_ResourcePath>
     <DCC_ObjPath>..\..\lib\d11\debug;..\..\source</DCC_ObjPath>
-    <DCC_IncludePath>..\..\lib\d11\debug;..\..\source</DCC_IncludePath>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_WriteableConstants>True</DCC_WriteableConstants>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_ImageBase>58000000</DCC_ImageBase>
+    <DCC_IncludePath>..\..\lib\d11\debug;..\..\source</DCC_IncludePath>    
   </PropertyGroup>
   <ProjectExtensions>
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">2552</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1031</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys><VersionInfoKeys Name="FileDescription">JCL Package containing repository wizards</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.0.0.2552</VersionInfoKeys><VersionInfoKeys Name="InternalName">JclRepositoryExpert</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2007 Project JEDI</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename">JclRepositoryExpert110.bpl</VersionInfoKeys><VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">JclRepositoryExpert.dpk</Source></Source>  <Package_Options>
-      <Package_Options Name="PackageDescription">JCL Package containing repository wizards</Package_Options>
-      <Package_Options Name="ImplicitBuild">False</Package_Options>
-      <Package_Options Name="DesigntimeOnly">True</Package_Options>
-      <Package_Options Name="RuntimeOnly">False</Package_Options>
-      <Package_Options Name="LibSuffix">100</Package_Options>
-    </Package_Options>
-  </Delphi.Personality></BorlandProject></BorlandProject>
+      <BorlandProject xmlns=""> 
+        <Delphi.Personality>
+          <Parameters>
+            <Parameters Name="UseLauncher">False</Parameters>
+            <Parameters Name="LoadAllSymbols">True</Parameters>
+            <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+          </Parameters>
+          <VersionInfo>
+           <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+           <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+           <VersionInfo Name="MajorVer">2</VersionInfo>
+           <VersionInfo Name="MinorVer">0</VersionInfo>
+           <VersionInfo Name="Release">0</VersionInfo>
+           <VersionInfo Name="Build">2552</VersionInfo>
+           <VersionInfo Name="Debug">False</VersionInfo>
+           <VersionInfo Name="PreRelease">False</VersionInfo>
+           <VersionInfo Name="Special">False</VersionInfo>
+           <VersionInfo Name="Private">False</VersionInfo>
+           <VersionInfo Name="DLL">False</VersionInfo>
+           <VersionInfo Name="Locale">1031</VersionInfo>
+           <VersionInfo Name="CodePage">1252</VersionInfo>
+         </VersionInfo>
+         <VersionInfoKeys>
+          <VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys>
+          <VersionInfoKeys Name="FileDescription">JCL Package containing repository wizards</VersionInfoKeys>
+          <VersionInfoKeys Name="FileVersion">2.0.0.2552</VersionInfoKeys>
+          <VersionInfoKeys Name="InternalName">JclRepositoryExpert</VersionInfoKeys>
+          <VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2007 Project JEDI</VersionInfoKeys>
+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+          <VersionInfoKeys Name="OriginalFilename">JclRepositoryExpert110.bpl</VersionInfoKeys>
+          <VersionInfoKeys Name="ProductName">Jedi Code Library</VersionInfoKeys>
+          <VersionInfoKeys Name="ProductVersion">2.0 Build 2552</VersionInfoKeys>
+         </VersionInfoKeys>
+         <Source>
+           <Source Name="MainSource">JclRepositoryExpert.dpk</Source>
+         </Source>
+         <Package_Options>
+           <Package_Options Name="LibSuffix">110</Package_Options>
+         </Package_Options>
+       </Delphi.Personality>
+    </BorlandProject>
+  </BorlandProject>
   </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+  <ItemGroup />
   <ItemGroup>
     <DelphiCompile Include="JclRepositoryExpert.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\experts\debug\dialog\JclOtaExcDlgFileFrame.pas">
-      <Form>JclOtaExcDlgFilePage</Form>
-    </DCCReference>
-    <DCCReference Include="..\..\experts\debug\dialog\JclOtaExcDlgFormFrame.pas">
-      <Form>JclOtaExcDlgFormPage</Form>
-    </DCCReference>
-    <DCCReference Include="..\..\experts\debug\dialog\JclOtaExcDlgIgnoreFrame.pas">
-      <Form>JclOtaExcDlgIgnoredPage</Form>
-    </DCCReference>
-    <DCCReference Include="..\..\experts\debug\dialog\JclOtaExcDlgRepository.pas" />
-    <DCCReference Include="..\..\experts\debug\dialog\JclOtaExcDlgSystemFrame.pas">
-      <Form>JclOtaExcDlgSystemPage</Form>
-    </DCCReference>
-    <DCCReference Include="..\..\experts\debug\dialog\JclOtaExcDlgTraceFrame.pas">
-      <Form>JclOtaExcDlgTracePage</Form>
-    </DCCReference>
-    <DCCReference Include="..\..\experts\debug\dialog\JclOtaExcDlgWizard.pas">
-      <Form>JclOtaExcDlgForm</Form>
-    </DCCReference>
-    <DCCReference Include="..\..\experts\debug\dialog\JclOtaRepositoryReg.pas" />
-    <DCCReference Include="..\..\experts\debug\dialog\JclOtaRepositoryUtils.pas" />
-    <DCCReference Include="..\..\experts\debug\dialog\JclOtaTemplates.pas" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\designide.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\Jcl.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\JclBaseExpert.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\rtl.dcp" />
-    <DCCReference Include="C:\Dokumente und Einstellungen\Andreas\vcl.dcp" />
+    <DCCReference Include="rtl.dcp" />
   </ItemGroup>
-</Project...
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl: [1984] trunk/jcl/source/common/JclStringLists.pas

From: <ah...@us...> - 2007-04-15 14:58:06

Revision: 1984
          http://svn.sourceforge.net/jcl/?rev=1984&view=rev
Author:   ahuser
Date:     2007-04-15 07:58:03 -0700 (Sun, 15 Apr 2007)

Log Message:
-----------
Delphi 5 support

Modified Paths:
--------------
    trunk/jcl/source/common/JclStringLists.pas

Modified: trunk/jcl/source/common/JclStringLists.pas
===================================================================
--- trunk/jcl/source/common/JclStringLists.pas	2007-04-15 14:14:06 UTC (rev 1983)
+++ trunk/jcl/source/common/JclStringLists.pas	2007-04-15 14:58:03 UTC (rev 1984)
@@ -29,8 +29,6 @@
 
 interface
 
-{$IFNDEF COMPILER5} // Delphi 5 isn't supported
-
 uses
   {$IFDEF UNITVERSIONING}
   JclUnitVersioning,
@@ -64,7 +62,9 @@
     function GetValue(const Name: string): string;
     function Find(const S: string; var Index: Integer): Boolean;
     function IndexOf(const S: string): Integer;
+    {$IFDEF COMPILER6_UP}
     function GetCaseSensitive: Boolean;
+    {$ENDIF COMPILER6_UP}
     function GetDuplicates: TDuplicates;
     function GetOnChange: TNotifyEvent;
     function GetOnChanging: TNotifyEvent;
@@ -77,29 +77,39 @@
     function SaveToFile(const FileName: string): IJclStringList;
     function SaveToStream(Stream: TStream): IJclStringList;
     function GetCommaText: string;
+    {$IFDEF COMPILER6_UP}
     function GetDelimitedText: string;
     function GetDelimiter: Char;
+    {$ENDIF COMPILER6_UP}
     function GetName(Index: Integer): string;
     {$IFDEF COMPILER7_UP}
     function GetNameValueSeparator: Char;
     function GetValueFromIndex(Index: Integer): string;
     {$ENDIF COMPILER7_UP}
+    {$IFDEF COMPILER6_UP}
     function GetQuoteChar: Char;
+    {$ENDIF COMPILER6_UP}
     procedure SetCommaText(const Value: string);
+    {$IFDEF COMPILER6_UP}
     procedure SetDelimitedText(const Value: string);
     procedure SetDelimiter(const Value: Char);
+    {$ENDIF COMPILER6_UP}
     {$IFDEF COMPILER7_UP}
     procedure SetNameValueSeparator(const Value: Char);
     procedure SetValueFromIndex(Index: Integer; const Value: string);
     {$ENDIF COMPILER7_UP}
+    {$IFDEF COMPILER6_UP}
     procedure SetQuoteChar(const Value: Char);
+    {$ENDIF COMPILER6_UP}
     procedure AddStrings(Strings: TStrings); overload;
     procedure SetObjects(Index: Integer; const Value: TObject);
     procedure Put(Index: Integer; const S: string);
     procedure SetCapacity(NewCapacity: Integer);
     procedure SetTextStr(const Value: string);
     procedure SetValue(const Name, Value: string);
+    {$IFDEF COMPILER6_UP}
     procedure SetCaseSensitive(const Value: Boolean);
+    {$ENDIF COMPILER6_UP}
     procedure SetDuplicates(const Value: TDuplicates);
     procedure SetOnChange(const Value: TNotifyEvent);
     procedure SetOnChanging(const Value: TNotifyEvent);
@@ -112,13 +122,19 @@
     property Values[const Name: string]: string read GetValue write SetValue;
     property Duplicates: TDuplicates read GetDuplicates write SetDuplicates;
     property Sorted: Boolean read GetSorted write SetSorted;
+    {$IFDEF COMPILER6_UP}
     property CaseSensitive: Boolean read GetCaseSensitive write SetCaseSensitive;
+    {$ENDIF COMPILER6_UP}
     property OnChange: TNotifyEvent read GetOnChange write SetOnChange;
     property OnChanging: TNotifyEvent read GetOnChanging write SetOnChanging;
+    {$IFDEF COMPILER6_UP}
+    property DelimitedText: string read GetDelimitedText write SetDelimitedText;
     property Delimiter: Char read GetDelimiter write SetDelimiter;
-    property DelimitedText: string read GetDelimitedText write SetDelimitedText;
+    {$ENDIF COMPILER6_UP}
     property Names[Index: Integer]: string read GetName;
+    {$IFDEF COMPILER6_UP}
     property QuoteChar: Char read GetQuoteChar write SetQuoteChar;
+    {$ENDIF COMPILER6_UP}
     property CommaText: string read GetCommaText write SetCommaText;
     {$IFDEF COMPILER7_UP}
     property ValueFromIndex[Index: Integer]: string read GetValueFromIndex write SetValueFromIndex;
@@ -203,15 +219,11 @@
     );
 {$ENDIF UNITVERSIONING}
 
-{$ENDIF ~COMPILER5} // Delphi 5 isn't supported
-
 implementation
 
-{$IFNDEF COMPILER5} // Delphi 5 isn't supported
-
 uses
   TypInfo,
-  JclPCRE, JclStrings;
+  JclFileUtils, JclPCRE, JclStrings;
 
 type
   TUpdateControl = class(TObject, IInterface)
@@ -252,20 +264,26 @@
     function GetValue(const Name: string): string;
     function GetVariants(AIndex: Integer): Variant;
     function GetKeyList(const AKey: string): IJclStringList;
+    {$IFDEF COMPILER6_UP}
     function GetCaseSensitive: Boolean;
+    {$ENDIF COMPILER6_UP}
     function GetDuplicates: TDuplicates;
     function GetOnChange: TNotifyEvent;
     function GetOnChanging: TNotifyEvent;
     function GetSorted: Boolean;
     function GetCommaText: string;
+    {$IFDEF COMPILER6_UP}
     function GetDelimitedText: string;
     function GetDelimiter: Char;
+    {$ENDIF COMPILER6_UP}
     function GetName(Index: Integer): string;
     {$IFDEF COMPILER7_UP}
     function GetNameValueSeparator: Char;
     function GetValueFromIndex(Index: Integer): string;
     {$ENDIF COMPILER7_UP}
+    {$IFDEF COMPILER6_UP}
     function GetQuoteChar: Char;
+    {$ENDIF COMPILER6_UP}
     function GetInterfaceByIndex(AIndex: Integer): IInterface;
     function GetObjects(Index: Integer): TObject;
     procedure SetValue(const Name, Value: string);
@@ -275,19 +293,25 @@
     procedure SetKeyVariant(const AKey: string; const Value: Variant);
     procedure SetLists(Index: Integer; const Value: IJclStringList);
     procedure SetVariants(Index: Integer; const Value: Variant);
+    {$IFDEF COMPILER6_UP}
     procedure SetCaseSensitive(const Value: Boolean);
+    {$ENDIF COMPILER6_UP}
     procedure SetDuplicates(const Value: TDuplicates);
     procedure SetOnChange(const Value: TNotifyEvent);
     procedure SetOnChanging(const Value: TNotifyEvent);
     procedure SetSorted(const Value: Boolean);
     procedure SetCommaText(const Value: string);
+    {$IFDEF COMPILER6_UP}
     procedure SetDelimitedText(const Value: string);
     procedure SetDelimiter(const Value: Char);
+    {$ENDIF COMPILER6_UP}
     {$IFDEF COMPILER7_UP}
     procedure SetNameValueSeparator(const Value: Char);
     procedure SetValueFromIndex(Index: Integer; const Value: string);
     {$ENDIF COMPILER7_UP}
+    {$IFDEF COMPILER6_UP}
     procedure SetQuoteChar(const Value: Char);
+    {$ENDIF COMPILER6_UP}
     procedure SetInterfaceByIndex(Index: Integer; const Value: IInterface);
     procedure SetObjects(Index: Integer; const Value: TObject);
     procedure EnsureObjectsMode(AMode: TJclStringListObjectsMode);
@@ -297,6 +321,9 @@
     function QueryInterface(const IID: TGUID; out Obj): HRESULT; stdcall;
     function _AddRef: Integer; stdcall;
     function _Release: Integer; stdcall;
+    {$IFDEF COMPILER5}
+    function CompareStrings(const S1, S2: string): Integer; virtual;
+    {$ENDIF COMPILER5}
   public
     constructor Create;
     destructor Destroy; override;
@@ -346,10 +373,14 @@
     function Assign(Source: TPersistent): IJclStringList; reintroduce;
     { From TStrings/TStringList }
     property Values[const Name: string]: string read GetValue write SetValue;
+    {$IFDEF COMPILER6_UP}
+    property DelimitedText: string read GetDelimitedText write SetDelimitedText;
     property Delimiter: Char read GetDelimiter write SetDelimiter;
-    property DelimitedText: string read GetDelimitedText write SetDelimitedText;
+    {$ENDIF COMPILER6_UP}
     property Names[Index: Integer]: string read GetName;
+    {$IFDEF COMPILER6_UP}
     property QuoteChar: Char read GetQuoteChar write SetQuoteChar;
+    {$ENDIF COMPILER6_UP}
     property CommaText: string read GetCommaText write SetCommaText;
     {$IFDEF COMPILER7_UP}
     property ValueFromIndex[Index: Integer]: string read GetValueFromIndex write SetValueFromIndex;
@@ -357,7 +388,9 @@
     {$ENDIF COMPILER7_UP}
     property Duplicates: TDuplicates read GetDuplicates write SetDuplicates;
     property Sorted: Boolean read GetSorted write SetSorted;
+    {$IFDEF COMPILER6_UP}
     property CaseSensitive: Boolean read GetCaseSensitive write SetCaseSensitive;
+    {$ENDIF COMPILER6_UP}
     property OnChange: TNotifyEvent read GetOnChange write SetOnChange;
     property OnChanging: TNotifyEvent read GetOnChanging write SetOnChanging;
     { New }
@@ -402,6 +435,8 @@
 //=== { TJclStringListImpl } =================================================
 
 function TJclStringListImpl.Add(const A: array of const): IJclStringList;
+const
+  BoolToStr: array [Boolean] of string[5] = ('false', 'true');
 var
   I: Integer;
 begin
@@ -412,7 +447,7 @@
         vtInteger:
           Add(IntToStr(VInteger));
         vtBoolean:
-          Add(BoolToStr(VBoolean));
+          Add(BoolToStr[VBoolean]);
         vtChar:
           Add(VChar);
         vtExtended:
@@ -607,10 +642,12 @@
     FRegEx := TJclAnsiRegEx.Create;
   if FLastRegExPattern <> APattern then
   begin
+    {$IFDEF COMPILER6_UP}
     if CaseSensitive then
       FRegEx.Options := FRegEx.Options - [roIgnoreCase]
     else
       FRegEx.Options := FRegEx.Options + [roIgnoreCase];
+    {$ENDIF COMPILER6_UP}
     FRegEx.Compile(APattern, False, True);
     FLastRegExPattern := APattern;
   end;
@@ -646,7 +683,7 @@
           if (ARegExPattern = '') or MatchRegEx(LFullName, ARegExPattern) then
             Add(LFullName);
           if ARecursive then
-            DoDirectories(IncludeTrailingPathDelimiter(LFullName) + ExtractFileName(APattern));
+            DoDirectories(PathAddSeparator(LFullName) + ExtractFileName(APattern));
         until FindNext(LSearchRec) <> 0;
       finally
         FindClose(LSearchRec);
@@ -656,7 +693,7 @@
 begin
   AutoUpdateControl;
   if DirectoryExists(APattern) then
-    DoDirectories(IncludeTrailingPathDelimiter(APattern) + '*')
+    DoDirectories(PathAddSeparator(APattern) + '*')
   else
     DoDirectories(APattern);
   Result := FSelfAsInterface;
@@ -693,14 +730,14 @@
     begin
       LDirectories := JclStringList.Directories(LPath + '*', False);
       for I := 0 to LDirectories.LastIndex do
-        DoFiles(IncludeTrailingPathDelimiter(LDirectories[I]) + ExtractFileName(APattern));
+        DoFiles(PathAddSeparator(LDirectories[I]) + ExtractFileName(APattern));
     end;
   end;
 
 begin
   AutoUpdateControl;
   if DirectoryExists(APattern) then
-    DoFiles(IncludeTrailingPathDelimiter(APattern) + '*')
+    DoFiles(PathAddSeparator(APattern) + '*')
   else
     DoFiles(APattern);
   Result := FSelfAsInterface;
@@ -718,7 +755,11 @@
   inherited Create;
   FUpdateControl := TUpdateControl.Create(Self);
   if QueryInterface(IJclStringList, FSelfAsInterface) <> 0 then
+    {$IFDEF COMPILER5}
+    RunError(228 { reIntfCastError });
+    {$ELSE}
     System.Error(reIntfCastError);
+    {$ENDIF COMPILER5}
 end;
 
 function TJclStringListImpl.GetLists(Index: Integer): IJclStringList;
@@ -967,6 +1008,13 @@
   Result := FSelfAsInterface;
 end;
 
+{$IFDEF COMPILER5}
+function TJclStringListImpl.CompareStrings(const S1, S2: string): Integer;
+begin
+  Result := AnsiCompareText(S1, S2);
+end;
+{$ENDIF COMPILER5}
+
 function TJclStringListImpl.SortByName: IJclStringList;
 
   function LocalSortByName(List: TStringList; Index1, Index2: Integer): Integer;
@@ -991,10 +1039,12 @@
   Result := FSelfAsInterface;
 end;
 
+{$IFDEF COMPILER6_UP}
 function TJclStringListImpl.GetCaseSensitive: Boolean;
 begin
   Result := inherited CaseSensitive;
 end;
+{$ENDIF COMPILER6_UP}
 
 function TJclStringListImpl.GetDuplicates: TDuplicates;
 begin
@@ -1016,10 +1066,12 @@
   Result := inherited Sorted;
 end;
 
+{$IFDEF COMPILER6_UP}
 procedure TJclStringListImpl.SetCaseSensitive(const Value: Boolean);
 begin
   inherited CaseSensitive := Value;
 end;
+{$ENDIF COMPILER6_UP}
 
 procedure TJclStringListImpl.SetDuplicates(const Value: TDuplicates);
 begin
@@ -1070,6 +1122,8 @@
   Result := inherited CommaText;
 end;
 
+{$IFDEF COMPILER6_UP}
+
 function TJclStringListImpl.GetDelimitedText: string;
 begin
   Result := inherited DelimitedText;
@@ -1080,6 +1134,8 @@
   Result := inherited Delimiter;
 end;
 
+{$ENDIF COMPILER6_UP}
+
 function TJclStringListImpl.GetName(Index: Integer): string;
 begin
   Result := inherited Names[Index];
@@ -1099,16 +1155,20 @@
 
 {$ENDIF COMPILER7_UP}
 
+{$IFDEF COMPILER6_UP}
 function TJclStringListImpl.GetQuoteChar: Char;
 begin
   Result := inherited QuoteChar;
 end;
+{$ENDIF COMPILER6_UP}
 
 procedure TJclStringListImpl.SetCommaText(const Value: string);
 begin
   inherited CommaText := Value;
 end;
 
+{$IFDEF COMPILER6_UP}
+
 procedure TJclStringListImpl.SetDelimitedText(const Value: string);
 begin
   inherited DelimitedText := Value;
@@ -1119,6 +1179,8 @@
   inherited Delimiter := Value;
 end;
 
+{$ENDIF COMPILER6_UP}
+
 {$IFDEF COMPILER7_UP}
 
 procedure TJclStringListImpl.SetNameValueSeparator(const Value: Char);
@@ -1133,10 +1195,12 @@
 
 {$ENDIF COMPILER7_UP}
 
+{$IFDEF COMPILER6_UP}
 procedure TJclStringListImpl.SetQuoteChar(const Value: Char);
 begin
   inherited QuoteChar := Value;
 end;
+{$ENDIF COMPILER6_UP}
 
 function TJclStringListImpl.Delimit(const ADelimiter: string): IJclStringList;
 var
@@ -1312,6 +1376,4 @@
   UnregisterUnitVersion(HInstance);
 {$ENDIF UNITVERSIONING}
 
-{$ENDIF ~COMPILER5} // Delphi 5 isn't supported
-
 end.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

49 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 74 75 76 77 78 .. 92 > >> (Page 76 of 92)