Rename/group the compression units. Stop using Compression.Base (Shared.Compress) in Compil32.

Projects/Compil32.dpr

@@ -56,7 +56,6 @@ uses
   Shared.SignToolsFunc in 'Src\Shared.SignToolsFunc.pas',
   Shared.FileClass in 'Src\Shared.FileClass.pas',
   Shared.Int64Em in 'Src\Shared.Int64Em.pas',
-  Shared.Compress in 'Src\Shared.Compress.pas',
   Shared.TaskDialogFunc in 'Src\Shared.TaskDialogFunc.pas',
   IDE.RegistryDesignerForm in 'Src\IDE.RegistryDesignerForm.pas' {RegistryDesignerForm},
   IDE.Wizard.WizardFormRegistryHelper in 'Src\IDE.Wizard.WizardFormRegistryHelper.pas',

Projects/Compil32.dproj

@@ -134,7 +134,6 @@
         <DCCReference Include="Src\Shared.SignToolsFunc.pas"/>
         <DCCReference Include="Src\Shared.FileClass.pas"/>
         <DCCReference Include="Src\Shared.Int64Em.pas"/>
-        <DCCReference Include="Src\Shared.Compress.pas"/>
         <DCCReference Include="Src\Shared.TaskDialogFunc.pas"/>
         <DCCReference Include="Src\IDE.RegistryDesignerForm.pas">
             <Form>RegistryDesignerForm</Form>

Projects/ISCmplr.dpr

@@ -23,10 +23,10 @@ uses
   Compiler.ScriptClasses in 'Src\Compiler.ScriptClasses.pas',
   Shared.ResUpdateFunc in 'Src\Shared.ResUpdateFunc.pas',
   Compiler.ExeUpdateFunc in 'Src\Compiler.ExeUpdateFunc.pas',
-  Shared.Compress in 'Src\Shared.Compress.pas',
-  Shared.Compress.Zlib in 'Src\Shared.Compress.Zlib.pas',
-  Shared.Compress.bzlib in 'Src\Shared.Compress.bzlib.pas',
-  Compiler.LZMACompressor in 'Src\Compiler.LZMACompressor.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',

Projects/ISCmplr.dproj

@@ -89,10 +89,10 @@
         <DCCReference Include="Src\Compiler.ScriptClasses.pas"/>
         <DCCReference Include="Src\Shared.ResUpdateFunc.pas"/>
         <DCCReference Include="Src\Compiler.ExeUpdateFunc.pas"/>
-        <DCCReference Include="Src\Shared.Compress.pas"/>
-        <DCCReference Include="Src\Shared.Compress.Zlib.pas"/>
-        <DCCReference Include="Src\Shared.Compress.bzlib.pas"/>
-        <DCCReference Include="Src\Compiler.LZMACompressor.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"/>

Projects/Setup.dpr

@@ -39,10 +39,10 @@ uses
   Setup.FileExtractor in 'Src\Setup.FileExtractor.pas',
   Shared.Int64Em in 'Src\Shared.Int64Em.pas',
   Setup.SelectFolderForm in 'Src\Setup.SelectFolderForm.pas' {SelectFolderForm},
-  Shared.Compress in 'Src\Shared.Compress.pas',
-  Shared.Compress.Zlib in 'Src\Shared.Compress.Zlib.pas',
-  Shared.Compress.bzlib in 'Src\Shared.Compress.bzlib.pas',
-  Setup.LZMADecompressor in 'Src\Setup.LZMADecompressor.pas',
+  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',

Projects/Setup.dproj

@@ -108,10 +108,10 @@
         <DCCReference Include="Src\Setup.SelectFolderForm.pas">
             <Form>SelectFolderForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Shared.Compress.pas"/>
-        <DCCReference Include="Src\Shared.Compress.Zlib.pas"/>
-        <DCCReference Include="Src\Shared.Compress.bzlib.pas"/>
-        <DCCReference Include="Src\Setup.LZMADecompressor.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"/>

Projects/SetupLdr.dpr

@@ -15,8 +15,8 @@ uses
   Windows,
   Messages,
   SysUtils,
-  Shared.Compress in 'Src\Shared.Compress.pas',
-  SetupLdr.LZMA1SmallDecompressor in 'Src\SetupLdr.LZMA1SmallDecompressor.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',
   Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',

Projects/SetupLdr.dproj

@@ -72,8 +72,8 @@
         </DelphiCompile>
         <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
         <DCCReference Include="Src\Setup.XPTheme.pas"/>
