From f242bd973d2ec0097972f7f26c890701aaee72dc Mon Sep 17 00:00:00 2001 From: Homes32 Date: Wed, 31 Aug 2022 11:09:51 -0500 Subject: [PATCH] Fix issue #7 bug with arch selection logic in VC++ 14 runtime --- .../Components/Visual C++/350-VCRedist-14.script | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-14.script b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-14.script index e92bc55..37166ab 100644 --- a/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-14.script +++ b/Projects/PhoenixPE/Components/Visual C++/350-VCRedist-14.script @@ -32,11 +32,11 @@ Title=Visual C++ 14 Runtime Author=Homes32 Description=Allows you to run programs created with Microsoft Visual C++ 2017/2018/2019/2022 -Version=1.3.1.0 +Version=1.3.2.0 Level=4 Selected=False Mandatory=False -Date=2022-08-12 +Date=2022-08-29 [Variables] @@ -48,17 +48,17 @@ If,%SourceArch%,Equal,x64,Begin Decompress,%ProjectTemp%\x86\VC14.7z,%TargetWindows%\SysWOW64 Decompress,%ProjectTemp%\x64\VC14.7z,%TargetSystem32% End -If,%SourceArch%,Equal,arm64,Begin +Else,If,%SourceArch%,Equal,arm64,Begin ExtractFile,%ScriptFile%,x86,VC14.7z,%ProjectTemp%\x86 ExtractFile,%ScriptFile%,arm64,VC14.7z,%ProjectTemp%\x64 Decompress,%ProjectTemp%\x86\VC14.7z,%TargetWindows%\SysWOW64 Decompress,%ProjectTemp%\arm64\VC14.7z,%TargetSystem32% End -Else,If,%SourceArch%,Equal,x86,Begin +Else,Begin + // fallback to x86 ExtractFile,%ScriptFile%,x86,VC14.7z,%ProjectTemp%\x86 Decompress,%ProjectTemp%\x86\VC14.7z,%TargetSystem32% End -Else,Halt,"INTERNAL LOGIC ERROR: Only x86 and x64 sources are supported." [#Interface#] // ===============================================================================================================================