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: <ou...@us...> - 2012-01-19 18:42:03
|
Revision: 3692
http://jcl.svn.sourceforge.net/jcl/?rev=3692&view=rev
Author: outchy
Date: 2012-01-19 18:41:57 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
static link is now the default link option for BZIP2, PCRE and ZLIB.
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas 2012-01-17 17:41:43 UTC (rev 3691)
+++ trunk/jcl/install/JclInstall.pas 2012-01-19 18:41:57 UTC (rev 3692)
@@ -884,54 +884,26 @@
end;
procedure AddWrapperOptions(Parent: TInstallerOption);
- var
- LinkOnRequestDefault: Boolean;
begin
- LinkOnRequestDefault := (Target is TJclBDSInstallation) and (Target.IDEVersionNumber >= 9) and (FTargetPlatform = bpWin64);
-
// PCRE options
AddOption(joJCLDefPCRE, [goChecked], Parent);
if Target.RadToolKind = brBorlandDevStudio then
begin
- if LinkOnRequestDefault then
- begin
- AddOption(joJCLDefPCREStaticLink, [goRadioButton], joJCLDefPCRE);
- AddOption(joJCLDefPCRELinkOnRequest, [goRadioButton, goChecked], joJCLDefPCRE);
- end
- else
- begin
- AddOption(joJCLDefPCREStaticLink, [goRadioButton, goChecked], joJCLDefPCRE);
- AddOption(joJCLDefPCRELinkOnRequest, [goRadioButton], joJCLDefPCRE);
- end;
+ AddOption(joJCLDefPCREStaticLink, [goRadioButton, goChecked], joJCLDefPCRE);
+ AddOption(joJCLDefPCRELinkOnRequest, [goRadioButton], joJCLDefPCRE);
end
else
AddOption(joJCLDefPCRELinkOnRequest, [goRadioButton, goChecked], joJCLDefPCRE);
AddOption(joJCLDefPCRELinkDLL, [goRadioButton], joJCLDefPCRE);
// BZip2 options
AddOption(joJCLDefBZip2, [goChecked], Parent);
- if LinkOnRequestDefault then
- begin
- AddOption(joJCLDefBZip2StaticLink, [goRadioButton], joJCLDefBZip2);
- AddOption(joJCLDefBZip2LinkOnRequest, [goRadioButton, goChecked], joJCLDefBZip2);
- end
- else
- begin
- AddOption(joJCLDefBZip2StaticLink, [goRadioButton, goChecked], joJCLDefBZip2);
- AddOption(joJCLDefBZip2LinkOnRequest, [goRadioButton], joJCLDefBZip2);
- end;
+ AddOption(joJCLDefBZip2StaticLink, [goRadioButton, goChecked], joJCLDefBZip2);
+ AddOption(joJCLDefBZip2LinkOnRequest, [goRadioButton], joJCLDefBZip2);
AddOption(joJCLDefBZip2LinkDLL, [goRadioButton], joJCLDefBZip2);
// ZLib options
AddOption(joJCLDefZLib, [goChecked], Parent);
- if LinkOnRequestDefault then
- begin
- AddOption(joJCLDefZLibStaticLink, [goRadioButton], joJCLDefZLib);
- AddOption(joJCLDefZLibLinkOnRequest, [goRadioButton, goChecked], joJCLDefZLib);
- end
- else
- begin
- AddOption(joJCLDefZLibStaticLink, [goRadioButton, goChecked], joJCLDefZLib);
- AddOption(joJCLDefZLibLinkOnRequest, [goRadioButton], joJCLDefZLib);
- end;
+ AddOption(joJCLDefZLibStaticLink, [goRadioButton, goChecked], joJCLDefZLib);
+ AddOption(joJCLDefZLibLinkOnRequest, [goRadioButton], joJCLDefZLib);
AddOption(joJCLDefZLibLinkDLL, [goRadioButton], joJCLDefZLib);
// Unicode options
AddOption(joJCLDefUnicode, [goChecked], Parent);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-17 17:41:56
|
Revision: 3691
http://jcl.svn.sourceforge.net/jcl/?rev=3691&view=rev
Author: outchy
Date: 2012-01-17 17:41:43 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
update to Unicode Character Database (UCD) 6.0.0.
Modified Paths:
--------------
trunk/jcl/source/common/JclUnicode.pas
trunk/jcl/source/common/JclUnicode.rc
trunk/jcl/source/common/JclUnicode.res
trunk/jcl/source/common/JclUnicodeBZip2.res
trunk/jcl/source/common/JclUnicodeBzip2.rc
trunk/jcl/source/common/JclUnicodeZLib.rc
trunk/jcl/source/common/JclUnicodeZLib.res
Modified: trunk/jcl/source/common/JclUnicode.pas
===================================================================
--- trunk/jcl/source/common/JclUnicode.pas 2012-01-17 16:02:46 UTC (rev 3690)
+++ trunk/jcl/source/common/JclUnicode.pas 2012-01-17 17:41:43 UTC (rev 3691)
@@ -379,6 +379,8 @@
ubArabicSupplement,
ubThaana,
ubNKo,
+ ubSamaritan,
+ ubMandaic,
ubDevanagari,
ubBengali,
ubGurmukhi,
@@ -407,12 +409,19 @@
ubTagbanwa,
ubKhmer,
ubMongolian,
+ ubUnifiedCanadianAboriginalSyllabicsExtended,
ubLimbu,
ubTaiLe,
ubNewTaiLue,
ubKhmerSymbols,
ubBuginese,
+ ubTaiTham,
ubBalinese,
+ ubSundanese,
+ ubBatak,
+ ubLepcha,
+ ubOlChiki,
+ ubVedicExtensions,
ubPhoneticExtensions,
ubPhoneticExtensionsSupplement,
ubCombiningDiacriticalMarksSupplement,
@@ -448,6 +457,7 @@
ubGeorgianSupplement,
ubTifinagh,
ubEthiopicExtended,
+ ubCyrillicExtendedA,
ubSupplementalPunctuation,
ubCJKRadicalsSupplement,
ubKangxiRadicals,
@@ -468,11 +478,28 @@
ubCJKUnifiedIdeographs,
ubYiSyllables,
ubYiRadicals,
+ ubLisu,
+ ubVai,
+ ubCyrillicExtendedB,
+ ubBamum,
ubModifierToneLetters,
ubLatinExtendedD,
ubSylotiNagri,
+ ubCommonIndicNumberForms,
ubPhagsPa,
+ ubSaurashtra,
+ ubDevanagariExtended,
+ ubKayahLi,
+ ubRejang,
+ ubHangulJamoExtendedA,
+ ubJavanese,
+ ubCham,
+ ubMyanmarExtendedA,
+ ubTaiViet,
+ ubEthiopicExtendedA,
+ ubMeeteiMayek,
ubHangulSyllables,
+ ubHangulJamoExtendedB,
ubHighSurrogates,
ubHighPrivateUseSurrogates,
ubLowSurrogates,
@@ -492,6 +519,10 @@
ubLinearBIdeograms,
ubAegeanNumbers,
ubAncientGreekNumbers,
+ ubAncientSymbols,
+ ubPhaistosDisc,
+ ubLycian,
+ ubCarian,
ubOldItalic,
ubGothic,
ubUgaritic,
@@ -500,17 +531,41 @@
ubShavian,
ubOsmanya,
ubCypriotSyllabary,
+ ubImperialAramaic,
ubPhoenician,
+ ubLydian,
ubKharoshthi,
+ ubOldSouthArabian,
+ ubAvestan,
+ ubInscriptionalParthian,
+ ubInscriptionalPahlavi,
+ ubOldTurkic,
+ ubRumiNumeralSymbols,
+ ubBrahmi,
+ ubKaithi,
ubCuneiform,
ubCuneiformNumbersAndPunctuation,
+ ubEgyptianHieroglyphs,
+ ubBamumSupplement,
+ ubKanaSupplement,
ubByzantineMusicalSymbols,
ubMusicalSymbols,
ubAncientGreekMusicalNotation,
ubTaiXuanJingSymbols,
ubCountingRodNumerals,
ubMathematicalAlphanumericSymbols,
+ ubMahjongTiles,
+ ubDominoTiles,
+ ubPlayingCards,
+ ubEnclosedAlphanumericSupplement,
+ ubEnclosedIdeographicSupplement,
+ ubMiscellaneousSymbolsAndPictographs,
+ ubEmoticons,
+ ubTransportAndMapSymbols,
+ ubAlchemicalSymbols,
ubCJKUnifiedIdeographsExtensionB,
+ ubCJKUnifiedIdeographsExtensionC,
+ ubCJKUnifiedIdeographsExtensionD,
ubCJKCompatibilityIdeographsSupplement,
ubTags,
ubVariationSelectorsSupplement,
@@ -544,6 +599,8 @@
(Range:(RangeStart: $0750; RangeEnd: $077F); Name: 'Arabic Supplement'),
(Range:(RangeStart: $0780; RangeEnd: $07BF); Name: 'Thaana'),
(Range:(RangeStart: $07C0; RangeEnd: $07FF); Name: 'NKo'),
+ (Range:(RangeStart: $0800; RangeEnd: $083F); Name: 'Samaritan'),
+ (Range:(RangeStart: $0840; RangeEnd: $085F); Name: 'Mandaic'),
(Range:(RangeStart: $0900; RangeEnd: $097F); Name: 'Devanagari'),
(Range:(RangeStart: $0980; RangeEnd: $09FF); Name: 'Bengali'),
(Range:(RangeStart: $0A00; RangeEnd: $0A7F); Name: 'Gurmukhi'),
@@ -572,12 +629,19 @@
(Range:(RangeStart: $1760; RangeEnd: $177F); Name: 'Tagbanwa'),
(Range:(RangeStart: $1780; RangeEnd: $17FF); Name: 'Khmer'),
(Range:(RangeStart: $1800; RangeEnd: $18AF); Name: 'Mongolian'),
+ (Range:(RangeStart: $18B0; RangeEnd: $18FF); Name: 'Unified Canadian Aboriginal Syllabics Extended'),
(Range:(RangeStart: $1900; RangeEnd: $194F); Name: 'Limbu'),
(Range:(RangeStart: $1950; RangeEnd: $197F); Name: 'Tai Le'),
(Range:(RangeStart: $1980; RangeEnd: $19DF); Name: 'New Tai Lue'),
(Range:(RangeStart: $19E0; RangeEnd: $19FF); Name: 'Khmer Symbols'),
(Range:(RangeStart: $1A00; RangeEnd: $1A1F); Name: 'Buginese'),
+ (Range:(RangeStart: $1A20; RangeEnd: $1AAF); Name: 'Tai Tham'),
(Range:(RangeStart: $1B00; RangeEnd: $1B7F); Name: 'Balinese'),
+ (Range:(RangeStart: $1B80; RangeEnd: $1BBF); Name: 'Sundanese'),
+ (Range:(RangeStart: $1BC0; RangeEnd: $1BFF); Name: 'Batak'),
+ (Range:(RangeStart: $1C00; RangeEnd: $1C4F); Name: 'Lepcha'),
+ (Range:(RangeStart: $1C50; RangeEnd: $1C7F); Name: 'Ol Chiki'),
+ (Range:(RangeStart: $1CD0; RangeEnd: $1CFF); Name: 'Vedic Extensions'),
(Range:(RangeStart: $1D00; RangeEnd: $1D7F); Name: 'Phonetic Extensions'),
(Range:(RangeStart: $1D80; RangeEnd: $1DBF); Name: 'Phonetic Extensions Supplement'),
(Range:(RangeStart: $1DC0; RangeEnd: $1DFF); Name: 'Combining Diacritical Marks Supplement'),
@@ -613,6 +677,7 @@
(Range:(RangeStart: $2D00; RangeEnd: $2D2F); Name: 'Georgian Supplement'),
(Range:(RangeStart: $2D30; RangeEnd: $2D7F); Name: 'Tifinagh'),
(Range:(RangeStart: $2D80; RangeEnd: $2DDF); Name: 'Ethiopic Extended'),
+ (Range:(RangeStart: $2DE0; RangeEnd: $2DFF); Name: 'Cyrillic Extended-A'),
(Range:(RangeStart: $2E00; RangeEnd: $2E7F); Name: 'Supplemental Punctuation'),
(Range:(RangeStart: $2E80; RangeEnd: $2EFF); Name: 'CJK Radicals Supplement'),
(Range:(RangeStart: $2F00; RangeEnd: $2FDF); Name: 'Kangxi Radicals'),
@@ -633,11 +698,28 @@
(Range:(RangeStart: $4E00; RangeEnd: $9FFF); Name: 'CJK Unified Ideographs'),
(Range:(RangeStart: $A000; RangeEnd: $A48F); Name: 'Yi Syllables'),
(Range:(RangeStart: $A490; RangeEnd: $A4CF); Name: 'Yi Radicals'),
+ (Range:(RangeStart: $A4D0; RangeEnd: $A4FF); Name: 'Lisu'),
+ (Range:(RangeStart: $A500; RangeEnd: $A63F); Name: 'Vai'),
+ (Range:(RangeStart: $A640; RangeEnd: $A69F); Name: 'Cyrillic Extended-B'),
+ (Range:(RangeStart: $A6A0; RangeEnd: $A6FF); Name: 'Bamum'),
(Range:(RangeStart: $A700; RangeEnd: $A71F); Name: 'Modifier Tone Letters'),
(Range:(RangeStart: $A720; RangeEnd: $A7FF); Name: 'Latin Extended-D'),
(Range:(RangeStart: $A800; RangeEnd: $A82F); Name: 'Syloti Nagri'),
+ (Range:(RangeStart: $A830; RangeEnd: $A83F); Name: 'Common Indic Number Forms'),
(Range:(RangeStart: $A840; RangeEnd: $A87F); Name: 'Phags-pa'),
+ (Range:(RangeStart: $A880; RangeEnd: $A8DF); Name: 'Saurashtra'),
+ (Range:(RangeStart: $A8E0; RangeEnd: $A8FF); Name: 'Devanagari Extended'),
+ (Range:(RangeStart: $A900; RangeEnd: $A92F); Name: 'Kayah Li'),
+ (Range:(RangeStart: $A930; RangeEnd: $A95F); Name: 'Rejang'),
+ (Range:(RangeStart: $A960; RangeEnd: $A97F); Name: 'Hangul Jamo Extended-A'),
+ (Range:(RangeStart: $A980; RangeEnd: $A9DF); Name: 'Javanese'),
+ (Range:(RangeStart: $AA00; RangeEnd: $AA5F); Name: 'Cham'),
+ (Range:(RangeStart: $AA60; RangeEnd: $AA7F); Name: 'Myanmar Extended-A'),
+ (Range:(RangeStart: $AA80; RangeEnd: $AADF); Name: 'Tai Viet'),
+ (Range:(RangeStart: $AB00; RangeEnd: $AB2F); Name: 'Ethiopic Extended-A'),
+ (Range:(RangeStart: $ABC0; RangeEnd: $ABFF); Name: 'Meetei Mayek'),
(Range:(RangeStart: $AC00; RangeEnd: $D7AF); Name: 'Hangul Syllables'),
+ (Range:(RangeStart: $D7B0; RangeEnd: $D7FF); Name: 'Hangul Jamo Extended-B'),
(Range:(RangeStart: $D800; RangeEnd: $DB7F); Name: 'High Surrogates'),
(Range:(RangeStart: $DB80; RangeEnd: $DBFF); Name: 'High Private Use Surrogates'),
(Range:(RangeStart: $DC00; RangeEnd: $DFFF); Name: 'Low Surrogates'),
@@ -657,6 +739,10 @@
(Range:(RangeStart: $10080; RangeEnd: $100FF); Name: 'Linear B Ideograms'),
(Range:(RangeStart: $10100; RangeEnd: $1013F); Name: 'Aegean Numbers'),
(Range:(RangeStart: $10140; RangeEnd: $1018F); Name: 'Ancient Greek Numbers'),
+ (Range:(RangeStart: $10190; RangeEnd: $101CF); Name: 'Ancient Symbols'),
+ (Range:(RangeStart: $101D0; RangeEnd: $101FF); Name: 'Phaistos Disc'),
+ (Range:(RangeStart: $10280; RangeEnd: $1029F); Name: 'Lycian'),
+ (Range:(RangeStart: $102A0; RangeEnd: $102DF); Name: 'Carian'),
(Range:(RangeStart: $10300; RangeEnd: $1032F); Name: 'Old Italic'),
(Range:(RangeStart: $10330; RangeEnd: $1034F); Name: 'Gothic'),
(Range:(RangeStart: $10380; RangeEnd: $1039F); Name: 'Ugaritic'),
@@ -665,17 +751,41 @@
(Range:(RangeStart: $10450; RangeEnd: $1047F); Name: 'Shavian'),
(Range:(RangeStart: $10480; RangeEnd: $104AF); Name: 'Osmanya'),
(Range:(RangeStart: $10800; RangeEnd: $1083F); Name: 'Cypriot Syllabary'),
+ (Range:(RangeStart: $10840; RangeEnd: $1085F); Name: 'Imperial Aramaic'),
(Range:(RangeStart: $10900; RangeEnd: $1091F); Name: 'Phoenician'),
+ (Range:(RangeStart: $10920; RangeEnd: $1093F); Name: 'Lydian'),
(Range:(RangeStart: $10A00; RangeEnd: $10A5F); Name: 'Kharoshthi'),
+ (Range:(RangeStart: $10A60; RangeEnd: $10A7F); Name: 'Old South Arabian'),
+ (Range:(RangeStart: $10B00; RangeEnd: $10B3F); Name: 'Avestan'),
+ (Range:(RangeStart: $10B40; RangeEnd: $10B5F); Name: 'Inscriptional Parthian'),
+ (Range:(RangeStart: $10B60; RangeEnd: $10B7F); Name: 'Inscriptional Pahlavi'),
+ (Range:(RangeStart: $10C00; RangeEnd: $10C4F); Name: 'Old Turkic'),
+ (Range:(RangeStart: $10E60; RangeEnd: $10E7F); Name: 'Rumi Numeral Symbols'),
+ (Range:(RangeStart: $11000; RangeEnd: $1107F); Name: 'Brahmi'),
+ (Range:(RangeStart: $11080; RangeEnd: $110CF); Name: 'Kaithi'),
(Range:(RangeStart: $12000; RangeEnd: $123FF); Name: 'Cuneiform'),
(Range:(RangeStart: $12400; RangeEnd: $1247F); Name: 'Cuneiform Numbers and Punctuation'),
+ (Range:(RangeStart: $13000; RangeEnd: $1342F); Name: 'Egyptian Hieroglyphs'),
+ (Range:(RangeStart: $16800; RangeEnd: $16A3F); Name: 'Bamum Supplement'),
+ (Range:(RangeStart: $1B000; RangeEnd: $1B0FF); Name: 'Kana Supplement'),
(Range:(RangeStart: $1D000; RangeEnd: $1D0FF); Name: 'Byzantine Musical Symbols'),
(Range:(RangeStart: $1D100; RangeEnd: $1D1FF); Name: 'Musical Symbols'),
(Range:(RangeStart: $1D200; RangeEnd: $1D24F); Name: 'Ancient Greek Musical Notation'),
(Range:(RangeStart: $1D300; RangeEnd: $1D35F); Name: 'Tai Xuan Jing Symbols'),
(Range:(RangeStart: $1D360; RangeEnd: $1D37F); Name: 'Counting Rod Numerals'),
(Range:(RangeStart: $1D400; RangeEnd: $1D7FF); Name: 'Mathematical Alphanumeric Symbols'),
+ (Range:(RangeStart: $1F000; RangeEnd: $1F02F); Name: 'Mahjong Tiles'),
+ (Range:(RangeStart: $1F030; RangeEnd: $1F09F); Name: 'Domino Tiles'),
+ (Range:(RangeStart: $1F0A0; RangeEnd: $1F0FF); Name: 'Playing Cards'),
+ (Range:(RangeStart: $1F100; RangeEnd: $1F1FF); Name: 'Enclosed Alphanumeric Supplement'),
+ (Range:(RangeStart: $1F200; RangeEnd: $1F2FF); Name: 'Enclosed Ideographic Supplement'),
+ (Range:(RangeStart: $1F300; RangeEnd: $1F5FF); Name: 'Miscellaneous Symbols And Pictographs'),
+ (Range:(RangeStart: $1F600; RangeEnd: $1F64F); Name: 'Emoticons'),
+ (Range:(RangeStart: $1F680; RangeEnd: $1F6FF); Name: 'Transport And Map Symbols'),
+ (Range:(RangeStart: $1F700; RangeEnd: $1F77F); Name: 'Alchemical Symbols'),
(Range:(RangeStart: $20000; RangeEnd: $2A6DF); Name: 'CJK Unified Ideographs Extension B'),
+ (Range:(RangeStart: $2A700; RangeEnd: $2B73F); Name: 'CJK Unified Ideographs Extension C'),
+ (Range:(RangeStart: $2B740; RangeEnd: $2B81F); Name: 'CJK Unified Ideographs Extension D'),
(Range:(RangeStart: $2F800; RangeEnd: $2FA1F); Name: 'CJK Compatibility Ideographs Supplement'),
(Range:(RangeStart: $E0000; RangeEnd: $E007F); Name: 'Tags'),
(Range:(RangeStart: $E0100; RangeEnd: $E01EF); Name: 'Variation Selectors Supplement'),
Modified: trunk/jcl/source/common/JclUnicode.rc
===================================================================
--- trunk/jcl/source/common/JclUnicode.rc 2012-01-17 16:02:46 UTC (rev 3690)
+++ trunk/jcl/source/common/JclUnicode.rc 2012-01-17 17:41:43 UTC (rev 3691)
@@ -12,7 +12,7 @@
LANGUAGE 0,0 CATEGORIES UNICODEDATA LOADONCALL MOVEABLE DISCARDABLE
{
- '00 52 02 00 00 41 00 00 5A 00 00 C0 00 00 D6 00 00 D8 00 00 DE 00 00 00 01 00 00 01 00 02 01 00'
+ '00 5B 02 00 00 41 00 00 5A 00 00 C0 00 00 D6 00 00 D8 00 00 DE 00 00 00 01 00 00 01 00 02 01 00'
'02 01 00 04 01 00 04 01 00 06 01 00 06 01 00 08 01 00 08 01 00 0A 01 00 0A 01 00 0C 01 00 0C 01'
'00 0E 01 00 0E 01 00 10 01 00 10 01 00 12 01 00 12 01 00 14 01 00 14 01 00 16 01 00 16 01 00 18'
'01 00 18 01 00 1A 01 00 1A 01 00 1C 01 00 1C 01 00 1E 01 00 1E 01 00 20 01 00 20 01 00 22 01 00'
@@ -61,667 +61,685 @@
'FC 04 00 FE 04 00 FE 04 00 00 05 00 00 05 00 02 05 00 02 05 00 04 05 00 04 05 00 06 05 00 06 05'
'00 08 05 00 08 05 00 0A 05 00 0A 05 00 0C 05 00 0C 05 00 0E 05 00 0E 05 00 10 05 00 10 05 00 12'
'05 00 12 05 00 14 05 00 14 05 00 16 05 00 16 05 00 18 05 00 18 05 00 1A 05 00 1A 05 00 1C 05 00'
- '1C 05 00 1E 05 00 1E 05 00 20 05 00 20 05 00 22 05 00 22 05 00 24 05 00 24 05 00 31 05 00 56 05'
- '00 A0 10 00 C5 10 00 00 1E 00 00 1E 00 02 1E 00 02 1E 00 04 1E 00 04 1E 00 06 1E 00 06 1E 00 08'
- '1E 00 08 1E 00 0A 1E 00 0A 1E 00 0C 1E 00 0C 1E 00 0E 1E 00 0E 1E 00 10 1E 00 10 1E 00 12 1E 00'
- '12 1E 00 14 1E 00 14 1E 00 16 1E 00 16 1E 00 18 1E 00 18 1E 00 1A 1E 00 1A 1E 00 1C 1E 00 1C 1E'
- '00 1E 1E 00 1E 1E 00 20 1E 00 20 1E 00 22 1E 00 22 1E 00 24 1E 00 24 1E 00 26 1E 00 26 1E 00 28'
- '1E 00 28 1E 00 2A 1E 00 2A 1E 00 2C 1E 00 2C 1E 00 2E 1E 00 2E 1E 00 30 1E 00 30 1E 00 32 1E 00'
- '32 1E 00 34 1E 00 34 1E 00 36 1E 00 36 1E 00 38 1E 00 38 1E 00 3A 1E 00 3A 1E 00 3C 1E 00 3C 1E'
- '00 3E 1E 00 3E 1E 00 40 1E 00 40 1E 00 42 1E 00 42 1E 00 44 1E 00 44 1E 00 46 1E 00 46 1E 00 48'
- '1E 00 48 1E 00 4A 1E 00 4A 1E 00 4C 1E 00 4C 1E 00 4E 1E 00 4E 1E 00 50 1E 00 50 1E 00 52 1E 00'
- '52 1E 00 54 1E 00 54 1E 00 56 1E 00 56 1E 00 58 1E 00 58 1E 00 5A 1E 00 5A 1E 00 5C 1E 00 5C 1E'
- '00 5E 1E 00 5E 1E 00 60 1E 00 60 1E 00 62 1E 00 62 1E 00 64 1E 00 64 1E 00 66 1E 00 66 1E 00 68'
- '1E 00 68 1E 00 6A 1E 00 6A 1E 00 6C 1E 00 6C 1E 00 6E 1E 00 6E 1E 00 70 1E 00 70 1E 00 72 1E 00'
- '72 1E 00 74 1E 00 74 1E 00 76 1E 00 76 1E 00 78 1E 00 78 1E 00 7A 1E 00 7A 1E 00 7C 1E 00 7C 1E'
- '00 7E 1E 00 7E 1E 00 80 1E 00 80 1E 00 82 1E 00 82 1E 00 84 1E 00 84 1E 00 86 1E 00 86 1E 00 88'
- '1E 00 88 1E 00 8A 1E 00 8A 1E 00 8C 1E 00 8C 1E 00 8E 1E 00 8E 1E 00 90 1E 00 90 1E 00 92 1E 00'
- '92 1E 00 94 1E 00 94 1E 00 9E 1E 00 9E 1E 00 A0 1E 00 A0 1E 00 A2 1E 00 A2 1E 00 A4 1E 00 A4 1E'
- '00 A6 1E 00 A6 1E 00 A8 1E 00 A8 1E 00 AA 1E 00 AA 1E 00 AC 1E 00 AC 1E 00 AE 1E 00 AE 1E 00 B0'
- '1E 00 B0 1E 00 B2 1E 00 B2 1E 00 B4 1E 00 B4 1E 00 B6 1E 00 B6 1E 00 B8 1E 00 B8 1E 00 BA 1E 00'
- 'BA 1E 00 BC 1E 00 BC 1E 00 BE 1E 00 BE 1E 00 C0 1E 00 C0 1E 00 C2 1E 00 C2 1E 00 C4 1E 00 C4 1E'
- '00 C6 1E 00 C6 1E 00 C8 1E 00 C8 1E 00 CA 1E 00 CA 1E 00 CC 1E 00 CC 1E 00 CE 1E 00 CE 1E 00 D0'
- '1E 00 D0 1E 00 D2 1E 00 D2 1E 00 D4 1E 00 D4 1E 00 D6 1E 00 D6 1E 00 D8 1E 00 D8 1E 00 DA 1E 00'
- 'DA 1E 00 DC 1E 00 DC 1E 00 DE 1E 00 DE 1E 00 E0 1E 00 E0 1E 00 E2 1E 00 E2 1E 00 E4 1E 00 E4 1E'
- '00 E6 1E 00 E6 1E 00 E8 1E 00 E8 1E 00 EA 1E 00 EA 1E 00 EC 1E 00 EC 1E 00 EE 1E 00 EE 1E 00 F0'
- '1E 00 F0 1E 00 F2 1E 00 F2 1E 00 F4 1E 00 F4 1E 00 F6 1E 00 F6 1E 00 F8 1E 00 F8 1E 00 FA 1E 00'
- 'FA 1E 00 FC 1E 00 FC 1E 00 FE 1E 00 FE 1E 00 08 1F 00 0F 1F 00 18 1F 00 1D 1F 00 28 1F 00 2F 1F'
- '00 38 1F 00 3F 1F 00 48 1F 00 4D 1F 00 59 1F 00 59 1F 00 5B 1F 00 5B 1F 00 5D 1F 00 5D 1F 00 5F'
- '1F 00 5F 1F 00 68 1F 00 6F 1F 00 B8 1F 00 BB 1F 00 C8 1F 00 CB 1F 00 D8 1F 00 DB 1F 00 E8 1F 00'
- 'EC 1F 00 F8 1F 00 FB 1F 00 02 21 00 02 21 00 07 21 00 07 21 00 0B 21 00 0D 21 00 10 21 00 12 21'
- '00 15 21 00 15 21 00 19 21 00 1D 21 00 24 21 00 24 21 00 26 21 00 26 21 00 28 21 00 28 21 00 2A'
- '21 00 2D 21 00 30 21 00 33 21 00 3E 21 00 3F 21 00 45 21 00 45 21 00 83 21 00 83 21 00 00 2C 00'
- '2E 2C 00 60 2C 00 60 2C 00 62 2C 00 64 2C 00 67 2C 00 67 2C 00 69 2C 00 69 2C 00 6B 2C 00 6B 2C'
- '00 6D 2C 00 70 2C 00 72 2C 00 72 2C 00 75 2C 00 75 2C 00 7E 2C 00 80 2C 00 82 2C 00 82 2C 00 84'
- '2C 00 84 2C 00 86 2C 00 86 2C 00 88 2C 00 88 2C 00 8A 2C 00 8A 2C 00 8C 2C 00 8C 2C 00 8E 2C 00'
- '8E 2C 00 90 2C 00 90 2C 00 92 2C 00 92 2C 00 94 2C 00 94 2C 00 96 2C 00 96 2C 00 98 2C 00 98 2C'
- '00 9A 2C 00 9A 2C 00 9C 2C 00 9C 2C 00 9E 2C 00 9E 2C 00 A0 2C 00 A0 2C 00 A2 2C 00 A2 2C 00 A4'
- '2C 00 A4 2C 00 A6 2C 00 A6 2C 00 A8 2C 00 A8 2C 00 AA 2C 00 AA 2C 00 AC 2C 00 AC 2C 00 AE 2C 00'
- 'AE 2C 00 B0 2C 00 B0 2C 00 B2 2C 00 B2 2C 00 B4 2C 00 B4 2C 00 B6 2C 00 B6 2C 00 B8 2C 00 B8 2C'
- '00 BA 2C 00 BA 2C 00 BC 2C 00 BC 2C 00 BE 2C 00 BE 2C 00 C0 2C 00 C0 2C 00 C2 2C 00 C2 2C 00 C4'
- '2C 00 C4 2C 00 C6 2C 00 C6 2C 00 C8 2C 00 C8 2C 00 CA 2C 00 CA 2C 00 CC 2C 00 CC 2C 00 CE 2C 00'
- 'CE 2C 00 D0 2C 00 D0 2C 00 D2 2C 00 D2 2C 00 D4 2C 00 D4 2C 00 D6 2C 00 D6 2C 00 D8 2C 00 D8 2C'
- '00 DA 2C 00 DA 2C 00 DC 2C 00 DC 2C 00 DE 2C 00 DE 2C 00 E0 2C 00 E0 2C 00 E2 2C 00 E2 2C 00 EB'
- '2C 00 EB 2C 00 ED 2C 00 ED 2C 00 40 A6 00 40 A6 00 42 A6 00 42 A6 00 44 A6 00 44 A6 00 46 A6 00'
- '46 A6 00 48 A6 00 48 A6 00 4A A6 00 4A A6 00 4C A6 00 4C A6 00 4E A6 00 4E A6 00 50 A6 00 50 A6'
- '00 52 A6 00 52 A6 00 54 A6 00 54 A6 00 56 A6 00 56 A6 00 58 A6 00 58 A6 00 5A A6 00 5A A6 00 5C'
- 'A6 00 5C A6 00 5E A6 00 5E A6 00 62 A6 00 62 A6 00 64 A6 00 64 A6 00 66 A6 00 66 A6 00 68 A6 00'
- '68 A6 00 6A A6 00 6A A6 00 6C A6 00 6C A6 00 80 A6 00 80 A6 00 82 A6 00 82 A6 00 84 A6 00 84 A6'
- '00 86 A6 00 86 A6 00 88 A6 00 88 A6 00 8A A6 00 8A A6 00 8C A6 00 8C A6 00 8E A6 00 8E A6 00 90'
- 'A6 00 90 A6 00 92 A6 00 92 A6 00 94 A6 00 94 A6 00 96 A6 00 96 A6 00 22 A7 00 22 A7 00 24 A7 00'
- '24 A7 00 26 A7 00 26 A7 00 28 A7 00 28 A7 00 2A A7 00 2A A7 00 2C A7 00 2C A7 00 2E A7 00 2E A7'
- '00 32 A7 00 32 A7 00 34 A7 00 34 A7 00 36 A7 00 36 A7 00 38 A7 00 38 A7 00 3A A7 00 3A A7 00 3C'
- 'A7 00 3C A7 00 3E A7 00 3E A7 00 40 A7 00 40 A7 00 42 A7 00 42 A7 00 44 A7 00 44 A7 00 46 A7 00'
- '46 A7 00 48 A7 00 48 A7 00 4A A7 00 4A A7 00 4C A7 00 4C A7 00 4E A7 00 4E A7 00 50 A7 00 50 A7'
- '00 52 A7 00 52 A7 00 54 A7 00 54 A7 00 56 A7 00 56 A7 00 58 A7 00 58 A7 00 5A A7 00 5A A7 00 5C'
- 'A7 00 5C A7 00 5E A7 00 5E A7 00 60 A7 00 60 A7 00 62 A7 00 62 A7 00 64 A7 00 64 A7 00 66 A7 00'
- '66 A7 00 68 A7 00 68 A7 00 6A A7 00 6A A7 00 6C A7 00 6C A7 00 6E A7 00 6E A7 00 79 A7 00 79 A7'
- '00 7B A7 00 7B A7 00 7D A7 00 7E A7 00 80 A7 00 80 A7 00 82 A7 00 82 A7 00 84 A7 00 84 A7 00 86'
- 'A7 00 86 A7 00 8B A7 00 8B A7 00 21 FF 00 3A FF 00 00 04 01 27 04 01 00 D4 01 19 D4 01 34 D4 01'
- '4D D4 01 68 D4 01 81 D4 01 9C D4 01 9C D4 01 9E D4 01 9F D4 01 A2 D4 01 A2 D4 01 A5 D4 01 A6 D4'
- '01 A9 D4 01 AC D4 01 AE D4 01 B5 D4 01 D0 D4 01 E9 D4 01 04 D5 01 05 D5 01 07 D5 01 0A D5 01 0D'
- 'D5 01 14 D5 01 16 D5 01 1C D5 01 38 D5 01 39 D5 01 3B D5 01 3E D5 01 40 D5 01 44 D5 01 46 D5 01'
- '46 D5 01 4A D5 01 50 D5 01 6C D5 01 85 D5 01 A0 D5 01 B9 D5 01 D4 D5 01 ED D5 01 08 D6 01 21 D6'
- '01 3C D6 01 55 D6 01 70 D6 01 89 D6 01 A8 D6 01 C0 D6 01 E2 D6 01 FA D6 01 1C D7 01 34 D7 01 56'
- 'D7 01 6E D7 01 90 D7 01 A8 D7 01 CA D7 01 CA D7 01 01 57 02 00 00 61 00 00 7A 00 00 AA 00 00 AA'
- '00 00 B5 00 00 B5 00 00 BA 00 00 BA 00 00 DF 00 00 F6 00 00 F8 00 00 FF 00 00 01 01 00 01 01 00'
- '03 01 00 03 01 00 05 01 00 05 01 00 07 01 00 07 01 00 09 01 00 09 01 00 0B 01 00 0B 01 00 0D 01'
- '00 0D 01 00 0F 01 00 0F 01 00 11 01 00 11 01 00 13 01 00 13 01 00 15 01 00 15 01 00 17 01 00 17'
- '01 00 19 01 00 19 01 00 1B 01 00 1B 01 00 1D 01 00 1D 01 00 1F 01 00 1F 01 00 21 01 00 21 01 00'
- '23 01 00 23 01 00 25 01 00 25 01 00 27 01 00 27 01 00 29 01 00 29 01 00 2B 01 00 2B 01 00 2D 01'
- '00 2D 01 00 2F 01 00 2F 01 00 31 01 00 31 01 00 33 01 00 33 01 00 35 01 00 35 01 00 37 01 00 38'
- '01 00 3A 01 00 3A 01 00 3C 01 00 3C 01 00 3E 01 00 3E 01 00 40 01 00 40 01 00 42 01 00 42 01 00'
- '44 01 00 44 01 00 46 01 00 46 01 00 48 01 00 49 01 00 4B 01 00 4B 01 00 4D 01 00 4D 01 00 4F 01'
- '00 4F 01 00 51 01 00 51 01 00 53 01 00 53 01 00 55 01 00 55 01 00 57 01 00 57 01 00 59 01 00 59'
- '01 00 5B 01 00 5B 01 00 5D 01 00 5D 01 00 5F 01 00 5F 01 00 61 01 00 61 01 00 63 01 00 63 01 00'
- '65 01 00 65 01 00 67 01 00 67 01 00 69 01 00 69 01 00 6B 01 00 6B 01 00 6D 01 00 6D 01 00 6F 01'
- '00 6F 01 00 71 01 00 71 01 00 73 01 00 73 01 00 75 01 00 75 01 00 77 01 00 77 01 00 7A 01 00 7A'
- '01 00 7C 01 00 7C 01 00 7E 01 00 80 01 00 83 01 00 83 01 00 85 01 00 85 01 00 88 01 00 88 01 00'
- '8C 01 00 8D 01 00 92 01 00 92 01 00 95 01 00 95 01 00 99 01 00 9B 01 00 9E 01 00 9E 01 00 A1 01'
- '00 A1 01 00 A3 01 00 A3 01 00 A5 01 00 A5 01 00 A8 01 00 A8 01 00 AA 01 00 AB 01 00 AD 01 00 AD'
- '01 00 B0 01 00 B0 01 00 B4 01 00 B4 01 00 B6 01 00 B6 01 00 B9 01 00 BA 01 00 BD 01 00 BF 01 00'
- 'C6 01 00 C6 01 00 C9 01 00 C9 01 00 CC 01 00 CC 01 00 CE 01 00 CE 01 00 D0 01 00 D0 01 00 D2 01'
- '00 D2 01 00 D4 01 00 D4 01 00 D6 01 00 D6 01 00 D8 01 00 D8 01 00 DA 01 00 DA 01 00 DC 01 00 DD'
- '01 00 DF 01 00 DF 01 00 E1 01 00 E1 01 00 E3 01 00 E3 01 00 E5 01 00 E5 01 00 E7 01 00 E7 01 00'
- 'E9 01 00 E9 01 00 EB 01 00 EB 01 00 ED 01 00 ED 01 00 EF 01 00 F0 01 00 F3 01 00 F3 01 00 F5 01'
- '00 F5 01 00 F9 01 00 F9 01 00 FB 01 00 FB 01 00 FD 01 00 FD 01 00 FF 01 00 FF 01 00 01 02 00 01'
- '02 00 03 02 00 03 02 00 05 02 00 05 02 00 07 02 00 07 02 00 09 02 00 09 02 00 0B 02 00 0B 02 00'
- '0D 02 00 0D 02 00 0F 02 00 0F 02 00 11 02 00 11 02 00 13 02 00 13 02 00 15 02 00 15 02 00 17 02'
- '00 17 02 00 19 02 00 19 02 00 1B 02 00 1B 02 00 1D 02 00 1D 02 00 1F 02 00 1F 02 00 21 02 00 21'
- '02 00 23 02 00 23 02 00 25 02 00 25 02 00 27 02 00 27 02 00 29 02 00 29 02 00 2B 02 00 2B 02 00'
- '2D 02 00 2D 02 00 2F 02 00 2F 02 00 31 02 00 31 02 00 33 02 00 39 02 00 3C 02 00 3C 02 00 3F 02'
- '00 40 02 00 42 02 00 42 02 00 47 02 00 47 02 00 49 02 00 49 02 00 4B 02 00 4B 02 00 4D 02 00 4D'
- '02 00 4F 02 00 93 02 00 95 02 00 AF 02 00 71 03 00 71 03 00 73 03 00 73 03 00 77 03 00 77 03 00'
- '7B 03 00 7D 03 00 90 03 00 90 03 00 AC 03 00 CE 03 00 D0 03 00 D1 03 00 D5 03 00 D7 03 00 D9 03'
- '00 D9 03 00 DB 03 00 DB 03 00 DD 03 00 DD 03 00 DF 03 00 DF 03 00 E1 03 00 E1 03 00 E3 03 00 E3'
- '03 00 E5 03 00 E5 03 00 E7 03 00 E7 03 00 E9 03 00 E9 03 00 EB 03 00 EB 03 00 ED 03 00 ED 03 00'
- 'EF 03 00 F3 03 00 F5 03 00 F5 03 00 F8 03 00 F8 03 00 FB 03 00 FC 03 00 30 04 00 5F 04 00 61 04'
- '00 61 04 00 63 04 00 63 04 00 65 04 00 65 04 00 67 04 00 67 04 00 69 04 00 69 04 00 6B 04 00 6B'
- '04 00 6D 04 00 6D 04 00 6F 04 00 6F 04 00 71 04 00 71 04 00 73 04 00 73 04 00 75 04 00 75 04 00'
- '77 04 00 77 04 00 79 04 00 79 04 00 7B 04 00 7B 04 00 7D 04 00 7D 04 00 7F 04 00 7F 04 00 81 04'
- '00 81 04 00 8B 04 00 8B 04 00 8D 04 00 8D 04 00 8F 04 00 8F 04 00 91 04 00 91 04 00 93 04 00 93'
- '04 00 95 04 00 95 04 00 97 04 00 97 04 00 99 04 00 99 04 00 9B 04 00 9B 04 00 9D 04 00 9D 04 00'
- '9F 04 00 9F 04 00 A1 04 00 A1 04 00 A3 04 00 A3 04 00 A5 04 00 A5 04 00 A7 04 00 A7 04 00 A9 04'
- '00 A9 04 00 AB 04 00 AB 04 00 AD 04 00 AD 04 00 AF 04 00 AF 04 00 B1 04 00 B1 04 00 B3 04 00 B3'
- '04 00 B5 04 00 B5 04 00 B7 04 00 B7 04 00 B9 04 00 B9 04 00 BB 04 00 BB 04 00 BD 04 00 BD 04 00'
- 'BF 04 00 BF 04 00 C2 04 00 C2 04 00 C4 04 00 C4 04 00 C6 04 00 C6 04 00 C8 04 00 C8 04 00 CA 04'
- '00 CA 04 00 CC 04 00 CC 04 00 CE 04 00 CF 04 00 D1 04 00 D1 04 00 D3 04 00 D3 04 00 D5 04 00 D5'
- '04 00 D7 04 00 D7 04 00 D9 04 00 D9 04 00 DB 04 00 DB 04 00 DD 04 00 DD 04 00 DF 04 00 DF 04 00'
- 'E1 04 00 E1 04 00 E3 04 00 E3 04 00 E5 04 00 E5 04 00 E7 04 00 E7 04 00 E9 04 00 E9 04 00 EB 04'
- '00 EB 04 00 ED 04 00 ED 04 00 EF 04 00 EF 04 00 F1 04 00 F1 04 00 F3 04 00 F3 04 00 F5 04 00 F5'
- '04 00 F7 04 00 F7 04 00 F9 04 00 F9 04 00 FB 04 00 FB 04 00 FD 04 00 FD 04 00 FF 04 00 FF 04 00'
- '01 05 00 01 05 00 03 05 00 03 05 00 05 05 00 05 05 00 07 05 00 07 05 00 09 05 00 09 05 00 0B 05'
- '00 0B 05 00 0D 05 00 0D 05 00 0F 05 00 0F 05 00 11 05 00 11 05 00 13 05 00 13 05 00 15 05 00 15'
- '05 00 17 05 00 17 05 00 19 05 00 19 05 00 1B 05 00 1B 05 00 1D 05 00 1D 05 00 1F 05 00 1F 05 00'
- '21 05 00 21 05 00 23 05 00 23 05 00 25 05 00 25 05 00 61 05 00 87 05 00 00 1D 00 2B 1D 00 62 1D'
- '00 77 1D 00 79 1D 00 9A 1D 00 01 1E 00 01 1E 00 03 1E 00 03 1E 00 05 1E 00 05 1E 00 07 1E 00 07'
- '1E 00 09 1E 00 09 1E 00 0B 1E 00 0B 1E 00 0D 1E 00 0D 1E 00 0F 1E 00 0F 1E 00 11 1E 00 11 1E 00'
- '13 1E 00 13 1E 00 15 1E 00 15 1E 00 17 1E 00 17 1E 00 19 1E 00 19 1E 00 1B 1E 00 1B 1E 00 1D 1E'
- '00 1D 1E 00 1F 1E 00 1F 1E 00 21 1E 00 21 1E 00 23 1E 00 23 1E 00 25 1E 00 25 1E 00 27 1E 00 27'
- '1E 00 29 1E 00 29 1E 00 2B 1E 00 2B 1E 00 2D 1E 00 2D 1E 00 2F 1E 00 2F 1E 00 31 1E 00 31 1E 00'
- '33 1E 00 33 1E 00 35 1E 00 35 1E 00 37 1E 00 37 1E 00 39 1E 00 39 1E 00 3B 1E 00 3B 1E 00 3D 1E'
- '00 3D 1E 00 3F 1E 00 3F 1E 00 41 1E 00 41 1E 00 43 1E 00 43 1E 00 45 1E 00 45 1E 00 47 1E 00 47'
- '1E 00 49 1E 00 49 1E 00 4B 1E 00 4B 1E 00 4D 1E 00 4D 1E 00 4F 1E 00 4F 1E 00 51 1E 00 51 1E 00'
- '53 1E 00 53 1E 00 55 1E 00 55 1E 00 57 1E 00 57 1E 00 59 1E 00 59 1E 00 5B 1E 00 5B 1E 00 5D 1E'
- '00 5D 1E 00 5F 1E 00 5F 1E 00 61 1E 00 61 1E 00 63 1E 00 63 1E 00 65 1E 00 65 1E 00 67 1E 00 67'
- '1E 00 69 1E 00 69 1E 00 6B 1E 00 6B 1E 00 6D 1E 00 6D 1E 00 6F 1E 00 6F 1E 00 71 1E 00 71 1E 00'
- '73 1E 00 73 1E 00 75 1E 00 75 1E 00 77 1E 00 77 1E 00 79 1E 00 79 1E 00 7B 1E 00 7B 1E 00 7D 1E'
- '00 7D 1E 00 7F 1E 00 7F 1E 00 81 1E 00 81 1E 00 83 1E 00 83 1E 00 85 1E 00 85 1E 00 87 1E 00 87'
- '1E 00 89 1E 00 89 1E 00 8B 1E 00 8B 1E 00 8D 1E 00 8D 1E 00 8F 1E 00 8F 1E 00 91 1E 00 91 1E 00'
- '93 1E 00 93 1E 00 95 1E 00 9D 1E 00 9F 1E 00 9F 1E 00 A1 1E 00 A1 1E 00 A3 1E 00 A3 1E 00 A5 1E'
- '00 A5 1E 00 A7 1E 00 A7 1E 00 A9 1E 00 A9 1E 00 AB 1E 00 AB 1E 00 AD 1E 00 AD 1E 00 AF 1E 00 AF'
- '1E 00 B1 1E 00 B1 1E 00 B3 1E 00 B3 1E 00 B5 1E 00 B5 1E 00 B7 1E 00 B7 1E 00 B9 1E 00 B9 1E 00'
- 'BB 1E 00 BB 1E 00 BD 1E 00 BD 1E 00 BF 1E 00 BF 1E 00 C1 1E 00 C1 1E 00 C3 1E 00 C3 1E 00 C5 1E'
- '00 C5 1E 00 C7 1E 00 C7 1E 00 C9 1E 00 C9 1E 00 CB 1E 00 CB 1E 00 CD 1E 00 CD 1E 00 CF 1E 00 CF'
- '1E 00 D1 1E 00 D1 1E 00 D3 1E 00 D3 1E 00 D5 1E 00 D5 1E 00 D7 1E 00 D7 1E 00 D9 1E 00 D9 1E 00'
- 'DB 1E 00 DB 1E 00 DD 1E 00 DD 1E 00 DF 1E 00 DF 1E 00 E1 1E 00 E1 1E 00 E3 1E 00 E3 1E 00 E5 1E'
- '00 E5 1E 00 E7 1E 00 E7 1E 00 E9 1E 00 E9 1E 00 EB 1E 00 EB 1E 00 ED 1E 00 ED 1E 00 EF 1E 00 EF'
- '1E 00 F1 1E 00 F1 1E 00 F3 1E 00 F3 1E 00 F5 1E 00 F5 1E 00 F7 1E 00 F7 1E 00 F9 1E 00 F9 1E 00'
- 'FB 1E 00 FB 1E 00 FD 1E 00 FD 1E 00 FF 1E 00 07 1F 00 10 1F 00 15 1F 00 20 1F 00 27 1F 00 30 1F'
- '00 37 1F 00 40 1F 00 45 1F 00 50 1F 00 57 1F 00 60 1F 00 67 1F 00 70 1F 00 7D 1F 00 80 1F 00 87'
- '1F 00 90 1F 00 97 1F 00 A0 1F 00 A7 1F 00 B0 1F 00 B4 1F 00 B6 1F 00 B7 1F 00 BE 1F 00 BE 1F 00'
- 'C2 1F 00 C4 1F 00 C6 1F 00 C7 1F 00 D0 1F 00 D3 1F 00 D6 1F 00 D7 1F 00 E0 1F 00 E7 1F 00 F2 1F'
- '00 F4 1F 00 F6 1F 00 F7 1F 00 0A 21 00 0A 21 00 0E 21 00 0F 21 00 13 21 00 13 21 00 2F 21 00 2F'
- '21 00 34 21 00 34 21 00 39 21 00 39 21 00 3C 21 00 3D 21 00 46 21 00 49 21 00 4E 21 00 4E 21 00'
- '84 21 00 84 21 00 30 2C 00 5E 2C 00 61 2C 00 61 2C 00 65 2C 00 66 2C 00 68 2C 00 68 2C 00 6A 2C'
- '00 6A 2C 00 6C 2C 00 6C 2C 00 71 2C 00 71 2C 00 73 2C 00 74 2C 00 76 2C 00 7C 2C 00 81 2C 00 81'
- '2C 00 83 2C 00 83 2C 00 85 2C 00 85 2C 00 87 2C 00 87 2C 00 89 2C 00 89 2C 00 8B 2C 00 8B 2C 00'
- '8D 2C 00 8D 2C 00 8F 2C 00 8F 2C 00 91 2C 00 91 2C 00 93 2C 00 93 2C 00 95 2C 00 95 2C 00 97 2C'
- '00 97 2C 00 99 2C 00 99 2C 00 9B 2C 00 9B 2C 00 9D 2C 00 9D 2C 00 9F 2C 00 9F 2C 00 A1 2C 00 A1'
- '2C 00 A3 2C 00 A3 2C 00 A5 2C 00 A5 2C 00 A7 2C 00 A7 2C 00 A9 2C 00 A9 2C 00 AB 2C 00 AB 2C 00'
- 'AD 2C 00 AD 2C 00 AF 2C 00 AF 2C 00 B1 2C 00 B1 2C 00 B3 2C 00 B3 2C 00 B5 2C 00 B5 2C 00 B7 2C'
- '00 B7 2C 00 B9 2C 00 B9 2C 00 BB 2C 00 BB 2C 00 BD 2C 00 BD 2C 00 BF 2C 00 BF 2C 00 C1 2C 00 C1'
- '2C 00 C3 2C 00 C3 2C 00 C5 2C 00 C5 2C 00 C7 2C 00 C7 2C 00 C9 2C 00 C9 2C 00 CB 2C 00 CB 2C 00'
- 'CD 2C 00 CD 2C 00 CF 2C 00 CF 2C 00 D1 2C 00 D1 2C 00 D3 2C 00 D3 2C 00 D5 2C 00 D5 2C 00 D7 2C'
- '00 D7 2C 00 D9 2C 00 D9 2C 00 DB 2C 00 DB 2C 00 DD 2C 00 DD 2C 00 DF 2C 00 DF 2C 00 E1 2C 00 E1'
- '2C 00 E3 2C 00 E4 2C 00 EC 2C 00 EC 2C 00 EE 2C 00 EE 2C 00 00 2D 00 25 2D 00 41 A6 00 41 A6 00'
- '43 A6 00 43 A6 00 45 A6 00 45 A6 00 47 A6 00 47 A6 00 49 A6 00 49 A6 00 4B A6 00 4B A6 00 4D A6'
- '00 4D A6 00 4F A6 00 4F A6 00 51 A6 00 51 A6 00 53 A6 00 53 A6 00 55 A6 00 55 A6 00 57 A6 00 57'
- 'A6 00 59 A6 00 59 A6 00 5B A6 00 5B A6 00 5D A6 00 5D A6 00 5F A6 00 5F A6 00 63 A6 00 63 A6 00'
- '65 A6 00 65 A6 00 67 A6 00 67 A6 00 69 A6 00 69 A6 00 6B A6 00 6B A6 00 6D A6 00 6D A6 00 81 A6'
- '00 81 A6 00 83 A6 00 83 A6 00 85 A6 00 85 A6 00 87 A6 00 87 A6 00 89 A6 00 89 A6 00 8B A6 00 8B'
- 'A6 00 8D A6 00 8D A6 00 8F A6 00 8F A6 00 91 A6 00 91 A6 00 93 A6 00 93 A6 00 95 A6 00 95 A6 00'
- '97 A6 00 97 A6 00 23 A7 00 23 A7 00 25 A7 00 25 A7 00 27 A7 00 27 A7 00 29 A7 00 29 A7 00 2B A7'
- '00 2B A7 00 2D A7 00 2D A7 00 2F A7 00 31 A7 00 33 A7 00 33 A7 00 35 A7 00 35 A7 00 37 A7 00 37'
- 'A7 00 39 A7 00 39 A7 00 3B A7 00 3B A7 00 3D A7 00 3D A7 00 3F A7 00 3F A7 00 41 A7 00 41 A7 00'
- '43 A7 00 43 A7 00 45 A7 00 45 A7 00 47 A7 00 47 A7 00 49 A7 00 49 A7 00 4B A7 00 4B A7 00 4D A7'
- '00 4D A7 00 4F A7 00 4F A7 00 51 A7 00 51 A7 00 53 A7 00 53 A7 00 55 A7 00 55 A7 00 57 A7 00 57'
- 'A7 00 59 A7 00 59 A7 00 5B A7 00 5B A7 00 5D A7 00 5D A7 00 5F A7 00 5F A7 00 61 A7 00 61 A7 00'
- '63 A7 00 63 A7 00 65 A7 00 65 A7 00 67 A7 00 67 A7 00 69 A7 00 69 A7 00 6B A7 00 6B A7 00 6D A7'
- '00 6D A7 00 6F A7 00 6F A7 00 71 A7 00 78 A7 00 7A A7 00 7A A7 00 7C A7 00 7C A7 00 7F A7 00 7F'
- 'A7 00 81 A7 00 81 A7 00 83 A7 00 83 A7 00 85 A7 00 85 A7 00 87 A7 00 87 A7 00 8C A7 00 8C A7 00'
- '00 FB 00 06 FB 00 13 FB 00 17 FB 00 41 FF 00 5A FF 00 28 04 01 4F 04 01 1A D4 01 33 D4 01 4E D4'
- '01 54 D4 01 56 D4 01 67 D4 01 82 D4 01 9B D4 01 B6 D4 01 B9 D4 01 BB D4 01 BB D4 01 BD D4 01 C3'
- 'D4 01 C5 D4 01 CF D4 01 EA D4 01 03 D5 01 1E D5 01 37 D5 01 52 D5 01 6B D5 01 86 D5 01 9F D5 01'
- 'BA D5 01 D3 D5 01 EE D5 01 07 D6 01 22 D6 01 3B D6 01 56 D6 01 6F D6 01 8A D6 01 A5 D6 01 C2 D6'
- '01 DA D6 01 DC D6 01 E1 D6 01 FC D6 01 14 D7 01 16 D7 01 1B D7 01 36 D7 01 4E D7 01 50 D7 01 55'
- 'D7 01 70 D7 01 88 D7 01 8A D7 01 8F D7 01 AA D7 01 C2 D7 01 C4 D7 01 C9 D7 01 CB D7 01 CB D7 01'
- '02 0A 00 00 00 C5 01 00 C5 01 00 C8 01 00 C8 01 00 CB 01 00 CB 01 00 F2 01 00 F2 01 00 88 1F 00'
- '8F 1F 00 98 1F 00 9F 1F 00 A8 1F 00 AF 1F 00 BC 1F 00 BC 1F 00 CC 1F 00 CC 1F 00 FC 1F 00 FC 1F'
- '00 03 C0 00 00 00 00 03 00 6F 03 00 83 04 00 89 04 00 91 05 00 BD 05 00 BF 05 00 BF 05 00 C1 05'
- '00 C2 05 00 C4 05 00 C5 05 00 C7 05 00 C7 05 00 10 06 00 1A 06 00 4B 06 00 5E 06 00 70 06 00 70'
- '06 00 D6 06 00 DC 06 00 DE 06 00 E4 06 00 E7 06 00 E8 06 00 EA 06 00 ED 06 00 11 07 00 11 07 00'
- '30 07 00 4A 07 00 A6 07 00 B0 07 00 EB 07 00 F3 07 00 16 08 00 19 08 00 1B 08 00 23 08 00 25 08'
- '00 27 08 00 29 08 00 2D 08 00 00 09 00 02 09 00 3C 09 00 3C 09 00 41 09 00 48 09 00 4D 09 00 4D'
- '09 00 51 09 00 55 09 00 62 09 00 63 09 00 81 09 00 81 09 00 BC 09 00 BC 09 00 C1 09 00 C4 09 00'
- 'CD 09 00 CD 09 00 E2 09 00 E3 09 00 01 0A 00 02 0A 00 3C 0A 00 3C 0A 00 41 0A 00 42 0A 00 47 0A'
- '00 48 0A 00 4B 0A 00 4D 0A 00 51 0A 00 51 0A 00 70 0A 00 71 0A 00 75 0A 00 75 0A 00 81 0A 00 82'
- '0A 00 BC 0A 00 BC 0A 00 C1 0A 00 C5 0A 00 C7 0A 00 C8 0A 00 CD 0A 00 CD 0A 00 E2 0A 00 E3 0A 00'
- '01 0B 00 01 0B 00 3C 0B 00 3C 0B 00 3F 0B 00 3F 0B 00 41 0B 00 44 0B 00 4D 0B 00 4D 0B 00 56 0B'
- '00 56 0B 00 62 0B 00 63 0B 00 82 0B 00 82 0B 00 C0 0B 00 C0 0B 00 CD 0B 00 CD 0B 00 3E 0C 00 40'
- '0C 00 46 0C 00 48 0C 00 4A 0C 00 4D 0C 00 55 0C 00 56 0C 00 62 0C 00 63 0C 00 BC 0C 00 BC 0C 00'
- 'BF 0C 00 BF 0C 00 C6 0C 00 C6 0C 00 CC 0C 00 CD 0C 00 E2 0C 00 E3 0C 00 41 0D 00 44 0D 00 4D 0D'
- '00 4D 0D 00 62 0D 00 63 0D 00 CA 0D 00 CA 0D 00 D2 0D 00 D4 0D 00 D6 0D 00 D6 0D 00 31 0E 00 31'
- '0E 00 34 0E 00 3A 0E 00 47 0E 00 4E 0E 00 B1 0E 00 B1 0E 00 B4 0E 00 B9 0E 00 BB 0E 00 BC 0E 00'
- 'C8 0E 00 CD 0E 00 18 0F 00 19 0F 00 35 0F 00 35 0F 00 37 0F 00 37 0F 00 39 0F 00 39 0F 00 71 0F'
- '00 7E 0F 00 80 0F 00 84 0F 00 86 0F 00 87 0F 00 90 0F 00 97 0F 00 99 0F 00 BC 0F 00 C6 0F 00 C6'
- '0F 00 2D 10 00 30 10 00 32 10 00 37 10 00 39 10 00 3A 10 00 3D 10 00 3E 10 00 58 10 00 59 10 00'
- '5E 10 00 60 10 00 71 10 00 74 10 00 82 10 00 82 10 00 85 10 00 86 10 00 8D 10 00 8D 10 00 9D 10'
- '00 9D 10 00 5F 13 00 5F 13 00 12 17 00 14 17 00 32 17 00 34 17 00 52 17 00 53 17 00 72 17 00 73'
- '17 00 B7 17 00 BD 17 00 C6 17 00 C6 17 00 C9 17 00 D3 17 00 DD 17 00 DD 17 00 0B 18 00 0D 18 00'
- 'A9 18 00 A9 18 00 20 19 00 22 19 00 27 19 00 28 19 00 32 19 00 32 19 00 39 19 00 3B 19 00 17 1A'
- '00 18 1A 00 56 1A 00 56 1A 00 58 1A 00 5E 1A 00 60 1A 00 60 1A 00 62 1A 00 62 1A 00 65 1A 00 6C'
- '1A 00 73 1A 00 7C 1A 00 7F 1A 00 7F 1A 00 00 1B 00 03 1B 00 34 1B 00 34 1B 00 36 1B 00 3A 1B 00'
- '3C 1B 00 3C 1B 00 42 1B 00 42 1B 00 6B 1B 00 73 1B 00 80 1B 00 81 1B 00 A2 1B 00 A5 1B 00 A8 1B'
- '00 A9 1B 00 2C 1C 00 33 1C 00 36 1C 00 37 1C 00 D0 1C 00 D2 1C 00 D4 1C 00 E0 1C 00 E2 1C 00 E8'
- '1C 00 ED 1C 00 ED 1C 00 C0 1D 00 E6 1D 00 FD 1D 00 FF 1D 00 D0 20 00 F0 20 00 EF 2C 00 F1 2C 00'
- 'E0 2D 00 FF 2D 00 2A 30 00 2F 30 00 99 30 00 9A 30 00 6F A6 00 72 A6 00 7C A6 00 7D A6 00 F0 A6'
- '00 F1 A6 00 02 A8 00 02 A8 00 06 A8 00 06 A8 00 0B A8 00 0B A8 00 25 A8 00 26 A8 00 C4 A8 00 C4'
- 'A8 00 E0 A8 00 F1 A8 00 26 A9 00 2D A9 00 47 A9 00 51 A9 00 80 A9 00 82 A9 00 B3 A9 00 B3 A9 00'
- 'B6 A9 00 B9 A9 00 BC A9 00 BC A9 00 29 AA 00 2E AA 00 31 AA 00 32 AA 00 35 AA 00 36 AA 00 43 AA'
- '00 43 AA 00 4C AA 00 4C AA 00 B0 AA 00 B0 AA 00 B2 AA 00 B4 AA 00 B7 AA 00 B8 AA 00 BE AA 00 BF'
- 'AA 00 C1 AA 00 C1 AA 00 E5 AB 00 E5 AB 00 E8 AB 00 E8 AB 00 ED AB 00 ED AB 00 1E FB 00 1E FB 00'
- '00 FE 00 0F FE 00 20 FE 00 26 FE 00 FD 01 01 FD 01 01 01 0A 01 03 0A 01 05 0A 01 06 0A 01 0C 0A'
- '01 0F 0A 01 38 0A 01 3A 0A 01 3F 0A 01 3F 0A 01 80 10 01 81 10 01 B3 10 01 B6 10 01 B9 10 01 BA'
- '10 01 67 D1 01 69 D1 01 7B D1 01 82 D1 01 85 D1 01 8B D1 01 AA D1 01 AD D1 01 42 D2 01 44 D2 01'
- '00 01 0E EF 01 0E 04 6A 00 00 00 03 09 00 03 09 00 3E 09 00 40 09 00 49 09 00 4C 09 00 4E 09 00'
- '4E 09 00 82 09 00 83 09 00 BE 09 00 C0 09 00 C7 09 00 C8 09 00 CB 09 00 CC 09 00 D7 09 00 D7 09'
- '00 03 0A 00 03 0A 00 3E 0A 00 40 0A 00 83 0A 00 83 0A 00 BE 0A 00 C0 0A 00 C9 0A 00 C9 0A 00 CB'
- '0A 00 CC 0A 00 02 0B 00 03 0B 00 3E 0B 00 3E 0B 00 40 0B 00 40 0B 00 47 0B 00 48 0B 00 4B 0B 00'
- '4C 0B 00 57 0B 00 57 0B 00 BE 0B 00 BF 0B 00 C1 0B 00 C2 0B 00 C6 0B 00 C8 0B 00 CA 0B 00 CC 0B'
- '00 D7 0B 00 D7 0B 00 01 0C 00 03 0C 00 41 0C 00 44 0C 00 82 0C 00 83 0C 00 BE 0C 00 BE 0C 00 C0'
- '0C 00 C4 0C 00 C7 0C 00 C8 0C 00 CA 0C 00 CB 0C 00 D5 0C 00 D6 0C 00 02 0D 00 03 0D 00 3E 0D 00'
- '40 0D 00 46 0D 00 48 0D 00 4A 0D 00 4C 0D 00 57 0D 00 57 0D 00 82 0D 00 83 0D 00 CF 0D 00 D1 0D'
- '00 D8 0D 00 DF 0D 00 F2 0D 00 F3 0D 00 3E 0F 00 3F 0F 00 7F 0F 00 7F 0F 00 2B 10 00 2C 10 00 31'
- '10 00 31 10 00 38 10 00 38 10 00 3B 10 00 3C 10 00 56 10 00 57 10 00 62 10 00 64 10 00 67 10 00'
- '6D 10 00 83 10 00 84 10 00 87 10 00 8C 10 00 8F 10 00 8F 10 00 9A 10 00 9C 10 00 B6 17 00 B6 17'
- '00 BE 17 00 C5 17 00 C7 17 00 C8 17 00 23 19 00 26 19 00 29 19 00 2B 19 00 30 19 00 31 19 00 33'
- '19 00 38 19 00 B0 19 00 C0 19 00 C8 19 00 C9 19 00 19 1A 00 1B 1A 00 55 1A 00 55 1A 00 57 1A 00'
- '57 1A 00 61 1A 00 61 1A 00 63 1A 00 64 1A 00 6D 1A 00 72 1A 00 04 1B 00 04 1B 00 35 1B 00 35 1B'
- '00 3B 1B 00 3B 1B 00 3D 1B 00 41 1B 00 43 1B 00 44 1B 00 82 1B 00 82 1B 00 A1 1B 00 A1 1B 00 A6'
- '1B 00 A7 1B 00 AA 1B 00 AA 1B 00 24 1C 00 2B 1C 00 34 1C 00 35 1C 00 E1 1C 00 E1 1C 00 F2 1C 00'
- 'F2 1C 00 23 A8 00 24 A8 00 27 A8 00 27 A8 00 80 A8 00 81 A8 00 B4 A8 00 C3 A8 00 52 A9 00 53 A9'
- '00 83 A9 00 83 A9 00 B4 A9 00 B5 A9 00 BA A9 00 BB A9 00 BD A9 00 C0 A9 00 2F AA 00 30 AA 00 33'
- 'AA 00 34 AA 00 4D AA 00 4D AA 00 7B AA 00 7B AA 00 E3 AB 00 E4 AB 00 E6 AB 00 E7 AB 00 E9 AB 00'
- 'EA AB 00 EC AB 00 EC AB 00 82 10 01 82 10 01 B0 10 01 B2 10 01 B7 10 01 B8 10 01 65 D1 01 66 D1'
- '01 6D D1 01 72 D1 01 05 05 00 00 00 88 04 00 89 04 00 DE 06 00 DE 06 00 DD 20 00 E0 20 00 E2 20'
- '00 E4 20 00 70 A6 00 72 A6 00 06 25 00 00 00 30 00 00 39 00 00 60 06 00 69 06 00 F0 06 00 F9 06'
- '00 C0 07 00 C9 07 00 66 09 00 6F 09 00 E6 09 00 EF 09 00 66 0A 00 6F 0A 00 E6 0A 00 EF 0A 00 66'
- '0B 00 6F 0B 00 E6 0B 00 EF 0B 00 66 0C 00 6F 0C 00 E6 0C 00 EF 0C 00 66 0D 00 6F 0D 00 50 0E 00'
- '59 0E 00 D0 0E 00 D9 0E 00 20 0F 00 29 0F 00 40 10 00 49 10 00 90 10 00 99 10 00 E0 17 00 E9 17'
- '00 10 18 00 19 18 00 46 19 00 4F 19 00 D0 19 00 DA 19 00 80 1A 00 89 1A 00 90 1A 00 99 1A 00 50'
- '1B 00 59 1B 00 B0 1B 00 B9 1B 00 40 1C 00 49 1C 00 50 1C 00 59 1C 00 20 A6 00 29 A6 00 D0 A8 00'
- 'D9 A8 00 00 A9 00 09 A9 00 D0 A9 00 D9 A9 00 50 AA 00 59 AA 00 F0 AB 00 F9 AB 00 10 FF 00 19 FF'
- '00 A0 04 01 A9 04 01 CE D7 01 FF D7 01 07 0C 00 00 00 EE 16 00 F0 16 00 60 21 00 82 21 00 85 21'
- '00 88 21 00 07 30 00 07 30 00 21 30 00 29 30 00 38 30 00 3A 30 00 E6 A6 00 EF A6 00 40 01 01 74'
- '01 01 41 03 01 41 03 01 4A 03 01 4A 03 01 D1 03 01 D5 03 01 00 24 01 62 24 01 08 26 00 00 00 B2'
- '00 00 B3 00 00 B9 00 00 B9 00 00 BC 00 00 BE 00 00 F4 09 00 F9 09 00 F0 0B 00 F2 0B 00 78 0C 00'
- '7E 0C 00 70 0D 00 75 0D 00 2A 0F 00 33 0F 00 69 13 00 7C 13 00 F0 17 00 F9 17 00 70 20 00 70 20'
- '00 74 20 00 79 20 00 80 20 00 89 20 00 50 21 00 5F 21 00 89 21 00 89 21 00 60 24 00 9B 24 00 EA'
- '24 00 FF 24 00 76 27 00 93 27 00 FD 2C 00 FD 2C 00 92 31 00 95 31 00 20 32 00 29 32 00 51 32 00'
- '5F 32 00 80 32 00 89 32 00 B1 32 00 BF 32 00 30 A8 00 35 A8 00 07 01 01 33 01 01 75 01 01 78 01'
- '01 8A 01 01 8A 01 01 20 03 01 23 03 01 58 08 01 5F 08 01 16 09 01 1B 09 01 40 0A 01 47 0A 01 7D'
- '0A 01 7E 0A 01 58 0B 01 5F 0B 01 78 0B 01 7F 0B 01 60 0E 01 7E 0E 01 60 D3 01 71 D3 01 00 F1 01'
- '0A F1 01 09 08 00 00 00 20 00 00 20 00 00 A0 00 00 A0 00 00 80 16 00 80 16 00 0E 18 00 0E 18 00'
- '00 20 00 0A 20 00 2F 20 00 2F 20 00 5F 20 00 5F 20 00 00 30 00 00 30 00 0A 01 00 00 00 28 20 00'
- '28 20 00 0B 05 00 00 00 0A 00 00 0A 00 00 0D 00 00 0D 00 00 1C 00 00 1E 00 00 85 00 00 85 00 00'
- '29 20 00 29 20 00 0C 02 00 00 00 00 00 00 1F 00 00 7F 00 00 9F 00 00 0D 0F 00 00 00 AD 00 00 AD'
- '00 00 00 06 00 03 06 00 DD 06 00 DD 06 00 0F 07 00 0F 07 00 B4 17 00 B5 17 00 0B 20 00 0F 20 00'
- '2A 20 00 2E 20 00 60 20 00 64 20 00 6A 20 00 6F 20 00 FF FE 00 FF FE 00 F9 FF 00 FB FF 00 BD 10'
- '01 BD 10 01 73 D1 01 7A D1 01 01 00 0E 01 00 0E 20 00 0E 7F 00 0E 0E 01 00 00 00 00 D8 00 FF DF'
- '00 0F 03 00 00 00 00 E0 00 FF F8 00 00 00 0F FD FF 0F 00 00 10 FD FF 10 11 31 00 00 00 B0 02 00'
- 'C1 02 00 C6 02 00 D1 02 00 E0 02 00 E4 02 00 EC 02 00 EC 02 00 EE 02 00 EE 02 00 74 03 00 74 03'
- '00 7A 03 00 7A 03 00 59 05 00 59 05 00 40 06 00 40 06 00 E5 06 00 E6 06 00 F4 07 00 F5 07 00 FA'
- '07 00 FA 07 00 1A 08 00 1A 08 00 24 08 00 24 08 00 28 08 00 28 08 00 71 09 00 71 09 00 46 0E 00'
- '46 0E 00 C6 0E 00 C6 0E 00 FC 10 00 FC 10 00 D7 17 00 D7 17 00 43 18 00 43 18 00 A7 1A 00 A7 1A'
- '00 78 1C 00 7D 1C 00 2C 1D 00 61 1D 00 78 1D 00 78 1D 00 9B 1D 00 BF 1D 00 71 20 00 71 20 00 7F'
- '20 00 7F 20 00 90 20 00 94 20 00 7D 2C 00 7D 2C 00 6F 2D 00 6F 2D 00 2F 2E 00 2F 2E 00 05 30 00'
- '05 30 00 31 30 00 35 30 00 3B 30 00 3B 30 00 9D 30 00 9E 30 00 FC 30 00 FE 30 00 15 A0 00 15 A0'
- '00 F8 A4 00 FD A4 00 0C A6 00 0C A6 00 7F A6 00 7F A6 00 17 A7 00 1F A7 00 70 A7 00 70 A7 00 88'
- 'A7 00 88 A7 00 CF A9 00 CF A9 00 70 AA 00 70 AA 00 DD AA 00 DD AA 00 70 FF 00 70 FF 00 9E FF 00'
- '9F FF 00 12 37 01 00 00 BB 01 00 BB 01 00 C0 01 00 C3 01 00 94 02 00 94 02 00 D0 05 00 EA 05 00'
- 'F0 05 00 F2 05 00 21 06 00 3F 06 00 41 06 00 4A 06 00 6E 06 00 6F 06 00 71 06 00 D3 06 00 D5 06'
- '00 D5 06 00 EE 06 00 EF 06 00 FA 06 00 FC 06 00 FF 06 00 FF 06 00 10 07 00 10 07 00 12 07 00 2F'
- '07 00 4D 07 00 A5 07 00 B1 07 00 B1 07 00 CA 07 00 EA 07 00 00 08 00 15 08 00 04 09 00 39 09 00'
- '3D 09 00 3D 09 00 50 09 00 50 09 00 58 09 00 61 09 00 72 09 00 72 09 00 79 09 00 7F 09 00 85 09'
- '00 8C 09 00 8F 09 00 90 09 00 93 09 00 A8 09 00 AA 09 00 B0 09 00 B2 09 00 B2 09 00 B6 09 00 B9'
- '09 00 BD 09 00 BD 09 00 CE 09 00 CE 09 00 DC 09 00 DD 09 00 DF 09 00 E1 09 00 F0 09 00 F1 09 00'
- '05 0A 00 0A 0A 00 0F 0A 00 10 0A 00 13 0A 00 28 0A 00 2A 0A 00 30 0A 00 32 0A 00 33 0A 00 35 0A'
- '00 36 0A 00 38 0A 00 39 0A 00 59 0A 00 5C 0A 00 5E 0A 00 5E 0A 00 72 0A 00 74 0A 00 85 0A 00 8D'
- '0A 00 8F 0A 00 91 0A 00 93 0A 00 A8 0A 00 AA 0A 00 B0 0A 00 B2 0A 00 B3 0A 00 B5 0A 00 B9 0A 00'
- 'BD 0A 00 BD 0A 00 D0 0A 00 D0 0A 00 E0 0A 00 E1 0A 00 05 0B 00 0C 0B 00 0F 0B 00 10 0B 00 13 0B'
- '00 28 0B 00 2A 0B 00 30 0B 00 32 0B 00 33 0B 00 35 0B 00 39 0B 00 3D 0B 00 3D 0B 00 5C 0B 00 5D'
- '0B 00 5F 0B 00 61 0B 00 71 0B 00 71 0B 00 83 0B 00 83 0B 00 85 0B 00 8A 0B 00 8E 0B 00 90 0B 00'
- '92 0B 00 95 0B 00 99 0B 00 9A 0B 00 9C 0B 00 9C 0B 00 9E 0B 00 9F 0B 00 A3 0B 00 A4 0B 00 A8 0B'
- '00 AA 0B 00 AE 0B 00 B9 0B 00 D0 0B 00 D0 0B 00 05 0C 00 0C 0C 00 0E 0C 00 10 0C 00 12 0C 00 28'
- '0C 00 2A 0C 00 33 0C 00 35 0C 00 39 0C 00 3D 0C 00 3D 0C 00 58 0C 00 59 0C 00 60 0C 00 61 0C 00'
- '85 0C 00 8C 0C 00 8E 0C 00 90 0C 00 92 0C 00 A8 0C 00 AA 0C 00 B3 0C 00 B5 0C 00 B9 0C 00 BD 0C'
- '00 BD 0C 00 DE 0C 00 DE 0C 00 E0 0C 00 E1 0C 00 05 0D 00 0C 0D 00 0E 0D 00 10 0D 00 12 0D 00 28'
- '0D 00 2A 0D 00 39 0D 00 3D 0D 00 3D 0D 00 60 0D 00 61 0D 00 7A 0D 00 7F 0D 00 85 0D 00 96 0D 00'
- '9A 0D 00 B1 0D 00 B3 0D 00 BB 0D 00 BD 0D 00 BD 0D 00 C0 0D 00 C6 0D 00 01 0E 00 30 0E 00 32 0E'
- '00 33 0E 00 40 0E 00 45 0E 00 81 0E 00 82 0E 00 84 0E 00 84 0E 00 87 0E 00 88 0E 00 8A 0E 00 8A'
- '0E 00 8D 0E 00 8D 0E 00 94 0E 00 97 0E 00 99 0E 00 9F 0E 00 A1 0E 00 A3 0E 00 A5 0E 00 A5 0E 00'
- 'A7 0E 00 A7 0E 00 AA 0E 00 AB 0E 00 AD 0E 00 B0 0E 00 B2 0E 00 B3 0E 00 BD 0E 00 BD 0E 00 C0 0E'
- '00 C4 0E 00 DC 0E 00 DD 0E 00 00 0F 00 00 0F 00 40 0F 00 47 0F 00 49 0F 00 6C 0F 00 88 0F 00 8B'
- '0F 00 00 10 00 2A 10 00 3F 10 00 3F 10 00 50 10 00 55 10 00 5A 10 00 5D 10 00 61 10 00 61 10 00'
- '65 10 00 66 10 00 6E 10 00 70 10 00 75 10 00 81 10 00 8E 10 00 8E 10 00 D0 10 00 FA 10 00 00 11'
- '00 48 12 00 4A 12 00 4D 12 00 50 12 00 56 12 00 58 12 00 58 12 00 5A 12 00 5D 12 00 60 12 00 88'
- '12 00 8A 12 00 8D 12 00 90 12 00 B0 12 00 B2 12 00 B5 12 00 B8 12 00 BE 12 00 C0 12 00 C0 12 00'
- 'C2 12 00 C5 12 00 C8 12 00 D6 12 00 D8 12 00 10 13 00 12 13 00 15 13 00 18 13 00 5A 13 00 80 13'
- '00 8F 13 00 A0 13 00 F4 13 00 01 14 00 6C 16 00 6F 16 00 7F 16 00 81 16 00 9A 16 00 A0 16 00 EA'
- '16 00 00 17 00 0C 17 00 0E 17 00 11 17 00 20 17 00 31 17 00 40 17 00 51 17 00 60 17 00 6C 17 00'
- '6E 17 00 70 17 00 80 17 00 B3 17 00 DC 17 00 DC 17 00 20 18 00 42 18 00 44 18 00 77 18 00 80 18'
- '00 A8 18 00 AA 18 00 AA 18 00 B0 18 00 F5 18 00 00 19 00 1C 19 00 50 19 00 6D 19 00 70 19 00 74'
- '19 00 80 19 00 AB 19 00 C1 19 00 C7 19 00 00 1A 00 16 1A 00 20 1A 00 54 1A 00 05 1B 00 33 1B 00'
- '45 1B 00 4B 1B 00 83 1B 00 A0 1B 00 AE 1B 00 AF 1B 00 00 1C 00 23 1C 00 4D 1C 00 4F 1C 00 5A 1C'
- '00 77 1C 00 E9 1C 00 EC 1C 00 EE 1C 00 F1 1C 00 35 21 00 38 21 00 30 2D 00 65 2D 00 80 2D 00 96'
- '2D 00 A0 2D 00 A6 2D 00 A8 2D 00 AE 2D 00 B0 2D 00 B6 2D 00 B8 2D 00 BE 2D 00 C0 2D 00 C6 2D 00'
- 'C8 2D 00 CE 2D 00 D0 2D 00 D6 2D 00 D8 2D 00 DE 2D 00 06 30 00 06 30 00 3C 30 00 3C 30 00 41 30'
- '00 96 30 00 9F 30 00 9F 30 00 A1 30 00 FA 30 00 FF 30 00 FF 30 00 05 31 00 2D 31 00 31 31 00 8E'
- '31 00 A0 31 00 B7 31 00 F0 31 00 FF 31 00 00 34 00 B5 4D 00 00 4E 00 CB 9F 00 00 A0 00 14 A0 00'
- '16 A0 00 8C A4 00 D0 A4 00 F7 A4 00 00 A5 00 0B A6 00 10 A6 00 1F A6 00 2A A6 00 2B A6 00 6E A6'
- '00 6E A6 00 A0 A6 00 E5 A6 00 FB A7 00 01 A8 00 03 A8 00 05 A8 00 07 A8 00 0A A8 00 0C A8 00 22'
- 'A8 00 40 A8 00 73 A8 00 82 A8 00 B3 A8 00 F2 A8 00 F7 A8 00 FB A8 00 FB A8 00 0A A9 00 25 A9 00'
- '30 A9 00 46 A9 00 60 A9 00 7C A9 00 84 A9 00 B2 A9 00 00 AA 00 28 AA 00 40 AA 00 42 AA 00 44 AA'
- '00 4B AA 00 60 AA 00 6F AA 00 71 AA 00 76 AA 00 7A AA 00 7A AA 00 80 AA 00 AF AA 00 B1 AA 00 B1'
- 'AA 00 B5 AA 00 B6 AA 00 B9 AA 00 BD AA 00 C0 AA 00 C0 AA 00 C2 AA 00 C2 AA 00 DB AA 00 DC AA 00'
- 'C0 AB 00 E2 AB 00 00 AC 00 A3 D7 00 B0 D7 00 C6 D7 00 CB D7 00 FB D7 00 00 F9 00 2D FA 00 30 FA'
- '00 6D FA 00 70 FA 00 D9 FA 00 1D FB 00 1D FB 00 1F FB 00 28 FB 00 2A FB 00 36 FB 00 38 FB 00 3C'
- 'FB 00 3E FB 00 3E FB 00 40 FB 00 41 FB 00 43 FB 00 44 FB 00 46 FB 00 B1 FB 00 D3 FB 00 3D FD 00'
- '50 FD 00 8F FD 00 92 FD 00 C7 FD 00 F0 FD 00 FB FD 00 70 FE 00 74 FE 00 76 FE 00 FC FE 00 66 FF'
- '00 6F FF 00 71 FF 00 9D FF 00 A0 FF 00 BE FF 00 C2 FF 00 C7 FF 00 CA FF 00 CF FF 00 D2 FF 00 D7'
- 'FF 00 DA FF 00 DC FF 00 00 00 01 0B 00 01 0D 00 01 26 00 01 28 00 01 3A 00 01 3C 00 01 3D 00 01'
- '3F 00 01 4D 00 01 50 00 01 5D 00 01 80 00 01 FA 00 01 80 02 01 9C 02 01 A0 02 01 D0 02 01 00 03'
- '01 1E 03 01 30 03 01 40 03 01 42 03 01 49 03 01 80 03 01 9D 03 01 A0 03 01 C3 03 01 C8 03 01 CF'
- '03 01 50 04 01 9D 04 01 00 08 01 05 08 01 08 08 01 08 08 01 0A 08 01 35 08 01 37 08 01 38 08 01'
- '3C 08 01 3C 08 01 3F 08 01 55 08 01 00 09 01 15 09 01 20 09 01 39 09 01 00 0A 01 00 0A 01 10 0A'
- '01 13 0A 01 15 0A 01 17 0A 01 19 0A 01 33 0A 01 60 0A 01 7C 0A 01 00 0B 01 35 0B 01 40 0B 01 55'
- '0B 01 60 0B 01 72 0B 01 00 0C 01 48 0C 01 83 10 01 AF 10 01 00 20 01 6E 23 01 00 30 01 2E 34 01'
- '00 00 02 D6 A6 02 00 A7 02 34 B7 02 00 F8 02 1D FA 02 13 06 00 00 00 5F 00 00 5F 00 00 3F 20 00'
- '40 20 00 54 20 00 54 20 00 33 FE 00 34 FE 00 4D FE 00 4F FE 00 3F FF 00 3F FF 00 14 13 00 00 00'
- '2D 00 00 2D 00 00 8A 05 00 8A 05 00 BE 05 00 BE 05 00 00 14 00 00 14 00 06 18 00 06 18 00 10 20'
- '00 15 20 00 53 20 00 53 20 00 7B 20 00 7B 20 00 8B 20 00 8B 20 00 12 22 00 12 22 00 17 2E 00 17'
- '2E 00 1A 2E 00 1A 2E 00 1C 30 00 1C 30 00 30 30 00 30 30 00 A0 30 00 A0 30 00 31 FE 00 32 FE 00'
- '58 FE 00 58 FE 00 63 FE 00 63 FE 00 0D FF 00 0D FF 00 15 48 00 00 00 28 00 00 28 00 00 5B 00 00'
- '5B 00 00 7B 00 00 7B 00 00 3A 0F 00 3A 0F 00 3C 0F 00 3C 0F 00 9B 16 00 9B 16 00 1A 20 00 1A 20'
- '00 1E 20 00 1E 20 00 45 20 00 45 20 00 7D 20 00 7D 20 00 8D 20 00 8D 20 00 29 23 00 29 23 00 68'
- '27 00 68 27 00 6A 27 00 6A 27 00 6C 27 00 6C 27 00 6E 27 00 6E 27 00 70 27 00 70 27 00 72 27 00'
- '72 27 00 74 27 00 74 27 00 C5 27 00 C5 27 00 E6 27 00 E6 27 00 E8 27 00 E8 27 00 EA 27 00 EA 27'
- '00 EC 27 00 EC 27 00 EE 27 00 EE 27 00 83 29 00 83 29 00 85 29 00 85 29 00 87 29 00 87 29 00 89'
- '29 00 89 29 00 8B 29 00 8B 29 00 8D 29 00 8D 29 00 8F 29 00 8F 29 00 91 29 00 91 29 00 93 29 00'
- '93 29 00 95 29 00 95 29 00 97 29 00 97 29 00 D8 29 00 D8 29 00 DA 29 00 DA 29 00 FC 29 00 FC 29'
- '00 22 2E 00 22 2E 00 24 2E 00 24 2E 00 26 2E 00 26 2E 00 28 2E 00 28 2E 00 08 30 00 08 30 00 0A'
- '30 00 0A 30 00 0C 30 00 0C 30 00 0E 30 00 0E 30 00 10 30 00 10 30 00 14 30 00 14 30 00 16 30 00'
- '16 30 00 18 30 00 18 30 00 1A 30 00 1A 30 00 1D 30 00 1D 30 00 3E FD 00 3E FD 00 17 FE 00 17 FE'
- '00 35 FE 00 35 FE 00 37 FE 00 37 FE 00 39 FE 00 39 FE 00 3B FE 00 3B FE 00 3D FE 00 3D FE 00 3F'
- 'FE 00 3F FE 00 41 FE 00 41 FE 00 43 FE 00 43 FE 00 47 FE 00 47 FE 00 59 FE 00 59 FE 00 5B FE 00'
- '5B FE 00 5D FE 00 5D FE 00 08 FF 00 08 FF 00 3B FF 00 3B FF 00 5B FF 00 5B FF 00 5F FF 00 5F FF'
- '00 62 FF 00 62 FF 00 16 46 00 00 00 29 00 00 29 00 00 5D 00 00 5D 00 00 7D 00 00 7D 00 00 3B 0F'
- '00 3B 0F 00 3D 0F 00 3D 0F 00 9C 16 00 9C 16 00 46 20 00 46 20 00 7E 20 00 7E 20 00 8E 20 00 8E'
- '20 00 2A 23 00 2A 23 00 69 27 00 69 27 00 6B 27 00 6B 27 00 6D 27 00 6D 27 00 6F 27 00 6F 27 00'
- '71 27 00 71 27 00 73 27 00 73 27 00 75 27 00 75 27 00 C6 27 00 C6 27 00 E7 27 00 E7 27 00 E9 27'
- '00 E9 27 00 EB 27 00 EB 27 00 ED 27 00 ED 27 00 EF 27 00 EF 27 00 84 29 00 84 29 00 86 29 00 86'
- '29 00 88 29 00 88 29 00 8A 29 00 8A 29 00 8C 29 00 8C 29 00 8E 29 00 8E 29 00 90 29 00 90 29 00'
- '92 29 00 92 29 00 94 29 00 94 29 00 96 29 00 96 29 00 98 29 00 98 29 00 D9 29 00 D9 29 00 DB 29'
- '00 DB 29 00 FD 29 00 FD 29 00 23 2E 00 23 2E 00 25 2E 00 25 2E 00 27 2E 00 27 2E 00 29 2E 00 29'
- '2E 00 09 30 00 09 30 00 0B 30 00 0B 30 00 0D 30 00 0D 30 00 0F 30 00 0F 30 00 11 30 00 11 30 00'
- '15 30 00 15 30 00 17 30 00 17 30 00 19 30 00 19 30 00 1B 30 00 1B 30 00 1E 30 00 1F 30 00 3F FD'
- '00 3F FD 00 18 FE 00 18 FE 00 36 FE 00 36 FE 00 38 FE 00 38 FE 00 3A FE 00 3A FE 00 3C FE 00 3C'
- 'FE 00 3E FE 00 3E FE 00 40 FE 00 40 FE 00 42 FE 00 42 FE 00 44 FE 00 44 FE 00 48 FE 00 48 FE 00'
- '5A FE 00 5A FE 00 5C FE 00 5C FE 00 5E FE 00 5E FE 00 09 FF 00 09 FF 00 3D FF 00 3D FF 00 5D FF'
- '00 5D FF 00 60 FF 00 60 FF 00 63 FF 00 63 FF 00 17 0B 00 00 00 AB 00 00 AB 00 00 18 20 00 18 20'
- '00 1B 20 00 1C 20 00 1F 20 00 1F 20 00 39 20 00 39 20 00 02 2E 00 02 2E 00 04 2E 00 04 2E 00 09'
- '2E 00 09 2E 00 0C 2E 00 0C 2E 00 1C 2E 00 1C 2E 00 20 2E 00 20 2E 00 18 0A 00 00 00 BB 00 00 BB'
- '00 00 19 20 00 19 20 00 1D 20 00 1D 20 00 3A 20 00 3A 20 00 03 2E 00 03 2E 00 05 2E 00 05 2E 00'
- '0A 2E 00 0A 2E 00 0D 2E 00 0D 2E 00 1D 2E 00 1D 2E 00 21 2E 00 21 2E 00 19 7C 00 00 00 21 00 00'
- '23 00 00 25 00 00 27 00 00 2A 00 00 2A 00 00 2C 00 00 2C 00 00 2E 00 00 2F 00 00 3A 00 00 3B 00'
- '00 3F 00 00 40 00 00 5C 00 00 5C 00 00 A1 00 00 A1 00 00 B7 00 00 B7 00 00 BF 00 00 BF 00 00 7E'
- '03 00 7E 03 00 87 03 00 87 03 00 5A 05 00 5F 05 00 89 05 00 89 05 00 C0 05 00 C0 05 00 C3 05 00'
- 'C3 05 00 C6 05 00 C6 05 00 F3 05 00 F4 05 00 09 06 00 0A 06 00 0C 06 00 0D 06 00 1B 06 00 1B 06'
- '00 1E 06 00 1F 06 00 6A 06 00 6D 06 00 D4 06 00 D4 06 00 00 07 00 0D 07 00 F7 07 00 F9 07 00 30'
- '08 00 3E 08 00 64 09 00 65 09 00 70 09 00 70 09 00 F4 0D 00 F4 0D 00 4F 0E 00 4F 0E 00 5A 0E 00'
- '5B 0E 00 04 0F 00 12 0F 00 85 0F 00 85 0F 00 D0 0F 00 D4 0F 00 4A 10 00 4F 10 00 FB 10 00 FB 10'
- '00 61 13 00 68 13 00 6D 16 00 6E 16 00 EB 16 00 ED 16 00 35 17 00 36 17 00 D4 17 00 D6 17 00 D8'
- '17 00 DA 17 00 00 18 00 05 18 00 07 18 00 0A 18 00 44 19 00 45 19 00 DE 19 00 DF 19 00 1E 1A 00'
- '1F 1A 00 A0 1A 00 A6 1A 00 A8 1A 00 AD 1A 00 5A 1B 00 60 1B 00 3B 1C 00 3F 1C 00 7E 1C 00 7F 1C'
- '00 D3 1C 00 D3 1C 00 16 20 00 17 20 00 20 20 00 27 20 00 30 20 00 38 20 00 3B 20 00 3E 20 00 41'
- '20 00 43 20 00 47 20 00 51 20 00 53 20 00 53 20 00 55 20 00 5E 20 00 F9 2C 00 FC 2C 00 FE 2C 00'
- 'FF 2C 00 00 2E 00 01 2E 00 06 2E 00 08 2E 00 0B 2E 00 0B 2E 00 0E 2E 00 16 2E 00 18 2E 00 19 2E'
- '00 1B 2E 00 1B 2E 00 1E 2E 00 1F 2E 00 2A 2E 00 2E 2E 00 30 2E 00 31 2E 00 01 30 00 03 30 00 3D'
- '30 00 3D 30 00 FB 30 00 FB 30 00 FE A4 00 FF A4 00 0D A6 00 0F A6 00 73 A6 00 73 A6 00 7E A6 00'
- '7E A6 00 F2 A6 00 F7 A6 00 74 A8 00 77 A8 00 CE A8 00 CF A8 00 F8 A8 00 FA A8 00 2E A9 00 2F A9'
- '00 5F A9 00 5F A9 00 C1 A9 00 CD A9 00 DE A9 00 DF A9 00 5C AA 00 5F AA 00 DE AA 00 DF AA 00 EB'
- 'AB 00 EB AB 00 10 FE 00 16 FE 00 19 FE 00 19 FE 00 30 FE 00 30 FE 00 45 FE 00 46 FE 00 49 FE 00'
- '4C FE 00 50 FE 00 52 FE 00 54 FE 00 57 FE 00 5F FE 00 61 FE 00 68 FE 00 68 FE 00 6A FE 00 6B FE'
- '00 01 FF 00 03 FF 00 05 FF 00 07 FF 00 0A FF 00 0A FF 00 0C FF 00 0C FF 00 0E FF 00 0F FF 00 1A'
- 'FF 00 1B FF 00 1F FF 00 20 FF 00 3C FF 00 3C FF 00 61 FF 00 61 FF 00 64 FF 00 65 FF 00 00 01 01'
- '01 01 01 9F 03 01 9F 03 01 D0 03 01 D0 03 01 57 08 01 57 08 01 1F 09 01 1F 09 01 3F 09 01 3F 09'
- '01 50 0A 01 58 0A 01 7F 0A 01 7F 0A 01 39 0B 01 3F 0B 01 BB 10 01 BC 10 01 BE 10 01 C1 10 01 70'
- '24 01 73 24 01 1A 41 00 00 00 2B 00 00 2B 00 00 3C 00 00 3E 00 00 7C 00 00 7C 00 00 7E 00 00 7E'
- '00 00 AC 00 00 AC 00 00 B1 00 00 B1 00 00 D7 00 00 D7 00 00 F7 00 00 F7 00 00 F6 03 00 F6 03 00'
- '06 06 00 08 06 00 44 20 00 44 20 00 52 20 00 52 20 00 7A 20 00 7C 20 00 8A 20 00 8C 20 00 40 21'
- '00 44 21 00 4B 21 00 4B 21 00 90 21 00 94 21 00 9A 21 00 9B 21 00 A0 21 00 A0 21 00 A3 21 00 A3'
- '21 00 A6 21 00 A6 21 00 AE 21 00 AE 21 00 CE 21 00 CF 21 00 D2 21 00 D2 21 00 D4 21 00 D4 21 00'
- 'F4 21 00 FF 22 00 08 23 00 0B 23 00 20 23 00 21 23 00 7C 23 00 7C 23 00 9B 23 00 B3 23 00 DC 23'
- '00 E1 23 00 B7 25 00 B7 25 00 C1 25 00 C1 25 00 F8 25 00 FF 25 00 6F 26 00 6F 26 00 C0 27 00 C4'
- '27 00 C7 27 00 CA 27 00 CC 27 00 CC 27 00 D0 27 00 E5 27 00 F0 27 00 FF 27 00 00 29 00 82 29 00'
- '99 29 00 D7 29 00 DC 29 00 FB 29 00 FE 29 00 FF 2A 00 30 2B 00 44 2B 00 47 2B 00 4C 2B 00 29 FB'
- '00 29 FB 00 62 FE 00 62 FE 00 64 FE 00 66 FE 00 0B FF 00 0B FF 00 1C FF 00 1E FF 00 5C FF 00 5C'
- 'FF 00 5E FF 00 5E FF 00 E2 FF 00 E2 FF 00 E9 FF 00 EC FF 00 C1 D6 01 C1 D6 01 DB D6 01 DB D6 01'
- 'FB D6 01 FB D6 01 15 D7 01 15 D7 01 35 D7 01 35 D7 01 4F D7 01 4F D7 01 6F D7 01 6F D7 01 89 D7'
- '01 89 D7 01 A9 D7 01 A9 D7 01 C3 D7 01 C3 D7 01 1B 10 00 00 00 24 00 00 24 00 00 A2 00 00 A5 00'
- '00 0B 06 00 0B 06 00 F2 09 00 F3 09 00 FB 09 00 FB 09 00 F1 0A 00 F1 0A 00 F9 0B 00 F9 0B 00 3F'
- '0E 00 3F 0E 00 DB 17 00 DB 17 00 A0 20 00 B8 20 00 38 A8 00 38 A8 00 FC FD 00 FC FD 00 69 FE 00'
- '69 FE 00 04 FF 00 04 FF 00 E0 FF 00 E1 FF 00 E5 FF 00 E6 FF 00 1C 1A 00 00 00 5E 00 00 5E 00 00'
- '60 00 00 60 00 00 A8 00 00 A8 00 00 AF 00 00 AF 00 00 B4 00 00 B4 00 00 B8 00 00 B8 00 00 C2 02'
- '00 C5 02 00 D2 02 00 DF 02 00 E5 02 00 EB 02 00 ED 02 00 ED 02 00 EF 02 00 FF 02 00 75 03 00 75'
- '03 00 84 03 00 85 03 00 BD 1F 00 BD 1F 00 BF 1F 00 C1 1F 00 CD 1F 00 CF 1F 00 DD 1F 00 DF 1F 00'
- 'ED 1F 00 EF 1F 00 FD 1F 00 FE 1F 00 9B 30 00 9C 30 00 00 A7 00 16 A7 00 20 A7 00 21 A7 00 89 A7'
- '00 8A A7 00 3E FF 00 3E FF 00 40 FF 00 40 FF 00 E3 FF 00 E3 FF 00 1D 9A 00 00 00 A6 00 00 A7 00'
- '00 A9 00 00 A9 00 00 AE 00 00 AE 00 00 B0 00 00 B0 00 00 B6 00 00 B6 00 00 82 04 00 82 04 00 0E'
- '06 00 0F 06 00 E9 06 00 E9 06 00 FD 06 00 FE 06 00 F6 07 00 F6 07 00 FA 09 00 FA 09 00 70 0B 00'
- '70 0B 00 F3 0B 00 F8 0B 00 FA 0B 00 FA 0B 00 7F 0C 00 7F 0C 00 F1 0C 00 F2 0C 00 79 0D 00 79 0D'
- '00 01 0F 00 03 0F 00 13 0F 00 17 0F 00 1A 0F 00 1F 0F 00 34 0F 00 34 0F 00 36 0F 00 36 0F 00 38'
- '0F 00 38 0F 00 BE 0F 00 C5 0F 00 C7 0F 00 CC 0F 00 CE 0F 00 CF 0F 00 D5 0F 00 D8 0F 00 9E 10 00'
- '9F 10 00 60 13 00 60 13 00 90 13 00 99 13 00 40 19 00 40 19 00 E0 19 00 FF 19 00 61 1B 00 6A 1B'
- '00 74 1B 00 7C 1B 00 00 21 00 01 21 00 03 21 00 06 21 00 08 21 00 09 21 00 14 21 00 14 21 00 16'
- '21 00 18 21 00 1E 21 00 23 21 00 25 21 00 25 21 00 27 21 00 27 21 00 29 21 00 29 21 00 2E 21 00'
- '2E 21 00 3A 21 00 3B 21 00 4A 21 00 4A 21 00 4C 21 00 4D 21 00 4F 21 00 4F 21 00 95 21 00 99 21'
- '00 9C 21 00 9F 21 00 A1 21 00 A2 21 00 A4 21 00 A5 21 00 A7 21 00 AD 21 00 AF 21 00 CD 21 00 D0'
- '21 00 D1 21 00 D3 21 00 D3 21 00 D5 21 00 F3 21 00 00 23 00 07 23 00 0C 23 00 1F 23 00 22 23 00'
- '28 23 00 2B 23 00 7B 23 00 7D 23 00 9A 23 00 B4 23 00 DB 23 00 E2 23 00 E8 23 00 00 24 00 26 24'
- '00 40 24 00 4A 24 00 9C 24 00 E9 24 00 00 25 00 B6 25 00 B8 25 00 C0 25 00 C2 25 00 F7 25 00 00'
- '26 00 6E 26 00 70 26 00 CD 26 00 CF 26 00 E1 26 00 E3 26 00 E3 26 00 E8 26 00 FF 26 00 01 27 00'
- '04 27 00 06 27 00 09 27 00 0C 27 00 27 27 00 29 27 00 4B 27 00 4D 27 00 4D 27 00 4F 27 00 52 27'
- '00 56 27 00 5E 27 00 61 27 00 67 27 00 94 27 00 94 27 00 98 27 00 AF 27 00 B1 27 00 BE 27 00 00'
- '28 00 FF 28 00 00 2B 00 2F 2B 00 45 2B 00 46 2B 00 50 2B 00 59 2B 00 E5 2C 00 EA 2C 00 80 2E 00'
- '99 2E 00 9B 2E 00 F3 2E 00 00 2F 00 D5 2F 00 F0 2F 00 FB 2F 00 04 30 00 04 30 00 12 30 00 13 30'
- '00 20 30 00 20 30 00 36 30 00 37 30 00 3E 30 00 3F 30 00 90 31 00 91 31 00 96 31 00 9F 31 00 C0'
- '31 00 E3 31 00 00 32 00 1E 32 00 2A 32 00 50 32 00 60 32 00 7F 32 00 8A 32 00 B0 32 00 C0 32 00'
- 'FE 32 00 00 33 00 FF 33 00 C0 4D 00 FF 4D 00 90 A4 00 C6 A4 00 28 A8 00 2B A8 00 36 A8 00 37 A8'
- '00 39 A8 00 39 A8 00 77 AA 00 79 AA 00 FD FD 00 FD FD 00 E4 FF 00 E4 FF 00 E8 FF 00 E8 FF 00 ED'
- 'FF 00 EE FF 00 FC FF 00 FD FF 00 02 01 01 02 01 01 37 01 01 3F 01 01 79 01 01 89 01 01 90 01 01'
- '9B 01 01 D0 01 01 FC 01 01 00 D0 01 F5 D0 01 00 D1 01 26 D1 01 29 D1 01 64 D1 01 6A D1 01 6C D1'
- '01 83 D1 01 84 D1 01 8C D1 01 A9 D1 01 AE D1 01 DD D1 01 00 D2 01 41 D2 01 45 D2 01 45 D2 01 00'
- 'D3 01 56 D3 01 00 F0 01 2B F0 01 30 F0 01 93 F0 01 10 F1 01 2E F1 01 31 F1 01 31 F1 01 3D F1 01'
- '3D F1 01 3F F1 01 3F F1 01 42 F1 01 42 F1 01 46 F1 01 46 F1 01 4A F1 01 4E F1 01 57 F1 01 57 F1'
- '01 5F F1 01 5F F1 01 79 F1 01 79 F1 01 7B F1 01 7C F1 01 7F F1 01 7F F1 01 8A F1 01 8D F1 01 90'
- 'F1 01 90 F1 01 00 F2 01 00 F2 01 10 F2 01 31 F2 01 40 F2 01 48 F2 01 1E FD 01 00 00 41 00 00 5A'
- '00 00 61 00 00 7A 00 00 AA 00 00 AA 00 00 B5 00 00 B5 00 00 BA 00 00 BA 00 00 C0 00 00 D6 00 00'
- 'D8 00 00 F6 00 00 F8 00 00 B8 02 00 BB 02 00 C1 02 00 D0 02 00 D1 02 00 E0 02 00 E4 02 00 EE 02'
- '00 EE 02 00 70 03 00 73 03 00 76 03 00 77 03 00 7A 03 00 7D 03 00 86 03 00 86 03 00 88 03 00 8A'
- '03 00 8C 03 00 8C 03 00 8E 03 00 A1 03 00 A3 03 00 F5 03 00 F7 03 00 82 04 00 8A 04 00 25 05 00'
- '31 05 00 56 05 00 59 05 00 5F 05 00 61 05 00 87 05 00 89 05 00 89 05 00 03 09 00 39 09 00 3D 09'
- '00 40 09 00 49 09 00 4C 09 00 4E 09 00 4E 09 00 50 09 00 50 09 00 58 09 00 61 09 00 64 09 00 72'
- '09 00 79 09 00 7F 09 00 82 09 00 83 09 00 85 09 00 8C 09 00 8F 09 00 90 09 00 93 09 00 A8 09 00'
- 'AA 09 00 B0 09 00 B2 09 00 B2 09 00 B6 09 00 B9 09 00 BD 09 00 C0 09 00 C7 09 00 C8 09 00 CB 09'
- '00 CC 09 00 CE 09 00 CE 09 00 D7 09 00 D7 09 00 DC 09 00 DD 09 00 DF 09 00 E1 09 00 E6 09 00 F1'
- '09 00 F4 09 00 FA 09 00 03 0A 00 03 0A 00 05 0A 00 0A 0A 00 0F 0A 00 10 0A 00 13 0A 00 28 0A 00'
- '2A 0A 00 30 0A 00 32 0A 00 33 0A 00 35 0A 00 36 0A 00 38 0A 00 39 0A 00 3E 0A 00 40 0A 00 59 0A'
- '00 5C 0A 00 5E 0A 00 5E 0A 00 66 0A 00 6F 0A 00 72 0A 00 74 0A 00 83 0A 00 83 0A 00 85 0A 00 8D'
- '0A 00 8F 0A 00 91 0A 00 93 0A 00 A8 0A 00 AA 0A 00 B0 0A 00 B2 0A 00 B3 0A 00 B5 0A 00 B9 0A 00'
- 'BD 0A 00 C0 0A 00 C9 0A 00 C9 0A 00 CB 0A 00 CC 0A 00 D0 0A 00 D0 0A 00 E0 0A 00 E1 0A 00 E6 0A'
- '00 EF 0A 00 02 0B 00 03 0B 00 05 0B 00 0C 0B 00 0F 0B 00 10 0B 00 13 0B 00 28 0B 00 2A 0B 00 30'
- '0B 00 32 0B 00 33 0B 00 35 0B 00 39 0B 00 3D 0B 00 3E 0B 00 40 0B 00 40 0B 00 47 0B 00 48 0B 00'
- '4B 0B 00 4C 0B 00 57 0B 00 57 0B 00 5C 0B 00 5D 0B 00 5F 0B 00 61 0B 00 66 0B 00 71 0B 00 83 0B'
- '00 83 0B 00 85 0B 00 8A 0B 00 8E 0B 00 90 0B 00 92 0B 00 95 0B 00 99 0B 00 9A 0B 00 9C 0B 00 9C'
- '0B 00 9E 0B 00 9F 0B 00 A3 0B 00 A4 0B 00 A8 0B 00 AA 0B 00 AE 0B 00 B9 0B 00 BE 0B 00 BF 0B 00'
- 'C1 0B 00 C2 0B 00 C6 0B 00 C8 0B 00 CA 0B 00 CC 0B 00 D0 0B 00 D0 0B 00 D7 0B 00 D7 0B 00 E6 0B'
- '00 F2 0B 00 01 0C 00 03 0C 00 05 0C 00 0C 0C 00 0E 0C 00 10 0C 00 12 0C 00 28 0C 00 2A 0C 00 33'
- '0C 00 35 0C 00 39 0C 00 3D 0C 00 3D 0C 00 41 0C 00 44 0C 00 58 0C 00 59 0C 00 60 0C 00 61 0C 00'
- '66 0C 00 6F 0C 00 7F 0C 00 7F 0C 00 82 0C 00 83 0C 00 85 0C 00 8C 0C 00 8E 0C 00 90 0C 00 92 0C'
- '00 A8 0C 00 AA 0C 00 B3 0C 00 B5 0C 00 B9 0C 00 BD 0C 00 C4 0C 00 C6 0C 00 C8 0C 00 CA 0C 00 CB'
- '0C 00 D5 0C 00 D6 0C 00 DE 0C 00 DE 0C 00 E0 0C 00 E1 0C 00 E6 0C 00 EF 0C 00 02 0D 00 03 0D 00'
- '05 0D 00 0C 0D 00 0E 0D 00 10 0D 00 12 0D 00 28 0D 00 2A 0D 00 39 0D 00 3D 0D 00 40 0D 00 46 0D'
- '00 48 0D 00 4A 0D 00 4C 0D 00 57 0D 00 57 0D 00 60 0D 00 61 0D 00 66 0D 00 75 0D 00 79 0D 00 7F'
- '0D 00 82 0D 00 83 0D 00 85 0D 00 96 0D 00 9A 0D 00 B1 0D 00 B3 0D 00 BB 0D 00 BD 0D 00 BD 0D 00'
- 'C0 0D 00 C6 0D 00 CF 0D 00 D1 0D 00 D8 0D 00 DF 0D 00 F2 0D 00 F4 0D 00 01 0E 00 30 0E 00 32 0E'
- '00 33 0E 00 40 0E 00 46 0E 00 4F 0E 00 5B 0E 00 81 0E 00 82 0E 00 84 0E 00 84 0E 00 87 0E 00 88'...
[truncated message content] |
|
From: <ou...@us...> - 2012-01-17 16:02:57
|
Revision: 3690
http://jcl.svn.sourceforge.net/jcl/?rev=3690&view=rev
Author: outchy
Date: 2012-01-17 16:02:46 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
PCRE update to 8.21 with JIT support.
Modified Paths:
--------------
trunk/jcl/examples/common/pcre/PCREDemoMain.dfm
trunk/jcl/examples/common/pcre/PCREDemoMain.pas
trunk/jcl/source/common/JclPCRE.pas
trunk/jcl/source/common/JclResources.pas
trunk/jcl/source/common/pcre.pas
trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
trunk/jcl/source/windows/obj/pcre/win32/pcre_compile.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_config.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_default_tables.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_dfa_exec.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_exec.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_fullinfo.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_get.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_info.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_maketables.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_newline.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_ord2utf8.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_refcount.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_study.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_tables.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_try_flipped.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_ucd.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_valid_utf8.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_version.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_xclass.obj
trunk/jcl/source/windows/obj/pcre/win64/makefile.mak
trunk/jcl/source/windows/obj/pcre/win64/pcre_compile.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_config.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_default_tables.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_dfa_exec.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_exec.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_fullinfo.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_get.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_info.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_maketables.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_newline.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_ord2utf8.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_refcount.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_study.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_tables.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_try_flipped.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_ucd.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_valid_utf8.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_version.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_xclass.obj
trunk/thirdparty/pcre/pcre-8.21/AUTHORS
trunk/thirdparty/pcre/pcre-8.21/LICENCE
trunk/thirdparty/pcre/pcre-8.21/README
trunk/thirdparty/pcre/pcre-8.21/config.h.generic
trunk/thirdparty/pcre/pcre-8.21/pcre.h.generic
trunk/thirdparty/pcre/pcre-8.21/pcre_compile.c
trunk/thirdparty/pcre/pcre-8.21/pcre_config.c
trunk/thirdparty/pcre/pcre-8.21/pcre_dfa_exec.c
trunk/thirdparty/pcre/pcre-8.21/pcre_exec.c
trunk/thirdparty/pcre/pcre-8.21/pcre_fullinfo.c
trunk/thirdparty/pcre/pcre-8.21/pcre_internal.h
trunk/thirdparty/pcre/pcre-8.21/pcre_study.c
trunk/thirdparty/pcre/pcre-8.21/pcre_tables.c
trunk/thirdparty/pcre/pcre-8.21/pcre_ucd.c
trunk/thirdparty/pcre/pcre-8.21/pcre_valid_utf8.c
trunk/thirdparty/pcre/pcre-8.21/pcre_xclass.c
trunk/thirdparty/pcre/pcre-8.21/ucp.h
Added Paths:
-----------
trunk/jcl/source/windows/obj/pcre/win32/pcre_jit_compile.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_jit_compile.obj
trunk/thirdparty/pcre/pcre-8.21/
trunk/thirdparty/pcre/pcre-8.21/pcre_jit_compile.c
trunk/thirdparty/pcre/pcre-8.21/sljit/
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitConfig.h
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitConfigInternal.h
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitExecAllocator.c
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitLir.c
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitLir.h
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitNativeARM_Thumb2.c
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitNativeARM_v5.c
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitNativeMIPS_32.c
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitNativeMIPS_common.c
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitNativePPC_32.c
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitNativePPC_64.c
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitNativePPC_common.c
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitNativeX86_32.c
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitNativeX86_64.c
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitNativeX86_common.c
trunk/thirdparty/pcre/pcre-8.21/sljit/sljitUtils.c
Removed Paths:
-------------
trunk/thirdparty/pcre/pcre-8.02/
Modified: trunk/jcl/examples/common/pcre/PCREDemoMain.dfm
===================================================================
--- trunk/jcl/examples/common/pcre/PCREDemoMain.dfm 2012-01-17 15:33:46 UTC (rev 3689)
+++ trunk/jcl/examples/common/pcre/PCREDemoMain.dfm 2012-01-17 16:02:46 UTC (rev 3690)
@@ -2,7 +2,7 @@
Left = 300
Top = 115
Caption = 'JclPCRE Demo'
- ClientHeight = 334
+ ClientHeight = 473
ClientWidth = 462
Color = clBtnFace
Constraints.MinHeight = 361
@@ -56,7 +56,7 @@
Left = 12
Top = 54
Width = 437
- Height = 180
+ Height = 205
Anchors = [akLeft, akTop, akRight, akBottom]
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -72,140 +72,170 @@
WordWrap = False
end
object btnOpen: TButton
- Left = 364
- Top = 294
+ Left = 370
+ Top = 274
Width = 75
Height = 25
Action = acOpen
Anchors = [akRight, akBottom]
TabOrder = 4
end
- object chkIgnoreCase: TCheckBox
- Left = 18
- Top = 244
- Width = 97
- Height = 17
- Anchors = [akLeft, akBottom]
- Caption = '&Ignore Case'
- Checked = True
- State = cbChecked
- TabOrder = 5
- end
- object chkMultiLine: TCheckBox
- Left = 18
- Top = 262
- Width = 97
- Height = 17
- Anchors = [akLeft, akBottom]
- Caption = '&Multi Line'
- Checked = True
- State = cbChecked
- TabOrder = 6
- end
- object chkDotAll: TCheckBox
- Left = 18
- Top = 280
- Width = 97
- Height = 17
- Anchors = [akLeft, akBottom]
- Caption = '&Dot All'
- TabOrder = 7
- end
- object chkExtended: TCheckBox
- Left = 18
- Top = 298
- Width = 97
- Height = 17
- Anchors = [akLeft, akBottom]
- Caption = '&Extended'
- TabOrder = 8
- end
- object chkAnchored: TCheckBox
- Left = 132
- Top = 244
- Width = 97
- Height = 17
- Anchors = [akLeft, akBottom]
- Caption = '&Anchored'
- TabOrder = 9
- end
- object chkDollarEndOnly: TCheckBox
- Left = 132
- Top = 262
- Width = 97
- Height = 17
- Anchors = [akLeft, akBottom]
- Caption = 'Dollar End Onl&y'
- TabOrder = 10
- end
- object chkExtra: TCheckBox
- Left = 132
- Top = 280
- Width = 97
- Height = 17
- Anchors = [akLeft, akBottom]
- Caption = 'Ex&tra'
- TabOrder = 11
- end
- object chkNotBOL: TCheckBox
- Left = 132
- Top = 298
- Width = 97
- Height = 17
- Anchors = [akLeft, akBottom]
- Caption = 'Not &BOL'
- TabOrder = 12
- end
- object chkNotEOL: TCheckBox
- Left = 246
- Top = 244
- Width = 97
- Height = 17
- Anchors = [akLeft, akBottom]
- Caption = 'Not EO&L'
- TabOrder = 13
- end
- object chkUnGreedy: TCheckBox
- Left = 246
- Top = 262
- Width = 97
- Height = 17
- Anchors = [akLeft, akBottom]
- Caption = '&Ungreedy'
- Checked = True
- State = cbChecked
- TabOrder = 14
- end
- object chkNotEmpty: TCheckBox
- Left = 246
- Top = 280
- Width = 97
- Height = 17
- Anchors = [akLeft, akBottom]
- Caption = 'Not Em&pty'
- Checked = True
- State = cbChecked
- TabOrder = 15
- end
- object chkUTF8: TCheckBox
- Left = 246
- Top = 298
- Width = 97
- Height = 17
- Anchors = [akLeft, akBottom]
- Caption = 'UTF&8'
- TabOrder = 16
- end
object sbMain: TStatusBar
Left = 0
- Top = 315
+ Top = 454
Width = 462
Height = 19
Panels = <
item
Width = 50
end>
+ ExplicitTop = 323
end
+ object GroupBoxMatchOptions: TGroupBox
+ Left = 8
+ Top = 321
+ Width = 359
+ Height = 127
+ Anchors = [akLeft, akBottom]
+ Caption = 'Match options:'
+ TabOrder = 6
+ object chkIgnoreCase: TCheckBox
+ Left = 26
+ Top = 29
+ Width = 97
+ Height = 17
+ Caption = '&Ignore Case'
+ Checked = True
+ State = cbChecked
+ TabOrder = 0
+ end
+ object chkMultiLine: TCheckBox
+ Left = 26
+ Top = 52
+ Width = 97
+ Height = 17
+ Caption = '&Multi Line'
+ Checked = True
+ State = cbChecked
+ TabOrder = 1
+ end
+ object chkDotAll: TCheckBox
+ Left = 26
+ Top = 75
+ Width = 97
+ Height = 17
+ Caption = '&Dot All'
+ TabOrder = 2
+ end
+ object chkExtended: TCheckBox
+ Left = 26
+ Top = 98
+ Width = 97
+ Height = 17
+ Caption = '&Extended'
+ TabOrder = 3
+ end
+ object chkAnchored: TCheckBox
+ Left = 140
+ Top = 29
+ Width = 97
+ Height = 17
+ Caption = '&Anchored'
+ TabOrder = 4
+ end
+ object chkDollarEndOnly: TCheckBox
+ Left = 140
+ Top = 52
+ Width = 97
+ Height = 17
+ Caption = 'Dollar End Onl&y'
+ TabOrder = 5
+ end
+ object chkExtra: TCheckBox
+ Left = 140
+ Top = 75
+ Width = 97
+ Height = 17
+ Caption = 'Ex&tra'
+ TabOrder = 6
+ end
+ object chkNotBOL: TCheckBox
+ Left = 140
+ Top = 98
+ Width = 97
+ Height = 17
+ Caption = 'Not &BOL'
+ TabOrder = 7
+ end
+ object chkNotEOL: TCheckBox
+ Left = 256
+ Top = 29
+ Width = 97
+ Height = 17
+ Caption = 'Not EO&L'
+ TabOrder = 8
+ end
+ object chkUnGreedy: TCheckBox
+ Left = 256
+ Top = 52
+ Width = 97
+ Height = 17
+ Caption = '&Ungreedy'
+ Checked = True
+ State = cbChecked
+ TabOrder = 9
+ end
+ object chkNotEmpty: TCheckBox
+ Left = 256
+ Top = 75
+ Width = 97
+ Height = 17
+ Caption = 'Not Em&pty'
+ Checked = True
+ State = cbChecked
+ TabOrder = 10
+ end
+ object chkUTF8: TCheckBox
+ Left = 256
+ Top = 98
+ Width = 97
+ Height = 17
+ Caption = 'UTF&8'
+ TabOrder = 11
+ end
+ end
+ object GroupBoxCompileOptions: TGroupBox
+ Left = 8
+ Top = 265
+ Width = 356
+ Height = 50
+ Caption = 'Compile options:'
+ TabOrder = 7
+ object chkStudy: TCheckBox
+ Left = 26
+ Top = 24
+ Width = 97
+ Height = 17
+ Caption = '&Study'
+ TabOrder = 0
+ end
+ object chkUserLocale: TCheckBox
+ Left = 140
+ Top = 24
+ Width = 97
+ Height = 17
+ Caption = 'Use&r locale'
+ TabOrder = 1
+ end
+ object chkJITCompile: TCheckBox
+ Left = 256
+ Top = 24
+ Width = 97
+ Height = 17
+ Caption = '&JIT Compile'
+ TabOrder = 2
+ end
+ end
object alMain: TActionList
Left = 144
Top = 102
Modified: trunk/jcl/examples/common/pcre/PCREDemoMain.pas
===================================================================
--- trunk/jcl/examples/common/pcre/PCREDemoMain.pas 2012-01-17 15:33:46 UTC (rev 3689)
+++ trunk/jcl/examples/common/pcre/PCREDemoMain.pas 2012-01-17 16:02:46 UTC (rev 3690)
@@ -20,6 +20,8 @@
acFindNext: TAction;
acOpen: TAction;
odOpen: TOpenDialog;
+ sbMain: TStatusBar;
+ GroupBoxMatchOptions: TGroupBox;
chkIgnoreCase: TCheckBox;
chkMultiLine: TCheckBox;
chkDotAll: TCheckBox;
@@ -32,7 +34,10 @@
chkUnGreedy: TCheckBox;
chkNotEmpty: TCheckBox;
chkUTF8: TCheckBox;
- sbMain: TStatusBar;
+ GroupBoxCompileOptions: TGroupBox;
+ chkStudy: TCheckBox;
+ chkUserLocale: TCheckBox;
+ chkJITCompile: TCheckBox;
procedure acOpenExecute(Sender: TObject);
procedure acFindExecute(Sender: TObject);
procedure acFindNextExecute(Sender: TObject);
@@ -75,7 +80,7 @@
FreeAndNil(RE);
RE := TJclAnsiRegEx.Create;
RE.Options := GetUIOptions;
- RE.Compile(edRegExpr.Text, false, false);
+ RE.Compile(edRegExpr.Text, chkStudy.Checked, chkUserLocale.Checked, chkJITCompile.Checked);
FMatchIndex := 1;
Match;
end;
Modified: trunk/jcl/source/common/JclPCRE.pas
===================================================================
--- trunk/jcl/source/common/JclPCRE.pas 2012-01-17 15:33:46 UTC (rev 3689)
+++ trunk/jcl/source/common/JclPCRE.pas 2012-01-17 16:02:46 UTC (rev 3690)
@@ -79,10 +79,10 @@
TJclRegExOption = (roIgnoreCase, roMultiLine, roDotAll, roExtended,
roAnchored, roDollarEndOnly, roExtra, roNotBOL, roNotEOL, roUnGreedy,
roNotEmpty, roUTF8, roNoAutoCapture, roNoUTF8Check, roAutoCallout,
- roPartial, roDfaShortest, roDfaRestart, roDfaFirstLine, roDupNames,
+ roPartial, roDfaShortest, roDfaRestart, roFirstLine, roDupNames,
roNewLineCR, roNewLineLF, roNewLineCRLF, roNewLineAny, roBSRAnyCRLF,
roBSRUnicode, roJavascriptCompat, roNoStartOptimize, roPartialHard,
- roNotEmptyAtStart);
+ roNotEmptyAtStart, roUCP);
TJclRegExOptions = set of TJclRegExOption;
TJclCaptureRange = record
FirstPos: Integer;
@@ -125,7 +125,7 @@
procedure SetNamedCapture(const Name, Value: string);
function GetCaptureNameCount: Integer;
function GetCaptureName(Index: Integer): string;
- function GetAPIOptions(RunTime: Boolean): Integer;
+ function GetAPIOptions(RunTime, DFA: Boolean): Integer;
function CalloutHandler(var CalloutBlock: pcre_callout_block): Integer;
public
@@ -133,7 +133,7 @@
property Options: TJclRegExOptions read FOptions write FOptions;
function Compile(const Pattern: string; Study: Boolean;
- UserLocale: Boolean = False): Boolean;
+ UserLocale: Boolean = False; JITCompile: Boolean = False): Boolean;
property Pattern: string read FPattern;
property DfaMode: Boolean read FDfaMode write FDfaMode;
function Match(const Subject: string; StartOffset: Cardinal = 1): Boolean;
@@ -313,6 +313,14 @@
PErr := @RsErrNullWsLimit;
PCRE_ERROR_BADNEWLINE:
PErr := @RsErrBadNewLine;
+ PCRE_ERROR_BADOFFSET:
+ PErr := @RsErrBadOffset;
+ PCRE_ERROR_SHORTUTF8:
+ PErr := @RsErrShortUTF8;
+ PCRE_ERROR_RECURSELOOP:
+ PErr := @RsErrRecurseLoop;
+ PCRE_ERROR_JITSTACKLIMIT:
+ PErr := @RsErrJITStackLimit;
JCL_PCRE_ERROR_STUDYFAILED:
PErr := @RsErrStudyFailed;
JCL_PCRE_ERROR_CALLOUTERROR:
@@ -331,7 +339,7 @@
if Assigned(FCode) then
CallPCREFree(FCode);
if Assigned(FExtra) then
- CallPCREFree(FExtra);
+ pcre_free_study(FExtra);
if Assigned(FVector) then
FreeMem(FVector);
if Assigned(FChangedCaptures) then
@@ -340,11 +348,11 @@
inherited Destroy;
end;
-function TJclRegEx.Compile(const Pattern: string; Study: Boolean;
- UserLocale: Boolean = False): Boolean;
+function TJclRegEx.Compile(const Pattern: string; Study, UserLocale, JITCompile: Boolean): Boolean;
var
ErrMsgPtr: PAnsiChar;
Tables: PAnsiChar;
+ StudyOptions, ConfigJIT: Integer;
begin
if UserLocale then
begin
@@ -363,7 +371,7 @@
CallPCREFree(FCode);
FCode := nil;
end;
- FCode := pcre_compile2(PAnsiChar(EncodeString(FPattern, roUTF8 in Options)), GetAPIOptions(False),
+ FCode := pcre_compile2(PAnsiChar(EncodeString(FPattern, roUTF8 in Options)), GetAPIOptions(False, DfaMode),
@FErrorCode, @ErrMsgPtr, @FErrorOffset, Tables);
Inc(FErrorOffset);
FErrorMessage := string(AnsiString(ErrMsgPtr));
@@ -372,8 +380,18 @@
begin
if Study then
begin
- if Assigned(FExtra) then CallPCREFree(FExtra);
- FExtra := pcre_study(FCode, 0, @ErrMsgPtr);
+ if Assigned(FExtra) then
+ pcre_free_study(FExtra);
+ if JITCompile then
+ begin
+ PCRECheck(pcre_config(PCRE_CONFIG_JIT, @ConfigJIT));
+ if ConfigJIT = 0 then
+ raise EPCREError.CreateRes(@RsErrNoJITSupport, 0);
+ StudyOptions := PCRE_STUDY_JIT_COMPILE;
+ end
+ else
+ StudyOptions := 0;
+ FExtra := pcre_study(FCode, StudyOptions, @ErrMsgPtr);
Result := Assigned(FExtra) or (not Assigned(ErrMsgPtr));
if not Result then
begin
@@ -393,38 +411,52 @@
end;
end;
-function TJclRegEx.GetAPIOptions(RunTime: Boolean): Integer;
+function TJclRegEx.GetAPIOptions(RunTime, DFA: Boolean): Integer;
const
{ roIgnoreCase, roMultiLine, roDotAll, roExtended,
roAnchored, roDollarEndOnly, roExtra, roNotBOL, roNotEOL, roUnGreedy,
roNotEmpty, roUTF8, roNoAutoCapture, roNoUTF8Check, roAutoCallout,
- roPartial, roDfaShortest, roDfaRestart, roDfaFirstLine, roDupNames,
+ roPartial, roDfaShortest, roDfaRestart, roFirstLine, roDupNames,
roNewLineCR, roNewLineLF, roNewLineCRLF, roNewLineAny, roBSRAnyCRLF,
roBSRUnicode, roJavascriptCompat, roNoStartOptimize, roPartialHard,
- roNotEmptyAtStart }
+ roNotEmptyAtStart, roUCP }
cDesignOptions: array [TJclRegExOption] of Integer =
(PCRE_CASELESS, PCRE_MULTILINE, PCRE_DOTALL, PCRE_EXTENDED, PCRE_ANCHORED,
PCRE_DOLLAR_ENDONLY, PCRE_EXTRA, 0, 0, PCRE_UNGREEDY, 0, PCRE_UTF8,
- PCRE_NO_AUTO_CAPTURE, PCRE_NO_UTF8_CHECK, PCRE_AUTO_CALLOUT, 0, 0, 0, 0,
- PCRE_DUPNAMES, PCRE_NEWLINE_CR, PCRE_NEWLINE_LF, PCRE_NEWLINE_CRLF,
+ PCRE_NO_AUTO_CAPTURE, PCRE_NO_UTF8_CHECK, PCRE_AUTO_CALLOUT, 0, 0, 0,
+ PCRE_FIRSTLINE, PCRE_DUPNAMES, PCRE_NEWLINE_CR, PCRE_NEWLINE_LF,
+ PCRE_NEWLINE_CRLF, PCRE_NEWLINE_ANY, PCRE_BSR_ANYCRLF, PCRE_BSR_UNICODE,
+ PCRE_JAVASCRIPT_COMPAT, PCRE_NO_START_OPTIMIZE, 0, 0, PCRE_UCP);
+ cRunOptions: array [TJclRegExOption] of Integer =
+ (0, 0, 0, 0, PCRE_ANCHORED, PCRE_DOLLAR_ENDONLY, 0, PCRE_NOTBOL, PCRE_NOTEOL,
+ 0, PCRE_NOTEMPTY, PCRE_UTF8, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL, 0, 0,
+ PCRE_FIRSTLINE, 0, PCRE_NEWLINE_CR, PCRE_NEWLINE_LF, PCRE_NEWLINE_CRLF,
PCRE_NEWLINE_ANY, PCRE_BSR_ANYCRLF, PCRE_BSR_UNICODE,
PCRE_JAVASCRIPT_COMPAT, PCRE_NO_START_OPTIMIZE, PCRE_PARTIAL_HARD,
- PCRE_NOTEMPTY_ATSTART);
- cRunOptions: array [TJclRegExOption] of Integer =
- (0, 0, 0, 0, 0, 0, 0, PCRE_NOTBOL, PCRE_NOTEOL, 0, PCRE_NOTEMPTY, 0, 0,
- PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL, 0, 0, 0, 0, PCRE_NEWLINE_CR,
- PCRE_NEWLINE_LF, PCRE_NEWLINE_CRLF, PCRE_NEWLINE_ANY, PCRE_BSR_ANYCRLF,
- PCRE_BSR_UNICODE, PCRE_JAVASCRIPT_COMPAT, PCRE_NO_START_OPTIMIZE,
- PCRE_PARTIAL_HARD, PCRE_NOTEMPTY_ATSTART);
+ PCRE_NOTEMPTY_ATSTART, PCRE_UCP);
+ cDFARunOptions: array [TJclRegExOption] of Integer =
+ (0, 0, 0, 0, PCRE_ANCHORED, PCRE_DOLLAR_ENDONLY, 0, PCRE_NOTBOL, PCRE_NOTEOL,
+ 0, PCRE_NOTEMPTY, PCRE_UTF8, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL,
+ PCRE_DFA_SHORTEST, PCRE_DFA_RESTART, PCRE_FIRSTLINE, 0, PCRE_NEWLINE_CR,
+ PCRE_NEWLINE_LF, PCRE_NEWLINE_CRLF, PCRE_NEWLINE_ANY, PCRE_BSR_ANYCRLF,
+ PCRE_BSR_UNICODE, 0, PCRE_NO_START_OPTIMIZE, PCRE_PARTIAL_HARD,
+ PCRE_NOTEMPTY_ATSTART, PCRE_UCP);
var
I: TJclRegExOption;
- SUPPORT_UTF8: Integer;
+ ConfigUTF8: Integer;
begin
- PCRECheck(pcre_config(PCRE_CONFIG_UTF8, @SUPPORT_UTF8));
- if (roUTF8 in Options) and (SUPPORT_UTF8 = 0) then
+ PCRECheck(pcre_config(PCRE_CONFIG_UTF8, @ConfigUTF8));
+ if (roUTF8 in Options) and (ConfigUTF8 = 0) then
raise EPCREError.CreateRes(@RsErrNoUTF8Support, 0);
Result := 0;
+ if RunTime and DFA then
+ begin
+ for I := Low(TJclRegExOption) to High(TJclRegExOption) do
+ if I in Options then
+ Result := Result or cDFARunOptions[I];
+ end
+ else
if RunTime then
begin
for I := Low(TJclRegExOption) to High(TJclRegExOption) do
@@ -620,12 +652,12 @@
if FDfaMode then
begin
ExecRslt := pcre_dfa_exec(FCode, Extra, PAnsiChar(EncodedSubject), Length(EncodedSubject),
- StartOffset - 1, GetAPIOptions(True), PInteger(FVector), FVectorSize, @Workspace, 20);
+ StartOffset - 1, GetAPIOptions(True, DfaMode), PInteger(FVector), FVectorSize, @Workspace, 20);
end
else
begin
ExecRslt := pcre_exec(FCode, Extra, PAnsiChar(EncodedSubject), Length(EncodedSubject),
- StartOffset - 1, GetAPIOptions(True), PInteger(FVector), FVectorSize);
+ StartOffset - 1, GetAPIOptions(True, DfaMode), PInteger(FVector), FVectorSize);
end;
Result := ExecRslt >= 0;
if Result then
Modified: trunk/jcl/source/common/JclResources.pas
===================================================================
--- trunk/jcl/source/common/JclResources.pas 2012-01-17 15:33:46 UTC (rev 3689)
+++ trunk/jcl/source/common/JclResources.pas 2012-01-17 16:02:46 UTC (rev 3690)
@@ -1464,12 +1464,17 @@
RsErrRecursionLimit = 'Recursion limit';
RsErrNullWsLimit = 'Null WS limit';
RsErrBadNewLine = 'Bad new line';
+ RsErrBadOffset = 'Bad offset';
+ RsErrShortUTF8 = 'Short UTF8';
+ RsErrRecurseLoop = 'Recurse loop';
+ RsErrJITStackLimit = 'JIT stack limit';
RsErrLibNotLoaded = 'PCRE library not loaded';
RsErrMemFuncNotSet = 'PCRE memory management functions not set';
- RsErrStudyFailed = 'Study failed';
+ RsErrStudyFailed = 'Study failed';
RsErrCalloutError = 'Unhandled exception in callout';
RsErrUnknownError = 'Unknown error';
RsErrNoUTF8Support = 'No UTF8 support in this version of PCRE';
+ RsErrNoJITSupport = 'No JIT support in this version of PCRE';
//=== JclPeImage =============================================================
resourcestring
Modified: trunk/jcl/source/common/pcre.pas
===================================================================
--- trunk/jcl/source/common/pcre.pas 2012-01-17 15:33:46 UTC (rev 3689)
+++ trunk/jcl/source/common/pcre.pas 2012-01-17 16:02:46 UTC (rev 3690)
@@ -150,6 +150,8 @@
{$EXTERNALSYM PCRE_PARTIAL_HARD}
PCRE_NOTEMPTY_ATSTART = $10000000;
{$EXTERNALSYM PCRE_NOTEMPTY_ATSTART}
+ PCRE_UCP = $20000000;
+ {$EXTERNALSYM PCRE_UCP}
(* Exec-time and get-time error codes *)
@@ -199,7 +201,40 @@
{$EXTERNALSYM PCRE_ERROR_NULLWSLIMIT}
PCRE_ERROR_BADNEWLINE = -23;
{$EXTERNALSYM PCRE_ERROR_BADNEWLINE}
+ PCRE_ERROR_BADOFFSET = -24;
+ {$EXTERNALSYM PCRE_ERROR_BADOFFSET}
+ PCRE_ERROR_SHORTUTF8 = -25;
+ {$EXTERNALSYM PCRE_ERROR_SHORTUTF8}
+ PCRE_ERROR_RECURSELOOP = -26;
+ {$EXTERNALSYM PCRE_ERROR_RECURSELOOP}
+ PCRE_ERROR_JITSTACKLIMIT = -27;
+ {$EXTERNALSYM PCRE_ERROR_JITSTACKLIMIT}
+ (* Specific error codes for UTF-8 validity checks *)
+
+ PCRE_UTF8_ERR0 = 0;
+ PCRE_UTF8_ERR1 = 1;
+ PCRE_UTF8_ERR2 = 2;
+ PCRE_UTF8_ERR3 = 3;
+ PCRE_UTF8_ERR4 = 4;
+ PCRE_UTF8_ERR5 = 5;
+ PCRE_UTF8_ERR6 = 6;
+ PCRE_UTF8_ERR7 = 7;
+ PCRE_UTF8_ERR8 = 8;
+ PCRE_UTF8_ERR9 = 9;
+ PCRE_UTF8_ERR10 = 10;
+ PCRE_UTF8_ERR11 = 11;
+ PCRE_UTF8_ERR12 = 12;
+ PCRE_UTF8_ERR13 = 13;
+ PCRE_UTF8_ERR14 = 14;
+ PCRE_UTF8_ERR15 = 15;
+ PCRE_UTF8_ERR16 = 16;
+ PCRE_UTF8_ERR17 = 17;
+ PCRE_UTF8_ERR18 = 18;
+ PCRE_UTF8_ERR19 = 19;
+ PCRE_UTF8_ERR20 = 20;
+ PCRE_UTF8_ERR21 = 21;
+
(* Request types for pcre_fullinfo() *)
PCRE_INFO_OPTIONS = 0;
@@ -234,6 +269,10 @@
{$EXTERNALSYM PCRE_INFO_HASCRORLF}
PCRE_INFO_MINLENGTH = 15;
{$EXTERNALSYM PCRE_INFO_MINLENGTH}
+ PCRE_INFO_JIT = 16;
+ {$EXTERNALSYM PCRE_INFO_JIT}
+ PCRE_INFO_JITSIZE = 17;
+ {$EXTERNALSYM PCRE_INFO_JITSIZE}
(* Request types for pcre_config() *)
PCRE_CONFIG_UTF8 = 0;
@@ -254,7 +293,13 @@
{$EXTERNALSYM PCRE_CONFIG_MATCH_LIMIT_RECURSION}
PCRE_CONFIG_BSR = 8;
{$EXTERNALSYM PCRE_CONFIG_BSR}
+ PCRE_CONFIG_JIT = 9;
+ {$EXTERNALSYM PCRE_CONFIG_JIT}
+ (* Request types for pcre_study() *)
+
+ PCRE_STUDY_JIT_COMPILE = $0001;
+
(* Bit flags for the pcre_extra structure *)
PCRE_EXTRA_STUDY_DATA = $0001;
@@ -267,6 +312,10 @@
{$EXTERNALSYM PCRE_EXTRA_TABLES}
PCRE_EXTRA_MATCH_LIMIT_RECURSION = $0010;
{$EXTERNALSYM PCRE_EXTRA_MATCH_LIMIT_RECURSION}
+ PCRE_EXTRA_MARK = $0020;
+ {$EXTERNALSYM PCRE_EXTRA_MARK}
+ PCRE_EXTRA_EXECUTABLE_JIT = $0040;
+ {$EXTERNALSYM PCRE_EXTRA_EXECUTABLE_JIT}
type
real_pcre = packed record
@@ -283,15 +332,20 @@
TPCRE = real_pcre;
PPCRE = ^TPCRE;
+ real_pcre_jit_stack = packed record
+ end;
+ TPCREJITStack = real_pcre_jit_stack;
+ PPCREJITStack = ^TPCREJITStack;
+
real_pcre_extra = packed record
- {options: PAnsiChar;
- start_bits: array [0..31] of AnsiChar;}
flags: Cardinal; (* Bits for which fields are set *)
study_data: Pointer; (* Opaque data from pcre_study() *)
match_limit: Cardinal; (* Maximum number of calls to match() *)
callout_data: Pointer; (* Data passed back in callouts *)
tables: PAnsiChar; (* Pointer to character tables *)
match_limit_recursion: Cardinal; (* Max recursive calls to match() *)
+ mark: PPAnsiChar; (* For passing back a mark pointer *)
+ executable_jit: Pointer; (* Contains a pointer to a compiled jit code *)
end;
TPCREExtra = real_pcre_extra;
PPCREExtra = ^TPCREExtra;
@@ -311,6 +365,8 @@
(* ------------------- Added for Version 1 -------------------------- *)
pattern_position: Integer; (* Offset to next item in the pattern *)
next_item_length: Integer; (* Length of next item in the pattern *)
+ (* ------------------- Added for Version 2 -------------------------- *)
+ Mark: PCardinal; (* Pointer to current mark or NULL *)
(* ------------------------------------------------------------------ *)
end;
@@ -324,6 +380,8 @@
{$EXTERNALSYM pcre_stack_free_callback}
pcre_callout_callback = function(var callout_block: pcre_callout_block): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
{$EXTERNALSYM pcre_callout_callback}
+ pcre_jit_callback = function (P: Pointer): PPCREJITStack; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+ {$EXTERNALSYM pcre_jit_callback}
var
// renamed from "pcre_X" to "pcre_X_func" to allow functions with name "pcre_X" to be
@@ -459,8 +517,17 @@
function pcre_study(const code: PPCRE; options: Integer; const errptr: PPAnsiChar): PPCREExtra;
{$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
{$EXTERNALSYM pcre_study}
+procedure pcre_free_study(const extra: PPCREExtra);
+ {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre_free_study}
function pcre_version: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
{$EXTERNALSYM pcre_version}
+function pcre_jit_stack_alloc(startsize, maxsize: Integer): PPCREJITStack; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre_jit_stack_alloc}
+procedure pcre_jit_stack_free(stack: PPCREJITStack); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre_jit_stack_free}
+procedure pcre_assign_jit_stack(extra: PPCREExtra; callback: pcre_jit_callback; userdata: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre_assign_jit_stack}
{$ELSE PCRE_LINKONREQUEST}
@@ -534,8 +601,20 @@
pcre_study_func = function(const code: PPCRE; options: Integer; const errptr: PPAnsiChar): PPCREExtra;
{$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
{$EXTERNALSYM pcre_study_func}
+ pcre_free_study_func = procedure (const extra: PPCREExtra);
+ {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+ {$EXTERNALSYM pcre_free_study_func}
pcre_version_func = function: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
{$EXTERNALSYM pcre_version_func}
+ pcre_jit_stack_alloc_func = function (startsize, maxsize: Integer): PPCREJITStack;
+ {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+ {$EXTERNALSYM pcre_jit_stack_alloc_func}
+ pcre_jit_stack_free_func = procedure (stack: PPCREJITStack);
+ {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+ {$EXTERNALSYM pcre_jit_stack_free_func}
+ pcre_assign_jit_stack_func = procedure (extra: PPCREExtra; callback: pcre_jit_callback; userdata: Pointer);
+ {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+ {$EXTERNALSYM pcre_assign_jit_stack_func}
var
pcre_compile: pcre_compile_func = nil;
@@ -576,8 +655,16 @@
{$EXTERNALSYM pcre_refcount}
pcre_study: pcre_study_func = nil;
{$EXTERNALSYM pcre_study}
+ pcre_free_study: pcre_free_study_func = nil;
+ {$EXTERNALSYM pcre_free_study}
pcre_version: pcre_version_func = nil;
{$EXTERNALSYM pcre_version}
+ pcre_jit_stack_alloc: pcre_jit_stack_alloc_func = nil;
+ {$EXTERNALSYM pcre_jit_stack_alloc}
+ pcre_jit_stack_free: pcre_jit_stack_free_func = nil;
+ {$EXTERNALSYM pcre_jit_stack_free}
+ pcre_assign_jit_stack: pcre_assign_jit_stack_func = nil;
+ {$EXTERNALSYM pcre_assign_jit_stack}
{$ENDIF PCRE_LINKONREQUEST}
@@ -621,6 +708,9 @@
// make the linker happy with PCRE 8.00
procedure _pcre_find_bracket; external;
+// make the linker happy with PCRE 8.21
+procedure _pcre_jit_compile; external;
+procedure _pcre_jit_free; external;
{$IFDEF CPU32}
{$LINK ..\windows\obj\pcre\win32\pcre_compile.obj}
@@ -630,6 +720,7 @@
{$LINK ..\windows\obj\pcre\win32\pcre_fullinfo.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_get.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_info.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_jit_compile.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_maketables.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_newline.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_ord2utf8.obj}
@@ -651,6 +742,7 @@
{$LINK ..\windows\obj\pcre\win64\pcre_fullinfo.obj}
{$LINK ..\windows\obj\pcre\win64\pcre_get.obj}
{$LINK ..\windows\obj\pcre\win64\pcre_info.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_jit_compile.obj}
{$LINK ..\windows\obj\pcre\win64\pcre_maketables.obj}
{$LINK ..\windows\obj\pcre\win64\pcre_newline.obj}
{$LINK ..\windows\obj\pcre\win64\pcre_ord2utf8.obj}
@@ -692,7 +784,11 @@
function pcre_maketables; external;
function pcre_refcount; external;
function pcre_study; external;
+procedure pcre_free_study; external;
function pcre_version; external;
+function pcre_jit_stack_alloc; external;
+procedure pcre_jit_stack_free; external;
+procedure pcre_assign_jit_stack; external;
procedure __llmul;
asm
@@ -705,6 +801,8 @@
const
szMSVCRT = 'MSVCRT.DLL';
+function malloc(size: size_t): Pointer; cdecl; external szMSVCRT name 'malloc';
+
{$IFDEF CPU32}
function _memcpy(dest, src: Pointer; count: size_t): Pointer; cdecl; external szMSVCRT name 'memcpy';
function _memmove(dest, src: Pointer; count: size_t): Pointer; cdecl; external szMSVCRT name 'memmove';
@@ -726,6 +824,11 @@
function _isupper(__ch: Integer): Integer; cdecl; external szMSVCRT name 'isupper';
function _isxdigit(__ch: Integer): Integer; cdecl; external szMSVCRT name 'isxdigit';
function _strchr(__s: PAnsiChar; __c: Integer): PAnsiChar; cdecl; external szMSVCRT name 'strchr';
+
+function ___alloca_helper(size: size_t): Pointer; cdecl;
+begin
+ Result := malloc(size);
+end;
{$ENDIF CPU32}
{$IFDEF CPU64}
function memcpy(dest, src: Pointer; count: size_t): Pointer; external szMSVCRT name 'memcpy';
@@ -749,10 +852,13 @@
function isupper(__ch: Integer): Integer; external szMSVCRT name 'isupper';
function isxdigit(__ch: Integer): Integer; external szMSVCRT name 'isxdigit';
function strchr(__s: PAnsiChar; __c: Integer): PAnsiChar; external szMSVCRT name 'strchr';
+
+function __chkstk(size: size_t): Pointer;
+begin
+ Result := malloc(size);
+end;
{$ENDIF CPU64}
-function malloc(size: size_t): Pointer; cdecl; external szMSVCRT name 'malloc';
-
function pcre_malloc_jcl(Size: SizeInt): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
begin
if Assigned(pcre_malloc_user) then
@@ -858,7 +964,11 @@
PCREMakeTablesExportName = 'pcre_maketables';
PCRERefCountExportName = 'pcre_refcount';
PCREStudyExportName = 'pcre_study';
+ PCREFreeStudyExportName = 'pcre_free_study';
PCREVersionExportName = 'pcre_version';
+ PCREJITStackAllocExportName = 'pcre_jit_stack_alloc';
+ PCREJITStackFreeExportName = 'pcre_jit_stack_free';
+ PCREAssignJITStackExportName = 'pcre_assign_jit_stack';
PCREMallocExportName = 'pcre_malloc';
PCREFreeExportName = 'pcre_free';
PCREStackMallocExportName = 'pcre_stack_malloc';
@@ -1108,7 +1218,11 @@
@pcre_maketables := Value;
@pcre_refcount := Value;
@pcre_study := Value;
+ @pcre_free_study := Value;
@pcre_version := Value;
+ @pcre_jit_stack_alloc := Value;
+ @pcre_jit_stack_free := Value;
+ @pcre_assign_jit_stack := Value;
{$ENDIF PCRE_LINKONREQUEST}
pcre_malloc_func := nil;
pcre_free_func := nil;
@@ -1178,7 +1292,11 @@
@pcre_maketables := GetSymbol(PCREMakeTablesExportName);
@pcre_refcount := GetSymbol(PCRERefCountExportName);
@pcre_study := GetSymbol(PCREStudyExportName);
+ @pcre_free_study := GetSymbol(PCREFreeStudyExportName);
@pcre_version := GetSymbol(PCREVersionExportName);
+ @pcre_jit_stack_alloc := GetSymbol(PCREJITStackAllocExportName);
+ @pcre_jit_stack_free := GetSymbol(PCREJITStackFreeExportName);
+ @pcre_assign_jit_stack := GetSymbol(PCREAssignJITStackExportName);
{$ENDIF PCRE_LINKONREQUEST}
pcre_malloc_func := GetSymbol(PCREMallocExportName);
pcre_free_func := GetSymbol(PCREFreeExportName);
@@ -1226,7 +1344,11 @@
function pcre_maketables; external libpcremodulename name PCREMakeTablesExportName;
function pcre_refcount; external libpcremodulename name PCRERefCountExportName;
function pcre_study; external libpcremodulename name PCREStudyExportName;
+procedure pcre_free_study; external libpcremodulename name PCREFreeStudyExportName;
function pcre_version; external libpcremodulename name PCREVersionExportName;
+function pcre_jit_stack_alloc; external libpcremodulename name PCREJITStackAllocExportName;
+procedure pcre_jit_stack_free; external libpcremodulename name PCREJITStackFreeExportName;
+procedure pcre_assign_jit_stack; external libpcremodulename name PCREAssignJITStackExportName;
{$ENDIF PCRE_LINKDLL}
{$IFDEF UNITVERSIONING}
Modified: trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win32/makefile.mak 2012-01-17 15:33:46 UTC (rev 3689)
+++ trunk/jcl/source/windows/obj/pcre/win32/makefile.mak 2012-01-17 16:02:46 UTC (rev 3690)
@@ -2,7 +2,7 @@
# makefile to make pcre .obj files using Borland's C++ compiler bcc32
# derived from a makefile generated by BCB6' bpr2mak
#
-# if pcre source directory is different from ..\..\..\..\..\..\thirdparty\pcre\pcre-8.02, use
+# if pcre source directory is different from ..\..\..\..\..\..\thirdparty\pcre\pcre-8.21, use
# "make -Dpcresrc=<path to pcre sources>" to tell make where to find the
# source files
#
@@ -42,7 +42,7 @@
BCC = $(BCB)
!if !$d(pcresrc)
-pcresrc = ..\..\..\..\..\..\thirdparty\pcre\pcre-8.02
+pcresrc = ..\..\..\..\..\..\thirdparty\pcre\pcre-8.21
!endif
!if !$d(CPU)
@@ -61,15 +61,16 @@
# ---------------------------------------------------------------------------
OBJFILES = .\pcre_compile.obj .\pcre_config.obj .\pcre_dfa_exec.obj \
.\pcre_exec.obj .\pcre_fullinfo.obj .\pcre_get.obj \
- .\pcre_info.obj .\pcre_maketables.obj .\pcre_newline.obj \
- .\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj .\pcre_tables.obj \
- .\pcre_try_flipped.obj .\pcre_ucd.obj .\pcre_valid_utf8.obj \
- .\pcre_version.obj .\pcre_xclass.obj .\pcre_default_tables.obj
+ .\pcre_info.obj .\pcre_jit_compile.obj .\pcre_maketables.obj \
+ .\pcre_newline.obj .\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj \
+ .\pcre_tables.obj .\pcre_try_flipped.obj .\pcre_ucd.obj \
+ .\pcre_valid_utf8.obj .\pcre_version.obj .\pcre_xclass.obj \
+ .\pcre_default_tables.obj
# ---------------------------------------------------------------------------
DEBUGLIBPATH = $(BCB)\lib\debug
RELEASELIBPATH = $(BCB)\lib\release
-USERDEFINES = SUPPORT_UTF8;SUPPORT_UCP
+USERDEFINES = SUPPORT_UTF8;SUPPORT_UCP;SUPPORT_JIT
SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
INCLUDEPATH = $(pcresrc);$(BCC)\include;$(BCB)\include\vcl
LIBPATH = $(BCB)\lib\obj;$(BCB)\lib
@@ -78,6 +79,8 @@
PATHC = .;$(pcresrc)
# PATHOBJ = .;$(LIBPATH)
ALLLIB = import32.lib cw32i.lib
+INCLUDES = $(pcresrc)\pcre.h $(pcresrc)\config.h
+TABLES = pcre_default_tables.c
# ---------------------------------------------------------------------------
CFLAG1 = -O2 -Ve -X- -a8 -$(CPU) -b -d -k- -vi -tWM- -DHAVE_CONFIG_H
@@ -106,22 +109,24 @@
!endif
# ---------------------------------------------------------------------------
-pcre: includes tables $(OBJFILES)
+pcre: $(INCLUDES) $(TABLES) $(OBJFILES)
# ---------------------------------------------------------------------------
.c.obj:
$(BCC)\BIN\$(BCC32) -c $(CFLAG1) $(CallingConvention) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }
-includes:
- copy /Y $(pcresrc)\pcre.h.generic $(pcresrc)\pcre.h
- copy /Y $(pcresrc)\config.h.generic $(pcresrc)\config.h
+$(pcresrc)\pcre.h: $(pcresrc)\pcre.h.generic
+ copy /Y $? $@
-tables:
- $(BCC)\BIN\$(BCC32) -c -tWC $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n.\ $(pcresrc)\dftables.c
+$(pcresrc)\config.h: $(pcresrc)\config.h.generic
+ copy /Y $? $@
+
+pcre_default_tables.c: $(pcresrc)\dftables.c
+ $(BCC)\BIN\$(BCC32) -c -tWC $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n.\ $?
$(BCC)\BIN\$(LINKER) $(LFLAGS) -L$(LIBPATH) c0x32.obj .\dftables.obj, .\dftables.exe,, $(ALLLIB),,
del dftables.tds
del dftables.obj
- dftables.exe pcre_default_tables.c
+ dftables.exe $@
del dftables.exe
# ---------------------------------------------------------------------------
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_compile.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_config.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_default_tables.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_dfa_exec.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_exec.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_fullinfo.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_get.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_info.obj
===================================================================
(Binary files differ)
Added: trunk/jcl/source/windows/obj/pcre/win32/pcre_jit_compile.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win32/pcre_jit_compile.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_maketables.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_newline.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_ord2utf8.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_refcount.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_study.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_tables.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_try_flipped.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_ucd.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_valid_utf8.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_version.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_xclass.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win64/makefile.mak 2012-01-17 15:33:46 UTC (rev 3689)
+++ trunk/jcl/source/windows/obj/pcre/win64/makefile.mak 2012-01-17 16:02:46 UTC (rev 3690)
@@ -1,8 +1,8 @@
#
# makefile to make pcre .obj files using Microsoft C++ compiler (cl.exe)
#
-# if pcre source directory is different from ..\..\..\..\..\..\thirdparty\pcre\pcre-8.02, use
-# "make -Dpcresrc=<path to pcre sources>" to tell make where to find the
+# if pcre source directory is different from ..\..\..\..\..\..\thirdparty\pcre\pcre-8.21, use
+# "make -Dpcresrc=<path to pcre sources>" to tell make where to find the
# source files
#
# Make.exe needs to reside in the same directory as bcc32.exe.
@@ -26,24 +26,27 @@
BCC = $(BCB)
!if !$d(pcresrc)
-pcresrc = ..\..\..\..\..\..\thirdparty\pcre\pcre-8.02
+pcresrc = ..\..\..\..\..\..\thirdparty\pcre\pcre-8.21
!endif
# ---------------------------------------------------------------------------
OBJFILES = .\pcre_compile.obj .\pcre_config.obj .\pcre_dfa_exec.obj \
.\pcre_exec.obj .\pcre_fullinfo.obj .\pcre_get.obj \
- .\pcre_info.obj .\pcre_maketables.obj .\pcre_newline.obj \
- .\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj .\pcre_tables.obj \
- .\pcre_try_flipped.obj .\pcre_ucd.obj .\pcre_valid_utf8.obj \
- .\pcre_version.obj .\pcre_xclass.obj .\pcre_default_tables.obj
+ .\pcre_info.obj .\pcre_jit_compile.obj .\pcre_maketables.obj \
+ .\pcre_newline.obj .\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj \
+ .\pcre_tables.obj .\pcre_try_flipped.obj .\pcre_ucd.obj \
+ .\pcre_valid_utf8.obj .\pcre_version.obj .\pcre_xclass.obj \
+ .\pcre_default_tables.obj
# ---------------------------------------------------------------------------
-USERDEFINES = SUPPORT_UTF8;SUPPORT_UCP
+USERDEFINES = SUPPORT_UTF8;SUPPORT_UCP;SUPPORT_JIT
SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
INCLUDEPATH = $(pcresrc);$(BCC)\include;$(BCB)\include\vcl
LIBPATH = $(BCB)\lib\obj;$(BCB)\lib
PATHC = .;$(pcresrc)
ALLLIB = import32.lib cw32i.lib
+INCLUDES = $(pcresrc)\pcre.h $(pcresrc)\config.h
+TABLES = pcre_default_tables.c
# ---------------------------------------------------------------------------
CFLAG1 = -O2 -Ve -X- -a8 -5 -b -d -k- -vi -tWM- -DHAVE_CONFIG_H
@@ -72,22 +75,24 @@
!endif
# ---------------------------------------------------------------------------
-pcre: includes tables $(OBJFILES)
+pcre: $(INCLUDES) $(TABLES) $(OBJFILES)
# ---------------------------------------------------------------------------
.c.obj:
- cl -c -nologo -D_KERNEL32_ -GS- -Z7 -wd4068 -I$(pcresrc) -D$(SYSDEFINES) -D$(USERDEFINES) -DHAVE_CONFIG_H -Gs999999 -Fo$@ $<
+ cl -c -nologo -D_KERNEL32_ -GS- -Z7 -wd4068 -I$(pcresrc) -D$(SYSDEFINES) -DSUPPORT_UTF8 -DSUPPORT_UCP -DSUPPORT_JIT -DHAVE_CONFIG_H -Gs999999 -Fo$@ $<
-includes:
- copy /Y $(pcresrc)\pcre.h.generic $(pcresrc)\pcre.h
- copy /Y $(pcresrc)\config.h.generic $(pcresrc)\config.h
+$(pcresrc)\pcre.h: $(pcresrc)\pcre.h.generic
+ copy /Y $? $@
-tables:
- $(BCC)\BIN\$(BCC32) -c -tWC $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(SYSDEFINES) -D$(USERDEFINES) -n.\ $(pcresrc)\dftables.c
+$(pcresrc)\config.h: $(pcresrc)\config.h.generic
+ copy /Y $? $@
+
+pcre_default_tables.c: $(pcresrc)\dftables.c
+ $(BCC)\BIN\$(BCC32) -c -tWC $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n.\ $?
$(BCC)\BIN\$(LINKER) $(LFLAGS) -L$(LIBPATH) c0x32.obj .\dftables.obj, .\dftables.exe,, $(ALLLIB),,
del dftables.tds
del dftables.obj
- dftables.exe pcre_default_tables.c
+ dftables.exe $@
del dftables.exe
# ---------------------------------------------------------------------------
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_compile.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_config.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_default_tables.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_dfa_exec.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_exec.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_fullinfo.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_get.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_info.obj
===================================================================
(Binary files differ)
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_jit_compile.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_jit_compile.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_maketables.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_newline.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_ord2utf8.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_refcount.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_study.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_tables.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_try_flipped.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_ucd.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_valid_utf8.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_version.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_xclass.obj
===================================================================
(Binary files differ)
Property changes on: trunk/thirdparty/pcre/pcre-8.21
___________________________________________________________________
Added: tsvn:projectlanguage
+ 0x0409
Added: bugtraq:url
+ http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
+ (Mantis #%BUGID%)
Added: svn:ignore
+ cmake
pcrecpp.h
Makefile.in
Detrail
pcre_scanner_unittest.cc
pcre_scanner.cc
depcomp
makevp.bat
132html
ltmain.sh
pcregexp.pas
PrepareRelease
pcre-config.in
configure.ac
RunTest
doc
pcre_printint.src
COPYING
NEWS
pcrecpp_internal.h
pcrecpp.cc
pcrecpparg.h.in
CleanTxt
pcre.h.in
ChangeLog
pcre_scanner.h
pcreposix.c
config.h.in
pcreposix.h
makevp_c.txt
HACKING
NON-UNIX-USE
pcre_stringpiece_unittest.cc
testdata
makevp_l.txt
perltest.pl
config-cmake.h.in
pcredemo.c
m4
pcre_stringpiece.h.in
configure
libpcre.pc.in
config.guess
config.sub
INSTALL
libpcreposix.pc.in
pcre_stringpiece.cc
RunTest.bat
pcretest.c
CMakeLists.txt
pcrecpp_unittest.cc
RunGrepTest
pcregrep.c
libpcrecpp.pc.in
pcre_chartables.c.dist
missing
Makefile.am
aclocal.m4
install-sh
pcre.h
config.h
pcre_jit_test.c
CheckMan
Added: bugtraq:logregex
+ [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)
Modified: trunk/thirdparty/pcre/pcre-8.21/AUTHORS
===================================================================
--- trunk/thirdparty/pcre/pcre-8.02/AUTHORS 2012-01-17 15:33:46 UTC (rev 3689)
+++ trunk/thirdparty/pcre/pcre-8.21/AUTHORS 2012-01-17 16:02:46 UTC (rev 3690)
@@ -8,16 +8,38 @@
University of Cambridge Computing Service,
Cambridge, England.
-Copyright (c) 1997-2010 University of Cambridge
+Copyright (c) 1997-2011 University of Cambridge
All rights reserved
+PCRE JUST-IN-TIME COMPILATION SUPPORT
+-------------------------------------
+
+Written by: Zoltan Herczeg
+Email local part: hzmester
+Emain domain: freemail.hu
+
+Copyright(c) 2010-2011 Zoltan Herczeg
+All rights reserved.
+
+
+STACK-LESS JUST-IN-TIME COMPILER
+--------------------------------
+
+Written by: Zoltan Herczeg
+Email local part: hzmester
+Emain domain: freemail.hu
+
+Copyright(c) 2009-2011 Zoltan Herczeg
+All rights reserved.
+
+
THE C++ WRAPPER LIBRARY
-----------------------
Written by: Google Inc.
-Copyright (c) 2007-2010 Google Inc
+Copyright (c) 2007-2011 Google Inc
All rights reserved
####
Modified: trunk/thirdparty/pcre/pcre-8.21/LICENCE
===================================================================
--- trunk/thirdparty/pcre/pcre-8.02/LICENCE 2012-01-17 15:33:46 UTC (rev 3689)
+++ trunk/thirdparty/pcre/pcre-8.21/LICENCE 2012-01-17 16:02:46 UTC (rev 3690)
@@ -9,7 +9,9 @@
directory, is distributed under the same terms as the software itself.
The basic library functions are written in C and are freestanding. Also
-included in the distribution is a set of C++ wrapper functions.
+included in the distribution is a set of C++ wrapper functions, and a
+just-in-time compiler that can be used to optimize pattern matching. These
+are both optional features that can be omitted when the library is built.
THE BASIC LIBRARY FUNCTIONS
@@ -22,16 +24,38 @@
University of Cambridge Computing Service,
Cambridge, England.
-Copyright (c) 1997-2010 University of Cambridge
+Copyright (c) 1997-2011 University of Cambridge
All rights reserved.
+PCRE JUST-IN-TIME COMPILATION SUPPORT
+-------------------------------------
+
+Written by: Zoltan Herczeg
+Email local part: hzmester
+Emain domain: freemail.hu
+
+Copyright(c) 2010-2011 Zoltan Herczeg
+All rights reserved.
+
+
+STACK-LESS JUST-IN-TIME COMPILER
+--------------------------------
+
+Written by: Zoltan Herczeg
+Email local part: hzmester
+Emain domain: freemail.hu
+
+Copyright(c) 2009-2011 Zoltan Herczeg
+All rights reserved.
+
+
THE C++ WRAPPER FUNCTIONS
-------------------------
Contributed by: Google Inc.
-Copyright (c) 2007-2010, Google Inc.
+Copyright (c) 2007-2011, Google Inc.
All rights reserved.
Modified: trunk/thirdparty/pcre/pcre-8.21/README
===================================================================
--- trunk/thirdparty/pcre/pcre-8.02/README 2012-01-17 15:33:46 UTC (rev 3689)
+++ trunk/thirdparty/pcre/pcre-8.21/README 2012-01-17 16:02:46 UTC (rev 3690)
@@ -159,13 +159,30 @@
does not have any features to support this.
There are some optional features that can be included or omitted from the PCRE
-library. You can read more about them in the pcrebuild man page.
+library. They are also documented in the pcrebuild man page.
+. By default, both shared and static libraries are built. You can change this
+ by adding one of these options to the "configure" command:
+
+ --disable-shared
+ --disable-static
+
+ (See also "Shared libraries on Unix-like systems" below.)
+
. If you want to suppress the building of the C++ wrapper library, you can add
--disable-cpp to the "configure" command. Otherwise, when "configure" is run,
it will try to find a C++ compiler and C++ header files, and if it succeeds,
it will try to build the C++ wrapper.
+. If you want to include support for just-in-time compiling, which can give
+ large performance improvements on certain platforms, add --enable-jit to the
+ "configure" command. This support is available only for certain hardware
+ architectures. If you try to enable it on an unsupported architecture, there
+ will be a compile time error.
+
+. When JIT support is enabled, pcregrep automatically makes use of it, unless
+ you add --disable-pcregrep-jit to the "configure" command.
+
. If you want to make use of the support for UTF-8 Unicode character strings in
PCRE, you must add --enable-utf8 to the "configure" command. Without it, the
code for handling UTF-8 is not included in the library. Even when included,
@@ -247,9 +264,10 @@
on the "configure" command. PCRE runs more slowly in this mode, but it may be
necessary in environments with limited stack sizes. This applies only to the
- pcre_exec() function; it does not apply to pcre_dfa_exec(), which does not
- use deeply nested recursion. There is a discussion about stack sizes in the
- pcrestack man page.
+ normal execution of the pcre_exec() function; if JIT support is being
+ successfully used, it is not relevant. Equally, it does not apply to
+ pcre_dfa_exec(), which does not use deeply nested recursion. There is a
+ discussion about stack sizes in the pcrestack man page.
. For speed, PCRE uses four tables for manipulating and identifying characters
whose code point values are less than 256. By default, it uses a set of
@@ -279,6 +297,13 @@
Of course, the relevant libraries must be installed on your system.
+. The default size of internal buffer used by pcregrep can be set by, for
+ example:
+
+ --with-pcregrep-bufsize=50K
+
+ The default value is 20K.
+
. It is possible to compile pcretest so that it links with the libreadline
library, by specifying
@@ -302,14 +327,16 @@
The "configure" script builds the following files for the basic C library:
-. Makefile is the makefile that builds the library
-. config.h contains build-time configuration options for the library
-. pcre.h is the public PCRE header file
-. pcre-config is a script that shows the settings of "configure" options
-. libpcre.pc is data for the pkg-config command
-. libtool is a script that builds shared and/or static libraries
-. RunTest is a script for running tests on the basic C library
-. RunGrepTest is a script for running tests on the pcregrep command
+. Makefile the makefile that builds the library
+. config.h build-time configuration options for the library
+. pcre.h the public PCRE header file
+. pcre-config script that shows the building settings such as CFLAGS
+ that were set for "configure"
+. libpcre.pc ) data for the pkg-config command
+. libpcreposix.pc )
+. libtool script that builds shared and/or static libraries
+. RunTest script for running tests on the basic C library
+. RunGrepTest script for running tests on the pcregrep command
Versions of config.h and pcre.h are distributed in the PCRE tarballs under the
names config.h.generic and pcre.h.generic. These are provided for those who
@@ -318,9 +345,9 @@
If a C++ compiler is found, the following files are also built:
-. libpcrecpp.pc is data for the pkg-config command
-. pcrecpparg.h is a header file for programs that call PCRE via the C++ wrapper
-. pcre_stringpiece.h is the header for the C++ "stringpiece" functions
+. libpcrecpp.pc data for the pkg-config command
+. pcrecpparg.h header file for calling PCRE via the C++ wrapper
+. pcre_stringpiece.h header for the C++ "stringpiece" functions
The "configure" script also creates config.status, which is an executable
script that can be run to recreate the configuration, and config.log, which
@@ -328,11 +355,11 @@
Once "configure" has run, you can run "make". It builds two libraries, called
libpcre and libpcreposix, a test program called pcretest, and the pcregrep
-command. If a C++ compiler was found on your system, "make" also builds the C++
-wrapper library, which is called libpcrecpp, and some test programs called
-pcrecpp_unittest, pcre_scanner_unittest, and pcre_stringpiece_unittest.
-Building the C++ wrapper can be disabled by adding --disable-cpp to the
-"configure" command.
+command. If a C++ compiler was found on your system, and you did not disable it
+with --disable-cpp, "make" also builds the C++ wrapper library, which is called
+libpcrecpp, and some test programs called pcrecpp_unittest,
+pcre_scanner_unittest, and pcre_stringpiece_unittest. If you enabled JIT
+support with --enable-jit, a test program called pcre_jit_test is also built.
The command "make check" runs all the appropriate tests. Details of the PCRE
tests are given below in a separate section of this document.
@@ -353,6 +380,7 @@
Configuration information (lib/pkgconfig):
libpcre.pc
+ libpcreposix.pc
libpcrecpp.pc (if C++ support is enabled)
Header files (include):
@@ -366,6 +394,7 @@
Man pages (share/man/man{1,3}):
pcregrep.1
pcretest.1
+ pcre-config.1
pcre.3
pcre*.3 (lots more pages, all starting "pcre")
@@ -380,9 +409,10 @@
LICENCE
NEWS
README
- pcre.txt (a concatenation of the man(3) pages)
- pcretest.txt the pcretest man page
- pcregrep.txt the pcregrep man page
+ pcre.txt (a concatenation of the man(3) pages)
+ pcretest.txt the pcretest man page
+ pcregrep.txt the pcregrep man page
+ pcre-config.txt the pcre-config man page
If you want to remove PCRE from your system, you can run "make uninstall".
This removes all the files that "make install" installed. However, it does not
@@ -518,24 +548,34 @@
created by the configuring process. There is also a script called RunGrepTest
that tests the options of the pcregrep command. If the C++ wrapper library is
built, three test programs called pcrecpp_unittest, pcre_scanner_unittest, and
-pcre_stringpiece_unittest are also built.
+pcre_stringpiece_unittest are also built. When JIT support is enabled, another
+test program called pcre_jit_test is built.
Both the scripts and all the program tests are run if you obey "make check" or
"make test". For other systems, see the instructions in NON-UNIX-USE.
The RunTest script runs the pcretest test program (which is documented in its
-own man page) on each of the testinput files in the testdata directory in
-turn, and compares the output with the contents of the corresponding testoutput
-files. A file called testtry is used to hold the main output from pcretest
+own man page) on each of the relevant testinput fil...
[truncated message content] |
|
From: <ou...@us...> - 2012-01-17 15:33:52
|
Revision: 3689
http://jcl.svn.sourceforge.net/jcl/?rev=3689&view=rev
Author: outchy
Date: 2012-01-17 15:33:46 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
PCRE now works properly on Win64: the 64-bit compiler fails to replace a function pointer referenced in an obj by a function body implemented in a pascal unit.
pcre_globals.obj is not required anymore since the function pointers are not "instantiated" in C code anymore, they are now "instantiated" in the pascal unit.
Modified Paths:
--------------
trunk/jcl/source/common/pcre.pas
trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
trunk/jcl/source/windows/obj/pcre/win64/makefile.mak
Removed Paths:
-------------
trunk/jcl/source/windows/obj/pcre/win32/pcre_globals.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_globals.obj
Modified: trunk/jcl/source/common/pcre.pas
===================================================================
--- trunk/jcl/source/common/pcre.pas 2012-01-17 09:59:03 UTC (rev 3688)
+++ trunk/jcl/source/common/pcre.pas 2012-01-17 15:33:46 UTC (rev 3689)
@@ -629,7 +629,6 @@
{$LINK ..\windows\obj\pcre\win32\pcre_exec.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_fullinfo.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_get.obj}
-{$LINK ..\windows\obj\pcre\win32\pcre_globals.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_info.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_maketables.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_newline.obj}
@@ -651,7 +650,6 @@
{$LINK ..\windows\obj\pcre\win64\pcre_exec.obj}
{$LINK ..\windows\obj\pcre\win64\pcre_fullinfo.obj}
{$LINK ..\windows\obj\pcre\win64\pcre_get.obj}
-{$LINK ..\windows\obj\pcre\win64\pcre_globals.obj}
{$LINK ..\windows\obj\pcre\win64\pcre_info.obj}
{$LINK ..\windows\obj\pcre\win64\pcre_maketables.obj}
{$LINK ..\windows\obj\pcre\win64\pcre_newline.obj}
@@ -755,7 +753,7 @@
function malloc(size: size_t): Pointer; cdecl; external szMSVCRT name 'malloc';
-function pcre_malloc(Size: SizeInt): Pointer;
+function pcre_malloc_jcl(Size: SizeInt): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
begin
if Assigned(pcre_malloc_user) then
Result := pcre_malloc_user(Size)
@@ -763,7 +761,7 @@
Result := malloc(Size);
end;
-function pcre_stack_malloc(Size: SizeInt): Pointer;
+function pcre_stack_malloc_jcl(Size: SizeInt): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
begin
if Assigned(pcre_stack_malloc_user) then
Result := pcre_stack_malloc_user(Size)
@@ -773,12 +771,12 @@
function _malloc(size: size_t): Pointer;
begin
- Result := pcre_malloc(size);
+ Result := pcre_malloc_jcl(size);
end;
procedure free(pBlock: Pointer); cdecl; external szMSVCRT name 'free';
-procedure pcre_free(P: Pointer);
+procedure pcre_free_jcl(P: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
begin
if Assigned(pcre_free_user) then
pcre_free_user(P)
@@ -786,7 +784,7 @@
free(P);
end;
-procedure pcre_stack_free(P: Pointer);
+procedure pcre_stack_free_jcl(P: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
begin
if Assigned(pcre_stack_free_user) then
pcre_stack_free_user(P)
@@ -796,10 +794,10 @@
procedure _free(pBlock: Pointer);
begin
- pcre_free(pBlock);
+ pcre_free_jcl(pBlock);
end;
-function pcre_callout(var callout_block: pcre_callout_block): Integer; cdecl;
+function pcre_callout_jcl(var callout_block: pcre_callout_block): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
begin
if Assigned(pcre_callout_user) then
Result := pcre_callout_user(callout_block)
@@ -807,6 +805,23 @@
Result := 0;
end;
+{$IFDEF CPU32}
+const
+ _pcre_malloc: pcre_malloc_callback = pcre_malloc_jcl;
+ _pcre_free: pcre_free_callback = pcre_free_jcl;
+ _pcre_stack_malloc: pcre_stack_malloc_callback = pcre_stack_malloc_jcl;
+ _pcre_stack_free: pcre_stack_free_callback = pcre_stack_free_jcl;
+ _pcre_callout: pcre_callout_callback = pcre_callout_jcl;
+{$ENDIF CPU32}
+{$IFDEF CPU64}
+const
+ pcre_malloc: pcre_malloc_callback = pcre_malloc_jcl;
+ pcre_free: pcre_free_callback = pcre_free_jcl;
+ pcre_stack_malloc: pcre_stack_malloc_callback = pcre_stack_malloc_jcl;
+ pcre_stack_free: pcre_stack_free_callback = pcre_stack_free_jcl;
+ pcre_callout: pcre_callout_callback = pcre_callout_jcl;
+{$ENDIF CPU64}
+
{$ELSE ~PCRE_STATICLINK}
type
@@ -892,7 +907,7 @@
function CallPCREMalloc(Size: SizeInt): Pointer;
begin
{$IFDEF PCRE_STATICLINK}
- Result := pcre_malloc(Size);
+ Result := pcre_malloc_jcl(Size);
{$ELSE ~PCRE_STATICLINK}
Result := pcre_malloc_func^(Size);
{$ENDIF ~PCRE_STATICLINK}
@@ -935,7 +950,7 @@
procedure CallPCREFree(P: Pointer);
begin
{$IFDEF PCRE_STATICLINK}
- pcre_free(P);
+ pcre_free_jcl(P);
{$ELSE ~PCRE_STATICLINK}
pcre_free_func^(P);
{$ENDIF ~PCRE_STATICLINK}
@@ -978,7 +993,7 @@
function CallPCREStackMalloc(Size: SizeInt): Pointer;
begin
{$IFDEF PCRE_STATICLINK}
- Result := pcre_stack_malloc(Size);
+ Result := pcre_stack_malloc_jcl(Size);
{$ELSE ~PCRE_STATICLINK}
Result := pcre_stack_malloc_func^(Size);
{$ENDIF ~PCRE_STATICLINK}
@@ -1021,7 +1036,7 @@
procedure CallPCREStackFree(P: Pointer);
begin
{$IFDEF PCRE_STATICLINK}
- pcre_stack_free(P);
+ pcre_stack_free_jcl(P);
{$ELSE ~PCRE_STATICLINK}
pcre_stack_free_func^(P);
{$ENDIF ~PCRE_STATICLINK}
@@ -1064,7 +1079,7 @@
function CallPCRECallout(var callout_block: pcre_callout_block): Integer;
begin
{$IFDEF PCRE_STATICLINK}
- Result := pcre_callout(callout_block);
+ Result := pcre_callout_jcl(callout_block);
{$ELSE ~PCRE_STATICLINK}
Result := pcre_callout_func^(callout_block);
{$ENDIF ~PCRE_STATICLINK}
Modified: trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win32/makefile.mak 2012-01-17 09:59:03 UTC (rev 3688)
+++ trunk/jcl/source/windows/obj/pcre/win32/makefile.mak 2012-01-17 15:33:46 UTC (rev 3689)
@@ -60,7 +60,7 @@
VERSION = BCB.06.00
# ---------------------------------------------------------------------------
OBJFILES = .\pcre_compile.obj .\pcre_config.obj .\pcre_dfa_exec.obj \
- .\pcre_exec.obj .\pcre_fullinfo.obj .\pcre_get.obj .\pcre_globals.obj \
+ .\pcre_exec.obj .\pcre_fullinfo.obj .\pcre_get.obj \
.\pcre_info.obj .\pcre_maketables.obj .\pcre_newline.obj \
.\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj .\pcre_tables.obj \
.\pcre_try_flipped.obj .\pcre_ucd.obj .\pcre_valid_utf8.obj \
Deleted: trunk/jcl/source/windows/obj/pcre/win32/pcre_globals.obj
===================================================================
(Binary files differ)
Modified: trunk/jcl/source/windows/obj/pcre/win64/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win64/makefile.mak 2012-01-17 09:59:03 UTC (rev 3688)
+++ trunk/jcl/source/windows/obj/pcre/win64/makefile.mak 2012-01-17 15:33:46 UTC (rev 3689)
@@ -31,7 +31,7 @@
# ---------------------------------------------------------------------------
OBJFILES = .\pcre_compile.obj .\pcre_config.obj .\pcre_dfa_exec.obj \
- .\pcre_exec.obj .\pcre_fullinfo.obj .\pcre_get.obj .\pcre_globals.obj \
+ .\pcre_exec.obj .\pcre_fullinfo.obj .\pcre_get.obj \
.\pcre_info.obj .\pcre_maketables.obj .\pcre_newline.obj \
.\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj .\pcre_tables.obj \
.\pcre_try_flipped.obj .\pcre_ucd.obj .\pcre_valid_utf8.obj \
Deleted: trunk/jcl/source/windows/obj/pcre/win64/pcre_globals.obj
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-17 09:59:12
|
Revision: 3688
http://jcl.svn.sourceforge.net/jcl/?rev=3688&view=rev
Author: outchy
Date: 2012-01-17 09:59:03 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
Rework revision 3687 with suggested change from Rudy Velthuis in the newgroup: the z_stream_s record shall not be packed.
Revision Links:
--------------
http://jcl.svn.sourceforge.net/jcl/?rev=3687&view=rev
Modified Paths:
--------------
trunk/jcl/source/common/zlibh.pas
Modified: trunk/jcl/source/common/zlibh.pas
===================================================================
--- trunk/jcl/source/common/zlibh.pas 2012-01-16 21:05:25 UTC (rev 3687)
+++ trunk/jcl/source/common/zlibh.pas 2012-01-17 09:59:03 UTC (rev 3688)
@@ -249,28 +249,25 @@
type
{$EXTERNALSYM z_stream_s}
- z_stream_s = packed record
+ z_stream_s = record
next_in: PBytef; // next input byte
- avail_in: uInt; // number of bytes available at next_in
- total_in: uLong; // total nb of input bytes read so far
+ avail_in: uInt; // number of bytes available at next_in
+ total_in: uLong; // total nb of input bytes read so far
- next_out: PBytef; // next output byte should be put there
+ next_out: PBytef; // next output byte should be put there
avail_out:uInt; // remaining free space at next_out
total_out:uLong; // total nb of bytes output so far
msg: PAnsiChar; // last error message, NULL if no error
- state:PInternalState; // not visible by applications
+ state:PInternalState; // not visible by applications
- zalloc: TFNAllocFunc;// used to allocate the internal state
- zfree: TFNFreeFunc; // used to free the internal state
- opaque: voidpf; // private data object passed to zalloc and zfree
+ zalloc: TFNAllocFunc;// used to allocate the internal state
+ zfree: TFNFreeFunc; // used to free the internal state
+ opaque: voidpf; // private data object passed to zalloc and zfree
- data_type: Integer; // best guess about the data type: ascii or binary
- adler: uLong; // adler32 value of the uncompressed data
+ data_type: Integer; // best guess about the data type: ascii or binary
+ adler: uLong; // adler32 value of the uncompressed data
reserved: uLong; // reserved for future use
- {$IFDEF CPU64}
- padding: uLong; // Visual C++ compiler adds a 4 byte padding
- {$ENDIF CPU64}
end;
{$IFDEF COMPILER10_UP}
(*$HPPEMIT 'namespace Zlibh {'*)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-16 21:05:31
|
Revision: 3687
http://jcl.svn.sourceforge.net/jcl/?rev=3687&view=rev
Author: outchy
Date: 2012-01-16 21:05:25 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
Fix the version error with 64-bit static link: Andreas Hausladen commented in the newsgroups that MS compiler aligns record sizes on multiples of 8.
Modified Paths:
--------------
trunk/jcl/source/common/zlibh.pas
Modified: trunk/jcl/source/common/zlibh.pas
===================================================================
--- trunk/jcl/source/common/zlibh.pas 2012-01-16 16:14:44 UTC (rev 3686)
+++ trunk/jcl/source/common/zlibh.pas 2012-01-16 21:05:25 UTC (rev 3687)
@@ -267,7 +267,10 @@
data_type: Integer; // best guess about the data type: ascii or binary
adler: uLong; // adler32 value of the uncompressed data
- reserved: uLong; // reserved for future use
+ reserved: uLong; // reserved for future use
+ {$IFDEF CPU64}
+ padding: uLong; // Visual C++ compiler adds a 4 byte padding
+ {$ENDIF CPU64}
end;
{$IFDEF COMPILER10_UP}
(*$HPPEMIT 'namespace Zlibh {'*)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-16 16:14:50
|
Revision: 3686
http://jcl.svn.sourceforge.net/jcl/?rev=3686&view=rev
Author: outchy
Date: 2012-01-16 16:14:44 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
Mantis 5471: the new hook fails in D2007 (when D2006 is present).
Modified Paths:
--------------
trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
trunk/jcl/source/vcl/JclOpenDialogHooks.pas
Modified: trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-14 19:37:18 UTC (rev 3685)
+++ trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-16 16:14:44 UTC (rev 3686)
@@ -483,7 +483,7 @@
if I >= 0 then
begin
// delete current folder
- if MessageBox(FHandle,
+ if MessageBox(0,
PChar(Format(LoadResString(@RsOpenDialogDelConfirm), [Path])),
PChar(LoadResString(@RsOpenDialogConfirmation)),
MB_YESNO or MB_ICONQUESTION or MB_DEFBUTTON2) = ID_YES then
Modified: trunk/jcl/source/vcl/JclOpenDialogHooks.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogHooks.pas 2012-01-14 19:37:18 UTC (rev 3685)
+++ trunk/jcl/source/vcl/JclOpenDialogHooks.pas 2012-01-16 16:14:44 UTC (rev 3686)
@@ -45,9 +45,19 @@
{$ENDIF UNITVERSIONING}
JclBase, JclPeImage, JclWin32;
+// old-style open dialogs are supported by all versions of Delphi
+{$DEFINE OLDSTYLE}
+
+// new-style file dialogs are supported by Delphi 2007 and newer
+// it is disabled in D2007, because the D2006 RTL does not support it at all
+{$IFDEF RTL200_UP}
+{$DEFINE NEWSTYLE}
+{$ENDIF RTL200_UP}
+
type
EJclOpenDialogHookError = class(EJclError);
+ {$IFDEF NEWSTYLE}
TJclFileOpenDialogHook = class (TFileOpenDialog)
strict protected
function CreateFileDialog: IFileDialog; override;
@@ -63,8 +73,10 @@
class procedure InstallHook(out OldHandler: Pointer);
class procedure UninstallHook(OldHandler: Pointer);
end;
+ {$ENDIF NEWSTYLE}
TJclOpenDialogHook = class (TObject)
+ {$IFDEF OLDSTYLE}
private
FDisableHelpButton: Boolean;
FDisablePlacesBar: Boolean;
@@ -75,8 +87,6 @@
FPictureDialogLastFolder: string;
FWndInstance: Pointer;
FOldWndInstance: Pointer;
- FOldFileOpenCreateFileDialog: Pointer;
- FOldFileSaveCreateFileDialog: Pointer;
FOnClose: TNotifyEvent;
FOnShow: TNotifyEvent;
function GetCurrentFolder: string;
@@ -89,17 +99,12 @@
procedure DialogFolderChange; virtual;
procedure DialogShow; virtual;
procedure DialogClose; virtual;
- procedure FileDialogCreate(const AFileDialog: IFileDialog); virtual;
procedure DoClose;
procedure DoShow;
procedure ParentWndProc(var Message: TMessage); virtual;
procedure WndProc(var Message: TMessage); virtual;
property FileNameEditWnd: HWND read GetFileNameEditWnd;
public
- constructor Create; virtual;
- destructor Destroy; override;
- procedure HookDialogs;
- procedure UnhookDialogs;
property CurrentFolder: string read GetCurrentFolder write SetCurrentFolder;
property DisableHelpButton: Boolean read FDisableHelpButton write FDisableHelpButton;
property DisablePlacesBar: Boolean read FDisablePlacesBar write FDisablePlacesBar;
@@ -107,6 +112,19 @@
property PictureDialogLastFolder: string read FPictureDialogLastFolder write FPictureDialogLastFolder;
property OnClose: TNotifyEvent read FOnClose write FOnClose;
property OnShow: TNotifyEvent read FOnShow write FOnShow;
+ {$ENDIF OLDSTYLE}
+ {$IFDEF NEWSTYLE}
+ private
+ FOldFileOpenCreateFileDialog: Pointer;
+ FOldFileSaveCreateFileDialog: Pointer;
+ protected
+ procedure FileDialogCreate(const AFileDialog: IFileDialog); virtual;
+ {$ENDIF NEWSTYLE}
+ public
+ constructor Create; virtual;
+ destructor Destroy; override;
+ procedure HookDialogs;
+ procedure UnhookDialogs;
end;
TJclOpenDialogHookClass = class of TJclOpenDialogHook;
@@ -139,11 +157,14 @@
{$R JclOpenDialog.res}
+var
+ GlobalOpenDialogHook: TJclOpenDialogHook;
+
+{$IFDEF OLDSTYLE}
const
OpenDialogTemplateName = 'JCLOPENDLGHOOK';
OpenPictureDialogTemplateName = 'DLGTEMPLATE';
-
type
TGetOpenFileName = function (var OpenFile: TOpenFilename): Bool; stdcall;
@@ -151,7 +172,6 @@
OldGetOpenFileName: TGetOpenFileName;
OldGetSaveFileName: TGetOpenFileName;
OldExplorerHook: function(Wnd: HWND; Msg: UINT; wParam: WPARAM; lParam: LPARAM): {$IFDEF RTL230_UP}UINT_PTR{$ELSE}UINT{$ENDIF RTL230_UP} stdcall;
- GlobalOpenDialogHook: TJclOpenDialogHook;
function NewExplorerHook(Wnd: HWnd; Msg: UINT; WParam: WPARAM; LParam: LPARAM): {$IFDEF RTL230_UP}UINT_PTR{$ELSE}UINT{$ENDIF RTL230_UP}; stdcall;
begin
@@ -214,6 +234,7 @@
InitOpenFileStruct(OpenFile);
Result := OldGetSaveFileName(OpenFile);
end;
+{$ENDIF OLDSTYLE}
function InitializeOpenDialogHook(OpenDialogHookClass: TJclOpenDialogHookClass): TJclOpenDialogHook;
begin
@@ -234,6 +255,7 @@
//=== { TJclFileOpenDialogHook } =============================================
+{$IFDEF NEWSTYLE}
function TJclFileOpenDialogHook.CreateFileDialog: IFileDialog;
begin
Result := inherited CreateFileDialog;
@@ -267,9 +289,11 @@
Break;
end;
end;
+{$ENDIF NEWSTYLE}
//=== { TJclFileSaveDialogHook } =============================================
+{$IFDEF NEWSTYLE}
function TJclFileSaveDialogHook.CreateFileDialog: IFileDialog;
begin
Result := inherited CreateFileDialog;
@@ -303,26 +327,32 @@
Break;
end;
end;
+{$ENDIF NEWSTYLE}
//=== { TJclOpenDialogHook } =================================================
constructor TJclOpenDialogHook.Create;
begin
inherited Create;
+ {$IFDEF OLDSTYLE}
FHooks := TJclPeMapImgHooks.Create;
FParentWndInstance := MakeObjectInstance(ParentWndProc);
FWndInstance := MakeObjectInstance(WndProc);
+ {$ENDIF OLDSTYLE}
end;
destructor TJclOpenDialogHook.Destroy;
begin
UnhookDialogs;
+ {$IFDEF OLDSTYLE}
FreeObjectInstance(FParentWndInstance);
FreeObjectInstance(FWndInstance);
FreeAndNil(FHooks);
+ {$ENDIF OLDSTYLE}
inherited Destroy;
end;
+{$IFDEF OLDSTYLE}
procedure TJclOpenDialogHook.DialogAdjustControlPos;
begin
// override to customize
@@ -358,12 +388,16 @@
if Assigned(FOnShow) then
FOnShow(Self);
end;
+{$ENDIF OLDSTYLE}
+{$IFDEF NEWSTYLE}
procedure TJclOpenDialogHook.FileDialogCreate(const AFileDialog: IFileDialog);
begin
// override to customize
end;
+{$ENDIF NEWSTYLE}
+{$IFDEF OLDSTYLE}
function TJclOpenDialogHook.GetCurrentFolder: string;
var
Path: array [0..MAX_PATH] of Char;
@@ -378,8 +412,10 @@
if Result = 0 then
Result := GetDlgItem(FParentWnd, cmb13);
end;
+{$ENDIF OLDSTYLE}
procedure TJclOpenDialogHook.HookDialogs;
+{$IFDEF OLDSTYLE}
procedure HookImportsForModule(ModuleBase: Pointer);
const
comdlg32 = 'comdlg32.dll';
@@ -399,7 +435,9 @@
Pe: TJclPeImage;
I: Integer;
HookedModule: LongWord;
+{$ENDIF OLDSTYLE}
begin
+ {$IFDEF OLDSTYLE}
{ TODO : Hook all loaded modules }
Pe := TJclPeImage.Create(True);
try
@@ -414,10 +452,14 @@
finally
Pe.Free;
end;
+ {$ENDIF OLDSTYLE}
+ {$IFDEF NEWSTYLE}
TJclFileOpenDialogHook.InstallHook(FOldFileOpenCreateFileDialog);
TJclFileSaveDialogHook.InstallHook(FOldFileSaveCreateFileDialog);
+ {$ENDIF NEWSTYLE}
end;
+{$IFDEF OLDSTYLE}
procedure TJclOpenDialogHook.ParentWndProc(var Message: TMessage);
begin
with Message do
@@ -443,19 +485,27 @@
SetFocus(LastFocus);
end;
end;
+{$ENDIF OLDSTYLE}
procedure TJclOpenDialogHook.UnhookDialogs;
+{$IFDEF OLDSTYLE}
var
I: Integer;
+{$ENDIF OLDSTYLE}
begin
+ {$IFDEF OLDSTYLE}
I := 0;
while I < FHooks.Count do
if not FHooks[I].Unhook then
Inc(I);
+ {$ENDIF OLDSTYLE}
+ {$IFDEF NEWSTYLE}
TJclFileOpenDialogHook.UninstallHook(FOldFileOpenCreateFileDialog);
TJclFileSaveDialogHook.UninstallHook(FOldFileSaveCreateFileDialog);
+ {$ENDIF NEWSTYLE}
end;
+{$IFDEF OLDSTYLE}
procedure TJclOpenDialogHook.WndProc(var Message: TMessage);
procedure Default;
@@ -500,6 +550,7 @@
end;
end;
end;
+{$ENDIF OLDSTYLE}
{$IFDEF UNITVERSIONING}
initialization
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-14 19:37:25
|
Revision: 3685
http://jcl.svn.sourceforge.net/jcl/?rev=3685&view=rev
Author: outchy
Date: 2012-01-14 19:37:18 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
Mantis 5471: the new hook fails in D2007 (when D2006 is present).
Modified Paths:
--------------
trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
Modified: trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-14 18:42:36 UTC (rev 3684)
+++ trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-14 19:37:18 UTC (rev 3685)
@@ -49,9 +49,10 @@
{$DEFINE OLDSTYLE}
// new-style file dialogs are supported by Delphi 2007 and newer
-{$IFDEF RTL185_UP}
+// it is disabled in D2007, because the D2006 RTL does not support it at all
+{$IFDEF RTL200_UP}
{$DEFINE NEWSTYLE}
-{$ENDIF RTL185_UP}
+{$ENDIF RTL200_UP}
type
{$NODEFINE TJclOpenDialogFavoritesHook} // IFileDialogCustomize is badly emitted
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-14 18:42:42
|
Revision: 3684
http://jcl.svn.sourceforge.net/jcl/?rev=3684&view=rev
Author: outchy
Date: 2012-01-14 18:42:36 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
Add a group for options of wrappers to PCRE/Zlib/BZip2/7z/UCD.
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
trunk/jcl/install/JclInstallResources.pas
Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas 2012-01-08 05:28:53 UTC (rev 3683)
+++ trunk/jcl/install/JclInstall.pas 2012-01-14 18:42:36 UTC (rev 3684)
@@ -45,6 +45,7 @@
joJCLDef,
joJCLDefMath,
joJCLDefDebug,
+ joJCLDefWrappers,
joJCLDefPCRE,
joJCLDefBZip2,
joJCLDefZLib,
@@ -380,6 +381,7 @@
(Id: -1; Caption: @RsCaptionDef; Hint: @RsHintDef), // joDef
(Id: -1; Caption: @RsCaptionDefMath; Hint: @RsHintDefMath), // joDefMath
(Id: -1; Caption: @RsCaptionDefDebug; Hint: @RsHintDefDebug), // joDefDebug
+ (Id: -1; Caption: @RsCaptionDefWrappers; Hint: @RsHintDefWrappers), // joDefWrappers
(Id: -1; Caption: @RsCaptionDefPCRE; Hint: @RsHintDefPCRE), // joDefPCRE
(Id: -1; Caption: @RsCaptionDefBZip2; Hint: @RsHintDefBZip2), // joDefBZip2
(Id: -1; Caption: @RsCaptionDefZLib; Hint: @RsHintDefZLib), // joDefZLib
@@ -841,10 +843,7 @@
end;
procedure AddDefOptions(Parent: TInstallerOption);
- var
- LinkOnRequestDefault: Boolean;
begin
- LinkOnRequestDefault := (Target is TJclBDSInstallation) and (Target.IDEVersionNumber >= 9) and (FTargetPlatform = bpWin64);
AddOption(joJCLDefThreadSafe, [goChecked], Parent);
AddOption(joJCLDefDropObsoleteCode, [goChecked], Parent);
if (Target.RadToolKind <> brBorlandDevStudio) or (Target.IDEVersionNumber <> 3) then
@@ -882,6 +881,14 @@
AddOption(joJCLDefDebugNoExports, [goNoAutoCheck], joJCLDefDebug);
AddOption(joJCLDefDebugNoSymbols, [goNoAutoCheck], joJCLDefDebug);
{$ENDIF MSWINDOWS}
+ end;
+
+ procedure AddWrapperOptions(Parent: TInstallerOption);
+ var
+ LinkOnRequestDefault: Boolean;
+ begin
+ LinkOnRequestDefault := (Target is TJclBDSInstallation) and (Target.IDEVersionNumber >= 9) and (FTargetPlatform = bpWin64);
+
// PCRE options
AddOption(joJCLDefPCRE, [goChecked], Parent);
if Target.RadToolKind = brBorlandDevStudio then
@@ -1220,6 +1227,10 @@
AddOption(joJCLDef, [goExpandable, goChecked], OptionData[joJediCodeLibrary].Id);
AddDefOptions(joJCLDef);
+ // wrapper options
+ AddOption(joJCLDefWrappers, [goChecked], OptionData[joJCLDef].Id);
+ AddWrapperOptions(joJCLDefWrappers);
+
AddOption(joJCLEnvironment, [goExpandable, goChecked], OptionData[joJediCodeLibrary].Id);
AddEnvOptions(joJCLEnvironment);
Modified: trunk/jcl/install/JclInstallResources.pas
===================================================================
--- trunk/jcl/install/JclInstallResources.pas 2012-01-08 05:28:53 UTC (rev 3683)
+++ trunk/jcl/install/JclInstallResources.pas 2012-01-14 18:42:36 UTC (rev 3684)
@@ -70,6 +70,8 @@
RsCaptionDefDebugNoMap = 'No debug source from Map files';
RsCaptionDefDebugNoExports = 'No debug source from function export table for libraries';
RsCaptionDefDebugNoSymbols = 'No debug source from Microsoft debug symbols';
+ // Wrapper options
+ RsCaptionDefWrappers = 'Wrapper options';
// PCRE options
RsCaptionDefPCRE = 'PCRE options';
RsCaptionDefPCREStaticLink = 'Static link to PCRE code';
@@ -180,6 +182,8 @@
RsHintDefDebugNoTD32 = 'Disable support for TD32 informations';
RsHintDefDebugNoExports = 'Disable support for export names of libraries';
RsHintDefDebugNoSymbols = 'Disable support for Microsoft debug symbols (PDB and DBG files)';
+ // Wrapper options
+ RsHintDefWrappers = 'Configure linking options for wrappers to thirdparty libraries';
// PCRE options
RsHintDefPCRE = 'PCRE specific options (pcre.pas and JclPCRE.pas)';
RsHintDefPCREStaticLink = 'Code from PCRE is linked into JCL binaries';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2012-01-08 05:29:00
|
Revision: 3683
http://jcl.svn.sourceforge.net/jcl/?rev=3683&view=rev
Author: jgsoft
Date: 2012-01-08 05:28:53 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Do not link in JclUnicode when UNICODE_RTL_DATABASE is defined
Modified Paths:
--------------
trunk/jcl/source/common/JclCompression.pas
Modified: trunk/jcl/source/common/JclCompression.pas
===================================================================
--- trunk/jcl/source/common/JclCompression.pas 2012-01-07 21:41:30 UTC (rev 3682)
+++ trunk/jcl/source/common/JclCompression.pas 2012-01-08 05:28:53 UTC (rev 3683)
@@ -2185,7 +2185,9 @@
implementation
uses
+ {$IFNDEF UNICODE_RTL_DATABASE}
JclUnicode, // WideSameText
+ {$ENDIF ~UNICODE_RTL_DATABASE}
JclDateTime, JclFileUtils, JclResources, JclStrings, JclSysUtils;
const
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-07 21:41:39
|
Revision: 3682
http://jcl.svn.sourceforge.net/jcl/?rev=3682&view=rev
Author: outchy
Date: 2012-01-07 21:41:30 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
First version of 64-bit object files for BZIP2, PCRE and ZLIB.
Warning, the static link of these 64-bit object files is highly experimental:
- ZLIB dies with a version error;
- PCRE dies with AV.
Modified Paths:
--------------
trunk/jcl/source/common/bzip2.pas
trunk/jcl/source/common/pcre.pas
trunk/jcl/source/common/zlibh.pas
trunk/jcl/source/windows/obj/bzip2/win32/makefile.mak
trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
trunk/jcl/source/windows/obj/zlib/win32/makefile.mak
Added Paths:
-----------
trunk/jcl/source/windows/obj/bzip2/win64/blocksort.obj
trunk/jcl/source/windows/obj/bzip2/win64/bzlib.obj
trunk/jcl/source/windows/obj/bzip2/win64/compress.obj
trunk/jcl/source/windows/obj/bzip2/win64/crctable.obj
trunk/jcl/source/windows/obj/bzip2/win64/decompress.obj
trunk/jcl/source/windows/obj/bzip2/win64/huffman.obj
trunk/jcl/source/windows/obj/bzip2/win64/makefile.mak
trunk/jcl/source/windows/obj/bzip2/win64/randtable.obj
trunk/jcl/source/windows/obj/pcre/win64/makefile.mak
trunk/jcl/source/windows/obj/pcre/win64/pcre_compile.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_config.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_default_tables.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_dfa_exec.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_exec.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_fullinfo.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_get.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_globals.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_info.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_maketables.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_newline.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_ord2utf8.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_refcount.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_study.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_tables.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_try_flipped.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_ucd.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_valid_utf8.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_version.obj
trunk/jcl/source/windows/obj/pcre/win64/pcre_xclass.obj
trunk/jcl/source/windows/obj/zlib/win64/adler32.obj
trunk/jcl/source/windows/obj/zlib/win64/compress.obj
trunk/jcl/source/windows/obj/zlib/win64/crc32.obj
trunk/jcl/source/windows/obj/zlib/win64/deflate.obj
trunk/jcl/source/windows/obj/zlib/win64/infback.obj
trunk/jcl/source/windows/obj/zlib/win64/inffast.obj
trunk/jcl/source/windows/obj/zlib/win64/inflate.obj
trunk/jcl/source/windows/obj/zlib/win64/inftrees.obj
trunk/jcl/source/windows/obj/zlib/win64/makefile.mak
trunk/jcl/source/windows/obj/zlib/win64/trees.obj
trunk/jcl/source/windows/obj/zlib/win64/uncompr.obj
trunk/jcl/source/windows/obj/zlib/win64/zutil.obj
Modified: trunk/jcl/source/common/bzip2.pas
===================================================================
--- trunk/jcl/source/common/bzip2.pas 2012-01-07 18:40:46 UTC (rev 3681)
+++ trunk/jcl/source/common/bzip2.pas 2012-01-07 21:41:30 UTC (rev 3682)
@@ -26,7 +26,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
@@ -364,10 +364,16 @@
// an external must be declared for this function in order to make the compiler considering
// the corresponding PUBDEF in bzlib.obj
// source: CodeGear QA team
+{$IFDEF CPU32}
function _BZ2_indexIntoF: Pointer;
{$IFDEF BZIP2_EXPORT_STDCALL}stdcall;{$ENDIF BZIP2_EXPORT_STDCALL}
{$IFDEF BZIP2_EXPORT_CDECL}cdecl;{$ENDIF BZIP2_EXPORT_CDECL} external;
+{$ENDIF CPU32}
+{$IFDEF CPU64}
+function BZ2_indexIntoF: Pointer; external;
+{$ENDIF CPU64}
+{$IFDEF CPU32}
{$LINK ..\windows\obj\bzip2\win32\bzlib.obj}
{$LINK ..\windows\obj\bzip2\win32\randtable.obj}
{$LINK ..\windows\obj\bzip2\win32\crctable.obj}
@@ -375,18 +381,43 @@
{$LINK ..\windows\obj\bzip2\win32\decompress.obj}
{$LINK ..\windows\obj\bzip2\win32\huffman.obj}
{$LINK ..\windows\obj\bzip2\win32\blocksort.obj}
+{$ENDIF CPU32}
+{$IFDEF CPU64}
+{$LINK ..\windows\obj\bzip2\win64\bzlib.obj}
+{$LINK ..\windows\obj\bzip2\win64\randtable.obj}
+{$LINK ..\windows\obj\bzip2\win64\crctable.obj}
+{$LINK ..\windows\obj\bzip2\win64\compress.obj}
+{$LINK ..\windows\obj\bzip2\win64\decompress.obj}
+{$LINK ..\windows\obj\bzip2\win64\huffman.obj}
+{$LINK ..\windows\obj\bzip2\win64\blocksort.obj}
+{$ENDIF CPU64}
+{$IFDEF CPU32}
function _malloc(size: Longint): Pointer; cdecl;
+{$ENDIF CPU32}
+{$IFDEF CPU64}
+function malloc(size: SizeInt): Pointer;
+{$ENDIF CPU64}
begin
GetMem(Result, Size);
end;
+{$IFDEF CPU32}
procedure _free(pBlock: Pointer); cdecl;
+{$ENDIF CPU32}
+{$IFDEF CPU64}
+procedure free(pBlock: Pointer);
+{$ENDIF CPU64}
begin
FreeMem(pBlock);
end;
+{$IFDEF CPU32}
procedure _bz_internal_error(errcode: Integer); cdecl;
+{$ENDIF CPU32}
+{$IFDEF CPU64}
+procedure bz_internal_error(errcode: Integer);
+{$ENDIF CPU64}
begin
if Assigned(bz2_internal_error_event) then
bz2_internal_error_event(errcode);
Modified: trunk/jcl/source/common/pcre.pas
===================================================================
--- trunk/jcl/source/common/pcre.pas 2012-01-07 18:40:46 UTC (rev 3681)
+++ trunk/jcl/source/common/pcre.pas 2012-01-07 21:41:30 UTC (rev 3682)
@@ -622,6 +622,7 @@
// make the linker happy with PCRE 8.00
procedure _pcre_find_bracket; external;
+{$IFDEF CPU32}
{$LINK ..\windows\obj\pcre\win32\pcre_compile.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_config.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_dfa_exec.obj}
@@ -642,6 +643,29 @@
{$LINK ..\windows\obj\pcre\win32\pcre_version.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_xclass.obj}
{$LINK ..\windows\obj\pcre\win32\pcre_default_tables.obj}
+{$ENDIF CPU32}
+{$IFDEF CPU64}
+{$LINK ..\windows\obj\pcre\win64\pcre_compile.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_config.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_dfa_exec.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_exec.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_fullinfo.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_get.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_globals.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_info.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_maketables.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_newline.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_ord2utf8.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_refcount.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_study.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_tables.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_try_flipped.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_ucd.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_valid_utf8.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_version.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_xclass.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_default_tables.obj}
+{$ENDIF CPU64}
// user's defined callbacks
var
@@ -683,6 +707,7 @@
const
szMSVCRT = 'MSVCRT.DLL';
+{$IFDEF CPU32}
function _memcpy(dest, src: Pointer; count: size_t): Pointer; cdecl; external szMSVCRT name 'memcpy';
function _memmove(dest, src: Pointer; count: size_t): Pointer; cdecl; external szMSVCRT name 'memmove';
function _memset(dest: Pointer; val: Integer; count: size_t): Pointer; cdecl; external szMSVCRT name 'memset';
@@ -703,6 +728,30 @@
function _isupper(__ch: Integer): Integer; cdecl; external szMSVCRT name 'isupper';
function _isxdigit(__ch: Integer): Integer; cdecl; external szMSVCRT name 'isxdigit';
function _strchr(__s: PAnsiChar; __c: Integer): PAnsiChar; cdecl; external szMSVCRT name 'strchr';
+{$ENDIF CPU32}
+{$IFDEF CPU64}
+function memcpy(dest, src: Pointer; count: size_t): Pointer; external szMSVCRT name 'memcpy';
+function memmove(dest, src: Pointer; count: size_t): Pointer; external szMSVCRT name 'memmove';
+function memset(dest: Pointer; val: Integer; count: size_t): Pointer; external szMSVCRT name 'memset';
+function strncmp(s1: PAnsiChar; s2: PAnsiChar; n: size_t): Integer; external szMSVCRT name 'strncmp';
+function strcmp(s1: PAnsiChar; s2: PAnsiChar; n: size_t): Integer; external szMSVCRT name 'strcmp';
+function memcmp(s1: Pointer; s2: Pointer; n: size_t): Integer; external szMSVCRT name 'memcmp';
+function strlen(s: PAnsiChar): size_t; external szMSVCRT name 'strlen';
+function tolower(__ch: Integer): Integer; external szMSVCRT name 'tolower';
+function toupper(__ch: Integer): Integer; external szMSVCRT name 'toupper';
+function isalnum(__ch: Integer): Integer; external szMSVCRT name 'isalnum';
+function isalpha(__ch: Integer): Integer; external szMSVCRT name 'isalpha';
+function iscntrl(__ch: Integer): Integer; external szMSVCRT name 'iscntrl';
+function isdigit(__ch: Integer): Integer; external szMSVCRT name 'isdigit';
+function isgraph(__ch: Integer): Integer; external szMSVCRT name 'isgraph';
+function islower(__ch: Integer): Integer; external szMSVCRT name 'islower';
+function isprint(__ch: Integer): Integer; external szMSVCRT name 'isprint';
+function ispunct(__ch: Integer): Integer; external szMSVCRT name 'ispunct';
+function isspace(__ch: Integer): Integer; external szMSVCRT name 'isspace';
+function isupper(__ch: Integer): Integer; external szMSVCRT name 'isupper';
+function isxdigit(__ch: Integer): Integer; external szMSVCRT name 'isxdigit';
+function strchr(__s: PAnsiChar; __c: Integer): PAnsiChar; external szMSVCRT name 'strchr';
+{$ENDIF CPU64}
function malloc(size: size_t): Pointer; cdecl; external szMSVCRT name 'malloc';
Modified: trunk/jcl/source/common/zlibh.pas
===================================================================
--- trunk/jcl/source/common/zlibh.pas 2012-01-07 18:40:46 UTC (rev 3681)
+++ trunk/jcl/source/common/zlibh.pas 2012-01-07 21:41:30 UTC (rev 3682)
@@ -2081,6 +2081,7 @@
{$IFDEF ZLIB_STATICLINK}
+{$IFDEF CPU32}
{$LINK ..\windows\obj\zlib\win32\adler32.obj} // OS: CHECKTHIS - Unix version may need forward slashes?
{$LINK ..\windows\obj\zlib\win32\compress.obj}
{$LINK ..\windows\obj\zlib\win32\crc32.obj}
@@ -2092,6 +2093,20 @@
{$LINK ..\windows\obj\zlib\win32\trees.obj}
{$LINK ..\windows\obj\zlib\win32\uncompr.obj}
{$LINK ..\windows\obj\zlib\win32\zutil.obj}
+{$ENDIF CPU32}
+{$IFDEF CPU64}
+{$LINK ..\windows\obj\zlib\win64\adler32.obj}
+{$LINK ..\windows\obj\zlib\win64\compress.obj}
+{$LINK ..\windows\obj\zlib\win64\crc32.obj}
+{$LINK ..\windows\obj\zlib\win64\deflate.obj}
+{$LINK ..\windows\obj\zlib\win64\infback.obj}
+{$LINK ..\windows\obj\zlib\win64\inffast.obj}
+{$LINK ..\windows\obj\zlib\win64\inflate.obj}
+{$LINK ..\windows\obj\zlib\win64\inftrees.obj}
+{$LINK ..\windows\obj\zlib\win64\trees.obj}
+{$LINK ..\windows\obj\zlib\win64\uncompr.obj}
+{$LINK ..\windows\obj\zlib\win64\zutil.obj}
+{$ENDIF CPU64}
// Core functions
function zlibVersion; external;
@@ -2191,24 +2206,44 @@
{$ELSE ~LINK_TO_MSVCRT}
+{$IFDEF CPU32}
function _memcpy(dest, src: Pointer; count: size_t): Pointer; cdecl;
+{$ENDIF CPU32}
+{$IFDEF CPU64}
+function memcpy(dest, src: Pointer; count: size_t): Pointer;
+{$ENDIF CPU64}
begin
Move(src^, dest^, count);
Result := dest;
end;
+{$IFDEF CPU32}
function _memset(dest: Pointer; val: Integer; count: size_t): Pointer; cdecl;
+{$ENDIF CPU32}
+{$IFDEF CPU64}
+function memset(dest: Pointer; val: Integer; count: size_t): Pointer;
+{$ENDIF CPU64}
begin
FillChar(dest^, count, val);
Result := dest;
end;
+{$IFDEF CPU32}
function _malloc(size: size_t): Pointer; cdecl;
+{$ENDIF CPU32}
+{$IFDEF CPU64}
+function malloc(size: size_t): Pointer;
+{$ENDIF CPU64}
begin
GetMem(Result, size);
end;
+{$IFDEF CPU32}
procedure _free(pBlock: Pointer); cdecl;
+{$ENDIF CPU32}
+{$IFDEF CPU64}
+procedure free(pBlock: Pointer);
+{$ENDIF CPU64}
begin
FreeMem(pBlock);
end;
Modified: trunk/jcl/source/windows/obj/bzip2/win32/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/bzip2/win32/makefile.mak 2012-01-07 18:40:46 UTC (rev 3681)
+++ trunk/jcl/source/windows/obj/bzip2/win32/makefile.mak 2012-01-07 21:41:30 UTC (rev 3682)
@@ -2,7 +2,7 @@
# makefile to make bzip2 .obj files using Borland's C++ compiler bcc32
# derived from a makefile generated by BCB6' bpr2mak
#
-# if bzip2 source directory is different from ..\..\..\..\..\thirdparty\bzip2\bzip2-1.0.6, use
+# if bzip2 source directory is different from ..\..\..\..\..\..\thirdparty\bzip2\bzip2-1.0.6, use
# "make -Dbzip2src=<path to bzip2 sources>" to tell make where to find the
# source files
#
@@ -42,7 +42,7 @@
BCC = $(BCB)
!if !$d(bzip2src)
-bzip2src = ..\..\..\..\..\thirdparty\bzip2\bzip2-1.0.6
+bzip2src = ..\..\..\..\..\..\thirdparty\bzip2\bzip2-1.0.6
!endif
!if !$d(CPU)
Added: trunk/jcl/source/windows/obj/bzip2/win64/blocksort.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/bzip2/win64/blocksort.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/bzip2/win64/bzlib.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/bzip2/win64/bzlib.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/bzip2/win64/compress.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/bzip2/win64/compress.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/bzip2/win64/crctable.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/bzip2/win64/crctable.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/bzip2/win64/decompress.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/bzip2/win64/decompress.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/bzip2/win64/huffman.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/bzip2/win64/huffman.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: trunk/jcl/source/windows/obj/bzip2/win64/makefile.mak (from rev 3679, trunk/jcl/source/windows/obj/bzip2/win32/makefile.mak)
===================================================================
--- trunk/jcl/source/windows/obj/bzip2/win64/makefile.mak (rev 0)
+++ trunk/jcl/source/windows/obj/bzip2/win64/makefile.mak 2012-01-07 21:41:30 UTC (rev 3682)
@@ -0,0 +1,59 @@
+#
+# makefile to make bzip2 .obj files using Microsoft C++ compiler (cl.exe)
+#
+# if bzip2 source directory is different from ..\..\..\..\..\..\thirdparty\bzip2\bzip2-1.0.6, use
+# "make -Dbzip2src=<path to bzip2 sources>" to tell make where to find the
+# source files
+#
+# Make.exe needs to reside in the same directory as bcc32.exe.
+# For example, if you have Borlands free C++ v. 5.5 compiler (available from
+# http://www.borland.com/products/downloads/download_cbuilder.html#) installed:
+#
+# >C:\Program Files\Borland\BCC55\Bin\make
+#
+# or, if you want to use C++ Builder 6:
+#
+# >C:\Program Files\Borland\CBuilder6\Bin\make
+#
+# or, if you want to use Borland Developer Studio 2006:
+#
+# >C:\Program files\Borland\BDS\4.0\bin\make
+#
+
+!if !$d(bzip2src)
+bzip2src = ..\..\..\..\..\..\thirdparty\bzip2\bzip2-1.0.6
+!endif
+
+# ---------------------------------------------------------------------------
+OBJFILES = .\bzlib.obj .\randtable.obj .\crctable.obj .\compress.obj \
+ .\decompress.obj .\huffman.obj .\blocksort.obj
+# ---------------------------------------------------------------------------
+USERDEFINES = BZ_EXPORT
+SYSDEFINES = BZ_NO_STDIO
+PATHC = .;$(bzip2src)
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE. It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------
+!if $d(PATHC)
+.PATH.C = $(PATHC)
+!endif
+
+# ---------------------------------------------------------------------------
+bzip2: $(OBJFILES)
+
+# ---------------------------------------------------------------------------
+.c.obj:
+ cl -c -nologo -D_KERNEL32_ -GS- -Z7 -wd4068 -D$(SYSDEFINES) -D$(USERDEFINES) -Gs999999 -Fo$@ $<
+# ---------------------------------------------------------------------------
+
+
+
+
Added: trunk/jcl/source/windows/obj/bzip2/win64/randtable.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/bzip2/win64/randtable.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win32/makefile.mak 2012-01-07 18:40:46 UTC (rev 3681)
+++ trunk/jcl/source/windows/obj/pcre/win32/makefile.mak 2012-01-07 21:41:30 UTC (rev 3682)
@@ -2,7 +2,7 @@
# makefile to make pcre .obj files using Borland's C++ compiler bcc32
# derived from a makefile generated by BCB6' bpr2mak
#
-# if pcre source directory is different from ..\..\..\..\..\thirdparty\pcre\pcre-8.02, use
+# if pcre source directory is different from ..\..\..\..\..\..\thirdparty\pcre\pcre-8.02, use
# "make -Dpcresrc=<path to pcre sources>" to tell make where to find the
# source files
#
@@ -42,7 +42,7 @@
BCC = $(BCB)
!if !$d(pcresrc)
-pcresrc = ..\..\..\..\..\thirdparty\pcre\pcre-8.02
+pcresrc = ..\..\..\..\..\..\thirdparty\pcre\pcre-8.02
!endif
!if !$d(CPU)
Copied: trunk/jcl/source/windows/obj/pcre/win64/makefile.mak (from rev 3679, trunk/jcl/source/windows/obj/pcre/win32/makefile.mak)
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win64/makefile.mak (rev 0)
+++ trunk/jcl/source/windows/obj/pcre/win64/makefile.mak 2012-01-07 21:41:30 UTC (rev 3682)
@@ -0,0 +1,96 @@
+#
+# makefile to make pcre .obj files using Microsoft C++ compiler (cl.exe)
+#
+# if pcre source directory is different from ..\..\..\..\..\..\thirdparty\pcre\pcre-8.02, use
+# "make -Dpcresrc=<path to pcre sources>" to tell make where to find the
+# source files
+#
+# Make.exe needs to reside in the same directory as bcc32.exe.
+# For example, if you have Borlands free C++ v. 5.5 compiler (available from
+# http://www.borland.com/products/downloads/download_cbuilder.html#) installed:
+#
+# >C:\Program Files\Borland\BCC55\Bin\make
+#
+# or, if you want to use C++ Builder 6:
+#
+# >C:\Program Files\Borland\CBuilder6\Bin\make
+#
+# or, if you want to use Borland Developer Studio 2006:
+#
+# >C:\Program files\Borland\BDS\4.0\bin\make
+
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+BCC = $(BCB)
+
+!if !$d(pcresrc)
+pcresrc = ..\..\..\..\..\..\thirdparty\pcre\pcre-8.02
+!endif
+
+# ---------------------------------------------------------------------------
+OBJFILES = .\pcre_compile.obj .\pcre_config.obj .\pcre_dfa_exec.obj \
+ .\pcre_exec.obj .\pcre_fullinfo.obj .\pcre_get.obj .\pcre_globals.obj \
+ .\pcre_info.obj .\pcre_maketables.obj .\pcre_newline.obj \
+ .\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj .\pcre_tables.obj \
+ .\pcre_try_flipped.obj .\pcre_ucd.obj .\pcre_valid_utf8.obj \
+ .\pcre_version.obj .\pcre_xclass.obj .\pcre_default_tables.obj
+
+# ---------------------------------------------------------------------------
+USERDEFINES = SUPPORT_UTF8;SUPPORT_UCP
+SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
+INCLUDEPATH = $(pcresrc);$(BCC)\include;$(BCB)\include\vcl
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib
+PATHC = .;$(pcresrc)
+ALLLIB = import32.lib cw32i.lib
+# ---------------------------------------------------------------------------
+CFLAG1 = -O2 -Ve -X- -a8 -5 -b -d -k- -vi -tWM- -DHAVE_CONFIG_H
+
+LFLAGS = -D"" -ap -Tpe -x -Gn
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE. It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+# ---------------------------------------------------------------------------
+!if $d(PATHC)
+.PATH.C = $(PATHC)
+!endif
+
+# ---------------------------------------------------------------------------
+pcre: includes tables $(OBJFILES)
+
+# ---------------------------------------------------------------------------
+.c.obj:
+ cl -c -nologo -D_KERNEL32_ -GS- -Z7 -wd4068 -I$(pcresrc) -D$(SYSDEFINES) -D$(USERDEFINES) -DHAVE_CONFIG_H -Gs999999 -Fo$@ $<
+
+includes:
+ copy /Y $(pcresrc)\pcre.h.generic $(pcresrc)\pcre.h
+ copy /Y $(pcresrc)\config.h.generic $(pcresrc)\config.h
+
+tables:
+ $(BCC)\BIN\$(BCC32) -c -tWC $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(SYSDEFINES) -D$(USERDEFINES) -n.\ $(pcresrc)\dftables.c
+ $(BCC)\BIN\$(LINKER) $(LFLAGS) -L$(LIBPATH) c0x32.obj .\dftables.obj, .\dftables.exe,, $(ALLLIB),,
+ del dftables.tds
+ del dftables.obj
+ dftables.exe pcre_default_tables.c
+ del dftables.exe
+# ---------------------------------------------------------------------------
+
+
+
+
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_compile.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_compile.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_config.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_config.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_default_tables.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_default_tables.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_dfa_exec.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_dfa_exec.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_exec.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_exec.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_fullinfo.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_fullinfo.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_get.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_get.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_globals.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_globals.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_info.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_info.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_maketables.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_maketables.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_newline.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_newline.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_ord2utf8.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_ord2utf8.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_refcount.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_refcount.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_study.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_study.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_tables.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_tables.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_try_flipped.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_try_flipped.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_ucd.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_ucd.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_valid_utf8.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_valid_utf8.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_version.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_version.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_xclass.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_xclass.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/jcl/source/windows/obj/zlib/win32/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/zlib/win32/makefile.mak 2012-01-07 18:40:46 UTC (rev 3681)
+++ trunk/jcl/source/windows/obj/zlib/win32/makefile.mak 2012-01-07 21:41:30 UTC (rev 3682)
@@ -2,7 +2,7 @@
# makefile to make zlib .obj files using Borland's C++ compiler bcc32
# derived from a makefile generated by BCB6' bpr2mak
#
-# if zlib source directory is different from ..\..\..\..\..\thirdparty\zlib\zlib-1.2.5, use
+# if zlib source directory is different from ..\..\..\..\..\..\thirdparty\zlib\zlib-1.2.5, use
# "make -Dzlibsrc=<path to zlib sources>" to tell make where to find the
# source files
#
@@ -44,7 +44,7 @@
BCC = $(BCB)
!if !$d(zlibsrc)
-zlibsrc = ..\..\..\..\..\thirdparty\zlib\zlib-1.2.5
+zlibsrc = ..\..\..\..\..\..\thirdparty\zlib\zlib-1.2.5
!endif
!if !$d(CPU)
Added: trunk/jcl/source/windows/obj/zlib/win64/adler32.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/zlib/win64/adler32.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/zlib/win64/compress.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/zlib/win64/compress.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/zlib/win64/crc32.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/zlib/win64/crc32.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/zlib/win64/deflate.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/zlib/win64/deflate.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/zlib/win64/infback.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/zlib/win64/infback.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/zlib/win64/inffast.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/zlib/win64/inffast.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/zlib/win64/inflate.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/zlib/win64/inflate.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/zlib/win64/inftrees.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/zlib/win64/inftrees.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: trunk/jcl/source/windows/obj/zlib/win64/makefile.mak (from rev 3679, trunk/jcl/source/windows/obj/zlib/win32/makefile.mak)
===================================================================
--- trunk/jcl/source/windows/obj/zlib/win64/makefile.mak (rev 0)
+++ trunk/jcl/source/windows/obj/zlib/win64/makefile.mak 2012-01-07 21:41:30 UTC (rev 3682)
@@ -0,0 +1,60 @@
+#
+# makefile to make zlib .obj files using Microsoft C++ compiler (cl.exe)
+#
+# if zlib source directory is different from ..\..\..\..\..\..\thirdparty\zlib\zlib-1.2.5, use
+# "make -Dzlibsrc=<path to zlib sources>" to tell make where to find the
+# source files
+#
+# Make.exe needs to reside in the same directory as bcc32.exe.
+# For example, if you have Borlands free C++ v. 5.5 compiler (available from
+# http://www.borland.com/products/downloads/download_cbuilder.html#) installed:
+#
+# >C:\Program Files\Borland\BCC55\Bin\make
+#
+# or, if you want to use C++ Builder 6:
+#
+# >C:\Program Files\Borland\CBuilder6\Bin\make
+#
+# or, if you want to use Borland Developer Studio 2006:
+#
+# >C:\Program files\Borland\BDS\4.0\bin\make
+
+!if !$d(zlibsrc)
+zlibsrc = ..\..\..\..\..\..\thirdparty\zlib\zlib-1.2.5
+!endif
+
+# ---------------------------------------------------------------------------
+OBJFILES = .\zutil.obj .\compress.obj .\crc32.obj .\deflate.obj \
+ .\infback.obj .\inffast.obj .\inflate.obj .\inftrees.obj .\trees.obj \
+ .\uncompr.obj .\adler32.obj
+# ---------------------------------------------------------------------------
+SYSDEFINES = NO_STRICT
+INCLUDEPATH = $(zlibsrc);$(BCC)\include;$(BCB)\include\vcl
+PATHC = .;$(zlibsrc)
+# ---------------------------------------------------------------------------
+CFLAG1 = -O2 -Ve -X- -a8 -$(CPU) -b -d -k- -vi -tWM $(CallingConvention)
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE. It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if $d(PATHC)
+.PATH.C = $(PATHC)
+!endif
+
+# ---------------------------------------------------------------------------
+zlib: $(OBJFILES)
+
+# ---------------------------------------------------------------------------
+.c.obj:
+ cl -c -nologo -D_KERNEL32_ -GS- -Z7 -wd4068 -I$(pcresrc) -D$(SYSDEFINES) -D$(USERDEFINES) -DHAVE_CONFIG_H -Gs999999 -Fo$@ $<
+# ---------------------------------------------------------------------------
+
+
+
+
Added: trunk/jcl/source/windows/obj/zlib/win64/trees.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/zlib/win64/trees.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/zlib/win64/uncompr.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/zlib/win64/uncompr.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jcl/source/windows/obj/zlib/win64/zutil.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/zlib/win64/zutil.obj
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-07 18:40:53
|
Revision: 3681
http://jcl.svn.sourceforge.net/jcl/?rev=3681&view=rev
Author: outchy
Date: 2012-01-07 18:40:46 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
fix some warnings.
Modified Paths:
--------------
trunk/jcl/source/vcl/JclOpenDialogHooks.pas
trunk/jcl/source/vcl/JclVersionCtrlSVNImpl.pas
Modified: trunk/jcl/source/vcl/JclOpenDialogHooks.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogHooks.pas 2012-01-07 18:40:00 UTC (rev 3680)
+++ trunk/jcl/source/vcl/JclOpenDialogHooks.pas 2012-01-07 18:40:46 UTC (rev 3681)
@@ -32,6 +32,7 @@
interface
{$I jcl.inc}
+{$I windowsonly.inc}
uses
{$IFDEF HAS_UNITSCOPE}
Modified: trunk/jcl/source/vcl/JclVersionCtrlSVNImpl.pas
===================================================================
--- trunk/jcl/source/vcl/JclVersionCtrlSVNImpl.pas 2012-01-07 18:40:00 UTC (rev 3680)
+++ trunk/jcl/source/vcl/JclVersionCtrlSVNImpl.pas 2012-01-07 18:40:46 UTC (rev 3681)
@@ -409,9 +409,9 @@
function TJclVersionControlSVN.SVNSupportedDirVersion(const FileDir: String): TSvnDirVersion;
var
BaseDir: String;
- IgnoreList: TStringList;
- IgnoreDir : String;
- i: Integer;
+ //IgnoreList: TStringList;
+ //IgnoreDir : String;
+ //i: Integer;
IndexDir: Integer;
begin
Result := sdvNone;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-07 18:40:07
|
Revision: 3680
http://jcl.svn.sourceforge.net/jcl/?rev=3680&view=rev
Author: outchy
Date: 2012-01-07 18:40:00 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
move the win32 obj to a dedicated directory, create directories for obj for win64.
Modified Paths:
--------------
trunk/jcl/source/common/bzip2.pas
trunk/jcl/source/common/pcre.pas
trunk/jcl/source/common/zlibh.pas
Modified: trunk/jcl/source/common/bzip2.pas
===================================================================
--- trunk/jcl/source/common/bzip2.pas 2012-01-07 18:39:07 UTC (rev 3679)
+++ trunk/jcl/source/common/bzip2.pas 2012-01-07 18:40:00 UTC (rev 3680)
@@ -368,13 +368,13 @@
{$IFDEF BZIP2_EXPORT_STDCALL}stdcall;{$ENDIF BZIP2_EXPORT_STDCALL}
{$IFDEF BZIP2_EXPORT_CDECL}cdecl;{$ENDIF BZIP2_EXPORT_CDECL} external;
-{$LINK ..\windows\obj\bzip2\bzlib.obj}
-{$LINK ..\windows\obj\bzip2\randtable.obj}
-{$LINK ..\windows\obj\bzip2\crctable.obj}
-{$LINK ..\windows\obj\bzip2\compress.obj}
-{$LINK ..\windows\obj\bzip2\decompress.obj}
-{$LINK ..\windows\obj\bzip2\huffman.obj}
-{$LINK ..\windows\obj\bzip2\blocksort.obj}
+{$LINK ..\windows\obj\bzip2\win32\bzlib.obj}
+{$LINK ..\windows\obj\bzip2\win32\randtable.obj}
+{$LINK ..\windows\obj\bzip2\win32\crctable.obj}
+{$LINK ..\windows\obj\bzip2\win32\compress.obj}
+{$LINK ..\windows\obj\bzip2\win32\decompress.obj}
+{$LINK ..\windows\obj\bzip2\win32\huffman.obj}
+{$LINK ..\windows\obj\bzip2\win32\blocksort.obj}
function _malloc(size: Longint): Pointer; cdecl;
begin
Modified: trunk/jcl/source/common/pcre.pas
===================================================================
--- trunk/jcl/source/common/pcre.pas 2012-01-07 18:39:07 UTC (rev 3679)
+++ trunk/jcl/source/common/pcre.pas 2012-01-07 18:40:00 UTC (rev 3680)
@@ -622,26 +622,26 @@
// make the linker happy with PCRE 8.00
procedure _pcre_find_bracket; external;
-{$LINK ..\windows\obj\pcre\pcre_compile.obj}
-{$LINK ..\windows\obj\pcre\pcre_config.obj}
-{$LINK ..\windows\obj\pcre\pcre_dfa_exec.obj}
-{$LINK ..\windows\obj\pcre\pcre_exec.obj}
-{$LINK ..\windows\obj\pcre\pcre_fullinfo.obj}
-{$LINK ..\windows\obj\pcre\pcre_get.obj}
-{$LINK ..\windows\obj\pcre\pcre_globals.obj}
-{$LINK ..\windows\obj\pcre\pcre_info.obj}
-{$LINK ..\windows\obj\pcre\pcre_maketables.obj}
-{$LINK ..\windows\obj\pcre\pcre_newline.obj}
-{$LINK ..\windows\obj\pcre\pcre_ord2utf8.obj}
-{$LINK ..\windows\obj\pcre\pcre_refcount.obj}
-{$LINK ..\windows\obj\pcre\pcre_study.obj}
-{$LINK ..\windows\obj\pcre\pcre_tables.obj}
-{$LINK ..\windows\obj\pcre\pcre_try_flipped.obj}
-{$LINK ..\windows\obj\pcre\pcre_ucd.obj}
-{$LINK ..\windows\obj\pcre\pcre_valid_utf8.obj}
-{$LINK ..\windows\obj\pcre\pcre_version.obj}
-{$LINK ..\windows\obj\pcre\pcre_xclass.obj}
-{$LINK ..\windows\obj\pcre\pcre_default_tables.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_compile.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_config.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_dfa_exec.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_exec.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_fullinfo.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_get.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_globals.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_info.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_maketables.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_newline.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_ord2utf8.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_refcount.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_study.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_tables.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_try_flipped.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_ucd.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_valid_utf8.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_version.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_xclass.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_default_tables.obj}
// user's defined callbacks
var
Modified: trunk/jcl/source/common/zlibh.pas
===================================================================
--- trunk/jcl/source/common/zlibh.pas 2012-01-07 18:39:07 UTC (rev 3679)
+++ trunk/jcl/source/common/zlibh.pas 2012-01-07 18:40:00 UTC (rev 3680)
@@ -2081,17 +2081,17 @@
{$IFDEF ZLIB_STATICLINK}
-{$LINK ..\windows\obj\zlib\adler32.obj} // OS: CHECKTHIS - Unix version may need forward slashes?
-{$LINK ..\windows\obj\zlib\compress.obj}
-{$LINK ..\windows\obj\zlib\crc32.obj}
-{$LINK ..\windows\obj\zlib\deflate.obj}
-{$LINK ..\windows\obj\zlib\infback.obj}
-{$LINK ..\windows\obj\zlib\inffast.obj}
-{$LINK ..\windows\obj\zlib\inflate.obj}
-{$LINK ..\windows\obj\zlib\inftrees.obj}
-{$LINK ..\windows\obj\zlib\trees.obj}
-{$LINK ..\windows\obj\zlib\uncompr.obj}
-{$LINK ..\windows\obj\zlib\zutil.obj}
+{$LINK ..\windows\obj\zlib\win32\adler32.obj} // OS: CHECKTHIS - Unix version may need forward slashes?
+{$LINK ..\windows\obj\zlib\win32\compress.obj}
+{$LINK ..\windows\obj\zlib\win32\crc32.obj}
+{$LINK ..\windows\obj\zlib\win32\deflate.obj}
+{$LINK ..\windows\obj\zlib\win32\infback.obj}
+{$LINK ..\windows\obj\zlib\win32\inffast.obj}
+{$LINK ..\windows\obj\zlib\win32\inflate.obj}
+{$LINK ..\windows\obj\zlib\win32\inftrees.obj}
+{$LINK ..\windows\obj\zlib\win32\trees.obj}
+{$LINK ..\windows\obj\zlib\win32\uncompr.obj}
+{$LINK ..\windows\obj\zlib\win32\zutil.obj}
// Core functions
function zlibVersion; external;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-07 18:39:16
|
Revision: 3679
http://jcl.svn.sourceforge.net/jcl/?rev=3679&view=rev
Author: outchy
Date: 2012-01-07 18:39:07 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
move the win32 obj to a dedicated directory, create directories for obj for win64.
Added Paths:
-----------
trunk/jcl/source/windows/obj/bzip2/win32/
trunk/jcl/source/windows/obj/bzip2/win32/blocksort.obj
trunk/jcl/source/windows/obj/bzip2/win32/bzlib.obj
trunk/jcl/source/windows/obj/bzip2/win32/compress.obj
trunk/jcl/source/windows/obj/bzip2/win32/crctable.obj
trunk/jcl/source/windows/obj/bzip2/win32/decompress.obj
trunk/jcl/source/windows/obj/bzip2/win32/dirinfo.txt
trunk/jcl/source/windows/obj/bzip2/win32/huffman.obj
trunk/jcl/source/windows/obj/bzip2/win32/makefile.mak
trunk/jcl/source/windows/obj/bzip2/win32/randtable.obj
trunk/jcl/source/windows/obj/bzip2/win64/
trunk/jcl/source/windows/obj/bzip2/win64/dirinfo.txt
trunk/jcl/source/windows/obj/pcre/win32/
trunk/jcl/source/windows/obj/pcre/win32/dirinfo.txt
trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
trunk/jcl/source/windows/obj/pcre/win32/pcre_compile.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_config.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_default_tables.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_dfa_exec.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_exec.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_fullinfo.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_get.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_globals.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_info.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_maketables.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_newline.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_ord2utf8.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_refcount.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_study.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_tables.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_try_flipped.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_ucd.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_valid_utf8.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_version.obj
trunk/jcl/source/windows/obj/pcre/win32/pcre_xclass.obj
trunk/jcl/source/windows/obj/pcre/win64/
trunk/jcl/source/windows/obj/pcre/win64/dirinfo.txt
trunk/jcl/source/windows/obj/zlib/win32/
trunk/jcl/source/windows/obj/zlib/win32/adler32.obj
trunk/jcl/source/windows/obj/zlib/win32/compress.obj
trunk/jcl/source/windows/obj/zlib/win32/crc32.obj
trunk/jcl/source/windows/obj/zlib/win32/deflate.obj
trunk/jcl/source/windows/obj/zlib/win32/dirinfo.txt
trunk/jcl/source/windows/obj/zlib/win32/infback.obj
trunk/jcl/source/windows/obj/zlib/win32/inffast.obj
trunk/jcl/source/windows/obj/zlib/win32/inflate.obj
trunk/jcl/source/windows/obj/zlib/win32/inftrees.obj
trunk/jcl/source/windows/obj/zlib/win32/makefile.mak
trunk/jcl/source/windows/obj/zlib/win32/trees.obj
trunk/jcl/source/windows/obj/zlib/win32/uncompr.obj
trunk/jcl/source/windows/obj/zlib/win32/zutil.obj
trunk/jcl/source/windows/obj/zlib/win64/
trunk/jcl/source/windows/obj/zlib/win64/dirinfo.txt
Removed Paths:
-------------
trunk/jcl/source/windows/obj/bzip2/blocksort.obj
trunk/jcl/source/windows/obj/bzip2/bzlib.obj
trunk/jcl/source/windows/obj/bzip2/compress.obj
trunk/jcl/source/windows/obj/bzip2/crctable.obj
trunk/jcl/source/windows/obj/bzip2/decompress.obj
trunk/jcl/source/windows/obj/bzip2/dirinfo.txt
trunk/jcl/source/windows/obj/bzip2/huffman.obj
trunk/jcl/source/windows/obj/bzip2/makefile.mak
trunk/jcl/source/windows/obj/bzip2/randtable.obj
trunk/jcl/source/windows/obj/dirinfo.txt
trunk/jcl/source/windows/obj/pcre/dirinfo.txt
trunk/jcl/source/windows/obj/pcre/makefile.mak
trunk/jcl/source/windows/obj/pcre/pcre_compile.obj
trunk/jcl/source/windows/obj/pcre/pcre_config.obj
trunk/jcl/source/windows/obj/pcre/pcre_default_tables.obj
trunk/jcl/source/windows/obj/pcre/pcre_dfa_exec.obj
trunk/jcl/source/windows/obj/pcre/pcre_exec.obj
trunk/jcl/source/windows/obj/pcre/pcre_fullinfo.obj
trunk/jcl/source/windows/obj/pcre/pcre_get.obj
trunk/jcl/source/windows/obj/pcre/pcre_globals.obj
trunk/jcl/source/windows/obj/pcre/pcre_info.obj
trunk/jcl/source/windows/obj/pcre/pcre_maketables.obj
trunk/jcl/source/windows/obj/pcre/pcre_newline.obj
trunk/jcl/source/windows/obj/pcre/pcre_ord2utf8.obj
trunk/jcl/source/windows/obj/pcre/pcre_refcount.obj
trunk/jcl/source/windows/obj/pcre/pcre_study.obj
trunk/jcl/source/windows/obj/pcre/pcre_tables.obj
trunk/jcl/source/windows/obj/pcre/pcre_try_flipped.obj
trunk/jcl/source/windows/obj/pcre/pcre_ucd.obj
trunk/jcl/source/windows/obj/pcre/pcre_valid_utf8.obj
trunk/jcl/source/windows/obj/pcre/pcre_version.obj
trunk/jcl/source/windows/obj/pcre/pcre_xclass.obj
trunk/jcl/source/windows/obj/zlib/adler32.obj
trunk/jcl/source/windows/obj/zlib/compress.obj
trunk/jcl/source/windows/obj/zlib/crc32.obj
trunk/jcl/source/windows/obj/zlib/deflate.obj
trunk/jcl/source/windows/obj/zlib/dirinfo.txt
trunk/jcl/source/windows/obj/zlib/infback.obj
trunk/jcl/source/windows/obj/zlib/inffast.obj
trunk/jcl/source/windows/obj/zlib/inflate.obj
trunk/jcl/source/windows/obj/zlib/inftrees.obj
trunk/jcl/source/windows/obj/zlib/makefile.mak
trunk/jcl/source/windows/obj/zlib/trees.obj
trunk/jcl/source/windows/obj/zlib/uncompr.obj
trunk/jcl/source/windows/obj/zlib/zutil.obj
Deleted: trunk/jcl/source/windows/obj/bzip2/blocksort.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/bzip2/bzlib.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/bzip2/compress.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/bzip2/crctable.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/bzip2/decompress.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/bzip2/dirinfo.txt
===================================================================
--- trunk/jcl/source/windows/obj/bzip2/dirinfo.txt 2012-01-06 20:05:42 UTC (rev 3678)
+++ trunk/jcl/source/windows/obj/bzip2/dirinfo.txt 2012-01-07 18:39:07 UTC (rev 3679)
@@ -1 +0,0 @@
-This is the directory where object files for bzip (http://www.bzip.org) reside.
\ No newline at end of file
Deleted: trunk/jcl/source/windows/obj/bzip2/huffman.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/bzip2/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/bzip2/makefile.mak 2012-01-06 20:05:42 UTC (rev 3678)
+++ trunk/jcl/source/windows/obj/bzip2/makefile.mak 2012-01-07 18:39:07 UTC (rev 3679)
@@ -1,106 +0,0 @@
-#
-# makefile to make bzip2 .obj files using Borland's C++ compiler bcc32
-# derived from a makefile generated by BCB6' bpr2mak
-#
-# if bzip2 source directory is different from ..\..\..\..\..\thirdparty\bzip2\bzip2-1.0.6, use
-# "make -Dbzip2src=<path to bzip2 sources>" to tell make where to find the
-# source files
-#
-# Make.exe needs to reside in the same directory as bcc32.exe.
-# For example, if you have Borlands free C++ v. 5.5 compiler (available from
-# http://www.borland.com/products/downloads/download_cbuilder.html#) installed:
-#
-# >C:\Program Files\Borland\BCC55\Bin\make
-#
-# or, if you want to use C++ Builder 6:
-#
-# >C:\Program Files\Borland\CBuilder6\Bin\make
-#
-# or, if you want to use Borland Developer Studio 2006:
-#
-# >C:\Program files\Borland\BDS\4.0\bin\make
-#
-# To choose the target CPU, pass "-DCPU=n" as option to make, with n being a
-# number between 3 and 6, with the following meanings:
-#
-# n Target CPU (or compatible)
-# --------------------------------
-# 3 80386
-# 4 80486
-# 5 Pentium (default)
-# 6 Pentium Pro
-#
-# Robert Rossmair, 2004-10-16
-#
-
-CallingConvention = -pc
-
-!if !$d(BCB)
-BCB = $(MAKEDIR)\..
-!endif
-
-BCC = $(BCB)
-
-!if !$d(bzip2src)
-bzip2src = ..\..\..\..\..\thirdparty\bzip2\bzip2-1.0.6
-!endif
-
-!if !$d(CPU)
-CPU = 5 # Pentium
-!endif
-
-# ---------------------------------------------------------------------------
-# IDE SECTION
-# ---------------------------------------------------------------------------
-# The following section of the project makefile is managed by the BCB IDE.
-# It is recommended to use the IDE to change any of the values in this
-# section.
-# ---------------------------------------------------------------------------
-
-VERSION = BCB.06.00
-# ---------------------------------------------------------------------------
-OBJFILES = .\bzlib.obj .\randtable.obj .\crctable.obj .\compress.obj \
- .\decompress.obj .\huffman.obj .\blocksort.obj
-# ---------------------------------------------------------------------------
-DEBUGLIBPATH = $(BCB)\lib\debug
-RELEASELIBPATH = $(BCB)\lib\release
-USERDEFINES =
-SYSDEFINES = BZ_EXPORT;BZ_NO_STDIO
-INCLUDEPATH = $(bzip2src);$(BCC)\include;$(BCB)\include\vcl
-# LIBPATH = $(bzip2src)
-WARNINGS= -w-par -w-aus
-PATHC = .;$(bzip2src)
-# PATHOBJ = .;$(LIBPATH)
-# ---------------------------------------------------------------------------
-CFLAG1 = -O2 -Ve -X- -a8 -$(CPU) -b -d -k- -vi -tWM $(CallingConvention)
-
-# ---------------------------------------------------------------------------
-# MAKE SECTION
-# ---------------------------------------------------------------------------
-# This section of the project file is not used by the BCB IDE. It is for
-# the benefit of building from the command-line using the MAKE utility.
-# ---------------------------------------------------------------------------
-
-.autodepend
-# ---------------------------------------------------------------------------
-
-!if !$d(BCC32)
-BCC32 = bcc32
-!endif
-
-# ---------------------------------------------------------------------------
-!if $d(PATHC)
-.PATH.C = $(PATHC)
-!endif
-
-# ---------------------------------------------------------------------------
-bzip2: $(OBJFILES)
-
-# ---------------------------------------------------------------------------
-.c.obj:
- $(BCC)\BIN\$(BCC32) -c $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }
-# ---------------------------------------------------------------------------
-
-
-
-
Deleted: trunk/jcl/source/windows/obj/bzip2/randtable.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/bzip2/win32
___________________________________________________________________
Added: tsvn:projectlanguage
+ 0x0409
Added: bugtraq:url
+ http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
+ (Mantis #%BUGID%)
Added: bugtraq:logregex
+ [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)
Copied: trunk/jcl/source/windows/obj/bzip2/win32/blocksort.obj (from rev 3678, trunk/jcl/source/windows/obj/bzip2/blocksort.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/bzip2/win32/bzlib.obj (from rev 3678, trunk/jcl/source/windows/obj/bzip2/bzlib.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/bzip2/win32/compress.obj (from rev 3678, trunk/jcl/source/windows/obj/bzip2/compress.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/bzip2/win32/crctable.obj (from rev 3678, trunk/jcl/source/windows/obj/bzip2/crctable.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/bzip2/win32/decompress.obj (from rev 3678, trunk/jcl/source/windows/obj/bzip2/decompress.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/bzip2/win32/dirinfo.txt (from rev 3678, trunk/jcl/source/windows/obj/bzip2/dirinfo.txt)
===================================================================
--- trunk/jcl/source/windows/obj/bzip2/win32/dirinfo.txt (rev 0)
+++ trunk/jcl/source/windows/obj/bzip2/win32/dirinfo.txt 2012-01-07 18:39:07 UTC (rev 3679)
@@ -0,0 +1 @@
+This is the directory where object files of bzip (http://www.bzip.org) for win32 reside.
\ No newline at end of file
Copied: trunk/jcl/source/windows/obj/bzip2/win32/huffman.obj (from rev 3678, trunk/jcl/source/windows/obj/bzip2/huffman.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/bzip2/win32/makefile.mak (from rev 3678, trunk/jcl/source/windows/obj/bzip2/makefile.mak)
===================================================================
--- trunk/jcl/source/windows/obj/bzip2/win32/makefile.mak (rev 0)
+++ trunk/jcl/source/windows/obj/bzip2/win32/makefile.mak 2012-01-07 18:39:07 UTC (rev 3679)
@@ -0,0 +1,106 @@
+#
+# makefile to make bzip2 .obj files using Borland's C++ compiler bcc32
+# derived from a makefile generated by BCB6' bpr2mak
+#
+# if bzip2 source directory is different from ..\..\..\..\..\thirdparty\bzip2\bzip2-1.0.6, use
+# "make -Dbzip2src=<path to bzip2 sources>" to tell make where to find the
+# source files
+#
+# Make.exe needs to reside in the same directory as bcc32.exe.
+# For example, if you have Borlands free C++ v. 5.5 compiler (available from
+# http://www.borland.com/products/downloads/download_cbuilder.html#) installed:
+#
+# >C:\Program Files\Borland\BCC55\Bin\make
+#
+# or, if you want to use C++ Builder 6:
+#
+# >C:\Program Files\Borland\CBuilder6\Bin\make
+#
+# or, if you want to use Borland Developer Studio 2006:
+#
+# >C:\Program files\Borland\BDS\4.0\bin\make
+#
+# To choose the target CPU, pass "-DCPU=n" as option to make, with n being a
+# number between 3 and 6, with the following meanings:
+#
+# n Target CPU (or compatible)
+# --------------------------------
+# 3 80386
+# 4 80486
+# 5 Pentium (default)
+# 6 Pentium Pro
+#
+# Robert Rossmair, 2004-10-16
+#
+
+CallingConvention = -pc
+
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+BCC = $(BCB)
+
+!if !$d(bzip2src)
+bzip2src = ..\..\..\..\..\thirdparty\bzip2\bzip2-1.0.6
+!endif
+
+!if !$d(CPU)
+CPU = 5 # Pentium
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.06.00
+# ---------------------------------------------------------------------------
+OBJFILES = .\bzlib.obj .\randtable.obj .\crctable.obj .\compress.obj \
+ .\decompress.obj .\huffman.obj .\blocksort.obj
+# ---------------------------------------------------------------------------
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+USERDEFINES =
+SYSDEFINES = BZ_EXPORT;BZ_NO_STDIO
+INCLUDEPATH = $(bzip2src);$(BCC)\include;$(BCB)\include\vcl
+# LIBPATH = $(bzip2src)
+WARNINGS= -w-par -w-aus
+PATHC = .;$(bzip2src)
+# PATHOBJ = .;$(LIBPATH)
+# ---------------------------------------------------------------------------
+CFLAG1 = -O2 -Ve -X- -a8 -$(CPU) -b -d -k- -vi -tWM $(CallingConvention)
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE. It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+# ---------------------------------------------------------------------------
+!if $d(PATHC)
+.PATH.C = $(PATHC)
+!endif
+
+# ---------------------------------------------------------------------------
+bzip2: $(OBJFILES)
+
+# ---------------------------------------------------------------------------
+.c.obj:
+ $(BCC)\BIN\$(BCC32) -c $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }
+# ---------------------------------------------------------------------------
+
+
+
+
Copied: trunk/jcl/source/windows/obj/bzip2/win32/randtable.obj (from rev 3678, trunk/jcl/source/windows/obj/bzip2/randtable.obj)
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/bzip2/win64
___________________________________________________________________
Added: tsvn:projectlanguage
+ 0x0409
Added: bugtraq:url
+ http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
+ (Mantis #%BUGID%)
Added: bugtraq:logregex
+ [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)
Copied: trunk/jcl/source/windows/obj/bzip2/win64/dirinfo.txt (from rev 3678, trunk/jcl/source/windows/obj/bzip2/dirinfo.txt)
===================================================================
--- trunk/jcl/source/windows/obj/bzip2/win64/dirinfo.txt (rev 0)
+++ trunk/jcl/source/windows/obj/bzip2/win64/dirinfo.txt 2012-01-07 18:39:07 UTC (rev 3679)
@@ -0,0 +1 @@
+This is the directory where object files of bzip (http://www.bzip.org) for win64 reside.
\ No newline at end of file
Deleted: trunk/jcl/source/windows/obj/dirinfo.txt
===================================================================
--- trunk/jcl/source/windows/obj/dirinfo.txt 2012-01-06 20:05:42 UTC (rev 3678)
+++ trunk/jcl/source/windows/obj/dirinfo.txt 2012-01-07 18:39:07 UTC (rev 3679)
@@ -1 +0,0 @@
-This is the directory where object files for Win32-specific units reside.
\ No newline at end of file
Deleted: trunk/jcl/source/windows/obj/pcre/dirinfo.txt
===================================================================
--- trunk/jcl/source/windows/obj/pcre/dirinfo.txt 2012-01-06 20:05:42 UTC (rev 3678)
+++ trunk/jcl/source/windows/obj/pcre/dirinfo.txt 2012-01-07 18:39:07 UTC (rev 3679)
@@ -1 +0,0 @@
-This is the directory where object files for PCRE (http://www.pcre.org/) reside.
\ No newline at end of file
Deleted: trunk/jcl/source/windows/obj/pcre/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/makefile.mak 2012-01-06 20:05:42 UTC (rev 3678)
+++ trunk/jcl/source/windows/obj/pcre/makefile.mak 2012-01-07 18:39:07 UTC (rev 3679)
@@ -1,130 +0,0 @@
-#
-# makefile to make pcre .obj files using Borland's C++ compiler bcc32
-# derived from a makefile generated by BCB6' bpr2mak
-#
-# if pcre source directory is different from ..\..\..\..\..\thirdparty\pcre\pcre-8.02, use
-# "make -Dpcresrc=<path to pcre sources>" to tell make where to find the
-# source files
-#
-# Make.exe needs to reside in the same directory as bcc32.exe.
-# For example, if you have Borlands free C++ v. 5.5 compiler (available from
-# http://www.borland.com/products/downloads/download_cbuilder.html#) installed:
-#
-# >C:\Program Files\Borland\BCC55\Bin\make
-#
-# or, if you want to use C++ Builder 6:
-#
-# >C:\Program Files\Borland\CBuilder6\Bin\make
-#
-# or, if you want to use Borland Developer Studio 2006:
-#
-# >C:\Program files\Borland\BDS\4.0\bin\make
-#
-# To choose the target CPU, pass "-DCPU=n" as option to make, with n being a
-# number between 3 and 6, with the following meanings:
-#
-# n Target CPU (or compatible)
-# --------------------------------
-# 3 80386
-# 4 80486
-# 5 Pentium (default)
-# 6 Pentium Pro
-#
-# Robert Rossmair, 2004-10-16
-#
-
-CallingConvention = -pr
-
-!if !$d(BCB)
-BCB = $(MAKEDIR)\..
-!endif
-
-BCC = $(BCB)
-
-!if !$d(pcresrc)
-pcresrc = ..\..\..\..\..\thirdparty\pcre\pcre-8.02
-!endif
-
-!if !$d(CPU)
-CPU = 5 # Pentium
-!endif
-
-# ---------------------------------------------------------------------------
-# IDE SECTION
-# ---------------------------------------------------------------------------
-# The following section of the project makefile is managed by the BCB IDE.
-# It is recommended to use the IDE to change any of the values in this
-# section.
-# ---------------------------------------------------------------------------
-
-VERSION = BCB.06.00
-# ---------------------------------------------------------------------------
-OBJFILES = .\pcre_compile.obj .\pcre_config.obj .\pcre_dfa_exec.obj \
- .\pcre_exec.obj .\pcre_fullinfo.obj .\pcre_get.obj .\pcre_globals.obj \
- .\pcre_info.obj .\pcre_maketables.obj .\pcre_newline.obj \
- .\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj .\pcre_tables.obj \
- .\pcre_try_flipped.obj .\pcre_ucd.obj .\pcre_valid_utf8.obj \
- .\pcre_version.obj .\pcre_xclass.obj .\pcre_default_tables.obj
-
-# ---------------------------------------------------------------------------
-DEBUGLIBPATH = $(BCB)\lib\debug
-RELEASELIBPATH = $(BCB)\lib\release
-USERDEFINES = SUPPORT_UTF8;SUPPORT_UCP
-SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
-INCLUDEPATH = $(pcresrc);$(BCC)\include;$(BCB)\include\vcl
-LIBPATH = $(BCB)\lib\obj;$(BCB)\lib
-# LIBPATH = $(pcresrc)
-WARNINGS= -wpar -w-aus
-PATHC = .;$(pcresrc)
-# PATHOBJ = .;$(LIBPATH)
-ALLLIB = import32.lib cw32i.lib
-# ---------------------------------------------------------------------------
-CFLAG1 = -O2 -Ve -X- -a8 -$(CPU) -b -d -k- -vi -tWM- -DHAVE_CONFIG_H
-
-LFLAGS = -D"" -ap -Tpe -x -Gn
-# ---------------------------------------------------------------------------
-# MAKE SECTION
-# ---------------------------------------------------------------------------
-# This section of the project file is not used by the BCB IDE. It is for
-# the benefit of building from the command-line using the MAKE utility.
-# ---------------------------------------------------------------------------
-
-.autodepend
-# ---------------------------------------------------------------------------
-
-!if !$d(BCC32)
-BCC32 = bcc32
-!endif
-
-!if !$d(LINKER)
-LINKER = ilink32
-!endif
-
-# ---------------------------------------------------------------------------
-!if $d(PATHC)
-.PATH.C = $(PATHC)
-!endif
-
-# ---------------------------------------------------------------------------
-pcre: includes tables $(OBJFILES)
-
-# ---------------------------------------------------------------------------
-.c.obj:
- $(BCC)\BIN\$(BCC32) -c $(CFLAG1) $(CallingConvention) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }
-
-includes:
- copy /Y $(pcresrc)\pcre.h.generic $(pcresrc)\pcre.h
- copy /Y $(pcresrc)\config.h.generic $(pcresrc)\config.h
-
-tables:
- $(BCC)\BIN\$(BCC32) -c -tWC $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n.\ $(pcresrc)\dftables.c
- $(BCC)\BIN\$(LINKER) $(LFLAGS) -L$(LIBPATH) c0x32.obj .\dftables.obj, .\dftables.exe,, $(ALLLIB),,
- del dftables.tds
- del dftables.obj
- dftables.exe pcre_default_tables.c
- del dftables.exe
-# ---------------------------------------------------------------------------
-
-
-
-
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_compile.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_config.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_default_tables.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_dfa_exec.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_exec.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_fullinfo.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_get.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_globals.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_info.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_maketables.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_newline.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_ord2utf8.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_refcount.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_study.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_tables.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_try_flipped.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_ucd.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_valid_utf8.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_version.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/pcre/pcre_xclass.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win32
___________________________________________________________________
Added: tsvn:projectlanguage
+ 0x0409
Added: bugtraq:url
+ http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
+ (Mantis #%BUGID%)
Added: svn:ignore
+ pcre_default_tables.c
Added: bugtraq:logregex
+ [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)
Copied: trunk/jcl/source/windows/obj/pcre/win32/dirinfo.txt (from rev 3678, trunk/jcl/source/windows/obj/pcre/dirinfo.txt)
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win32/dirinfo.txt (rev 0)
+++ trunk/jcl/source/windows/obj/pcre/win32/dirinfo.txt 2012-01-07 18:39:07 UTC (rev 3679)
@@ -0,0 +1 @@
+This is the directory where object files of PCRE (http://www.pcre.org/) for win32 reside.
\ No newline at end of file
Copied: trunk/jcl/source/windows/obj/pcre/win32/makefile.mak (from rev 3678, trunk/jcl/source/windows/obj/pcre/makefile.mak)
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win32/makefile.mak (rev 0)
+++ trunk/jcl/source/windows/obj/pcre/win32/makefile.mak 2012-01-07 18:39:07 UTC (rev 3679)
@@ -0,0 +1,130 @@
+#
+# makefile to make pcre .obj files using Borland's C++ compiler bcc32
+# derived from a makefile generated by BCB6' bpr2mak
+#
+# if pcre source directory is different from ..\..\..\..\..\thirdparty\pcre\pcre-8.02, use
+# "make -Dpcresrc=<path to pcre sources>" to tell make where to find the
+# source files
+#
+# Make.exe needs to reside in the same directory as bcc32.exe.
+# For example, if you have Borlands free C++ v. 5.5 compiler (available from
+# http://www.borland.com/products/downloads/download_cbuilder.html#) installed:
+#
+# >C:\Program Files\Borland\BCC55\Bin\make
+#
+# or, if you want to use C++ Builder 6:
+#
+# >C:\Program Files\Borland\CBuilder6\Bin\make
+#
+# or, if you want to use Borland Developer Studio 2006:
+#
+# >C:\Program files\Borland\BDS\4.0\bin\make
+#
+# To choose the target CPU, pass "-DCPU=n" as option to make, with n being a
+# number between 3 and 6, with the following meanings:
+#
+# n Target CPU (or compatible)
+# --------------------------------
+# 3 80386
+# 4 80486
+# 5 Pentium (default)
+# 6 Pentium Pro
+#
+# Robert Rossmair, 2004-10-16
+#
+
+CallingConvention = -pr
+
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+BCC = $(BCB)
+
+!if !$d(pcresrc)
+pcresrc = ..\..\..\..\..\thirdparty\pcre\pcre-8.02
+!endif
+
+!if !$d(CPU)
+CPU = 5 # Pentium
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.06.00
+# ---------------------------------------------------------------------------
+OBJFILES = .\pcre_compile.obj .\pcre_config.obj .\pcre_dfa_exec.obj \
+ .\pcre_exec.obj .\pcre_fullinfo.obj .\pcre_get.obj .\pcre_globals.obj \
+ .\pcre_info.obj .\pcre_maketables.obj .\pcre_newline.obj \
+ .\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj .\pcre_tables.obj \
+ .\pcre_try_flipped.obj .\pcre_ucd.obj .\pcre_valid_utf8.obj \
+ .\pcre_version.obj .\pcre_xclass.obj .\pcre_default_tables.obj
+
+# ---------------------------------------------------------------------------
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+USERDEFINES = SUPPORT_UTF8;SUPPORT_UCP
+SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
+INCLUDEPATH = $(pcresrc);$(BCC)\include;$(BCB)\include\vcl
+LIBPATH = $(BCB)\lib\obj;$(BCB)\lib
+# LIBPATH = $(pcresrc)
+WARNINGS= -wpar -w-aus
+PATHC = .;$(pcresrc)
+# PATHOBJ = .;$(LIBPATH)
+ALLLIB = import32.lib cw32i.lib
+# ---------------------------------------------------------------------------
+CFLAG1 = -O2 -Ve -X- -a8 -$(CPU) -b -d -k- -vi -tWM- -DHAVE_CONFIG_H
+
+LFLAGS = -D"" -ap -Tpe -x -Gn
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE. It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+# ---------------------------------------------------------------------------
+!if $d(PATHC)
+.PATH.C = $(PATHC)
+!endif
+
+# ---------------------------------------------------------------------------
+pcre: includes tables $(OBJFILES)
+
+# ---------------------------------------------------------------------------
+.c.obj:
+ $(BCC)\BIN\$(BCC32) -c $(CFLAG1) $(CallingConvention) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }
+
+includes:
+ copy /Y $(pcresrc)\pcre.h.generic $(pcresrc)\pcre.h
+ copy /Y $(pcresrc)\config.h.generic $(pcresrc)\config.h
+
+tables:
+ $(BCC)\BIN\$(BCC32) -c -tWC $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n.\ $(pcresrc)\dftables.c
+ $(BCC)\BIN\$(LINKER) $(LFLAGS) -L$(LIBPATH) c0x32.obj .\dftables.obj, .\dftables.exe,, $(ALLLIB),,
+ del dftables.tds
+ del dftables.obj
+ dftables.exe pcre_default_tables.c
+ del dftables.exe
+# ---------------------------------------------------------------------------
+
+
+
+
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_compile.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_compile.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_config.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_config.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_default_tables.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_default_tables.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_dfa_exec.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_dfa_exec.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_exec.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_exec.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_fullinfo.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_fullinfo.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_get.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_get.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_globals.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_globals.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_info.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_info.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_maketables.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_maketables.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_newline.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_newline.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_ord2utf8.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_ord2utf8.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_refcount.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_refcount.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_study.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_study.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_tables.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_tables.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_try_flipped.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_try_flipped.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_ucd.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_ucd.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_valid_utf8.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_valid_utf8.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_version.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_version.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/pcre/win32/pcre_xclass.obj (from rev 3678, trunk/jcl/source/windows/obj/pcre/pcre_xclass.obj)
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/pcre/win64
___________________________________________________________________
Added: tsvn:projectlanguage
+ 0x0409
Added: bugtraq:url
+ http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
+ (Mantis #%BUGID%)
Added: svn:ignore
+ pcre_default_tables.c
Added: bugtraq:logregex
+ [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)
Copied: trunk/jcl/source/windows/obj/pcre/win64/dirinfo.txt (from rev 3678, trunk/jcl/source/windows/obj/pcre/dirinfo.txt)
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win64/dirinfo.txt (rev 0)
+++ trunk/jcl/source/windows/obj/pcre/win64/dirinfo.txt 2012-01-07 18:39:07 UTC (rev 3679)
@@ -0,0 +1 @@
+This is the directory where object files of PCRE (http://www.pcre.org/) for win64 reside.
\ No newline at end of file
Deleted: trunk/jcl/source/windows/obj/zlib/adler32.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/zlib/compress.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/zlib/crc32.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/zlib/deflate.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/zlib/dirinfo.txt
===================================================================
--- trunk/jcl/source/windows/obj/zlib/dirinfo.txt 2012-01-06 20:05:42 UTC (rev 3678)
+++ trunk/jcl/source/windows/obj/zlib/dirinfo.txt 2012-01-07 18:39:07 UTC (rev 3679)
@@ -1 +0,0 @@
-This is the directory where object files for zlib (http://www.zlib.net) reside.
\ No newline at end of file
Deleted: trunk/jcl/source/windows/obj/zlib/infback.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/zlib/inffast.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/zlib/inflate.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/zlib/inftrees.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/zlib/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/zlib/makefile.mak 2012-01-06 20:05:42 UTC (rev 3678)
+++ trunk/jcl/source/windows/obj/zlib/makefile.mak 2012-01-07 18:39:07 UTC (rev 3679)
@@ -1,109 +0,0 @@
-#
-# makefile to make zlib .obj files using Borland's C++ compiler bcc32
-# derived from a makefile generated by BCB6' bpr2mak
-#
-# if zlib source directory is different from ..\..\..\..\..\thirdparty\zlib\zlib-1.2.5, use
-# "make -Dzlibsrc=<path to zlib sources>" to tell make where to find the
-# source files
-#
-# Make.exe needs to reside in the same directory as bcc32.exe.
-# For example, if you have Borlands free C++ v. 5.5 compiler (available from
-# http://www.borland.com/products/downloads/download_cbuilder.html#) installed:
-#
-# >C:\Program Files\Borland\BCC55\Bin\make
-#
-# or, if you want to use C++ Builder 6:
-#
-# >C:\Program Files\Borland\CBuilder6\Bin\make
-#
-# or, if you want to use Borland Developer Studio 2006:
-#
-# >C:\Program files\Borland\BDS\4.0\bin\make
-#
-# To choose the target CPU, pass "-DCPU=n" as option to make, with n being a
-# number between 3 and 6, with the following meanings:
-#
-# n Target CPU (or compatible)
-# --------------------------------
-# 3 80386
-# 4 80486
-# 5 Pentium (default)
-# 6 Pentium Pro
-#
-# Note: This assumes -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
-#
-# Robert Rossmair, 2004-10-16
-#
-
-CallingConvention = -pr -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
-
-!if !$d(BCB)
-BCB = $(MAKEDIR)\..
-!endif
-
-BCC = $(BCB)
-
-!if !$d(zlibsrc)
-zlibsrc = ..\..\..\..\..\thirdparty\zlib\zlib-1.2.5
-!endif
-
-!if !$d(CPU)
-CPU = 5 # Pentium
-!endif
-
-# ---------------------------------------------------------------------------
-# IDE SECTION
-# ---------------------------------------------------------------------------
-# The following section of the project makefile is managed by the BCB IDE.
-# It is recommended to use the IDE to change any of the values in this
-# section.
-# ---------------------------------------------------------------------------
-
-VERSION = BCB.06.00
-# ---------------------------------------------------------------------------
-OBJFILES = .\zutil.obj .\compress.obj .\crc32.obj .\deflate.obj \
- .\infback.obj .\inffast.obj .\inflate.obj .\inftrees.obj .\trees.obj \
- .\uncompr.obj .\adler32.obj
-# ---------------------------------------------------------------------------
-DEBUGLIBPATH = $(BCB)\lib\debug
-RELEASELIBPATH = $(BCB)\lib\release
-USERDEFINES =
-SYSDEFINES = NO_STRICT
-INCLUDEPATH = $(zlibsrc);$(BCC)\include;$(BCB)\include\vcl
-# LIBPATH = $(zlibsrc)
-WARNINGS= -w-par -w-aus
-PATHC = .;$(zlibsrc)
-# PATHOBJ = .;$(LIBPATH)
-# ---------------------------------------------------------------------------
-CFLAG1 = -O2 -Ve -X- -a8 -$(CPU) -b -d -k- -vi -tWM $(CallingConvention)
-
-# ---------------------------------------------------------------------------
-# MAKE SECTION
-# ---------------------------------------------------------------------------
-# This section of the project file is not used by the BCB IDE. It is for
-# the benefit of building from the command-line using the MAKE utility.
-# ---------------------------------------------------------------------------
-
-.autodepend
-# ---------------------------------------------------------------------------
-
-!if !$d(BCC32)
-BCC32 = bcc32
-!endif
-
-# ---------------------------------------------------------------------------
-!if $d(PATHC)
-.PATH.C = $(PATHC)
-!endif
-
-# ---------------------------------------------------------------------------
-zlib: $(OBJFILES)
-
-# ---------------------------------------------------------------------------
-.c.obj:
- $(BCC)\BIN\$(BCC32) -c $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }
-# ---------------------------------------------------------------------------
-
-
-
-
Deleted: trunk/jcl/source/windows/obj/zlib/trees.obj
===================================================================
(Binary files differ)
Deleted: trunk/jcl/source/windows/obj/zlib/uncompr.obj
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/zlib/win32
___________________________________________________________________
Added: tsvn:projectlanguage
+ 0x0409
Added: bugtraq:url
+ http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
+ (Mantis #%BUGID%)
Added: bugtraq:logregex
+ [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)
Copied: trunk/jcl/source/windows/obj/zlib/win32/adler32.obj (from rev 3678, trunk/jcl/source/windows/obj/zlib/adler32.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/zlib/win32/compress.obj (from rev 3678, trunk/jcl/source/windows/obj/zlib/compress.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/zlib/win32/crc32.obj (from rev 3678, trunk/jcl/source/windows/obj/zlib/crc32.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/zlib/win32/deflate.obj (from rev 3678, trunk/jcl/source/windows/obj/zlib/deflate.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/zlib/win32/dirinfo.txt (from rev 3678, trunk/jcl/source/windows/obj/zlib/dirinfo.txt)
===================================================================
--- trunk/jcl/source/windows/obj/zlib/win32/dirinfo.txt (rev 0)
+++ trunk/jcl/source/windows/obj/zlib/win32/dirinfo.txt 2012-01-07 18:39:07 UTC (rev 3679)
@@ -0,0 +1 @@
+This is the directory where object files of zlib (http://www.zlib.net) for win32 reside.
\ No newline at end of file
Copied: trunk/jcl/source/windows/obj/zlib/win32/infback.obj (from rev 3678, trunk/jcl/source/windows/obj/zlib/infback.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/zlib/win32/inffast.obj (from rev 3678, trunk/jcl/source/windows/obj/zlib/inffast.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/zlib/win32/inflate.obj (from rev 3678, trunk/jcl/source/windows/obj/zlib/inflate.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/zlib/win32/inftrees.obj (from rev 3678, trunk/jcl/source/windows/obj/zlib/inftrees.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/zlib/win32/makefile.mak (from rev 3678, trunk/jcl/source/windows/obj/zlib/makefile.mak)
===================================================================
--- trunk/jcl/source/windows/obj/zlib/win32/makefile.mak (rev 0)
+++ trunk/jcl/source/windows/obj/zlib/win32/makefile.mak 2012-01-07 18:39:07 UTC (rev 3679)
@@ -0,0 +1,109 @@
+#
+# makefile to make zlib .obj files using Borland's C++ compiler bcc32
+# derived from a makefile generated by BCB6' bpr2mak
+#
+# if zlib source directory is different from ..\..\..\..\..\thirdparty\zlib\zlib-1.2.5, use
+# "make -Dzlibsrc=<path to zlib sources>" to tell make where to find the
+# source files
+#
+# Make.exe needs to reside in the same directory as bcc32.exe.
+# For example, if you have Borlands free C++ v. 5.5 compiler (available from
+# http://www.borland.com/products/downloads/download_cbuilder.html#) installed:
+#
+# >C:\Program Files\Borland\BCC55\Bin\make
+#
+# or, if you want to use C++ Builder 6:
+#
+# >C:\Program Files\Borland\CBuilder6\Bin\make
+#
+# or, if you want to use Borland Developer Studio 2006:
+#
+# >C:\Program files\Borland\BDS\4.0\bin\make
+#
+# To choose the target CPU, pass "-DCPU=n" as option to make, with n being a
+# number between 3 and 6, with the following meanings:
+#
+# n Target CPU (or compatible)
+# --------------------------------
+# 3 80386
+# 4 80486
+# 5 Pentium (default)
+# 6 Pentium Pro
+#
+# Note: This assumes -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
+#
+# Robert Rossmair, 2004-10-16
+#
+
+CallingConvention = -pr -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
+
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+BCC = $(BCB)
+
+!if !$d(zlibsrc)
+zlibsrc = ..\..\..\..\..\thirdparty\zlib\zlib-1.2.5
+!endif
+
+!if !$d(CPU)
+CPU = 5 # Pentium
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.06.00
+# ---------------------------------------------------------------------------
+OBJFILES = .\zutil.obj .\compress.obj .\crc32.obj .\deflate.obj \
+ .\infback.obj .\inffast.obj .\inflate.obj .\inftrees.obj .\trees.obj \
+ .\uncompr.obj .\adler32.obj
+# ---------------------------------------------------------------------------
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+USERDEFINES =
+SYSDEFINES = NO_STRICT
+INCLUDEPATH = $(zlibsrc);$(BCC)\include;$(BCB)\include\vcl
+# LIBPATH = $(zlibsrc)
+WARNINGS= -w-par -w-aus
+PATHC = .;$(zlibsrc)
+# PATHOBJ = .;$(LIBPATH)
+# ---------------------------------------------------------------------------
+CFLAG1 = -O2 -Ve -X- -a8 -$(CPU) -b -d -k- -vi -tWM $(CallingConvention)
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE. It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+# ---------------------------------------------------------------------------
+!if $d(PATHC)
+.PATH.C = $(PATHC)
+!endif
+
+# ---------------------------------------------------------------------------
+zlib: $(OBJFILES)
+
+# ---------------------------------------------------------------------------
+.c.obj:
+ $(BCC)\BIN\$(BCC32) -c $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< }
+# ---------------------------------------------------------------------------
+
+
+
+
Copied: trunk/jcl/source/windows/obj/zlib/win32/trees.obj (from rev 3678, trunk/jcl/source/windows/obj/zlib/trees.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/zlib/win32/uncompr.obj (from rev 3678, trunk/jcl/source/windows/obj/zlib/uncompr.obj)
===================================================================
(Binary files differ)
Copied: trunk/jcl/source/windows/obj/zlib/win32/zutil.obj (from rev 3678, trunk/jcl/source/windows/obj/zlib/zutil.obj)
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/source/windows/obj/zlib/win64
___________________________________________________________________
Added: tsvn:projectlanguage
+ 0x0409
Added: bugtraq:url
+ http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
+ (Mantis #%BUGID%)
Added: bugtraq:logregex
+ [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)
Copied: trunk/jcl/source/windows/obj/zlib/win64/dirinfo.txt (from rev 3678, trunk/jcl/source/windows/obj/zlib/dirinfo.txt)
===================================================================
--- trunk/jcl/source/windows/obj/zlib/win64/dirinfo.txt (rev 0)
+++ trunk/jcl/source/windows/obj/zlib/win64/dirinfo.txt 2012-01-07 18:39:07 UTC (rev 3679)
@@ -0,0 +1 @@
+This is the directory where object files of zlib (http://www.zlib.net) for win64 reside.
\ No newline at end of file
Deleted: trunk/jcl/source/windows/obj/zlib/zutil.obj
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-06 20:05:48
|
Revision: 3678
http://jcl.svn.sourceforge.net/jcl/?rev=3678&view=rev
Author: outchy
Date: 2012-01-06 20:05:42 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
The Delphi badly emits the HPP files that reference IFileDialogCustomize.
Modified Paths:
--------------
trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
Modified: trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-06 19:35:24 UTC (rev 3677)
+++ trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-06 20:05:42 UTC (rev 3678)
@@ -54,6 +54,7 @@
{$ENDIF RTL185_UP}
type
+ {$NODEFINE TJclOpenDialogFavoritesHook} // IFileDialogCustomize is badly emitted
TJclOpenDialogFavoritesHook = class (TJclOpenDialogHook{$IFDEF NEWSTYLE}, IFileDialogControlEvents, IFileDialogEvents, IInterface{$ENDIF})
private
FFavoriteFolders: TStrings;
@@ -119,7 +120,9 @@
property FavoriteFolders: TStrings read FFavoriteFolders;
end;
+{$NODEFINE InitializeOpenDialogFavorites}
function InitializeOpenDialogFavorites: TJclOpenDialogFavoritesHook;
+{$NODEFINE FinalizeOpenDialogFavorites}
procedure FinalizeOpenDialogFavorites;
{$IFDEF UNITVERSIONING}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-06 19:35:31
|
Revision: 3677
http://jcl.svn.sourceforge.net/jcl/?rev=3677&view=rev
Author: outchy
Date: 2012-01-06 19:35:24 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
CheckOSError is not defined before XE2.
Modified Paths:
--------------
trunk/jcl/source/common/JclBase.pas
Modified: trunk/jcl/source/common/JclBase.pas
===================================================================
--- trunk/jcl/source/common/JclBase.pas 2012-01-05 23:07:02 UTC (rev 3676)
+++ trunk/jcl/source/common/JclBase.pas 2012-01-06 19:35:24 UTC (rev 3677)
@@ -282,6 +282,10 @@
procedure RaiseLastOSError;
{$ENDIF ~XPLATFORM_RTL}
+{$IFNDEF RTL230_UP}
+procedure CheckOSError(ErrorCode: Cardinal);
+{$ENDIF RTL230_UP}
+
procedure MoveChar(const Source: string; FromIndex: SizeInt;
var Dest: string; ToIndex, Count: SizeInt); overload; // Index: 0..n-1
@@ -522,6 +526,14 @@
end;
{$ENDIF ~XPLATFORM_RTL}
+{$IFNDEF RTL230_UP}
+procedure CheckOSError(ErrorCode: Cardinal);
+begin
+ if ErrorCode <> ERROR_SUCCESS then
+ RaiseLastOSError(ErrorCode);
+end;
+{$ENDIF RTL230_UP}
+
{$OVERFLOWCHECKS OFF}
function Addr64ToAddr32(const Value: TJclAddr64): TJclAddr32;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-05 23:07:09
|
Revision: 3676
http://jcl.svn.sourceforge.net/jcl/?rev=3676&view=rev
Author: outchy
Date: 2012-01-05 23:07:02 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Mantis 5760: Add a makemodified.bat which recompiles the installation without showing the installer.
Added Paths:
-----------
trunk/jcl/Make modified.bat
Added: trunk/jcl/Make modified.bat
===================================================================
--- trunk/jcl/Make modified.bat (rev 0)
+++ trunk/jcl/Make modified.bat 2012-01-05 23:07:02 UTC (rev 3676)
@@ -0,0 +1 @@
+Install.bat /AutoAcceptMPL /AcceptInformations /AcceptConfirmations /Install /CloseOnSuccess %*
\ No newline at end of file
Property changes on: trunk/jcl/Make modified.bat
___________________________________________________________________
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-05 22:59:34
|
Revision: 3675
http://jcl.svn.sourceforge.net/jcl/?rev=3675&view=rev
Author: outchy
Date: 2012-01-05 22:59:27 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Mantis 5471: Problem with favorite combobox in Open/Save dialogs on Vista and newer.
This patch provides a new hook for the new open/save dialogs (IFileDialog). However, the layout of the open/save dialogs cannot be customized and the combobox is not wide enough...
Modified Paths:
--------------
trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
trunk/jcl/source/vcl/JclOpenDialogHooks.pas
trunk/jcl/source/vcl/JclVclResources.pas
Modified: trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-05 18:50:45 UTC (rev 3674)
+++ trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-05 22:59:27 UTC (rev 3675)
@@ -35,9 +35,9 @@
uses
{$IFDEF HAS_UNITSCOPE}
- Winapi.Windows, Winapi.Messages, System.Classes, System.SysUtils, Vcl.Controls, Vcl.StdCtrls, Vcl.ExtCtrls,
+ Winapi.Windows, Winapi.Messages, Winapi.ShlObj, System.Classes, System.SysUtils, Vcl.Controls, Vcl.StdCtrls, Vcl.ExtCtrls,
{$ELSE ~HAS_UNITSCOPE}
- Windows, Messages, Classes, SysUtils, Controls, StdCtrls, ExtCtrls,
+ Windows, Messages, ShlObj, Classes, SysUtils, Controls, StdCtrls, ExtCtrls,
{$ENDIF ~HAS_UNITSCOPE}
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
@@ -45,23 +45,74 @@
JclPeImage, JclWin32,
JclOpenDialogHooks;
+// old-style open dialogs are supported by all versions of Delphi
+{$DEFINE OLDSTYLE}
+
+// new-style file dialogs are supported by Delphi 2007 and newer
+{$IFDEF RTL185_UP}
+{$DEFINE NEWSTYLE}
+{$ENDIF RTL185_UP}
+
type
- TJclOpenDialogFavoritesHook = class (TJclOpenDialogHook)
+ TJclOpenDialogFavoritesHook = class (TJclOpenDialogHook{$IFDEF NEWSTYLE}, IFileDialogControlEvents, IFileDialogEvents, IInterface{$ENDIF})
private
- FFavoriteComboBox: TComboBox;
FFavoriteFolders: TStrings;
- FFavoriteStaticText: TStaticText;
- FFavoritePanel: TPanel;
FTextAdd: string;
FTextDelete: string;
FTextVirtual: string;
+ {$IFDEF OLDSTYLE}
+ private
+ FFavoriteComboBox: TComboBox;
+ FFavoriteStaticText: TStaticText;
+ FFavoritePanel: TPanel;
procedure FavoriteComboBoxClick(Sender: TObject);
protected
procedure DialogAdjustControlPos; override;
procedure DialogFolderChange; override;
procedure DialogShow; override;
procedure DialogClose; override;
+ {$ENDIF OLDSTYLE}
+ {$IFDEF NEWSTYLE}
+ private
+ FComboboxCount: Integer;
+ FComboboxListItem,
+ FComboboxAddItem,
+ FComboboxDeleteItem,
+ FComboboxVirtualItem: Boolean;
+ FTextList: string;
+ procedure FileDialogCleanCombobox(const AFileDialogCustomize: IFileDialogCustomize);
+ procedure FileDialogFillCombobox(const AFileDialogCustomize: IFileDialogCustomize; ListItem, AddItem, DeleteItem, VirtualItem: Boolean);
+ protected
+ procedure FileDialogCreate(const AFileDialog: IFileDialog); override;
public
+ { IInterface }
+ function QueryInterface(const IID: TGUID; out Obj): HResult; stdcall;
+ function _AddRef: Integer; stdcall;
+ function _Release: Integer; stdcall;
+ public
+ { IFileDialogEvents }
+ function OnFileOk(const pfd: IFileDialog): HResult; stdcall;
+ function OnFolderChanging(const pfd: IFileDialog;
+ const psiFolder: IShellItem): HResult; stdcall;
+ function OnFolderChange(const pfd: IFileDialog): HResult; stdcall;
+ function OnSelectionChange(const pfd: IFileDialog): HResult; stdcall;
+ function OnShareViolation(const pfd: IFileDialog; const psi: IShellItem;
+ out pResponse: DWORD): HResult; stdcall;
+ function OnTypeChange(const pfd: IFileDialog): HResult; stdcall;
+ function OnOverwrite(const pfd: IFileDialog; const psi: IShellItem;
+ out pResponse: DWORD): HResult; stdcall;
+ public
+ { IFileDialogControlEvents }
+ function OnItemSelected(const pfdc: IFileDialogCustomize; dwIDCtl: DWORD;
+ dwIDItem: DWORD): HResult; stdcall;
+ function OnButtonClicked(const pfdc: IFileDialogCustomize;
+ dwIDCtl: DWORD): HResult; stdcall;
+ function OnCheckButtonToggled(const pfdc: IFileDialogCustomize;
+ dwIDCtl: DWORD; bChecked: BOOL): HResult; stdcall;
+ function OnControlActivating(const pfdc: IFileDialogCustomize;
+ dwIDCtl: DWORD): HResult; stdcall;
+ {$ENDIF NEWSTYLE}
+ public
constructor Create; override;
destructor Destroy; override;
procedure LoadFavorites(const FileName: string);
@@ -93,6 +144,15 @@
{$ENDIF ~HAS_UNITSCOPE}
JclBase, JclFileUtils, JclStrings, JclSysInfo, JclSysUtils, JclVclResources;
+{$IFDEF NEWSTYLE}
+const
+ CTRLID_COMBOBOX = $2346;
+ ITEMID_LIST = $FFFF;
+ ITEMID_ADD = $FFFE;
+ ITEMID_DELETE = $FFFD;
+ ITEMID_VIRTUAL = $FFFC;
+{$ENDIF NEWSTYLE}
+
function InitializeOpenDialogFavorites: TJclOpenDialogFavoritesHook;
begin
Result := InitializeOpenDialogHook(TJclOpenDialogFavoritesHook) as TJclOpenDialogFavoritesHook;
@@ -110,6 +170,7 @@
inherited Create;
FFavoriteFolders := TStringList.Create;
+ {$IFDEF OLDSTYLE}
FFavoritePanel := TPanel.Create(nil);
FFavoritePanel.Name := 'FavoritePanel';
FFavoritePanel.BevelOuter := bvNone;
@@ -128,21 +189,29 @@
FFavoriteStaticText.Caption := LoadResString(@RsOpenDialogFavorites);
FFavoriteStaticText.AutoSize := True;
FFavoriteStaticText.FocusControl := FFavoriteComboBox;
+ {$ENDIF OLDSTYLE}
FTextAdd := LoadResString(@RsOpenDialogAdd);
FTextDelete := LoadResString(@RsOpenDialogDelete);
FTextVirtual := LoadResString(@RsOpenDialogVirtual);
+
+ {$IFDEF NEWSTYLE}
+ FTextList := LoadResString(@RsOpenDialogList);
+ {$ENDIF NEWSTYLE}
end;
destructor TJclOpenDialogFavoritesHook.Destroy;
begin
+ {$IFDEF OLDSTYLE}
FreeAndNil(FFavoriteComboBox);
FreeAndNil(FFavoritePanel);
FreeAndNil(FFavoriteStaticText);
+ {$ENDIF OLDSTYLE}
FreeAndNil(FFavoriteFolders);
inherited Destroy;
end;
+{$IFDEF OLDSTYLE}
procedure TJclOpenDialogFavoritesHook.DialogAdjustControlPos;
var
FileTypeStaticTextRect, FileTypeEditRect, // ID = 1136 1089
@@ -251,7 +320,69 @@
// switch to selected folder
CurrentFolder := FFavoriteComboBox.Items[FFavoriteComboBox.ItemIndex];
end;
+{$ENDIF OLDSTYLE}
+{$IFDEF NEWSTYLE}
+procedure TJclOpenDialogFavoritesHook.FileDialogCreate(
+ const AFileDialog: IFileDialog);
+var
+ FileDialogCustomize: IFileDialogCustomize;
+ Unused: Cardinal;
+begin
+ inherited FileDialogCreate(AFileDialog);
+ FileDialogCustomize := AFileDialog as IFileDialogCustomize;
+ //CheckOSError(FileDialogCustomize.StartVisualGroup(CTRLID_GROUP, PWideChar(WideString(LoadResString(@RsOpenDialogFavorites)))));
+ CheckOSError(FileDialogCustomize.AddComboBox(CTRLID_COMBOBOX));
+ //CheckOSError(FileDialogCustomize.EndVisualGroup);
+ CheckOSError(FileDialogCustomize.MakeProminent(CTRLID_COMBOBOX));
+ CheckOSError(AFileDialog.Advise(Self, Unused));
+end;
+
+procedure TJclOpenDialogFavoritesHook.FileDialogCleanCombobox(
+ const AFileDialogCustomize: IFileDialogCustomize);
+var
+ I: Integer;
+begin
+ if FComboboxListItem then
+ CheckOSError(AFileDialogCustomize.RemoveControlItem(CTRLID_COMBOBOX, ITEMID_LIST));
+ FComboboxListItem := False;
+ if FComboboxAddItem then
+ CheckOSError(AFileDialogCustomize.RemoveControlItem(CTRLID_COMBOBOX, ITEMID_ADD));
+ FComboboxAddItem := False;
+ if FComboboxDeleteItem then
+ CheckOSError(AFileDialogCustomize.RemoveControlItem(CTRLID_COMBOBOX, ITEMID_DELETE));
+ FComboboxDeleteItem := False;
+ if FComboboxVirtualItem then
+ CheckOSError(AFileDialogCustomize.RemoveControlItem(CTRLID_COMBOBOX, ITEMID_VIRTUAL));
+ FComboboxVirtualItem := False;
+ for I := 0 to FComboboxCount - 1 do
+ CheckOSError(AFileDialogCustomize.RemoveControlItem(CTRLID_COMBOBOX, I));
+ FComboboxCount := 0;
+end;
+
+procedure TJclOpenDialogFavoritesHook.FileDialogFillCombobox(
+ const AFileDialogCustomize: IFileDialogCustomize; ListItem, AddItem, DeleteItem, VirtualItem: Boolean);
+var
+ I: Integer;
+begin
+ if ListItem then
+ CheckOSError(AFileDialogCustomize.AddControlItem(CTRLID_COMBOBOX, ITEMID_LIST, PWideChar(WideString(FTextList))));
+ FComboboxListItem := ListItem;
+ if AddItem then
+ CheckOSError(AFileDialogCustomize.AddControlItem(CTRLID_COMBOBOX, ITEMID_ADD, PWideChar(WideString(FTextAdd))));
+ FComboboxAddItem := AddItem;
+ if DeleteItem then
+ CheckOSError(AFileDialogCustomize.AddControlItem(CTRLID_COMBOBOX, ITEMID_DELETE, PWideChar(WideString(FTextDelete))));
+ FComboboxDeleteItem := DeleteItem;
+ if VirtualItem then
+ CheckOSError(AFileDialogCustomize.AddControlItem(CTRLID_COMBOBOX, ITEMID_VIRTUAL, PWideChar(WideString(FTextVirtual))));
+ FComboboxVirtualItem := VirtualItem;
+ FComboboxCount := FFavoriteFolders.Count;
+ for I := 0 to FComboboxCount - 1 do
+ CheckOSError(AFileDialogCustomize.AddControlItem(CTRLID_COMBOBOX, I, PWideChar(WideString(FFavoriteFolders.Strings[I]))));
+end;
+{$ENDIF NEWSTYLE}
+
procedure TJclOpenDialogFavoritesHook.LoadFavorites(const FileName: string);
begin
if FileExists(FileName) then
@@ -260,6 +391,175 @@
FavoriteFolders.Clear;
end;
+{$IFDEF NEWSTYLE}
+function TJclOpenDialogFavoritesHook.OnButtonClicked(
+ const pfdc: IFileDialogCustomize; dwIDCtl: DWORD): HResult;
+begin
+ Result := S_OK;
+end;
+
+function TJclOpenDialogFavoritesHook.OnCheckButtonToggled(
+ const pfdc: IFileDialogCustomize; dwIDCtl: DWORD; bChecked: BOOL): HResult;
+begin
+ Result := S_OK;
+end;
+
+function TJclOpenDialogFavoritesHook.OnControlActivating(
+ const pfdc: IFileDialogCustomize; dwIDCtl: DWORD): HResult;
+begin
+ Result := S_OK;
+end;
+
+function TJclOpenDialogFavoritesHook.OnFileOk(const pfd: IFileDialog): HResult;
+begin
+ Result := S_OK;
+end;
+
+function TJclOpenDialogFavoritesHook.OnFolderChange(
+ const pfd: IFileDialog): HResult;
+var
+ pfdc: IFileDialogCustomize;
+ ppsi: IShellItem;
+ Path: PWideChar;
+ ItemIndex: Integer;
+begin
+ Result := S_OK;
+ pfdc := pfd as IFileDialogCustomize;
+ CheckOSError(pfd.GetFolder(ppsi));
+ if not Succeeded(ppsi.GetDisplayName(SIGDN_FILESYSPATH, Path)) then
+ Path := nil;
+ ItemIndex := FFavoriteFolders.IndexOf(Path);
+ if ItemIndex = -1 then
+ begin
+ if Path <> '' then
+ begin
+ FileDialogCleanCombobox(pfdc);
+ FileDialogFillCombobox(pfdc, True, True, False, False);
+ CheckOSError(pfdc.SetSelectedControlItem(CTRLID_COMBOBOX, ITEMID_LIST));
+ end
+ else
+ begin
+ FileDialogCleanCombobox(pfdc);
+ FileDialogFillCombobox(pfdc, False, False, False, True);
+ CheckOSError(pfdc.SetSelectedControlItem(CTRLID_COMBOBOX, ITEMID_VIRTUAL));
+ end;
+ end
+ else
+ begin
+ FileDialogCleanCombobox(pfdc);
+ FileDialogFillCombobox(pfdc, False, False, True, False);
+ CheckOSError(pfdc.SetSelectedControlItem(CTRLID_COMBOBOX, ItemIndex));
+ end;
+end;
+
+function TJclOpenDialogFavoritesHook.OnFolderChanging(const pfd: IFileDialog;
+ const psiFolder: IShellItem): HResult;
+begin
+ Result := S_OK;
+end;
+
+function TJclOpenDialogFavoritesHook.OnItemSelected(
+ const pfdc: IFileDialogCustomize; dwIDCtl, dwIDItem: DWORD): HResult;
+var
+ I: Integer;
+ pfd: IFileDialog;
+ ppsi: IShellItem;
+ Path: PWideChar;
+begin
+ Result := S_OK;
+ if dwIDCtl = CTRLID_COMBOBOX then
+ begin
+ pfd := pfdc as IFileDialog;
+ CheckOSError(pfd.GetFolder(ppsi));
+ if not Succeeded(ppsi.GetDisplayName(SIGDN_FILESYSPATH, Path)) then
+ Path := nil;
+ if dwIDItem = ITEMID_DELETE then
+ begin
+ I := FFavoriteFolders.IndexOf(Path);
+ if I >= 0 then
+ begin
+ // delete current folder
+ if MessageBox(FHandle,
+ PChar(Format(LoadResString(@RsOpenDialogDelConfirm), [Path])),
+ PChar(LoadResString(@RsOpenDialogConfirmation)),
+ MB_YESNO or MB_ICONQUESTION or MB_DEFBUTTON2) = ID_YES then
+ begin
+ FFavoriteFolders.Delete(I);
+ FileDialogCleanCombobox(pfdc);
+ FileDialogFillCombobox(pfdc, True, True, False, False);
+ CheckOSError(pfdc.SetSelectedControlItem(CTRLID_COMBOBOX, ITEMID_LIST));
+ end;
+ end;
+ end
+ else
+ if dwIDItem = ITEMID_ADD then
+ begin
+ if Path <> '' then
+ begin
+ // add current folder
+ I := FFavoriteFolders.Add(Path);
+ FileDialogCleanCombobox(pfdc);
+ FileDialogFillCombobox(pfdc, False, False, True, False);
+ CheckOSError(pfdc.SetSelectedControlItem(CTRLID_COMBOBOX, I));
+ end;
+ end
+ else
+ //if dwIDItem >= 0 then
+ begin
+ // switch to selected folder
+ CheckOSError(SHCreateItemFromParsingName(PWideChar(WideString(FFavoriteFolders.Strings[dwIDItem])), nil, IShellItem, ppsi));
+ CheckOSError(pfd.SetFolder(ppsi));
+ FileDialogCleanCombobox(pfdc);
+ FileDialogFillCombobox(pfdc, False, False, True, False);
+ CheckOSError(pfdc.SetSelectedControlItem(CTRLID_COMBOBOX, dwIDItem));
+ end;
+ end;
+end;
+
+function TJclOpenDialogFavoritesHook.OnOverwrite(const pfd: IFileDialog;
+ const psi: IShellItem; out pResponse: DWORD): HResult;
+begin
+ Result := S_OK;
+end;
+
+function TJclOpenDialogFavoritesHook.OnSelectionChange(
+ const pfd: IFileDialog): HResult;
+begin
+ Result := S_OK;
+end;
+
+function TJclOpenDialogFavoritesHook.OnShareViolation(const pfd: IFileDialog;
+ const psi: IShellItem; out pResponse: DWORD): HResult;
+begin
+ Result := S_OK;
+end;
+
+function TJclOpenDialogFavoritesHook.OnTypeChange(
+ const pfd: IFileDialog): HResult;
+begin
+ Result := S_OK;
+end;
+
+function TJclOpenDialogFavoritesHook.QueryInterface(const IID: TGUID;
+ out Obj): HResult;
+begin
+ if GetInterface(IID, Obj) then
+ Result := 0
+ else
+ Result := E_NOINTERFACE;
+end;
+
+function TJclOpenDialogFavoritesHook._AddRef: Integer;
+begin
+ Result := -1;
+end;
+
+function TJclOpenDialogFavoritesHook._Release: Integer;
+begin
+ Result := -1;
+end;
+{$ENDIF NEWSTYLE}
+
{$IFDEF UNITVERSIONING}
initialization
RegisterUnitVersion(HInstance, UnitVersioning);
Modified: trunk/jcl/source/vcl/JclOpenDialogHooks.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogHooks.pas 2012-01-05 18:50:45 UTC (rev 3674)
+++ trunk/jcl/source/vcl/JclOpenDialogHooks.pas 2012-01-05 22:59:27 UTC (rev 3675)
@@ -35,9 +35,9 @@
uses
{$IFDEF HAS_UNITSCOPE}
- Winapi.Windows, Winapi.Messages, System.Classes, System.SysUtils, Vcl.Controls, Vcl.StdCtrls, Vcl.ExtCtrls,
+ Winapi.Windows, Winapi.Messages, Winapi.ShlObj, System.Classes, System.SysUtils, Vcl.Controls, Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.Dialogs,
{$ELSE ~HAS_UNITSCOPE}
- Windows, Messages, Classes, SysUtils, Controls, StdCtrls, ExtCtrls,
+ Windows, Messages, ShlObj, Classes, SysUtils, Controls, StdCtrls, ExtCtrls, Dialogs,
{$ENDIF ~HAS_UNITSCOPE}
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
@@ -45,6 +45,24 @@
JclBase, JclPeImage, JclWin32;
type
+ EJclOpenDialogHookError = class(EJclError);
+
+ TJclFileOpenDialogHook = class (TFileOpenDialog)
+ strict protected
+ function CreateFileDialog: IFileDialog; override;
+ public
+ class procedure InstallHook(out OldHandler: Pointer);
+ class procedure UninstallHook(OldHandler: Pointer);
+ end;
+
+ TJclFileSaveDialogHook = class (TFileSaveDialog)
+ strict protected
+ function CreateFileDialog: IFileDialog; override;
+ public
+ class procedure InstallHook(out OldHandler: Pointer);
+ class procedure UninstallHook(OldHandler: Pointer);
+ end;
+
TJclOpenDialogHook = class (TObject)
private
FDisableHelpButton: Boolean;
@@ -56,6 +74,8 @@
FPictureDialogLastFolder: string;
FWndInstance: Pointer;
FOldWndInstance: Pointer;
+ FOldFileOpenCreateFileDialog: Pointer;
+ FOldFileSaveCreateFileDialog: Pointer;
FOnClose: TNotifyEvent;
FOnShow: TNotifyEvent;
function GetCurrentFolder: string;
@@ -68,6 +88,7 @@
procedure DialogFolderChange; virtual;
procedure DialogShow; virtual;
procedure DialogClose; virtual;
+ procedure FileDialogCreate(const AFileDialog: IFileDialog); virtual;
procedure DoClose;
procedure DoShow;
procedure ParentWndProc(var Message: TMessage); virtual;
@@ -89,8 +110,6 @@
TJclOpenDialogHookClass = class of TJclOpenDialogHook;
- EJclOpenDialogHookError = class(EJclError);
-
function InitializeOpenDialogHook(OpenDialogHookClass: TJclOpenDialogHookClass): TJclOpenDialogHook;
procedure FinalizeOpenDialogHook;
@@ -212,6 +231,78 @@
FreeAndNil(GlobalOpenDialogHook);
end;
+//=== { TJclFileOpenDialogHook } =============================================
+
+function TJclFileOpenDialogHook.CreateFileDialog: IFileDialog;
+begin
+ Result := inherited CreateFileDialog;
+ GlobalOpenDialogHook.FileDialogCreate(Result);
+end;
+
+class procedure TJclFileOpenDialogHook.InstallHook(out OldHandler: Pointer);
+var
+ I: Integer;
+begin
+ for I := 0 to GetVirtualMethodCount(TFileOpenDialog) - 1 do
+ begin
+ OldHandler := GetVirtualMethod(TFileOpenDialog, I);
+ if OldHandler = @TFileOpenDialog.CreateFileDialog then
+ begin
+ SetVirtualMethod(TFileOpenDialog, I, @TJclFileOpenDialogHook.CreateFileDialog);
+ Exit;
+ end;
+ end;
+ OldHandler := nil;
+end;
+
+class procedure TJclFileOpenDialogHook.UninstallHook(OldHandler: Pointer);
+var
+ I: Integer;
+begin
+ for I := 0 to GetVirtualMethodCount(TFileOpenDialog) - 1 do
+ if GetVirtualMethod(TFileOpenDialog, I) = @TJclFileOpenDialogHook.CreateFileDialog then
+ begin
+ SetVirtualMethod(TFileOpenDialog, I, OldHandler);
+ Break;
+ end;
+end;
+
+//=== { TJclFileSaveDialogHook } =============================================
+
+function TJclFileSaveDialogHook.CreateFileDialog: IFileDialog;
+begin
+ Result := inherited CreateFileDialog;
+ GlobalOpenDialogHook.FileDialogCreate(Result);
+end;
+
+class procedure TJclFileSaveDialogHook.InstallHook(out OldHandler: Pointer);
+var
+ I: Integer;
+begin
+ for I := 0 to GetVirtualMethodCount(TFileSaveDialog) - 1 do
+ begin
+ OldHandler := GetVirtualMethod(TFileSaveDialog, I);
+ if OldHandler = @TFileSaveDialog.CreateFileDialog then
+ begin
+ SetVirtualMethod(TFileSaveDialog, I, @TJclFileSaveDialogHook.CreateFileDialog);
+ Exit;
+ end;
+ end;
+ OldHandler := nil;
+end;
+
+class procedure TJclFileSaveDialogHook.UninstallHook(OldHandler: Pointer);
+var
+ I: Integer;
+begin
+ for I := 0 to GetVirtualMethodCount(TFileSaveDialog) - 1 do
+ if GetVirtualMethod(TFileSaveDialog, I) = @TJclFileSaveDialogHook.CreateFileDialog then
+ begin
+ SetVirtualMethod(TFileSaveDialog, I, OldHandler);
+ Break;
+ end;
+end;
+
//=== { TJclOpenDialogHook } =================================================
constructor TJclOpenDialogHook.Create;
@@ -267,6 +358,11 @@
FOnShow(Self);
end;
+procedure TJclOpenDialogHook.FileDialogCreate(const AFileDialog: IFileDialog);
+begin
+ // override to customize
+end;
+
function TJclOpenDialogHook.GetCurrentFolder: string;
var
Path: array [0..MAX_PATH] of Char;
@@ -317,6 +413,8 @@
finally
Pe.Free;
end;
+ TJclFileOpenDialogHook.InstallHook(FOldFileOpenCreateFileDialog);
+ TJclFileSaveDialogHook.InstallHook(FOldFileSaveCreateFileDialog);
end;
procedure TJclOpenDialogHook.ParentWndProc(var Message: TMessage);
@@ -353,6 +451,8 @@
while I < FHooks.Count do
if not FHooks[I].Unhook then
Inc(I);
+ TJclFileOpenDialogHook.UninstallHook(FOldFileOpenCreateFileDialog);
+ TJclFileSaveDialogHook.UninstallHook(FOldFileSaveCreateFileDialog);
end;
procedure TJclOpenDialogHook.WndProc(var Message: TMessage);
Modified: trunk/jcl/source/vcl/JclVclResources.pas
===================================================================
--- trunk/jcl/source/vcl/JclVclResources.pas 2012-01-05 18:50:45 UTC (rev 3674)
+++ trunk/jcl/source/vcl/JclVclResources.pas 2012-01-05 22:59:27 UTC (rev 3675)
@@ -87,6 +87,7 @@
//=== JclOpenDialogFavorites.pas =============================================
resourcestring
+ RsOpenDialogList = ' --> Favorites';
RsOpenDialogAdd = ' --> Add to this list';
RsOpenDialogDelete = ' --> Delete from this list';
RsOpenDialogVirtual = ' --> Virtual directories cannot be added to the favorites';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-05 18:50:52
|
Revision: 3674
http://jcl.svn.sourceforge.net/jcl/?rev=3674&view=rev
Author: outchy
Date: 2012-01-05 18:50:45 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
fix an issue on Windows XP and newer when a virtual directory is about to be added to the favorites.
Modified Paths:
--------------
trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
trunk/jcl/source/vcl/JclVclResources.pas
Modified: trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-05 18:15:44 UTC (rev 3673)
+++ trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-05 18:50:45 UTC (rev 3674)
@@ -54,6 +54,7 @@
FFavoritePanel: TPanel;
FTextAdd: string;
FTextDelete: string;
+ FTextVirtual: string;
procedure FavoriteComboBoxClick(Sender: TObject);
protected
procedure DialogAdjustControlPos; override;
@@ -130,6 +131,7 @@
FTextAdd := LoadResString(@RsOpenDialogAdd);
FTextDelete := LoadResString(@RsOpenDialogDelete);
+ FTextVirtual := LoadResString(@RsOpenDialogVirtual);
end;
destructor TJclOpenDialogFavoritesHook.Destroy;
@@ -190,7 +192,10 @@
FFavoriteComboBox.ItemIndex := FFavoriteComboBox.Items.IndexOf(Path);
if FFavoriteComboBox.ItemIndex = -1 then
begin
- FFavoriteComboBox.Items[0] := FTextAdd;
+ if Path <> '' then
+ FFavoriteComboBox.Items[0] := FTextAdd
+ else
+ FFavoriteComboBox.Items[0] := FTextVirtual;
FFavoriteComboBox.ItemIndex := 0;
end
else
@@ -233,6 +238,7 @@
end;
end
else
+ if Path <> '' then
begin
// add current folder
FFavoriteComboBox.ItemIndex := FFavoriteComboBox.Items.Add(Path);
Modified: trunk/jcl/source/vcl/JclVclResources.pas
===================================================================
--- trunk/jcl/source/vcl/JclVclResources.pas 2012-01-05 18:15:44 UTC (rev 3673)
+++ trunk/jcl/source/vcl/JclVclResources.pas 2012-01-05 18:50:45 UTC (rev 3674)
@@ -89,6 +89,7 @@
resourcestring
RsOpenDialogAdd = ' --> Add to this list';
RsOpenDialogDelete = ' --> Delete from this list';
+ RsOpenDialogVirtual = ' --> Virtual directories cannot be added to the favorites';
RsOpenDialogFavorites = '&Favorites:';
RsOpenDialogConfirmation = 'Confirmation';
RsOpenDialogDelConfirm = 'Are you sure to delete "%s" from favorite folders?';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-05 18:15:51
|
Revision: 3673
http://jcl.svn.sourceforge.net/jcl/?rev=3673&view=rev
Author: outchy
Date: 2012-01-05 18:15:44 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
New style favorite combobox for the open/save dialog: the add/del button is removed, its action is now implemented by a dedicated item in the combobox.
Modified Paths:
--------------
trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
trunk/jcl/source/vcl/JclVclResources.pas
Modified: trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-05 17:59:51 UTC (rev 3672)
+++ trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-05 18:15:44 UTC (rev 3673)
@@ -48,20 +48,18 @@
type
TJclOpenDialogFavoritesHook = class (TJclOpenDialogHook)
private
- FAddButton: TButton;
- FDeleteMode: Boolean;
FFavoriteComboBox: TComboBox;
FFavoriteFolders: TStrings;
+ FFavoriteStaticText: TStaticText;
FFavoritePanel: TPanel;
- procedure AddButtonClick(Sender: TObject);
+ FTextAdd: string;
+ FTextDelete: string;
procedure FavoriteComboBoxClick(Sender: TObject);
- procedure SetDeleteMode(const Value: Boolean);
protected
procedure DialogAdjustControlPos; override;
procedure DialogFolderChange; override;
procedure DialogShow; override;
procedure DialogClose; override;
- property DeleteMode: Boolean read FDeleteMode write SetDeleteMode;
public
constructor Create; override;
destructor Destroy; override;
@@ -110,83 +108,43 @@
begin
inherited Create;
FFavoriteFolders := TStringList.Create;
+
FFavoritePanel := TPanel.Create(nil);
- with FFavoritePanel do
- begin
- Name := 'FavoritePanel';
- BevelOuter := bvNone;
- Caption := '';
- FullRepaint := False;
- FFavoriteComboBox := TComboBox.Create(FFavoritePanel);
- with FFavoriteComboBox do
- begin
- SetBounds(6, 14, 300, Height);
- Style := csDropDownList;
- Sorted := True;
- OnClick := FavoriteComboBoxClick;
- Parent := FFavoritePanel;
- end;
- with TStaticText.Create(FFavoritePanel) do
- begin
- AutoSize := False;
- SetBounds(6, 0, 100, 14);
- Caption := LoadResString(@RsOpenDialogFavorites);
- FocusControl := FFavoriteComboBox;
- Parent := FFavoritePanel;
- end;
- FAddButton := TButton.Create(FFavoritePanel);
- with FAddButton do
- begin
- SetBounds(333, 14, 75, 23);
- Caption := LoadResString(@RsOpenDialogAdd);
- OnClick := AddButtonClick;
- Parent := FFavoritePanel;
- end;
- end;
+ FFavoritePanel.Name := 'FavoritePanel';
+ FFavoritePanel.BevelOuter := bvNone;
+ FFavoritePanel.Caption := '';
+ FFavoritePanel.FullRepaint := False;
+
+ FFavoriteComboBox := TComboBox.Create(nil);
+ FFavoriteComboBox.Parent := FFavoritePanel;
+ FFavoriteComboBox.Align := alClient;
+ FFavoriteComboBox.Style := csDropDownList;
+ FFavoriteComboBox.Sorted := True;
+ FFavoriteComboBox.OnClick := FavoriteComboBoxClick;
+
+ FFavoriteStaticText := TStaticText.Create(nil);
+ FFavoriteStaticText.SetBounds(6, 18, FFavoriteStaticText.Width, FFavoriteStaticText.Height);
+ FFavoriteStaticText.Caption := LoadResString(@RsOpenDialogFavorites);
+ FFavoriteStaticText.AutoSize := True;
+ FFavoriteStaticText.FocusControl := FFavoriteComboBox;
+
+ FTextAdd := LoadResString(@RsOpenDialogAdd);
+ FTextDelete := LoadResString(@RsOpenDialogDelete);
end;
destructor TJclOpenDialogFavoritesHook.Destroy;
begin
+ FreeAndNil(FFavoriteComboBox);
FreeAndNil(FFavoritePanel);
+ FreeAndNil(FFavoriteStaticText);
FreeAndNil(FFavoriteFolders);
inherited Destroy;
end;
-procedure TJclOpenDialogFavoritesHook.AddButtonClick(Sender: TObject);
-var
- I: Integer;
- Path: string;
-begin
- if DeleteMode then
- begin
- I := FFavoriteComboBox.ItemIndex;
- Path := FFavoriteComboBox.Items[I];
- if MessageBox(FHandle,
- PChar(Format(LoadResString(@RsOpenDialogDelConfirm), [Path])),
- PChar(LoadResString(@RsOpenDialogConfirmation)),
- MB_YESNO or MB_ICONQUESTION or MB_DEFBUTTON2) = ID_YES then
- begin
- FFavoriteComboBox.Items.Delete(I);
- DeleteMode := False;
- end;
- end
- else
- begin
- Path := CurrentFolder;
- I := FFavoriteComboBox.Items.IndexOf(Path);
- if I = -1 then
- begin
- FFavoriteComboBox.Items.Add(Path);
- I := FFavoriteComboBox.Items.IndexOf(Path);
- FFavoriteComboBox.ItemIndex := I;
- DeleteMode := True;
- end;
- end;
-end;
-
procedure TJclOpenDialogFavoritesHook.DialogAdjustControlPos;
var
- ParentRect, FileNameEditRect, OkButtonRect: TRect;
+ FileTypeStaticTextRect, FileTypeEditRect, // ID = 1136 1089
+ FileNameStaticTextRect, FileNameEditRect: TRect; // ID = 1148 1090
procedure GetDlgItemRect(ItemID: Integer; var R: TRect);
begin
@@ -196,31 +154,30 @@
begin
inherited DialogAdjustControlPos;
- GetWindowRect(FParentWnd, ParentRect);
- if GetDlgItem(FParentWnd, edt1) <> 0 then
- GetDlgItemRect(edt1, FileNameEditRect)
- else
- GetDlgItemRect(cmb1, FileNameEditRect);
- GetDlgItemRect(1, OkButtonRect);
-// Salvatore Besso: Changes to avoid truncation of Add button. I don't know why, but debugging I
-// have discovered that ParentRect.Right was equal to 1024, ie Screen.Width. I also can't figure
-// out why I can't preserve original help button that disappears using this expert.
-// As visible in the changes, favorite panel width is just left of the original button column.
+ GetDlgItemRect(stc2, FileTypeStaticTextRect);
+ GetDlgItemRect(cmb1, FileTypeEditRect);
+ GetDlgItemRect(stc3, FileNameStaticTextRect);
+ GetDlgItemRect(cmb13, FileNameEditRect);
- if IsWin2k or IsWinXP then
- FAddButton.Width := 65;
- FFavoritePanel.Width := OkButtonRect.Left - 1;
- FFavoriteComboBox.Width := FFavoritePanel.Width - FFavoriteComboBox.Left - FAddButton.Width - 16;
- FAddButton.Left := FFavoriteComboBox.Width + 14;
+ FFavoriteStaticText.Left := FileTypeStaticTextRect.Left;
+ FFavoriteStaticText.Top := 2 * FileTypeStaticTextRect.Top - FileNameStaticTextRect.Top;
+
+ FFavoritePanel.Left := FileNameEditRect.Left;
+ FFavoritePanel.Top := 2 * FileTypeEditRect.Top - FileNameEditRect.Top;
+ FFavoritePanel.Width := FileTypeEditRect.Right - FileTypeEditRect.Left;
end;
procedure TJclOpenDialogFavoritesHook.DialogClose;
begin
inherited DialogClose;
if not IsOpenPictureDialog then
+ begin
+ FFavoriteComboBox.Items.Delete(0);
FavoriteFolders.Assign(FFavoriteComboBox.Items);
+ end;
FFavoritePanel.ParentWindow := 0;
+ FFavoriteStaticText.ParentWindow := 0;
FParentWnd := 0;
end;
@@ -230,33 +187,63 @@
begin
inherited DialogFolderChange;
Path := CurrentFolder;
- with FFavoriteComboBox do
+ FFavoriteComboBox.ItemIndex := FFavoriteComboBox.Items.IndexOf(Path);
+ if FFavoriteComboBox.ItemIndex = -1 then
begin
- ItemIndex := Items.IndexOf(Path);
- DeleteMode := (ItemIndex <> -1);
- end;
+ FFavoriteComboBox.Items[0] := FTextAdd;
+ FFavoriteComboBox.ItemIndex := 0;
+ end
+ else
+ FFavoriteComboBox.Items[0] := FTextDelete;
+ FFavoriteComboBox.Invalidate;
end;
procedure TJclOpenDialogFavoritesHook.DialogShow;
-var
- PreviewRect: TRect;
begin
inherited DialogShow;
if not IsOpenPictureDialog then
begin
- GetClientRect(FHandle, PreviewRect);
- PreviewRect.Top := PreviewRect.Bottom - 43;
- FFavoritePanel.BoundsRect := PreviewRect;
FFavoritePanel.ParentWindow := FHandle;
+ FFavoriteStaticText.ParentWindow := FHandle;
FFavoriteComboBox.Items.Assign(FavoriteFolders);
+ FFavoriteComboBox.Items.Insert(0, FTextAdd);
end;
end;
procedure TJclOpenDialogFavoritesHook.FavoriteComboBoxClick(Sender: TObject);
+var
+ I: Integer;
+ Path: string;
begin
- with FFavoriteComboBox do
- if ItemIndex <> - 1 then
- CurrentFolder := FFavoriteComboBox.Items[ItemIndex];
+ if FFavoriteComboBox.ItemIndex = 0 then
+ begin
+ Path := CurrentFolder;
+ I := FFavoriteComboBox.Items.IndexOf(Path);
+ if I > 0 then
+ begin
+ // delete current folder
+ if MessageBox(FHandle,
+ PChar(Format(LoadResString(@RsOpenDialogDelConfirm), [Path])),
+ PChar(LoadResString(@RsOpenDialogConfirmation)),
+ MB_YESNO or MB_ICONQUESTION or MB_DEFBUTTON2) = ID_YES then
+ begin
+ FFavoriteComboBox.Items.Delete(I);
+ FFavoriteComboBox.Items[0] := FTextAdd;
+ FFavoriteComboBox.ItemIndex := 0;
+ end;
+ end
+ else
+ begin
+ // add current folder
+ FFavoriteComboBox.ItemIndex := FFavoriteComboBox.Items.Add(Path);
+ FFavoriteComboBox.Items[0] := FTextDelete;
+ end;
+ FFavoriteComboBox.Invalidate;
+ end
+ else
+ if FFavoriteComboBox.ItemIndex > 0 then
+ // switch to selected folder
+ CurrentFolder := FFavoriteComboBox.Items[FFavoriteComboBox.ItemIndex];
end;
procedure TJclOpenDialogFavoritesHook.LoadFavorites(const FileName: string);
@@ -267,19 +254,6 @@
FavoriteFolders.Clear;
end;
-procedure TJclOpenDialogFavoritesHook.SetDeleteMode(const Value: Boolean);
-begin
- if FDeleteMode <> Value then
- begin
- FDeleteMode := Value;
- if FDeleteMode then
- FAddButton.Caption := LoadResString(@RsOpenDialogDelete)
- else
- FAddButton.Caption := LoadResString(@RsOpenDialogAdd);
- FFavoriteComboBox.Invalidate;
- end;
-end;
-
{$IFDEF UNITVERSIONING}
initialization
RegisterUnitVersion(HInstance, UnitVersioning);
Modified: trunk/jcl/source/vcl/JclVclResources.pas
===================================================================
--- trunk/jcl/source/vcl/JclVclResources.pas 2012-01-05 17:59:51 UTC (rev 3672)
+++ trunk/jcl/source/vcl/JclVclResources.pas 2012-01-05 18:15:44 UTC (rev 3673)
@@ -87,9 +87,9 @@
//=== JclOpenDialogFavorites.pas =============================================
resourcestring
- RsOpenDialogAdd = '<- Add';
- RsOpenDialogDelete = '&Delete';
- RsOpenDialogFavorites = '&Favorites';
+ RsOpenDialogAdd = ' --> Add to this list';
+ RsOpenDialogDelete = ' --> Delete from this list';
+ RsOpenDialogFavorites = '&Favorites:';
RsOpenDialogConfirmation = 'Confirmation';
RsOpenDialogDelConfirm = 'Are you sure to delete "%s" from favorite folders?';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-05 18:00:00
|
Revision: 3672
http://jcl.svn.sourceforge.net/jcl/?rev=3672&view=rev
Author: outchy
Date: 2012-01-05 17:59:51 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Some refactoring: AdjustControlPos -> DialogAdjustControlPos, all functions for old-style dialog boxes are now prefixed by "Dialog".
Modified Paths:
--------------
trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
trunk/jcl/source/vcl/JclOpenDialogHooks.pas
Modified: trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-05 17:52:54 UTC (rev 3671)
+++ trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-05 17:59:51 UTC (rev 3672)
@@ -57,7 +57,7 @@
procedure FavoriteComboBoxClick(Sender: TObject);
procedure SetDeleteMode(const Value: Boolean);
protected
- procedure AdjustControlPos; override;
+ procedure DialogAdjustControlPos; override;
procedure DialogFolderChange; override;
procedure DialogShow; override;
procedure DialogClose; override;
@@ -184,7 +184,7 @@
end;
end;
-procedure TJclOpenDialogFavoritesHook.AdjustControlPos;
+procedure TJclOpenDialogFavoritesHook.DialogAdjustControlPos;
var
ParentRect, FileNameEditRect, OkButtonRect: TRect;
@@ -195,7 +195,7 @@
end;
begin
- inherited AdjustControlPos;
+ inherited DialogAdjustControlPos;
GetWindowRect(FParentWnd, ParentRect);
if GetDlgItem(FParentWnd, edt1) <> 0 then
GetDlgItemRect(edt1, FileNameEditRect)
@@ -248,7 +248,6 @@
PreviewRect.Top := PreviewRect.Bottom - 43;
FFavoritePanel.BoundsRect := PreviewRect;
FFavoritePanel.ParentWindow := FHandle;
- AdjustControlPos;
FFavoriteComboBox.Items.Assign(FavoriteFolders);
end;
end;
Modified: trunk/jcl/source/vcl/JclOpenDialogHooks.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogHooks.pas 2012-01-05 17:52:54 UTC (rev 3671)
+++ trunk/jcl/source/vcl/JclOpenDialogHooks.pas 2012-01-05 17:59:51 UTC (rev 3672)
@@ -64,7 +64,7 @@
protected
FHandle: HWND;
FParentWnd: HWND;
- procedure AdjustControlPos; virtual;
+ procedure DialogAdjustControlPos; virtual;
procedure DialogFolderChange; virtual;
procedure DialogShow; virtual;
procedure DialogClose; virtual;
@@ -231,7 +231,7 @@
inherited Destroy;
end;
-procedure TJclOpenDialogHook.AdjustControlPos;
+procedure TJclOpenDialogHook.DialogAdjustControlPos;
begin
// override to customize
end;
@@ -325,7 +325,7 @@
begin
Result := CallWindowProc(FOldParentWndInstance, FParentWnd, Msg, WParam, LParam);
if Msg = WM_SIZE then
- AdjustControlPos;
+ DialogAdjustControlPos;
end;
end;
@@ -371,7 +371,10 @@
begin
case (POFNotify(Message.LParam)^.hdr.code) of
CDN_INITDONE:
- DialogShow;
+ begin
+ DialogShow;
+ DialogAdjustControlPos;
+ end;
CDN_FOLDERCHANGE:
if not IsOpenPictureDialog then
DialogFolderChange;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-05 17:53:01
|
Revision: 3671
http://jcl.svn.sourceforge.net/jcl/?rev=3671&view=rev
Author: outchy
Date: 2012-01-05 17:52:54 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
some refactoring: introduce DialogClose as a high level function invoked when the dialog is closed, move the low-level stuff WndProc to JclOpenDialogHooks.
Modified Paths:
--------------
trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
trunk/jcl/source/vcl/JclOpenDialogHooks.pas
Modified: trunk/jcl/source/vcl/JclOpenDialogFavorites.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-05 17:48:01 UTC (rev 3670)
+++ trunk/jcl/source/vcl/JclOpenDialogFavorites.pas 2012-01-05 17:52:54 UTC (rev 3671)
@@ -60,7 +60,7 @@
procedure AdjustControlPos; override;
procedure DialogFolderChange; override;
procedure DialogShow; override;
- procedure WndProc(var Message: TMessage); override;
+ procedure DialogClose; override;
property DeleteMode: Boolean read FDeleteMode write SetDeleteMode;
public
constructor Create; override;
@@ -215,6 +215,15 @@
FAddButton.Left := FFavoriteComboBox.Width + 14;
end;
+procedure TJclOpenDialogFavoritesHook.DialogClose;
+begin
+ inherited DialogClose;
+ if not IsOpenPictureDialog then
+ FavoriteFolders.Assign(FFavoriteComboBox.Items);
+ FFavoritePanel.ParentWindow := 0;
+ FParentWnd := 0;
+end;
+
procedure TJclOpenDialogFavoritesHook.DialogFolderChange;
var
Path: string;
@@ -272,30 +281,6 @@
end;
end;
-procedure TJclOpenDialogFavoritesHook.WndProc(var Message: TMessage);
-begin
- if FHandle <> 0 then
- begin
- case Message.Msg of
- WM_DESTROY:
- begin
- if not IsOpenPictureDialog then
- FavoriteFolders.Assign(FFavoriteComboBox.Items);
- try
- DoClose;
- inherited WndProc(Message);
- finally
- if not IsOpenPictureDialog then
- FFavoritePanel.ParentWindow := 0;
- FParentWnd := 0;
- end;
- end;
- else
- inherited WndProc(Message);
- end;
- end;
-end;
-
{$IFDEF UNITVERSIONING}
initialization
RegisterUnitVersion(HInstance, UnitVersioning);
Modified: trunk/jcl/source/vcl/JclOpenDialogHooks.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogHooks.pas 2012-01-05 17:48:01 UTC (rev 3670)
+++ trunk/jcl/source/vcl/JclOpenDialogHooks.pas 2012-01-05 17:52:54 UTC (rev 3671)
@@ -67,6 +67,7 @@
procedure AdjustControlPos; virtual;
procedure DialogFolderChange; virtual;
procedure DialogShow; virtual;
+ procedure DialogClose; virtual;
procedure DoClose;
procedure DoShow;
procedure ParentWndProc(var Message: TMessage); virtual;
@@ -235,6 +236,11 @@
// override to customize
end;
+procedure TJclOpenDialogHook.DialogClose;
+begin
+ // override to customize
+end;
+
procedure TJclOpenDialogHook.DialogFolderChange;
begin
// override to customize
@@ -380,6 +386,11 @@
Default;
FHandle := 0;
end;
+ WM_DESTROY:
+ begin
+ DialogClose;
+ DoClose;
+ end;
else
Default;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-05 17:48:08
|
Revision: 3670
http://jcl.svn.sourceforge.net/jcl/?rev=3670&view=rev
Author: outchy
Date: 2012-01-05 17:48:01 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
GetWindowCaption causes AV when the caption is empty.
Modified Paths:
--------------
trunk/jcl/source/common/JclSysInfo.pas
Modified: trunk/jcl/source/common/JclSysInfo.pas
===================================================================
--- trunk/jcl/source/common/JclSysInfo.pas 2012-01-04 22:09:43 UTC (rev 3669)
+++ trunk/jcl/source/common/JclSysInfo.pas 2012-01-05 17:48:01 UTC (rev 3670)
@@ -2903,6 +2903,8 @@
Size: Integer;
begin
Size := GetWindowTextLength(Wnd);
+ if Size = 0 then
+ Size := 1; // always allocate at least one byte, otherwise PChar(Buffer) returns nil
SetLength(Buffer, Size);
// strings always have an additional null character
Size := GetWindowText(Wnd, PChar(Buffer), Size + 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2012-01-04 22:09:49
|
Revision: 3669
http://jcl.svn.sourceforge.net/jcl/?rev=3669&view=rev
Author: outchy
Date: 2012-01-04 22:09:43 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
catch WM_SIZE for all Windows since Windows 2k.
Modified Paths:
--------------
trunk/jcl/source/vcl/JclOpenDialogHooks.pas
Modified: trunk/jcl/source/vcl/JclOpenDialogHooks.pas
===================================================================
--- trunk/jcl/source/vcl/JclOpenDialogHooks.pas 2012-01-03 19:03:51 UTC (rev 3668)
+++ trunk/jcl/source/vcl/JclOpenDialogHooks.pas 2012-01-04 22:09:43 UTC (rev 3669)
@@ -244,7 +244,7 @@
begin
// override to customize
FParentWnd := GetParent(FHandle);
- if IsWin2k or IsWinXP then
+ if GetWindowsVersion >= wvWin2000 then
FOldParentWndInstance := Pointer(SetWindowLongPtr(FParentWnd, GWLP_WNDPROC, LONG_PTR(FParentWndInstance)));
DoShow;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jfu...@us...> - 2012-01-03 19:03:58
|
Revision: 3668
http://jcl.svn.sourceforge.net/jcl/?rev=3668&view=rev
Author: jfudickar
Date: 2012-01-03 19:03:51 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Function StrSplit added
Modified Paths:
--------------
trunk/jcl/source/common/JclAnsiStrings.pas
Modified: trunk/jcl/source/common/JclAnsiStrings.pas
===================================================================
--- trunk/jcl/source/common/JclAnsiStrings.pas 2012-01-02 21:47:40 UTC (rev 3667)
+++ trunk/jcl/source/common/JclAnsiStrings.pas 2012-01-03 19:03:51 UTC (rev 3668)
@@ -415,13 +415,25 @@
function StrSuffixIndex(const S: AnsiString; const Suffixes: array of AnsiString): SizeInt;
// String Extraction
+// String Extraction
+// Returns the String before SubStr
function StrAfter(const SubStr, S: AnsiString): AnsiString;
+/// Returns the AnsiString after SubStr
function StrBefore(const SubStr, S: AnsiString): AnsiString;
+/// Splits a AnsiString at SubStr, returns true when SubStr is found, Left contains the
+/// AnsiString before the SubStr and Rigth the AnsiString behind SubStr
+function StrSplit(const SubStr, S: AnsiString;var Left, Right : AnsiString): boolean;
+/// Returns the AnsiString between Start and Stop
function StrBetween(const S: AnsiString; const Start, Stop: AnsiChar): AnsiString;
+/// Returns the left N characters of the AnsiString
function StrChopRight(const S: AnsiString; N: SizeInt): AnsiString;
+/// Returns the left Count characters of the AnsiString
function StrLeft(const S: AnsiString; Count: SizeInt): AnsiString;
+/// Returns the AnsiString starting from position Start for the Count Characters
function StrMid(const S: AnsiString; Start, Count: SizeInt): AnsiString;
+/// Returns the AnsiString starting from position N to the end
function StrRestOf(const S: AnsiString; N: SizeInt): AnsiString;
+/// Returns the right Count characters of the AnsiString
function StrRight(const S: AnsiString; Count: SizeInt): AnsiString;
// Character Test Routines
@@ -2969,6 +2981,23 @@
Result := StrLeft(S, P - 1);
end;
+function StrSplit(const SubStr, S: AnsiString;var Left, Right : AnsiString): 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: AnsiString; const Start, Stop: AnsiChar): AnsiString;
var
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.
