Move the sources back into the Src folder now that they have prefixes. Changed the Shared prefix of the files which were in SetupLdrAndSetup to Setup. Todo: the remaining dirs with helper code.

Projects/Compil32.dpr

@@ -15,31 +15,31 @@ uses
   SysUtils,
   Forms,
   PathFunc in '..\Components\PathFunc.pas',
-  IDE.CompileForm in 'Src\Compil32\IDE.CompileForm.pas' {CompileForm},
+  IDE.CompileForm in 'Src\IDE.CompileForm.pas' {CompileForm},
   Shared.CommonFunc.Vcl in 'Src\Shared.CommonFunc.Vcl.pas',
   Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
-  IDE.HelperFunc in 'Src\Compil32\IDE.HelperFunc.pas',
-  IDE.Messages in 'Src\Compil32\IDE.Messages.pas',
+  IDE.HelperFunc in 'Src\IDE.HelperFunc.pas',
+  IDE.Messages in 'Src\IDE.Messages.pas',
   Shared.CompilerInt in 'Src\Shared.CompilerInt.pas',
-  IDE.OptionsForm in 'Src\Compil32\IDE.OptionsForm.pas' {OptionsForm},
-  IDE.StartupForm in 'Src\Compil32\IDE.StartupForm.pas' {StartupForm},
-  IDE.Wizard.WizardForm in 'Src\Compil32\IDE.Wizard.WizardForm.pas' {WizardForm},
-  IDE.Wizard.WizardFileForm in 'Src\Compil32\IDE.Wizard.WizardFileForm.pas' {WizardFileForm},
-  IDE.FileAssocFunc in 'Src\Compil32\IDE.FileAssocFunc.pas',
+  IDE.OptionsForm in 'Src\IDE.OptionsForm.pas' {OptionsForm},
+  IDE.StartupForm in 'Src\IDE.StartupForm.pas' {StartupForm},
+  IDE.Wizard.WizardForm in 'Src\IDE.Wizard.WizardForm.pas' {WizardForm},
+  IDE.Wizard.WizardFileForm in 'Src\IDE.Wizard.WizardFileForm.pas' {WizardFileForm},
+  IDE.FileAssocFunc in 'Src\IDE.FileAssocFunc.pas',
   NewUxTheme.TmSchema in '..\Components\NewUxTheme.TmSchema.pas',
   NewUxTheme in '..\Components\NewUxTheme.pas',
   Shared.DebugStruct in 'Src\Shared.DebugStruct.pas',
   Shared.BrowseFunc in 'Src\Shared.BrowseFunc.pas',
-  IDE.SignToolsForm in 'Src\Compil32\IDE.SignToolsForm.pas' {SignToolsForm},
-  IDE.InputQueryComboForm in 'Src\Compil32\IDE.InputQueryComboForm.pas',
+  IDE.SignToolsForm in 'Src\IDE.SignToolsForm.pas' {SignToolsForm},
+  IDE.InputQueryComboForm in 'Src\IDE.InputQueryComboForm.pas',
   ScintInt in '..\Components\ScintInt.pas',
   ScintEdit in '..\Components\ScintEdit.pas',
-  IDE.ScintStylerInnoSetup in 'Src\Compil32\IDE.ScintStylerInnoSetup.pas',
+  IDE.ScintStylerInnoSetup in 'Src\IDE.ScintStylerInnoSetup.pas',
   ModernColors in '..\Components\ModernColors.pas',
-  IDE.MsgBoxDesignerForm in 'Src\Compil32\IDE.MsgBoxDesignerForm.pas' {MsgBoxDesignerForm},
-  IDE.CompScintEdit in 'Src\Compil32\IDE.CompScintEdit.pas',
-  IDE.FilesDesignerForm in 'Src\Compil32\IDE.FilesDesignerForm.pas' {FilesDesignerForm},
-  IDE.Wizard.WizardFormFilesHelper in 'Src\Compil32\IDE.Wizard.WizardFormFilesHelper.pas',
+  IDE.MsgBoxDesignerForm in 'Src\IDE.MsgBoxDesignerForm.pas' {MsgBoxDesignerForm},
+  IDE.CompScintEdit in 'Src\IDE.CompScintEdit.pas',
+  IDE.FilesDesignerForm in 'Src\IDE.FilesDesignerForm.pas' {FilesDesignerForm},
+  IDE.Wizard.WizardFormFilesHelper in 'Src\IDE.Wizard.WizardFormFilesHelper.pas',
   NewTabSet in '..\Components\NewTabSet.pas',
   NewStaticText in '..\Components\NewStaticText.pas',
   BidiUtils in '..\Components\BidiUtils.pas',
@@ -47,7 +47,7 @@ uses
   NewCheckListBox in '..\Components\NewCheckListBox.pas',
   NewNotebook in '..\Components\NewNotebook.pas',
   Shared.TaskbarProgressFunc in 'Src\Shared.TaskbarProgressFunc.pas',
-  IDE.HtmlHelpFunc in 'Src\Compil32\IDE.HtmlHelpFunc.pas',
+  IDE.HtmlHelpFunc in 'Src\IDE.HtmlHelpFunc.pas',
   Shared.UIStateForm in 'Src\Shared.UIStateForm.pas',
   Shared.LangOptionsSectionDirectives in 'Src\Shared.LangOptionsSectionDirectives.pas',
   Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
@@ -58,8 +58,8 @@ uses
   Shared.Int64Em in 'Src\Shared.Int64Em.pas',
   Shared.Compress in 'Src\Shared.Compress.pas',
   Shared.TaskDialogFunc in 'Src\Shared.TaskDialogFunc.pas',
-  IDE.RegistryDesignerForm in 'Src\Compil32\IDE.RegistryDesignerForm.pas' {RegistryDesignerForm},
-  IDE.Wizard.WizardFormRegistryHelper in 'Src\Compil32\IDE.Wizard.WizardFormRegistryHelper.pas',
+  IDE.RegistryDesignerForm in 'Src\IDE.RegistryDesignerForm.pas' {RegistryDesignerForm},
+  IDE.Wizard.WizardFormRegistryHelper in 'Src\IDE.Wizard.WizardFormRegistryHelper.pas',
   MD5 in '..\Components\MD5.pas',
   ScintInt.InnoSetup in '..\Components\ScintInt.InnoSetup.pas',
   Shared.ScriptFunc in 'Src\Shared.ScriptFunc.pas',

Projects/Compil32.dproj

@@ -77,47 +77,47 @@
         </DelphiCompile>
         <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
-        <DCCReference Include="Src\Compil32\IDE.CompileForm.pas">
+        <DCCReference Include="Src\IDE.CompileForm.pas">
             <Form>CompileForm</Form>
         </DCCReference>
         <DCCReference Include="Src\Shared.CommonFunc.Vcl.pas"/>
         <DCCReference Include="Src\Shared.CommonFunc.pas"/>
-        <DCCReference Include="Src\Compil32\IDE.HelperFunc.pas"/>
-        <DCCReference Include="Src\Compil32\IDE.Messages.pas"/>
+        <DCCReference Include="Src\IDE.HelperFunc.pas"/>
+        <DCCReference Include="Src\IDE.Messages.pas"/>
         <DCCReference Include="Src\Shared.CompilerInt.pas"/>
-        <DCCReference Include="Src\Compil32\IDE.OptionsForm.pas">
+        <DCCReference Include="Src\IDE.OptionsForm.pas">
             <Form>OptionsForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\IDE.StartupForm.pas">
