[REACTOS]

- Fix height of the inner wizard pages.
- Do not show the header for the finish page.
- Remove the language selection page and the ReactOS logo because they have been moved to userinit.
- Start removing groupbox controls from the wizard pages. They just occupy a lot of space.
- Resize / realign the install type page and add some descriptive text to all languages.
- Allocate setup data from the heap and pass the setup data pointer to each wizard page.
- Move the drive wizard page (DriveDlgProc) to a separate file.
- Move the common declarations to a new header file.

svn path=/trunk/; revision=70638

Author: EricKohl

reactos/base/setup/reactos/CMakeLists.txt

@@ -1,7 +1,13 @@
 
+list(APPEND SOURCE
+    drivepage.c
+    reactos.c
+    reactos.h)
+
 file(GLOB reactos_rc_deps res/*.*)
 add_rc_deps(reactos.rc ${reactos_rc_deps})
-add_executable(reactos reactos.c reactos.rc)
+add_executable(reactos ${SOURCE} reactos.rc)
+add_pch(reactos reactos.h SOURCE)
 target_link_libraries(reactos uuid)
 set_module_type(reactos win32gui UNICODE)
 add_importlibs(reactos gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll)

reactos/base/setup/reactos/drivepage.c

@@ -0,0 +1,243 @@
+/*
+ *  ReactOS applications
+ *  Copyright (C) 2004-2008 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS GUI first stage setup application
+ * FILE:        base/setup/reactos/drivepage.c
+ * PROGRAMMERS: Eric Kohl
+ *              Matthias Kupfer
+ *              Dmitry Chapyshev ([email protected])
+ */
+
+#include "reactos.h"
+#include "resource.h"
+
+/* GLOBALS ******************************************************************/
+
+static INT_PTR CALLBACK
+MoreOptDlgProc(HWND hwndDlg,
+               UINT uMsg,
+               WPARAM wParam,
+               LPARAM lParam)
+{
+    PSETUPDATA pSetupData;
+
+    /* Retrieve pointer to the global setup data */
+    pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
+
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+            /* Save pointer to the global setup data */
+            pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+            SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
+
+            CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED);
+            SendMessage(GetDlgItem(hwndDlg, IDC_PATH),
+                        WM_SETTEXT,
+                        (WPARAM)0,
+                        (LPARAM)pSetupData->InstallDir);
+            break;
+
+        case WM_COMMAND:
+            switch(LOWORD(wParam))
+            {
+                case IDOK:
+                    SendMessage(GetDlgItem(hwndDlg, IDC_PATH),
+                                WM_GETTEXT,
+                                (WPARAM)sizeof(pSetupData->InstallDir) / sizeof(TCHAR),
+                                (LPARAM)pSetupData->InstallDir);
+
+                    EndDialog(hwndDlg, IDOK);
+                    return TRUE;
+
+                case IDCANCEL:
+                    EndDialog(hwndDlg, IDCANCEL);
+                    return TRUE;
+            }
+            break;
+    }
+
+    return FALSE;
+}
+
+static INT_PTR CALLBACK
+PartitionDlgProc(HWND hwndDlg,
+                 UINT uMsg,
+                 WPARAM wParam,
+                 LPARAM lParam)
+{
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+            break;
+        case WM_COMMAND:
+        {
+            switch(LOWORD(wParam))
+            {
+                case IDOK:
+                    EndDialog(hwndDlg, IDOK);
+                    return TRUE;
+                case IDCANCEL:
+                    EndDialog(hwndDlg, IDCANCEL);
+                    return TRUE;
+            }
+        }
+    }
+    return FALSE;
+}
+
+INT_PTR
+CALLBACK
+DriveDlgProc(
+    HWND hwndDlg,
+    UINT uMsg,
+    WPARAM wParam,
+    LPARAM lParam)
+{
+    PSETUPDATA pSetupData;
+#if 1
+    HDEVINFO h;
+    HWND hList;
+    SP_DEVINFO_DATA DevInfoData;
+    DWORD i;
+#endif
+
+    /* Retrieve pointer to the global setup data */
+    pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
+
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+        {
+            HWND hwndControl;
+            DWORD dwStyle;
+
+            /* Save pointer to the global setup data */
+            pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+            SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
+
+            hwndControl = GetParent(hwndDlg);
+
+            dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
+            SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
+        
+            /* Set title font */
+            /*SendDlgItemMessage(hwndDlg,
+                                 IDC_STARTTITLE,
+                                 WM_SETFONT,
+                                 (WPARAM)hTitleFont,
+                                 (LPARAM)TRUE);*/
+#if 1
+            h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, DIGCF_PRESENT);
+            if (h != INVALID_HANDLE_VALUE)
+            {
+                hList =GetDlgItem(hwndDlg, IDC_PARTITION); 
+                DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
+                for (i=0; SetupDiEnumDeviceInfo(h, i, &DevInfoData); i++)
+                {
+                    DWORD DataT;
+                    LPTSTR buffer = NULL;
+                    DWORD buffersize = 0;
+
+                    while (!SetupDiGetDeviceRegistryProperty(h,
+                                                             &DevInfoData,
+                                                             SPDRP_DEVICEDESC,
+                                                             &DataT,
+                                                             (PBYTE)buffer,
+                                                             buffersize,
+                                                             &buffersize))
+                    {
+                        if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+                        {
+                            if (buffer) LocalFree(buffer);
+                            buffer = LocalAlloc(LPTR, buffersize * 2);
+                        }
+                        else
+                            break;
+                    }
+                    if (buffer)
+                    {
+                        SendMessage(hList, LB_ADDSTRING, (WPARAM) 0, (LPARAM) buffer);
+                        LocalFree(buffer);
+                    }
+                }
+                SetupDiDestroyDeviceInfoList(h);
+            }
+#endif
+        }
+        break;
+
+        case WM_COMMAND:
+        {
+            switch(LOWORD(wParam))
+            {
+                case IDC_PARTMOREOPTS:
+                    DialogBoxParam(pSetupData->hInstance,
+                                   MAKEINTRESOURCE(IDD_BOOTOPTIONS),
+                                   hwndDlg,
+                                   (DLGPROC)MoreOptDlgProc,
+                                   (LPARAM)pSetupData);
+                    break;
+                case IDC_PARTCREATE:
+                    DialogBox(pSetupData->hInstance,
+                              MAKEINTRESOURCE(IDD_PARTITION),
+                              hwndDlg,
+                              (DLGPROC) PartitionDlgProc);
+                    break;
+                case IDC_PARTDELETE:
+                    break;
+            }
+            break;
+        }
+
+        case WM_NOTIFY:
+        {
+            LPNMHDR lpnm = (LPNMHDR)lParam;
+
+            switch (lpnm->code)
+            {        
+                case PSN_SETACTIVE:
+                    PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK);
+                    break;
+
+                case PSN_QUERYCANCEL:
+                    SetWindowLongPtr(hwndDlg,
+                                     DWL_MSGRESULT,
+                                     MessageBox(GetParent(hwndDlg),
+                                                pSetupData->szAbortMessage,
+                                                pSetupData->szAbortTitle,
+                                                MB_YESNO | MB_ICONQUESTION) != IDYES);
+                    return TRUE;
+
+                default:
+                    break;
+            }
+        }
+        break;
+
+        default:
+            break;
+
+    }
+
+    return FALSE;
+}
+
+/* EOF */

