Update existing references for all and add missing ones to ISCC and SetupLdr, the other 3 still todo.

Projects/Compil32.dpr

@@ -15,31 +15,31 @@ uses
   SysUtils,
   Forms,
   PathFunc in '..\Components\PathFunc.pas',
-  CompForm in 'CompForm.pas' {CompileForm},
-  CmnFunc in 'CmnFunc.pas',
-  CmnFunc2 in 'CmnFunc2.pas',
-  CompFunc in 'CompFunc.pas',
-  CompMsgs in 'CompMsgs.pas',
-  CompInt in 'CompInt.pas',
-  CompOptions in 'CompOptions.pas' {OptionsForm},
-  CompStartup in 'CompStartup.pas' {StartupForm},
-  CompWizard in 'CompWizard.pas' {WizardForm},
-  CompWizardFile in 'CompWizardFile.pas' {WizardFileForm},
-  CompFileAssoc in 'CompFileAssoc.pas',
+  CompForm in 'Src\CompForm.pas' {CompileForm},
+  CmnFunc in 'Src\CmnFunc.pas',
+  CmnFunc2 in 'Src\CmnFunc2.pas',
+  CompFunc in 'Src\CompFunc.pas',
+  CompMsgs in 'Src\CompMsgs.pas',
+  CompInt in 'Src\CompInt.pas',
+  CompOptions in 'Src\CompOptions.pas' {OptionsForm},
+  CompStartup in 'Src\CompStartup.pas' {StartupForm},
+  CompWizard in 'Src\CompWizard.pas' {WizardForm},
+  CompWizardFile in 'Src\CompWizardFile.pas' {WizardFileForm},
+  CompFileAssoc in 'Src\CompFileAssoc.pas',
   TmSchema in '..\Components\TmSchema.pas',
   UxTheme in '..\Components\UxTheme.pas',
-  DebugStruct in 'DebugStruct.pas',
-  BrowseFunc in 'BrowseFunc.pas',
-  CompSignTools in 'CompSignTools.pas' {SignToolsForm},
-  CompInputQueryCombo in 'CompInputQueryCombo.pas',
+  DebugStruct in 'Src\DebugStruct.pas',
+  BrowseFunc in 'Src\BrowseFunc.pas',
+  CompSignTools in 'Src\CompSignTools.pas' {SignToolsForm},
+  CompInputQueryCombo in 'Src\CompInputQueryCombo.pas',
   ScintInt in '..\Components\ScintInt.pas',
   ScintEdit in '..\Components\ScintEdit.pas',
   ScintStylerInnoSetup in '..\Components\ScintStylerInnoSetup.pas',
   ModernColors in '..\Components\ModernColors.pas',
-  CompMsgBoxDesigner in 'CompMsgBoxDesigner.pas' {MsgBoxDesignerForm},
-  CompScintEdit in 'CompScintEdit.pas',
-  CompFilesDesigner in 'CompFilesDesigner.pas' {FilesDesignerForm},
-  CompWizardFilesHelper in 'CompWizardFilesHelper.pas',
+  CompMsgBoxDesigner in 'Src\CompMsgBoxDesigner.pas' {MsgBoxDesignerForm},
+  CompScintEdit in 'Src\CompScintEdit.pas',
+  CompFilesDesigner in 'Src\CompFilesDesigner.pas' {FilesDesignerForm},
+  CompWizardFilesHelper in 'Src\CompWizardFilesHelper.pas',
   NewTabSet in '..\Components\NewTabSet.pas',
   dwTaskbarList in '..\Components\dwTaskbarList.pas',
   NewStaticText in '..\Components\NewStaticText.pas',
@@ -47,8 +47,8 @@ uses
   DropListBox in '..\Components\DropListBox.pas',
   NewCheckListBox in '..\Components\NewCheckListBox.pas',
   NewNotebook in '..\Components\NewNotebook.pas',
-  TaskbarProgressFunc in 'TaskbarProgressFunc.pas',
-  HtmlHelpFunc in 'HtmlHelpFunc.pas';
+  TaskbarProgressFunc in 'Src\TaskbarProgressFunc.pas',
+  HtmlHelpFunc in 'Src\HtmlHelpFunc.pas';
 
 {$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}
 {$SETPEOSVERSION 6.1}

Projects/Compil32.dproj

@@ -79,48 +79,47 @@
         </DelphiCompile>
         <DCCReference Include="SafeDLLPath.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
