Home Explore Help
Sign In
pascal
/
innosetup
mirror of https://github.com/jrsoftware/issrc.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

ARM -> Arm, see https://www.arm.com/company/policies/trademarks/arm-trademark-list/arm-trademark

Martijn Laan 1 year ago
parent
4c76909fb8
commit
8cc49b4e19
7 changed files with 28 additions and 28 deletions
Unified View Show Diff Stats
  1. 1 1
      Examples/MyProg/Myprog.c
  2. 5 5
      ISHelp/isetup.xml
  3. 9 9
      ISHelp/isxfunc.xml
  4. 9 9
      Projects/Src/Main.pas
  5. 1 1
      Projects/Src/ScriptFunc.pas
  6. 1 1
      Projects/Src/ScriptFunc_R.pas
  7. 2 2
      Projects/Src/Struct.pas

+ 1 - 1
Examples/MyProg/Myprog.c
View File 

@@ -6,7 +6,7 @@
 
 #elif defined(_AMD64_)

 #elif defined(_AMD64_)

 	#define ARCHNOTE TEXT("\n\n(This EXE was compiled for the x64 architecture.)")

 	#define ARCHNOTE TEXT("\n\n(This EXE was compiled for the x64 architecture.)")

 #elif defined(_M_ARM64)

 #elif defined(_M_ARM64)

-	#define ARCHNOTE TEXT("\n\n(This EXE was compiled for the ARM64 architecture.)")

+	#define ARCHNOTE TEXT("\n\n(This EXE was compiled for the Arm64 architecture.)")

 #elif defined(_IA64_)

 #elif defined(_IA64_)

 	#define ARCHNOTE TEXT("\n\n(This EXE was compiled for the Itanium architecture.)")

 	#define ARCHNOTE TEXT("\n\n(This EXE was compiled for the Itanium architecture.)")

 #else

 #else

+ 5 - 5
ISHelp/isetup.xml
View File 

@@ -101,9 +101,9 @@ Inno Setup is a <i>free</i> installer for Windows programs by Jordan Russell and
 
 

 

 <ul>

 <ul>

 

 

-<li>Support for every Windows release since 2009, including: Windows 11, Windows 10, Windows 10 on ARM, Windows Server 2019, Windows Server 2016, Windows 8.1, Windows 8, Windows Server 2012, Windows 7, and Windows Server 2008 R2. (No service packs are required.)</li>

+<li>Support for every Windows release since 2009, including: Windows 11, Windows 10, Windows 11 on Arm, Windows 10 on Arm, Windows Server 2019, Windows Server 2016, Windows 8.1, Windows 8, Windows Server 2012, Windows 7, and Windows Server 2008 R2. (No service packs are required.)</li>

 

 

-<li>Extensive support for installation of <link topic="32vs64bitinstalls">64-bit</link> applications on the 64-bit editions of Windows. The x64, ARM64 and Itanium architectures are all supported.</li>

+<li>Extensive support for installation of <link topic="32vs64bitinstalls">64-bit</link> applications on the 64-bit editions of Windows. The x64, Arm64 and Itanium architectures are all supported.</li>

 

 

 <li>Extensive support for both administrative and <link topic="admininstallmode">non administrative installations</link> installations.</li>

 <li>Extensive support for both administrative and <link topic="admininstallmode">non administrative installations</link> installations.</li>

 

 

@@ -5242,14 +5242,14 @@ DiskSliceSize=1457664
 
 <keyword value="x64" />

 <keyword value="x64" />

 <keyword value="IA-64" />

 <keyword value="IA-64" />

 <keyword value="Itanium" />

 <keyword value="Itanium" />

-<keyword value="ARM64" />

