diff --git a/help/JCLHelp.dox b/help/JCLHelp.dox index 902824a1d1..d0a4654714 100644 --- a/help/JCLHelp.dox +++ b/help/JCLHelp.dox @@ -28361,7 +28361,7 @@ ControlPointSize=6 GraphBorder=0 LayoutDirection=1 LevelSpacing=30 -MaxNodeWidth=200 +MaxNodeWidth=350 MinNodeHeight=15 MinNodeWidth=30 NodesAdjustWidthToGrid=0 @@ -28383,8 +28383,8 @@ Style=0 BackgroundColor=16777215 BorderColor=0 GradientBaseColor=10070188 -HighlightColor=-2147483635 -HighlightFontColor=-2147483634 +HighlightColor=-16777203 +HighlightFontColor=-16777202 Show=1 Style=0 StyleOptions=7 @@ -28394,7 +28394,7 @@ TextAlignment=0 Charset=1 Color=0 Height=-9 -Name=Tahoma +Name=Segoe UI Orientation=0 Pitch=0 Size=7 @@ -28410,8 +28410,8 @@ Top=2 BackgroundColor=13434829 BorderColor=0 GradientBaseColor=11197867 -HighlightColor=-2147483635 -HighlightFontColor=-2147483634 +HighlightColor=-16777203 +HighlightFontColor=-16777202 Show=1 Style=0 StyleOptions=7 @@ -28421,7 +28421,7 @@ TextAlignment=0 Charset=1 Color=0 Height=-9 -Name=Tahoma +Name=Segoe UI Orientation=0 Pitch=0 Size=7 @@ -28437,8 +28437,8 @@ Top=2 BackgroundColor=13434829 BorderColor=0 GradientBaseColor=11197867 -HighlightColor=-2147483635 -HighlightFontColor=-2147483634 +HighlightColor=-16777203 +HighlightFontColor=-16777202 Show=1 Style=0 StyleOptions=7 @@ -28448,7 +28448,7 @@ TextAlignment=0 Charset=1 Color=0 Height=-9 -Name=Tahoma +Name=Segoe UI Orientation=0 Pitch=0 Size=7 @@ -28464,8 +28464,8 @@ Top=2 BackgroundColor=16764313 BorderColor=0 GradientBaseColor=14527351 -HighlightColor=-2147483635 -HighlightFontColor=-2147483634 +HighlightColor=-16777203 +HighlightFontColor=-16777202 Show=1 Style=0 StyleOptions=7 @@ -28475,7 +28475,7 @@ TextAlignment=0 Charset=1 Color=0 Height=-9 -Name=Tahoma +Name=Segoe UI Orientation=0 Pitch=0 Size=7 @@ -28491,8 +28491,8 @@ Top=2 BackgroundColor=131071 BorderColor=0 GradientBaseColor=56797 -HighlightColor=-2147483635 -HighlightFontColor=-2147483634 +HighlightColor=-16777203 +HighlightFontColor=-16777202 Show=0 Style=3 StyleOptions=7 @@ -28502,7 +28502,7 @@ TextAlignment=0 Charset=1 Color=0 Height=-9 -Name=Tahoma +Name=Segoe UI Orientation=0 Pitch=0 Size=7 @@ -28518,8 +28518,8 @@ Top=2 BackgroundColor=131071 BorderColor=0 GradientBaseColor=56797 -HighlightColor=-2147483635 -HighlightFontColor=-2147483634 +HighlightColor=-16777203 +HighlightFontColor=-16777202 Show=0 Style=3 StyleOptions=7 @@ -28529,7 +28529,7 @@ TextAlignment=0 Charset=1 Color=0 Height=-9 -Name=Tahoma +Name=Segoe UI Orientation=0 Pitch=0 Size=7 @@ -28545,8 +28545,8 @@ Top=2 BackgroundColor=16777215 BorderColor=0 GradientBaseColor=10070188 -HighlightColor=-2147483635 -HighlightFontColor=-2147483634 +HighlightColor=-16777203 +HighlightFontColor=-16777202 Show=1 Style=0 StyleOptions=7 @@ -28556,7 +28556,7 @@ TextAlignment=0 Charset=1 Color=0 Height=-9 -Name=Tahoma +Name=Segoe UI Orientation=0 Pitch=0 Size=7 @@ -28572,8 +28572,8 @@ Top=2 BackgroundColor=52479 BorderColor=0 GradientBaseColor=43741 -HighlightColor=-2147483635 -HighlightFontColor=-2147483634 +HighlightColor=-16777203 +HighlightFontColor=-16777202 Show=1 Style=2 StyleOptions=7 @@ -28583,7 +28583,7 @@ TextAlignment=0 Charset=1 Color=0 Height=-9 -Name=Tahoma +Name=Segoe UI Orientation=0 Pitch=0 Size=7 @@ -28599,8 +28599,8 @@ Top=2 BackgroundColor=3394407 BorderColor=0 GradientBaseColor=1157445 -HighlightColor=-2147483635 -HighlightFontColor=-2147483634 +HighlightColor=-16777203 +HighlightFontColor=-16777202 Show=1 Style=0 StyleOptions=7 @@ -28610,7 +28610,7 @@ TextAlignment=0 Charset=1 Color=0 Height=-9 -Name=Tahoma +Name=Segoe UI Orientation=0 Pitch=0 Size=7 @@ -28626,8 +28626,8 @@ Top=2 BackgroundColor=16777215 BorderColor=0 GradientBaseColor=10070188 -HighlightColor=-2147483635 -HighlightFontColor=-2147483634 +HighlightColor=-16777203 +HighlightFontColor=-16777202 Show=1 Style=0 StyleOptions=7 @@ -28637,7 +28637,7 @@ TextAlignment=0 Charset=1 Color=0 Height=-9 -Name=Tahoma +Name=Segoe UI Orientation=0 Pitch=0 Size=7 @@ -136632,7 +136632,7 @@ Title=JEDI Code Library TypeDefStructsAsStructs=1 VersionBuild=0 VersionMajor=2 -VersionMinor=2 +VersionMinor=3 VersionRelease=0 [Generic Sources] diff --git a/help/NTFS.dtx b/help/NTFS.dtx index 34f13528b5..4e5b2dc1eb 100644 --- a/help/NTFS.dtx +++ b/help/NTFS.dtx @@ -755,16 +755,11 @@ See also: NtfsGetReparsePoint Donator: Marcel van Brakel -@@_REPARSE_GUID_DATA_BUFFER.ReparseTag - Reparse tag. This member uniquely identifies the structure of the reparse data. -@@_REPARSE_GUID_DATA_BUFFER.ReparseDataLength - Size, in bytes, of the data in the GenericReparseBuffer member. -@@_REPARSE_GUID_DATA_BUFFER.Reserved - Reserved. -@@_REPARSE_GUID_DATA_BUFFER.ReparseGuid - GUID which uniquely identifies the kind of reparse tag. -@@_REPARSE_GUID_DATA_BUFFER.GenericReparseBuffer - User defined data for the reparse point. + + + + + @@TReparseGuidDataBuffer diff --git a/help/Win32.dtx b/help/Win32.dtx index 5f58b31968..f9e2b2fc1b 100644 --- a/help/Win32.dtx +++ b/help/Win32.dtx @@ -1179,20 +1179,9 @@ See also: SHDllGetVersion Donator: Marcel van Brakel -@@_DLLVERSIONINFO.cbSize - Set to the size of this record. Initialize is done by SHDllGetVersion. -@@_DLLVERSIONINFO.dwMajorVersion - Major version of the DLL -@@_DLLVERSIONINFO.dwMinorVersion - Minor version of the DLL -@@_DLLVERSIONINFO.dwBuildNumber - Build number of the DLL -@@_DLLVERSIONINFO.dwPlatformId - Identifies the platform for which this DLL was built. Can be - DLLVER_PLATFORM_WINDOWS or DLLVER_PLATFORM_NT which indicate - generic Windows and Windows NT respectively. -@@DLLVERSIONINFO - -@@TDllVersionInfo - --------------------------------------------------------------------------------- \ No newline at end of file + + + + + + diff --git a/jcl/source/common/bzip2.pas b/jcl/source/common/bzip2.pas index 0a1ca28e60..15b34ef18e 100644 --- a/jcl/source/common/bzip2.pas +++ b/jcl/source/common/bzip2.pas @@ -44,6 +44,8 @@ interface {$ENDIF UNITVERSIONING} JclBase; // PByte, PCardinal for Delphi 5 and C++Builder 5... +//DOM-IGNORE-BEGIN + { /*-------------------------------------------------------------*/ /*--- Public header file for the library. ---*/ @@ -303,6 +305,8 @@ function BZ2_bzerror(b: BZFILE; errnum: PInteger): PChar; var bz2_internal_error_event: procedure(errcode: Integer) of object = nil; +//DOM-IGNORE-END + function LoadBZip2: Boolean; function IsBZip2Loaded: Boolean; procedure UnloadBZip2; diff --git a/jcl/source/common/pcre.pas b/jcl/source/common/pcre.pas index e8e7945aca..a0d3d64f12 100644 --- a/jcl/source/common/pcre.pas +++ b/jcl/source/common/pcre.pas @@ -50,6 +50,8 @@ interface {$ENDIF UNITVERSIONING} JclBase; +//DOM-IGNORE-BEGIN + (************************************************* * Perl-Compatible Regular Expressions * *************************************************) @@ -579,6 +581,8 @@ function pcre_version: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE {$ENDIF PCRE_LINKONREQUEST} +//DOM-IGNORE-END + function IsPCRELoaded: Boolean; function LoadPCRE: Boolean; procedure UnloadPCRE; diff --git a/jcl/source/common/zlibh.pas b/jcl/source/common/zlibh.pas index b8fa26bf92..da07f2ed66 100644 --- a/jcl/source/common/zlibh.pas +++ b/jcl/source/common/zlibh.pas @@ -72,6 +72,8 @@ interface {$ENDIF UNITVERSIONING} JclBase; +//DOM-IGNORE-BEGIN + {$IFNDEF FPC} type {$IFDEF UNIX} @@ -2018,6 +2020,8 @@ function get_crc_table():PuLongf; DEF_MEM_LEVEL = 8; {$EXTERNALSYM DEF_MEM_LEVEL} +//DOM-IGNORE-END + function IsZLibLoaded: Boolean; function LoadZLib: Boolean; procedure UnloadZLib; diff --git a/jcl/source/prototypes/Hardlinks.pas b/jcl/source/prototypes/Hardlinks.pas index 918a681b12..d3bfc943f6 100644 --- a/jcl/source/prototypes/Hardlinks.pas +++ b/jcl/source/prototypes/Hardlinks.pas @@ -178,6 +178,9 @@ interface {$DEFINE RTDL // Use runtime dynamic linking } {$DEFINE PREFERAPI // Prefer the "real" Windows API on systems on which it exists // If this is defined STDCALL is automatically needed and defined! } + +//DOM-IGNORE-BEGIN + {$ENDIF JCL} (* @@ -228,6 +231,10 @@ function CreateHardLinkA(szLinkName, szLinkTarget: PAnsiChar; lpSecurityAttribut bRtdlFunctionsLoaded: Boolean = False; // To show wether the RTDL functions had been loaded {$ENDIF RTDL} +{$IFDEF JCL} +//DOM-IGNORE-END +{$ENDIF JCL} + {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( diff --git a/jcl/source/prototypes/JclWin32.pas b/jcl/source/prototypes/JclWin32.pas index def60272c2..31236253ed 100644 --- a/jcl/source/prototypes/JclWin32.pas +++ b/jcl/source/prototypes/JclWin32.pas @@ -108,6 +108,8 @@ EJclWin32Error = class(EJclError) end; {$ENDIF MSWINDOWS} +//DOM-IGNORE-BEGIN + {$I win32api\WinDef.int} {$I win32api\WinNT.int} {$I win32api\WinBase.int} @@ -137,6 +139,8 @@ EJclWin32Error = class(EJclError) {$I win32api\TlHelp32.int} {$I win32api\Winternl.int} +//DOM-IGNORE-END + {$IFDEF MSWINDOWS} const diff --git a/jcl/source/windows/Hardlinks.pas b/jcl/source/windows/Hardlinks.pas index 90f49dbe35..b33c197658 100644 --- a/jcl/source/windows/Hardlinks.pas +++ b/jcl/source/windows/Hardlinks.pas @@ -55,6 +55,9 @@ interface {$I jcl.inc} +//DOM-IGNORE-BEGIN + + (* All possible combinations of the above DEFINEs have been tested and work fine. @@ -90,6 +93,8 @@ interface hNtDll: THandle = 0; // For runtime dynamic linking bRtdlFunctionsLoaded: Boolean = False; // To show wether the RTDL functions had been loaded +//DOM-IGNORE-END + {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( diff --git a/jcl/source/windows/JclWin32.pas b/jcl/source/windows/JclWin32.pas index 81ff7b6faa..aa57bea75d 100644 --- a/jcl/source/windows/JclWin32.pas +++ b/jcl/source/windows/JclWin32.pas @@ -110,6 +110,8 @@ EJclWin32Error = class(EJclError) property LastErrorMsg: string read FLastErrorMsg; end; +//DOM-IGNORE-BEGIN + {$IFNDEF FPC} // @@ -2973,7 +2975,6 @@ function GlobalMemoryStatusEx(out lpBuffer: TMemoryStatusEx): BOOL; stdcall; // line 3189 - function BackupSeek(hFile: THandle; dwLowBytesToSeek, dwHighBytesToSeek: DWORD; out lpdwLowByteSeeked, lpdwHighByteSeeked: DWORD; var lpContext: Pointer): BOOL; stdcall; @@ -3097,18 +3098,15 @@ procedure SetExtendedFeaturesMask(ContextEx: PCONTEXT_EX; const FeatureMask: Int {$EXTERNALSYM SetExtendedFeaturesMask} - // From JwaAclApi // line 185 - function SetNamedSecurityInfoW(pObjectName: LPWSTR; ObjectType: SE_OBJECT_TYPE; SecurityInfo: SECURITY_INFORMATION; psidOwner, psidGroup: PSID; pDacl, pSacl: PACL): DWORD; stdcall; {$EXTERNALSYM SetNamedSecurityInfoW} - const IMAGE_SEPARATION = (64*1024); {$EXTERNALSYM IMAGE_SEPARATION} @@ -3139,7 +3137,6 @@ _LOADED_IMAGE = record // line 152 - function ReBaseImage(CurrentImageName: PAnsiChar; SymbolPath: PAnsiChar; fReBase: BOOL; fRebaseSysfileOk: BOOL; fGoingDown: BOOL; CheckImageSize: ULONG; var OldImageSize: ULONG; var OldImageBase: ULONG_PTR; var NewImageSize: ULONG; @@ -3194,7 +3191,6 @@ function ImageRvaToVa(NtHeaders: PImageNtHeaders; Base: Pointer; Rva: ULONG; {$EXTERNALSYM ImageRvaToVa} - // line 461 // @@ -7540,6 +7536,8 @@ function NtQueryInformationThread(ThreadHandle: THandle; ThreadInformationClass: +//DOM-IGNORE-END + const RtdlSetNamedSecurityInfoW: function(pObjectName: LPWSTR; ObjectType: SE_OBJECT_TYPE; diff --git a/jcl/source/windows/MSHelpServices_TLB.pas b/jcl/source/windows/MSHelpServices_TLB.pas index 8f82a6a2a7..a74f914caa 100644 --- a/jcl/source/windows/MSHelpServices_TLB.pas +++ b/jcl/source/windows/MSHelpServices_TLB.pas @@ -72,7 +72,8 @@ interface JclUnitVersioning, {$ENDIF UNITVERSIONING} ActiveX, Classes; - + +//DOM-IGNORE-BEGIN // *********************************************************************// // GUIDS declared in the TypeLibrary. Following prefixes are used: @@ -1590,6 +1591,8 @@ CoHxRegisterProtocol = class class function CreateRemote(const MachineName: string): IHxRegisterProtocol; end; +//DOM-IGNORE-END + {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( diff --git a/jcl/source/windows/MSTask.pas b/jcl/source/windows/MSTask.pas index 1848919194..9e2d9c187d 100644 --- a/jcl/source/windows/MSTask.pas +++ b/jcl/source/windows/MSTask.pas @@ -55,6 +55,7 @@ interface ActiveX, Windows; +//DOM-IGNORE-BEGIN (*$HPPEMIT '#include ' *) @@ -691,6 +692,8 @@ _PSP = record end; {$EXTERNALSYM CLSID_CSchedulingAgent} CLSID_CSchedulingAgent: TCLSID = (D1: $148BD52A; D2: $A2AB; D3: $11CE; D4: ($B1, $1F, $00, $AA, $00, $53, $05, $03)); +//DOM-IGNORE-END + {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( diff --git a/jcl/source/windows/Snmp.pas b/jcl/source/windows/Snmp.pas index 97730e949e..fdf66a3a8e 100644 --- a/jcl/source/windows/Snmp.pas +++ b/jcl/source/windows/Snmp.pas @@ -64,6 +64,8 @@ interface {$ENDIF UNITVERSIONING} Windows, SysUtils; +//DOM-IGNORE-BEGIN + (*$HPPEMIT '#include '*) type @@ -654,6 +656,8 @@ function SNMP_DBG_realloc(pMem: Pointer; nBytes: UINT): Pointer; stdcall; SnmpExtensionClose: TSnmpExtensionClose; {$EXTERNALSYM SnmpExtensionClose} +//DOM-IGNORE-END + function SnmpExtensionLoaded: Boolean; function LoadSnmpExtension(const LibName: string): Boolean; function UnloadSnmpExtension: Boolean; diff --git a/jcl/source/windows/mscoree_TLB.pas b/jcl/source/windows/mscoree_TLB.pas index dbcec592c8..876ce0e8ca 100644 --- a/jcl/source/windows/mscoree_TLB.pas +++ b/jcl/source/windows/mscoree_TLB.pas @@ -1,6 +1,6 @@ {**************************************************************************************************} { } -{ Last modified: $Date:: $ } +{ Last modified: $Date:: $ } { Revision: $Rev:: $ } { Author: $Author:: $ } { } @@ -57,6 +57,8 @@ interface ActiveX, Classes; +//DOM-IGNORE-BEGIN + {$HPPEMIT '#include '} // *********************************************************************// @@ -437,6 +439,8 @@ CoCorRuntimeHost = class class function CreateRemote(const MachineName: string): ICorRuntimeHost; end; +//DOM-IGNORE-END + {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( diff --git a/jcl/source/windows/mscorlib_TLB.pas b/jcl/source/windows/mscorlib_TLB.pas index 116b1d8b45..35b3ffca3c 100644 --- a/jcl/source/windows/mscorlib_TLB.pas +++ b/jcl/source/windows/mscorlib_TLB.pas @@ -1,6 +1,6 @@ {**************************************************************************************************} { } -{ Last modified: $Date:: $ } +{ Last modified: $Date:: $ } { Revision: $Rev:: $ } { Author: $Author:: $ } { } @@ -75,6 +75,7 @@ interface ActiveX, Classes; +//DOM-IGNORE-BEGIN // *********************************************************************// // GUIDS declared in the TypeLibrary. Following prefixes are used: @@ -26627,6 +26628,8 @@ CoEnumBuilder = class class function CreateRemote(const MachineName: string): _EnumBuilder; end; +//DOM-IGNORE-END + {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( diff --git a/jcl/source/windows/sevenzip.pas b/jcl/source/windows/sevenzip.pas index ef0c698d9e..f2db0e6638 100644 --- a/jcl/source/windows/sevenzip.pas +++ b/jcl/source/windows/sevenzip.pas @@ -65,6 +65,8 @@ interface {$ENDIF UNITVERSIONING} JclBase; +//DOM-IGNORE-BEGIN + // Guid.txt const CLSID_CCodec : TGUID = '{23170F69-40C1-2790-0000-000000000000}'; @@ -624,6 +626,8 @@ function GetNumberOfMethods(NumMethods: PCardinal): HRESULT; stdcall; function SetLargePageMode: HRESULT; stdcall; {$ENDIF ~7ZIP_LINKONREQUEST} +//DOM-IGNORE-END + function Load7Zip: Boolean; function Is7ZipLoaded: Boolean; procedure Unload7Zip;