Ros-diffs October 2018

ros-diffs@reactos.org

21 participants
354 discussions

01/01: [WIN32SS][USER32] Fix #984 (#985)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84ae36c78db45532c8c1c… commit 84ae36c78db45532c8c1ca86231005e9e5fc657b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 27 20:32:51 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 27 20:32:51 2018 +0900 [WIN32SS][USER32] Fix #984 (#985) Sorry, I had to wait the build checks. --- win32ss/user/user32/windows/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index bb42e4de4a..1f8f5ca4cf 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -129,7 +129,7 @@ CloseWindow(HWND hWnd) { PostMessageW(hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); - return ValidateHwnd(hWndParent) != NULL; + return ValidateHwnd(hWnd) != NULL; } FORCEINLINE

6 years

01/01: [WIN32SS][USER32] CloseWindow does minimize, doesn't close (#984)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0e5f4ac115a04432d4de… commit d0e5f4ac115a04432d4dedc6e2e46686eed3d825 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 27 20:21:55 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 27 20:21:55 2018 +0900 [WIN32SS][USER32] CloseWindow does minimize, doesn't close (#984) In Windows, user32!CloseWindow minimizes the window. It doesn't close the window actually. This is not a joke. This bad function naming is responsible to MS. --- win32ss/user/user32/windows/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index 048673ff10..bb42e4de4a 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -127,9 +127,9 @@ ChildWindowFromPointEx(HWND hwndParent, BOOL WINAPI CloseWindow(HWND hWnd) { - SendMessageA(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); + PostMessageW(hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); - return HandleToUlong(hWnd); + return ValidateHwnd(hWndParent) != NULL; } FORCEINLINE

6 years

04/04: [BOOTDATA] Define the ObUnsecureGlobalNames registry key on setup

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5cced1d422be0df4178e… commit d5cced1d422be0df4178ec954bb34010e3180524 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 27 12:00:35 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 27 12:01:38 2018 +0200 [BOOTDATA] Define the ObUnsecureGlobalNames registry key on setup It contains values that are present on W2K3 and required to avoid regressions in .NET See: https://blogs.msdn.microsoft.com/toddca/2005/06/08/normal-users-on-terminal… --- boot/bootdata/hivesys.inf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 6eedacffcf..76491a5d2e 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1490,6 +1490,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Windows",0x0 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\AppCompatCache","AppCompatCache", 0x00000001, \ fe,0f,dc,ba,00,00,00,00 +; Unsecure objects names +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\kernel","ObUnsecureGlobalNames",0x00010000,"netfxcustomerfcounters.1.0","SharedPerfIPCBlock","Cor_Private_IPCBlock","Cor_Public_IPCBlock_" + ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\WOW",,0x00000012

6 years

03/04: [NTOSKRNL] Add support for unsecure object names

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c6037182c86165a35e8d… commit 9c6037182c86165a35e8dbc07fac2d9a9892a258 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 27 11:48:52 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 27 12:01:38 2018 +0200 [NTOSKRNL] Add support for unsecure object names --- ntoskrnl/ob/obname.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/ob/obname.c b/ntoskrnl/ob/obname.c index 5177cc1224..a9d05c8137 100644 --- a/ntoskrnl/ob/obname.c +++ b/ntoskrnl/ob/obname.c @@ -814,11 +814,27 @@ ParseFromRoot: /* Get the object header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(InsertObject); - /* FIXME: Check if this is a Section Object or Sym Link */ - /* FIXME: If it is, then check if this isn't session 0 */ - /* FIXME: If it isn't, check for SeCreateGlobalPrivilege */ - /* FIXME: If privilege isn't there, check for unsecure name */ - /* FIXME: If it isn't a known unsecure name, then fail */ + /* + * Deny object creation if: + * That's a section object or a symbolic link + * Which isn't in the same section that root directory + * That doesn't have the SeCreateGlobalPrivilege + * And that is not a known unsecure name + */ + if (RootDirectory->SessionId != -1) + { + if (ObjectHeader->Type == MmSectionObjectType || + ObjectHeader->Type == ObpSymbolicLinkObjectType) + { + if (RootDirectory->SessionId != PsGetCurrentProcessSessionId() && + !SeSinglePrivilegeCheck(SeCreateGlobalPrivilege, AccessCheckMode) && + !ObpIsUnsecureName(&ComponentName, BooleanFlagOn(Attributes, OBJ_CASE_INSENSITIVE))) + { + Status = STATUS_ACCESS_DENIED; + break; + } + } + } /* Create Object Name */ NewName = ExAllocatePoolWithTag(PagedPool,

6 years

02/04: [NTOSKRNL] Implement the ObpIsUnsecureName() helper function

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f3635355120cbd54e650… commit 0f3635355120cbd54e65005cea937aadf1d038c7 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 27 11:47:42 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 27 12:01:38 2018 +0200 [NTOSKRNL] Implement the ObpIsUnsecureName() helper function --- ntoskrnl/ob/obname.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/ntoskrnl/ob/obname.c b/ntoskrnl/ob/obname.c index 7071a7dd0e..5177cc1224 100644 --- a/ntoskrnl/ob/obname.c +++ b/ntoskrnl/ob/obname.c @@ -356,6 +356,56 @@ ObpDeleteNameCheck(IN PVOID Object) } } +BOOLEAN +NTAPI +ObpIsUnsecureName(IN PUNICODE_STRING ObjectName, + IN BOOLEAN CaseInSensitive) +{ + BOOLEAN Unsecure; + PWSTR UnsecureBuffer; + UNICODE_STRING UnsecureName; + + /* No unsecure names known, quit */ + if (ObpUnsecureGlobalNamesBuffer[0] == UNICODE_NULL) + { + return FALSE; + } + + /* By default, we have a secure name */ + Unsecure = FALSE; + /* We will browse the whole string */ + UnsecureBuffer = &ObpUnsecureGlobalNamesBuffer[0]; + while (TRUE) + { + /* Initialize the unicode string */ + RtlInitUnicodeString(&UnsecureName, UnsecureBuffer); + /* We're at the end of the multisz string! */ + if (UnsecureName.Length == 0) + { + break; + } + + /* + * Does the unsecure name prefix the object name? + * If so, that's an unsecure name, and return so + */ + if (RtlPrefixUnicodeString(&UnsecureName, ObjectName, CaseInSensitive)) + { + Unsecure = TRUE; + break; + } + + /* + * Move to the next string. As a reminder, ObpUnsecureGlobalNamesBuffer is + * a multisz, so we move the string next to the current UNICODE_NULL char + */ + UnsecureBuffer = (PWSTR)((ULONG_PTR)UnsecureBuffer + UnsecureName.Length + sizeof(UNICODE_NULL)); + } + + /* Return our findings */ + return Unsecure; +} + NTSTATUS NTAPI ObpLookupObjectName(IN HANDLE RootHandle OPTIONAL,

6 years

01/04: [NTOSKRNL] Add support for the ObUnsecureGlobalNames registry key

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9423f07d9900a0dc651b… commit b9423f07d9900a0dc651bb3b261468b710390b91 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 27 11:44:19 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 27 12:01:38 2018 +0200 [NTOSKRNL] Add support for the ObUnsecureGlobalNames registry key --- ntoskrnl/config/cmdata.c | 8 ++++++++ ntoskrnl/include/internal/ob.h | 2 ++ ntoskrnl/ob/obname.c | 3 +++ 3 files changed, 13 insertions(+) diff --git a/ntoskrnl/config/cmdata.c b/ntoskrnl/config/cmdata.c index 994991cc5f..a32909da34 100644 --- a/ntoskrnl/config/cmdata.c +++ b/ntoskrnl/config/cmdata.c @@ -586,6 +586,14 @@ INIT_FUNCTION CM_SYSTEM_CONTROL_VECTOR CmControlVector[] = NULL }, + { + L"Session Manager\\Kernel", + L"ObUnsecureGlobalNames", + ObpUnsecureGlobalNamesBuffer, + &ObpUnsecureGlobalNamesLength, + NULL + }, + { L"Session Manager\\I/O System", L"CountOperations", diff --git a/ntoskrnl/include/internal/ob.h b/ntoskrnl/include/internal/ob.h index e6f9c56292..1026c49ee7 100644 --- a/ntoskrnl/include/internal/ob.h +++ b/ntoskrnl/include/internal/ob.h @@ -613,6 +613,8 @@ extern BOOLEAN IoCountOperations; extern ALIGNEDNAME ObpDosDevicesShortNamePrefix; extern ALIGNEDNAME ObpDosDevicesShortNameRoot; extern UNICODE_STRING ObpDosDevicesShortName; +extern WCHAR ObpUnsecureGlobalNamesBuffer[128]; +extern ULONG ObpUnsecureGlobalNamesLength; // // Inlined Functions diff --git a/ntoskrnl/ob/obname.c b/ntoskrnl/ob/obname.c index bf559477d8..7071a7dd0e 100644 --- a/ntoskrnl/ob/obname.c +++ b/ntoskrnl/ob/obname.c @@ -29,6 +29,9 @@ UNICODE_STRING ObpDosDevicesShortName = (PWSTR)&ObpDosDevicesShortNamePrefix }; +WCHAR ObpUnsecureGlobalNamesBuffer[128] = {0}; +ULONG ObpUnsecureGlobalNamesLength = sizeof(ObpUnsecureGlobalNamesBuffer); + /* PRIVATE FUNCTIONS *********************************************************/ NTSTATUS

6 years

01/01: [WIN32SS][NTUSER] Make offset only for menu bars (#983)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f819c9c460c0655cb3e49… commit f819c9c460c0655cb3e498db37a1bd971794ff8b Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Oct 27 12:45:21 2018 +0300 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Oct 27 18:45:21 2018 +0900 [WIN32SS][NTUSER] Make offset only for menu bars (#983) CORE-15226 --- win32ss/user/ntuser/menu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index dfab116bbc..a708729914 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -1781,7 +1781,8 @@ static void FASTCALL MENU_DrawBitmapItem(HDC hdc, PITEM lpitem, const RECT *rect rop=((lpitem->fState & MF_HILITE) && !IS_MAGIC_BITMAP(hbmToDraw)) ? NOTSRCCOPY : SRCCOPY; if ((lpitem->fState & MF_HILITE) && lpitem->hbmp) IntGdiSetBkColor(hdc, IntGetSysColor(COLOR_HIGHLIGHT)); - if (!flat_menu && + if (MenuBar && + !flat_menu && (lpitem->fState & (MF_HILITE | MF_GRAYED)) == MF_HILITE) { ++left; @@ -2531,7 +2532,8 @@ static void FASTCALL MENU_DrawMenuItem(PWND Wnd, PMENU Menu, PWND WndOwner, HDC break; } - if (!flat_menu && + if (menuBar && + !flat_menu && (lpitem->fState & (MF_HILITE | MF_GRAYED)) == MF_HILITE) { RECTL_vOffsetRect(&rect, +1, +1); @@ -2578,7 +2580,8 @@ static void FASTCALL MENU_DrawMenuItem(PWND Wnd, PMENU Menu, PWND WndOwner, HDC DrawTextW( hdc, Text + i + 1, -1, &rect, uFormat ); } - if (!flat_menu && + if (menuBar && + !flat_menu && (lpitem->fState & (MF_HILITE | MF_GRAYED)) == MF_HILITE) { RECTL_vOffsetRect(&rect, -1, -1);

6 years

02/02: [NTOSKRNL] Reduce noise

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e51bb6510797f6e14439… commit 8e51bb6510797f6e14439719515e762495a5fb95 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 27 10:04:22 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 27 10:04:22 2018 +0200 [NTOSKRNL] Reduce noise --- ntoskrnl/config/cmapi.c | 6 +++--- ntoskrnl/io/iomgr/driver.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/config/cmapi.c b/ntoskrnl/config/cmapi.c index 84e0f11b91..3b1455df1a 100644 --- a/ntoskrnl/config/cmapi.c +++ b/ntoskrnl/config/cmapi.c @@ -2363,9 +2363,9 @@ CmpEnumerateOpenSubKeys( if (CachedKcb->RefCount > 0) { - DPRINT1("Found a sub key pointing to '%.*s', RefCount = %u\n", - CachedKcb->NameBlock->NameLength, CachedKcb->NameBlock->Name, - CachedKcb->RefCount); + DPRINT("Found a sub key pointing to '%.*s', RefCount = %u\n", + CachedKcb->NameBlock->NameLength, CachedKcb->NameBlock->Name, + CachedKcb->RefCount); /* If we dereference opened KCBs, don't touch read-only keys */ if (DereferenceOpenedEntries && diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index fc133b0489..4e1814dcab 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -1045,7 +1045,7 @@ IopInitializeBootDrivers(VOID) NULL, &BootEntry->RegistryPath, KEY_READ); - DPRINT1("IopOpenRegistryKeyEx(%wZ) returned 0x%08lx\n", &BootEntry->RegistryPath, Status); + DPRINT("IopOpenRegistryKeyEx(%wZ) returned 0x%08lx\n", &BootEntry->RegistryPath, Status); #if 0 if (NT_SUCCESS(Status)) #else // Hack still needed...

6 years

01/02: [NTOSKRNL] Call internal helper to get VACB on mapping We already properly round our offset

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=18f392272510ebcecf0fa… commit 18f392272510ebcecf0fa922f58024e3cbd3b568 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 27 09:30:22 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 27 09:38:55 2018 +0200 [NTOSKRNL] Call internal helper to get VACB on mapping We already properly round our offset --- ntoskrnl/cc/pin.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index d972f8a75d..dc7427427e 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -78,7 +78,7 @@ CcpMapData( OUT PROS_VACB *pVacb, OUT PVOID *pBuffer) { - LONGLONG ReadOffset; + LONGLONG ReadOffset, BaseOffset; BOOLEAN Valid; PROS_VACB Vacb; NTSTATUS Status; @@ -109,12 +109,14 @@ CcpMapData( } } + /* Properly round offset and call internal helper for getting a VACB */ ROffset = ROUND_DOWN(ReadOffset, VACB_MAPPING_GRANULARITY); - Status = CcRosRequestVacb(SharedCacheMap, - ROffset, - pBuffer, - &Valid, - &Vacb); + Status = CcRosGetVacb(SharedCacheMap, + ROffset, + &BaseOffset, + pBuffer, + &Valid, + &Vacb); if (!NT_SUCCESS(Status)) { CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n",

6 years

08/08: [USETUP] Minor code formatting only.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f04856f6845d021a16e9… commit 3f04856f6845d021a16e9533eaee54638940d817 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 9 20:29:07 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 03:18:01 2018 +0200 [USETUP] Minor code formatting only. svn path=/branches/setup_improvements/; revision=75517 --- base/setup/usetup/usetup.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 97da4d426a..c87a3fecc8 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -109,9 +109,9 @@ static PNTOS_INSTALLATION CurrentInstallation = NULL; static PGENERIC_LIST NtOsInstallsList = NULL; static PGENERIC_LIST ComputerList = NULL; -static PGENERIC_LIST DisplayList = NULL; +static PGENERIC_LIST DisplayList = NULL; static PGENERIC_LIST KeyboardList = NULL; -static PGENERIC_LIST LayoutList = NULL; +static PGENERIC_LIST LayoutList = NULL; static PGENERIC_LIST LanguageList = NULL; static LANGID LanguageId = 0; @@ -148,7 +148,7 @@ DrawBox(IN SHORT xLeft, COORD coPos; DWORD Written; - /* draw upper left corner */ + /* Draw upper left corner */ coPos.X = xLeft; coPos.Y = yTop; FillConsoleOutputCharacterA(StdOutput, @@ -157,7 +157,7 @@ DrawBox(IN SHORT xLeft, coPos, &Written); - /* draw upper edge */ + /* Draw upper edge */ coPos.X = xLeft + 1; coPos.Y = yTop; FillConsoleOutputCharacterA(StdOutput, @@ -166,7 +166,7 @@ DrawBox(IN SHORT xLeft, coPos, &Written); - /* draw upper right corner */ + /* Draw upper right corner */ coPos.X = xLeft + Width - 1; coPos.Y = yTop; FillConsoleOutputCharacterA(StdOutput, @@ -200,7 +200,7 @@ DrawBox(IN SHORT xLeft, &Written); } - /* draw lower left corner */ + /* Draw lower left corner */ coPos.X = xLeft; coPos.Y = yTop + Height - 1; FillConsoleOutputCharacterA(StdOutput, @@ -209,7 +209,7 @@ DrawBox(IN SHORT xLeft, coPos, &Written); - /* draw lower edge */ + /* Draw lower edge */ coPos.X = xLeft + 1; coPos.Y = yTop + Height - 1; FillConsoleOutputCharacterA(StdOutput, @@ -218,7 +218,7 @@ DrawBox(IN SHORT xLeft, coPos, &Written); - /* draw lower right corner */ + /* Draw lower right corner */ coPos.X = xLeft + Width - 1; coPos.Y = yTop + Height - 1; FillConsoleOutputCharacterA(StdOutput, @@ -4613,9 +4613,9 @@ BootLoaderPage(PINPUT_RECORD Ir) } else if ((PartitionType == PARTITION_FAT_12) || (PartitionType == PARTITION_FAT_16) || - (PartitionType == PARTITION_HUGE) || + (PartitionType == PARTITION_HUGE) || (PartitionType == PARTITION_XINT13) || - (PartitionType == PARTITION_FAT32) || + (PartitionType == PARTITION_FAT32) || (PartitionType == PARTITION_FAT32_XINT13)) { DPRINT("Found FAT partition\n"); @@ -4652,11 +4652,11 @@ BootLoaderPage(PINPUT_RECORD Ir) CONSOLE_NormalTextXY(8, Line, 60, 1); Line++; - if (Line<12) - Line=15; + if (Line < 12) + Line = 15; - if (Line>15) - Line=12; + if (Line > 15) + Line = 12; CONSOLE_InvertTextXY(8, Line, 60, 1); } @@ -4666,11 +4666,11 @@ BootLoaderPage(PINPUT_RECORD Ir) CONSOLE_NormalTextXY(8, Line, 60, 1); Line--; - if (Line<12) - Line=15; + if (Line < 12) + Line = 15; - if (Line>15) - Line=12; + if (Line > 15) + Line = 12; CONSOLE_InvertTextXY(8, Line, 60, 1); }

6 years

← Newer
1
...
8
9
10
11
12
13
14
...
36
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 October 2018