From 56b5d04a85888e350d17cd0bd537e1d44cf71fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sat, 7 Feb 2026 21:50:18 +0100
Subject: [PATCH] fix

---
 .github/workflows/main.yml       | 14 ++++++-----
 wix/Build_Base.cmd               | 43 ++++++++++++++++----------------
 wix/Build_Debug.cmd              |  2 +-
 wix/Build_Release.cmd            |  2 +-
 wix/CreateEmbedLangTransform.cmd | 13 +++++-----
 5 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c9d127e51..0f887e175 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -458,7 +458,8 @@ jobs:
           & $signtool verify /pa /v "dist/ffdec.exe"   
         
         
-      - name: Add Msi tools to PATH
+      - name: Get Msi tools path
+        id: msitools
         shell: pwsh
         run: |
           $candidates = Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\bin" `
@@ -478,9 +479,10 @@ jobs:
           }
 
           $path = $x86 | Sort-Object FullName -Descending | Select-Object -First 1
-          $path = Split-Path $path -Parent
+          #$path = Split-Path $path -Parent
           
-          Add-Content $env:GITHUB_PATH $path
+          "path=$path" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          #Add-Content $env:GITHUB_PATH $path
       
       - name: Inject version info
         shell: pwsh
@@ -496,10 +498,10 @@ jobs:
         shell: pwsh
         working-directory: wix
         run: |
-            .\Build_Release.cmd
+            .\Build_Release.cmd "${{ steps.msitools.outputs.path }}"
             
       - name: Sign MSI with KMS key
-        shell: pwsh        
+        shell: pwsh
         run: |      
           $signtool = "${{ steps.signtool.outputs.path }}"
           $kc = "projects/$env:GCP_PROJECT_ID/locations/$env:GCP_LOCATION/keyRings/$env:KMS_KEYRING/cryptoKeys/$env:KMS_KEY/cryptoKeyVersions/$env:KMS_KEY_VERSION"
@@ -511,7 +513,7 @@ jobs:
             /csp "Google Cloud KMS Provider" `
             /kc "$kc" `
             "wix/bin/Release/FFDec.msi"
-            
+                      
       - name: Verify MSI signature
         shell: pwsh
         run: |
diff --git a/wix/Build_Base.cmd b/wix/Build_Base.cmd
index 2803725a2..014208c87 100644
--- a/wix/Build_Base.cmd
+++ b/wix/Build_Base.cmd
@@ -1,5 +1,6 @@
 set MsiName=FFDec
-set BuildType=%1
+set MsiToolsPath=%1
+set BuildType=%2
 pwsh -File GenerateExtensions.ps1
 rd /s /q bin
 rd /s /q obj
@@ -8,27 +9,27 @@ if errorlevel 1 exit /b %errorlevel%
 
 if exist %MsiName%.msi del %MsiName%.msi
 copy bin\%BuildType%\en-US\%MsiName%.msi bin\%BuildType%\%MSiName%.msi
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% cs-CZ 1029
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% cs-CZ 1029
 goto after
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% ca-ES 1027
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% de-DE 1031
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% es-ES 1034
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% fr-FR 1036
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% hu-HU 1038
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% it-IT 1040
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% ja-JP 1041
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% nl-NL 1043
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% pl-PL 1045
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% pt-BR 1046
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% pt-PT 2070
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% ru-RU 1049
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% sk-SK 1051
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% sl-SI 1060
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% sv-SE 1053
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% tr-TR 1055
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% uk-UA 1058
-call CreateEmbedLangTransform.cmd %MsiName% %BuildType% zh-CN 2052
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% ca-ES 1027
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% de-DE 1031
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% es-ES 1034
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% fr-FR 1036
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% hu-HU 1038
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% it-IT 1040
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% ja-JP 1041
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% nl-NL 1043
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% pl-PL 1045
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% pt-BR 1046
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% pt-PT 2070
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% ru-RU 1049
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% sk-SK 1051
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% sl-SI 1060
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% sv-SE 1053
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% tr-TR 1055
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% uk-UA 1058
+call CreateEmbedLangTransform.cmd "%MsiToolsPath%" %MsiName% %BuildType% zh-CN 2052
 :after
-msiinfo.exe bin\%BuildType%\%MsiName%.msi /p Intel;1033,1027,1029,1031,1034,1036,1038,1040,1041,1043,1045,1046,2070,1049,1051,1060,1053,1055,1058,2052 /t "JPEXS Free Flash Decompiler"
+"%MsiToolsPath%\msiinfo.exe" bin\%BuildType%\%MsiName%.msi /p Intel;1033,1027,1029,1031,1034,1036,1038,1040,1041,1043,1045,1046,2070,1049,1051,1060,1053,1055,1058,2052 /t "JPEXS Free Flash Decompiler"
 
 
diff --git a/wix/Build_Debug.cmd b/wix/Build_Debug.cmd
index 36c151c43..eba3601b3 100644
--- a/wix/Build_Debug.cmd
+++ b/wix/Build_Debug.cmd
@@ -1 +1 @@
-call Build_Base.cmd Debug
\ No newline at end of file
+call Build_Base.cmd "%1" Debug
\ No newline at end of file
diff --git a/wix/Build_Release.cmd b/wix/Build_Release.cmd
index 092dd442e..3c8af0727 100644
--- a/wix/Build_Release.cmd
+++ b/wix/Build_Release.cmd
@@ -1 +1 @@
-call Build_Base.cmd Release
\ No newline at end of file
+call Build_Base.cmd "%1" Release
\ No newline at end of file
diff --git a/wix/CreateEmbedLangTransform.cmd b/wix/CreateEmbedLangTransform.cmd
index 72480671c..0ae34ab22 100644
--- a/wix/CreateEmbedLangTransform.cmd
+++ b/wix/CreateEmbedLangTransform.cmd
@@ -1,8 +1,9 @@
-set MsiName=%1
-set BuildType=%2
-set lang=%3
-set langcode=%4
+set MsiToolsPath=%1
+set MsiName=%2
+set BuildType=%3
+set lang=%4
+set langcode=%5
 
-msitran.exe -g bin\%BuildType%\en-US\%MsiName%.msi bin\%BuildType%\%lang%\%MsiName%.msi %langcode%
-msidb.exe -d bin\%BuildType%\%MsiName%.msi -r %langcode%
+"%MsiToolsPath%\msitran.exe" -g bin\%BuildType%\en-US\%MsiName%.msi bin\%BuildType%\%lang%\%MsiName%.msi %langcode%
+"%MsiToolsPath%\msidb.exe" -d bin\%BuildType%\%MsiName%.msi -r %langcode%
 del %langcode%
\ No newline at end of file