Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTOS:EX] Only set WakeTimer-related status if timer handle is valid. CORE-18133
by Thomas Faber 04 Apr '22

04 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d1a497619f4001db59e5… commit 7d1a497619f4001db59e552ddb69406bea4dae70 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Apr 3 20:10:37 2022 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Apr 3 20:13:09 2022 -0400 [NTOS:EX] Only set WakeTimer-related status if timer handle is valid. CORE-18133 Since STATUS_TIMER_RESUME_IGNORED is a success status, we would otherwise go into the success case with a NULL Timer object pointer. --- ntoskrnl/ex/timer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ex/timer.c b/ntoskrnl/ex/timer.c index 0ce7af03156..0c33675333c 100644 --- a/ntoskrnl/ex/timer.c +++ b/ntoskrnl/ex/timer.c @@ -640,7 +640,10 @@ NtSetTimer(IN HANDLE TimerHandle, * functionality required to support them, make this check dependent * on the actual PM capabilities */ - if (WakeTimer) Status = STATUS_TIMER_RESUME_IGNORED; + if (NT_SUCCESS(Status) && WakeTimer) + { + Status = STATUS_TIMER_RESUME_IGNORED; + } /* Check status */ if (NT_SUCCESS(Status))

1 0

[reactos] 01/01: [RTL][NTOS_VISTA] Move the RTL UTF8 functions to the main RTL library, to be linked in the rtl_vista target instead.
by Hermès Bélusca-Maïto 03 Apr '22

03 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f559e9c548b19cb06f1f… commit 6f559e9c548b19cb06f1fc388716a78885614f98 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 21 01:14:28 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 3 20:41:11 2022 +0200 [RTL][NTOS_VISTA] Move the RTL UTF8 functions to the main RTL library, to be linked in the rtl_vista target instead. The reason is that both RtlUTF8ToUnicodeN() and RtlUnicodeToUTF8N() are exported in both kernel and user-mode (ntdll) in Windows 7+. Conversion from and to UTF8 are fundamental enough that they indeed deserve to be in a separate file. --- sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt | 6 +++--- sdk/lib/rtl/CMakeLists.txt | 2 +- sdk/lib/rtl/runonce.c | 2 +- sdk/lib/{drivers/ntoskrnl_vista/rtl.c => rtl/utf8.c} | 19 +++++++++++-------- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt index 78658c54bd0..9cb2838f2a0 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt +++ b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt @@ -4,14 +4,14 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-DUNICODE -D_UNICODE -D__NTOSKRNL__ -D_NTOSKRNL_ -D_NTSYSTEM_) list(APPEND SOURCE - etw.c + etw.c fsrtl.c io.c po.c - ke.c - rtl.c) + ke.c) add_library(ntoskrnl_vista ${SOURCE}) +target_link_libraries(ntoskrnl_vista PRIVATE rtl_vista) add_dependencies(ntoskrnl_vista bugcodes xdk) target_compile_definitions(ntoskrnl_vista PUBLIC NTKRNLVISTA) diff --git a/sdk/lib/rtl/CMakeLists.txt b/sdk/lib/rtl/CMakeLists.txt index 5a0158675d5..042e51e4e4a 100644 --- a/sdk/lib/rtl/CMakeLists.txt +++ b/sdk/lib/rtl/CMakeLists.txt @@ -116,7 +116,7 @@ list(APPEND SOURCE_VISTA condvar.c runonce.c srw.c -) + utf8.c) add_library(rtl_vista ${SOURCE_VISTA}) add_pch(rtl_vista rtl_vista.h SOURCE_VISTA) diff --git a/sdk/lib/rtl/runonce.c b/sdk/lib/rtl/runonce.c index 10401287983..0ffa49b9fa4 100644 --- a/sdk/lib/rtl/runonce.c +++ b/sdk/lib/rtl/runonce.c @@ -1,7 +1,7 @@ /* Taken from Wine ntdll/sync.c */ -#include "rtl_vista.h" +#include <rtl_vista.h> #include <wine/config.h> #include <wine/port.h> diff --git a/sdk/lib/drivers/ntoskrnl_vista/rtl.c b/sdk/lib/rtl/utf8.c similarity index 93% rename from sdk/lib/drivers/ntoskrnl_vista/rtl.c rename to sdk/lib/rtl/utf8.c index 5adfc97943a..1de9d5fe249 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/rtl.c +++ b/sdk/lib/rtl/utf8.c @@ -1,15 +1,18 @@ /* - * PROJECT: ReactOS Kernel - Vista+ APIs - * LICENSE: GPL v2 - See COPYING in the top level directory - * FILE: lib/drivers/ntoskrnl_vista/rtl.c - * PURPOSE: Rtl functions of Vista+ - * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS Kernel - Vista+ APIs + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Rtl functions of Vista+ + * COPYRIGHT: 2016 Thomas Faber <thomas.faber(a)reactos.org> */ -#include <ntdef.h> -#include <ntifs.h> +/* INCLUDES ******************************************************************/ -typedef UCHAR BYTE; +#include <rtl_vista.h> + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ /****************************************************************************** * RtlUnicodeToUTF8N [NTDLL.@]

1 0

[reactos] 01/01: [COMCTL32][COMDLG32] Fix Serbian (Latin) sublanguage identifiers
by Stanislav Motylkov 02 Apr '22

