Setup: Fix modern uninstaller wizard and legacy uninstall launch behavior

tools/CustomSetupTool/resource.h

@@ -13,6 +13,7 @@
 #define IDD_REPAIR                      109
 #define IDB_PNG1                        110
 #define IDD_ERROR                       111
+#define IDD_UNINSTALL_WELCOME           112
 #define IDC_PATH                        1001
 #define IDC_BROWSE                      1002
 #define IDC_PROGRESS                    1003
@@ -23,6 +24,7 @@
 #define IDC_PAGEICON                    1008
 #define IDC_SIDEBAR                     1009
 #define IDC_SIDEBARICON                 1010
+#define IDC_REMOVESETTINGS              1011
 
 // Next default values for new objects
 // 
@@ -31,7 +33,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        112
 #define _APS_NEXT_COMMAND_VALUE         40002
-#define _APS_NEXT_CONTROL_VALUE         1011
+#define _APS_NEXT_CONTROL_VALUE         1012
 #define _APS_NEXT_SYMED_VALUE           105
 #endif
 #endif

tools/CustomSetupTool/resource.rc

@@ -47,6 +47,18 @@ BEGIN
     LTEXT           "Click Next to continue, or Cancel to exit setup.",IDC_STATIC,148,126,240,14
 END
 
+IDD_UNINSTALL_WELCOME DIALOGEX 0, 0, 408, 234
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "System Informer Uninstall"
+FONT 8, "MS Shell Dlg", 400, 0, 0x0
+BEGIN
+    CONTROL         "",IDC_SIDEBAR,"Static",SS_BITMAP,21,20,140,212
+    LTEXT           "Welcome to the System Informer Uninstall Wizard",IDC_TITLE,148,4,250,34
+    LTEXT           "This will uninstall System Informer on your computer. System Informer helps you monitor system resources, debug software, and detect malware.",IDC_STATIC,148,55,240,30
+    LTEXT           "It is recommended you close all other applications before continuing.",IDC_STATIC,148,94,240,18
+    LTEXT           "Click Next to continue, or Cancel to exit uninstallation.",IDC_STATIC,148,126,240,14
+END
+
 IDD_CONFIG DIALOGEX 0, 0, 408, 234
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Setup Options"
@@ -81,7 +93,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x0
 BEGIN
     CONTROL         "",IDC_SIDEBAR,"Static",SS_BITMAP,21,20,140,212
     LTEXT           "Completing the System Informer Setup Wizard",IDC_TITLE,148,4,250,34
-    LTEXT           "Setup has finished installing System Informer on your computer. The application may be launched by selecting the installed shortcuts.",IDC_STATIC,148,55,240,30
+    LTEXT           "Setup has finished installing System Informer on your computer. The application may be launched by selecting the installed shortcuts.",IDC_SUBTITLE,148,55,240,30
     LTEXT           "Click Finish to exit Setup.",IDC_STATIC,148,88,240,14
     CONTROL         "Start System Informer",IDC_STARTAPP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,112,240,12
 END
@@ -93,20 +105,21 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x0
 BEGIN
     CONTROL         "",IDC_SIDEBAR,"Static",SS_BITMAP,21,20,15,13
     LTEXT           "System Informer Setup Wizard failed",IDC_TITLE,148,4,250,34
-    LTEXT           "Setup was unable to complete the operation.",IDC_STATIC,148,55,240,14
+    LTEXT           "Setup was unable to complete the operation.",IDC_SUBTITLE,148,55,240,14
     LTEXT           "",IDC_STATUS,148,78,240,42
     LTEXT           "Click Finish to exit Setup.",IDC_STATIC,148,130,240,14
 END
 
 IDD_UNINSTALL DIALOGEX 0, 0, 408, 234
-STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Uninstall"
 FONT 8, "MS Shell Dlg", 400, 0, 0x0
 BEGIN
     LTEXT           "Ready to Uninstall",IDC_TITLE,15,0,338,10
     LTEXT           "Setup is ready to remove System Informer from your computer.",IDC_SUBTITLE,25,11,338,10
     ICON            IDI_ICON,IDC_PAGEICON,378,0,20,20
     LTEXT           "Click Uninstall to continue with the uninstallation, or click Back if you want to review or change any settings.",IDC_STATIC,25,40,358,18
+    CONTROL         "Remove application settings",IDC_REMOVESETTINGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,70,358,12
 END
 
 IDD_UPDATE DIALOGEX 0, 0, 408, 234
@@ -172,6 +185,11 @@ BEGIN
         RIGHTMARGIN, 398
     END
 
+    IDD_UNINSTALL_WELCOME, DIALOG
+    BEGIN
+        RIGHTMARGIN, 398
+    END
+
     IDD_CONFIG, DIALOG
     BEGIN
         RIGHTMARGIN, 395

tools/CustomSetupTool/setup.h

@@ -116,6 +116,13 @@ VOID SetupShowWizard(
     _In_ PPH_SETUP_CONTEXT Context
     );
 
+INT_PTR CALLBACK SetupUninstallPageDlgProc(
+    _In_ HWND WindowHandle,
+    _In_ UINT uMsg,
+    _In_ WPARAM wParam,
+    _In_ LPARAM lParam
+    );
+
 VOID ShowWelcomePageDialog(
     _In_ PPH_SETUP_CONTEXT Context
     );

tools/CustomSetupTool/uninstall.c

@@ -112,7 +112,8 @@ NTSTATUS CALLBACK SetupUninstallBuild(
     //
     if (Context->SetupRemoveAppData)
         SetupDeleteAppdataDirectory(Context);
-
+
+    Context->SetupCompleted = TRUE;
     SetupSetProgressText(Context, L"Uninstall complete.", NULL);
     SetupSetProgressValue(Context, 100);
     Context->SetupProgressActive = FALSE;