-        <DCCReference Include="Src\Shared.Compress.pas"/>
-        <DCCReference Include="Src\SetupLdr.LZMA1SmallDecompressor.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\Shared.CommonFunc.pas"/>

Projects/Src/Compiler.Compile.pas

@@ -33,7 +33,7 @@ uses
   Shared.PreprocInt, Commctrl, Consts, Classes, IniFiles, TypInfo, AnsiStrings, Math,
   Generics.Collections, StrUtils, WideStrUtils,
   PathFunc, Shared.CommonFunc, Shared.Struct, Shared.Int64Em, Compiler.Messages, Shared.SetupEntFunc,
-  Shared.FileClass, Shared.Compress, Shared.Compress.Zlib, Shared.Compress.bzlib, Compiler.LZMACompressor, Shared.ArcFour, SHA1,
+  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,

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

@@ -1,4 +1,4 @@
-unit Shared.Compress;
+unit Compression.Base;
 
 {
   Inno Setup

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

@@ -1,4 +1,4 @@
-unit SetupLdr.LZMA1SmallDecompressor;
+unit Compression.LZMA1SmallDecompressor;
 
 {
   Inno Setup
@@ -13,7 +13,7 @@ unit SetupLdr.LZMA1SmallDecompressor;
 interface
 
 uses
-  Windows, SysUtils, Shared.Compress, Shared.Int64Em;
+  Windows, SysUtils, Compression.Base, Shared.Int64Em;
 
 type
   { Internally-used record }

Projects/Src/Compiler.LZMACompressor.pas → Projects/Src/Compression.LZMACompressor.pas

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

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

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

Projects/Src/Shared.Compress.Zlib.pas → Projects/Src/Compression.Zlib.pas

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

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

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

Projects/Src/Setup.FileExtractor.pas

@@ -12,7 +12,7 @@ unit Setup.FileExtractor;
 interface
 
 uses
-  Windows, SysUtils, Shared.Int64Em, Shared.FileClass, Shared.Compress,
+  Windows, SysUtils, Shared.Int64Em, Shared.FileClass, Compression.Base,
   Shared.Struct, Shared.ArcFour;
 
 type
@@ -51,8 +51,8 @@ implementation
 
 uses
   PathFunc, Shared.CommonFunc, Setup.MainForm, Setup.Messages, Shared.SetupMessageIDs,
-  Setup.InstFunc, Shared.Compress.Zlib, Shared.Compress.bzlib,
-  Setup.LZMADecompressor, SHA1, Setup.LoggingFunc, Setup.NewDiskForm;
+  Setup.InstFunc, Compression.Zlib, Compression.bzlib,
+  Compression.LZMADecompressor, SHA1, Setup.LoggingFunc, Setup.NewDiskForm;
 
 var
   FFileExtractor: TFileExtractor;

Projects/Src/Setup.Install.pas

@@ -31,7 +31,7 @@ uses
   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,
-  Shared.Compress, SHA1, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Setup.RedirFunc, Shared.Int64Em, Shared.SetupMessageIDs,
+  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, Shared.TaskbarProgressFunc, NewProgressBar, RestartManager,
   Net.HTTPClient, Net.URLClient, NetEncoding, RegStr;

Projects/Src/Setup.MainForm.pas

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

Projects/Src/Setup.Messages.pas

@@ -51,7 +51,7 @@ const
 implementation
 
 uses
-  Windows, SysUtils, Shared.Compress, Shared.CommonFunc, Shared.FileClass;
+  Windows, SysUtils, Compression.Base, Shared.CommonFunc, Shared.FileClass;
 
 const
   SMsgsFileTooLarge = 'Internal error: Messages file is too large';

Projects/Src/Setup.UninstallLog.pas

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

Projects/Src/SetupLdr/LzmaDecode/LzmaDecodeInno.c

@@ -1,6 +1,6 @@
 /*
   LzmaDecodeInno.c = LzmaDecodeSize.c + additional helper functions used by
-  Inno Setup's SetupLdr.LZMA1SmallDecompressor.pas
+  Inno Setup's Compression.LZMA1SmallDecompressor.pas
 */
 
 #include "LzmaDecodeSize.c"

Projects/Src/Shared.SetupEntFunc.pas

@@ -12,7 +12,7 @@ unit Shared.SetupEntFunc;
 interface
 
 uses
-  Shared.Compress;
+  Compression.Base;
 
 procedure SEFreeRec(const P: Pointer; const NumStrings, NumAnsiStrings: Integer);
 procedure SEDuplicateRec(OldP, NewP: Pointer; Bytes: Cardinal;