+        <DCCReference Include="Src\IDE.StartupForm.pas">
             <Form>StartupForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\IDE.Wizard.WizardForm.pas">
+        <DCCReference Include="Src\IDE.Wizard.WizardForm.pas">
             <Form>WizardForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\IDE.Wizard.WizardFileForm.pas">
+        <DCCReference Include="Src\IDE.Wizard.WizardFileForm.pas">
             <Form>WizardFileForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\IDE.FileAssocFunc.pas"/>
+        <DCCReference Include="Src\IDE.FileAssocFunc.pas"/>
         <DCCReference Include="..\Components\NewUxTheme.TmSchema.pas"/>
         <DCCReference Include="..\Components\NewUxTheme.pas"/>
         <DCCReference Include="Src\Shared.DebugStruct.pas"/>
         <DCCReference Include="Src\Shared.BrowseFunc.pas"/>
-        <DCCReference Include="Src\Compil32\IDE.SignToolsForm.pas">
+        <DCCReference Include="Src\IDE.SignToolsForm.pas">
             <Form>SignToolsForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\IDE.InputQueryComboForm.pas"/>
+        <DCCReference Include="Src\IDE.InputQueryComboForm.pas"/>
         <DCCReference Include="..\Components\ScintInt.pas"/>
         <DCCReference Include="..\Components\ScintEdit.pas"/>
-        <DCCReference Include="Src\Compil32\IDE.ScintStylerInnoSetup.pas"/>
+        <DCCReference Include="Src\IDE.ScintStylerInnoSetup.pas"/>
         <DCCReference Include="..\Components\ModernColors.pas"/>
-        <DCCReference Include="Src\Compil32\IDE.MsgBoxDesignerForm.pas">
+        <DCCReference Include="Src\IDE.MsgBoxDesignerForm.pas">
             <Form>MsgBoxDesignerForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\IDE.CompScintEdit.pas"/>
-        <DCCReference Include="Src\Compil32\IDE.FilesDesignerForm.pas">
+        <DCCReference Include="Src\IDE.CompScintEdit.pas"/>
+        <DCCReference Include="Src\IDE.FilesDesignerForm.pas">
             <Form>FilesDesignerForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\IDE.Wizard.WizardFormFilesHelper.pas"/>
+        <DCCReference Include="Src\IDE.Wizard.WizardFormFilesHelper.pas"/>
         <DCCReference Include="..\Components\NewTabSet.pas"/>
         <DCCReference Include="..\Components\NewStaticText.pas"/>
         <DCCReference Include="..\Components\BidiUtils.pas"/>
@@ -125,7 +125,7 @@
         <DCCReference Include="..\Components\NewCheckListBox.pas"/>
         <DCCReference Include="..\Components\NewNotebook.pas"/>
         <DCCReference Include="Src\Shared.TaskbarProgressFunc.pas"/>
-        <DCCReference Include="Src\Compil32\IDE.HtmlHelpFunc.pas"/>
+        <DCCReference Include="Src\IDE.HtmlHelpFunc.pas"/>
         <DCCReference Include="Src\Shared.UIStateForm.pas"/>
         <DCCReference Include="Src\Shared.LangOptionsSectionDirectives.pas"/>
         <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
@@ -136,10 +136,10 @@
         <DCCReference Include="Src\Shared.Int64Em.pas"/>
         <DCCReference Include="Src\Shared.Compress.pas"/>
         <DCCReference Include="Src\Shared.TaskDialogFunc.pas"/>
-        <DCCReference Include="Src\Compil32\IDE.RegistryDesignerForm.pas">
+        <DCCReference Include="Src\IDE.RegistryDesignerForm.pas">
             <Form>RegistryDesignerForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\IDE.Wizard.WizardFormRegistryHelper.pas"/>
+        <DCCReference Include="Src\IDE.Wizard.WizardFormRegistryHelper.pas"/>
         <DCCReference Include="..\Components\MD5.pas"/>
         <DCCReference Include="..\Components\ScintInt.InnoSetup.pas"/>
         <DCCReference Include="Src\Shared.ScriptFunc.pas"/>

Projects/ISCmplr.dpr

@@ -14,19 +14,19 @@ uses
   SysUtils,
   Shared.CompilerInt in 'Src\Shared.CompilerInt.pas',
   Shared.PreprocInt in 'Src\Shared.PreprocInt.pas',
-  Compiler.Compile in 'Src\ISCmplr\Compiler.Compile.pas',
-  Compiler.Messages in 'Src\ISCmplr\Compiler.Messages.pas',
+  Compiler.Compile in 'Src\Compiler.Compile.pas',
+  Compiler.Messages in 'Src\Compiler.Messages.pas',
   Shared.Struct in 'Src\Shared.Struct.pas',
   Shared.ScriptFunc in 'Src\Shared.ScriptFunc.pas',
-  Compiler.ScriptFunc in 'Src\ISCmplr\Compiler.ScriptFunc.pas',
-  Compiler.ScriptCompiler in 'Src\ISCmplr\Compiler.ScriptCompiler.pas',
-  Compiler.ScriptClasses in 'Src\ISCmplr\Compiler.ScriptClasses.pas',
+  Compiler.ScriptFunc in 'Src\Compiler.ScriptFunc.pas',
+  Compiler.ScriptCompiler in 'Src\Compiler.ScriptCompiler.pas',
+  Compiler.ScriptClasses in 'Src\Compiler.ScriptClasses.pas',
   Shared.ResUpdateFunc in 'Src\Shared.ResUpdateFunc.pas',
-  Compiler.ExeUpdateFunc in 'Src\ISCmplr\Compiler.ExeUpdateFunc.pas',
+  Compiler.ExeUpdateFunc in 'Src\Compiler.ExeUpdateFunc.pas',
   Shared.Compress in 'Src\Shared.Compress.pas',
   Shared.Compress.Zlib in 'Src\Shared.Compress.Zlib.pas',
   Shared.Compress.bzlib in 'Src\Shared.Compress.bzlib.pas',
-  Compiler.LZMACompressor in 'Src\ISCmplr\Compiler.LZMACompressor.pas',
+  Compiler.LZMACompressor in 'Src\Compiler.LZMACompressor.pas',
   Shared.FileClass in 'Src\Shared.FileClass.pas',
   Shared.ArcFour in 'Src\Shared.ArcFour.pas',
   Shared.VerInfoFunc in 'Src\Shared.VerInfoFunc.pas',

Projects/ISCmplr.dproj

@@ -80,19 +80,19 @@
         <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
         <DCCReference Include="Src\Shared.CompilerInt.pas"/>
         <DCCReference Include="Src\Shared.PreprocInt.pas"/>
-        <DCCReference Include="Src\ISCmplr\Compiler.Compile.pas"/>
-        <DCCReference Include="Src\ISCmplr\Compiler.Messages.pas"/>
+        <DCCReference Include="Src\Compiler.Compile.pas"/>
+        <DCCReference Include="Src\Compiler.Messages.pas"/>
         <DCCReference Include="Src\Shared.Struct.pas"/>
         <DCCReference Include="Src\Shared.ScriptFunc.pas"/>
