Fix #104 (#105)

mlocati · Jan 14, 2023 · a51b2dc · a51b2dc
1 parent 8681006
commit a51b2dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/PhpManager/private/Constants.ps1 b/PhpManager/private/Constants.ps1
@@ -60,6 +60,7 @@ New-Variable -Option Constant -Scope Script -Name 'CACERT_PEM_URL' -Value 'https
 New-Variable -Option Constant -Scope Script -Name 'CACERT_CHECKSUM_URL' -Value 'https://curl.haxx.se/ca/cacert.pem.sha256'
 New-Variable -Option Constant -Scope Script -Name 'CACERT_CHECKSUM_ALGORITHM' -Value 'SHA256'
 
+New-Variable -Option Constant -Scope Script -Name 'STATUS_INVALID_IMAGE_FORMAT' -Value 0xC000007B
 New-Variable -Option Constant -Scope Script -Name 'STATUS_DLL_NOT_FOUND' -Value 0xC0000135
 New-Variable -Option Constant -Scope Script -Name 'ENTRYPOINT_NOT_FOUND' -Value 0xC0000139
 

diff --git a/PhpManager/private/Install-PhpFromUrl.ps1 b/PhpManager/private/Install-PhpFromUrl.ps1
@@ -55,7 +55,7 @@
                     $exeOutput = $_.Exception.Message
                 }
                 $exeExitCode = $LASTEXITCODE
-                if ($exeExitCode -eq $Script:STATUS_DLL_NOT_FOUND -or $exeExitCode -eq $Script:ENTRYPOINT_NOT_FOUND -or $exeOutput -match 'vcruntime.*is not compatible with this PHP build') {
+                if ($exeExitCode -eq $Script:STATUS_DLL_NOT_FOUND -or $exeExitCode -eq $Script:ENTRYPOINT_NOT_FOUND  -or $exeExitCode -eq $Script:STATUS_INVALID_IMAGE_FORMAT -or $exeOutput -match 'vcruntime.*is not compatible with this PHP build') {
                     switch ($PhpVersion.VCVersion) {
                         6 { $redistName = '6' } # PHP 5.2, PHP 5.3
                         7 { $redistName = '2002' }