SetupLdrAndSetup unit scope -> Shared. Do keep them in separate dir to avoid accidental extra sharing.

Projects/Setup.dpr

@@ -11,7 +11,7 @@ program Setup;
 
 uses
   Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
-  SetupLdrAndSetup.XPTheme in 'Src\SetupLdrAndSetup\SetupLdrAndSetup.XPTheme.pas',
+  Shared.XPTheme in 'Src\SetupLdrAndSetup\Shared.XPTheme.pas',
   Forms,
   Windows,
   SysUtils,
@@ -21,12 +21,12 @@ uses
   Shared.CmnFunc2 in 'Src\Shared.CmnFunc2.pas',
   Setup.MainForm in 'Src\Setup\Setup.MainForm.pas' {MainForm},
   Setup.Install in 'Src\Setup\Setup.Install.pas',
-  SetupLdrAndSetup.Messages in 'Src\SetupLdrAndSetup\SetupLdrAndSetup.Messages.pas',
+  Shared.Messages in 'Src\SetupLdrAndSetup\Shared.Messages.pas',
   Shared.MsgIDs in 'Src\Shared.MsgIDs.pas',
   Setup.UninstallLog in 'Src\Setup\Setup.UninstallLog.pas',
   Shared.Struct in 'Src\Shared.Struct.pas',
   Setup.NewDiskForm in 'Src\Setup\Setup.NewDiskForm.pas' {NewDiskForm},
-  SetupLdrAndSetup.InstFunc in 'Src\SetupLdrAndSetup\SetupLdrAndSetup.InstFunc.pas',
+  Shared.InstFunc in 'Src\SetupLdrAndSetup\Shared.InstFunc.pas',
   Setup.InstFnc2 in 'Src\Setup\Setup.InstFnc2.pas',
   Setup.WizardForm in 'Src\Setup\Setup.WizardForm.pas' {WizardForm},
   Setup.ScriptFunc in 'Src\Setup\Setup.ScriptFunc.pas',
@@ -58,7 +58,7 @@ uses
   Setup.SetupForm in 'Src\Setup\Setup.SetupForm.pas',
   Setup.RegSvr in 'Src\Setup\Setup.RegSvr.pas',
   Shared.BrowseFunc in 'Src\Shared.BrowseFunc.pas',
-  SetupLdrAndSetup.RedirFunc in 'Src\SetupLdrAndSetup\SetupLdrAndSetup.RedirFunc.pas',
+  Shared.RedirFunc in 'Src\SetupLdrAndSetup\Shared.RedirFunc.pas',
   Setup.SecurityFunc in 'Src\Setup\Setup.SecurityFunc.pas',
   Setup.Helper in 'Src\Setup\Setup.Helper.pas',
   Shared.VerInfo in 'Src\Shared.VerInfo.pas',

Projects/Setup.dproj

@@ -74,7 +74,7 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\SetupLdrAndSetup.XPTheme.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\Shared.XPTheme.pas"/>
         <DCCReference Include="..\Components\RichEditViewer.pas"/>
         <DCCReference Include="Src\Shared.CmnFunc.pas"/>
         <DCCReference Include="Src\Shared.CmnFunc2.pas"/>
@@ -82,14 +82,14 @@
             <Form>MainForm</Form>
         </DCCReference>
         <DCCReference Include="Src\Setup\Setup.Install.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\SetupLdrAndSetup.Messages.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\Shared.Messages.pas"/>
         <DCCReference Include="Src\Shared.MsgIDs.pas"/>
         <DCCReference Include="Src\Setup\Setup.UninstallLog.pas"/>
         <DCCReference Include="Src\Shared.Struct.pas"/>
         <DCCReference Include="Src\Setup\Setup.NewDiskForm.pas">
             <Form>NewDiskForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\SetupLdrAndSetup\SetupLdrAndSetup.InstFunc.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\Shared.InstFunc.pas"/>
         <DCCReference Include="Src\Setup\Setup.InstFnc2.pas"/>
         <DCCReference Include="Src\Setup\Setup.WizardForm.pas">
             <Form>WizardForm</Form>