-        <DCCReference Include="Src\ISCmplr\Compiler.ScriptFunc.pas"/>
-        <DCCReference Include="Src\ISCmplr\Compiler.ScriptCompiler.pas"/>
-        <DCCReference Include="Src\ISCmplr\Compiler.ScriptClasses.pas"/>
+        <DCCReference Include="Src\Compiler.ScriptFunc.pas"/>
+        <DCCReference Include="Src\Compiler.ScriptCompiler.pas"/>
+        <DCCReference Include="Src\Compiler.ScriptClasses.pas"/>
         <DCCReference Include="Src\Shared.ResUpdateFunc.pas"/>
-        <DCCReference Include="Src\ISCmplr\Compiler.ExeUpdateFunc.pas"/>
+        <DCCReference Include="Src\Compiler.ExeUpdateFunc.pas"/>
         <DCCReference Include="Src\Shared.Compress.pas"/>
         <DCCReference Include="Src\Shared.Compress.Zlib.pas"/>
         <DCCReference Include="Src\Shared.Compress.bzlib.pas"/>
-        <DCCReference Include="Src\ISCmplr\Compiler.LZMACompressor.pas"/>
+        <DCCReference Include="Src\Compiler.LZMACompressor.pas"/>
         <DCCReference Include="Src\Shared.FileClass.pas"/>
         <DCCReference Include="Src\Shared.ArcFour.pas"/>
         <DCCReference Include="Src\Shared.VerInfoFunc.pas"/>

Projects/ISPP.dpr

@@ -15,18 +15,18 @@ uses
   Windows,
   Classes,
   Shared.PreprocInt in 'Src\Shared.PreprocInt.pas',
-  ISPP.Preprocess in 'Src\ISPP\ISPP.Preprocess.pas',
-  ISPP.Preprocessor in 'Src\ISPP\ISPP.Preprocessor.pas',
-  ISPP.Funcs in 'Src\ISPP\ISPP.Funcs.pas',
-  ISPP.VarUtils in 'Src\ISPP\ISPP.VarUtils.pas',
-  ISPP.Consts in 'Src\ISPP\ISPP.Consts.pas',
-  ISPP.Stack in 'Src\ISPP\ISPP.Stack.pas',
-  ISPP.Intf in 'Src\ISPP\ISPP.Intf.pas',
-  ISPP.Parser in 'Src\ISPP\ISPP.Parser.pas',
-  ISPP.IdentMan in 'Src\ISPP\ISPP.IdentMan.pas',
-  ISPP.Sessions in 'Src\ISPP\ISPP.Sessions.pas',
-  ISPP.CTokenizer in 'Src\ISPP\ISPP.CTokenizer.pas',
-  ISPP.Base in 'Src\ISPP\ISPP.Base.pas',
+  ISPP.Preprocess in 'Src\ISPP.Preprocess.pas',
+  ISPP.Preprocessor in 'Src\ISPP.Preprocessor.pas',
+  ISPP.Funcs in 'Src\ISPP.Funcs.pas',
+  ISPP.VarUtils in 'Src\ISPP.VarUtils.pas',
+  ISPP.Consts in 'Src\ISPP.Consts.pas',
+  ISPP.Stack in 'Src\ISPP.Stack.pas',
+  ISPP.Intf in 'Src\ISPP.Intf.pas',
+  ISPP.Parser in 'Src\ISPP.Parser.pas',
+  ISPP.IdentMan in 'Src\ISPP.IdentMan.pas',
+  ISPP.Sessions in 'Src\ISPP.Sessions.pas',
+  ISPP.CTokenizer in 'Src\ISPP.CTokenizer.pas',
+  ISPP.Base in 'Src\ISPP.Base.pas',
   PathFunc in '..\Components\PathFunc.pas',
   Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
   Shared.FileClass in 'Src\Shared.FileClass.pas',

Projects/ISPP.dproj

@@ -76,18 +76,18 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="Src\Shared.PreprocInt.pas"/>
-        <DCCReference Include="Src\ISPP\ISPP.Preprocess.pas"/>
-        <DCCReference Include="Src\ISPP\ISPP.Preprocessor.pas"/>
-        <DCCReference Include="Src\ISPP\ISPP.Funcs.pas"/>
-        <DCCReference Include="Src\ISPP\ISPP.VarUtils.pas"/>
-        <DCCReference Include="Src\ISPP\ISPP.Consts.pas"/>
-        <DCCReference Include="Src\ISPP\ISPP.Stack.pas"/>
-        <DCCReference Include="Src\ISPP\ISPP.Intf.pas"/>
-        <DCCReference Include="Src\ISPP\ISPP.Parser.pas"/>
-        <DCCReference Include="Src\ISPP\ISPP.IdentMan.pas"/>
-        <DCCReference Include="Src\ISPP\ISPP.Sessions.pas"/>
-        <DCCReference Include="Src\ISPP\ISPP.CTokenizer.pas"/>
-        <DCCReference Include="Src\ISPP\ISPP.Base.pas"/>
+        <DCCReference Include="Src\ISPP.Preprocess.pas"/>
+        <DCCReference Include="Src\ISPP.Preprocessor.pas"/>
+        <DCCReference Include="Src\ISPP.Funcs.pas"/>
+        <DCCReference Include="Src\ISPP.VarUtils.pas"/>
+        <DCCReference Include="Src\ISPP.Consts.pas"/>
+        <DCCReference Include="Src\ISPP.Stack.pas"/>
+        <DCCReference Include="Src\ISPP.Intf.pas"/>
+        <DCCReference Include="Src\ISPP.Parser.pas"/>
+        <DCCReference Include="Src\ISPP.IdentMan.pas"/>
+        <DCCReference Include="Src\ISPP.Sessions.pas"/>
+        <DCCReference Include="Src\ISPP.CTokenizer.pas"/>
+        <DCCReference Include="Src\ISPP.Base.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
         <DCCReference Include="Src\Shared.CommonFunc.pas"/>
         <DCCReference Include="Src\Shared.FileClass.pas"/>

Projects/Setup.dpr

@@ -11,7 +11,7 @@ program Setup;
 
 uses
   Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
-  Shared.XPTheme in 'Src\SetupLdrAndSetup\Shared.XPTheme.pas',
+  Setup.XPTheme in 'Src\Setup.XPTheme.pas',
   Forms,
   Windows,
   SysUtils,
@@ -19,54 +19,54 @@ uses
   RichEditViewer in '..\Components\RichEditViewer.pas',
   Shared.CommonFunc.Vcl in 'Src\Shared.CommonFunc.Vcl.pas',
   Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
-  Setup.MainForm in 'Src\Setup\Setup.MainForm.pas' {MainForm},
-  Setup.Install in 'Src\Setup\Setup.Install.pas',
-  Shared.Messages in 'Src\SetupLdrAndSetup\Shared.Messages.pas',
+  Setup.MainForm in 'Src\Setup.MainForm.pas' {MainForm},
+  Setup.Install in 'Src\Setup.Install.pas',
+  Setup.Messages in 'Src\Setup.Messages.pas',
   Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
-  Setup.UninstallLog in 'Src\Setup\Setup.UninstallLog.pas',
+  Setup.UninstallLog in 'Src\Setup.UninstallLog.pas',
   Shared.Struct in 'Src\Shared.Struct.pas',
