Merge branch 'namecleanup'

Components/BidiUtils.pas

@@ -2,7 +2,7 @@ unit BidiUtils;
 
 {
   Inno Setup
-  Copyright (C) 1997-2018 Jordan Russell
+  Copyright (C) 1997-2024 Jordan Russell
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
@@ -21,7 +21,7 @@ function IsParentRightToLeft(const AControl: TControl): Boolean;
 function SetBiDiStyles(const AControl: TControl; var AParams: TCreateParams): Boolean;
 
 var
-  { These are set by the SetupForm unit: }
+  { These two callbacks should be set by the caller. Inno Setup: set by the Setup.SetupForm unit: }
   IsParentFlippedFunc: function(AControl: TControl): Boolean;
   IsParentRightToLeftFunc: function(AControl: TControl): Boolean;
 

Components/NewCheckListBox.pas

@@ -205,7 +205,7 @@ procedure Register;
 implementation
 
 uses
-  TmSchema, PathFunc, ActiveX, BidiUtils, Types;
+  NewUxTheme.TmSchema, PathFunc, ActiveX, BidiUtils, Types;
 
 const
   sRadioCantHaveDisabledChildren = 'Radio item cannot have disabled child items';

Components/TmSchema.pas → Components/NewUxTheme.TmSchema.pas

@@ -46,7 +46,7 @@
 
 { Simplified by Martijn Laan for Inno Setup }
 
-unit TmSchema;
+unit NewUxTheme.TmSchema;
 
 interface
 

Projects/Src/Compil32/IsscintInt.pas → Components/ScintInt.InnoSetup.pas

@@ -1,4 +1,4 @@
-unit IsscintInt;
+unit ScintInt.InnoSetup;
 
 {
   Inno Setup

ISHelp/isxclasses_wordlists_generated.pas

@@ -5,7 +5,7 @@ unit isxclasses_wordlists_generated;
 interface
 
 uses
-  ScriptFunc;
+  Shared.ScriptFunc;
 
 var
   PascalConstants_Isxclasses: array of AnsiString = [

Projects/Compil32.dpr

@@ -10,62 +10,62 @@ program Compil32;
 }
 
 uses
-  SafeDLLPath in 'Src\SafeDLLPath.pas',
+  SafeDLLPath in '..\Components\SafeDLLPath.pas',
   Windows,
   SysUtils,
   Forms,
   PathFunc in '..\Components\PathFunc.pas',
-  CompForm in 'Src\Compil32\CompForm.pas' {CompileForm},
-  CmnFunc in 'Src\CmnFunc.pas',
-  CmnFunc2 in 'Src\CmnFunc2.pas',
-  CompFunc in 'Src\Compil32\CompFunc.pas',
-  CompMsgs2 in 'Src\Compil32\CompMsgs2.pas',
-  CompInt in 'Src\CompInt.pas',
-  CompOptions in 'Src\Compil32\CompOptions.pas' {OptionsForm},
-  CompStartup in 'Src\Compil32\CompStartup.pas' {StartupForm},
-  CompWizard in 'Src\Compil32\CompWizard.pas' {WizardForm},
-  CompWizardFile in 'Src\Compil32\CompWizardFile.pas' {WizardFileForm},
-  FileAssocFunc in 'Src\Compil32\FileAssocFunc.pas',
-  TmSchema in '..\Components\TmSchema.pas',
+  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\IDE.HelperFunc.pas',
+  IDE.Messages in 'Src\IDE.Messages.pas',
+  Shared.CompilerInt in 'Src\Shared.CompilerInt.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',
-  DebugStruct in 'Src\DebugStruct.pas',
-  BrowseFunc in 'Src\BrowseFunc.pas',
-  CompSignTools in 'Src\Compil32\CompSignTools.pas' {SignToolsForm},
-  CompInputQueryCombo in 'Src\Compil32\CompInputQueryCombo.pas',
+  Shared.DebugStruct in 'Src\Shared.DebugStruct.pas',
+  BrowseFunc in '..\Components\BrowseFunc.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',
-  ScintStylerInnoSetup in 'Src\Compil32\ScintStylerInnoSetup.pas',
+  IDE.ScintStylerInnoSetup in 'Src\IDE.ScintStylerInnoSetup.pas',
   ModernColors in '..\Components\ModernColors.pas',
-  CompMsgBoxDesigner in 'Src\Compil32\CompMsgBoxDesigner.pas' {MsgBoxDesignerForm},
-  CompScintEdit in 'Src\Compil32\CompScintEdit.pas',
-  FilesDesignerForm in 'Src\Compil32\FilesDesignerForm.pas',
-  CompWizardFilesHelper in 'Src\Compil32\CompWizardFilesHelper.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',
   DropListBox in '..\Components\DropListBox.pas',
   NewCheckListBox in '..\Components\NewCheckListBox.pas',
   NewNotebook in '..\Components\NewNotebook.pas',
-  TaskbarProgressFunc in 'Src\TaskbarProgressFunc.pas',
-  HtmlHelpFunc in 'Src\Compil32\HtmlHelpFunc.pas',
-  UIStateForm in 'Src\UIStateForm.pas',
-  LangOptionsSectionDirectives in 'Src\LangOptionsSectionDirectives.pas',
-  MsgIDs in 'Src\MsgIDs.pas',
-  SetupSectionDirectives in 'Src\SetupSectionDirectives.pas',
-  CompTypes in 'Src\CompTypes.pas',
-  FileClass in 'Src\FileClass.pas',
-  Int64Em in 'Src\Int64Em.pas',
-  Compress in 'Src\Compress.pas',
-  TaskDialog in 'Src\TaskDialog.pas',
-  RegistryDesignerForm in 'Src\Compil32\RegistryDesignerForm.pas',
-  CompWizardRegistryHelper in 'Src\Compil32\CompWizardRegistryHelper.pas',
+  TaskbarProgressFunc in '..\Components\TaskbarProgressFunc.pas',
+  IDE.HtmlHelpFunc in 'Src\IDE.HtmlHelpFunc.pas',
+  UIStateForm in '..\Components\UIStateForm.pas',
+  Shared.LangOptionsSectionDirectives in 'Src\Shared.LangOptionsSectionDirectives.pas',
+  Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
+  Shared.SetupSectionDirectives in 'Src\Shared.SetupSectionDirectives.pas',
+  Shared.ConfigIniFile in 'Src\Shared.ConfigIniFile.pas',
+  Shared.SignToolsFunc in 'Src\Shared.SignToolsFunc.pas',
+  Shared.FileClass in 'Src\Shared.FileClass.pas',
+  Shared.Int64Em in 'Src\Shared.Int64Em.pas',
+  Shared.TaskDialogFunc in 'Src\Shared.TaskDialogFunc.pas',
+  IDE.RegistryDesignerForm in 'Src\IDE.RegistryDesignerForm.pas' {RegistryDesignerForm},
+  IDE.Wizard.WizardFormRegistryHelper in 'Src\IDE.Wizard.WizardFormRegistryHelper.pas',
   MD5 in '..\Components\MD5.pas',
-  IsscintInt in 'Src\Compil32\IsscintInt.pas',
-  ScriptFunc in 'Src\ScriptFunc.pas',
-  SetupTypes in 'Src\SetupTypes.pas',
-  Struct in 'Src\Struct.pas',
+  ScintInt.InnoSetup in '..\Components\ScintInt.InnoSetup.pas',
+  Shared.ScriptFunc in 'Src\Shared.ScriptFunc.pas',
+  Shared.SetupTypes in 'Src\Shared.SetupTypes.pas',
+  Shared.Struct in 'Src\Shared.Struct.pas',
   SHA1 in '..\Components\SHA1.pas',
-  DotNetVersion in 'Src\DotNetVersion.pas',
+  Shared.DotNetVersion in 'Src\Shared.DotNetVersion.pas',
   isxclasses_wordlists_generated in '..\ISHelp\isxclasses_wordlists_generated.pas';
 
 {$SETPEOSVERSION 6.1}

Projects/Compil32.dproj

@@ -41,7 +41,7 @@
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=Jordan Russell;FileDescription=Inno Setup Compiler;FileVersion=0.0.0.0;InternalName=;LegalCopyright=Copyright (C) 1997-2008 Jordan Russell. Portions Copyright (C) 2000-2008 Martijn Laan.;LegalTrademarks=;OriginalFilename=;ProductName=Inno Setup;ProductVersion=0.0.0.0;Comments=Inno Setup home page: http://www.innosetup.com</VerInfo_Keys>
-        <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_Namespace>System;System.Win;Winapi;Vcl;Vcl.Imaging;$(DCC_Namespace)</DCC_Namespace>
         <DCC_SYMBOL_DEPRECATED>false</DCC_SYMBOL_DEPRECATED>
         <DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
         <DCC_UNSAFE_CAST>false</DCC_UNSAFE_CAST>
@@ -52,7 +52,6 @@
         <DCC_DcuOutput>Dcu\$(MainSource)</DCC_DcuOutput>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
@@ -76,73 +75,77 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="Src\SafeDLLPath.pas"/>
+        <DCCReference Include="..\Components\SafeDLLPath.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
-        <DCCReference Include="Src\Compil32\CompForm.pas">
+        <DCCReference Include="Src\IDE.CompileForm.pas">
             <Form>CompileForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\CmnFunc.pas"/>
-        <DCCReference Include="Src\CmnFunc2.pas"/>
-        <DCCReference Include="Src\Compil32\CompFunc.pas"/>
-        <DCCReference Include="Src\Compil32\CompMsgs2.pas"/>
-        <DCCReference Include="Src\CompInt.pas"/>
-        <DCCReference Include="Src\Compil32\CompOptions.pas">
+        <DCCReference Include="Src\Shared.CommonFunc.Vcl.pas"/>
+        <DCCReference Include="Src\Shared.CommonFunc.pas"/>
+        <DCCReference Include="Src\IDE.HelperFunc.pas"/>
+        <DCCReference Include="Src\IDE.Messages.pas"/>
+        <DCCReference Include="Src\Shared.CompilerInt.pas"/>
+        <DCCReference Include="Src\IDE.OptionsForm.pas">
             <Form>OptionsForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\CompStartup.pas">
+        <DCCReference Include="Src\IDE.StartupForm.pas">
             <Form>StartupForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\CompWizard.pas">
+        <DCCReference Include="Src\IDE.Wizard.WizardForm.pas">
             <Form>WizardForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\CompWizardFile.pas">
+        <DCCReference Include="Src\IDE.Wizard.WizardFileForm.pas">
             <Form>WizardFileForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\FileAssocFunc.pas"/>
-        <DCCReference Include="..\Components\TmSchema.pas"/>
+        <DCCReference Include="Src\IDE.FileAssocFunc.pas"/>
+        <DCCReference Include="..\Components\NewUxTheme.TmSchema.pas"/>
         <DCCReference Include="..\Components\NewUxTheme.pas"/>
-        <DCCReference Include="Src\DebugStruct.pas"/>
-        <DCCReference Include="Src\BrowseFunc.pas"/>
-        <DCCReference Include="Src\Compil32\CompSignTools.pas">
+        <DCCReference Include="Src\Shared.DebugStruct.pas"/>
+        <DCCReference Include="..\Components\BrowseFunc.pas"/>
+        <DCCReference Include="Src\IDE.SignToolsForm.pas">
             <Form>SignToolsForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\CompInputQueryCombo.pas"/>
+        <DCCReference Include="Src\IDE.InputQueryComboForm.pas"/>
         <DCCReference Include="..\Components\ScintInt.pas"/>
         <DCCReference Include="..\Components\ScintEdit.pas"/>
-        <DCCReference Include="Src\Compil32\ScintStylerInnoSetup.pas"/>
+        <DCCReference Include="Src\IDE.ScintStylerInnoSetup.pas"/>
         <DCCReference Include="..\Components\ModernColors.pas"/>
-        <DCCReference Include="Src\Compil32\CompMsgBoxDesigner.pas">
+        <DCCReference Include="Src\IDE.MsgBoxDesignerForm.pas">
             <Form>MsgBoxDesignerForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\CompScintEdit.pas"/>
-        <DCCReference Include="Src\Compil32\FilesDesignerForm.pas"/>
-        <DCCReference Include="Src\Compil32\CompWizardFilesHelper.pas"/>
+        <DCCReference Include="Src\IDE.CompScintEdit.pas"/>
+        <DCCReference Include="Src\IDE.FilesDesignerForm.pas">
+            <Form>FilesDesignerForm</Form>
+        </DCCReference>
+        <DCCReference Include="Src\IDE.Wizard.WizardFormFilesHelper.pas"/>
         <DCCReference Include="..\Components\NewTabSet.pas"/>
         <DCCReference Include="..\Components\NewStaticText.pas"/>
         <DCCReference Include="..\Components\BidiUtils.pas"/>
         <DCCReference Include="..\Components\DropListBox.pas"/>
         <DCCReference Include="..\Components\NewCheckListBox.pas"/>
         <DCCReference Include="..\Components\NewNotebook.pas"/>
-        <DCCReference Include="Src\TaskbarProgressFunc.pas"/>
-        <DCCReference Include="Src\Compil32\HtmlHelpFunc.pas"/>
-        <DCCReference Include="Src\UIStateForm.pas"/>
-        <DCCReference Include="Src\LangOptionsSectionDirectives.pas"/>
-        <DCCReference Include="Src\MsgIDs.pas"/>
-        <DCCReference Include="Src\SetupSectionDirectives.pas"/>
-        <DCCReference Include="Src\CompTypes.pas"/>
-        <DCCReference Include="Src\FileClass.pas"/>
-        <DCCReference Include="Src\Int64Em.pas"/>
-        <DCCReference Include="Src\Compress.pas"/>
-        <DCCReference Include="Src\TaskDialog.pas"/>
-        <DCCReference Include="Src\Compil32\RegistryDesignerForm.pas"/>
-        <DCCReference Include="Src\Compil32\CompWizardRegistryHelper.pas"/>
+        <DCCReference Include="..\Components\TaskbarProgressFunc.pas"/>
+        <DCCReference Include="Src\IDE.HtmlHelpFunc.pas"/>
+        <DCCReference Include="..\Components\UIStateForm.pas"/>
+        <DCCReference Include="Src\Shared.LangOptionsSectionDirectives.pas"/>
+        <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
+        <DCCReference Include="Src\Shared.SetupSectionDirectives.pas"/>
+        <DCCReference Include="Src\Shared.ConfigIniFile.pas"/>
+        <DCCReference Include="Src\Shared.SignToolsFunc.pas"/>
+        <DCCReference Include="Src\Shared.FileClass.pas"/>
+        <DCCReference Include="Src\Shared.Int64Em.pas"/>
+        <DCCReference Include="Src\Shared.TaskDialogFunc.pas"/>
+        <DCCReference Include="Src\IDE.RegistryDesignerForm.pas">
+            <Form>RegistryDesignerForm</Form>
+        </DCCReference>
+        <DCCReference Include="Src\IDE.Wizard.WizardFormRegistryHelper.pas"/>
         <DCCReference Include="..\Components\MD5.pas"/>
-        <DCCReference Include="Src\Compil32\IsscintInt.pas"/>
-        <DCCReference Include="Src\ScriptFunc.pas"/>
-        <DCCReference Include="Src\SetupTypes.pas"/>
-        <DCCReference Include="Src\Struct.pas"/>
+        <DCCReference Include="..\Components\ScintInt.InnoSetup.pas"/>
+        <DCCReference Include="Src\Shared.ScriptFunc.pas"/>
+        <DCCReference Include="Src\Shared.SetupTypes.pas"/>
+        <DCCReference Include="Src\Shared.Struct.pas"/>
         <DCCReference Include="..\Components\SHA1.pas"/>
-        <DCCReference Include="Src\DotNetVersion.pas"/>
+        <DCCReference Include="Src\Shared.DotNetVersion.pas"/>
         <DCCReference Include="..\ISHelp\isxclasses_wordlists_generated.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>

Projects/ISCC.dpr

@@ -15,17 +15,18 @@ program ISCC;
   into this program and not depend on ISCmplr.dll. }
 
 uses
-  SafeDLLPath in 'Src\SafeDLLPath.pas',
+  SafeDLLPath in '..\Components\SafeDLLPath.pas',
   Windows,
   SysUtils,
   Classes,
-  {$IFDEF STATICCOMPILER} Compile in 'Src\Compile.pas', {$ENDIF}
+  {$IFDEF STATICCOMPILER} ISCmplr.Compile in 'Src\ISCmplr\ISCmplr.Compile.pas', {$ENDIF}
   PathFunc in '..\Components\PathFunc.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';
+  Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
+  Shared.CompilerInt in 'Src\Shared.CompilerInt.pas',
+  Shared.FileClass in 'Src\Shared.FileClass.pas',
+  Shared.ConfigIniFile in 'Src\Shared.ConfigIniFile.pas',
+  Shared.SignToolsFunc in 'Src\Shared.SignToolsFunc.pas',
+  Shared.Int64Em in 'Src\Shared.Int64Em.pas';
 
 {$SETPEOSVERSION 6.1}
 {$SETPESUBSYSVERSION 6.1}

Projects/ISCC.dproj

@@ -41,7 +41,7 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_Namespace>System;System.Win;Winapi;$(DCC_Namespace)</DCC_Namespace>
         <VerInfo_Keys>CompanyName=Jordan Russell;FileDescription=Inno Setup Command-Line Compiler;FileVersion=0.0.0.0;InternalName=;LegalCopyright=Copyright (C) 1997-2008 Jordan Russell. Portions Copyright (C) 2000-2008 Martijn Laan.;LegalTrademarks=;OriginalFilename=;ProductName=Inno Setup;ProductVersion=0.0.0.0;Comments=Inno Setup home page: http://www.innosetup.com</VerInfo_Keys>
         <DCC_SYMBOL_DEPRECATED>false</DCC_SYMBOL_DEPRECATED>
         <DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
@@ -53,7 +53,6 @@
         <DCC_DcuOutput>Dcu\$(MainSource)</DCC_DcuOutput>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
@@ -75,14 +74,15 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="Src\SafeDLLPath.pas"/>
-        <DCCReference Include="Src\Compile.pas"/>
+        <DCCReference Include="..\Components\SafeDLLPath.pas"/>
+        <DCCReference Include="Src\ISCmplr\ISCmplr.Compile.pas"/>
         <DCCReference Include="..\Components\PathFunc.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"/>
+        <DCCReference Include="Src\Shared.CommonFunc.pas"/>
+        <DCCReference Include="Src\Shared.CompilerInt.pas"/>
+        <DCCReference Include="Src\Shared.FileClass.pas"/>
+        <DCCReference Include="Src\Shared.ConfigIniFile.pas"/>
+        <DCCReference Include="Src\Shared.SignToolsFunc.pas"/>
+        <DCCReference Include="Src\Shared.Int64Em.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Projects/ISCmplr.dpr

@@ -10,39 +10,39 @@ library ISCmplr;
 }
 
 uses
