Menu
▾
▴
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
|
|
From: <jfu...@us...> - 2012-01-02 21:47:46
|
Revision: 3667
http://jcl.svn.sourceforge.net/jcl/?rev=3667&view=rev
Author: jfudickar
Date: 2012-01-02 21:47:40 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
Function StrSplit added
Modified Paths:
--------------
trunk/jcl/source/common/JclStrings.pas
Modified: trunk/jcl/source/common/JclStrings.pas
===================================================================
--- trunk/jcl/source/common/JclStrings.pas 2012-01-01 16:33:36 UTC (rev 3666)
+++ trunk/jcl/source/common/JclStrings.pas 2012-01-02 21:47:40 UTC (rev 3667)
@@ -278,13 +278,24 @@
function StrSuffixIndex(const S: string; const Suffixes: array of string): SizeInt;
// String Extraction
+// Returns the String before SubStr
function StrAfter(const SubStr, S: string): string;
+/// Returns the string after SubStr
function StrBefore(const SubStr, S: string): string;
+/// Splits a string at SubStr, returns true when SubStr is found, Left contains the
+/// string before the SubStr and Rigth the string behind SubStr
+function StrSplit(const SubStr, S: string;var Left, Right : string): boolean;
+/// Returns the string between Start and Stop
function StrBetween(const S: string; const Start, Stop: Char): string;
+/// Returns the left N characters of the string
function StrChopRight(const S: string; N: SizeInt): string;
+/// Returns the left Count characters of the string
function StrLeft(const S: string; Count: SizeInt): string;
+/// Returns the string starting from position Start for the Count Characters
function StrMid(const S: string; Start, Count: SizeInt): string;
+/// Returns the string starting from position N to the end
function StrRestOf(const S: string; N: SizeInt): string;
+/// Returns the right Count characters of the string
function StrRight(const S: string; Count: SizeInt): string;
// Character Test Routines
@@ -2715,6 +2726,23 @@
Result := StrLeft(S, P - 1);
end;
+function StrSplit(const SubStr, S: string;var Left, Right : string): boolean;
+var
+ P: SizeInt;
+begin
+ P := StrFind(SubStr, S, 1);
+ Result:= p > 0;
+ if Result then
+ begin
+ Left := StrLeft(S, P - 1);
+ Right := StrRestOf(S, P + Length(SubStr));
+ end
+ else
+ begin
+ Left := '';
+ Right := '';
+ end;
+end;
function StrBetween(const S: string; const Start, Stop: Char): string;
var
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jfu...@us...> - 2012-01-01 16:33:43
|
Revision: 3666
http://jcl.svn.sourceforge.net/jcl/?rev=3666&view=rev
Author: jfudickar
Date: 2012-01-01 16:33:36 +0000 (Sun, 01 Jan 2012)
Log Message:
-----------
First fix to support SVN 1.7 Repositories.
We lost now the support of ignored fields.
Modified Paths:
--------------
trunk/jcl/source/vcl/JclVersionCtrlSVNImpl.pas
Modified: trunk/jcl/source/vcl/JclVersionCtrlSVNImpl.pas
===================================================================
--- trunk/jcl/source/vcl/JclVersionCtrlSVNImpl.pas 2011-12-31 11:46:11 UTC (rev 3665)
+++ trunk/jcl/source/vcl/JclVersionCtrlSVNImpl.pas 2012-01-01 16:33:36 UTC (rev 3666)
@@ -43,6 +43,7 @@
JclVersionControl;
type
+ TSvnDirVersion = (sdvNone, sdv10, sdv17);
TJclVersionControlSVN = class (TJclVersionControlPlugin)
private
FTortoiseSVNProc: string;
@@ -51,7 +52,9 @@
function GetFileActions(const FileName: TFileName): TJclVersionControlActionTypes; override;
function GetSandboxActions(const SdBxName: TFileName): TJclVersionControlActionTypes; override;
function GetEnabled: Boolean; override;
+ function GetSVNBaseDir(const FileName: TFileName): string;
function GetName: string; override;
+ function SVNSupportedDirVersion(const FileDir: String): TSvnDirVersion;
public
constructor Create; override;
destructor Destroy; override;
@@ -103,6 +106,7 @@
JclVersionCtrlSVNDirectory1 = '.svn\';
JclVersionCtrlSVNDirectory2 = '_svn\';
JclVersionCtrlSVNEntryFile = 'entries';
+ JclVersionCtrlSVNDbFile = 'wc.db';
JclVersionCtrlSVNDirectories: array [0..1] of string =
( JclVersionCtrlSVNDirectory1, JclVersionCtrlSVNDirectory2 );
@@ -241,11 +245,21 @@
EntryFileName, UpperCaseFileName, XmlFileNameValue: TFileName;
Entries: TJclAnsiMappedTextReader;
IndexDir: Integer;
+ SupportedDirVersion: TSvnDirVersion;
begin
Result := inherited GetFileActions(FileName);
if Enabled then
begin
+ SupportedDirVersion := SVNSupportedDirVersion(ExtractFilePath(FileName));
+ if SupportedDirVersion = sdv17 then
+ begin
+ Result := GetSupportedActionTypes;
+ Exit;
+ end
+ else if SupportedDirVersion = sdvNone then
+ Exit;
+
UpperCaseFileName := StrUpper(ExtractFileName(FileName));
XmlFileNameValue := Format('NAME="%s"', [UpperCaseFileName]);
@@ -295,6 +309,27 @@
end;
end;
+function TJclVersionControlSVN.GetSVNBaseDir(const FileName: TFileName): string;
+var
+ DirectoryName: String;
+ IndexFileName: Integer;
+ IndexDir: Integer;
+begin
+ Result := '';
+ if Enabled then
+ for IndexFileName := Length(FileName) downto 1 do
+ if FileName[IndexFileName] = DirDelimiter then
+ begin
+ DirectoryName := Copy(FileName, 1, IndexFileName);
+ for IndexDir := Low(JclVersionCtrlSVNDirectories) to High(JclVersionCtrlSVNDirectories) do
+ if FileExists(DirectoryName + JclVersionCtrlSVNDirectories[IndexDir] + JclVersionCtrlSVNEntryFile) then
+ begin
+ Result := DirectoryName;
+ Exit;
+ end;
+ end;
+end;
+
function TJclVersionControlSVN.GetSupportedActionTypes: TJclVersionControlActionTypes;
begin
Result := inherited GetSupportedActionTypes;
@@ -371,6 +406,31 @@
Result := inherited GetSandboxNames(FileName, SdBxNames);
end;
+function TJclVersionControlSVN.SVNSupportedDirVersion(const FileDir: String): TSvnDirVersion;
+var
+ BaseDir: String;
+ IgnoreList: TStringList;
+ IgnoreDir : String;
+ i: Integer;
+ IndexDir: Integer;
+begin
+ Result := sdvNone;
+ if Enabled then
+ begin
+ BaseDir := GetSVNBaseDir(FileDir);
+ if (BaseDir <> '') then
+ begin
+ Result := sdv10;
+ for IndexDir := Low(JclVersionCtrlSVNDirectories) to High(JclVersionCtrlSVNDirectories) do
+ if FileExists(BaseDir + JclVersionCtrlSVNDirectories[IndexDir] + JclVersionCtrlSVNDbFile) then
+ begin
+ Result := sdv17;
+ exit;
+ end
+ end;
+ end;
+end;
+
initialization
{$IFDEF UNITVERSIONING}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-31 11:46:18
|
Revision: 3665
http://jcl.svn.sourceforge.net/jcl/?rev=3665&view=rev
Author: outchy
Date: 2011-12-31 11:46:11 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
manifest update.
Modified Paths:
--------------
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
Modified: trunk/jcl/source/windows/JclCommCtrlAdmin.manifest
===================================================================
--- trunk/jcl/source/windows/JclCommCtrlAdmin.manifest 2011-12-30 20:05:41 UTC (rev 3664)
+++ trunk/jcl/source/windows/JclCommCtrlAdmin.manifest 2011-12-31 11:46:11 UTC (rev 3665)
@@ -3,8 +3,8 @@
<assemblyIdentity
type="win32"
name="JEDI Code Library"
- version="2.0.0.2552"
- processorArchitecture="*"/>
+ version="2.4.0.4322"
+ processorArchitecture="X86"/>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: trunk/jcl/source/windows/JclCommCtrlAdmin.rc
===================================================================
--- trunk/jcl/source/windows/JclCommCtrlAdmin.rc 2011-12-30 20:05:41 UTC (rev 3664)
+++ trunk/jcl/source/windows/JclCommCtrlAdmin.rc 2011-12-31 11:46:11 UTC (rev 3665)
@@ -4,4 +4,4 @@
****************************************************************************************************/
-1 24 "JclCommCtrlAdmin.manifest"
+LANGUAGE 0,0 1 24 "JclCommCtrlAdmin.manifest"
Modified: trunk/jcl/source/windows/JclCommCtrlAdmin.res
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/JclCommCtrlAsInvoker.manifest
===================================================================
--- trunk/jcl/source/windows/JclCommCtrlAsInvoker.manifest 2011-12-30 20:05:41 UTC (rev 3664)
+++ trunk/jcl/source/windows/JclCommCtrlAsInvoker.manifest 2011-12-31 11:46:11 UTC (rev 3665)
@@ -3,8 +3,8 @@
<assemblyIdentity
type="win32"
name="JEDI Code Library"
- version="2.0.0.2552"
- processorArchitecture="*"/>
+ version="2.4.0.4322"
+ processorArchitecture="X86"/>
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: trunk/jcl/source/windows/JclCommCtrlAsInvoker.rc
===================================================================
--- trunk/jcl/source/windows/JclCommCtrlAsInvoker.rc 2011-12-30 20:05:41 UTC (rev 3664)
+++ trunk/jcl/source/windows/JclCommCtrlAsInvoker.rc 2011-12-31 11:46:11 UTC (rev 3665)
@@ -4,4 +4,4 @@
****************************************************************************************************/
-1 24 "JclCommCtrlAsInvoker.manifest"
+LANGUAGE 0,0 1 24 "JclCommCtrlAsInvoker.manifest"
Modified: trunk/jcl/source/windows/JclCommCtrlAsInvoker.res
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/JclNoDepAdmin.manifest
===================================================================
--- trunk/jcl/source/windows/JclNoDepAdmin.manifest 2011-12-30 20:05:41 UTC (rev 3664)
+++ trunk/jcl/source/windows/JclNoDepAdmin.manifest 2011-12-31 11:46:11 UTC (rev 3665)
@@ -3,8 +3,8 @@
<assemblyIdentity
type="win32"
name="JEDI Code Library"
- version="2.0.0.2552"
- processorArchitecture="*"/>
+ version="2.4.0.4322"
+ processorArchitecture="X86"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
Modified: trunk/jcl/source/windows/JclNoDepAdmin.rc
===================================================================
--- trunk/jcl/source/windows/JclNoDepAdmin.rc 2011-12-30 20:05:41 UTC (rev 3664)
+++ trunk/jcl/source/windows/JclNoDepAdmin.rc 2011-12-31 11:46:11 UTC (rev 3665)
@@ -4,4 +4,4 @@
****************************************************************************************************/
-1 24 "JclNoDepAdmin.manifest"
+LANGUAGE 0,0 1 24 "JclNoDepAdmin.manifest"
Modified: trunk/jcl/source/windows/JclNoDepAdmin.res
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/JclNoDepAsInvoker.manifest
===================================================================
--- trunk/jcl/source/windows/JclNoDepAsInvoker.manifest 2011-12-30 20:05:41 UTC (rev 3664)
+++ trunk/jcl/source/windows/JclNoDepAsInvoker.manifest 2011-12-31 11:46:11 UTC (rev 3665)
@@ -3,8 +3,8 @@
<assemblyIdentity
type="win32"
name="JEDI Code Library"
- version="2.0.0.2552"
- processorArchitecture="*"/>
+ version="2.4.0.4322"
+ processorArchitecture="X86"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
Modified: trunk/jcl/source/windows/JclNoDepAsInvoker.rc
===================================================================
--- trunk/jcl/source/windows/JclNoDepAsInvoker.rc 2011-12-30 20:05:41 UTC (rev 3664)
+++ trunk/jcl/source/windows/JclNoDepAsInvoker.rc 2011-12-31 11:46:11 UTC (rev 3665)
@@ -4,4 +4,4 @@
****************************************************************************************************/
-1 24 "JclNoDepAsInvoker.manifest"
+LANGUAGE 0,0 1 24 "JclNoDepAsInvoker.manifest"
Modified: trunk/jcl/source/windows/JclNoDepAsInvoker.res
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-30 20:05:49
|
Revision: 3664
http://jcl.svn.sourceforge.net/jcl/?rev=3664&view=rev
Author: outchy
Date: 2011-12-30 20:05:41 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
prototype update.
Modified Paths:
--------------
trunk/jcl/source/common/JclArrayLists.pas
trunk/jcl/source/common/JclHashMaps.pas
trunk/jcl/source/prototypes/JclAlgorithms.pas
trunk/jcl/source/prototypes/JclArrayLists.pas
trunk/jcl/source/prototypes/JclArraySets.pas
trunk/jcl/source/prototypes/JclBinaryTrees.pas
trunk/jcl/source/prototypes/JclContainerIntf.pas
trunk/jcl/source/prototypes/JclGraphUtils.pas
trunk/jcl/source/prototypes/JclGraphics.pas
trunk/jcl/source/prototypes/JclHashMaps.pas
trunk/jcl/source/prototypes/JclHashSets.pas
trunk/jcl/source/prototypes/JclLinkedLists.pas
trunk/jcl/source/prototypes/JclQueues.pas
trunk/jcl/source/prototypes/JclSortedMaps.pas
trunk/jcl/source/prototypes/JclStacks.pas
trunk/jcl/source/prototypes/JclTrees.pas
trunk/jcl/source/prototypes/JclVectors.pas
trunk/jcl/source/vcl/JclGraphics.pas
Modified: trunk/jcl/source/common/JclArrayLists.pas
===================================================================
--- trunk/jcl/source/common/JclArrayLists.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/common/JclArrayLists.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -1222,11 +1222,11 @@
implementation
uses
- {$IFDEF SUPPORTNAMESPACES}
+ {$IFDEF SUPPORTNAMESPACES}
System.SysUtils;
-{$ELSE}
-SysUtils;
-{$ENDIF}
+ {$ELSE}
+ SysUtils;
+ {$ENDIF}
//=== { TJclIntfArrayList } ======================================================
Modified: trunk/jcl/source/common/JclHashMaps.pas
===================================================================
--- trunk/jcl/source/common/JclHashMaps.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/common/JclHashMaps.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -54,6 +54,7 @@
JclBase, JclSynch,
JclContainerIntf, JclAbstractContainers, JclArrayLists, JclArraySets;
+
type
// Hash Function
// Result must be in 0..Range-1
Modified: trunk/jcl/source/prototypes/JclAlgorithms.pas
===================================================================
--- trunk/jcl/source/prototypes/JclAlgorithms.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclAlgorithms.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -218,18 +218,31 @@
implementation
uses
+ {$IFDEF HAS_UNITSCOPE}
+ {$IFDEF COMPILER11_UP}
+ Winapi.Windows,
+ {$ENDIF COMPILER11_UP}
{$IFDEF HAS_UNIT_ANSISTRINGS}
+ System.AnsiStrings,
+ {$ENDIF HAS_UNIT_ANSISTRINGS}
+ System.SysUtils,
+ {$ELSE ~HAS_UNITSCOPE}
+ {$IFDEF COMPILER11_UP}
+ Windows,
+ {$ENDIF COMPILER11_UP}
+ {$IFDEF HAS_UNIT_ANSISTRINGS}
AnsiStrings,
{$ENDIF HAS_UNIT_ANSISTRINGS}
- JclAnsiStrings, JclStringConversions, JclUnicode,
- SysUtils;
+ SysUtils,
+ {$ENDIF ~HAS_UNITSCOPE}
+ JclAnsiStrings, JclStringConversions, JclUnicode;
function IntfSimpleCompare(const Obj1, Obj2: IInterface): Integer;
begin
- if Integer(Obj1) < Integer(Obj2) then
+ if SizeInt(Obj1) < SizeInt(Obj2) then
Result := -1
else
- if Integer(Obj1) > Integer(Obj2) then
+ if SizeInt(Obj1) > SizeInt(Obj2) then
Result := 1
else
Result := 0;
@@ -256,7 +269,7 @@
// case-insensitive
function WideStrSimpleCompareI(const Obj1, Obj2: WideString): Integer;
begin
- Result := WideCompareText(Obj1, Obj2);
+ Result := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}SysUtils.WideCompareText(Obj1, Obj2);
end;
{$IFDEF SUPPORTS_UNICODE_STRING}
@@ -368,10 +381,10 @@
function PtrSimpleCompare(Obj1, Obj2: Pointer): Integer;
begin
- if Integer(Obj1) < Integer(Obj2) then
+ if SizeInt(Obj1) < SizeInt(Obj2) then
Result := -1
else
- if Integer(Obj1) > Integer(Obj2) then
+ if SizeInt(Obj1) > SizeInt(Obj2) then
Result := 1
else
Result := 0;
@@ -379,10 +392,10 @@
function SimpleCompare(Obj1, Obj2: TObject): Integer;
begin
- if Integer(Obj1) < Integer(Obj2) then
+ if SizeInt(Obj1) < SizeInt(Obj2) then
Result := -1
else
- if Integer(Obj1) > Integer(Obj2) then
+ if SizeInt(Obj1) > SizeInt(Obj2) then
Result := 1
else
Result := 0;
@@ -390,10 +403,10 @@
function IntegerCompare(Obj1, Obj2: TObject): Integer;
begin
- if Integer(Obj1) < Integer(Obj2) then
+ if SizeInt(Obj1) < SizeInt(Obj2) then
Result := -1
else
- if Integer(Obj1) > Integer(Obj2) then
+ if SizeInt(Obj1) > SizeInt(Obj2) then
Result := 1
else
Result := 0;
@@ -401,7 +414,7 @@
function IntfSimpleEqualityCompare(const Obj1, Obj2: IInterface): Boolean;
begin
- Result := Integer(Obj1) = Integer(Obj2);
+ Result := SizeInt(Obj1) = SizeInt(Obj2);
end;
// default is case-sensitive
@@ -425,7 +438,7 @@
// case-insensitive
function WideStrSimpleEqualityCompareI(const Obj1, Obj2: WideString): Boolean;
begin
- Result := WideCompareText(Obj1, Obj2) = 0;
+ Result := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}SysUtils.WideCompareText(Obj1, Obj2) = 0;
end;
{$IFDEF SUPPORTS_UNICODE_STRING}
@@ -491,17 +504,21 @@
function PtrSimpleEqualityCompare(Obj1, Obj2: Pointer): Boolean;
begin
- Result := Integer(Obj1) = Integer(Obj2);
+ Result := SizeInt(Obj1) = SizeInt(Obj2);
end;
function SimpleEqualityCompare(Obj1, Obj2: TObject): Boolean;
begin
- Result := Integer(Obj1) = Integer(Obj2);
+ Result := SizeInt(Obj1) = SizeInt(Obj2);
end;
function IntfSimpleHashConvert(const AInterface: IInterface): Integer;
begin
- Result := Integer(AInterface) and MaxInt;
+ {$IFDEF CPU32}
+ Result := SizeInt(AInterface) and MaxInt;
+ {$ELSE ~CPU32}
+ Result := (SizeInt(AInterface) xor (SizeInt(AInterface) shr 32)) and MaxInt;
+ {$ENDIF ~CPU32}
end;
// from "Fast Hashing of Variable-Length Text Strings", Peter K. Pearson, 1990
@@ -561,7 +578,7 @@
// case-sensitive and UTF8-encoded
function AnsiStrSimpleHashConvertU(const AString: AnsiString): Integer;
var
- I: Integer;
+ I: SizeInt;
C, IntegerHash: TIntegerHash;
begin
IntegerHash.H1 := 0;
@@ -585,7 +602,8 @@
// case-insensitive and UTF8-encoded
function AnsiStrSimpleHashConvertUI(const AString: AnsiString): Integer;
var
- I, J: Integer;
+ I: SizeInt;
+ J: Integer;
C, IntegerHash: TIntegerHash;
CA: TUCS4Array;
begin
@@ -616,7 +634,7 @@
// default is case-sensitive
function WideStrSimpleHashConvert(const AString: WideString): Integer;
var
- I: Integer;
+ I: SizeInt;
C, IntegerHash: TIntegerHash;
begin
IntegerHash.H1 := 0;
@@ -640,7 +658,8 @@
// case-insensitive
function WideStrSimpleHashConvertI(const AString: WideString): Integer;
var
- I, J: Integer;
+ I: SizeInt;
+ J: Integer;
C, IntegerHash: TIntegerHash;
CA: TUCS4Array;
begin
@@ -672,7 +691,7 @@
// default is case-sensitive
function UnicodeStrSimpleHashConvert(const AString: UnicodeString): Integer;
var
- I: Integer;
+ I: SizeInt;
C, IntegerHash: TIntegerHash;
begin
IntegerHash.H1 := 0;
@@ -696,7 +715,8 @@
// case-insensitive
function UnicodeStrSimpleHashConvertI(const AString: UnicodeString): Integer;
var
- I, J: Integer;
+ I: SizeInt;
+ J: Integer;
C, IntegerHash: TIntegerHash;
CA: TUCS4Array;
begin
@@ -778,17 +798,17 @@
function Int64SimpleHashConvert(const AValue: Int64): Integer;
begin
- Result := AValue and MaxInt;
+ Result := (AValue xor (AValue shr 32)) and MaxInt;
end;
function PtrSimpleHashConvert(APtr: Pointer): Integer;
begin
- Result := Integer(APtr) and MaxInt;
+ Result := SizeInt(APtr) and MaxInt;
end;
function SimpleHashConvert(AObject: TObject): Integer;
begin
- Result := Integer(AObject) and MaxInt;
+ Result := SizeInt(AObject) and MaxInt;
end;
(*$JPPLOOP TRUETYPEINDEX TRUETYPECOUNT
Modified: trunk/jcl/source/prototypes/JclArrayLists.pas
===================================================================
--- trunk/jcl/source/prototypes/JclArrayLists.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclArrayLists.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -38,7 +38,11 @@
interface
uses
+ {$IFDEF HAS_UNITSCOPE}
+ System.Classes,
+ {$ELSE ~HAS_UNITSCOPE}
Classes,
+ {$ENDIF ~HAS_UNITSCOPE}
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
@@ -129,7 +133,11 @@
implementation
uses
+ {$IFDEF SUPPORTNAMESPACES}
+ System.SysUtils;
+ {$ELSE}
SysUtils;
+ {$ENDIF}
(*$JPPLOOP TRUETYPEINDEX TRUETYPECOUNT
{$JPPEXPANDMACRO JCLARRAYLISTIMP(,,,,,,,,,,,,,)}
Modified: trunk/jcl/source/prototypes/JclArraySets.pas
===================================================================
--- trunk/jcl/source/prototypes/JclArraySets.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclArraySets.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -38,7 +38,11 @@
interface
uses
+ {$IFDEF HAS_UNITSCOPE}
+ System.Classes,
+ {$ELSE ~HAS_UNITSCOPE}
Classes,
+ {$ENDIF ~HAS_UNITSCOPE}
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
@@ -120,7 +124,11 @@
implementation
uses
+ {$IFDEF HAS_UNITSCOPE}
+ System.SysUtils;
+ {$ELSE ~HAS_UNITSCOPE}
SysUtils;
+ {$ENDIF ~HAS_UNITSCOPE}
(*$JPPLOOP TRUETYPEINDEX TRUETYPECOUNT
{$JPPEXPANDMACRO JCLARRAYSETIMP(,,,,,,,)}
Modified: trunk/jcl/source/prototypes/JclBinaryTrees.pas
===================================================================
--- trunk/jcl/source/prototypes/JclBinaryTrees.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclBinaryTrees.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -41,7 +41,11 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
+ {$IFDEF HAS_UNITSCOPE}
+ System.Classes,
+ {$ELSE ~HAS_UNITSCOPE}
Classes,
+ {$ENDIF ~HAS_UNITSCOPE}
JclBase, JclAbstractContainers, JclAlgorithms, JclContainerIntf, JclSynch;
{$I containers\JclContainerCommon.imp}
{$I containers\JclBinaryTrees.imp}
@@ -138,7 +142,11 @@
implementation
uses
+ {$IFDEF HAS_UNITSCOPE}
+ System.SysUtils;
+ {$ELSE ~HAS_UNITSCOPE}
SysUtils;
+ {$ENDIF ~HAS_UNITSCOPE}
(*$JPPLOOP TRUETYPEINDEX TRUETYPECOUNT
{$JPPEXPANDMACRO JCLBINARYTREEIMP(,,,,,,,,,,,,,,,,)}
Modified: trunk/jcl/source/prototypes/JclContainerIntf.pas
===================================================================
--- trunk/jcl/source/prototypes/JclContainerIntf.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclContainerIntf.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -37,13 +37,18 @@
{$I jcl.inc}
{$I containers\JclContainerIntf.int}
+
interface
uses
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
+ {$IFDEF HAS_UNITSCOPE}
+ System.Classes,
+ {$ELSE ~HAS_UNITSCOPE}
Classes,
+ {$ENDIF ~HAS_UNITSCOPE}
JclBase,
JclAnsiStrings,
JclWideStrings;
@@ -629,7 +634,11 @@
implementation
uses
+ {$IFDEF HAS_UNITSCOPE}
+ System.SysUtils,
+ {$ELSE ~HAS_UNITSCOPE}
SysUtils,
+ {$ENDIF ~HAS_UNITSCOPE}
JclResources;
//=== { EJclOutOfBoundsError } ===============================================
Modified: trunk/jcl/source/prototypes/JclGraphUtils.pas
===================================================================
--- trunk/jcl/source/prototypes/JclGraphUtils.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclGraphUtils.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -41,14 +41,11 @@
{$I jcl.inc}
uses
- Types,
- {$IFDEF MSWINDOWS}
- Windows,
- {$ENDIF MSWINDOWS}
- SysUtils,
- {$IFDEF VCL}
- Graphics,
- {$ENDIF VCL}
+ {$IFDEF HAS_UNITSCOPE}
+ System.Types, Winapi.Windows, System.SysUtils, Vcl.Graphics,
+ {$ELSE ~HAS_UNITSCOPE}
+ Types, Windows, SysUtils, Graphics,
+ {$ENDIF ~HAS_UNITSCOPE}
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
@@ -299,10 +296,14 @@
implementation
uses
- {$IFDEF VCL}
- Classes, Consts,
- {$ENDIF VCL}
- Math,
+ {$IFDEF HAS_UNITSCOPE}
+ System.Classes, Vcl.Consts, System.Math,
+ {$ELSE ~HAS_UNITSCOPE}
+ Classes, Consts, Math,
+ {$ENDIF ~HAS_UNITSCOPE}
+ {$IFDEF HAS_UNIT_SYSTEM_UITYPES}
+ System.UITypes,
+ {$ENDIF HAS_UNIT_SYSTEM_UITYPES}
JclVclResources, JclSysInfo, JclLogic;
type
@@ -465,6 +466,12 @@
end;
+{$IFDEF DELPHI64_TEMPORARY}
+procedure _BlendLine(Src, Dst: PColor32; Count: Integer);
+begin
+ System.Error(rePlatformNotImplemented);
+end;
+{$ELSE ~DELPHI64_TEMPORARY}
procedure _BlendLine(Src, Dst: PColor32; Count: Integer); assembler;
asm
{$IFDEF CPU32}
@@ -551,6 +558,7 @@
TODO
{$ENDIF CPU64}
end;
+{$ENDIF ~DELPHI64_TEMPORARY}
procedure _BlendLineEx(Src, Dst: PColor32; Count: Integer; M: TColor32);
begin
@@ -599,12 +607,16 @@
end;
procedure EMMS;
+{$IFNDEF DELPHI64_TEMPORARY}
begin
if MMX_ACTIVE then
+{$ENDIF ~DELPHI64_TEMPORARY}
asm
db $0F, $77 // EMMS
end;
+{$IFNDEF DELPHI64_TEMPORARY}
end;
+{$ENDIF ~DELPHI64_TEMPORARY}
function M_CombineReg(X, Y, W: TColor32): TColor32; assembler;
asm
@@ -632,7 +644,22 @@
db $0F, $7E, $C8 // MOVD EAX, MM1
{$ENDIF CPU32}
{$IFDEF CPU64}
- TODO
+ PXOR MM0, MM0
+ MOVD MM1, EAX
+ SHL RCX, 3
+ MOVD MM2, EDX
+ PUNPCKLBW MM1, MM0
+ PUNPCKLBW MM2, MM0
+ ADD RCX, alpha_ptr
+ PSUBW MM1, MM2
+ PMULLW MM1, [RCX]
+ PSLLW MM2, 8
+ MOV RCX, bias_ptr
+ PADDW MM2, [RCX]
+ PADDW MM1, MM2
+ PSRLW MM1, 8
+ PACKUSWB MM1, MM0
+ MOVD EAX, MM1
{$ENDIF CPU64}
end;
@@ -668,7 +695,23 @@
db $0F, $7E, $D0 // MOVD EAX, MM2
{$ENDIF CPU32}
{$IFDEF CPU64}
- TODO
+ PXOR MM3, MM3
+ MOVD MM0, EAX
+ MOVD MM2, EDX
+ PUNPCKLBW MM0, MM3
+ MOV RCX, bias_ptr
+ PUNPCKLBW MM2, MM3
+ MOVQ MM1, MM0
+ PUNPCKHWD MM1, MM1
+ PSUBW MM0, MM2
+ PUNPCKHDQ MM1, MM1
+ PSLLW MM2, 8
+ PMULLW MM0, MM1
+ PADDW MM2, [RCX]
+ PADDW MM2, MM0
+ PSRLW MM2, 8
+ PACKUSWB MM2, MM3
+ MOVD EAX, MM2
{$ENDIF CPU64}
end;
@@ -714,7 +757,32 @@
POP EBX
{$ENDIF CPU32}
{$IFDEF CPU64}
- TODO
+ PUSH RBX
+ MOV RBX, RAX
+ SHR RBX, 24
+ IMUL RCX, RBX
+ SHR RCX, 8
+ JZ @1
+
+ PXOR MM0, MM0
+ MOVD MM1, EAX
+ SHL RCX, 3
+ MOVD MM2, EDX
+ PUNPCKLBW MM1, MM0
+ PUNPCKLBW MM2, MM0
+ ADD RCX, alpha_ptr
+ PSUBW MM1, MM2
+ PMULLW MM1, [RCX]
+ PSLLW MM2, 8
+ MOV RCX, bias_ptr
+ PADDW MM2, [RCX]
+ PADDW MM1, MM2
+ PSRLW MM1, 8
+ PACKUSWB MM1, MM0
+ MOVD EAX, MM1
+
+@1: MOV RAX, RDX
+ POP RBX
{$ENDIF CPU64}
end;
@@ -723,6 +791,12 @@
B := M_BlendRegEx(F, B, M);
end;
+{$IFDEF DELPHI64_TEMPORARY}
+procedure M_BlendLine(Src, Dst: PColor32; Count: Integer);
+begin
+ System.Error(rePlatformNotImplemented);
+end;
+{$ELSE ~DELPHI64_TEMPORARY}
procedure M_BlendLine(Src, Dst: PColor32; Count: Integer); assembler;
asm
{$IFDEF CPU32}
@@ -784,7 +858,14 @@
TODO
{$ENDIF CPU64}
end;
+{$ENDIF ~DELPHI64_TEMPORARY}
+{$IFDEF DELPHI64_TEMPORARY}
+procedure M_BlendLineEx(Src, Dst: PColor32; Count: Integer; M: TColor32);
+begin
+ System.Error(rePlatformNotImplemented);
+end;
+{$ELSE ~DELPHI64_TEMPORARY}
procedure M_BlendLineEx(Src, Dst: PColor32; Count: Integer; M: TColor32); assembler;
asm
{$IFDEF CPU32}
@@ -850,6 +931,7 @@
TODO
{$ENDIF CPU64}
end;
+{$ENDIF ~DELPHI64_TEMPORARY}
{ MMX Detection and linking }
Modified: trunk/jcl/source/prototypes/JclGraphics.pas
===================================================================
--- trunk/jcl/source/prototypes/JclGraphics.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclGraphics.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -36,7 +36,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
@@ -49,17 +49,15 @@
interface
uses
- {$IFDEF MSWINDOWS}
- Windows,
- {$ENDIF MSWINDOWS}
- Classes, SysUtils,
+ {$IFDEF HAS_UNITSCOPE}
+ Winapi.Windows, System.Classes, System.SysUtils, Vcl.Graphics, Vcl.Controls, Vcl.Forms,
+ {$ELSE ~HAS_UNITSCOPE}
+ Windows, Classes, SysUtils, Graphics, Controls, Forms,
+ {$ENDIF ~HAS_UNITSCOPE}
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- {$IFDEF VCL}
- Graphics, JclGraphUtils, Controls, Forms,
- {$ENDIF VCL}
- JclBase;
+ JclGraphUtils, JclBase;
type
EJclGraphicsError = class(EJclError);
@@ -577,10 +575,19 @@
implementation
uses
+ {$IFDEF HAS_UNITSCOPE}
+ System.Math,
+ Winapi.CommCtrl, Winapi.ShellApi,
+ {$IFDEF HAS_UNIT_GIFIMG}
+ Vcl.Imaging.GifImg,
+ {$ENDIF HAS_UNIT_GIFIMG}
+ {$IFDEF HAS_UNIT_PNGIMAGE}
+ Vcl.Imaging.PngImage,
+ {$ENDIF HAS_UNIT_PNGIMAGE}
+ Vcl.ClipBrd, Vcl.Imaging.JPeg, System.TypInfo,
+ {$ELSE ~HAS_UNITSCOPE}
Math,
- {$IFDEF MSWINDOWS}
CommCtrl, ShellApi,
- {$IFDEF VCL}
{$IFDEF HAS_UNIT_GIFIMG}
GifImg,
{$ENDIF HAS_UNIT_GIFIMG}
@@ -588,9 +595,8 @@
PngImage,
{$ENDIF HAS_UNIT_PNGIMAGE}
ClipBrd, JPeg, TypInfo,
+ {$ENDIF ~HAS_UNITSCOPE}
JclVclResources,
- {$ENDIF VCL}
- {$ENDIF MSWINDOWS}
JclSysUtils,
JclLogic;
@@ -650,7 +656,7 @@
function IntToByte(Value: Integer): Byte;
begin
- Result := Math.Max(0, Math.Min(255, Value));
+ Result := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}Math.Max(0, {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}Math.Min(255, Value));
end;
{$IFDEF Bitmap32}
@@ -976,8 +982,8 @@
begin
ContributorList[I].N := 0;
Center := I / ScaleX;
- Left := Math.Floor(Center - Width);
- Right := Math.Ceil(Center + Width);
+ Left := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}Math.Floor(Center - Width);
+ Right := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}Math.Ceil(Center + Width);
SetLength(ContributorList[I].Contributors, Right - Left + 1);
for J := Left to Right do
begin
@@ -1007,8 +1013,8 @@
begin
ContributorList[I].N := 0;
Center := I / ScaleX;
- Left := Math.Floor(Center - Radius);
- Right := Math.Ceil(Center + Radius);
+ Left := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}Math.Floor(Center - Radius);
+ Right := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}Math.Ceil(Center + Radius);
SetLength(ContributorList[I].Contributors, Right - Left + 1);
for J := Left to Right do
begin
@@ -1067,8 +1073,8 @@
begin
ContributorList[I].N := 0;
Center := I / ScaleY;
- Left := Math.Floor(Center - Width);
- Right := Math.Ceil(Center + Width);
+ Left := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}Math.Floor(Center - Width);
+ Right := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}Math.Ceil(Center + Width);
SetLength(ContributorList[I].Contributors, Right - Left + 1);
for J := Left to Right do
begin
@@ -1098,8 +1104,8 @@
begin
ContributorList[I].N := 0;
Center := I / ScaleY;
- Left := Math.Floor(Center - Radius);
- Right := Math.Ceil(Center + Radius);
+ Left := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}Math.Floor(Center - Radius);
+ Right := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}Math.Ceil(Center + Radius);
SetLength(ContributorList[I].Contributors, Right - Left + 1);
for J := Left to Right do
begin
@@ -1139,7 +1145,7 @@
with ContributorList[I] do
begin
DestPixel^ := ApplyContributors(N, ContributorList[I].Contributors);
- Inc(Integer(DestPixel), DestDelta);
+ Inc(INT_PTR(DestPixel), DestDelta);
end;
Inc(SourceLine);
Inc(DestLine);
@@ -4405,7 +4411,7 @@
begin
SelectObject(Handle, Font.Handle);
SetTextColor(Handle, ColorToRGB(Font.Color));
- SetBkMode(Handle, Windows.TRANSPARENT);
+ SetBkMode(Handle, {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.TRANSPARENT);
end;
end;
@@ -4444,7 +4450,7 @@
UpdateFont;
Result.cX := 0;
Result.cY := 0;
- Windows.GetTextExtentPoint32(Handle, PChar(Text), Length(Text), Result);
+ {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.GetTextExtentPoint32(Handle, PChar(Text), Length(Text), Result);
end;
procedure TJclBitmap32.TextOut(X, Y: Integer; const Text: string);
Modified: trunk/jcl/source/prototypes/JclHashMaps.pas
===================================================================
--- trunk/jcl/source/prototypes/JclHashMaps.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclHashMaps.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -38,10 +38,14 @@
interface
uses
- Classes,
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
+ {$IFDEF HAS_UNITSCOPE}
+ System.Classes,
+ {$ELSE ~HAS_UNITSCOPE}
+ Classes,
+ {$ENDIF ~HAS_UNITSCOPE}
JclAlgorithms,
JclBase, JclSynch,
JclContainerIntf, JclAbstractContainers, JclArrayLists, JclArraySets;
@@ -190,7 +194,11 @@
implementation
uses
+ {$IFDEF HAS_UNITSCOPE}
+ System.SysUtils,
+ {$ELSE ~HAS_UNITSCOPE}
SysUtils,
+ {$ENDIF ~HAS_UNITSCOPE}
JclResources;
function HashMul(Key, Range: Integer): Integer;
Modified: trunk/jcl/source/prototypes/JclHashSets.pas
===================================================================
--- trunk/jcl/source/prototypes/JclHashSets.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclHashSets.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -38,11 +38,14 @@
interface
uses
- SysUtils,
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- Classes,
+ {$IFDEF HAS_UNITSCOPE}
+ System.SysUtils, System.Classes,
+ {$ELSE ~HAS_UNITSCOPE}
+ SysUtils, Classes,
+ {$ENDIF ~HAS_UNITSCOPE}
{$IFDEF SUPPORTS_GENERICS}
JclAlgorithms,
{$ENDIF SUPPORTS_GENERICS}
Modified: trunk/jcl/source/prototypes/JclLinkedLists.pas
===================================================================
--- trunk/jcl/source/prototypes/JclLinkedLists.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclLinkedLists.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -44,7 +44,11 @@
{$IFDEF SUPPORTS_GENERICS}
JclAlgorithms,
{$ENDIF SUPPORTS_GENERICS}
+ {$IFDEF HAS_UNITSCOPE}
+ System.Classes,
+ {$ELSE ~HAS_UNITSCOPE}
Classes,
+ {$ENDIF ~HAS_UNITSCOPE}
JclBase, JclAbstractContainers, JclContainerIntf, JclSynch;
{$I containers\JclContainerCommon.imp}
{$I containers\JclLinkedLists.imp}
@@ -134,7 +138,11 @@
implementation
uses
+ {$IFDEF HAS_UNITSCOPE}
+ System.SysUtils;
+ {$ELSE ~HAS_UNITSCOPE}
SysUtils;
+ {$ENDIF ~HAS_UNITSCOPE}
(*$JPPLOOP TRUETYPEINDEX TRUETYPECOUNT
{$JPPEXPANDMACRO JCLLINKEDLISTIMP(,,,,,,,,,,,,,,)}
Modified: trunk/jcl/source/prototypes/JclQueues.pas
===================================================================
--- trunk/jcl/source/prototypes/JclQueues.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclQueues.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -113,7 +113,11 @@
implementation
uses
+ {$IFDEF HAS_UNITSCOPE}
+ System.SysUtils;
+ {$ELSE ~HAS_UNITSCOPE}
SysUtils;
+ {$ENDIF ~HAS_UNITSCOPE}
(*$JPPLOOP TRUETYPEINDEX TRUETYPECOUNT
{$JPPEXPANDMACRO JCLQUEUEIMP(,,,,,,,)}
Modified: trunk/jcl/source/prototypes/JclSortedMaps.pas
===================================================================
--- trunk/jcl/source/prototypes/JclSortedMaps.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclSortedMaps.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -37,10 +37,14 @@
{$I jcl.inc}
uses
- Classes,
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
+ {$IFDEF HAS_UNITSCOPE}
+ System.Classes,
+ {$ELSE ~HAS_UNITSCOPE}
+ Classes,
+ {$ENDIF ~HAS_UNITSCOPE}
JclAlgorithms,
JclBase, JclSynch,
JclAbstractContainers, JclContainerIntf, JclArrayLists, JclArraySets;
@@ -170,7 +174,11 @@
implementation
uses
+ {$IFDEF HAS_UNITSCOPE}
+ System.SysUtils;
+ {$ELSE ~HAS_UNITSCOPE}
SysUtils;
+ {$ENDIF ~HAS_UNITSCOPE}
(*$JPPLOOP TRUEMAPINDEX TRUEMAPCOUNT
{$JPPEXPANDMACRO JCLSORTEDMAPIMP(,,,,,,,,,,,,,,,,)}
Modified: trunk/jcl/source/prototypes/JclStacks.pas
===================================================================
--- trunk/jcl/source/prototypes/JclStacks.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclStacks.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -41,10 +41,17 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
+ {$IFDEF HAS_UNITSCOPE}
{$IFDEF SUPPORTS_GENERICS}
+ System.Generics.Collections,
+ JclAlgorithms,
+ {$ENDIF SUPPORTS_GENERICS}
+ {$ELSE ~HAS_UNITSCOPE}
+ {$IFDEF SUPPORTS_GENERICS}
Generics.Collections,
JclAlgorithms,
{$ENDIF SUPPORTS_GENERICS}
+ {$ENDIF ~HAS_UNITSCOPE}
JclBase, JclAbstractContainers, JclContainerIntf, JclSynch;
{$I containers\JclContainerCommon.imp}
{$I containers\JclStacks.imp}
Modified: trunk/jcl/source/prototypes/JclTrees.pas
===================================================================
--- trunk/jcl/source/prototypes/JclTrees.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclTrees.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -37,7 +37,11 @@
{$I jcl.inc}
uses
+ {$IFDEF HAS_UNITSCOPE}
+ System.Classes,
+ {$ELSE ~HAS_UNITSCOPE}
Classes,
+ {$ENDIF ~HAS_UNITSCOPE}
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
@@ -132,7 +136,11 @@
implementation
uses
+ {$IFDEF HAS_UNITSCOPE}
+ System.SysUtils;
+ {$ELSE ~HAS_UNITSCOPE}
SysUtils;
+ {$ENDIF ~HAS_UNITSCOPE}
(*$JPPLOOP TRUETYPEINDEX TRUETYPECOUNT
{$JPPEXPANDMACRO JCLTREETYPESIMP(,,,,)}
Modified: trunk/jcl/source/prototypes/JclVectors.pas
===================================================================
--- trunk/jcl/source/prototypes/JclVectors.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/prototypes/JclVectors.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -44,9 +44,12 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- JclAlgorithms,
+ {$IFDEF HAS_UNITSCOPE}
+ System.Classes,
+ {$ELSE ~HAS_UNITSCOPE}
Classes,
- JclBase, JclAbstractContainers, JclContainerIntf, JclSynch;
+ {$ENDIF ~HAS_UNITSCOPE}
+ JclAlgorithms, JclBase, JclAbstractContainers, JclContainerIntf, JclSynch;
{$I containers\JclContainerCommon.imp}
{$I containers\JclVectors.imp}
{$I containers\JclVectors.int}
@@ -128,7 +131,11 @@
implementation
uses
+ {$IFDEF HAS_UNITSCOPE}
+ System.SysUtils;
+ {$ELSE ~HAS_UNITSCOPE}
SysUtils;
+ {$ENDIF ~HAS_UNITSCOPE}
(*$JPPLOOP TRUETYPEINDEX TRUETYPECOUNT
{$JPPEXPANDMACRO JCLVECTORIMP(,,,,,,,,,,,,,)}
Modified: trunk/jcl/source/vcl/JclGraphics.pas
===================================================================
--- trunk/jcl/source/vcl/JclGraphics.pas 2011-12-29 23:30:47 UTC (rev 3663)
+++ trunk/jcl/source/vcl/JclGraphics.pas 2011-12-30 20:05:41 UTC (rev 3664)
@@ -40,7 +40,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-29 23:30:53
|
Revision: 3663
http://jcl.svn.sourceforge.net/jcl/?rev=3663&view=rev
Author: outchy
Date: 2011-12-29 23:30:47 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
fix compilation with RTLs that do not define DWORD64.
Modified Paths:
--------------
trunk/jcl/source/prototypes/win32api/ImageHlp.int
trunk/jcl/source/windows/JclWin32.pas
Modified: trunk/jcl/source/prototypes/win32api/ImageHlp.int
===================================================================
--- trunk/jcl/source/prototypes/win32api/ImageHlp.int 2011-12-29 23:12:19 UTC (rev 3662)
+++ trunk/jcl/source/prototypes/win32api/ImageHlp.int 2011-12-29 23:30:47 UTC (rev 3663)
@@ -166,7 +166,7 @@
{$EXTERNALSYM _IMAGEHLP_SYMBOLA64}
_IMAGEHLP_SYMBOLA64 = packed record
SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_SYMBOL) }
- Address: DWORD64; { virtual address including dll base address }
+ Address: TJclAddr64; { virtual address including dll base address }
Size: DWORD; { estimated size of symbol, can be zero }
Flags: DWORD; { info about the symbols, see the SYMF defines }
MaxNameLength: DWORD; { maximum size of symbol name in 'Name' }
@@ -200,7 +200,7 @@
{$EXTERNALSYM _IMAGEHLP_SYMBOLW64}
_IMAGEHLP_SYMBOLW64 = packed record
SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_SYMBOL) }
- Address: DWORD64; { virtual address including dll base address }
+ Address: TJclAddr64; { virtual address including dll base address }
Size: DWORD; { estimated size of symbol, can be zero }
Flags: DWORD; { info about the symbols, see the SYMF defines }
MaxNameLength: DWORD; { maximum size of symbol name in 'Name' }
@@ -238,7 +238,7 @@
{$EXTERNALSYM _IMAGEHLP_MODULEA64}
_IMAGEHLP_MODULEA64 = record
SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_MODULE) }
- BaseOfImage: DWORD64; { base load address of module }
+ BaseOfImage: TJclAddr64; { base load address of module }
ImageSize: DWORD; { virtual size of the loaded module }
TimeDateStamp: DWORD; { date/time stamp from pe header }
CheckSum: DWORD; { checksum from the pe header }
@@ -280,7 +280,7 @@
{$EXTERNALSYM _IMAGEHLP_MODULEW64}
_IMAGEHLP_MODULEW64 = record
SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_MODULE) }
- BaseOfImage: DWORD64; { base load address of module }
+ BaseOfImage: TJclAddr64; { base load address of module }
ImageSize: DWORD; { virtual size of the loaded module }
TimeDateStamp: DWORD; { date/time stamp from pe header }
CheckSum: DWORD; { checksum from the pe header }
@@ -312,7 +312,7 @@
Key: Pointer; // internal
LineNumber: DWORD; // line number in file
FileName: PAnsiChar; // full filename
- Address: DWORD64; // first instruction of line
+ Address: TJclAddr64; // first instruction of line
end;
IMAGEHLP_LINEA64 = _IMAGEHLP_LINEA64;
PIMAGEHLP_LINEA64 = ^_IMAGEHLP_LINEA64;
@@ -336,7 +336,7 @@
Key: Pointer; // internal
LineNumber: DWORD; // line number in file
FileName: PWideChar; // full filename
- Address: DWORD64; // first instruction of line
+ Address: TJclAddr64; // first instruction of line
end;
IMAGEHLP_LINEW64 = _IMAGEHLP_LINEW64;
PIMAGEHLP_LINEW64 = ^_IMAGEHLP_LINEW64;
Modified: trunk/jcl/source/windows/JclWin32.pas
===================================================================
--- trunk/jcl/source/windows/JclWin32.pas 2011-12-29 23:12:19 UTC (rev 3662)
+++ trunk/jcl/source/windows/JclWin32.pas 2011-12-29 23:30:47 UTC (rev 3663)
@@ -3292,7 +3292,7 @@
{$EXTERNALSYM _IMAGEHLP_SYMBOLA64}
_IMAGEHLP_SYMBOLA64 = packed record
SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_SYMBOL) }
- Address: DWORD64; { virtual address including dll base address }
+ Address: TJclAddr64; { virtual address including dll base address }
Size: DWORD; { estimated size of symbol, can be zero }
Flags: DWORD; { info about the symbols, see the SYMF defines }
MaxNameLength: DWORD; { maximum size of symbol name in 'Name' }
@@ -3326,7 +3326,7 @@
{$EXTERNALSYM _IMAGEHLP_SYMBOLW64}
_IMAGEHLP_SYMBOLW64 = packed record
SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_SYMBOL) }
- Address: DWORD64; { virtual address including dll base address }
+ Address: TJclAddr64; { virtual address including dll base address }
Size: DWORD; { estimated size of symbol, can be zero }
Flags: DWORD; { info about the symbols, see the SYMF defines }
MaxNameLength: DWORD; { maximum size of symbol name in 'Name' }
@@ -3364,7 +3364,7 @@
{$EXTERNALSYM _IMAGEHLP_MODULEA64}
_IMAGEHLP_MODULEA64 = record
SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_MODULE) }
- BaseOfImage: DWORD64; { base load address of module }
+ BaseOfImage: TJclAddr64; { base load address of module }
ImageSize: DWORD; { virtual size of the loaded module }
TimeDateStamp: DWORD; { date/time stamp from pe header }
CheckSum: DWORD; { checksum from the pe header }
@@ -3406,7 +3406,7 @@
{$EXTERNALSYM _IMAGEHLP_MODULEW64}
_IMAGEHLP_MODULEW64 = record
SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_MODULE) }
- BaseOfImage: DWORD64; { base load address of module }
+ BaseOfImage: TJclAddr64; { base load address of module }
ImageSize: DWORD; { virtual size of the loaded module }
TimeDateStamp: DWORD; { date/time stamp from pe header }
CheckSum: DWORD; { checksum from the pe header }
@@ -3438,7 +3438,7 @@
Key: Pointer; // internal
LineNumber: DWORD; // line number in file
FileName: PAnsiChar; // full filename
- Address: DWORD64; // first instruction of line
+ Address: TJclAddr64; // first instruction of line
end;
IMAGEHLP_LINEA64 = _IMAGEHLP_LINEA64;
PIMAGEHLP_LINEA64 = ^_IMAGEHLP_LINEA64;
@@ -3462,7 +3462,7 @@
Key: Pointer; // internal
LineNumber: DWORD; // line number in file
FileName: PWideChar; // full filename
- Address: DWORD64; // first instruction of line
+ Address: TJclAddr64; // first instruction of line
end;
IMAGEHLP_LINEW64 = _IMAGEHLP_LINEW64;
PIMAGEHLP_LINEW64 = ^_IMAGEHLP_LINEW64;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-29 23:12:26
|
Revision: 3662
http://jcl.svn.sourceforge.net/jcl/?rev=3662&view=rev
Author: outchy
Date: 2011-12-29 23:12:19 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
Some features are available since Windows 2000 (and newer)...
Modified Paths:
--------------
trunk/jcl/examples/windows/delphitools/toolhelpview/Main.pas
trunk/jcl/examples/windows/locales/LocalesDemoMain.pas
trunk/jcl/source/windows/JclLocales.pas
trunk/jcl/source/windows/JclSvcCtrl.pas
Modified: trunk/jcl/examples/windows/delphitools/toolhelpview/Main.pas
===================================================================
--- trunk/jcl/examples/windows/delphitools/toolhelpview/Main.pas 2011-12-29 20:21:56 UTC (rev 3661)
+++ trunk/jcl/examples/windows/delphitools/toolhelpview/Main.pas 2011-12-29 23:12:19 UTC (rev 3662)
@@ -321,10 +321,10 @@
with ProcessEntry do if FindItem = nil then
begin // New Process
Added := True;
- if IsWin2k then
+ if GetWindowsVersion >= wvWin2000 then
begin
ProcessHandle := OpenProcess(PROCESS_QUERY_INFORMATION or PROCESS_VM_READ, False, th32ProcessID);
- if Handle <> 0 then
+ if ProcessHandle <> 0 then
begin
if GetModuleFileNameEx(ProcessHandle, 0, szExeFile, SizeOf(szExeFile)) = 0 then
StrPCopy(szExeFile, '[Idle]');
Modified: trunk/jcl/examples/windows/locales/LocalesDemoMain.pas
===================================================================
--- trunk/jcl/examples/windows/locales/LocalesDemoMain.pas 2011-12-29 20:21:56 UTC (rev 3661)
+++ trunk/jcl/examples/windows/locales/LocalesDemoMain.pas 2011-12-29 23:12:19 UTC (rev 3662)
@@ -159,7 +159,7 @@
Items.Add('');
Items.Add('Short date formats:');
Items.AddStrings(DateFormats[ldShort]);
- if IsWin2k then
+ if GetWindowsVersion >= wvWin2000 then
begin
Items.Add('');
Items.Add('Year month formats:');
Modified: trunk/jcl/source/windows/JclLocales.pas
===================================================================
--- trunk/jcl/source/windows/JclLocales.pas 2011-12-29 20:21:56 UTC (rev 3661)
+++ trunk/jcl/source/windows/JclLocales.pas 2011-12-29 23:12:19 UTC (rev 3662)
@@ -345,7 +345,7 @@
Inc(Result, KLF_REORDER);
if (klUnloadPrevious in ActivateFlags) and IsWinNT then
Inc(Result, KLF_UNLOADPREVIOUS);
- if (klSetForProcess in ActivateFlags) and IsWin2K then
+ if (klSetForProcess in ActivateFlags) and (GetWindowsVersion >= wvWin2000) then
Inc(Result, KLF_SETFORPROCESS);
if LoadMode then
begin
Modified: trunk/jcl/source/windows/JclSvcCtrl.pas
===================================================================
--- trunk/jcl/source/windows/JclSvcCtrl.pas 2011-12-29 20:21:56 UTC (rev 3661)
+++ trunk/jcl/source/windows/JclSvcCtrl.pas 2011-12-29 23:12:19 UTC (rev 3662)
@@ -1329,7 +1329,7 @@
RaiseLastOsError;
CloseServiceHandle(Svc);
- if (Description <> '') and (IsWin2K or IsWinXP) then
+ if (Description <> '') and (GetWindowsVersion >= wvWin2000) then
RegWriteString(HKEY_LOCAL_MACHINE, '\' + REGSTR_PATH_SERVICES + '\' + ServiceName,
'Description', Description);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-29 20:22:03
|
Revision: 3661
http://jcl.svn.sourceforge.net/jcl/?rev=3661&view=rev
Author: outchy
Date: 2011-12-29 20:21:56 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
Work around QC#102231: IsValidAcl does not work properly.
Modified Paths:
--------------
trunk/jcl/source/windows/JclAppInst.pas
Modified: trunk/jcl/source/windows/JclAppInst.pas
===================================================================
--- trunk/jcl/source/windows/JclAppInst.pas 2011-12-29 00:21:39 UTC (rev 3660)
+++ trunk/jcl/source/windows/JclAppInst.pas 2011-12-29 20:21:56 UTC (rev 3661)
@@ -30,7 +30,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
@@ -734,7 +734,7 @@
end;
procedure TJclAppInstances.SecurityGetSecurityAttributes(OwnerSID, AccessSID: PSID; out ACL: PACL;
- out SecurityDescriptor: PSecurityDescriptor; out SecurityAttributes: PSecurityAttributes);
+ out SecurityDescriptor: PSecurityDescriptor; out SecurityAttributes: PSecurityAttributes);
var
ACLSize: SizeInt;
begin
@@ -743,7 +743,7 @@
ACL := AllocMem(ACLSize);
Win32Check(InitializeAcl(ACL^, ACLSize, ACL_REVISION));
Win32Check(AddAccessAllowedAce(ACL^, ACL_REVISION, FILE_MAP_ALL_ACCESS, AccessSID));
- Assert(IsValidAcl(ACL^));
+ Assert(IsValidAcl(ACL{$IFNDEF RTL230_UP}^{$ENDIF})); // QC #102231
// create the security descriptor
SecurityDescriptor := AllocMem(SECURITY_DESCRIPTOR_MIN_LENGTH);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-29 00:21:46
|
Revision: 3660
http://jcl.svn.sourceforge.net/jcl/?rev=3660&view=rev
Author: outchy
Date: 2011-12-29 00:21:39 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
Additional 64-bit fixes:
- 64-bit addresses in examples (work-in-progress);
- predefined pattern for formatting 32/64-bit addresses in JclBase.
Modified Paths:
--------------
trunk/jcl/examples/windows/appinst/AppInstDemoMain.pas
trunk/jcl/examples/windows/console/ConsoleExamples.dpr
trunk/jcl/examples/windows/debug/mttest/JclDebugMTTestMain.pas
trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas
trunk/jcl/experts/stacktraceviewer/APIExamples/FastMM/FastMMFreedObjectFrame.pas
trunk/jcl/experts/stacktraceviewer/APIExamples/FastMM/FastMMMemoryFrame.pas
trunk/jcl/experts/stacktraceviewer/APIExamples/FastMM/FastMMParser.pas
trunk/jcl/source/common/JclBase.pas
trunk/jcl/source/windows/JclRegistry.pas
Modified: trunk/jcl/examples/windows/appinst/AppInstDemoMain.pas
===================================================================
--- trunk/jcl/examples/windows/appinst/AppInstDemoMain.pas 2011-12-28 22:45:12 UTC (rev 3659)
+++ trunk/jcl/examples/windows/appinst/AppInstDemoMain.pas 2011-12-29 00:21:39 UTC (rev 3660)
@@ -35,6 +35,9 @@
{$R *.DFM}
+uses
+ JclBase;
+
const
MaxAllowedInstances = 3;
@@ -55,7 +58,7 @@
begin
Caption := IntToStr(I + 1);
SubItems.Add(Format('%.8x', [ProcessIDs[I]]));
- SubItems.Add(Format('%.8x', [AppWnds[I]]));
+ SubItems.Add(Format(HexDigitFmt, [AppWnds[I]]));
end;
CurrIndex := InstanceIndex[GetCurrentProcessId];
Selected := Items[CurrIndex];
Modified: trunk/jcl/examples/windows/console/ConsoleExamples.dpr
===================================================================
--- trunk/jcl/examples/windows/console/ConsoleExamples.dpr 2011-12-28 22:45:12 UTC (rev 3659)
+++ trunk/jcl/examples/windows/console/ConsoleExamples.dpr 2011-12-29 00:21:39 UTC (rev 3660)
@@ -9,6 +9,7 @@
SysUtils,
Windows,
TypInfo,
+ JclBase,
JclConsole;
{$R ..\..\..\source\windows\JclNoDepAsInvoker.res}
@@ -65,7 +66,7 @@
Attr: IJclScreenTextAttribute;
begin
ScrBuf.WriteLn;
- ScrBuf.WriteLn(Format('Handle: 0x%.8x', [ScrBuf.Handle]));
+ ScrBuf.WriteLn(Format('Handle: ' + HexFmt, [ScrBuf.Handle]));
ScrBuf.Writeln('Old Mode : ' + ModeToString);
OldMode := ScrBuf.Mode;
ScrBuf.Mode := ScrBuf.Mode - [omWrapAtEol];
Modified: trunk/jcl/examples/windows/debug/mttest/JclDebugMTTestMain.pas
===================================================================
--- trunk/jcl/examples/windows/debug/mttest/JclDebugMTTestMain.pas 2011-12-28 22:45:12 UTC (rev 3659)
+++ trunk/jcl/examples/windows/debug/mttest/JclDebugMTTestMain.pas 2011-12-29 00:21:39 UTC (rev 3660)
@@ -26,6 +26,9 @@
implementation
+uses
+ JclBase;
+
{$R *.dfm}
procedure LoadedModules(ModuleList: TJclSerializableModuleInfoList);
@@ -36,7 +39,7 @@
S, BinFileVersion, FileVersion, FileDescription: string;
FileVersionInfo: TJclFileVersionInfo;
ModuleInfoList: TJclModuleInfoList;
- ModuleBase: Cardinal;
+ ModuleBase: TJclAddr;
Module: TJclSerializableModuleInfo;
begin
ProcessHandle := GetCurrentProcess;
@@ -44,7 +47,7 @@
try
for I := 0 to ModuleInfoList.Count - 1 do
begin
- ModuleBase := Cardinal(ModuleInfoList.Items[I].StartAddr);
+ ModuleBase := TJclAddr(ModuleInfoList.Items[I].StartAddr);
GetModuleFileNameEx(ProcessHandle, ModuleBase, FileName, SizeOf(FileName));
FileVersion := '';
if (FileName <> '') and VersionResourceAvailable(FileName) then
@@ -63,8 +66,8 @@
else
S := '0';
Module := ModuleList.Add;
- Module.StartStr := Format('0x%.8x', [ModuleBase]);
- Module.EndStr := Format('0x%.8x', [Cardinal(ModuleInfoList.Items[I].EndAddr)]);
+ Module.StartStr := Format(HexFmt, [ModuleBase]);
+ Module.EndStr := Format(HexFmt, [TJclAddr(ModuleInfoList.Items[I].EndAddr)]);
Module.SystemModuleStr := S;
Module.ModuleName := FileName;
Module.BinFileVersion := BinFileVersion;
Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas 2011-12-28 22:45:12 UTC (rev 3659)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas 2011-12-29 00:21:39 UTC (rev 3660)
@@ -422,7 +422,7 @@
begin
ModuleName := SL[I];
ModuleBase := TJclAddr(SL.Objects[I]);
- DetailsMemo.Lines.Add(Format('[%.8x] %s', [ModuleBase, ModuleName]));
+ DetailsMemo.Lines.Add(Format('[' + HexDigitFmt + '] %s', [ModuleBase, ModuleName]));
PETarget := PeMapImgTarget(Pointer(ModuleBase));
NtHeaders32 := nil;
NtHeaders64 := nil;
@@ -432,10 +432,10 @@
if PETarget = taWin64 then
NtHeaders64 := PeMapImgNtHeaders64(Pointer(ModuleBase));
if (NtHeaders32 <> nil) and (NtHeaders32^.OptionalHeader.ImageBase <> ModuleBase) then
- ImageBaseStr := Format('<%.8x> ', [NtHeaders32^.OptionalHeader.ImageBase])
+ ImageBaseStr := Format('<' + HexDigitFmt32 + '> ', [NtHeaders32^.OptionalHeader.ImageBase])
else
if (NtHeaders64 <> nil) and (NtHeaders64^.OptionalHeader.ImageBase <> ModuleBase) then
- ImageBaseStr := Format('<%.8x> ', [NtHeaders64^.OptionalHeader.ImageBase])
+ ImageBaseStr := Format('<' + HexDigitFmt64 + '> ', [NtHeaders64^.OptionalHeader.ImageBase])
else
ImageBaseStr := StrRepeat(' ', 11);
if VersionResourceAvailable(ModuleName) then
Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas 2011-12-28 22:45:12 UTC (rev 3659)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas 2011-12-29 00:21:39 UTC (rev 3660)
@@ -445,7 +445,7 @@
begin
ModuleName := SL[I];
ModuleBase := TJclAddr(SL.Objects[I]);
- DetailsMemo.Lines.Add(Format('[%.8x] %s', [ModuleBase, ModuleName]));
+ DetailsMemo.Lines.Add(Format('[' + HexDigitFmt + '] %s', [ModuleBase, ModuleName]));
PETarget := PeMapImgTarget(Pointer(ModuleBase));
NtHeaders32 := nil;
NtHeaders64 := nil;
@@ -455,10 +455,10 @@
if PETarget = taWin64 then
NtHeaders64 := PeMapImgNtHeaders64(Pointer(ModuleBase));
if (NtHeaders32 <> nil) and (NtHeaders32^.OptionalHeader.ImageBase <> ModuleBase) then
- ImageBaseStr := Format('<%.8x> ', [NtHeaders32^.OptionalHeader.ImageBase])
+ ImageBaseStr := Format('<' + HexDigitFmt32 + '> ', [NtHeaders32^.OptionalHeader.ImageBase])
else
if (NtHeaders64 <> nil) and (NtHeaders64^.OptionalHeader.ImageBase <> ModuleBase) then
- ImageBaseStr := Format('<%.8x> ', [NtHeaders64^.OptionalHeader.ImageBase])
+ ImageBaseStr := Format('<' + HexDigitFmt64 + '> ', [NtHeaders64^.OptionalHeader.ImageBase])
else
ImageBaseStr := StrRepeat(' ', 11);
if VersionResourceAvailable(ModuleName) then
Modified: trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas 2011-12-28 22:45:12 UTC (rev 3659)
+++ trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas 2011-12-29 00:21:39 UTC (rev 3660)
@@ -466,7 +466,7 @@
begin
ModuleName := SL[I];
ModuleBase := TJclAddr(SL.Objects[I]);
- DetailsMemo.Lines.Add(Format('[%.8x] %s', [ModuleBase, ModuleName]));
+ DetailsMemo.Lines.Add(Format('[' + HexDigitFmt + '] %s', [ModuleBase, ModuleName]));
PETarget := PeMapImgTarget(Pointer(ModuleBase));
NtHeaders32 := nil;
NtHeaders64 := nil;
@@ -476,10 +476,10 @@
if PETarget = taWin64 then
NtHeaders64 := PeMapImgNtHeaders64(Pointer(ModuleBase));
if (NtHeaders32 <> nil) and (NtHeaders32^.OptionalHeader.ImageBase <> ModuleBase) then
- ImageBaseStr := Format('<%.8x> ', [NtHeaders32^.OptionalHeader.ImageBase])
+ ImageBaseStr := Format('<' + HexDigitFmt32 + '> ', [NtHeaders32^.OptionalHeader.ImageBase])
else
if (NtHeaders64 <> nil) and (NtHeaders64^.OptionalHeader.ImageBase <> ModuleBase) then
- ImageBaseStr := Format('<%.8x> ', [NtHeaders64^.OptionalHeader.ImageBase])
+ ImageBaseStr := Format('<' + HexDigitFmt64 + '> ', [NtHeaders64^.OptionalHeader.ImageBase])
else
ImageBaseStr := StrRepeat(' ', 11);
if VersionResourceAvailable(ModuleName) then
Modified: trunk/jcl/experts/stacktraceviewer/APIExamples/FastMM/FastMMFreedObjectFrame.pas
===================================================================
--- trunk/jcl/experts/stacktraceviewer/APIExamples/FastMM/FastMMFreedObjectFrame.pas 2011-12-28 22:45:12 UTC (rev 3659)
+++ trunk/jcl/experts/stacktraceviewer/APIExamples/FastMM/FastMMFreedObjectFrame.pas 2011-12-29 00:21:39 UTC (rev 3660)
@@ -141,7 +141,7 @@
lbFreedObjectClass.Caption := FFreedObjectData.ObjectClass;
lbAllocationNumber.Caption := IntToStr(FFreedObjectData.AllocationNumber);
lbVM.Caption := FFreedObjectData.VirtualMethod;
- lbVMAddr.Caption := Format('%.8x', [FFreedObjectData.VirtualMethodAddress]);
+ lbVMAddr.Caption := Format(HexDigitFmt, [FFreedObjectData.VirtualMethodAddress]);
end;
tsStack1.TabVisible := Assigned(FStackFrame1) and Assigned(FFreedObjectData) and (FFreedObjectData.Stack1.Count > 0);
tsStack1.Caption := Format('Stack (allocated by thread %x)', [FFreedObjectData.Stack1Thread]);
Modified: trunk/jcl/experts/stacktraceviewer/APIExamples/FastMM/FastMMMemoryFrame.pas
===================================================================
--- trunk/jcl/experts/stacktraceviewer/APIExamples/FastMM/FastMMMemoryFrame.pas 2011-12-28 22:45:12 UTC (rev 3659)
+++ trunk/jcl/experts/stacktraceviewer/APIExamples/FastMM/FastMMMemoryFrame.pas 2011-12-29 00:21:39 UTC (rev 3660)
@@ -3,8 +3,9 @@
interface
uses
- Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
- Dialogs, FastMMParser, Grids, StdCtrls, ExtCtrls;
+ Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+ Dialogs, FastMMParser, Grids, StdCtrls, ExtCtrls,
+ JclBase;
type
TfrmMemory = class(TFrame)
@@ -16,10 +17,10 @@
{ Private-Deklarationen }
FMemoryArray: TFastMMMemoryArray;
procedure SetMemoryArray(const Value: TFastMMMemoryArray);
- procedure SetAddress(const Value: Integer);
+ procedure SetAddress(const Value: TJclAddr);
public
{ Public-Deklarationen }
- property Address: Integer write SetAddress;
+ property Address: TJclAddr write SetAddress;
property MemoryArray: TFastMMMemoryArray write SetMemoryArray;
end;
@@ -29,9 +30,9 @@
{ TfrmMemory }
-procedure TfrmMemory.SetAddress(const Value: Integer);
+procedure TfrmMemory.SetAddress(const Value: TJclAddr);
begin
- lbMemoryAddr.Caption := Format('%.8x', [Value]);
+ lbMemoryAddr.Caption := Format(HexDigitFmt, [Value]);
end;
procedure TfrmMemory.SetMemoryArray(const Value: TFastMMMemoryArray);
Modified: trunk/jcl/experts/stacktraceviewer/APIExamples/FastMM/FastMMParser.pas
===================================================================
--- trunk/jcl/experts/stacktraceviewer/APIExamples/FastMM/FastMMParser.pas 2011-12-28 22:45:12 UTC (rev 3659)
+++ trunk/jcl/experts/stacktraceviewer/APIExamples/FastMM/FastMMParser.pas 2011-12-29 00:21:39 UTC (rev 3660)
@@ -6,6 +6,7 @@
uses
SysUtils, Classes, Contnrs,
+ JclBase,
{$IFNDEF NOVIEW}
JclStackTraceViewerClasses,
{$ENDIF ~NOVIEW}
@@ -31,26 +32,26 @@
TFastMMLeak = class(TObject)
private
- FAddress: Integer;
+ FAddress: TJclAddr;
FAllocationNumber: Integer;
FBlockClass: string;
FDateStr: string;
FMemory: TFastMMMemoryArray;
FFoundMemory: Boolean;
- FLeakSize: Integer;
+ FLeakSize: TJclAddr;
FParent: TFastMMReport;
FThreadID: Integer;
FStack: TFastMMLocationInfoList;
public
constructor Create(AParent: TFastMMReport);
destructor Destroy; override;
- property Address: Integer read FAddress write FAddress;
+ property Address: TJclAddr read FAddress write FAddress;
property AllocationNumber: Integer read FAllocationNumber write FAllocationNumber;
property BlockClass: string read FBlockClass write FBlockClass;
property DateStr: string read FDateStr write FDateStr;
property Memory: TFastMMMemoryArray read FMemory write FMemory;
property FoundMemory: Boolean read FFoundMemory write FFoundMemory;
- property LeakSize: Integer read FLeakSize write FLeakSize;
+ property LeakSize: TJclAddr read FLeakSize write FLeakSize;
property Parent: TFastMMReport read FParent;
property Stack: TFastMMLocationInfoList read FStack;
property ThreadID: Integer read FThreadID write FThreadID;
@@ -59,23 +60,23 @@
TFastMMLeakGroup = class(TObject)
private
FItems: TList;
- FLeakSize: Integer;
+ FLeakSize: TJclAddr;
FLeakSizeUpdate: Boolean;
function GetCount: Integer;
function GetItems(AIndex: Integer): TFastMMLeak;
- function GetLeakSize: Integer;
+ function GetLeakSize: TJclAddr;
public
constructor Create;
destructor Destroy; override;
procedure Add(ALeak: TFastMMLeak);
property Count: Integer read GetCount;
property Items[AIndex: Integer]: TFastMMLeak read GetItems; default;
- property LeakSize: Integer read GetLeakSize;
+ property LeakSize: TJclAddr read GetLeakSize;
end;
TFastMMVMOnFreedObject = class(TObject)
private
- FAddress: Integer;
+ FAddress: TJclAddr;
FAllocationNumber: Integer;
FObjectClass: string;
FMemory: TFastMMMemoryArray;
@@ -87,11 +88,11 @@
FStack3: TFastMMLocationInfoList;
FStack3Thread: Integer;
FVirtualMethod: string;
- FVirtualMethodAddress: Integer;
+ FVirtualMethodAddress: TJclAddr;
public
constructor Create;
destructor Destroy; override;
- property Address: Integer read FAddress write FAddress;
+ property Address: TJclAddr read FAddress write FAddress;
property AllocationNumber: Integer read FAllocationNumber write FAllocationNumber;
property ObjectClass: string read FObjectClass write FObjectClass;
property Memory: TFastMMMemoryArray read FMemory write FMemory;
@@ -103,7 +104,7 @@
property Stack3Thread: Integer read FStack3Thread write FStack3Thread;
property Stack3: TFastMMLocationInfoList read FStack3;
property VirtualMethod: string read FVirtualMethod write FVirtualMethod;
- property VirtualMethodAddress: Integer read FVirtualMethodAddress write FVirtualMethodAddress;
+ property VirtualMethodAddress: TJclAddr read FVirtualMethodAddress write FVirtualMethodAddress;
end;
TFastMMReport = class(TObject)
@@ -169,13 +170,13 @@
constructor TFastMMLeak.Create(AParent: TFastMMReport);
begin
inherited Create;
- FAddress := -1;
- FAllocationNumber := -1;
+ FAddress := 0;
+ FAllocationNumber := 0;
FBlockClass := '';
FFoundMemory := False;
- FLeakSize := -1;
+ FLeakSize := 0;
FParent := AParent;
- FThreadID := -1;
+ FThreadID := 0;
FStack := TFastMMLocationInfoList.Create;
end;
@@ -215,7 +216,7 @@
Result := TFastMMLeak(FItems[AIndex]);
end;
-function TFastMMLeakGroup.GetLeakSize: Integer;
+function TFastMMLeakGroup.GetLeakSize: TJclAddr;
var
I: Integer;
begin
@@ -234,15 +235,15 @@
constructor TFastMMVMOnFreedObject.Create;
begin
inherited Create;
- FAddress := -1;
- FAllocationNumber := -1;
+ FAddress := 0;
+ FAllocationNumber := 0;
FFoundMemory := False;
FStack1 := TFastMMLocationInfoList.Create;
- FStack1Thread := -1;
+ FStack1Thread := 0;
FStack2 := TFastMMLocationInfoList.Create;
- FStack2Thread := -1;
+ FStack2Thread := 0;
FStack3 := TFastMMLocationInfoList.Create;
- FStack3Thread := -1;
+ FStack3Thread := 0;
end;
destructor TFastMMVMOnFreedObject.Destroy;
@@ -486,7 +487,7 @@
if C = ' ' then
begin
if S <> '' then
- ALocationInfo.Address := Pointer(StrToInt('$' + S));
+ ALocationInfo.Address := Pointer(StrToInt64('$' + S));
Break;
end
else
@@ -606,7 +607,7 @@
LastReportType := ReportType;
Leak := Report.AddLeak;
Delete(S, 1, Length(cLeakSize));
- Leak.LeakSize := StrToIntDef(S, -1);
+ Leak.LeakSize := StrToInt64Def(S, 0);
if (I > 1) then
begin
S := TSL[I - 1];
@@ -640,7 +641,7 @@
Delete(S, 1, Length(cThread));
P := Pos(',', S);
if P > 1 then
- Leak.ThreadID := StrToIntDef('$' + Copy(S, 1, P - 1), -1);
+ Leak.ThreadID := StrToIntDef('$' + Copy(S, 1, P - 1), 0);
end;
if Pos(cStack, S) > 0 then
begin
@@ -672,7 +673,7 @@
if Pos(cAllocNo, S) = 1 then
begin
Delete(S, 1, Length(cAllocNo));
- Leak.AllocationNumber := StrToIntDef(S, -1);
+ Leak.AllocationNumber := StrToIntDef(S, 0);
end;
if Pos(cMemory, S) = 1 then
begin
@@ -680,7 +681,7 @@
P := Pos(':', S);
if P > 1 then
begin
- Leak.Address := StrToIntDef('$' + Copy(S, 1, P - 1), -1);
+ Leak.Address := StrToInt64Def('$' + Copy(S, 1, P - 1), 0);
Inc(I);
for J := 0 to 7 do
begin
@@ -690,7 +691,7 @@
for K := 0 to 31 do
begin
S2 := Copy(S, K * 3 + 1, 2);
- MemoryArray[J * 32 + K] := StrToIntDef('$' + S2, -1);
+ MemoryArray[J * 32 + K] := StrToIntDef('$' + S2, 0);
end;
end
else
@@ -736,13 +737,13 @@
if Pos(cVMFOVirtualMethodAddress, S) = 1 then
begin
Delete(S, 1, Length(cVMFOVirtualMethodAddress));
- VMOnFreedObject.VirtualMethodAddress := StrToIntDef('$' + S, -1);
+ VMOnFreedObject.VirtualMethodAddress := StrToInt64Def('$' + S, 0);
end
else
if Pos(cVMFOAllocNo, S) = 1 then
begin
Delete(S, 1, Length(cVMFOAllocNo));
- VMOnFreedObject.AllocationNumber := StrToIntDef(S, -1);
+ VMOnFreedObject.AllocationNumber := StrToIntDef(S, 0);
end
else
if Pos(cVMFOStack1Thread, S) = 1 then
@@ -750,7 +751,7 @@
Delete(S, 1, Length(cVMFOStack1Thread));
P := Pos(',', S);
if P > 1 then
- VMOnFreedObject.Stack1Thread := StrToIntDef('$' + Copy(S, 1, P - 1), -1);
+ VMOnFreedObject.Stack1Thread := StrToIntDef('$' + Copy(S, 1, P - 1), 0);
if Pos(cVMFOStack1Stack, S) > 0 then
begin
Inc(I);
@@ -780,7 +781,7 @@
Delete(S, 1, Length(cVMFOStack2Thread));
P := Pos(',', S);
if P > 1 then
- VMOnFreedObject.Stack2Thread := StrToIntDef('$' + Copy(S, 1, P - 1), -1);
+ VMOnFreedObject.Stack2Thread := StrToIntDef('$' + Copy(S, 1, P - 1), 0);
if Pos(cVMFOStack2Stack, S) > 0 then
begin
Inc(I);
@@ -810,7 +811,7 @@
Delete(S, 1, Length(cVMFOStack3Thread));
P := Pos(',', S);
if P > 1 then
- VMOnFreedObject.Stack3Thread := StrToIntDef('$' + Copy(S, 1, P - 1), -1);
+ VMOnFreedObject.Stack3Thread := StrToIntDef('$' + Copy(S, 1, P - 1), 0);
if Pos(cVMFOStack3Stack, S) > 0 then
begin
Inc(I);
@@ -841,7 +842,7 @@
P := Pos(':', S);
if P > 1 then
begin
- VMOnFreedObject.Address := StrToIntDef('$' + Copy(S, 1, P - 1), -1);
+ VMOnFreedObject.Address := StrToInt64Def('$' + Copy(S, 1, P - 1), 0);
Inc(I);
for J := 0 to 7 do
begin
@@ -853,7 +854,7 @@
for K := 0 to 31 do
begin
S2 := Copy(S, K * 3 + 1, 2);
- MemoryArray[J * 32 + K] := StrToIntDef('$' + S2, -1);
+ MemoryArray[J * 32 + K] := StrToIntDef('$' + S2, 0);
end;
end
else
Modified: trunk/jcl/source/common/JclBase.pas
===================================================================
--- trunk/jcl/source/common/JclBase.pas 2011-12-28 22:45:12 UTC (rev 3659)
+++ trunk/jcl/source/common/JclBase.pas 2011-12-29 00:21:39 UTC (rev 3660)
@@ -205,6 +205,8 @@
HexPrefixPascal = string('$');
HexPrefixC = string('0x');
+ HexDigitFmt32 = string('%.8x');
+ HexDigitFmt64 = string('%.16x');
{$IFDEF BCB}
HexPrefix = HexPrefixC;
@@ -212,6 +214,15 @@
HexPrefix = HexPrefixPascal;
{$ENDIF ~BCB}
+ {$IFDEF CPU32}
+ HexDigitFmt = HexDigitFmt32;
+ {$ENDIF CPU32}
+ {$IFDEF CPU64}
+ HexDigitFmt = HexDigitFmt64;
+ {$ENDIF CPU64}
+
+ HexFmt = HexPrefix + HexDigitFmt;
+
const
BOM_UTF16_LSB: array [0..1] of Byte = ($FF,$FE);
BOM_UTF16_MSB: array [0..1] of Byte = ($FE,$FF);
Modified: trunk/jcl/source/windows/JclRegistry.pas
===================================================================
--- trunk/jcl/source/windows/JclRegistry.pas 2011-12-28 22:45:12 UTC (rev 3659)
+++ trunk/jcl/source/windows/JclRegistry.pas 2011-12-29 00:21:39 UTC (rev 3660)
@@ -459,12 +459,7 @@
HKDD : Result := HKDDLongName;
{$ENDIF ~DELPHI64_TEMPORARY}
else
- {$IFDEF DELPHICOMPILER}
- Result := Format('$%.8x', [RootKey]);
- {$ENDIF DELPHICOMPILER}
- {$IFDEF BCB}
- Result := Format('0x%.8x', [RootKey]);
- {$ENDIF BCB}
+ Result := Format(HexFmt, [RootKey]);
end;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-28 22:45:19
|
Revision: 3659
http://jcl.svn.sourceforge.net/jcl/?rev=3659&view=rev
Author: outchy
Date: 2011-12-28 22:45:12 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Add some notice before jcl.XX.inc is included.
Modified Paths:
--------------
trunk/jcl/source/include/jcl.inc
Modified: trunk/jcl/source/include/jcl.inc
===================================================================
--- trunk/jcl/source/include/jcl.inc 2011-12-28 22:30:01 UTC (rev 3658)
+++ trunk/jcl/source/include/jcl.inc 2011-12-28 22:45:12 UTC (rev 3659)
@@ -51,16 +51,25 @@
{ BDS }
{----------------------------}
{$IFDEF BDS3}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld9.net.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF BDS3}
{----------------------------}
{$IFDEF BDS4}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld10.net.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF BDS4}
{----------------------------}
{$IFDEF BDS5}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld11.net.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF BDS5}
@@ -70,11 +79,17 @@
{ C++Builder }
{----------------------------}
{$IFDEF BCB5}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jclc5.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF BCB5}
{----------------------------}
{$IFDEF BCB6}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jclc6.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF BCB6}
@@ -82,60 +97,93 @@
{ Delphi }
{----------------------------}
{$IFDEF DELPHI5}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld5.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF DELPIH5}
{----------------------------}
{$IFDEF DELPHI6}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld6.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF DELPIH6}
{----------------------------}
{$IFDEF DELPHI7}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld7.inc}
{$DEFINE JCL_CONFIGURED}
- {$ENDIF DELPIH7}
+ {$ENDIF DELPIH7}
{----------------------------}
{ BDS }
{----------------------------}
// BDS 1 and BDS 2 have the same version numbers for their native compilers
// no compiler defines are used for BDS 1 and BDS 2
{$IFDEF BDS1}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
//{$I jclcs1.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF BDS1}
{----------------------------}
{$IFDEF BDS2}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
//{$I jcld8.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF BDS2}
{----------------------------}
{$IFDEF BDS3}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld9.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF BDS3}
{----------------------------}
{$IFDEF BDS4}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld10.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF BDS4}
{----------------------------}
{$IFDEF BDS5}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld11.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF BDS5}
{----------------------------}
{$IFDEF BDS6}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld12.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF BDS6}
{----------------------------}
{$IFDEF BDS7}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld14.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF BDS7}
{----------------------------}
{$IFDEF BDS8}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld15.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF BDS8}
@@ -143,9 +191,15 @@
{$IFDEF BDS9}
{$IFDEF MSWINDOWS}
{$IFDEF CPUX86}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld16win32.inc}
{$ENDIF CPUX86}
{$IFDEF CPUX64}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jcld16win64.inc}
{$ENDIF CPUX64}
{$DEFINE JCL_CONFIGURED}
@@ -153,6 +207,9 @@
{$ENDIF BDS9}
{----------------------------}
{$IFDEF FPC}
+ // This file should be located in directory jcl/source/include
+ // It is automatically created by the JCL installer
+ // For manual installations, copy and adjust jcl/source/include/jcl.template.inc
{$I jclfpc.inc}
{$DEFINE JCL_CONFIGURED}
{$ENDIF FPC}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-28 22:30:08
|
Revision: 3658
http://jcl.svn.sourceforge.net/jcl/?rev=3658&view=rev
Author: outchy
Date: 2011-12-28 22:30:01 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
64-bit compatibility for TJclDebugInfoSymbols.
Modified Paths:
--------------
trunk/jcl/source/prototypes/win32api/ImageHlp.int
trunk/jcl/source/windows/JclDebug.pas
trunk/jcl/source/windows/JclWin32.pas
Modified: trunk/jcl/source/prototypes/win32api/ImageHlp.int
===================================================================
--- trunk/jcl/source/prototypes/win32api/ImageHlp.int 2011-12-28 21:40:47 UTC (rev 3657)
+++ trunk/jcl/source/prototypes/win32api/ImageHlp.int 2011-12-28 22:30:01 UTC (rev 3658)
@@ -161,6 +161,23 @@
TImagehlpSymbolA = _IMAGEHLP_SYMBOLA;
{ symbol data structure }
+ {$EXTERNALSYM PImagehlpSymbolA64}
+ PImagehlpSymbolA64 = ^TImagehlpSymbolA64;
+ {$EXTERNALSYM _IMAGEHLP_SYMBOLA64}
+ _IMAGEHLP_SYMBOLA64 = packed record
+ SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_SYMBOL) }
+ Address: DWORD64; { virtual address including dll base address }
+ Size: DWORD; { estimated size of symbol, can be zero }
+ Flags: DWORD; { info about the symbols, see the SYMF defines }
+ MaxNameLength: DWORD; { maximum size of symbol name in 'Name' }
+ Name: packed array[0..0] of AnsiChar; { symbol name (null terminated string) }
+ end;
+ {$EXTERNALSYM IMAGEHLP_SYMBOLA64}
+ IMAGEHLP_SYMBOLA64 = _IMAGEHLP_SYMBOLA64;
+ {$EXTERNALSYM TImagehlpSymbolA64}
+ TImagehlpSymbolA64 = _IMAGEHLP_SYMBOLA64;
+
+ { symbol data structure }
{$EXTERNALSYM PImagehlpSymbolW}
PImagehlpSymbolW = ^TImagehlpSymbolW;
{$EXTERNALSYM _IMAGEHLP_SYMBOLW}
@@ -177,6 +194,23 @@
{$EXTERNALSYM TImagehlpSymbolW}
TImagehlpSymbolW = _IMAGEHLP_SYMBOLW;
+ { symbol data structure }
+ {$EXTERNALSYM PImagehlpSymbolW64}
+ PImagehlpSymbolW64 = ^TImagehlpSymbolW64;
+ {$EXTERNALSYM _IMAGEHLP_SYMBOLW64}
+ _IMAGEHLP_SYMBOLW64 = packed record
+ SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_SYMBOL) }
+ Address: DWORD64; { virtual address including dll base address }
+ Size: DWORD; { estimated size of symbol, can be zero }
+ Flags: DWORD; { info about the symbols, see the SYMF defines }
+ MaxNameLength: DWORD; { maximum size of symbol name in 'Name' }
+ Name: packed array[0..0] of WideChar; { symbol name (null terminated string) }
+ end;
+ {$EXTERNALSYM IMAGEHLP_SYMBOLW64}
+ IMAGEHLP_SYMBOLW64 = _IMAGEHLP_SYMBOLW64;
+ {$EXTERNALSYM TImagehlpSymbolW64}
+ TImagehlpSymbolW64 = _IMAGEHLP_SYMBOLW64;
+
{ module data structure }
{$EXTERNALSYM PImagehlpModuleA}
PImagehlpModuleA = ^TImagehlpModuleA;
@@ -199,6 +233,27 @@
TImagehlpModuleA = _IMAGEHLP_MODULEA;
{ module data structure }
+ {$EXTERNALSYM PImagehlpModuleA64}
+ PImagehlpModuleA64 = ^TImagehlpModuleA64;
+ {$EXTERNALSYM _IMAGEHLP_MODULEA64}
+ _IMAGEHLP_MODULEA64 = record
+ SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_MODULE) }
+ BaseOfImage: DWORD64; { base load address of module }
+ ImageSize: DWORD; { virtual size of the loaded module }
+ TimeDateStamp: DWORD; { date/time stamp from pe header }
+ CheckSum: DWORD; { checksum from the pe header }
+ NumSyms: DWORD; { number of symbols in the symbol table }
+ SymType: TSymType; { type of symbols loaded }
+ ModuleName: packed array[0..31] of AnsiChar; { module name }
+ ImageName: packed array[0..255] of AnsiChar; { image name }
+ LoadedImageName: packed array[0..255] of AnsiChar; { symbol file name }
+ end;
+ {$EXTERNALSYM IMAGEHLP_MODULEA64}
+ IMAGEHLP_MODULEA64 = _IMAGEHLP_MODULEA64;
+ {$EXTERNALSYM TImagehlpModuleA64}
+ TImagehlpModuleA64 = _IMAGEHLP_MODULEA64;
+
+ { module data structure }
{$EXTERNALSYM PImagehlpModuleW}
PImagehlpModuleW = ^TImagehlpModuleW;
{$EXTERNALSYM _IMAGEHLP_MODULEW}
@@ -219,6 +274,27 @@
{$EXTERNALSYM TImagehlpModuleW}
TImagehlpModuleW = _IMAGEHLP_MODULEW;
+ { module data structure }
+ {$EXTERNALSYM PImagehlpModuleW64}
+ PImagehlpModuleW64 = ^TImagehlpModuleW64;
+ {$EXTERNALSYM _IMAGEHLP_MODULEW64}
+ _IMAGEHLP_MODULEW64 = record
+ SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_MODULE) }
+ BaseOfImage: DWORD64; { base load address of module }
+ ImageSize: DWORD; { virtual size of the loaded module }
+ TimeDateStamp: DWORD; { date/time stamp from pe header }
+ CheckSum: DWORD; { checksum from the pe header }
+ NumSyms: DWORD; { number of symbols in the symbol table }
+ SymType: TSymType; { type of symbols loaded }
+ ModuleName: packed array[0..31] of WideChar; { module name }
+ ImageName: packed array[0..255] of WideChar; { image name }
+ LoadedImageName: packed array[0..255] of WideChar; { symbol file name }
+ end;
+ {$EXTERNALSYM IMAGEHLP_MODULEW64}
+ IMAGEHLP_MODULEW64 = _IMAGEHLP_MODULEW64;
+ {$EXTERNALSYM TImagehlpModuleW64}
+ TImagehlpModuleW64 = _IMAGEHLP_MODULEW64;
+
_IMAGEHLP_LINEA = packed record
SizeOfStruct: DWORD; // set to sizeof(IMAGEHLP_LINE)
Key: Pointer; // internal
@@ -231,6 +307,18 @@
TImageHlpLineA = _IMAGEHLP_LINEA;
PImageHlpLineA = PIMAGEHLP_LINEA;
+ _IMAGEHLP_LINEA64 = packed record
+ SizeOfStruct: DWORD; // set to sizeof(IMAGEHLP_LINE)
+ Key: Pointer; // internal
+ LineNumber: DWORD; // line number in file
+ FileName: PAnsiChar; // full filename
+ Address: DWORD64; // first instruction of line
+ end;
+ IMAGEHLP_LINEA64 = _IMAGEHLP_LINEA64;
+ PIMAGEHLP_LINEA64 = ^_IMAGEHLP_LINEA64;
+ TImageHlpLineA64 = _IMAGEHLP_LINEA64;
+ PImageHlpLineA64 = PIMAGEHLP_LINEA64;
+
_IMAGEHLP_LINEW = packed record
SizeOfStruct: DWORD; // set to sizeof(IMAGEHLP_LINE)
Key: Pointer; // internal
@@ -243,6 +331,18 @@
TImageHlpLineW = _IMAGEHLP_LINEW;
PImageHlpLineW = PIMAGEHLP_LINEW;
+ _IMAGEHLP_LINEW64 = packed record
+ SizeOfStruct: DWORD; // set to sizeof(IMAGEHLP_LINE)
+ Key: Pointer; // internal
+ LineNumber: DWORD; // line number in file
+ FileName: PWideChar; // full filename
+ Address: DWORD64; // first instruction of line
+ end;
+ IMAGEHLP_LINEW64 = _IMAGEHLP_LINEW64;
+ PIMAGEHLP_LINEW64 = ^_IMAGEHLP_LINEW64;
+ TImageHlpLineW64 = _IMAGEHLP_LINEW64;
+ PImageHlpLineW64 = PIMAGEHLP_LINEW64;
+
// line 1475
//
Modified: trunk/jcl/source/windows/JclDebug.pas
===================================================================
--- trunk/jcl/source/windows/JclDebug.pas 2011-12-28 21:40:47 UTC (rev 3657)
+++ trunk/jcl/source/windows/JclDebug.pas 2011-12-28 22:30:01 UTC (rev 3658)
@@ -3681,6 +3681,7 @@
TSymGetOptionsFunc = function: DWORD; stdcall;
TSymSetOptionsFunc = function (SymOptions: DWORD): DWORD; stdcall;
TSymCleanupFunc = function (hProcess: THandle): Bool; stdcall;
+ {$IFDEF CPU32}
TSymGetSymFromAddrAFunc = function (hProcess: THandle; dwAddr: DWORD;
pdwDisplacement: PDWORD; var Symbol: JclWin32.TImagehlpSymbolA): Bool; stdcall;
TSymGetSymFromAddrWFunc = function (hProcess: THandle; dwAddr: DWORD;
@@ -3690,11 +3691,28 @@
TSymGetModuleInfoWFunc = function (hProcess: THandle; dwAddr: DWORD;
var ModuleInfo: JclWin32.TImagehlpModuleW): Bool; stdcall;
TSymLoadModuleFunc = function (hProcess: THandle; hFile: THandle; ImageName,
- ModuleName: LPSTR; BaseOfDll, SizeOfDll: DWORD): DWORD; stdcall;
+ ModuleName: LPSTR; BaseOfDll: DWORD; SizeOfDll: DWORD): DWORD; stdcall;
TSymGetLineFromAddrAFunc = function (hProcess: THandle; dwAddr: DWORD;
pdwDisplacement: PDWORD; var Line: JclWin32.TImageHlpLineA): Bool; stdcall;
TSymGetLineFromAddrWFunc = function (hProcess: THandle; dwAddr: DWORD;
pdwDisplacement: PDWORD; var Line: JclWin32.TImageHlpLineW): Bool; stdcall;
+ {$ENDIF CPU32}
+ {$IFDEF CPU64}
+ TSymGetSymFromAddrAFunc = function (hProcess: THandle; dwAddr: DWORD64;
+ pdwDisplacement: PDWORD64; var Symbol: JclWin32.TImagehlpSymbolA64): Bool; stdcall;
+ TSymGetSymFromAddrWFunc = function (hProcess: THandle; dwAddr: DWORD64;
+ pdwDisplacement: PDWORD64; var Symbol: JclWin32.TImagehlpSymbolW64): Bool; stdcall;
+ TSymGetModuleInfoAFunc = function (hProcess: THandle; dwAddr: DWORD64;
+ var ModuleInfo: JclWin32.TImagehlpModuleA64): Bool; stdcall;
+ TSymGetModuleInfoWFunc = function (hProcess: THandle; dwAddr: DWORD64;
+ var ModuleInfo: JclWin32.TImagehlpModuleW64): Bool; stdcall;
+ TSymLoadModuleFunc = function (hProcess: THandle; hFile: THandle; ImageName,
+ ModuleName: LPSTR; BaseOfDll: DWORD64; SizeOfDll: DWORD): DWORD; stdcall;
+ TSymGetLineFromAddrAFunc = function (hProcess: THandle; dwAddr: DWORD64;
+ pdwDisplacement: PDWORD; var Line: JclWin32.TImageHlpLineA64): Bool; stdcall;
+ TSymGetLineFromAddrWFunc = function (hProcess: THandle; dwAddr: DWORD64;
+ pdwDisplacement: PDWORD; var Line: JclWin32.TImageHlpLineW64): Bool; stdcall;
+ {$ENDIF CPU64}
var
DebugSymbolsInitialized: Boolean = False;
@@ -3720,6 +3738,7 @@
SymGetOptionsFuncName = 'SymGetOptions'; // do not localize
SymSetOptionsFuncName = 'SymSetOptions'; // do not localize
SymCleanupFuncName = 'SymCleanup'; // do not localize
+ {$IFDEF CPU32}
SymGetSymFromAddrAFuncName = 'SymGetSymFromAddr'; // do not localize
SymGetSymFromAddrWFuncName = 'SymGetSymFromAddrW'; // do not localize
SymGetModuleInfoAFuncName = 'SymGetModuleInfo'; // do not localize
@@ -3727,6 +3746,16 @@
SymLoadModuleFuncName = 'SymLoadModule'; // do not localize
SymGetLineFromAddrAFuncName = 'SymGetLineFromAddr'; // do not localize
SymGetLineFromAddrWFuncName = 'SymGetLineFromAddrW'; // do not localize
+ {$ENDIF CPU32}
+ {$IFDEF CPU64}
+ SymGetSymFromAddrAFuncName = 'SymGetSymFromAddr64'; // do not localize
+ SymGetSymFromAddrWFuncName = 'SymGetSymFromAddrW64'; // do not localize
+ SymGetModuleInfoAFuncName = 'SymGetModuleInfo64'; // do not localize
+ SymGetModuleInfoWFuncName = 'SymGetModuleInfoW64'; // do not localize
+ SymLoadModuleFuncName = 'SymLoadModule64'; // do not localize
+ SymGetLineFromAddrAFuncName = 'SymGetLineFromAddr64'; // do not localize
+ SymGetLineFromAddrWFuncName = 'SymGetLineFromAddrW64'; // do not localize
+ {$ENDIF CPU64}
function StrRemoveEmptyPaths(const Paths: string): string;
var
@@ -3822,15 +3851,29 @@
out Info: TJclLocationInfo): Boolean;
const
SymbolNameLength = 1000;
+ {$IFDEF CPU32}
SymbolSizeA = SizeOf(TImagehlpSymbolA) + SymbolNameLength * SizeOf(AnsiChar);
SymbolSizeW = SizeOf(TImagehlpSymbolW) + SymbolNameLength * SizeOf(WideChar);
+ {$ENDIF CPU32}
+ {$IFDEF CPU64}
+ SymbolSizeA = SizeOf(TImagehlpSymbolA64) + SymbolNameLength * SizeOf(AnsiChar);
+ SymbolSizeW = SizeOf(TImagehlpSymbolW64) + SymbolNameLength * SizeOf(WideChar);
+ {$ENDIF CPU64}
var
Displacement: DWORD;
ProcessHandle: THandle;
+ {$IFDEF CPU32}
SymbolA: PImagehlpSymbolA;
SymbolW: PImagehlpSymbolW;
LineA: TImageHlpLineA;
LineW: TImageHlpLineW;
+ {$ENDIF CPU32}
+ {$IFDEF CPU64}
+ SymbolA: PImagehlpSymbolA64;
+ SymbolW: PImagehlpSymbolW64;
+ LineA: TImageHlpLineA64;
+ LineW: TImageHlpLineW64;
+ {$ENDIF CPU64}
begin
ProcessHandle := GetCurrentProcess;
@@ -3839,7 +3882,7 @@
GetMem(SymbolW, SymbolSizeW);
try
ZeroMemory(SymbolW, SymbolSizeW);
- SymbolW^.SizeOfStruct := SizeOf(TImageHlpSymbolW);
+ SymbolW^.SizeOfStruct := SizeOf(SymbolW^);
SymbolW^.MaxNameLength := SymbolNameLength;
Displacement := 0;
@@ -3862,7 +3905,7 @@
GetMem(SymbolA, SymbolSizeA);
try
ZeroMemory(SymbolA, SymbolSizeA);
- SymbolA^.SizeOfStruct := SizeOf(TImageHlpSymbolA);
+ SymbolA^.SizeOfStruct := SizeOf(SymbolA^);
SymbolA^.MaxNameLength := SymbolNameLength;
Displacement := 0;
@@ -3915,8 +3958,14 @@
function TJclDebugInfoSymbols.InitializeSource: Boolean;
var
ModuleFileName: TFileName;
+ {$IFDEF CPU32}
ModuleInfoA: TImagehlpModuleA;
ModuleInfoW: TImagehlpModuleW;
+ {$ENDIF CPU32}
+ {$IFDEF CPU64}
+ ModuleInfoA: TImagehlpModuleA64;
+ ModuleInfoW: TImagehlpModuleW64;
+ {$ENDIF CPU64}
ProcessHandle: THandle;
begin
Result := InitializeDebugSymbols;
@@ -4785,7 +4834,7 @@
{$ENDIF CPU32}
{$IFDEF CPU64}
if GetThreadContext(ThreadHandle, C) then
- Result := JclCreateStackList(Raw, DWORD(-1), Pointer(C.Rip), False, Pointer(C.Rbp),
+ Result := JclCreateStackList(Raw, -1, Pointer(C.Rip), False, Pointer(C.Rbp),
Pointer(GetThreadTopOfStack(ThreadHandle)));
{$ENDIF CPU64}
end;
Modified: trunk/jcl/source/windows/JclWin32.pas
===================================================================
--- trunk/jcl/source/windows/JclWin32.pas 2011-12-28 21:40:47 UTC (rev 3657)
+++ trunk/jcl/source/windows/JclWin32.pas 2011-12-28 22:30:01 UTC (rev 3658)
@@ -3287,6 +3287,23 @@
TImagehlpSymbolA = _IMAGEHLP_SYMBOLA;
{ symbol data structure }
+ {$EXTERNALSYM PImagehlpSymbolA64}
+ PImagehlpSymbolA64 = ^TImagehlpSymbolA64;
+ {$EXTERNALSYM _IMAGEHLP_SYMBOLA64}
+ _IMAGEHLP_SYMBOLA64 = packed record
+ SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_SYMBOL) }
+ Address: DWORD64; { virtual address including dll base address }
+ Size: DWORD; { estimated size of symbol, can be zero }
+ Flags: DWORD; { info about the symbols, see the SYMF defines }
+ MaxNameLength: DWORD; { maximum size of symbol name in 'Name' }
+ Name: packed array[0..0] of AnsiChar; { symbol name (null terminated string) }
+ end;
+ {$EXTERNALSYM IMAGEHLP_SYMBOLA64}
+ IMAGEHLP_SYMBOLA64 = _IMAGEHLP_SYMBOLA64;
+ {$EXTERNALSYM TImagehlpSymbolA64}
+ TImagehlpSymbolA64 = _IMAGEHLP_SYMBOLA64;
+
+ { symbol data structure }
{$EXTERNALSYM PImagehlpSymbolW}
PImagehlpSymbolW = ^TImagehlpSymbolW;
{$EXTERNALSYM _IMAGEHLP_SYMBOLW}
@@ -3303,6 +3320,23 @@
{$EXTERNALSYM TImagehlpSymbolW}
TImagehlpSymbolW = _IMAGEHLP_SYMBOLW;
+ { symbol data structure }
+ {$EXTERNALSYM PImagehlpSymbolW64}
+ PImagehlpSymbolW64 = ^TImagehlpSymbolW64;
+ {$EXTERNALSYM _IMAGEHLP_SYMBOLW64}
+ _IMAGEHLP_SYMBOLW64 = packed record
+ SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_SYMBOL) }
+ Address: DWORD64; { virtual address including dll base address }
+ Size: DWORD; { estimated size of symbol, can be zero }
+ Flags: DWORD; { info about the symbols, see the SYMF defines }
+ MaxNameLength: DWORD; { maximum size of symbol name in 'Name' }
+ Name: packed array[0..0] of WideChar; { symbol name (null terminated string) }
+ end;
+ {$EXTERNALSYM IMAGEHLP_SYMBOLW64}
+ IMAGEHLP_SYMBOLW64 = _IMAGEHLP_SYMBOLW64;
+ {$EXTERNALSYM TImagehlpSymbolW64}
+ TImagehlpSymbolW64 = _IMAGEHLP_SYMBOLW64;
+
{ module data structure }
{$EXTERNALSYM PImagehlpModuleA}
PImagehlpModuleA = ^TImagehlpModuleA;
@@ -3325,6 +3359,27 @@
TImagehlpModuleA = _IMAGEHLP_MODULEA;
{ module data structure }
+ {$EXTERNALSYM PImagehlpModuleA64}
+ PImagehlpModuleA64 = ^TImagehlpModuleA64;
+ {$EXTERNALSYM _IMAGEHLP_MODULEA64}
+ _IMAGEHLP_MODULEA64 = record
+ SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_MODULE) }
+ BaseOfImage: DWORD64; { base load address of module }
+ ImageSize: DWORD; { virtual size of the loaded module }
+ TimeDateStamp: DWORD; { date/time stamp from pe header }
+ CheckSum: DWORD; { checksum from the pe header }
+ NumSyms: DWORD; { number of symbols in the symbol table }
+ SymType: TSymType; { type of symbols loaded }
+ ModuleName: packed array[0..31] of AnsiChar; { module name }
+ ImageName: packed array[0..255] of AnsiChar; { image name }
+ LoadedImageName: packed array[0..255] of AnsiChar; { symbol file name }
+ end;
+ {$EXTERNALSYM IMAGEHLP_MODULEA64}
+ IMAGEHLP_MODULEA64 = _IMAGEHLP_MODULEA64;
+ {$EXTERNALSYM TImagehlpModuleA64}
+ TImagehlpModuleA64 = _IMAGEHLP_MODULEA64;
+
+ { module data structure }
{$EXTERNALSYM PImagehlpModuleW}
PImagehlpModuleW = ^TImagehlpModuleW;
{$EXTERNALSYM _IMAGEHLP_MODULEW}
@@ -3345,6 +3400,27 @@
{$EXTERNALSYM TImagehlpModuleW}
TImagehlpModuleW = _IMAGEHLP_MODULEW;
+ { module data structure }
+ {$EXTERNALSYM PImagehlpModuleW64}
+ PImagehlpModuleW64 = ^TImagehlpModuleW64;
+ {$EXTERNALSYM _IMAGEHLP_MODULEW64}
+ _IMAGEHLP_MODULEW64 = record
+ SizeOfStruct: DWORD; { set to sizeof(IMAGEHLP_MODULE) }
+ BaseOfImage: DWORD64; { base load address of module }
+ ImageSize: DWORD; { virtual size of the loaded module }
+ TimeDateStamp: DWORD; { date/time stamp from pe header }
+ CheckSum: DWORD; { checksum from the pe header }
+ NumSyms: DWORD; { number of symbols in the symbol table }
+ SymType: TSymType; { type of symbols loaded }
+ ModuleName: packed array[0..31] of WideChar; { module name }
+ ImageName: packed array[0..255] of WideChar; { image name }
+ LoadedImageName: packed array[0..255] of WideChar; { symbol file name }
+ end;
+ {$EXTERNALSYM IMAGEHLP_MODULEW64}
+ IMAGEHLP_MODULEW64 = _IMAGEHLP_MODULEW64;
+ {$EXTERNALSYM TImagehlpModuleW64}
+ TImagehlpModuleW64 = _IMAGEHLP_MODULEW64;
+
_IMAGEHLP_LINEA = packed record
SizeOfStruct: DWORD; // set to sizeof(IMAGEHLP_LINE)
Key: Pointer; // internal
@@ -3357,6 +3433,18 @@
TImageHlpLineA = _IMAGEHLP_LINEA;
PImageHlpLineA = PIMAGEHLP_LINEA;
+ _IMAGEHLP_LINEA64 = packed record
+ SizeOfStruct: DWORD; // set to sizeof(IMAGEHLP_LINE)
+ Key: Pointer; // internal
+ LineNumber: DWORD; // line number in file
+ FileName: PAnsiChar; // full filename
+ Address: DWORD64; // first instruction of line
+ end;
+ IMAGEHLP_LINEA64 = _IMAGEHLP_LINEA64;
+ PIMAGEHLP_LINEA64 = ^_IMAGEHLP_LINEA64;
+ TImageHlpLineA64 = _IMAGEHLP_LINEA64;
+ PImageHlpLineA64 = PIMAGEHLP_LINEA64;
+
_IMAGEHLP_LINEW = packed record
SizeOfStruct: DWORD; // set to sizeof(IMAGEHLP_LINE)
Key: Pointer; // internal
@@ -3369,6 +3457,18 @@
TImageHlpLineW = _IMAGEHLP_LINEW;
PImageHlpLineW = PIMAGEHLP_LINEW;
+ _IMAGEHLP_LINEW64 = packed record
+ SizeOfStruct: DWORD; // set to sizeof(IMAGEHLP_LINE)
+ Key: Pointer; // internal
+ LineNumber: DWORD; // line number in file
+ FileName: PWideChar; // full filename
+ Address: DWORD64; // first instruction of line
+ end;
+ IMAGEHLP_LINEW64 = _IMAGEHLP_LINEW64;
+ PIMAGEHLP_LINEW64 = ^_IMAGEHLP_LINEW64;
+ TImageHlpLineW64 = _IMAGEHLP_LINEW64;
+ PImageHlpLineW64 = PIMAGEHLP_LINEW64;
+
// line 1475
//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-28 21:40:54
|
Revision: 3657
http://jcl.svn.sourceforge.net/jcl/?rev=3657&view=rev
Author: outchy
Date: 2011-12-28 21:40:47 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
prototype update.
Modified Paths:
--------------
trunk/jcl/source/prototypes/JclWin32.pas
trunk/jcl/source/prototypes/win32api/ImageHlp.int
trunk/jcl/source/prototypes/win32api/NtSecApi.int
Modified: trunk/jcl/source/prototypes/JclWin32.pas
===================================================================
--- trunk/jcl/source/prototypes/JclWin32.pas 2011-12-28 21:12:57 UTC (rev 3656)
+++ trunk/jcl/source/prototypes/JclWin32.pas 2011-12-28 21:40:47 UTC (rev 3657)
@@ -59,11 +59,17 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
+ {$IFDEF HAS_UNITSCOPE}
+ Winapi.Windows, System.SysUtils,
+ {$IFNDEF FPC}
+ Winapi.AccCtrl, Winapi.ActiveX,
+ {$ENDIF ~FPC}
+ {$ELSE ~HAS_UNITSCOPE}
Windows, SysUtils,
{$IFNDEF FPC}
- AccCtrl,
- ActiveX,
+ AccCtrl, ActiveX,
{$ENDIF ~FPC}
+ {$ENDIF ~HAS_UNITSCOPE}
JclBase;
{$HPPEMIT '#include <WinDef.h>'}
@@ -90,6 +96,14 @@
{$HPPEMIT '#include <objbase.h>'}
{$HPPEMIT '#include <ntsecapi.h>'}
{$HPPEMIT ''}
+{$IFDEF RTL230_UP}
+{$HPPEMIT '// To avoid ambiguity between IMAGE_LOAD_CONFIG_DIRECTORY32 and Winapi::Windows::IMAGE_LOAD_CONFIG_DIRECTORY32'}
+{$HPPEMIT '#define IMAGE_LOAD_CONFIG_DIRECTORY32 ::IMAGE_LOAD_CONFIG_DIRECTORY32'}
+{$HPPEMIT ''}
+{$HPPEMIT '// To avoid ambiguity between IMAGE_LOAD_CONFIG_DIRECTORY64 and Winapi::Windows::IMAGE_LOAD_CONFIG_DIRECTORY64'}
+{$HPPEMIT '#define IMAGE_LOAD_CONFIG_DIRECTORY64 ::IMAGE_LOAD_CONFIG_DIRECTORY64'}
+{$HPPEMIT ''}
+{$ENDIF RTL230_UP}
// EJclWin32Error
{$IFDEF MSWINDOWS}
Modified: trunk/jcl/source/prototypes/win32api/ImageHlp.int
===================================================================
--- trunk/jcl/source/prototypes/win32api/ImageHlp.int 2011-12-28 21:12:57 UTC (rev 3656)
+++ trunk/jcl/source/prototypes/win32api/ImageHlp.int 2011-12-28 21:40:47 UTC (rev 3657)
@@ -38,8 +38,8 @@
function ReBaseImage64(CurrentImageName: PAnsiChar; SymbolPath: PAnsiChar; fReBase: BOOL;
fRebaseSysfileOk: BOOL; fGoingDown: BOOL; CheckImageSize: ULONG;
- var OldImageSize: TJclAddr; var OldImageBase: TJclAddr64;
- var NewImageSize: TJclAddr; var NewImageBase: TJclAddr64; TimeStamp: ULONG): BOOL; stdcall;
+ var OldImageSize: TJclAddr32; var OldImageBase: TJclAddr64;
+ var NewImageSize: TJclAddr32; var NewImageBase: TJclAddr64; TimeStamp: ULONG): BOOL; stdcall;
{$EXTERNALSYM ReBaseImage64}
// line 199
Modified: trunk/jcl/source/prototypes/win32api/NtSecApi.int
===================================================================
--- trunk/jcl/source/prototypes/win32api/NtSecApi.int 2011-12-28 21:12:57 UTC (rev 3656)
+++ trunk/jcl/source/prototypes/win32api/NtSecApi.int 2011-12-28 21:40:47 UTC (rev 3657)
@@ -4,7 +4,7 @@
_LSA_UNICODE_STRING = record
Length: USHORT;
MaximumLength: USHORT;
- Buffer: Windows.LPWSTR;
+ Buffer: {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.LPWSTR;
end;
LSA_UNICODE_STRING = _LSA_UNICODE_STRING;
TLsaUnicodeString = LSA_UNICODE_STRING;
@@ -23,7 +23,7 @@
PLSA_OBJECT_ATTRIBUTES = ^LSA_OBJECT_ATTRIBUTES;
_LSA_OBJECT_ATTRIBUTES = record
Length: ULONG;
- RootDirectory: Windows.THandle;
+ RootDirectory: {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.THandle;
ObjectName: PLSA_UNICODE_STRING;
Attributes: ULONG;
SecurityDescriptor: Pointer; // Points to type SECURITY_DESCRIPTOR
@@ -145,7 +145,7 @@
PPOLICY_ACCOUNT_DOMAIN_INFO = ^POLICY_ACCOUNT_DOMAIN_INFO;
_POLICY_ACCOUNT_DOMAIN_INFO = record
DomainName: LSA_UNICODE_STRING;
- DomainSid: Windows.PSID;
+ DomainSid: {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.PSID;
end;
POLICY_ACCOUNT_DOMAIN_INFO = _POLICY_ACCOUNT_DOMAIN_INFO;
TPolicyAccountDomainInfo = POLICY_ACCOUNT_DOMAIN_INFO;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-28 21:13:03
|
Revision: 3656
http://jcl.svn.sourceforge.net/jcl/?rev=3656&view=rev
Author: outchy
Date: 2011-12-28 21:12:57 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Fix some possible integer overflows: stack levels are definitively signed integer since they can be negative for ignored levels.
Modified Paths:
--------------
trunk/jcl/source/windows/JclDebug.pas
Modified: trunk/jcl/source/windows/JclDebug.pas
===================================================================
--- trunk/jcl/source/windows/JclDebug.pas 2011-12-28 20:59:49 UTC (rev 3655)
+++ trunk/jcl/source/windows/JclDebug.pas 2011-12-28 21:12:57 UTC (rev 3656)
@@ -34,7 +34,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
@@ -616,7 +616,7 @@
PStackInfo = ^TStackInfo;
TStackInfo = record
CallerAddr: TJclAddr;
- Level: DWORD;
+ Level: Integer;
CallerFrame: TJclAddr;
DumpSize: DWORD;
ParamSize: DWORD;
@@ -641,7 +641,7 @@
TJclStackInfoList = class(TJclStackBaseList)
private
- FIgnoreLevels: DWORD;
+ FIgnoreLevels: Integer;
TopOfStack: TJclAddr;
BaseOfStack: TJclAddr;
FStackData: PPointer;
@@ -669,13 +669,13 @@
function GetCount: Integer;
procedure CorrectOnAccess(ASkipFirstItem: Boolean);
public
- constructor Create(ARaw: Boolean; AIgnoreLevels: DWORD;
+ constructor Create(ARaw: Boolean; AIgnoreLevels: Integer;
AFirstCaller: Pointer); overload;
- constructor Create(ARaw: Boolean; AIgnoreLevels: DWORD;
+ constructor Create(ARaw: Boolean; AIgnoreLevels: Integer;
AFirstCaller: Pointer; ADelayedTrace: Boolean); overload;
- constructor Create(ARaw: Boolean; AIgnoreLevels: DWORD;
+ constructor Create(ARaw: Boolean; AIgnoreLevels: Integer;
AFirstCaller: Pointer; ADelayedTrace: Boolean; ABaseOfStack: Pointer); overload;
- constructor Create(ARaw: Boolean; AIgnoreLevels: DWORD;
+ constructor Create(ARaw: Boolean; AIgnoreLevels: Integer;
AFirstCaller: Pointer; ADelayedTrace: Boolean; ABaseOfStack, ATopOfStack: Pointer); overload;
destructor Destroy; override;
procedure ForceStackTracing;
@@ -684,17 +684,17 @@
IncludeVAddress: Boolean = False);
property DelayedTrace: Boolean read FDelayedTrace;
property Items[Index: Integer]: TJclStackInfoItem read GetItems; default;
- property IgnoreLevels: DWORD read FIgnoreLevels;
+ property IgnoreLevels: Integer read FIgnoreLevels;
property Count: Integer read GetCount;
property Raw: Boolean read FRaw;
end;
-function JclCreateStackList(Raw: Boolean; AIgnoreLevels: DWORD; FirstCaller: Pointer): TJclStackInfoList; overload;
-function JclCreateStackList(Raw: Boolean; AIgnoreLevels: DWORD; FirstCaller: Pointer;
+function JclCreateStackList(Raw: Boolean; AIgnoreLevels: Integer; FirstCaller: Pointer): TJclStackInfoList; overload;
+function JclCreateStackList(Raw: Boolean; AIgnoreLevels: Integer; FirstCaller: Pointer;
DelayedTrace: Boolean): TJclStackInfoList; overload;
-function JclCreateStackList(Raw: Boolean; AIgnoreLevels: DWORD; FirstCaller: Pointer;
+function JclCreateStackList(Raw: Boolean; AIgnoreLevels: Integer; FirstCaller: Pointer;
DelayedTrace: Boolean; BaseOfStack: Pointer): TJclStackInfoList; overload;
-function JclCreateStackList(Raw: Boolean; AIgnoreLevels: DWORD; FirstCaller: Pointer;
+function JclCreateStackList(Raw: Boolean; AIgnoreLevels: Integer; FirstCaller: Pointer;
DelayedTrace: Boolean; BaseOfStack, TopOfStack: Pointer): TJclStackInfoList; overload;
function JclCreateThreadStackTrace(Raw: Boolean; const ThreadHandle: THandle): TJclStackInfoList;
@@ -4658,7 +4658,7 @@
procedure DoExceptionStackTrace(ExceptObj: TObject; ExceptAddr: Pointer; OSException: Boolean;
BaseOfStack: Pointer);
var
- IgnoreLevels: DWORD;
+ IgnoreLevels: Integer;
FirstCaller: Pointer;
RawMode: Boolean;
Delayed: Boolean;
@@ -4671,10 +4671,10 @@
IgnoreLevels := 1;
end
else
- IgnoreLevels := Cardinal(-1); // because of the "IgnoreLevels + 1" in TJclStackInfoList.StoreToList()
+ IgnoreLevels := -1; // because of the "IgnoreLevels + 1" in TJclStackInfoList.StoreToList()
if OSException then
begin
- if IgnoreLevels = Cardinal(-1) then
+ if IgnoreLevels = -1 then
IgnoreLevels := 0
else
Inc(IgnoreLevels); // => HandleAnyException
@@ -4725,27 +4725,27 @@
GlobalStackList.Clear;
end;
-function JclCreateStackList(Raw: Boolean; AIgnoreLevels: DWORD; FirstCaller: Pointer): TJclStackInfoList;
+function JclCreateStackList(Raw: Boolean; AIgnoreLevels: Integer; FirstCaller: Pointer): TJclStackInfoList;
begin
Result := TJclStackInfoList.Create(Raw, AIgnoreLevels, FirstCaller, False, nil, nil);
GlobalStackList.AddObject(Result);
end;
-function JclCreateStackList(Raw: Boolean; AIgnoreLevels: DWORD; FirstCaller: Pointer;
+function JclCreateStackList(Raw: Boolean; AIgnoreLevels: Integer; FirstCaller: Pointer;
DelayedTrace: Boolean): TJclStackInfoList;
begin
Result := TJclStackInfoList.Create(Raw, AIgnoreLevels, FirstCaller, DelayedTrace, nil, nil);
GlobalStackList.AddObject(Result);
end;
-function JclCreateStackList(Raw: Boolean; AIgnoreLevels: DWORD; FirstCaller: Pointer;
+function JclCreateStackList(Raw: Boolean; AIgnoreLevels: Integer; FirstCaller: Pointer;
DelayedTrace: Boolean; BaseOfStack: Pointer): TJclStackInfoList;
begin
Result := TJclStackInfoList.Create(Raw, AIgnoreLevels, FirstCaller, DelayedTrace, BaseOfStack, nil);
GlobalStackList.AddObject(Result);
end;
-function JclCreateStackList(Raw: Boolean; AIgnoreLevels: DWORD; FirstCaller: Pointer;
+function JclCreateStackList(Raw: Boolean; AIgnoreLevels: Integer; FirstCaller: Pointer;
DelayedTrace: Boolean; BaseOfStack, TopOfStack: Pointer): TJclStackInfoList;
begin
Result := TJclStackInfoList.Create(Raw, AIgnoreLevels, FirstCaller, DelayedTrace, BaseOfStack, TopOfStack);
@@ -4780,7 +4780,7 @@
C.ContextFlags := CONTEXT_FULL;
{$IFDEF CPU32}
if GetThreadContext(ThreadHandle, C) then
- Result := JclCreateStackList(Raw, DWORD(-1), Pointer(C.Eip), False, Pointer(C.Ebp),
+ Result := JclCreateStackList(Raw, -1, Pointer(C.Eip), False, Pointer(C.Ebp),
Pointer(GetThreadTopOfStack(ThreadHandle)));
{$ENDIF CPU32}
{$IFDEF CPU64}
@@ -4833,25 +4833,25 @@
//=== { TJclStackInfoList } ==================================================
-constructor TJclStackInfoList.Create(ARaw: Boolean; AIgnoreLevels: DWORD;
+constructor TJclStackInfoList.Create(ARaw: Boolean; AIgnoreLevels: Integer;
AFirstCaller: Pointer);
begin
Create(ARaw, AIgnoreLevels, AFirstCaller, False, nil, nil);
end;
-constructor TJclStackInfoList.Create(ARaw: Boolean; AIgnoreLevels: DWORD;
+constructor TJclStackInfoList.Create(ARaw: Boolean; AIgnoreLevels: Integer;
AFirstCaller: Pointer; ADelayedTrace: Boolean);
begin
Create(ARaw, AIgnoreLevels, AFirstCaller, ADelayedTrace, nil, nil);
end;
-constructor TJclStackInfoList.Create(ARaw: Boolean; AIgnoreLevels: DWORD;
+constructor TJclStackInfoList.Create(ARaw: Boolean; AIgnoreLevels: Integer;
AFirstCaller: Pointer; ADelayedTrace: Boolean; ABaseOfStack: Pointer);
begin
Create(ARaw, AIgnoreLevels, AFirstCaller, ADelayedTrace, ABaseOfStack, nil);
end;
-constructor TJclStackInfoList.Create(ARaw: Boolean; AIgnoreLevels: DWORD;
+constructor TJclStackInfoList.Create(ARaw: Boolean; AIgnoreLevels: Integer;
AFirstCaller: Pointer; ADelayedTrace: Boolean; ABaseOfStack, ATopOfStack: Pointer);
var
Item: TJclStackInfoItem;
@@ -5035,7 +5035,7 @@
var
Item: TJclStackInfoItem;
begin
- if ((IgnoreLevels = Cardinal(-1)) and (StackInfo.Level > 0)) or
+ if ((IgnoreLevels = -1) and (StackInfo.Level > 0)) or
(StackInfo.Level > (IgnoreLevels + 1)) then
begin
Item := TJclStackInfoItem.Create;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-28 20:59:56
|
Revision: 3655
http://jcl.svn.sourceforge.net/jcl/?rev=3655&view=rev
Author: outchy
Date: 2011-12-28 20:59:49 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Mantis 5747: 64-bit incompatibility in ExceptDlgMail.pas.
Modified Paths:
--------------
trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas
Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas 2011-12-27 22:45:48 UTC (rev 3654)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas 2011-12-28 20:59:49 UTC (rev 3655)
@@ -171,8 +171,10 @@
function HookTApplicationHandleException: Boolean;
const
- CallOffset = $86;
- CallOffsetDebug = $94;
+ CallOffset = $86; // Until D2007
+ CallOffsetDebug = $94; // Until D2007
+ CallOffsetWin32 = $7A; // D2009 and newer
+ CallOffsetWin64 = $95; // DXE2 for Win64
type
PCALLInstruction = ^TCALLInstruction;
TCALLInstruction = packed record
@@ -208,7 +210,8 @@
SysUtilsShowExceptionAddr := PeMapImgResolvePackageThunk(@SysUtils.ShowException);
if Assigned(TApplicationHandleExceptionAddr) and Assigned(SysUtilsShowExceptionAddr) then
begin
- Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
+ Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug) or
+ CheckAddressForOffset(CallOffsetWin32) or CheckAddressForOffset(CallOffsetWin64);
if Result then
begin
CALLInstruction.Address := SizeInt(@HookShowException) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
@@ -303,7 +306,7 @@
ModuleName: TFileName;
NtHeaders32: PImageNtHeaders32;
NtHeaders64: PImageNtHeaders64;
- ModuleBase: Cardinal;
+ ModuleBase: TJclAddr;
ImageBaseStr: string;
C: TWinControl;
CpuInfo: TCpuInfo;
Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas 2011-12-27 22:45:48 UTC (rev 3654)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas 2011-12-28 20:59:49 UTC (rev 3655)
@@ -173,8 +173,10 @@
function HookTApplicationHandleException: Boolean;
const
- CallOffset = $86;
- CallOffsetDebug = $94;
+ CallOffset = $86; // Until D2007
+ CallOffsetDebug = $94; // Until D2007
+ CallOffsetWin32 = $7A; // D2009 and newer
+ CallOffsetWin64 = $95; // DXE2 for Win64
type
PCALLInstruction = ^TCALLInstruction;
TCALLInstruction = packed record
@@ -210,7 +212,8 @@
SysUtilsShowExceptionAddr := PeMapImgResolvePackageThunk(@SysUtils.ShowException);
if Assigned(TApplicationHandleExceptionAddr) and Assigned(SysUtilsShowExceptionAddr) then
begin
- Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
+ Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug) or
+ CheckAddressForOffset(CallOffsetWin32) or CheckAddressForOffset(CallOffsetWin64);
if Result then
begin
CALLInstruction.Address := SizeInt(@HookShowException) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
@@ -326,7 +329,7 @@
ModuleName: TFileName;
NtHeaders32: PImageNtHeaders32;
NtHeaders64: PImageNtHeaders64;
- ModuleBase: Cardinal;
+ ModuleBase: TJclAddr;
ImageBaseStr: string;
C: TWinControl;
CpuInfo: TCpuInfo;
Modified: trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas 2011-12-27 22:45:48 UTC (rev 3654)
+++ trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas 2011-12-28 20:59:49 UTC (rev 3655)
@@ -174,8 +174,10 @@
function HookTApplicationHandleException: Boolean;
const
- CallOffset = $86;
- CallOffsetDebug = $94;
+ CallOffset = $86; // Until D2007
+ CallOffsetDebug = $94; // Until D2007
+ CallOffsetWin32 = $7A; // D2009 and newer
+ CallOffsetWin64 = $95; // DXE2 for Win64
type
PCALLInstruction = ^TCALLInstruction;
TCALLInstruction = packed record
@@ -211,7 +213,8 @@
SysUtilsShowExceptionAddr := PeMapImgResolvePackageThunk(@SysUtils.ShowException);
if Assigned(TApplicationHandleExceptionAddr) and Assigned(SysUtilsShowExceptionAddr) then
begin
- Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
+ Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug) or
+ CheckAddressForOffset(CallOffsetWin32) or CheckAddressForOffset(CallOffsetWin64);
if Result then
begin
CALLInstruction.Address := SizeInt(@HookShowException) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
@@ -334,7 +337,7 @@
ModuleName: TFileName;
NtHeaders32: PImageNtHeaders32;
NtHeaders64: PImageNtHeaders64;
- ModuleBase: Cardinal;
+ ModuleBase: TJclAddr;
ImageBaseStr: string;{$ENDIF}
{$IFDEF ActiveControls} C: TWinControl;{$ENDIF}
{$IFDEF OSInfo} CpuInfo: TCpuInfo;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-27 22:45:56
|
Revision: 3654
http://jcl.svn.sourceforge.net/jcl/?rev=3654&view=rev
Author: outchy
Date: 2011-12-27 22:45:48 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
regenerated using latest pgEdit.exe.
Modified Paths:
--------------
trunk/jcl/packages/d16/Jcl.dproj
trunk/jcl/packages/d16/JclBaseExpert.dproj
trunk/jcl/packages/d16/JclContainers.dproj
trunk/jcl/packages/d16/JclDebugExpert.dproj
trunk/jcl/packages/d16/JclDebugExpertDLL.dproj
trunk/jcl/packages/d16/JclDeveloperTools.dproj
trunk/jcl/packages/d16/JclFavoriteFoldersExpert.dproj
trunk/jcl/packages/d16/JclFavoriteFoldersExpertDLL.dproj
trunk/jcl/packages/d16/JclProjectAnalysisExpert.dproj
trunk/jcl/packages/d16/JclProjectAnalysisExpertDLL.dproj
trunk/jcl/packages/d16/JclRepositoryExpert.dproj
trunk/jcl/packages/d16/JclRepositoryExpertDLL.dproj
trunk/jcl/packages/d16/JclSIMDViewExpert.dproj
trunk/jcl/packages/d16/JclSIMDViewExpertDLL.dproj
trunk/jcl/packages/d16/JclStackTraceViewerExpert.dproj
trunk/jcl/packages/d16/JclStackTraceViewerExpertDLL.dproj
trunk/jcl/packages/d16/JclVcl.dproj
trunk/jcl/packages/d16/JclVersionControlExpert.dproj
trunk/jcl/packages/d16/JclVersionControlExpertDLL.dproj
trunk/jcl/packages/d16/template.dproj
Modified: trunk/jcl/packages/d16/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d16/Jcl.dproj 2011-12-27 21:47:24 UTC (rev 3653)
+++ trunk/jcl/packages/d16/Jcl.dproj 2011-12-27 22:45:48 UTC (rev 3654)
@@ -1,4 +1,4 @@
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{44DB645B-C167-410D-9334-38AF9F0C7913}</ProjectGuid>
<MainSource>Jcl.dpk</MainSource>
@@ -73,7 +73,7 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DCC_ImageBase>$48000000</DCC_ImageBase>
- <DCC_UsePackage>rtl</DCC_UsePackage>
+ <DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win64)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -147,7 +147,7 @@
<VerInfo_Locale>1031</VerInfo_Locale>
</PropertyGroup>
<ItemGroup>
- <DelphiCompile Include="Jcl.dpk">
+ <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp"/>
@@ -279,7 +279,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">True</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
Modified: trunk/jcl/packages/d16/JclBaseExpert.dproj
===================================================================
--- trunk/jcl/packages/d16/JclBaseExpert.dproj 2011-12-27 21:47:24 UTC (rev 3653)
+++ trunk/jcl/packages/d16/JclBaseExpert.dproj 2011-12-27 22:45:48 UTC (rev 3654)
@@ -15,11 +15,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
- <Base_Win64>true</Base_Win64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -30,12 +25,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
- <Cfg_1_Win64>true</Cfg_1_Win64>
- <CfgParent>Cfg_1</CfgParent>
- <Cfg_1>true</Cfg_1>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
@@ -47,12 +36,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
- <Cfg_2_Win64>true</Cfg_2_Win64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -73,14 +56,8 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DCC_ImageBase>$58000000</DCC_ImageBase>
- <DCC_UsePackage>rtl;vcl;vclx;designide;Jcl;JclDeveloperTools</DCC_UsePackage>
+ <DCC_UsePackage>rtl;vcl;vclx;designide;Jcl;JclDeveloperTools;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_Win64)'!=''">
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
- <VerInfo_Locale>1031</VerInfo_Locale>
- <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -92,18 +69,6 @@
<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32\debug</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32\debug</DCC_ObjOutput>
@@ -122,18 +87,6 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32</DCC_ObjOutput>
@@ -147,7 +100,7 @@
<VerInfo_Locale>1031</VerInfo_Locale>
</PropertyGroup>
<ItemGroup>
- <DelphiCompile Include="JclBaseExpert.dpk">
+ <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp"/>
@@ -219,7 +172,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
Modified: trunk/jcl/packages/d16/JclContainers.dproj
===================================================================
--- trunk/jcl/packages/d16/JclContainers.dproj 2011-12-27 21:47:24 UTC (rev 3653)
+++ trunk/jcl/packages/d16/JclContainers.dproj 2011-12-27 22:45:48 UTC (rev 3654)
@@ -73,7 +73,7 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DCC_ImageBase>$48500000</DCC_ImageBase>
- <DCC_UsePackage>rtl;Jcl</DCC_UsePackage>
+ <DCC_UsePackage>rtl;Jcl;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win64)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -147,7 +147,7 @@
<VerInfo_Locale>1031</VerInfo_Locale>
</PropertyGroup>
<ItemGroup>
- <DelphiCompile Include="JclContainers.dpk">
+ <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp"/>
@@ -217,7 +217,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">True</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
Modified: trunk/jcl/packages/d16/JclDebugExpert.dproj
===================================================================
--- trunk/jcl/packages/d16/JclDebugExpert.dproj 2011-12-27 21:47:24 UTC (rev 3653)
+++ trunk/jcl/packages/d16/JclDebugExpert.dproj 2011-12-27 22:45:48 UTC (rev 3654)
@@ -15,11 +15,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
- <Base_Win64>true</Base_Win64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -30,12 +25,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
- <Cfg_1_Win64>true</Cfg_1_Win64>
- <CfgParent>Cfg_1</CfgParent>
- <Cfg_1>true</Cfg_1>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
@@ -47,12 +36,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
- <Cfg_2_Win64>true</Cfg_2_Win64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -73,14 +56,8 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DCC_ImageBase>$58150000</DCC_ImageBase>
- <DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert;JclDeveloperTools</DCC_UsePackage>
+ <DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert;JclDeveloperTools;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_Win64)'!=''">
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
- <VerInfo_Locale>1031</VerInfo_Locale>
- <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -92,18 +69,6 @@
<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32\debug</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32\debug</DCC_ObjOutput>
@@ -122,18 +87,6 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32</DCC_ObjOutput>
@@ -147,7 +100,7 @@
<VerInfo_Locale>1031</VerInfo_Locale>
</PropertyGroup>
<ItemGroup>
- <DelphiCompile Include="JclDebugExpert.dpk">
+ <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp"/>
@@ -210,7 +163,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
Modified: trunk/jcl/packages/d16/JclDebugExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d16/JclDebugExpertDLL.dproj 2011-12-27 21:47:24 UTC (rev 3653)
+++ trunk/jcl/packages/d16/JclDebugExpertDLL.dproj 2011-12-27 22:45:48 UTC (rev 3654)
@@ -15,11 +15,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
- <Base_Win64>true</Base_Win64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -30,12 +25,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
- <Cfg_1_Win64>true</Cfg_1_Win64>
- <CfgParent>Cfg_1</CfgParent>
- <Cfg_1>true</Cfg_1>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
@@ -47,12 +36,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
- <Cfg_2_Win64>true</Cfg_2_Win64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -72,14 +55,8 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DCC_ImageBase>$58150000</DCC_ImageBase>
- <DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert;JclDeveloperTools</DCC_UsePackage>
+ <DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert;JclDeveloperTools;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_Win64)'!=''">
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
- <VerInfo_Locale>1031</VerInfo_Locale>
- <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -91,18 +68,6 @@
<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32\debug</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32\debug</DCC_ObjOutput>
@@ -121,18 +86,6 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32</DCC_ObjOutput>
@@ -146,7 +99,7 @@
<VerInfo_Locale>1031</VerInfo_Locale>
</PropertyGroup>
<ItemGroup>
- <DelphiCompile Include="JclDebugExpertDLL.dpr">
+ <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp"/>
@@ -209,7 +162,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
Modified: trunk/jcl/packages/d16/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d16/JclDeveloperTools.dproj 2011-12-27 21:47:24 UTC (rev 3653)
+++ trunk/jcl/packages/d16/JclDeveloperTools.dproj 2011-12-27 22:45:48 UTC (rev 3654)
@@ -73,7 +73,7 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DCC_ImageBase>$48380000</DCC_ImageBase>
- <DCC_UsePackage>rtl;vcl;Jcl;JclContainers</DCC_UsePackage>
+ <DCC_UsePackage>rtl;vcl;Jcl;JclContainers;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win64)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -147,7 +147,7 @@
<VerInfo_Locale>1031</VerInfo_Locale>
</PropertyGroup>
<ItemGroup>
- <DelphiCompile Include="JclDeveloperTools.dpk">
+ <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp"/>
@@ -234,7 +234,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">True</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
Modified: trunk/jcl/packages/d16/JclFavoriteFoldersExpert.dproj
===================================================================
--- trunk/jcl/packages/d16/JclFavoriteFoldersExpert.dproj 2011-12-27 21:47:24 UTC (rev 3653)
+++ trunk/jcl/packages/d16/JclFavoriteFoldersExpert.dproj 2011-12-27 22:45:48 UTC (rev 3654)
@@ -15,11 +15,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
- <Base_Win64>true</Base_Win64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -30,12 +25,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
- <Cfg_1_Win64>true</Cfg_1_Win64>
- <CfgParent>Cfg_1</CfgParent>
- <Cfg_1>true</Cfg_1>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
@@ -47,12 +36,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
- <Cfg_2_Win64>true</Cfg_2_Win64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -73,14 +56,8 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DCC_ImageBase>$58040000</DCC_ImageBase>
- <DCC_UsePackage>rtl;vcl;designide;Jcl;JclVcl;JclBaseExpert</DCC_UsePackage>
+ <DCC_UsePackage>rtl;vcl;designide;Jcl;JclVcl;JclBaseExpert;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_Win64)'!=''">
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
- <VerInfo_Locale>1031</VerInfo_Locale>
- <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -92,18 +69,6 @@
<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32\debug</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32\debug</DCC_ObjOutput>
@@ -122,18 +87,6 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32</DCC_ObjOutput>
@@ -147,7 +100,7 @@
<VerInfo_Locale>1031</VerInfo_Locale>
</PropertyGroup>
<ItemGroup>
- <DelphiCompile Include="JclFavoriteFoldersExpert.dpk">
+ <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp"/>
@@ -208,7 +161,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
Modified: trunk/jcl/packages/d16/JclFavoriteFoldersExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d16/JclFavoriteFoldersExpertDLL.dproj 2011-12-27 21:47:24 UTC (rev 3653)
+++ trunk/jcl/packages/d16/JclFavoriteFoldersExpertDLL.dproj 2011-12-27 22:45:48 UTC (rev 3654)
@@ -15,11 +15,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
- <Base_Win64>true</Base_Win64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -30,12 +25,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
- <Cfg_1_Win64>true</Cfg_1_Win64>
- <CfgParent>Cfg_1</CfgParent>
- <Cfg_1>true</Cfg_1>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
@@ -47,12 +36,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
- <Cfg_2_Win64>true</Cfg_2_Win64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -72,14 +55,8 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DCC_ImageBase>$58040000</DCC_ImageBase>
- <DCC_UsePackage>rtl;vcl;designide;Jcl;JclVcl;JclBaseExpert</DCC_UsePackage>
+ <DCC_UsePackage>rtl;vcl;designide;Jcl;JclVcl;JclBaseExpert;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_Win64)'!=''">
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
- <VerInfo_Locale>1031</VerInfo_Locale>
- <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -91,18 +68,6 @@
<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32\debug</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32\debug</DCC_ObjOutput>
@@ -121,18 +86,6 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32</DCC_ObjOutput>
@@ -146,7 +99,7 @@
<VerInfo_Locale>1031</VerInfo_Locale>
</PropertyGroup>
<ItemGroup>
- <DelphiCompile Include="JclFavoriteFoldersExpertDLL.dpr">
+ <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp"/>
@@ -207,7 +160,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
Modified: trunk/jcl/packages/d16/JclProjectAnalysisExpert.dproj
===================================================================
--- trunk/jcl/packages/d16/JclProjectAnalysisExpert.dproj 2011-12-27 21:47:24 UTC (rev 3653)
+++ trunk/jcl/packages/d16/JclProjectAnalysisExpert.dproj 2011-12-27 22:45:48 UTC (rev 3654)
@@ -15,11 +15,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
- <Base_Win64>true</Base_Win64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -30,12 +25,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
- <Cfg_1_Win64>true</Cfg_1_Win64>
- <CfgParent>Cfg_1</CfgParent>
- <Cfg_1>true</Cfg_1>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
@@ -47,12 +36,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
- <Cfg_2_Win64>true</Cfg_2_Win64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -73,14 +56,8 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DCC_ImageBase>$58060000</DCC_ImageBase>
- <DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert</DCC_UsePackage>
+ <DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_Win64)'!=''">
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
- <VerInfo_Locale>1031</VerInfo_Locale>
- <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -92,18 +69,6 @@
<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32\debug</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32\debug</DCC_ObjOutput>
@@ -122,18 +87,6 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32</DCC_ObjOutput>
@@ -147,7 +100,7 @@
<VerInfo_Locale>1031</VerInfo_Locale>
</PropertyGroup>
<ItemGroup>
- <DelphiCompile Include="JclProjectAnalysisExpert.dpk">
+ <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp"/>
@@ -208,7 +161,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
Modified: trunk/jcl/packages/d16/JclProjectAnalysisExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d16/JclProjectAnalysisExpertDLL.dproj 2011-12-27 21:47:24 UTC (rev 3653)
+++ trunk/jcl/packages/d16/JclProjectAnalysisExpertDLL.dproj 2011-12-27 22:45:48 UTC (rev 3654)
@@ -15,11 +15,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
- <Base_Win64>true</Base_Win64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -30,12 +25,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
- <Cfg_1_Win64>true</Cfg_1_Win64>
- <CfgParent>Cfg_1</CfgParent>
- <Cfg_1>true</Cfg_1>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
@@ -47,12 +36,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
- <Cfg_2_Win64>true</Cfg_2_Win64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -72,14 +55,8 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DCC_ImageBase>$58060000</DCC_ImageBase>
- <DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert</DCC_UsePackage>
+ <DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_Win64)'!=''">
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
- <VerInfo_Locale>1031</VerInfo_Locale>
- <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -91,18 +68,6 @@
<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32\debug</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32\debug</DCC_ObjOutput>
@@ -121,18 +86,6 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32</DCC_ObjOutput>
@@ -146,7 +99,7 @@
<VerInfo_Locale>1031</VerInfo_Locale>
</PropertyGroup>
<ItemGroup>
- <DelphiCompile Include="JclProjectAnalysisExpertDLL.dpr">
+ <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp"/>
@@ -207,7 +160,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
Modified: trunk/jcl/packages/d16/JclRepositoryExpert.dproj
===================================================================
--- trunk/jcl/packages/d16/JclRepositoryExpert.dproj 2011-12-27 21:47:24 UTC (rev 3653)
+++ trunk/jcl/packages/d16/JclRepositoryExpert.dproj 2011-12-27 22:45:48 UTC (rev 3654)
@@ -15,11 +15,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
- <Base_Win64>true</Base_Win64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -30,12 +25,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
- <Cfg_1_Win64>true</Cfg_1_Win64>
- <CfgParent>Cfg_1</CfgParent>
- <Cfg_1>true</Cfg_1>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
@@ -47,12 +36,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
- <Cfg_2_Win64>true</Cfg_2_Win64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -73,14 +56,8 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DCC_ImageBase>$58100000</DCC_ImageBase>
- <DCC_UsePackage>rtl;vcl;designide;Jcl;JclContainers;JclBaseExpert;JclDeveloperTools</DCC_UsePackage>
+ <DCC_UsePackage>rtl;vcl;designide;Jcl;JclContainers;JclBaseExpert;JclDeveloperTools;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_Win64)'!=''">
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
- <VerInfo_Locale>1031</VerInfo_Locale>
- <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -92,18 +69,6 @@
<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32\debug</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32\debug</DCC_ObjOutput>
@@ -122,18 +87,6 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32</DCC_ObjOutput>
@@ -147,7 +100,7 @@
<VerInfo_Locale>1031</VerInfo_Locale>
</PropertyGroup>
<ItemGroup>
- <DelphiCompile Include="JclRepositoryExpert.dpk">
+ <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp"/>
@@ -219,7 +172,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
Modified: trunk/jcl/packages/d16/JclRepositoryExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d16/JclRepositoryExpertDLL.dproj 2011-12-27 21:47:24 UTC (rev 3653)
+++ trunk/jcl/packages/d16/JclRepositoryExpertDLL.dproj 2011-12-27 22:45:48 UTC (rev 3654)
@@ -15,11 +15,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
- <Base_Win64>true</Base_Win64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -30,12 +25,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
- <Cfg_1_Win64>true</Cfg_1_Win64>
- <CfgParent>Cfg_1</CfgParent>
- <Cfg_1>true</Cfg_1>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
@@ -47,12 +36,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
- <Cfg_2_Win64>true</Cfg_2_Win64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -72,14 +55,8 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DCC_ImageBase>$58100000</DCC_ImageBase>
- <DCC_UsePackage>rtl;vcl;designide;Jcl;JclContainers;JclBaseExpert;JclDeveloperTools</DCC_UsePackage>
+ <DCC_UsePackage>rtl;vcl;designide;Jcl;JclContainers;JclBaseExpert;JclDeveloperTools;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_Win64)'!=''">
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
- <VerInfo_Locale>1031</VerInfo_Locale>
- <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -91,18 +68,6 @@
<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32\debug</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32\debug</DCC_ObjOutput>
@@ -121,18 +86,6 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Locale>1031</VerInfo_Locale>
- </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<DCC_DcuOutput>..\..\lib\d16\win32</DCC_DcuOutput>
<DCC_ObjOutput>..\..\lib\d16\win32</DCC_ObjOutput>
@@ -146,7 +99,7 @@
<VerInfo_Locale>1031</VerInfo_Locale>
</PropertyGroup>
<ItemGroup>
- <DelphiCompile Include="JclRepositoryExpertDLL.dpr">
+ <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp"/>
@@ -218,7 +171,7 @@
</Delphi.Personality>
<Deployment/>
<Platforms>
- <Platform value="Win64">%WIN64ENABLED%</Platform>
+ <Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
Modified: trunk/jcl/packages/d16/JclSIMDViewExpert.dproj
===================================================================
--- trunk/jcl/packages/d16/JclSIMDViewExpert.dproj 2011-12-27 21:47:24 UTC (rev 3653)
+++ trunk/jcl/packages/d16/JclSIMDViewExpert.dproj 2011-12-27 22:45:48 UTC (rev 3654)
@@ -15,11 +15,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
- <Base_Win64>true</Base_Win64>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
@@ -30,12 +25,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
- <Cfg_1_Win64>true</Cfg_1_Win64>
- <CfgParent>Cfg_1</CfgParent>
- <Cfg_1>true</Cfg_1>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
@@ -47,12 +36,6 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
- <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
- <Cfg_2_Win64>true</Cfg_2_Win64>
- <CfgParent>Cfg_2</CfgParent>
- <Cfg_2>true</Cfg_2>
- <Base>true</Base>
- </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent>
@@ -73,14 +56,8 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DCC_ImageBase>$58080000</DCC_ImageBase>
- <DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert</DCC_UsePackage>
+ <DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert;$(DCC_UsePackage)</DCC_UsePackage>
</PropertyGroup>
- <PropertyGroup Condition="'$(Base_Win64)'!=''">
- <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
- <VerInfo_Locale>1031</VerInfo_Locale>
- <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
- </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -92,18 +69,6 @@
<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
- <DCC_DcuOutput>..\..\lib\d16\win64\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d16\win64\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d16\win64\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d16\win64\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d16\win64\debug;..\..\source\include;$(DCC...
[truncated message content] |
|
From: <ou...@us...> - 2011-12-27 21:47:30
|
Revision: 3653
http://jcl.svn.sourceforge.net/jcl/?rev=3653&view=rev
Author: outchy
Date: 2011-12-27 21:47:24 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Mantis 5732: JCL Unit Versioning leak on dynamically allocated dlls.
Modified Paths:
--------------
trunk/jcl/source/common/JclUnitVersioning.pas
Modified: trunk/jcl/source/common/JclUnitVersioning.pas
===================================================================
--- trunk/jcl/source/common/JclUnitVersioning.pas 2011-12-27 20:27:46 UTC (rev 3652)
+++ trunk/jcl/source/common/JclUnitVersioning.pas 2011-12-27 21:47:24 UTC (rev 3653)
@@ -683,18 +683,11 @@
UnitVersioningFinalized := True;
try
if UnitVersioningNPA <> nil then
- begin
- UnitVersioningMutex.WaitFor(INFINITE);
- try
- UnitVersioningNPA^ := nil;
- SharedCloseMem(UnitVersioningNPA);
- finally
- UnitVersioningMutex.Release;
- end;
- end;
+ SharedCloseMem(UnitVersioningNPA);
if (GlobalUnitVersioning <> nil) and UnitVersioningOwner then
- GlobalUnitVersioning.Free;
- GlobalUnitVersioning := nil;
+ FreeAndNil(GlobalUnitVersioning)
+ else
+ GlobalUnitVersioning := nil;
except
// ignore - should never happen
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-27 20:27:53
|
Revision: 3652
http://jcl.svn.sourceforge.net/jcl/?rev=3652&view=rev
Author: outchy
Date: 2011-12-27 20:27:46 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Mantis 5739: installation of OpenHelp failed.
Modified Paths:
--------------
trunk/jcl/source/common/JclIDEUtils.pas
trunk/jcl/source/windows/JclHelpUtils.pas
Modified: trunk/jcl/source/common/JclIDEUtils.pas
===================================================================
--- trunk/jcl/source/common/JclIDEUtils.pas 2011-12-27 20:22:54 UTC (rev 3651)
+++ trunk/jcl/source/common/JclIDEUtils.pas 2011-12-27 20:27:46 UTC (rev 3652)
@@ -770,8 +770,6 @@
const
{$IFDEF MSWINDOWS}
- MSHelpSystemKeyName = '\SOFTWARE\Microsoft\Windows\Help';
-
BCBKeyName = '\SOFTWARE\Borland\C++Builder';
BDSKeyName = '\SOFTWARE\Borland\BDS';
CDSKeyName = '\SOFTWARE\CodeGear\BDS';
@@ -889,11 +887,6 @@
{$ELSE BCB}
BorRADToolRepositoryFileName = 'delphi32.dro';
{$ENDIF BCB}
- HelpContentFileName = '%s\Help\%s%d.ohc';
- HelpIndexFileName = '%s\Help\%s%d.ohi';
- HelpLinkFileName = '%s\Help\%s%d.ohl';
- HelpProjectFileName = '%s\Help\%s%d.ohp';
- HelpGidFileName = '%s\Help\%s%d.gid';
{$ENDIF MSWINDOWS}
// MsBuild options
Modified: trunk/jcl/source/windows/JclHelpUtils.pas
===================================================================
--- trunk/jcl/source/windows/JclHelpUtils.pas 2011-12-27 20:22:54 UTC (rev 3651)
+++ trunk/jcl/source/windows/JclHelpUtils.pas 2011-12-27 20:27:46 UTC (rev 3652)
@@ -151,11 +151,11 @@
const
MSHelpSystemKeyName = '\SOFTWARE\Microsoft\Windows\Help';
- HelpContentFileName = '%s\Help\%s%d.ohc';
- HelpIndexFileName = '%s\Help\%s%d.ohi';
- HelpLinkFileName = '%s\Help\%s%d.ohl';
- HelpProjectFileName = '%s\Help\%s%d.ohp';
- HelpGidFileName = '%s\Help\%s%d.gid';
+ HelpContentFileName = '%s\Help\%s.ohc';
+ HelpIndexFileName = '%s\Help\%s.ohi';
+ HelpLinkFileName = '%s\Help\%s.ohl';
+ HelpProjectFileName = '%s\Help\%s.ohp';
+ HelpGidFileName = '%s\Help\%s.gid';
//=== { TJclBorlandOpenHelp } ================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-27 20:23:01
|
Revision: 3651
http://jcl.svn.sourceforge.net/jcl/?rev=3651&view=rev
Author: outchy
Date: 2011-12-27 20:22:54 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
regenerated with XE2.
Modified Paths:
--------------
trunk/jcl/packages/JclPackagesD160.groupproj
Modified: trunk/jcl/packages/JclPackagesD160.groupproj
===================================================================
--- trunk/jcl/packages/JclPackagesD160.groupproj 2011-12-27 20:17:32 UTC (rev 3650)
+++ trunk/jcl/packages/JclPackagesD160.groupproj 2011-12-27 20:22:54 UTC (rev 3651)
@@ -41,118 +41,121 @@
</Projects>
</ItemGroup>
<ProjectExtensions>
- <Borland.Personality>Default.Personality</Borland.Personality>
+ <Borland.Personality>Default.Personality.12</Borland.Personality>
<Borland.ProjectType/>
- <BorlandProject><BorlandProject><Default.Personality></Default.Personality></BorlandProject>
-</BorlandProject>
+ <BorlandProject>
+ <BorlandProject>
+ <Default.Personality/>
+ </BorlandProject>
+ </BorlandProject>
</ProjectExtensions>
<Target Name="Jcl">
<MSBuild Projects="d16\Jcl.dproj"/>
</Target>
<Target Name="Jcl:Clean">
- <MSBuild Targets="Clean" Projects="d16\Jcl.dproj"/>
+ <MSBuild Projects="d16\Jcl.dproj" Targets="Clean"/>
</Target>
<Target Name="Jcl:Make">
- <MSBuild Targets="Make" Projects="d16\Jcl.dproj"/>
+ <MSBuild Projects="d16\Jcl.dproj" Targets="Make"/>
</Target>
<Target Name="JclVcl">
<MSBuild Projects="d16\JclVcl.dproj"/>
</Target>
<Target Name="JclVcl:Clean">
- <MSBuild Targets="Clean" Projects="d16\JclVcl.dproj"/>
+ <MSBuild Projects="d16\JclVcl.dproj" Targets="Clean"/>
</Target>
<Target Name="JclVcl:Make">
- <MSBuild Targets="Make" Projects="d16\JclVcl.dproj"/>
+ <MSBuild Projects="d16\JclVcl.dproj" Targets="Make"/>
</Target>
<Target Name="JclContainers">
<MSBuild Projects="d16\JclContainers.dproj"/>
</Target>
<Target Name="JclContainers:Clean">
- <MSBuild Targets="Clean" Projects="d16\JclContainers.dproj"/>
+ <MSBuild Projects="d16\JclContainers.dproj" Targets="Clean"/>
</Target>
<Target Name="JclContainers:Make">
- <MSBuild Targets="Make" Projects="d16\JclContainers.dproj"/>
+ <MSBuild Projects="d16\JclContainers.dproj" Targets="Make"/>
</Target>
<Target Name="JclDeveloperTools">
<MSBuild Projects="d16\JclDeveloperTools.dproj"/>
</Target>
<Target Name="JclDeveloperTools:Clean">
- <MSBuild Targets="Clean" Projects="d16\JclDeveloperTools.dproj"/>
+ <MSBuild Projects="d16\JclDeveloperTools.dproj" Targets="Clean"/>
</Target>
<Target Name="JclDeveloperTools:Make">
- <MSBuild Targets="Make" Projects="d16\JclDeveloperTools.dproj"/>
+ <MSBuild Projects="d16\JclDeveloperTools.dproj" Targets="Make"/>
</Target>
<Target Name="JclBaseExpert">
<MSBuild Projects="d16\JclBaseExpert.dproj"/>
</Target>
<Target Name="JclBaseExpert:Clean">
- <MSBuild Targets="Clean" Projects="d16\JclBaseExpert.dproj"/>
+ <MSBuild Projects="d16\JclBaseExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclBaseExpert:Make">
- <MSBuild Targets="Make" Projects="d16\JclBaseExpert.dproj"/>
+ <MSBuild Projects="d16\JclBaseExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclDebugExpert">
<MSBuild Projects="d16\JclDebugExpert.dproj"/>
</Target>
<Target Name="JclDebugExpert:Clean">
- <MSBuild Targets="Clean" Projects="d16\JclDebugExpert.dproj"/>
+ <MSBuild Projects="d16\JclDebugExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclDebugExpert:Make">
- <MSBuild Targets="Make" Projects="d16\JclDebugExpert.dproj"/>
+ <MSBuild Projects="d16\JclDebugExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclFavoriteFoldersExpert">
<MSBuild Projects="d16\JclFavoriteFoldersExpert.dproj"/>
</Target>
<Target Name="JclFavoriteFoldersExpert:Clean">
- <MSBuild Targets="Clean" Projects="d16\JclFavoriteFoldersExpert.dproj"/>
+ <MSBuild Projects="d16\JclFavoriteFoldersExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclFavoriteFoldersExpert:Make">
- <MSBuild Targets="Make" Projects="d16\JclFavoriteFoldersExpert.dproj"/>
+ <MSBuild Projects="d16\JclFavoriteFoldersExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclProjectAnalysisExpert">
<MSBuild Projects="d16\JclProjectAnalysisExpert.dproj"/>
</Target>
<Target Name="JclProjectAnalysisExpert:Clean">
- <MSBuild Targets="Clean" Projects="d16\JclProjectAnalysisExpert.dproj"/>
+ <MSBuild Projects="d16\JclProjectAnalysisExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclProjectAnalysisExpert:Make">
- <MSBuild Targets="Make" Projects="d16\JclProjectAnalysisExpert.dproj"/>
+ <MSBuild Projects="d16\JclProjectAnalysisExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclRepositoryExpert">
<MSBuild Projects="d16\JclRepositoryExpert.dproj"/>
</Target>
<Target Name="JclRepositoryExpert:Clean">
- <MSBuild Targets="Clean" Projects="d16\JclRepositoryExpert.dproj"/>
+ <MSBuild Projects="d16\JclRepositoryExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclRepositoryExpert:Make">
- <MSBuild Targets="Make" Projects="d16\JclRepositoryExpert.dproj"/>
+ <MSBuild Projects="d16\JclRepositoryExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclSIMDViewExpert">
<MSBuild Projects="d16\JclSIMDViewExpert.dproj"/>
</Target>
<Target Name="JclSIMDViewExpert:Clean">
- <MSBuild Targets="Clean" Projects="d16\JclSIMDViewExpert.dproj"/>
+ <MSBuild Projects="d16\JclSIMDViewExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclSIMDViewExpert:Make">
- <MSBuild Targets="Make" Projects="d16\JclSIMDViewExpert.dproj"/>
+ <MSBuild Projects="d16\JclSIMDViewExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclStackTraceViewerExpert">
<MSBuild Projects="d16\JclStackTraceViewerExpert.dproj"/>
</Target>
<Target Name="JclStackTraceViewerExpert:Clean">
- <MSBuild Targets="Clean" Projects="d16\JclStackTraceViewerExpert.dproj"/>
+ <MSBuild Projects="d16\JclStackTraceViewerExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclStackTraceViewerExpert:Make">
- <MSBuild Targets="Make" Projects="d16\JclStackTraceViewerExpert.dproj"/>
+ <MSBuild Projects="d16\JclStackTraceViewerExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclVersionControlExpert">
<MSBuild Projects="d16\JclVersionControlExpert.dproj"/>
</Target>
<Target Name="JclVersionControlExpert:Clean">
- <MSBuild Targets="Clean" Projects="d16\JclVersionControlExpert.dproj"/>
+ <MSBuild Projects="d16\JclVersionControlExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclVersionControlExpert:Make">
- <MSBuild Targets="Make" Projects="d16\JclVersionControlExpert.dproj"/>
+ <MSBuild Projects="d16\JclVersionControlExpert.dproj" Targets="Make"/>
</Target>
<Target Name="Build">
<CallTarget Targets="Jcl;JclVcl;JclContainers;JclDeveloperTools;JclBaseExpert;JclDebugExpert;JclFavoriteFoldersExpert;JclProjectAnalysisExpert;JclRepositoryExpert;JclSIMDViewExpert;JclStackTraceViewerExpert;JclVersionControlExpert"/>
@@ -163,5 +166,5 @@
<Target Name="Make">
<CallTarget Targets="Jcl:Make;JclVcl:Make;JclContainers:Make;JclDeveloperTools:Make;JclBaseExpert:Make;JclDebugExpert:Make;JclFavoriteFoldersExpert:Make;JclProjectAnalysisExpert:Make;JclRepositoryExpert:Make;JclSIMDViewExpert:Make;JclStackTraceViewerExpert:Make;JclVersionControlExpert:Make"/>
</Target>
- <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')" Project="$(BDS)\Bin\CodeGear.Group.Targets"/>
</Project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-27 20:17:39
|
Revision: 3650
http://jcl.svn.sourceforge.net/jcl/?rev=3650&view=rev
Author: outchy
Date: 2011-12-27 20:17:32 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Mantis 5740: Access violation at address 5800C1B6 in module 'JclBaseExpert150.bpl'.
Modified Paths:
--------------
trunk/jcl/experts/common/JclOtaUtils.pas
Modified: trunk/jcl/experts/common/JclOtaUtils.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaUtils.pas 2011-12-27 19:11:45 UTC (rev 3649)
+++ trunk/jcl/experts/common/JclOtaUtils.pas 2011-12-27 20:17:32 UTC (rev 3650)
@@ -565,29 +565,33 @@
for FileIndex := 0 to AProject.GetModuleFileCount - 1 do
begin
AEditor := AProject.GetModuleFileEditor(FileIndex);
- FileExtension := ExtractFileExt(AEditor.FileName);
- if AnsiSameText(FileExtension, '.dpr') or AnsiSameText(FileExtension, '.dpk')
- or AnsiSameText(FileExtension, '.bpf') or AnsiSameText(FileExtension, '.cpp') then
+ // some modules do not have text editors
+ if Assigned(AEditor) then
begin
- AReader := (AEditor as IOTASourceEditor).CreateReader;
- try
- PropLocations := InternalLocateProperties(AReader, PropIDs);
- for PropIndex := 0 to PropCount - 1 do
- if PropLocations[PropIndex] > 0 then
- begin
- SetLength(Result[PropIndex], BufferSize);
- SetLength(Result[PropIndex], AReader.GetText(PropLocations[PropIndex], PAnsiChar(Result[PropIndex]), BufferSize));
- for BufferIndex := 1 to Length(Result[PropIndex]) do
- if CharIsWhiteSpace(Char(Result[PropIndex][BufferIndex])) then
+ FileExtension := ExtractFileExt(AEditor.FileName);
+ if AnsiSameText(FileExtension, '.dpr') or AnsiSameText(FileExtension, '.dpk')
+ or AnsiSameText(FileExtension, '.bpf') or AnsiSameText(FileExtension, '.cpp') then
+ begin
+ AReader := (AEditor as IOTASourceEditor).CreateReader;
+ try
+ PropLocations := InternalLocateProperties(AReader, PropIDs);
+ for PropIndex := 0 to PropCount - 1 do
+ if PropLocations[PropIndex] > 0 then
begin
- SetLength(Result[PropIndex], BufferIndex - 1);
- Break;
+ SetLength(Result[PropIndex], BufferSize);
+ SetLength(Result[PropIndex], AReader.GetText(PropLocations[PropIndex], PAnsiChar(Result[PropIndex]), BufferSize));
+ for BufferIndex := 1 to Length(Result[PropIndex]) do
+ if CharIsWhiteSpace(Char(Result[PropIndex][BufferIndex])) then
+ begin
+ SetLength(Result[PropIndex], BufferIndex - 1);
+ Break;
+ end;
end;
+ finally
+ AReader := nil;
end;
- finally
- AReader := nil;
+ Break;
end;
- Break;
end;
end;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-27 19:11:51
|
Revision: 3649
http://jcl.svn.sourceforge.net/jcl/?rev=3649&view=rev
Author: outchy
Date: 2011-12-27 19:11:45 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Mantis 5747: 64-bit incompatibility in ExceptDlgMail.pas.
Modified Paths:
--------------
trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas
Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas 2011-12-27 18:48:25 UTC (rev 3648)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlg.pas 2011-12-27 19:11:45 UTC (rev 3649)
@@ -136,10 +136,10 @@
function SortModulesListByAddressCompare(List: TStringList;
Index1, Index2: Integer): Integer;
var
- Addr1, Addr2: Cardinal;
+ Addr1, Addr2: TJclAddr;
begin
- Addr1 := Cardinal(List.Objects[Index1]);
- Addr2 := Cardinal(List.Objects[Index2]);
+ Addr1 := TJclAddr(List.Objects[Index1]);
+ Addr2 := TJclAddr(List.Objects[Index2]);
if Addr1 > Addr2 then
Result := 1
else if Addr1 < Addr2 then
@@ -188,15 +188,15 @@
function CheckAddressForOffset(Offset: Cardinal): Boolean;
begin
try
- CallAddress := Pointer(Cardinal(TApplicationHandleExceptionAddr) + Offset);
+ CallAddress := Pointer(TJclAddr(TApplicationHandleExceptionAddr) + Offset);
CALLInstruction.Call := $E8;
Result := PCALLInstruction(CallAddress)^.Call = CALLInstruction.Call;
if Result then
begin
if IsCompiledWithPackages then
- Result := PeMapImgResolvePackageThunk(Pointer(Integer(CallAddress) + Integer(PCALLInstruction(CallAddress)^.Address) + SizeOf(CALLInstruction))) = SysUtilsShowExceptionAddr
+ Result := PeMapImgResolvePackageThunk(Pointer(SizeInt(CallAddress) + Integer(PCALLInstruction(CallAddress)^.Address) + SizeOf(CALLInstruction))) = SysUtilsShowExceptionAddr
else
- Result := PCALLInstruction(CallAddress)^.Address = Integer(SysUtilsShowExceptionAddr) - Integer(CallAddress) - SizeOf(CALLInstruction);
+ Result := PCALLInstruction(CallAddress)^.Address = SizeInt(SysUtilsShowExceptionAddr) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
end;
except
Result := False;
@@ -211,7 +211,7 @@
Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
if Result then
begin
- CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
+ CALLInstruction.Address := SizeInt(@HookShowException) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
end;
end
@@ -418,7 +418,7 @@
for I := 0 to SL.Count - 1 do
begin
ModuleName := SL[I];
- ModuleBase := Cardinal(SL.Objects[I]);
+ ModuleBase := TJclAddr(SL.Objects[I]);
DetailsMemo.Lines.Add(Format('[%.8x] %s', [ModuleBase, ModuleName]));
PETarget := PeMapImgTarget(Pointer(ModuleBase));
NtHeaders32 := nil;
Modified: trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas 2011-12-27 18:48:25 UTC (rev 3648)
+++ trunk/jcl/experts/repository/ExceptionDialog/StandardDialogs/ExceptDlgMail.pas 2011-12-27 19:11:45 UTC (rev 3649)
@@ -138,10 +138,10 @@
function SortModulesListByAddressCompare(List: TStringList;
Index1, Index2: Integer): Integer;
var
- Addr1, Addr2: Cardinal;
+ Addr1, Addr2: TJclAddr;
begin
- Addr1 := Cardinal(List.Objects[Index1]);
- Addr2 := Cardinal(List.Objects[Index2]);
+ Addr1 := TJclAddr(List.Objects[Index1]);
+ Addr2 := TJclAddr(List.Objects[Index2]);
if Addr1 > Addr2 then
Result := 1
else if Addr1 < Addr2 then
@@ -190,15 +190,15 @@
function CheckAddressForOffset(Offset: Cardinal): Boolean;
begin
try
- CallAddress := Pointer(Cardinal(TApplicationHandleExceptionAddr) + Offset);
+ CallAddress := Pointer(TJclAddr(TApplicationHandleExceptionAddr) + Offset);
CALLInstruction.Call := $E8;
Result := PCALLInstruction(CallAddress)^.Call = CALLInstruction.Call;
if Result then
begin
if IsCompiledWithPackages then
- Result := PeMapImgResolvePackageThunk(Pointer(Integer(CallAddress) + Integer(PCALLInstruction(CallAddress)^.Address) + SizeOf(CALLInstruction))) = SysUtilsShowExceptionAddr
+ Result := PeMapImgResolvePackageThunk(Pointer(SizeInt(CallAddress) + Integer(PCALLInstruction(CallAddress)^.Address) + SizeOf(CALLInstruction))) = SysUtilsShowExceptionAddr
else
- Result := PCALLInstruction(CallAddress)^.Address = Integer(SysUtilsShowExceptionAddr) - Integer(CallAddress) - SizeOf(CALLInstruction);
+ Result := PCALLInstruction(CallAddress)^.Address = SizeInt(SysUtilsShowExceptionAddr) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
end;
except
Result := False;
@@ -213,7 +213,7 @@
Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
if Result then
begin
- CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
+ CALLInstruction.Address := SizeInt(@HookShowException) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
end;
end
@@ -441,7 +441,7 @@
for I := 0 to SL.Count - 1 do
begin
ModuleName := SL[I];
- ModuleBase := Cardinal(SL.Objects[I]);
+ ModuleBase := TJclAddr(SL.Objects[I]);
DetailsMemo.Lines.Add(Format('[%.8x] %s', [ModuleBase, ModuleName]));
PETarget := PeMapImgTarget(Pointer(ModuleBase));
NtHeaders32 := nil;
Modified: trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas 2011-12-27 18:48:25 UTC (rev 3648)
+++ trunk/jcl/experts/repository/ExceptionDialog/Templates/ExceptDlg.Delphi32.pas 2011-12-27 19:11:45 UTC (rev 3649)
@@ -139,10 +139,10 @@
function SortModulesListByAddressCompare(List: TStringList;
Index1, Index2: Integer): Integer;
var
- Addr1, Addr2: Cardinal;
+ Addr1, Addr2: TJclAddr;
begin
- Addr1 := Cardinal(List.Objects[Index1]);
- Addr2 := Cardinal(List.Objects[Index2]);
+ Addr1 := TJclAddr(List.Objects[Index1]);
+ Addr2 := TJclAddr(List.Objects[Index2]);
if Addr1 > Addr2 then
Result := 1
else if Addr1 < Addr2 then
@@ -191,15 +191,15 @@
function CheckAddressForOffset(Offset: Cardinal): Boolean;
begin
try
- CallAddress := Pointer(Cardinal(TApplicationHandleExceptionAddr) + Offset);
+ CallAddress := Pointer(TJclAddr(TApplicationHandleExceptionAddr) + Offset);
CALLInstruction.Call := $E8;
Result := PCALLInstruction(CallAddress)^.Call = CALLInstruction.Call;
if Result then
begin
if IsCompiledWithPackages then
- Result := PeMapImgResolvePackageThunk(Pointer(Integer(CallAddress) + Integer(PCALLInstruction(CallAddress)^.Address) + SizeOf(CALLInstruction))) = SysUtilsShowExceptionAddr
+ Result := PeMapImgResolvePackageThunk(Pointer(SizeInt(CallAddress) + Integer(PCALLInstruction(CallAddress)^.Address) + SizeOf(CALLInstruction))) = SysUtilsShowExceptionAddr
else
- Result := PCALLInstruction(CallAddress)^.Address = Integer(SysUtilsShowExceptionAddr) - Integer(CallAddress) - SizeOf(CALLInstruction);
+ Result := PCALLInstruction(CallAddress)^.Address = SizeInt(SysUtilsShowExceptionAddr) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
end;
except
Result := False;
@@ -214,7 +214,7 @@
Result := CheckAddressForOffset(CallOffset) or CheckAddressForOffset(CallOffsetDebug);
if Result then
begin
- CALLInstruction.Address := Integer(@HookShowException) - Integer(CallAddress) - SizeOf(CALLInstruction);
+ CALLInstruction.Address := SizeInt(@HookShowException) - SizeInt(CallAddress) - SizeOf(CALLInstruction);
Result := WriteProtectedMemory(CallAddress, @CallInstruction, SizeOf(CallInstruction), WrittenBytes);
end;
end
@@ -462,7 +462,7 @@
for I := 0 to SL.Count - 1 do
begin
ModuleName := SL[I];
- ModuleBase := Cardinal(SL.Objects[I]);
+ ModuleBase := TJclAddr(SL.Objects[I]);
DetailsMemo.Lines.Add(Format('[%.8x] %s', [ModuleBase, ModuleName]));
PETarget := PeMapImgTarget(Pointer(ModuleBase));
NtHeaders32 := nil;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-27 18:48:31
|
Revision: 3648
http://jcl.svn.sourceforge.net/jcl/?rev=3648&view=rev
Author: outchy
Date: 2011-12-27 18:48:25 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Mantis 5748: JclMapi incompatibilities with 64-bit.
Modified Paths:
--------------
trunk/jcl/source/windows/JclMapi.pas
Modified: trunk/jcl/source/windows/JclMapi.pas
===================================================================
--- trunk/jcl/source/windows/JclMapi.pas 2011-12-27 18:27:22 UTC (rev 3647)
+++ trunk/jcl/source/windows/JclMapi.pas 2011-12-27 18:48:25 UTC (rev 3648)
@@ -310,7 +310,7 @@
AnsiStrings,
{$ENDIF HAS_UNIT_ANSISTRINGS}
{$ENDIF ~HAS_UNITSCOPE}
- JclFileUtils, JclLogic, JclRegistry, JclResources, JclSysInfo, JclSysUtils;
+ JclFileUtils, JclLogic, JclPeImage, JclRegistry, JclResources, JclSysInfo, JclSysUtils;
const
MapiDll = 'mapi32.dll';
@@ -403,29 +403,28 @@
end;
end;
-procedure RestoreTaskWindowsList(const List: TJclTaskWindowsList);
+function RestoreTaskWnds(Wnd: THandle; List: TJclTaskWindowsList): BOOL; stdcall;
var
I: Integer;
-
- function RestoreTaskWnds(Wnd: THandle; List: TJclTaskWindowsList): BOOL; stdcall;
- var
- I: Integer;
- EnableIt: Boolean;
+ EnableIt: Boolean;
+begin
+ if IsWindowVisible(Wnd) then
begin
- if IsWindowVisible(Wnd) then
- begin
- EnableIt := False;
- for I := 1 to Length(List) - 1 do
- if List[I] = Wnd then
- begin
- EnableIt := True;
- Break;
- end;
- EnableWindow(Wnd, EnableIt);
- end;
- Result := True;
+ EnableIt := False;
+ for I := 1 to Length(List) - 1 do
+ if List[I] = Wnd then
+ begin
+ EnableIt := True;
+ Break;
+ end;
+ EnableWindow(Wnd, EnableIt);
end;
+ Result := True;
+end;
+procedure RestoreTaskWindowsList(const List: TJclTaskWindowsList);
+var
+ I: Integer;
begin
if Length(List) > 0 then
begin
@@ -436,21 +435,20 @@
end;
end;
-function SaveTaskWindowsList: TJclTaskWindowsList;
-
- function SaveTaskWnds(Wnd: THandle; var Data: TJclTaskWindowsList): BOOL; stdcall;
- var
- C: Integer;
+function SaveTaskWnds(Wnd: THandle; var Data: TJclTaskWindowsList): BOOL; stdcall;
+var
+ C: Integer;
+begin
+ if IsWindowVisible(Wnd) and IsWindowEnabled(Wnd) then
begin
- if IsWindowVisible(Wnd) and IsWindowEnabled(Wnd) then
- begin
- C := Length(Data);
- SetLength(Data, C + 1);
- Data[C] := Wnd;
- end;
- Result := True;
+ C := Length(Data);
+ SetLength(Data, C + 1);
+ Data[C] := Wnd;
end;
+ Result := True;
+end;
+function SaveTaskWindowsList: TJclTaskWindowsList;
begin
SetLength(Result, 1);
Result[0] := GetFocus;
@@ -584,6 +582,24 @@
SL: TStringList;
I: Integer;
+ function CheckPeImageTarget(const ClientPath: string): Boolean;
+ var
+ Img: TJclPeImage;
+ begin
+ Img := TJclPeImage.Create(True);
+ try
+ Img.FileName := ClientPath;
+ {$IFDEF CPU32}
+ Result := Img.Target = taWin32;
+ {$ENDIF CPU32}
+ {$IFDEF CPU64}
+ Result := Img.Target = taWin64;
+ {$ENDIF CPU64}
+ finally
+ Img.Free;
+ end;
+ end;
+
function CheckValid(var Client: TJclMapiClient): Boolean;
var
I: Integer;
@@ -636,9 +652,14 @@
begin
FClients[I].ClientName := RegReadStringDef(HKEY_LOCAL_MACHINE, ClientKey, '', '');
FClients[I].ClientPath := RegReadStringDef(HKEY_LOCAL_MACHINE, ClientKey, 'DLLPathEx', '');
- if FClients[I].ClientPath = '' then
+ ExpandEnvironmentVar(FClients[I].ClientPath);
+ if (FClients[I].ClientPath = '') or not CheckPeImageTarget(FClients[I].ClientPath) then
+ begin
FClients[I].ClientPath := RegReadStringDef(HKEY_LOCAL_MACHINE, ClientKey, 'DLLPath', '');
- ExpandEnvironmentVar(FClients[I].ClientPath);
+ ExpandEnvironmentVar(FClients[I].ClientPath);
+ if not CheckPeImageTarget(FClients[I].ClientPath) then
+ FClients[I].ClientPath := '';
+ end;
if CheckValid(FClients[I]) then
FAnyClientInstalled := True;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-27 18:27:28
|
Revision: 3647
http://jcl.svn.sourceforge.net/jcl/?rev=3647&view=rev
Author: outchy
Date: 2011-12-27 18:27:22 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Add the platform name to the tab captions for all XE2 targets.
Different section names of JCL demo section names for XE2 Win32 and XE2 Win64.
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas 2011-12-27 17:50:45 UTC (rev 3646)
+++ trunk/jcl/install/JclInstall.pas 2011-12-27 18:27:22 UTC (rev 3647)
@@ -654,27 +654,25 @@
FRunTimeInstallation := (Target.RadToolKind <> brBorlandDevStudio)
or ((Target.VersionNumber >= 3) and (bpDelphi32 in Target.Personalities));
- case TargetPlatform of
- bpWin32: ;
- // begin
- // FTargetName := Format('%s %s', [FTargetName, Personality32Bit]);
- // LibDirMask := LibDirMask + '.x86';
- // end;
- bpWin64:
- begin
+ if (Target.RadToolKind = brBorlandDevStudio) and (Target.VersionNumber >= 9) then
+ begin
+ case TargetPlatform of
+ bpWin32:
+ FTargetName := Format('%s %s', [FTargetName, Personality32Bit]);
+ bpWin64:
FTargetName := Format('%s %s', [FTargetName, Personality64Bit]);
- end;
- bpOSX32:
- raise EJclBorRADException.CreateRes(@RsEOSXPlatformNotValid);
- else
- raise EJclBorRADException.CreateRes(@RsEPlatformNotValid);
+ bpOSX32:
+ raise EJclBorRADException.CreateRes(@RsEOSXPlatformNotValid);
+ else
+ raise EJclBorRADException.CreateRes(@RsEPlatformNotValid);
+ end;
end;
FLibReleaseDir := MakePath(Distribution.LibReleaseDirMask);
FLibDebugDir := MakePath(Distribution.LibDebugDirMask);
FJclDcpPath := PathAddSeparator(MakePath(Distribution.LibReleaseDirMask)); // packages are release
- FDemoSectionName := Target.Name + ' demos';
+ FDemoSectionName := TargetName + ' demos';
FLogFileName := Format('%sbin%s%s.log', [Distribution.JclPath, DirDelimiter, TargetName]);
FLogLines := TJclSimpleLog.Create(FLogFileName);
@@ -2050,7 +2048,7 @@
begin
VersionStr := Target.VersionNumberStr;
if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 9) then
- VersionStr := VersionStr + '\' + AnsiLowerCase(GetPlatformStr);
+ VersionStr := VersionStr + DirDelimiter + AnsiLowerCase(GetPlatformStr);
Result := Format(FormatStr, [VersionStr]);
{$IFDEF MSWINDOWS}
if (Target.RadToolKind <> brBorlandDevStudio) or (Target.VersionNumber < 3) then
@@ -3538,7 +3536,7 @@
TargetInstall := TargetInstalls[Index];
if (TargetInstall.Enabled) and (TargetInstall.FTargetPlatform = bpWin32) then
begin
- Result := TargetInstall.CompileApplication(JclPath + 'install\RegHelper.dpr');
+ Result := TargetInstall.CompileApplication(JclPath + 'install' + DirDelimiter + 'RegHelper.dpr');
if not Result then
begin
if Assigned(GUI) then
@@ -3551,7 +3549,7 @@
// step 2: create parameters for the RegHelper utility
- LogFileName := JclBinDir + '\RegHelper.log';
+ LogFileName := JclBinDir + DirDelimiter + 'RegHelper.log';
if FileExists(LogFileName) then
FileDelete(LogFileName);
Parameters := Format('-c -o"%s"', [LogFileName]);
@@ -3593,7 +3591,7 @@
else
Verb := 'runas';
- Result := JclShell.ShellExecAndWait(JclBinDir + '\RegHelper.exe', Parameters, Verb, SW_HIDE, JclPath + 'help\');
+ Result := JclShell.ShellExecAndWait(JclBinDir + DirDelimiter + 'RegHelper.exe', Parameters, Verb, SW_HIDE, JclPath + 'help' + DirDelimiter);
// step 4: examine output
if Result then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-27 17:50:53
|
Revision: 3646
http://jcl.svn.sourceforge.net/jcl/?rev=3646&view=rev
Author: outchy
Date: 2011-12-27 17:50:45 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
fix some XE2 warnings/errors.
Modified Paths:
--------------
trunk/jcl/examples/common/filesearch/FileSearchDemoMain.pas
trunk/jcl/examples/windows/debug/threadexcept/ThreadExceptDemoMain.dfm
trunk/jcl/examples/windows/debug/threadexcept/ThreadExceptDemoMain.pas
trunk/jcl/examples/windows/delphitools/common/SHDocVw_TLB.pas
trunk/jcl/examples/windows/delphitools/peviewer/PeResView.pas
trunk/jcl/examples/windows/delphitools/peviewer/PeSearch.pas
trunk/jcl/examples/windows/delphitools/peviewer/PeViewer.dpr
trunk/jcl/source/common/JclAlgorithms.pas
Added Paths:
-----------
trunk/jcl/examples/D16.exc
Copied: trunk/jcl/examples/D16.exc (from rev 3644, trunk/jcl/examples/D15.exc)
===================================================================
--- trunk/jcl/examples/D16.exc (rev 0)
+++ trunk/jcl/examples/D16.exc 2011-12-27 17:50:45 UTC (rev 3646)
@@ -0,0 +1 @@
+ExtraRequirements.exc
Modified: trunk/jcl/examples/common/filesearch/FileSearchDemoMain.pas
===================================================================
--- trunk/jcl/examples/common/filesearch/FileSearchDemoMain.pas 2011-12-26 20:40:53 UTC (rev 3645)
+++ trunk/jcl/examples/common/filesearch/FileSearchDemoMain.pas 2011-12-27 17:50:45 UTC (rev 3646)
@@ -115,13 +115,19 @@
procedure TFileSearchForm.AddFile(const Directory: string; const FileInfo: TSearchRec);
var
ListItem: TListItem;
+ FileDateTime: TDateTime;
begin
ListItem := FileList.Items.Add;
with ListItem do
begin
Caption := Directory + FileInfo.Name;
SubItems.Add(IntToStr(GetSizeOfFile(FileInfo)));
- SubItems.Add(FormatDateTime(' yyyy-mm-dd hh:nn:ss ', FileDateToDateTime(FileInfo.Time)));
+ {$IFDEF RTL230_UP}
+ FileDateTime := FileInfo.TimeStamp;
+ {$ELSE ~RTL230_UP}
+ FileDateTime := FileDateToDateTime(FileInfo.Time);
+ {$ENDIF ~RTL230_UP}
+ SubItems.Add(FormatDateTime(' yyyy-mm-dd hh:nn:ss ', FileDateTime));
SubItems.Add(FileAttributesStr(FileInfo));
{$IFDEF UNIX}
if (FileInfo.Attr and faSymLink) <> 0 then
Modified: trunk/jcl/examples/windows/debug/threadexcept/ThreadExceptDemoMain.dfm
===================================================================
--- trunk/jcl/examples/windows/debug/threadexcept/ThreadExceptDemoMain.dfm 2011-12-26 20:40:53 UTC (rev 3645)
+++ trunk/jcl/examples/windows/debug/threadexcept/ThreadExceptDemoMain.dfm 2011-12-27 17:50:45 UTC (rev 3646)
@@ -37,7 +37,7 @@
Width = 697
Height = 289
Anchors = [akLeft, akTop, akRight, akBottom]
- Font.Charset = EASTEUROPE_CHARSET
+ Font.Charset = ANSI_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Courier New'
@@ -54,7 +54,7 @@
Width = 537
Height = 249
Anchors = [akLeft, akTop, akRight]
- Font.Charset = EASTEUROPE_CHARSET
+ Font.Charset = ANSI_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Courier New'
Modified: trunk/jcl/examples/windows/debug/threadexcept/ThreadExceptDemoMain.pas
===================================================================
--- trunk/jcl/examples/windows/debug/threadexcept/ThreadExceptDemoMain.pas 2011-12-26 20:40:53 UTC (rev 3645)
+++ trunk/jcl/examples/windows/debug/threadexcept/ThreadExceptDemoMain.pas 2011-12-27 17:50:45 UTC (rev 3646)
@@ -1,5 +1,7 @@
unit ThreadExceptDemoMain;
+{$I jcl.inc}
+
interface
uses
@@ -139,7 +141,11 @@
begin
DemoThread := TDemoThread.Create(True, ThreadNameEdit.Text);
DemoThread.FreeOnTerminate := True;
+ {$IFDEF RTL230_UP}
+ DemoThread.Start;
+ {$ELSE ~RTL230_UP}
DemoThread.Resume;
+ {$ENDIF ~RTL230_UP}
ThreadNameEdit.Text := GetNewThreadName;
end;
Modified: trunk/jcl/examples/windows/delphitools/common/SHDocVw_TLB.pas
===================================================================
--- trunk/jcl/examples/windows/delphitools/common/SHDocVw_TLB.pas 2011-12-26 20:40:53 UTC (rev 3645)
+++ trunk/jcl/examples/windows/delphitools/common/SHDocVw_TLB.pas 2011-12-27 17:50:45 UTC (rev 3646)
@@ -1,14 +1,14 @@
unit SHDocVw_TLB;
// ************************************************************************ //
-// WARNING
-// -------
-// The types declared in this file were generated from data read from a
-// Type Library. If this type library is explicitly or indirectly (via
-// another type library referring to this type library) re-imported, or the
-// 'Refresh' command of the Type Library Editor activated while editing the
-// Type Library, the contents of this file will be regenerated and all
-// manual modifications will be lost.
+// WARNING
+// -------
+// The types declared in this file were generated from data read from a
+// Type Library. If this type library is explicitly or indirectly (via
+// another type library referring to this type library) re-imported, or the
+// 'Refresh' command of the Type Library Editor activated while editing the
+// Type Library, the contents of this file will be regenerated and all
+// manual modifications will be lost.
// ************************************************************************ //
// PASTLWTR : $Revision$
@@ -18,8 +18,8 @@
// Type Lib: C:\WINDOWS\SYSTEM\SHDOCVW.DLL (1)
// LIBID: {EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}
// LCID: 0
-// Helpfile:
-// DepndLst:
+// Helpfile:
+// DepndLst:
// (1) v2.0 stdole, (C:\WINDOWS\SYSTEM\stdole2.tlb)
// (2) v4.0 StdVCL, (C:\WINDOWS\SYSTEM\stdvcl40.dll)
// Errors:
@@ -1515,6 +1515,15 @@
uses ComObj;
+function CreateEmptyParam: OleVariant;
+begin
+ {$IFDEF RTL230_UP}
+ Result := System.Variants.EmptyParam;
+ {$ELSE ~RTL230_UP}
+ Result := EmptyParam;
+ {$ENDIF ~RTL230_UP}
+end;
+
procedure TWebBrowser_V1.InitControlData;
const
CEventDispIDs: array [0..16] of DWORD = (
@@ -1592,29 +1601,47 @@
end;
procedure TWebBrowser_V1.Navigate(const URL: WideString);
+var
+ EmptyParam1, EmptyParam2, EmptyParam3, EmptyParam4: OleVariant;
begin
- DefaultInterface.Navigate(URL, EmptyParam, EmptyParam, EmptyParam, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ EmptyParam2 := CreateEmptyParam;
+ EmptyParam3 := CreateEmptyParam;
+ EmptyParam4 := CreateEmptyParam;
+ DefaultInterface.Navigate(URL, EmptyParam1, EmptyParam2, EmptyParam3, EmptyParam4);
end;
procedure TWebBrowser_V1.Navigate(const URL: WideString; var Flags: OleVariant);
+var
+ EmptyParam1, EmptyParam2, EmptyParam3: OleVariant;
begin
- DefaultInterface.Navigate(URL, Flags, EmptyParam, EmptyParam, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ EmptyParam2 := CreateEmptyParam;
+ EmptyParam3 := CreateEmptyParam;
+ DefaultInterface.Navigate(URL, Flags, EmptyParam1, EmptyParam2, EmptyParam3);
end;
-procedure TWebBrowser_V1.Navigate(const URL: WideString; var Flags: OleVariant;
+procedure TWebBrowser_V1.Navigate(const URL: WideString; var Flags: OleVariant;
var TargetFrameName: OleVariant);
+var
+ EmptyParam1, EmptyParam2: OleVariant;
begin
- DefaultInterface.Navigate(URL, Flags, TargetFrameName, EmptyParam, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ EmptyParam2 := CreateEmptyParam;
+ DefaultInterface.Navigate(URL, Flags, TargetFrameName, EmptyParam1, EmptyParam2);
end;
-procedure TWebBrowser_V1.Navigate(const URL: WideString; var Flags: OleVariant;
+procedure TWebBrowser_V1.Navigate(const URL: WideString; var Flags: OleVariant;
var TargetFrameName: OleVariant; var PostData: OleVariant);
+var
+ EmptyParam1: OleVariant;
begin
- DefaultInterface.Navigate(URL, Flags, TargetFrameName, PostData, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ DefaultInterface.Navigate(URL, Flags, TargetFrameName, PostData, EmptyParam1);
end;
-procedure TWebBrowser_V1.Navigate(const URL: WideString; var Flags: OleVariant;
- var TargetFrameName: OleVariant; var PostData: OleVariant;
+procedure TWebBrowser_V1.Navigate(const URL: WideString; var Flags: OleVariant;
+ var TargetFrameName: OleVariant; var PostData: OleVariant;
var Headers: OleVariant);
begin
DefaultInterface.Navigate(URL, Flags, TargetFrameName, PostData, Headers);
@@ -1626,8 +1653,11 @@
end;
procedure TWebBrowser_V1.Refresh2;
+var
+ EmptyParam1: OleVariant;
begin
- DefaultInterface.Refresh2(EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ DefaultInterface.Refresh2(EmptyParam1);
end;
procedure TWebBrowser_V1.Refresh2(var Level: OleVariant);
@@ -1719,28 +1749,46 @@
end;
procedure TWebBrowser.Navigate(const URL: WideString);
+var
+ EmptyParam1, EmptyParam2, EmptyParam3, EmptyParam4: OleVariant;
begin
- DefaultInterface.Navigate(URL, EmptyParam, EmptyParam, EmptyParam, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ EmptyParam2 := CreateEmptyParam;
+ EmptyParam3 := CreateEmptyParam;
+ EmptyParam4 := CreateEmptyParam;
+ DefaultInterface.Navigate(URL, EmptyParam1, EmptyParam2, EmptyParam3, EmptyParam4);
end;
procedure TWebBrowser.Navigate(const URL: WideString; var Flags: OleVariant);
+var
+ EmptyParam1, EmptyParam2, EmptyParam3: OleVariant;
begin
- DefaultInterface.Navigate(URL, Flags, EmptyParam, EmptyParam, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ EmptyParam2 := CreateEmptyParam;
+ EmptyParam3 := CreateEmptyParam;
+ DefaultInterface.Navigate(URL, Flags, EmptyParam1, EmptyParam2, EmptyParam3);
end;
-procedure TWebBrowser.Navigate(const URL: WideString; var Flags: OleVariant;
+procedure TWebBrowser.Navigate(const URL: WideString; var Flags: OleVariant;
var TargetFrameName: OleVariant);
+var
+ EmptyParam1, EmptyParam2: OleVariant;
begin
- DefaultInterface.Navigate(URL, Flags, TargetFrameName, EmptyParam, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ EmptyParam2 := CreateEmptyParam;
+ DefaultInterface.Navigate(URL, Flags, TargetFrameName, EmptyParam1, EmptyParam2);
end;
-procedure TWebBrowser.Navigate(const URL: WideString; var Flags: OleVariant;
+procedure TWebBrowser.Navigate(const URL: WideString; var Flags: OleVariant;
var TargetFrameName: OleVariant; var PostData: OleVariant);
+var
+ EmptyParam1: OleVariant;
begin
- DefaultInterface.Navigate(URL, Flags, TargetFrameName, PostData, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ DefaultInterface.Navigate(URL, Flags, TargetFrameName, PostData, EmptyParam1);
end;
-procedure TWebBrowser.Navigate(const URL: WideString; var Flags: OleVariant;
+procedure TWebBrowser.Navigate(const URL: WideString; var Flags: OleVariant;
var TargetFrameName: OleVariant; var PostData: OleVariant;
var Headers: OleVariant);
begin
@@ -1753,8 +1801,11 @@
end;
procedure TWebBrowser.Refresh2;
+var
+ EmptyParam1: OleVariant;
begin
- DefaultInterface.Refresh2(EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ DefaultInterface.Refresh2(EmptyParam1);
end;
procedure TWebBrowser.Refresh2(var Level: OleVariant);
@@ -1788,25 +1839,43 @@
end;
procedure TWebBrowser.Navigate2(var URL: OleVariant);
+var
+ EmptyParam1, EmptyParam2, EmptyParam3, EmptyParam4: OleVariant;
begin
- DefaultInterface.Navigate2(URL, EmptyParam, EmptyParam, EmptyParam, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ EmptyParam2 := CreateEmptyParam;
+ EmptyParam3 := CreateEmptyParam;
+ EmptyParam4 := CreateEmptyParam;
+ DefaultInterface.Navigate2(URL, EmptyParam1, EmptyParam2, EmptyParam3, EmptyParam4);
end;
procedure TWebBrowser.Navigate2(var URL: OleVariant; var Flags: OleVariant);
+var
+ EmptyParam1, EmptyParam2, EmptyParam3: OleVariant;
begin
- DefaultInterface.Navigate2(URL, Flags, EmptyParam, EmptyParam, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ EmptyParam2 := CreateEmptyParam;
+ EmptyParam3 := CreateEmptyParam;
+ DefaultInterface.Navigate2(URL, Flags, EmptyParam1, EmptyParam2, EmptyParam3);
end;
-procedure TWebBrowser.Navigate2(var URL: OleVariant; var Flags: OleVariant;
+procedure TWebBrowser.Navigate2(var URL: OleVariant; var Flags: OleVariant;
var TargetFrameName: OleVariant);
+var
+ EmptyParam1, EmptyParam2: OleVariant;
begin
- DefaultInterface.Navigate2(URL, Flags, TargetFrameName, EmptyParam, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ EmptyParam2 := CreateEmptyParam;
+ DefaultInterface.Navigate2(URL, Flags, TargetFrameName, EmptyParam1, EmptyParam2);
end;
-procedure TWebBrowser.Navigate2(var URL: OleVariant; var Flags: OleVariant;
+procedure TWebBrowser.Navigate2(var URL: OleVariant; var Flags: OleVariant;
var TargetFrameName: OleVariant; var PostData: OleVariant);
+var
+ EmptyParam1: OleVariant;
begin
- DefaultInterface.Navigate2(URL, Flags, TargetFrameName, PostData, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ DefaultInterface.Navigate2(URL, Flags, TargetFrameName, PostData, EmptyParam1);
end;
procedure TWebBrowser.Navigate2(var URL: OleVariant; var Flags: OleVariant;
@@ -1822,29 +1891,43 @@
end;
procedure TWebBrowser.ExecWB(cmdID: OLECMDID; cmdexecopt: OLECMDEXECOPT);
+var
+ EmptyParam1, EmptyParam2: OleVariant;
begin
- DefaultInterface.ExecWB(cmdID, cmdexecopt, EmptyParam, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ EmptyParam2 := CreateEmptyParam;
+ DefaultInterface.ExecWB(cmdID, cmdexecopt, EmptyParam1, EmptyParam2);
end;
procedure TWebBrowser.ExecWB(cmdID: OLECMDID; cmdexecopt: OLECMDEXECOPT; var pvaIn: OleVariant);
+var
+ EmptyParam1: OleVariant;
begin
- DefaultInterface.ExecWB(cmdID, cmdexecopt, pvaIn, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ DefaultInterface.ExecWB(cmdID, cmdexecopt, pvaIn, EmptyParam1);
end;
-procedure TWebBrowser.ExecWB(cmdID: OLECMDID; cmdexecopt: OLECMDEXECOPT; var pvaIn: OleVariant;
+procedure TWebBrowser.ExecWB(cmdID: OLECMDID; cmdexecopt: OLECMDEXECOPT; var pvaIn: OleVariant;
var pvaOut: OleVariant);
begin
DefaultInterface.ExecWB(cmdID, cmdexecopt, pvaIn, pvaOut);
end;
procedure TWebBrowser.ShowBrowserBar(var pvaClsid: OleVariant);
+var
+ EmptyParam1, EmptyParam2: OleVariant;
begin
- DefaultInterface.ShowBrowserBar(pvaClsid, EmptyParam, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ EmptyParam2 := CreateEmptyParam;
+ DefaultInterface.ShowBrowserBar(pvaClsid, EmptyParam1, EmptyParam2);
end;
procedure TWebBrowser.ShowBrowserBar(var pvaClsid: OleVariant; var pvarShow: OleVariant);
+var
+ EmptyParam1: OleVariant;
begin
- DefaultInterface.ShowBrowserBar(pvaClsid, pvarShow, EmptyParam);
+ EmptyParam1 := CreateEmptyParam;
+ DefaultInterface.ShowBrowserBar(pvaClsid, pvarShow, EmptyParam1);
end;
procedure TWebBrowser.ShowBrowserBar(var pvaClsid: OleVariant; var pvarShow: OleVariant;
Modified: trunk/jcl/examples/windows/delphitools/peviewer/PeResView.pas
===================================================================
--- trunk/jcl/examples/windows/delphitools/peviewer/PeResView.pas 2011-12-26 20:40:53 UTC (rev 3645)
+++ trunk/jcl/examples/windows/delphitools/peviewer/PeResView.pas 2011-12-27 17:50:45 UTC (rev 3646)
@@ -30,12 +30,7 @@
interface
uses
- //SHDocVw_TLB needs an adjustment for XE2
- {$IFDEF RTL230_UP}
- SHDocVw,
- {$ELSE ~RTL230_UP}
SHDocVw_TLB,
- {$ENDIF ~RTL230_UP}
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
JclPeImage, PeResource, JclLogic, JclGraphUtils, ComCtrls, StdCtrls,
ExtCtrls, Grids, ToolWin, ActnList, OleCtrls, Menus;
Modified: trunk/jcl/examples/windows/delphitools/peviewer/PeSearch.pas
===================================================================
--- trunk/jcl/examples/windows/delphitools/peviewer/PeSearch.pas 2011-12-26 20:40:53 UTC (rev 3645)
+++ trunk/jcl/examples/windows/delphitools/peviewer/PeSearch.pas 2011-12-27 17:50:45 UTC (rev 3646)
@@ -136,7 +136,11 @@
FSearchThread.OnProcessFile := SearchProcessFile;
UpdateButtons;
ClearResults;
+ {$IFDEF RTL230_UP}
+ FSearchThread.Start;
+ {$ELSE ~RTL230_UP}
FSearchThread.Resume;
+ {$ENDIF ~RTL230_UP}
end;
procedure TPeSearchChild.StopSearch;
Modified: trunk/jcl/examples/windows/delphitools/peviewer/PeViewer.dpr
===================================================================
--- trunk/jcl/examples/windows/delphitools/peviewer/PeViewer.dpr 2011-12-26 20:40:53 UTC (rev 3645)
+++ trunk/jcl/examples/windows/delphitools/peviewer/PeViewer.dpr 2011-12-27 17:50:45 UTC (rev 3646)
@@ -17,11 +17,8 @@
About in '..\Common\About.pas' {AboutBox},
PeGenDef in 'PeGenDef.pas' {PeGenDefChild},
FindDlg in '..\Common\FindDlg.pas' {FindTextForm},
- ExceptDlg in '..\..\..\..\experts\repository\ExceptionDialog\StandardDialogs\ExceptDlg.pas' {ExceptionDialog}
- {$IFNDEF RTL230_UP}
- , SHDocVw_TLB in '..\Common\SHDocVw_TLB.pas'
- {$ENDIF ~RTL230_UP}
- ;
+ ExceptDlg in '..\..\..\..\experts\repository\ExceptionDialog\StandardDialogs\ExceptDlg.pas' {ExceptionDialog},
+ SHDocVw_TLB in '..\Common\SHDocVw_TLB.pas';
{$R *.TLB}
Modified: trunk/jcl/source/common/JclAlgorithms.pas
===================================================================
--- trunk/jcl/source/common/JclAlgorithms.pas 2011-12-26 20:40:53 UTC (rev 3645)
+++ trunk/jcl/source/common/JclAlgorithms.pas 2011-12-27 17:50:45 UTC (rev 3646)
@@ -506,10 +506,10 @@
function IntfSimpleCompare(const Obj1, Obj2: IInterface): Integer;
begin
- if INT_PTR(Obj1) < INT_PTR(Obj2) then
+ if SizeInt(Obj1) < SizeInt(Obj2) then
Result := -1
else
- if INT_PTR(Obj1) > INT_PTR(Obj2) then
+ if SizeInt(Obj1) > SizeInt(Obj2) then
Result := 1
else
Result := 0;
@@ -648,10 +648,10 @@
function PtrSimpleCompare(Obj1, Obj2: Pointer): Integer;
begin
- if INT_PTR(Obj1) < INT_PTR(Obj2) then
+ if SizeInt(Obj1) < SizeInt(Obj2) then
Result := -1
else
- if INT_PTR(Obj1) > INT_PTR(Obj2) then
+ if SizeInt(Obj1) > SizeInt(Obj2) then
Result := 1
else
Result := 0;
@@ -659,10 +659,10 @@
function SimpleCompare(Obj1, Obj2: TObject): Integer;
begin
- if INT_PTR(Obj1) < INT_PTR(Obj2) then
+ if SizeInt(Obj1) < SizeInt(Obj2) then
Result := -1
else
- if INT_PTR(Obj1) > INT_PTR(Obj2) then
+ if SizeInt(Obj1) > SizeInt(Obj2) then
Result := 1
else
Result := 0;
@@ -670,10 +670,10 @@
function IntegerCompare(Obj1, Obj2: TObject): Integer;
begin
- if INT_PTR(Obj1) < INT_PTR(Obj2) then
+ if SizeInt(Obj1) < SizeInt(Obj2) then
Result := -1
else
- if INT_PTR(Obj1) > INT_PTR(Obj2) then
+ if SizeInt(Obj1) > SizeInt(Obj2) then
Result := 1
else
Result := 0;
@@ -681,7 +681,7 @@
function IntfSimpleEqualityCompare(const Obj1, Obj2: IInterface): Boolean;
begin
- Result := INT_PTR(Obj1) = INT_PTR(Obj2);
+ Result := SizeInt(Obj1) = SizeInt(Obj2);
end;
// default is case-sensitive
@@ -771,20 +771,21 @@
function PtrSimpleEqualityCompare(Obj1, Obj2: Pointer): Boolean;
begin
- Result := INT_PTR(Obj1) = INT_PTR(Obj2);
+ Result := SizeInt(Obj1) = SizeInt(Obj2);
end;
function SimpleEqualityCompare(Obj1, Obj2: TObject): Boolean;
begin
- Result := INT_PTR(Obj1) = INT_PTR(Obj2);
+ Result := SizeInt(Obj1) = SizeInt(Obj2);
end;
function IntfSimpleHashConvert(const AInterface: IInterface): Integer;
begin
- {$IFDEF DELPHI64_TEMPORARY}
- {$MESSAGE WARN 'This and related functions high likely needs to be adjusted for 64-bit'}
- {$ENDIF DELPHI64_TEMPORARY}
- Result := INT_PTR(AInterface) and MaxInt;
+ {$IFDEF CPU32}
+ Result := SizeInt(AInterface) and MaxInt;
+ {$ELSE ~CPU32}
+ Result := (SizeInt(AInterface) xor (SizeInt(AInterface) shr 32)) and MaxInt;
+ {$ENDIF ~CPU32}
end;
// from "Fast Hashing of Variable-Length Text Strings", Peter K. Pearson, 1990
@@ -1064,17 +1065,17 @@
function Int64SimpleHashConvert(const AValue: Int64): Integer;
begin
- Result := AValue and MaxInt;
+ Result := (AValue xor (AValue shr 32)) and MaxInt;
end;
function PtrSimpleHashConvert(APtr: Pointer): Integer;
begin
- Result := Integer(APtr) and MaxInt;
+ Result := SizeInt(APtr) and MaxInt;
end;
function SimpleHashConvert(AObject: TObject): Integer;
begin
- Result := Integer(AObject) and MaxInt;
+ Result := SizeInt(AObject) and MaxInt;
end;
procedure FinalizeArrayBeforeMove(var List: TDynIInterfaceArray; FromIndex, ToIndex, Count: SizeInt); overload;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2011-12-26 20:40:59
|
Revision: 3645
http://jcl.svn.sourceforge.net/jcl/?rev=3645&view=rev
Author: outchy
Date: 2011-12-26 20:40:53 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
Fix some warnings about operand size extents.
Modified Paths:
--------------
trunk/jcl/source/common/JclSysUtils.pas
Modified: trunk/jcl/source/common/JclSysUtils.pas
===================================================================
--- trunk/jcl/source/common/JclSysUtils.pas 2011-12-04 14:31:49 UTC (rev 3644)
+++ trunk/jcl/source/common/JclSysUtils.pas 2011-12-26 20:40:53 UTC (rev 3645)
@@ -1435,7 +1435,8 @@
function ArrayItemPointer(Item: SizeInt): Pointer;
begin
- Result := Pointer(TJclAddr(ArrayPtr) + (Item * SizeInt(ElementSize)));
+ Assert(Item >= 0);
+ Result := Pointer(TJclAddr(ArrayPtr) + TJclAddr(Item * SizeInt(ElementSize)));
end;
procedure QuickSort(L, R: SizeInt);
@@ -1518,7 +1519,7 @@
while L <= H do
begin
I := (L + H) shr 1;
- C := SortFunc(Pointer(TJclAddr(ArrayPtr) + (I * SizeInt(ElementSize))), ValuePtr);
+ C := SortFunc(Pointer(TJclAddr(ArrayPtr) + TJclAddr(I * SizeInt(ElementSize))), ValuePtr);
if C < 0 then
L := I + 1
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <usc...@us...> - 2011-12-04 14:31:55
|
Revision: 3644
http://jcl.svn.sourceforge.net/jcl/?rev=3644&view=rev
Author: uschuster
Date: 2011-12-04 14:31:49 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Fixed SortDynArray and SearchDynArray for 64-bit (Mantis #5720; patch from Patrick van Logchem)
The following snippet lead to an access violation on Win64
function CompareNativeInt(Item1, Item2: Pointer): Integer;
begin
Result := PNativeInt(Item1)^ - PNativeInt(Item2)^;
end;
procedure TestSortDynArray;
var
A: array of NativeInt;
I: Integer;
begin
SetLength(A, 5);
for I := 0 to High(A) do
A[I] := High(A) - I;
SortDynArray(A, SizeOf(NativeInt), CompareNativeInt);
end;
Modified Paths:
--------------
trunk/jcl/source/common/JclSysUtils.pas
Modified: trunk/jcl/source/common/JclSysUtils.pas
===================================================================
--- trunk/jcl/source/common/JclSysUtils.pas 2011-12-04 13:52:33 UTC (rev 3643)
+++ trunk/jcl/source/common/JclSysUtils.pas 2011-12-04 14:31:49 UTC (rev 3644)
@@ -243,7 +243,7 @@
procedure SortDynArray(const ArrayPtr: Pointer; ElementSize: Cardinal; SortFunc: TDynArraySortCompare);
// Usage: SortDynArray(Array, SizeOf(Array[0]), SortFunction);
function SearchDynArray(const ArrayPtr: Pointer; ElementSize: Cardinal; SortFunc: TDynArraySortCompare;
- ValuePtr: Pointer; Nearest: Boolean = False): Integer;
+ ValuePtr: Pointer; Nearest: Boolean = False): SizeInt;
// Usage: SearchDynArray(Array, SizeOf(Array[0]), SortFunction, @SearchedValue);
{ Various compare functions for basic types }
@@ -1433,14 +1433,14 @@
var
TempBuf: TDynByteArray;
- function ArrayItemPointer(Item: Integer): Pointer;
+ function ArrayItemPointer(Item: SizeInt): Pointer;
begin
- Result := Pointer(TJclAddr(ArrayPtr) + (Cardinal(Item) * ElementSize));
+ Result := Pointer(TJclAddr(ArrayPtr) + (Item * SizeInt(ElementSize)));
end;
- procedure QuickSort(L, R: Integer);
+ procedure QuickSort(L, R: SizeInt);
var
- I, J, T: Integer;
+ I, J, T: SizeInt;
P, IPtr, JPtr: Pointer;
begin
repeat
@@ -1499,26 +1499,26 @@
if ArrayPtr <> nil then
begin
SetLength(TempBuf, ElementSize);
- QuickSort(0, PInteger(TJclAddr(ArrayPtr) - 4)^ - 1);
+ QuickSort(0, PSizeInt(TJclAddr(ArrayPtr) - SizeOf(SizeInt))^ - 1);
end;
end;
function SearchDynArray(const ArrayPtr: Pointer; ElementSize: Cardinal; SortFunc: TDynArraySortCompare;
- ValuePtr: Pointer; Nearest: Boolean): Integer;
+ ValuePtr: Pointer; Nearest: Boolean): SizeInt;
var
- L, H, I, C: Integer;
+ L, H, I, C: SizeInt;
B: Boolean;
begin
Result := -1;
if ArrayPtr <> nil then
begin
L := 0;
- H := PInteger(TJclAddr(ArrayPtr) - 4)^ - 1;
+ H := PSizeInt(TJclAddr(ArrayPtr) - SizeOf(SizeInt))^ - 1;
B := False;
while L <= H do
begin
I := (L + H) shr 1;
- C := SortFunc(Pointer(TJclAddr(ArrayPtr) + (Cardinal(I) * ElementSize)), ValuePtr);
+ C := SortFunc(Pointer(TJclAddr(ArrayPtr) + (I * SizeInt(ElementSize))), ValuePtr);
if C < 0 then
L := I + 1
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <usc...@us...> - 2011-12-04 13:52:40
|
Revision: 3643
http://jcl.svn.sourceforge.net/jcl/?rev=3643&view=rev
Author: uschuster
Date: 2011-12-04 13:52:33 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Fixed Win64 compiler hint (from Patrick van Logchem as part of the patch for Mantis #5720)
Modified Paths:
--------------
trunk/jcl/source/windows/JclDebug.pas
Modified: trunk/jcl/source/windows/JclDebug.pas
===================================================================
--- trunk/jcl/source/windows/JclDebug.pas 2011-11-30 10:27:20 UTC (rev 3642)
+++ trunk/jcl/source/windows/JclDebug.pas 2011-12-04 13:52:33 UTC (rev 3643)
@@ -661,7 +661,9 @@
procedure StoreToList(const StackInfo: TStackInfo);
procedure TraceStackFrames;
procedure TraceStackRaw;
+ {$IFDEF CPU32}
procedure DelayStoreStack;
+ {$ENDIF CPU32}
function ValidCallSite(CodeAddr: TJclAddr; out CallInstructionSize: Cardinal): Boolean;
function ValidStackAddr(StackAddr: TJclAddr): Boolean;
function GetCount: Integer;
@@ -5180,6 +5182,7 @@
end;
end;
+{$IFDEF CPU32}
procedure TJclStackInfoList.DelayStoreStack;
var
StackPtr: PJclAddr;
@@ -5211,6 +5214,7 @@
FFramePointer := Pointer(TJclAddr(FFramePointer) + FStackOffset);
TopOfStack := TopOfStack + FStackOffset;
end;
+{$ENDIF CPU32}
// Validate that the code address is a valid code site
//
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.