-  Setup.NewDiskForm in 'Src\Setup\Setup.NewDiskForm.pas' {NewDiskForm},
-  Shared.InstFunc in 'Src\SetupLdrAndSetup\Shared.InstFunc.pas',
-  Setup.InstFunc.Ole in 'Src\Setup\Setup.InstFunc.Ole.pas',
-  Setup.WizardForm in 'Src\Setup\Setup.WizardForm.pas' {WizardForm},
-  Setup.ScriptFunc in 'Src\Setup\Setup.ScriptFunc.pas',
+  Setup.NewDiskForm in 'Src\Setup.NewDiskForm.pas' {NewDiskForm},
+  Setup.InstFunc in 'Src\Setup.InstFunc.pas',
+  Setup.InstFunc.Ole in 'Src\Setup.InstFunc.Ole.pas',
+  Setup.WizardForm in 'Src\Setup.WizardForm.pas' {WizardForm},
+  Setup.ScriptFunc in 'Src\Setup.ScriptFunc.pas',
   Shared.ScriptFunc in 'Src\Shared.ScriptFunc.pas',
   Shared.SetupTypes in 'Src\Shared.SetupTypes.pas',
-  Setup.ScriptRunner in 'Src\Setup\Setup.ScriptRunner.pas',
-  Setup.ScriptDlg in 'Src\Setup\Setup.ScriptDlg.pas',
-  Setup.ScriptClasses in 'Src\Setup\Setup.ScriptClasses.pas',
-  Setup.SelectLanguageForm in 'Src\Setup\Setup.SelectLanguageForm.pas' {SelectLanguageForm},
-  Setup.FileExtractor in 'Src\Setup\Setup.FileExtractor.pas',
+  Setup.ScriptRunner in 'Src\Setup.ScriptRunner.pas',
+  Setup.ScriptDlg in 'Src\Setup.ScriptDlg.pas',
+  Setup.ScriptClasses in 'Src\Setup.ScriptClasses.pas',
+  Setup.SelectLanguageForm in 'Src\Setup.SelectLanguageForm.pas' {SelectLanguageForm},
+  Setup.FileExtractor in 'Src\Setup.FileExtractor.pas',
   Shared.Int64Em in 'Src\Shared.Int64Em.pas',
-  Setup.SelectFolderForm in 'Src\Setup\Setup.SelectFolderForm.pas' {SelectFolderForm},
+  Setup.SelectFolderForm in 'Src\Setup.SelectFolderForm.pas' {SelectFolderForm},
   Shared.Compress in 'Src\Shared.Compress.pas',
   Shared.Compress.Zlib in 'Src\Shared.Compress.Zlib.pas',
   Shared.Compress.bzlib in 'Src\Shared.Compress.bzlib.pas',
-  Setup.LZMADecompressor in 'Src\Setup\Setup.LZMADecompressor.pas',
+  Setup.LZMADecompressor in 'Src\Setup.LZMADecompressor.pas',
   Shared.FileClass in 'Src\Shared.FileClass.pas',
   MD5 in '..\Components\MD5.pas',
   SHA1 in '..\Components\SHA1.pas',
-  Setup.LoggingFunc in 'Src\Setup\Setup.LoggingFunc.pas',
-  Setup.DebugClient in 'Src\Setup\Setup.DebugClient.pas',
+  Setup.LoggingFunc in 'Src\Setup.LoggingFunc.pas',
+  Setup.DebugClient in 'Src\Setup.DebugClient.pas',
   Shared.DebugStruct in 'Src\Shared.DebugStruct.pas',
   Shared.ArcFour in 'Src\Shared.ArcFour.pas',
-  Setup.Uninstall in 'Src\Setup\Setup.Uninstall.pas',
-  Setup.UninstallProgressForm in 'Src\Setup\Setup.UninstallProgressForm.pas' {UninstallProgressForm},
-  Setup.UninstallSharedFileForm in 'Src\Setup\Setup.UninstallSharedFileForm.pas' {UninstallSharedFileForm},
+  Setup.Uninstall in 'Src\Setup.Uninstall.pas',
+  Setup.UninstallProgressForm in 'Src\Setup.UninstallProgressForm.pas' {UninstallProgressForm},
+  Setup.UninstallSharedFileForm in 'Src\Setup.UninstallSharedFileForm.pas' {UninstallSharedFileForm},
   Shared.SimpleExpression in 'Src\Shared.SimpleExpression.pas',
   Shared.UIStateForm in 'Src\Shared.UIStateForm.pas',
-  Setup.SetupForm in 'Src\Setup\Setup.SetupForm.pas',
-  Setup.RegSvr in 'Src\Setup\Setup.RegSvr.pas',
+  Setup.SetupForm in 'Src\Setup.SetupForm.pas',
+  Setup.RegSvr in 'Src\Setup.RegSvr.pas',
   Shared.BrowseFunc in 'Src\Shared.BrowseFunc.pas',
-  Shared.RedirFunc in 'Src\SetupLdrAndSetup\Shared.RedirFunc.pas',
-  Setup.SecurityFunc in 'Src\Setup\Setup.SecurityFunc.pas',
-  Setup.Helper in 'Src\Setup\Setup.Helper.pas',
+  Setup.RedirFunc in 'Src\Setup.RedirFunc.pas',
+  Setup.SecurityFunc in 'Src\Setup.SecurityFunc.pas',
+  Setup.Helper in 'Src\Setup.Helper.pas',
   Shared.VerInfoFunc in 'Src\Shared.VerInfoFunc.pas',
-  Setup.RegDLL in 'Src\Setup\Setup.RegDLL.pas',
+  Setup.RegDLL in 'Src\Setup.RegDLL.pas',
   Shared.ResUpdateFunc in 'Src\Shared.ResUpdateFunc.pas',
-  Setup.SpawnCommon in 'Src\Setup\Setup.SpawnCommon.pas',
-  Setup.SpawnServer in 'Src\Setup\Setup.SpawnServer.pas',
-  Setup.SpawnClient in 'Src\Setup\Setup.SpawnClient.pas',
+  Setup.SpawnCommon in 'Src\Setup.SpawnCommon.pas',
+  Setup.SpawnServer in 'Src\Setup.SpawnServer.pas',
+  Setup.SpawnClient in 'Src\Setup.SpawnClient.pas',
   Shared.TaskDialogFunc in 'Src\Shared.TaskDialogFunc.pas',
   BidiUtils in '..\Components\BidiUtils.pas',
   PathFunc in '..\Components\PathFunc.pas',
@@ -83,9 +83,9 @@ uses
   Resample in '..\Components\Resample.pas',
   ASMInline in '..\Components\ASMInline.pas',
   Shared.TaskbarProgressFunc in 'Src\Shared.TaskbarProgressFunc.pas',
-  Setup.DotNetFunc in 'Src\Setup\Setup.DotNetFunc.pas',
+  Setup.DotNetFunc in 'Src\Setup.DotNetFunc.pas',
   Shared.SetupEntFunc in 'Src\Shared.SetupEntFunc.pas',
-  Setup.MsiFunc in 'Src\Setup\Setup.MsiFunc.pas',
+  Setup.MsiFunc in 'Src\Setup.MsiFunc.pas',
   Shared.DotNetVersion in 'Src\Shared.DotNetVersion.pas',
   NewUxTheme in '..\Components\NewUxTheme.pas';
 

Projects/Setup.dproj

@@ -74,72 +74,72 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\Shared.XPTheme.pas"/>
+        <DCCReference Include="Src\Setup.XPTheme.pas"/>
         <DCCReference Include="..\Components\RichEditViewer.pas"/>
         <DCCReference Include="Src\Shared.CommonFunc.Vcl.pas"/>
         <DCCReference Include="Src\Shared.CommonFunc.pas"/>
