ソースを参照

Merge branch 'main' into issigkeys

Martijn Laan 4 ヶ月 前
コミット
ebd3321ee0
7 ファイル変更8 行追加9 行削除
  1. 1 1
      ISHelp/isetup.xml
  2. 1 2
      Projects/Src/Compiler.SetupCompiler.pas
  3. 1 1
      Projects/Src/Shared.Struct.pas
  4. 1 1
      build-ce.bat
  5. 1 1
      build.bat
  6. 1 1
      setup.iss
  7. 2 2
      whatsnew.htm

+ 1 - 1
ISHelp/isetup.xml

@@ -104,7 +104,7 @@
 <body>
 <body>
 
 
 <p>
 <p>
-<b>Inno Setup version 6.4.3-dev</b><br/>
+<b>Inno Setup version 6.4.3</b><br/>
 <b>Copyright &copy; 1997-2025 Jordan Russell. All rights reserved.</b><br/>
 <b>Copyright &copy; 1997-2025 Jordan Russell. All rights reserved.</b><br/>
 <b>Portions Copyright &copy; 2000-2025 Martijn Laan. All rights reserved.</b><br/>
 <b>Portions Copyright &copy; 2000-2025 Martijn Laan. All rights reserved.</b><br/>
 <extlink href="https://jrsoftware.org/">Inno Setup home page</extlink>
 <extlink href="https://jrsoftware.org/">Inno Setup home page</extlink>

+ 1 - 2
Projects/Src/Compiler.SetupCompiler.pas

@@ -4953,8 +4953,7 @@ type
         end;
         end;
         if NewFileLocationEntry = nil then begin
         if NewFileLocationEntry = nil then begin
           NewFileLocationEntry := AllocMem(SizeOf(TSetupFileLocationEntry));
           NewFileLocationEntry := AllocMem(SizeOf(TSetupFileLocationEntry));
-          New(NewFileLocationEntryExtraInfo);
-          FillChar(NewFileLocationEntryExtraInfo^, SizeOf(TFileLocationEntryExtraInfo), 0);
+          NewFileLocationEntryExtraInfo := AllocMem(SizeOf(TFileLocationEntryExtraInfo));
           SetupHeader.CompressMethod := CompressMethod;
           SetupHeader.CompressMethod := CompressMethod;
           FileLocationEntries.Add(NewFileLocationEntry);
           FileLocationEntries.Add(NewFileLocationEntry);
           FileLocationEntryExtraInfos.Add(NewFileLocationEntryExtraInfo);
           FileLocationEntryExtraInfos.Add(NewFileLocationEntryExtraInfo);

+ 1 - 1
Projects/Src/Shared.Struct.pas

@@ -17,7 +17,7 @@ uses
 
 
 const
 const
   SetupTitle = 'Inno Setup';
   SetupTitle = 'Inno Setup';
-  SetupVersion = '6.4.3-dev';
+  SetupVersion = '6.4.3';
   SetupBinVersion = (6 shl 24) + (4 shl 16) + (3 shl 8) + 0;
   SetupBinVersion = (6 shl 24) + (4 shl 16) + (3 shl 8) + 0;
 
 
 type
 type

+ 1 - 1
build-ce.bat

@@ -19,7 +19,7 @@ rem  Once done the installer can be found in Output
 
 
 setlocal
 setlocal
 
 
-set VER=6.4.3-dev
+set VER=6.4.3
 
 
 echo Building Inno Setup %VER%...
 echo Building Inno Setup %VER%...
 echo.
 echo.

+ 1 - 1
build.bat

@@ -20,7 +20,7 @@ rem  Once done the installer can be found in Output
 
 
 setlocal
 setlocal
 
 
-set VER=6.4.3-dev
+set VER=6.4.3
 
 
 echo Building Inno Setup %VER%...
 echo Building Inno Setup %VER%...
 echo.
 echo.

+ 1 - 1
setup.iss

@@ -13,7 +13,7 @@
 [Setup]
 [Setup]
 AppName=Inno Setup
 AppName=Inno Setup
 AppId={code:GetAppId|Inno Setup 6}
 AppId={code:GetAppId|Inno Setup 6}
-AppVersion=6.4.3-dev
+AppVersion=6.4.3
 AppPublisher=jrsoftware.org
 AppPublisher=jrsoftware.org
 AppPublisherURL=https://www.innosetup.com/
 AppPublisherURL=https://www.innosetup.com/
 AppSupportURL=https://www.innosetup.com/
 AppSupportURL=https://www.innosetup.com/

+ 2 - 2
whatsnew.htm

@@ -29,10 +29,10 @@ For conditions of distribution and use, see <a href="files/is/license.txt">LICEN
 
 
 <p><b>Want to be notified by e-mail of new Inno Setup releases?</b> <a href="ismail.php">Subscribe</a> to the Inno Setup Mailing List!</p>
 <p><b>Want to be notified by e-mail of new Inno Setup releases?</b> <a href="ismail.php">Subscribe</a> to the Inno Setup Mailing List!</p>
 
 
-<p><a name="6.4.3"></a><span class="ver">6.4.3-dev </span><span class="date">(?)</span></p>
+<p><a name="6.4.3"></a><span class="ver">6.4.3 </span><span class="date">(2025-05-03)</span></p>
 <ul>
 <ul>
   <li>Compiler IDE change: The editor now restores selections on undo and redo.</li>
   <li>Compiler IDE change: The editor now restores selections on undo and redo.</li>
-  <li>Inno Setup now includes a new command-line tool, ISSigTool.exe. This tool is designed to sign files using ECDSA P-256 cryptographic signatures. Compil32, ISCC, and ISCmplr use these signatures to verify a number of DLL files before loading them.<br />Note: ISSigTool.exe does not replace Microsoft's signtool.exe in any way and is in fact not related to Authenticode Code Signing at all.</li>
+  <li>Inno Setup now includes a new command-line tool, ISSigTool.exe. This tool is designed to sign files using ECDSA P-256 cryptographic signatures. Compil32, ISCC, and ISCmplr use these signatures to verify a number of DLL files before loading them. This is a &quot;technology preview&quot; that is subject to change (e.g., any signatures you create now may have to be recreated when upgrading to the next version).<br />Note: ISSigTool.exe does not replace Microsoft's signtool.exe in any way and is in fact not related to Authenticode Code Signing at all.</li>
   <li><i>Fix:</i> Autocomplete support for parameter names in the <tt>[Components]</tt> and <tt>[Dirs]</tt> sections was broken since 6.1.1.</li>
   <li><i>Fix:</i> Autocomplete support for parameter names in the <tt>[Components]</tt> and <tt>[Dirs]</tt> sections was broken since 6.1.1.</li>
   <li><i>Fix:</i> Pascal Scripting support function <tt>Extract7ZipArchive</tt> which was introduced by 6.4.0 would fail with error 11 on older versions of Windows, at least Windows 8.1 and Windows Server 2016.</li>
   <li><i>Fix:</i> Pascal Scripting support function <tt>Extract7ZipArchive</tt> which was introduced by 6.4.0 would fail with error 11 on older versions of Windows, at least Windows 8.1 and Windows Server 2016.</li>
   <li>Minor tweaks and documentation improvements.</li>
   <li>Minor tweaks and documentation improvements.</li>