Replace EULA printing custom action with MsiPrint.

Fixes https://github.com/wixtoolset/issues/issues/8580

16 files changed, 42 insertions, 626 deletions

diff --git a/src/ext/UI/ca/PrintEula.cpp b/src/ext/UI/ca/PrintEula.cpp
deleted file mode 100644
index b19de9a6..00000000
--- a/src/ext/UI/ca/PrintEula.cpp
+++ /dev/null
@@ -1,556 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-#include "precomp.h"
-
-// Constants
-LPCWSTR vcsEulaQuery = L"SELECT `Text` FROM `Control` WHERE `Control`='LicenseText'";
-
-
-enum eEulaQuery { eqText = 1};
-const int IDM_POPULATE = 100;
-const int IDM_PRINT = 101;
-const int CONTROL_X_COORDINATE = 0;
-const int CONTROL_Y_COORDINATE = 0;
-const int CONTROL_WIDTH = 500;
-const int CONTROL_HEIGHT = 500;
-const int ONE_INCH = 1440; // 1440 TWIPS = 1 inch.
-const int TEXT_RECORD_POS = 1;
-const int STRING_CAPACITY = 512;
-const int NO_OF_COPIES = 1;
-const LPWSTR WINDOW_CLASS = L"PrintEulaRichText";
-
-//Forward declarations of functions, check the function definitions for the comments
-static LRESULT CALLBACK WndProc(__in HWND hWnd, __in UINT message, __in WPARAM wParam, __in LPARAM lParam);
-static HRESULT ReadEulaText(__in MSIHANDLE hInstall, __out LPSTR* ppszEulaText);
-static DWORD CALLBACK ReadStreamCallback(__in DWORD Cookie, __out LPBYTE pbBuff, __in LONG cb, __out LONG FAR *pcb);
-static HRESULT CreateRichTextWindow(__out HWND* phWndMain, __out BOOL* pfRegisteredClass);
-static HRESULT PrintRichText(__in HWND hWndMain);
-static void Print(__in_opt HWND hWnd);
-static void LoadEulaText(__in_opt HWND hWnd);
-static void ShowErrorMessage(__in HRESULT hr);
-
-//Global variables
-PRINTDLGEXW* vpPrintDlg = NULL; //Parameters for print (needed on both sides of WndProc callbacks)
-LPSTR vpszEulaText = NULL;
-LPCWSTR vwzRichEditClass = NULL;
-HRESULT vhr = S_OK; //Global hr, used by the functions called from WndProc to set errorcode
-
-
-/********************************************************************
- PrintEula - Custom Action entry point
-
-********************************************************************/
-extern "C" UINT __stdcall PrintEula(MSIHANDLE hInstall)
-{
-    //AssertSz(FALSE, "Debug PrintEula");
-
-    HRESULT hr = S_OK;
-    HWND hWndMain = NULL;
-    HMODULE hRichEdit = NULL;
-    BOOL fRegisteredClass = FALSE;
-
-    hr = WcaInitialize(hInstall, "PrintEula");
-    ExitOnFailure(hr, "failed to initialize");
-
-    // Initialize then display print dialog.
-    vpPrintDlg = (PRINTDLGEXW*)GlobalAlloc(GPTR, sizeof(PRINTDLGEXW)); // MSDN says to allocate on heap.
-    ExitOnNullWithLastError(vpPrintDlg, hr, "Failed to allocate memory for print dialog struct.");
-
-    vpPrintDlg->lStructSize = sizeof(PRINTDLGEX);
-    vpPrintDlg->hwndOwner = ::FindWindowW(L"MsiDialogCloseClass", NULL);
-    vpPrintDlg->Flags = PD_RETURNDC | PD_COLLATE | PD_NOCURRENTPAGE | PD_ALLPAGES | PD_NOPAGENUMS | PD_NOSELECTION;
-    vpPrintDlg->nCopies = NO_OF_COPIES;
-    vpPrintDlg->nStartPage = START_PAGE_GENERAL;
-
-    hr = ::PrintDlgExW(vpPrintDlg);
-    ExitOnFailure(hr, "Failed to show print dialog");
-
-    // If user said they want to print.
-    if (PD_RESULT_PRINT == vpPrintDlg->dwResultAction)
-    {
-        // Get the stream for Eula
-        hr = ReadEulaText(hInstall, &vpszEulaText);
-        ExitOnFailure(hr, "failed to read Eula text from MSI database");
-
-        // Have to load Rich Edit since we'll be creating a Rich Edit control in the window
-        hr = LoadSystemLibrary(L"Msftedit.dll", &hRichEdit);
-        if (SUCCEEDED(hr))
-        {
-            vwzRichEditClass = MSFTEDIT_CLASS;
-        }
-        else
-        {
-            hr = LoadSystemLibrary(L"Riched20.dll", &hRichEdit);
-            ExitOnFailure(hr, "failed to load rich edit 2.0 library");
-
-            vwzRichEditClass = RICHEDIT_CLASSW;
-        }
-
-        hr = CreateRichTextWindow(&hWndMain, &fRegisteredClass);
-        ExitOnFailure(hr, "failed to create rich text window for printing");
-
-        hr = PrintRichText(hWndMain);
-        if (FAILED(hr)) // Since we've already shown the print dialog, we better show them a dialog explaining why it didn't print
-        {
-            ShowErrorMessage(hr);
-        }
-    }
-
-LExit:
-    ReleaseNullStr(vpszEulaText);
-    if (vpPrintDlg)
-    {
-        if (vpPrintDlg->hDevMode)
-        {
-            ::GlobalFree(vpPrintDlg->hDevMode);
-        }
-
-        if (vpPrintDlg->hDevNames)
-        {
-            ::GlobalFree(vpPrintDlg->hDevNames);
-        }
-
-        if (vpPrintDlg->hDC)
-        {
-            ::DeleteDC(vpPrintDlg->hDC);
-        }
-
-        ::GlobalFree(vpPrintDlg);
-        vpPrintDlg = NULL;
-    }
-
-    if (fRegisteredClass)
-    {
-        ::UnregisterClassW(WINDOW_CLASS, NULL);
-    }
-
-    vwzRichEditClass = NULL;
-    if (NULL != hRichEdit)
-    {
-        ::FreeLibrary(hRichEdit);
-    }
-
-    // Always return success since we dont want to stop the
-    // installation even if the Eula printing fails.
-    return WcaFinalize(ERROR_SUCCESS);
-}
-
-
-
-/********************************************************************
-CreateRichTextWindow - Creates Window and Child RichText control.
-
-********************************************************************/
-HRESULT CreateRichTextWindow(
-    __out HWND* phWndMain,
-    __out BOOL* pfRegisteredClass
-    )
-{
-    HRESULT hr = S_OK;
-    HWND hWndMain = NULL;
-    WNDCLASSEXW wcex;
-
-    //
-    // Register the window class
-    //
-    wcex.cbSize = sizeof(WNDCLASSEXW);
-    wcex.style = CS_HREDRAW | CS_VREDRAW;
-    wcex.lpfnWndProc = (WNDPROC)WndProc;
-    wcex.cbClsExtra = 0;
-    wcex.cbWndExtra = 0;
-    wcex.hInstance = NULL;
-    wcex.hIcon = NULL;
-    wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
-    wcex.hbrBackground = (HBRUSH)(COLOR_BACKGROUND+1);
-    wcex.lpszMenuName = NULL;
-    wcex.lpszClassName = WINDOW_CLASS;
-    wcex.hIconSm = NULL;
-
-    if (0 == ::RegisterClassExW(&wcex))
-    {
-        DWORD  dwResult = ::GetLastError();
-
-        // If we get "Class already exists" error ignore it. We might
-        // encounter this when the user tries to print more than once
-        // in the same setup instance and we are unable to clean up fully.
-        if (dwResult != ERROR_CLASS_ALREADY_EXISTS)
-        {
-            ExitOnFailure(hr = HRESULT_FROM_WIN32(dwResult), "failed to register window class");
-        }
-    }
-
-    *pfRegisteredClass = TRUE;
-
-    // Perform application initialization:
-    hWndMain = ::CreateWindowW(WINDOW_CLASS, NULL, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, NULL, NULL);
-    ExitOnNullWithLastError(hWndMain, hr, "failed to create window for printing");
-
-    ::ShowWindow(hWndMain, SW_HIDE);
-    if (!::UpdateWindow(hWndMain))
-    {
-        ExitWithLastError(hr, "failed to update window");
-    }
-
-    *phWndMain = hWndMain;
-
-LExit:
-    return hr;
-}
-
-
-/********************************************************************
- PrintRichText - Sends messages to load the Eula text, print it, and
- close the window.
-
- NOTE: Returns errors that have occured while attempting to print,
- which were saved in vhr by the print callbacks.
-********************************************************************/
-HRESULT PrintRichText(
-    __in HWND hWndMain
-    )
-{
-    MSG msg;
-
-    // Populate the RichEdit control
-    ::SendMessageW(hWndMain, WM_COMMAND, IDM_POPULATE, 0);
-
-    // Print Eula
-    ::SendMessageW(hWndMain, WM_COMMAND, IDM_PRINT, 0);
-
-    // Done! Lets close the Window
-    ::SendMessage(hWndMain, WM_CLOSE, 0, 0);
-    // Main message loop:
-    while (::GetMessageW(&msg, NULL, 0, 0))
-    {
-//        if (!::TranslateAcceleratorW(msg.hwnd, NULL, &msg))
-//        {
-//            ::TranslateMessage(&msg);
-//            ::DispatchMessageW(&msg);
-//        }
-    }
-
-
-    // return any errors encountered in the print callbacks
-    return vhr;
-}
-
-
-/********************************************************************
- WndProc - Windows callback procedure
-
-********************************************************************/
-LRESULT CALLBACK WndProc(
-    __in HWND hWnd,
-    __in UINT message,
-    __in WPARAM wParam,
-    __in LPARAM lParam
-    )
-{
-    static HWND hWndRichEdit = NULL;
-    int wmId, wmEvent;
-    PAINTSTRUCT ps;
-    HDC hdc;
-
-    switch (message)
-    {
-    case WM_CREATE:
-        hWndRichEdit = ::CreateWindowExW(WS_EX_CLIENTEDGE, vwzRichEditClass, L"", ES_MULTILINE | WS_CHILD | WS_VISIBLE | WS_VSCROLL, CONTROL_X_COORDINATE, CONTROL_Y_COORDINATE, CONTROL_WIDTH, CONTROL_HEIGHT, hWnd, NULL, NULL, NULL);
-        break;
-    case WM_COMMAND:
-        wmId = LOWORD(wParam);
-        wmEvent = HIWORD(wParam);
-        switch (wmId)
-        {
-        case IDM_POPULATE:
-            LoadEulaText(hWndRichEdit);
-            break;
-        case IDM_PRINT:
-            Print(hWndRichEdit);
-            break;
-        default:
-            return ::DefWindowProcW(hWnd, message, wParam, lParam);
-            break;
-        }
-        break;
-    case WM_PAINT:
-        hdc = ::BeginPaint(hWnd, &ps);
-        ::EndPaint(hWnd, &ps);
-        break;
-    case WM_DESTROY:
-        ::PostQuitMessage(0);
-        break;
-    default:
-        return ::DefWindowProcW(hWnd, message, wParam, lParam);
-    }
-
-    return 0;
-}
-
-
-/********************************************************************
- ReadStreamCallback - Callback function to read data to the RichText control
-
- NOTE: Richtext control uses this function to read data from the buffer
-********************************************************************/
-DWORD CALLBACK ReadStreamCallback(
-    __in DWORD /*Cookie*/,
-    __out LPBYTE pbBuff,
-    __in LONG cb,
-    __out LONG FAR *pcb
-    )
-{
-    static LPCSTR pszTextBuf = NULL;
-    DWORD er = ERROR_SUCCESS;
-
-    // If it's null set it to the beginning of the EULA buffer
-    if (pszTextBuf == NULL)
-    {
-        pszTextBuf = vpszEulaText;
-    }
-
-    LONG lTextLength = (LONG)lstrlen(pszTextBuf);
-
-    if (cb < 0)
-    {
-        *pcb = 0;
-        er = 1;
-    }
-    else if (lTextLength < cb ) // If the size to be written is less than then length of the buffer, write the rest
-    {
-        *pcb = lTextLength;
-        memcpy(pbBuff, pszTextBuf, *pcb);
-        pszTextBuf = NULL;
-    }
-    else // Only write the amount being asked for and move the pointer along
-    {
-        *pcb = cb;
-        memcpy(pbBuff, pszTextBuf, *pcb);
-        pszTextBuf = pszTextBuf +  cb;
-    }
-
-    return er;
-}
-
-
-/********************************************************************
- LoadEulaText - Reads data for Richedit control
-
-********************************************************************/
-void LoadEulaText(
-    __in HWND hWnd
-    )
-{
-    HRESULT hr = S_OK;
-
-    ExitOnNull(hWnd, hr, ERROR_INVALID_HANDLE, "Invalid Handle passed to LoadEulaText");
-
-    // Docs say this doesn't return any value
-    ::SendMessageW(hWnd, EM_LIMITTEXT, static_cast<WPARAM>(lstrlen(vpszEulaText)), 0);
-
-    EDITSTREAM es;
-    ::ZeroMemory(&es, sizeof(es));
-    es.pfnCallback = (EDITSTREAMCALLBACK)ReadStreamCallback;
-    es.dwCookie = (DWORD)0;
-    ::SendMessageW(hWnd, EM_STREAMIN, SF_RTF, (LPARAM)&es);
-
-    if (0 != es.dwError)
-    {
-        ExitOnLastError(hr, "failed to load the EULA into the control");
-    }
-
-LExit:
-    vhr = hr;
-}
-
-
-/********************************************************************
- ReadEulaText - Reads Eula text from the MSI
-
-********************************************************************/
-HRESULT ReadEulaText(
-    __in MSIHANDLE /*hInstall*/,
-    __out LPSTR* ppszEulaText
-    )
-{
-    HRESULT hr = S_OK;
-    PMSIHANDLE hDB;
-    PMSIHANDLE hView;
-    PMSIHANDLE hRec;
-    LPWSTR pwzEula = NULL;
-
-    hr = WcaOpenExecuteView(vcsEulaQuery, &hView);
-    ExitOnFailure(hr, "failed to open and execute view for PrintEula query");
-
-    hr = WcaFetchSingleRecord(hView, &hRec);
-    ExitOnFailure(hr, "failed to fetch the row containing the LicenseText");
-
-    hr = WcaGetRecordString(hRec, 1, &pwzEula);
-    ExitOnFailure(hr, "failed to get LicenseText in PrintEula");
-
-    hr = StrAnsiAllocString(ppszEulaText, pwzEula, 0, CP_ACP);
-    ExitOnFailure(hr, "failed to convert LicenseText to ANSI code page");
-
-LExit:
-    return hr;
-}
-
-
-/********************************************************************
- Print - Function that sends the data from richedit control to the printer
-
- NOTE: Any errors encountered are saved to the vhr variable
-********************************************************************/
-void Print(
-    __in_opt HWND hRtfWnd
-    )
-{
-    HRESULT hr = S_OK;
-    FORMATRANGE fRange;
-    RECT rcPage;
-    RECT rcPrintablePage;
-    GETTEXTLENGTHEX gTxex;
-    HDC hPrinterDC = vpPrintDlg->hDC;
-    int nHorizRes = ::GetDeviceCaps(hPrinterDC, HORZRES);
-    int nVertRes = ::GetDeviceCaps(hPrinterDC, VERTRES);
-    int nLogPixelsX = ::GetDeviceCaps(hPrinterDC, LOGPIXELSX);
-    //int nLogPixelsY = ::GetDeviceCaps(hPrinterDC, LOGPIXELSY);
-    LONG_PTR lTextLength = 0; // Length of document.
-    LONG_PTR lTextPrinted = 0; // Amount of document printed.
-    DOCINFOW dInfo;
-    LPDEVNAMES pDevnames;
-    LPWSTR sczProductName = NULL;
-    BOOL fStartedDoc = FALSE;
-    BOOL fPrintedSomething = FALSE;
-
-    // Ensure the printer DC is in MM_TEXT mode.
-    if (0 == ::SetMapMode(hPrinterDC, MM_TEXT))
-    {
-        ExitWithLastError(hr, "failed to set map mode");
-    }
-
-    // Rendering to the same DC we are measuring.
-    ::ZeroMemory(&fRange, sizeof(fRange));
-    fRange.hdc = fRange.hdcTarget = hPrinterDC;
-
-    // Set up the page.
-    rcPage.left = rcPage.top = 0;
-    rcPage.right = MulDiv(nHorizRes, ONE_INCH, nLogPixelsX);
-    rcPage.bottom = MulDiv(nVertRes, ONE_INCH, nLogPixelsX);
-
-    // Set up 1" margins all around.
-    rcPrintablePage.left = rcPage.left + ONE_INCH;  
-    rcPrintablePage.top = rcPage.top + ONE_INCH;
-    rcPrintablePage.right = rcPage.right - ONE_INCH;
-    rcPrintablePage.bottom = rcPage.bottom - ONE_INCH;
-
-    // Set up the print job (standard printing stuff here).
-    ::ZeroMemory(&dInfo, sizeof(dInfo));
-    dInfo.cbSize = sizeof(DOCINFO);
-    hr = WcaGetProperty(L"ProductName", &sczProductName);
-    if (FAILED(hr))
-    {
-        // If we fail to get the product name, don't fail, just leave it blank;
-        dInfo.lpszDocName = L"";
-        hr = S_OK;
-    }
-    else
-    {
-        dInfo.lpszDocName = sczProductName;
-    }
-
-    pDevnames = (LPDEVNAMES)::GlobalLock(vpPrintDlg->hDevNames);
-    ExitOnNullWithLastError(pDevnames, hr, "failed to get global lock");
-
-    dInfo.lpszOutput  = (LPWSTR)pDevnames + pDevnames->wOutputOffset;
-
-    if (0 == ::GlobalUnlock(pDevnames))
-    {
-        ExitWithLastError(hr, "failed to release global lock");
-    }
-
-    // Start the document.
-    if (0 >= ::StartDocW(hPrinterDC, &dInfo))
-    {
-        ExitWithLastError(hr, "failed to start print document");
-    }
-
-    fStartedDoc = TRUE;
-
-    ::ZeroMemory(&gTxex, sizeof(gTxex));
-    gTxex.flags = GTL_NUMCHARS | GTL_PRECISE;
-    lTextLength = ::SendMessageW(hRtfWnd, EM_GETTEXTLENGTHEX, (LONG_PTR)&gTxex, 0);
-
-    while (lTextPrinted < lTextLength)
-    {
-        // Start the page.
-        if (0 >= ::StartPage(hPrinterDC))
-        {
-            ExitWithLastError(hr, "failed to start print page");
-        }
-
-        // Always reset to the full printable page and start where the
-        // last text left off (or zero at the beginning).
-        fRange.rc = rcPrintablePage;
-        fRange.rcPage = rcPage;
-        fRange.chrg.cpMin = (LONG)lTextPrinted;
-        fRange.chrg.cpMax = -1;
-
-        // Print as much text as can fit on a page. The return value is
-        // the index of the first character on the next page. Using TRUE
-        // for the wParam parameter causes the text to be printed.
-        lTextPrinted = ::SendMessageW(hRtfWnd, EM_FORMATRANGE, TRUE, (LPARAM)&fRange);
-        fPrintedSomething = TRUE;
-
-        // If text wasn't printed (i.e. we didn't move past the point we started) then
-        // something must have gone wrong.
-        if (lTextPrinted <= fRange.chrg.cpMin)
-        {
-            hr = E_FAIL;
-            ExitOnFailure(hr, "failed to print some text");
-        }
-
-        // Print last page.
-        if (0 >= ::EndPage(hPrinterDC))
-        {
-            ExitWithLastError(hr, "failed to end print page");
-        }
-    }
-
-LExit:
-    // Tell the control to release cached information, if we actually tried to
-    // print something.
-    if (fPrintedSomething)
-    {
-        ::SendMessageW(hRtfWnd, EM_FORMATRANGE, 0, (LPARAM)NULL);
-    }
-
-    if (fStartedDoc)
-    {
-        ::EndDoc(hPrinterDC);
-    }
-
-    ReleaseStr(sczProductName);
-
-    vhr = hr;
-}
-
-
-/********************************************************************
- ShowErrorMessage - Display MessageBox showing the message for hr.
-
-********************************************************************/
-void ShowErrorMessage(
-    __in HRESULT hr
-    )
-{
-    WCHAR wzMsg[STRING_CAPACITY];
-
-#pragma prefast(push)
-#pragma prefast(disable:25028)
-    if (0 != ::FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, 0, hr, 0, wzMsg, countof(wzMsg), 0))
-#pragma prefast(pop)
-    {
-        HWND hWnd = ::GetForegroundWindow();
-        ::MessageBoxW(hWnd, wzMsg, L"PrintEULA", MB_OK | MB_ICONWARNING);
-    }
-}
diff --git a/src/ext/UI/ca/uica.def b/src/ext/UI/ca/uica.def
index 62ce8135..41460394 100644
--- a/src/ext/UI/ca/uica.def
+++ b/src/ext/UI/ca/uica.def
@@ -4,5 +4,4 @@
 LIBRARY      "uica"
 
 EXPORTS