-        <DCCReference Include="Src\Setup\Setup.MainForm.pas">
+        <DCCReference Include="Src\Setup.MainForm.pas">
             <Form>MainForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Setup\Setup.Install.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\Shared.Messages.pas"/>
+        <DCCReference Include="Src\Setup.Install.pas"/>
+        <DCCReference Include="Src\Setup.Messages.pas"/>
         <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
-        <DCCReference Include="Src\Setup\Setup.UninstallLog.pas"/>
+        <DCCReference Include="Src\Setup.UninstallLog.pas"/>
         <DCCReference Include="Src\Shared.Struct.pas"/>
-        <DCCReference Include="Src\Setup\Setup.NewDiskForm.pas">
+        <DCCReference Include="Src\Setup.NewDiskForm.pas">
             <Form>NewDiskForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\SetupLdrAndSetup\Shared.InstFunc.pas"/>
-        <DCCReference Include="Src\Setup\Setup.InstFunc.Ole.pas"/>
-        <DCCReference Include="Src\Setup\Setup.WizardForm.pas">
+        <DCCReference Include="Src\Setup.InstFunc.pas"/>
+        <DCCReference Include="Src\Setup.InstFunc.Ole.pas"/>
+        <DCCReference Include="Src\Setup.WizardForm.pas">
             <Form>WizardForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Setup\Setup.ScriptFunc.pas"/>
+        <DCCReference Include="Src\Setup.ScriptFunc.pas"/>
         <DCCReference Include="Src\Shared.ScriptFunc.pas"/>
         <DCCReference Include="Src\Shared.SetupTypes.pas"/>
-        <DCCReference Include="Src\Setup\Setup.ScriptRunner.pas"/>
-        <DCCReference Include="Src\Setup\Setup.ScriptDlg.pas"/>
-        <DCCReference Include="Src\Setup\Setup.ScriptClasses.pas"/>
-        <DCCReference Include="Src\Setup\Setup.SelectLanguageForm.pas">
+        <DCCReference Include="Src\Setup.ScriptRunner.pas"/>
+        <DCCReference Include="Src\Setup.ScriptDlg.pas"/>
+        <DCCReference Include="Src\Setup.ScriptClasses.pas"/>
+        <DCCReference Include="Src\Setup.SelectLanguageForm.pas">
             <Form>SelectLanguageForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Setup\Setup.FileExtractor.pas"/>
+        <DCCReference Include="Src\Setup.FileExtractor.pas"/>
         <DCCReference Include="Src\Shared.Int64Em.pas"/>
-        <DCCReference Include="Src\Setup\Setup.SelectFolderForm.pas">
+        <DCCReference Include="Src\Setup.SelectFolderForm.pas">
             <Form>SelectFolderForm</Form>
         </DCCReference>
         <DCCReference Include="Src\Shared.Compress.pas"/>
         <DCCReference Include="Src\Shared.Compress.Zlib.pas"/>
         <DCCReference Include="Src\Shared.Compress.bzlib.pas"/>
-        <DCCReference Include="Src\Setup\Setup.LZMADecompressor.pas"/>
+        <DCCReference Include="Src\Setup.LZMADecompressor.pas"/>
         <DCCReference Include="Src\Shared.FileClass.pas"/>
         <DCCReference Include="..\Components\MD5.pas"/>
         <DCCReference Include="..\Components\SHA1.pas"/>
-        <DCCReference Include="Src\Setup\Setup.LoggingFunc.pas"/>
-        <DCCReference Include="Src\Setup\Setup.DebugClient.pas"/>
+        <DCCReference Include="Src\Setup.LoggingFunc.pas"/>
+        <DCCReference Include="Src\Setup.DebugClient.pas"/>
         <DCCReference Include="Src\Shared.DebugStruct.pas"/>
         <DCCReference Include="Src\Shared.ArcFour.pas"/>
-        <DCCReference Include="Src\Setup\Setup.Uninstall.pas"/>
-        <DCCReference Include="Src\Setup\Setup.UninstallProgressForm.pas">
+        <DCCReference Include="Src\Setup.Uninstall.pas"/>
+        <DCCReference Include="Src\Setup.UninstallProgressForm.pas">
             <Form>UninstallProgressForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Setup\Setup.UninstallSharedFileForm.pas">
+        <DCCReference Include="Src\Setup.UninstallSharedFileForm.pas">
             <Form>UninstallSharedFileForm</Form>
         </DCCReference>
         <DCCReference Include="Src\Shared.SimpleExpression.pas"/>
         <DCCReference Include="Src\Shared.UIStateForm.pas"/>
-        <DCCReference Include="Src\Setup\Setup.SetupForm.pas"/>
-        <DCCReference Include="Src\Setup\Setup.RegSvr.pas"/>
+        <DCCReference Include="Src\Setup.SetupForm.pas"/>
+        <DCCReference Include="Src\Setup.RegSvr.pas"/>
         <DCCReference Include="Src\Shared.BrowseFunc.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\Shared.RedirFunc.pas"/>
-        <DCCReference Include="Src\Setup\Setup.SecurityFunc.pas"/>
-        <DCCReference Include="Src\Setup\Setup.Helper.pas"/>
+        <DCCReference Include="Src\Setup.RedirFunc.pas"/>
+        <DCCReference Include="Src\Setup.SecurityFunc.pas"/>
+        <DCCReference Include="Src\Setup.Helper.pas"/>
         <DCCReference Include="Src\Shared.VerInfoFunc.pas"/>
-        <DCCReference Include="Src\Setup\Setup.RegDLL.pas"/>
+        <DCCReference Include="Src\Setup.RegDLL.pas"/>
         <DCCReference Include="Src\Shared.ResUpdateFunc.pas"/>
-        <DCCReference Include="Src\Setup\Setup.SpawnCommon.pas"/>
-        <DCCReference Include="Src\Setup\Setup.SpawnServer.pas"/>
-        <DCCReference Include="Src\Setup\Setup.SpawnClient.pas"/>
+        <DCCReference Include="Src\Setup.SpawnCommon.pas"/>
+        <DCCReference Include="Src\Setup.SpawnServer.pas"/>
+        <DCCReference Include="Src\Setup.SpawnClient.pas"/>
         <DCCReference Include="Src\Shared.TaskDialogFunc.pas"/>
         <DCCReference Include="..\Components\BidiUtils.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
@@ -156,9 +156,9 @@
         <DCCReference Include="..\Components\Resample.pas"/>
         <DCCReference Include="..\Components\ASMInline.pas"/>
         <DCCReference Include="Src\Shared.TaskbarProgressFunc.pas"/>
-        <DCCReference Include="Src\Setup\Setup.DotNetFunc.pas"/>
+        <DCCReference Include="Src\Setup.DotNetFunc.pas"/>
         <DCCReference Include="Src\Shared.SetupEntFunc.pas"/>
-        <DCCReference Include="Src\Setup\Setup.MsiFunc.pas"/>
+        <DCCReference Include="Src\Setup.MsiFunc.pas"/>
         <DCCReference Include="Src\Shared.DotNetVersion.pas"/>
         <DCCReference Include="..\Components\NewUxTheme.pas"/>
         <BuildConfiguration Include="Base">

Projects/SetupLdr.dpr

@@ -11,24 +11,24 @@ program SetupLdr;
 
 uses
   Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
-  Shared.XPTheme in 'Src\SetupLdrAndSetup\Shared.XPTheme.pas',
+  Setup.XPTheme in 'Src\Setup.XPTheme.pas',
   Windows,
   Messages,
   SysUtils,
   Shared.Compress in 'Src\Shared.Compress.pas',
