Cherry pick from is-6_3_3: Stop stripping relocations because it breaks ASLR. Remove old comments. Update whatsnew.

martijnlaan · martijnlaan · commit f85c584f9ebf · 2024-07-12T09:37:15.000+02:00
diff --git a/ISHelp/isetup.xml b/ISHelp/isetup.xml
@@ -5523,7 +5523,7 @@ ArchitecturesInstallIn64BitMode=x64compatible
 <setupvalid><link topic="yesnonotes"><tt>yes</tt> or <tt>no</tt></link></setupvalid>
 <setupdefault><tt>yes</tt></setupdefault>
 <body>
-<p>Specifies whether the compiler should set the "Terminal Services aware" flag in the headers of the Setup and Uninstall programs. This feature is new to version 5.1.7 and defaults to <tt>yes</tt>; previous versions never set the flag.</p>
+<p>Specifies whether the compiler should set the "Terminal Services aware" flag in the headers of the Setup and Uninstall programs.</p>
 <p>Most importantly, the "Terminal Services aware" flag affects the behavior of the {win} constant (and <link topic="isxfunc_GetWinDir">GetWinDir</link> support function) on servers with Terminal Services installed in application mode.</p>
 <p>When the flag is set, {win} will consistently return the system's real Windows directory, typically "C:\WINDOWS", just as on systems that do not have Terminal Services installed.</p>
 <p>When the flag is not set, Windows runs the program in compatibility mode, where {win} may return either the real Windows directory or a user-specific Windows directory, such as "C:\Documents and Settings\&lt;user name&gt;\WINDOWS". Which one you get depends on the name of the program's EXE file and how it is launched. If the program is named setup.exe or install.exe, or if it is launched from the <i>Add/Remove Programs</i> Control Panel applet, then Windows will put the system in "install mode", which effectively makes the program (and all other programs running in the session) behave as if the "Terminal Services aware" flag were set. Otherwise, the program is treated as a legacy application and is given a private Windows directory. (This is true even if the user running the program has full administrative privileges.)</p>
@@ -5535,7 +5535,7 @@ ArchitecturesInstallIn64BitMode=x64compatible
 <setupvalid><link topic="yesnonotes"><tt>yes</tt> or <tt>no</tt></link></setupvalid>
 <setupdefault><tt>yes</tt></setupdefault>
 <body>
-<p>Specifies whether the compiler should set the "NX Compatible" flag in the headers of the Setup and Uninstall programs to mark them compatible with data execution prevention (DEP). This feature is new to version 5.5.7 and defaults to <tt>yes</tt>; previous versions never set the flag.</p>
+<p>Specifies whether the compiler should set the "NX Compatible" flag in the headers of the Setup and Uninstall programs to mark them compatible with data execution prevention (DEP).</p>
 <p>Setting this to <tt>no</tt> might be needed if you're using a buggy third-party DLL from [Code].</p>
 </body>
 </setuptopic>
@@ -5544,7 +5544,7 @@ ArchitecturesInstallIn64BitMode=x64compatible
 <setupvalid><link topic="yesnonotes"><tt>yes</tt> or <tt>no</tt></link></setupvalid>
 <setupdefault><tt>yes</tt></setupdefault>
 <body>
-<p>Specifies whether the compiler should set the "Dynamic Base" flag in the headers of the Setup and Uninstall programs. This feature is new to version 5.5.7 and defaults to <tt>yes</tt>; previous versions never set the flag.</p>
+<p>Specifies whether the compiler should set the "Dynamic Base" flag in the headers of the Setup and Uninstall programs.</p>
 </body>
 </setuptopic>
 
diff --git a/Projects/Compil32.dpr b/Projects/Compil32.dpr
@@ -63,7 +63,6 @@ uses
   IsscintInt in 'Src\Compil32\IsscintInt.pas',
   ScriptFunc in 'Src\ScriptFunc.pas';
 
-{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}
 {$SETPEOSVERSION 6.1}
 {$SETPESUBSYSVERSION 6.1}
 {$WEAKLINKRTTI ON}
diff --git a/Projects/ISCC.dpr b/Projects/ISCC.dpr
@@ -27,7 +27,6 @@ uses
   CompTypes in 'Src\CompTypes.pas',
   Int64Em in 'Src\Int64Em.pas';
 
-{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}
 {$SETPEOSVERSION 6.1}
 {$SETPESUBSYSVERSION 6.1}
 {$WEAKLINKRTTI ON}
diff --git a/Projects/Setup.dpr b/Projects/Setup.dpr
@@ -89,7 +89,6 @@ uses
   DotNetVersion in 'Src\DotNetVersion.pas',
   NewUxTheme in '..\Components\NewUxTheme.pas';
 
-{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}
 {$SETPEOSVERSION 6.1}
 {$SETPESUBSYSVERSION 6.1}
 {$WEAKLINKRTTI ON}
diff --git a/Projects/SetupLdr.dpr b/Projects/SetupLdr.dpr
@@ -32,7 +32,6 @@ uses
   SetupTypes in 'Src\SetupTypes.pas',
   VerInfo in 'Src\VerInfo.pas';
 
-{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}
 {$SETPEOSVERSION 6.1}
 {$SETPESUBSYSVERSION 6.1}
 {$WEAKLINKRTTI ON}
diff --git a/Projects/Src/ISCmplr/CompExeUpdate.pas b/Projects/Src/ISCmplr/CompExeUpdate.pas
@@ -85,9 +85,6 @@ procedure UpdateSetupPEHeaderFields(const F: TCustomFile;
             DllChars := DllChars or IMAGE_DLLCHARACTERISTICS_NX_COMPAT
           else
             DllChars := DllChars and not IMAGE_DLLCHARACTERISTICS_NX_COMPAT;
-          { Note: because we stripped relocations from Setup(Ldr).e32 during
-            compilation IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE won't actually
-            enable ASLR, but allow setting it anyway to make checkers happy. }
           if IsASLRCompatible then
             DllChars := DllChars or IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE
           else
diff --git a/whatsnew.htm b/whatsnew.htm
@@ -83,6 +83,11 @@
 
 <p>Contributions via <a href="https://github.com/jrsoftware/issrc" target="_blank">GitHub</a>: Thanks to Sergii Leonov, John Stevenson, and jogo- for their contributions!</p>
 
+<p><a name="6.3.3"></a><span class="ver">6.3.3 </span><span class="date">(2024-07-12)</span></p>
+<ul>
+  <li>Improved support for ASLR.</li>
+</ul>
+
 <p><a name="6.3.2"></a><span class="ver">6.3.2 </span><span class="date">(2024-06-28)</span></p>
 <ul>
   <li>Pascal Scripting change: Fixed support function <tt>TStream.Seek</tt>.</li>