+<keyword value="Arm64" />

 <setupvalid>One or more of the following, separated by spaces: <br/><tt>x86</tt> <br/><tt>x64</tt> <br/><tt>arm64</tt> <br/><tt>ia64</tt></setupvalid>

 <setupvalid>One or more of the following, separated by spaces: <br/><tt>x86</tt> <br/><tt>x64</tt> <br/><tt>arm64</tt> <br/><tt>ia64</tt></setupvalid>

 <setupdefault><i>(blank)</i></setupdefault>

 <setupdefault><i>(blank)</i></setupdefault>

 <body>

 <body>

 <p>Specifies which processor architecture(s) Setup is allowed to run on. If this directive is not specified or is blank, Setup will be allowed to run on all processor architectures capable of executing its 32-bit code (including ones it doesn't recognize). Otherwise, if a user's processor architecture is not one of those specified in this directive, Setup will display an error message and exit.</p>

 <p>Specifies which processor architecture(s) Setup is allowed to run on. If this directive is not specified or is blank, Setup will be allowed to run on all processor architectures capable of executing its 32-bit code (including ones it doesn't recognize). Otherwise, if a user's processor architecture is not one of those specified in this directive, Setup will display an error message and exit.</p>

 <p>If your application's binaries are all 32-bit and run in user mode, you should not change this directive from its default value (specifically, don't set it to <tt>x86</tt>), because normally such binaries will run without issue on the 64-bit Windows via the WOW64 emulator.</p>

 <p>If your application's binaries are all 32-bit and run in user mode, you should not change this directive from its default value (specifically, don't set it to <tt>x86</tt>), because normally such binaries will run without issue on the 64-bit Windows via the WOW64 emulator.</p>

 <p>If you install any 32-bit device drivers, you should set this directive to <tt>x86</tt>, as 32-bit device drivers cannot function on 64-bit Windows.</p>

 <p>If you install any 32-bit device drivers, you should set this directive to <tt>x86</tt>, as 32-bit device drivers cannot function on 64-bit Windows.</p>

-<p>If your application's binaries are built for the x64, ARM64 or Itanium architectures, you should set this directive to either <tt>x64</tt>, <tt>arm64</tt> or <tt>ia64</tt> respectively.</p>

+<p>If your application's binaries are built for the x64, Arm64 or Itanium architectures, you should set this directive to either <tt>x64</tt>, <tt>arm64</tt> or <tt>ia64</tt> respectively.</p>

 <p><b>See also:</b><br/>

 <p><b>See also:</b><br/>

 <link topic="setup_architecturesinstallin64bitmode">ArchitecturesInstallIn64BitMode</link></p>

 <link topic="setup_architecturesinstallin64bitmode">ArchitecturesInstallIn64BitMode</link></p>

 </body>

 </body>

@@ -5262,7 +5262,7 @@ DiskSliceSize=1457664
 
 <keyword value="x64" />

 <keyword value="x64" />

 <keyword value="IA-64" />

 <keyword value="IA-64" />

 <keyword value="Itanium" />

 <keyword value="Itanium" />

-<keyword value="ARM64" />

+<keyword value="Arm64" />

 <setupvalid>One or more of the following, separated by spaces: <br/><tt>x64</tt> <br/><tt>arm64</tt> <br/><tt>ia64</tt></setupvalid>

 <setupvalid>One or more of the following, separated by spaces: <br/><tt>x64</tt> <br/><tt>arm64</tt> <br/><tt>ia64</tt></setupvalid>

 <setupdefault><i>(blank)</i></setupdefault>

 <setupdefault><i>(blank)</i></setupdefault>

 <body>

 <body>

+ 9 - 9
ISHelp/isxfunc.xml
View File 

@@ -471,10 +471,10 @@ end;</pre></example>
 
         <prototype>function ProcessorArchitecture: TSetupProcessorArchitecture;</prototype>

         <prototype>function ProcessorArchitecture: TSetupProcessorArchitecture;</prototype>

         <description><p>Returns the native processor architecture of the current system.</p>

         <description><p>Returns the native processor architecture of the current system.</p>

 <p>TSetupProcessorArchitecture is defined as:</p>

 <p>TSetupProcessorArchitecture is defined as:</p>

-<p><tt>TSetupProcessorArchitecture = (paUnknown, paX86, paX64, paIA64, paARM64, paARM32);</tt></p></description>

