Cleanup.
This commit is contained in:
parent
387ec06261
commit
e6e027fa4b
@ -53,7 +53,7 @@ type
|
|||||||
Data: String;
|
Data: String;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
TEnumIniSectionProc = procedure(const Line: PChar; const Ext, Ext2: Integer) of object;
|
TEnumIniSectionProc = procedure(const Line: PChar; const Ext: Integer) of object;
|
||||||
|
|
||||||
TSetupSectionDirectives = (
|
TSetupSectionDirectives = (
|
||||||
ssAllowCancelDuringInstall,
|
ssAllowCancelDuringInstall,
|
||||||
@ -424,7 +424,7 @@ type
|
|||||||
procedure CallIdleProc;
|
procedure CallIdleProc;
|
||||||
procedure DoCallback(const Code: Integer; var Data: TCompilerCallbackData);
|
procedure DoCallback(const Code: Integer; var Data: TCompilerCallbackData);
|
||||||
procedure EnumIniSection(const EnumProc: TEnumIniSectionProc;
|
procedure EnumIniSection(const EnumProc: TEnumIniSectionProc;
|
||||||
const SectionName: String; const Ext, Ext2: Integer; const Verbose, SkipBlankLines: Boolean;
|
const SectionName: String; const Ext: Integer; const Verbose, SkipBlankLines: Boolean;
|
||||||
const Filename: String; const AnsiLanguageFile, Pre: Boolean);
|
const Filename: String; const AnsiLanguageFile, Pre: Boolean);
|
||||||
function EvalCheckOrInstallIdentifier(Sender: TSimpleExpression; const Name: String;
|
function EvalCheckOrInstallIdentifier(Sender: TSimpleExpression; const Name: String;
|
||||||
const Parameters: array of const): Boolean;
|
const Parameters: array of const): Boolean;
|
||||||
@ -434,27 +434,27 @@ type
|
|||||||
const AllowedConsts: TAllowedConsts): Boolean;
|
const AllowedConsts: TAllowedConsts): Boolean;
|
||||||
procedure CheckCustomMessageDefinitions;
|
procedure CheckCustomMessageDefinitions;
|
||||||
procedure CheckCustomMessageReferences;
|
procedure CheckCustomMessageReferences;
|
||||||
procedure EnumTypes(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumTypes(const Line: PChar; const Ext: Integer);
|
||||||
procedure EnumComponents(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumComponents(const Line: PChar; const Ext: Integer);
|
||||||
procedure EnumTasks(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumTasks(const Line: PChar; const Ext: Integer);
|
||||||
procedure EnumDirs(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumDirs(const Line: PChar; const Ext: Integer);
|
||||||
procedure EnumIcons(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumIcons(const Line: PChar; const Ext: Integer);
|
||||||
procedure EnumINI(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumINI(const Line: PChar; const Ext: Integer);
|
||||||
{$IFDEF UNICODE}
|
{$IFDEF UNICODE}
|
||||||
procedure EnumLangOptionsPre(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumLangOptionsPre(const Line: PChar; const Ext: Integer);
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
procedure EnumLangOptions(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumLangOptions(const Line: PChar; const Ext: Integer);
|
||||||
{$IFDEF UNICODE}
|
{$IFDEF UNICODE}
|
||||||
procedure EnumLanguagesPre(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumLanguagesPre(const Line: PChar; const Ext: Integer);
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
procedure EnumLanguages(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumLanguages(const Line: PChar; const Ext: Integer);
|
||||||
procedure EnumRegistry(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumRegistry(const Line: PChar; const Ext: Integer);
|
||||||
procedure EnumDelete(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumDelete(const Line: PChar; const Ext: Integer);
|
||||||
procedure EnumFiles(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumFiles(const Line: PChar; const Ext: Integer);
|
||||||
procedure EnumRun(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumRun(const Line: PChar; const Ext: Integer);
|
||||||
procedure EnumSetup(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumSetup(const Line: PChar; const Ext: Integer);
|
||||||
procedure EnumMessages(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumMessages(const Line: PChar; const Ext: Integer);
|
||||||
procedure EnumCustomMessages(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumCustomMessages(const Line: PChar; const Ext: Integer);
|
||||||
procedure ExtractParameters(S: PChar; const ParamInfo: array of TParamInfo;
|
procedure ExtractParameters(S: PChar; const ParamInfo: array of TParamInfo;
|
||||||
var ParamValues: array of TParamValue);
|
var ParamValues: array of TParamValue);
|
||||||
function FindLangEntryIndexByName(const AName: String; const Pre: Boolean): Integer;
|
function FindLangEntryIndexByName(const AName: String; const Pre: Boolean): Integer;
|
||||||
@ -500,7 +500,7 @@ type
|
|||||||
function ReadScriptFile(const Filename: String; const UseCache: Boolean;
|
function ReadScriptFile(const Filename: String; const UseCache: Boolean;
|
||||||
const AnsiConvertCodePage: Cardinal): TScriptFileLines;
|
const AnsiConvertCodePage: Cardinal): TScriptFileLines;
|
||||||
procedure RenamedConstantCallback(const Cnst, CnstRenamed: String);
|
procedure RenamedConstantCallback(const Cnst, CnstRenamed: String);
|
||||||
procedure EnumCode(const Line: PChar; const Ext, Ext2: Integer);
|
procedure EnumCode(const Line: PChar; const Ext: Integer);
|
||||||
procedure ReadCode;
|
procedure ReadCode;
|
||||||
procedure CodeCompilerOnLineToLineInfo(const Line: LongInt; var Filename: String; var FileLine: LongInt);
|
procedure CodeCompilerOnLineToLineInfo(const Line: LongInt; var Filename: String; var FileLine: LongInt);
|
||||||
procedure CodeCompilerOnUsedLine(const Filename: String; const Line, Position: LongInt);
|
procedure CodeCompilerOnUsedLine(const Filename: String; const Line, Position: LongInt);
|
||||||
@ -2350,7 +2350,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumIniSection(const EnumProc: TEnumIniSectionProc;
|
procedure TSetupCompiler.EnumIniSection(const EnumProc: TEnumIniSectionProc;
|
||||||
const SectionName: String; const Ext, Ext2: Integer; const Verbose, SkipBlankLines: Boolean;
|
const SectionName: String; const Ext: Integer; const Verbose, SkipBlankLines: Boolean;
|
||||||
const Filename: String; const AnsiLanguageFile, Pre: Boolean);
|
const Filename: String; const AnsiLanguageFile, Pre: Boolean);
|
||||||
var
|
var
|
||||||
FoundSection: Boolean;
|
FoundSection: Boolean;
|
||||||
@ -2435,7 +2435,7 @@ var
|
|||||||
AddStatus(Format(SCompilerStatusParsingSectionLineFile,
|
AddStatus(Format(SCompilerStatusParsingSectionLineFile,
|
||||||
[SectionName, LineNumber, ParseFilename]));
|
[SectionName, LineNumber, ParseFilename]));
|
||||||
end;
|
end;
|
||||||
EnumProc(PChar(Line.LineText), Ext, Ext2);
|
EnumProc(PChar(Line.LineText), Ext);
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
@ -3525,7 +3525,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumSetup(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumSetup(const Line: PChar; const Ext: Integer);
|
||||||
var
|
var
|
||||||
KeyName, Value: String;
|
KeyName, Value: String;
|
||||||
I: Integer;
|
I: Integer;
|
||||||
@ -4497,7 +4497,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
{$IFDEF UNICODE}
|
{$IFDEF UNICODE}
|
||||||
procedure TSetupCompiler.EnumLangOptionsPre(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumLangOptionsPre(const Line: PChar; const Ext: Integer);
|
||||||
|
|
||||||
procedure ApplyToLangEntryPre(const KeyName, Value: String;
|
procedure ApplyToLangEntryPre(const KeyName, Value: String;
|
||||||
const PreLangData: TPreLangData; const AffectsMultipleLangs: Boolean);
|
const PreLangData: TPreLangData; const AffectsMultipleLangs: Boolean);
|
||||||
@ -4551,7 +4551,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumLangOptions(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumLangOptions(const Line: PChar; const Ext: Integer);
|
||||||
|
|
||||||
procedure ApplyToLangEntry(const KeyName, Value: String;
|
procedure ApplyToLangEntry(const KeyName, Value: String;
|
||||||
var LangOptions: TSetupLanguageEntry; const AffectsMultipleLangs: Boolean);
|
var LangOptions: TSetupLanguageEntry; const AffectsMultipleLangs: Boolean);
|
||||||
@ -4673,7 +4673,7 @@ begin
|
|||||||
ApplyToLangEntry(KeyName, Value, PSetupLanguageEntry(LanguageEntries[LangIndex])^, False);
|
ApplyToLangEntry(KeyName, Value, PSetupLanguageEntry(LanguageEntries[LangIndex])^, False);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumTypes(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumTypes(const Line: PChar; const Ext: Integer);
|
||||||
|
|
||||||
function IsCustomTypeAlreadyDefined: Boolean;
|
function IsCustomTypeAlreadyDefined: Boolean;
|
||||||
var
|
var
|
||||||
@ -4748,7 +4748,7 @@ begin
|
|||||||
TypeEntries.Add(NewTypeEntry);
|
TypeEntries.Add(NewTypeEntry);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumComponents(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumComponents(const Line: PChar; const Ext: Integer);
|
||||||
type
|
type
|
||||||
TParam = (paFlags, paName, paDescription, paExtraDiskSpaceRequired, paTypes,
|
TParam = (paFlags, paName, paDescription, paExtraDiskSpaceRequired, paTypes,
|
||||||
paLanguages, paCheck, paMinVersion, paOnlyBelowVersion);
|
paLanguages, paCheck, paMinVersion, paOnlyBelowVersion);
|
||||||
@ -4852,7 +4852,7 @@ begin
|
|||||||
ComponentEntries.Add(NewComponentEntry);
|
ComponentEntries.Add(NewComponentEntry);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumTasks(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumTasks(const Line: PChar; const Ext: Integer);
|
||||||
type
|
type
|
||||||
TParam = (paFlags, paName, paDescription, paGroupDescription, paComponents,
|
TParam = (paFlags, paName, paDescription, paGroupDescription, paComponents,
|
||||||
paLanguages, paCheck, paMinVersion, paOnlyBelowVersion);
|
paLanguages, paCheck, paMinVersion, paOnlyBelowVersion);
|
||||||
@ -4942,7 +4942,7 @@ end;
|
|||||||
const
|
const
|
||||||
FILE_ATTRIBUTE_NOT_CONTENT_INDEXED = $00002000;
|
FILE_ATTRIBUTE_NOT_CONTENT_INDEXED = $00002000;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumDirs(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumDirs(const Line: PChar; const Ext: Integer);
|
||||||
type
|
type
|
||||||
TParam = (paFlags, paName, paAttribs, paPermissions, paComponents, paTasks,
|
TParam = (paFlags, paName, paAttribs, paPermissions, paComponents, paTasks,
|
||||||
paLanguages, paCheck, paBeforeInstall, paAfterInstall, paMinVersion,
|
paLanguages, paCheck, paBeforeInstall, paAfterInstall, paMinVersion,
|
||||||
@ -5081,7 +5081,7 @@ const
|
|||||||
SmkcDown, SmkcIns, SmkcDel, SmkcShift, SmkcCtrl, SmkcAlt);
|
SmkcDown, SmkcIns, SmkcDel, SmkcShift, SmkcCtrl, SmkcAlt);
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumIcons(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumIcons(const Line: PChar; const Ext: Integer);
|
||||||
|
|
||||||
{$IFNDEF Delphi3OrHigher}
|
{$IFNDEF Delphi3OrHigher}
|
||||||
procedure LoadStrings;
|
procedure LoadStrings;
|
||||||
@ -5325,7 +5325,7 @@ begin
|
|||||||
IconEntries.Add(NewIconEntry);
|
IconEntries.Add(NewIconEntry);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumINI(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumINI(const Line: PChar; const Ext: Integer);
|
||||||
type
|
type
|
||||||
TParam = (paFlags, paFilename, paSection, paKey, paString, paComponents,
|
TParam = (paFlags, paFilename, paSection, paKey, paString, paComponents,
|
||||||
paTasks, paLanguages, paCheck, paBeforeInstall, paAfterInstall,
|
paTasks, paLanguages, paCheck, paBeforeInstall, paAfterInstall,
|
||||||
@ -5424,7 +5424,7 @@ begin
|
|||||||
IniEntries.Add(NewIniEntry);
|
IniEntries.Add(NewIniEntry);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumRegistry(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumRegistry(const Line: PChar; const Ext: Integer);
|
||||||
type
|
type
|
||||||
TParam = (paFlags, paRoot, paSubkey, paValueType, paValueName, paValueData,
|
TParam = (paFlags, paRoot, paSubkey, paValueType, paValueName, paValueData,
|
||||||
paPermissions, paComponents, paTasks, paLanguages, paCheck, paBeforeInstall,
|
paPermissions, paComponents, paTasks, paLanguages, paCheck, paBeforeInstall,
|
||||||
@ -5700,7 +5700,7 @@ begin
|
|||||||
RegistryEntries.Add(NewRegistryEntry);
|
RegistryEntries.Add(NewRegistryEntry);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumDelete(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumDelete(const Line: PChar; const Ext: Integer);
|
||||||
type
|
type
|
||||||
TParam = (paType, paName, paComponents, paTasks, paLanguages, paCheck,
|
TParam = (paType, paName, paComponents, paTasks, paLanguages, paCheck,
|
||||||
paBeforeInstall, paAfterInstall, paMinVersion, paOnlyBelowVersion);
|
paBeforeInstall, paAfterInstall, paMinVersion, paOnlyBelowVersion);
|
||||||
@ -5777,7 +5777,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumFiles(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumFiles(const Line: PChar; const Ext: Integer);
|
||||||
|
|
||||||
function EscapeBraces(const S: String): String;
|
function EscapeBraces(const S: String): String;
|
||||||
{ Changes all '{' to '{{' }
|
{ Changes all '{' to '{{' }
|
||||||
@ -6709,7 +6709,7 @@ begin
|
|||||||
SetFileTime(H, nil, nil, @FT);
|
SetFileTime(H, nil, nil, @FT);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumRun(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumRun(const Line: PChar; const Ext: Integer);
|
||||||
type
|
type
|
||||||
TParam = (paFlags, paFilename, paParameters, paWorkingDir, paRunOnceId,
|
TParam = (paFlags, paFilename, paParameters, paWorkingDir, paRunOnceId,
|
||||||
paDescription, paStatusMsg, paVerb, paComponents, paTasks, paLanguages,
|
paDescription, paStatusMsg, paVerb, paComponents, paTasks, paLanguages,
|
||||||
@ -6929,7 +6929,7 @@ const
|
|||||||
(Name: ParamLanguagesInfoAfterFile; Flags: [piNoEmpty]));
|
(Name: ParamLanguagesInfoAfterFile; Flags: [piNoEmpty]));
|
||||||
|
|
||||||
{$IFDEF UNICODE}
|
{$IFDEF UNICODE}
|
||||||
procedure TSetupCompiler.EnumLanguagesPre(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumLanguagesPre(const Line: PChar; const Ext: Integer);
|
||||||
var
|
var
|
||||||
Values: array[TLanguagesParam] of TParamValue;
|
Values: array[TLanguagesParam] of TParamValue;
|
||||||
NewPreLangData: TPreLangData;
|
NewPreLangData: TPreLangData;
|
||||||
@ -6961,7 +6961,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumLanguages(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumLanguages(const Line: PChar; const Ext: Integer);
|
||||||
var
|
var
|
||||||
Values: array[TLanguagesParam] of TParamValue;
|
Values: array[TLanguagesParam] of TParamValue;
|
||||||
NewLanguageEntry: PSetupLanguageEntry;
|
NewLanguageEntry: PSetupLanguageEntry;
|
||||||
@ -7018,7 +7018,7 @@ begin
|
|||||||
ReadMessagesFromFiles(Filename, LanguageEntries.Count-1);
|
ReadMessagesFromFiles(Filename, LanguageEntries.Count-1);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumMessages(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumMessages(const Line: PChar; const Ext: Integer);
|
||||||
var
|
var
|
||||||
P, P2: PChar;
|
P, P2: PChar;
|
||||||
I, ID, LangIndex: Integer;
|
I, ID, LangIndex: Integer;
|
||||||
@ -7067,7 +7067,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumCustomMessages(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumCustomMessages(const Line: PChar; const Ext: Integer);
|
||||||
|
|
||||||
function ExpandNewlines(const S: String): String;
|
function ExpandNewlines(const S: String): String;
|
||||||
{ Replaces '%n' with #13#10 }
|
{ Replaces '%n' with #13#10 }
|
||||||
@ -7251,7 +7251,7 @@ begin
|
|||||||
Filename := PathExpand(PrependSourceDirName(Filename));
|
Filename := PathExpand(PrependSourceDirName(Filename));
|
||||||
AnsiLanguageFile := not TFile.IsUTF8File(Filename);
|
AnsiLanguageFile := not TFile.IsUTF8File(Filename);
|
||||||
AddStatus(Format(SCompilerStatusReadingInFile, [Filename]));
|
AddStatus(Format(SCompilerStatusReadingInFile, [Filename]));
|
||||||
EnumIniSection(EnumLangOptionsPre, 'LangOptions', ALangIndex, 0, False, True, Filename, AnsiLanguageFile, True);
|
EnumIniSection(EnumLangOptionsPre, 'LangOptions', ALangIndex, False, True, Filename, AnsiLanguageFile, True);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
@ -7271,11 +7271,11 @@ begin
|
|||||||
Filename := PathExpand(PrependSourceDirName(Filename));
|
Filename := PathExpand(PrependSourceDirName(Filename));
|
||||||
AnsiLanguageFile := not TFile.IsUTF8File(Filename);
|
AnsiLanguageFile := not TFile.IsUTF8File(Filename);
|
||||||
AddStatus(Format(SCompilerStatusReadingInFile, [Filename]));
|
AddStatus(Format(SCompilerStatusReadingInFile, [Filename]));
|
||||||
EnumIniSection(EnumLangOptions, 'LangOptions', ALangIndex, Integer(AnsiLanguageFile), False, True, Filename, AnsiLanguageFile, False);
|
EnumIniSection(EnumLangOptions, 'LangOptions', ALangIndex, False, True, Filename, AnsiLanguageFile, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
EnumIniSection(EnumMessages, 'Messages', ALangIndex, 0, False, True, Filename, AnsiLanguageFile, False);
|
EnumIniSection(EnumMessages, 'Messages', ALangIndex, False, True, Filename, AnsiLanguageFile, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
EnumIniSection(EnumCustomMessages, 'CustomMessages', ALangIndex, 0, False, True, Filename, AnsiLanguageFile, False);
|
EnumIniSection(EnumCustomMessages, 'CustomMessages', ALangIndex, False, True, Filename, AnsiLanguageFile, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
@ -7285,7 +7285,7 @@ var
|
|||||||
J: TSetupMessageID;
|
J: TSetupMessageID;
|
||||||
begin
|
begin
|
||||||
{ Read messages from Default.isl into DefaultLangData }
|
{ Read messages from Default.isl into DefaultLangData }
|
||||||
EnumIniSection(EnumMessages, 'Messages', -2, 0, False, True, 'compiler:Default.isl', True, False);
|
EnumIniSection(EnumMessages, 'Messages', -2, False, True, 'compiler:Default.isl', True, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Check for missing messages in Default.isl }
|
{ Check for missing messages in Default.isl }
|
||||||
@ -7327,7 +7327,7 @@ begin
|
|||||||
|
|
||||||
{ Then read the [LangOptions] section in the script }
|
{ Then read the [LangOptions] section in the script }
|
||||||
AddStatus(SCompilerStatusReadingInScriptMsgs);
|
AddStatus(SCompilerStatusReadingInScriptMsgs);
|
||||||
EnumIniSection(EnumLangOptionspre, 'LangOptions', -1, 0, False, True, '', False, True);
|
EnumIniSection(EnumLangOptionspre, 'LangOptions', -1, False, True, '', False, True);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
end;
|
end;
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
@ -7371,11 +7371,11 @@ begin
|
|||||||
|
|
||||||
{ Then read the [LangOptions] & [Messages] & [CustomMessages] sections in the script }
|
{ Then read the [LangOptions] & [Messages] & [CustomMessages] sections in the script }
|
||||||
AddStatus(SCompilerStatusReadingInScriptMsgs);
|
AddStatus(SCompilerStatusReadingInScriptMsgs);
|
||||||
EnumIniSection(EnumLangOptions, 'LangOptions', -1, 0, False, True, '', False, False);
|
EnumIniSection(EnumLangOptions, 'LangOptions', -1, False, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
EnumIniSection(EnumMessages, 'Messages', -1, 0, False, True, '', False, False);
|
EnumIniSection(EnumMessages, 'Messages', -1, False, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
EnumIniSection(EnumCustomMessages, 'CustomMessages', -1, 0, False, True, '', False, False);
|
EnumIniSection(EnumCustomMessages, 'CustomMessages', -1, False, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Check for missing messages }
|
{ Check for missing messages }
|
||||||
@ -7438,7 +7438,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSetupCompiler.EnumCode(const Line: PChar; const Ext, Ext2: Integer);
|
procedure TSetupCompiler.EnumCode(const Line: PChar; const Ext: Integer);
|
||||||
var
|
var
|
||||||
CodeTextLineInfo: TLineInfo;
|
CodeTextLineInfo: TLineInfo;
|
||||||
begin
|
begin
|
||||||
@ -7452,7 +7452,7 @@ procedure TSetupCompiler.ReadCode;
|
|||||||
begin
|
begin
|
||||||
{ Read [Code] section }
|
{ Read [Code] section }
|
||||||
AddStatus(SCompilerStatusReadingCode);
|
AddStatus(SCompilerStatusReadingCode);
|
||||||
EnumIniSection(EnumCode, 'Code', 0, 0, False, False, '', False, False);
|
EnumIniSection(EnumCode, 'Code', 0, False, False, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
@ -8636,7 +8636,7 @@ begin
|
|||||||
SetupHeader.WizardStyle := wsClassic;
|
SetupHeader.WizardStyle := wsClassic;
|
||||||
|
|
||||||
{ Read [Setup] section }
|
{ Read [Setup] section }
|
||||||
EnumIniSection(EnumSetup, 'Setup', 0, 0, True, True, '', False, False);
|
EnumIniSection(EnumSetup, 'Setup', 0, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Verify settings set in [Setup] section }
|
{ Verify settings set in [Setup] section }
|
||||||
@ -8975,7 +8975,7 @@ begin
|
|||||||
|
|
||||||
{ 0.1. Read [Languages] section and [LangOptions] in the .isl files the
|
{ 0.1. Read [Languages] section and [LangOptions] in the .isl files the
|
||||||
entries reference }
|
entries reference }
|
||||||
EnumIniSection(EnumLanguagesPre, 'Languages', 0, 0, True, True, '', False, True);
|
EnumIniSection(EnumLanguagesPre, 'Languages', 0, True, True, '', False, True);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ 0.2. Read [LangOptions] in the script }
|
{ 0.2. Read [LangOptions] in the script }
|
||||||
@ -8987,7 +8987,7 @@ begin
|
|||||||
ReadDefaultMessages;
|
ReadDefaultMessages;
|
||||||
|
|
||||||
{ 2. Read [Languages] section and the .isl files the entries reference }
|
{ 2. Read [Languages] section and the .isl files the entries reference }
|
||||||
EnumIniSection(EnumLanguages, 'Languages', 0, 0, True, True, '', False, False);
|
EnumIniSection(EnumLanguages, 'Languages', 0, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ 3. Read [LangOptions] & [Messages] & [CustomMessages] in the script }
|
{ 3. Read [LangOptions] & [Messages] & [CustomMessages] in the script }
|
||||||
@ -9002,53 +9002,53 @@ begin
|
|||||||
ReadCode;
|
ReadCode;
|
||||||
|
|
||||||
{ Read [Types] section }
|
{ Read [Types] section }
|
||||||
EnumIniSection(EnumTypes, 'Types', 0, 0, True, True, '', False, False);
|
EnumIniSection(EnumTypes, 'Types', 0, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Read [Components] section }
|
{ Read [Components] section }
|
||||||
EnumIniSection(EnumComponents, 'Components', 0, 0, True, True, '', False, False);
|
EnumIniSection(EnumComponents, 'Components', 0, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Read [Tasks] section }
|
{ Read [Tasks] section }
|
||||||
EnumIniSection(EnumTasks, 'Tasks', 0, 0, True, True, '', False, False);
|
EnumIniSection(EnumTasks, 'Tasks', 0, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Read [Dirs] section }
|
{ Read [Dirs] section }
|
||||||
EnumIniSection(EnumDirs, 'Dirs', 0, 0, True, True, '', False, False);
|
EnumIniSection(EnumDirs, 'Dirs', 0, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Read [Icons] section }
|
{ Read [Icons] section }
|
||||||
EnumIniSection(EnumIcons, 'Icons', 0, 0, True, True, '', False, False);
|
EnumIniSection(EnumIcons, 'Icons', 0, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Read [INI] section }
|
{ Read [INI] section }
|
||||||
EnumIniSection(EnumINI, 'INI', 0, 0, True, True, '', False, False);
|
EnumIniSection(EnumINI, 'INI', 0, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Read [Registry] section }
|
{ Read [Registry] section }
|
||||||
EnumIniSection(EnumRegistry, 'Registry', 0, 0, True, True, '', False, False);
|
EnumIniSection(EnumRegistry, 'Registry', 0, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Read [InstallDelete] section }
|
{ Read [InstallDelete] section }
|
||||||
EnumIniSection(EnumDelete, 'InstallDelete', 0, 0, True, True, '', False, False);
|
EnumIniSection(EnumDelete, 'InstallDelete', 0, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Read [UninstallDelete] section }
|
{ Read [UninstallDelete] section }
|
||||||
EnumIniSection(EnumDelete, 'UninstallDelete', 1, 0, True, True, '', False, False);
|
EnumIniSection(EnumDelete, 'UninstallDelete', 1, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Read [Run] section }
|
{ Read [Run] section }
|
||||||
EnumIniSection(EnumRun, 'Run', 0, 0, True, True, '', False, False);
|
EnumIniSection(EnumRun, 'Run', 0, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Read [UninstallRun] section }
|
{ Read [UninstallRun] section }
|
||||||
EnumIniSection(EnumRun, 'UninstallRun', 1, 0, True, True, '', False, False);
|
EnumIniSection(EnumRun, 'UninstallRun', 1, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
{ Read [Files] section }
|
{ Read [Files] section }
|
||||||
if not TryStrToBoolean(SetupHeader.Uninstallable, Uninstallable) or Uninstallable then
|
if not TryStrToBoolean(SetupHeader.Uninstallable, Uninstallable) or Uninstallable then
|
||||||
EnumFiles('', 1, 0);
|
EnumFiles('', 1);
|
||||||
EnumIniSection(EnumFiles, 'Files', 0, 0, True, True, '', False, False);
|
EnumIniSection(EnumFiles, 'Files', 0, True, True, '', False, False);
|
||||||
CallIdleProc;
|
CallIdleProc;
|
||||||
|
|
||||||
if UsedUserAreasWarning and (UsedUserAreas.Count > 0) and
|
if UsedUserAreasWarning and (UsedUserAreas.Count > 0) and
|
||||||
|
Loading…
x
Reference in New Issue
Block a user