Author: hpoussin Date: Wed Jul 11 15:51:42 2007 New Revision: 27589
URL: http://svn.reactos.org/svn/reactos?rev=27589&view=rev Log: Add a status window instead of a black screen at the start of the 2nd stage, when installing devices Now, we should be able to diagnostic if a hang is caused by a bad driver or something else
Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/lang/en-US.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/lang/es-ES.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h
Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install.... ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Wed Jul 11 15:51:42 2007 @@ -397,9 +397,66 @@ }
+static BOOL CALLBACK +StatusMessageWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + UNREFERENCED_PARAMETER(wParam); + + switch (uMsg) + { + case WM_INITDIALOG: + { + TCHAR szMsg[256]; + + if (!LoadString(hDllInstance, IDS_STATUS_INSTALL_DEV, szMsg, sizeof(szMsg)/sizeof(szMsg[0]))) + return FALSE; + SetDlgItemText(hwndDlg, IDC_STATUSLABEL, szMsg); + return TRUE; + } + } + return FALSE; +} + + +static DWORD WINAPI +ShowStatusMessageThread( + IN LPVOID lpParameter) +{ + HWND *phWnd = (HWND *)lpParameter; + HWND hWnd; + MSG Msg; + + hWnd = CreateDialogParam( + hDllInstance, + MAKEINTRESOURCE(IDD_STATUSWINDOW_DLG), + GetDesktopWindow(), + StatusMessageWindowProc, + (LPARAM)NULL); + if (!hWnd) + return 0; + *phWnd = hWnd; + + ShowWindow(hWnd, SW_SHOW); + + /* Message loop for the Status window */ + while (GetMessage(&Msg, NULL, 0, 0)) + { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } + + return 0; +} + static BOOL CommonInstall(VOID) { + HWND hWnd = NULL; + hSysSetupInf = SetupOpenInfFileW( L"syssetup.inf", NULL, @@ -418,32 +475,43 @@ return FALSE; }
+ CreateThread( + NULL, + 0, + ShowStatusMessageThread, + (LPVOID)&hWnd, + 0, + NULL); + if (!EnableUserModePnpManager()) { DebugPrint("EnableUserModePnpManager() failed!\n"); + SetupCloseInfFile(hSysSetupInf); + EndDialog(hWnd, 0); return FALSE; }
if (CMP_WaitNoPendingInstallEvents(INFINITE) != WAIT_OBJECT_0) { DebugPrint("CMP_WaitNoPendingInstallEvents() failed!\n"); + SetupCloseInfFile(hSysSetupInf); + EndDialog(hWnd, 0); return FALSE; }
+ EndDialog(hWnd, 0); return TRUE; }
DWORD WINAPI InstallLiveCD(IN HINSTANCE hInstance) { - HKEY hKey = NULL; - LPTSTR Shell = NULL; STARTUPINFO StartupInfo; PROCESS_INFORMATION ProcessInformation; BOOL res;
if (!CommonInstall()) - return 0; + goto cleanup; SetupCloseInfFile(hSysSetupInf);
/* Run the shell */ @@ -472,9 +540,6 @@ WaitForSingleObject(ProcessInformation.hProcess, INFINITE);
cleanup: - if (hKey != NULL) - RegCloseKey(hKey); - HeapFree(GetProcessHeap(), 0, Shell); MessageBoxA( NULL, "You can shutdown your computer, or press ENTER to reboot",
Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc Wed Jul 11 15:51:42 2007 @@ -161,6 +161,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" @@ -221,4 +230,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Propchange: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Wed Jul 11 15:51:42 2007 @@ -163,6 +163,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Anerkennungen" @@ -246,4 +255,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Propchange: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Wed Jul 11 15:51:42 2007 @@ -164,6 +164,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" @@ -247,4 +256,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Propchange: trunk/reactos/dll/win32/syssetup/lang/en-US.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Wed Jul 11 15:51:42 2007 @@ -184,6 +184,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" @@ -227,4 +236,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Propchange: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision
Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Wed Jul 11 15:51:42 2007 @@ -164,6 +164,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Veuillez patienter..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Remerciements" @@ -247,4 +256,10 @@ IDS_WZD_PASSWORDCHAR "Le mot de passe entré contient des caractères invalides. Veuillez saisir un mot de passe correct." IDS_WZD_LOCALTIME "L'installation n'a pas réussi à définir l'heure locale." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installation des périphériques en cours..." +END + /* EOF */
Propchange: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc Wed Jul 11 15:51:42 2007 @@ -176,6 +176,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Köszönetnyílvánítás" @@ -254,4 +263,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc Wed Jul 11 15:51:42 2007 @@ -162,6 +162,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Pengakuan" @@ -245,4 +254,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Wed Jul 11 15:51:42 2007 @@ -155,6 +155,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Riconoscimenti" @@ -238,4 +247,10 @@ IDS_WZD_PASSWORDCHAR "La password contiene caratteri non validi. Digitate una password diversa." IDS_WZD_LOCALTIME "La procedura di installazione non ha potuto impostare l'ora locale." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Wed Jul 11 15:51:42 2007 @@ -164,6 +164,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "³F" @@ -225,4 +234,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Modified: trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nb-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc Wed Jul 11 15:51:42 2007 @@ -167,6 +167,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Annerkjennelser" @@ -249,4 +258,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc Wed Jul 11 15:51:42 2007 @@ -164,6 +164,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" @@ -225,4 +234,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Propchange: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Revision
Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc Wed Jul 11 15:51:42 2007 @@ -167,6 +167,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Podziêkowania" @@ -250,4 +259,10 @@ IDS_WZD_PASSWORDCHAR "Wprowadzone has³o zawiera nieodpowiednie znaki. Proszê wprowadziæ has³o bez ich udzia³u." IDS_WZD_LOCALTIME "Program instalacyjny nie zdo³a³ ustawiæ czasu lokalnego." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Wed Jul 11 15:51:42 2007 @@ -145,6 +145,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Ïîäòâåðæäåíèÿ" @@ -228,4 +237,10 @@ IDS_WZD_PASSWORDCHAR "Ïàðîëè, êîòîðûå âû ââåëè ñîäåðæàò çàïðåùåííûå ñèìâîëû. Ââåäèòå èõ ñíîâà." IDS_WZD_LOCALTIME "Íå óäàëîñü óñòàíîâèòü ìåñòíîå âðåìÿ." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Wed Jul 11 15:51:42 2007 @@ -153,6 +153,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "ϳäòâåðäæåííÿ" @@ -235,4 +244,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh-... ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc Wed Jul 11 15:51:42 2007 @@ -152,6 +152,15 @@ END
+IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Please wait..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" @@ -209,4 +218,10 @@ IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." IDS_WZD_LOCALTIME "Setup was unable to set the local time." END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Installing devices..." +END + /* EOF */
Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resource... ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h (original) +++ trunk/reactos/dll/win32/syssetup/resource.h Wed Jul 11 15:51:42 2007 @@ -63,6 +63,9 @@
#define IDD_GPL 2100 #define IDC_GPL_TEXT 2101 + +#define IDD_STATUSWINDOW_DLG 2200 +#define IDC_STATUSLABEL 2201
#define IDS_ACKTITLE 3010 #define IDS_ACKSUBTITLE 3011 @@ -135,6 +138,8 @@ #define IDS_WZD_PASSWORDCHAR 3455 #define IDS_WZD_LOCALTIME 3456
+#define IDS_STATUS_INSTALL_DEV 3500 + #define IDR_GPL 4000
#endif /* RESOURCE_H */