+<p><tt>TSetupProcessorArchitecture = (paUnknown, paX86, paX64, paIA64, paArm64, paArm32);</tt></p></description>

         <remarks><p>A 64-bit processor architecture will never be returned on 32-bit versions of Windows. Hence, you cannot use this function to detect a 64-bit AMD CPU on a 32-bit version of Windows; you'll just get back <tt>paX86</tt> if you try.</p>

         <remarks><p>A 64-bit processor architecture will never be returned on 32-bit versions of Windows. Hence, you cannot use this function to detect a 64-bit AMD CPU on a 32-bit version of Windows; you'll just get back <tt>paX86</tt> if you try.</p>

 <p><tt>paUnknown</tt> is returned if Setup/Uninstall does not recognize the processor architecture. It can be assumed that an "unknown" architecture is at least capable of executing 32-bit code, or Setup/Uninstall wouldn't be running at all.</p>

 <p><tt>paUnknown</tt> is returned if Setup/Uninstall does not recognize the processor architecture. It can be assumed that an "unknown" architecture is at least capable of executing 32-bit code, or Setup/Uninstall wouldn't be running at all.</p>

-<p><tt>paARM32</tt> is never returned because Setup/Uninstall does not run on 32-bit versions of Windows for ARM32.</p>

+<p><tt>paArm32</tt> is never returned because Setup/Uninstall does not run on 32-bit versions of Windows for Arm32.</p>

 <p>If <tt>paIA64</tt> is returned, and <tt>ia64</tt> is <i>not</i> included in the value of the <link topic="setup_architecturesinstallin64bitmode">ArchitecturesInstallIn64BitMode</link> [Setup] section directive, you should not assume that Inno Setup's 64-bit-only features are available -- for example, the <tt>{autopf64}</tt> constant. Those features only work when <link topic="isxfunc_IsWin64">IsWin64</link> returns True, and as documented, it may not return True on older Itanium versions of Windows that lack certain APIs Inno Setup requires.</p>

 <p>If <tt>paIA64</tt> is returned, and <tt>ia64</tt> is <i>not</i> included in the value of the <link topic="setup_architecturesinstallin64bitmode">ArchitecturesInstallIn64BitMode</link> [Setup] section directive, you should not assume that Inno Setup's 64-bit-only features are available -- for example, the <tt>{autopf64}</tt> constant. Those features only work when <link topic="isxfunc_IsWin64">IsWin64</link> returns True, and as documented, it may not return True on older Itanium versions of Windows that lack certain APIs Inno Setup requires.</p>

 <p>Therefore, instead of:</p>

 <p>Therefore, instead of:</p>

 <pre>

 <pre>

@@ -502,7 +502,7 @@ begin
 
     paX86: S := 'x86';

     paX86: S := 'x86';

     paX64: S := 'x64';

     paX64: S := 'x64';

     paIA64: S := 'Itanium';

     paIA64: S := 'Itanium';

-    paARM64: S := 'ARM64';

+    paArm64: S := 'Arm64';

   else

   else

     S := 'Unrecognized';

     S := 'Unrecognized';

   end;

   end;

@@ -511,7 +511,7 @@ end;</pre></example>
 
         <seealso><p><link topic="isxfunc_IsX86">IsX86</link><br />

         <seealso><p><link topic="isxfunc_IsX86">IsX86</link><br />

 <link topic="isxfunc_IsX64">IsX64</link><br />

 <link topic="isxfunc_IsX64">IsX64</link><br />

 <link topic="isxfunc_IsIA64">IsIA64</link><br />

 <link topic="isxfunc_IsIA64">IsIA64</link><br />

-<link topic="isxfunc_IsARM64">IsARM64</link><br />

+<link topic="isxfunc_IsArm64">IsArm64</link><br />

 <link topic="isxfunc_IsWin64">IsWin64</link><br />

 <link topic="isxfunc_IsWin64">IsWin64</link><br />

 <link topic="isxfunc_Is64BitInstallMode">Is64BitInstallMode</link></p></seealso>

 <link topic="isxfunc_Is64BitInstallMode">Is64BitInstallMode</link></p></seealso>

       </function>

       </function>

@@ -523,7 +523,7 @@ end;</pre></example>
 
         <seealso><p><link topic="isxfunc_ProcessorArchitecture">ProcessorArchitecture</link><br />

         <seealso><p><link topic="isxfunc_ProcessorArchitecture">ProcessorArchitecture</link><br />

 <link topic="isxfunc_IsX64">IsX64</link><br />

 <link topic="isxfunc_IsX64">IsX64</link><br />

 <link topic="isxfunc_IsIA64">IsIA64</link><br />

 <link topic="isxfunc_IsIA64">IsIA64</link><br />

-<link topic="isxfunc_IsARM64">IsARM64</link></p></seealso>