-  SafeDLLPath in 'Src\SafeDLLPath.pas',
+  SafeDLLPath in '..\Components\SafeDLLPath.pas',
   SysUtils,
-  CompInt in 'Src\CompInt.pas',
-  CompPreprocInt in 'Src\CompPreprocInt.pas',
-  Compile in 'Src\ISCmplr\Compile.pas',
-  CompMsgs in 'Src\ISCmplr\CompMsgs.pas',
-  Struct in 'Src\Struct.pas',
-  ScriptFunc in 'Src\ScriptFunc.pas',
-  ScriptFunc_C in 'Src\ISCmplr\ScriptFunc_C.pas',
-  ScriptCompiler in 'Src\ISCmplr\ScriptCompiler.pas',
-  ScriptClasses_C in 'Src\ISCmplr\ScriptClasses_C.pas',
-  ResUpdate in 'Src\ResUpdate.pas',
-  CompExeUpdate in 'Src\ISCmplr\CompExeUpdate.pas',
-  Compress in 'Src\Compress.pas',
-  CompressZlib in 'Src\CompressZlib.pas',
-  bzlib in 'Src\bzlib.pas',
-  LZMA in 'Src\ISCmplr\LZMA.pas',
-  FileClass in 'Src\FileClass.pas',
-  ArcFour in 'Src\ArcFour.pas',
-  VerInfo in 'Src\VerInfo.pas',
+  Shared.CompilerInt in 'Src\Shared.CompilerInt.pas',
+  Shared.PreprocInt in 'Src\Shared.PreprocInt.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\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\Compiler.ExeUpdateFunc.pas',
+  Compression.Base in 'Src\Compression.Base.pas',
+  Compression.Zlib in 'Src\Compression.Zlib.pas',
+  Compression.bzlib in 'Src\Compression.bzlib.pas',
+  Compression.LZMACompressor in 'Src\Compression.LZMACompressor.pas',
+  Shared.FileClass in 'Src\Shared.FileClass.pas',
+  Shared.ArcFour in 'Src\Shared.ArcFour.pas',
+  Shared.VerInfoFunc in 'Src\Shared.VerInfoFunc.pas',
   PathFunc in '..\Components\PathFunc.pas',
-  CmnFunc2 in 'Src\CmnFunc2.pas',
-  Int64Em in 'Src\Int64Em.pas',
+  Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
+  Shared.Int64Em in 'Src\Shared.Int64Em.pas',
   SHA1 in '..\Components\SHA1.pas',
-  DebugStruct in 'Src\DebugStruct.pas',
-  LangOptionsSectionDirectives in 'Src\LangOptionsSectionDirectives.pas',
-  MsgIDs in 'Src\MsgIDs.pas',
-  SetupEnt in 'Src\SetupEnt.pas',
-  SetupSectionDirectives in 'Src\SetupSectionDirectives.pas',
-  SetupTypes in 'Src\SetupTypes.pas',
-  SimpleExpression in 'Src\SimpleExpression.pas',
+  Shared.DebugStruct in 'Src\Shared.DebugStruct.pas',
+  Shared.LangOptionsSectionDirectives in 'Src\Shared.LangOptionsSectionDirectives.pas',
+  Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
+  Shared.SetupEntFunc in 'Src\Shared.SetupEntFunc.pas',
+  Shared.SetupSectionDirectives in 'Src\Shared.SetupSectionDirectives.pas',
+  Shared.SetupTypes in 'Src\Shared.SetupTypes.pas',
+  SimpleExpression in '..\Components\SimpleExpression.pas',
   MD5 in '..\Components\MD5.pas',
-  DotNetVersion in 'Src\DotNetVersion.pas';
+  Shared.DotNetVersion in 'Src\Shared.DotNetVersion.pas';
 
 {$IMAGEBASE $00800000}
 {$SETPEOSVERSION 6.1}

Projects/ISCmplr.dproj

@@ -42,7 +42,7 @@
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=Jordan Russell;FileDescription=Inno Setup Compiler;FileVersion=0.0.0.0;InternalName=;LegalCopyright=Copyright (C) 1997-2008 Jordan Russell. Portions Copyright (C) 2000-2008 Martijn Laan.;LegalTrademarks=;OriginalFilename=;ProductName=Inno Setup;ProductVersion=0.0.0.0;Comments=Inno Setup home page: http://www.innosetup.com</VerInfo_Keys>
-        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_Namespace>System;System.Win;Winapi;Vcl;$(DCC_Namespace)</DCC_Namespace>
         <DCC_SYMBOL_DEPRECATED>false</DCC_SYMBOL_DEPRECATED>
         <DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
         <DCC_UNSAFE_CAST>false</DCC_UNSAFE_CAST>
@@ -53,7 +53,6 @@
         <DCC_DcuOutput>Dcu\$(MainSource)</DCC_DcuOutput>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
@@ -78,38 +77,38 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="Src\SafeDLLPath.pas"/>
-        <DCCReference Include="Src\CompInt.pas"/>
-        <DCCReference Include="Src\CompPreprocInt.pas"/>
-        <DCCReference Include="Src\ISCmplr\Compile.pas"/>
-        <DCCReference Include="Src\ISCmplr\CompMsgs.pas"/>
-        <DCCReference Include="Src\Struct.pas"/>
-        <DCCReference Include="Src\ScriptFunc.pas"/>
-        <DCCReference Include="Src\ISCmplr\ScriptFunc_C.pas"/>
-        <DCCReference Include="Src\ISCmplr\ScriptCompiler.pas"/>
-        <DCCReference Include="Src\ISCmplr\ScriptClasses_C.pas"/>
-        <DCCReference Include="Src\ResUpdate.pas"/>
-        <DCCReference Include="Src\ISCmplr\CompExeUpdate.pas"/>
-        <DCCReference Include="Src\Compress.pas"/>
-        <DCCReference Include="Src\CompressZlib.pas"/>
-        <DCCReference Include="Src\bzlib.pas"/>
-        <DCCReference Include="Src\ISCmplr\LZMA.pas"/>
-        <DCCReference Include="Src\FileClass.pas"/>
-        <DCCReference Include="Src\ArcFour.pas"/>
-        <DCCReference Include="Src\VerInfo.pas"/>
+        <DCCReference Include="..\Components\SafeDLLPath.pas"/>
+        <DCCReference Include="Src\Shared.CompilerInt.pas"/>
+        <DCCReference Include="Src\Shared.PreprocInt.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\Compiler.ScriptFunc.pas"/>
+        <DCCReference Include="Src\Compiler.ScriptCompiler.pas"/>
+        <DCCReference Include="Src\Compiler.ScriptClasses.pas"/>
+        <DCCReference Include="Src\Shared.ResUpdateFunc.pas"/>
+        <DCCReference Include="Src\Compiler.ExeUpdateFunc.pas"/>
+        <DCCReference Include="Src\Compression.Base.pas"/>
+        <DCCReference Include="Src\Compression.Zlib.pas"/>
+        <DCCReference Include="Src\Compression.bzlib.pas"/>
+        <DCCReference Include="Src\Compression.LZMACompressor.pas"/>
+        <DCCReference Include="Src\Shared.FileClass.pas"/>
+        <DCCReference Include="Src\Shared.ArcFour.pas"/>
+        <DCCReference Include="Src\Shared.VerInfoFunc.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
-        <DCCReference Include="Src\CmnFunc2.pas"/>
-        <DCCReference Include="Src\Int64Em.pas"/>
+        <DCCReference Include="Src\Shared.CommonFunc.pas"/>
+        <DCCReference Include="Src\Shared.Int64Em.pas"/>
         <DCCReference Include="..\Components\SHA1.pas"/>
