* Sync up to trunk head (r64939).

[reactos.git] / dll / win32 / newdev / wizard.c

diff --git a/dll/win32/newdev/wizard.c b/dll/win32/newdev/wizard.c
index 12be7e0..d3ec237 100644 (file)
--- a/dll/win32/newdev/wizard.c
+++ b/dll/win32/newdev/wizard.c
@@ -1252,52 +1252,56 @@ DisplayWizard(
     /* Create the Welcome page */
     ZeroMemory(&psp, sizeof(PROPSHEETPAGE));
     psp.dwSize = sizeof(PROPSHEETPAGE);
-    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
+    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
     psp.hInstance = hDllInstance;
     psp.lParam = (LPARAM)DevInstData;
-    psp.pfnDlgProc = (DLGPROC) WelcomeDlgProc;
+    psp.pszTitle = MAKEINTRESOURCE(DevInstData->bUpdate ? IDS_UPDATEWIZARDTITLE : IDS_INSTALLWIZARDTITLE);
+    psp.pfnDlgProc = WelcomeDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE);
     ahpsp[IDD_WELCOMEPAGE] = CreatePropertySheetPage(&psp);
 
     /* Create the Select Source page */
-    psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
-    psp.pfnDlgProc = (DLGPROC) CHSourceDlgProc;
+    psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE;
+    psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_CHSOURCE_TITLE);
+    psp.pfnDlgProc = CHSourceDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_CHSOURCE);
     ahpsp[IDD_CHSOURCE] = CreatePropertySheetPage(&psp);
 
     /* Create the Search driver page */
-    psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
-    psp.pfnDlgProc = (DLGPROC) SearchDrvDlgProc;
+    psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE;
+    psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_SEARCHDRV_TITLE);
+    psp.pfnDlgProc = SearchDrvDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_SEARCHDRV);
     ahpsp[IDD_SEARCHDRV] = CreatePropertySheetPage(&psp);
 
     /* Create the Install driver page */
-    psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
-    psp.pfnDlgProc = (DLGPROC) InstallDrvDlgProc;
+    psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE;
+    psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_INSTALLDRV_TITLE);
+    psp.pfnDlgProc = InstallDrvDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLDRV);
     ahpsp[IDD_INSTALLDRV] = CreatePropertySheetPage(&psp);
 
     /* Create the No driver page */
-    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
-    psp.pfnDlgProc = (DLGPROC) NoDriverDlgProc;
+    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
+    psp.pfnDlgProc = NoDriverDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_NODRIVER);
     ahpsp[IDD_NODRIVER] = CreatePropertySheetPage(&psp);
 
     /* Create the Install failed page */
-    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
-    psp.pfnDlgProc = (DLGPROC) InstallFailedDlgProc;
+    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
+    psp.pfnDlgProc = InstallFailedDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLFAILED);
     ahpsp[IDD_INSTALLFAILED] = CreatePropertySheetPage(&psp);
 
     /* Create the Need reboot page */
-    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
-    psp.pfnDlgProc = (DLGPROC) NeedRebootDlgProc;
+    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
+    psp.pfnDlgProc = NeedRebootDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_NEEDREBOOT);
     ahpsp[IDD_NEEDREBOOT] = CreatePropertySheetPage(&psp);
 
     /* Create the Finish page */
-    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
-    psp.pfnDlgProc = (DLGPROC) FinishDlgProc;
+    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
+    psp.pfnDlgProc = FinishDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE);
     ahpsp[IDD_FINISHPAGE] = CreatePropertySheetPage(&psp);