+<link topic="isxfunc_IsArm64">IsArm64</link></p></seealso>

       </function>

       </function>

       <function>

       <function>

         <name>IsX64</name>

         <name>IsX64</name>

@@ -533,7 +533,7 @@ end;</pre></example>
 
         <seealso><p><link topic="isxfunc_ProcessorArchitecture">ProcessorArchitecture</link><br />

         <seealso><p><link topic="isxfunc_ProcessorArchitecture">ProcessorArchitecture</link><br />

 <link topic="isxfunc_IsX86">IsX86</link><br />

 <link topic="isxfunc_IsX86">IsX86</link><br />

 <link topic="isxfunc_IsIA64">IsIA64</link><br />

 <link topic="isxfunc_IsIA64">IsIA64</link><br />

-<link topic="isxfunc_IsARM64">IsARM64</link></p></seealso>

+<link topic="isxfunc_IsArm64">IsArm64</link></p></seealso>

       </function>

       </function>

       <function>

       <function>

         <name>IsIA64</name>

         <name>IsIA64</name>

@@ -543,11 +543,11 @@ end;</pre></example>
 
         <seealso><p><link topic="isxfunc_ProcessorArchitecture">ProcessorArchitecture</link><br />

         <seealso><p><link topic="isxfunc_ProcessorArchitecture">ProcessorArchitecture</link><br />

 <link topic="isxfunc_IsX86">IsX86</link><br />

 <link topic="isxfunc_IsX86">IsX86</link><br />

 <link topic="isxfunc_IsX64">IsX64</link><br />

 <link topic="isxfunc_IsX64">IsX64</link><br />

-<link topic="isxfunc_IsARM64">IsARM64</link></p></seealso>

+<link topic="isxfunc_IsArm64">IsArm64</link></p></seealso>

       </function>

       </function>

       <function>

       <function>

-        <name>IsARM64</name>

-        <prototype>function IsARM64: Boolean;</prototype>

+        <name>IsArm64</name>

+        <prototype>function IsArm64: Boolean;</prototype>

         <description><p>Returns True if the native processor architecture is arm64.</p>

         <description><p>Returns True if the native processor architecture is arm64.</p>

 <p>This function is a shorthand for <link topic="isxfunc_ProcessorArchitecture">ProcessorArchitecture</link>. Be sure to read the <link topic="isxfunc_ProcessorArchitecture">ProcessorArchitecture</link> topic before using this function.</p></description>

 <p>This function is a shorthand for <link topic="isxfunc_ProcessorArchitecture">ProcessorArchitecture</link>. Be sure to read the <link topic="isxfunc_ProcessorArchitecture">ProcessorArchitecture</link> topic before using this function.</p></description>

         <seealso><p><link topic="isxfunc_ProcessorArchitecture">ProcessorArchitecture</link><br />

         <seealso><p><link topic="isxfunc_ProcessorArchitecture">ProcessorArchitecture</link><br />

+ 9 - 9
Projects/Src/Main.pas
View File 

@@ -4402,7 +4402,7 @@ begin
 
     4. GetSystemWow64DirectoryA is available.

     4. GetSystemWow64DirectoryA is available.

     5. RegDeleteKeyExA is available.

     5. RegDeleteKeyExA is available.

     The system does not have to be one of the known 64-bit architectures

     The system does not have to be one of the known 64-bit architectures

-    (AMD64, IA64, ARM64) to be considered a "Win64" system. }

+    (AMD64, IA64, Arm64) to be considered a "Win64" system. }

 

 

   IsWin64 := False;

   IsWin64 := False;

 

 

@@ -4415,7 +4415,7 @@ begin
 
       IMAGE_FILE_MACHINE_I386: ProcessorArchitecture := paX86;

       IMAGE_FILE_MACHINE_I386: ProcessorArchitecture := paX86;

       IMAGE_FILE_MACHINE_IA64: ProcessorArchitecture := paIA64;

       IMAGE_FILE_MACHINE_IA64: ProcessorArchitecture := paIA64;

       IMAGE_FILE_MACHINE_AMD64: ProcessorArchitecture := paX64;

       IMAGE_FILE_MACHINE_AMD64: ProcessorArchitecture := paX64;

-      IMAGE_FILE_MACHINE_ARM64: ProcessorArchitecture := paARM64;

