Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIXBUG:2691 - Extend horizontal lines by 3 pixels #535

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

WIXBUG:2691 - Extend horizontal lines by 3 pixels #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
31c5830
WiX v3.11.1
robmen Nov 18, 2017
19b5f04
When elevated place clean room in system Temp folder
robmen Nov 18, 2017
eb1da27
WixBuild: Version 3.11.1.2318
wixbot Nov 18, 2017
d7bb699
WiX v3.11.2
robmen Sep 15, 2019
cff610d
Sign binaries redistrubted with customers' bundles
heaths Mar 18, 2019
bedf8fb
Use ShouldSignObject in projects directly
heaths Mar 20, 2019
7b64563
Add history entry for signing service support
robmen Apr 8, 2019
3b16f67
Prevent Zip Slip when using ArchiveFileStreamContext to decompress
robmen Sep 12, 2019
14fa226
Fixes Zip Slip fix break when using ArchiveFileStreamContext to compress
robmen Sep 16, 2019
2c19a69
Refine build order in light of MSBuild ProjectReference protocol changes
robmen Sep 17, 2019
473562c
WixBuild: Version 3.11.2.4516
wixbot Sep 17, 2019
add0a0a
WIXBUG:2691 - Extend horizontal lines by 3 pixels
Coder686375 Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions History.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## WixBuild: Version 3.11.2.4516

* HeathS: Add support for .NET Foundation signing service

* RobMen: WIXBUG:6075 - Fix "Zip Slip" vulnerability in DTF.

## WixBuild: Version 3.11.1.2318

* RobMen - WIXBUG:5724 - fix DLL hijack of clean room when bundle launched elevated.

## WixBuild: Version 3.11.0.1701

* RobMen: WIXBUG:5536 - introduce wix.nativeca.targets to simplify CPP CA projects.
Expand Down
1 change: 1 addition & 0 deletions src/DTF/Libraries/Compression.Cab/Compression.Cab.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<CreateDocumentationFile>true</CreateDocumentationFile>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FxCopEnabled>false</FxCopEnabled>
<ShouldSignOutput>true</ShouldSignOutput>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/DTF/Libraries/Compression.Zip/Compression.Zip.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<AssemblyName>Microsoft.Deployment.Compression.Zip</AssemblyName>
<CreateDocumentationFile>true</CreateDocumentationFile>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<ShouldSignOutput>true</ShouldSignOutput>
</PropertyGroup>

<ItemGroup>
Expand Down
12 changes: 12 additions & 0 deletions src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,8 @@ private string TranslateFilePath(string path)
}
else
{
this.ValidateArchivePath(path);

filePath = path;
}

Expand All @@ -647,6 +649,16 @@ private string TranslateFilePath(string path)
return filePath;
}

private void ValidateArchivePath(string filePath)
{
string basePath = Path.GetFullPath(String.IsNullOrEmpty(this.directory) ? Environment.CurrentDirectory : this.directory);
string path = Path.GetFullPath(Path.Combine(basePath, filePath));
if (!path.StartsWith(basePath, StringComparison.InvariantCultureIgnoreCase))
{
throw new InvalidDataException("Archive cannot contain files with absolute or traversal paths.");
}
}

