Ros-diffs April 2022

ros-diffs@reactos.org

22 participants
157 discussions

[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

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.@]

2 years, 5 months

[reactos] 01/01: [COMCTL32][COMDLG32] Fix Serbian (Latin) sublanguage identifiers

by Stanislav Motylkov

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 {

2 years, 5 months

[reactos] 01/01: [TRANSLATION] Fix Croatian (hr-HR) sublanguage identifiers

by Stanislav Motylkov

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

2 years, 5 months

[reactos] 01/01: [TRANSLATION] Update Croatian (hr-HR) translation (#4375)

by Andrej Bartulin

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

2 years, 5 months

[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

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)

2 years, 5 months

[reactos] 01/01: [BOOTSECT] ISOBOOT: Add missing trailing 0x55AA sector signature.

by Hermès Bélusca-Maïto

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

2 years, 5 months

[reactos] 01/01: [SDK:REACTOS][SVCHOST] Add/complete all missing definitions in the SVCHOST global header. (#4295)

by Hermès Bélusca-Maïto

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 */

2 years, 5 months

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 April 2022