-        PrintEula
         ValidatePath
diff --git a/src/ext/UI/ca/uica.vcxproj b/src/ext/UI/ca/uica.vcxproj
index 0803b252..39c0b404 100644
--- a/src/ext/UI/ca/uica.vcxproj
+++ b/src/ext/UI/ca/uica.vcxproj
@@ -50,7 +50,6 @@
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="DriveCheck.cpp" />
-    <ClCompile Include="PrintEula.cpp" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ext/UI/test/WixToolsetTest.UI/TestData/InstallDir_SpecialDlg/Package.wxs b/src/ext/UI/test/WixToolsetTest.UI/TestData/InstallDir_SpecialDlg/Package.wxs
index 9b10c509..eeb44833 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/TestData/InstallDir_SpecialDlg/Package.wxs
+++ b/src/ext/UI/test/WixToolsetTest.UI/TestData/InstallDir_SpecialDlg/Package.wxs
@@ -43,7 +43,6 @@
     <?foreach WIXUIARCH in X86;X64;A64 ?>
     <Fragment>
         <UI Id="InstallDir_SpecialDlg_$(WIXUIARCH)">
-            <Publish Dialog="LicenseAgreementDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" />
             <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH" />
             <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" />
         </UI>
diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
index 45d58e26..eb5e3687 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
+++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
@@ -37,19 +37,17 @@ namespace WixToolsetTest.UI
                 "CustomAction:WixSetDefaultPerUserFolder\t51\tWixPerUserFolder\t[LocalAppDataFolder]Apps\\[ApplicationFolderName]\t",
                 "CustomAction:WixSetPerMachineFolder\t51\tAPPLICATIONFOLDER\t[WixPerMachineFolder]\t",
                 "CustomAction:WixSetPerUserFolder\t51\tAPPLICATIONFOLDER\t[WixPerUserFolder]\t",
