Ros-diffs November 2022

ros-diffs@reactos.org

26 participants
175 discussions

[reactos] 01/01: [INPUT] Update Polish (pl-PL) translation (#4858)

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a400b29c04a0ed53bb5a… commit 2a400b29c04a0ed53bb5a17ea7043e394a8b563c Author: Piotr Hetnarowicz <piotrhwz(a)gmail.com> AuthorDate: Thu Nov 10 00:08:40 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 10 02:08:40 2022 +0300 [INPUT] Update Polish (pl-PL) translation (#4858) Reviewed-by: Adam Stachowicz <saibamenppl(a)gmail.com> --- dll/cpl/input/lang/pl-PL.rc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dll/cpl/input/lang/pl-PL.rc b/dll/cpl/input/lang/pl-PL.rc index 35475621d38..ef5ecb316cd 100644 --- a/dll/cpl/input/lang/pl-PL.rc +++ b/dll/cpl/input/lang/pl-PL.rc @@ -1,9 +1,10 @@ /* - * Translated by Caemyr - Olaf Siejka (Jan, March 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; - * UTF-8 conversion by Caemyr (May, 2011) + * PROJECT: ReactOS Language Control Panel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Polish resource file + * TRANSLATORS: Copyright 2008-2013 Olaf Siejka <caemyr(a)openmailbox.org> + * Copyright 2018 Adam Słaboń <asaillen456esx(a)gmail.com> + * Copyright 2022 Piotr Hetnarowicz <piotrhwz(a)gmail.com> */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -13,17 +14,17 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ustawienia" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Default input &language", -1, 5, 5, 246, 55 - LTEXT "Select one of the installed input languages to use when your computer starts.", -1, 15, 15, 230, 23 + GROUPBOX "Domyślny &język wprowadzania", -1, 5, 5, 246, 55 + LTEXT "Wybierz jeden z zainstalowanych języków wprowadzania, który ma być używany podczas uruchamiania komputera.", -1, 15, 15, 230, 23 COMBOBOX IDC_DEFAULT_LANGUAGE, 15, 40, 230, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "&Installed services", -1, 5, 65, 246, 125 + GROUPBOX "Z&ainstalowane usługi", -1, 5, 65, 246, 125 LTEXT "Wybierz usługi dla kadego używanego języka z listy. Listę można modyfikować przyciskami Dodaj i Usuń.", -1, 15, 78, 230, 25 CONTROL "", IDC_KEYLAYOUT_LIST, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 15, 105, 155, 80 PUSHBUTTON "&Dodaj...", IDC_ADD_BUTTON, 175, 105, 70, 14 PUSHBUTTON "U&suń", IDC_REMOVE_BUTTON, 175, 125, 70, 14 PUSHBUTTON "&Właściwości...", IDC_PROP_BUTTON, 175, 145, 70, 14 GROUPBOX "Preferencje", -1, 5, 195, 245, 30 - PUSHBUTTON "Language &Bar...", IDC_LANGUAGE_BAR, 15, 205, 110, 14 + PUSHBUTTON "&Pasek języka...", IDC_LANGUAGE_BAR, 15, 205, 110, 14 PUSHBUTTON "Us&tawienia klawiszy...", IDC_KEY_SET_BTN, 133, 205, 110, 14 END

2 years, 1 month

[reactos] 01/01: [DDRAW] Sync the fix for swap_interval from Wine (#4831)

by Simone Mario Lombardo

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67559215608eaf7338cbc… commit 67559215608eaf7338cbc7002ba3b74bf972a3a4 Author: Simone Mario Lombardo <simonelombardo(a)dismail.de> AuthorDate: Wed Nov 9 18:44:30 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 9 20:44:30 2022 +0300 [DDRAW] Sync the fix for swap_interval from Wine (#4831) Sync the barebone fix from Wine (wine-7.19-557-g13cc08e32d6): https://source.winehq.org/git/wine.git/?a=search&h=HEAD&st=grep&s=ddraw_sur… and https://source.winehq.org/git/wine.git/blob/13cc08e32d6c04f8f915d07cda39638… - Added "swap_interval" argument to ddraw_surface_update_frontbuffer() - Added ddraw_swap_interval_from_flags() function for dispatching the integer type of required swap interval - Updated ddraw_surface_update_frontbuffer() function for managing the swap interval between backbuffer and frontbuffer (and relative flipping) - Updated the ddraw_surface7_Flip() function for relaying the swap interval to ddraw_surface_update_frontbuffer() function. - Added 0 value (as Wine) when the swap interval is not required This fixes empty white screen issue on rendering because of lacking swap interval for the software / games that use ddraw. CORE-18547 --- dll/directx/wine/ddraw/ddraw_private.h | 2 +- dll/directx/wine/ddraw/palette.c | 2 +- dll/directx/wine/ddraw/surface.c | 59 +++++++++++++++++++++++++--------- media/doc/WINESYNC.txt | 2 +- 4 files changed, 47 insertions(+), 18 deletions(-) diff --git a/dll/directx/wine/ddraw/ddraw_private.h b/dll/directx/wine/ddraw/ddraw_private.h index cac38c57e92..433bcd34a3d 100644 --- a/dll/directx/wine/ddraw/ddraw_private.h +++ b/dll/directx/wine/ddraw/ddraw_private.h @@ -218,7 +218,7 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, - const RECT *rect, BOOL read) DECLSPEC_HIDDEN; + const RECT *rect, BOOL read, unsigned int swap_interval) DECLSPEC_HIDDEN; static inline struct ddraw_surface *impl_from_IDirect3DTexture(IDirect3DTexture *iface) { diff --git a/dll/directx/wine/ddraw/palette.c b/dll/directx/wine/ddraw/palette.c index 5148832cab6..87aec96443a 100644 --- a/dll/directx/wine/ddraw/palette.c +++ b/dll/directx/wine/ddraw/palette.c @@ -176,7 +176,7 @@ static HRESULT WINAPI ddraw_palette_SetEntries(IDirectDrawPalette *iface, hr = wined3d_palette_set_entries(palette->wined3d_palette, flags, start, count, entries); if (SUCCEEDED(hr) && palette->flags & DDPCAPS_PRIMARYSURFACE) - ddraw_surface_update_frontbuffer(palette->ddraw->primary, NULL, FALSE); + ddraw_surface_update_frontbuffer(palette->ddraw->primary, NULL, FALSE, 0); wined3d_mutex_unlock(); diff --git a/dll/directx/wine/ddraw/surface.c b/dll/directx/wine/ddraw/surface.c index 11a0e6ba8db..c26cc76baab 100644 --- a/dll/directx/wine/ddraw/surface.c +++ b/dll/directx/wine/ddraw/surface.c @@ -40,8 +40,9 @@ static inline struct ddraw_surface *impl_from_IDirectDrawGammaControl(IDirectDra * applications from drawing to the screen while we've locked the frontbuffer. * We'd like to do this in wined3d instead, but for that to work wined3d needs * to support windowless rendering first. */ -HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read) +HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read, unsigned int swap_interval) { + struct wined3d_texture *dst_texture; struct ddraw *ddraw = surface->ddraw; HDC surface_dc, screen_dc; int x, y, w, h; @@ -70,8 +71,18 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RE if (read) return DD_OK; - return wined3d_texture_blt(ddraw->wined3d_frontbuffer, 0, rect, - surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT); + if (swap_interval) + dst_texture = wined3d_swapchain_get_back_buffer(ddraw->wined3d_swapchain, 0); + else + dst_texture = ddraw->wined3d_frontbuffer; + + if (SUCCEEDED(hr = wined3d_texture_blt(dst_texture, 0, rect, + surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT))){ + hr = wined3d_swapchain_present(ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); + ddraw->flags |= DDRAW_GDI_FLIP; + } + + return hr; } if (FAILED(hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, &surface_dc))) @@ -474,7 +485,7 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; wined3d_swapchain_set_palette(surface->ddraw->wined3d_swapchain, palette_impl ? palette_impl->wined3d_palette : NULL); - ddraw_surface_update_frontbuffer(surface, NULL, FALSE); + ddraw_surface_update_frontbuffer(surface, NULL, FALSE, 0); } if (palette_impl) IDirectDrawPalette_AddRef(&palette_impl->IDirectDrawPalette_iface); @@ -990,7 +1001,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface, } if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE); + hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE, 0); if (SUCCEEDED(hr)) hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, &map_desc, rect ? &box : NULL, @@ -1179,7 +1190,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface wined3d_mutex_lock(); hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx); if (SUCCEEDED(hr) && surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, &surface->ddraw->primary_lock, FALSE); + hr = ddraw_surface_update_frontbuffer(surface, &surface->ddraw->primary_lock, FALSE, 0); wined3d_mutex_unlock(); return hr; @@ -1224,6 +1235,24 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Unlock(IDirectDrawSurface return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); } +static unsigned int ddraw_swap_interval_from_flags(DWORD flags) +{ + if (flags & DDFLIP_NOVSYNC) + return 0; + + switch (flags & (DDFLIP_INTERVAL2 | DDFLIP_INTERVAL3 | DDFLIP_INTERVAL4)) + { + case DDFLIP_INTERVAL2: + return 2; + case DDFLIP_INTERVAL3: + return 3; + case DDFLIP_INTERVAL4: + return 4; + default: + return 1; + } +} + static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDrawSurface7 *src, DWORD flags) { @@ -1347,7 +1376,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 } if (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(dst_impl, NULL, FALSE); + hr = ddraw_surface_update_frontbuffer(dst_impl, NULL, FALSE,ddraw_swap_interval_from_flags(flags)); else hr = DD_OK; @@ -1488,11 +1517,11 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (!dst_surface->clipper) { if (src_surface && src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect, TRUE); + hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect, TRUE, 0); if (SUCCEEDED(hr)) hr = ddraw_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fill_colour, fx, filter); if (SUCCEEDED(hr) && (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) - hr = ddraw_surface_update_frontbuffer(dst_surface, &dst_rect, FALSE); + hr = ddraw_surface_update_frontbuffer(dst_surface, &dst_rect, FALSE, 0); return hr; } @@ -1535,7 +1564,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - if (FAILED(hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect_clipped, TRUE))) + if (FAILED(hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect_clipped, TRUE, 0))) break; } } @@ -1546,7 +1575,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - if (FAILED(hr = ddraw_surface_update_frontbuffer(dst_surface, &clip_rect[i], FALSE))) + if (FAILED(hr = ddraw_surface_update_frontbuffer(dst_surface, &clip_rect[i], FALSE, 0))) break; } } @@ -2219,7 +2248,7 @@ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *dc) if (surface->dc) hr = DDERR_DCALREADYCREATED; else if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE); + hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE, 0); if (SUCCEEDED(hr)) hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, dc); @@ -2323,7 +2352,7 @@ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC h { surface->dc = NULL; if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE); + hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE, 0); } wined3d_mutex_unlock(); @@ -4291,12 +4320,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurfac } if (src_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(src_impl, src_rect, TRUE); + hr = ddraw_surface_update_frontbuffer(src_impl, src_rect, TRUE, 0); if (SUCCEEDED(hr)) hr = wined3d_texture_blt(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &dst_rect, src_impl->wined3d_texture, src_impl->sub_resource_idx, src_rect, flags, NULL, WINED3D_TEXF_POINT); if (SUCCEEDED(hr) && (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) - hr = ddraw_surface_update_frontbuffer(dst_impl, &dst_rect, FALSE); + hr = ddraw_surface_update_frontbuffer(dst_impl, &dst_rect, FALSE, 0); wined3d_mutex_unlock(); switch(hr) diff --git a/media/doc/WINESYNC.txt b/media/doc/WINESYNC.txt index 43def4ebffe..cb460336c0d 100644 --- a/media/doc/WINESYNC.txt +++ b/media/doc/WINESYNC.txt @@ -28,7 +28,7 @@ dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-4.18 dll/directx/wine/d3drm # Synced to WineStaging-4.18 dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-6.0-rc5 dll/directx/wine/d3dxof # Synced to WineStaging-4.18 -dll/directx/wine/ddraw # Synced to WineStaging-3.3 +dll/directx/wine/ddraw # Synced to WineStaging-3.3 (+ partial sync of ddraw_private.h, palette.c, and surface.c to wine-7.19-557-g13cc08e32d6) dll/directx/wine/devenum # Synced to WineStaging-4.18 dll/directx/wine/dinput # Synced to WineStaging-4.18 dll/directx/wine/dinput8 # Synced to WineStaging-4.18

2 years, 1 month

[reactos] 01/01: [SMSS] Fix build.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1908c895985f6b466a64… commit f1908c895985f6b466a64ed4608879377e525b25 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 9 00:05:13 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 9 00:05:13 2022 +0100 [SMSS] Fix build. --- base/system/smss/smsbapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/system/smss/smsbapi.c b/base/system/smss/smsbapi.c index 1eed513601c..60a081a548c 100644 --- a/base/system/smss/smsbapi.c +++ b/base/system/smss/smsbapi.c @@ -23,7 +23,7 @@ const PCSTR SmpSubSystemNames[] = "Windows GUI", "Windows CUI", NULL, - "OS/2 CUI" + "OS/2 CUI", NULL, "Posix CUI" }; @@ -158,7 +158,7 @@ SmpSbCreateSession(IN PVOID Reserved, if (!SubSysName) { SubSysName = SubSysTypeName; - sprintf(SubSysTypeName, "Type 0x%08x", SubSystemType); + sprintf(SubSysTypeName, "Type 0x%08lx", SubSystemType); } DPRINT1("SMSS: %s SubSystem not found (either not started or destroyed).\n", SubSysName); #endif

2 years, 1 month

[reactos] 02/02: [SMSS] Fix the displayed subsystem name in the failure path of SmpSbCreateSession().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b076800dd8518cd5be25a… commit b076800dd8518cd5be25a3b59fc63f2cd79d0bbf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 23 19:59:08 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 8 23:47:02 2022 +0100 [SMSS] Fix the displayed subsystem name in the failure path of SmpSbCreateSession(). The SubSystemNames array didn't correlate with the possible values of SubSystemType (e.g. index 4 was "Posix" whereas Posix is type 7; Posix and OS/2 entries were inverted; Windows CUI subsystem (type 3) was mapped to "Posix"), and the array dereferencing was out of bounds if the SubSystemType of the image happened to be larger than 8. I know (strings extraction from debug build of Windows' SMSS.EXE) that they use that same old'n'broken array. Perhaps a leftover from very old times (NT 3.1 betas) where the PE format was under work and the subsystem numbers didn't have their definitive values... (This has already happened with the NT PDK v1.196 from September 1991.) --- base/system/smss/smsbapi.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/base/system/smss/smsbapi.c b/base/system/smss/smsbapi.c index 0cd49e1ed19..1eed513601c 100644 --- a/base/system/smss/smsbapi.c +++ b/base/system/smss/smsbapi.c @@ -15,14 +15,19 @@ /* GLOBALS ********************************************************************/ -PCHAR SmpSubSystemNames[] = +#if DBG +const PCSTR SmpSubSystemNames[] = { "Unknown", "Native", - "Windows", - "Posix", - "OS/2" + "Windows GUI", + "Windows CUI", + NULL, + "OS/2 CUI" + NULL, + "Posix CUI" }; +#endif /* FUNCTIONS ******************************************************************/ @@ -35,6 +40,7 @@ SmpSbCreateSession(IN PVOID Reserved, IN PCLIENT_ID DbgClientId) { NTSTATUS Status; + ULONG SubSystemType = ProcessInformation->ImageInformation.SubSystemType; PSMP_SUBSYSTEM KnownSubsys; SB_API_MSG SbApiMsg; ULONG SessionId; @@ -65,9 +71,7 @@ SmpSbCreateSession(IN PVOID Reserved, } /* Find the subsystem we have for this initial process */ - KnownSubsys = SmpLocateKnownSubSysByType(MuSessionId, - ProcessInformation-> - ImageInformation.SubSystemType); + KnownSubsys = SmpLocateKnownSubSysByType(MuSessionId, SubSystemType); if (KnownSubsys) { /* Duplicate the process handle into the message */ @@ -142,11 +146,22 @@ SmpSbCreateSession(IN PVOID Reserved, } /* If we don't yet have a subsystem, only native images can be launched */ - if (ProcessInformation->ImageInformation.SubSystemType != IMAGE_SUBSYSTEM_NATIVE) + if (SubSystemType != IMAGE_SUBSYSTEM_NATIVE) { /* Fail */ - DPRINT1("SMSS: %s SubSystem has not been started.\n", - SmpSubSystemNames[ProcessInformation->ImageInformation.SubSystemType]); +#if DBG + PCSTR SubSysName = NULL; + CHAR SubSysTypeName[sizeof("Type 0x")+8]; + + if (SubSystemType < RTL_NUMBER_OF(SmpSubSystemNames)) + SubSysName = SmpSubSystemNames[SubSystemType]; + if (!SubSysName) + { + SubSysName = SubSysTypeName; + sprintf(SubSysTypeName, "Type 0x%08x", SubSystemType); + } + DPRINT1("SMSS: %s SubSystem not found (either not started or destroyed).\n", SubSysName); +#endif Status = STATUS_UNSUCCESSFUL; NtClose(ProcessInformation->ProcessHandle); NtClose(ProcessInformation->ThreadHandle);

2 years, 1 month

[reactos] 01/02: [CSRSRV] Minimally-adapt CSRSRV to make it able to host other subsystems than Win32.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcbfcd22788e5321ef09e… commit bcbfcd22788e5321ef09e7b00079fa8a453b2fa0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 23 23:54:06 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 8 23:46:32 2022 +0100 [CSRSRV] Minimally-adapt CSRSRV to make it able to host other subsystems than Win32. This is really ReactOS-specific, so I surround them with __REACTOS__ (even if this is our code) to differentiate these from Win2k3 behaviour, even though they were strongly inspired by what was possible in the beta versions of NT 3.1 (pre-3.10.404). Interestingly, Windows 7+ partially re-introduced that functionality (just in differencing "Windows=On" from "Off"). See https://reactos.org/wiki/User:Hbelusca/CSRSS for more information. --- subsystems/csr/csrsrv/init.c | 57 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/subsystems/csr/csrsrv/init.c b/subsystems/csr/csrsrv/init.c index 69e9cfdea00..491a15d896a 100644 --- a/subsystems/csr/csrsrv/init.c +++ b/subsystems/csr/csrsrv/init.c @@ -31,6 +31,10 @@ PCSR_THREAD CsrSbApiRequestThreadPtr; HANDLE CsrSmApiPort = NULL; HANDLE hSbApiPort = NULL; HANDLE CsrApiPort = NULL; +#ifdef __REACTOS__ +BOOLEAN CsrWindowsControl; +ULONG CsrSubSystemType; // Known as SessionFirstProcessImageType in Windows 7+ +#endif ULONG CsrMaxApiRequestThreads; ULONG CsrTotalPerProcessDataLength; ULONG SessionId; @@ -559,6 +563,10 @@ CsrParseServerCommandLine(IN ULONG ArgumentCount, /* Set the Defaults */ CsrTotalPerProcessDataLength = 0; CsrObjectDirectory = NULL; +#ifdef __REACTOS__ + CsrWindowsControl = FALSE; + CsrSubSystemType = IMAGE_SUBSYSTEM_UNKNOWN; +#endif CsrMaxApiRequestThreads = 16; /* Save our Session ID, and create a Directory for it */ @@ -619,7 +627,36 @@ CsrParseServerCommandLine(IN ULONG ArgumentCount, } else if (_stricmp(ParameterName, "SubSystemType") == 0) { +#ifdef __REACTOS__ + /* Well-known subsystems, specified by names */ + if (_stricmp(ParameterValue, "windows") == 0) + { + /* Behaviour compatible with Windows 7+ */ + if (CsrWindowsControl) + CsrSubSystemType = IMAGE_SUBSYSTEM_WINDOWS_GUI; + else + CsrSubSystemType = IMAGE_SUBSYSTEM_WINDOWS_CUI; + } + else if (_stricmp(ParameterValue, "posix") == 0) + { + CsrSubSystemType = IMAGE_SUBSYSTEM_POSIX_CUI; + } + else if (_stricmp(ParameterValue, "os2") == 0) + { + CsrSubSystemType = IMAGE_SUBSYSTEM_OS2_CUI; + } + else if (_stricmp(ParameterValue, "native") == 0) + { + CsrSubSystemType = IMAGE_SUBSYSTEM_NATIVE; + } + else + { + /* Another subsystem type, specified by a numerical value */ + Status = RtlCharToInteger(ParameterValue, 0, &CsrSubSystemType); + } +#else /* Ignored */ +#endif } else if (_stricmp(ParameterName, "MaxRequestThreads") == 0) { @@ -634,7 +671,7 @@ CsrParseServerCommandLine(IN ULONG ArgumentCount, } else if (_stricmp(ParameterName, "ProfileControl") == 0) { - /* Ignored */ + /* Related functionality ignored since NT 3.5 */ } else if (_stricmp(ParameterName, "SharedSection") == 0) { @@ -661,7 +698,7 @@ CsrParseServerCommandLine(IN ULONG ArgumentCount, /* Check for the Entry Point */ if ((*ServerString == ':') && (!EntryPoint)) { - /* Found it. Add a nullchar and save it */ + /* Found it. NULL-terminate and save it. */ *ServerString++ = ANSI_NULL; EntryPoint = ServerString; } @@ -696,8 +733,11 @@ CsrParseServerCommandLine(IN ULONG ArgumentCount, } else if (_stricmp(ParameterName, "Windows") == 0) { +#ifdef __REACTOS__ + CsrWindowsControl = (_stricmp(ParameterValue, "On") == 0); +#else /* Ignored */ - // Check whether we want to start in pure GUI or pure CLI. +#endif } else { @@ -1042,6 +1082,10 @@ CsrServerInitialization(IN ULONG ArgumentCount, return Status; } +#ifdef __REACTOS__ + if (CsrSubSystemType != IMAGE_SUBSYSTEM_UNKNOWN) + { +#endif /* Initialize the API Port for SM communication */ Status = CsrSbApiPortInitialize(); if (!NT_SUCCESS(Status)) @@ -1054,7 +1098,11 @@ CsrServerInitialization(IN ULONG ArgumentCount, /* We're all set! Connect to SM! */ Status = SmConnectToSm(&CsrSbApiPortName, CsrSbApiPort, +#ifdef __REACTOS__ + CsrSubSystemType, +#else IMAGE_SUBSYSTEM_WINDOWS_GUI, +#endif &CsrSmApiPort); if (!NT_SUCCESS(Status)) { @@ -1062,6 +1110,9 @@ CsrServerInitialization(IN ULONG ArgumentCount, __FUNCTION__, Status); return Status; } +#ifdef __REACTOS__ + } +#endif /* Have us handle Hard Errors */ Status = NtSetDefaultHardErrorPort(CsrApiPort);

2 years, 1 month

[reactos] 03/03: [NTOS:SE] Dump security debug info in case no every right has been granted in SepAccessCheck

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2fef8be89206b7b0589d3… commit 2fef8be89206b7b0589d3c05e5cc94587ceed9bf Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Nov 6 17:47:30 2022 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Nov 8 18:24:37 2022 +0100 [NTOS:SE] Dump security debug info in case no every right has been granted in SepAccessCheck The "failed to grant access rights" message isn't enough to understand what kind of access rights haven't been granted and why. Dumping information of the captured security descriptor, the ACL and its ACEs with mask rights and token SIDs should be enough to understand the reason of the failure in question. --- ntoskrnl/se/accesschk.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/se/accesschk.c b/ntoskrnl/se/accesschk.c index 2a92a0ef247..0796dc8db78 100644 --- a/ntoskrnl/se/accesschk.c +++ b/ntoskrnl/se/accesschk.c @@ -479,23 +479,20 @@ SepAccessCheck( _Out_ PNTSTATUS AccessStatusList) { ACCESS_MASK RemainingAccess; - PACCESS_CHECK_RIGHTS AccessCheckRights; - PACCESS_TOKEN Token; ULONG ResultListLength; ULONG ResultListIndex; PACL Dacl; BOOLEAN Present; BOOLEAN Defaulted; NTSTATUS Status; + PACCESS_TOKEN Token = NULL; + PACCESS_CHECK_RIGHTS AccessCheckRights = NULL; PAGED_CODE(); /* A security descriptor must be expected for access checks */ ASSERT(SecurityDescriptor); - /* Assume no access check rights first */ - AccessCheckRights = NULL; - /* Check for no access desired */ if (!DesiredAccess) { @@ -767,6 +764,16 @@ ReturnCommonStatus: AccessStatusList[ResultListIndex] = Status; } +#if DBG + /* Dump security debug info on access denied case */ + if (Status == STATUS_ACCESS_DENIED) + { + SepDumpSdDebugInfo(SecurityDescriptor); + SepDumpTokenDebugInfo(Token); + SepDumpAccessRightsStats(AccessCheckRights); + } +#endif + /* Free the allocated access check rights */ SepFreeAccessCheckRights(AccessCheckRights); AccessCheckRights = NULL;

2 years, 1 month

[reactos] 02/03: [NTOS:SE] Add new ACE types for SepGetSidFromAce routine

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2ee126c234f3645bdc96… commit e2ee126c234f3645bdc965b027c649900cbbd7e1 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Nov 6 17:46:04 2022 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Nov 8 18:24:37 2022 +0100 [NTOS:SE] Add new ACE types for SepGetSidFromAce routine --- ntoskrnl/se/sid.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ntoskrnl/se/sid.c b/ntoskrnl/se/sid.c index 3d4d8931a15..3d0dff1a8ab 100644 --- a/ntoskrnl/se/sid.c +++ b/ntoskrnl/se/sid.c @@ -616,8 +616,23 @@ SepGetSidFromAce( break; } + case SYSTEM_AUDIT_ACE_TYPE: + { + Sid = (PSID)&((PSYSTEM_AUDIT_ACE)Ace)->SidStart; + break; + } + + case SYSTEM_ALARM_ACE_TYPE: + { + Sid = (PSID)&((PSYSTEM_ALARM_ACE)Ace)->SidStart; + break; + } + default: + { + DPRINT1("SepGetSidFromAce(): Unknown ACE type (Ace 0x%p, Type %u)\n", Ace, AceType); break; + } } return Sid;

2 years, 1 month

[reactos] 01/03: [NTOS:SE] Implement security debug facility routines

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=caa3571cd78f595add72f… commit caa3571cd78f595add72fecfebdb06ecedd44818 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Nov 6 17:40:48 2022 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Nov 8 18:24:37 2022 +0100 [NTOS:SE] Implement security debug facility routines debug.c will serve as a centralized facility for security debugging routines and everything related to that. This file will be expanded with further debug functions for the Security subsystem if needed. --- ntoskrnl/include/internal/se.h | 17 +++ ntoskrnl/ntos.cmake | 4 + ntoskrnl/se/debug.c | 330 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 351 insertions(+) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index b81585c64eb..59cb4dbe631 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -289,6 +289,23 @@ extern PTOKEN SeAnonymousLogonTokenNoEveryone; KeLeaveCriticalRegion(); \ } +#if DBG +// +// Security Debug Utility Functions +// +VOID +SepDumpSdDebugInfo( + _In_opt_ PISECURITY_DESCRIPTOR SecurityDescriptor); + +VOID +SepDumpTokenDebugInfo( + _In_opt_ PTOKEN Token); + +VOID +SepDumpAccessRightsStats( + _In_opt_ PACCESS_CHECK_RIGHTS AccessRights); +#endif // DBG + // // Token Functions // diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 38af3b2b81b..67fe1186a14 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -294,6 +294,10 @@ list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/wmi.c ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/wmidrv.c) +if(DBG) + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/se/debug.c) +endif() + list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/zw.S) if(ARCH STREQUAL "i386") diff --git a/ntoskrnl/se/debug.c b/ntoskrnl/se/debug.c new file mode 100644 index 00000000000..da5e35a160e --- /dev/null +++ b/ntoskrnl/se/debug.c @@ -0,0 +1,330 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security subsystem debug routines support + * COPYRIGHT: Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS **********************************************************/ + +/** + * @brief + * Converts an Access Control Entry (ACE) type to a string. + * + * @return + * Returns a converted ACE type strings. If no + * known ACE type is found, it will return + * UNKNOWN TYPE. + */ +static +PCSTR +SepGetAceTypeString( + _In_ UCHAR AceType) +{ +#define TOSTR(x) #x + static const PCSTR AceTypes[] = + { + TOSTR(ACCESS_ALLOWED_ACE_TYPE), + TOSTR(ACCESS_DENIED_ACE_TYPE), + TOSTR(SYSTEM_AUDIT_ACE_TYPE), + TOSTR(SYSTEM_ALARM_ACE_TYPE), + TOSTR(ACCESS_ALLOWED_COMPOUND_ACE_TYPE), + TOSTR(ACCESS_ALLOWED_OBJECT_ACE_TYPE), + TOSTR(ACCESS_DENIED_OBJECT_ACE_TYPE), + TOSTR(SYSTEM_AUDIT_OBJECT_ACE_TYPE), + TOSTR(SYSTEM_ALARM_OBJECT_ACE_TYPE), + TOSTR(ACCESS_ALLOWED_CALLBACK_ACE_TYPE), + TOSTR(ACCESS_DENIED_CALLBACK_ACE_TYPE), + TOSTR(ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE), + TOSTR(ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE), + TOSTR(SYSTEM_AUDIT_CALLBACK_ACE_TYPE), + TOSTR(SYSTEM_ALARM_CALLBACK_ACE_TYPE), + TOSTR(SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE), + TOSTR(SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE), + TOSTR(SYSTEM_MANDATORY_LABEL_ACE_TYPE), + }; +#undef TOSTR + + if (AceType < RTL_NUMBER_OF(AceTypes)) + return AceTypes[AceType]; + else + return "UNKNOWN TYPE"; +} + +/** + * @brief + * Dumps the ACE flags to the debugger output. + */ +static +VOID +SepDumpAceFlags( + _In_ UCHAR AceFlags) +{ +#define ACE_FLAG_PRINT(x) \ + if (AceFlags & x) \ + { \ + DbgPrint(#x "\n"); \ + } + + ACE_FLAG_PRINT(OBJECT_INHERIT_ACE); + ACE_FLAG_PRINT(CONTAINER_INHERIT_ACE); + ACE_FLAG_PRINT(NO_PROPAGATE_INHERIT_ACE); + ACE_FLAG_PRINT(INHERIT_ONLY_ACE); + ACE_FLAG_PRINT(INHERITED_ACE); +#undef ACE_FLAG_PRINT +} + +/** + * @brief + * Iterates and dumps each ACE debug info in an ACL. + */ +static +VOID +SepDumpAces( + _In_ PACL Acl) +{ + NTSTATUS Status; + PACE Ace; + ULONG AceIndex; + PSID Sid; + UNICODE_STRING SidString; + + /* Loop all ACEs and dump their info */ + for (AceIndex = 0; AceIndex < Acl->AceCount; AceIndex++) + { + /* Get the ACE at this index */ + Status = RtlGetAce(Acl, AceIndex, (PVOID*)&Ace); + if (!NT_SUCCESS(Status)) + { + /* + * Normally this should never happen. + * Just fail gracefully and stop further + * debugging of ACEs. + */ + DbgPrint("SepDumpAces(): Failed to find the next ACE, stop dumping info...\n"); + return; + } + + DbgPrint("================== %lu# ACE DUMP INFO ==================\n", AceIndex); + DbgPrint("Ace -> 0x%p\n", Ace); + DbgPrint("Ace->Header -> 0x%p\n", Ace->Header); + DbgPrint("Ace->Header.AceType -> %s\n", SepGetAceTypeString(Ace->Header.AceType)); + DbgPrint("Ace->AccessMask -> 0x%08lx\n", Ace->AccessMask); + + Sid = SepGetSidFromAce(Ace->Header.AceType, Ace); + ASSERT(Sid); + RtlConvertSidToUnicodeString(&SidString, Sid, TRUE); + DbgPrint("Ace SID -> %wZ\n", &SidString); + RtlFreeUnicodeString(&SidString); + + DbgPrint("Ace->Header.AceSize -> %u\n", Ace->Header.AceSize); + DbgPrint("Ace->Header.AceFlags:\n"); + SepDumpAceFlags(Ace->Header.AceFlags); + } +} + +/** + * @brief + * Dumps debug info of an Access Control List (ACL). + */ +static +VOID +SepDumpAclInfo( + _In_ PACL Acl, + _In_ BOOLEAN IsSacl) +{ + /* Dump relevant info */ + DbgPrint("================== %s DUMP INFO ==================\n", IsSacl ? "SACL" : "DACL"); + DbgPrint("Acl->AclRevision -> %u\n", Acl->AclRevision); + DbgPrint("Acl->AclSize -> %u\n", Acl->AclSize); + DbgPrint("Acl->AceCount -> %u\n", Acl->AceCount); + + /* Dump all the ACEs present on this ACL */ + SepDumpAces(Acl); +} + +/** + * @brief + * Dumps control flags of a security descriptor to the debugger. + */ +static +VOID +SepDumpSdControlInfo( + _In_ SECURITY_DESCRIPTOR_CONTROL SdControl) +{ +#define SD_CONTROL_PRINT(x) \ + if (SdControl & x) \ + { \ + DbgPrint(#x "\n"); \ + } + + SD_CONTROL_PRINT(SE_OWNER_DEFAULTED); + SD_CONTROL_PRINT(SE_GROUP_DEFAULTED); + SD_CONTROL_PRINT(SE_DACL_PRESENT); + SD_CONTROL_PRINT(SE_DACL_DEFAULTED); + SD_CONTROL_PRINT(SE_SACL_PRESENT); + SD_CONTROL_PRINT(SE_SACL_DEFAULTED); + SD_CONTROL_PRINT(SE_DACL_UNTRUSTED); + SD_CONTROL_PRINT(SE_SERVER_SECURITY); + SD_CONTROL_PRINT(SE_DACL_AUTO_INHERIT_REQ); + SD_CONTROL_PRINT(SE_SACL_AUTO_INHERIT_REQ); + SD_CONTROL_PRINT(SE_DACL_AUTO_INHERITED); + SD_CONTROL_PRINT(SE_SACL_AUTO_INHERITED); + SD_CONTROL_PRINT(SE_DACL_PROTECTED); + SD_CONTROL_PRINT(SE_SACL_PROTECTED); + SD_CONTROL_PRINT(SE_RM_CONTROL_VALID); + SD_CONTROL_PRINT(SE_SELF_RELATIVE); +#undef SD_CONTROL_PRINT +} + +/** + * @brief + * Dumps each security identifier (SID) of an access token to debugger. + */ +static +VOID +SepDumpSidsOfToken( + _In_ PSID_AND_ATTRIBUTES Sids, + _In_ ULONG SidCount) +{ + ULONG SidIndex; + UNICODE_STRING SidString; + + /* Loop all SIDs and dump them */ + for (SidIndex = 0; SidIndex < SidCount; SidIndex++) + { + RtlConvertSidToUnicodeString(&SidString, Sids[SidIndex].Sid, TRUE); + DbgPrint("%lu# %wZ\n", SidIndex, &SidString); + RtlFreeUnicodeString(&SidString); + } +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/** + * @brief + * Dumps debug information of a security descriptor to the debugger. + */ +VOID +SepDumpSdDebugInfo( + _In_opt_ PISECURITY_DESCRIPTOR SecurityDescriptor) +{ + UNICODE_STRING SidString; + PSID OwnerSid, GroupSid; + PACL Dacl, Sacl; + + /* Don't dump anything if no SD was provided */ + if (!SecurityDescriptor) + { + return; + } + + /* Cache the necessary security buffers to dump info from */ + OwnerSid = SepGetOwnerFromDescriptor(SecurityDescriptor); + GroupSid = SepGetGroupFromDescriptor(SecurityDescriptor); + Sacl = SepGetSaclFromDescriptor(SecurityDescriptor); + Dacl = SepGetDaclFromDescriptor(SecurityDescriptor); + + DbgPrint("================== SECURITY DESCRIPTOR DUMP INFO ==================\n"); + DbgPrint("SecurityDescriptor -> 0x%p\n", SecurityDescriptor); + DbgPrint("SecurityDescriptor->Revision -> %u\n", SecurityDescriptor->Revision); + DbgPrint("SecurityDescriptor->Control:\n"); + SepDumpSdControlInfo(SecurityDescriptor->Control); + + /* Dump the Owner SID if the SD belongs to an owner */ + if (OwnerSid) + { + RtlConvertSidToUnicodeString(&SidString, OwnerSid, TRUE); + DbgPrint("SD Owner SID -> %wZ\n", &SidString); + RtlFreeUnicodeString(&SidString); + } + + /* Dump the Group SID if the SD belongs to a group */ + if (GroupSid) + { + RtlConvertSidToUnicodeString(&SidString, GroupSid, TRUE); + DbgPrint("SD Group SID -> %wZ\n", &SidString); + RtlFreeUnicodeString(&SidString); + } + + /* Dump the ACL contents of SACL if this SD has one */ + if (Sacl) + { + SepDumpAclInfo(Sacl, TRUE); + } + + /* Dump the ACL contents of DACL if this SD has one */ + if (Dacl) + { + SepDumpAclInfo(Dacl, FALSE); + } +} + +/** + * @brief + * Dumps debug information of an access token to the debugger. + */ +VOID +SepDumpTokenDebugInfo( + _In_opt_ PTOKEN Token) +{ + UNICODE_STRING SidString; + + /* Don't dump anything if no token was provided */ + if (!Token) + { + return; + } + + /* Dump relevant token info */ + DbgPrint("================== ACCESS TOKEN DUMP INFO ==================\n"); + DbgPrint("Token -> 0x%p\n", Token); + DbgPrint("Token->ImageFileName -> %s\n", Token->ImageFileName); + DbgPrint("Token->TokenSource.SourceName -> \"%-.*s\"\n", + RTL_NUMBER_OF(Token->TokenSource.SourceName), + Token->TokenSource.SourceName); + DbgPrint("Token->TokenSource.SourceIdentifier -> %lu.%lu\n", + Token->TokenSource.SourceIdentifier.HighPart, + Token->TokenSource.SourceIdentifier.LowPart); + + RtlConvertSidToUnicodeString(&SidString, Token->PrimaryGroup, TRUE); + DbgPrint("Token primary group SID -> %wZ\n", &SidString); + RtlFreeUnicodeString(&SidString); + + DbgPrint("Token user and groups SIDs:\n"); + SepDumpSidsOfToken(Token->UserAndGroups, Token->UserAndGroupCount); + + if (SeTokenIsRestricted(Token)) + { + DbgPrint("Token restricted SIDs:\n"); + SepDumpSidsOfToken(Token->RestrictedSids, Token->RestrictedSidCount); + } +} + +/** + * @brief + * Dumps security access rights to the debugger. + */ +VOID +SepDumpAccessRightsStats( + _In_opt_ PACCESS_CHECK_RIGHTS AccessRights) +{ + /* Don't dump anything if no access check rights list was provided */ + if (!AccessRights) + { + return; + } + + DbgPrint("================== ACCESS CHECK RIGHTS STATISTICS ==================\n"); + DbgPrint("Remaining access rights -> 0x%08lx\n", AccessRights->RemainingAccessRights); + DbgPrint("Granted access rights -> 0x%08lx\n", AccessRights->GrantedAccessRights); + DbgPrint("Denied access rights -> 0x%08lx\n", AccessRights->DeniedAccessRights); +} + +/* EOF */

2 years, 1 month

[reactos] 03/03: [SMLIB][SMSS] Implement SmLoadDeferedSubsystem() client and server-side. (#4821)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f48c6923173808c9f218… commit 9f48c6923173808c9f2184a22fc01a98defb5a5b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Oct 26 17:35:03 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 8 17:41:02 2022 +0100 [SMLIB][SMSS] Implement SmLoadDeferedSubsystem() client and server-side. (#4821) Loosely based on the deprecated ReactOS-specific SmExecuteProgram(). On server-side, we lookup into the list of deferred subsystems that has been initialized at init time. Dedicated to Justin Miller (The_DarkFire) work on reviving the POSIX subsystem! --- base/system/smss/smloop.c | 70 ++++++++++++++++++++++++++++++----- base/system/smss/smss.h | 3 +- sdk/include/reactos/subsys/sm/smmsg.h | 6 +++ sdk/lib/smlib/smclient.c | 52 ++++++++++++++++++++++++++ 4 files changed, 121 insertions(+), 10 deletions(-) diff --git a/base/system/smss/smloop.c b/base/system/smss/smloop.c index d44b6f026bc..ce5707bff73 100644 --- a/base/system/smss/smloop.c +++ b/base/system/smss/smloop.c @@ -26,10 +26,9 @@ typedef struct _SMP_CLIENT_CONTEXT typedef NTSTATUS (NTAPI *PSM_API_HANDLER)( - IN PSM_API_MSG SmApiMsg, - IN PSMP_CLIENT_CONTEXT ClientContext, - IN HANDLE SmApiPort -); + _In_ PSM_API_MSG SmApiMsg, + _In_ PSMP_CLIENT_CONTEXT ClientContext, + _In_ HANDLE SmApiPort); volatile LONG SmTotalApiThreads; HANDLE SmUniqueProcessId; @@ -139,12 +138,65 @@ SmpExecPgm(IN PSM_API_MSG SmApiMsg, NTSTATUS NTAPI -SmpLoadDeferedSubsystem(IN PSM_API_MSG SmApiMsg, - IN PSMP_CLIENT_CONTEXT ClientContext, - IN HANDLE SmApiPort) +SmpLoadDeferedSubsystem( + _In_ PSM_API_MSG SmApiMsg, + _In_ PSMP_CLIENT_CONTEXT ClientContext, + _In_ HANDLE SmApiPort) { - DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status = STATUS_OBJECT_NAME_NOT_FOUND; + PSM_LOAD_DEFERED_SUBSYSTEM_MSG SmLoadDefered = &SmApiMsg->u.LoadDefered; + UNICODE_STRING DeferedSubsystem; + ULONG MuSessionId; + PLIST_ENTRY NextEntry; + PSMP_REGISTRY_VALUE RegEntry; + + /* Validate DeferedSubsystem's length */ + if ((SmLoadDefered->Length <= 0) || + (SmLoadDefered->Length > sizeof(SmLoadDefered->Buffer))) + { + return STATUS_INVALID_PARAMETER; + } + + /* Get the name of the subsystem to start */ + DeferedSubsystem.Length = (USHORT)SmLoadDefered->Length; + DeferedSubsystem.MaximumLength = DeferedSubsystem.Length; + DeferedSubsystem.Buffer = SmLoadDefered->Buffer; + + /* Find a subsystem responsible for this session */ + SmpGetProcessMuSessionId(ClientContext->ProcessHandle, &MuSessionId); + if (!SmpCheckDuplicateMuSessionId(MuSessionId)) + { + DPRINT1("SMSS: Deferred subsystem load (%wZ) for MuSessionId %u, status=0x%x\n", + &DeferedSubsystem, MuSessionId, Status); + return Status; + } + + /* Now process the deferred subsystems list */ + for (NextEntry = SmpSubSystemsToDefer.Flink; + NextEntry != &SmpSubSystemsToDefer; + NextEntry = NextEntry->Flink) + { + /* Get each entry and check if it's the subsystem we are looking for */ + RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); + if (RtlEqualUnicodeString(&RegEntry->Name, &DeferedSubsystem, TRUE)) + { + // TODO: One may want to extra-flag the command for + // specific POSIX or OS2 processing... + + /* Load the deferred subsystem */ + Status = SmpExecuteCommand(&RegEntry->Value, + MuSessionId, + NULL, + SMP_SUBSYSTEM_FLAG); + if (!NT_SUCCESS(Status)) + DPRINT1("SMSS: Subsystem execute failed (%wZ)\n", &RegEntry->Value); + + break; + } + } + + /* Return status */ + return Status; } NTSTATUS diff --git a/base/system/smss/smss.h b/base/system/smss/smss.h index 7b2ad99e670..46f8dd18f87 100644 --- a/base/system/smss/smss.h +++ b/base/system/smss/smss.h @@ -91,9 +91,10 @@ extern UNICODE_STRING SmpSystemRoot; extern PWCHAR SmpDefaultEnvironment; extern UNICODE_STRING SmpDefaultLibPath; extern LIST_ENTRY SmpSetupExecuteList; +extern LIST_ENTRY SmpSubSystemList; extern LIST_ENTRY SmpSubSystemsToLoad; +extern LIST_ENTRY SmpSubSystemsToDefer; extern LIST_ENTRY SmpExecuteList; -extern LIST_ENTRY SmpSubSystemList; extern ULONG AttachedSessionId; extern BOOLEAN SmpDebug; diff --git a/sdk/include/reactos/subsys/sm/smmsg.h b/sdk/include/reactos/subsys/sm/smmsg.h index e8f15b5a1a1..e72f0917fb2 100644 --- a/sdk/include/reactos/subsys/sm/smmsg.h +++ b/sdk/include/reactos/subsys/sm/smmsg.h @@ -295,6 +295,12 @@ SmExecPgm( _In_ PRTL_USER_PROCESS_INFORMATION ProcessInformation, _In_ BOOLEAN DebugFlag); +NTSTATUS +NTAPI +SmLoadDeferedSubsystem( + _In_ HANDLE SmApiPort, + _In_ PUNICODE_STRING DeferedSubsystem); + NTSTATUS NTAPI SmStartCsr( diff --git a/sdk/lib/smlib/smclient.c b/sdk/lib/smlib/smclient.c index 58768f197bb..440ff4fe2e0 100644 --- a/sdk/lib/smlib/smclient.c +++ b/sdk/lib/smlib/smclient.c @@ -295,6 +295,58 @@ SmExecPgm( return Status; } +/** + * @brief + * This function is used to make the SM start an environment + * subsystem server process. + * + * @param[in] SmApiPort + * Port handle returned by SmConnectToSm(). + * + * @param[in] DeferedSubsystem + * Name of the subsystem to start. This must be one of the subsystems + * listed by value's name in the SM registry key + * \Registry\SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems + * (used by the SM to lookup the corresponding image name). + * Default valid names are: "Debug", "Windows", "Posix", "Os2". + * + * @return + * Success status as handed by the SM reply; otherwise a failure + * status code. + **/ +NTSTATUS +NTAPI +SmLoadDeferedSubsystem( + _In_ HANDLE SmApiPort, + _In_ PUNICODE_STRING DeferedSubsystem) +{ + SM_API_MSG SmApiMsg = {0}; + PSM_LOAD_DEFERED_SUBSYSTEM_MSG LoadDefered = &SmApiMsg.u.LoadDefered; + +#if 0 //def _WIN64 + /* 64-bit SMSS needs to talk to 32-bit processes so do the LPC conversion */ + if (SmpIsWow64Process()) + { + return SmpWow64LoadDeferedSubsystem(SmApiPort, DeferedSubsystem); + } +#endif + + /* Validate DeferedSubsystem's length */ + if (DeferedSubsystem->Length > sizeof(LoadDefered->Buffer)) + return STATUS_INVALID_PARAMETER; + + /* Set the message data */ + /* Buffer stores a counted non-NULL-terminated UNICODE string */ + LoadDefered->Length = DeferedSubsystem->Length; + RtlCopyMemory(LoadDefered->Buffer, + DeferedSubsystem->Buffer, + DeferedSubsystem->Length); + + /* Send the message and wait for a reply */ + SmApiMsg.ApiNumber = SmpLoadDeferedSubsystemApi; + return SmSendMsgToSm(SmApiPort, &SmApiMsg); +} + /** * @brief * Requests the SM to create a new Terminal Services session

2 years, 1 month

[reactos] 02/03: [SMSS] Logically group the LIST_ENTRY-ies.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8fea507d9bd1165f0a9f8… commit 8fea507d9bd1165f0a9f87a3f95ff5eafbc8b78c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Oct 28 00:21:44 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 8 17:41:01 2022 +0100 [SMSS] Logically group the LIST_ENTRY-ies. --- base/system/smss/sminit.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/base/system/smss/sminit.c b/base/system/smss/sminit.c index 7b0a01d3ac9..03743dda4b6 100644 --- a/base/system/smss/sminit.c +++ b/base/system/smss/sminit.c @@ -16,10 +16,11 @@ /* GLOBALS ********************************************************************/ UNICODE_STRING SmpSubsystemName, PosixName, Os2Name; -LIST_ENTRY SmpBootExecuteList, SmpSetupExecuteList, SmpPagingFileList; -LIST_ENTRY SmpDosDevicesList, SmpFileRenameList, SmpKnownDllsList; -LIST_ENTRY SmpExcludeKnownDllsList, SmpSubSystemList, SmpSubSystemsToLoad; -LIST_ENTRY SmpSubSystemsToDefer, SmpExecuteList, NativeProcessList; +LIST_ENTRY SmpBootExecuteList, SmpSetupExecuteList; +LIST_ENTRY SmpPagingFileList, SmpDosDevicesList, SmpFileRenameList; +LIST_ENTRY SmpKnownDllsList, SmpExcludeKnownDllsList; +LIST_ENTRY SmpSubSystemList, SmpSubSystemsToLoad, SmpSubSystemsToDefer; +LIST_ENTRY SmpExecuteList, NativeProcessList; PVOID SmpHeap; ULONG SmBaseTag;

2 years, 1 month

← Newer
1
...
9
10
11
12
13
14
15
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2022