reactos/base/setup/reactos/lang/bg-BG.rc

@@ -10,31 +10,19 @@ BEGIN
     LTEXT "Натиснете „Приключване“ за изход от настройването.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Език за настройването:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 8, 109, 135, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 145, 107, 163, 142
-    CONTROL "Клавиатура или начин на въвеждане:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 8, 142, 135, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 145, 141, 163, 81
-    LTEXT "Натиснете „Напред“ за избор на вида настройване.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Настройка на РеактОС"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Вид настройване", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Слагане на РеактОС", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Поправка или осъвременяване на сложен РеактОС", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Слагане на РеактОС", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Поправка или осъвременяване на сложен РеактОС", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Натиснете „Напред“ за настройка на устройствата.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +37,7 @@ BEGIN
     LTEXT "Натиснете „Напред“ за избор на устройство за слагане.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
@@ -94,7 +82,7 @@ BEGIN
     PUSHBUTTON "&Отказ", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Слагане на РеактОС"
 FONT 8, "MS Shell Dlg"
@@ -103,7 +91,7 @@ BEGIN
     LTEXT "Натиснете „Напред“ за за начало на слагането.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
@@ -128,8 +116,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Избор на език"
-    IDS_LANGSUBTITLE "Изберете език за настройването и за крайната уредба."
     IDS_TYPETITLE "РеактОС ви приветства!"
     IDS_TYPESUBTITLE "Изберете вид на настройването."
     IDS_DEVICETITLE "Настройване на основните устройства"