#endregion
}
}
1 change: 1 addition & 0 deletions src/DTF/Libraries/Compression/Compression.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<CreateDocumentationFile>true</CreateDocumentationFile>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FxCopEnabled>false</FxCopEnabled>
<ShouldSignOutput>true</ShouldSignOutput>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/DTF/Libraries/Resources/Resources.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<AssemblyName>Microsoft.Deployment.Resources</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<CreateDocumentationFile>true</CreateDocumentationFile>
<ShouldSignOutput>true</ShouldSignOutput>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/DTF/Libraries/WindowsInstaller.Linq/WindowsInstaller.Linq.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<AssemblyName>Microsoft.Deployment.WindowsInstaller.Linq</AssemblyName>
<CreateDocumentationFile>true</CreateDocumentationFile>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<ShouldSignOutput>true</ShouldSignOutput>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/DTF/Libraries/WindowsInstaller.Package/WindowsInstaller.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<AssemblyName>Microsoft.Deployment.WindowsInstaller.Package</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<CreateDocumentationFile>true</CreateDocumentationFile>
<ShouldSignOutput>true</ShouldSignOutput>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/DTF/Libraries/WindowsInstaller/WindowsInstaller.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<AssemblyName>Microsoft.Deployment.WindowsInstaller</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<CreateDocumentationFile>true</CreateDocumentationFile>
<ShouldSignOutput>true</ShouldSignOutput>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/DTF/Tools/SfxCA/SfxCA.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<TargetName>SfxCA</TargetName>
<CharacterSet>Unicode</CharacterSet>
<ProjectModuleDefinitionFile>EntryPoints.def</ProjectModuleDefinitionFile>
<ShouldSignOutput>true</ShouldSignOutput>
</PropertyGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.props" />
Expand Down
18 changes: 17 additions & 1 deletion src/burn/engine/cache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,13 +1104,29 @@ static HRESULT CalculateWorkingFolder(
{
HRESULT hr = S_OK;
RPC_STATUS rs = RPC_S_OK;
BOOL fElevated = FALSE;
WCHAR wzTempPath[MAX_PATH] = { };
UUID guid = {};
WCHAR wzGuid[39];

if (!vsczWorkingFolder)
{
if (0 == ::GetTempPathW(countof(wzTempPath), wzTempPath))
ProcElevated(::GetCurrentProcess(), &fElevated);

if (fElevated)
{
if (!::GetWindowsDirectoryW(wzTempPath, countof(wzTempPath)))
{
ExitWithLastError(hr, "Failed to get windows path for working folder.");
}

hr = PathFixedBackslashTerminate(wzTempPath, countof(wzTempPath));
ExitOnFailure(hr, "Failed to ensure windows path for working folder ended in backslash.");

hr = ::StringCchCatW(wzTempPath, countof(wzTempPath), L"Temp\\");
ExitOnFailure(hr, "Failed to concat Temp directory on windows path for working folder.");
}
else if (0 == ::GetTempPathW(countof(wzTempPath), wzTempPath))
{
ExitWithLastError(hr, "Failed to get temp path for working folder.");
}
Expand Down
1 change: 1 addition & 0 deletions src/ext/BalExtension/mba/core/core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<CreateDocumentationFile>true</CreateDocumentationFile>
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<FxCopEnabled>true</FxCopEnabled>
<ShouldSignOutput>true</ShouldSignOutput>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions src/ext/DifxAppExtension/difxapp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@

<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<ItemGroup>
<ProjectReference Include="wixlib\DIFxAppExtension.wixproj">
<Properties>Platform=x86</Properties>
</ProjectReference>
<ProjectReference Include="wixlib\DIFxAppExtension.wixproj">
<Properties>Platform=x64</Properties>
</ProjectReference>
<ProjectReference Include="wixext\WixDifxAppExtension.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/ext/UIExtension/wixlib/AdvancedWelcomeEulaDlg.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<UI>
<Dialog Id="AdvancedWelcomeEulaDlg" Width="370" Height="270" Title="!(loc.AdvancedWelcomeEulaDlg_Title)">
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.AdvancedWelcomeEulaDlgBannerBitmap)" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
<Control Id="Title" Type="Text" X="20" Y="10" Width="300" Height="24" Transparent="yes" NoPrefix="yes" Text="!(loc.AdvancedWelcomeEulaDlgTitle)" />
<Control Id="DescriptionPerMachine" Type="Text" X="20" Y="202" Width="330" Height="31" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.AdvancedWelcomeEulaDlgDescriptionPerMachine)">
<Condition Action="show">ALLUSERS</Condition>
Expand Down
4 changes: 2 additions & 2 deletions src/ext/UIExtension/wixlib/BrowseDlg.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<Control Id="DirectoryList" Type="DirectoryList" X="25" Y="83" Width="320" Height="98" Property="_BrowseProperty" Sunken="yes" Indirect="yes" TabSkip="no" />
<Control Id="PathLabel" Type="Text" X="25" Y="190" Width="320" Height="10" TabSkip="no" Text="!(loc.BrowseDlgPathLabel)" />
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.BrowseDlgBannerBitmap)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.BrowseDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.BrowseDlgTitle)" />
</Dialog>
Expand Down
4 changes: 2 additions & 2 deletions src/ext/UIExtension/wixlib/CustomizeDlg.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
</Control>
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.CustomizeDlgBannerBitmap)" />
<Control Id="Text" Type="Text" X="25" Y="55" Width="320" Height="20" Text="!(loc.CustomizeDlgText)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgTitle)" />
<Control Id="Box" Type="GroupBox" X="210" Y="81" Width="150" Height="118" />
Expand Down
4 changes: 2 additions & 2 deletions src/ext/UIExtension/wixlib/DiskCostDlg.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</Control>
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.DiskCostDlgBannerBitmap)" />
<Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="50" Text="!(loc.DiskCostDlgText)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
<Control Id="Description" Type="Text" X="20" Y="20" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.DiskCostDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.DiskCostDlgTitle)" />
<Control Id="VolumeList" Type="VolumeCostList" X="20" Y="100" Width="330" Height="120" Sunken="yes" Fixed="yes" Remote="yes" Text="!(loc.DiskCostDlgVolumeList)" />
Expand Down
2 changes: 1 addition & 1 deletion src/ext/UIExtension/wixlib/ExitDialog.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
<Control Id="OptionalText" Type="Text" X="135" Y="110" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]">
Expand Down
2 changes: 1 addition & 1 deletion src/ext/UIExtension/wixlib/FatalError.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.FatalErrorBitmap)" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.FatalErrorTitle)" />
<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Text="!(loc.FatalErrorDescription1) !(loc.FatalErrorDescription2)" />
</Dialog>
Expand Down
4 changes: 2 additions & 2 deletions src/ext/UIExtension/wixlib/FeaturesDlg.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
</Control>
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.FeaturesDlgBannerBitmap)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.FeaturesDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.FeaturesDlgTitle)" />
<Control Id="ItemDescription" Type="Text" X="20" Y="180" Width="330" Height="24" Transparent="yes" NoPrefix="yes" Text="!(loc.FeaturesDlgItemDescription)">
Expand Down
4 changes: 2 additions & 2 deletions src/ext/UIExtension/wixlib/FilesInUse.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
</Control>
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.FilesInUseBannerBitmap)" />
<Control Id="Text" Type="Text" X="20" Y="55" Width="330" Height="30" Text="!(loc.FilesInUseText)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
<Control Id="Description" Type="Text" X="20" Y="23" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.FilesInUseDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.FilesInUseTitle)" />
<Control Id="List" Type="ListBox" X="20" Y="87" Width="330" Height="130" Property="FileInUseProcess" Sunken="yes" TabSkip="yes" />
Expand Down
4 changes: 2 additions & 2 deletions src/ext/UIExtension/wixlib/InstallDirDlg.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />

<Control Id="FolderLabel" Type="Text" X="20" Y="60" Width="290" Height="30" NoPrefix="yes" Text="!(loc.InstallDirDlgFolderLabel)" />
<Control Id="Folder" Type="PathEdit" X="20" Y="100" Width="320" Height="18" Property="WIXUI_INSTALLDIR" Indirect="yes" />
Expand Down
4 changes: 2 additions & 2 deletions src/ext/UIExtension/wixlib/InstallScopeDlg.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<UI>
<Dialog Id="InstallScopeDlg" Width="370" Height="270" Title="!(loc.InstallScopeDlg_Title)" KeepModeless="yes">
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallScopeDlgBannerBitmap)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallScopeDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallScopeDlgTitle)" />
<Control Id="BothScopes" Type="RadioButtonGroup" X="20" Y="55" Width="330" Height="120" Property="WixAppFolder" Hidden="yes">
Expand Down
4 changes: 2 additions & 2 deletions src/ext/UIExtension/wixlib/LicenseAgreementDlg.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<UI>
<Dialog Id="LicenseAgreementDlg" Width="370" Height="270" Title="!(loc.LicenseAgreementDlg_Title)">
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgTitle)" />
<Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="207" Width="330" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.LicenseAgreementDlgLicenseAcceptedCheckBox)" />
Expand Down
4 changes: 2 additions & 2 deletions src/ext/UIExtension/wixlib/MaintenanceTypeDlg.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
</Control>
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.MaintenanceTypeDlgBannerBitmap)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgTitle)" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="340" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgDescription)" />
</Dialog>
Expand Down
2 changes: 1 addition & 1 deletion src/ext/UIExtension/wixlib/MaintenanceWelcomeDlg.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</Control>
<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.MaintenanceWelcomeDlgBitmap)" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceWelcomeDlgTitle)" />
<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceWelcomeDlgDescription)" />
</Dialog>
Expand Down
Loading