-        <DCCReference Include="Src\DebugStruct.pas"/>
-        <DCCReference Include="Src\LangOptionsSectionDirectives.pas"/>
-        <DCCReference Include="Src\MsgIDs.pas"/>
-        <DCCReference Include="Src\SetupEnt.pas"/>
-        <DCCReference Include="Src\SetupSectionDirectives.pas"/>
-        <DCCReference Include="Src\SetupTypes.pas"/>
-        <DCCReference Include="Src\SimpleExpression.pas"/>
+        <DCCReference Include="Src\Shared.DebugStruct.pas"/>
+        <DCCReference Include="Src\Shared.LangOptionsSectionDirectives.pas"/>
+        <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
+        <DCCReference Include="Src\Shared.SetupEntFunc.pas"/>
+        <DCCReference Include="Src\Shared.SetupSectionDirectives.pas"/>
+        <DCCReference Include="Src\Shared.SetupTypes.pas"/>
+        <DCCReference Include="..\Components\SimpleExpression.pas"/>
         <DCCReference Include="..\Components\MD5.pas"/>
-        <DCCReference Include="Src\DotNetVersion.pas"/>
+        <DCCReference Include="Src\Shared.DotNetVersion.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Projects/ISPP.dpr

@@ -14,26 +14,26 @@ uses
   SysUtils,
   Windows,
   Classes,
-  CompPreprocInt in 'Src\CompPreprocInt.pas',
-  IsppPreprocess in 'Src\ISPP\IsppPreprocess.pas',
-  IsppPreprocessor in 'Src\ISPP\IsppPreprocessor.pas',
-  IsppFuncs in 'Src\ISPP\IsppFuncs.pas',
-  IsppVarUtils in 'Src\ISPP\IsppVarUtils.pas',
-  IsppConsts in 'Src\ISPP\IsppConsts.pas',
-  IsppStack in 'Src\ISPP\IsppStack.pas',
-  IsppIntf in 'Src\ISPP\IsppIntf.pas',
-  IsppParser in 'Src\ISPP\IsppParser.pas',
-  IsppIdentMan in 'Src\ISPP\IsppIdentMan.pas',
-  IsppSessions in 'Src\ISPP\IsppSessions.pas',
-  CTokenizer in 'Src\ISPP\CTokenizer.pas',
-  IsppBase in 'Src\ISPP\IsppBase.pas',
+  Shared.PreprocInt in 'Src\Shared.PreprocInt.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',
-  CmnFunc2 in 'Src\CmnFunc2.pas',
-  FileClass in 'Src\FileClass.pas',
-  Int64Em in 'Src\Int64Em.pas',
+  Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
+  Shared.FileClass in 'Src\Shared.FileClass.pas',
+  Shared.Int64Em in 'Src\Shared.Int64Em.pas',
   MD5 in '..\Components\MD5.pas',
   SHA1 in '..\Components\SHA1.pas',
-  Struct in 'Src\Struct.pas';
+  Shared.Struct in 'Src\Shared.Struct.pas';
   
 {$IMAGEBASE $01800000}
 {$SETPEOSVERSION 6.1}

Projects/ISPP.dproj

@@ -40,7 +40,7 @@
         <VerInfo_DLL>true</VerInfo_DLL>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=Jordan Russell;FileDescription=Inno Setup Preprocessor;FileVersion=0.0.0.0;InternalName=;LegalCopyright=Copyright (C) 1997-2010 Jordan Russell. Portions Copyright (C) 2000-2010 Martijn Laan. Copyright © 2001-2004 Alex Yackimoff.;LegalTrademarks=;OriginalFilename=;ProductName=Inno Setup;ProductVersion=0.0.0.0;Comments=Inno Setup home page: http://www.innosetup.com</VerInfo_Keys>
-        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_Namespace>System;System.Win;Winapi;$(DCC_Namespace)</DCC_Namespace>
         <DCC_SYMBOL_DEPRECATED>false</DCC_SYMBOL_DEPRECATED>
         <DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
         <DCC_UNSAFE_CAST>false</DCC_UNSAFE_CAST>
@@ -51,7 +51,6 @@
         <DCC_DcuOutput>Dcu\$(MainSource)</DCC_DcuOutput>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
@@ -76,26 +75,26 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="Src\CompPreprocInt.pas"/>
-        <DCCReference Include="Src\ISPP\IsppPreprocess.pas"/>
-        <DCCReference Include="Src\ISPP\IsppPreprocessor.pas"/>
-        <DCCReference Include="Src\ISPP\IsppFuncs.pas"/>
-        <DCCReference Include="Src\ISPP\IsppVarUtils.pas"/>
-        <DCCReference Include="Src\ISPP\IsppConsts.pas"/>
-        <DCCReference Include="Src\ISPP\IsppStack.pas"/>
-        <DCCReference Include="Src\ISPP\IsppIntf.pas"/>
-        <DCCReference Include="Src\ISPP\IsppParser.pas"/>
-        <DCCReference Include="Src\ISPP\IsppIdentMan.pas"/>
-        <DCCReference Include="Src\ISPP\IsppSessions.pas"/>
-        <DCCReference Include="Src\ISPP\CTokenizer.pas"/>
-        <DCCReference Include="Src\ISPP\IsppBase.pas"/>
+        <DCCReference Include="Src\Shared.PreprocInt.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\CmnFunc2.pas"/>
-        <DCCReference Include="Src\FileClass.pas"/>
-        <DCCReference Include="Src\Int64Em.pas"/>
+        <DCCReference Include="Src\Shared.CommonFunc.pas"/>
+        <DCCReference Include="Src\Shared.FileClass.pas"/>
+        <DCCReference Include="Src\Shared.Int64Em.pas"/>
         <DCCReference Include="..\Components\MD5.pas"/>
         <DCCReference Include="..\Components\SHA1.pas"/>
-        <DCCReference Include="Src\Struct.pas"/>
+        <DCCReference Include="Src\Shared.Struct.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Projects/Setup.dpr

@@ -10,64 +10,64 @@ program Setup;
 }
 
 uses
-  SafeDLLPath in 'Src\SafeDLLPath.pas',
-  XPTheme in 'Src\SetupLdrAndSetup\XPTheme.pas',
+  SafeDLLPath in '..\Components\SafeDLLPath.pas',
+  Setup.XPTheme in 'Src\Setup.XPTheme.pas',
   Forms,
   Windows,
   SysUtils,
   Messages,
   RichEditViewer in '..\Components\RichEditViewer.pas',
-  CmnFunc in 'Src\CmnFunc.pas',
-  CmnFunc2 in 'Src\CmnFunc2.pas',
-  Main in 'Src\Setup\Main.pas' {MainForm},
-  Install in 'Src\Setup\Install.pas',
-  Msgs in 'Src\SetupLdrAndSetup\Msgs.pas',
-  MsgIDs in 'Src\MsgIDs.pas',
-  Undo in 'Src\Setup\Undo.pas',
-  Struct in 'Src\Struct.pas',
-  NewDisk in 'Src\Setup\NewDisk.pas' {NewDiskForm},
-  InstFunc in 'Src\SetupLdrAndSetup\InstFunc.pas',
-  InstFnc2 in 'Src\Setup\InstFnc2.pas',
-  Wizard in 'Src\Setup\Wizard.pas' {WizardForm},
-  ScriptFunc_R in 'Src\Setup\ScriptFunc_R.pas',
-  ScriptFunc in 'Src\ScriptFunc.pas',
-  SetupTypes in 'Src\SetupTypes.pas',
-  ScriptRunner in 'Src\Setup\ScriptRunner.pas',
-  ScriptDlg in 'Src\Setup\ScriptDlg.pas',
-  ScriptClasses_R in 'Src\Setup\ScriptClasses_R.pas',
-  SelLangForm in 'Src\Setup\SelLangForm.pas' {SelectLanguageForm},
-  Extract in 'Src\Setup\Extract.pas',
-  Int64Em in 'Src\Int64Em.pas',
-  SelFolderForm in 'Src\Setup\SelFolderForm.pas' {SelectFolderForm},
-  Compress in 'Src\Compress.pas',
-  CompressZlib in 'Src\CompressZlib.pas',
-  bzlib in 'Src\bzlib.pas',
-  LZMADecomp in 'Src\Setup\LZMADecomp.pas',
-  FileClass in 'Src\FileClass.pas',
+  Shared.CommonFunc.Vcl in 'Src\Shared.CommonFunc.Vcl.pas',
+  Shared.CommonFunc in 'Src\Shared.CommonFunc.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.UninstallLog.pas',
+  Shared.Struct in 'Src\Shared.Struct.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.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.SelectFolderForm.pas' {SelectFolderForm},
+  Compression.Base in 'Src\Compression.Base.pas',
+  Compression.Zlib in 'Src\Compression.Zlib.pas',
+  Compression.bzlib in 'Src\Compression.bzlib.pas',
+  Compression.LZMADecompressor in 'Src\Compression.LZMADecompressor.pas',
+  Shared.FileClass in 'Src\Shared.FileClass.pas',
   MD5 in '..\Components\MD5.pas',
   SHA1 in '..\Components\SHA1.pas',
-  Logging in 'Src\Setup\Logging.pas',
-  DebugClient in 'Src\Setup\DebugClient.pas',
-  DebugStruct in 'Src\DebugStruct.pas',
-  ArcFour in 'Src\ArcFour.pas',
-  Uninstall in 'Src\Setup\Uninstall.pas',
-  UninstProgressForm in 'Src\Setup\UninstProgressForm.pas' {UninstProgressForm},
-  UninstSharedFileForm in 'Src\Setup\UninstSharedFileForm.pas' {UninstSharedFileForm},
-  SimpleExpression in 'Src\SimpleExpression.pas',
-  UIStateForm in 'Src\UIStateForm.pas',
-  SetupForm in 'Src\Setup\SetupForm.pas',
-  RegSvr in 'Src\Setup\RegSvr.pas',
-  BrowseFunc in 'Src\BrowseFunc.pas',
-  RedirFunc in 'Src\SetupLdrAndSetup\RedirFunc.pas',
-  SecurityFunc in 'Src\Setup\SecurityFunc.pas',
-  Helper in 'Src\Setup\Helper.pas',
-  VerInfo in 'Src\VerInfo.pas',
-  RegDLL in 'Src\Setup\RegDLL.pas',
-  ResUpdate in 'Src\ResUpdate.pas',
-  SpawnCommon in 'Src\Setup\SpawnCommon.pas',
-  SpawnServer in 'Src\Setup\SpawnServer.pas',
-  SpawnClient in 'Src\Setup\SpawnClient.pas',
-  TaskDialog in 'Src\TaskDialog.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.Uninstall.pas',
+  Setup.UninstallProgressForm in 'Src\Setup.UninstallProgressForm.pas' {UninstallProgressForm},
+  Setup.UninstallSharedFileForm in 'Src\Setup.UninstallSharedFileForm.pas' {UninstallSharedFileForm},
+  SimpleExpression in '..\Components\SimpleExpression.pas',
+  UIStateForm in '..\Components\UIStateForm.pas',
+  Setup.SetupForm in 'Src\Setup.SetupForm.pas',
+  Setup.RegSvr in 'Src\Setup.RegSvr.pas',
+  BrowseFunc in '..\Components\BrowseFunc.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.RegDLL.pas',
+  Shared.ResUpdateFunc in 'Src\Shared.ResUpdateFunc.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',
   BidiCtrls in '..\Components\BidiCtrls.pas',
@@ -78,15 +78,15 @@ uses
   NewProgressBar in '..\Components\NewProgressBar.pas',
   NewStaticText in '..\Components\NewStaticText.pas',
   PasswordEdit in '..\Components\PasswordEdit.pas',
