首页 发现 帮助
登录
pascal
/
innosetup
镜像自地址 https://github.com/jrsoftware/issrc.git
2
0
派生 0
文件 工单管理 0 Wiki
浏览代码

Merge branch 'main' into issigkeys

Martijn Laan 4 月之前
父节点
8ccedcf829 47df9c7575
当前提交
fb5ea335af
共有 10 个文件被更改，包括 135 次插入 和 89 次删除
合并视图 显示文件统计
  1. 3 1
      Components/Lzma2/Util/7z/7zMain.c
  2. 4 4
      Files/Languages/Unofficial/Basque.isl
  3. 1 1
      ISHelp/isetup.xml
  4. 1 1
      ISHelp/ispp.dtd
  5. 70 62
      ISHelp/ispp.xml
  6. 2 2
      ISHelp/ispp.xsl
  7. 51 17
      Projects/ISSigTool.dpr
  8. 二进制
      Projects/Src/Compression.SevenZipDecoder/7zDecode/IS7zDec.obj
  9. 1 0
      Projects/Src/Shared.TaskDialogFunc.pas
  10. 2 1
      whatsnew.htm

+ 3 - 1
Components/Lzma2/Util/7z/7zMain.c
查看文件 

@@ -194,8 +194,10 @@ static SRes Utf16_To_Char(CBuf *buf, const UInt16 *s
 
       {

       {

         const char defaultChar = '_';

         const char defaultChar = '_';

         BOOL defUsed;

         BOOL defUsed;

+        const char *pDefaultChar = (codePage == CP_UTF7 || codePage == CP_UTF8) ? NULL : &defaultChar;

+        BOOL *pDefUsed = pDefaultChar ? NULL : &defUsed;

         const unsigned numChars = (unsigned)WideCharToMultiByte(

         const unsigned numChars = (unsigned)WideCharToMultiByte(

-            codePage, 0, (LPCWSTR)s, (int)len, (char *)buf->data, (int)size, &defaultChar, &defUsed);

+            codePage, 0, (LPCWSTR)s, (int)len, (char *)buf->data, (int)size, pDefaultChar, pDefUsed);

         if (numChars == 0 || numChars >= size)

         if (numChars == 0 || numChars >= size)

           return SZ_ERROR_FAIL;

           return SZ_ERROR_FAIL;

         buf->data[numChars] = 0;

         buf->data[numChars] = 0;

+ 4 - 4
Files/Languages/Unofficial/Basque.isl
查看文件 

@@ -88,7 +88,7 @@ AboutSetupMenuItem=&Ezartzaileari buruz...
 
 AboutSetupTitle=Ezartzaileari buruz

 AboutSetupTitle=Ezartzaileari buruz

 AboutSetupMessage=%1 bertsioa %2%n%3%n%n%1 webgunea:%n%4

 AboutSetupMessage=%1 bertsioa %2%n%3%n%n%1 webgunea:%n%4

 AboutSetupNote=

 AboutSetupNote=

-TranslatorNote=TranslatorNote=Basque translation maintained by Marimar

+TranslatorNote=Basque translation maintained by Marimar

 

 

 ; *** Buttons

 ; *** Buttons

 ButtonBack=< &Atzera

 ButtonBack=< &Atzera

@@ -155,7 +155,7 @@ WizardSelectDir=Hautatu Helmuga Kokalekua
 
 SelectDirDesc=Non ezarri behar da [name]?

 SelectDirDesc=Non ezarri behar da [name]?

 SelectDirLabel3=Ezartzaileak [name] hurrengo agiritegian ezarriko du.

 SelectDirLabel3=Ezartzaileak [name] hurrengo agiritegian ezarriko du.

 SelectDirBrowseLabel=Jarraitzeko, klikatu Hurrengoa. Beste agiritegi bat hautatzea nahi baduzu, klikatu Bilatu.

 SelectDirBrowseLabel=Jarraitzeko, klikatu Hurrengoa. Beste agiritegi bat hautatzea nahi baduzu, klikatu Bilatu.

-DiskSpaceGBLabel=Gutxienez [gb ] GB-eko toki askea behar da diska gogorrean.

+DiskSpaceGBLabel=Gutxienez [gb] GB-eko toki askea behar da diska gogorrean.

 DiskSpaceMBLabel=Gutxienez [mb] MB-eko toki askea behar da diska gogorrean.

 DiskSpaceMBLabel=Gutxienez [mb] MB-eko toki askea behar da diska gogorrean.

 CannotInstallToNetworkDrive=Ezarpena ezin da sare gidagailu batean egin.

 CannotInstallToNetworkDrive=Ezarpena ezin da sare gidagailu batean egin.

 CannotInstallToUNCPath=Ezarpena ezin da UNC helburu batean egin.

 CannotInstallToUNCPath=Ezarpena ezin da UNC helburu batean egin.

@@ -183,13 +183,13 @@ NoUninstallWarningTitle=Osagaiak Badaude
 
 NoUninstallWarning=Ezartzaileak atzeman du hurrengo osagaiak jadanik zure ordenagailuan ezarrita daudela:%n%n%1%n%nOsagai hauek deshautatuz gero ez dira ezarriko.%n%nHorrela ere jarraitzea nahi duzu?

 NoUninstallWarning=Ezartzaileak atzeman du hurrengo osagaiak jadanik zure ordenagailuan ezarrita daudela:%n%n%1%n%nOsagai hauek deshautatuz gero ez dira ezarriko.%n%nHorrela ere jarraitzea nahi duzu?

 ComponentSize1=%1 KB

 ComponentSize1=%1 KB

 ComponentSize2=%1 MB

 ComponentSize2=%1 MB

-ComponentsDiskSpaceGBLabel=Oraingo hautapenak gutxienez [gb ] GB-eko tokia behar du diskan.

+ComponentsDiskSpaceGBLabel=Oraingo hautapenak gutxienez [gb] GB-eko tokia behar du diskan.

 ComponentsDiskSpaceMBLabel=Oraingo hautapenak gutxienez [mb] MB-eko tokia behar du diskan.

 ComponentsDiskSpaceMBLabel=Oraingo hautapenak gutxienez [mb] MB-eko tokia behar du diskan.

 

 

 ; *** "Select Additional Tasks" wizard page

 ; *** "Select Additional Tasks" wizard page

 WizardSelectTasks=Hautatu Eginkizun Gehigarriak

 WizardSelectTasks=Hautatu Eginkizun Gehigarriak

 SelectTasksDesc=Zer eginkizun gehigarri burutu behar dira?

 SelectTasksDesc=Zer eginkizun gehigarri burutu behar dira?

-SelectTasksLabel2=Hautatu Ezartzaileak  [name]-ren ezarpenean zehar burutzea nahi dituzun eginkizun gehigarriak, orduan klikatu Hurrengoa

+SelectTasksLabel2=Hautatu Ezartzaileak [name]-ren ezarpenean zehar burutzea nahi dituzun eginkizun gehigarriak, orduan klikatu Hurrengoa

 

 

 ; *** "Select Start Menu Folder" wizard page

 ; *** "Select Start Menu Folder" wizard page

 WizardSelectProgramGroup=Hautatu Hasiera Menuko Agiritegia

 WizardSelectProgramGroup=Hautatu Hasiera Menuko Agiritegia

+ 1 - 1
ISHelp/isetup.xml
查看文件 

@@ -3569,7 +3569,7 @@ Filename: "{win}\MYPROG.INI"; Section: "InstallSettings"; Key: "InstallPath"; St
 
 <keyword value="ISSigTool" />

 <keyword value="ISSigTool" />

 <body>

 <body>

 

 

-<p>Inno Setup includes a command-line tool, ISSigTool.exe. This tool is designed to sign files using cryptographic signatures.</p>

+<p>Inno Setup includes a command-line tool, ISSigTool.exe. This tool is designed to sign files using ECDSA P-256 cryptographic signatures.</p>

 

 

 <p>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. If you are looking for more information about this topic see <link topic="setup_signtool">SignTool</link> instead.</p>

 <p>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. If you are looking for more information about this topic see <link topic="setup_signtool">SignTool</link> instead.</p>

+ 1 - 1
ISHelp/ispp.dtd
查看文件 

@@ -3,7 +3,7 @@
 
 <!ELEMENT topic     (title|subtopicstitle|keywords|syntax|description|(topic|section)*)+>

 <!ELEMENT topic     (title|subtopicstitle|keywords|syntax|description|(topic|section)*)+>

 <!ATTLIST topic

 <!ATTLIST topic

   id      ID        #IMPLIED

   id      ID        #IMPLIED

-  popup   (yes|no)  "no"

+  unlisted (yes|no) "no"

   usetitle (yes|no) "yes">

   usetitle (yes|no) "yes">

 

 

 <!ELEMENT title     (#PCDATA)*>

 <!ELEMENT title     (#PCDATA)*>

+ 70 - 62
ISHelp/ispp.xml
查看文件 

@@ -1,8 +1,5 @@
 
 <?xml version="1.0"?>

 <?xml version="1.0"?>

 <!DOCTYPE yasyx SYSTEM "ispp.dtd" [

 <!DOCTYPE yasyx SYSTEM "ispp.dtd" [

- <!ENTITY ob      "{">

- <!ENTITY cb      "}">

- <!ENTITY bs      "\">

  <!ENTITY sp      "&#160;">

  <!ENTITY sp      "&#160;">

  <!ENTITY dsp     "&#160;&#160;">

  <!ENTITY dsp     "&#160;&#160;">

  <!ENTITY define  '<tt><link href="define">define</link></tt>'>

  <!ENTITY define  '<tt><link href="define">define</link></tt>'>

@@ -27,8 +24,8 @@
 
  <!ENTITY endsub  '<tt><link href="sub">endsub</link></tt>'>

  <!ENTITY endsub  '<tt><link href="sub">endsub</link></tt>'>

  <!ENTITY for     '<tt><link href="for">for</link></tt>'>

  <!ENTITY for     '<tt><link href="for">for</link></tt>'>

  <!ENTITY expr    '<tt>expr</tt>'> <!-- not a directive -->

  <!ENTITY expr    '<tt>expr</tt>'> <!-- not a directive -->

- <!ENTITY curtrans '<link href="current-translation" popup="yes">current preprocessor output</link>'>

- <!ENTITY translation '<link href="translation" popup="yes">preprocessor output</link>'>

+ <!ENTITY curtrans '<link href="current-translation">current preprocessor output</link>'>

+ <!ENTITY translation '<link href="translation">preprocessor output</link>'>

  <!ENTITY builtins '<link href="builtinsiss">ISPPBuiltins.iss</link>'>

  <!ENTITY builtins '<link href="builtinsiss">ISPPBuiltins.iss</link>'>

  <!ENTITY dash "&#8211;">

  <!ENTITY dash "&#8211;">

 ]>

 ]>

@@ -36,21 +33,14 @@
 
 	<topic id="isppoverview">

 	<topic id="isppoverview">

 		<title>Introduction</title>

 		<title>Introduction</title>

 		<description header="no">

 		<description header="no">

-			<p>The main purpose of Inno Setup Preprocessor (ISPP) is to automate compile-time tasks and avoid repetition in your scripts. For example, you can declare a compile-time ISPP variable &dash; containing your application name, for instance &dash; and then use its value in several places of your script. If for some reason you need to change the name of your application, you'll have to change it only once in your script. Without ISPP, you would need to change all occurrences of your application name throughout the script.</p>

-			<p>Another example of using ISPP would be gathering version information from your application at compile-time by reading the version info of an EXE file, and using it in your <link href="setup_appvername">AppVerName</link> [Setup] section directive or anywhere else. Without ISPP, you would have to modify your script each time the version of your application changes.</p>

-			<p>ISPP can even scan your source folder and generate script lines for the found files. Without ISPP, you would have to manually maintain the list of files.</p>

-			<p>Conditional in- and exclusion of portions of script is also possible by using ISPP: you can create one single script for different versions/levels of your applications (for example, trial versus fully functional). Without ISPP, you would need multiple scripts.</p>

-			<p>Finally, ISPP makes it possible to split long lines using a line spanning symbol.</p>

-			<p>Note: ISPP works exclusively at compile-time, and has no run-time functionality.</p>

+			<p>The main purpose of Inno Setup Preprocessor (ISPP) is to automate compile-time tasks and avoid repetition in your scripts. For example, you can declare a compile-time preprocessor variable &dash; containing your application name, for instance &dash; and then use its value in several places of your script. If for some reason you need to change the name of your application, you'll have to change it only once in your script. Without the preprocessor, you would need to change all occurrences of your application name throughout the script.</p>

+			<p>Another example of using the preprocessor would be gathering version information from your application at compile-time by reading the version info of an EXE file, and using it in your <link href="setup_appvername">AppVerName</link> [Setup] section directive or anywhere else. Without the preprocessor, you would have to modify your script each time the version of your application changes.</p>

+			<p>The preprocessor can even scan your source folder and generate script lines for the found files. Without the preprocessor, you would have to manually maintain the list of files.</p>

+			<p>Conditional in- and exclusion of portions of script is also possible by using the preprocessor: you can create one single script for different versions/levels of your applications (for example, trial versus fully functional). Without the preprocessor, you would need multiple scripts.</p>

+			<p>Finally, the preprocessor makes it possible to split long lines using a line spanning symbol.</p>

+			<p>Note: the preprocessor works exclusively at compile-time, and has no run-time functionality.</p>

     </description>

     </description>

 		<subtopicstitle>All topics</subtopicstitle>

 		<subtopicstitle>All topics</subtopicstitle>

-    <topic id="example">

-      <title>Example Script</title>

-      <description header="no">

-        <p>An example script called <i>ISPPExample1.iss</i> is located in a separate folder. Please click the "Inno Setup Example Scripts" shortcut created in the Start Menu when you installed Inno Setup, or open the "Examples" folder in your Inno Setup directory.</p>

-        <p>Also see &builtins;.</p>

-      </description>

-    </topic>

 		<topic id="directives">

 		<topic id="directives">

 			<title>Directives Reference</title>

 			<title>Directives Reference</title>

  			<description header="no">

  			<description header="no">

@@ -253,8 +243,8 @@
 
 				<section title="Examples">

 				<section title="Examples">

 					<pre>

 					<pre>

 						<line>#include &lt;file.iss&gt;</line>

 						<line>#include &lt;file.iss&gt;</line>

-						<line>#include "c:&bs;dir&bs;file.iss"</line>

-						<line>#include AddBackslash(<link href="predefinedvars">CompilerPath</link>) + "common.iss"</line>

+						<line>#include "c:\dir\file.iss"</line>

+						<line>#include <link href="addbackslash">AddBackslash</link>(<link href="predefinedvars">CompilerPath</link>) + "common.iss"</line>

 					</pre>

 					</pre>

 				</section>

 				</section>

 				<section title="See also">

 				<section title="See also">

@@ -278,7 +268,7 @@
 
 				<section title="Examples">

 				<section title="Examples">

 					<pre>

 					<pre>

 						<line>[Setup]</line>

 						<line>[Setup]</line>

-						<line>LicenseFile=&ob;#file "mylic.txt"&cb;</line>

+						<line>LicenseFile={#file "mylic.txt"}</line>

 					</pre>

 					</pre>

 				</section>

 				</section>

 				<section title="See also">

 				<section title="See also">

@@ -308,14 +298,17 @@
 
 				</description>

 				</description>

 				<section title="Examples">

 				<section title="Examples">

 					<pre>

 					<pre>

+						<line>[Setup]</line>

+						<line>AppVersion={#<link href="getversionnumbersstring">GetVersionNumbersString</link>(<link href="addbackslash">AddBackslash</link>(SourcePath) + "MyProg.exe")}</line>

+						<line></line>

 						<line>[Files]</line>

 						<line>[Files]</line>

 						<line>#emit 'Source: "file1.ext"; DestDir: ' + MyDestDir</line>

 						<line>#emit 'Source: "file1.ext"; DestDir: ' + MyDestDir</line>

-						<line>Source: "file2.ext"; DestDir: &ob;#MyDestDir&cb;</line>

+						<line>Source: "file2.ext"; DestDir: {#MyDestDir}</line>

 						<line>#emit GenerateVisualCppFilesEntries ; user defined function</line>

 						<line>#emit GenerateVisualCppFilesEntries ; user defined function</line>

 						<line></line>

 						<line></line>

 						<line>[Code]</line>

 						<line>[Code]</line>

 						<line>const</line>

 						<line>const</line>

-						<line>&dsp;AppName = '&ob;#<link href="setupsetting">SetupSetting</link>("AppName")&cb;';</line>

+						<line>&dsp;AppName = '{#<link href="setupsetting">SetupSetting</link>("AppName")}';</line>

 					</pre>

 					</pre>

 				</section>

 				</section>

 				<section title="See also">

 				<section title="See also">

@@ -431,7 +424,7 @@
 
 						<line>#define Lang</line>

 						<line>#define Lang</line>

 						<line></line>

 						<line></line>

 						<line>[Tasks]</line>

 						<line>[Tasks]</line>

-						<line>#if "English" == Lang = <link href="ReadIni">ReadIni</link>(<link href="SetupSetting">SetupSetting</link>("MessagesFile"), &bs;</line>

+						<line>#if "English" == Lang = <link href="ReadIni">ReadIni</link>(<link href="SetupSetting">SetupSetting</link>("MessagesFile"), \</line>

 						<line>&dsp;"LangOptions", "LanguageName")</line>

 						<line>&dsp;"LangOptions", "LanguageName")</line>

 						<line>&dsp;Description: "For all users"; Name: all</line>

 						<line>&dsp;Description: "For all users"; Name: all</line>

 						<line>#elif "German" == Lang</line>

 						<line>#elif "German" == Lang</line>

@@ -475,10 +468,10 @@
 
 					<pre>

 					<pre>

 						<line>[Files]</line>

 						<line>[Files]</line>

 						<line>#ifexist "myfile.ext"</line>

 						<line>#ifexist "myfile.ext"</line>

-						<line>&dsp;Filename: "myfile.ext"; DestDir: &ob;app&cb;</line>

+						<line>&dsp;Filename: "myfile.ext"; DestDir: {app}</line>

 						<line>#endif</line>

 						<line>#endif</line>

 						<line>#ifdef Enterpise</line>

 						<line>#ifdef Enterpise</line>

-						<line>&dsp;Filename: "extra.dll"; DestDir: &ob;app&cb;</line>

+						<line>&dsp;Filename: "extra.dll"; DestDir: {app}</line>

 						<line>#endif</line>

 						<line>#endif</line>

 					</pre>

 					</pre>

 				</section>

 				</section>

@@ -491,7 +484,7 @@
 
 				<keywords><kwd>for</kwd></keywords>

 				<keywords><kwd>for</kwd></keywords>

 				<syntax>

 				<syntax>

 					<define id="for-directive">

 					<define id="for-directive">

-						<txt>for</txt><txt>&sp;</txt><txt>&ob;</txt><nt>expr1</nt><txt>;</txt><nt>expr2</nt><txt>;</txt><nt>expr3</nt><txt>&cb;</txt><nt>expr4</nt>

+						<txt>for</txt><txt>&sp;</txt><txt>{</txt><nt>expr1</nt><txt>;</txt><nt>expr2</nt><txt>;</txt><nt>expr3</nt><txt>}</txt><nt>expr4</nt>

 					</define>

 					</define>

 				</syntax>

 				</syntax>

 				<description>

 				<description>

@@ -506,7 +499,7 @@
 
 				<section title="Examples">

 				<section title="Examples">

 					<pre>

 					<pre>

 						<line>// Call AddFile user defined procedure 200 times</line>

 						<line>// Call AddFile user defined procedure 200 times</line>

-						<line>#for &ob;i = 200; i &gt; 0; i--&cb; AddFile</line>

+						<line>#for {i = 200; i &gt; 0; i--} AddFile</line>

 					</pre>

 					</pre>

 				</section>

 				</section>

 				<section title="More examples">

 				<section title="More examples">

@@ -540,9 +533,9 @@
 
 					<pre>

 					<pre>

 						<line>#sub AddFile</line>

 						<line>#sub AddFile</line>

 						<line>&dsp;#if <link href="Copy">Copy</link>(FileName, 1, 1) == "A"</line>

 						<line>&dsp;#if <link href="Copy">Copy</link>(FileName, 1, 1) == "A"</line>

-						<line>&dsp;&dsp;Source: &ob;#FileName&cb;; DestDir: &ob;app&cb;&bs;A</line>

+						<line>&dsp;&dsp;Source: {#FileName}; DestDir: {app}\A</line>

 						<line>&dsp;#else</line>

 						<line>&dsp;#else</line>

-						<line>&dsp;&dsp;Source: &ob;#FileName&cb;; DestDir: &ob;app&cb;</line>

+						<line>&dsp;&dsp;Source: {#FileName}; DestDir: {app}</line>

 						<line>&dsp;#endif</line>

 						<line>&dsp;#endif</line>

 						<line>#endsub</line>

 						<line>#endsub</line>

 					</pre>

 					</pre>

@@ -613,7 +606,7 @@
 
 					<p>The "pragma-option" variant of &pragma; directive controls the options which ISPP uses to read the source. Each option has an assigned letter and you specify options by typing group name (<tt>option</tt> or <tt>parseroption</tt>),

 					<p>The "pragma-option" variant of &pragma; directive controls the options which ISPP uses to read the source. Each option has an assigned letter and you specify options by typing group name (<tt>option</tt> or <tt>parseroption</tt>),

 then the letter prefixed by a dash. After the letter a plus must be used to turn the option on and minus turn it off. Multiple options can be specified at once (see syntax).

 then the letter prefixed by a dash. After the letter a plus must be used to turn the option on and minus turn it off. Multiple options can be specified at once (see syntax).

 The first group of options (<tt>option</tt>) controls the general options, while the second group (<tt>parseroption</tt>) controls options specific to parser. The list of options is provided at the end of this topic.</p>

 The first group of options (<tt>option</tt>) controls the general options, while the second group (<tt>parseroption</tt>) controls options specific to parser. The list of options is provided at the end of this topic.</p>

-					<p>The "pragma-itokens" variant is used to specify inline directive terminators: starting and ending, respectively. After the token description keyword (<tt>inlinestart</tt> or <tt>inlineend</tt>) a string type expression must follow. It must not evaluate to an empty string. It is allowed to specify the same token for both starting and ending terminators. By default, <tt>&ob;#</tt> (opening brace and a pound sign) and <tt>&cb;</tt> (closing brace) are assumed.</p>

+					<p>The "pragma-itokens" variant is used to specify inline directive terminators: starting and ending, respectively. After the token description keyword (<tt>inlinestart</tt> or <tt>inlineend</tt>) a string type expression must follow. It must not evaluate to an empty string. It is allowed to specify the same token for both starting and ending terminators. By default, <tt>{#</tt> (opening brace and a pound sign) and <tt>}</tt> (closing brace) are assumed.</p>

 					<p>The "pramga-msg" variant issues a message of the type specified by the keyword following the directive name. Messages and warnings are sent to the messages window of the compiler. Errors are shown (by the compiler) using message boxes. Expression must be of type string. Also see the &error; directive.</p>

 					<p>The "pramga-msg" variant issues a message of the type specified by the keyword following the directive name. Messages and warnings are sent to the messages window of the compiler. Errors are shown (by the compiler) using message boxes. Expression must be of type string. Also see the &error; directive.</p>

 					<p>The "pragma-verblev" variant turns on verbose mode and sets the level of verbosity which controls the importance of messages (see below). Least important messages will show up only when highest verbose level is set.</p>

 					<p>The "pragma-verblev" variant turns on verbose mode and sets the level of verbosity which controls the importance of messages (see below). Least important messages will show up only when highest verbose level is set.</p>

 					<p>The "pragma-include"  variant sets the include path. Expression may specify multiple paths delimited with semicolons. The list of these directories is used when ISPP tries to find a file, mentioned in &include; directive.</p>

 					<p>The "pragma-include"  variant sets the include path. Expression may specify multiple paths delimited with semicolons. The list of these directories is used when ISPP tries to find a file, mentioned in &include; directive.</p>

@@ -655,7 +648,7 @@ The first group of options (<tt>option</tt>) controls the general options, while
 
 						<line>#pragma verboselevel 9</line>

 						<line>#pragma verboselevel 9</line>

 						<line>#pragma inlinestart "$("</line>

 						<line>#pragma inlinestart "$("</line>

 						<line>#pragma inlineend ")"</line>

 						<line>#pragma inlineend ")"</line>

-						<line>#pragma include __INCLUDE__ + ";D:&bs;INCLUDE"</line>

+						<line>#pragma include __INCLUDE__ + ";D:\INCLUDE"</line>

 						<line>#pragma spansymbol "_"</line>

 						<line>#pragma spansymbol "_"</line>

 					</pre>

 					</pre>

 				</section>

 				</section>

@@ -690,12 +683,20 @@ The first group of options (<tt>option</tt>) controls the general options, while
 
 		<topic id="funcs">

 		<topic id="funcs">

 			<title>Support Functions Reference</title>

 			<title>Support Functions Reference</title>

 			<description header="no">

 			<description header="no">

-				<p>There are a number of built-in support functions which you can use to perform compile-time actions and/or change your script. For example the following uses ISPP function <link href="GetVersionNumbersString">GetVersionNumbersString</link> to read version info from an EXE and uses the return value of the function to set the <link href="setup_appvername">AppVerName</link> [Setup] section directive using ISPP directive &emit;:</p>

+				<p>There are a number of built-in support functions which you can use to perform compile-time actions and/or change your script. For example the following uses ISPP function <link href="GetVersionNumbersString">GetVersionNumbersString</link> to read version info from an EXE and uses the return value of the function to set the <link href="setup_appvername">AppVerName</link> [Setup] section directive using directive &emit;:</p>

         <pre>

         <pre>

-          <line>#define MyAppVer GetVersionNumbersString(AddBackslash(SourcePath) + "MyProg.exe")</line>

+          <line>#define MyAppVer <link href="getversionnumbersstring">GetVersionNumbersString</link>(<link href="addbackslash">AddBackslash</link>(<link href="predefinedvars">SourcePath</link>) + "MyProg.exe")</line>

           <line></line>

           <line></line>

           <line>[Setup]</line>

           <line>[Setup]</line>

           <line>AppVerName=MyProg version {#MyAppVer}</line>

           <line>AppVerName=MyProg version {#MyAppVer}</line>

+        </pre>

+				<p>Built-in support functions can also be called directly from directive &emit;. For example:</p>

+        <pre>

+          <line>#define MyAppEnterprise</line>

+  				<line></line>

+  	      <line>[Setup]</line>

+          <line>AppName=MyProg{#<link href="defined">Defined</link> MyAppEnterprise?" Enterprise Edition":""}</line>

+					<line>AppVersion={#<link href="getversionnumbersstring">GetVersionNumbersString</link>(<link href="addbackslash">AddBackslash</link>(<link href="predefinedvars">SourcePath</link>) + "MyProg.exe")}</line>

         </pre>

         </pre>

       </description>

       </description>

 			<section title="Function prototypes documenting conventions">

 			<section title="Function prototypes documenting conventions">

@@ -1016,7 +1017,7 @@ The first group of options (<tt>option</tt>) controls the general options, while
 
 				</section>

 				</section>

 				<description>

 				<description>

 					<p>Searches the directory specified by first parameter for the first file that matches the file name implied by first parameter and the attributes specified by second parameter. If the file is found, the result is a find handle, that should be used in subsequent calls to <tt><link href="FindGetFileName">FindGetFileName</link></tt>, <tt><link href="FindNext">FindNext</link></tt>, and <tt><link href="FindClose"/></tt> functions, otherwise the return value is 0.</p>

 					<p>Searches the directory specified by first parameter for the first file that matches the file name implied by first parameter and the attributes specified by second parameter. If the file is found, the result is a find handle, that should be used in subsequent calls to <tt><link href="FindGetFileName">FindGetFileName</link></tt>, <tt><link href="FindNext">FindNext</link></tt>, and <tt><link href="FindClose"/></tt> functions, otherwise the return value is 0.</p>

-					<p>The first parameter is the directory and file name mask, including wildcard characters. For example, <tt>'.&bs;*.*'</tt> specifies all files in the current directory).</p>

+					<p>The first parameter is the directory and file name mask, including wildcard characters. For example, <tt>'.\*.*'</tt> specifies all files in the current directory).</p>

 					<p>The second parameter specifies the special files to include in addition to all normal files. Choose from these file attribute constants defined in &builtins; when specifying this parameter:</p>

 					<p>The second parameter specifies the special files to include in addition to all normal files. Choose from these file attribute constants defined in &builtins; when specifying this parameter:</p>

 					<table>

 					<table>

 						<tr><td><code>faReadOnly</code></td><td>Read-only files</td></tr>

 						<tr><td><code>faReadOnly</code></td><td>Read-only files</td></tr>

@@ -1040,13 +1041,13 @@ The first group of options (<tt>option</tt>) controls the general options, while
 
 						<line>#sub ProcessFoundFile</line>

 						<line>#sub ProcessFoundFile</line>

 						<line>&dsp;#define FileName FindGetFileName(FindHandle)</line>

 						<line>&dsp;#define FileName FindGetFileName(FindHandle)</line>

 						<line>&dsp;#if LowerCase(Copy(FileName, 1, 4)) == "ispp"</line>

 						<line>&dsp;#if LowerCase(Copy(FileName, 1, 4)) == "ispp"</line>

-						<line>&dsp;&dsp;Source: &ob;#FileName&cb;; DestDir: &ob;app&cb;&bs;ispp</line>

+						<line>&dsp;&dsp;Source: {#FileName}; DestDir: {app}\ispp</line>

 						<line>&dsp;#else</line>

 						<line>&dsp;#else</line>

-						<line>&dsp;&dsp;Source: &ob;#FileName&cb;; DestDir: &ob;app&cb;</line>

+						<line>&dsp;&dsp;Source: {#FileName}; DestDir: {app}</line>

 						<line>&dsp;#endif</line>

 						<line>&dsp;#endif</line>

 						<line>#endsub</line>

 						<line>#endsub</line>

 						<line></line>

 						<line></line>

-						<line>#for &ob;FindHandle = FindResult = FindFirst(Mask, 0); FindResult; FindResult = FindNext(FindHandle)&cb; ProcessFoundFile</line>

+						<line>#for {FindHandle = FindResult = FindFirst(Mask, 0); FindResult; FindResult = FindNext(FindHandle)} ProcessFoundFile</line>

 						<line>#if FindHandle</line>

 						<line>#if FindHandle</line>

 						<line>&dsp;#expr FindClose(FindHandle)</line>

 						<line>&dsp;#expr FindClose(FindHandle)</line>

 						<line>#endif</line>

 						<line>#endif</line>

@@ -1110,9 +1111,9 @@ The first group of options (<tt>option</tt>) controls the general options, while
 
 						<line>&dsp;#define FileLine = FileRead(FileHandle)</line>

 						<line>&dsp;#define FileLine = FileRead(FileHandle)</line>

 						<line>&dsp;#pragma message FileLine</line>

 						<line>&dsp;#pragma message FileLine</line>

 						<line>#endsub</line>

 						<line>#endsub</line>

-						<line>#for &ob;FileHandle = FileOpen("c:&bs;autoexec.bat"); &bs;</line>

-						<line>&dsp;FileHandle &amp;&amp; !<link href="FileEof">FileEof</link>(FileHandle); ""&cb;

-							&bs;</line>

+						<line>#for {FileHandle = FileOpen("c:\autoexec.bat"); \</line>

+						<line>&dsp;FileHandle &amp;&amp; !<link href="FileEof">FileEof</link>(FileHandle); ""}

+							\</line>

 						<line>&dsp;ProcessFileLine</line>

 						<line>&dsp;ProcessFileLine</line>

 						<line>#if FileHandle</line>

 						<line>#if FileHandle</line>

 						<line>&dsp;#expr <link href="FileClose">FileClose</link>(FileHandle)</line>

 						<line>&dsp;#expr <link href="FileClose">FileClose</link>(FileHandle)</line>

@@ -1905,9 +1906,9 @@ The first group of options (<tt>option</tt>) controls the general options, while
 
 			<section title="Local array">

 			<section title="Local array">

         <p>In context of the expression, an additional array named <tt>Local</tt> is valid. Its elements can be used for temporary storage and reusing values in sequential expressions. Values stored in <tt>Local</tt> array are neither preserved from call to call (including recursive), nor are they accessible from anywhere except the expression.</p>

         <p>In context of the expression, an additional array named <tt>Local</tt> is valid. Its elements can be used for temporary storage and reusing values in sequential expressions. Values stored in <tt>Local</tt> array are neither preserved from call to call (including recursive), nor are they accessible from anywhere except the expression.</p>

         <pre>

         <pre>

-          <line>#define DeleteToFirstPeriod(str *S) /* user defined function declaration */ &bs;</line>

-          <line>&dsp;Local[1] = <link href="copy">Copy</link>(S, 1, (Local[0] = <link href="pos">Pos</link>(".", S)) - 1), &bs;</line>

-          <line>&dsp;S = Copy(S, Local[0] + 1), &bs;</line>

+          <line>#define DeleteToFirstPeriod(str *S) /* user defined function declaration */ \</line>

+          <line>&dsp;Local[1] = <link href="copy">Copy</link>(S, 1, (Local[0] = <link href="pos">Pos</link>(".", S)) - 1), \</line>

+          <line>&dsp;S = Copy(S, Local[0] + 1), \</line>

           <line>&dsp;Local[1]</line>

           <line>&dsp;Local[1]</line>

         </pre>

         </pre>

 			</section>

 			</section>

@@ -1950,7 +1951,7 @@ The first group of options (<tt>option</tt>) controls the general options, while
 
 				</pre>

 				</pre>

 				<p>Please note that line spanning feature is triggered before any further processing, so this is also a valid comment:</p>

 				<p>Please note that line spanning feature is triggered before any further processing, so this is also a valid comment:</p>

 				<pre>

 				<pre>

-					<line>#emit Var1 + Var2 ; this is &bs;</line>

+					<line>#emit Var1 + Var2 ; this is \</line>

 					<line>&dsp;still a comment</line>

 					<line>&dsp;still a comment</line>

 				</pre>

 				</pre>

         <p>Comments may also be placed anywhere by starting a line with two slashes. For example:</p>

         <p>Comments may also be placed anywhere by starting a line with two slashes. For example:</p>

@@ -2047,18 +2048,12 @@ The first group of options (<tt>option</tt>) controls the general options, while
 
       <description header="no">

       <description header="no">

         <p>By ending lines with ISPP's line spanning symbol preceded with a space, you can split long lines. For example:</p>

         <p>By ending lines with ISPP's line spanning symbol preceded with a space, you can split long lines. For example:</p>

         <pre>

         <pre>

-          <line>#define MyAppName &bs;</line>

+          <line>#define MyAppName \</line>

           <line>&dsp;"My Program"</line>

           <line>&dsp;"My Program"</line>

         </pre>

         </pre>

-        <p>The default line spanning symbol is "&bs;" which can be changed using &pragma;.</p>

+        <p>The default line spanning symbol is "\" which can be changed using &pragma;.</p>

       </description>

       </description>

     </topic>

     </topic>

-		<topic id="builtinsiss">

-			<title>ISPPBuiltins.iss</title>

-			<description header="no">

-				<p>The ISPPBuiltins.iss file is part of Inno Setup Preprocessor and is automatically installed to root of your Inno Setup folder. This file is automatically included at the start of preprocessing: some of ISPP's functions are actually implemented by this file instead of being built-in. It also contains common declarations such as special constants. The file is a regular Inno Setup Script file so you can use all of its techniques in your own script as well.</p>

-			</description>

-		</topic>

 		<topic id="visibility">

 		<topic id="visibility">

 			<keywords>

 			<keywords>

 				<kwd>private</kwd>

 				<kwd>private</kwd>

@@ -2089,8 +2084,21 @@ The first group of options (<tt>option</tt>) controls the general options, while
 
 				<p>It is recommended that you use appropriate visibility when declaring variables to avoid problems with unexpected redefinition of a variable (for example in included third-party file). If no included files depend on a variable, declare it as private. If they do, but the parent file doesn't, declare it as protected. Declare it as public otherwise. If you're unsure, then protected visibility is the common case.</p>

 				<p>It is recommended that you use appropriate visibility when declaring variables to avoid problems with unexpected redefinition of a variable (for example in included third-party file). If no included files depend on a variable, declare it as private. If they do, but the parent file doesn't, declare it as protected. Declare it as public otherwise. If you're unsure, then protected visibility is the common case.</p>

 			</description>

 			</description>

 		</topic>

 		</topic>

+    <topic id="example">

+      <title>Example Script</title>

+      <description header="no">

+        <p>An example script called <i>ISPPExample1.iss</i> is located in a separate folder. Please click the "Inno Setup Example Scripts" shortcut created in the Start Menu when you installed Inno Setup, or open the "Examples" folder in your Inno Setup directory.</p>

+        <p>Also see &builtins;.</p>

+      </description>

+    </topic>

+		<topic id="builtinsiss">

+			<title>ISPPBuiltins.iss</title>

+			<description header="no">

+				<p>The ISPPBuiltins.iss file is part of Inno Setup Preprocessor and is automatically installed to root of your Inno Setup folder. This file is automatically included at the start of preprocessing: some of ISPP's functions are actually implemented by this file instead of being built-in. It also contains common declarations such as special constants. The file is a regular Inno Setup Script file so you can use all of its techniques in your own script as well.</p>

+			</description>

+		</topic>

 		<topic id="isppcc">

 		<topic id="isppcc">

-			<title>Command Line Compiler</title>

+			<title>Extended Command Line Compiler</title>

 			<description header="no">

 			<description header="no">

 				<p>The <link href="compilercmdline">console-mode compiler</link> (ISCC.exe) provides extra parameters to control Inno Setup Preprocessor:</p>

 				<p>The <link href="compilercmdline">console-mode compiler</link> (ISCC.exe) provides extra parameters to control Inno Setup Preprocessor:</p>

 				<table>

 				<table>

@@ -2106,13 +2114,13 @@ The first group of options (<tt>option</tt>) controls the general options, while
 
 				<p>Example: <tt>iscc /$c- /Pu+ "/DLicenseFile=Trial License.txt" /Ic:\inc;d:\inc /Jdefines.iss "c:\isetup\samples\my script.iss"</tt></p>

 				<p>Example: <tt>iscc /$c- /Pu+ "/DLicenseFile=Trial License.txt" /Ic:\inc;d:\inc /Jdefines.iss "c:\isetup\samples\my script.iss"</tt></p>

 			</description>

 			</description>

 		</topic>

 		</topic>

-		<topic id="translation" popup="yes">

+		<topic id="translation" unlisted="yes">

 			<title>Preprocessor output</title>

 			<title>Preprocessor output</title>

 			<description header="no">

 			<description header="no">

 				<p>Preprocessor output refers to the preprocessed version of the script.</p>

 				<p>Preprocessor output refers to the preprocessed version of the script.</p>

 			</description>

 			</description>

 		</topic>

 		</topic>

-		<topic id="current-translation" popup="yes">

+		<topic id="current-translation" unlisted="yes">

 			<title>Current preprocessor output</title>

 			<title>Current preprocessor output</title>

 			<description header="no">

 			<description header="no">

 				<p>Current preprocessor output refers to the &translation; up to the line which ISPP is currently processing.</p>

 				<p>Current preprocessor output refers to the &translation; up to the line which ISPP is currently processing.</p>

@@ -2129,13 +2137,13 @@ The first group of options (<tt>option</tt>) controls the general options, while
 
       <p>ISPP allows you to call macro recursively, i. e. call it from itself. This feature can be used to emulate loop.</p>

       <p>ISPP allows you to call macro recursively, i. e. call it from itself. This feature can be used to emulate loop.</p>

       <p>For example, you wish to construct a "for"-like loop. To achieve this, you'll need to declare a macro that takes one integer parameter and which makes the loop "body." After that you declare "outer" loop, which is used for iterating:</p>

       <p>For example, you wish to construct a "for"-like loop. To achieve this, you'll need to declare a macro that takes one integer parameter and which makes the loop "body." After that you declare "outer" loop, which is used for iterating:</p>

       <pre> 

       <pre> 

-        <line>#define LoopBody(int I) Str(I) + "th iteration&bs;n"</line>

+        <line>#define LoopBody(int I) Str(I) + "th iteration\n"</line>

         <line></line>

         <line></line>

-        <line>#define Loop(int LoopRoof = 10) &bs; </line>

-        <line>&dsp;LoopRoof ?&sp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;/* if LoopTop is not zero */ &bs;</line>

-        <line>&dsp;&dsp;LoopBody(LoopRoof) +&sp;/* call the body */ &bs; </line>

-        <line>&dsp;&dsp;Loop(LoopRoof - 1)&sp;&dsp;/* next iteration*/ &bs;</line>

-        <line>&dsp;:&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;/* else */ &bs;</line>

+        <line>#define Loop(int LoopRoof = 10) \ </line>

+        <line>&dsp;LoopRoof ?&sp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;/* if LoopTop is not zero */ \</line>

+        <line>&dsp;&dsp;LoopBody(LoopRoof) +&sp;/* call the body */ \ </line>

+        <line>&dsp;&dsp;Loop(LoopRoof - 1)&sp;&dsp;/* next iteration*/ \</line>

+        <line>&dsp;:&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;/* else */ \</line>

         <line>&dsp;&dsp;""&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&sp;/* return empty string */</line>

         <line>&dsp;&dsp;""&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&dsp;&sp;/* return empty string */</line>

       </pre>

       </pre>

       <p>With these two macros declared, this command:</p>

       <p>With these two macros declared, this command:</p>

+ 2 - 2
ISHelp/ispp.xsl
查看文件 

@@ -9,7 +9,7 @@
 
 

 

   <xsl:comment>

   <xsl:comment>

     Inno Setup Preprocessor Reference

     Inno Setup Preprocessor Reference

-    Copyright (C) 1997-2024 Jordan Russell

+    Copyright (C) 1997-2025 Jordan Russell

     Portions Copyright (C) 2000-2024 Martijn Laan

     Portions Copyright (C) 2000-2024 Martijn Laan

     For conditions of distribution and use, see LICENSE.TXT.

     For conditions of distribution and use, see LICENSE.TXT.

     Portions Copyright (C) 2001-2004 Alex Yackimoff

     Portions Copyright (C) 2001-2004 Alex Yackimoff

@@ -52,7 +52,7 @@
 
           </xsl:when>

           </xsl:when>

           <xsl:otherwise>

           <xsl:otherwise>

             <xsl:for-each select="topic">

             <xsl:for-each select="topic">

-              <xsl:if test="title">

+              <xsl:if test="title and not(@unlisted='yes')">

                 <li><link topic="{translate(@id,$ucletters,$lcletters)}"><xsl:value-of select="title"/></link></li>

                 <li><link topic="{translate(@id,$ucletters,$lcletters)}"><xsl:value-of select="title"/></link></li>

               </xsl:if>

               </xsl:if>

             </xsl:for-each>

             </xsl:for-each>

+ 51 - 17
Projects/ISSigTool.dpr
查看文件 

@@ -33,6 +33,7 @@ uses
 
 var

 var

   Options: record

   Options: record

     KeyFile: String;

     KeyFile: String;

+    Quiet: Boolean;

   end;

   end;

 

 

 procedure RaiseFatalError(const Msg: String);

 procedure RaiseFatalError(const Msg: String);

@@ -45,6 +46,28 @@ begin
 
   raise Exception.CreateFmt(Msg, Args);

   raise Exception.CreateFmt(Msg, Args);

 end;

 end;

 

 

+procedure Print(const S: String; const IncludeNewLine: Boolean = True);

+begin

+  if IncludeNewLine then

+    Writeln(S)

+  else

+    Write(S);

+end;

+

+procedure PrintUnlessQuiet(const S: String;

+  const IncludeNewLine: Boolean = True);

+begin

+  if not Options.Quiet then

+    Print(S, IncludeNewLine);

+end;

+

+procedure PrintFmtUnlessQuiet(const S: String; const Args: array of const;

+  const IncludeNewLine: Boolean = True);

+begin

+  if not Options.Quiet then

+    Print(Format(S, Args), IncludeNewLine);

+end;

+

 function CalcFileHash(const AFile: TFile): TSHA256Digest;

 function CalcFileHash(const AFile: TFile): TSHA256Digest;

 var

 var

   Buf: array[0..$FFFF] of Byte;

   Buf: array[0..$FFFF] of Byte;

@@ -85,7 +108,7 @@ begin
 
     ISSigExportPublicKeyText(Key, PublicKeyText);

     ISSigExportPublicKeyText(Key, PublicKeyText);

     ISSigSaveTextToFile(AFilename, PublicKeyText);

     ISSigSaveTextToFile(AFilename, PublicKeyText);

 

 

-    Writeln('Public key file created: ', AFilename);

+    PrintFmtUnlessQuiet('Public key file created: "%s"', [AFilename]);

   finally

   finally

     Key.Free;

     Key.Free;

   end;

   end;

@@ -104,7 +127,7 @@ begin
 
     ISSigExportPrivateKeyText(Key, PrivateKeyText);

     ISSigExportPrivateKeyText(Key, PrivateKeyText);

     ISSigSaveTextToFile(Options.KeyFile, PrivateKeyText);

     ISSigSaveTextToFile(Options.KeyFile, PrivateKeyText);

 

 

-    Writeln('Private key file created: ', Options.KeyFile);

+    PrintFmtUnlessQuiet('Private key file created: "%s"', [Options.KeyFile]);

   finally

   finally

     Key.Free;

     Key.Free;

   end;

   end;

@@ -112,7 +135,7 @@ end;
 
 

 

 procedure SignSingleFile(const AKey: TECDSAKey; const AFilename: String);

 procedure SignSingleFile(const AKey: TECDSAKey; const AFilename: String);

 begin

 begin

-  Write(AFilename, ': ');

+  PrintFmtUnlessQuiet('%s: ', [AFilename], False);

 

 

   var FileSize: Int64;

   var FileSize: Int64;

   var FileHash: TSHA256Digest;

   var FileHash: TSHA256Digest;

@@ -140,7 +163,7 @@ begin
 
        ExistingFileHashValue) = vsrSuccess then begin

        ExistingFileHashValue) = vsrSuccess then begin

       if (FileSize = ExistingFileSizeValue) and

       if (FileSize = ExistingFileSizeValue) and

          SHA256DigestsEqual(FileHash, ExistingFileHashValue) then begin

          SHA256DigestsEqual(FileHash, ExistingFileHashValue) then begin

-        Writeln('signature unchanged');

+        PrintUnlessQuiet('signature unchanged');

         Exit;

         Exit;

       end;

       end;

     end;

     end;

@@ -148,7 +171,7 @@ begin
 
 

 

   const SigText = ISSigCreateSignatureText(AKey, FileSize, FileHash);

   const SigText = ISSigCreateSignatureText(AKey, FileSize, FileHash);

   ISSigSaveTextToFile(SigFilename, SigText);

   ISSigSaveTextToFile(SigFilename, SigText);

-  Writeln('signature written');

+  PrintUnlessQuiet('signature written');

 end;

 end;

 

 

 procedure CommandSign(const AFilenames: TStringList);

 procedure CommandSign(const AFilenames: TStringList);

@@ -167,16 +190,16 @@ end;
 
 function VerifySingleFile(const AKey: TECDSAKey; const AFilename: String): Boolean;

 function VerifySingleFile(const AKey: TECDSAKey; const AFilename: String): Boolean;

 begin

 begin

   Result := False;

   Result := False;

-  Write(AFilename, ': ');

+  PrintFmtUnlessQuiet('%s: ', [AFilename], False);

 

 

   if not NewFileExists(AFilename) then begin

   if not NewFileExists(AFilename) then begin

-    Writeln('MISSINGFILE (File does not exist)');

+    PrintUnlessQuiet('MISSINGFILE (File does not exist)');

     Exit;

     Exit;

   end;

   end;

 

 

   const SigFilename = AFilename + '.issig';

   const SigFilename = AFilename + '.issig';

   if not NewFileExists(SigFilename) then begin

   if not NewFileExists(SigFilename) then begin

-    Writeln('MISSINGSIGFILE (Signature file does not exist)');

+    PrintUnlessQuiet('MISSINGSIGFILE (Signature file does not exist)');

     Exit;

     Exit;

   end;

   end;

 

 

@@ -188,9 +211,9 @@ begin
 
   if VerifyResult <> vsrSuccess then begin

   if VerifyResult <> vsrSuccess then begin

     case VerifyResult of

     case VerifyResult of

       vsrMalformed, vsrBadSignature:

       vsrMalformed, vsrBadSignature:

-        Writeln('BADSIGFILE (Signature file is not valid)');

+        PrintUnlessQuiet('BADSIGFILE (Signature file is not valid)');

       vsrKeyNotFound:

       vsrKeyNotFound:

-        Writeln('UNKNOWNKEY (Incorrect key ID)');

+        PrintUnlessQuiet('UNKNOWNKEY (Incorrect key ID)');

     else

     else

       RaiseFatalError('Unknown verify result');

       RaiseFatalError('Unknown verify result');

     end;

     end;

@@ -200,19 +223,19 @@ begin
 
   const F = TFile.Create(AFilename, fdOpenExisting, faRead, fsRead);

   const F = TFile.Create(AFilename, fdOpenExisting, faRead, fsRead);

   try

   try

     if Int64(F.Size) <> ExpectedFileSize then begin

     if Int64(F.Size) <> ExpectedFileSize then begin

-      Writeln('WRONGSIZE (File size is incorrect)');

+      PrintUnlessQuiet('WRONGSIZE (File size is incorrect)');

       Exit;

       Exit;

     end;

     end;

     const ActualFileHash = CalcFileHash(F);

     const ActualFileHash = CalcFileHash(F);

     if not SHA256DigestsEqual(ActualFileHash, ExpectedFileHash) then begin

     if not SHA256DigestsEqual(ActualFileHash, ExpectedFileHash) then begin

-      Writeln('WRONGHASH (File hash is incorrect)');

+      PrintUnlessQuiet('WRONGHASH (File hash is incorrect)');

       Exit;

       Exit;

     end;

     end;

   finally

   finally

     F.Free;

     F.Free;

   end;

   end;

 

 

-  Writeln('OK');

+  PrintUnlessQuiet('OK');

   Result := True;

   Result := True;

 end;

 end;

 

 

@@ -244,6 +267,8 @@ begin
 
   Writeln(ErrOutput, 'or to generate a new private key:  issigtool [options] generate-private-key');

   Writeln(ErrOutput, 'or to generate a new private key:  issigtool [options] generate-private-key');

   Writeln(ErrOutput, 'Options:');

   Writeln(ErrOutput, 'Options:');

   Writeln(ErrOutput, '  --key-file=<filename> Specifies the private key filename (overrides ISSIGTOOL_KEY_FILE environment variable)');

   Writeln(ErrOutput, '  --key-file=<filename> Specifies the private key filename (overrides ISSIGTOOL_KEY_FILE environment variable)');

+  Writeln(ErrOutput, '  --quiet, -q           Suppresses status messages that are normally printed to standard output');

+  Writeln(ErrOutput, '  --help, -?            Prints this information');

   Writeln(ErrOutput, '');

   Writeln(ErrOutput, '');

 end;

 end;

 

 

@@ -254,15 +279,24 @@ begin
 
     for var I := 1 to NewParamCount do

     for var I := 1 to NewParamCount do

       ArgList.Add(NewParamStr(I));

       ArgList.Add(NewParamStr(I));

 

 

+    const InitialArgListCount = ArgList.Count;

     var J := 0;

     var J := 0;

     while J < ArgList.Count do begin

     while J < ArgList.Count do begin

       const S = ArgList[J];

       const S = ArgList[J];

-      if S.StartsWith('--key-file=') then begin

-        Options.KeyFile := S.Substring(Length('--key-file='));

+      if S.StartsWith('-') then begin

+        if (S = '--help') or (S = '-?') then begin

+          ShowUsage;

+          if InitialArgListCount <> 1 then

+            RaiseFatalErrorFmt('"%s" option cannot be combined with other arguments', [S]);

+          Exit;

+        end else if (S = '--quiet') or (S = '-q') then begin

+          Options.Quiet := True;

+        end else if S.StartsWith('--key-file=') then begin

+          Options.KeyFile := S.Substring(Length('--key-file='));

+        end else

+          RaiseFatalErrorFmt('Unknown option "%s".', [S]);

         ArgList.Delete(J);

         ArgList.Delete(J);

       end else begin

       end else begin

-        if S.StartsWith('-') then

-          RaiseFatalErrorFmt('Unknown option "%s"', [S]);

         if S = '' then

         if S = '' then

           RaiseFatalError('Empty arguments not allowed');

           RaiseFatalError('Empty arguments not allowed');

         Inc(J);

         Inc(J);

二进制
Projects/Src/Compression.SevenZipDecoder/7zDecode/IS7zDec.obj
查看文件


+ 1 - 0
Projects/Src/Shared.TaskDialogFunc.pas
查看文件 

@@ -47,6 +47,7 @@ begin
 
   if Assigned(TaskDialogIndirectFunc) then begin

   if Assigned(TaskDialogIndirectFunc) then begin

     ZeroMemory(@Config, Sizeof(Config));

     ZeroMemory(@Config, Sizeof(Config));

     Config.cbSize := SizeOf(Config);

     Config.cbSize := SizeOf(Config);

+    Config.dwFlags := TDF_SIZE_TO_CONTENT;

     if RightToLeft then

     if RightToLeft then

       Config.dwFlags := Config.dwFlags or TDF_RTL_LAYOUT;

       Config.dwFlags := Config.dwFlags or TDF_RTL_LAYOUT;

     Config.hInstance := HInstance;

     Config.hInstance := HInstance;

+ 2 - 1
whatsnew.htm
查看文件 

@@ -32,8 +32,9 @@ For conditions of distribution and use, see <a href="files/is/license.txt">LICEN
 
 <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-dev </span><span class="date">(?)</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 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.<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>Minor tweaks and documentation improvements.</li>

 </ul>

 </ul>

 

 

 <p><a name="6.4.2"></a><span class="ver">6.4.2 </span><span class="date">(2025-03-12)</span></p>

 <p><a name="6.4.2"></a><span class="ver">6.4.2 </span><span class="date">(2025-03-12)</span></p>