From 4dcde245aee72f7bb52af4525e7e8d23cb7135e7 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Wed, 13 Aug 2025 22:57:52 -0400
Subject: [PATCH] Decompile Scope=perUserOrMachine.

Fixes https://github.com/wixtoolset/issues/issues/9144
---
 .../Decompile/Decompiler.cs                   |   8 ++++++++
 .../DecompileNullComponent/Expected.wxs       |   2 +-
 .../DecompileNullComponent/example.msi        | Bin 32768 -> 32768 bytes
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index 9cc3d88ed..90b07776b 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -3051,10 +3051,18 @@ private void FinalizeSummaryInformationStream(TableIndexedCollection tables)
                                     else
                                     {
                                         var xAllUsers = this.DecompilerHelper.RootElement.Elements(Names.PropertyElement).SingleOrDefault(p => p.Attribute("Id")?.Value == "ALLUSERS");
+                                        var xMsiInstallerPerUser = this.DecompilerHelper.RootElement.Elements(Names.PropertyElement).SingleOrDefault(p => p.Attribute("Id")?.Value == "MSIINSTALLPERUSER");
                                         if (xAllUsers?.Attribute("Value")?.Value == "1")
                                         {
                                             xAllUsers?.Remove();
                                         }
+                                        else if (xAllUsers?.Attribute("Value")?.Value == "2" && xMsiInstallerPerUser?.Attribute("Value")?.Value == "1")
+                                        {
+                                            this.DecompilerHelper.RootElement.SetAttributeValue("Scope", "perUserOrMachine");
+
+                                            xAllUsers?.Remove();
+                                            xMsiInstallerPerUser?.Remove();
+                                        }
                                     }
                                 }
 
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/Expected.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/Expected.wxs
index 3d15dd3e9..1f0dea362 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/Expected.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/Expected.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Codepage="65001" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{047730A5-30FE-4A62-A520-DA9381B8226A}" Version="1.0.0.0" InstallerVersion="200" ProductCode="{6F9B5694-F0F1-437C-919B-0D2DAF2D9DEA}">
+  <Package Codepage="65001" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{047730A5-30FE-4A62-A520-DA9381B8226A}" Version="1.0.0.0" InstallerVersion="200" ProductCode="{6F9B5694-F0F1-437C-919B-0D2DAF2D9DEA}" Scope="perUserOrMachine">
     <StandardDirectory Id="ProgramFilesFolder">
       <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="oekcr5lq">
         <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="" Bitness="always32">
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/example.msi b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileNullComponent/example.msi
index 81335041491df94698631f44b7ce02758388ef5a..42b1d124d015498641728123dcbdd28b91f61285 100644
GIT binary patch
delta 387
zcmZo@U}|V!+Tf$W$TitlL4i$Z-_oNzcP1Ar1Wa~TG-P#TU|>+0{8QmP2P2U69|$Hh
zGO29-qIjMOBtQ9!ivQ%p3Wl3YR0EiKM1e|Jkd!U{qQS^$KKZMrA6Tsb6DuS0<SH#s
zUPex!DiI`=Y#?oCB!FgnZFbS#!@>fxZ8D3&6^?&ED=k2r2L=k0RSX0+3mAUjQ-1lE
zfq@YSSs9qXG*AHp2N1F{Fat@DW`@nl4tE(RA8>Zq?BLYEIN8D1VUvpk=i~<88fHNT
z#?AkI8JQ*(ILH`<Bqrsg8U_^Q7o--IRE8zyl%_iR_=E<#1_f`H4wx??=o{?m=@%RV
z6bx_;0*P-vlVQR>*`Yv!>3{!Zg#xL`dIfBnOsy=9ERF08oDAFyybSydf(*h8q73_i
jZsB6!Vc=sBU=RZOSd4*rb8^8{CUyl#IB))6#K;Q()VytW

delta 360
zcmZo@U}|V!+Tf$W$T-<oL4j?n7z6*=Ym<u=0wz1F8cr5qVqsL6{8QolWDgac&0iGH
zGx0KVF)%QQ0`Y$!n9RteGWm;&|K!68hMP-N1DJV4fHEvdvWvfHFfv+9{;KK6%g6~8
zhv}STz{2#0X>yg8CrCdVNZT$6ppjmiU9|VGu>1pAz+!NP!yG69<~%S^U~vR;HnSN1
z;ge@);AG%t;AP-v5M&SrI*EgUi-CuMk3oPzh(Uxw3}}#|^2@(K<v_s7zyx6cNe&=n
zWnc!9j3BsK+2JnZW(TJR#z{^Nn_L_?Cm(QjnC#$N!<@#Dwt2rVBa?JUVp2|OKv8}{
zYEemLSYl3Ts-urjXs~Ngu;FHzfcX-er$)H3Pd?!9FsVRda)g7%=7xd_CU${7aA0o!
IU&P1@0LPhYNB{r;