Update to latest thmutil.
Sean Hall committed
Jul 6, 2020 at 22:07 UTC
4f563d90569c9e87faa6d82925a02b834ddd32c5
12 files changed
+22
-32
global.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0143"
3
+ "WixToolset.Sdk": "4.0.0-build-0144"
4
},
5
"sdk": {
6
"allowPrerelease": false
src/Samples/bafunctions/bafunctions.vcxproj
+2
-2
@@ -4,7 +4,7 @@
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
<Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" />
6
<Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
7
- <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
7
+ <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
8
9
<ItemGroup Label="ProjectConfigurations">
10
<ProjectConfiguration Include="Debug|Win32">
@@ -59,7 +59,7 @@
59
</PropertyGroup>
60
<Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props'))" />
61
<Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
62
- <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
62
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
63
<Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
64
</Target>
65
</Project>
src/Samples/bafunctions/packages.config
+1
-1
@@ -3,5 +3,5 @@
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
5
<package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
6
- <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
6
+ <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/dnchost/dnchost.vcxproj
+2
-2
@@ -6,7 +6,7 @@
6
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
7
<Import Project="..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" />
8
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
9
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
9
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
10
<ItemGroup Label="ProjectConfigurations">
11
<ProjectConfiguration Include="Debug|Win32">
12
<Configuration>Debug</Configuration>
@@ -85,6 +85,6 @@
85
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
86
<Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props'))" />
87
<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
88
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
88
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
89
</Target>
90
</Project>
\ No newline at end of file
src/dnchost/packages.config
+1
-1
@@ -7,5 +7,5 @@
7
<package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="3.1.3" targetFramework="native" />
8
<package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
9
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
10
- <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
10
+ <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
11
</packages>
\ No newline at end of file
src/mbahost/mbahost.vcxproj
+2
-2
@@ -7,7 +7,7 @@
7
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
8
<Import Project="..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" />
9
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
10
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
10
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
11
12
<ItemGroup Label="ProjectConfigurations">
13
<ProjectConfiguration Include="Debug|Win32">
@@ -85,6 +85,6 @@
85
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
86
<Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props'))" />
87
<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
88
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
88
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
89
</Target>
90
</Project>
\ No newline at end of file
src/mbahost/packages.config
+1
-1
@@ -6,5 +6,5 @@
6
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
7
<package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
8
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
9
- <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
9
+ <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
10
</packages>
\ No newline at end of file
src/test/examples/TestEngine/Example.TestEngine.vcxproj
+2
-2
@@ -3,7 +3,7 @@
3
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
<Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" />
5
<Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
6
- <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
6
+ <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
7
<ItemGroup Label="ProjectConfigurations">
8
<ProjectConfiguration Include="Debug|Win32">
9
<Configuration>Debug</Configuration>
@@ -70,6 +70,6 @@
70
<Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
71
<Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props'))" />
72
<Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
73
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
73
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
74
</Target>
75
</Project>
\ No newline at end of file
src/test/examples/TestEngine/packages.config
+1
-1
@@ -3,5 +3,5 @@
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
5
<package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
6
- <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
6
+ <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/wixstdba/WixStandardBootstrapperApplication.cpp
+6
-16
@@ -2300,8 +2300,6 @@ private: // privates
2300
int x = CW_USEDEFAULT;
2301
int y = CW_USEDEFAULT;
2302
POINT ptCursor = { };
2303
- HMONITOR hMonitor = NULL;
2304
- MONITORINFO mi = { };
2303
2304
// If the theme did not provide an icon, try using the icon from the bundle engine.
2305
if (!hIcon)
@@ -2344,20 +2342,12 @@ private: // privates
2342
// Center the window on the monitor with the mouse.
2343
if (::GetCursorPos(&ptCursor))
2344
{
2347
- hMonitor = ::MonitorFromPoint(ptCursor, MONITOR_DEFAULTTONEAREST);
2348
- if (hMonitor)
2349
- {
2350
- mi.cbSize = sizeof(mi);
2351
- if (::GetMonitorInfoW(hMonitor, &mi))
2352
- {
2353
- x = mi.rcWork.left + (mi.rcWork.right - mi.rcWork.left - m_pTheme->nWidth) / 2;
2354
- y = mi.rcWork.top + (mi.rcWork.bottom - mi.rcWork.top - m_pTheme->nHeight) / 2;
2355
- }
2356
- }
2345
+ x = ptCursor.x;
2346
+ y = ptCursor.y;
2347
}
2348
2359
- m_hWnd = ::CreateWindowExW(0, wc.lpszClassName, m_pTheme->sczCaption, dwWindowStyle, x, y, m_pTheme->nWidth, m_pTheme->nHeight, HWND_DESKTOP, NULL, m_hModule, this);
2360
- ExitOnNullWithLastError(m_hWnd, hr, "Failed to create window.");
2349
+ hr = ThemeCreateParentWindow(m_pTheme, 0, wc.lpszClassName, m_pTheme->sczCaption, dwWindowStyle, x, y, HWND_DESKTOP, m_hModule, this, THEME_WINDOW_INITIAL_POSITION_CENTER_MONITOR_FROM_COORDINATES, &m_hWnd);
2350
+ ExitOnFailure(hr, "Failed to create window.");
2351
2352
hr = S_OK;
2353
@@ -2601,7 +2591,7 @@ private: // privates
2591
// OnCreate - finishes loading the theme.
2592
//
2593
BOOL OnCreate(
2604
- __in HWND hWnd
2594
+ __in HWND /*hWnd*/
2595
)
2596
{
2597
HRESULT hr = S_OK;
@@ -2612,7 +2602,7 @@ private: // privates
2602
BA_FUNCTIONS_ONTHEMELOADED_ARGS themeLoadedArgs = { };
2603
BA_FUNCTIONS_ONTHEMELOADED_RESULTS themeLoadedResults = { };
2604
2615
- hr = ThemeLoadControls(m_pTheme, hWnd, vrgInitControls, countof(vrgInitControls));
2605
+ hr = ThemeLoadControls(m_pTheme, vrgInitControls, countof(vrgInitControls));
2606
BalExitOnFailure(hr, "Failed to load theme controls.");
2607
2608
C_ASSERT(COUNT_WIXSTDBA_PAGE == countof(vrgwzPageNames));
src/wixstdba/packages.config
+1
-1
@@ -6,5 +6,5 @@
6
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
7
<package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
8
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
9
- <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
9
+ <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
10
</packages>
\ No newline at end of file
src/wixstdba/wixstdba.vcxproj
+2
-2
@@ -7,7 +7,7 @@
7
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
8
<Import Project="..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" />
9
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
10
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
10
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
11
12
<ItemGroup Label="ProjectConfigurations">
13
<ProjectConfiguration Include="Debug|Win32">
@@ -80,6 +80,6 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command>
80
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
81
<Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props'))" />
82
<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
83
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
83
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
84
</Target>
85
</Project>
\ No newline at end of file