02 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe452a1dad975b9071d8f… commit fe452a1dad975b9071d8f0bcf88a492487966e83 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Apr 2 23:36:28 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Apr 2 23:36:28 2022 +0300 [COMCTL32][COMDLG32] Fix Serbian (Latin) sublanguage identifiers Should really fix MSVC build. Addendum to 64c87aab. --- dll/win32/comctl32/lang/comctl_Sr.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Sr.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/comctl32/lang/comctl_Sr.rc b/dll/win32/comctl32/lang/comctl_Sr.rc index f8ee2e08dd0..1a0225211f8 100644 --- a/dll/win32/comctl32/lang/comctl_Sr.rc +++ b/dll/win32/comctl32/lang/comctl_Sr.rc @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN STRINGTABLE { diff --git a/dll/win32/comdlg32/lang/cdlg_Sr.rc b/dll/win32/comdlg32/lang/cdlg_Sr.rc index 62c1f4a04c0..cb49ac15851 100644 --- a/dll/win32/comdlg32/lang/cdlg_Sr.rc +++ b/dll/win32/comdlg32/lang/cdlg_Sr.rc @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN STRINGTABLE {

1 0

[reactos] 01/01: [TRANSLATION] Fix Croatian (hr-HR) sublanguage identifiers
by Stanislav Motylkov 02 Apr '22

02 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64c87aab739856326d4e8… commit 64c87aab739856326d4e8e1dd9bc859909ee60de Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Apr 2 22:54:19 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Apr 2 22:54:19 2022 +0300 [TRANSLATION] Fix Croatian (hr-HR) sublanguage identifiers Should fix MSVC build. Addendum to 4644e5b7. --- base/applications/notepad/lang/hr-HR.rc | 2 +- base/applications/wordpad/lang/hr-HR.rc | 2 +- dll/win32/comctl32/lang/comctl_Hr.rc | 2 +- dll/win32/syssetup/lang/hr-HR.rc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/applications/notepad/lang/hr-HR.rc b/base/applications/notepad/lang/hr-HR.rc index 3424906023f..fa683dd091d 100644 --- a/base/applications/notepad/lang/hr-HR.rc +++ b/base/applications/notepad/lang/hr-HR.rc @@ -5,7 +5,7 @@ * TRANSLATORS: Copyright 2022 Andrej Bartulin <andrej.bartulinvr(a)gmail.com> */ -LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT +LANGUAGE LANG_CROATIAN, SUBLANG_CROATIAN_CROATIA ID_ACCEL ACCELERATORS BEGIN diff --git a/base/applications/wordpad/lang/hr-HR.rc b/base/applications/wordpad/lang/hr-HR.rc index 3f1ad832a79..1b6310ac763 100644 --- a/base/applications/wordpad/lang/hr-HR.rc +++ b/base/applications/wordpad/lang/hr-HR.rc @@ -13,7 +13,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT +LANGUAGE LANG_CROATIAN, SUBLANG_CROATIAN_CROATIA IDM_MAINMENU MENU BEGIN diff --git a/dll/win32/comctl32/lang/comctl_Hr.rc b/dll/win32/comctl32/lang/comctl_Hr.rc index 565b9a380a4..e403047079d 100644 --- a/dll/win32/comctl32/lang/comctl_Hr.rc +++ b/dll/win32/comctl32/lang/comctl_Hr.rc @@ -5,7 +5,7 @@ * TRANSLATORS: Copyright 2022 Andrej Bartulin <andrej.bartulinvr(a)gmail.com> */ -LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT +LANGUAGE LANG_CROATIAN, SUBLANG_CROATIAN_CROATIA STRINGTABLE { diff --git a/dll/win32/syssetup/lang/hr-HR.rc b/dll/win32/syssetup/lang/hr-HR.rc index 6fe7ba7ae14..d9ec4484331 100644 --- a/dll/win32/syssetup/lang/hr-HR.rc +++ b/dll/win32/syssetup/lang/hr-HR.rc @@ -5,7 +5,7 @@ * TRANSLATORS: Copyright 2022 Andrej Bartulin <andrej.bartulinvr(a)gmail.com> */ -LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT +LANGUAGE LANG_CROATIAN, SUBLANG_CROATIAN_CROATIA IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

1 0

[reactos] 01/01: [TRANSLATION] Update Croatian (hr-HR) translation (#4375)
by Andrej Bartulin 02 Apr '22

02 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4644e5b75de457f566693… commit 4644e5b75de457f566693bc86568a3644da77784 Author: Andrej Bartulin <andrej.bartulinvr(a)gmail.com> AuthorDate: Sat Apr 2 19:32:28 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 2 20:32:28 2022 +0300 [TRANSLATION] Update Croatian (hr-HR) translation (#4375) - [COMCTL32] Fix Croatian (hr-HR) MessageBox mnemonics - [SYSSETUP] Add Croatian (hr-HR) translation 2nd stage of setup translated to Croatian and hotkey fix in MessageBox ("Napijed" and "Nazad" share the same keyboard mnemonic, Alt+N). --- dll/win32/comctl32/lang/comctl_Hr.rc | 86 ++++++++++++ dll/win32/comctl32/rsrc.rc | 3 + dll/win32/syssetup/lang/hr-HR.rc | 265 +++++++++++++++++++++++++++++++++++ dll/win32/syssetup/syssetup.rc | 3 + 4 files changed, 357 insertions(+) diff --git a/dll/win32/comctl32/lang/comctl_Hr.rc b/dll/win32/comctl32/lang/comctl_Hr.rc new file mode 100644 index 00000000000..565b9a380a4 --- /dev/null +++ b/dll/win32/comctl32/lang/comctl_Hr.rc @@ -0,0 +1,86 @@ +/* + * PROJECT: ReactOS MessageBox dialog + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Croatian resource file + * TRANSLATORS: Copyright 2022 Andrej Bartulin <andrej.bartulinvr(a)gmail.com> + */ + +LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CLOSE "Zatvori" +} + +STRINGTABLE +{ + IDM_TODAY "Danas:" + IDM_GOTODAY "Prijeđi na današnji dan" +} + +STRINGTABLE +{ + IDS_SEPARATOR "Razdvajač" +} + +STRINGTABLE +{ + HKY_NONE "Ništa" +} + +STRINGTABLE +{ + IDS_BUTTON_YES "&Da" + IDS_BUTTON_NO "&Ne" + IDS_BUTTON_RETRY "&Ponovo" + IDS_BUTTON_OK "U redu" + IDS_BUTTON_CANCEL "Odustani" + IDS_BUTTON_CLOSE "&Zatvori" +} + +IDD_PROPSHEET DIALOG 0, 0, 220, 140 +STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Svojstva za %s" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "U redu", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Otkaži", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Primjeni", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Pomoć", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG 0, 0, 290, 159 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Vodič" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Natrag", IDC_BACK_BUTTON,56,138,55,14 + DEFPUSHBUTTON "Nap&rijed >", IDC_NEXT_BUTTON,111,138,55,14 + DEFPUSHBUTTON "Kraj", IDC_FINISH_BUTTON,111,138,55,14 + PUSHBUTTON "Otkaži", IDCANCEL,173,138,55,14 + PUSHBUTTON "Pomoć", IDHELP,235,138,55,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG 10, 20, 395, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Prilagodi alatnicu" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Zatvori", IDCANCEL,320,6,70,14 + PUSHBUTTON "&Poništi", IDC_RESET_BTN,320,23,70,14 + PUSHBUTTON "P&omoć", IDC_HELP_BTN,320,40,70,14 + PUSHBUTTON "Pomakni &gore", IDC_MOVEUP_BTN,320,74,70,14 + PUSHBUTTON "Pomkani &dolje", IDC_MOVEDN_BTN,320,91,70,14 + LTEXT "Dostupne &tipke:", -1,4,5,120,10 + LISTBOX IDC_AVAILBTN_LBOX,5,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "Do&daj ->", IDOK, 132, 42, 55, 14 + PUSHBUTTON "<- &Ukloni", IDC_REMOVE_BTN,132,62,55,14 + LTEXT "Tipke na &alatnoj traci:", -1,194,5,120,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 194,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END diff --git a/dll/win32/comctl32/rsrc.rc b/dll/win32/comctl32/rsrc.rc index 0d386b2f418..7779c8ec1fc 100644 --- a/dll/win32/comctl32/rsrc.rc +++ b/dll/win32/comctl32/rsrc.rc @@ -129,6 +129,9 @@ IDI_TT_ERROR_SM ICON idi_tt_error_sm.ico #ifdef LANGUAGE_HI_IN #include "lang/comctl_Hi.rc" #endif +#ifdef LANGUAGE_HR_HR + #include "lang/comctl_Hr.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/comctl_Hu.rc" #endif diff --git a/dll/win32/syssetup/lang/hr-HR.rc b/dll/win32/syssetup/lang/hr-HR.rc new file mode 100644 index 00000000000..6fe7ba7ae14 --- /dev/null +++ b/dll/win32/syssetup/lang/hr-HR.rc @@ -0,0 +1,265 @@ +/* + * PROJECT: ReactOS System Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Croatian resource file + * TRANSLATORS: Copyright 2022 Andrej Bartulin <andrej.bartulinvr(a)gmail.com> + */ + +LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Instalacija" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Dobrodošli u ReactOS Instalacijski čarobnjak.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Ovaj čarobnjak instalira ReactOS na Vaš uređaj. Čarobnjak treba nabaviti nekoliko informacija kako bi pravilno postavio ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Klikinite Napred da biste nastavili.", IDC_STATIC, 115, 169, 195, 17 +END + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Instalacija" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Razvijatelji ReactOS-a žele zahvaliti na sljedećim projektima otvorenog koda (dijelovima) koji su korišteni za stvaranje ReactOS-a:", IDC_STATIC, 15, 7, 286, 19 + LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOS je licenciran pod GPL-om, pa ako ga želite ponovno koristiti ili redistribuirati (dijelove) morate poštivati GPL.", IDC_STATIC, 15, 110, 227, 19 + PUSHBUTTON "&Vidi GPL...", IDC_VIEWGPL, 251, 110, 50, 19 + LTEXT "Klikinite Napred da biste nastavili..", IDC_STATIC, 15, 136, 195, 17 +END + +IDD_PRODUCT DIALOGEX 0, 0, 317, 143 +CAPTION "ReactOS Instalacija" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 + LTEXT "Molimo odaberite opciju proizvoda:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Opcija &proizvoda:", IDC_STATIC, 5, 32, 85, 10 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Informacije o proizvodu", IDC_STATIC, 5, 50, 305, 85 + LTEXT "Opis:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL +END + +IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Instalacija" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 + LTEXT "Upišite svoje puno ime i naziv svoje tvrtke ili organizacije.", IDC_STATIC, 54, 7, 242, 21 + LTEXT "&Ime:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Organizacija:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + +IDD_COMPUTERPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Instalacija" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 + LTEXT "Unesite naziv za svoje računalo koji ima 15 znakova ili manje. Ako ste na mreži, naziv vašeg računala treba biti jedinstven.", IDC_STATIC, 54, 7, 250, 24 + LTEXT "Naz&iv računala:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 + LTEXT "Postavljanje će stvoriti korisnički račun na vašem računalu pod nazivom Administrator. Možete koristiti ovaj račun ako trebate puni pristup svom računalu.", IDC_STATIC, 54, 57, 250, 25 + LTEXT "Upišite administratorsku lozinku koja ima 127 znakova ili manje.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "&Administratorska lozinka:", IDC_STATIC, 54, 104, 105, 8 + EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "&Potvrdi lozinku:", IDC_STATIC, 54, 123, 105, 8 + EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Instalacija" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 + LTEXT "Lokalizacija sustava trebala bi odgovarati jeziku aplikacija koje želite koristiti. Lokalizacija korisnika kontrolira kako se pojavljuju brojevi, valute i datumi.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "Za promjenu postavki sustava ili korisničkog jezika kliknite Prilagodi.", IDC_STATIC, 53, 60, 196, 8 + PUSHBUTTON "&Prilagodi...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ + LTEXT "Raspored tipkovnice kontrolira znakove koji se pojavljuju kada tipkate.", IDC_STATIC, 53, 86, 253, 8 + LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "Za promjenu rasporeda tipkovnice kliknite Prilagodi.", IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "Pri&lagodi...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 +END + +IDD_DATETIMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Instalacija" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Datum i vrijeme:", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Vremenska zona:", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "Automatski namjestite &sat za promjene ljetnog računanja vremena", IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Instalacija" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_THEMEPICKER, "SysListView32", LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP, 18, 8, 288, 130 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Instalacija" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Registriranje komponenti", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Instalacija stvari za početni izbornik (start menu)", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Spremanje postavki", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Uklananje privremenih datoteka", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 +END + +IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Dovršavanje ReactOS instalacije" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Dovršavanje ReactOS instalacije", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Uspješno ste dovršili postavljanje ReactOS-a.\n\nKada kliknete Završi, vaše će se računalo ponovno pokrenuti.", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "Ako se u priključku nalazi CD ili USB, uklonite ga. Zatim, za ponovno pokretanje računala, kliknite Završi.", IDC_STATIC, 115, 169, 195, 17 +END + +IDD_GPL DIALOGEX 0, 0, 333, 230 +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU General Public License" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT, 7, 7, 319, 190, ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "U redu", IDOK, 141, 209, 50, 14 +END + +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 275, 78 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Molimo pričekajte..." +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + CONTROL IDB_REACTOS, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUSLABEL, 7, 59, 235, 12, SS_WORDELLIPSIS +END + +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Napredne postavke" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 + RTEXT "&Uzorak stope:", -1, 27, 35, 90, 8 + LTEXT "izvješća u sekundi", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Detekcija kotača:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "Duljina ulaznog &međuspremnika:", -1, 27, 75, 90, 8 + LTEXT "paketi", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Brza incijalizacija", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Zadano", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Priznanja" + IDS_ACKSUBTITLE "Rame na kojima ReactOS stoji i informacije o licenci" + IDS_OWNERTITLE "Personalizirajte svoj softver" + IDS_OWNERSUBTITLE "Postavljanje koristi ove podatke o vama za personalizaciju ReactOS-a." + IDS_COMPUTERTITLE "Ime računala i administratorska lozinka" + IDS_COMPUTERSUBTITLE "Trebate unijeti ime i administratorsku lozinku za svoje računalo." + IDS_LOCALETITLE "Regionalne postavke" + IDS_LOCALESUBTITLE "Možete prilagoditi ReactOS za različite regije i jezike." + IDS_LOCALETEXT "Standardi i formati su postavljeni na %s, a lokacija na %s." + IDS_LAYOUTTEXT "Vaš zadani jezik i način unosa teksta je: %s raspored tipkovnice" + IDS_DATETIMETITLE "Datum i vrijeme" + IDS_DATETIMESUBTITLE "Postavite točan datum i vrijeme za svoje računalo." + IDS_PROCESSTITLE "Registriranje komponenti" + IDS_PROCESSSUBTITLE "Molimo pričekajte..." + IDS_THEMESELECTIONTITLE "Izgled" + IDS_THEMESELECTIONSUBTITLE "Odaberite temu koju preferirate." +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "ReactOS Instalacija" + IDS_UNKNOWN_ERROR "Nepoznata pogreška" + IDS_LOADLIBRARY_FAILED "Učitavanje LoadLibrary-a je neuspješno: " + IDS_GETPROCADDR_FAILED "Učitavanje GetProcAddr-a je neuspješno: " + IDS_REGSVR_FAILED "Učitavnaje DllRegisterServer-a je neuspješno: " + IDS_DLLINSTALL_FAILED "Učitavanje DllInstall-a je neuspješno: " + IDS_TIMEOUT "Istek vremena tijekom registracije" + IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administrator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Owner" +END + +STRINGTABLE +BEGIN + IDS_WZD_NAME "Postavljanje se ne može nastaviti dok ne unesete svoje ime." + IDS_WZD_SETCOMPUTERNAME "Postavljanje nije uspjelo postaviti naziv računala." + IDS_WZD_COMPUTERNAME "Postavljanje se ne može nastaviti dok ne unesete naziv svog računala." + IDS_WZD_PASSWORDEMPTY "Trebate unijeti lozinku!" + IDS_WZD_PASSWORDMATCH "Zaporke koje ste unijeli ne odgovaraju. Ponovno unesite željenu lozinku." + IDS_WZD_PASSWORDCHAR "Lozinka koju ste unijeli sadrži nevažeće znakove. Unesite očišćenu lozinku." + IDS_WZD_LOCALTIME "Postavljanje nije moglo postaviti lokalno vrijeme." +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Instaliranje uređaja..." +END + +/* ATTENTION: Synchronize these strings with dll/win32/shell32/lang */ +STRINGTABLE +BEGIN + IDS_PROGRAMFILES "%SystemDrive%\\Program Files" + IDS_COMMONFILES "Common Files" +END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detekcija je onemogućena" + IDS_LOOKFORWHEEL "Potražite kotač" + IDS_ASSUMEPRESENT "Pretpostavimo da je kotač prisutan" +END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Klasična (Classic)" + IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" + IDS_MIZU "Mizu" +END + +STRINGTABLE +BEGIN + IDS_PRODUCTTITLE "Opcije proizvoda" + IDS_PRODUCTSUBTITLE "Možete odabrati opciju proizvoda koja utječe na ponašanje sustava." + IDS_PRODUCTSERVERNAME "ReactOS Server" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" + IDS_PRODUCTSERVERINFO "Sustav će biti prepoznat kao server. Privatne mape su: ""My Pictures"", ""My Videos"" i ""My Music"" koji su neovisni od mape ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "Sustav će biti prepoznat kao radna stanica - workstation. Privatne mape su: ""My Pictures"", ""My Videos"" i ""My Music"" koji su u mapi ""My Documents""." + IDS_DEFAULT "Zadano (Default)" +END diff --git a/dll/win32/syssetup/syssetup.rc b/dll/win32/syssetup/syssetup.rc index cc5f874bad8..fc8c974532a 100644 --- a/dll/win32/syssetup/syssetup.rc +++ b/dll/win32/syssetup/syssetup.rc @@ -89,6 +89,9 @@ IDR_GPL RT_TEXT "COPYING" #ifdef LANGUAGE_HI_IN #include "lang/hi-IN.rc" #endif +#ifdef LANGUAGE_HR_HR + #include "lang/hr-HR.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif

1 0

[reactos] 01/01: [BOOT] Move boot-related commands from boot/CMakeLists.txt into a boot_images.cmake sub-file. (#4407)
by Hermès Bélusca-Maïto 01 Apr '22

01 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64290dd2c98f430c23a47… commit 64290dd2c98f430c23a47100f655ce7e6849c3ee Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 21 02:45:34 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Apr 1 04:58:08 2022 +0200 [BOOT] Move boot-related commands from boot/CMakeLists.txt into a boot_images.cmake sub-file. (#4407) This allows the CMakeLists.txt file to be less cluttered by unrelated stuff. --- boot/CMakeLists.txt | 167 +---------------------------- boot/{CMakeLists.txt => boot_images.cmake} | 4 - 2 files changed, 2 insertions(+), 169 deletions(-) diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index 602b8600361..8ce56ed64fb 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -1,169 +1,6 @@ -## efisys.bin -# EFI platform ID, used in environ/CMakelists.txt for bootmgfw filename naming also. -if(ARCH STREQUAL "amd64") - set(EFI_PLATFORM_ID "x64") -elseif(ARCH STREQUAL "i386") - set(EFI_PLATFORM_ID "ia32") -elseif(ARCH STREQUAL "ia64") - set(EFI_PLATFORM_ID "ia64") -elseif(ARCH STREQUAL "arm") - set(EFI_PLATFORM_ID "arm") -elseif(ARCH STREQUAL "arm64") - set(EFI_PLATFORM_ID "aa64") -else() - message(FATAL_ERROR "Unknown ARCH '" ${ARCH} "', cannot generate a valid UEFI boot filename.") -endif() +include(boot_images.cmake) -# FIXME: this command creates a dummy EFI partition, add EFI/BOOT/boot${EFI_PLATFORM_ID}.efi file -# once ReactOS supports UEFI -add_custom_target(efisys - COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT - DEPENDS native-fatten fat - VERBATIM) - - -# Create an 'empty' directory (guaranteed to be empty) to be able to add -# arbitrary empty directories to the ISO image using mkisofs. -file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/empty) - -# Retrieve the full paths to the generated files of the 'isombr', 'isoboot', 'isobtrt' and 'efisys' targets -set(_isombr_file ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isombr.bin) # get_target_property(_isombr_file isombr LOCATION) -set(_isoboot_file ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin) # get_target_property(_isoboot_file isoboot LOCATION) -set(_isobtrt_file ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isobtrt.bin) # get_target_property(_isobtrt_file isobtrt LOCATION) -set(_efisys_file ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin) # get_target_property(_efisys_file efisys LOCATION) - -# Create a mkisofs sort file to specify an explicit ordering for the boot files -# to place them at the beginning of the image (makes ISO image analysis easier). -# See mkisofs/schilytools/mkisofs/README.sort for more details. -# As the default file sort weight is '0', give the boot files sort weights >= 1. -# Note that it is sad that '-sort' does not work using grafted points, and as a -# result we need in particular to use the boot catalog file "path" mkisofs that -# mkisofs expects, that is, the boot catalog file name is appended to the first -# host-system path listed in the file list, whatever it is, and that does not -# work well if the first item is a graft point (and especially if it's a file -# and not a directory). To fix that, the trick is to use as the first file item -# the empty directory created earlier. This ensures that: -# - the boot catalog file path is meaningful; -# - since its contents are included by mkisofs in the root of the ISO image, -# using the empty directory ensures that no extra unwanted files are added. -# -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort "\ -${CMAKE_CURRENT_BINARY_DIR}/empty/boot.catalog 4 -${_isoboot_file} 3 -${_isobtrt_file} 2 -${_efisys_file} 1 -") - -# ISO image identifier names -set(ISO_MANUFACTURER "ReactOS Foundation") # For both the publisher and the preparer -set(ISO_VOLNAME "ReactOS") # For both the Volume ID and the Volume set ID - - -# Create user profile directories in the LiveImage -function(add_allusers_profile_dirs _image_filelist _rootdir) - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -endfunction() -function(add_user_profile_dirs _image_filelist _rootdir _username) - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Application Data/Microsoft/Internet Explorer/Quick Launch=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -endfunction() - - -## BootCD -# Create the file list -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "") -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - -add_custom_target(bootcd - COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcd.iso -iso-level 4 - -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} - -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog - -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort - -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcd.$<CONFIG>.lst - COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcd.iso - DEPENDS isombr native-isohybrid native-mkisofs - VERBATIM) - -## BootCDRegTest -# Create the file list -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake.lst "") -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - -add_custom_target(bootcdregtest - COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcdregtest.iso -iso-level 4 - -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} - -eltorito-boot loader/isobtrt.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog - -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort - -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.$<CONFIG>.lst - COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcdregtest.iso - DEPENDS isombr native-isohybrid native-mkisofs - VERBATIM) - -## LiveCD -# Create the file list -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "") -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - -# Create user profile directories -add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles") -add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles" "Default User") - -add_custom_target(livecd - COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/livecd.iso -iso-level 4 - -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} - -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog - -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort - -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/livecd.$<CONFIG>.lst - COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/livecd.iso - DEPENDS isombr native-isohybrid native-mkisofs - VERBATIM) - -## HybridCD -# Create the file list -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "") -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - -# Create user profile directories -add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles") -add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles" "Default User") - -add_custom_target(hybridcd - COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/hybridcd.iso -iso-level 4 - -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} - -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog - -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort - -duplicates-once -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.$<CONFIG>.lst - COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/hybridcd.iso - DEPENDS bootcd livecd - VERBATIM) - -add_cd_file(TARGET efisys FILE ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd regtest livecd hybridcd) - -add_subdirectory(freeldr) add_subdirectory(bootdata) # add_subdirectory(environ) +add_subdirectory(freeldr) diff --git a/boot/CMakeLists.txt b/boot/boot_images.cmake similarity index 99% copy from boot/CMakeLists.txt copy to boot/boot_images.cmake index 602b8600361..9abe78d4245 100644 --- a/boot/CMakeLists.txt +++ b/boot/boot_images.cmake @@ -163,7 +163,3 @@ add_custom_target(hybridcd VERBATIM) add_cd_file(TARGET efisys FILE ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd regtest livecd hybridcd) - -add_subdirectory(freeldr) -add_subdirectory(bootdata) -# add_subdirectory(environ)

1 0

[reactos] 01/01: [BOOTSECT] ISOBOOT: Add missing trailing 0x55AA sector signature.
by Hermès Bélusca-Maïto 01 Apr '22

01 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88618f176d19223efae0b… commit 88618f176d19223efae0b79f72a0fea5d1a31a4e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Apr 1 04:47:22 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Apr 1 04:57:31 2022 +0200 [BOOTSECT] ISOBOOT: Add missing trailing 0x55AA sector signature. --- boot/freeldr/bootsect/isoboot.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/bootsect/isoboot.S b/boot/freeldr/bootsect/isoboot.S index 76861165dcb..da52eba9bfe 100644 --- a/boot/freeldr/bootsect/isoboot.S +++ b/boot/freeldr/bootsect/isoboot.S @@ -1147,8 +1147,8 @@ dapa: // Extend the size to cover one 2K-sized sector -.org 2047 - .byte 0 +.org 2046 + .word HEX(0aa55) // BootSector signature .endcode16

1 0

[reactos] 01/01: [SDK:REACTOS][SVCHOST] Add/complete all missing definitions in the SVCHOST global header. (#4295)
by Hermès Bélusca-Maïto 01 Apr '22

01 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d3a5aa02e1e613095e36… commit 3d3a5aa02e1e613095e369c4d1f0e61d206ddd77 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 17 01:01:57 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Apr 1 04:55:31 2022 +0200 [SDK:REACTOS][SVCHOST] Add/complete all missing definitions in the SVCHOST global header. (#4295) Following commit 24a727a23, give a lift to the SVCHOST global header and add & complete all the missing definitions. - Based on https://www.geoffchappell.com/studies/windows/win32/services/svchost/proces… from public debug symbols (e.g. svchost, mswsock, w32time, wscsvc...), adjust some of our symbols' names. - Make the header C++-compatible. - Even if the start/stop RPC server functions return an error code whose underlying storage type is a 32-bit long, they don't return an RPC status error code, but an NT status. Thus, use the adequate type instead. - The PSVCHOST_STOP_CALLBACK is nothing but a WAITORTIMERCALLBACK function. - Take the opportunity to fix some of these functions' SAL annotations. - Remark: "LP" for pointers is old-fashioned Windows, avoid this in NT code. [MSWSOCK][SECLOGON] Do the minor adjustments. Remove unnecessary function casts. --- base/services/seclogon/precomp.h | 2 +- base/services/seclogon/rpcserver.c | 12 +-- base/services/seclogon/seclogon.c | 4 +- base/services/svchost/globals.c | 16 ++-- base/services/svchost/rpcsrv.c | 4 +- base/services/svchost/svchost.c | 4 +- base/services/svchost/svchost.h | 13 ++-- dll/win32/mswsock/stubs.c | 2 +- sdk/include/reactos/svc.h | 151 ++++++++++++++++++++++++++----------- 9 files changed, 136 insertions(+), 72 deletions(-) diff --git a/base/services/seclogon/precomp.h b/base/services/seclogon/precomp.h index f8101a484c0..18825e72106 100644 --- a/base/services/seclogon/precomp.h +++ b/base/services/seclogon/precomp.h @@ -28,7 +28,7 @@ #include <wine/debug.h> extern HINSTANCE hDllInstance; -extern SVCHOST_GLOBALS *lpServiceGlobals; +extern PSVCHOST_GLOBAL_DATA lpServiceGlobals; DWORD StartRpcServer(VOID); diff --git a/base/services/seclogon/rpcserver.c b/base/services/seclogon/rpcserver.c index 410b50fc6b9..9c8f85e7c97 100644 --- a/base/services/seclogon/rpcserver.c +++ b/base/services/seclogon/rpcserver.c @@ -31,10 +31,10 @@ void __RPC_USER midl_user_free(void __RPC_FAR * ptr) DWORD StartRpcServer(VOID) { - ULONG Status; + NTSTATUS Status; - Status = ((LPSTART_RPC_SERVER)lpServiceGlobals->RpcpStartRpcServer)(L"seclogon", ISeclogon_v1_0_s_ifspec); - TRACE("RpcpStartRpcServer returned 0x%08lx\n", Status); + Status = lpServiceGlobals->StartRpcServer(L"seclogon", ISeclogon_v1_0_s_ifspec); + TRACE("StartRpcServer returned 0x%08lx\n", Status); return RtlNtStatusToDosError(Status); } @@ -43,10 +43,10 @@ StartRpcServer(VOID) DWORD StopRpcServer(VOID) { - ULONG Status; + NTSTATUS Status; - Status = ((LPSTOP_RPC_SERVER)lpServiceGlobals->RpcpStopRpcServer)(ISeclogon_v1_0_s_ifspec); - TRACE("RpcpStopRpcServer returned 0x%08lx\n", Status); + Status = lpServiceGlobals->StopRpcServer(ISeclogon_v1_0_s_ifspec); + TRACE("StopRpcServer returned 0x%08lx\n", Status); return RtlNtStatusToDosError(Status); } diff --git a/base/services/seclogon/seclogon.c b/base/services/seclogon/seclogon.c index afe90befb0e..efe5ce4f853 100644 --- a/base/services/seclogon/seclogon.c +++ b/base/services/seclogon/seclogon.c @@ -15,7 +15,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(seclogon); /* GLOBALS ******************************************************************/ HINSTANCE hDllInstance; -SVCHOST_GLOBALS *lpServiceGlobals; +PSVCHOST_GLOBAL_DATA lpServiceGlobals; static WCHAR ServiceName[] = L"seclogon"; @@ -112,7 +112,7 @@ ServiceControlHandlerEx( VOID WINAPI SvchostPushServiceGlobals( - _In_ SVCHOST_GLOBALS *lpGlobals) + _In_ PSVCHOST_GLOBAL_DATA lpGlobals) { TRACE("SvchostPushServiceGlobals(%p)\n", lpGlobals); lpServiceGlobals = lpGlobals; diff --git a/base/services/svchost/globals.c b/base/services/svchost/globals.c index 3f77d725e68..883272e08e9 100644 --- a/base/services/svchost/globals.c +++ b/base/services/svchost/globals.c @@ -47,7 +47,7 @@ DOMAIN_SID_DATA DomainSidData[8] = { &AliasBackupOpsSid, DOMAIN_ALIAS_RID_BACKUP_OPS }, }; -PSVCHOST_GLOBALS g_pSvchostSharedGlobals; +PSVCHOST_GLOBAL_DATA g_pSvchostSharedGlobals; DWORD g_SvchostInitFlag; HANDLE g_hHeap; @@ -148,13 +148,13 @@ SvchostBuildSharedGlobals ( g_pSvchostSharedGlobals->AliasBackupOpsSid = AliasBackupOpsSid; /* Write the pointers to the callbacks */ - g_pSvchostSharedGlobals->RpcpStartRpcServer = RpcpStartRpcServer; - g_pSvchostSharedGlobals->RpcpStopRpcServer = RpcpStopRpcServer; - g_pSvchostSharedGlobals->RpcpStopRpcServerEx = RpcpStopRpcServerEx; - g_pSvchostSharedGlobals->SvcNetBiosOpen = SvcNetBiosOpen; - g_pSvchostSharedGlobals->SvcNetBiosClose = SvcNetBiosClose; - g_pSvchostSharedGlobals->SvcNetBiosReset = SvcNetBiosReset; - g_pSvchostSharedGlobals->SvcRegisterStopCallback = SvcRegisterStopCallback; + g_pSvchostSharedGlobals->StartRpcServer = RpcpStartRpcServer; + g_pSvchostSharedGlobals->StopRpcServer = RpcpStopRpcServer; + g_pSvchostSharedGlobals->StopRpcServerEx = RpcpStopRpcServerEx; + g_pSvchostSharedGlobals->NetBiosOpen = SvcNetBiosOpen; + g_pSvchostSharedGlobals->NetBiosClose = SvcNetBiosClose; + g_pSvchostSharedGlobals->NetBiosReset = SvcNetBiosReset; + g_pSvchostSharedGlobals->RegisterStopCallback = SvcRegisterStopCallback; } VOID diff --git a/base/services/svchost/rpcsrv.c b/base/services/svchost/rpcsrv.c index 34482bf76cf..4fd49212d62 100644 --- a/base/services/svchost/rpcsrv.c +++ b/base/services/svchost/rpcsrv.c @@ -81,7 +81,7 @@ RpcpStopRpcServerEx ( NTSTATUS NTAPI RpcpAddInterface ( - _In_ LPCWSTR IfName, + _In_ PCWSTR IfName, _In_ RPC_IF_HANDLE IfSpec ) { @@ -129,7 +129,7 @@ RpcpAddInterface ( NTSTATUS NTAPI RpcpStartRpcServer ( - _In_ LPCWSTR IfName, + _In_ PCWSTR IfName, _In_ RPC_IF_HANDLE IfSpec ) { diff --git a/base/services/svchost/svchost.c b/base/services/svchost/svchost.c index ab89bfcba6e..0f763f9c661 100644 --- a/base/services/svchost/svchost.c +++ b/base/services/svchost/svchost.c @@ -516,8 +516,8 @@ SvchostStopCallback ( DWORD WINAPI SvcRegisterStopCallback ( - _In_ PHANDLE phNewWaitObject, - _In_ LPCWSTR ServiceName, + _Out_ PHANDLE phNewWaitObject, + _In_ PCWSTR ServiceName, _In_ HANDLE hObject, _In_ PSVCHOST_STOP_CALLBACK pfnStopCallback, _In_ PVOID pContext, diff --git a/base/services/svchost/svchost.h b/base/services/svchost/svchost.h index 8cd80fdf4f0..46d0ee70e17 100644 --- a/base/services/svchost/svchost.h +++ b/base/services/svchost/svchost.h @@ -39,8 +39,9 @@ // typedef VOID (WINAPI *PSVCHOST_INIT_GLOBALS) ( - _In_ PSVCHOST_GLOBALS Globals + _In_ PSVCHOST_GLOBAL_DATA Globals ); + // // Initialization Stages // @@ -139,7 +140,7 @@ RpcpStopRpcServerEx ( NTSTATUS NTAPI RpcpStartRpcServer ( - _In_ LPCWSTR IfName, + _In_ PCWSTR IfName, _In_ RPC_IF_HANDLE IfSpec ); @@ -189,7 +190,7 @@ SvcNetBiosInit ( VOID WINAPI SvcNetBiosClose ( -VOID + VOID ); VOID @@ -243,14 +244,14 @@ RegQueryStringA ( DWORD WINAPI SvcRegisterStopCallback ( - _In_ PHANDLE phNewWaitObject, - _In_ LPCWSTR ServiceName, + _Out_ PHANDLE phNewWaitObject, + _In_ PCWSTR ServiceName, _In_ HANDLE hObject, _In_ PSVCHOST_STOP_CALLBACK pfnStopCallback, _In_ PVOID pContext, _In_ ULONG dwFlags ); -extern PSVCHOST_GLOBALS g_pSvchostSharedGlobals; +extern PSVCHOST_GLOBAL_DATA g_pSvchostSharedGlobals; #endif /* _SVCHOST_PCH_ */ diff --git a/dll/win32/mswsock/stubs.c b/dll/win32/mswsock/stubs.c index 40def8f5cf3..9f57605ff69 100644 --- a/dll/win32/mswsock/stubs.c +++ b/dll/win32/mswsock/stubs.c @@ -446,7 +446,7 @@ StopWsdpService() */ VOID WINAPI -SvchostPushServiceGlobals(SVCHOST_GLOBALS *lpGlobals) +SvchostPushServiceGlobals(PSVCHOST_GLOBAL_DATA lpGlobals) { OutputDebugStringW(L"mswsock SvchostPushServiceGlobals stub called\n"); } diff --git a/sdk/include/reactos/svc.h b/sdk/include/reactos/svc.h index 009c2e77703..7a1867da0b4 100644 --- a/sdk/include/reactos/svc.h +++ b/sdk/include/reactos/svc.h @@ -1,68 +1,131 @@ /* * PROJECT: ReactOS Service Host * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: sdk/include/reactos/svc.h * PURPOSE: Global Header for Service Host * PROGRAMMERS: ReactOS Portable Systems Group + * + * REFERENCES: + * https://www.geoffchappell.com/studies/windows/win32/services/svchost/proces… */ -/* See https://www.geoffchappell.com/studies/windows/win32/services/svchost/proces… */ #ifndef __SVC_H #define __SVC_H -#ifndef __RPC_H__ +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef __RPC_H__ // For RPC_IF_HANDLE +/* Don't include windows.h if we just need rpc.h */ +#ifndef RPC_NO_WINDOWS_H +#define RPC_NO_WINDOWS_H +#endif #include <rpc.h> +#endif // __RPC_H__ + +#ifndef WINAPI +#define WINAPI __stdcall +#endif + +/* Ensure NTSTATUS is defined */ +#ifndef _NTDEF_ +typedef _Return_type_success_(return >= 0) LONG NTSTATUS, *PNTSTATUS; #endif -typedef RPC_STATUS -(CALLBACK *LPSTART_RPC_SERVER) ( - _In_ RPC_WSTR PipeName, +/* + * Entrypoints for starting and stopping an RPC server. + */ +typedef NTSTATUS +(WINAPI *PSTART_RPC_SERVER)( + _In_ PCWSTR IfName, _In_ RPC_IF_HANDLE IfSpec); -typedef RPC_STATUS -(CALLBACK *LPSTOP_RPC_SERVER) ( +typedef NTSTATUS +(WINAPI *PSTOP_RPC_SERVER)( _In_ RPC_IF_HANDLE IfSpec); -// -// This is the callback that a hosted service can register for stop notification -// +typedef NTSTATUS +(WINAPI *PSTOP_RPC_SERVER_EX)( + _In_ RPC_IF_HANDLE IfSpec); + +/* + * Entrypoints for NetBIOS service support. + */ typedef VOID -(CALLBACK *PSVCHOST_STOP_CALLBACK) ( +(WINAPI *PNET_BIOS_OPEN)(VOID); + +typedef VOID +(WINAPI *PNET_BIOS_CLOSE)(VOID); + +typedef DWORD +(WINAPI *PNET_BIOS_RESET)( + _In_ UCHAR LanaNum); + +/* + * Callback that a hosted service can register for stop notification. + * Alias to (RTL_)WAITORTIMERCALLBACK(FUNC). + */ +/* +typedef VOID +(CALLBACK *PSVCHOST_STOP_CALLBACK)( _In_ PVOID lpParameter, - _In_ BOOLEAN TimerOrWaitFired - ); + _In_ BOOLEAN TimerOrWaitFired); +*/ +typedef WAITORTIMERCALLBACK PSVCHOST_STOP_CALLBACK; + +#if (_WIN32_WINNT == _WIN32_WINNT_WINXP && NTDDI_VERSION >= NTDDI_WINXPSP2) || \ + (NTDDI_VERSION >= NTDDI_WS03SP1) +typedef DWORD +(WINAPI *PREGISTER_STOP_CALLBACK)( + _Out_ PHANDLE phNewWaitObject, + _In_ PCWSTR pszServiceName, + _In_ HANDLE hObject, + _In_ PSVCHOST_STOP_CALLBACK Callback, + _In_ PVOID Context, + _In_ ULONG dwFlags); +#endif -// -// Hosted Services and SvcHost Use this Structure -// -typedef struct _SVCHOST_GLOBALS +/* + * Hosted Services and SvcHost use this shared global data structure. + */ +typedef struct _SVCHOST_GLOBAL_DATA { - PVOID NullSid; - PVOID WorldSid; - PVOID LocalSid; - PVOID NetworkSid; - PVOID LocalSystemSid; - PVOID LocalServiceSid; - PVOID NetworkServiceSid; - PVOID BuiltinDomainSid; - PVOID AuthenticatedUserSid; - PVOID AnonymousLogonSid; - PVOID AliasAdminsSid; - PVOID AliasUsersSid; - PVOID AliasGuestsSid; - PVOID AliasPowerUsersSid; - PVOID AliasAccountOpsSid; - PVOID AliasSystemOpsSid; - PVOID AliasPrintOpsSid; - PVOID AliasBackupOpsSid; - PVOID RpcpStartRpcServer; - PVOID RpcpStopRpcServer; - PVOID RpcpStopRpcServerEx; - PVOID SvcNetBiosOpen; - PVOID SvcNetBiosClose; - PVOID SvcNetBiosReset; - PVOID SvcRegisterStopCallback; -} SVCHOST_GLOBALS, *PSVCHOST_GLOBALS; + PSID NullSid; + PSID WorldSid; + PSID LocalSid; + PSID NetworkSid; + PSID LocalSystemSid; + PSID LocalServiceSid; + PSID NetworkServiceSid; + PSID BuiltinDomainSid; + PSID AuthenticatedUserSid; + PSID AnonymousLogonSid; + PSID AliasAdminsSid; + PSID AliasUsersSid; + PSID AliasGuestsSid; + PSID AliasPowerUsersSid; + PSID AliasAccountOpsSid; + PSID AliasSystemOpsSid; + PSID AliasPrintOpsSid; + PSID AliasBackupOpsSid; + + /* SvcHost callbacks for RPC server and NetBIOS service support */ + PSTART_RPC_SERVER StartRpcServer; + PSTOP_RPC_SERVER StopRpcServer; + PSTOP_RPC_SERVER_EX StopRpcServerEx; + PNET_BIOS_OPEN NetBiosOpen; + PNET_BIOS_CLOSE NetBiosClose; + PNET_BIOS_RESET NetBiosReset; + +#if (_WIN32_WINNT == _WIN32_WINNT_WINXP && NTDDI_VERSION >= NTDDI_WINXPSP2) || \ + (NTDDI_VERSION >= NTDDI_WS03SP1) + PREGISTER_STOP_CALLBACK RegisterStopCallback; +#endif +} SVCHOST_GLOBAL_DATA, *PSVCHOST_GLOBAL_DATA; + +#ifdef __cplusplus +} +#endif #endif /* __SVC_H */

1 0

[reactos] 01/01: [CMAKE] msvc.cmake: Remove redundant '/Gy' (#4424)
by Joachim Henze 31 Mar '22

31 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=493bb8de46ce33720c931… commit 493bb8de46ce33720c9319efa555ddb441d14519 Author: Joachim Henze <33393466+JoachimHenze(a)users.noreply.github.com> AuthorDate: Thu Mar 31 21:18:26 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 31 21:18:26 2022 +0200 [CMAKE] msvc.cmake: Remove redundant '/Gy' (#4424) * [CMAKE] msvc.cmake: Remove redundant '/Gy' Function-level-Linking '/Gy' is already enabled unconditionally at line 26. So no need to enable it here another time. Makes the differences between the multiple OPTIMIZE-levels more obvious. * [CMAKE] msvc.cmake: Fix typo in comment --- sdk/cmake/msvc.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 77de6955619..9f6d4544003 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -14,7 +14,7 @@ elseif(OPTIMIZE STREQUAL "3") elseif(OPTIMIZE STREQUAL "4") add_compile_options(/Ob0 /Od) elseif(OPTIMIZE STREQUAL "5") - add_compile_options(/Gy /Ob2 /Os /Ox /GS-) + add_compile_options(/Ob2 /Os /Ox /GS-) endif() # Always use string pooling: this helps reducing the binaries size since a lot @@ -55,7 +55,7 @@ if(ARCH STREQUAL "i386") endif() endif() -# CLang default to -fno-common from version 11 onward. We are not rady for this now +# CLang default to -fno-common from version 11 onward. We are not ready for this now if (USE_CLANG_CL) add_compile_options(-fcommon) endif()

1 0

[reactos] 01/01: [TRANSLATION] Improve Simplified & Traditional Chinese translations (#4388)
by Luke Luo 31 Mar '22

31 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f59c58d8330abc455ba92… commit f59c58d8330abc455ba928850318e5c97fbb15cb Author: Luke Luo <njlyf2011(a)hotmail.com> AuthorDate: Fri Apr 1 01:38:52 2022 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 31 20:38:52 2022 +0300 [TRANSLATION] Improve Simplified & Traditional Chinese translations (#4388) Reviewed-by: Chan Chilung <eason066(a)gmail.com> Reviewed-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/win32/shell32/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-HK.rc | 4 +- dll/win32/shell32/lang/zh-TW.rc | 4 +- drivers/bus/acpi/acpi.inf | 10 +- drivers/filesystems/btrfs/btrfs.inf | 27 +++ drivers/network/dd/ne2000/netne2000.inf | 12 +- drivers/processor/processr/cpu.inf | 61 +++++ drivers/storage/class/cdrom/cdrom.inf | 60 +++++ drivers/storage/class/disk/disk.inf | 50 ++++ drivers/storage/port/storahci/storahci.inf | 15 ++ drivers/usb/usbstor/usbstor.inf | 10 +- media/inf/display.inf | 10 +- media/inf/flpydisk.inf | 6 +- media/inf/input.inf | 16 +- media/inf/intl.inf | 356 +++++++++++++++++++++++++++++ media/inf/volume.inf | 17 +- 16 files changed, 632 insertions(+), 28 deletions(-) diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index b864aa61a15..edb2e382fa0 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -163,7 +163,7 @@ IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 STYLE DS_SHELLFONT | WS_CHILD FONT 9, "宋体" BEGIN - LTEXT "带给您 ReactOS 的是：", IDC_STATIC, 0, 0, 180, 10 + LTEXT "给您带来 ReactOS 的是：", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc index ad450e50088..40cade86f9f 100644 --- a/dll/win32/shell32/lang/zh-HK.rc +++ b/dll/win32/shell32/lang/zh-HK.rc @@ -161,7 +161,7 @@ IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 STYLE DS_SHELLFONT | WS_CHILD FONT 9, "新細明體" BEGIN - LTEXT "帶給您 ReactOS 的是：", IDC_STATIC, 0, 0, 180, 10 + LTEXT "給您帶來 ReactOS 的是：", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END @@ -318,7 +318,7 @@ BEGIN EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10 - LTEXT "已使用的空間：", -1, 25, 69, 80, 10 + LTEXT "已使用空間：", -1, 25, 69, 80, 10 EDITTEXT 14003, 110, 69, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14004, 197, 69, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL CONTROL "", 14014, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10, 10 diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 962ae555563..b8f0880e74b 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -162,7 +162,7 @@ IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 STYLE DS_SHELLFONT | WS_CHILD FONT 9, "新細明體" BEGIN - LTEXT "帶給您 ReactOS 的是：", IDC_STATIC, 0, 0, 180, 10 + LTEXT "給您帶來 ReactOS 的是：", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END @@ -319,7 +319,7 @@ BEGIN EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10 - LTEXT "已使用的空間：", -1, 25, 69, 80, 10 + LTEXT "已使用空間：", -1, 25, 69, 80, 10 EDITTEXT 14003, 110, 69, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14004, 197, 69, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL CONTROL "", 14014, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10, 10 diff --git a/drivers/bus/acpi/acpi.inf b/drivers/bus/acpi/acpi.inf index 389cc99e099..64693975404 100644 --- a/drivers/bus/acpi/acpi.inf +++ b/drivers/bus/acpi/acpi.inf @@ -49,6 +49,10 @@ GenericMfg = "(Generic system devices)" [Strings.0405] GenericMfg = "(Generická systémová zařízení)" +[Strings.0404] +GenericMfg = "（標準系統裝置）" +*PNP0C08.DeviceDesc = "ACPI 硬體" + [Strings.0407] GenericMfg = "(Generische Systemgeräte)" *PNP0C08.DeviceDesc = "ACPI Hardware" @@ -108,5 +112,9 @@ GenericMfg = "(Стандартні системні пристрої)" GenericMfg = "(Standartiniai sisteminiai įrenginiai)" [Strings.0804] -GenericMfg = "(通用系统设备)" +GenericMfg = "（通用系统设备）" +*PNP0C08.DeviceDesc = "ACPI 硬件" + +[Strings.0c04] +GenericMfg = "（標準系統裝置）" *PNP0C08.DeviceDesc = "ACPI 硬件" diff --git a/drivers/filesystems/btrfs/btrfs.inf b/drivers/filesystems/btrfs/btrfs.inf index 09c4f1bdde1..fa841e227f2 100644 --- a/drivers/filesystems/btrfs/btrfs.inf +++ b/drivers/filesystems/btrfs/btrfs.inf @@ -128,6 +128,15 @@ DiskId1 = "Btrfs Device Installation Disk" VolumeName = "Btrfs volume" ControllerName = "Btrfs controller" +[Strings.0404] +Me = "Mark Harmstone" +ServiceDescription = "Btrfs 驅動程式" +ServiceName = "btrfs" +DriverName = "btrfs" +DiskId1 = "Btrfs 裝置安裝磁片" +VolumeName = "Btrfs 磁碟區" +ControllerName = "Btrfs 控制器" + [Strings.0415] Me = "Mark Harmstone" ServiceDescription = "Sterownik systemu plików Btrfs" @@ -136,3 +145,21 @@ DriverName = "btrfs" DiskId1 = "Dysk instalacyjny urządzenia Btrfs" VolumeName = "Wolumin Btrfs" ControllerName = "Kontroler Btrfs" + +[Strings.0804] +Me = "Mark Harmstone" +ServiceDescription = "Btrfs 驱动程序" +ServiceName = "btrfs" +DriverName = "btrfs" +DiskId1 = "Btrfs 设备安装磁盘" +VolumeName = "Btrfs 卷" +ControllerName = "Btrfs 控制器" + +[Strings.0c04] +Me = "Mark Harmstone" +ServiceDescription = "Btrfs 驅動程式" +ServiceName = "btrfs" +DriverName = "btrfs" +DiskId1 = "Btrfs 裝置安裝磁片" +VolumeName = "Btrfs 磁碟區" +ControllerName = "Btrfs 控制器" diff --git a/drivers/network/dd/ne2000/netne2000.inf b/drivers/network/dd/ne2000/netne2000.inf index da00c8e4419..fb8a1df3067 100644 --- a/drivers/network/dd/ne2000/netne2000.inf +++ b/drivers/network/dd/ne2000/netne2000.inf @@ -71,6 +71,10 @@ RealtekMfg = "Realtek Semiconductor Co., Ltd." *RTL8019.DeviceDesc = "Realtek RTL8019AS ISA Ethernet Adapter" PCI\VEN_10EC&DEV_8029.DeviceDesc = "Realtek RTL8029 PCI Ethernet Adapter" +[Strings.0404] +GenericMfg = "（標準網路卡）" +*PNP80D6.DeviceDesc = "與 NE2000 相容的乙太網路卡" + [Strings.0405] GenericMfg = "(Generické síťové karty)" *PNP80D6.DeviceDesc = "NE2000 kompatibilní síťová karta" @@ -139,5 +143,9 @@ GenericMfg = "(Standartinės tinklo plokštės)" *PNP80D6.DeviceDesc = "Su NE2000 suderinama tinklo plokštė" [Strings.0804] -GenericMfg = "(通用网卡)" -*PNP80D6.DeviceDesc = "NE2000 兼容" +GenericMfg = "（通用网卡）" +*PNP80D6.DeviceDesc = "与 NE2000 兼容的以太网适配器" + +[Strings.0c04] +GenericMfg = "（標準網絡卡）" +*PNP80D6.DeviceDesc = "與 NE2000 相容的乙太網絡卡" diff --git a/drivers/processor/processr/cpu.inf b/drivers/processor/processr/cpu.inf index 268ec540e8a..59d8f1eaf99 100644 --- a/drivers/processor/processr/cpu.inf +++ b/drivers/processor/processr/cpu.inf @@ -453,6 +453,36 @@ Processor.ServiceDesc = "Processor driver" IntelProcessor.DeviceDesc = "Intel procesorius" Standard = "Standartinis procesorius" +[Strings.0404] +Processor.DeviceDesc = "處理器" +Processor.ServiceDesc = "處理器驅動程式" +CyrixProcessor.DeviceDesc = "Cyrix 6x86 處理器" +IntelProcessor.DeviceDesc = "Intel Pentium 處理器" +IntelMMXProcessor.DeviceDesc = "Intel Pentium MMX 處理器" +IntelPROProcessor.DeviceDesc = "Intel Pentium Pro 處理器" +IntelP2Processor.DeviceDesc = "Intel Pentium II / Celeron 處理器" +IntelP3Processor.DeviceDesc = "Intel Pentium III / Celeron / Xeon 處理器" +IntelMProcessor.DeviceDesc = "Intel Pentium M / Celeron M 處理器" +IntelP4Processor.DeviceDesc = "Intel Pentium 4 / Celeron / Xeon / D 處理器" +IntelAtomProcessor.DeviceDesc = "Intel Atom 處理器" +IntelCoreProcessor.DeviceDesc = "Intel Core Solo/Duo/Ex / Celeron / Xeon / M 處理器" +IntelCoreiXProcessor.DeviceDesc = "Intel Core i* 處理器" +AMDProcessor.DeviceDesc = "AMD 處理器" +AMDK6Processor.DeviceDesc = "AMD K6 處理器" +AMDK62Processor.DeviceDesc = "AMD K6-2 處理器" +AMDK63Processor.DeviceDesc = "AMD K6-III / Geode 處理器" +AMDK7Processor.DeviceDesc = "AMD Athlon / Duron / Geode NX / Sempron 處理器" +AMDK8Processor.DeviceDesc = "AMD Athlon 64 / Turion 64 / Opteron / Sempron 處理器" +AMDPHENProcessor.DeviceDesc = "AMD Athlon 64 X / Turion 64 X / Phenom 處理器" +AMDQProcessor.DeviceDesc = "AMD Athlon 64 Q* / Turion 64 *M / Sempron S* 處理器" +TransmetaProcessor.DeviceDesc = "Transmeta Crusoe 處理器" +Standard = "標準處理器" +ViaC7Processor.DeviceDesc = "VIA C7 處理器" +ViaNEHProcessor.DeviceDesc = "VIA Nehemiah 處理器" +ViaESTProcessor.DeviceDesc = "VIA Esther 處理器" +ViaNANOProcessor.DeviceDesc = "VIA Nano 處理器" +ViaProcessor.DeviceDesc = "VIA 處理器" + [Strings.0804] Processor.DeviceDesc = "处理器" Processor.ServiceDesc = "处理器驱动程序" @@ -482,3 +512,34 @@ ViaNEHProcessor.DeviceDesc = "VIA Nehemiah 处理器" ViaESTProcessor.DeviceDesc = "VIA Esther 处理器" ViaNANOProcessor.DeviceDesc = "VIA Nano 处理器" ViaProcessor.DeviceDesc = "VIA 处理器" + +[Strings.0c04] +Processor.DeviceDesc = "處理器" +Processor.ServiceDesc = "處理器驅動程式" +CyrixProcessor.DeviceDesc = "Cyrix 6x86 處理器" +IntelProcessor.DeviceDesc = "Intel Pentium 處理器" +IntelMMXProcessor.DeviceDesc = "Intel Pentium MMX 處理器" +IntelPROProcessor.DeviceDesc = "Intel Pentium Pro 處理器" +IntelP2Processor.DeviceDesc = "Intel Pentium II / Celeron 處理器" +IntelP3Processor.DeviceDesc = "Intel Pentium III / Celeron / Xeon 處理器" +IntelMProcessor.DeviceDesc = "Intel Pentium M / Celeron M 處理器" +IntelP4Processor.DeviceDesc = "Intel Pentium 4 / Celeron / Xeon / D 處理器" +IntelAtomProcessor.DeviceDesc = "Intel Atom 處理器" +IntelCoreProcessor.DeviceDesc = "Intel Core Solo/Duo/Ex / Celeron / Xeon / M 處理器" +IntelCoreiXProcessor.DeviceDesc = "Intel Core i* 處理器" +AMDProcessor.DeviceDesc = "AMD 處理器" +AMDK6Processor.DeviceDesc = "AMD K6 處理器" +AMDK62Processor.DeviceDesc = "AMD K6-2 處理器" +AMDK63Processor.DeviceDesc = "AMD K6-III / Geode 處理器" +AMDK7Processor.DeviceDesc = "AMD Athlon / Duron / Geode NX / Sempron 處理器" +AMDK8Processor.DeviceDesc = "AMD Athlon 64 / Turion 64 / Opteron / Sempron 處理器" +AMDPHENProcessor.DeviceDesc = "AMD Athlon 64 X / Turion 64 X / Phenom 處理器" +AMDQProcessor.DeviceDesc = "AMD Athlon 64 Q* / Turion 64 *M / Sempron S* 處理器" +TransmetaProcessor.DeviceDesc = "Transmeta Crusoe 處理器" +Standard = "標準處理器" +ViaC7Processor.DeviceDesc = "VIA C7 處理器" +ViaNEHProcessor.DeviceDesc = "VIA Nehemiah 處理器" +ViaESTProcessor.DeviceDesc = "VIA Esther 處理器" +ViaNANOProcessor.DeviceDesc = "VIA Nano 處理器" +ViaProcessor.DeviceDesc = "VIA 處理器" + diff --git a/drivers/storage/class/cdrom/cdrom.inf b/drivers/storage/class/cdrom/cdrom.inf index 751d2577b74..5ba43970c78 100644 --- a/drivers/storage/class/cdrom/cdrom.inf +++ b/drivers/storage/class/cdrom/cdrom.inf @@ -189,6 +189,46 @@ ISO_Generic_FriendlyName = "Wirtualna stacja dysków DVD-ROM firmy Microsoft" cdrom_ServiceDesc = "Sterownik stacji dysków CD-ROM" +;Chinese(Taiwan) +[Strings.0404] +MSFT = "Microsoft" +CDROMClassName = "DVD/CD-ROM 光碟機" + +;; Manufacturer specific strings +MITSUMI = "Mitsumi" +GenManufacturer = "（標準 CD-ROM 光碟機）" + +;; Descriptions for enumerated brands and models +Mitsumi_cdrom_devdesc = "Mitsumi CD-ROM 光碟機" +gencdrom_devdesc = "CD-ROM 光碟機" + +;; Friendly names +Mitsumi_Generic_FriendlyName = "Mitsumi CD-ROM 光碟機" +ISO_Generic_FriendlyName = "Microsoft 虛擬 DVD-ROM" + +;; Service descriptions +cdrom_ServiceDesc = "CD-ROM 驅動程式" + +;Chinese(PRC) +[Strings.0804] +MSFT = "Microsoft" +CDROMClassName = "DVD/CD-ROM 驱动器" + +;; Manufacturer specific strings +MITSUMI = "Mitsumi" +GenManufacturer = "（标准 CD-ROM 驱动器）" + +;; Descriptions for enumerated brands and models +Mitsumi_cdrom_devdesc = "Mitsumi CD-ROM 驱动器" +gencdrom_devdesc = "CD-ROM 驱动器" + +;; Friendly names +Mitsumi_Generic_FriendlyName = "Mitsumi CD-ROM 驱动器" +ISO_Generic_FriendlyName = "Microsoft 虚拟 DVD-ROM" + +;; Service descriptions +cdrom_ServiceDesc = "CD-ROM 驱动程序" + [Strings.0419] CDROMClassName = "DVD/CD-ROM дисководы" @@ -201,3 +241,23 @@ Mitsumi_Generic_FriendlyName = "Mitsumi CD-ROM дисковод" ISO_Generic_FriendlyName = "Microsoft виртуальный DVD-ROM дисковод" cdrom_ServiceDesc = "CD-ROM дисковод" + +;Chinese(Hong Kong) +[Strings.0c04] +MSFT = "Microsoft" +CDROMClassName = "DVD/CD-ROM 光碟機" + +;; Manufacturer specific strings +MITSUMI = "Mitsumi" +GenManufacturer = "（標準 CD-ROM 光碟機）" + +;; Descriptions for enumerated brands and models +Mitsumi_cdrom_devdesc = "Mitsumi CD-ROM 光碟機" +gencdrom_devdesc = "CD-ROM 光碟機" + +;; Friendly names +Mitsumi_Generic_FriendlyName = "Mitsumi CD-ROM 光碟機" +ISO_Generic_FriendlyName = "Microsoft 虛擬 DVD-ROM" + +;; Service descriptions +cdrom_ServiceDesc = "CD-ROM 驅動程式" diff --git a/drivers/storage/class/disk/disk.inf b/drivers/storage/class/disk/disk.inf index 006aafb3a8c..5c333729072 100644 --- a/drivers/storage/class/disk/disk.inf +++ b/drivers/storage/class/disk/disk.inf @@ -213,6 +213,40 @@ mylex_array.DeviceDesc = "Mylex RAID дисковое устройство" VHD_Generic_FriendlyName = "Microsoft виртуальный диск" +;Chinese(Taiwan) +[Strings.0404] +MSFT="Microsoft" +DiskClassName="磁碟機" +GenManufacturer="（標準磁碟機）" +Compaq="Compaq" +Mylex="Mylex" + +disk_devdesc="磁碟機" +opticaldisk_devdesc="光碟機" + +disk_ServiceDesc="磁碟驅動程式" +compaq_array.DeviceDesc = "Compaq SCSI 磁碟機陣列" +mylex_array.DeviceDesc = "Mylex RAID 磁碟機裝置" + +VHD_Generic_FriendlyName = "Microsoft 虛擬磁碟" + +;Chinese(PRC) +[Strings.0804] +MSFT="Microsoft" +DiskClassName="磁盘驱动器" +GenManufacturer="（标准磁盘驱动器）" +Compaq="Compaq" +Mylex="Mylex" + +disk_devdesc="磁盘驱动器" +opticaldisk_devdesc="光盘驱动器" + +disk_ServiceDesc="磁盘驱动程序" +compaq_array.DeviceDesc = "Compaq SCSI 磁盘驱动器阵列" +mylex_array.DeviceDesc = "Mylex RAID 磁盘设备" + +VHD_Generic_FriendlyName = "Microsoft 虚拟磁盘" + [Strings.0a] DiskClassName="Unidades de discos" GenManufacturer="(Unidades de disco estándar)" @@ -226,3 +260,19 @@ mylex_array.DeviceDesc = "Dispositivo de Disco Mylex RAID" VHD_Generic_FriendlyName = "Disco Virtual de Microsoft" +;Chinese(Hong Kong) +[Strings.0c04] +MSFT="Microsoft" +DiskClassName="磁碟機" +GenManufacturer="（標準磁碟機）" +Compaq="Compaq" +Mylex="Mylex" + +disk_devdesc="磁碟機" +opticaldisk_devdesc="光碟機" + +disk_ServiceDesc="磁碟驅動程式" +compaq_array.DeviceDesc = "Compaq SCSI 磁碟機陣列" +mylex_array.DeviceDesc = "Mylex RAID 磁碟機裝置" + +VHD_Generic_FriendlyName = "Microsoft 虛擬磁碟" diff --git a/drivers/storage/port/storahci/storahci.inf b/drivers/storage/port/storahci/storahci.inf index df68ba5932d..80a739806d6 100644 --- a/drivers/storage/port/storahci/storahci.inf +++ b/drivers/storage/port/storahci/storahci.inf @@ -69,6 +69,11 @@ ROS = "ReactOS" DeviceDesc = "AHCI SATA Driver" SATA_AHCI.DeviceDesc = "Standard SATA AHCI Controller" +[Strings.0404] +ROS = "ReactOS" +DeviceDesc = "AHCI SATA 驅動程式" +SATA_AHCI.DeviceDesc = "標準 SATA AHCI 控制器" + [Strings.0418] ROS = "ReactOS" DeviceDesc = "Modúl-pilot SATA AHCI" @@ -79,6 +84,16 @@ ROS = "ReactOS" DeviceDesc = "AHCI SATA Sürücüsü" SATA_AHCI.DeviceDesc = "Ölçünlü SATA AHCI Denetleyicisi" +[Strings.0804] +ROS = "ReactOS" +DeviceDesc = "AHCI SATA 驱动程序" +SATA_AHCI.DeviceDesc = "标准 SATA AHCI 控制器" + +[Strings.0c04] +ROS = "ReactOS" +DeviceDesc = "AHCI SATA 驅動程式" +SATA_AHCI.DeviceDesc = "標準 SATA AHCI 控制器" + SPSVCINST_ASSOCSERVICE = 0x00000002 SERVICE_KERNEL_DRIVER = 1 SERVICE_BOOT_START = 0 diff --git a/drivers/usb/usbstor/usbstor.inf b/drivers/usb/usbstor/usbstor.inf index d6bc94ac7b6..8d6df54bebd 100644 --- a/drivers/usb/usbstor/usbstor.inf +++ b/drivers/usb/usbstor/usbstor.inf @@ -48,6 +48,10 @@ ReactOS = "ReactOS Team" GenericMfg = "(Generic USB devices)" GenericBulkOnlyTransport.DeviceDesc = "USB Storage device" +[Strings.0404] +GenericMfg = "（標準 USB 裝置）" +GenericBulkOnlyTransport.DeviceDesc = "USB 儲存裝置" + [Strings.0405] GenericMfg = "(Generická USB zařízení)" GenericBulkOnlyTransport.DeviceDesc = "USB úložné zařízení" @@ -109,5 +113,9 @@ GenericMfg = "(Standartiniai USB įrenginiai)" GenericBulkOnlyTransport.DeviceDesc = "USB atminties įrenginys" [Strings.0804] -GenericMfg = "(通用 USB 设备)" +GenericMfg = "（通用 USB 设备）" GenericBulkOnlyTransport.DeviceDesc = "USB 存储设备" + +[Strings.0c04] +GenericMfg = "（標準 USB 裝置）" +GenericBulkOnlyTransport.DeviceDesc = "USB 儲存裝置" diff --git a/media/inf/display.inf b/media/inf/display.inf index 7945060869d..4b076b834f5 100644 --- a/media/inf/display.inf +++ b/media/inf/display.inf @@ -65,9 +65,9 @@ StdMfg = "(Standard display adapters)" VGA.DeviceDesc = "VGA-compatible graphics card" [Strings.0404] -DisplayClassName = "顯示配接器" +DisplayClassName = "顯示介面卡" -StdMfg = "(標準顯示配接器)" +StdMfg = "（標準顯示介面卡）" VGA.DeviceDesc = "VGA 相容顯示卡" [Strings.0405] @@ -159,7 +159,7 @@ StdMfg = "(Standartinis vaizdo adapteris)" VGA.DeviceDesc = "Su VGA suderinama vaizdo plokštė" [Strings.0804] -StdMfg = "(标准显示适配器)" +StdMfg = "（标准显示适配器）" VGA.DeviceDesc = "VGA 兼容显示卡" [Strings.0816] @@ -170,7 +170,7 @@ StdMfg = "(Adaptador de vídeo padrão)" VGA.DeviceDesc = "Adaptador de vídeo compatível com VGA" [Strings.0C04] -DisplayClassName = "顯示配接器" +DisplayClassName = "顯示介面卡" -StdMfg = "(標準顯示配接器)" +StdMfg = "（標準顯示介面卡）" VGA.DeviceDesc = "VGA 相容顯示卡" diff --git a/media/inf/flpydisk.inf b/media/inf/flpydisk.inf index 7b4d3802626..0ba41a94344 100644 --- a/media/inf/flpydisk.inf +++ b/media/inf/flpydisk.inf @@ -66,7 +66,7 @@ Floppy.DeviceDesc = "Generic floppy disk drive" [Strings.0404] FloppyClassName = "軟碟機" -GenericMfg = "(標準軟碟機)" +GenericMfg = "（標準軟碟機）" Floppy.DeviceDesc = "標準軟碟機" [Strings.0405] @@ -111,7 +111,7 @@ GenericMfg = "(Genel Disket Sürücüleri)" Floppy.DeviceDesc = "Genel Disket Sürücüsü" [Strings.0804] -GenericMfg = "(通用软盘驱动器)" +GenericMfg = "（通用软盘驱动器）" Floppy.DeviceDesc = "通用软盘驱动器" [Strings.0816] @@ -123,5 +123,5 @@ Floppy.DeviceDesc = "Controlador disquete Genérico" [Strings.0C04] FloppyClassName = "軟碟機" -GenericMfg = "(標準軟碟機)" +GenericMfg = "（標準軟碟機）" Floppy.DeviceDesc = "標準軟碟機" diff --git a/media/inf/input.inf b/media/inf/input.inf index 664d6059993..9eecb543b64 100644 --- a/media/inf/input.inf +++ b/media/inf/input.inf @@ -93,11 +93,11 @@ USB\VID_045E&PID_0040.DeviceDesc="Microsoft Wheel Mouse Optical (USB)" USB\VID_045E&PID_0047.DeviceDesc="Microsoft IntelliMouse Explorer 3.0 (USB)" [Strings.0404] -HID.ClassName = "人體學介面裝置" -HID.DeviceDesc = "USB 人體學介面裝置" +HID.ClassName = "人性化介面裝置" +HID.DeviceDesc = "USB 人性化介面裝置" HID_DEVICE = "HID 相容裝置" -StdMfg = "(標準人體學介面裝置)" +StdMfg = "（標準人性化介面裝置）" [Strings.0405] HID.ClassName = "Zařízení standardu HID" @@ -152,9 +152,9 @@ ReactOS = "Команда ReactOS" HID_DEVICE = "HID-сумісний пристрій" [Strings.0804] -HID.DeviceDesc = "USB 人类接口设备" +HID.DeviceDesc = "USB 人机接口设备" HID_DEVICE = "HID 兼容设备" -StdMfg = "(标准人类接口设备)" +StdMfg = "(标准人机接口设备)" [Strings.0816] ReactOS = "Equipa ReactOS" @@ -165,8 +165,8 @@ HID_DEVICE = "Dispositivo compatível com outros dispositivos de inte StdMfg = "(Dispositivos de interface humana padrão)" [Strings.0c04] -HID.ClassName = "人體學介面裝置" -HID.DeviceDesc = "USB 人體學介面裝置" +HID.ClassName = "人性化介面裝置" +HID.DeviceDesc = "USB 人性化介面裝置" HID_DEVICE = "HID 相容裝置" -StdMfg = "(標準人體學介面裝置)" +StdMfg = "（標準人性化介面裝置）" diff --git a/media/inf/intl.inf b/media/inf/intl.inf index 801ded14264..35c441ac10e 100644 --- a/media/inf/intl.inf +++ b/media/inf/intl.inf @@ -1842,6 +1842,362 @@ LG_INDIAN = "Indian" LG_GEORGIAN = "Georgian" LG_ARMENIAN = "Armean" +;Chinese(PRC) +[Strings.0804] +; Locales +Afrikaans = "南非文" +Albanian = "阿尔巴尼亚文" +Arabic_Saudi_Arabia = "阿拉伯文 (沙特阿拉伯)" +Arabic_Iraq = "阿拉伯文 (伊拉克)" +Arabic_Egypt = "阿拉伯文 (埃及)" +Arabic_Libya = "阿拉伯文 (利比亚)" +Arabic_Algeria = "阿拉伯文 (阿尔及利亚)" +Arabic_Morocco = "阿拉伯文 (摩洛哥)" +Arabic_Tunisia = "阿拉伯文 (突尼西亚)" +Arabic_Oman = "阿拉伯文 (阿曼)" +Arabic_Yemen = "阿拉伯文 (也门)" +Arabic_Syria = "阿拉伯文 (叙利亚)" +Arabic_Jordan = "阿拉伯文 (约旦)" +Arabic_Lebanon = "阿拉伯文 (黎巴嫩)" +Arabic_Kuwait = "阿拉伯文 (科威特)" +Arabic_UAE = "阿拉伯文 (阿拉伯联合酋长国)" +Arabic_Bahrain = "阿拉伯文 (巴林)" +Arabic_Qatar = "阿拉伯文 (卡塔尔)" +Armenian = "亚美尼亚文" +Azeri_Latin = "阿塞拜疆文 (拉丁)" +Azeri_Cyrillic = "阿塞拜疆文 (西里尔)" +Basque = "巴斯克文" +Belarusian = "白俄罗斯文" +Bengali_Bangladesh = "孟加拉国文 (孟加拉国)" +Bengali_India = "孟加拉国文 (印度)" +Bosnian_Latin = "波斯尼亚文 (拉丁, 波斯尼亚和黑塞哥维那)" +Bosnian_Cyrillic = "波斯尼亚文 (西里尔, 波斯尼亚和黑塞哥维那)" +Bulgarian = "保加利亚文" +Catalan = "加泰罗尼亚文" +Chinese_Taiwan = "中文 (台湾)" +Chinese_PRC = "中文 (中华人民共和国)" +Chinese_Hong_Kong = "中文 (香港特别行政区)" +Chinese_Singapore = "中文 (新加坡)" +Chinese_Macau = "中文 (澳门特别行政区)" +Croatian = "克罗地亚文" +Croatian_Bosnia = "克罗地亚文 (波斯尼亚和黑塞哥维那)" +Czech = "捷克文" +Danish = "丹麦文" +Divehi_Maldives = "迪维希文 (马尔代夫)" +Dutch_Netherlands = "荷兰文 (荷兰)" +Dutch_Belgium = "荷兰文 (比利时)" +English_United_States = "英文 (美国)" +English_United_Kingdom = "英文 (英国)" +English_Australia = "英文 (澳大利亚)" +English_Canada = "英文 (加拿大)" +English_New_Zealand = "英文 (新西兰)" +English_Ireland = "英文 (爱尔兰)" +English_South_Africa = "英文 (南非)" +English_Jamaica = "英文 (牙买加)" +English_Caribbean = "英文 (加勒比地区)" +English_Belize = "英文 (伯利兹)" +English_Trinidad = "英文 (特立尼达)" +English_Zimbabwe = "英文 (津巴布韦)" +English_Philippines = "英文 (菲律宾)" +Esperanto = "世界文" +Estonian = "爱沙尼亚文" +Faeroese = "法罗文" +Farsi = "波斯文" +Filipino = "菲律宾文" +Finnish = "芬兰文" +French_France = "法文 (法国)" +French_Belgium = "法文 (比利时)" +French_Canada = "法文 (加拿大)" +French_Switzerland = "法文 (瑞士)" +French_Luxembourg = "法文 (卢森堡)" +French_Monaco = "法文 (摩洛哥)" +Frisian = "弗里斯兰文" +Galician_Spain = "加里西亚文 (西班牙)" +Georgian = "乔治亚文" +German_Germany = "德文 (德国)" +German_Switzerland = "德文 (瑞士)" +German_Austria = "德文 (奥地利)" +German_Luxembourg = "德文 (卢森堡)" +German_Liechtenstein = "德文 (列支敦士登)" +Greek = "希腊文" +Gujarati_India = "古吉拉特文 (印度)" +Hebrew = "希伯来文" +Hindi = "印地文" +Hungarian = "匈牙利文" +Icelandic = "冰岛文" +Indonesian = "印度尼西亚文" +Inuktitut_Latin = "因纽特文 (拉丁)" +Irish = "爱尔兰文" +Italian_Italy = "意大利文 (意大利)" +Italian_Switzerland = "意大利文 (瑞士)" +Japanese = "日文" +Kannada_India = "卡纳达文 (印度)" +Kazakh = "哈萨克斯坦文" +Konkani = "孔卡尼文" +Korean = "韩文" +Korean_Johab = "韩文 (Johab)" +Kyrgyz_Kyrgyzstan = "吉尔吉斯文 (吉尔吉斯斯坦)" +Latvian = "拉脱维亚文" +Lithuanian = "立陶宛文" +Luxembourgish = "卢森堡文" +Macedonian = "马其顿文 (北马其顿)" +Malay_Malaysia = "马来文 (马来西亚)" +Malay_Brunei = "马来文 (文莱)" +Malayalam = "马拉雅拉姆文 (印度)" +Maltese = "马耳他文" +Maori = "毛利文" +Mapudungun = "马普切文" +Marathi = "马拉提文" +Mohawk = "莫霍克文" +Mongolian = "蒙古文 (蒙古)" +Nepali_Nepal = "尼泊尔文 (尼泊尔)" +Northern_Sotho = "北索托文" +Norwegian_Bokmal = "挪威文 (书面挪威文)" +Norwegian_Nynorsk = "挪威文 (新挪威文)" +Pashto = "普什图文" +Polish = "波兰文" +Portuguese_Brazil = "葡萄牙文 (巴西)" +Portuguese_Portugal = "葡萄牙文 (葡萄牙)" +Punjabi = "旁遮普文 (印度)" +Quechua_Bolivia = "克丘亚文 (玻利维亚)" +Quechua_Ecuador = "克丘亚文 (厄瓜多尔)" +Quechua_Peru = "克丘亚文 (秘鲁)" +Romanian = "罗马尼亚文" +Romansh = "罗曼什文" +Russian = "俄文" +Sami_Northern_Norway = "北萨米文 (挪威)" +Sami_Northern_Sweden = "北萨米文 (瑞典)" +Sami_Northern_Finland = "北萨米文 (芬兰)" +Sami_Lule_Norway = "律勒欧萨米文 (挪威)" +Sami_Lule_Sweden = "律勒欧萨米文 (瑞典)" +Sami_Southern_Norway = "南萨米文 (挪威)" +Sami_Southern_Sweden = "南萨米文 (瑞典)" +Sami_Skolt_Finland = "斯科特萨米文 (芬兰)" +Sami_Inari_Finland = "伊纳里萨米文 (芬兰)" +Sanskrit = "梵文" +Serbian_Latin = "塞尔维亚文 (拉丁)" +Serbian_Latin_Bosnia = "塞尔维亚文 (拉丁, 波斯尼亚和黑塞哥维那)" +Serbian_Cyrillic = "塞尔维亚文 (西里尔)" +Serbian_Cyrillic_Bosnia = "塞尔维亚文 (西里尔, 波斯尼亚和黑塞哥维那)" +Slovak = "斯洛伐克文" +Slovenian = "斯洛文尼亚文" +Spanish_Traditional_Sort = "西班牙文 (传统分类)" +Spanish_Mexico = "西班牙文 (墨西哥)" +Spanish_International_Sort = "西班牙文 (国际分类)" +Spanish_Guatemala = "西班牙文 (危地马拉)" +Spanish_Costa_Rica = "西班牙文 (哥斯达黎加)" +Spanish_Panama = "西班牙文 (巴拿马)" +Spanish_Dominican_Republic = "西班牙文 (多米尼加共和国)" +Spanish_Venezuela = "西班牙文 (委内瑞拉)" +Spanish_Colombia = "西班牙文 (哥伦比亚)" +Spanish_Peru = "西班牙文 (秘鲁)" +Spanish_Argentina = "西班牙文 (阿根廷)" +Spanish_Ecuador = "西班牙文 (厄瓜多尔)" +Spanish_Chile = "西班牙文 (智利)" +Spanish_Uruguay = "西班牙文 (乌拉圭)" +Spanish_Paraguay = "西班牙文 (巴拉圭)" +Spanish_Bolivia = "西班牙文 (玻利维亚)" +Spanish_El_Salvador = "西班牙文 (萨尔瓦多)" +Spanish_Honduras = "西班牙文 (洪都拉斯)" +Spanish_Nicaragua = "西班牙文 (尼加拉瓜)" +Spanish_Puerto_Rico = "西班牙文 (波多黎各)" +Swahili = "斯瓦希里文" +Swedish = "瑞典文" +Swedish_Finland = "瑞典文 (芬兰)" +Syriac = "叙利亚文 (叙利亚)" +Tamil = "坦米尔文" +Tatar = "鞑靼文" +Telugu = "泰卢固文 (印度)" +Thai = "泰文" +Tswana = "北索托语" +Turkish = "土耳其文" +Ukrainian = "乌克兰文" +Urdu = "乌尔都文" +Uzbek_Latin = "乌孜别克文 (拉丁)" +Uzbek_Cyrillic = "乌孜别克文 (西里尔)" +Vietnamese = "越南文" +Welsh = "韦尔斯文" +Xhosa = "科萨文" +Zulu = "祖鲁文" + + +; Code pages +CP1250 = "1250 (ANSI - 中欧)" +CP1251 = "1251 (ANSI - 西里尔文)" +CP1252 = "1252 (ANSI - 拉丁文 I)" +CP1253 = "1253 (ANSI - 希腊文)" +CP1254 = "1254 (ANSI - 土耳其文)" +CP1255 = "1255 (ANSI - 希伯来文)" +CP1256 = "1256 (ANSI - 阿拉伯文)" +CP1257 = "1257 (ANSI - 波罗的海)" +CP1258 = "1258 (ANSI/OEM - 越南)" +CP874 = "874 (ANSI/OEM - 泰文)" +CP932 = "932 (ANSI/OEM - 日文 Shift-JIS)" +CP936 = "936 (ANSI/OEM - 简体中文 GBK)" +CP949 = "949 (ANSI/OEM - 韩文)" +CP950 = "950 (ANSI/OEM - 繁体中文 Big5)" + +CP437 = "437 (OEM - 美国)" +CP737 = "737 (OEM - 希腊文 437G)" +CP775 = "775 (OEM - 波罗的海)" +CP850 = "850 (OEM - 多语言拉丁文 I)" +CP852 = "852 (OEM - 拉丁文 II)" +CP855 = "855 (OEM - 西里尔文)" +CP857 = "857 (OEM - 土耳其文)" +CP858 = "858 (OEM - 多语言拉丁文 I + 欧洲语系)" +CP860 = "860 (OEM - 葡萄牙文)" +CP861 = "861 (OEM - 冰岛文)" +CP862 = "862 (OEM - 希伯来文)" +CP863 = "863 (OEM - 法文 (加拿大))" +CP864 = "864 (OEM - 阿拉伯文)" +CP865 = "865 (OEM - 北欧)" +CP866 = "866 (OEM - 俄罗斯文)" +CP869 = "869 (OEM - 现代希腊文)" + +CP10000 = "10000 (MAC - 罗马文)" +CP10001 = "10001 (MAC - 日文)" +CP10002 = "10002 (MAC - 繁体中文 Big5)" +CP10003 = "10003 (MAC - 韩文)" +CP10004 = "10004 (MAC - 阿拉伯文)" +CP10005 = "10005 (MAC - 希伯来文)" +CP10006 = "10006 (MAC - 希腊文 I)" +CP10007 = "10007 (MAC - 西里尔文)" +CP10008 = "10008 (MAC - 简体中文 GB 2312)" +CP10010 = "10010 (MAC - 罗马尼亚)" +CP10017 = "10017 (MAC - 乌克兰)" +CP10021 = "10021 (MAC - 泰文)" +CP10029 = "10029 (MAC - 拉丁文 II)" +CP10079 = "10079 (MAC - 冰岛文)" +CP10081 = "10081 (MAC - 土耳其文)" +CP10082 = "10082 (MAC - 克罗地亚)" + +CP65000 = "65000 (UTF-7)" +CP65001 = "65001 (UTF-8)" + +CP37 = "37 (IBM EBCDIC - 美国/加拿大)" +CP1026 = "1026 (IBM EBCDIC - 土耳其文 (拉丁文-5))" +CP1047 = "1047 (IBM EBCDIC - 拉丁文-1/开放系统)" +CP1140 = "1140 (IBM EBCDIC - 美国/加拿大 (37 + 欧洲语系))" +CP1141 = "1141 (IBM EBCDIC - 德国 (20273 + 欧洲语系))" +CP1142 = "1142 (IBM EBCDIC - 丹麦/挪威 (20277 + 欧洲语系))" +CP1143 = "1143 (IBM EBCDIC - 芬兰/瑞典 (20278 + 欧洲语系))" +CP1144 = "1144 (IBM EBCDIC - 意大利 (20280 + 欧洲语系))" +CP1145 = "1145 (IBM EBCDIC - 拉丁美洲/西班牙 (20284 + 欧洲语系))" +CP1146 = "1146 (IBM EBCDIC - 英国 (20285 + 欧洲语系))" +CP1147 = "1147 (IBM EBCDIC - 法国 (20297 + 欧洲语系))" +CP1148 = "1148 (IBM EBCDIC - 国际 (500 + 欧洲语系))" +CP1149 = "1149 (IBM EBCDIC - 冰岛文 (20871 + 欧洲语系))" +CP20273 = "20273 (IBM EBCDIC - 德国)" +CP20277 = "20277 (IBM EBCDIC - 丹麦/挪威)" +CP20278 = "20278 (IBM EBCDIC - 芬兰/瑞典)" +CP20280 = "20280 (IBM EBCDIC - 意大利)" +CP20284 = "20284 (IBM EBCDIC - 拉丁美洲/西班牙)" +CP20285 = "20285 (IBM EBCDIC - 英国)" +CP20290 = "20290 (IBM EBCDIC - 日文 (片假名扩展))" +CP20297 = "20297 (IBM EBCDIC - 法国)" +CP20420 = "20420 (IBM EBCDIC - 阿拉伯文)" +CP20423 = "20423 (IBM EBCDIC - 希腊文)" +CP20424 = "20424 (IBM EBCDIC - 希伯来文)" +CP20833 = "20833 (IBM EBCDIC - 韩文 (扩展))" +CP20838 = "20838 (IBM EBCDIC - 泰文)" +CP20871 = "20871 (IBM EBCDIC - 冰岛文)" +CP20880 = "20880 (IBM EBCDIC - 西里尔文 (俄罗斯文))" +CP20905 = "20905 (IBM EBCDIC - 土耳其文)" +CP20924 = "20924 (IBM EBCDIC - 拉丁文-1/开放系统 (1047 + 欧洲语系))" +CP21025 = "21025 (IBM EBCDIC - 西里尔文 (塞尔维亚语、保加利亚语))" +CP500 = "500 (IBM EBCDIC - 国际)" +CP870 = "870 (IBM EBCDIC - 多语言/ROECE (拉丁文-2))" +CP875 = "875 (IBM EBCDIC - 现代希腊文)" + +CP20269 = "20269 (ISO 6937 非间距口音)" +CP28591 = "28591 (ISO 8859-1 拉丁文 I)" +CP28592 = "28592 (ISO 8859-2 中欧)" +CP28593 = "28593 (ISO 8859-3 拉丁文 3)" +CP28594 = "28594 (ISO 8859-4 波罗的海)" +CP28595 = "28595 (ISO 8859-5 西里尔文)" +CP28596 = "28596 (ISO 8859-6 阿拉伯文)" +CP28597 = "28597 (ISO 8859-7 希腊文)" +CP28598 = "28598 (ISO 8859-8 希伯来文: 视觉排序)" +CP28599 = "28599 (ISO 8859-9 拉丁文 5)" +CP28605 = "28605 (ISO 8859-15 拉丁文 9)" +CP38598 = "38598 (ISO 8859-8 希伯来文: 逻辑排序)" + +CP20105 = "20105 (IA5 国际字母表 5 号)" +CP20106 = "20106 (IA5 德文)" +CP20107 = "20107 (IA5 瑞典文)" +CP20108 = "20108 (IA5 挪威文)" + +CP1361 = "1361 (韩文 - Johab)" +CP20000 = "20000 (CNS - 台湾)" +CP20001 = "20001 (TCA - 台湾)" +CP20002 = "20002 (Eten - 台湾)" +CP20003 = "20003 (IBM5550 - 台湾)" +CP20004 = "20004 (TeleText - 台湾)" +CP20005 = "20005 (Wang - 台湾)" +CP20127 = "20127 (美国 - ASCII)" +CP20261 = "20261 (T.61)" +CP20866 = "20866 (俄罗斯文 - KOI8)" +CP21027 = "21027 (Ext Alpha 小写)" +CP21866 = "21866 (乌克兰文 - KOI8-U)" +CP708 = "708 (阿拉伯文 - ASMO)" +CP720 = "720 (阿拉伯文 - 透明 ASMO)" +CP20932 = "20932 (JIS X 0208-1990 & 0212-1990)" +CP20936 = "20936 (简体中文 GB2312)" +CP20949 = "20949 (韩文 Wansung)" + +CP57002 = "57002 (ISCII 梵文)" +CP57003 = "57003 (ISCII 孟加拉国文)" +CP57004 = "57004 (ISCII 泰米尔文)" +CP57005 = "57005 (ISCII 泰卢固文)" +CP57006 = "57006 (ISCII 阿萨姆文)" +CP57007 = "57007 (ISCII 奥里亚文)" +CP57008 = "57008 (ISCII 卡纳拉文)" +CP57009 = "57009 (ISCII 马拉雅拉姆文)" +CP57010 = "57010 (ISCII 古吉拉特文)" +CP57011 = "57011 (ISCII 锡克教文)" + +CP50930 = "50930 (IBM EBCDIC - 日文 (含片假名扩展))" +CP50931 = "50931 (IBM EBCDIC - 美国/加拿大和日文)" +CP50933 = "50933 (IBM EBCDIC - 韩文 (含扩展))" +CP50935 = "50935 (IBM EBCDIC - 简体中文)" +CP50937 = "50937 (IBM EBCDIC - 美国/加拿大和繁体中文)" +CP50939 = "50939 (IBM EBCDIC - 日文 (含拉丁文扩展))" + +CP50220 = "50220 (ISO-2022 日文 (没有半角片假名))" +CP50221 = "50221 (ISO-2022 日文 (有半角片假名))" +CP50222 = "50222 (ISO-2022 日文 JIS X 0201-1989)" +CP50225 = "50225 (ISO-2022 韩文)" +CP50227 = "50227 (ISO-2022 简体中文)" +CP50229 = "50229 (ISO-2022 繁体中文)" + +CP51932 = "51932 (EUC - 日文)" +CP51936 = "51936 (EUC - 简体中文)" +CP51949 = "51949 (EUC - 韩文)" +CP51950 = "51950 (EUC - 繁体中文)" + +CP52936 = "52936 (HZ-GB2312 简体中文)" +CP54936 = "54936 (GB18030 简体中文)" + + +; Language groups +LG_WESTERN_EUROPE = "西欧语系" +LG_CENTRAL_EUROPE = "中欧语系" +LG_BALTIC = "波罗的海文" +LG_GREEK = "希腊文" +LG_CYRILLIC = "西里尔文" +LG_TURKISH = "突厥语系" +LG_JAPANESE = "日文" +LG_KOREAN = "韩文" +LG_TRADITIONAL_CHINESE = "繁体中文" +LG_SIMPLIFIED_CHINESE = "简体中文" +LG_THAI = "泰文" +LG_HEBREW = "希伯来文" +LG_ARABIC = "阿拉伯文" +LG_VIETNAMESE = "越南文" +LG_INDIAN = "印度语系" +LG_GEORGIAN = "乔治亚文" +LG_ARMENIAN = "亚美尼亚文" + ; Chinese Hong Kong [Strings.0c04] ; Locales diff --git a/media/inf/volume.inf b/media/inf/volume.inf index b8fa4ec560d..b243c324264 100644 --- a/media/inf/volume.inf +++ b/media/inf/volume.inf @@ -45,9 +45,9 @@ GenericMfg = "(Generic storage volumes)" STORAGE\Volume.DeviceDesc = "Storage volume" [Strings.0404] -VolumeClassName = "儲存磁碟區" -GenericMfg = "(標準儲存磁碟區)" -STORAGE\Volume.DeviceDesc = "儲存磁碟區" +VolumeClassName = "存放磁碟區" +GenericMfg = "（標準存放磁碟區）" +STORAGE\Volume.DeviceDesc = "存放磁碟區" [Strings.0419] ReactOS = "Команда ReactOS" @@ -60,3 +60,14 @@ ReactOS = "Equipa ReactOS" VolumeClassName = "Volumes de armazenamento" GenericMfg = "(Volumes de armazenamento genérico)" STORAGE\Volume.DeviceDesc = "Volume de armazenamento" + +[Strings.0804] +ReactOS = "ReactOS Team" +VolumeClassName = "存储卷" +GenericMfg = "（通用存储卷）" +STORAGE\Volume.DeviceDesc = "存储卷" + +[Strings.0c04] +VolumeClassName = "存放磁碟區" +GenericMfg = "（標準存放磁碟區）" +STORAGE\Volume.DeviceDesc = "存放磁碟區"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs