Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTOS:CC] CcWriteVirtualAddress(): Do not round 'Size'
by Serge Gautherie 01 Jul '19

01 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0d2170729a01f4287c2d… commit a0d2170729a01f4287c2d183f1bc1a18207e6148 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Jun 19 06:54:02 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Jul 1 21:30:25 2019 +0200 [NTOS:CC] CcWriteVirtualAddress(): Do not round 'Size' Revert 'Properly align VACB writes' part of 2a80ae2bb6fdb4135d41244335caa2dadb6c8fa9. CORE-15384 CORE-16018 --- ntoskrnl/cc/copy.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 41980b87d45..1f731716b1f 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -178,7 +178,6 @@ CcWriteVirtualAddress ( } while (++i < (Size >> PAGE_SHIFT)); } - Size = ROUND_TO_PAGES(Size); ASSERT(Size <= VACB_MAPPING_GRANULARITY); ASSERT(Size > 0);

1 0

[reactos] 01/01: [WIN32SS][GDI] Improve stub for EngQueryDeviceAttribute
by Bernhard Feichtinger 30 Jun '19

30 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=774246e95c0df326464e5… commit 774246e95c0df326464e59ad4a948c9dc8948d96 Author: Bernhard Feichtinger <43303168+BieHDC(a)users.noreply.github.com> AuthorDate: Mon Apr 22 21:12:53 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jun 30 23:50:20 2019 +0200 [WIN32SS][GDI] Improve stub for EngQueryDeviceAttribute --- win32ss/gdi/eng/stubs.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/win32ss/gdi/eng/stubs.c b/win32ss/gdi/eng/stubs.c index 35f329209ad..29d5595d7fc 100644 --- a/win32ss/gdi/eng/stubs.c +++ b/win32ss/gdi/eng/stubs.c @@ -583,14 +583,25 @@ EngPlgBlt( BOOL APIENTRY EngQueryDeviceAttribute( - IN HDEV Device, - IN ENG_DEVICE_ATTRIBUTE Attribute, - IN VOID *In, - IN ULONG InSize, - OUT VOID *Out, - OUT ULONG OutSize) + _In_ HDEV hdev, + _In_ ENG_DEVICE_ATTRIBUTE devAttr, + _In_reads_bytes_(cjInSize) PVOID pvIn, + _In_ ULONG cjInSize, + _Out_writes_bytes_(cjOutSize) PVOID pvOut, + _In_ ULONG cjOutSize) { + if (devAttr != QDA_ACCELERATION_LEVEL) + return FALSE; + UNIMPLEMENTED; + + if (cjOutSize >= sizeof(DWORD)) + { + /* Set all accelerations to enabled */ + *(DWORD*)pvOut = 0; + return TRUE; + } + return FALSE; }

1 0

[reactos] 07/07: [REACTOS] Finally enable the LUID mapped devices
by Pierre Schweitzer 30 Jun '19

30 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2aa749bbd03c20dbc18b… commit c2aa749bbd03c20dbc18b13897c33fca67fd115f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Jun 25 22:14:23 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jun 30 23:07:54 2019 +0200 [REACTOS] Finally enable the LUID mapped devices This allows users to have their own locally mapped DOS devices. For instance, when a network drive is mapped, it is now mapped in the user device maps and no longer in the global device map. This avoids sharing mount points system wide whereas they shouldn't. LUID mapped devices is the default W2K3 behavior. Globally mapped devices can be restored by adding back this registry key. https://twitter.com/HeisSpiter/status/1143615176450686976 CORE-16114 --- boot/bootdata/hivesys.inf | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index d1e1f7d4d59..0f2fc9369eb 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1445,7 +1445,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00 "\Windows", \ "\RPC Control" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ProtectionMode", 0x00010003, 0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","LUIDDeviceMapsDisabled", 0x00010003, 0x00000001 ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000002,"\DosDevices\COM1"

1 0

[reactos] 06/07: [NTOSKRNL] When looping again in ObpLookupEntryDirectory, properly init root entry
by Pierre Schweitzer 30 Jun '19