-        <DCCReference Include="CompForm.pas">
+        <DCCReference Include="Src\CompForm.pas">
             <Form>CompileForm</Form>
         </DCCReference>
-        <DCCReference Include="CmnFunc.pas"/>
-        <DCCReference Include="CmnFunc2.pas"/>
-        <DCCReference Include="CompFunc.pas"/>
-        <DCCReference Include="CompMsgs.pas"/>
-        <DCCReference Include="CompInt.pas"/>
-        <DCCReference Include="CompOptions.pas">
+        <DCCReference Include="Src\CmnFunc.pas"/>
+        <DCCReference Include="Src\CmnFunc2.pas"/>
+        <DCCReference Include="Src\CompFunc.pas"/>
+        <DCCReference Include="Src\CompMsgs.pas"/>
+        <DCCReference Include="Src\CompInt.pas"/>
+        <DCCReference Include="Src\CompOptions.pas">
             <Form>OptionsForm</Form>
         </DCCReference>
-        <DCCReference Include="CompStartup.pas">
+        <DCCReference Include="Src\CompStartup.pas">
             <Form>StartupForm</Form>
         </DCCReference>
-        <DCCReference Include="CompWizard.pas">
+        <DCCReference Include="Src\CompWizard.pas">
             <Form>WizardForm</Form>
         </DCCReference>
-        <DCCReference Include="CompWizardFile.pas">
+        <DCCReference Include="Src\CompWizardFile.pas">
             <Form>WizardFileForm</Form>
         </DCCReference>
-        <DCCReference Include="CompFileAssoc.pas"/>
+        <DCCReference Include="Src\CompFileAssoc.pas"/>
         <DCCReference Include="..\Components\TmSchema.pas"/>
         <DCCReference Include="..\Components\UxTheme.pas"/>
-        <DCCReference Include="DebugStruct.pas"/>
-        <DCCReference Include="BrowseFunc.pas"/>
-        <DCCReference Include="CompSignTools.pas">
+        <DCCReference Include="Src\DebugStruct.pas"/>
+        <DCCReference Include="Src\BrowseFunc.pas"/>
+        <DCCReference Include="Src\CompSignTools.pas">
             <Form>SignToolsForm</Form>
         </DCCReference>
-        <DCCReference Include="CompInputQueryCombo.pas"/>
+        <DCCReference Include="Src\CompInputQueryCombo.pas"/>
         <DCCReference Include="..\Components\ScintInt.pas"/>
         <DCCReference Include="..\Components\ScintEdit.pas"/>
         <DCCReference Include="..\Components\ScintStylerInnoSetup.pas"/>
         <DCCReference Include="..\Components\ModernColors.pas"/>
-        <DCCReference Include="CompMsgBoxDesigner.pas">
+        <DCCReference Include="Src\CompMsgBoxDesigner.pas">
             <Form>MsgBoxDesignerForm</Form>
         </DCCReference>
-        <DCCReference Include="CompScintEdit.pas"/>
-        <DCCReference Include="CompFilesDesigner.pas">
+        <DCCReference Include="Src\CompScintEdit.pas"/>
+        <DCCReference Include="Src\CompFilesDesigner.pas">
             <Form>FilesDesignerForm</Form>
-            <FormType>dfm</FormType>
         </DCCReference>
-        <DCCReference Include="CompWizardFilesHelper.pas"/>
+        <DCCReference Include="Src\CompWizardFilesHelper.pas"/>
         <DCCReference Include="..\Components\NewTabSet.pas"/>
         <DCCReference Include="..\Components\dwTaskbarList.pas"/>
         <DCCReference Include="..\Components\NewStaticText.pas"/>
@@ -128,8 +127,8 @@
         <DCCReference Include="..\Components\DropListBox.pas"/>
         <DCCReference Include="..\Components\NewCheckListBox.pas"/>
         <DCCReference Include="..\Components\NewNotebook.pas"/>
-        <DCCReference Include="TaskbarProgressFunc.pas"/>
-        <DCCReference Include="HtmlHelpFunc.pas"/>
+        <DCCReference Include="Src\TaskbarProgressFunc.pas"/>
+        <DCCReference Include="Src\HtmlHelpFunc.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Projects/ISCC.dpr

@@ -15,18 +15,19 @@ program ISCC;
   into this program and not depend on ISCmplr.dll. }
 
 uses