@@ -131,7 +131,7 @@
         <DCCReference Include="Src\Setup\Setup.SetupForm.pas"/>
         <DCCReference Include="Src\Setup\Setup.RegSvr.pas"/>
         <DCCReference Include="Src\Shared.BrowseFunc.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\SetupLdrAndSetup.RedirFunc.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\Shared.RedirFunc.pas"/>
         <DCCReference Include="Src\Setup\Setup.SecurityFunc.pas"/>
         <DCCReference Include="Src\Setup\Setup.Helper.pas"/>
         <DCCReference Include="Src\Shared.VerInfo.pas"/>

Projects/SetupLdr.dpr

@@ -11,7 +11,7 @@ program SetupLdr;
 
 uses
   Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
-  SetupLdrAndSetup.XPTheme in 'Src\SetupLdrAndSetup\SetupLdrAndSetup.XPTheme.pas',
+  Shared.XPTheme in 'Src\SetupLdrAndSetup\Shared.XPTheme.pas',
   Windows,
   Messages,
   SysUtils,
@@ -20,15 +20,15 @@ uses
   Shared.SetupEnt in 'Src\Shared.SetupEnt.pas',
   PathFunc in '..\Components\PathFunc.pas',
   Shared.CmnFunc2 in 'Src\Shared.CmnFunc2.pas',
-  SetupLdrAndSetup.Messages in 'Src\SetupLdrAndSetup\SetupLdrAndSetup.Messages.pas',
+  Shared.Messages in 'Src\SetupLdrAndSetup\Shared.Messages.pas',
   Shared.MsgIDs in 'Src\Shared.MsgIDs.pas',
   Shared.Struct in 'Src\Shared.Struct.pas',
-  SetupLdrAndSetup.InstFunc in 'Src\SetupLdrAndSetup\SetupLdrAndSetup.InstFunc.pas',
+  Shared.InstFunc in 'Src\SetupLdrAndSetup\Shared.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',
-  SetupLdrAndSetup.RedirFunc in 'Src\SetupLdrAndSetup\SetupLdrAndSetup.RedirFunc.pas',
+  Shared.RedirFunc in 'Src\SetupLdrAndSetup\Shared.RedirFunc.pas',
   Shared.SetupTypes in 'Src\Shared.SetupTypes.pas',
   Shared.VerInfo in 'Src\Shared.VerInfo.pas';
 

Projects/SetupLdr.dproj

@@ -71,21 +71,21 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\SetupLdrAndSetup.XPTheme.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\Shared.XPTheme.pas"/>
         <DCCReference Include="Src\Shared.Compress.pas"/>
         <DCCReference Include="Src\SetupLdr\SetupLdr.LZMA1SmallDecompressor.pas"/>
         <DCCReference Include="Src\Shared.SetupEnt.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
         <DCCReference Include="Src\Shared.CmnFunc2.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\SetupLdrAndSetup.Messages.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\Shared.Messages.pas"/>
         <DCCReference Include="Src\Shared.MsgIDs.pas"/>
         <DCCReference Include="Src\Shared.Struct.pas"/>
-        <DCCReference Include="Src\SetupLdrAndSetup\SetupLdrAndSetup.InstFunc.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\Shared.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\SetupLdrAndSetup.RedirFunc.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\Shared.RedirFunc.pas"/>
         <DCCReference Include="Src\Shared.SetupTypes.pas"/>
         <DCCReference Include="Src\Shared.VerInfo.pas"/>
         <BuildConfiguration Include="Base">

Projects/Src/Setup/Setup.DebugClient.pas

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

Projects/Src/Setup/Setup.DotNetFunc.pas

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

Projects/Src/Setup/Setup.FileExtractor.pas

@@ -50,8 +50,8 @@ procedure FreeFileExtractor;
 implementation
 
 uses
-  PathFunc, Shared.CmnFunc2, Setup.MainForm, SetupLdrAndSetup.Messages, Shared.MsgIDs,
-  SetupLdrAndSetup.InstFunc, Shared.CompressZlib, Shared.bzlib,
+  PathFunc, Shared.CmnFunc2, Setup.MainForm, Shared.Messages, Shared.MsgIDs,
+  Shared.InstFunc, Shared.CompressZlib, Shared.bzlib,
   Setup.LZMADecompressor, SHA1, Setup.LoggingFunc, Setup.NewDiskForm;
 
 var