30 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4fd223729b84740e558a9… commit 4fd223729b84740e558a9bbc9c0727749959f8a2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Jun 25 22:09:54 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jun 30 23:07:54 2019 +0200 [NTOSKRNL] When looping again in ObpLookupEntryDirectory, properly init root entry This fixes looking in global directory for DOS drives that are globally mounted (such as C: drive) CORE-16114 --- ntoskrnl/ob/obdir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/ob/obdir.c b/ntoskrnl/ob/obdir.c index 83d05d4beb9..1c7b457c726 100644 --- a/ntoskrnl/ob/obdir.c +++ b/ntoskrnl/ob/obdir.c @@ -214,11 +214,11 @@ ObpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory, Context->HashValue = HashValue; Context->HashIndex = (USHORT)HashIndex; +DoItAgain: /* Get the root entry and set it as our lookup bucket */ AllocatedEntry = &Directory->HashBuckets[HashIndex]; LookupBucket = AllocatedEntry; -DoItAgain: /* Check if the directory is already locked */ if (!Context->DirectoryLocked) {

1 0

[reactos] 05/07: [BASESRV] Implement LUID mapped drive arrival/removal notification
by Pierre Schweitzer 30 Jun '19

30 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=222ace7c6c014741217b8… commit 222ace7c6c014741217b8e4ff73ad4bbdf7a3139 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Jun 20 09:00:07 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jun 30 23:07:54 2019 +0200 [BASESRV] Implement LUID mapped drive arrival/removal notification CORE-16114 --- subsystems/win/basesrv/basesrv.h | 2 + subsystems/win/basesrv/dosdev.c | 362 ++++++++++++++++++++++++++++++++++++++- subsystems/win/basesrv/init.c | 10 +- 3 files changed, 367 insertions(+), 7 deletions(-) diff --git a/subsystems/win/basesrv/basesrv.h b/subsystems/win/basesrv/basesrv.h index 67b73a6da69..c758ab435c5 100644 --- a/subsystems/win/basesrv/basesrv.h +++ b/subsystems/win/basesrv/basesrv.h @@ -16,6 +16,7 @@ #define COM_NO_WINDOWS_H #include <windef.h> #include <winbase.h> +#include <dbt.h> #define NTOS_MODE_USER #include <ndk/rtlfuncs.h> #include <ndk/obfuncs.h> @@ -67,6 +68,7 @@ extern HANDLE BaseSrvSharedHeap; extern PBASE_STATIC_SERVER_DATA BaseStaticServerData; extern ULONG SessionId; extern ULONG ProtectionMode; +extern RTL_CRITICAL_SECTION BaseSrvDDDBSMCritSec; #define SM_REG_KEY \ L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Session Manager" diff --git a/subsystems/win/basesrv/dosdev.c b/subsystems/win/basesrv/dosdev.c index d13edb4ac19..83a01242e73 100644 --- a/subsystems/win/basesrv/dosdev.c +++ b/subsystems/win/basesrv/dosdev.c @@ -13,9 +13,21 @@ #define NDEBUG #include <debug.h> +typedef struct _BSM_REQUEST +{ + struct _BSM_REQUEST * Next; + LUID BroadcastLuid; + LONG DriveLetter; + LONG RemoveDefinition; +} BSM_REQUEST, *PBSM_REQUEST; + /* GLOBALS ********************************************************************/ static RTL_CRITICAL_SECTION BaseDefineDosDeviceCritSec; +RTL_CRITICAL_SECTION BaseSrvDDDBSMCritSec; +PBSM_REQUEST BSM_Request_Queue = NULL, BSM_Request_Queue_End = NULL; +ULONG BaseSrvpBSMThreadCount = 0; +LONG (WINAPI *PBROADCASTSYSTEMMESSAGEEXW)(DWORD, LPDWORD, UINT, WPARAM, LPARAM, PBSMINFO) = NULL; /* PRIVATE FUNCTIONS **********************************************************/ @@ -146,6 +158,317 @@ IsGlobalSymbolicLink(HANDLE LinkHandle, return Status; } +BOOLEAN +CheckForGlobalDriveLetter(SHORT DriveLetter) +{ + WCHAR Path[8]; + NTSTATUS Status; + BOOLEAN IsGlobal; + UNICODE_STRING PathU; + HANDLE SymbolicLinkHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + + /* Setup our drive path */ + wcsncpy(Path, L"\\??\\X:", (sizeof(L"\\??\\X:") / sizeof(WCHAR))); + Path[4] = DriveLetter + L'A'; + Path[6] = UNICODE_NULL; + + /* Prepare everything to open the link */ + RtlInitUnicodeString(&PathU, Path); + InitializeObjectAttributes(&ObjectAttributes, + &PathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Impersonate the caller */ + if (!CsrImpersonateClient(NULL)) + { + return FALSE; + } + + /* Open our drive letter */ + Status = NtOpenSymbolicLinkObject(&SymbolicLinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + + CsrRevertToSelf(); + + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + + /* Check whether it's global */ + Status = IsGlobalSymbolicLink(SymbolicLinkHandle, &IsGlobal); + NtClose(SymbolicLinkHandle); + + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + + return IsGlobal; +} + +NTSTATUS +SendWinStationBSM(DWORD Flags, + LPDWORD Recipients, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BroadcastDriveLetterChange(LONG DriveLetter, + BOOLEAN RemoveDefinition, + PLUID BroadcastLuid) +{ + HANDLE hUser32; + NTSTATUS Status; + UNICODE_STRING User32U; + ANSI_STRING ProcedureName; + DWORD Recipients, Flags, wParam; + LUID SystemLuid = SYSTEM_LUID; + BSMINFO Info; + DEV_BROADCAST_VOLUME Volume; + + /* We need a broadcast LUID */ + if (BroadcastLuid == NULL) + { + return STATUS_INVALID_PARAMETER; + } + + /* Get the Csr procedure, and keep it forever */ + if (PBROADCASTSYSTEMMESSAGEEXW == NULL) + { + hUser32 = NULL; + RtlInitUnicodeString(&User32U, L"user32"); + Status = LdrGetDllHandle(NULL, NULL, &User32U, &hUser32); + if (hUser32 != NULL && NT_SUCCESS(Status)) + { + RtlInitString(&ProcedureName, "CsrBroadcastSystemMessageExW"); + Status = LdrGetProcedureAddress(hUser32, + &ProcedureName, + 0, + (PVOID *)&PBROADCASTSYSTEMMESSAGEEXW); + if (!NT_SUCCESS(Status)) + { + PBROADCASTSYSTEMMESSAGEEXW = NULL; + } + } + + /* If we failed to get broadcast procedure, no more actions left */ + if (PBROADCASTSYSTEMMESSAGEEXW == NULL) + { + return Status; + } + } + + /* Initialize broadcast info */ + Info.cbSize = sizeof(BSMINFO); + Info.hdesk = 0; + Info.hwnd = 0; + RtlCopyLuid(&Info.luid, BroadcastLuid); + + /* Initialize volume information */ + Volume.dbcv_size = sizeof(DEV_BROADCAST_VOLUME); + Volume.dbcv_devicetype = DBT_DEVTYP_VOLUME; + Volume.dbcv_reserved = 0; + Volume.dbcv_unitmask = 1 << DriveLetter; + Volume.dbcv_flags = DBTF_NET; + + /* Wide broadcast */ + Recipients = BSM_APPLICATIONS | BSM_ALLDESKTOPS; + Flags = BSF_NOHANG | BSF_NOTIMEOUTIFNOTHUNG | BSF_FORCEIFHUNG; + + /* + * If we don't broadcast as system, it's not a global drive + * notification, then mark it as LUID mapped drive + */ + if (!RtlEqualLuid(&Info.luid, &SystemLuid)) + { + Flags |= BSF_LUID; + } + + /* Set event type */ + wParam = RemoveDefinition ? DBT_DEVICEREMOVECOMPLETE : DBT_DEVICEARRIVAL; + + /* And broadcast! */ + Status = PBROADCASTSYSTEMMESSAGEEXW(Flags, &Recipients, WM_DEVICECHANGE, wParam, (LPARAM)&Volume, &Info); + + /* If the drive is global, notify Winsta */ + if (!(Flags & BSF_LUID)) + { + Status = SendWinStationBSM(Flags, &Recipients, WM_DEVICECHANGE, wParam, (LPARAM)&Volume); + } + + return Status; +} + +ULONG +NTAPI +BaseSrvBSMThread(PVOID StartupContext) +{ + ULONG ExitStatus; + NTSTATUS Status; + PBSM_REQUEST CurrentRequest; + + /* We have a thread */ + ExitStatus = 0; + RtlEnterCriticalSection(&BaseSrvDDDBSMCritSec); + ++BaseSrvpBSMThreadCount; + + while (TRUE) + { + /* If we flushed the queue, job done */ + if (BSM_Request_Queue == NULL) + { + break; + } + + /* Queue current request, and remove it from the queue */ + CurrentRequest = BSM_Request_Queue; + BSM_Request_Queue = BSM_Request_Queue->Next; + + /* If that was the last request, NULLify queue end */ + if (BSM_Request_Queue == NULL) + { + BSM_Request_Queue_End = NULL; + } + + RtlLeaveCriticalSection(&BaseSrvDDDBSMCritSec); + + /* Broadcast the message */ + Status = BroadcastDriveLetterChange(CurrentRequest->DriveLetter, + CurrentRequest->RemoveDefinition, + &CurrentRequest->BroadcastLuid); + + /* Reflect the last entry status on stop */ + CurrentRequest->Next = NULL; + ExitStatus = Status; + + RtlFreeHeap(BaseSrvHeap, 0, CurrentRequest); + RtlEnterCriticalSection(&BaseSrvDDDBSMCritSec); + } + + /* Here, we've flushed the queue, quit the user thread */ + --BaseSrvpBSMThreadCount; + RtlLeaveCriticalSection(&BaseSrvDDDBSMCritSec); + + NtCurrentTeb()->FreeStackOnTermination = TRUE; + NtTerminateThread(NtCurrentThread(), ExitStatus); + + return ExitStatus; +} + +NTSTATUS +CreateBSMThread(VOID) +{ + /* This can only be true for LUID mappings */ + if (BaseStaticServerData->LUIDDeviceMapsEnabled == 0) + { + return STATUS_ACCESS_DENIED; + } + + /* Create our user thread */ + return RtlCreateUserThread(NtCurrentProcess(), + NULL, + FALSE, + 0, + 0, + 0, + BaseSrvBSMThread, + NULL, + NULL, + NULL); +} + +NTSTATUS +AddBSMRequest(LONG DriveLetter, + BOOLEAN RemoveDefinition, + PLUID BroadcastLuid) +{ + LUID CallerLuid; + NTSTATUS Status; + LUID SystemLuid = SYSTEM_LUID; + PBSM_REQUEST Request; + + /* We need a broadcast LUID */ + if (BroadcastLuid == NULL) + { + return STATUS_INVALID_PARAMETER; + } + + /* + * If LUID mappings are not enabled, this call makes no sense + * It should not happen though + */ + if (BaseStaticServerData->LUIDDeviceMapsEnabled == 0) + { + return STATUS_ACCESS_DENIED; + } + + /* Get our caller LUID (not the broadcaster!) */ + Status = GetCallerLuid(&CallerLuid); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* System cannot create LUID mapped drives - thus broadcast makes no sense */ + if (!RtlEqualLuid(&CallerLuid, &SystemLuid)) + { + return STATUS_ACCESS_DENIED; + } + + /* Allocate our request */ + Request = RtlAllocateHeap(BaseSrvHeap, 0, sizeof(BSM_REQUEST)); + if (Request == NULL) + { + return STATUS_NO_MEMORY; + } + + /* Initialize it */ + Request->DriveLetter = DriveLetter; + Request->RemoveDefinition = RemoveDefinition; + RtlCopyLuid(&Request->BroadcastLuid, BroadcastLuid); + Request->Next = NULL; + + /* And queue it */ + RtlEnterCriticalSection(&BaseSrvDDDBSMCritSec); + + /* At the end of the queue if not empty */ + if (BSM_Request_Queue_End != NULL) + { + BSM_Request_Queue_End->Next = Request; + } + /* Otherwise, initialize the queue */ + else + { + BSM_Request_Queue = Request; + } + + /* We're in FIFO mode */ + BSM_Request_Queue_End = Request; + + /* If we don't have a messaging thread running, then start one */ + if (BaseSrvpBSMThreadCount >= 1) + { + RtlLeaveCriticalSection(&BaseSrvDDDBSMCritSec); + } + else + { + RtlLeaveCriticalSection(&BaseSrvDDDBSMCritSec); + Status = CreateBSMThread(); + } + + return Status; +} + /* PUBLIC SERVER APIS *********************************************************/ CSR_API(BaseSrvDefineDosDevice) @@ -167,7 +490,7 @@ CSR_API(BaseSrvDefineDosDevice) BOOLEAN DriveLetter = FALSE; BOOLEAN RemoveDefinition; BOOLEAN HandleTarget; - BOOLEAN HandleSMB = FALSE; + BOOLEAN Broadcast = FALSE; BOOLEAN IsGlobal = FALSE; ULONG CchLengthLeft; ULONG CchLength; @@ -297,13 +620,19 @@ CSR_API(BaseSrvDefineDosDevice) _SEH2_LEAVE; } - /* While impersonating the caller, also get its LUID */ + /* + * While impersonating the caller, also get its LUID. + * This is mandatory in case we have a driver letter, + * Because we're in the case we've got LUID mapping + * enabled and broadcasting enabled. LUID will be required + * for the latter + */ if (DriveLetter) { Status = GetCallerLuid(&CallerLuid); if (NT_SUCCESS(Status)) { - HandleSMB = TRUE; + Broadcast = TRUE; } } @@ -744,10 +1073,31 @@ CSR_API(BaseSrvDefineDosDevice) /* Free our internal buffer */ RtlFreeHeap(BaseSrvHeap, 0, lpBuffer); - /* Handle SMB */ - if (DriveLetter && Status == STATUS_SUCCESS && HandleSMB) + /* Broadcast drive letter creation */ + if (DriveLetter && Status == STATUS_SUCCESS && Broadcast) { - UNIMPLEMENTED; + LUID SystemLuid = SYSTEM_LUID; + + /* If that's a global drive, broadcast as system */ + if (IsGlobal) + { + RtlCopyLuid(&CallerLuid, &SystemLuid); + } + + /* Broadcast the event */ + AddBSMRequest(AbsLetter, RemoveDefinition, &CallerLuid); + + /* + * If we removed drive, and the drive was shadowing a global one + * broadcast the arrival of the global drive (as system - global) + */ + if (RemoveDefinition && !RtlEqualLuid(&CallerLuid, &SystemLuid)) + { + if (CheckForGlobalDriveLetter(AbsLetter)) + { + AddBSMRequest(AbsLetter, FALSE, &CallerLuid); + } + } } /* Done! */ diff --git a/subsystems/win/basesrv/init.c b/subsystems/win/basesrv/init.c index a1bf0f8c021..0768f69e76a 100644 --- a/subsystems/win/basesrv/init.c +++ b/subsystems/win/basesrv/init.c @@ -580,7 +580,10 @@ BaseInitializeStaticServerData(IN PCSR_SERVER_DLL LoadedServerDll) NULL); ASSERT(NT_SUCCESS(Status)); BaseStaticServerData->LUIDDeviceMapsEnabled = (BOOLEAN)LuidEnabled; - if (!BaseStaticServerData->LUIDDeviceMapsEnabled) + + /* Initialize Global */ + if (!BaseStaticServerData->LUIDDeviceMapsEnabled || + NT_SUCCESS(RtlInitializeCriticalSectionAndSpinCount(&BaseSrvDDDBSMCritSec, 0x80000000))) { /* Make Global point back to BNO */ RtlInitUnicodeString(&DirectoryName, L"Global"); @@ -638,6 +641,11 @@ BaseInitializeStaticServerData(IN PCSR_SERVER_DLL LoadedServerDll) &ObjectAttributes); ASSERT(NT_SUCCESS(Status)); } + else + { + /* That should never happen */ + ASSERT(FALSE); + } /* Initialize NLS */ BaseSrvNLSInit(BaseStaticServerData);

1 0

[reactos] 04/07: [SDK] Add RtlInitString to the NDK
by Pierre Schweitzer 30 Jun '19

30 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=522821bb8b8b17cdfc037… commit 522821bb8b8b17cdfc03766b64b99465ac6ceeb8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Jun 20 08:56:05 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jun 30 23:07:54 2019 +0200 [SDK] Add RtlInitString to the NDK --- sdk/include/ndk/rtlfuncs.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index 8f5cdf07e5a..60cac48dc59 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -2201,6 +2201,22 @@ RtlHashUnicodeString( _Out_ PULONG HashValue ); +_IRQL_requires_max_(DISPATCH_LEVEL) +_At_(DestinationString->Buffer, _Post_equal_to_(SourceString)) +_When_(SourceString != NULL, +_At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString))) +_At_(DestinationString->MaximumLength, _Post_equal_to_(DestinationString->Length + sizeof(CHAR)))) +_When_(SourceString == NULL, +_At_(DestinationString->Length, _Post_equal_to_(0)) +_At_(DestinationString->MaximumLength, _Post_equal_to_(0))) +NTSYSAPI +VOID +NTAPI +RtlInitString( + _Out_ PSTRING DestinationString, + _In_opt_z_ __drv_aliasesMem PCSTR SourceString +); + _IRQL_requires_max_(DISPATCH_LEVEL) _At_(DestinationString->Buffer, _Post_equal_to_(SourceString)) _When_(SourceString != NULL,

1 0

[reactos] 03/07: [NTOSKRNL] Implement support for device maps in ObpLookupObjectName
by Pierre Schweitzer 30 Jun '19

30 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f13b6e025f89096cee0d2… commit f13b6e025f89096cee0d224b3d258f75ba356d3d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Jun 20 08:55:31 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jun 30 23:07:54 2019 +0200 [NTOSKRNL] Implement support for device maps in ObpLookupObjectName This allows getting rid of the ?? hack in the kernel but this doesn't allow enabling LUID device maps as ReactOS can no longer open a session with them enabled. So, we must remain with device maps at root CORE-16114 --- ntoskrnl/include/internal/ob.h | 6 ++++ ntoskrnl/ob/obname.c | 67 ++++++++++++++++++++++++++---------------- 2 files changed, 48 insertions(+), 25 deletions(-) diff --git a/ntoskrnl/include/internal/ob.h b/ntoskrnl/include/internal/ob.h index 266c4dd668c..41e1af894a9 100644 --- a/ntoskrnl/include/internal/ob.h +++ b/ntoskrnl/include/internal/ob.h @@ -443,6 +443,12 @@ ObIsLUIDDeviceMapsEnabled( VOID ); +PDEVICE_MAP +NTAPI +ObpReferenceDeviceMap( + VOID +); + // // Security descriptor cache functions // diff --git a/ntoskrnl/ob/obname.c b/ntoskrnl/ob/obname.c index 460338f0d48..9ba15a6d013 100644 --- a/ntoskrnl/ob/obname.c +++ b/ntoskrnl/ob/obname.c @@ -214,26 +214,6 @@ ObpCreateDosDevicesDirectory(VOID) if (!NT_SUCCESS(Status)) goto done; - /*********************************************\ - |*** HACK until we support device mappings ***| - |*** Add a symlink \??\ <--> \GLOBAL??\ ***| - \*********************************************/ - RtlInitUnicodeString(&LinkName, L"\\??"); - InitializeObjectAttributes(&ObjectAttributes, - &LinkName, - OBJ_PERMANENT, - NULL, - &DosDevicesSD); - Status = NtCreateSymbolicLinkObject(&SymHandle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes, - &RootName); - if (NT_SUCCESS(Status)) NtClose(SymHandle); - /*********************************************\ - \*********************************************/ - - // FIXME: Create a device mapping for the global \?? directory - /* * Initialize the \??\GLOBALROOT symbolic link * pointing to the root directory \ . @@ -490,6 +470,8 @@ ObpLookupObjectName(IN HANDLE RootHandle OPTIONAL, PWCHAR NewName; POBJECT_HEADER_NAME_INFO ObjectNameInfo; ULONG MaxReparse = 30; + PDEVICE_MAP DeviceMap = NULL; + UNICODE_STRING LocalName; PAGED_CODE(); OBTRACE(OB_NAMESPACE_DEBUG, "%s - Finding Object: %wZ. Expecting: %p\n", @@ -642,6 +624,8 @@ ObpLookupObjectName(IN HANDLE RootHandle OPTIONAL, *FoundObject = Object; return Status; } + + LocalName = *ObjectName; } else { @@ -695,7 +679,14 @@ ObpLookupObjectName(IN HANDLE RootHandle OPTIONAL, else { ParseFromRoot: - /* FIXME: Check if we have a device map */ + LocalName = *ObjectName; + + /* Deference the device map if we already have one */ + if (DeviceMap != NULL) + { + ObfDereferenceDeviceMap(DeviceMap); + DeviceMap = NULL; + } /* Check if this is a possible DOS name */ if (!((ULONG_PTR)(ObjectName->Buffer) & 7)) @@ -713,7 +704,17 @@ ParseFromRoot: (*(PULONGLONG)(ObjectName->Buffer) == ObpDosDevicesShortNamePrefix.Alignment.QuadPart)) { - /* FIXME! */ + DeviceMap = ObpReferenceDeviceMap(); + /* We have a local mapping, drop the ?? prefix */ + if (DeviceMap != NULL && DeviceMap->DosDevicesDirectory != NULL) + { + LocalName.Length -= ObpDosDevicesShortName.Length; + LocalName.MaximumLength -= ObpDosDevicesShortName.Length; + LocalName.Buffer += (ObpDosDevicesShortName.Length / sizeof(WCHAR)); + + /* We'll browse that local directory */ + Directory = DeviceMap->DosDevicesDirectory; + } } else if ((ObjectName->Length == ObpDosDevicesShortName.Length - sizeof(WCHAR)) && @@ -722,7 +723,23 @@ ParseFromRoot: (*((PWCHAR)(ObjectName->Buffer) + 2) == (WCHAR)(ObpDosDevicesShortNameRoot.Alignment.HighPart))) { - /* FIXME! */ + DeviceMap = ObpReferenceDeviceMap(); + + /* Caller is looking for the directory itself */ + if (DeviceMap != NULL && DeviceMap->DosDevicesDirectory != NULL) + { + Status = ObReferenceObjectByPointer(DeviceMap->DosDevicesDirectory, + 0, + ObjectType, + AccessMode); + if (NT_SUCCESS(Status)) + { + *FoundObject = DeviceMap->DosDevicesDirectory; + } + + ObfDereferenceDeviceMap(DeviceMap); + return Status; + } } } } @@ -740,7 +757,7 @@ ParseFromRoot: while (Reparse && MaxReparse) { /* Get the name */ - RemainingName = *ObjectName; + RemainingName = LocalName; /* Disable reparsing again */ Reparse = FALSE; @@ -1149,7 +1166,7 @@ ReparseObject: } /* Check if we have a device map and dereference it if so */ - //if (DeviceMap) ObfDereferenceDeviceMap(DeviceMap); + if (DeviceMap) ObfDereferenceDeviceMap(DeviceMap); /* Check if we have a referenced directory and dereference it if so */ if (ReferencedDirectory) ObDereferenceObject(ReferencedDirectory);

1 0

[reactos] 02/07: [KMTESTS:OB] Add support for LUID mappings being disabled in ObSecurity tests
by Pierre Schweitzer 30 Jun '19

30 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f529033555bdfe7fb090e… commit f529033555bdfe7fb090e8f21f1191187b21706b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Jun 20 08:53:27 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jun 30 23:07:54 2019 +0200 [KMTESTS:OB] Add support for LUID mappings being disabled in ObSecurity tests CORE-16114 --- modules/rostests/kmtests/include/kmt_platform.h | 1 + modules/rostests/kmtests/ntos_ob/ObSecurity.c | 52 ++++++++++++++++++++----- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/modules/rostests/kmtests/include/kmt_platform.h b/modules/rostests/kmtests/include/kmt_platform.h index 4895bf25a31..2cdc9b655c8 100644 --- a/modules/rostests/kmtests/include/kmt_platform.h +++ b/modules/rostests/kmtests/include/kmt_platform.h @@ -24,6 +24,7 @@ #include <ndk/kefuncs.h> #include <ndk/mmfuncs.h> #include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> #include <ndk/sefuncs.h> #include <ntstrsafe.h> #if defined KMT_FILTER_DRIVER diff --git a/modules/rostests/kmtests/ntos_ob/ObSecurity.c b/modules/rostests/kmtests/ntos_ob/ObSecurity.c index 4ac9478074a..55f5a0fe4cb 100644 --- a/modules/rostests/kmtests/ntos_ob/ObSecurity.c +++ b/modules/rostests/kmtests/ntos_ob/ObSecurity.c @@ -124,18 +124,52 @@ CheckDirectorySecurity__( START_TEST(ObSecurity) { + NTSTATUS Status; + /* Assume yes, that's the default on W2K3 */ + ULONG LUIDMappingsEnabled = 1, ReturnLength; + #define DIRECTORY_GENERIC_READ STANDARD_RIGHTS_READ | DIRECTORY_TRAVERSE | DIRECTORY_QUERY #define DIRECTORY_GENERIC_WRITE STANDARD_RIGHTS_WRITE | DIRECTORY_CREATE_SUBDIRECTORY | DIRECTORY_CREATE_OBJECT - CheckDirectorySecurityWithOwnerAndGroup(L"\\??", SeExports->SeAliasAdminsSid, NULL, // Group is "Domain Users" - 4, ACCESS_ALLOWED_ACE_TYPE, CONTAINER_INHERIT_ACE | - OBJECT_INHERIT_ACE, SeExports->SeLocalSystemSid, DIRECTORY_ALL_ACCESS, - ACCESS_ALLOWED_ACE_TYPE, CONTAINER_INHERIT_ACE | - OBJECT_INHERIT_ACE, SeExports->SeAliasAdminsSid, DIRECTORY_ALL_ACCESS, - ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, DIRECTORY_ALL_ACCESS, - ACCESS_ALLOWED_ACE_TYPE, INHERIT_ONLY_ACE | - CONTAINER_INHERIT_ACE | - OBJECT_INHERIT_ACE, SeExports->SeCreatorOwnerSid,GENERIC_ALL); + /* Check if LUID device maps are enabled */ + Status = ZwQueryInformationProcess(NtCurrentProcess(), + ProcessLUIDDeviceMapsEnabled, + &LUIDMappingsEnabled, + sizeof(LUIDMappingsEnabled), + &ReturnLength); + ok(NT_SUCCESS(Status), "NtQueryInformationProcess failed: 0x%x\n", Status); + + trace("LUID mappings are enabled: %d\n", LUIDMappingsEnabled); + if (LUIDMappingsEnabled != 0) + { + CheckDirectorySecurityWithOwnerAndGroup(L"\\??", SeExports->SeAliasAdminsSid, NULL, // Group is "Domain Users" + 4, ACCESS_ALLOWED_ACE_TYPE, CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeLocalSystemSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeAliasAdminsSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, INHERIT_ONLY_ACE | + CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeCreatorOwnerSid,GENERIC_ALL); + } + else + { + CheckDirectorySecurityWithOwnerAndGroup(L"\\??", SeExports->SeAliasAdminsSid, NULL, // Group is "Domain Users" + 6, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeWorldSid, READ_CONTROL | DIRECTORY_TRAVERSE | DIRECTORY_QUERY, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, INHERIT_ONLY_ACE | + CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeWorldSid, GENERIC_EXECUTE, + ACCESS_ALLOWED_ACE_TYPE, INHERIT_ONLY_ACE | + CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeAliasAdminsSid,GENERIC_ALL, + ACCESS_ALLOWED_ACE_TYPE, INHERIT_ONLY_ACE | + CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeLocalSystemSid,GENERIC_ALL, + ACCESS_ALLOWED_ACE_TYPE, INHERIT_ONLY_ACE | + CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeCreatorOwnerSid,GENERIC_ALL); + } CheckDirectorySecurity(L"\\", 4, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeWorldSid, DIRECTORY_GENERIC_READ,