-  SafeDLLPath in 'SafeDLLPath.pas',
+  SafeDLLPath in 'Src\SafeDLLPath.pas',
   Windows,
   SysUtils,
   Classes,
-  {$IFDEF STATICCOMPILER} Compile in 'Compile.pas', {$ENDIF}
+  {$IFDEF STATICCOMPILER} Compile in 'Src\Compile.pas', {$ENDIF}
   PathFunc in '..\Components\PathFunc.pas',
-  CmnFunc2 in 'CmnFunc2.pas',
-  CompInt in 'CompInt.pas',
-  FileClass in 'FileClass.pas',
-  CompTypes in 'CompTypes.pas';
+  CmnFunc2 in 'Src\CmnFunc2.pas',
+  CompInt in 'Src\CompInt.pas',
+  FileClass in 'Src\FileClass.pas',
+  CompTypes in 'Src\CompTypes.pas',
+  Int64Em in 'Src\Int64Em.pas';
 
-{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED} 
+{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}
 {$SETPEOSVERSION 6.1}
 {$SETPESUBSYSVERSION 6.1}
 {$WEAKLINKRTTI ON}

Projects/ISCC.dproj

@@ -75,13 +75,14 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="SafeDLLPath.pas"/>
-        <DCCReference Include="Compile.pas"/>
+        <DCCReference Include="Src\SafeDLLPath.pas"/>
+        <DCCReference Include="Src\Compile.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
-        <DCCReference Include="CmnFunc2.pas"/>
-        <DCCReference Include="CompInt.pas"/>
-        <DCCReference Include="FileClass.pas"/>
-        <DCCReference Include="CompTypes.pas"/>
+        <DCCReference Include="Src\CmnFunc2.pas"/>
+        <DCCReference Include="Src\CompInt.pas"/>
+        <DCCReference Include="Src\FileClass.pas"/>
+        <DCCReference Include="Src\CompTypes.pas"/>
+        <DCCReference Include="Src\Int64Em.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Projects/ISCmplr.dpr

@@ -2,7 +2,7 @@ library ISCmplr;
 
 {
   Inno Setup
-  Copyright (C) 1997-2020 Jordan Russell
+  Copyright (C) 1997-2024 Jordan Russell
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
@@ -10,26 +10,26 @@ library ISCmplr;
 }
 
 uses
-  SafeDLLPath in 'SafeDLLPath.pas',
+  SafeDLLPath in 'Src\SafeDLLPath.pas',
   SysUtils,
-  CompInt in 'CompInt.pas',
-  CompPreprocInt in 'CompPreprocInt.pas',
-  Compile in 'Compile.pas',
-  CompMsgs in 'CompMsgs.pas',
-  Struct in 'Struct.pas',
-  ScriptFunc in 'ScriptFunc.pas',
-  ScriptFunc_C in 'ScriptFunc_C.pas',
-  ScriptCompiler in 'ScriptCompiler.pas',
-  ScriptClasses_C in 'ScriptClasses_C.pas',
-  ResUpdate in 'ResUpdate.pas',
-  CompExeUpdate in 'CompExeUpdate.pas',
-  Compress in 'Compress.pas',
-  CompressZlib in 'CompressZlib.pas',
-  bzlib in 'bzlib.pas',
-  LZMA in 'LZMA.pas',
-  FileClass in 'FileClass.pas',
-  ArcFour in 'ArcFour.pas',
-  VerInfo in 'VerInfo.pas',
+  CompInt in 'Src\CompInt.pas',
+  CompPreprocInt in 'Src\CompPreprocInt.pas',
+  Compile in 'Src\Compile.pas',
+  CompMsgs in 'Src\CompMsgs.pas',
+  Struct in 'Src\Struct.pas',
+  ScriptFunc in 'Src\ScriptFunc.pas',
+  ScriptFunc_C in 'Src\ScriptFunc_C.pas',
+  ScriptCompiler in 'Src\ScriptCompiler.pas',
+  ScriptClasses_C in 'Src\ScriptClasses_C.pas',
+  ResUpdate in 'Src\ResUpdate.pas',
+  CompExeUpdate in 'Src\CompExeUpdate.pas',
+  Compress in 'Src\Compress.pas',
+  CompressZlib in 'Src\CompressZlib.pas',
+  bzlib in 'Src\bzlib.pas',
+  LZMA in 'Src\LZMA.pas',
+  FileClass in 'Src\FileClass.pas',
+  ArcFour in 'Src\ArcFour.pas',
+  VerInfo in 'Src\VerInfo.pas',
   PathFunc in '..\Components\PathFunc.pas';
 
 {$IMAGEBASE $00800000}