+      IMAGE_FILE_MACHINE_ARM64: ProcessorArchitecture := paArm64;

     else

     else

       ProcessorArchitecture := paUnknown;

       ProcessorArchitecture := paUnknown;

     end;

     end;

@@ -4435,7 +4435,7 @@ begin
 
       PROCESSOR_ARCHITECTURE_INTEL: ProcessorArchitecture := paX86;

       PROCESSOR_ARCHITECTURE_INTEL: ProcessorArchitecture := paX86;

       PROCESSOR_ARCHITECTURE_IA64: ProcessorArchitecture := paIA64;

       PROCESSOR_ARCHITECTURE_IA64: ProcessorArchitecture := paIA64;

       PROCESSOR_ARCHITECTURE_AMD64: ProcessorArchitecture := paX64;

       PROCESSOR_ARCHITECTURE_AMD64: ProcessorArchitecture := paX64;

-      PROCESSOR_ARCHITECTURE_ARM64: ProcessorArchitecture := paARM64;

+      PROCESSOR_ARCHITECTURE_ARM64: ProcessorArchitecture := paArm64;

     else

     else

       ProcessorArchitecture := paUnknown;

       ProcessorArchitecture := paUnknown;

     end;

     end;

@@ -4453,10 +4453,10 @@ begin
 
       (but not paX86 in a future x64 build of Inno Setup if Windows was installed

       (but not paX86 in a future x64 build of Inno Setup if Windows was installed

        without support for x86 binaries (which is possible with Windows Server))

        without support for x86 binaries (which is possible with Windows Server))

     - Itanium: [paX86, paIA64]

     - Itanium: [paX86, paIA64]

-    - Arm64 Windows 10: [paX86, paARM64, paARM32]

-      (ARM32 support detected, not just assumed)

-    - Arm64 Windows 11: [paX86, paX64, paARM64, paARM32]

-      (X64 and ARM32 support detected, not just assumed) }

+    - Arm64 Windows 10: [paX86, paArm64, paArm32]

+      (Arm32 support detected, not just assumed)

+    - Arm64 Windows 11: [paX86, paX64, paArm64, paArm32]

+      (X64 and Arm32 support detected, not just assumed) }

 

 

   {$IFDEF CPUX86}

   {$IFDEF CPUX86}

   MachineTypesSupportedBySystem := [paX86];

   MachineTypesSupportedBySystem := [paX86];

@@ -4473,7 +4473,7 @@ begin
 
     var MachineTypeAttributes: Integer;

     var MachineTypeAttributes: Integer;

     if (GetMachineTypeAttributesFunc(IMAGE_FILE_MACHINE_ARMNT, MachineTypeAttributes) = S_OK) and

     if (GetMachineTypeAttributesFunc(IMAGE_FILE_MACHINE_ARMNT, MachineTypeAttributes) = S_OK) and

        ((MachineTypeAttributes and UserEnabled) <> 0) then

        ((MachineTypeAttributes and UserEnabled) <> 0) then

-      Include(MachineTypesSupportedBySystem, paARM32);

+      Include(MachineTypesSupportedBySystem, paArm32);

     if not (paX64 in MachineTypesSupportedBySystem) and

     if not (paX64 in MachineTypesSupportedBySystem) and

        (GetMachineTypeAttributesFunc(IMAGE_FILE_MACHINE_AMD64, MachineTypeAttributes) = S_OK) and

        (GetMachineTypeAttributesFunc(IMAGE_FILE_MACHINE_AMD64, MachineTypeAttributes) = S_OK) and

        ((MachineTypeAttributes and UserEnabled) <> 0) then

        ((MachineTypeAttributes and UserEnabled) <> 0) then

@@ -4486,7 +4486,7 @@ begin
 
       var MachineIsSupported: BOOL;

       var MachineIsSupported: BOOL;

       if (IsWow64GuestMachineSupportedFunc(IMAGE_FILE_MACHINE_ARMNT, MachineIsSupported) = S_OK) and

       if (IsWow64GuestMachineSupportedFunc(IMAGE_FILE_MACHINE_ARMNT, MachineIsSupported) = S_OK) and

           MachineIsSupported then

           MachineIsSupported then

-        Include(MachineTypesSupportedBySystem, paARM32);

