Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 14:25:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NEWDEV]

Browse source 
- fix 'first hardware page' not shown bug

svn path=/trunk/; revision=66412
This commit is contained in:
Johannes Anderwald 2015-02-22 17:53:17 +00:00
parent 264915f48d
commit 1726257036
2 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
reactos/dll/win32/newdev/resource.h
View file

@ -18,15 +18,16 @@
#define IDC_COMBO_PATH 2010 #define IDC_COMBO_PATH 2010
#define IDC_FINISHTITLE 2011 #define IDC_FINISHTITLE 2011
#define IDD_WELCOMEPAGE 0 #define IDD_WELCOMEPAGE 200
#define IDD_CHSOURCE 1 #define IDD_CHSOURCE 201
#define IDD_SEARCHDRV 2 #define IDD_SEARCHDRV 202
#define IDD_INSTALLDRV 3 #define IDD_INSTALLDRV 203
#define IDD_NODRIVER 4 #define IDD_NODRIVER 204
#define IDD_INSTALLFAILED 5 #define IDD_INSTALLFAILED 205
#define IDD_NEEDREBOOT 6 #define IDD_NEEDREBOOT 206
#define IDD_FINISHPAGE 7 #define IDD_FINISHPAGE 207
#define IDD_MAXIMUMPAGE IDD_FINISHPAGE #define IDD_FIRSTPAGE IDD_WELCOMEPAGE
#define IDD_MAXIMUMPAGE 7
#define IDS_INSTALLWIZARDTITLE 1000 #define IDS_INSTALLWIZARDTITLE 1000
#define IDS_UPDATEWIZARDTITLE 1001 #define IDS_UPDATEWIZARDTITLE 1001

19
reactos/dll/win32/newdev/wizard.c
View file

@ -1251,6 +1251,9 @@ DisplayWizard(
HPROPSHEETPAGE ahpsp[IDD_MAXIMUMPAGE + 1]; HPROPSHEETPAGE ahpsp[IDD_MAXIMUMPAGE + 1];
PROPSHEETPAGE psp; PROPSHEETPAGE psp;
/* zero based index */
startPage -= IDD_FIRSTPAGE;
/* Create the Welcome page */ /* Create the Welcome page */
ZeroMemory(&psp, sizeof(PROPSHEETPAGE)); ZeroMemory(&psp, sizeof(PROPSHEETPAGE));
psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwSize = sizeof(PROPSHEETPAGE);
@ -1260,52 +1263,52 @@ DisplayWizard(
psp.pszTitle = MAKEINTRESOURCE(DevInstData->bUpdate ? IDS_UPDATEWIZARDTITLE : IDS_INSTALLWIZARDTITLE); psp.pszTitle = MAKEINTRESOURCE(DevInstData->bUpdate ? IDS_UPDATEWIZARDTITLE : IDS_INSTALLWIZARDTITLE);
psp.pfnDlgProc = WelcomeDlgProc; psp.pfnDlgProc = WelcomeDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE); psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE);
ahpsp[IDD_WELCOMEPAGE] = CreatePropertySheetPage(&psp); ahpsp[IDD_WELCOMEPAGE-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
/* Create the Select Source page */ /* Create the Select Source page */
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE; psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE;
psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_CHSOURCE_TITLE); psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_CHSOURCE_TITLE);
psp.pfnDlgProc = CHSourceDlgProc; psp.pfnDlgProc = CHSourceDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_CHSOURCE); psp.pszTemplate = MAKEINTRESOURCE(IDD_CHSOURCE);
ahpsp[IDD_CHSOURCE] = CreatePropertySheetPage(&psp); ahpsp[IDD_CHSOURCE-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
/* Create the Search driver page */ /* Create the Search driver page */
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE; psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE;
psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_SEARCHDRV_TITLE); psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_SEARCHDRV_TITLE);
psp.pfnDlgProc = SearchDrvDlgProc; psp.pfnDlgProc = SearchDrvDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_SEARCHDRV); psp.pszTemplate = MAKEINTRESOURCE(IDD_SEARCHDRV);
ahpsp[IDD_SEARCHDRV] = CreatePropertySheetPage(&psp); ahpsp[IDD_SEARCHDRV-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
/* Create the Install driver page */ /* Create the Install driver page */
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE; psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USETITLE;
psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_INSTALLDRV_TITLE); psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_INSTALLDRV_TITLE);
psp.pfnDlgProc = InstallDrvDlgProc; psp.pfnDlgProc = InstallDrvDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLDRV); psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLDRV);
ahpsp[IDD_INSTALLDRV] = CreatePropertySheetPage(&psp); ahpsp[IDD_INSTALLDRV-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
/* Create the No driver page */ /* Create the No driver page */
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE; psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
psp.pfnDlgProc = NoDriverDlgProc; psp.pfnDlgProc = NoDriverDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_NODRIVER); psp.pszTemplate = MAKEINTRESOURCE(IDD_NODRIVER);
ahpsp[IDD_NODRIVER] = CreatePropertySheetPage(&psp); ahpsp[IDD_NODRIVER-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
/* Create the Install failed page */ /* Create the Install failed page */
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE; psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
psp.pfnDlgProc = InstallFailedDlgProc; psp.pfnDlgProc = InstallFailedDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLFAILED); psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLFAILED);
ahpsp[IDD_INSTALLFAILED] = CreatePropertySheetPage(&psp); ahpsp[IDD_INSTALLFAILED-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
/* Create the Need reboot page */ /* Create the Need reboot page */
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE; psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
psp.pfnDlgProc = NeedRebootDlgProc; psp.pfnDlgProc = NeedRebootDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_NEEDREBOOT); psp.pszTemplate = MAKEINTRESOURCE(IDD_NEEDREBOOT);
ahpsp[IDD_NEEDREBOOT] = CreatePropertySheetPage(&psp); ahpsp[IDD_NEEDREBOOT-200] = CreatePropertySheetPage(&psp);
/* Create the Finish page */ /* Create the Finish page */
psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE; psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
psp.pfnDlgProc = FinishDlgProc; psp.pfnDlgProc = FinishDlgProc;
psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE); psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE);
ahpsp[IDD_FINISHPAGE] = CreatePropertySheetPage(&psp); ahpsp[IDD_FINISHPAGE-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
/* Create the property sheet */ /* Create the property sheet */
psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwSize = sizeof(PROPSHEETHEADER);