Ros-diffs January 2020

ros-diffs@reactos.org

21 participants
133 discussions

[reactos] 01/01: [ATL] Re-enable MSVC warning C4477 (#2010)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=367a94211b0d83ed0ffa4… commit 367a94211b0d83ed0ffa4dfd4d2e97dadaca18fc Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Jan 20 14:24:06 2020 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jan 20 14:24:06 2020 +0100 [ATL] Re-enable MSVC warning C4477 (#2010) Follow-up to e410a122. --- dll/win32/atl/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dll/win32/atl/CMakeLists.txt b/dll/win32/atl/CMakeLists.txt index ac492112eeb..475ebab24ff 100644 --- a/dll/win32/atl/CMakeLists.txt +++ b/dll/win32/atl/CMakeLists.txt @@ -9,11 +9,6 @@ add_definitions( include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(atl.dll atl.spec ADD_IMPORTLIB) -if(MSVC) - # Disable warning C4477 (printf format warnings) - add_compile_flags("/wd4477") -endif() - list(APPEND SOURCE atl.c atl30.c

4 years, 11 months

[reactos] 01/01: [WIN32SS][USERSRV] Add CSR API_NUMBER comments

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8dc90a4c7ea00b0d5a0ee… commit 8dc90a4c7ea00b0d5a0ee3da51bc83720a0ecded Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 20 08:06:40 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jan 20 08:06:40 2020 +0900 [WIN32SS][USERSRV] Add CSR API_NUMBER comments --- win32ss/user/winsrv/usersrv/init.c | 5 +++++ win32ss/user/winsrv/usersrv/register.c | 2 ++ win32ss/user/winsrv/usersrv/shutdown.c | 3 +++ 3 files changed, 10 insertions(+) diff --git a/win32ss/user/winsrv/usersrv/init.c b/win32ss/user/winsrv/usersrv/init.c index f3c5be8a4dc..0fb1922ff8d 100644 --- a/win32ss/user/winsrv/usersrv/init.c +++ b/win32ss/user/winsrv/usersrv/init.c @@ -119,6 +119,7 @@ CreateSystemThreads(PVOID pParam) return 0; } +/* API_NUMBER: UserpCreateSystemThreads */ CSR_API(SrvCreateSystemThreads) { NTSTATUS Status = CsrExecServerThread(CreateSystemThreads, 0); @@ -130,12 +131,14 @@ CSR_API(SrvCreateSystemThreads) return Status; } +/* API_NUMBER: UserpActivateDebugger */ CSR_API(SrvActivateDebugger) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } +/* API_NUMBER: UserpGetThreadConsoleDesktop */ CSR_API(SrvGetThreadConsoleDesktop) { NTSTATUS Status; @@ -153,12 +156,14 @@ CSR_API(SrvGetThreadConsoleDesktop) return STATUS_SUCCESS; } +/* API_NUMBER: UserpDeviceEvent */ CSR_API(SrvDeviceEvent) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } +/* API_NUMBER: UserpLogon */ CSR_API(SrvLogon) { PUSER_LOGON LogonRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.LogonRequest; diff --git a/win32ss/user/winsrv/usersrv/register.c b/win32ss/user/winsrv/usersrv/register.c index 0a521bcdd4e..9f400881d4e 100644 --- a/win32ss/user/winsrv/usersrv/register.c +++ b/win32ss/user/winsrv/usersrv/register.c @@ -26,6 +26,7 @@ extern HANDLE CsrApiPort; /* PUBLIC SERVER APIS *********************************************************/ +/* API_NUMBER: UserpRegisterLogonProcess */ CSR_API(SrvRegisterLogonProcess) { PUSER_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.RegisterLogonProcessRequest; @@ -76,6 +77,7 @@ CSR_API(SrvRegisterLogonProcess) return STATUS_SUCCESS; } +/* API_NUMBER: UserpRegisterServicesProcess */ CSR_API(SrvRegisterServicesProcess) { PUSER_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.RegisterServicesProcessRequest; diff --git a/win32ss/user/winsrv/usersrv/shutdown.c b/win32ss/user/winsrv/usersrv/shutdown.c index b07609314c8..e81c6478232 100644 --- a/win32ss/user/winsrv/usersrv/shutdown.c +++ b/win32ss/user/winsrv/usersrv/shutdown.c @@ -799,6 +799,7 @@ UserClientShutdown(IN PCSR_PROCESS CsrProcess, /* PUBLIC SERVER APIS *********************************************************/ +/* API_NUMBER: UserpExitWindowsEx */ CSR_API(SrvExitWindowsEx) { NTSTATUS Status; @@ -823,6 +824,7 @@ CSR_API(SrvExitWindowsEx) return Status; } +/* API_NUMBER: UserpEndTask */ CSR_API(SrvEndTask) { PUSER_END_TASK EndTaskRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.EndTaskRequest; @@ -867,6 +869,7 @@ CSR_API(SrvEndTask) return STATUS_SUCCESS; } +/* API_NUMBER: UserpRecordShutdownReason */ CSR_API(SrvRecordShutdownReason) { DPRINT1("%s not yet implemented\n", __FUNCTION__);

4 years, 11 months

[reactos] 01/01: [USETUP] Implement resource ID text based strings for MUI (#2193)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2bf4180c80b1c18594bd3… commit 2bf4180c80b1c18594bd302b3f3c21c9863c315d Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Jan 19 17:58:13 2020 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 19 17:58:13 2020 +0100 [USETUP] Implement resource ID text based strings for MUI (#2193) CORE-12683 Supersedes PR #612. * [USETUP] Implement the internal MUI routines for text manipulation based on its ID and implement text resource based IDs USETUP (the 1st stage text mode setup module) bases upon MUI (Multilingual User Interface) sub-component of USETUP which is responsible for the ability into translating the MUI pages (each page having corresponding properties like X, Y coordinates, text flags and text string buffer) in various languages. The only problem, as of now, is that whenever you want to modify a certain property of a page, such as removing a text from the said page in the screen, you've got to rely on using CONSOLE_* specific functions and calling with hardcoded parameters, namely the coordinates. This can become a problem as not every localized (translated) MUI page has the same properties for each language and this could lead to various issues. Therefore, assigning each entry with an ID you can remove a text by only giving its ID (and the entry page number) without having the need to specify the coordinates as the internal MUI routine, MUIGetEntry(), automatically retrieves the entry with respective data fields. The following commit implements: - MUIGetEntry() - MUIClearText() - MUIClearStyledText() - MUISetText() - MUISetStyledText() - Now the X and Y coordinate members of MUI_ENTRY are of SHORT integer type, for the sake of the general code as most of the coordination values, even the COORD structure itself, has the coordination points as SHORTs and not BYTEs. The following MUI functions will be used to manipulate text based resources depending on their ID from the corresponding MUI entry. * [USETUP] Make CONSOLE_ClearTextXY function public so that we can use across other files. * [USETUP] Implement the IDs for each text MUI entry in locale files. This mechanism follows the same principle of resource IDs in Win32 applications. Static text is merely a resource that doesn't get changed programmatically for whole of its lifetime whereas dynamic resources can change during the lifetime of the program depending on the algorithm (for example, hide that piece of text and set another one, etc.). * [USETUP] Remove the "Press ENTER to continue" message prompt when the partition formatting begins. --- base/setup/usetup/consup.c | 1 - base/setup/usetup/consup.h | 6 + base/setup/usetup/lang/bg-BG.h | 628 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/bn-BD.h | 648 +++++++++++++++++++++++++++-------------- base/setup/usetup/lang/cs-CZ.h | 627 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/da-DK.h | 641 ++++++++++++++++++++++++++-------------- base/setup/usetup/lang/de-DE.h | 634 ++++++++++++++++++++++++++-------------- base/setup/usetup/lang/el-GR.h | 642 ++++++++++++++++++++++++++-------------- base/setup/usetup/lang/en-US.h | 627 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/es-ES.h | 627 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/et-EE.h | 627 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/fr-FR.h | 636 ++++++++++++++++++++++++++-------------- base/setup/usetup/lang/he-IL.h | 627 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/hu-HU.h | 593 ++++++++++++++++++++++++------------- base/setup/usetup/lang/it-IT.h | 628 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/ja-JP.h | 627 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/lt-LT.h | 625 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/ms-MY.h | 624 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/nl-NL.h | 630 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/pl-PL.h | 618 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/pt-BR.h | 642 ++++++++++++++++++++++++++-------------- base/setup/usetup/lang/pt-PT.h | 642 ++++++++++++++++++++++++++-------------- base/setup/usetup/lang/ro-RO.h | 644 ++++++++++++++++++++++++++-------------- base/setup/usetup/lang/ru-RU.h | 638 ++++++++++++++++++++++++++-------------- base/setup/usetup/lang/sk-SK.h | 627 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/sq-AL.h | 627 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/sv-SE.h | 625 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/tr-TR.h | 617 ++++++++++++++++++++++++++------------- base/setup/usetup/lang/uk-UA.h | 627 ++++++++++++++++++++++++++------------- base/setup/usetup/mui.c | 196 +++++++++++++ base/setup/usetup/mui.h | 41 ++- base/setup/usetup/usetup.c | 5 + 32 files changed, 11579 insertions(+), 5668 deletions(-) diff --git a/base/setup/usetup/consup.c b/base/setup/usetup/consup.c index a919e076248..84ef416ed7f 100644 --- a/base/setup/usetup/consup.c +++ b/base/setup/usetup/consup.c @@ -321,7 +321,6 @@ CONSOLE_SetTextXY( &Written); } -static VOID CONSOLE_ClearTextXY(IN SHORT x, IN SHORT y, diff --git a/base/setup/usetup/consup.h b/base/setup/usetup/consup.h index c107785cb3c..a14e3b10f7d 100644 --- a/base/setup/usetup/consup.h +++ b/base/setup/usetup/consup.h @@ -200,6 +200,12 @@ CONSOLE_SetTextXY( IN SHORT y, IN LPCSTR Text); +VOID +CONSOLE_ClearTextXY( + IN SHORT x, + IN SHORT y, + IN SHORT Length); + VOID CONSOLE_SetUnderlinedTextXY( IN SHORT x, diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 2b92b5f71ef..f3bd4a8f566 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -9,25 +9,29 @@ static MUI_ENTRY bgBGSetupInitPageEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 0, 20, "Please wait while the ReactOS Setup initializes itself", - TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, + TEXT_ID_STATIC }, { 0, 21, "and discovers your devices...", - TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, + TEXT_ID_STATIC }, { 0, 0, "Please wait...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -43,37 +47,43 @@ static MUI_ENTRY bgBGLanguagePageEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\210\247\241\256\340 \255\240 \245\247\250\252", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "\x07 \210\247\241\245\340\245\342\245 \245\247\250\252, \252\256\251\342\256 \244\240 \250\247\257\256\253\242\240\342\245 \257\340\250 \341\253\240\243\240\255\245\342\256.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " \255\240\342\250\341\255\245\342\245 ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 \205\247\250\252\352\342 \351\245 \241\352\244\245 \257\256\244\340\240\247\241\250\340\240\255\250\357\342 \247\240 \252\340\240\251\255\240\342\240 \343\340\245\244\241\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " ENTER = \217\340\256\244\352\253\246\240\242\240\255\245 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -89,73 +99,85 @@ static MUI_ENTRY bgBGWelcomePageEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\220\245\240\252\342\216\221 \242\250 \257\340\250\242\245\342\341\342\242\240!", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 6, 11, "\222\240\247\250 \347\240\341\342 \256\342 \255\240\341\342\340\256\251\252\240\342\240 \247\240\257\250\341\242\240 \340\240\241\256\342\255\240\342\240 \343\340\245\244\241\240 \220\245\240\252\342\216\221", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "\255\240 \252\256\254\257\356\342\352\340\240 \242\250 \250 \257\256\244\243\256\342\242\357 \242\342\256\340\240\342\240 \347\240\341\342 \255\240 \255\240\341\342\340\256\251\252\240\342\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "\x07 Press ENTER to install or upgrade ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "\x07 \215\240\342\250\341\255\245\342\245 R \247\240 \257\256\257\340\240\242\252\240 \255\240 \220\245\240\252\342\216\221.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 \215\240\342\250\341\255\245\342\245 L, \247\240 \244\240 \242\250\244\250\342\245 \340\240\247\340\245\350\250\342\245\253\255\250\342\245 (\253\250\346\245\255\247\255\250\342\245)", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 20, " \250\247\250\341\252\242\240\255\250\357 \250 \343\341\253\256\242\250\357 \255\240 \220\245\240\252\342\216\221", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 22, "\x07 \215\240\342\250\341\255\245\342\245 F3 \247\240 \250\247\345\256\244 \241\245\247 \341\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 24, "\207\240 \257\256\242\245\347\245 \341\242\245\244\245\255\250\357 \247\240 \220\245\240\252\342\216\221, \257\256\341\245\342\245\342\245:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 25, "http://www.reactos.org", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 0, 0, " ENTER = \217\340\256\244\352\253\246\240\242\240\255\245 R = \217\256\257\340\240\242\252\240 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -171,61 +193,71 @@ static MUI_ENTRY bgBGIntroPageEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "ReactOS Version Status", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 6, 11, "ReactOS is in Alpha stage, meaning it is not feature-complete", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "and is under heavy development. It is recommended to use it only for", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 13, "evaluation and testing purposes and not as your daily-usage OS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 15, "Backup your data or test on a secondary computer if you attempt", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 16, "to run ReactOS on real hardware.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 Press ENTER to continue ReactOS Setup.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 Press F3 to quit without installing ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -241,115 +273,134 @@ static MUI_ENTRY bgBGLicensePageEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 6, "\213\250\346\245\255\247\250\340\240\255\245:", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 8, 8, "\223\340\245\244\241\240\342\240 \220\245\240\252\342\216\221 \245 \253\250\346\245\255\247\250\340\240\255\240 \257\340\250 \343\341\253\256\242\250\357\342\240 \255\240 GNU GPL", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 9, "\341 \347\240\341\342\250, \341\352\244\352\340\246\240\351\250 \252\256\244 \256\342 \244\340\343\243\250 \341\352\242\254\245\341\342\250\254\250 \253\250\346\245\255\247\250 \252\240\342\256", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "X11, BSD \250\253\250 GNU LGPL.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, "\221\253\245\244\256\242\240\342\245\253\255\256 \242\341\357\252\256 \256\341\250\243\343\340\357\242\240\255\245, \252\256\245\342\256 \245 \347\240\341\342 \256\342", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 12, "\220\245\240\252\342\216\221, \341\245 \256\241\255\240\340\256\244\242\240 \257\256\244 GNU GPL, \341 \257\256\244\244\352\340\246\240\255\245\342\256 \255\240", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\255\240 \256\340\250\243\250\255\240\253\255\250\357 \253\250\346\245\255\247.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "This software comes with NO WARRANTY or restrictions on usage", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 16, "save applicable local and international law. The licensing of", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "ReactOS only covers distribution to third parties.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 18, "\200\252\256 \257\256\340\240\244\250 \255\357\252\240\252\242\240 \257\340\250\347\250\255\240, \247\240\245\244\255\256 \341 \220\245\240\252\342\216\221 \255\245 \341\342\245", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\257\256\253\343\347\250\253\250 \252\256\257\250\245 \255\240 GNU General Public License, \257\256\341\245\342\245\342\245", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 20, "http://www.gnu.org/licenses/licenses.html", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 8, 22, "\203\240\340\240\255\346\250\357:", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 8, 24, "\222\256\242\240 \245 \341\242\256\241\256\244\245\255 \341\256\344\342\343\245\340; \242\250\246\342\245 \250\247\345\256\244\255\250\357 \252\256\244 \247\240 \343\341\253\256\242\250\357\342\240 \255\240 \242\352\247\257\340\256\250\247\242\245\246\244\240\255\245.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 25, "There is NO warranty; not even for MERCHANTABILITY or", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 26, "FITNESS FOR A PARTICULAR PURPOSE", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " ENTER = \202\340\352\351\240\255\245", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -365,84 +416,98 @@ static MUI_ENTRY bgBGDevicePageEntries[] = 4, 3, " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\221\257\250\341\352\252\352\342 \257\256- \244\256\253\343 \257\256\252\240\247\242\240 \342\245\252\343\351\250\342\245 \255\240\341\342\340\256\251\252\250 \255\240 \343\341\342\340\256\251\341\342\242\240\342\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " \212\256\254\257\356\342\352\340:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 12, " \205\252\340\240\255:", TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 3, 13, " \212\253\240\242\250\240\342\343\340\240:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 3, 14, "\212\253\240\242\250\240\342\343\340\255\240 \257\256\244\340\245\244\241\240:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 3, 16, " \217\340\250\245\254\240\255\245:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 25, 16, "\217\340\250\245\254\240\255\245 \255\240 \255\240\341\342\340\256\251\252\250\342\245", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 19, "\207\240 \244\240 \257\340\256\254\245\255\250\342\245 \255\240\341\342\340\256\251\252\250\342\245 \255\240 \256\241\256\340\343\244\242\240\255\245\342\256, \250\247\257\256\253\247\242\240\251\342\245 \341\342\340\245\253\252\250\342\245", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 20, "\215\200\203\216\220\205 \250 \215\200\204\216\213\223. \221\253\245\244 \342\256\242\240 \255\240\342\250\341\255\245\342\245 ENTER, \247\240 \244\240 \250\247\241\245\340\245\342\245", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 21, "\247\240\254\245\341\342\242\240\351\250 \255\240\341\342\340\256\251\252\250.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 23, "\212\256\243\240\342\256 \255\240\257\340\240\242\250\342\245 \242\341\250\347\252\250 \255\240\341\342\340\256\251\252\250, \250\247\241\245\340\245\342\245 '\217\340\250\245\254\240\255\245 \255\240 \255\240\341\342\340\256\251\252\250\342\245'", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 24, "\250 \255\240\342\250\341\255\245\342\245 ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " ENTER = \217\340\256\244\352\253\246\240\242\240\255\245 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -458,55 +523,64 @@ static MUI_ENTRY bgBGRepairPageEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\215\240\341\342\340\256\251\242\240\347\352\342 \255\240 \220\245\240\252\342\216\221 \245 \242 \340\240\255\255\240 \341\342\245\257\245\255 \255\240 \340\240\247\340\240\241\256\342\252\240. \202\341\245 \256\351\245", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "\255\357\254\240 \242\341\250\347\252\250 \242\352\247\254\256\246\255\256\341\342\250 \255\240 \255\240\257\352\253\255\256 \250\247\257\256\253\247\242\240\245\254\256 \255\240\341\342\340\256\251\242\240\351\256 \257\340\250\253\256\246\245\255\250\245.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "\202\352\247\254\256\246\255\256\341\342\342\240 \247\240 \257\256\257\340\240\242\252\240 \256\351\245 \255\245 \245 \243\256\342\256\242\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "\x07 \255\240\342\250\341\255\245\342\245 U \247\240 \256\241\255\256\242\357\242\240\255\245 \255\240 \256\257\245\340\240\346\250\256\255\255\240\342\240 \341\250\341\342\245\254\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "\x07 \215\240\342\250\341\255\245\342\245 R \247\240 \242\352\247\341\342\240\255\256\242\357\242\240\351\240 \341\340\245\244\240 (\252\256\255\247\256\253\240).", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 \255\240\342\341\250\255\245\342\245 ESC \247\240 \242\340\352\351\240\255\245 \252\352\254 \243\253\240\242\255\240\342\240 \341\342\340\240\255\250\346\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 \215\240\342\250\341\255\245\342\245 ENTER \247\240 \257\340\245\247\240\257\343\341\252 \255\240 \252\256\254\257\356\342\352\340\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " ESC = \203\253\240\242\255\240 \341\342\340\240\255\250\346\240 ENTER = \217\340\245\247\240\257\343\341\252", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -522,61 +596,71 @@ static MUI_ENTRY bgBGUpgradePageEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "The ReactOS Setup can upgrade one of the available ReactOS installations", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "listed below, or, if a ReactOS installation is damaged, the Setup program", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 10, "can attempt to repair it.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "The repair functions are not all implemented yet.", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 8, 15, "\x07 Press UP or DOWN to select an OS installation.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "\x07 Press U for upgrading the selected OS installation.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 Press ESC to continue with a new installation.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 Press F3 to quit without installing ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "U = Upgrade ESC = Do not upgrade F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -592,43 +676,50 @@ static MUI_ENTRY bgBGComputerPageEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\220\245\350\250\253\250 \341\342\245 \244\240 \341\254\245\255\250\342\245 \242\250\244\240 \255\240 \252\256\254\257\356\342\352\340\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "\x07 \210\247\241\245\340\245\342\245 \242\250\244\240 \255\240 \245\252\340\240\255\240 \341\352\341 \341\342\340\245\253\252\250\342\245 \255\240\243\256\340\245 \250 \255\240\244\256\253\343 \250 ", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " \255\240\342\250\341\255\245\342\245 ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 \215\240\342\250\341\255\245\342\245 ESC, \247\240 \244\240 \341\245 \242\352\340\255\245\342\245 \252\352\254 \257\340\245\244\345\256\244\255\240\342\240 \341\342\340\240\255\250\346\240, \241\245\247 \244\240", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 14, " \341\254\245\255\357\342\245 \242\250\244\240 \255\240 \252\256\254\257\356\342\352\340\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " ENTER = \217\340\256\244\352\253\246\240\242\240\255\245 ESC = \216\342\252\240\247 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -644,31 +735,36 @@ static MUI_ENTRY bgBGFlushPageEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 10, 6, "\223\340\245\244\241\240\342\240 \257\340\256\242\245\340\357\242\240, \244\240\253\250 \242\341\250\347\252\250 \244\240\255\255\250 \341\240 \341\352\345\340\240\255\245\255\250 \255\240 \244\250\341\252\240 \242\250.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 8, "\222\256\242\240 \351\245 \256\342\255\245\254\245 \254\250\255\343\342\252\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 9, "\212\256\254\257\356\342\352\340\352\342 \242\250 \351\245 \341\245 \257\340\245\247\240\257\343\341\255\245 \341\240\254, \252\256\243\240\342\256 \257\340\250\252\253\356\347\250.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " \210\247\347\250\341\342\242\240\255\245 \255\240 \341\252\253\240\244\240", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -684,37 +780,43 @@ static MUI_ENTRY bgBGQuitPageEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 10, 6, "\221\253\240\243\240\255\245\342\256 \255\240 \220\245\240\252\342\216\221 \255\245 \245 \247\240\242\352\340\350\250\253\256.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 8, "\210\247\242\240\244\245\342\245 \244\250\341\252\245\342\240\342\240 \256\342 \343\341\342\340\256\251\341\342\242\256 \200: \250", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 9, "\242\341\250\347\252\250 \255\256\341\250\342\245\253\250 \256\342 \212\204 \250 DVD \343\341\342\340\256\251\341\342\242\240\342\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 11, "\215\240\342\250\341\255\245\342\245 ENTER, \247\240 \244\240 \257\340\245\247\240\257\343\341\255\245\342\245 \252\256\254\257\356\342\352\340\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " \210\247\347\240\252\240\251\342\245...", TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -730,43 +832,50 @@ static MUI_ENTRY bgBGDisplayPageEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\220\245\350\250\253\250 \341\342\245 \244\240 \341\254\245\255\250\342\245 \242\250\244\240 \255\240 \245\252\340\240\255\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "\x07 \210\247\241\245\340\245\342\245 \242\250\244\240 \255\240 \245\252\340\240\255\240 \341\352\341 \341\342\340\245\253\252\250\342\245 \255\240\243\256\340\245 \250 \255\240\244\256\253\343 \250 ", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " \255\240\342\250\341\255\245\342\245 ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 \215\240\342\250\341\255\245\342\245 ESC, \247\240 \244\240 \341\245 \242\352\340\255\245\342\245 \252\352\254 \257\340\245\244\345\256\244\255\240\342\240 \341\342\340\240\255\250\346\240, \241\245\247 \244\240", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 14, " \341\254\245\255\357\342\245 \242\250\244\240 \255\240 \245\252\340\240\255\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " ENTER = \217\340\256\244\352\253\246\240\242\240\255\245 ESC = \216\342\252\240\247 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -782,37 +891,43 @@ static MUI_ENTRY bgBGSuccessPageEntries[] = 4, 3, " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 10, 6, "\216\341\255\256\242\255\250\342\245 \341\352\341\342\240\242\252\250 \255\240 \220\245\240\252\342\216\221 \341\240 \341\253\256\246\245\255\250 \343\341\257\245\350\255\256.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 8, "\210\247\242\240\244\245\342\245 \244\250\341\252\245\342\240\342\240 \256\342 \343\341\342\340\256\251\341\342\242\256 \200: \250", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 9, "\242\341\250\347\252\250 \255\256\341\250\342\245\253\250 \256\342 \256\257\342\250\347\255\250\342\245 \343\341\342\340\256\251\341\342\242\240 (\212\204/DVD)", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 11, "\215\240\342\250\341\255\245\342\245 ENTER, \247\240 \244\240 \257\340\245\247\240\257\343\341\255\245\342\245 \252\256\254\257\356\342\352\340\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " ENTER = \217\340\245\247\240\257\343\341\252\240\255\245 \255\240 \252\256\254\257\356\342\352\340\240", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -828,37 +943,43 @@ static MUI_ENTRY bgBGBootPageEntries[] = 4, 3, " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\221\253\240\243\240\255\245\342\256 \255\240 \247\240\340\245\246\244\240\347\240 (bootloader) \255\240 \244\250\341\252\240 \255\240 \252\256\254\257\356\342\352\340\240 \242\250", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "\241\245 \255\245\343\341\257\245\350\255\256.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 13, "\221\253\256\246\245\342\245 \344\256\340\254\240\342\250\340\240\255\240 \244\250\341\252\245\342\240 \242 \343\341\342\340\256\251\341\342\242\256 A:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 14, "\250 \255\240\342\250\341\255\245\342\245 ENTER.", TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " ENTER = \217\340\256\244\352\253\246\240\242\240\255\245 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -875,62 +996,72 @@ static MUI_ENTRY bgBGSelectPartitionEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\221\257\250\341\352\252\352\342 \257\256- \244\256\253\343 \341\352\244\352\340\246\240 \341\352\351\245\341\342\242\343\242\240\351\250\342\245 \244\357\253\256\242\245 \250 \257\340\240\247\255\256\342\256", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "\254\357\341\342\256 \247\240 \255\256\242\250 \244\357\253\256\242\245", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, "\x07 \210\247\257\256\253\247\242\240\251\342\245 \341\342\340\245\253\252\250\342\245 \247\240 \250\247\241\256\340 \256\342 \341\257\250\341\352\252\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 \215\240\342\250\341\255\245\342\245 ENTER \247\240 \341\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 \255\240 \250\247\241\340\240\255\250\357 \244\357\253.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "\x07 Press P to create a primary partition.", // "\x07 ��᭥� C �� ꧤ�� .", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "\x07 Press E to create an extended partition.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 Press L to create a logical partition.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 \215\240\342\250\341\255\245\342\245 D \247\240 \250\247\342\340\250\242\240\255\245 \255\240 \341\352\351\245\341\342\242\343\242\240\351 \244\357\253.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " \217\256\347\240\252\240\251\342\245...", /* �� ॢ��, �� ᯨ�� 﫮�� ࠧ�� */ - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -946,97 +1077,113 @@ static MUI_ENTRY bgBGChangeSystemPartition[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "The current system partition of your computer", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "on the system disk", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 16, "uses a format not supported by ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 18, "In order to successfully install ReactOS, the Setup program must change", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 19, "the current system partition to a new one.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 21, "The new candidate system partition is:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 25, "\x07 To accept this choice, press ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 27, "\x07 To manually change the system partition, press ESC to go back to", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 28, " the partition selection list, then select or create a new system", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 29, " partition on the system disk.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 32, "In case there are other operating systems that depend on the original", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 33, "system partition, you may need to either reconfigure them for the new", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 34, "system partition, or you may need to change the system partition back", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 35, "to the original one after finishing the installation of ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue ESC = Cancel", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1052,85 +1199,99 @@ static MUI_ENTRY bgBGConfirmDeleteSystemPartitionEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "You have chosen to delete the system partition.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 10, "System partitions can contain diagnostic programs, hardware configuration", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 11, "programs, programs to start an operating system (like ReactOS) or other", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "programs provided by the hardware manufacturer.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 14, "Delete a system partition only when you are sure that there are no such", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 15, "programs on the partition, or when you are sure you want to delete them.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 16, "When you delete the partition, you might not be able to boot the", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 17, "computer from the harddisk until you finished the ReactOS Setup.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 20, "\x07 Press ENTER to delete the system partition. You will be asked", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, " to confirm the deletion of the partition again later.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 24, "\x07 Press ESC to return to the previous page. The partition will", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 25, " not be deleted.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER=Continue ESC=Cancel", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1146,25 +1307,29 @@ static MUI_ENTRY bgBGFormatPartitionEntries[] = 4, 3, " \221\253\240\243\240\255\245 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\224\256\340\254\240\342\250\340\240\255\245 \255\240 \244\357\253", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 10, "\204\357\253\352\342 \351\245 \241\352\244\245 \344\256\340\254\240\342\250\340\240\255. \215\240\342\250\341\255\245\342\245 ENTER \247\240 \257\340\256\244\352\253\246\240\242\240\255\245.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_FORMAT_PROMPT }, { 0, 0, " ENTER = \217\340\256\244\352\253\246\240\242\240\255\245 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -1180,43 +1345,50 @@ static MUI_ENTRY bgBGInstallDirectoryEntries[] = 4, 3, " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\224\240\251\253\256\242\245\342\245 \255\240 \220\245\240\252\342\216\221 \351\245 \241\352\244\240\342 \341\253\256\246\245\255\250 \255\240 \250\247\241\340\240\255\250\357 \244\357\253. \210\247\241\245\340\245\342\245", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "\257\240\257\252\240, \242 \252\256\357\342\256 \244\240 \241\352\244\245 \341\253\256\246\245\255 \220\245\240\252\342\216\221:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 14, "\207\240 \341\254\357\255\240 \255\240 \257\340\245\244\253\256\246\245\255\240\342\240 \257\240\257\252\240 \255\240\342\250\341\255\245\342\245 BACKSPACE, \247\240 \244\240", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 15, "\250\247\342\340\250\245\342\245 \247\255\240\346\250\342\245 \250 \342\256\243\240\242\240 \255\240\257\250\350\245\342\245 \257\240\257\252\240\342\240, \242 \252\256\357\342\256 \244\240 \241\352\244\245", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 16, "\341\253\256\246\245\255 \220\245\240\252\342\216\221.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " ENTER = \217\340\256\244\352\253\246\240\242\240\255\245 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -1232,32 +1404,37 @@ static MUI_ENTRY bgBGFileCopyEntries[] = 4, 3, " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 11, 12, "\210\247\347\240\252\240\251\342\245 \244\240 \257\340\250\252\253\356\347\250 \247\240\257\250\341\352\342 \255\240 \344\240\251\253\256\242\245\342\245 \242 \250\247\241\340\240\255\240\342\240 \257\240\257\252\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 30, 13, // "��࠭�� .", "", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 20, 14, "\222\256\242\240 \254\256\246\245 \244\240 \256\342\255\245\254\245 \255\357\252\256\253\252\256 \254\250\255\343\342\250.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " \xB3 \217\256\347\240\252\240\251\342\245... ", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -1273,43 +1450,50 @@ static MUI_ENTRY bgBGBootLoaderEntries[] = 4, 3, " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\217\340\256\342\250\347\240 \341\253\240\243\240\255\245\342\256 \255\240 \247\240\340\245\246\244\240\347\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 12, "\221\253\240\243\240\255\245 \255\240 \247\240\340\245\246\244\240\347 \255\240 \342\242\352\340\244\250\357 \244\250\341\252 (MBR \250 VBR).", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\221\253\240\243\240\255\245 \255\240 \247\240\340\245\246\244\240\347 \255\240 \342\242\352\340\244\250\357 \244\250\341\252 (\341\240\254\256 VBR).", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 14, "\221\253\240\243\240\255\245 \255\240 \247\240\340\245\246\244\240\347 \255\240 \244\250\341\252\245\342\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "\204\240 \255\245 \341\245 \341\253\240\243\240 \247\240\340\245\246\244\240\347.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " ENTER = \217\340\256\244\352\253\246\240\242\240\255\245 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -1325,43 +1509,50 @@ static MUI_ENTRY bgBGKeyboardSettingsEntries[] = 4, 3, " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\210\341\252\240\342\245 \244\240 \341\254\245\255\250\342\245 \242\250\244\240 \255\240 \252\253\240\242\250\240\342\343\340\240\342\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "\x07 \210\247\257\256\253\247\242\240\251\342\245 \341\342\340\245\253\252\250\342\245, \247\240 \244\240 \250\247\241\245\340\245\342\245 \242\250\244\240 \255\240 \252\253\240\242\250\240\342\343\340\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " \255\240\342\250\341\255\245\342\245 ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 \215\240\342\250\341\255\245\342\245 ESC, \247\240 \244\240 \341\245 \242\352\340\255\245\342\245 \252\352\254 \257\340\245\244\345\256\244\255\240\342\240 \341\342\340\240\255\250\346\240, \241\245\247 \244\240", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 14, " \341\254\245\255\357\342\245 \242\250\244\240 \255\240 \252\253\240\242\250\240\342\343\340\240\342\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " ENTER = \217\340\256\244\352\253\246\240\242\240\255\245 ESC = \216\342\252\240\247 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -1377,43 +1568,50 @@ static MUI_ENTRY bgBGLayoutSettingsEntries[] = 4, 3, " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\210\247\241\245\340\245\342\245 \257\256\244\340\240\247\241\250\340\240\255\240 \252\253\240\242\250\240\342\343\340\255\240 \257\256\244\340\245\244\241\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "\x07 \210\247\257\256\253\247\242\240\251\342\245 \341\342\340\245\253\252\250\342\245, \247\240 \244\240 \250\247\241\245\340\245\342\245 \246\245\253\240\255\240\342\240 \252\253\240\242\250\240\342\343\340\255\240", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " \257\256\244\340\245\244\241\240 \250 \257\256\341\253\245 \255\240\342\250\341\255\245\342\245 ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 \215\240\342\250\341\255\245\342\245 ESC, \247\240 \244\240 \341\245 \242\352\340\255\245\342\245 \252\352\254 \257\340\245\244\345\256\244\255\240\342\240 \341\342\340\240\255\250\346\240, \241\245\247 \244\240", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 14, " \341\254\245\255\357\342\245 \252\253\240\242\250\240\342\343\340\255\240\342\240 \257\256\244\340\245\244\241\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " ENTER = \217\340\256\244\352\253\246\240\242\240\255\245 ESC = \216\342\252\240\247 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -1430,19 +1628,22 @@ static MUI_ENTRY bgBGPrepareCopyEntries[] = 4, 3, " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\212\256\254\257\356\342\352\340\352\342 \341\245 \257\256\244\243\256\342\242\357 \247\240 \247\240\257\250\341 \255\240 \344\240\251\253\256\242\245\342\245 \255\240 \220\245\240\252\342\216\221.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " \221\352\341\342\240\242\357\255\245 \255\240 \341\257\250\341\352\252\240 \256\342 \344\240\251\253\256\242\245 \247\240 \247\240\257\250\341...", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -1459,7 +1660,8 @@ static MUI_ENTRY bgBGSelectFSEntries[] = 4, 3, " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, @@ -1489,7 +1691,8 @@ static MUI_ENTRY bgBGSelectFSEntries[] = 0, 0, " ENTER = \217\340\256\244\352\253\246\240\242\240\255\245 ESC = \216\342\252\240\247 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -1505,37 +1708,43 @@ static MUI_ENTRY bgBGDeletePartitionEntries[] = 4, 3, " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\210\247\241\340\240\253\250 \341\342\245 \244\240 \250\247\342\340\250\245\342\245 \244\357\253", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 18, "\x07 \215\240\342\250\341\255\245\342\245 L, \247\240 \244\240 \250\247\342\340\250\245\342\245 \244\357\253\240.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 11, 19, "\202\215\210\214\200\215\210\205: \202\341\250\347\252\250 \244\240\255\255\250 \255\240 \342\256\247\250 \244\357\253 \351\245 \241\352\244\240\342 \343\255\250\351\256\246\245\255\250!", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 \215\240\342\250\341\255\245\342\245 ESC, \247\240 \244\240 \341\245 \256\342\252\240\246\245\342\245.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " L = \210\247\342\340\250\242\240\255\245 \255\240 \244\357\253\240, ESC = \216\342\252\240\247 F3 = \210\247\345\256\244", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -1551,19 +1760,22 @@ static MUI_ENTRY bgBGRegistryEntries[] = 4, 3, " \215\240\341\342\340\256\251\252\240 \255\240 \220\245\240\252\342\216\221 " KERNEL_VERSION_STR " .", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "\217\340\256\342\250\347\240 \256\241\255\256\242\357\242\240\255\245 \255\240 \341\250\341\342\245\254\255\250\342\245 \255\240\341\342\340\256\251\252\250.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " \221\352\247\244\240\242\240\255\245 \255\240 \340\245\243\250\341\342\352\340\255\250\342\245 \340\256\245\242\245...", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 08552cc0d1b..f4e11d3947b 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -6,25 +6,29 @@ static MUI_ENTRY bnBDSetupInitPageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 0, 20, "Please wait while the ReactOS Setup initializes itself", - TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, + TEXT_ID_STATIC }, { 0, 21, "and discovers your devices...", - TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, + TEXT_ID_STATIC }, { 0, 0, "Please wait...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -40,37 +44,43 @@ static MUI_ENTRY bnBDLanguagePageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Language Selection", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "\x07 Please choose the language used for the installation process.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " Then press ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 This Language will be the default language for the final system.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -86,67 +96,79 @@ static MUI_ENTRY bnBDWelcomePageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Welcome to ReactOS Setup", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 6, 11, "This part of the setup copies the ReactOS Operating System to your", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "computer and prepares the second part of the setup.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "\x07 Press ENTER to install or upgrade ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, + // "\x07 Press R to repair a ReactOS installation using the Recovery Console.", "\x07 Press R to repair a ReactOS installation.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 Press L to view the ReactOS Licensing Terms and Conditions.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 Press F3 to quit without installing ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 23, "For more information on ReactOS, please visit:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 24, "http://www.reactos.org", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue R = Repair L = License F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -162,61 +184,71 @@ static MUI_ENTRY bnBDIntroPageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "ReactOS Version Status", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 6, 11, "ReactOS is in Alpha stage, meaning it is not feature-complete", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "and is under heavy development. It is recommended to use it only for", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 13, "evaluation and testing purposes and not as your daily-usage OS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 15, "Backup your data or test on a secondary computer if you attempt", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 16, "to run ReactOS on real hardware.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 Press ENTER to continue ReactOS Setup.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 Press F3 to quit without installing ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -232,115 +264,134 @@ static MUI_ENTRY bnBDLicensePageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 6, "Licensing:", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 8, 8, "The ReactOS System is licensed under the terms of the", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 9, "GNU GPL with parts containing code from other compatible", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "licenses such as the X11 or BSD and GNU LGPL licenses.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, "All software that is part of the ReactOS system is", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 12, "therefore released under the GNU GPL as well as maintaining", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "the original license.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "This software comes with NO WARRANTY or restrictions on usage", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 16, "save applicable local and international law. The licensing of", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "ReactOS only covers distribution to third parties.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 18, "If for some reason you did not receive a copy of the", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "GNU General Public License with ReactOS please visit", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 20, "http://www.gnu.org/licenses/licenses.html", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 8, 22, "Warranty:", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 8, 24, "This is free software; see the source for copying conditions.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 25, "There is NO warranty; not even for MERCHANTABILITY or", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 26, "FITNESS FOR A PARTICULAR PURPOSE", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Return", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -356,84 +407,98 @@ static MUI_ENTRY bnBDDevicePageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "The list below shows the current device settings.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 24, 11, "Computer:", - TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT, + TEXT_ID_STATIC }, { 24, 12, "Display:", - TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT, + TEXT_ID_STATIC }, { 24, 13, "Keyboard:", - TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT, + TEXT_ID_STATIC }, { 24, 14, "Keyboard layout:", - TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT, + TEXT_ID_STATIC }, { 24, 16, "Accept:", - TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT, + TEXT_ID_STATIC }, { 25, 16, "Accept these device settings", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 19, "You can change the hardware settings by pressing the UP or DOWN keys", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 20, "to select an entry. Then press the ENTER key to select alternative", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 21, "settings.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 23, "When all settings are correct, select \"Accept these device settings\"", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 24, "and press ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -449,55 +514,64 @@ static MUI_ENTRY bnBDRepairPageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "ReactOS Setup is in an early development phase. It does not yet", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "support all the functions of a fully usable setup application.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "The repair functions are not implemented yet.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "\x07 Press U for Updating OS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "\x07 Press R for the Recovery Console.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 Press ESC to return to the main page.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 Press ENTER to reboot your computer.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ESC = Main page U = Update R = Recovery ENTER = Reboot", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -513,61 +587,71 @@ static MUI_ENTRY bnBDUpgradePageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "The ReactOS Setup can upgrade one of the available ReactOS installations", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "listed below, or, if a ReactOS installation is damaged, the Setup program", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 10, "can attempt to repair it.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "The repair functions are not all implemented yet.", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 8, 15, "\x07 Press UP or DOWN to select an OS installation.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "\x07 Press U for upgrading the selected OS installation.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 Press ESC to continue with a new installation.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 Press F3 to quit without installing ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "U = Upgrade ESC = Do not upgrade F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -583,43 +667,50 @@ static MUI_ENTRY bnBDComputerPageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "You want to change the type of computer to be installed.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "\x07 Press the UP or DOWN key to select the desired computer type.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " Then press ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 Press the ESC key to return to the previous page without changing", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 14, " the computer type.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue ESC = Cancel F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -635,31 +726,36 @@ static MUI_ENTRY bnBDFlushPageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 10, 6, "The system is now making sure all data is stored on your disk.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 8, "This may take a minute.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 9, "When finished, your computer will reboot automatically.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "Flushing cache", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -675,37 +771,43 @@ static MUI_ENTRY bnBDQuitPageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 10, 6, "ReactOS is not completely installed.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 8, "Remove floppy disk from Drive A: and", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 9, "all CD-ROMs from CD-Drives.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 11, "Press ENTER to reboot your computer.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "Please wait...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -721,43 +823,50 @@ static MUI_ENTRY bnBDDisplayPageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "You want to change the type of display to be installed.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "\x07 Press the UP or DOWN key to select the desired display type.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " Then press ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 Press the ESC key to return to the previous page without changing", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 14, " the display type.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue ESC = Cancel F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -773,37 +882,43 @@ static MUI_ENTRY bnBDSuccessPageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 10, 6, "The basic components of ReactOS have been installed successfully.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 8, "Remove floppy disk from Drive A: and", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 9, "all CD-ROMs from CD-Drive.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 11, "Press ENTER to reboot your computer.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Reboot computer", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -819,37 +934,43 @@ static MUI_ENTRY bnBDBootPageEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Setup cannot install the bootloader on your computers", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "hardisk", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 13, "Please insert a formatted floppy disk in drive A: and", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 14, "press ENTER.", TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -866,61 +987,71 @@ static MUI_ENTRY bnBDSelectPartitionEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "The list below shows existing partitions and unused disk", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "space for new partitions.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, "\x07 Press UP or DOWN to select a list entry.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 Press ENTER to install ReactOS onto the selected partition.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "\x07 Press P to create a primary partition.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "\x07 Press E to create an extended partition.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 Press L to create a logical partition.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 Press D to delete an existing partition.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "Please wait...", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -936,97 +1067,113 @@ static MUI_ENTRY bnBDChangeSystemPartition[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "The current system partition of your computer", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "on the system disk", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 16, "uses a format not supported by ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 18, "In order to successfully install ReactOS, the Setup program must change", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 19, "the current system partition to a new one.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 21, "The new candidate system partition is:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 25, "\x07 To accept this choice, press ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 27, "\x07 To manually change the system partition, press ESC to go back to", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 28, " the partition selection list, then select or create a new system", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 29, " partition on the system disk.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 32, "In case there are other operating systems that depend on the original", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 33, "system partition, you may need to either reconfigure them for the new", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 34, "system partition, or you may need to change the system partition back", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 35, "to the original one after finishing the installation of ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue ESC = Cancel", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1042,85 +1189,99 @@ static MUI_ENTRY bnBDConfirmDeleteSystemPartitionEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "You have chosen to delete the system partition.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 10, "System partitions can contain diagnostic programs, hardware configuration", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 11, "programs, programs to start an operating system (like ReactOS) or other", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "programs provided by the hardware manufacturer.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 14, "Delete a system partition only when you are sure that there are no such", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 15, "programs on the partition, or when you are sure you want to delete them.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 16, "When you delete the partition, you might not be able to boot the", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 17, "computer from the harddisk until you finished the ReactOS Setup.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 20, "\x07 Press ENTER to delete the system partition. You will be asked", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, " to confirm the deletion of the partition again later.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 24, "\x07 Press ESC to return to the previous page. The partition will", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 25, " not be deleted.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER=Continue ESC=Cancel", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1136,25 +1297,29 @@ static MUI_ENTRY bnBDFormatPartitionEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Format partition", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 10, "Setup will now format the partition. Press ENTER to continue.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_FORMAT_PROMPT }, { 0, 0, "ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1170,43 +1335,50 @@ static MUI_ENTRY bnBDInstallDirectoryEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Setup installs ReactOS files onto the selected partition. Choose a", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "directory where you want ReactOS to be installed:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 14, "To change the suggested directory, press BACKSPACE to delete", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 15, "characters and then type the directory where you want ReactOS to", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 16, "be installed.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1222,31 +1394,36 @@ static MUI_ENTRY bnBDFileCopyEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 0, 12, "Please wait while ReactOS Setup copies files to your ReactOS", - TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, + TEXT_ID_STATIC }, { 0, 13, "installation folder.", - TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, + TEXT_ID_STATIC }, { 0, 14, "This may take several minutes to complete.", - TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, + TEXT_ID_STATIC }, { 50, 0, "\xB3 Please wait... ", - TEXT_TYPE_STATUS + TEXT_TYPE_STATUS, + TEXT_ID_STATIC }, { 0, @@ -1262,43 +1439,50 @@ static MUI_ENTRY bnBDBootLoaderEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Setup is installing the boot loader", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 12, "Install bootloader on the harddisk (MBR and VBR).", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "Install bootloader on the harddisk (VBR only).", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 14, "Install bootloader on a floppy disk.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "Skip install bootloader.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1314,43 +1498,50 @@ static MUI_ENTRY bnBDKeyboardSettingsEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "You want to change the type of keyboard to be installed.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "\x07 Press the UP or DOWN key to select the desired keyboard type.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " Then press ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 Press the ESC key to return to the previous page without changing", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 14, " the keyboard type.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue ESC = Cancel F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1366,43 +1557,50 @@ static MUI_ENTRY bnBDLayoutSettingsEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Please select a layout to be installed by default.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "\x07 Press the UP or DOWN key to select the desired keyboard", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " layout. Then press ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 Press the ESC key to return to the previous page without changing", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 14, " the keyboard layout.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue ESC = Cancel F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1419,19 +1617,22 @@ static MUI_ENTRY bnBDPrepareCopyEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Setup prepares your computer for copying the ReactOS files.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "Building the file copy list...", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1448,7 +1649,8 @@ static MUI_ENTRY bnBDSelectFSEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, @@ -1478,7 +1680,8 @@ static MUI_ENTRY bnBDSelectFSEntries[] = 0, 0, "ENTER = Continue ESC = Cancel F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1494,37 +1697,43 @@ static MUI_ENTRY bnBDDeletePartitionEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "You have chosen to delete the partition", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 18, "\x07 Press L to delete the partition.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 11, 19, "WARNING: All data on this partition will be lost!", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 Press ESC to cancel.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "L = Delete Partition ESC = Cancel F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1540,19 +1749,22 @@ static MUI_ENTRY bnBDRegistryEntries[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Setup is updating the system configuration.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "Creating registry hives...", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1651,14 +1863,14 @@ MUI_ERROR bnBDErrorEntries[] = }, { // ERROR_WARN_PARTITION, - "Setup found that at least one harddisk contains an incompatible\n" - "partition table that cannot be handled properly!\n" - "\n" - "Creating or deleting partitions can destroy the partition table.\n" - "\n" - " \x07 Press F3 to quit Setup.\n" - " \x07 Press ENTER to continue.", - "F3 = Quit ENTER = Continue" + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that cannot be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partition table.\n" + "\n" + " \x07 Press F3 to quit Setup.\n" + " \x07 Press ENTER to continue.", + "F3 = Quit ENTER = Continue" }, { // ERROR_NEW_PARTITION, @@ -2036,10 +2248,14 @@ MUI_STRING bnBDStrings[] = "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."}, {STRING_HDINFOPARTZEROED_1, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, + // {STRING_HDINFOPARTZEROED_2, + // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, {STRING_HDDINFOUNK4, "%c%c Type 0x%02X %I64u %s"}, {STRING_HDINFOPARTEXISTS_1, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."}, + // {STRING_HDINFOPARTEXISTS_2, + // "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."}, {STRING_HDDINFOUNK5, "%c%c %c %sType %-3u%s %6lu %s"}, {STRING_HDINFOPARTSELECT_1, diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 83fd41c742b..e39792a97e6 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -15,25 +15,29 @@ static MUI_ENTRY csCZSetupInitPageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 0, 20, "Please wait while the ReactOS Setup initializes itself", - TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, + TEXT_ID_STATIC }, { 0, 21, "and discovers your devices...", - TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, + TEXT_ID_STATIC }, { 0, 0, "Please wait...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -49,37 +53,43 @@ static MUI_ENTRY csCZLanguagePageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "V\354b\330r jazyka", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "\x07 Pros\241m zvolte jazyk, kter\354 bude b\330hem instalace pou\247it.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " Pot\202 stiskn\330te ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 Tento jazyk bude v\354choz\241m jazykem v nainstalovan\202m syst\202mu.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Pokra\237ovat F3 = Ukon\237it", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -95,67 +105,78 @@ static MUI_ENTRY csCZWelcomePageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "V\241tejte v instalaci ReactOS", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 6, 11, "Tato \237\240st instalace nakop\241ruje opera\237n\241 syst\202m ReactOS do va\347eho", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "po\237\241ta\237e a p\375iprav\241 druhou \237\240st instalace.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "\x07 Press ENTER to install or upgrade ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "\x07 Stisknut\241m R zah\240j\241te opravu ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 Stiskut\241m L zobraz\241te Licen\237n\241 podm\241nky ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 Stisknut\241m F3 ukon\237\241te instalaci ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 23, "V\241ce informac\241 o ReactOS naleznete na adrese:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 24, "http://www.reactos.org", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Pokra\237ovat R = Opravit L = Licence F3 = Ukon\237it", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -171,61 +192,71 @@ static MUI_ENTRY csCZIntroPageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "ReactOS Version Status", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 6, 11, "ReactOS is in Alpha stage, meaning it is not feature-complete", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "and is under heavy development. It is recommended to use it only for", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 13, "evaluation and testing purposes and not as your daily-usage OS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 15, "Backup your data or test on a secondary computer if you attempt", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 16, "to run ReactOS on real hardware.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 Press ENTER to continue ReactOS Setup.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 Press F3 to quit without installing ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -241,115 +272,134 @@ static MUI_ENTRY csCZLicensePageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 6, "Licence:", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 8, 8, "The ReactOS System is licensed under the terms of the", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 9, "GNU GPL with parts containing code from other compatible", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "licenses such as the X11 or BSD and GNU LGPL licenses.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, "All software that is part of the ReactOS system is", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 12, "therefore released under the GNU GPL as well as maintaining", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "the original license.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "This software comes with NO WARRANTY or restrictions on usage", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 16, "save applicable local and international law. The licensing of", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "ReactOS only covers distribution to third parties.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 18, "If for some reason you did not receive a copy of the", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "GNU General Public License with ReactOS please visit", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 20, "http://www.gnu.org/licenses/licenses.html", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 8, 22, "Z\240ruka:", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 8, 24, "This is free software; see the source for copying conditions.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 25, "There is NO warranty; not even for MERCHANTABILITY or", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 26, "FITNESS FOR A PARTICULAR PURPOSE", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Zp\330t", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -365,84 +415,98 @@ static MUI_ENTRY csCZDevicePageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "N\240sleduj\241c\241 seznam zobrazuje sou\237asn\202 nastaven\241 za\375\241zen\241.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 24, 11, "Po\237\241ta\237:", - TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT, + TEXT_ID_STATIC }, { 24, 12, "Obrazovka:", - TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT, + TEXT_ID_STATIC }, { 24, 13, "Kl\240vesnice:", - TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT, + TEXT_ID_STATIC }, { 24, 14, "Rozlo\247en\241 kl\240ves:", - TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT, + TEXT_ID_STATIC }, { 24, 16, "P\375ijmout:", - TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT, + TEXT_ID_STATIC }, { 25, 16, "P\375ijmout toto nastaven\241 za\375\241zen\241", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 19, "Nastaven\241 hardwaru lze zm\330nit stiskem kl\240vesy ENTER na \375\240dku", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 20, "zvolen\202m \347ipkami nahoru a dol\205. Pot\202 lze zvolit jin\202 nastaven\241.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 21, " ", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 23, "Jakmile budou v\347echna nastaven\241 v po\375\240dku, ozna\237te \"P\375ijmout toto", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 24, "nastaven\241 za\375\241zen\241\" a stiskn\330te ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Pokra\237ovat F3 = Ukon\237it", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -458,55 +522,64 @@ static MUI_ENTRY csCZRepairPageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Instalace ReactOS je v ran\202 v\354vojov\202 f\240zi. Zat\241m nejsou", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "podporov\240ny v\347echny funkce pln\330 pou\247iteln\202 instala\237n\241 aplikace.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "Opravn\202 funkce zat\241m nejsou implementov\240ny.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "\x07 Stisknut\241m U zah\240j\241te Update syst\202mu.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "\x07 Stisknut\241m R spust\241te Konzoli obnoven\241.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 Stisknut\241m ESC se vr\240t\241te na hlavn\241 str\240nku.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 Stisknut\241m kl\240vesy ENTER restartujete po\237\241ta\237.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ESC = Hlavn\241 str\240nka U = Aktualizovat R = Z\240chrana ENTER = Restartovat", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -522,61 +595,71 @@ static MUI_ENTRY csCZUpgradePageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "The ReactOS Setup can upgrade one of the available ReactOS installations", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "listed below, or, if a ReactOS installation is damaged, the Setup program", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 10, "can attempt to repair it.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "The repair functions are not all implemented yet.", - TEXT_STYLE_HIGHLIGHT + TEXT_STYLE_HIGHLIGHT, + TEXT_ID_STATIC }, { 8, 15, "\x07 Press UP or DOWN to select an OS installation.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "\x07 Press U for upgrading the selected OS installation.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 Press ESC to continue with a new installation.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 Press F3 to quit without installing ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "U = Upgrade ESC = Do not upgrade F3 = Quit", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -592,43 +675,50 @@ static MUI_ENTRY csCZComputerPageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Chcete zm\330nit typ po\237\241ta\237e, kter\354 bude nainstalov\240n.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "\x07 Po\247adovan\354 typ po\237\241ta\237e zvolte pomoc\241 \347ipek nahoru a dol\205.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " Pot\202 stiskn\330te ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 Stisknut\241m ESC se vr\240t\241te na p\375edchoz\241 str\240nku bez zm\330ny typu", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 14, " po\237\241ta\237e.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Pokra\237ovat ESC = Zru\347it F3 = Ukon\237it", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -644,31 +734,36 @@ static MUI_ENTRY csCZFlushPageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 10, 6, "Syst\202m se nyn\241 uji\347\234uje, \247e v\347echna data budou ulo\247ena na disk.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 8, "Toto m\205\247e trvat n\330kolik minut.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 9, "Po dokon\237en\241 bude po\237\241ta\237 automaticky zrestartov\240n.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "Uvol\345uji cache", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -684,37 +779,43 @@ static MUI_ENTRY csCZQuitPageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 10, 6, "ReactOS nen\241 kompletn\330 nainstalov\240n.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 8, "Vyjm\330te disketu z jednotky A:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 9, "a v\347echny CD-ROM z CD mechanik.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 11, "Stisknut\241m kl\240vesy ENTER restartujete po\237\241ta\237.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, " \254ekejte, pros\241m...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -730,43 +831,50 @@ static MUI_ENTRY csCZDisplayPageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Chcete zm\330nit typ obrazovky, kter\240 bude nainstalov\240na.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 10, "\x07 Po\247adovan\354 typ obrazovky zvolte pomoc\241 \347ipek nahoru a dol\205.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, " Pot\202 stiskn\330te ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 Stisknut\241m ESC se vr\240t\241te na p\375edchoz\241 str\240nku bez zm\330ny typu", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 14, " obrazovky.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Pokra\237ovat ESC = Zru\347it F3 = Ukon\237it", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -782,37 +890,43 @@ static MUI_ENTRY csCZSuccessPageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 10, 6, "Z\240kladn\241 sou\237\240sti ReactOS byly \243sp\330\347n\330 nainstalov\240ny.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 8, "Vyjm\330te disketu z jednotky A:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 9, "a v\347echny CD-ROM z CD mechanik.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 10, 11, "Stisknut\241m kl\240vesy ENTER restartujete po\237\241ta\237.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Restartovat po\237\241ta\237", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -828,37 +942,43 @@ static MUI_ENTRY csCZBootPageEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Instala\237n\241 aplikace nedok\240\247e nainstalovat zavad\330\237 na tento", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "disk", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 13, "Vlo\247te naform\240tovanou disketu do jednotky A:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 14, "a stiskn\330te ENTER.", TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Pokra\237ovat F3 = Ukon\237it", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -875,61 +995,71 @@ static MUI_ENTRY csCZSelectPartitionEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Na n\240sleduj\241c\241m seznamu jsou existuj\241c\241 odd\241ly a nevyu\247it\202", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 9, "m\241sto pro nov\202 odd\241ly.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 11, "\x07 Vyberte polo\247ku v seznamu pomoc\241 \347ipek nahoru a dol\205.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 13, "\x07 Stisknut\241m kl\240vesy ENTER nainstalujete ReactOS na zvolen\354 odd\241l.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 15, "\x07 Stistknut\241m P vytvo\375\241te prim\240rn\241 odd\241l.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 17, "\x07 Stistknut\241m E vytvo\375\241te roz\347\241\375en\354 odd\241l.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 19, "\x07 Press L to create a logical partition.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, "\x07 Stisknut\241m D umo\247n\241te smaz\240n\241 existuj\241c\241ho odd\241lu.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "Cekejte, prosim...", //MUSI ZUSTAT BEZ DIAKRITIKY! - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -945,97 +1075,113 @@ static MUI_ENTRY csCZChangeSystemPartition[] = 4, 3, " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "The current system partition of your computer", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "on the system disk", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 16, "uses a format not supported by ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 18, "In order to successfully install ReactOS, the Setup program must change", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 19, "the current system partition to a new one.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 21, "The new candidate system partition is:", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 25, "\x07 To accept this choice, press ENTER.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 27, "\x07 To manually change the system partition, press ESC to go back to", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 28, " the partition selection list, then select or create a new system", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 29, " partition on the system disk.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 32, "In case there are other operating systems that depend on the original", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 33, "system partition, you may need to either reconfigure them for the new", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 34, "system partition, or you may need to change the system partition back", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 35, "to the original one after finishing the installation of ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER = Continue ESC = Cancel", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1051,85 +1197,99 @@ static MUI_ENTRY csCZConfirmDeleteSystemPartitionEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "You have chosen to delete the system partition.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 10, "System partitions can contain diagnostic programs, hardware configuration", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 11, "programs, programs to start an operating system (like ReactOS) or other", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 12, "programs provided by the hardware manufacturer.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 14, "Delete a system partition only when you are sure that there are no such", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 15, "programs on the partition, or when you are sure you want to delete them.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 16, "When you delete the partition, you might not be able to boot the", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 17, "computer from the harddisk until you finished the ReactOS Setup.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 20, "\x07 Press ENTER to delete the system partition. You will be asked", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 21, " to confirm the deletion of the partition again later.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 24, "\x07 Press ESC to return to the previous page. The partition will", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 8, 25, " not be deleted.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "ENTER=Continue ESC=Cancel", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1145,25 +1305,29 @@ static MUI_ENTRY csCZFormatPartitionEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Form\240tov\240n\241 odd\241lu", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 6, 10, "Tento odd\241l bude nyn\241 zform\240tov\240n. Stisknut\241m kl\240vesy ENTER za\237nete.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_FORMAT_PROMPT }, { 0, 0, "ENTER = Pokra\237ovat F3 = Ukon\237it", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1179,43 +1343,50 @@ static MUI_ENTRY csCZInstallDirectoryEntries[] = 4, 3, " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Instalace nyn\241 na zvolen\354 odd\241l nakop\241ruje soubory ReactOS.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, ... 42583 lines suppressed ...

4 years, 11 months

[reactos] 03/03: [SYSSETUP] When the physical host name is set, also set an empty physical domain name

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e2ae9b05c4c8d29bcddf… commit 9e2ae9b05c4c8d29bcddf1dcae1cb469450c0c71 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 19 13:33:15 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 19 13:34:32 2020 +0100 [SYSSETUP] When the physical host name is set, also set an empty physical domain name --- dll/win32/syssetup/wizard.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index d0b4dca711c..bd5e6118301 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -556,7 +556,10 @@ WriteComputerSettings(WCHAR * ComputerName, HWND hwndDlg) return FALSE; } - /* Try to also set DNS hostname */ + /* Set the physical DNS domain */ + SetComputerNameExW(ComputerNamePhysicalDnsDomain, L""); + + /* Set the physical DNS hostname */ SetComputerNameExW(ComputerNamePhysicalDnsHostname, ComputerName); /* Set the accounts domain name */

4 years, 11 months

[reactos] 02/03: [KERNEL32] Improvements to Get/SetComputerNameExW

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6456603843c4397c0ca0… commit c6456603843c4397c0ca0369dfae994f23995eb3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 19 13:28:02 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 19 13:34:31 2020 +0100 [KERNEL32] Improvements to Get/SetComputerNameExW - The ComputerNamePhysicalDnsDomain name type gets or sets the 'NV Domain' registry value. - The ComputerNamePhysicalDnsHostname name type gets or sets the 'NV Hostname' registry value. - IsValidComputerName: Enforce name length restrictions according to the name type. --- dll/win32/kernel32/client/compname.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dll/win32/kernel32/client/compname.c b/dll/win32/kernel32/client/compname.c index c2efa30b929..46d05e78d32 100644 --- a/dll/win32/kernel32/client/compname.c +++ b/dll/win32/kernel32/client/compname.c @@ -335,21 +335,24 @@ GetComputerNameExW(COMPUTER_NAME_FORMAT NameType, case ComputerNamePhysicalDnsDomain: return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" L"\\Services\\Tcpip\\Parameters", - L"Domain", + L"NV Domain", lpBuffer, nSize); - /* XXX Redo these */ + /* XXX Redo this */ case ComputerNamePhysicalDnsFullyQualified: return GetComputerNameExW(ComputerNameDnsFullyQualified, lpBuffer, nSize); case ComputerNamePhysicalDnsHostname: - return GetComputerNameExW(ComputerNameDnsHostname, - lpBuffer, - nSize); + return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"NV Hostname", + lpBuffer, + nSize); + /* XXX Redo this */ case ComputerNamePhysicalNetBIOS: return GetComputerNameExW(ComputerNameNetBIOS, lpBuffer, @@ -477,7 +480,14 @@ IsValidComputerName(COMPUTER_NAME_FORMAT NameType, p++; } - if (Length == 0 || Length > MAX_COMPUTERNAME_LENGTH) + if (NameType == ComputerNamePhysicalDnsDomain) + return TRUE; + + if (Length == 0) + return FALSE; + + if (NameType == ComputerNamePhysicalNetBIOS && + Length > MAX_COMPUTERNAME_LENGTH) return FALSE; return TRUE; @@ -600,12 +610,12 @@ SetComputerNameExW(COMPUTER_NAME_FORMAT NameType, return FALSE; } - switch( NameType ) + switch (NameType) { case ComputerNamePhysicalDnsDomain: return SetComputerNameToRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" L"\\Services\\Tcpip\\Parameters", - L"Domain", + L"NV Domain", lpBuffer); case ComputerNamePhysicalDnsHostname:

4 years, 11 months

[reactos] 01/03: [NETEVENT] Netevent.dll does not have an entry point because it is a resource-only dll.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f4827edde81c7cf60f25… commit 0f4827edde81c7cf60f2581995814b0ec8173d4a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 18 19:22:53 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 19 13:34:29 2020 +0100 [NETEVENT] Netevent.dll does not have an entry point because it is a resource-only dll. --- dll/win32/netevent/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/netevent/CMakeLists.txt b/dll/win32/netevent/CMakeLists.txt index d21c01dd82a..bd67dd4f1c5 100644 --- a/dll/win32/netevent/CMakeLists.txt +++ b/dll/win32/netevent/CMakeLists.txt @@ -1,5 +1,5 @@ add_library(netevent MODULE netevent.rc) -set_module_type(netevent module UNICODE) +set_module_type(netevent module UNICODE ENTRYPOINT 0) add_dependencies(netevent neteventmsg) add_cd_file(TARGET netevent DESTINATION reactos/system32 FOR all)

4 years, 11 months

[reactos] 01/01: [FREELDR] Add FAT12 file system boot sector for NEC PC-98 series (#2025)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=065afd93fd35cb8a9717d… commit 065afd93fd35cb8a9717d901649bee97d71d1a35 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sun Jan 19 00:16:23 2020 +0600 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 18 19:16:23 2020 +0100 [FREELDR] Add FAT12 file system boot sector for NEC PC-98 series (#2025) The first part of PC-98 Port - https://reactos.org/wiki/PC-98 - Add FAT12 file system boot sector for NEC PC-98 series. - Add a new build target for a PC-98 bootable floppy disk. - Add a new sub-architecture into config.cmake. --- boot/freeldr/bootsect/CMakeLists.txt | 4 + boot/freeldr/bootsect/pc98/fat12fdd.S | 501 ++++++++++++++++++++++++++++++++++ boot/freeldr/freeldr/CMakeLists.txt | 8 + sdk/cmake/config.cmake | 2 +- 4 files changed, 514 insertions(+), 1 deletion(-) diff --git a/boot/freeldr/bootsect/CMakeLists.txt b/boot/freeldr/bootsect/CMakeLists.txt index 411750ac7a0..c847a998fa2 100644 --- a/boot/freeldr/bootsect/CMakeLists.txt +++ b/boot/freeldr/bootsect/CMakeLists.txt @@ -8,6 +8,10 @@ if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) CreateBootSectorTarget(btrfsvbr ${CMAKE_CURRENT_SOURCE_DIR}/btrfs.S ${CMAKE_CURRENT_BINARY_DIR}/btrfs.bin 7c00) + if(SARCH STREQUAL "pc98") + CreateBootSectorTarget(fat12pc98 ${CMAKE_CURRENT_SOURCE_DIR}/pc98/fat12fdd.S ${CMAKE_CURRENT_BINARY_DIR}/pc98/fat12fdd.bin 7c00) + endif() + ## New versions using FATY.S (experimental) # add_definitions(-DFAT12) # CreateBootSectorTarget(fat_new ${CMAKE_CURRENT_SOURCE_DIR}/faty.S ${CMAKE_CURRENT_BINARY_DIR}/fat_new.bin 7c00) diff --git a/boot/freeldr/bootsect/pc98/fat12fdd.S b/boot/freeldr/bootsect/pc98/fat12fdd.S new file mode 100644 index 00000000000..51ebfec05c4 --- /dev/null +++ b/boot/freeldr/bootsect/pc98/fat12fdd.S @@ -0,0 +1,501 @@ +/* + * PROJECT: FreeLoader + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: FAT12 file system boot sector for NEC PC-98 series + * NOTES: The source code in this file is based on the Brian Palmer's work + * (boot/freeldr/bootsect/fat.S) + * COPYRIGHT: Copyright 2019 Dmitry Borisov (di.sean(a)protonmail.com) + */ + +#include <asm.inc> +#include <freeldr/include/arch/pc/x86common.h> + +#define BP_REL(x) [bp + x - offset start] +#define VGA_WIDTH 80 +#define VGA_HEIGHT 25 + +/* + * See https://www.webtech.co.jp/company/doc/undocumented_mem/memsys.txt + * At segment 0000h + */ +#define BOOT_DAUA HEX(0584) + +DataAreaStartHigh = 2 +DataAreaStartLow = 4 +BiosCHSDriveSizeHigh = 6 +BiosCHSDriveSizeLow = 8 +BiosCHSDriveSize = 8 +ReadSectorsOffset = 10 +ReadClusterOffset = 12 +PutCharsOffset = 14 +BootSectorStackTop = HEX(7C00) - 16 + +if 0 +.macro DEBUG_STOP + hlt + jmp short $ - 1 +.endm + +.macro DEBUG_STEP + push ax + xor ah, ah + int HEX(18) // Wait for a keypress + pop ax +.endm +endif + +// org 7C00h + +.code16 + +start: + jmp main + nop + +// After running fatten tool it overwrites (BPB & EBPB) +OEMName: + .ascii "FrLdr1.0" +BytesPerSector: + .word 512 +SectsPerCluster: + .byte 1 +ReservedSectors: + .word 1 +NumberOfFats: + .byte 2 +MaxRootEntries: + .word 224 +TotalSectors: + .word 2880 +MediaDescriptor: + .byte HEX(0f0) +SectorsPerFat: + .word 9 +SectorsPerTrack: + .word 18 +NumberOfHeads: + .word 2 +HiddenSectors: + .long 0 +TotalSectorsBig: + .long 0 +BootDrive: + .byte HEX(0ff) +Reserved: + .byte 0 +ExtendSig: + .byte HEX(29) +SerialNumber: + .long 00000000 +VolumeLabel: + .ascii "NO NAME " +FileSystem: + .ascii "FAT12 " + +/* + * Real-mode entry point + */ +main: + xor ax, ax // Setup segment registers: + mov ds, ax // Make DS correct + mov es, ax // Make ES correct + mov ss, ax // Make SS correct + mov bp, HEX(7C00) + mov sp, BootSectorStackTop // Stack grows downwards from BootSectorStackTop + +if 0 // It would have been nice to have had this check... + mov ax, HEX(1000) // Detecting hardware + + /* + * INSTALLATION CHECK interrupt + * See http://www.ctyme.com/intr/rb-2293.htm + */ + int HEX(1A) + cmp ax, HEX(1000) + je HardwareError // An IBM-compatible PC +endif + + /* + * IBM PC here: NEC PC-98 here: + * ESI = 000E:0000 ESI = 0000:0000 + * EDI = 0000:070C EDI = 0000:0000 + * EBP = 0000:7C00 EBP = 0000:7C00 + * ESP = 0000:7BF0 ESP = 0000:7BF0 + * CS:IP = 0000:7C4E CS:IP = 1FE0:004E + */ + mov ax, word ptr ds:[BOOT_DAUA] // Get the Device Address/Unit Address (DA/UA) + mov si, ax + + push si + push cs + pop ds + xor si, si + mov ax, HEX(0000) + mov es, ax + mov di, HEX(7C00) + mov cx, 512 + rep movsw // Move our 512 bytes boot sector to the [0000:7C00] + pop si + + ljmp16 0, relocated // Jump into relocated code + +relocated: + xor ax, ax // Clean-up segments + mov es, ax + mov ds, ax + + test byte ptr ds:[HEX(501)], HEX(08) // High-resolution mode check + jz VideoTestNormalMode + mov ax, HEX(0E000) + jmp short VideoTestDone +VideoTestNormalMode: + mov ax, HEX(0A000) +VideoTestDone: + mov word ptr BP_REL(VramSegment), ax + + mov ax, si + mov byte ptr BP_REL(BootDrive), al // Save the boot drive + + /* + * Now we must find our way to the first sector of the root directory + * + * LBA = NumberOfFats * SectorsPerFat + HiddenSectors + ReservedSectors + */ + xor ax, ax + xor cx, cx + mov al, byte ptr BP_REL(NumberOfFats) // Number of fats + mul word ptr BP_REL(SectorsPerFat) // Times sectors per fat + add ax, word ptr BP_REL(HiddenSectors) + adc dx, word ptr BP_REL(HiddenSectors + 2) // Add the number of hidden sectors + add ax, word ptr BP_REL(ReservedSectors) // Add the number of reserved sectors + adc dx, cx // Add carry bit + mov word ptr [bp - DataAreaStartLow], ax // Save the starting sector of the root directory + mov word ptr [bp - DataAreaStartHigh], dx // Save it in the first 4 bytes before the boot sector + mov si, word ptr BP_REL(MaxRootEntries) // Get number of root dir entries in SI + pusha // Save 32-bit logical start sector of root dir + // DX:AX now has the number of the starting sector of the root directory + + /* + * Now calculate the size of the root directory + * + * Root directory sectors = (MaxRootEntries * 32 + BytesPerSector - 1) / BytesPerSector + */ + xor dx, dx + mov ax, 32 // Size of dir entry + mul si // Times the number of entries + mov bx, word ptr BP_REL(BytesPerSector) + add ax, bx + dec ax + div bx // Divided by the size of a sector + // AX now has the number of root directory sectors + + add word ptr [bp - DataAreaStartLow], ax // Add the number of sectors of the root directory to our other value + adc word ptr [bp - DataAreaStartHigh], cx // Now the first 4 bytes before the boot sector contain the starting sector of the data area + popa + +/* + * Reads root directory into [0000:7E00] and finds 'FREELDR SYS' + * + * Call with: + * + * DX:AX - LBA of the starting sector of the root directory + */ +LoadRootDirSector: + mov bx, HEX(7E0) // We will load the root directory sector + mov es, bx // Right after the boot sector in memory + xor bx, bx // We will load it to [0000:7E00] + xor cx, cx // Zero out CX + inc cx // Now increment it to 1, we are reading one sector + xor di, di // Zero out di + push es // Save ES because it will get incremented by 20h + call ReadSectors // Read the first sector of the root directory + pop es // Restore ES (ES:DI = 7E0:0000) + +SearchRootDirSector: + cmp byte ptr es:[di], ch // If the first byte of the directory entry is zero then we have + jz PrintFileNotFound // reached the end of the directory and FREELDR.SYS is not here so reboot + pusha // Save all registers + mov cl, 11 // Put 11 in cl (length of filename in directory entry) + mov si, offset filename // Put offset of filename string in DS:SI + repe cmpsb // Compare this directory entry against 'FREELDR SYS' + popa // Restore all the registers + jz FoundFreeLoader // If we found it then jump + dec si // SI holds MaxRootEntries, subtract one + jz PrintFileNotFound // If we are out of root dir entries then reboot + add di, 32 // Increment DI by the size of a directory entry + cmp di, HEX(0200) // Compare DI to 512 (DI has offset to next dir entry, make sure we haven't gone over one sector) + jc SearchRootDirSector // If DI is less than 512 loop again + jmp short LoadRootDirSector // Didn't find FREELDR.SYS in this directory sector, try again + +FoundFreeLoader: + /* + * We found freeldr.sys on the disk + * so we need to load the first 512 bytes of it to [0000:F800] + * ES:DI has dir entry (ES:DI == 07E0:XXXX) + */ + mov ax, word ptr es:[di + HEX(1A)] // Get start cluster + push ax // Save start cluster + push FREELDR_BASE / 16 // Put load segment on the stack and load it + pop es // Into ES so that we load the cluster at [0000:F800] + call ReadCluster // Read the cluster + pop ax // Restore start cluster of FreeLoader + + /* + * Save the addresses of needed functions so + * the helper code will know where to call them + */ + mov word ptr [bp - ReadSectorsOffset], offset ReadSectors // Save the address of ReadSectors + mov word ptr [bp - ReadClusterOffset], offset ReadCluster // Save the address of ReadCluster + mov word ptr [bp - PutCharsOffset], offset PrintString // Save the address of PrintString + + /* + * Now AX has start cluster of FreeLoader and we + * have loaded the helper code in the first 512 bytes + * of FreeLoader to 0000:F800. Now transfer control + * to the helper code. Skip the first three bytes + * because they contain a jump instruction to skip + * over the helper code in the FreeLoader image + */ + ljmp16 0, FREELDR_BASE + 3 + +/* + * Reads cluster number in AX into [ES:BX] + * + * Call with: + * + * AX - cluster number + * ES:BX - buffer to read data into + */ +ReadCluster: + /* + * StartSector = ((Cluster - 2) * SectorsPerCluster) + ReservedSectors + HiddenSectors + */ + dec ax // Adjust start cluster by 2 + dec ax // Because the data area starts on cluster 2 + xor ch, ch + mov cl, byte ptr BP_REL(SectsPerCluster) + mul cx // Times sectors per cluster + add ax, [bp - DataAreaStartLow] // Add start of data area + adc dx, [bp - DataAreaStartHigh] // Now we have DX:AX with the logical start sector of FREELDR.SYS + xor bx, bx // We will load it to [ES:0000], ES loaded before function call + +/* + * Reads logical sectors into [ES:BX] + * + * Call with: + * + * DX:AX - logical sector number to read (LBA value) + * ES:BX - buffer to read data into + * CX - number of sectors to read + */ +ReadSectors: + + .ReadSectorsLoop: + pusha + + /* + * Converting LBA (Linear Block Address) into a format CHS (Cylinder:Head:Sector) + * + * C = (LBA / SPT) / HPC + * H = (LBA / SPT) % HPC + * S = (LBA % SPT) + 1 + */ + xchg ax, cx + xchg ax, dx + xor dx, dx + div word ptr BP_REL(SectorsPerTrack) + xchg ax, cx + div word ptr BP_REL(SectorsPerTrack) // Divide logical by SectorsPerTrack + inc dx // Sectors numbering starts at 1 not 0 + xchg cx, dx + div word ptr BP_REL(NumberOfHeads) // Number of heads + + mov dh, dl // DH - head number (0-1) + mov dl, cl // DL - sector number (1-26) + mov cl, al // CL - cylinder number (0-76) + + // TODO: This should be calculated using the equation: BytesPerSector = (CH + 1) * 128 + mov ch, 2 // CH - sector size (0-4): 0 (128), 1 (256), 2 (512), 3 (1024), 4 (2048) + + mov al, byte ptr BP_REL(BootDrive) // AL - DA/UA + push bp + push bx + mov bx, word ptr BP_REL(BytesPerSector) // BX - bytes to read + pop bp // ES:BP - buffer to read data into + mov ah, HEX(56) // AH - read sectors from a floppy disk with SEEK, and use double-density format (MFM) + + /* + * Disk BIOS interrupt + * See http://radioc.web.fc2.com/column/pc98bas/bios/int1b_06.htm + */ + int HEX(1b) + + pop bp + jc PrintDiskError // CF set on failure + + popa + + inc ax // Increment sector to read + jnz .NoCarryCHS + inc dx + + .NoCarryCHS: + push bx + mov bx, es + add bx, HEX(20) // Add size of dir entry to the buffer address for the next sector + mov es, bx + pop bx + loop .ReadSectorsLoop // Increment read buffer for next sector, read next sector + + ret + +/* + * Prints a character + * + * Call with: + * + * AL - ASCII code + */ +PutChar: + push di + push es + + push word ptr BP_REL(VramSegment) + pop es + mov di, word ptr BP_REL(VramOffset) // ES:DI = VramSegment:VramOffset + .PutCharWrite: + xor ah, ah + stosw // Write ASCII directly to the VRAM + + mov word ptr BP_REL(VramOffset), di + pop es + pop di + + ret + +/* + * Prints a null-terminated string + * + * Call with: + * + * DS:SI - pointer to a string + */ +PrintString: + xor ah, ah + lodsb // Get a single char from a ptr + + or al, al + jz short .PrintEnd // Found NULL + + cmp al, HEX(0D) + jz short .PrintStringHandleCR // Found CR + + call PutChar + jmp short PrintString + + .PrintStringHandleCR: + mov ax, word ptr BP_REL(VramOffset) + mov dl, VGA_WIDTH * 2 + div dl + inc ax + mul dl + mov word ptr BP_REL(VramOffset), ax + inc si // Skip the next LF character + jmp short PrintString + +.PrintEnd: + ret + +if 0 +/* + * Displays a hardware error message and reboots + */ +HardwareError: + mov si, offset msgHardwareError + + .PrintStringVGA: + lodsb // Get a single char from a ptr + + or al, al + jz short .HardwareErrorDone // Found NULL + + mov ah, HEX(0E) // Teletype output + mov bx, 7 // BH - video page number, BL - foreground color + int HEX(10) // Display a character via TTY mode + jmp short .PrintStringVGA + +.HardwareErrorDone: + xor ax, ax + int HEX(16) // Wait for a keypress + int HEX(19) // Reboot +endif + +/* + * Displays a disk error message and reboots + */ +PrintDiskError: + mov si, offset msgDiskError // Disk error message + call PrintString // Display it + + jmp short Reboot + +/* + * Displays a file not found error message and reboots + */ +PrintFileNotFound: + mov si, offset msgNotFoundError // FreeLdr not found message + call PrintString // Display it + + jmp short Reboot + +/* + * Reboots the computer after keypress + */ +Reboot: + mov si, offset msgAnyKey // Press any key message + call PrintString // Display it + + xor ax, ax + int HEX(18) // Wait for a keypress + + /* + * Activate the CPU reset line + * See https://people.freebsd.org/~kato/pc98-arch.html#cpureset + * and http://www.webtech.co.jp/company/doc/undocumented_mem/io_cpu.txt + */ + xor ax, ax + out HEX(0F0), al + + hlt +Halt: + jmp short Halt // Spin + +VramSegment: + .word 0 +VramOffset: + .word 0 +msgDiskError: + .ascii "ERR", CR, LF, NUL +msgNotFoundError: + .ascii "NFE", CR, LF, NUL +msgAnyKey: + .ascii "Press any key", NUL +filename: + .ascii "FREELDR SYS" + +if 0 // So totally out of space here... +msgHardwareError: + .ascii "It's not PC-98", NUL +endif + + .org 509 // Pad to 509 bytes + +BootPartition: + .byte 0 + +BootSignature: + .word HEX(0AA55) // BootSector signature + +.endcode16 + +END diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 37f44004ef8..784febe1f43 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -292,6 +292,14 @@ endif() add_dependencies(freeldr_pe asm) add_dependencies(freeldr_pe_dbg asm) +if(SARCH STREQUAL "pc98") + file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/PC98) + add_custom_target(pc98bootfdd + COMMAND native-fatten ${REACTOS_BINARY_DIR}/PC98/ReactOS-98.IMG -format 2880 ROS98BOOT -boot ${CMAKE_BINARY_DIR}/boot/freeldr/bootsect/pc98/fat12fdd.bin -add ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys FREELDR.SYS -add ${CMAKE_SOURCE_DIR}/boot/bootdata/livecd.ini FREELDR.INI + DEPENDS native-fatten fat12pc98 freeldr + VERBATIM) +endif() + if(NOT ARCH STREQUAL "arm") concatenate_files( ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys diff --git a/sdk/cmake/config.cmake b/sdk/cmake/config.cmake index d3f596f3168..4c2305479ac 100644 --- a/sdk/cmake/config.cmake +++ b/sdk/cmake/config.cmake @@ -1,7 +1,7 @@ set(SARCH "pc" CACHE STRING "Sub-architecture to build for. Specify one of: - pc xbox") + pc pc98 xbox") set(OARCH "pentium" CACHE STRING "Generate instructions for this CPU type. Specify one of:

4 years, 11 months

[reactos] 01/01: [WBEMPROX] Always free 'new_path' (#2056)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63cf8625a055e04c0e161… commit 63cf8625a055e04c0e1619fd4f59609aaa5b1d8b Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jan 18 18:53:11 2020 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 18 18:53:11 2020 +0100 [WBEMPROX] Always free 'new_path' (#2056) Cherry-pick https://source.winehq.org/git/wine.git/commit/a45dfea99a2eeaf3ede829b04e58c… CORE-13391 --- dll/win32/wbemprox/builtin.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dll/win32/wbemprox/builtin.c b/dll/win32/wbemprox/builtin.c index b92231c8152..d2ad7376191 100644 --- a/dll/win32/wbemprox/builtin.c +++ b/dll/win32/wbemprox/builtin.c @@ -2408,7 +2408,13 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c goto done; } if (!wcscmp( data.cFileName, dotW ) || !wcscmp( data.cFileName, dotdotW )) continue; - new_path = append_path( path, data.cFileName, &len ); + + if (!(new_path = append_path( path, data.cFileName, &len ))) + { + status = FILL_STATUS_FAILED; + FindClose( handle ); + goto done; + } if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -2421,6 +2427,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c rec = (struct record_datafile *)(table->data + offset); rec->name = build_name( root[0], new_path ); rec->version = get_file_version( rec->name ); + heap_free( new_path ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row ); @@ -2532,7 +2539,13 @@ static enum fill_status fill_directory( struct table *table, const struct expr * !wcscmp( data.cFileName, dotW ) || !wcscmp( data.cFileName, dotdotW )) continue; - new_path = append_path( path, data.cFileName, &len ); + if (!(new_path = append_path( path, data.cFileName, &len ))) + { + FindClose( handle ); + status = FILL_STATUS_FAILED; + goto done; + } + if (!(push_dir( dirstack, new_path, len ))) { heap_free( new_path ); @@ -2543,6 +2556,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * rec = (struct record_directory *)(table->data + offset); rec->accessmask = FILE_ALL_ACCESS; rec->name = build_name( root[0], new_path ); + heap_free( new_path ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row );

4 years, 11 months

[reactos] 01/01: [HALXBOX] Don't use Xbox partitions if MBR signature found (#2253)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af7ec17ce12a589507c64… commit af7ec17ce12a589507c6443272f16b87adb7be97 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Jan 18 20:41:32 2020 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 18 18:41:32 2020 +0100 [HALXBOX] Don't use Xbox partitions if MBR signature found (#2253) * [HALXBOX] Formatting only. * [HALXBOX] Don't use Xbox partitions if MBR signature found. - Fixes BSOD 0x7B when booting from a HDD that have both MBR and BRFR signatures. - It happens when you format Xbox (BRFR) disk as MBR. After that "BRFR" signature is still located at sector 3. - Also fix pre-existing leaks. CORE-16216 CORE-16329 --- hal/halx86/xbox/halxbox.h | 4 ++- hal/halx86/xbox/part_xbox.c | 60 +++++++++++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/hal/halx86/xbox/halxbox.h b/hal/halx86/xbox/halxbox.h index 5e4a5228800..e437ad88ac1 100644 --- a/hal/halx86/xbox/halxbox.h +++ b/hal/halx86/xbox/halxbox.h @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Xbox specific routines * COPYRIGHT: Copyright 2004 Gé van Geldorp (gvg(a)reactos.com) - * Copyright 2019 Stanislav Motylkov (x86corez(a)gmail.com) + * Copyright 2019-2020 Stanislav Motylkov (x86corez(a)gmail.com) * * REFERENCES: https://xboxdevwiki.net/SMBus * https://github.com/XboxDev/cromwell/blob/master/drivers/pci/i2cio.c @@ -17,6 +17,8 @@ #include <hal.h> #include <ntdddisk.h> +#define TAG_HAL_XBOX 'XlaH' + #define SMB_IO_BASE 0xC000 #define SMB_GLOBAL_STATUS (0 + SMB_IO_BASE) diff --git a/hal/halx86/xbox/part_xbox.c b/hal/halx86/xbox/part_xbox.c index 261dbe40e16..a05d31d12a3 100644 --- a/hal/halx86/xbox/part_xbox.c +++ b/hal/halx86/xbox/part_xbox.c @@ -1,16 +1,15 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/xbox/part_xbox.c - * PURPOSE: Xbox specific handling of partition tables - * PROGRAMMER: Ge van Geldorp (gvg(a)reactos.com) - * UPDATE HISTORY: - * 2004/12/04: Created + * PROJECT: Xbox HAL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Xbox specific handling of partition tables + * COPYRIGHT: Copyright 2004 Ge van Geldorp (gvg(a)reactos.com) + * Copyright 2020 Stanislav Motylkov (x86corez(a)gmail.com) */ /* INCLUDES *****************************************************************/ #include "halxbox.h" +#include <internal/tag.h> #define NDEBUG #include <debug.h> @@ -106,32 +105,51 @@ HalpXboxDeviceHasXboxPartitioning(IN PDEVICE_OBJECT DeviceObject, PVOID SectorData; LARGE_INTEGER Offset; NTSTATUS Status; + BOOLEAN HasMBRPartitioning; DPRINT("HalpXboxDeviceHasXboxPartitioning(%p %lu %p)\n", DeviceObject, SectorSize, HasXboxPartitioning); - SectorData = ExAllocatePool(PagedPool, SectorSize); + SectorData = ExAllocatePoolWithTag(PagedPool, SectorSize, TAG_HAL_XBOX); if (!SectorData) { return STATUS_NO_MEMORY; } + Offset.QuadPart = 0; + Status = HalpXboxReadSector(DeviceObject, SectorSize, &Offset, SectorData); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + HasMBRPartitioning = (*((USHORT *)SectorData + (SectorSize / sizeof(USHORT)) - 1) == PARTITION_SIGNATURE); + if (HasMBRPartitioning) + { + *HasXboxPartitioning = FALSE; + goto Cleanup; + } + Offset.QuadPart = XBOX_SIGNATURE_SECTOR * SectorSize; Status = HalpXboxReadSector(DeviceObject, SectorSize, &Offset, SectorData); - if (! NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { - return Status; + goto Cleanup; } DPRINT("Signature 0x%02x 0x%02x 0x%02x 0x%02x\n", *((UCHAR *) SectorData), *((UCHAR *) SectorData + 1), *((UCHAR *) SectorData + 2), *((UCHAR *) SectorData + 3)); *HasXboxPartitioning = (XBOX_SIGNATURE == *((ULONG *) SectorData)); - ExFreePool(SectorData); - DPRINT("%s partitioning found\n", *HasXboxPartitioning ? "Xbox" : "MBR"); +Cleanup: + ExFreePoolWithTag(SectorData, TAG_HAL_XBOX); + if (NT_SUCCESS(Status)) + { + DPRINT("%s partitioning found\n", *HasXboxPartitioning ? "Xbox" : "MBR"); + } - return STATUS_SUCCESS; + return Status; } static VOID FASTCALL @@ -152,12 +170,12 @@ HalpXboxExamineMBR(IN PDEVICE_OBJECT DeviceObject, *Buffer = NULL; Status = HalpXboxDeviceHasXboxPartitioning(DeviceObject, SectorSize, &HasXboxPartitioning); - if (! NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { return; } - if (! HasXboxPartitioning) + if (!HasXboxPartitioning) { DPRINT("Delegating to standard MBR code\n"); NtoskrnlExamineMBR(DeviceObject, SectorSize, MBRTypeIdentifier, Buffer); @@ -186,12 +204,12 @@ HalpXboxIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, PartitionBuffer); Status = HalpXboxDeviceHasXboxPartitioning(DeviceObject, SectorSize, &HasXboxPartitioning); - if (! NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { return Status; } - if (! HasXboxPartitioning) + if (!HasXboxPartitioning) { DPRINT("Delegating to standard MBR code\n"); return NtoskrnlIoReadPartitionTable(DeviceObject, SectorSize, @@ -202,8 +220,8 @@ HalpXboxIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, PagedPool, sizeof(DRIVE_LAYOUT_INFORMATION) + XBOX_PARTITION_COUNT * sizeof(PARTITION_INFORMATION), - 'SYSF'); - if (NULL == *PartitionBuffer) + TAG_FILE_SYSTEM); + if (*PartitionBuffer == NULL) { return STATUS_NO_MEMORY; } @@ -251,7 +269,7 @@ HalpXboxIoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, PartitionType); Status = HalpXboxDeviceHasXboxPartitioning(DeviceObject, SectorSize, &HasXboxPartitioning); - if (! NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { return Status; } @@ -286,7 +304,7 @@ HalpXboxIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, PartitionBuffer); Status = HalpXboxDeviceHasXboxPartitioning(DeviceObject, SectorSize, &HasXboxPartitioning); - if (! NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { return Status; }

4 years, 11 months

[reactos] 01/01: [DNSAPI] DnsQuery_W: Check names for invalid characters before querying the dns resolver.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a274da7cdea108b81036… commit 0a274da7cdea108b810362deaf05fcb34f9d92c9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 18 15:02:18 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jan 18 15:03:12 2020 +0100 [DNSAPI] DnsQuery_W: Check names for invalid characters before querying the dns resolver. --- dll/win32/dnsapi/query.c | 51 +++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/dll/win32/dnsapi/query.c b/dll/win32/dnsapi/query.c index c92f9a14441..6dbe665473e 100644 --- a/dll/win32/dnsapi/query.c +++ b/dll/win32/dnsapi/query.c @@ -475,6 +475,7 @@ DnsQuery_W(LPCWSTR Name, { DWORD dwRecords = 0; PDNS_RECORDW pRecord = NULL; + size_t NameLen, i; DNS_STATUS Status = ERROR_SUCCESS; DPRINT("DnsQuery_W()\n"); @@ -494,6 +495,31 @@ DnsQuery_W(LPCWSTR Name, return ERROR_SUCCESS; } + /* + * Check allowed characters + * According to RFC a-z,A-Z,0-9,-,_, but can't start or end with - or _ + */ + NameLen = wcslen(Name); + if (Name[0] == L'-' || Name[0] == L'_' || Name[NameLen - 1] == L'-' || + Name[NameLen - 1] == L'_' || wcsstr(Name, L"..") != NULL) + { + return ERROR_INVALID_NAME; + } + + i = 0; + while (i < NameLen) + { + if (!((Name[i] >= L'a' && Name[i] <= L'z') || + (Name[i] >= L'A' && Name[i] <= L'Z') || + (Name[i] >= L'0' && Name[i] <= L'9') || + Name[i] == L'-' || Name[i] == L'_' || Name[i] == L'.')) + { + return DNS_ERROR_INVALID_NAME_CHAR; + } + + i++; + } + RpcTryExcept { Status = R_ResolverQuery(NULL, @@ -635,7 +661,7 @@ Query_Main(LPCWSTR Name, int adns_error; adns_answer *answer; LPSTR CurrentName; - unsigned i, CNameLoop; + unsigned CNameLoop; PFIXED_INFO network_info; ULONG network_info_blen = 0; DWORD network_info_result; @@ -680,29 +706,6 @@ Query_Main(LPCWSTR Name, 0); NameLen--; - /* Check allowed characters - * According to RFC a-z,A-Z,0-9,-,_, but can't start or end with - or _ - */ - if (AnsiName[0] == '-' || AnsiName[0] == '_' || AnsiName[NameLen - 1] == '-' || - AnsiName[NameLen - 1] == '_' || strstr(AnsiName, "..") != NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); - return ERROR_INVALID_NAME; - } - i = 0; - while (i < NameLen) - { - if (!((AnsiName[i] >= 'a' && AnsiName[i] <= 'z') || - (AnsiName[i] >= 'A' && AnsiName[i] <= 'Z') || - (AnsiName[i] >= '0' && AnsiName[i] <= '9') || - AnsiName[i] == '-' || AnsiName[i] == '_' || AnsiName[i] == '.')) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); - return DNS_ERROR_INVALID_NAME_CHAR; - } - i++; - } - network_info_result = GetNetworkParams(NULL, &network_info_blen); network_info = (PFIXED_INFO)RtlAllocateHeap(RtlGetProcessHeap(), 0, (size_t)network_info_blen); if (NULL == network_info)

4 years, 11 months

← Newer
1
2
3
4
5
6
7
8
9
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2020