-  TmSchema in '..\Components\TmSchema.pas',
+  NewUxTheme.TmSchema in '..\Components\NewUxTheme.TmSchema.pas',
   RestartManager in '..\Components\RestartManager.pas',
   Resample in '..\Components\Resample.pas',
   ASMInline in '..\Components\ASMInline.pas',
-  TaskbarProgressFunc in 'Src\TaskbarProgressFunc.pas',
-  DotNet in 'Src\Setup\DotNet.pas',
-  SetupEnt in 'Src\SetupEnt.pas',
-  Msi in 'Src\Setup\Msi.pas',
-  DotNetVersion in 'Src\DotNetVersion.pas',
+  TaskbarProgressFunc in '..\Components\TaskbarProgressFunc.pas',
+  Setup.DotNetFunc in 'Src\Setup.DotNetFunc.pas',
+  Shared.SetupEntFunc in 'Src\Shared.SetupEntFunc.pas',
+  Setup.MsiFunc in 'Src\Setup.MsiFunc.pas',
+  Shared.DotNetVersion in 'Src\Shared.DotNetVersion.pas',
   NewUxTheme in '..\Components\NewUxTheme.pas';
 
 {$SETPEOSVERSION 6.1}

Projects/Setup.dproj

@@ -38,7 +38,7 @@
         <SanitizedProjectName>Setup</SanitizedProjectName>
         <VerInfo_Locale>1043</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
-        <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;System.Bindings;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_Namespace>System;System.Win;Winapi;Vcl;$(DCC_Namespace)</DCC_Namespace>
         <DCC_SYMBOL_DEPRECATED>false</DCC_SYMBOL_DEPRECATED>
         <DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
         <DCC_UNSAFE_CAST>false</DCC_UNSAFE_CAST>
@@ -49,7 +49,6 @@
         <DCC_DcuOutput>Dcu\$(MainSource)</DCC_DcuOutput>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
@@ -74,74 +73,74 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="Src\SafeDLLPath.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\XPTheme.pas"/>
+        <DCCReference Include="..\Components\SafeDLLPath.pas"/>
+        <DCCReference Include="Src\Setup.XPTheme.pas"/>
         <DCCReference Include="..\Components\RichEditViewer.pas"/>
-        <DCCReference Include="Src\CmnFunc.pas"/>
-        <DCCReference Include="Src\CmnFunc2.pas"/>
-        <DCCReference Include="Src\Setup\Main.pas">
+        <DCCReference Include="Src\Shared.CommonFunc.Vcl.pas"/>
+        <DCCReference Include="Src\Shared.CommonFunc.pas"/>
+        <DCCReference Include="Src\Setup.MainForm.pas">
             <Form>MainForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Setup\Install.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\Msgs.pas"/>
-        <DCCReference Include="Src\MsgIDs.pas"/>
-        <DCCReference Include="Src\Setup\Undo.pas"/>
-        <DCCReference Include="Src\Struct.pas"/>
-        <DCCReference Include="Src\Setup\NewDisk.pas">
+        <DCCReference Include="Src\Setup.Install.pas"/>
+        <DCCReference Include="Src\Setup.Messages.pas"/>
+        <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
+        <DCCReference Include="Src\Setup.UninstallLog.pas"/>
+        <DCCReference Include="Src\Shared.Struct.pas"/>
+        <DCCReference Include="Src\Setup.NewDiskForm.pas">
             <Form>NewDiskForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\SetupLdrAndSetup\InstFunc.pas"/>
-        <DCCReference Include="Src\Setup\InstFnc2.pas"/>
-        <DCCReference Include="Src\Setup\Wizard.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\ScriptFunc_R.pas"/>
-        <DCCReference Include="Src\ScriptFunc.pas"/>
-        <DCCReference Include="Src\SetupTypes.pas"/>
-        <DCCReference Include="Src\Setup\ScriptRunner.pas"/>
-        <DCCReference Include="Src\Setup\ScriptDlg.pas"/>
-        <DCCReference Include="Src\Setup\ScriptClasses_R.pas"/>
-        <DCCReference Include="Src\Setup\SelLangForm.pas">
+        <DCCReference Include="Src\Setup.ScriptFunc.pas"/>
+        <DCCReference Include="Src\Shared.ScriptFunc.pas"/>
+        <DCCReference Include="Src\Shared.SetupTypes.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\Extract.pas"/>
-        <DCCReference Include="Src\Int64Em.pas"/>
-        <DCCReference Include="Src\Setup\SelFolderForm.pas">
+        <DCCReference Include="Src\Setup.FileExtractor.pas"/>
+        <DCCReference Include="Src\Shared.Int64Em.pas"/>
+        <DCCReference Include="Src\Setup.SelectFolderForm.pas">
             <Form>SelectFolderForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compress.pas"/>
-        <DCCReference Include="Src\CompressZlib.pas"/>
-        <DCCReference Include="Src\bzlib.pas"/>
-        <DCCReference Include="Src\Setup\LZMADecomp.pas"/>
-        <DCCReference Include="Src\FileClass.pas"/>
+        <DCCReference Include="Src\Compression.Base.pas"/>
+        <DCCReference Include="Src\Compression.Zlib.pas"/>
+        <DCCReference Include="Src\Compression.bzlib.pas"/>
+        <DCCReference Include="Src\Compression.LZMADecompressor.pas"/>
+        <DCCReference Include="Src\Shared.FileClass.pas"/>
         <DCCReference Include="..\Components\MD5.pas"/>
         <DCCReference Include="..\Components\SHA1.pas"/>
-        <DCCReference Include="Src\Setup\Logging.pas"/>
-        <DCCReference Include="Src\Setup\DebugClient.pas"/>
-        <DCCReference Include="Src\DebugStruct.pas"/>
-        <DCCReference Include="Src\ArcFour.pas"/>
-        <DCCReference Include="Src\Setup\Uninstall.pas"/>
-        <DCCReference Include="Src\Setup\UninstProgressForm.pas">
-            <Form>UninstProgressForm</Form>
+        <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.Uninstall.pas"/>
+        <DCCReference Include="Src\Setup.UninstallProgressForm.pas">
+            <Form>UninstallProgressForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Setup\UninstSharedFileForm.pas">
-            <Form>UninstSharedFileForm</Form>
+        <DCCReference Include="Src\Setup.UninstallSharedFileForm.pas">
+            <Form>UninstallSharedFileForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\SimpleExpression.pas"/>
-        <DCCReference Include="Src\UIStateForm.pas"/>
-        <DCCReference Include="Src\Setup\SetupForm.pas"/>
-        <DCCReference Include="Src\Setup\RegSvr.pas"/>
-        <DCCReference Include="Src\BrowseFunc.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\RedirFunc.pas"/>
-        <DCCReference Include="Src\Setup\SecurityFunc.pas"/>
-        <DCCReference Include="Src\Setup\Helper.pas"/>
-        <DCCReference Include="Src\VerInfo.pas"/>
-        <DCCReference Include="Src\Setup\RegDLL.pas"/>
-        <DCCReference Include="Src\ResUpdate.pas"/>
-        <DCCReference Include="Src\Setup\SpawnCommon.pas"/>
-        <DCCReference Include="Src\Setup\SpawnServer.pas"/>
-        <DCCReference Include="Src\Setup\SpawnClient.pas"/>
-        <DCCReference Include="Src\TaskDialog.pas"/>
+        <DCCReference Include="..\Components\SimpleExpression.pas"/>
+        <DCCReference Include="..\Components\UIStateForm.pas"/>
+        <DCCReference Include="Src\Setup.SetupForm.pas"/>
+        <DCCReference Include="Src\Setup.RegSvr.pas"/>
+        <DCCReference Include="..\Components\BrowseFunc.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.RegDLL.pas"/>
+        <DCCReference Include="Src\Shared.ResUpdateFunc.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"/>
         <DCCReference Include="..\Components\BidiCtrls.pas"/>
@@ -152,15 +151,15 @@
         <DCCReference Include="..\Components\NewProgressBar.pas"/>
         <DCCReference Include="..\Components\NewStaticText.pas"/>
         <DCCReference Include="..\Components\PasswordEdit.pas"/>
-        <DCCReference Include="..\Components\TmSchema.pas"/>
+        <DCCReference Include="..\Components\NewUxTheme.TmSchema.pas"/>
         <DCCReference Include="..\Components\RestartManager.pas"/>
         <DCCReference Include="..\Components\Resample.pas"/>
         <DCCReference Include="..\Components\ASMInline.pas"/>
-        <DCCReference Include="Src\TaskbarProgressFunc.pas"/>
-        <DCCReference Include="Src\Setup\DotNet.pas"/>
-        <DCCReference Include="Src\SetupEnt.pas"/>
-        <DCCReference Include="Src\Setup\Msi.pas"/>
-        <DCCReference Include="Src\DotNetVersion.pas"/>
+        <DCCReference Include="..\Components\TaskbarProgressFunc.pas"/>
+        <DCCReference Include="Src\Setup.DotNetFunc.pas"/>
+        <DCCReference Include="Src\Shared.SetupEntFunc.pas"/>
+        <DCCReference Include="Src\Setup.MsiFunc.pas"/>
+        <DCCReference Include="Src\Shared.DotNetVersion.pas"/>
         <DCCReference Include="..\Components\NewUxTheme.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>

Projects/SetupLdr.dpr

@@ -10,27 +10,27 @@ program SetupLdr;
 }
 
 uses
-  SafeDLLPath in 'Src\SafeDLLPath.pas',
-  XPTheme in 'Src\SetupLdrAndSetup\XPTheme.pas',
+  SafeDLLPath in '..\Components\SafeDLLPath.pas',
+  Setup.XPTheme in 'Src\Setup.XPTheme.pas',
   Windows,
   Messages,
   SysUtils,
-  Compress in 'Src\Compress.pas',
-  LZMADecompSmall in 'Src\SetupLdr\LZMADecompSmall.pas',
-  SetupEnt in 'Src\SetupEnt.pas',
+  Compression.Base in 'Src\Compression.Base.pas',
+  Compression.LZMA1SmallDecompressor in 'Src\Compression.LZMA1SmallDecompressor.pas',
+  Shared.SetupEntFunc in 'Src\Shared.SetupEntFunc.pas',
   PathFunc in '..\Components\PathFunc.pas',
-  CmnFunc2 in 'Src\CmnFunc2.pas',
-  Msgs in 'Src\SetupLdrAndSetup\Msgs.pas',
-  MsgIDs in 'Src\MsgIDs.pas',
-  Struct in 'Src\Struct.pas',
-  InstFunc in 'Src\SetupLdrAndSetup\InstFunc.pas',
-  FileClass in 'Src\FileClass.pas',
-  Int64Em in 'Src\Int64Em.pas',
+  Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
+  Setup.Messages in 'Src\Setup.Messages.pas',
+  Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
+  Shared.Struct in 'Src\Shared.Struct.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',
-  RedirFunc in 'Src\SetupLdrAndSetup\RedirFunc.pas',
-  SetupTypes in 'Src\SetupTypes.pas',
-  VerInfo in 'Src\VerInfo.pas';
+  Setup.RedirFunc in 'Src\Setup.RedirFunc.pas',
+  Shared.SetupTypes in 'Src\Shared.SetupTypes.pas',
+  Shared.VerInfoFunc in 'Src\Shared.VerInfoFunc.pas';
 
 {$SETPEOSVERSION 6.1}
 {$SETPESUBSYSVERSION 6.1}

Projects/SetupLdr.dproj

@@ -36,7 +36,7 @@
         <SanitizedProjectName>SetupLdr</SanitizedProjectName>
         <VerInfo_Locale>1043</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
-        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_Namespace>System;System.Win;Winapi;$(DCC_Namespace)</DCC_Namespace>
         <DCC_SYMBOL_DEPRECATED>false</DCC_SYMBOL_DEPRECATED>
         <DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
         <DCC_UNSAFE_CAST>false</DCC_UNSAFE_CAST>
@@ -48,7 +48,6 @@
         <DCC_Define>SETUPLDRPROJ;$(DCC_Define)</DCC_Define>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
