[ros-diffs] [janderwald] 66412: [NEWDEV] - fix 'first hardware page' not shown bug

Author: janderwald
Date: Sun Feb 22 17:53:17 2015
New Revision: 66412

URL: http://svn.reactos.org/svn/reactos?rev=66412&view=rev
Log:
[NEWDEV]
- fix 'first hardware page' not shown bug

Modified:
    trunk/reactos/dll/win32/newdev/resource.h
    trunk/reactos/dll/win32/newdev/wizard.c

Modified: trunk/reactos/dll/win32/newdev/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/resource.…
==============================================================================
--- trunk/reactos/dll/win32/newdev/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/resource.h	[iso-8859-1] Sun Feb 22 17:53:17 2015
@@ -18,15 +18,16 @@
 #define IDC_COMBO_PATH       2010
 #define IDC_FINISHTITLE      2011
 
-#define IDD_WELCOMEPAGE   0
-#define IDD_CHSOURCE      1
-#define IDD_SEARCHDRV     2
-#define IDD_INSTALLDRV    3
-#define IDD_NODRIVER      4
-#define IDD_INSTALLFAILED 5
-#define IDD_NEEDREBOOT    6
-#define IDD_FINISHPAGE    7
-#define IDD_MAXIMUMPAGE   IDD_FINISHPAGE
+#define IDD_WELCOMEPAGE   200
+#define IDD_CHSOURCE      201
+#define IDD_SEARCHDRV     202
+#define IDD_INSTALLDRV    203
+#define IDD_NODRIVER      204
+#define IDD_INSTALLFAILED 205
+#define IDD_NEEDREBOOT    206
+#define IDD_FINISHPAGE    207
+#define IDD_FIRSTPAGE     IDD_WELCOMEPAGE
+#define IDD_MAXIMUMPAGE   7
 
 #define IDS_INSTALLWIZARDTITLE 1000
 #define IDS_UPDATEWIZARDTITLE  1001

Modified: trunk/reactos/dll/win32/newdev/wizard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?…
==============================================================================
--- trunk/reactos/dll/win32/newdev/wizard.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/wizard.c	[iso-8859-1] Sun Feb 22 17:53:17 2015
@@ -1251,6 +1251,9 @@
     HPROPSHEETPAGE ahpsp[IDD_MAXIMUMPAGE + 1];
     PROPSHEETPAGE psp;
 
+    /* zero based index */
+    startPage -= IDD_FIRSTPAGE;
+
     /* Create the Welcome page */
     ZeroMemory(&psp, sizeof(PROPSHEETPAGE));
     psp.dwSize = sizeof(PROPSHEETPAGE);
@@ -1260,52 +1263,52 @@
     psp.pszTitle = MAKEINTRESOURCE(DevInstData->bUpdate ? IDS_UPDATEWIZARDTITLE :
IDS_INSTALLWIZARDTITLE);
     psp.pfnDlgProc = WelcomeDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE);
-    ahpsp[IDD_WELCOMEPAGE] = CreatePropertySheetPage(&psp);
+    ahpsp[IDD_WELCOMEPAGE-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
 
     /* Create the Select Source page */
     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);
+    ahpsp[IDD_CHSOURCE-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
 
     /* Create the Search driver page */
     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);
+    ahpsp[IDD_SEARCHDRV-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
 
     /* Create the Install driver page */
     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);
+    ahpsp[IDD_INSTALLDRV-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
 
     /* Create the No driver page */
     psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
     psp.pfnDlgProc = NoDriverDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_NODRIVER);
-    ahpsp[IDD_NODRIVER] = CreatePropertySheetPage(&psp);
+    ahpsp[IDD_NODRIVER-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
 
     /* Create the Install failed page */
     psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
     psp.pfnDlgProc = InstallFailedDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLFAILED);
-    ahpsp[IDD_INSTALLFAILED] = CreatePropertySheetPage(&psp);
+    ahpsp[IDD_INSTALLFAILED-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
 
     /* Create the Need reboot page */
     psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
     psp.pfnDlgProc = NeedRebootDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_NEEDREBOOT);
-    ahpsp[IDD_NEEDREBOOT] = CreatePropertySheetPage(&psp);
+    ahpsp[IDD_NEEDREBOOT-200] = CreatePropertySheetPage(&psp);
 
     /* Create the Finish page */
     psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER | PSP_USETITLE;
     psp.pfnDlgProc = FinishDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE);
-    ahpsp[IDD_FINISHPAGE] = CreatePropertySheetPage(&psp);
+    ahpsp[IDD_FINISHPAGE-IDD_FIRSTPAGE] = CreatePropertySheetPage(&psp);
 
     /* Create the property sheet */
     psh.dwSize = sizeof(PROPSHEETHEADER);