Fix Dialog table decompilation.
Fix duplicate NoMinimize attribute and add attributes that were entirely missing. Fixes https://github.com/wixtoolset/issues/issues/7482.
Bob Arnson committed
May 11, 2023 at 22:57 UTC
28ef79b681f9b41f203f3176266ce48a31b435b7
3 files changed
+5
-1
src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+2
-1
@@ -4246,13 +4246,14 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
4246
0 == (attributes & WindowsInstallerConstants.MsidbDialogAttributesVisible) ? new XAttribute("Hidden", "yes") : null,
4247
0 == (attributes & WindowsInstallerConstants.MsidbDialogAttributesModal) ? new XAttribute("Modeless", "yes") : null,
4248
0 == (attributes & WindowsInstallerConstants.MsidbDialogAttributesMinimize) ? new XAttribute("NoMinimize", "yes") : null,
4249
- 0 == (attributes & WindowsInstallerConstants.MsidbDialogAttributesMinimize) ? new XAttribute("NoMinimize", "yes") : null,
4249
WindowsInstallerConstants.MsidbDialogAttributesSysModal == (attributes & WindowsInstallerConstants.MsidbDialogAttributesSysModal) ? new XAttribute("SystemModal", "yes") : null,
4250
WindowsInstallerConstants.MsidbDialogAttributesKeepModeless == (attributes & WindowsInstallerConstants.MsidbDialogAttributesKeepModeless) ? new XAttribute("KeepModeless", "yes") : null,
4251
WindowsInstallerConstants.MsidbDialogAttributesTrackDiskSpace == (attributes & WindowsInstallerConstants.MsidbDialogAttributesTrackDiskSpace) ? new XAttribute("TrackDiskSpace", "yes") : null,
4252
WindowsInstallerConstants.MsidbDialogAttributesUseCustomPalette == (attributes & WindowsInstallerConstants.MsidbDialogAttributesUseCustomPalette) ? new XAttribute("CustomPalette", "yes") : null,
4253
WindowsInstallerConstants.MsidbDialogAttributesLeftScroll == (attributes & WindowsInstallerConstants.MsidbDialogAttributesLeftScroll) ? new XAttribute("LeftScroll", "yes") : null,
4254
WindowsInstallerConstants.MsidbDialogAttributesError == (attributes & WindowsInstallerConstants.MsidbDialogAttributesError) ? new XAttribute("ErrorDialog", "yes") : null,
4255
+ WindowsInstallerConstants.MsidbDialogAttributesRightAligned == (attributes & WindowsInstallerConstants.MsidbDialogAttributesRightAligned) ? new XAttribute("RightAligned", "yes") : null,
4256
+ WindowsInstallerConstants.MsidbDialogAttributesRTLRO == (attributes & WindowsInstallerConstants.MsidbDialogAttributesRTLRO) ? new XAttribute("RightToLeft", "yes") : null,
4257
!row.IsColumnNull(6) ? new XAttribute("Title", row.FieldAsString(6)) : null);
4258
4259
this.UIElement.Add(xDialog);
src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ExpectedUI.wxs
+3
@@ -478,6 +478,9 @@
478
<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Text="{\WixUI_Font_Bigger}Welcome to the [ProductName] Setup Wizard" Transparent="yes" NoPrefix="yes" TabSkip="yes" />
479
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" Disabled="yes" TabSkip="yes" />
480
</Dialog>
481
+ <Dialog Id="TrickyDlg" X="50" Y="50" Width="370" Height="270" NoMinimize="yes" RightAligned="yes" RightToLeft="yes" LeftScroll="yes" Title="Dialog with tricky style bits">
482
+ <Control Id="TrickyText" Type="Text" X="48" Y="15" Width="194" Height="30" Text="This is tricky." TabSkip="no" />
483
+ </Dialog>
484
<RadioButtonGroup Property="WixUIRMOption">
485
<RadioButton Value="UseRM" X="0" Y="0" Width="295" Height="16" Text="&Close the applications and attempt to restart them." />
486
<RadioButton Value="DontUseRM" X="0" Y="20" Width="295" Height="16" Text="&Do not close applications. A reboot will be required." />
src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ui.msi
Binary files a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ui.msi and b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ui.msi differ