@@ -71,24 +70,24 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="Src\SafeDLLPath.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\XPTheme.pas"/>
-        <DCCReference Include="Src\Compress.pas"/>
-        <DCCReference Include="Src\SetupLdr\LZMADecompSmall.pas"/>
-        <DCCReference Include="Src\SetupEnt.pas"/>
+        <DCCReference Include="..\Components\SafeDLLPath.pas"/>
+        <DCCReference Include="Src\Setup.XPTheme.pas"/>
+        <DCCReference Include="Src\Compression.Base.pas"/>
+        <DCCReference Include="Src\Compression.LZMA1SmallDecompressor.pas"/>
+        <DCCReference Include="Src\Shared.SetupEntFunc.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
-        <DCCReference Include="Src\CmnFunc2.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\Msgs.pas"/>
-        <DCCReference Include="Src\MsgIDs.pas"/>
-        <DCCReference Include="Src\Struct.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\InstFunc.pas"/>
-        <DCCReference Include="Src\FileClass.pas"/>
-        <DCCReference Include="Src\Int64Em.pas"/>
+        <DCCReference Include="Src\Shared.CommonFunc.pas"/>
+        <DCCReference Include="Src\Setup.Messages.pas"/>
+        <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
+        <DCCReference Include="Src\Shared.Struct.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\RedirFunc.pas"/>
-        <DCCReference Include="Src\SetupTypes.pas"/>
-        <DCCReference Include="Src\VerInfo.pas"/>
+        <DCCReference Include="Src\Setup.RedirFunc.pas"/>
+        <DCCReference Include="Src\Shared.SetupTypes.pas"/>
+        <DCCReference Include="Src\Shared.VerInfoFunc.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Projects/Src/ISCmplr/Compile.pas → Projects/Src/Compiler.Compile.pas