Projects/ISCmplr.dproj

@@ -79,25 +79,25 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="SafeDLLPath.pas"/>
-        <DCCReference Include="CompInt.pas"/>
-        <DCCReference Include="CompPreprocInt.pas"/>
-        <DCCReference Include="Compile.pas"/>
-        <DCCReference Include="CompMsgs.pas"/>
-        <DCCReference Include="Struct.pas"/>
-        <DCCReference Include="ScriptFunc.pas"/>
-        <DCCReference Include="ScriptFunc_C.pas"/>
-        <DCCReference Include="ScriptCompiler.pas"/>
-        <DCCReference Include="ScriptClasses_C.pas"/>
-        <DCCReference Include="ResUpdate.pas"/>
-        <DCCReference Include="CompExeUpdate.pas"/>
-        <DCCReference Include="Compress.pas"/>
-        <DCCReference Include="CompressZlib.pas"/>
-        <DCCReference Include="bzlib.pas"/>
-        <DCCReference Include="LZMA.pas"/>
-        <DCCReference Include="FileClass.pas"/>
-        <DCCReference Include="ArcFour.pas"/>
-        <DCCReference Include="VerInfo.pas"/>
+        <DCCReference Include="Src\SafeDLLPath.pas"/>
+        <DCCReference Include="Src\CompInt.pas"/>
+        <DCCReference Include="Src\CompPreprocInt.pas"/>
+        <DCCReference Include="Src\Compile.pas"/>
+        <DCCReference Include="Src\CompMsgs.pas"/>
+        <DCCReference Include="Src\Struct.pas"/>
+        <DCCReference Include="Src\ScriptFunc.pas"/>
+        <DCCReference Include="Src\ScriptFunc_C.pas"/>
+        <DCCReference Include="Src\ScriptCompiler.pas"/>
+        <DCCReference Include="Src\ScriptClasses_C.pas"/>
+        <DCCReference Include="Src\ResUpdate.pas"/>
+        <DCCReference Include="Src\CompExeUpdate.pas"/>
+        <DCCReference Include="Src\Compress.pas"/>
+        <DCCReference Include="Src\CompressZlib.pas"/>
+        <DCCReference Include="Src\bzlib.pas"/>
+        <DCCReference Include="Src\LZMA.pas"/>
+        <DCCReference Include="Src\FileClass.pas"/>
+        <DCCReference Include="Src\ArcFour.pas"/>
+        <DCCReference Include="Src\VerInfo.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>

Projects/Setup.dpr

@@ -10,64 +10,64 @@ program Setup;
 }
 
 uses
-  SafeDLLPath in 'SafeDLLPath.pas',
-  XPTheme in 'XPTheme.pas',
+  SafeDLLPath in 'Src\SafeDLLPath.pas',
+  XPTheme in 'Src\XPTheme.pas',
   Forms,
   Windows,
   SysUtils,
   Messages,
   RichEditViewer in '..\Components\RichEditViewer.pas',