+        Include(MachineTypesSupportedBySystem, paArm32);

     end;

     end;

   end;

   end;

 end;

 end;

+ 1 - 1
Projects/Src/ScriptFunc.pas
View File 

@@ -229,7 +229,7 @@ const
 
     'function IsX64: Boolean;',

     'function IsX64: Boolean;',

     'function IsX64Compatible: Boolean;',

     'function IsX64Compatible: Boolean;',

     'function IsIA64: Boolean;',

     'function IsIA64: Boolean;',

-    'function IsARM64: Boolean;',

+    'function IsArm64: Boolean;',

     'function CustomMessage(const MsgName: String): String;',

     'function CustomMessage(const MsgName: String): String;',

     'function RmSessionStarted: Boolean;',

     'function RmSessionStarted: Boolean;',

     'function RegisterExtraCloseApplicationsResource(const DisableFsRedir: Boolean; const AFilename: String): Boolean;'

     'function RegisterExtraCloseApplicationsResource(const DisableFsRedir: Boolean; const AFilename: String): Boolean;'

+ 1 - 1
Projects/Src/ScriptFunc_R.pas
View File 

@@ -1103,7 +1103,7 @@ begin
 
   end else if Proc.Name = 'ISIA64' then begin

   end else if Proc.Name = 'ISIA64' then begin

     Stack.SetBool(PStart, ProcessorArchitecture = paIA64);

     Stack.SetBool(PStart, ProcessorArchitecture = paIA64);

   end else if Proc.Name = 'ISARM64' then begin

   end else if Proc.Name = 'ISARM64' then begin

-    Stack.SetBool(PStart, ProcessorArchitecture = paARM64);

+    Stack.SetBool(PStart, ProcessorArchitecture = paArm64);

   end else if Proc.Name = 'CUSTOMMESSAGE' then begin

   end else if Proc.Name = 'CUSTOMMESSAGE' then begin

     Stack.SetString(PStart, CustomMessage(Stack.GetString(PStart-1)));

     Stack.SetString(PStart, CustomMessage(Stack.GetString(PStart-1)));

   end else if Proc.Name = 'RMSESSIONSTARTED' then begin

   end else if Proc.Name = 'RMSESSIONSTARTED' then begin

+ 2 - 2
Projects/Src/Struct.pas
View File 

@@ -69,7 +69,7 @@ type
 
   TSetupLanguageDetectionMethod = (ldUILanguage, ldLocale, ldNone);

   TSetupLanguageDetectionMethod = (ldUILanguage, ldLocale, ldNone);

   TSetupCompressMethod = (cmStored, cmZip, cmBzip, cmLZMA, cmLZMA2);

   TSetupCompressMethod = (cmStored, cmZip, cmBzip, cmLZMA, cmLZMA2);

   TSetupSalt = array[0..7] of Byte;

   TSetupSalt = array[0..7] of Byte;

-  TSetupProcessorArchitecture = (paUnknown, paX86, paX64, paIA64, paARM64, paARM32);

+  TSetupProcessorArchitecture = (paUnknown, paX86, paX64, paIA64, paArm64, paArm32);

   TSetupProcessorArchitectures = set of TSetupProcessorArchitecture;

   TSetupProcessorArchitectures = set of TSetupProcessorArchitecture;

   TSetupDisablePage = (dpAuto, dpNo, dpYes);

   TSetupDisablePage = (dpAuto, dpNo, dpYes);

   TSetupPrivilegesRequired = (prNone, prPowerUser, prAdmin, prLowest);

   TSetupPrivilegesRequired = (prNone, prPowerUser, prAdmin, prLowest);

@@ -78,7 +78,7 @@ type
 
   TSetupWizardStyle = (wsClassic, wsModern);

   TSetupWizardStyle = (wsClassic, wsModern);

 const

 const

   SetupProcessorArchitectureNames: array[TSetupProcessorArchitecture] of String =

   SetupProcessorArchitectureNames: array[TSetupProcessorArchitecture] of String =

-    ('Unknown', 'x86', 'x64', 'Itanium', 'ARM64', 'ARM32');

+    ('Unknown', 'x86', 'x64', 'Itanium', 'Arm64', 'Arm32');

 

 

 const

 const

   SetupHeaderStrings = 32;

   SetupHeaderStrings = 32;