Projects/Src/Setup/Setup.Helper.pas

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

Projects/Src/Setup/Setup.InstFnc2.pas

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

Projects/Src/Setup/Setup.Install.pas

@@ -29,9 +29,9 @@ implementation
 
 uses
   Windows, SysUtils, Messages, Classes, Forms, ShlObj, Shared.Struct, Setup.UninstallLog, Shared.SetupTypes,
-  SetupLdrAndSetup.InstFunc, Setup.InstFnc2, Setup.SecurityFunc, SetupLdrAndSetup.Messages,
+  Shared.InstFunc, Setup.InstFnc2, Setup.SecurityFunc, Shared.Messages,
   Setup.MainForm, Setup.LoggingFunc, Setup.FileExtractor, Shared.FileClass,
-  Shared.Compress, SHA1, PathFunc, Shared.CmnFunc, Shared.CmnFunc2, SetupLdrAndSetup.RedirFunc, Shared.Int64Em, Shared.MsgIDs,
+  Shared.Compress, SHA1, PathFunc, Shared.CmnFunc, Shared.CmnFunc2, Shared.RedirFunc, Shared.Int64Em, Shared.MsgIDs,
   Setup.WizardForm, Shared.DebugStruct, Setup.DebugClient, Shared.VerInfo, Setup.ScriptRunner, Setup.RegDLL, Setup.Helper,
   Shared.ResUpdate, Setup.DotNetFunc, Shared.TaskbarProgressFunc, NewProgressBar, RestartManager,
   Net.HTTPClient, Net.URLClient, NetEncoding, RegStr;

Projects/Src/Setup/Setup.MainForm.pas

@@ -267,7 +267,7 @@ implementation
 
 uses
   ShellAPI, ShlObj, StrUtils,
-  SetupLdrAndSetup.Messages, Shared.MsgIDs, Setup.Install, SetupLdrAndSetup.InstFunc, Setup.InstFnc2, SetupLdrAndSetup.RedirFunc, PathFunc,
+  Shared.Messages, Shared.MsgIDs, Setup.Install, Shared.InstFunc, Setup.InstFnc2, Shared.RedirFunc, PathFunc,
   Shared.Compress, Shared.CompressZlib, Shared.bzlib, Setup.LZMADecompressor, Shared.ArcFour, Shared.SetupEnt, Setup.SelectLanguageForm,
   Setup.WizardForm, Setup.DebugClient, Shared.VerInfo, Setup.FileExtractor, Shared.FileClass, Setup.LoggingFunc, MD5, SHA1, ActiveX,
   Shared.SimpleExpression, Setup.Helper, Setup.SpawnClient, Setup.SpawnServer, Setup.DotNetFunc, BitmapImage,

Projects/Src/Setup/Setup.NewDiskForm.pas

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

Projects/Src/Setup/Setup.RegDLL.pas

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

Projects/Src/Setup/Setup.RegSvr.pas

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

Projects/Src/Setup/Setup.ScriptDlg.pas

@@ -201,9 +201,9 @@ implementation
 
 uses
   StrUtils,
-  Shared.Struct, Setup.MainForm, Setup.SelectFolderForm, SetupLdrAndSetup.Messages,
+  Shared.Struct, Setup.MainForm, Setup.SelectFolderForm, Shared.Messages,
   Shared.MsgIDs, PathFunc, Shared.CmnFunc, Shared.CmnFunc2,
-  Shared.BrowseFunc, Setup.LoggingFunc, SetupLdrAndSetup.InstFunc;
+  Shared.BrowseFunc, Setup.LoggingFunc, Shared.InstFunc;
 
 const
   DefaultLabelHeight = 14;

Projects/Src/Setup/Setup.ScriptFunc.pas

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

Projects/Src/Setup/Setup.SecurityFunc.pas

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

Projects/Src/Setup/Setup.SelectFolderForm.pas

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

