From 27341b700fdf0f31118afb2669d05c334dcea811 Mon Sep 17 00:00:00 2001 From: Matthias Kupfer Date: Wed, 12 Nov 2008 20:00:09 +0000 Subject: [PATCH] - add and enable partition creation and file system selection dialog svn path=/trunk/; revision=37316 --- reactos/base/setup/reactos/lang/en-US.rc | 16 +++++++++++++ reactos/base/setup/reactos/reactos.c | 30 +++++++++++++++++++++++- reactos/base/setup/reactos/resource.h | 5 ++++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/reactos/base/setup/reactos/lang/en-US.rc b/reactos/base/setup/reactos/lang/en-US.rc index f9b5c327bb9..6c5d85314a9 100644 --- a/reactos/base/setup/reactos/lang/en-US.rc +++ b/reactos/base/setup/reactos/lang/en-US.rc @@ -64,6 +64,22 @@ BEGIN LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 END +IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 +STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +CAPTION "Create Partition" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 + CONTROL "Create and format partition",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + LTEXT "Size:",IDC_STATIC, 13,24,27,9 + EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP + LTEXT "GB",IDC_UNIT, 117,24,14,9 + LTEXT "Filesystem:",IDC_STATIC,13,46,35,9 + CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 + PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP +END + IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME CAPTION "Advanced Partition Settings" diff --git a/reactos/base/setup/reactos/reactos.c b/reactos/base/setup/reactos/reactos.c index a1d0b138283..89e6f417d9c 100644 --- a/reactos/base/setup/reactos/reactos.c +++ b/reactos/base/setup/reactos/reactos.c @@ -544,7 +544,30 @@ MoreOptDlgProc(HWND hwndDlg, 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); + break; + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + break; + } + } + return FALSE; +} + static INT_PTR CALLBACK DriveDlgProc(HWND hwndDlg, UINT uMsg, @@ -613,6 +636,11 @@ DriveDlgProc(HWND hwndDlg, case IDC_PARTMOREOPTS: DialogBox(hInstance,MAKEINTRESOURCE(IDD_BOOTOPTIONS),hwndDlg,MoreOptDlgProc); break; + case IDC_PARTCREATE: + DialogBox(hInstance,MAKEINTRESOURCE(IDD_PARTITION),hwndDlg,PartitionDlgProc); + break; + case IDC_PARTDELETE: + break; } } diff --git a/reactos/base/setup/reactos/resource.h b/reactos/base/setup/reactos/resource.h index 7194d906602..a59ad69e147 100644 --- a/reactos/base/setup/reactos/resource.h +++ b/reactos/base/setup/reactos/resource.h @@ -51,6 +51,11 @@ #define IDC_ACTION 2040 #define IDC_PARTMOREOPTS 2041 #define IDD_BOOTOPTIONS 2042 +#define IDD_PARTITION 2043 +#define IDC_UPDOWN1 2044 +#define IDC_PARTSIZE 2045 +#define IDC_UNIT 2046 +#define IDC_FSTYPE 2047 #define IDI_MAIN 3000