-                "CustomAction:WixUIPrintEula_X86\t65\tWixUiCa_X86\tPrintEula\t",
                 "CustomAction:WixUIValidatePath_X86\t65\tWixUiCa_X86\tValidatePath\t",
             }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
             WixAssert.CompareLineByLine(new[]
             {
-                "ControlEvent:AdvancedWelcomeEulaDlg\tPrint\tDoAction\tWixUIPrintEula_X86\t1\t1",
                 "ControlEvent:BrowseDlg\tOK\tDoAction\tWixUIValidatePath_X86\tNOT WIXUI_DONTVALIDATEPATH\t1",
                 "ControlEvent:InstallDirDlg\tNext\tDoAction\tWixUIValidatePath_X86\tNOT WIXUI_DONTVALIDATEPATH\t2",
             }, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")).ToArray());
             WixAssert.CompareLineByLine(new[]
             {
-                "InstallUISequence:AdvancedWelcomeEulaDlg\tNOT Installed\t1296",
-                "InstallUISequence:WelcomeDlg\tInstalled AND PATCH\t1295",
+                "InstallUISequence:AdvancedWelcomeEulaDlg\tNOT Installed\t1297",
+                "InstallUISequence:WelcomeDlg\tInstalled AND PATCH\t1296",
             }, results.Where(r => r.StartsWith("InstallUISequence:AdvancedWelcome") || r.StartsWith("InstallUISequence:Welcome")).ToArray());
         }
 