-  SetupLdr.LZMA1SmallDecompressor in 'Src\SetupLdr\SetupLdr.LZMA1SmallDecompressor.pas',
+  SetupLdr.LZMA1SmallDecompressor in 'Src\SetupLdr.LZMA1SmallDecompressor.pas',
   Shared.SetupEntFunc in 'Src\Shared.SetupEntFunc.pas',
   PathFunc in '..\Components\PathFunc.pas',
   Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
-  Shared.Messages in 'Src\SetupLdrAndSetup\Shared.Messages.pas',
+  Setup.Messages in 'Src\Setup.Messages.pas',
   Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
   Shared.Struct in 'Src\Shared.Struct.pas',
-  Shared.InstFunc in 'Src\SetupLdrAndSetup\Shared.InstFunc.pas',
+  Setup.InstFunc in 'Src\Setup.InstFunc.pas',
   Shared.FileClass in 'Src\Shared.FileClass.pas',
   Shared.Int64Em in 'Src\Shared.Int64Em.pas',
   SHA1 in '..\Components\SHA1.pas',
   MD5 in '..\Components\MD5.pas',
-  Shared.RedirFunc in 'Src\SetupLdrAndSetup\Shared.RedirFunc.pas',
+  Setup.RedirFunc in 'Src\Setup.RedirFunc.pas',
   Shared.SetupTypes in 'Src\Shared.SetupTypes.pas',
   Shared.VerInfoFunc in 'Src\Shared.VerInfoFunc.pas';
 

Projects/SetupLdr.dproj

@@ -71,21 +71,21 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\Shared.XPTheme.pas"/>
+        <DCCReference Include="Src\Setup.XPTheme.pas"/>
         <DCCReference Include="Src\Shared.Compress.pas"/>
-        <DCCReference Include="Src\SetupLdr\SetupLdr.LZMA1SmallDecompressor.pas"/>
+        <DCCReference Include="Src\SetupLdr.LZMA1SmallDecompressor.pas"/>
         <DCCReference Include="Src\Shared.SetupEntFunc.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
         <DCCReference Include="Src\Shared.CommonFunc.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\Shared.Messages.pas"/>
+        <DCCReference Include="Src\Setup.Messages.pas"/>
         <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
         <DCCReference Include="Src\Shared.Struct.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\Shared.InstFunc.pas"/>
+        <DCCReference Include="Src\Setup.InstFunc.pas"/>
         <DCCReference Include="Src\Shared.FileClass.pas"/>
         <DCCReference Include="Src\Shared.Int64Em.pas"/>
         <DCCReference Include="..\Components\SHA1.pas"/>
         <DCCReference Include="..\Components\MD5.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\Shared.RedirFunc.pas"/>
+        <DCCReference Include="Src\Setup.RedirFunc.pas"/>
         <DCCReference Include="Src\Shared.SetupTypes.pas"/>
         <DCCReference Include="Src\Shared.VerInfoFunc.pas"/>
         <BuildConfiguration Include="Base">

Projects/Src/Setup/Setup.DebugClient.pas → Projects/Src/Setup.DebugClient.pas

@@ -36,7 +36,7 @@ procedure SetDebugServerWnd(Wnd: HWND; WantCodeText: Boolean);
 implementation
 
 uses
-  Forms, Classes, Shared.CommonFunc, Shared.Struct, Shared.InstFunc, Setup.MainForm;
+  Forms, Classes, Shared.CommonFunc, Shared.Struct, Setup.InstFunc, Setup.MainForm;
 
 type
   TDummyClass = class

Projects/Src/Setup/Setup.DotNetFunc.pas → Projects/Src/Setup.DotNetFunc.pas