-  CmnFunc in 'CmnFunc.pas',
-  CmnFunc2 in 'CmnFunc2.pas',
-  Main in 'Main.pas' {MainForm},
-  Install in 'Install.pas',
-  Msgs in 'Msgs.pas',
-  MsgIDs in 'MsgIDs.pas',
-  Undo in 'Undo.pas',
-  Struct in 'Struct.pas',
-  NewDisk in 'NewDisk.pas' {NewDiskForm},
-  InstFunc in 'InstFunc.pas',
-  InstFnc2 in 'InstFnc2.pas',
-  Wizard in 'Wizard.pas' {WizardForm},
-  ScriptFunc_R in 'ScriptFunc_R.pas',
-  ScriptFunc in 'ScriptFunc.pas',
-  SetupTypes in 'SetupTypes.pas',
-  ScriptRunner in 'ScriptRunner.pas',
-  ScriptDlg in 'ScriptDlg.pas',
-  ScriptClasses_R in 'ScriptClasses_R.pas',
-  SelLangForm in 'SelLangForm.pas' {SelectLanguageForm},
-  Extract in 'Extract.pas',
-  Int64Em in 'Int64Em.pas',
-  SelFolderForm in 'SelFolderForm.pas' {SelectFolderForm},
-  Compress in 'Compress.pas',
-  CompressZlib in 'CompressZlib.pas',
-  bzlib in 'bzlib.pas',
-  LZMADecomp in 'LZMADecomp.pas',
-  FileClass in 'FileClass.pas',
-  MD5 in 'MD5.pas',
-  SHA1 in 'SHA1.pas',
-  Logging in 'Logging.pas',
-  DebugClient in 'DebugClient.pas',
-  DebugStruct in 'DebugStruct.pas',
-  ArcFour in 'ArcFour.pas',
-  Uninstall in 'Uninstall.pas',
-  UninstProgressForm in 'UninstProgressForm.pas' {UninstProgressForm},
-  UninstSharedFileForm in 'UninstSharedFileForm.pas' {UninstSharedFileForm},
-  SimpleExpression in 'SimpleExpression.pas',
-  UIStateForm in 'UIStateForm.pas',
-  SetupForm in 'SetupForm.pas',
-  RegSvr in 'RegSvr.pas',
-  BrowseFunc in 'BrowseFunc.pas',
-  RedirFunc in 'RedirFunc.pas',
-  SecurityFunc in 'SecurityFunc.pas',
-  Helper in 'Helper.pas',
-  VerInfo in 'VerInfo.pas',
-  RegDLL in 'RegDLL.pas',
-  ResUpdate in 'ResUpdate.pas',
-  SpawnCommon in 'SpawnCommon.pas',
-  SpawnServer in 'SpawnServer.pas',
-  SpawnClient in 'SpawnClient.pas',
-  TaskDialog in 'TaskDialog.pas',
+  CmnFunc in 'Src\CmnFunc.pas',
+  CmnFunc2 in 'Src\CmnFunc2.pas',
+  Main in 'Src\Main.pas' {MainForm},
+  Install in 'Src\Install.pas',
+  Msgs in 'Src\Msgs.pas',
+  MsgIDs in 'Src\MsgIDs.pas',
+  Undo in 'Src\Undo.pas',
+  Struct in 'Src\Struct.pas',
+  NewDisk in 'Src\NewDisk.pas' {NewDiskForm},
+  InstFunc in 'Src\InstFunc.pas',
+  InstFnc2 in 'Src\InstFnc2.pas',
+  Wizard in 'Src\Wizard.pas' {WizardForm},
+  ScriptFunc_R in 'Src\ScriptFunc_R.pas',
+  ScriptFunc in 'Src\Src\ScriptFunc.pas',
+  SetupTypes in 'Src\SetupTypes.pas',
+  ScriptRunner in 'Src\ScriptRunner.pas',
+  ScriptDlg in 'Src\ScriptDlg.pas',
+  ScriptClasses_R in 'Src\ScriptClasses_R.pas',
+  SelLangForm in 'Src\SelLangForm.pas' {SelectLanguageForm},
+  Extract in 'Src\Extract.pas',
+  Int64Em in 'Src\Int64Em.pas',
+  SelFolderForm in 'Src\SelFolderForm.pas' {SelectFolderForm},
+  Compress in 'Src\Compress.pas',
+  CompressZlib in 'Src\CompressZlib.pas',
+  bzlib in 'Src\bzlib.pas',
+  LZMADecomp in 'Src\LZMADecomp.pas',
+  FileClass in 'Src\FileClass.pas',
+  MD5 in 'Src\MD5.pas',
+  SHA1 in 'Src\SHA1.pas',
+  Logging in 'Src\Logging.pas',
+  DebugClient in 'Src\DebugClient.pas',
+  DebugStruct in 'Src\DebugStruct.pas',
+  ArcFour in 'Src\ArcFour.pas',
+  Uninstall in 'Src\Uninstall.pas',
+  UninstProgressForm in 'Src\UninstProgressForm.pas' {UninstProgressForm},
+  UninstSharedFileForm in 'Src\UninstSharedFileForm.pas' {UninstSharedFileForm},
+  SimpleExpression in 'Src\SimpleExpression.pas',
+  UIStateForm in 'Src\UIStateForm.pas',
+  SetupForm in 'Src\SetupForm.pas',
+  RegSvr in 'Src\RegSvr.pas',
+  BrowseFunc in 'Src\BrowseFunc.pas',
+  RedirFunc in 'Src\RedirFunc.pas',
+  SecurityFunc in 'Src\SecurityFunc.pas',
+  Helper in 'Src\Helper.pas',
+  VerInfo in 'Src\VerInfo.pas',
+  RegDLL in 'Src\RegDLL.pas',
+  ResUpdate in 'Src\ResUpdate.pas',
+  SpawnCommon in 'Src\SpawnCommon.pas',
+  SpawnServer in 'Src\SpawnServer.pas',
+  SpawnClient in 'Src\SpawnClient.pas',
+  TaskDialog in 'Src\TaskDialog.pas',
   BidiUtils in '..\Components\BidiUtils.pas',
   PathFunc in '..\Components\PathFunc.pas',
   BidiCtrls in '..\Components\BidiCtrls.pas',