@@ -78,12 +76,10 @@ namespace WixToolsetTest.UI
                 "CustomAction:WixSetDefaultPerUserFolder\t51\tWixPerUserFolder\t[LocalAppDataFolder]Apps\\[ApplicationFolderName]\t",
                 "CustomAction:WixSetPerMachineFolder\t51\tAPPLICATIONFOLDER\t[WixPerMachineFolder]\t",
                 "CustomAction:WixSetPerUserFolder\t51\tAPPLICATIONFOLDER\t[WixPerUserFolder]\t",
-                "CustomAction:WixUIPrintEula_X64\t65\tWixUiCa_X64\tPrintEula\t",
                 "CustomAction:WixUIValidatePath_X64\t65\tWixUiCa_X64\tValidatePath\t",
             }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
             WixAssert.CompareLineByLine(new[]
             {
-                "ControlEvent:AdvancedWelcomeEulaDlg\tPrint\tDoAction\tWixUIPrintEula_X64\t1\t1",
                 "ControlEvent:BrowseDlg\tOK\tDoAction\tWixUIValidatePath_X64\tNOT WIXUI_DONTVALIDATEPATH\t1",
                 "ControlEvent:InstallDirDlg\tNext\tDoAction\tWixUIValidatePath_X64\tNOT WIXUI_DONTVALIDATEPATH\t2",
             }, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")).ToArray());
@@ -114,12 +110,10 @@ namespace WixToolsetTest.UI
                 "CustomAction:WixSetDefaultPerUserFolder\t51\tWixPerUserFolder\t[LocalAppDataFolder]Apps\\[ApplicationFolderName]\t",
                 "CustomAction:WixSetPerMachineFolder\t51\tAPPLICATIONFOLDER\t[WixPerMachineFolder]\t",
                 "CustomAction:WixSetPerUserFolder\t51\tAPPLICATIONFOLDER\t[WixPerUserFolder]\t",
-                "CustomAction:WixUIPrintEula_A64\t65\tWixUiCa_A64\tPrintEula\t",
                 "CustomAction:WixUIValidatePath_A64\t65\tWixUiCa_A64\tValidatePath\t",
             }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
             WixAssert.CompareLineByLine(new[]
             {
-                "ControlEvent:AdvancedWelcomeEulaDlg\tPrint\tDoAction\tWixUIPrintEula_A64\t1\t1",
                 "ControlEvent:BrowseDlg\tOK\tDoAction\tWixUIValidatePath_A64\tNOT WIXUI_DONTVALIDATEPATH\t1",
                 "ControlEvent:InstallDirDlg\tNext\tDoAction\tWixUIValidatePath_A64\tNOT WIXUI_DONTVALIDATEPATH\t2",
             }, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")).ToArray());
@@ -144,17 +138,12 @@ namespace WixToolsetTest.UI
                 "Binary:WixUI_Bmp_Up\t[Binary data]",
                 "Binary:WixUI_Ico_Exclam\t[Binary data]",
                 "Binary:WixUI_Ico_Info\t[Binary data]",
-                "Binary:WixUiCa_X64\t[Binary data]",
             }, results.Where(r => r.StartsWith("Binary:")).ToArray());
             WixAssert.CompareLineByLine(new[]
             {
                 "CustomAction:SetWIXUI_EXITDIALOGOPTIONALTEXT\t51\tWIXUI_EXITDIALOGOPTIONALTEXT\tThank you for installing [ProductName].\t",
-                "CustomAction:WixUIPrintEula_X64\t65\tWixUiCa_X64\tPrintEula\t",
             }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
-            WixAssert.CompareLineByLine(new[]
-            {
-                "ControlEvent:LicenseAgreementDlg\tPrint\tDoAction\tWixUIPrintEula_X64\t1\t1",
-            }, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")).ToArray());
+            Assert.Empty(results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")));
             WixAssert.CompareLineByLine(new[]
             {
                 "InstallUISequence:WelcomeDlg\tNOT Installed OR PATCH\t1297",
@@ -183,7 +172,6 @@ namespace WixToolsetTest.UI
             }, results.Where(r => r.StartsWith("Binary:")).ToArray());
             WixAssert.CompareLineByLine(new[]
             {
-                "CustomAction:WixUIPrintEula_X86\t65\tWixUiCa_X86\tPrintEula\t",
                 "CustomAction:WixUIValidatePath_X86\t65\tWixUiCa_X86\tValidatePath\t",
             }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
             WixAssert.CompareLineByLine(new[]
@@ -194,7 +182,6 @@ namespace WixToolsetTest.UI
             {
                 "ControlEvent:BrowseDlg\tOK\tDoAction\tWixUIValidatePath_X86\tNOT WIXUI_DONTVALIDATEPATH\t3",
                 "ControlEvent:InstallDirDlg\tNext\tDoAction\tWixUIValidatePath_X86\tNOT WIXUI_DONTVALIDATEPATH\t2",
-                "ControlEvent:LicenseAgreementDlg\tPrint\tDoAction\tWixUIPrintEula_X86\t1\t1",
             }, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")).OrderBy(s => s).ToArray());
             WixAssert.CompareLineByLine(new[]
             {
@@ -219,20 +206,13 @@ namespace WixToolsetTest.UI
                 "Binary:WixUI_Bmp_Up\t[Binary data]",
                 "Binary:WixUI_Ico_Exclam\t[Binary data]",
                 "Binary:WixUI_Ico_Info\t[Binary data]",
-                "Binary:WixUiCa_X86\t[Binary data]",
             }, results.Where(r => r.StartsWith("Binary:")).ToArray());
+            Assert.Empty(results.Where(r => r.StartsWith("CustomAction:")));
+            Assert.Empty(results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")));
             WixAssert.CompareLineByLine(new[]
             {
-                "CustomAction:WixUIPrintEula_X86\t65\tWixUiCa_X86\tPrintEula\t",
-            }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
-            WixAssert.CompareLineByLine(new[]
-            {
-                "ControlEvent:WelcomeEulaDlg\tPrint\tDoAction\tWixUIPrintEula_X86\t1\t1",
-            }, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")).OrderBy(s => s).ToArray());
-            WixAssert.CompareLineByLine(new[]
-            {
-                "InstallUISequence:WelcomeDlg\tInstalled AND PATCH\t1295",
-                "InstallUISequence:WelcomeEulaDlg\tNOT Installed\t1296",
+                "InstallUISequence:WelcomeDlg\tInstalled AND PATCH\t1296",
+                "InstallUISequence:WelcomeEulaDlg\tNOT Installed\t1297",
             }, results.Where(r => r.StartsWith("InstallUISequence:AdvancedWelcome") || r.StartsWith("InstallUISequence:Welcome")).ToArray());
         }
 
@@ -297,13 +277,11 @@ namespace WixToolsetTest.UI
             }, results.Where(r => r.StartsWith("Binary:")).ToArray());
             WixAssert.CompareLineByLine(new[]
             {
-                "CustomAction:WixUIPrintEula_X86\t65\tWixUiCa_X86\tPrintEula\t",
                 "CustomAction:WixUIValidatePath_X86\t65\tWixUiCa_X86\tValidatePath\t",
             }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
             WixAssert.CompareLineByLine(new[]
             {
                 "ControlEvent:BrowseDlg\tOK\tDoAction\tWixUIValidatePath_X86\tNOT WIXUI_DONTVALIDATEPATH\t3",
-                "ControlEvent:LicenseAgreementDlg\tPrint\tDoAction\tWixUIPrintEula_X86\t1\t1",
             }, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")).ToArray());
             WixAssert.CompareLineByLine(new[]
             {
@@ -387,7 +365,6 @@ namespace WixToolsetTest.UI
             }, results.Where(r => r.StartsWith("Binary:")).ToArray());
             WixAssert.CompareLineByLine(new[]
             {
-                "CustomAction:WixUIPrintEula_X64\t65\tWixUiCa_X64\tPrintEula\t",
                 "CustomAction:WixUIValidatePath_X64\t65\tWixUiCa_X64\tValidatePath\t",
             }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
             WixAssert.CompareLineByLine(new[]
@@ -398,7 +375,6 @@ namespace WixToolsetTest.UI
             {
                 "ControlEvent:BrowseDlg\tOK\tDoAction\tWixUIValidatePath_X64\tNOT WIXUI_DONTVALIDATEPATH\t3",
                 "ControlEvent:InstallDirDlg\tNext\tDoAction\tWixUIValidatePath_X64\tNOT WIXUI_DONTVALIDATEPATH\t2",
-                "ControlEvent:LicenseAgreementDlg\tPrint\tDoAction\tWixUIPrintEula_X64\t1\t1",
             }, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")).OrderBy(s => s).ToArray());
             WixAssert.CompareLineByLine(new[]
             {
diff --git a/src/ext/UI/wixlib/AdvancedWelcomeEulaDlg.wxs b/src/ext/UI/wixlib/AdvancedWelcomeEulaDlg.wxs
index 8b950ec1..c8ab1036 100644
--- a/src/ext/UI/wixlib/AdvancedWelcomeEulaDlg.wxs
+++ b/src/ext/UI/wixlib/AdvancedWelcomeEulaDlg.wxs
@@ -11,7 +11,9 @@
                 <Control Id="DescriptionPerMachine" Type="Text" X="20" Y="202" Width="330" Height="31" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.AdvancedWelcomeEulaDlgDescriptionPerMachine)" ShowCondition="ALLUSERS" />
                 <Control Id="DescriptionPerUser" Type="Text" X="20" Y="202" Width="330" Height="31" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.AdvancedWelcomeEulaDlgDescriptionPerUser)" ShowCondition="NOT ALLUSERS" />
                 <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="180" Width="226" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" />
-                <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)" />
+                <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
+                    <Publish Event="MsiPrint" Value="1" />
+                </Control>
                 <Control Id="Advanced" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.AdvancedWelcomeEulaDlgAdvanced)" DisableCondition="LicenseAccepted &lt;&gt; &quot;1&quot;" EnableCondition="LicenseAccepted = &quot;1&quot;" />
                 <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.AdvancedWelcomeEulaDlgInstall)" Hidden="yes" DisableCondition="LicenseAccepted &lt;&gt; &quot;1&quot;" EnableCondition="LicenseAccepted = &quot;1&quot;" ShowCondition="ALLUSERS">
                     <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
diff --git a/src/ext/UI/wixlib/Common_Platform.wxi b/src/ext/UI/wixlib/Common_Platform.wxi
index 329abb2e..51fff6a1 100644
--- a/src/ext/UI/wixlib/Common_Platform.wxi
+++ b/src/ext/UI/wixlib/Common_Platform.wxi
@@ -5,10 +5,6 @@
     <?include ..\..\caDecor.wxi ?>
 
     <Fragment>
-        <CustomAction Id="WixUIPrintEula$(Suffix)" BinaryRef="WixUiCa$(Suffix)" DllEntry="PrintEula" Return="ignore" Execute="immediate" />
-    </Fragment>
-
-    <Fragment>
         <CustomAction Id="WixUIValidatePath$(Suffix)" BinaryRef="WixUiCa$(Suffix)" DllEntry="ValidatePath" Return="ignore" Execute="immediate" />
     </Fragment>
 
diff --git a/src/ext/UI/wixlib/LicenseAgreementDlg.wxs b/src/ext/UI/wixlib/LicenseAgreementDlg.wxs
index a072cf6b..96585b29 100644
--- a/src/ext/UI/wixlib/LicenseAgreementDlg.wxs
+++ b/src/ext/UI/wixlib/LicenseAgreementDlg.wxs
@@ -11,7 +11,9 @@
                 <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)" />
-                <Control Id="Print" Type="PushButton" X="112" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)" />
+                <Control Id="Print" Type="PushButton" X="112" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
+                    <Publish Event="MsiPrint" Value="1" />
+                </Control>
                 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
                 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" DisableCondition="LicenseAccepted &lt;&gt; &quot;1&quot;" EnableCondition="LicenseAccepted = &quot;1&quot;">
                     <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
diff --git a/src/ext/UI/wixlib/WelcomeEulaDlg.wxs b/src/ext/UI/wixlib/WelcomeEulaDlg.wxs
index ee01d29a..a95a9274 100644
--- a/src/ext/UI/wixlib/WelcomeEulaDlg.wxs
+++ b/src/ext/UI/wixlib/WelcomeEulaDlg.wxs
@@ -9,7 +9,9 @@
                 <Control Id="Title" Type="Text" X="130" Y="6" Width="225" Height="30" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeEulaDlgTitle)" />
                 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
                 <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="130" Y="207" Width="226" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.WelcomeEulaDlgLicenseAcceptedCheckBox)" />
-                <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)" />
+                <Control Id="Print" Type="PushButton" X="88" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
+                    <Publish Event="MsiPrint" Value="1" />
+                </Control>
                 <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
                 <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes" DisableCondition="LicenseAccepted &lt;&gt; &quot;1&quot;" EnableCondition="LicenseAccepted = &quot;1&quot;" ShowCondition="ALLUSERS">
                     <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
diff --git a/src/ext/UI/wixlib/WixUI_Advanced.wxs b/src/ext/UI/wixlib/WixUI_Advanced.wxs
index 4f8bfa0c..2050dc24 100644
--- a/src/ext/UI/wixlib/WixUI_Advanced.wxs
+++ b/src/ext/UI/wixlib/WixUI_Advanced.wxs
@@ -23,7 +23,6 @@ Todo:
     <?foreach WIXUIARCH in X86;X64;A64 ?>
     <Fragment>
         <UI Id="WixUI_Advanced_$(WIXUIARCH)">
-            <Publish Dialog="AdvancedWelcomeEulaDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" />
             <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="1" Condition="NOT WIXUI_DONTVALIDATEPATH" />
             <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" />
         </UI>
diff --git a/src/ext/UI/wixlib/WixUI_FeatureTree.wxs b/src/ext/UI/wixlib/WixUI_FeatureTree.wxs
index 6b9b1cf3..5ec27445 100644
--- a/src/ext/UI/wixlib/WixUI_FeatureTree.wxs
+++ b/src/ext/UI/wixlib/WixUI_FeatureTree.wxs
@@ -22,10 +22,7 @@ Patch dialog sequence:
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?foreach WIXUIARCH in X86;X64;A64 ?>
     <Fragment>
-        <UI Id="WixUI_FeatureTree_$(WIXUIARCH)">
-            <Publish Dialog="LicenseAgreementDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" />
-        </UI>
-
+        <UI Id="WixUI_FeatureTree_$(WIXUIARCH)" />
         <UIRef Id="WixUI_FeatureTree" />
     </Fragment>
     <?endforeach?>
diff --git a/src/ext/UI/wixlib/WixUI_InstallDir.wxs b/src/ext/UI/wixlib/WixUI_InstallDir.wxs
index e3c171df..bbe806bd 100644
--- a/src/ext/UI/wixlib/WixUI_InstallDir.wxs
+++ b/src/ext/UI/wixlib/WixUI_InstallDir.wxs
@@ -24,7 +24,6 @@ Patch dialog sequence:
     <?foreach WIXUIARCH in X86;X64;A64 ?>
     <Fragment>
         <UI Id="WixUI_InstallDir_$(WIXUIARCH)">
-            <Publish Dialog="LicenseAgreementDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" />
             <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH" />
             <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" />
         </UI>
diff --git a/src/ext/UI/wixlib/WixUI_Minimal.wxs b/src/ext/UI/wixlib/WixUI_Minimal.wxs
index 80a011e6..df71e995 100644
--- a/src/ext/UI/wixlib/WixUI_Minimal.wxs
+++ b/src/ext/UI/wixlib/WixUI_Minimal.wxs
@@ -17,10 +17,7 @@ Patch dialog sequence:
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?foreach WIXUIARCH in X86;X64;A64 ?>
     <Fragment>
-        <UI Id="WixUI_Minimal_$(WIXUIARCH)">
-            <Publish Dialog="WelcomeEulaDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" />
-        </UI>
-
+        <UI Id="WixUI_Minimal_$(WIXUIARCH)" />
         <UIRef Id="WixUI_Minimal" />
     </Fragment>
     <?endforeach?>
diff --git a/src/ext/UI/wixlib/WixUI_Mondo.wxs b/src/ext/UI/wixlib/WixUI_Mondo.wxs
index aac13112..4dd1148d 100644
--- a/src/ext/UI/wixlib/WixUI_Mondo.wxs
+++ b/src/ext/UI/wixlib/WixUI_Mondo.wxs
@@ -25,7 +25,6 @@ Patch dialog sequence:
     <?foreach WIXUIARCH in X86;X64;A64 ?>
     <Fragment>
         <UI Id="WixUI_Mondo_$(WIXUIARCH)">
-            <Publish Dialog="LicenseAgreementDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" />
             <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH" />
         </UI>
 
diff --git a/src/wix/WixToolset.Converters/WixConverter.cs b/src/wix/WixToolset.Converters/WixConverter.cs
index be51d6c7..a4de1d21 100644
--- a/src/wix/WixToolset.Converters/WixConverter.cs
+++ b/src/wix/WixToolset.Converters/WixConverter.cs
@@ -1705,11 +1705,20 @@ namespace WixToolset.Converters
             var eventName = element.Attribute("Event")?.Value;
             var eventValue = element.Attribute("Value")?.Value;
 
-            if (eventName?.Equals("DoAction", StringComparison.OrdinalIgnoreCase) == true
-                && eventValue?.StartsWith("WixUI", StringComparison.OrdinalIgnoreCase) == true
-                && this.OnInformation(ConverterTestType.CustomActionIdsIncludePlatformSuffix, element, "Custom action ids have changed in WiX v4 extensions to support platform-specific custom actions. For more information, see https://wixtoolset.org/docs/fourthree/#converting-custom-wixui-dialog-sets."))
+            if (eventName?.Equals("DoAction", StringComparison.OrdinalIgnoreCase) == true)
             {
-                element.Attribute("Value").Value = eventValue + "_$(sys.BUILDARCHSHORT)";
+                if (eventValue?.StartsWith("WixUIPrintEula", StringComparison.OrdinalIgnoreCase) == true)
+                {
+                    if (this.OnInformation(ConverterTestType.WixUIPrintEulaCustomAction, element, "The WixUIPrintEula custom action has been replaced with the MSI native MsiPrint control event in WiX v5 and no longer needs to be authored in a custom dialog set."))
+                    {
+                        element.Remove();
+                    }
+                }
+                else if (eventValue?.StartsWith("WixUI", StringComparison.OrdinalIgnoreCase) == true
+                    && this.OnInformation(ConverterTestType.CustomActionIdsIncludePlatformSuffix, element, "Custom action ids have changed in WiX v4 extensions to support platform-specific custom actions. For more information, see https://wixtoolset.org/docs/fourthree/faqs/#converting-custom-wixui-dialog-sets."))
+                {
+                    element.Attribute("Value").Value = eventValue + "_$(sys.BUILDARCHSHORT)";
+                }
             }
         }
 
