diff --git a/reactos/lib/syssetup/Makefile b/reactos/lib/syssetup/Makefile index 0506b5eb261..28e11fd148e 100644 --- a/reactos/lib/syssetup/Makefile +++ b/reactos/lib/syssetup/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.7 2004/04/16 13:37:18 ekohl Exp $ +# $Id: Makefile,v 1.8 2004/04/19 10:54:23 ekohl Exp $ PATH_TO_TOP = ../.. @@ -18,7 +18,6 @@ TARGET_RCFLAGS += -D__USE_W32API -D_WIN32_IE=0x0500 TARGET_LFLAGS = -nostartfiles -nostdlib TARGET_OBJECTS = dllmain.o install.o logfile.o wizard.o -# wizard.o include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk diff --git a/reactos/lib/syssetup/install.c b/reactos/lib/syssetup/install.c index 67b9068a277..fd382d30ef1 100644 --- a/reactos/lib/syssetup/install.c +++ b/reactos/lib/syssetup/install.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: install.c,v 1.11 2004/04/16 13:37:18 ekohl Exp $ +/* $Id: install.c,v 1.12 2004/04/19 10:54:23 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -34,6 +34,7 @@ #include #include +#include #include "globals.h" #include "resource.h" @@ -42,11 +43,6 @@ #define VMWINST -/* userenv.dll */ -BOOL WINAPI InitializeProfiles (VOID); -BOOL WINAPI CreateUserProfileW (PSID Sid, LPCWSTR lpUserName); - - /* GLOBALS ******************************************************************/ PSID DomainSid = NULL; @@ -76,6 +72,7 @@ DebugPrint(char* fmt,...) #endif } + #ifdef VMWINST static BOOL RunVMWInstall(VOID) @@ -292,14 +289,13 @@ InstallReactOS (HINSTANCE hInstance) #endif #ifdef VMWINST - RunVMWInstall(); + RunVMWInstall (); #endif - DialogBox( -// GetModuleHandle(TEXT("syssetup.dll")), - hDllInstance, - MAKEINTRESOURCE(IDD_RESTART), - NULL, - RestartDlgProc); + + DialogBox (hDllInstance, + MAKEINTRESOURCE(IDD_RESTART), + NULL, + RestartDlgProc); return 0; } diff --git a/reactos/lib/syssetup/syssetup_Cz.rc b/reactos/lib/syssetup/syssetup_Cz.rc index 4057d9b9955..434bf4cd895 100644 --- a/reactos/lib/syssetup/syssetup_Cz.rc +++ b/reactos/lib/syssetup/syssetup_Cz.rc @@ -18,6 +18,68 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STATIC, 115, 9, 189, 31 + LTEXT "This wizard installs ReactOS on your computer. The wizard "\ + "needs to gather some information about you and your computer "\ + "to set up ReactOS properly.", IDC_STATIC, 115, 50, 189, 100 + LTEXT "Click Next to continue with Setup.", IDC_STATIC, 115, 160, 189, 31 +END + + +IDD_OWNERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Type your full name and the name of your company or organization.", + IDC_STATIC, 54, 7, 242, 21 + LTEXT "Na&me:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Organization:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Type a name for your computer that is 63 characters or less. "\ + "If you are on a network, your computer name must be unique.", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "&Computer Name:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + LTEXT "Setup will create a user account on your computer called Administrator. "\ + "You can use this account if you need full access to your computer.", + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Type an Administrator Password that is 14 characters or less.", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "&Administrator Password:", IDC_STATIC, 54, 104, 75, 8 + EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "C&onfirm Password:", IDC_STATIC, 54, 123, 75, 8 + EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Completing ReactOS Setup" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Completing the ReactOS Setup Wizard",IDC_STATIC,115,9,195,37 + LTEXT "You have successfully completed ReactOS Setup.\n\n" \ + "When you click Finish, your computer will restart.", IDC_STATIC, 115, 58, 195, 100 + LTEXT "If there is a CD in a drive, remove it. Then, to restart "\ + "your computer, click Finish.", IDC_STATIC, 115, 160, 195, 31 +END + + IDD_RESTART DIALOG 6, 18, 245, 116 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Instatalace ReactOSu" diff --git a/reactos/lib/syssetup/wizard.c b/reactos/lib/syssetup/wizard.c index b2b69a97153..f3b75c9778b 100644 --- a/reactos/lib/syssetup/wizard.c +++ b/reactos/lib/syssetup/wizard.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: wizard.c,v 1.1 2004/04/16 13:37:18 ekohl Exp $ +/* $Id: wizard.c,v 1.2 2004/04/19 10:54:23 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -137,8 +137,8 @@ OwnerPageDlgProc(HWND hwndDlg, if (GetDlgItemText(hwndDlg, IDC_OWNERNAME, SetupData->OwnerName, 50) == 0) { MessageBox (hwndDlg, - "Setup cannot continue until you enter your name.", - "ReactOS Setup", + _T("Setup cannot continue until you enter your name."), + _T("ReactOS Setup"), MB_ICONERROR | MB_OK); return -1; } @@ -212,8 +212,8 @@ ComputerPageDlgProc(HWND hwndDlg, if (GetDlgItemText(hwndDlg, IDC_COMPUTERNAME, SetupData->ComputerName, 64) == 0) { MessageBox (hwndDlg, - "Setup cannot continue until you enter the name of your computer.", - "ReactOS Setup", + _T("Setup cannot continue until you enter the name of your computer."), + _T("ReactOS Setup"), MB_ICONERROR | MB_OK); return -1; } @@ -226,9 +226,9 @@ ComputerPageDlgProc(HWND hwndDlg, if (_tcscmp (Password1, Password2)) { MessageBox (hwndDlg, - "The passwords you entered do not match. Please enter "\ - "the desired password again.", - "ReactOS Setup", + _T("The passwords you entered do not match. Please enter "\ + "the desired password again."), + _T("ReactOS Setup"), MB_ICONERROR | MB_OK); return -1; } @@ -353,7 +353,7 @@ InstallWizard (VOID) // psh.pszbmHeader = MAKEINTRESOURCE(IDB_BANNER); /* Display the wizard */ - PropertySheetA (&psh); + PropertySheet (&psh); } /* EOF */