@@ -83,7 +83,7 @@ uses
   Resample in '..\Components\Resample.pas',
   dwTaskbarList in '..\Components\dwTaskbarList.pas',
   ASMInline in '..\Components\ASMInline.pas',
-  TaskbarProgressFunc in 'TaskbarProgressFunc.pas';
+  TaskbarProgressFunc in 'Src\TaskbarProgressFunc.pas';
 
 {$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}
 {$SETPEOSVERSION 6.1}

Projects/Setup.dproj

@@ -74,74 +74,74 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="SafeDLLPath.pas"/>
-        <DCCReference Include="XPTheme.pas"/>
+        <DCCReference Include="Src\SafeDLLPath.pas"/>
+        <DCCReference Include="Src\XPTheme.pas"/>
         <DCCReference Include="..\Components\RichEditViewer.pas"/>
-        <DCCReference Include="CmnFunc.pas"/>
-        <DCCReference Include="CmnFunc2.pas"/>
-        <DCCReference Include="Main.pas">
+        <DCCReference Include="Src\CmnFunc.pas"/>
+        <DCCReference Include="Src\CmnFunc2.pas"/>
+        <DCCReference Include="Src\Main.pas">
             <Form>MainForm</Form>
         </DCCReference>
-        <DCCReference Include="Install.pas"/>
-        <DCCReference Include="Msgs.pas"/>
-        <DCCReference Include="MsgIDs.pas"/>
-        <DCCReference Include="Undo.pas"/>
-        <DCCReference Include="Struct.pas"/>
-        <DCCReference Include="NewDisk.pas">
+        <DCCReference Include="Src\Install.pas"/>
+        <DCCReference Include="Src\Msgs.pas"/>
+        <DCCReference Include="Src\MsgIDs.pas"/>
+        <DCCReference Include="Src\Undo.pas"/>
+        <DCCReference Include="Src\Struct.pas"/>
+        <DCCReference Include="Src\NewDisk.pas">
             <Form>NewDiskForm</Form>
         </DCCReference>
-        <DCCReference Include="InstFunc.pas"/>
-        <DCCReference Include="InstFnc2.pas"/>
-        <DCCReference Include="Wizard.pas">
+        <DCCReference Include="Src\InstFunc.pas"/>
+        <DCCReference Include="Src\InstFnc2.pas"/>
+        <DCCReference Include="Src\Wizard.pas">
             <Form>WizardForm</Form>
         </DCCReference>
-        <DCCReference Include="ScriptFunc_R.pas"/>
-        <DCCReference Include="ScriptFunc.pas"/>
-        <DCCReference Include="SetupTypes.pas"/>
-        <DCCReference Include="ScriptRunner.pas"/>
-        <DCCReference Include="ScriptDlg.pas"/>
-        <DCCReference Include="ScriptClasses_R.pas"/>
-        <DCCReference Include="SelLangForm.pas">
+        <DCCReference Include="Src\ScriptFunc_R.pas"/>
+        <DCCReference Include="Src\Src\ScriptFunc.pas"/>
+        <DCCReference Include="Src\SetupTypes.pas"/>
+        <DCCReference Include="Src\ScriptRunner.pas"/>
+        <DCCReference Include="Src\ScriptDlg.pas"/>
+        <DCCReference Include="Src\ScriptClasses_R.pas"/>
+        <DCCReference Include="Src\SelLangForm.pas">
             <Form>SelectLanguageForm</Form>
         </DCCReference>