@@ -61,7 +61,7 @@ function IsDotNetInstalled(const RegView: TRegView; const MinVersion: TDotNetVer
 implementation
 
 uses
-  Shared.InstFunc, PathFunc;
+  Setup.InstFunc, PathFunc;
 
 var
   DotNetRoot: array [TRegView] of String;

Projects/Src/Setup/Setup.FileExtractor.pas → Projects/Src/Setup.FileExtractor.pas

@@ -50,8 +50,8 @@ procedure FreeFileExtractor;
 implementation
 
 uses
-  PathFunc, Shared.CommonFunc, Setup.MainForm, Shared.Messages, Shared.SetupMessageIDs,
-  Shared.InstFunc, Shared.Compress.Zlib, Shared.Compress.bzlib,
+  PathFunc, Shared.CommonFunc, Setup.MainForm, Setup.Messages, Shared.SetupMessageIDs,
+  Setup.InstFunc, Shared.Compress.Zlib, Shared.Compress.bzlib,
   Setup.LZMADecompressor, SHA1, Setup.LoggingFunc, Setup.NewDiskForm;
 
 var

Projects/Src/Setup/Setup.Helper.pas → Projects/Src/Setup.Helper.pas

@@ -31,8 +31,8 @@ implementation
 {x$DEFINE HELPERDEBUG}
 
 uses
-  Forms, Shared.Int64Em, Shared.CommonFunc.Vcl, Shared.CommonFunc, PathFunc, Setup.MainForm, Shared.InstFunc,
-  Setup.LoggingFunc, Shared.Messages, Shared.SetupMessageIDs;
+  Forms, Shared.Int64Em, Shared.CommonFunc.Vcl, Shared.CommonFunc, PathFunc, Setup.MainForm, Setup.InstFunc,
+  Setup.LoggingFunc, Setup.Messages, Shared.SetupMessageIDs;
 
 const
   HELPER_VERSION = 105;

Projects/Src/Setup/Setup.InstFunc.Ole.pas → Projects/Src/Setup.InstFunc.Ole.pas

@@ -23,8 +23,8 @@ function UnpinShellLink(const Filename: String): Boolean;
 implementation
 
 uses
-  Windows, SysUtils, PathFunc, Shared.CommonFunc, Shared.InstFunc, Setup.MainForm,
-  Shared.Messages, Shared.SetupMessageIDs,
+  Windows, SysUtils, PathFunc, Shared.CommonFunc, Setup.InstFunc, Setup.MainForm,
+  Setup.Messages, Shared.SetupMessageIDs,
   ActiveX, ComObj, PropSys, ShellAPI, ShlObj;
 
 procedure AssignWorkingDir(const SL: IShellLink; const WorkingDir: String);

Projects/Src/SetupLdrAndSetup/Shared.InstFunc.pas → Projects/Src/Setup.InstFunc.pas

@@ -1,4 +1,4 @@
-unit Shared.InstFunc;
+unit Setup.InstFunc;
 
 {
   Inno Setup
@@ -6,7 +6,7 @@ unit Shared.InstFunc;
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
-  Misc. installation functions
+  Misc. installation functions. Used only by the Setup and SetupLdr projects.
 }
 
 interface
@@ -118,7 +118,7 @@ function ForceDirectories(const DisableFsRedir: Boolean; Dir: String): Boolean;
 implementation
 
 uses
-  Messages, ShellApi, PathFunc, Shared.Messages, Shared.SetupMessageIDs, Shared.FileClass, Shared.RedirFunc, Shared.SetupTypes,
+  Messages, ShellApi, PathFunc, Setup.Messages, Shared.SetupMessageIDs, Shared.FileClass, Setup.RedirFunc, Shared.SetupTypes,
   Hash, Classes, RegStr, Math;
 
 procedure InternalError(const Id: String);

Projects/Src/Setup/Setup.Install.pas → Projects/Src/Setup.Install.pas

@@ -29,9 +29,9 @@ implementation
 
 uses
   Windows, SysUtils, Messages, Classes, Forms, ShlObj, Shared.Struct, Setup.UninstallLog, Shared.SetupTypes,
-  Shared.InstFunc, Setup.InstFunc.Ole, Setup.SecurityFunc, Shared.Messages,
+  Setup.InstFunc, Setup.InstFunc.Ole, Setup.SecurityFunc, Setup.Messages,
   Setup.MainForm, Setup.LoggingFunc, Setup.FileExtractor, Shared.FileClass,
-  Shared.Compress, SHA1, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.RedirFunc, Shared.Int64Em, Shared.SetupMessageIDs,
+  Shared.Compress, SHA1, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Setup.RedirFunc, Shared.Int64Em, Shared.SetupMessageIDs,
   Setup.WizardForm, Shared.DebugStruct, Setup.DebugClient, Shared.VerInfoFunc, Setup.ScriptRunner, Setup.RegDLL, Setup.Helper,
   Shared.ResUpdateFunc, Setup.DotNetFunc, Shared.TaskbarProgressFunc, NewProgressBar, RestartManager,
   Net.HTTPClient, Net.URLClient, NetEncoding, RegStr;

Projects/Src/Setup/Setup.MainForm.pas → Projects/Src/Setup.MainForm.pas

@@ -267,7 +267,7 @@ implementation
 
 uses
   ShellAPI, ShlObj, StrUtils,
-  Shared.Messages, Shared.SetupMessageIDs, Setup.Install, Shared.InstFunc, Setup.InstFunc.Ole, Shared.RedirFunc, PathFunc,
+  Setup.Messages, Shared.SetupMessageIDs, Setup.Install, Setup.InstFunc, Setup.InstFunc.Ole, Setup.RedirFunc, PathFunc,
   Shared.Compress, Shared.Compress.Zlib, Shared.Compress.bzlib, Setup.LZMADecompressor, Shared.ArcFour, Shared.SetupEntFunc, Setup.SelectLanguageForm,
   Setup.WizardForm, Setup.DebugClient, Shared.VerInfoFunc, Setup.FileExtractor, Shared.FileClass, Setup.LoggingFunc, MD5, SHA1, ActiveX,
   Shared.SimpleExpression, Setup.Helper, Setup.SpawnClient, Setup.SpawnServer, Setup.DotNetFunc, BitmapImage,

Projects/Src/SetupLdrAndSetup/Shared.Messages.pas → Projects/Src/Setup.Messages.pas

@@ -1,4 +1,4 @@
-unit Shared.Messages;
+unit Setup.Messages;
 
 {
   Inno Setup

Projects/Src/Setup/Setup.NewDiskForm.pas → Projects/Src/Setup.NewDiskForm.pas

@@ -40,7 +40,7 @@ function SelectDisk(const DiskNumber: Integer; const AFilename: String; var Path
 implementation
 
 uses
-  Shared.Messages, Shared.SetupMessageIDs, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.BrowseFunc,
+  Setup.Messages, Shared.SetupMessageIDs, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.BrowseFunc,
   Setup.MainForm, Setup.WizardForm;
 
 {$R *.DFM}

Projects/Src/SetupLdrAndSetup/Shared.RedirFunc.pas → Projects/Src/Setup.RedirFunc.pas

@@ -1,4 +1,4 @@
-unit Shared.RedirFunc;
+unit Setup.RedirFunc;
 
 {
   Inno Setup
@@ -7,6 +7,7 @@ unit Shared.RedirFunc;
   For conditions of distribution and use, see LICENSE.TXT.
 
   Functions for dealing with WOW64 file system redirection.
+  Used only by the Setup and SetupLdr projects.
 
   The *Redir functions are counterparts to common functions that offer
   built-in support for disabling FS redirection.

Projects/Src/Setup/Setup.RegDLL.pas → Projects/Src/Setup.RegDLL.pas

@@ -20,8 +20,8 @@ procedure RegisterServer(const AUnregister: Boolean; const AIs64Bit: Boolean;
 implementation
 
 uses
-  SysUtils, Forms, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.InstFunc, Shared.Messages, Shared.SetupMessageIDs,
-  Setup.LoggingFunc, Shared.RedirFunc, Setup.MainForm;
+  SysUtils, Forms, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Setup.InstFunc, Setup.Messages, Shared.SetupMessageIDs,
+  Setup.LoggingFunc, Setup.RedirFunc, Setup.MainForm;
 
 function WaitForAndCloseProcessHandle(var AProcessHandle: THandle): DWORD;
 var

Projects/Src/Setup/Setup.RegSvr.pas → Projects/Src/Setup.RegSvr.pas

@@ -16,8 +16,8 @@ procedure RunRegSvr;
 implementation
 
 uses
-  Windows, SysUtils, Classes, Forms, PathFunc, Shared.CommonFunc, Shared.InstFunc, Setup.InstFunc.Ole,
-  Shared.FileClass, Shared.CommonFunc.Vcl, Shared.Struct, Setup.MainForm, Shared.Messages, Shared.SetupMessageIDs, Setup.RegDLL, Setup.Helper;
+  Windows, SysUtils, Classes, Forms, PathFunc, Shared.CommonFunc, Setup.InstFunc, Setup.InstFunc.Ole,
+  Shared.FileClass, Shared.CommonFunc.Vcl, Shared.Struct, Setup.MainForm, Setup.Messages, Shared.SetupMessageIDs, Setup.RegDLL, Setup.Helper;
 
 procedure DeleteOldTempFiles(const Path: String);
 { Removes any old isRS-???.tmp files from Path. Not strictly necessary, but

Projects/Src/Setup/Setup.ScriptDlg.pas → Projects/Src/Setup.ScriptDlg.pas

@@ -201,9 +201,9 @@ implementation
 
 uses
   StrUtils,
-  Shared.Struct, Setup.MainForm, Setup.SelectFolderForm, Shared.Messages,
+  Shared.Struct, Setup.MainForm, Setup.SelectFolderForm, Setup.Messages,
   Shared.SetupMessageIDs, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc,
-  Shared.BrowseFunc, Setup.LoggingFunc, Shared.InstFunc;
+  Shared.BrowseFunc, Setup.LoggingFunc, Setup.InstFunc;
 
 const
   DefaultLabelHeight = 14;

Projects/Src/Setup/Setup.ScriptFunc.pas → Projects/Src/Setup.ScriptFunc.pas

@@ -22,8 +22,8 @@ uses
   Windows, Shared.ScriptFunc,
   Forms, uPSUtils, SysUtils, Classes, Graphics, Controls, TypInfo, ActiveX,
   Shared.Struct, Setup.ScriptDlg, Setup.MainForm, PathFunc, Shared.CommonFunc.Vcl,
-  Shared.CommonFunc, Shared.FileClass, Shared.RedirFunc,
-  Setup.Install, Shared.InstFunc, Setup.InstFunc.Ole, Shared.Messages,
+  Shared.CommonFunc, Shared.FileClass, Setup.RedirFunc,
+  Setup.Install, Setup.InstFunc, Setup.InstFunc.Ole, Setup.Messages,
   Shared.SetupMessageIDs, Setup.NewDiskForm, Shared.BrowseFunc, Setup.WizardForm, Shared.VerInfoFunc,
   Shared.SetupTypes, Shared.Int64Em, MD5, SHA1, Setup.LoggingFunc, Setup.SetupForm, Setup.RegDLL, Setup.Helper,
   Setup.SpawnClient, Setup.UninstallProgressForm, ASMInline, Setup.DotNetFunc,

Projects/Src/Setup/Setup.SecurityFunc.pas → Projects/Src/Setup.SecurityFunc.pas

@@ -23,8 +23,8 @@ function GrantPermissionOnKey(const RegView: TRegView; const RootKey: HKEY;
 implementation
 
 uses
-  PathFunc, Shared.Messages, Shared.InstFunc, Setup.LoggingFunc,
-  Shared.RedirFunc, Setup.Helper;
+  PathFunc, Setup.Messages, Setup.InstFunc, Setup.LoggingFunc,
+  Setup.RedirFunc, Setup.Helper;
 
 function InternalGrantPermission(const ObjectType: DWORD; const ObjectName: String;
   const Entries: TGrantPermissionEntry; const EntryCount: Integer;

Projects/Src/Setup/Setup.SelectFolderForm.pas → Projects/Src/Setup.SelectFolderForm.pas

@@ -42,7 +42,7 @@ function ShowSelectFolderDialog(const StartMenu, AppendDir: Boolean;
 implementation
 
 uses
-  PathFunc, Shared.Messages, Shared.SetupMessageIDs, Setup.MainForm,
+  PathFunc, Setup.Messages, Shared.SetupMessageIDs, Setup.MainForm,
   Shared.SetupTypes, Setup.WizardForm, Shared.CommonFunc;
 
 {$R *.DFM}

Projects/Src/Setup/Setup.SelectLanguageForm.pas → Projects/Src/Setup.SelectLanguageForm.pas

@@ -36,7 +36,7 @@ function AskForLanguage: Boolean;
 implementation
 
 uses
-  Shared.Struct, Shared.Messages, Shared.SetupMessageIDs, Setup.MainForm;
+  Shared.Struct, Setup.Messages, Shared.SetupMessageIDs, Setup.MainForm;
 
 {$R *.DFM}
 

Projects/Src/Setup/Setup.SetupForm.pas → Projects/Src/Setup.SetupForm.pas

@@ -74,7 +74,7 @@ implementation
 
 uses
   Generics.Collections, UITypes,
-  Shared.CommonFunc, Setup.MainForm, Shared.Messages, BidiUtils;
+  Shared.CommonFunc, Setup.MainForm, Setup.Messages, BidiUtils;
 
 var
   WM_QueryCancelAutoPlay: UINT;

Projects/Src/Setup/Setup.SpawnClient.pas → Projects/Src/Setup.SpawnClient.pas

@@ -15,7 +15,7 @@ unit Setup.SpawnClient;
 interface
 
 uses
-  Windows, SysUtils, Messages, Shared.InstFunc, Shared.CommonFunc;
+  Windows, SysUtils, Messages, Setup.InstFunc, Shared.CommonFunc;
 
 procedure InitializeSpawnClient(const AServerWnd: HWND);
 function InstExecEx(const RunAsOriginalUser: Boolean;

Projects/Src/Setup/Setup.SpawnServer.pas → Projects/Src/Setup.SpawnServer.pas

@@ -46,7 +46,7 @@ implementation
 {x$DEFINE SPAWNSERVER_RESPAWN_ALWAYS}
 
 uses
-  Classes, Forms, ShellApi, Shared.Int64Em, PathFunc, Shared.CommonFunc, Shared.InstFunc, Setup.SpawnCommon;
+  Classes, Forms, ShellApi, Shared.Int64Em, PathFunc, Shared.CommonFunc, Setup.InstFunc, Setup.SpawnCommon;
 
 type
   TPtrAndSize = record

Projects/Src/Setup/Setup.Uninstall.pas → Projects/Src/Setup.Uninstall.pas

@@ -17,8 +17,8 @@ procedure HandleUninstallerEndSession;
 implementation
 
 uses
-  Windows, SysUtils, Messages, Forms, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Setup.UninstallLog, Shared.Messages,
-  Shared.SetupMessageIDs, Shared.InstFunc, Shared.Struct, Shared.SetupEntFunc, Setup.UninstallProgressForm, Setup.UninstallSharedFileForm,
+  Windows, SysUtils, Messages, Forms, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Setup.UninstallLog, Setup.Messages,
+  Shared.SetupMessageIDs, Setup.InstFunc, Shared.Struct, Shared.SetupEntFunc, Setup.UninstallProgressForm, Setup.UninstallSharedFileForm,
   Shared.FileClass, Setup.ScriptRunner, Setup.DebugClient, Shared.SetupTypes, Setup.LoggingFunc, Setup.MainForm,
   Setup.SpawnServer;
 

Projects/Src/Setup/Setup.UninstallLog.pas → Projects/Src/Setup.UninstallLog.pas

@@ -155,8 +155,8 @@ implementation
 
 uses
   Messages, ShlObj, AnsiStrings,
-  PathFunc, Shared.Struct, Shared.Messages, Shared.SetupMessageIDs, Shared.InstFunc,
-  Setup.InstFunc.Ole, Shared.RedirFunc, Shared.Compress,
+  PathFunc, Shared.Struct, Setup.Messages, Shared.SetupMessageIDs, Setup.InstFunc,
+  Setup.InstFunc.Ole, Setup.RedirFunc, Shared.Compress,
   Setup.LoggingFunc, Setup.RegDLL, Setup.Helper, Setup.DotNetFunc;
 
 type

Projects/Src/Setup/Setup.UninstallProgressForm.pas → Projects/Src/Setup.UninstallProgressForm.pas

@@ -65,7 +65,7 @@ var
 implementation
 
 uses
-  Shared.TaskbarProgressFunc, Setup.MainForm, Shared.Messages,
+  Shared.TaskbarProgressFunc, Setup.MainForm, Setup.Messages,
   Shared.SetupMessageIDs, Shared.CommonFunc.Vcl;
 
 {$R *.DFM}

Projects/Src/Setup/Setup.UninstallSharedFileForm.pas → Projects/Src/Setup.UninstallSharedFileForm.pas

@@ -41,7 +41,7 @@ function ExecuteRemoveSharedFileDlg(const Filename: String;
 implementation
 
 uses
-  PathFunc, Shared.Struct, Shared.Messages, Shared.SetupMessageIDs, Setup.MainForm;
+  PathFunc, Shared.Struct, Setup.Messages, Shared.SetupMessageIDs, Setup.MainForm;
 
 {$R *.DFM}
 

Projects/Src/Setup/Setup.WizardForm.pas → Projects/Src/Setup.WizardForm.pas

@@ -342,8 +342,8 @@ function ValidateCustomDirEdit(const AEdit: TEdit;
 implementation
 
 uses
-  ShellApi, ShlObj, Types, Shared.Messages, Setup.MainForm, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc,
-  MD5, Shared.InstFunc, Setup.SelectFolderForm, Setup.FileExtractor, Setup.LoggingFunc, RestartManager, Setup.ScriptRunner;
+  ShellApi, ShlObj, Types, Setup.Messages, Setup.MainForm, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc,
+  MD5, Setup.InstFunc, Setup.SelectFolderForm, Setup.FileExtractor, Setup.LoggingFunc, RestartManager, Setup.ScriptRunner;
 
 {$R *.DFM}