Projects/Src/Setup/Setup.SelectLanguageForm.pas

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

Projects/Src/Setup/Setup.SetupForm.pas

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

Projects/Src/Setup/Setup.SpawnClient.pas

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

Projects/Src/Setup/Setup.SpawnServer.pas

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

Projects/Src/Setup/Setup.Uninstall.pas

@@ -17,8 +17,8 @@ procedure HandleUninstallerEndSession;
 implementation
 
 uses
-  Windows, SysUtils, Messages, Forms, PathFunc, Shared.CmnFunc, Shared.CmnFunc2, Setup.UninstallLog, SetupLdrAndSetup.Messages,
-  Shared.MsgIDs, SetupLdrAndSetup.InstFunc, Shared.Struct, Shared.SetupEnt, Setup.UninstallProgressForm, Setup.UninstallSharedFileForm,
+  Windows, SysUtils, Messages, Forms, PathFunc, Shared.CmnFunc, Shared.CmnFunc2, Setup.UninstallLog, Shared.Messages,
+  Shared.MsgIDs, Shared.InstFunc, Shared.Struct, Shared.SetupEnt, Setup.UninstallProgressForm, Setup.UninstallSharedFileForm,
   Shared.FileClass, Setup.ScriptRunner, Setup.DebugClient, Shared.SetupTypes, Setup.LoggingFunc, Setup.MainForm,
   Setup.SpawnServer;
 

Projects/Src/Setup/Setup.UninstallLog.pas

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

Projects/Src/Setup/Setup.UninstallProgressForm.pas

@@ -65,7 +65,7 @@ var
 implementation
 
 uses
-  Shared.TaskbarProgressFunc, Setup.MainForm, SetupLdrAndSetup.Messages,
+  Shared.TaskbarProgressFunc, Setup.MainForm, Shared.Messages,
   Shared.MsgIDs, Shared.CmnFunc;
 
 {$R *.DFM}

Projects/Src/Setup/Setup.UninstallSharedFileForm.pas

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

Projects/Src/Setup/Setup.WizardForm.pas

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

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

@@ -1,4 +1,4 @@
-unit SetupLdrAndSetup.InstFunc;
+unit Shared.InstFunc;
 
 {
   Inno Setup
@@ -118,7 +118,7 @@ function ForceDirectories(const DisableFsRedir: Boolean; Dir: String): Boolean;
 implementation
 
 uses
-  Messages, ShellApi, PathFunc, SetupLdrAndSetup.Messages, Shared.MsgIDs, Shared.FileClass, SetupLdrAndSetup.RedirFunc, Shared.SetupTypes,
+  Messages, ShellApi, PathFunc, Shared.Messages, Shared.MsgIDs, Shared.FileClass, Shared.RedirFunc, Shared.SetupTypes,
   Hash, Classes, RegStr, Math;
 
 procedure InternalError(const Id: String);

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

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

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

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

Projects/Src/SetupLdrAndSetup/SetupLdrAndSetup.XPTheme.pas → Projects/Src/SetupLdrAndSetup/Shared.XPTheme.pas

@@ -1,4 +1,4 @@
-unit SetupLdrAndSetup.XPTheme;
+unit Shared.XPTheme;
 
 {
   Inno Setup
@@ -16,7 +16,7 @@ interface
 
 implementation
 
-{$R SetupLdrAndSetup.XPTheme.res}
+{$R Shared.XPTheme.res}
 
 uses
   Windows;

Projects/Src/Shared.TaskDialog.pas

@@ -20,7 +20,7 @@ implementation
 
 uses
   Classes, StrUtils, Math, Forms, Dialogs, SysUtils,
-  Commctrl, Shared.CmnFunc2, {$IFDEF SETUPPROJ} SetupLdrAndSetup.InstFunc, {$ENDIF} PathFunc;
+  Commctrl, Shared.CmnFunc2, {$IFDEF SETUPPROJ} Shared.InstFunc, {$ENDIF} PathFunc;
 
 var
   TaskDialogIndirectFunc: function(const pTaskConfig: TTaskDialogConfig;