-        <DCCReference Include="Extract.pas"/>
-        <DCCReference Include="Int64Em.pas"/>
-        <DCCReference Include="SelFolderForm.pas">
+        <DCCReference Include="Src\Extract.pas"/>
+        <DCCReference Include="Src\Int64Em.pas"/>
+        <DCCReference Include="Src\SelFolderForm.pas">
             <Form>SelectFolderForm</Form>
         </DCCReference>
-        <DCCReference Include="Compress.pas"/>
-        <DCCReference Include="CompressZlib.pas"/>
-        <DCCReference Include="bzlib.pas"/>
-        <DCCReference Include="LZMADecomp.pas"/>
-        <DCCReference Include="FileClass.pas"/>
-        <DCCReference Include="MD5.pas"/>
-        <DCCReference Include="SHA1.pas"/>
-        <DCCReference Include="Logging.pas"/>
-        <DCCReference Include="DebugClient.pas"/>
-        <DCCReference Include="DebugStruct.pas"/>
-        <DCCReference Include="ArcFour.pas"/>
-        <DCCReference Include="Uninstall.pas"/>
-        <DCCReference Include="UninstProgressForm.pas">
+        <DCCReference Include="Src\Compress.pas"/>
+        <DCCReference Include="Src\CompressZlib.pas"/>
+        <DCCReference Include="Src\bzlib.pas"/>
+        <DCCReference Include="Src\LZMADecomp.pas"/>
+        <DCCReference Include="Src\FileClass.pas"/>
+        <DCCReference Include="Src\MD5.pas"/>
+        <DCCReference Include="Src\SHA1.pas"/>
+        <DCCReference Include="Src\Logging.pas"/>
+        <DCCReference Include="Src\DebugClient.pas"/>
+        <DCCReference Include="Src\DebugStruct.pas"/>
+        <DCCReference Include="Src\ArcFour.pas"/>
+        <DCCReference Include="Src\Uninstall.pas"/>
+        <DCCReference Include="Src\UninstProgressForm.pas">
             <Form>UninstProgressForm</Form>
         </DCCReference>
-        <DCCReference Include="UninstSharedFileForm.pas">
+        <DCCReference Include="Src\UninstSharedFileForm.pas">
             <Form>UninstSharedFileForm</Form>
         </DCCReference>
-        <DCCReference Include="SimpleExpression.pas"/>
-        <DCCReference Include="UIStateForm.pas"/>
-        <DCCReference Include="SetupForm.pas"/>
-        <DCCReference Include="RegSvr.pas"/>
-        <DCCReference Include="BrowseFunc.pas"/>
-        <DCCReference Include="RedirFunc.pas"/>
-        <DCCReference Include="SecurityFunc.pas"/>
-        <DCCReference Include="Helper.pas"/>
-        <DCCReference Include="VerInfo.pas"/>
-        <DCCReference Include="RegDLL.pas"/>
-        <DCCReference Include="ResUpdate.pas"/>
-        <DCCReference Include="SpawnCommon.pas"/>
-        <DCCReference Include="SpawnServer.pas"/>
-        <DCCReference Include="SpawnClient.pas"/>
-        <DCCReference Include="TaskDialog.pas"/>
+        <DCCReference Include="Src\SimpleExpression.pas"/>
+        <DCCReference Include="Src\UIStateForm.pas"/>
+        <DCCReference Include="Src\SetupForm.pas"/>
+        <DCCReference Include="Src\RegSvr.pas"/>
+        <DCCReference Include="Src\BrowseFunc.pas"/>
+        <DCCReference Include="Src\RedirFunc.pas"/>
+        <DCCReference Include="Src\SecurityFunc.pas"/>
+        <DCCReference Include="Src\Helper.pas"/>
+        <DCCReference Include="Src\VerInfo.pas"/>
+        <DCCReference Include="Src\RegDLL.pas"/>
+        <DCCReference Include="Src\ResUpdate.pas"/>
+        <DCCReference Include="Src\SpawnCommon.pas"/>
+        <DCCReference Include="Src\SpawnServer.pas"/>
+        <DCCReference Include="Src\SpawnClient.pas"/>
+        <DCCReference Include="Src\TaskDialog.pas"/>
         <DCCReference Include="..\Components\BidiUtils.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
         <DCCReference Include="..\Components\BidiCtrls.pas"/>
