Ros-diffs June 2021

ros-diffs@reactos.org

19 participants
228 discussions

[reactos] 02/02: [NTOS:MM] Fix remnants of CORE-17587

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5ea259b2864b25b62bf1… commit a5ea259b2864b25b62bf1bb4045c6961877a342a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Jun 1 10:32:12 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Jun 7 17:04:18 2021 +0200 [NTOS:MM] Fix remnants of CORE-17587 --- ntoskrnl/mm/i386/page.c | 26 +++++++++++++++++--------- ntoskrnl/mm/section.c | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index 3e5f5797218..d15a9f74964 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -540,6 +540,10 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, /* Make sure our PDE is valid, and that everything is going fine */ if (Process == NULL) { + /* We don't support this in legacy Mm for kernel mappings */ + ASSERT(ProtectionMask != MM_WRITECOPY); + ASSERT(ProtectionMask != MM_EXECUTE_WRITECOPY); + if (Address < MmSystemRangeStart) { DPRINT1("NULL process given for user-mode mapping at %p\n", Address); @@ -567,14 +571,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, PointerPte = MiAddressToPte(Address); - if (Address >= MmSystemRangeStart) - { - MI_MAKE_HARDWARE_PTE_KERNEL(&TempPte, PointerPte, ProtectionMask, Page); - } - else - { - MI_MAKE_HARDWARE_PTE_USER(&TempPte, PointerPte, ProtectionMask, Page); - } + MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, ProtectionMask, Page); Pte = InterlockedExchangePte(PointerPte, TempPte.u.Long); /* There should not have been anything valid here */ @@ -710,7 +707,18 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) PointerPte = MiAddressToPte(Address); - MI_MAKE_HARDWARE_PTE_USER(&TempPte, PointerPte, ProtectionMask, PFN_FROM_PTE(PointerPte)); + /* Sanity check */ + ASSERT(PointerPte->u.Hard.Owner == 1); + + TempPte.u.Long = 0; + TempPte.u.Hard.PageFrameNumber = PointerPte->u.Hard.PageFrameNumber; + TempPte.u.Long |= MmProtectToPteMask[ProtectionMask]; + TempPte.u.Hard.Owner = 1; + + /* Only set valid bit if we have to */ + if ((ProtectionMask != MM_NOACCESS) && !FlagOn(ProtectionMask, MM_GUARDPAGE)) + TempPte.u.Hard.Valid = 1; + /* Keep dirty & accessed bits */ TempPte.u.Hard.Accessed = PointerPte->u.Hard.Accessed; TempPte.u.Hard.Dirty = PointerPte->u.Hard.Dirty; diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 005e686e771..c6b618cdbf8 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1474,7 +1474,7 @@ MmAlterViewAttributes(PMMSUPPORT AddressSpace, * If we doing COW for this segment then check if the page is * already private. */ - if (DoCOW && MmIsPagePresent(Process, Address)) + if (DoCOW && (MmIsPagePresent(Process, Address) || MmIsDisabledPage(Process, Address))) { LARGE_INTEGER Offset; ULONG_PTR Entry;

3 years, 4 months

[reactos] 01/02: [NTOS:MM] Make MI_MAKE_HARDWARE_PTE_KERNEL actually respect the protection it is given

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ddc66f224d96fb481aa8… commit 4ddc66f224d96fb481aa8c1cf9a223b94d631e55 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu May 27 19:17:13 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Jun 7 17:04:18 2021 +0200 [NTOS:MM] Make MI_MAKE_HARDWARE_PTE_KERNEL actually respect the protection it is given This one would set a page as writable & dirty even if MM_READONLY was passed CORE-17587 --- ntoskrnl/mm/ARM3/miarm.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index 730acdd8bf1..a784d08e15f 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -790,12 +790,23 @@ MI_MAKE_HARDWARE_PTE_KERNEL(IN PMMPTE NewPte, ASSERT(!MI_IS_SESSION_PTE(MappingPte)); ASSERT((MappingPte < (PMMPTE)PDE_BASE) || (MappingPte > (PMMPTE)PDE_TOP)); + /* Check that we are not setting valid a page that should not be */ + ASSERT(ProtectionMask & MM_PROTECT_ACCESS); + ASSERT((ProtectionMask & MM_GUARDPAGE) == 0); + /* Start fresh */ - *NewPte = ValidKernelPte; + NewPte->u.Long = 0; /* Set the protection and page */ NewPte->u.Hard.PageFrameNumber = PageFrameNumber; NewPte->u.Long |= MmProtectToPteMask[ProtectionMask]; + + /* Make this valid & global */ +#ifdef _GLOBAL_PAGES_ARE_AWESOME_ + if (KeFeatureBits & KF_GLOBAL_PAGE) + NewPte->u.Hard.Global = 1; +#endif + NewPte->u.Hard.Valid = 1; } // @@ -808,6 +819,10 @@ MI_MAKE_HARDWARE_PTE(IN PMMPTE NewPte, IN ULONG_PTR ProtectionMask, IN PFN_NUMBER PageFrameNumber) { + /* Check that we are not setting valid a page that should not be */ + ASSERT(ProtectionMask & MM_PROTECT_ACCESS); + ASSERT((ProtectionMask & MM_GUARDPAGE) == 0); + /* Set the protection and page */ NewPte->u.Long = MiDetermineUserGlobalPteMask(MappingPte); NewPte->u.Long |= MmProtectToPteMask[ProtectionMask]; @@ -830,7 +845,10 @@ MI_MAKE_HARDWARE_PTE_USER(IN PMMPTE NewPte, /* Start fresh */ NewPte->u.Long = 0; - /* Set the protection and page */ + /* Check that we are not setting valid a page that should not be */ + ASSERT(ProtectionMask & MM_PROTECT_ACCESS); + ASSERT((ProtectionMask & MM_GUARDPAGE) == 0); + NewPte->u.Hard.Valid = TRUE; NewPte->u.Hard.Owner = TRUE; NewPte->u.Hard.PageFrameNumber = PageFrameNumber;

3 years, 4 months

[reactos] 01/01: [CPL][APPWIZ] Follow-up of #3726

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46c84779b6b07f1b9a172… commit 46c84779b6b07f1b9a172c6b357eba458770d1a2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 7 18:03:49 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jun 7 18:03:49 2021 +0900 [CPL][APPWIZ] Follow-up of #3726 Sorry, #3726 doesn't fix CORE-5737. CORE-17550 --- dll/cpl/appwiz/addons.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dll/cpl/appwiz/addons.c b/dll/cpl/appwiz/addons.c index b9c089f744f..ae51aa4849a 100644 --- a/dll/cpl/appwiz/addons.c +++ b/dll/cpl/appwiz/addons.c @@ -388,17 +388,10 @@ static DWORD WINAPI download_proc(PVOID arg) static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - HWND hwndProgress, hwndInstallButton; + HWND hwndInstallButton; switch(msg) { case WM_INITDIALOG: - - hwndProgress = GetDlgItem(hwnd, ID_DWL_PROGRESS); - if (hwndProgress == GetFocus()) /* Avoid CORE-5737 */ - { - SendMessageW(hwnd, WM_NEXTDLGCTL, 0, FALSE); - } - ShowWindow(hwndProgress, SW_HIDE); - + ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_HIDE); install_dialog = hwnd; return TRUE;

3 years, 4 months

[reactos] 01/01: [USETUP] Polish translation update (#3715)

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab1f844189676355d9bd2… commit ab1f844189676355d9bd25c64ca88152a026b811 Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Mon Jun 7 10:31:32 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jun 7 10:31:32 2021 +0200 [USETUP] Polish translation update (#3715) --- base/setup/usetup/lang/pl-PL.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 74f38adb369..7c735287b95 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -8,6 +8,7 @@ * IRC: irc.freenode.net #reactos-pl; * Updated by Wojo664 (July, 2014) * Updated by Saibamen (July, 2015) + * Updated by Piotr Hetnarowicz (June, 2021) */ #pragma once @@ -1546,7 +1547,7 @@ static MUI_ENTRY plPLBootLoaderInstallPageEntries[] = { 0, 0, - "Installing the bootloader onto the media, please wait...", + "Instalacja mened\276era rozruchu na no\230niku, prosz\251 czeka\206...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1815,19 +1816,22 @@ static MUI_ENTRY plPLRegistryEntries[] = 4, 3, " Instalator ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE + TEXT_STYLE_UNDERLINE, + TEXT_ID_STATIC }, { 6, 8, "Instalator uaktualnia w\210a\230nie konfiguracj\251 systemu.", - TEXT_STYLE_NORMAL + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC }, { 0, 0, "Tworzenie ga\210\251zi rejestru...", - TEXT_TYPE_STATUS | TEXT_PADDING_BIG + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + TEXT_ID_STATIC }, { 0, @@ -1848,7 +1852,7 @@ MUI_ERROR plPLErrorEntries[] = // ERROR_NOT_INSTALLED "System ReactOS nie zosta\210 w pe\210ni zainstalowany na twoim\n" "komputerze. Je\230li wyjdziesz teraz, trzeba b\251dzie\n" - "ponownie uruchomi\206 instalator, by zainstalowa\206 system ReactOS.\n" + "ponownie uruchomi\206 instalatora, by zainstalowa\206 system ReactOS.\n" "\n" " \x07 Naci\230nij ENTER, aby kontynuowa\206 instalacj\251.\n" " \x07 Naci\230nij F3, aby wyj\230\206 z instalatora.",

3 years, 4 months

[reactos] 01/01: [VIDEOPRT] Fix monitor ID decoding issues

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4db8b82aeb1c1f9a968e1… commit 4db8b82aeb1c1f9a968e13dc0e20b5349e937741 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jun 6 21:26:34 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jun 6 21:27:00 2021 +0200 [VIDEOPRT] Fix monitor ID decoding issues --- win32ss/drivers/videoprt/child.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win32ss/drivers/videoprt/child.c b/win32ss/drivers/videoprt/child.c index 2c280850a8b..2d74070ff88 100644 --- a/win32ss/drivers/videoprt/child.c +++ b/win32ss/drivers/videoprt/child.c @@ -40,10 +40,12 @@ IntVideoPortGetMonitorId( /* 3 letters 5-bit ANSI manufacturer code (big endian) */ /* Letters encoded as A=1 to Z=26 */ - Manufacturer = *(PUSHORT)(&ChildExtension->ChildDescriptor[8]); + Manufacturer = ((USHORT)ChildExtension->ChildDescriptor[8] << 8) + + (USHORT)ChildExtension->ChildDescriptor[9]; /* Model number (16-bit little endian) */ - Model = *(PUSHORT)(&ChildExtension->ChildDescriptor[10]); + Model = ((USHORT)ChildExtension->ChildDescriptor[11] << 8) + + (USHORT)ChildExtension->ChildDescriptor[10]; /* Convert the Monitor ID to a readable form */ swprintf(Buffer,

3 years, 4 months

[reactos] 01/01: [NTOS:PS] Enable alignment probing for thread/process information classes

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a330b56787951d897eec0… commit a330b56787951d897eec0706b4649a452f8ba623 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon May 3 15:46:35 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Jun 6 17:14:22 2021 +0200 [NTOS:PS] Enable alignment probing for thread/process information classes In addition to that, here are some stuff done in this commit whilst testing: - ICIF_QUERY_SIZE_VARIABLE and friends were badly misused, they should be used only when an information class whose information length size is dyanmic and not fixed. By removing such flags from erroneous classes, this fixes the STATUS_INFO_LENGTH_MISMATCH testcases. - Use CHAR instead of UCHAR for classes that do not need alignment probing, as every other class in the table do, for the sake of consistency. - ProcessEnableAlignmentFaultFixup uses BOOLEAN as type size, not CHAR. This fixes a testcase failure on ROS. - Check for information length size before proceeding further on querying the process' cookie information. - ProcessHandleTracing wants an alignment of a ULONG, not CHAR. - Move PROCESS_LDT_INFORMATION and PROCESS_LDT_SIZE outside of NTOS_MODE_USER macro case. This fixes a compilation issue when enabling the alignment probing. My mistake of having them inside NTOS_MODE_USER case, sorry. - On functions like NtQueryInformationThread and the Process equivalent, complete probing is not done at the beginning of the function, complete probing including if the buffer is writable alongside with datatype misalignment check that is. Instead such check is done on each information class case basis. With that said, we have to explicitly tell DefaultQueryInfoBufferCheck if we want a complete probing or not initially. --- ntoskrnl/ex/event.c | 3 +- ntoskrnl/ex/mutant.c | 3 +- ntoskrnl/ex/sem.c | 3 +- ntoskrnl/ex/timer.c | 3 +- ntoskrnl/include/internal/probe.h | 18 ++++-- ntoskrnl/include/internal/ps_i.h | 112 +++++++++++++++++++------------------- ntoskrnl/include/ntoskrnl.h | 3 + ntoskrnl/io/iomgr/iocomp.c | 3 +- ntoskrnl/ps/query.c | 89 +++++++++++++++--------------- ntoskrnl/se/token.c | 3 +- sdk/include/ndk/pstypes.h | 24 ++++---- 11 files changed, 141 insertions(+), 123 deletions(-) diff --git a/ntoskrnl/ex/event.c b/ntoskrnl/ex/event.c index 0f7d6d3bbd0..e30420f65bb 100644 --- a/ntoskrnl/ex/event.c +++ b/ntoskrnl/ex/event.c @@ -333,7 +333,8 @@ NtQueryEvent(IN HANDLE EventHandle, EventInformationLength, ReturnLength, NULL, - PreviousMode); + PreviousMode, + TRUE); if(!NT_SUCCESS(Status)) { /* Invalid buffers */ diff --git a/ntoskrnl/ex/mutant.c b/ntoskrnl/ex/mutant.c index ff5772beff2..bab471c6173 100644 --- a/ntoskrnl/ex/mutant.c +++ b/ntoskrnl/ex/mutant.c @@ -243,7 +243,8 @@ NtQueryMutant(IN HANDLE MutantHandle, MutantInformationLength, ResultLength, NULL, - PreviousMode); + PreviousMode, + TRUE); if(!NT_SUCCESS(Status)) { DPRINT("NtQueryMutant() failed, Status: 0x%x\n", Status); diff --git a/ntoskrnl/ex/sem.c b/ntoskrnl/ex/sem.c index 8a1810d5db7..29c622814ff 100644 --- a/ntoskrnl/ex/sem.c +++ b/ntoskrnl/ex/sem.c @@ -239,7 +239,8 @@ NtQuerySemaphore(IN HANDLE SemaphoreHandle, SemaphoreInformationLength, ReturnLength, NULL, - PreviousMode); + PreviousMode, + TRUE); if (!NT_SUCCESS(Status)) { /* Invalid buffers */ diff --git a/ntoskrnl/ex/timer.c b/ntoskrnl/ex/timer.c index 129881dc5d9..0ce7af03156 100644 --- a/ntoskrnl/ex/timer.c +++ b/ntoskrnl/ex/timer.c @@ -536,7 +536,8 @@ NtQueryTimer(IN HANDLE TimerHandle, TimerInformationLength, ReturnLength, NULL, - PreviousMode); + PreviousMode, + TRUE); if (!NT_SUCCESS(Status)) return Status; /* Get the Timer Object */ diff --git a/ntoskrnl/include/internal/probe.h b/ntoskrnl/include/internal/probe.h index f02af658779..b819718f5ae 100644 --- a/ntoskrnl/include/internal/probe.h +++ b/ntoskrnl/include/internal/probe.h @@ -63,7 +63,8 @@ DefaultQueryInfoBufferCheck(ULONG Class, ULONG BufferLength, PULONG ReturnLength, PULONG_PTR ReturnLengthPtr, - KPROCESSOR_MODE PreviousMode) + KPROCESSOR_MODE PreviousMode, + BOOLEAN CompleteProbing) { NTSTATUS Status = STATUS_SUCCESS; @@ -90,9 +91,18 @@ DefaultQueryInfoBufferCheck(ULONG Class, { if (Buffer != NULL) { - ProbeForWrite(Buffer, - BufferLength, - ClassList[Class].AlignmentQUERY); + if (!CompleteProbing) + { + ProbeForRead(Buffer, + BufferLength, + ClassList[Class].AlignmentQUERY); + } + else + { + ProbeForWrite(Buffer, + BufferLength, + ClassList[Class].AlignmentQUERY); + } } if (ReturnLength != NULL) diff --git a/ntoskrnl/include/internal/ps_i.h b/ntoskrnl/include/internal/ps_i.h index 0f0a58e968f..85de26d8814 100644 --- a/ntoskrnl/include/internal/ps_i.h +++ b/ntoskrnl/include/internal/ps_i.h @@ -19,7 +19,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( PROCESS_BASIC_INFORMATION, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ProcessQuotaLimits */ @@ -27,7 +27,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( QUOTA_LIMITS, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ProcessIoCounters */ @@ -35,7 +35,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( IO_COUNTERS, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ProcessVmCounters */ @@ -51,7 +51,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( KERNEL_USER_TIMES, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ProcessBasePriority */ @@ -59,7 +59,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( KPRIORITY, ULONG, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ProcessRaisePriority */ @@ -67,7 +67,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( ULONG, ULONG, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ProcessDebugPort */ @@ -75,7 +75,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( HANDLE, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ProcessExceptionPort */ @@ -83,7 +83,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( HANDLE, ULONG, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ProcessAccessToken */ @@ -91,7 +91,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( PROCESS_ACCESS_TOKEN, ULONG, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ProcessLdtInformation */ @@ -99,7 +99,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( PROCESS_LDT_INFORMATION, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ProcessLdtSize */ @@ -107,7 +107,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( PROCESS_LDT_SIZE, ULONG, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ProcessDefaultHardErrorMode */ @@ -115,7 +115,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ProcessIoPortHandlers */ @@ -123,7 +123,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( UCHAR, ULONG, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ProcessPooledUsageAndLimits */ @@ -131,7 +131,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( POOLED_USAGE_AND_LIMITS, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ProcessWorkingSetWatch */ @@ -139,7 +139,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( PROCESS_WS_WATCH_INFORMATION, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), /* ProcessUserModeIOPL */ @@ -147,17 +147,17 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( UCHAR, ULONG, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ProcessEnableAlignmentFaultFixup */ IQS ( - CHAR, + BOOLEAN, CHAR, BOOLEAN, - UCHAR, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + CHAR, + ICIF_SET ), /* ProcessPriorityClass */ @@ -167,7 +167,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ULONG, PROCESS_PRIORITY_CLASS, CHAR, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ProcessWx86Information */ @@ -175,7 +175,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ProcessHandleCount */ @@ -183,7 +183,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ProcessAffinityMask */ @@ -191,7 +191,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( KAFFINITY, ULONG, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ProcessPriorityBoost */ @@ -199,7 +199,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ProcessDeviceMap */ @@ -209,7 +209,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ULONG, RTL_FIELD_TYPE(PROCESS_DEVICEMAP_INFORMATION, Set), ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ProcessSessionInformation */ @@ -217,7 +217,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( PROCESS_SESSION_INFORMATION, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ProcessForegroundInformation */ @@ -226,8 +226,8 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = CHAR, CHAR, BOOLEAN, - UCHAR, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + CHAR, + ICIF_SET ), /* ProcessWow64Information */ @@ -235,7 +235,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ProcessImageFileName */ @@ -251,7 +251,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ProcessBreakOnTermination */ @@ -259,7 +259,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ProcessDebugObjectHandle */ @@ -267,7 +267,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( HANDLE, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ProcessDebugFlags */ @@ -275,17 +275,17 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ProcessHandleTracing */ IQS ( PROCESS_HANDLE_TRACING_QUERY, - CHAR, ULONG, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ULONG, + ICIF_QUERY | ICIF_SET ), /* ProcessIoPriority */ @@ -301,7 +301,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ProcessTlsInformation */ @@ -317,7 +317,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ProcessImageInformation */ @@ -325,7 +325,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ( SECTION_IMAGE_INFORMATION, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ProcessCycleTime */ @@ -411,7 +411,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( THREAD_BASIC_INFORMATION, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ThreadTimes */ @@ -419,7 +419,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( KERNEL_USER_TIMES, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ThreadPriority */ @@ -427,7 +427,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( KPRIORITY, ULONG, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ThreadBasePriority */ @@ -435,7 +435,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( LONG, ULONG, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ThreadAffinityMask */ @@ -443,7 +443,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( KAFFINITY, ULONG, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ThreadImpersonationToken */ @@ -451,7 +451,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( HANDLE, ULONG, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ThreadDescriptorTableEntry is only implemented in x86 as well as the descriptor entry */ @@ -461,7 +461,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( DESCRIPTOR_TABLE_ENTRY, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), #else IQS_NONE, @@ -474,7 +474,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = CHAR, BOOLEAN, UCHAR, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ThreadEventPair_Reusable */ @@ -492,7 +492,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ULONG, ULONG_PTR, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ThreadZeroTlsCell */ @@ -500,7 +500,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( ULONG_PTR, ULONG, - ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_SET ), /* ThreadPerformanceCount */ @@ -508,7 +508,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( LARGE_INTEGER, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ThreadAmILastThread */ @@ -516,7 +516,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ThreadIdealProcessor */ @@ -524,7 +524,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( ULONG_PTR, ULONG, - ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_SET ), /* ThreadPriorityBoost */ @@ -534,7 +534,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ULONG, ULONG_PTR, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ThreadSetTlsArrayAddress */ @@ -550,7 +550,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ThreadHideFromDebugger */ @@ -566,7 +566,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE + ICIF_QUERY | ICIF_SET ), /* ThreadSwitchLegacyState */ @@ -574,7 +574,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( ULONG, ULONG, - ICIF_SET | ICIF_SET_SIZE_VARIABLE + ICIF_SET ), /* ThreadIsTerminated */ @@ -582,7 +582,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = ( ULONG, ULONG, - ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE + ICIF_QUERY ), /* ThreadLastSystemCall */ diff --git a/ntoskrnl/include/ntoskrnl.h b/ntoskrnl/include/ntoskrnl.h index a6ac78b4827..643562e60f0 100644 --- a/ntoskrnl/include/ntoskrnl.h +++ b/ntoskrnl/include/ntoskrnl.h @@ -124,6 +124,9 @@ C_ASSERT(MAX_WIN32_PATH == MAX_PATH); #include "internal/probe.h" #include "resource.h" +/* Internal Ps alignment probing header */ +#include "internal/ps_i.h" + #ifdef _MSC_VER # pragma section("INITDATA", read,write,discard) #endif diff --git a/ntoskrnl/io/iomgr/iocomp.c b/ntoskrnl/io/iomgr/iocomp.c index df883d476a5..41457a66574 100644 --- a/ntoskrnl/io/iomgr/iocomp.c +++ b/ntoskrnl/io/iomgr/iocomp.c @@ -399,7 +399,8 @@ NtQueryIoCompletion(IN HANDLE IoCompletionHandle, IoCompletionInformationLength, ResultLength, NULL, - PreviousMode); + PreviousMode, + TRUE); if (!NT_SUCCESS(Status)) return Status; /* Get the Object */ diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index 895c2db5d0d..5c28b03d068 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -86,26 +86,20 @@ NtQueryInformationProcess( ULONG Flags; PAGED_CODE(); - /* Check for user-mode caller */ - if (PreviousMode != KernelMode) + /* Verify Information Class validity */ + Status = DefaultQueryInfoBufferCheck(ProcessInformationClass, + PsProcessInfoClass, + RTL_NUMBER_OF(PsProcessInfoClass), + ProcessInformation, + ProcessInformationLength, + ReturnLength, + NULL, + PreviousMode, + FALSE); + if (!NT_SUCCESS(Status)) { - /* Prepare to probe parameters */ - _SEH2_TRY - { - /* Probe the buffer */ - ProbeForRead(ProcessInformation, - ProcessInformationLength, - sizeof(ULONG)); - - /* Probe the return length if required */ - if (ReturnLength) ProbeForWriteUlong(ReturnLength); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; + DPRINT1("NtQueryInformationProcess(): Information verification class failed! (Status -> 0x%lx, ProcessInformationClass -> %lx)\n", Status, ProcessInformationClass); + return Status; } if (((ProcessInformationClass == ProcessCookie) || @@ -794,6 +788,13 @@ NtQueryInformationProcess( /* Per-process security cookie */ case ProcessCookie: + if (ProcessInformationLength != sizeof(ULONG)) + { + /* Length size wrong, bail out */ + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + /* Get the current process and cookie */ Process = PsGetCurrentProcess(); Cookie = Process->Cookie; @@ -1131,15 +1132,17 @@ NtSetInformationProcess(IN HANDLE ProcessHandle, PAGED_CODE(); /* Verify Information Class validity */ -#if 0 Status = DefaultSetInfoBufferCheck(ProcessInformationClass, PsProcessInfoClass, RTL_NUMBER_OF(PsProcessInfoClass), ProcessInformation, ProcessInformationLength, PreviousMode); - if (!NT_SUCCESS(Status)) return Status; -#endif + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetInformationProcess(): Information verification class failed! (Status -> 0x%lx, ProcessInformationClass -> %lx)\n", Status, ProcessInformationClass); + return Status; + } /* Check what class this is */ Access = PROCESS_SET_INFORMATION; @@ -1846,7 +1849,7 @@ NtSetInformationProcess(IN HANDLE ProcessHandle, case ProcessEnableAlignmentFaultFixup: /* Check buffer length */ - if (ProcessInformationLength != sizeof(ULONG)) + if (ProcessInformationLength != sizeof(BOOLEAN)) { Status = STATUS_INFO_LENGTH_MISMATCH; break; @@ -2036,15 +2039,17 @@ NtSetInformationThread(IN HANDLE ThreadHandle, PAGED_CODE(); /* Verify Information Class validity */ -#if 0 Status = DefaultSetInfoBufferCheck(ThreadInformationClass, PsThreadInfoClass, RTL_NUMBER_OF(PsThreadInfoClass), ThreadInformation, ThreadInformationLength, PreviousMode); - if (!NT_SUCCESS(Status)) return Status; -#endif + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetInformationThread(): Information verification class failed! (Status -> 0x%lx, ThreadInformationClass -> %lx)\n", Status, ThreadInformationClass); + return Status; + } /* Check what kind of information class this is */ switch (ThreadInformationClass) @@ -2634,26 +2639,20 @@ NtQueryInformationThread(IN HANDLE ThreadHandle, ULONG ThreadTerminated; PAGED_CODE(); - /* Check if we were called from user mode */ - if (PreviousMode != KernelMode) + /* Verify Information Class validity */ + Status = DefaultQueryInfoBufferCheck(ThreadInformationClass, + PsThreadInfoClass, + RTL_NUMBER_OF(PsThreadInfoClass), + ThreadInformation, + ThreadInformationLength, + ReturnLength, + NULL, + PreviousMode, + FALSE); + if (!NT_SUCCESS(Status)) { - /* Enter SEH */ - _SEH2_TRY - { - /* Probe the buffer */ - ProbeForWrite(ThreadInformation, - ThreadInformationLength, - sizeof(ULONG)); - - /* Probe the return length if required */ - if (ReturnLength) ProbeForWriteUlong(ReturnLength); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; + DPRINT1("NtQueryInformationThread(): Information verification class failed! (Status -> 0x%lx , ThreadInformationClass -> %lx)\n", Status, ThreadInformationClass); + return Status; } /* Check what class this is */ diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index eb67cda7486..256e4b31d4c 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -2400,7 +2400,8 @@ NtQueryInformationToken( TokenInformationLength, ReturnLength, NULL, - PreviousMode); + PreviousMode, + TRUE); if (!NT_SUCCESS(Status)) { DPRINT("NtQueryInformationToken() failed, Status: 0x%x\n", Status); diff --git a/sdk/include/ndk/pstypes.h b/sdk/include/ndk/pstypes.h index 53e76516eed..3a47b04a560 100644 --- a/sdk/include/ndk/pstypes.h +++ b/sdk/include/ndk/pstypes.h @@ -911,18 +911,6 @@ typedef struct _POOLED_USAGE_AND_LIMITS SIZE_T PagefileLimit; } POOLED_USAGE_AND_LIMITS, *PPOOLED_USAGE_AND_LIMITS; -typedef struct _PROCESS_LDT_INFORMATION -{ - ULONG Start; - ULONG Length; - LDT_ENTRY LdtEntries[ANYSIZE_ARRAY]; -} PROCESS_LDT_INFORMATION, *PPROCESS_LDT_INFORMATION; - -typedef struct _PROCESS_LDT_SIZE -{ - ULONG Length; -} PROCESS_LDT_SIZE, *PPROCESS_LDT_SIZE; - typedef struct _PROCESS_WS_WATCH_INFORMATION { PVOID FaultingPc; @@ -951,6 +939,18 @@ typedef struct _PROCESS_HANDLE_TRACING_QUERY #endif +typedef struct _PROCESS_LDT_INFORMATION +{ + ULONG Start; + ULONG Length; + LDT_ENTRY LdtEntries[ANYSIZE_ARRAY]; +} PROCESS_LDT_INFORMATION, *PPROCESS_LDT_INFORMATION; + +typedef struct _PROCESS_LDT_SIZE +{ + ULONG Length; +} PROCESS_LDT_SIZE, *PPROCESS_LDT_SIZE; + typedef struct _PROCESS_PRIORITY_CLASS { BOOLEAN Foreground;

3 years, 4 months

[reactos] 01/01: [SHELL32_APITEST] ShellHook testcase Fix compiler error (addendum to #3289)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d30a1673d48602fceadf9… commit d30a1673d48602fceadf9e40dcd27603033c56a5 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jun 6 16:40:28 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jun 6 16:40:28 2021 +0200 [SHELL32_APITEST] ShellHook testcase Fix compiler error (addendum to #3289) addendum to 0.4.15-dev-1123-g 0089291751837d977431c85b6d8d6b1232fbb67b Fix a compiler error on RosBE2.1.6 GCC4.7.2 that I got when I merged this test back to 0.4.14RC: C:/0414rls/reactos/modules/rostests/apitests/shell32/ShellHook.cpp: In function 'LRESULT WindowProc(HWND, UINT, WPARAM, LPARAM)': C:/0414rls/reactos/modules/rostests/apitests/shell32/ShellHook.cpp:339:26: error : comparison between signed and unsigned integer expressions [-Werror=sign-compa re] cc1plus.exe: all warnings being treated as errors ninja: build stopped: subcommand failed. --- modules/rostests/apitests/shell32/ShellHook.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shell32/ShellHook.cpp b/modules/rostests/apitests/shell32/ShellHook.cpp index c1ab2eaa5df..0efabef3018 100644 --- a/modules/rostests/apitests/shell32/ShellHook.cpp +++ b/modules/rostests/apitests/shell32/ShellHook.cpp @@ -336,7 +336,7 @@ WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) INT i = (INT)wParam - ID_BURNING; DoTestEntryPart2(&s_entries[i]); ++i; - if (i == s_num_entries) + if (i == (INT)s_num_entries) { PostQuitMessage(0); break;

3 years, 4 months

[reactos] 01/01: [LSASRV] Notify all authentication packages of a session to be deleted

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ae7fc2b0479036b7421f… commit 6ae7fc2b0479036b7421f69ed9516082bfe52281 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jun 6 11:38:26 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jun 6 11:38:26 2021 +0200 [LSASRV] Notify all authentication packages of a session to be deleted --- dll/win32/lsasrv/authpackage.c | 19 +++++++++++++++++++ dll/win32/lsasrv/lsasrv.h | 5 +++++ dll/win32/lsasrv/session.c | 5 ++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dll/win32/lsasrv/authpackage.c b/dll/win32/lsasrv/authpackage.c index 8e509ed72e2..8a335be6d6b 100644 --- a/dll/win32/lsasrv/authpackage.c +++ b/dll/win32/lsasrv/authpackage.c @@ -541,6 +541,25 @@ LsapLookupAuthenticationPackage(PLSA_API_MSG RequestMsg, } +VOID +LsapTerminateLogon( + _In_ PLUID LogonId) +{ + PLIST_ENTRY ListEntry; + PAUTH_PACKAGE Package; + + ListEntry = PackageListHead.Flink; + while (ListEntry != &PackageListHead) + { + Package = CONTAINING_RECORD(ListEntry, AUTH_PACKAGE, Entry); + + Package->LsaApLogonTerminated(LogonId); + + ListEntry = ListEntry->Flink; + } +} + + NTSTATUS LsapCallAuthenticationPackage(PLSA_API_MSG RequestMsg, PLSAP_LOGON_CONTEXT LogonContext) diff --git a/dll/win32/lsasrv/lsasrv.h b/dll/win32/lsasrv/lsasrv.h index 5e1725f81b8..a73b66c672e 100644 --- a/dll/win32/lsasrv/lsasrv.h +++ b/dll/win32/lsasrv/lsasrv.h @@ -126,6 +126,11 @@ NTSTATUS LsapLogonUser(PLSA_API_MSG RequestMsg, PLSAP_LOGON_CONTEXT LogonContext); +VOID +LsapTerminateLogon( + _In_ PLUID LogonId); + + /* authport.c */ NTSTATUS StartAuthenticationPort(VOID); diff --git a/dll/win32/lsasrv/session.c b/dll/win32/lsasrv/session.c index 69775dba982..23ed33fbf55 100644 --- a/dll/win32/lsasrv/session.c +++ b/dll/win32/lsasrv/session.c @@ -210,7 +210,7 @@ LsapDeleteLogonSession(IN PLUID LogonId) if (Session == NULL) return STATUS_NO_SUCH_LOGON_SESSION; - TRACE("LsapDeleteLogonSession(<0x%lx,0x%lx>)\n", + TRACE("LsapDeleteLogonSession(0x%08lx%08lx)\n", LogonId->HighPart, LogonId->LowPart); /* Tell ntoskrnl to delete the logon session */ @@ -218,6 +218,9 @@ LsapDeleteLogonSession(IN PLUID LogonId) if (!NT_SUCCESS(Status)) return Status; + /* Notify the authentication packages */ + LsapTerminateLogon(LogonId); + /* Remove the session entry from the list */ RemoveEntryList(&Session->Entry); SessionCount--;

3 years, 4 months

[reactos] 01/01: [SHELL32_APITEST] Follow-up of #3723

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9eb566e707b6f5fbb9c84… commit 9eb566e707b6f5fbb9c843ec85771a93bb7fdb21 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jun 6 08:25:27 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Jun 6 08:25:27 2021 +0900 [SHELL32_APITEST] Follow-up of #3723 Strengthen FindExecutable testcase. CORE-17351, CORE-16898, CORE-17612 --- .../rostests/apitests/shell32/FindExecutable.cpp | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/modules/rostests/apitests/shell32/FindExecutable.cpp b/modules/rostests/apitests/shell32/FindExecutable.cpp index 2e18974dac4..07a673af8bd 100644 --- a/modules/rostests/apitests/shell32/FindExecutable.cpp +++ b/modules/rostests/apitests/shell32/FindExecutable.cpp @@ -48,6 +48,8 @@ static char s_win_test_exe[MAX_PATH]; static char s_sys_test_exe[MAX_PATH]; static char s_win_bat_file[MAX_PATH]; static char s_sys_bat_file[MAX_PATH]; +static char s_win_txt_file[MAX_PATH]; +static char s_sys_txt_file[MAX_PATH]; #define DIR_0 NULL #define DIR_1 "." @@ -97,6 +99,21 @@ static const TEST_ENTRY s_entries[] = { __LINE__, FALSE, "..\\notepad.exe", DIR_2, "" }, { __LINE__, FALSE, "..\\notepad.exe", DIR_3, "" }, { __LINE__, FALSE, "..\\notepad.exe", DIR_4, "" }, + { __LINE__, FALSE, ".\\notepad.exe", DIR_0, "" }, + { __LINE__, FALSE, ".\\notepad.exe", DIR_1, "" }, + { __LINE__, FALSE, ".\\notepad.exe", DIR_2, "" }, + { __LINE__, TRUE, ".\\notepad.exe", DIR_3, s_win_notepad }, + { __LINE__, FALSE, ".\\notepad.exe", DIR_4, "" }, + { __LINE__, FALSE, "system32\\notepad.exe", DIR_0, "" }, + { __LINE__, FALSE, "system32\\notepad.exe", DIR_1, "" }, + { __LINE__, FALSE, "system32\\notepad.exe", DIR_2, "" }, + { __LINE__, TRUE, "system32\\notepad.exe", DIR_3, s_sys_notepad }, + { __LINE__, FALSE, "system32\\notepad.exe", DIR_4, "" }, + { __LINE__, TRUE, s_win_notepad, DIR_0, s_win_notepad }, + { __LINE__, TRUE, s_win_notepad, DIR_1, s_win_notepad }, + { __LINE__, TRUE, s_win_notepad, DIR_2, s_win_notepad }, + { __LINE__, TRUE, s_win_notepad, DIR_3, s_win_notepad }, + { __LINE__, TRUE, s_win_notepad, DIR_4, s_win_notepad }, { __LINE__, TRUE, "test program", DIR_0, s_sys_test_exe }, { __LINE__, TRUE, "test program", DIR_1, s_sys_test_exe }, { __LINE__, TRUE, "test program", DIR_2, s_sys_test_exe }, @@ -157,6 +174,16 @@ static const TEST_ENTRY s_entries[] = { __LINE__, FALSE, "shell32_apitest_sub.exe", DIR_2, "" }, { __LINE__, FALSE, "shell32_apitest_sub.exe", DIR_3, "" }, { __LINE__, FALSE, "shell32_apitest_sub.exe", DIR_4, "" }, + { __LINE__, TRUE, "test file.txt", DIR_0, s_sys_notepad }, + { __LINE__, TRUE, "test file.txt", DIR_1, s_sys_notepad }, + { __LINE__, TRUE, "test file.txt", DIR_2, s_sys_notepad }, + { __LINE__, TRUE, "test file.txt", DIR_3, s_sys_notepad }, + { __LINE__, TRUE, "test file.txt", DIR_4, s_sys_notepad }, + { __LINE__, FALSE, "invalid file.txt", DIR_0, "" }, + { __LINE__, FALSE, "invalid file.txt", DIR_1, "" }, + { __LINE__, FALSE, "invalid file.txt", DIR_2, "" }, + { __LINE__, FALSE, "invalid file.txt", DIR_3, "" }, + { __LINE__, FALSE, "invalid file.txt", DIR_4, "" }, }; static void DoTestEntry(const TEST_ENTRY *pEntry) @@ -220,6 +247,16 @@ START_TEST(FindExecutable) fclose(fopen(s_sys_bat_file, "wb")); ok_int(PathFileExistsA(s_sys_bat_file), TRUE); + GetWindowsDirectoryA(s_win_txt_file, _countof(s_win_txt_file)); + PathAppendA(s_win_txt_file, "test file.txt"); + fclose(fopen(s_win_txt_file, "wb")); + ok_int(PathFileExistsA(s_win_txt_file), TRUE); + + GetSystemDirectoryA(s_sys_txt_file, _countof(s_sys_txt_file)); + PathAppendA(s_sys_txt_file, "test file.txt"); + fclose(fopen(s_sys_txt_file, "wb")); + ok_int(PathFileExistsA(s_sys_txt_file), TRUE); + for (UINT iTest = 0; iTest < _countof(s_entries); ++iTest) { DoTestEntry(&s_entries[iTest]); @@ -229,4 +266,6 @@ START_TEST(FindExecutable) DeleteFileA(s_sys_test_exe); DeleteFileA(s_win_bat_file); DeleteFileA(s_sys_bat_file); + DeleteFileA(s_win_txt_file); + DeleteFileA(s_sys_txt_file); }

3 years, 4 months

[reactos] 01/01: [HOST-TOOLS] Block sending telemetry when spawning a new shell

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64d3a54de93120aa63ef4… commit 64d3a54de93120aa63ef4b88f638960f5d291b0e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jun 6 00:43:05 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jun 6 00:43:05 2021 +0200 [HOST-TOOLS] Block sending telemetry when spawning a new shell --- sdk/cmake/host-tools.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 1f00f74e6a2..8533c3614ee 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -52,6 +52,7 @@ function(setup_host_tools) set(HOST_TOOLS_CMAKE_COMMAND "${REACTOS_BINARY_DIR}/host-tools/cmake_shim.cmd") if(MSVC_VERSION EQUAL 1900) file(WRITE ${HOST_TOOLS_CMAKE_COMMAND} + "set VSCMD_SKIP_SENDTELEMETRY=1\n" "@call \"$ENV{VCINSTALLDIR}\\vcvarsall.bat\" ${VCVARSALL_ARCH}\n" "\"${CMAKE_COMMAND}\" %*" )

3 years, 4 months

← Newer
1
...
16
17
18
19
20
21
22
23
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 June 2021