Author: mkupfer
Date: Wed Nov 12 14:00:09 2008
New Revision: 37316
URL:
http://svn.reactos.org/svn/reactos?rev=37316&view=rev
Log:
- add and enable partition creation and file system selection dialog
Modified:
trunk/reactos/base/setup/reactos/lang/en-US.rc
trunk/reactos/base/setup/reactos/reactos.c
trunk/reactos/base/setup/reactos/resource.h
Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en…
==============================================================================
--- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Wed Nov 12 14:00:09 2008
@@ -64,6 +64,22 @@
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"
Modified: trunk/reactos/base/setup/reactos/reactos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos…
==============================================================================
--- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Wed Nov 12 14:00:09 2008
@@ -544,7 +544,30 @@
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 @@
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;
}
}
Modified: trunk/reactos/base/setup/reactos/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc…
==============================================================================
--- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Wed Nov 12 14:00:09 2008
@@ -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