@@ -1,4 +1,4 @@
-unit Compile;
+unit Compiler.Compile;
 
 {
   Inno Setup
@@ -11,14 +11,14 @@ unit Compile;
 
 {x$DEFINE STATICPREPROC}
 { For debugging purposes, remove the 'x' to have it link the ISPP code into this
-  program and not depend on ISPP.dll. You will also need to add the Src\ISPP
+  program and not depend on ISPP.dll. You will also need to add the Src
   folder to the Delphi Compiler Search path in the project options. Most useful
-  when combine with CompForm's STATICCOMPILER. }
+  when combine with IDE.CompileForm's STATICCOMPILER. }
 
 interface
 
 uses
-  Windows, SysUtils, CompInt;
+  Windows, SysUtils, Shared.CompilerInt;
 
 function ISCompileScript(const Params: TCompileScriptParamsEx;
   const PropagateExceptions: Boolean): Integer;
@@ -30,15 +30,15 @@ type
 implementation
 
 uses
-  CompPreprocInt, Commctrl, Consts, Classes, IniFiles, TypInfo, AnsiStrings, Math,
+  Shared.PreprocInt, Commctrl, Consts, Classes, IniFiles, TypInfo, AnsiStrings, Math,
   Generics.Collections, StrUtils, WideStrUtils,
-  PathFunc, CmnFunc2, Struct, Int64Em, CompMsgs, SetupEnt,
-  FileClass, Compress, CompressZlib, bzlib, LZMA, ArcFour, SHA1,
-  MsgIDs, SetupSectionDirectives, LangOptionsSectionDirectives, DebugStruct, VerInfo, ResUpdate, CompExeUpdate,
+  PathFunc, Shared.CommonFunc, Shared.Struct, Shared.Int64Em, Compiler.Messages, Shared.SetupEntFunc,
+  Shared.FileClass, Compression.Base, Compression.Zlib, Compression.bzlib, Compression.LZMACompressor, Shared.ArcFour, SHA1,
+  Shared.SetupMessageIDs, Shared.SetupSectionDirectives, Shared.LangOptionsSectionDirectives, Shared.DebugStruct, Shared.VerInfoFunc, Shared.ResUpdateFunc, Compiler.ExeUpdateFunc,
 {$IFDEF STATICPREPROC}
   IsppPreprocess,
 {$ENDIF}
-  ScriptCompiler, SimpleExpression, SetupTypes;
+  Compiler.ScriptCompiler, SimpleExpression, Shared.SetupTypes;
 
 type
   TParamInfo = record
@@ -8978,7 +8978,7 @@ begin
             { Update manifest if needed }
             if UseSetupLdr then begin
               AddStatus(Format(SCompilerStatusUpdatingManifest, ['SETUP.EXE']));
-              CompExeUpdate.PreventCOMCTL32Sideloading(ExeFile);
+              PreventCOMCTL32Sideloading(ExeFile);
             end;
 
             { For some reason, on Win95 the date/time of the EXE sometimes

Projects/Src/ISCmplr/CompExeUpdate.pas → Projects/Src/Compiler.ExeUpdateFunc.pas

@@ -1,4 +1,4 @@
-unit CompExeUpdate;
+unit Compiler.ExeUpdateFunc;
 
 {
   Inno Setup
@@ -12,7 +12,7 @@ unit CompExeUpdate;
 interface
 
 uses
-  Windows, SysUtils, FileClass, VerInfo;
+  Windows, SysUtils, Shared.FileClass, Shared.VerInfoFunc;
 
 procedure UpdateSetupPEHeaderFields(const F: TCustomFile;
   const IsTSAware, IsDEPCompatible, IsASLRCompatible: Boolean);
@@ -27,7 +27,7 @@ procedure PreventCOMCTL32Sideloading(const F: TCustomFile);
 implementation
 
 uses
-  ResUpdate, Math, Int64Em;
+  Shared.ResUpdateFunc, Math, Shared.Int64Em;
 
 procedure UpdateSetupPEHeaderFields(const F: TCustomFile;
   const IsTSAware, IsDEPCompatible, IsASLRCompatible: Boolean);

Projects/Src/ISCmplr/CompMsgs.pas → Projects/Src/Compiler.Messages.pas

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

Projects/Src/ISCmplr/ScriptClasses_C.pas → Projects/Src/Compiler.ScriptClasses.pas

@@ -1,4 +1,4 @@
-unit ScriptClasses_C;
+unit Compiler.ScriptClasses;
 
 {
   Inno Setup
@@ -19,7 +19,7 @@ procedure ScriptClassesLibraryRegister_C(Cl: TPSPascalCompiler);
 implementation
 
 uses
-  Windows, SetupTypes,
+  Windows, Shared.SetupTypes,
   uPSC_std, uPSC_classes, uPSC_graphics, uPSC_controls, uPSC_stdctrls,
   uPSC_forms, uPSC_extctrls, uPSC_comobj;
 

Projects/Src/ISCmplr/ScriptCompiler.pas → Projects/Src/Compiler.ScriptCompiler.pas

@@ -1,4 +1,4 @@
-unit ScriptCompiler;
+unit Compiler.ScriptCompiler;
 
 {
   Inno Setup
@@ -60,7 +60,7 @@ implementation
 uses
   SysUtils, Generics.Defaults,
   uPSCompiler, uPSC_dll,
-  ScriptClasses_C, ScriptFunc_C;
+  Compiler.ScriptClasses, Compiler.ScriptFunc;
 
 type
   TScriptExport = class

Projects/Src/ISCmplr/ScriptFunc_C.pas → Projects/Src/Compiler.ScriptFunc.pas

@@ -1,4 +1,4 @@
-unit ScriptFunc_C;
+unit Compiler.ScriptFunc;
 
 {
   Inno Setup
@@ -21,8 +21,8 @@ implementation
 
 uses
   Windows, SysUtils, TypInfo,
-  CmnFunc2, MsgIDs, Struct,
-  SetupTypes, ScriptFunc, CompMsgs, DotNetVersion;
+  Shared.CommonFunc, Shared.SetupMessageIDs, Shared.Struct,
+  Shared.SetupTypes, Shared.ScriptFunc, Compiler.Messages, Shared.DotNetVersion;
 
 { This type copied from CmnFunc.pas. We don't actually 'use' CmnFunc since
   it would cause VCL units to be linked in. }

Projects/Src/Compress.pas → Projects/Src/Compression.Base.pas

@@ -1,4 +1,4 @@
-unit Compress;
+unit Compression.Base;
 
 {
   Inno Setup
@@ -12,7 +12,7 @@ unit Compress;
 interface
 
 uses
-  Windows, SysUtils, Int64Em, FileClass;
+  Windows, SysUtils, Shared.Int64Em, Shared.FileClass;
 
 type
   ECompressError = class(Exception);

Projects/Src/SetupLdr/LZMADecompSmall.pas → Projects/Src/Compression.LZMA1SmallDecompressor.pas

@@ -1,4 +1,4 @@
-unit LZMADecompSmall;
+unit Compression.LZMA1SmallDecompressor;
 
 {
   Inno Setup
@@ -13,7 +13,7 @@ unit LZMADecompSmall;
 interface
 
 uses
-  Windows, SysUtils, Compress, Int64Em;
+  Windows, SysUtils, Compression.Base, Shared.Int64Em;
 
 type
   { Internally-used record }
@@ -61,7 +61,7 @@ type
 implementation
 
 const
-  SLZMADataError = 'lzmadecompsmall: Compressed data is corrupted (%d)';
+  SLZMADataError = 'lzma1smalldecompressor: Compressed data is corrupted (%d)';
 
 procedure LZMADataError(const Id: Integer);
 begin
@@ -70,7 +70,7 @@ end;
 
 procedure LZMAInternalError(const Msg: String);
 begin
-  raise ECompressInternalError.CreateFmt('lzmadecompsmall: %s', [Msg]);
+  raise ECompressInternalError.CreateFmt('lzma1smalldecompressor: %s', [Msg]);
 end;
 
 procedure LZMAInternalErrorFmt(const Msg: String; const Args: array of const);

Projects/Src/ISCmplr/LZMA.pas → Projects/Src/Compression.LZMACompressor.pas

@@ -1,4 +1,4 @@
-unit LZMA;
+unit Compression.LZMACompressor;
 
 {
   Inno Setup
@@ -13,7 +13,7 @@ interface
 
 uses
   Windows, SysUtils,
-  Compress, Int64Em;
+  Compression.Base, Shared.Int64Em;
 
 function LZMAInitCompressFunctions(Module: HMODULE): Boolean;
 function LZMAGetLevel(const Value: String; var Level: Integer): Boolean;

Projects/Src/Setup/LZMADecomp.pas → Projects/Src/Compression.LZMADecompressor.pas

@@ -1,4 +1,4 @@
-unit LZMADecomp;
+unit Compression.LZMADecompressor;
 
 {
   Inno Setup
@@ -13,7 +13,7 @@ unit LZMADecomp;
 interface
 
 uses
-  Windows, SysUtils, Int64Em, Compress;
+  Windows, SysUtils, Shared.Int64Em, Compression.Base;
 
 type
   TLZMACustomDecompressor = class(TCustomDecompressor)

Projects/Src/CompressZlib.pas → Projects/Src/Compression.Zlib.pas

@@ -1,4 +1,4 @@
-unit CompressZlib;
+unit Compression.Zlib;
 
 {
   Inno Setup
@@ -12,7 +12,7 @@ unit CompressZlib;
 interface
 
 uses
-  Windows, SysUtils, Compress;
+  Windows, SysUtils, Compression.Base;
 
 function ZlibInitCompressFunctions(Module: HMODULE): Boolean;
 function ZlibInitDecompressFunctions(Module: HMODULE): Boolean;

Projects/Src/bzlib.pas → Projects/Src/Compression.bzlib.pas

@@ -1,4 +1,4 @@
-unit bzlib;
+unit Compression.bzlib;
 
 {
   Inno Setup
@@ -12,7 +12,7 @@ unit bzlib;
 interface
 
 uses
-  Windows, SysUtils, Compress;
+  Windows, SysUtils, Compression.Base;
 
 function BZInitCompressFunctions(Module: HMODULE): Boolean;
 function BZInitDecompressFunctions(Module: HMODULE): Boolean;

Projects/Src/Compil32/CompScintEdit.pas → Projects/Src/IDE.CompScintEdit.pas

@@ -1,4 +1,4 @@
-unit CompScintEdit;
+unit IDE.CompScintEdit;
 
 {
   Inno Setup
@@ -171,7 +171,7 @@ type
 implementation
 
 uses
-  SysUtils, MD5, IsscintInt;
+  SysUtils, MD5, ScintInt.InnoSetup;
   
 { TCompScintEdit }
 

Projects/Src/Compil32/CompForm.pas → Projects/Src/IDE.CompileForm.pas

@@ -1,4 +1,4 @@
-unit CompForm;
+unit IDE.CompileForm;
 
 {
   Inno Setup
@@ -12,8 +12,8 @@
 {x$DEFINE STATICCOMPILER}
 { For debugging purposes, remove the 'x' to have it link the compiler code into
   this program and not depend on ISCmplr.dll. You will also need to add the
-  ..\Components and Src and Src\ISCmplr folders to the Delphi Compiler Search path
-  in the project options. Also see Compile's STATICPREPROC. }
+  ..\Components and Src folders to the Delphi Compiler Search path
+  in the project options. Also see Compiler.Compile's STATICPREPROC. }
 
 {$IFDEF STATICCOMPILER}
 {$R ..\Res\ISCmplr.images.res}
@@ -24,8 +24,8 @@ interface
 uses
   Windows, Messages, SysUtils, Classes, Contnrs, Graphics, Controls, Forms, Dialogs, CommDlg,
   Generics.Collections, UIStateForm, StdCtrls, ExtCtrls, Menus, Buttons, ComCtrls, CommCtrl,
-  ScintInt, ScintEdit, ScintStylerInnoSetup, NewTabSet, ModernColors, CompScintEdit,
-  DebugStruct, CompInt, NewUxTheme, ImageList, ImgList, ToolWin, CompFunc,
+  ScintInt, ScintEdit, IDE.ScintStylerInnoSetup, NewTabSet, ModernColors, IDE.CompScintEdit,
+  Shared.DebugStruct, Shared.CompilerInt, NewUxTheme, ImageList, ImgList, ToolWin, IDE.HelperFunc,
   VirtualImageList, BaseImageCollection, ImageCollection;
 
 const
@@ -651,11 +651,12 @@ implementation
 uses
   ActiveX, Clipbrd, ShellApi, ShlObj, IniFiles, Registry, Consts, Types, UITypes,
   Math, StrUtils, WideStrUtils,
-  PathFunc, CmnFunc, CmnFunc2, FileClass, CompMsgs2, TmSchema, BrowseFunc,
-  HtmlHelpFunc, TaskbarProgressFunc,
+  PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.FileClass, IDE.Messages, NewUxTheme.TmSchema, BrowseFunc,
+  IDE.HtmlHelpFunc, TaskbarProgressFunc,
   {$IFDEF STATICCOMPILER} Compile, {$ENDIF}
-  CompOptions, CompStartup, CompWizard, CompSignTools, CompTypes, CompInputQueryCombo, CompMsgBoxDesigner,
-  FilesDesignerForm, RegistryDesignerForm, CompWizardRegistryHelper;
+  IDE.OptionsForm, IDE.StartupForm, IDE.Wizard.WizardForm, IDE.SignToolsForm,
+  Shared.ConfigIniFile, Shared.SignToolsFunc, IDE.InputQueryComboForm, IDE.MsgBoxDesignerForm,
+  IDE.FilesDesignerForm, IDE.RegistryDesignerForm, IDE.Wizard.WizardFormRegistryHelper;
 
 {$R *.DFM}
 

Projects/Src/Compil32/FileAssocFunc.pas → Projects/Src/IDE.FileAssocFunc.pas

@@ -1,4 +1,4 @@
-unit FileAssocFunc;
+unit IDE.FileAssocFunc;
 
 {
   Inno Setup
@@ -17,7 +17,7 @@ procedure UnregisterISSFileAssociation;
 implementation
 
 uses
-  Windows, SysUtils, PathFunc, ShlObj, CmnFunc, CmnFunc2;
+  Windows, SysUtils, PathFunc, ShlObj, Shared.CommonFunc.Vcl, Shared.CommonFunc;
   
 function GetRootkey: HKEY;
 begin

Projects/Src/Compil32/FilesDesignerForm.pas → Projects/Src/IDE.FilesDesignerForm.pas

@@ -1,4 +1,4 @@
-unit FilesDesignerForm;
+unit IDE.FilesDesignerForm;
 
 {
   Inno Setup
@@ -13,7 +13,7 @@ interface
 
 uses
   Classes, Controls, Forms, Dialogs, ExtCtrls, StdCtrls,
-  UIStateForm, NewStaticText, DropListBox, CompWizardFilesHelper;
+  UIStateForm, NewStaticText, DropListBox, IDE.Wizard.WizardFormFilesHelper;
 
 type
   TFilesDesignerForm = class(TUIStateForm)
@@ -45,7 +45,7 @@ implementation
 {$R *.dfm}
 
 uses
-  CompFunc;
+  IDE.HelperFunc;
 
 procedure TFilesDesignerForm.FormCreate(Sender: TObject);
 begin

Projects/Src/Compil32/CompFunc.pas → Projects/Src/IDE.HelperFunc.pas

@@ -1,4 +1,4 @@
-unit CompFunc;
+unit IDE.HelperFunc;
 
 {
   Inno Setup
@@ -14,7 +14,7 @@ interface
 uses
   Windows,
   Classes, Forms, Dialogs, Menus, Controls, StdCtrls,
-  ScintEdit, CompScintEdit, ModernColors;
+  ScintEdit, IDE.CompScintEdit, ModernColors;
 
 const
   MRUListMaxCount = 10;
@@ -86,8 +86,8 @@ implementation
 uses
   ActiveX, ShlObj, ShellApi, CommDlg, SysUtils, IOUtils, StrUtils,
   Messages, DwmApi, Consts,
-  CmnFunc2, PathFunc, FileClass, NewUxTheme,
-  CompForm, CompMsgs2, CompTypes;
+  Shared.CommonFunc, PathFunc, Shared.FileClass, NewUxTheme,
+  IDE.CompileForm, IDE.Messages, Shared.ConfigIniFile;
 
 procedure InitFormFont(Form: TForm);
 var

Projects/Src/Compil32/HtmlHelpFunc.pas → Projects/Src/IDE.HtmlHelpFunc.pas

@@ -1,4 +1,4 @@
-unit HtmlHelpFunc;
+unit IDE.HtmlHelpFunc;
 
 {
   Inno Setup
@@ -42,7 +42,7 @@ procedure FreeHtmlHelpLibrary;
 implementation
 
 uses
-  Messages, SysUtils, CmnFunc2, PathFunc;
+  Messages, SysUtils, Shared.CommonFunc, PathFunc;
 
 var
   HHCtrl: THandle;

Projects/Src/Compil32/CompInputQueryCombo.dfm → Projects/Src/IDE.InputQueryComboForm.dfm

@@ -1,4 +1,4 @@
-object InputQueryCombo: TInputQueryCombo
+object InputQueryComboForm: TInputQueryComboForm
   Left = 330
   Top = 188
   BorderIcons = [biSystemMenu]

Projects/Src/Compil32/CompInputQueryCombo.pas → Projects/Src/IDE.InputQueryComboForm.pas

@@ -1,4 +1,4 @@
-unit CompInputQueryCombo;
+unit IDE.InputQueryComboForm;
 
 {
   Inno Setup
@@ -15,7 +15,7 @@ uses
   Classes, Controls, StdCtrls, UIStateForm;
 
 type
-  TInputQueryCombo = class(TUIStateForm)
+  TInputQueryComboForm = class(TUIStateForm)
     OKButton: TButton;
     CancelButton: TButton;
     PromptLabel: TLabel;
@@ -37,13 +37,13 @@ function InputQueryCombo(const ACaption, APrompt: String; var AValue: String; co
 implementation
 
 uses
-  Windows, Messages, CompFunc, Forms;
+  Windows, Messages, IDE.HelperFunc, Forms;
 
 {$R *.DFM}
 
 function InputQueryCombo(const ACaption, APrompt: String; var AValue: String; const AValues: TStringList): Boolean;
 begin
-  with TInputQueryCombo.Create(Application) do try
+  with TInputQueryComboForm.Create(Application) do try
     Caption := ACaption;
     Prompt := APrompt;
     Value := AValue;
@@ -58,27 +58,27 @@ begin
   end;
 end;
 
-procedure TInputQueryCombo.FormCreate(Sender: TObject);
+procedure TInputQueryComboForm.FormCreate(Sender: TObject);
 begin
   InitFormFont(Self);
 end;
 
-function TInputQueryCombo.GetValue: String;
+function TInputQueryComboForm.GetValue: String;
 begin
   Result := ValueComboBox.Text;
 end;
 
-procedure TInputQueryCombo.SetPrompt(const APrompt: String);
+procedure TInputQueryComboForm.SetPrompt(const APrompt: String);
 begin
   PromptLabel.Caption := APrompt;
 end;
 
-procedure TInputQueryCombo.SetValue(const AValue: String);
+procedure TInputQueryComboForm.SetValue(const AValue: String);
 begin
   ValueComboBox.Text := AValue;
 end;
 
-procedure TInputQueryCombo.SetValues(const AValues: TStringList);
+procedure TInputQueryComboForm.SetValues(const AValues: TStringList);
 begin
   ValueComboBox.Items := AValues;
 end;

Projects/Src/Compil32/CompMsgs2.pas → Projects/Src/IDE.Messages.pas

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

Projects/Src/Compil32/CompMsgBoxDesigner.pas → Projects/Src/IDE.MsgBoxDesignerForm.pas

@@ -1,4 +1,4 @@
-unit CompMsgBoxDesigner;
+unit IDE.MsgBoxDesignerForm;
 
 {
   Inno Setup
@@ -108,7 +108,7 @@ type
 implementation
 
 uses
-  CmnFunc, CmnFunc2, CompFunc, TaskDialog, CompMsgs2;
+  Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelperFunc, Shared.TaskDialogFunc, IDE.Messages;
 
 {$R *.DFM}
 

Projects/Src/Compil32/CompOptions.pas → Projects/Src/IDE.OptionsForm.pas

@@ -1,4 +1,4 @@
-unit CompOptions;
+unit IDE.OptionsForm;
 
 {
   Inno Setup
@@ -70,7 +70,7 @@ type
 implementation
 
 uses
-  CmnFunc, CmnFunc2, CompFunc, FileAssocFunc;
+  Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelperFunc, IDE.FileAssocFunc;
 
 {$R *.DFM}
 

Projects/Src/Compil32/RegistryDesignerForm.pas → Projects/Src/IDE.RegistryDesignerForm.pas

@@ -1,4 +1,4 @@
-unit RegistryDesignerForm;
+unit IDE.RegistryDesignerForm;
 
 {
   Inno Setup
@@ -16,7 +16,7 @@ interface
 uses
   SysUtils, Classes,
   Forms, Controls, StdCtrls, ExtCtrls,
-  CompWizardRegistryHelper, NewStaticText;
+  IDE.Wizard.WizardFormRegistryHelper, NewStaticText;
 
 type
   TRegistryDesignerForm = class(TForm)
@@ -52,7 +52,7 @@ implementation
 {$R *.dfm}
 
 uses
-  CompFunc;
+  IDE.HelperFunc;
 
 procedure TRegistryDesignerForm.SetPrivilegesRequired(
   const Value: TPrivilegesRequired);

Projects/Src/Compil32/ScintStylerInnoSetup.pas → Projects/Src/IDE.ScintStylerInnoSetup.pas

@@ -1,4 +1,4 @@
-unit ScintStylerInnoSetup;
+unit IDE.ScintStylerInnoSetup;
 
 {
   Inno Setup
@@ -13,7 +13,7 @@ interface
 
 uses
   SysUtils, Classes, Graphics, Generics.Collections, TypInfo,
-  ScintEdit, ModernColors, ScriptFunc;
+  ScintEdit, ModernColors, Shared.ScriptFunc;
 
 const
   InnoSetupStylerWordListSeparator = #9;
@@ -155,8 +155,8 @@ implementation
 
 uses
   Generics.Defaults,
-  MsgIDs, ScintInt, SetupSectionDirectives, LangOptionsSectionDirectives,
-  CmnFunc, SetupTypes, Struct, DotNetVersion, isxclasses_wordlists_generated;
+  Shared.SetupMessageIDs, ScintInt, Shared.SetupSectionDirectives, Shared.LangOptionsSectionDirectives,
+  Shared.CommonFunc.Vcl, Shared.SetupTypes, Shared.Struct, Shared.DotNetVersion, isxclasses_wordlists_generated;
 
 type
   { Size must be <= SizeOf(TScintLineState) }
@@ -389,7 +389,7 @@ const
     'varVariant', 'varUnknown', 'varShortInt', 'varByte', 'varWord', 'varLongWord',
     'varInt64', 'varStrArg', 'varAny', 'varString', 'varTypeMask', 'varArray',
     'varByRef', 'varUString', 'False', 'True',
-    { ScriptFunc_C }
+    { ScriptFunc }
     'MaxInt', 'wpWelcome', 'wpLicense', 'wpPassword', 'wpInfoBefore',
     'wpUserInfo', 'wpSelectDir', 'wpSelectComponents', 'wpSelectProgramGroup',
     'wpSelectTasks', 'wpReady', 'wpPreparing', 'wpInstalling', 'wpInfoAfter',
@@ -417,7 +417,7 @@ const
     'VER_SUITE_PERSONAL', 'VER_SUITE_BLADE', 'VER_SUITE_EMBEDDED_RESTRICTED',
     'VER_SUITE_SECURITY_APPLIANCE'
     //undocumented: irInstall
-    { ScriptClasses_C: see PascalConstants_Isxclasses in isxclasses_wordlists_generated }
+    { ScriptClasses: see PascalConstants_Isxclasses in isxclasses_wordlists_generated }
   ];
 
   PascalInterfaces: array of AnsiString = [
@@ -445,21 +445,21 @@ const
     //undocumented: NativeString, AnyString, AnyMethod, ___Pointer, tbtString, NativeString, !NotificationVariant
     'TVarType',
     //undocumented: TIFException
-    { ScriptFunc_C's real enums, values done via PascalRealEnumValues instead of PascalEnumValues}
+    { ScriptFunc's real enums, values done via PascalRealEnumValues instead of PascalEnumValues}
     'TMsgBoxType', 'TSetupMessageID', 'TSetupStep', 'TUninstallStep',
     'TSetupProcessorArchitecture', 'TDotNetVersion',
-    { ScriptFunc_C's non real enums and other types }
+    { ScriptFunc's non real enums and other types }
     'TArrayOfString', 'TArrayOfChar', 'TArrayOfBoolean', 'TArrayOfInteger', 'DWORD',
     'UINT', 'BOOL', 'DWORD_PTR', 'UINT_PTR', 'INT_PTR', 'TFileTime',
     'TExecWait', 'TExecOutput', 'TFindRec', 'TWindowsVersion',
     'TOnDownloadProgress', 'TOnLog'
-    { ScriptClasses_C: see PascalTypes_Isxclasses in isxclasses_wordlists_generated }
+    { ScriptClasses: see PascalTypes_Isxclasses in isxclasses_wordlists_generated }
   ];
 
   PascalEnumValues: array of AnsiString = [
-    { ScriptFunc_C's values of non real enums }
+    { ScriptFunc's values of non real enums }
     'ewNoWait', 'ewWaitUntilTerminated', 'ewWaitUntilIdle'
-    { ScriptClasses_C: see PascalEnumValues_Isxclasses in isxclasses_wordlists_generated }
+    { ScriptClasses: see PascalEnumValues_Isxclasses in isxclasses_wordlists_generated }
   ];
 
 var
@@ -469,7 +469,7 @@ const
   PascalVariables: array of AnsiString = [
     { ROPS }
     'Result',
-    { ScriptClasses_C }
+    { ScriptClasses }
     'WizardForm', 'MainForm', 'UninstallProgressForm'
   ];
 

Projects/Src/Compil32/CompSignTools.pas → Projects/Src/IDE.SignToolsForm.pas

@@ -1,4 +1,4 @@
-unit CompSignTools;
+unit IDE.SignToolsForm;
 
 {
   Inno Setup
@@ -46,7 +46,7 @@ type
 implementation
 
 uses
-  Windows, Messages, CompFunc, CmnFunc, Dialogs, SysUtils;
+  Windows, Messages, IDE.HelperFunc, Shared.CommonFunc.Vcl, Dialogs, SysUtils;
 
 {$R *.DFM}
 

Projects/Src/Compil32/CompStartup.pas → Projects/Src/IDE.StartupForm.pas

@@ -1,4 +1,4 @@
-unit CompStartup;
+unit IDE.StartupForm;
 
 {
   Inno Setup
@@ -59,7 +59,7 @@ type
 implementation
 
 uses
-  CompMsgs2, CmnFunc, CmnFunc2, CompFunc, CompForm, ComCtrls;
+  IDE.Messages, Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelperFunc, IDE.CompileForm, ComCtrls;
 
 {$R *.DFM}
 

Projects/Src/Compil32/CompWizardFile.pas → Projects/Src/IDE.Wizard.WizardFileForm.pas

@@ -1,4 +1,4 @@
-unit CompWizardFile;
+unit IDE.Wizard.WizardFileForm;
 
 {
   Inno Setup
@@ -60,7 +60,7 @@ type
 implementation
 
 uses
-  CompMsgs2, CmnFunc, CmnFunc2, CompFunc;
+  IDE.Messages, Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelperFunc;
 
 {$R *.DFM}
 

Projects/Src/Compil32/CompWizard.pas → Projects/Src/IDE.Wizard.WizardForm.pas

@@ -1,4 +1,4 @@
-unit CompWizard;
+unit IDE.Wizard.WizardForm;
 
 {
   Inno Setup
@@ -14,7 +14,7 @@ interface
 uses
   Windows, Forms, Classes, Graphics, StdCtrls, ExtCtrls, Controls, Dialogs, pngimage,
   UIStateForm, NewStaticText, DropListBox, NewCheckListBox, NewNotebook,
-  CompWizardFilesHelper, CompWizardRegistryHelper;
+  IDE.Wizard.WizardFormFilesHelper, IDE.Wizard.WizardFormRegistryHelper;
 
 type
   TWizardPage = (wpWelcome, wpAppInfo, wpAppDir, wpAppFiles, wpAppAssoc, wpAppIcons,
@@ -186,9 +186,9 @@ implementation
 {$R *.DFM}
 
 uses
-  SysUtils, ShlObj, ActiveX, UITypes, FileClass,
-  PathFunc, CmnFunc, CmnFunc2, CompFunc, BrowseFunc,
-  CompMsgs2, CompWizardFile;
+  SysUtils, ShlObj, ActiveX, UITypes, Shared.FileClass,
+  PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelperFunc, BrowseFunc,
+  IDE.Messages, IDE.Wizard.WizardFileForm;
 
 type
   TConstant = record

Projects/Src/Compil32/CompWizardFilesHelper.pas → Projects/Src/IDE.Wizard.WizardFormFilesHelper.pas

@@ -1,4 +1,4 @@
-unit CompWizardFilesHelper;
+unit IDE.Wizard.WizardFormFilesHelper;
 
 {
   Inno Setup
@@ -6,7 +6,7 @@ unit CompWizardFilesHelper;
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
-  Helper to avoid duplicate code between CompWizard and CompFilesDesigner
+  Helper to avoid duplicate code between WizardForm and FilesDesignerForm
 }
 
 interface
@@ -48,8 +48,8 @@ implementation
 
 uses
   SysUtils, UITypes,
-  CmnFunc, CmnFunc2, BrowseFunc, PathFunc,
-  CompMsgs2, CompWizardFile;
+  Shared.CommonFunc.Vcl, Shared.CommonFunc, BrowseFunc, PathFunc,
+  IDE.Messages, IDE.Wizard.WizardFileForm;
 
 constructor TWizardFormFilesHelper.Create(const Form: TForm;
   const NotCreateAppDirCheck: TCheckBox; const FilesListBox: TDropListBox;

Projects/Src/Compil32/CompWizardRegistryHelper.pas → Projects/Src/IDE.Wizard.WizardFormRegistryHelper.pas

@@ -1,4 +1,4 @@
-unit CompWizardRegistryHelper;
+unit IDE.Wizard.WizardFormRegistryHelper;
 
 {
   Inno Setup
@@ -6,7 +6,7 @@ unit CompWizardRegistryHelper;
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
-  Helper to avoid duplicate code between CompWizard and CompRegistryDesigner
+  Helper to avoid duplicate code between WizardForm and RegistryDesignerForm
 }
 
 interface
@@ -47,7 +47,7 @@ implementation
 uses
   Windows, Classes, SysUtils, StrUtils, TypInfo, Graphics, UITypes,
   ComCtrls,
-  CompForm, CompFunc, CompMsgs2, BrowseFunc, CmnFunc2, HtmlHelpFunc;
+  IDE.CompileForm, IDE.HelperFunc, IDE.Messages, BrowseFunc, Shared.CommonFunc, IDE.HtmlHelpFunc;
 
 { TWizardFormRegistryHelper }
 

Projects/Src/ISPP/IsppBase.pas → Projects/Src/ISPP.Base.pas

@@ -8,11 +8,11 @@
   For conditions of distribution and use, see LICENSE.TXT.
 }
 
-unit IsppBase;
+unit ISPP.Base;
 
 interface
 
-uses IsppIntf, SysUtils;
+uses ISPP.Intf, SysUtils;
 
 type
 

Projects/Src/ISPP/CTokenizer.pas → Projects/Src/ISPP.CTokenizer.pas

@@ -8,7 +8,7 @@
   For conditions of distribution and use, see LICENSE.TXT.
 }
 
-unit CTokenizer;
+unit ISPP.CTokenizer;
 
 interface
 
@@ -116,7 +116,8 @@ const
 
 implementation
 
-uses IsppConsts, CmnFunc2;
+uses
+  ISPP.Consts, Shared.CommonFunc;
 
 { TCTokenizer }
 

Projects/Src/ISPP/IsppConsts.pas → Projects/Src/ISPP.Consts.pas

@@ -8,7 +8,7 @@
   For conditions of distribution and use, see LICENSE.TXT.
 }
 
-unit IsppConsts;
+unit ISPP.Consts;
 
 interface
 

Projects/Src/ISPP/IsppFuncs.pas → Projects/Src/ISPP.Funcs.pas

@@ -8,20 +8,21 @@
   For conditions of distribution and use, see LICENSE.TXT.
 }
 
-unit IsppFuncs;
+unit ISPP.Funcs;
 
 interface
 
 uses
-  Windows, Classes, IsppVarUtils, IsppIntf, IsppPreprocessor, IsppParser;
+  Windows, Classes, ISPP.VarUtils, ISPP.Intf, ISPP.Preprocessor, ISPP.Parser;
 
 procedure RegisterFunctions(Preproc: TPreprocessor);
 
 implementation
 
 uses
-  SysUtils, IniFiles, Registry, Math, IsppConsts, IsppBase, IsppIdentMan,
-  IsppSessions, DateUtils, FileClass, MD5, SHA1, PathFunc, CmnFunc2, Int64Em;
+  SysUtils, IniFiles, Registry, Math, ISPP.Consts, ISPP.Base, ISPP.IdentMan,
+  ISPP.Sessions, DateUtils, Shared.FileClass, MD5, SHA1, PathFunc, Shared.CommonFunc,
+  Shared.Int64Em;
   
 var
   IsWin64: Boolean;
@@ -135,7 +136,7 @@ begin
   if CheckParams(Params, [evStr], 1, Result) then
   try
     with IInternalFuncParams(Params) do
-      MakeBool(ResPtr^, CmnFunc2.DirExists(PrependPath(Ext, Get(0).AsStr)));
+      MakeBool(ResPtr^, Shared.CommonFunc.DirExists(PrependPath(Ext, Get(0).AsStr)));
   except
     on E: Exception do
     begin
@@ -1974,7 +1975,7 @@ begin
     RegisterFunction('ComparePackedVersion', ComparePackedVersionFunc, -1);
     RegisterFunction('SamePackedVersion', SamePackedVersionFunc, -1);
     RegisterFunction('GetStringFileInfo', GetFileVersionInfoItem, -1);
-    RegisterFunction('SaveToFile', IsppFuncs.SaveToFile, -1);
+    RegisterFunction('SaveToFile', ISPP.Funcs.SaveToFile, -1);
     RegisterFunction('Find', FindLine, -1);
     RegisterFunction('SetupSetting', SetupSetting, -1);
     RegisterFunction('SetSetupSetting', SetSetupSetting, -1);

Projects/Src/ISPP/IsppIdentMan.pas → Projects/Src/ISPP.IdentMan.pas

@@ -8,11 +8,12 @@
   For conditions of distribution and use, see LICENSE.TXT.
 }
 
-unit IsppIdentMan;
+unit ISPP.IdentMan;
 
 interface
 
-uses SysUtils, Classes, IsppIntf, IsppBase;
+uses
+  SysUtils, Classes, ISPP.Intf, ISPP.Base;
 
 type
 
@@ -118,8 +119,9 @@ const
 
 implementation
 
-uses Windows, Types, IsppPreprocessor, CTokenizer, IsppParser, IsppVarUtils, IsppConsts,
-  IsppSessions;
+uses
+  Windows, Types, ISPP.Preprocessor, ISPP.CTokenizer, ISPP.Parser,
+  ISPP.VarUtils, ISPP.Consts, ISPP.Sessions;
 
 const
   MaxLocalArraySize = 16;

Projects/Src/ISPP/IsppIntf.pas → Projects/Src/ISPP.Intf.pas

@@ -8,7 +8,7 @@
   For conditions of distribution and use, see LICENSE.TXT.
 }
 
-unit IsppIntf;
+unit ISPP.Intf;
 
 interface
 

Projects/Src/ISPP/IsppParser.pas → Projects/Src/ISPP.Parser.pas

@@ -8,11 +8,12 @@
   For conditions of distribution and use, see LICENSE.TXT.
 }
 
-unit IsppParser;
+unit ISPP.Parser;
 
 interface
 
-uses IsppIntf, IsppBase, IsppIdentMan, CTokenizer;
+uses
+  ISPP.Intf, ISPP.Base, ISPP.IdentMan, ISPP.CTokenizer;
 
 type
 
@@ -47,7 +48,8 @@ function ParseInt(const VarMan: IIdentManager; const AExpr: string; Offset: Inte
 
 implementation
 
-uses SysUtils, IsppSessions, IsppConsts, IsppVarUtils;
+uses
+  SysUtils, ISPP.Sessions, ISPP.Consts, ISPP.VarUtils;
 
 function Parse(const VarMan: IIdentManager; const AExpr: string; Offset: Integer; Options: PIsppParserOptions): TIsppVariant;
 begin

Projects/Src/ISPP/IsppPreprocess.pas → Projects/Src/ISPP.Preprocess.pas

@@ -8,20 +8,21 @@
   For conditions of distribution and use, see LICENSE.TXT.
 }
 
-unit IsppPreprocess;
+unit ISPP.Preprocess;
 
 interface
 
 uses
-  CompPreprocInt;
+  Shared.PreprocInt;
 
 function ISPreprocessScript(var Params: TPreprocessScriptParams): Integer; stdcall;
 
 implementation
 
 uses
-  SysUtils, CmnFunc2, PathFunc,
-  IsppBase, IsppPreprocessor, IsppSessions, IsppIntf, IsppIdentMan, IsppVarUtils, IsppConsts;
+  SysUtils, Shared.CommonFunc, PathFunc,
+  ISPP.Base, ISPP.Preprocessor, ISPP.Sessions, ISPP.Intf,
+  ISPP.IdentMan, ISPP.VarUtils, ISPP.Consts;
 
 procedure ReadScript(const Params: TPreprocessScriptParams;
   const Preprocessor: TPreprocessor);

Projects/Src/ISPP/IsppPreprocessor.pas → Projects/Src/ISPP.Preprocessor.pas

@@ -8,12 +8,13 @@
   For conditions of distribution and use, see LICENSE.TXT.
 }
 
-unit IsppPreprocessor;
+unit ISPP.Preprocessor;
 
 interface
 
-uses Windows, SysUtils, Classes, CompPreprocInt, IniFiles, Registry, IsppIntf,
-  IsppBase, IsppStack, IsppIdentMan, IsppParser;
+uses
+  Windows, SysUtils, Classes, Shared.PreprocInt, IniFiles, Registry, ISPP.Intf,
+  ISPP.Base, ISPP.Stack, ISPP.IdentMan, ISPP.Parser;
 
 type
 
@@ -151,8 +152,9 @@ type
 
 implementation
 
-uses IsppConsts, IsppFuncs, IsppVarUtils, IsppSessions, CTokenizer, PathFunc,
-  CmnFunc2, FileClass, Struct;
+uses
+  ISPP.Consts, ISPP.Funcs, ISPP.VarUtils, ISPP.Sessions, ISPP.CTokenizer, PathFunc,
+  Shared.CommonFunc, Shared.FileClass, Shared.Struct;
 
 const
   PreprocCommands: array[TPreprocessorCommand] of String =
@@ -257,7 +259,7 @@ begin
   FOutput := TStringList.Create;
   FProcs := TStringList.Create;
   FStack := TConditionalTranslationStack.Create(Self);
-  if VarManager = nil then IsppFuncs.RegisterFunctions(Self);
+  if VarManager = nil then ISPP.Funcs.RegisterFunctions(Self);
 end;
 
 destructor TPreprocessor.Destroy;

Projects/Src/ISPP/IsppSessions.pas → Projects/Src/ISPP.Sessions.pas

@@ -8,11 +8,12 @@
   For conditions of distribution and use, see LICENSE.TXT.
 }
 
-unit IsppSessions;
+unit ISPP.Sessions;
 
 interface
 
-uses IsppPreprocessor;
+uses
+  ISPP.Preprocessor;
 
 procedure PushPreproc(APreproc: TPreprocessor);
 function PopPreproc: TPreprocessor;
@@ -23,7 +24,8 @@ procedure QueueFileForDeletion(const FileName: string);
 
 implementation
 
-uses SysUtils, Classes, IsppStack, Windows;
+uses
+  SysUtils, Classes, ISPP.Stack, Windows;
 
 procedure WarningMsg(const Msg: string; const Args: array of const);
 var

Projects/Src/ISPP/IsppStack.pas → Projects/Src/ISPP.Stack.pas

@@ -8,7 +8,7 @@
   For conditions of distribution and use, see LICENSE.TXT.
 }
 
-unit IsppStack;
+unit ISPP.Stack;
 
 interface
 
@@ -49,7 +49,8 @@ type
 
 implementation
 
-uses IsppConsts;
+uses
+  ISPP.Consts;
 
 { TOrderedList }
 

Projects/Src/ISPP/IsppVarUtils.pas → Projects/Src/ISPP.VarUtils.pas

@@ -8,11 +8,12 @@
   For conditions of distribution and use, see LICENSE.TXT.
 }
 
-unit IsppVarUtils;
+unit ISPP.VarUtils;
 
 interface
 
-uses IsppIntf, IsppBase, IsppPreprocessor;
+uses
+  ISPP.Intf, ISPP.Base, ISPP.Preprocessor;
 
 function SimplifyLValue(var Src: TIsppVariant): Boolean;
 procedure MakeRValue(var Src: TIsppVariant);
@@ -30,7 +31,8 @@ const
 
 implementation
 
-uses SysUtils, IsppConsts;
+uses
+  SysUtils, ISPP.Consts;
 
 function SimplifyLValue(var Src: TIsppVariant): Boolean;
 begin

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

@@ -1,4 +1,4 @@
-unit DebugClient;
+unit Setup.DebugClient;
 
 {
   Inno Setup
@@ -12,7 +12,7 @@ unit DebugClient;
 interface
 
 uses
-  Windows, SysUtils, Messages, DebugStruct;
+  Windows, SysUtils, Messages, Shared.DebugStruct;
 
 var
   Debugging: Boolean;
@@ -36,7 +36,7 @@ procedure SetDebugServerWnd(Wnd: HWND; WantCodeText: Boolean);
 implementation
 
 uses
-  Forms, Classes, CmnFunc2, Struct, InstFunc, Main;
+  Forms, Classes, Shared.CommonFunc, Shared.Struct, Setup.InstFunc, Setup.MainForm;
 
 type
   TDummyClass = class

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

@@ -1,4 +1,4 @@
-unit DotNet;
+unit Setup.DotNetFunc;
 
 {
   Inno Setup
@@ -29,7 +29,7 @@ unit DotNet;
 interface
 
 uses
-  Ole2, SysUtils, Windows, CmnFunc2, DotNetVersion;
+  Ole2, SysUtils, Windows, Shared.CommonFunc, Shared.DotNetVersion;
 
 type
   IAssemblyCache = class(Ole2.IUnknown)
@@ -61,7 +61,7 @@ function IsDotNetInstalled(const RegView: TRegView; const MinVersion: TDotNetVer
 implementation
 
 uses
-  InstFunc, PathFunc;
+  Setup.InstFunc, PathFunc;
 
 var
   DotNetRoot: array [TRegView] of String;

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

@@ -1,4 +1,4 @@
-unit Extract;
+unit Setup.FileExtractor;
 
 {
   Inno Setup
@@ -6,13 +6,14 @@ unit Extract;
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
-  TFileExtractor class
+  TFileExtractor class to extract (=decrypt, decompress, and/or verify) Setup files
 }
 
 interface
 
 uses
-  Windows, SysUtils, Int64Em, FileClass, Compress, Struct, ArcFour;
+  Windows, SysUtils, Shared.Int64Em, Shared.FileClass, Compression.Base,
+  Shared.Struct, Shared.ArcFour;
 
 type
   TExtractorProgressProc = procedure(Bytes: Cardinal);
@@ -49,8 +50,9 @@ procedure FreeFileExtractor;
 implementation
 
 uses
-  PathFunc, CmnFunc2, Main, Msgs, MsgIDs, InstFunc, CompressZlib, bzlib,
-  LZMADecomp, SHA1, Logging, NewDisk;
+  PathFunc, Shared.CommonFunc, Setup.MainForm, Setup.Messages, Shared.SetupMessageIDs,
+  Setup.InstFunc, Compression.Zlib, Compression.bzlib,
+  Compression.LZMADecompressor, SHA1, Setup.LoggingFunc, Setup.NewDiskForm;
 
 var
   FFileExtractor: TFileExtractor;

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

@@ -1,4 +1,4 @@
-unit Helper;
+unit Setup.Helper;
 
 {
   Inno Setup
@@ -15,7 +15,7 @@ unit Helper;
 interface
 
 uses
-  Windows, SysUtils, Struct;
+  Windows, SysUtils, Shared.Struct;
 
 function GetHelperResourceName: String;
 function HelperGrantPermission(const AObjectType: DWORD;
@@ -31,8 +31,8 @@ implementation
 {x$DEFINE HELPERDEBUG}
 
 uses
-  Forms, Int64Em, CmnFunc, CmnFunc2, PathFunc, Main, InstFunc, Logging, Msgs,
-  MsgIDs;
+  Forms, Shared.Int64Em, Shared.CommonFunc.Vcl, Shared.CommonFunc, PathFunc, Setup.MainForm, Setup.InstFunc,
+  Setup.LoggingFunc, Setup.Messages, Shared.SetupMessageIDs;
 
 const
   HELPER_VERSION = 105;
@@ -111,7 +111,7 @@ var
 
 function GetHelperResourceName: String;
 begin
-  {$R HelperEXEs.res}
+  {$R Setup.HelperEXEs.res}
   if paX64 in MachineTypesSupportedBySystem then
     Result := 'HELPER_EXE_AMD64'
   else

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

@@ -1,4 +1,4 @@
-unit InstFnc2;
+unit Setup.InstFunc.Ole;
 
 {
   Inno Setup
@@ -23,7 +23,8 @@ function UnpinShellLink(const Filename: String): Boolean;
 implementation
 
 uses
-  Windows, SysUtils, PathFunc, CmnFunc2, InstFunc, Main, Msgs, MsgIDs,
+  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/InstFunc.pas → Projects/Src/Setup.InstFunc.pas

@@ -1,4 +1,4 @@
-unit InstFunc;
+unit Setup.InstFunc;
 
 {
   Inno Setup
@@ -6,13 +6,13 @@ unit 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
 
 uses
-  Windows, SysUtils, Struct, Int64Em, MD5, SHA1, CmnFunc2;
+  Windows, SysUtils, Shared.Struct, Shared.Int64Em, MD5, SHA1, Shared.CommonFunc;
 
 type
   PSimpleStringListArray = ^TSimpleStringListArray;
@@ -41,7 +41,7 @@ type
 
   TEnumFROFilenamesProc = procedure(const Filename: String; Param: Pointer);
 
-  { Must keep this in synch with ScriptFunc_C: }
+  { Must keep this in synch with Compiler.ScriptFunc.pas: }
   TExecWait = (ewNoWait, ewWaitUntilTerminated, ewWaitUntilIdle);
 
   TDetermineDefaultLanguageResult = (ddNoMatch, ddMatch, ddMatchLangParameter);
@@ -118,7 +118,7 @@ function ForceDirectories(const DisableFsRedir: Boolean; Dir: String): Boolean;
 implementation
 
 uses
-  Messages, ShellApi, PathFunc, Msgs, MsgIDs, FileClass, RedirFunc, 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/Install.pas → Projects/Src/Setup.Install.pas

@@ -1,4 +1,4 @@
-unit Install;
+unit Setup.Install;
 
 {
   Inno Setup
@@ -28,11 +28,12 @@ procedure SetDownloadCredentials(const User, Pass: String);
 implementation
 
 uses
-  Windows, SysUtils, Messages, Classes, Forms, ShlObj, Struct, Undo, SetupTypes,
-  InstFunc, InstFnc2, SecurityFunc, Msgs, Main, Logging, Extract, FileClass,
-  Compress, SHA1, PathFunc, CmnFunc, CmnFunc2, RedirFunc, Int64Em, MsgIDs,
-  Wizard, DebugStruct, DebugClient, VerInfo, ScriptRunner, RegDLL, Helper,
-  ResUpdate, DotNet, TaskbarProgressFunc, NewProgressBar, RestartManager,
+  Windows, SysUtils, Messages, Classes, Forms, ShlObj, Shared.Struct, Setup.UninstallLog, Shared.SetupTypes,
+  Setup.InstFunc, Setup.InstFunc.Ole, Setup.SecurityFunc, Setup.Messages,
+  Setup.MainForm, Setup.LoggingFunc, Setup.FileExtractor, Shared.FileClass,
+  Compression.Base, 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, TaskbarProgressFunc, NewProgressBar, RestartManager,
   Net.HTTPClient, Net.URLClient, NetEncoding, RegStr;
 
 type

Projects/Src/Setup/Logging.pas → Projects/Src/Setup.LoggingFunc.pas

@@ -1,4 +1,4 @@
-unit Logging;
+unit Setup.LoggingFunc;
 
 {
   Inno Setup
@@ -24,7 +24,7 @@ const
 implementation
 
 uses
-  Windows, SysUtils, Int64Em, CmnFunc2, FileClass, DebugClient;
+  Windows, SysUtils, Shared.Int64Em, Shared.CommonFunc, Shared.FileClass, Setup.DebugClient;
 
 var
   LogFile: TTextFileWriter;