@@ -157,7 +157,7 @@
         <DCCReference Include="..\Components\Resample.pas"/>
         <DCCReference Include="..\Components\dwTaskbarList.pas"/>
         <DCCReference Include="..\Components\ASMInline.pas"/>
-        <DCCReference Include="TaskbarProgressFunc.pas"/>
+        <DCCReference Include="Src\TaskbarProgressFunc.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Projects/SetupLdr.dpr

@@ -2,7 +2,7 @@ program SetupLdr;
 
 {
   Inno Setup
-  Copyright (C) 1997-2020 Jordan Russell
+  Copyright (C) 1997-2024 Jordan Russell
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
@@ -10,23 +10,29 @@ program SetupLdr;
 }
 
 uses
-  SafeDLLPath in 'SafeDLLPath.pas',
-  XPTheme in 'XPTheme.pas',
+  SafeDLLPath in 'Src\SafeDLLPath.pas',
+  XPTheme in 'Src\XPTheme.pas',
   Windows,
   Messages,
   SysUtils,
-  Compress in 'Compress.pas',
-  LZMADecompSmall in 'LZMADecompSmall.pas',
-  SetupEnt in 'SetupEnt.pas',
+  Compress in 'Src\Compress.pas',
+  LZMADecompSmall in 'Src\LZMADecompSmall.pas',
+  SetupEnt in 'Src\SetupEnt.pas',
   PathFunc in '..\Components\PathFunc.pas',
-  CmnFunc2 in 'CmnFunc2.pas',
-  Msgs in 'Msgs.pas',
-  MsgIDs in 'MsgIDs.pas',
-  Struct in 'Struct.pas',
-  InstFunc in 'InstFunc.pas',
-  FileClass in 'FileClass.pas';
-
-{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED} 
+  CmnFunc2 in 'Src\CmnFunc2.pas',
+  Msgs in 'Src\Msgs.pas',
+  MsgIDs in 'Src\MsgIDs.pas',
+  Struct in 'Src\Struct.pas',
+  InstFunc in 'Src\InstFunc.pas',
+  FileClass in 'Src\FileClass.pas',
+  Int64Em in 'Src\Int64Em.pas',
+  SHA1 in 'Src\SHA1.pas',
+  MD5 in 'Src\MD5.pas',
+  RedirFunc in 'Src\RedirFunc.pas',
+  SetupTypes in 'Src\SetupTypes.pas',
+  VerInfo in 'Src\VerInfo.pas';
+
+{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}
 {$SETPEOSVERSION 6.1}
 {$SETPESUBSYSVERSION 6.1}
 {$WEAKLINKRTTI ON}

Projects/SetupLdr.dproj

@@ -71,18 +71,24 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="SafeDLLPath.pas"/>
-        <DCCReference Include="XPTheme.pas"/>
-        <DCCReference Include="Compress.pas"/>
-        <DCCReference Include="LZMADecompSmall.pas"/>
-        <DCCReference Include="SetupEnt.pas"/>
+        <DCCReference Include="Src\SafeDLLPath.pas"/>
+        <DCCReference Include="Src\XPTheme.pas"/>
+        <DCCReference Include="Src\Compress.pas"/>
+        <DCCReference Include="Src\LZMADecompSmall.pas"/>
+        <DCCReference Include="Src\SetupEnt.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
-        <DCCReference Include="CmnFunc2.pas"/>
-        <DCCReference Include="Msgs.pas"/>
-        <DCCReference Include="MsgIDs.pas"/>
-        <DCCReference Include="Struct.pas"/>
-        <DCCReference Include="InstFunc.pas"/>
-        <DCCReference Include="FileClass.pas"/>
+        <DCCReference Include="Src\CmnFunc2.pas"/>
+        <DCCReference Include="Src\Msgs.pas"/>
+        <DCCReference Include="Src\MsgIDs.pas"/>
+        <DCCReference Include="Src\Struct.pas"/>
+        <DCCReference Include="Src\InstFunc.pas"/>
+        <DCCReference Include="Src\FileClass.pas"/>
+        <DCCReference Include="Src\Int64Em.pas"/>
+        <DCCReference Include="Src\SHA1.pas"/>
+        <DCCReference Include="Src\MD5.pas"/>
+        <DCCReference Include="Src\RedirFunc.pas"/>
+        <DCCReference Include="Src\SetupTypes.pas"/>
+        <DCCReference Include="Src\VerInfo.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>