@@ -3546,6 +3555,11 @@ namespace WixToolset.Converters
             /// The RelatedBundle element's Action attribute value must now be all lowercase. The Action='{0}' will be converted to '{1}'
             /// </summary>
             RelatedBundleActionLowercase,
+
+            /// <summary>
+            /// The WixUIPrintEula custom action has been replaced with the MSI native MsiPrint control event in WiX v5 and no longer needs to be authored in a custom dialog set.
+            /// </summary>
+            WixUIPrintEulaCustomAction,
         }
     }
 }
diff --git a/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs b/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs
index 168751f4..a562fb59 100644
--- a/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs
@@ -58,17 +58,13 @@ namespace WixToolsetTest.Converters
         }
 
         [Fact]
-        public void FixPrintCustomAction()
+        public void RemovePrintCustomAction()
         {
             var parse = String.Join(Environment.NewLine,
                 "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
                 "  <Fragment>",
-                "    <UI>",
-                "      <Dialog Id='CustomResumeDlg' Width='370' Height='270' Title='!(loc.ResumeDlg_Title)'>",
-                "        <Control Id='Print' Type='PushButton' X='112' Y='243' Width='56' Height='17' Text='!(loc.WixUIPrint)'>",
-                "          <Publish Event='DoAction' Value='WixUIPrintEula'>1</Publish>",
-                "        </Control>",
-                "      </Dialog>",
+                "    <UI Id=\"WixUI_Advanced_$(WIXUIARCH)\">",
+                "      <Publish Dialog=\"AdvancedWelcomeEulaDlg\" Control=\"Print\" Event=\"DoAction\" Value=\"WixUIPrintEula_$(WIXUIARCH)\" />",
                 "    </UI>",
                 "  </Fragment>",
                 "</Wix>");
@@ -77,12 +73,8 @@ namespace WixToolsetTest.Converters
             {
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <Fragment>",
-                "    <UI>",
-                "      <Dialog Id=\"CustomResumeDlg\" Width=\"370\" Height=\"270\" Title=\"!(loc.ResumeDlg_Title)\">",
-                "        <Control Id=\"Print\" Type=\"PushButton\" X=\"112\" Y=\"243\" Width=\"56\" Height=\"17\" Text=\"!(loc.WixUIPrint)\">",
-                "          <Publish Event=\"DoAction\" Value=\"WixUIPrintEula_$(sys.BUILDARCHSHORT)\" />",
-                "        </Control>",
-                "      </Dialog>",
+                "    <UI Id=\"WixUI_Advanced_$(WIXUIARCH)\">",
+                "      ",
                 "    </UI>",
                 "  </Fragment>",
                 "</Wix>"
@@ -98,7 +90,7 @@ namespace WixToolsetTest.Converters
             var actual = UnformattedDocumentLines(document);
 
             WixAssert.CompareLineByLine(expected, actual);
-            Assert.Equal(4, errors);
+            Assert.Equal(2, errors);
         }
 
         [Fact]