Upgrade to UIforETW 1.57, install Windows 22H2 WPT

In order to support > 4 Gib PDBs the 22H2 version of Windows Performance Toolkit is needed. This is version 10.0.22621.755 of xperf.exe, and version 11.1.5.2 of WPA.
google · Mar 7, 2023 · 495b9f3 · 495b9f3
1 parent 2f9de79
commit 495b9f3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/UIforETW/UIforETWDlg.cpp b/UIforETW/UIforETWDlg.cpp
@@ -437,8 +437,8 @@ BOOL CUIforETWDlg::OnInitDialog()
 
 	auto xperfVersion = GetFileVersion(GetXperfPath());
 	constexpr int64_t requiredXperfVersion = (10llu << 48) + 0 + (10586llu << 16) + (15llu << 0);
-	// Windows 10 spring 2019 version, 10.0.18362.1 - requires Windows 8 or higher?
-	constexpr int64_t preferredXperfVersion = (10llu << 48) + 0 + (22000llu << 16) + (194llu << 0);
+	// Windows 11 22H2 version, requires Windows 8 or higher?
+	constexpr int64_t preferredXperfVersion = (10llu << 48) + 0 + (22621llu << 16) + (755llu << 0);
 
 	wchar_t systemDir[MAX_PATH];
 	systemDir[0] = 0;
@@ -454,8 +454,8 @@ BOOL CUIforETWDlg::OnInitDialog()
 		{
 			const std::wstring installPath10[] =
 			{
-				CanonicalizePath(GetExeDir() + L"..\\third_party\\wpt10\\WPTx64 (OnecoreUAP)-x86_en-us.msi"),
-				CanonicalizePath(GetExeDir() + L"..\\third_party\\wpt10\\WPTx64 (DesktopEditions)-x86_en-us.msi"),
+				CanonicalizePath(GetExeDir() + L"..\\third_party\\wpt10\\WPTx64 (OnecoreUAP)-x64_en-us.msi"),
+				CanonicalizePath(GetExeDir() + L"..\\third_party\\wpt10\\WPTx64 (DesktopEditions)-x64_en-us.msi"),
 			};
 			if (PathFileExists(installPath10[0].c_str()) && PathFileExists(installPath10[1].c_str()))
 			{

diff --git a/UIforETW/Version.h b/UIforETW/Version.h
@@ -5,7 +5,7 @@
 // that is included hundreds of times.
 // constexpr might help avoid that, but then it breaks my fragile upgrade-needed
 // detection code, so this should be left as const.
-const float kCurrentVersion = 1.56f;
+const float kCurrentVersion = 1.57f;
 
 // Put a "#define VERSION_SUFFIX 'b'" line here to add a minor version
 // increment that won't trigger the new-version checks, handy for minor

diff --git a/package_etw.bat b/package_etw.bat
@@ -17,9 +17,9 @@ mkdir %destdir%\third_party
 mkdir %symboldir%
 
 @rem Prerequisite for the WPT installer
-set wptredistmsi1=Windows Performance Toolkit\Redistributables\WPTx64 (OnecoreUAP)-x86_en-us.msi
+set wptredistmsi1=Windows Performance Toolkit\Redistributables\WPTx64 (OnecoreUAP)-x64_en-us.msi
 @rem The WPT installer
-set wptredistmsi2=Windows Performance Toolkit\Redistributables\WPTx64 (DesktopEditions)-x86_en-us.msi
+set wptredistmsi2=Windows Performance Toolkit\Redistributables\WPTx64 (DesktopEditions)-x64_en-us.msi
 
 set wpt10=c:\Program Files (x86)\Windows Kits\10\
 if not exist "%wpt10%%wptredistmsi1%" goto nowpt10