1 0

[reactos] 01/07: [SDK] Properly define ZwQueryInformationProcess
by Thomas Faber 30 Jun '19

30 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cde208c6bfe1ac9091a5… commit 6cde208c6bfe1ac9091a53e1330f291145dc4d80 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Jun 20 08:45:24 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jun 30 23:07:54 2019 +0200 [SDK] Properly define ZwQueryInformationProcess --- sdk/include/ndk/psfuncs.h | 2 -- sdk/include/xdk/zwfuncs.h | 11 ----------- 2 files changed, 13 deletions(-) diff --git a/sdk/include/ndk/psfuncs.h b/sdk/include/ndk/psfuncs.h index 8718ae51bb3..76f2dc94ea4 100644 --- a/sdk/include/ndk/psfuncs.h +++ b/sdk/include/ndk/psfuncs.h @@ -759,7 +759,6 @@ ZwQueryInformationJobObject( _Out_ PULONG ReturnLength ); -#ifndef _NTDDK_ NTSYSAPI NTSTATUS NTAPI @@ -770,7 +769,6 @@ ZwQueryInformationProcess( _In_ ULONG ProcessInformationLength, _Out_opt_ PULONG ReturnLength ); -#endif NTSYSAPI NTSTATUS diff --git a/sdk/include/xdk/zwfuncs.h b/sdk/include/xdk/zwfuncs.h index 69d778401a3..8b22735f781 100644 --- a/sdk/include/xdk/zwfuncs.h +++ b/sdk/include/xdk/zwfuncs.h @@ -1408,17 +1408,6 @@ ZwQueryDirectoryObject( ); #endif /* (VER_PRODUCTBUILD >= 2195) */ -NTSYSAPI -NTSTATUS -NTAPI -ZwQueryInformationProcess ( - _In_ HANDLE ProcessHandle, - _In_ PROCESSINFOCLASS ProcessInformationClass, - _Out_ PVOID ProcessInformation, - _In_ ULONG ProcessInformationLength, - _Out_opt_ PULONG ReturnLength -); - NTSYSAPI NTSTATUS NTAPI

1 0

[reactos] 01/01: [MEDIA][FONTS] Disable sserife.fon font file
by Katayama Hirofumi MZ 30 Jun '19

30 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2b4fad771677c533e8c2… commit a2b4fad771677c533e8c2c036bfbb334f5523718 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 1 05:17:29 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jul 1 05:17:29 2019 +0900 [MEDIA][FONTS] Disable sserife.fon font file --- media/fonts/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 670f584703c..d28e48ba019 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -126,7 +126,7 @@ list(APPEND FONT_FILES SourceCodePro-Regular.ttf SourceCodePro-Semibold.ttf SourceCodePro-SemiboldIt.ttf - sserife.fon + #sserife.fon UniVGA16.ttf) foreach(item ${FONT_FILES})

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs