Ros-diffs August 2018

ros-diffs@reactos.org

32 participants
304 discussions

11/18: [WIN32K:NTUSER] Rename some variables with more natural names.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc7810a97eb07ba2247db… commit bc7810a97eb07ba2247db510a00cc7d0a015ce86 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 22 20:30:05 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:36 2018 +0200 [WIN32K:NTUSER] Rename some variables with more natural names. --- win32ss/user/ntuser/desktop.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 62f0ee3ff3..2776cbe27a 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -27,7 +27,7 @@ IntFreeDesktopHeap(IN PDESKTOP pdesk); /* GLOBALS *******************************************************************/ -/* These can be changed via csrss startup, these are defaults */ +/* These can be changed via CSRSS startup, these are defaults */ DWORD gdwDesktopSectionSize = 512; DWORD gdwNOIOSectionSize = 128; // A guess, for one or more of the first three system desktops. @@ -631,7 +631,7 @@ HDESK FASTCALL IntGetDesktopObjectHandle(PDESKTOP DesktopObject) { NTSTATUS Status; - HDESK Ret; + HDESK hDesk; ASSERT(DesktopObject); @@ -639,7 +639,7 @@ IntGetDesktopObjectHandle(PDESKTOP DesktopObject) DesktopObject, ExDesktopObjectType, NULL, - (PHANDLE)&Ret)) + (PHANDLE)&hDesk)) { Status = ObOpenObjectByPointer(DesktopObject, 0, @@ -647,7 +647,7 @@ IntGetDesktopObjectHandle(PDESKTOP DesktopObject) 0, ExDesktopObjectType, UserMode, - (PHANDLE)&Ret); + (PHANDLE)&hDesk); if (!NT_SUCCESS(Status)) { /* Unable to create a handle */ @@ -657,10 +657,10 @@ IntGetDesktopObjectHandle(PDESKTOP DesktopObject) } else { - TRACE("Got handle: %p\n", Ret); + TRACE("Got handle: 0x%p\n", hDesk); } - return Ret; + return hDesk; } PUSER_MESSAGE_QUEUE FASTCALL @@ -2327,7 +2327,7 @@ NtUserGetThreadDesktop(DWORD dwThreadId, DWORD Unknown1) NTSTATUS Status; PETHREAD Thread; PDESKTOP DesktopObject; - HDESK Ret, hThreadDesktop; + HDESK hDesk, hThreadDesktop; OBJECT_HANDLE_INFORMATION HandleInformation; DECLARE_RETURN(HDESK); @@ -2351,9 +2351,9 @@ NtUserGetThreadDesktop(DWORD dwThreadId, DWORD Unknown1) { /* Just return the handle, we queried the desktop handle of a thread running in the same context */ - Ret = ((PTHREADINFO)Thread->Tcb.Win32Thread)->hdesk; + hDesk = ((PTHREADINFO)Thread->Tcb.Win32Thread)->hdesk; ObDereferenceObject(Thread); - RETURN(Ret); + RETURN(hDesk); } /* Get the desktop handle and the desktop of the thread */ @@ -2387,12 +2387,12 @@ NtUserGetThreadDesktop(DWORD dwThreadId, DWORD Unknown1) /* Lookup our handle table if we can find a handle to the desktop object, if not, create one */ - Ret = IntGetDesktopObjectHandle(DesktopObject); + hDesk = IntGetDesktopObjectHandle(DesktopObject); /* All done, we got a valid handle to the desktop */ ObDereferenceObject(DesktopObject); ObDereferenceObject(Thread); - RETURN(Ret); + RETURN(hDesk); CLEANUP: TRACE("Leave NtUserGetThreadDesktop, ret=%p\n",_ret_);

6 years, 4 months

10/18: [WIN32K:NTUSER] Split NtUserCreateDesktop() into the part that captures the user-mode data and the internal worker IntCreateDesktop() function, which will also be used later.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1abeb905c3d8f9424b712… commit 1abeb905c3d8f9424b71239b9c8f163f5476b876 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 22 20:27:33 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:35 2018 +0200 [WIN32K:NTUSER] Split NtUserCreateDesktop() into the part that captures the user-mode data and the internal worker IntCreateDesktop() function, which will also be used later. --- win32ss/user/ntuser/desktop.c | 123 +++++++++++++++++++++++++++++------------- win32ss/user/ntuser/desktop.h | 11 ++++ 2 files changed, 97 insertions(+), 37 deletions(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 7fe1a37096..62f0ee3ff3 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -1697,17 +1697,20 @@ UserInitializeDesktop(PDESKTOP pdesk, PUNICODE_STRING DesktopName, PWINSTATION_O * @implemented */ -HDESK APIENTRY -NtUserCreateDesktop( - POBJECT_ATTRIBUTES ObjectAttributes, - PUNICODE_STRING lpszDesktopDevice, - LPDEVMODEW lpdmw, - DWORD dwFlags, - ACCESS_MASK dwDesiredAccess) +NTSTATUS +FASTCALL +IntCreateDesktop( + OUT HDESK* phDesktop, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN KPROCESSOR_MODE AccessMode, + IN PUNICODE_STRING lpszDesktopDevice OPTIONAL, + IN LPDEVMODEW lpdmw OPTIONAL, + IN DWORD dwFlags, + IN ACCESS_MASK dwDesiredAccess) { + NTSTATUS Status; PDESKTOP pdesk = NULL; - NTSTATUS Status = STATUS_SUCCESS; - HDESK hdesk; + HDESK hDesk; BOOLEAN Context = FALSE; UNICODE_STRING ClassName; LARGE_STRING WindowName; @@ -1717,16 +1720,16 @@ NtUserCreateDesktop( PTHREADINFO ptiCurrent; PCLS pcls; - DECLARE_RETURN(HDESK); + TRACE("Enter IntCreateDesktop\n"); - TRACE("Enter NtUserCreateDesktop\n"); - UserEnterExclusive(); + ASSERT(phDesktop); + *phDesktop = NULL; ptiCurrent = PsGetCurrentThreadWin32Thread(); ASSERT(ptiCurrent); ASSERT(gptiDesktopThread); - /* Turn off hooks when calling any CreateWindowEx from inside win32k. */ + /* Turn off hooks when calling any CreateWindowEx from inside win32k */ NoHooks = (ptiCurrent->TIF_flags & TIF_DISABLEHOOKS); ptiCurrent->TIF_flags |= TIF_DISABLEHOOKS; ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; @@ -1734,30 +1737,29 @@ NtUserCreateDesktop( /* * Try to open already existing desktop */ - Status = ObOpenObjectByName( - ObjectAttributes, - ExDesktopObjectType, - UserMode, - NULL, - dwDesiredAccess, - (PVOID)&Context, - (HANDLE*)&hdesk); + Status = ObOpenObjectByName(ObjectAttributes, + ExDesktopObjectType, + AccessMode, + NULL, + dwDesiredAccess, + (PVOID)&Context, + (PHANDLE)&hDesk); if (!NT_SUCCESS(Status)) { ERR("ObOpenObjectByName failed to open/create desktop\n"); - SetLastNtError(Status); - RETURN(NULL); + goto Quit; } /* In case the object was not created (eg if it existed), return now */ if (Context == FALSE) { TRACE("NtUserCreateDesktop opened desktop %wZ\n", ObjectAttributes->ObjectName); - RETURN( hdesk); + Status = STATUS_SUCCESS; + goto Quit; } /* Reference the desktop */ - Status = ObReferenceObjectByHandle(hdesk, + Status = ObReferenceObjectByHandle(hDesk, 0, ExDesktopObjectType, KernelMode, @@ -1766,8 +1768,7 @@ NtUserCreateDesktop( if (!NT_SUCCESS(Status)) { ERR("Failed to reference desktop object\n"); - SetLastNtError(Status); - RETURN(NULL); + goto Quit; } /* Get the desktop window class. The thread desktop does not belong to any desktop @@ -1780,7 +1781,8 @@ NtUserCreateDesktop( if (pcls == NULL) { ASSERT(FALSE); - RETURN(NULL); + Status = STATUS_UNSUCCESSFUL; + goto Quit; } RtlZeroMemory(&WindowName, sizeof(WindowName)); @@ -1794,12 +1796,13 @@ NtUserCreateDesktop( Cs.lpszName = (LPCWSTR) &WindowName; Cs.lpszClass = (LPCWSTR) &ClassName; - /* Use IntCreateWindow instead of co_UserCreateWindowEx cause the later expects a thread with a desktop */ + /* Use IntCreateWindow instead of co_UserCreateWindowEx because the later expects a thread with a desktop */ pWnd = IntCreateWindow(&Cs, &WindowName, pcls, NULL, NULL, NULL, pdesk); if (pWnd == NULL) { ERR("Failed to create desktop window for the new desktop\n"); - RETURN(NULL); + Status = STATUS_UNSUCCESSFUL; + goto Quit; } pdesk->dwSessionId = PsGetCurrentProcessSessionId(); @@ -1813,7 +1816,8 @@ NtUserCreateDesktop( if (pcls == NULL) { ASSERT(FALSE); - RETURN(NULL); + Status = STATUS_UNSUCCESSFUL; + goto Quit; } RtlZeroMemory(&WindowName, sizeof(WindowName)); @@ -1827,7 +1831,8 @@ NtUserCreateDesktop( if (pWnd == NULL) { ERR("Failed to create message window for the new desktop\n"); - RETURN(NULL); + Status = STATUS_UNSUCCESSFUL; + goto Quit; } pdesk->spwndMessage = pWnd; @@ -1841,23 +1846,67 @@ NtUserCreateDesktop( The rest is same as message window. http://msdn.microsoft.com/en-us/library/bb760250(VS.85).aspx */ - RETURN( hdesk); + Status = STATUS_SUCCESS; -CLEANUP: +Quit: if (pdesk != NULL) { ObDereferenceObject(pdesk); } - if (_ret_ == NULL && hdesk != NULL) + if (!NT_SUCCESS(Status) && hDesk != NULL) { - ObCloseHandle(hdesk, UserMode); + ObCloseHandle(hDesk, AccessMode); + hDesk = NULL; } if (!NoHooks) { ptiCurrent->TIF_flags &= ~TIF_DISABLEHOOKS; ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; } - TRACE("Leave NtUserCreateDesktop, ret=%p\n",_ret_); + + TRACE("Leave IntCreateDesktop, Status 0x%08lx\n", Status); + + if (NT_SUCCESS(Status)) + *phDesktop = hDesk; + else + SetLastNtError(Status); + return Status; +} + +HDESK APIENTRY +NtUserCreateDesktop( + POBJECT_ATTRIBUTES ObjectAttributes, + PUNICODE_STRING lpszDesktopDevice, + LPDEVMODEW lpdmw, + DWORD dwFlags, + ACCESS_MASK dwDesiredAccess) +{ + NTSTATUS Status; + HDESK hDesk; + + DECLARE_RETURN(HDESK); + + TRACE("Enter NtUserCreateDesktop\n"); + UserEnterExclusive(); + + Status = IntCreateDesktop(&hDesk, + ObjectAttributes, + UserMode, + lpszDesktopDevice, + lpdmw, + dwFlags, + dwDesiredAccess); + if (!NT_SUCCESS(Status)) + { + ERR("IntCreateDesktop failed, Status 0x%08lx\n", Status); + // SetLastNtError(Status); + RETURN(NULL); + } + + RETURN(hDesk); + +CLEANUP: + TRACE("Leave NtUserCreateDesktop, ret=0x%p\n", _ret_); UserLeave(); END_CLEANUP; } diff --git a/win32ss/user/ntuser/desktop.h b/win32ss/user/ntuser/desktop.h index b615e3675c..7156f22bf7 100644 --- a/win32ss/user/ntuser/desktop.h +++ b/win32ss/user/ntuser/desktop.h @@ -168,6 +168,17 @@ IntValidateDesktopHandle( ACCESS_MASK DesiredAccess, PDESKTOP *Object); +NTSTATUS +FASTCALL +IntCreateDesktop( + OUT HDESK* phDesktop, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN KPROCESSOR_MODE AccessMode, + IN PUNICODE_STRING lpszDesktopDevice OPTIONAL, + IN LPDEVMODEW lpdmw OPTIONAL, + IN DWORD dwFlags, + IN ACCESS_MASK dwDesiredAccess); + NTSTATUS FASTCALL IntParseDesktopPath(PEPROCESS Process, PUNICODE_STRING DesktopPath,

6 years, 4 months

09/18: [WIN32K:NTUSER] Fixes for NtUserCreateWindowStation(), IntCreateWindowStation() and NtUserOpenWindowStation(). CORE-11933 and PR #621.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bc2ddd66973d89390e81… commit 7bc2ddd66973d89390e81bd5a29403f25b9312a8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 22 20:22:49 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:35 2018 +0200 [WIN32K:NTUSER] Fixes for NtUserCreateWindowStation(), IntCreateWindowStation() and NtUserOpenWindowStation(). CORE-11933 and PR #621. We are potentially going to modify the window station name to be created or opened, by one with the format "Service-0x<luidhigh>-<luidlow>$", in case the user provides an empty name. Since we want to use the user-mode ObjectAttributes structure pointer so that the Object manager can correctly perform the access checks and the capture, we actually need to construct the new window station name in the user memory space! This allows us then to fetch the new name in the ObjectAttributes structure so that Ob can use it. All of this is performed under SEH. For NtUserOpenWindowStation(), we also need to be Windows-compatible and detect whether user-mode gave instead the special "Service-0x00000000-00000000$" name (observed via API monitoring) that is used when one tries to open a window station with empty name. --- win32ss/user/ntuser/winsta.c | 482 +++++++++++++++++++++++++++++++++---------- win32ss/user/ntuser/winsta.h | 1 + 2 files changed, 375 insertions(+), 108 deletions(-) diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index ba1b1eb57d..1400827bc6 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -14,7 +14,10 @@ DBG_DEFAULT_CHANNEL(UserWinsta); /* GLOBALS *******************************************************************/ -/* Currently active window station */ +/* + * The currently active window station. This is the + * only one interactive window station on the system. + */ PWINSTATION_OBJECT InputWindowStation = NULL; /* Winlogon SAS window */ @@ -96,7 +99,7 @@ UserCreateWinstaDirectory(VOID) return Status; } -/* OBJECT CALLBACKS **********************************************************/ +/* OBJECT CALLBACKS ***********************************************************/ NTSTATUS NTAPI @@ -106,7 +109,18 @@ IntWinStaObjectDelete( PWIN32_DELETEMETHOD_PARAMETERS DeleteParameters = Parameters; PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)DeleteParameters->Object; - TRACE("Deleting window station (0x%p)\n", WinSta); + TRACE("Deleting window station 0x%p\n", WinSta); + + if (WinSta == InputWindowStation) + { + ERR("WARNING: Deleting the interactive window station '%wZ'!\n", + &(OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(InputWindowStation))->Name)); + + /* Only Winlogon can close and delete the interactive window station */ + ASSERT(gpidLogon == PsGetCurrentProcessId()); + + InputWindowStation = NULL; + } WinSta->Flags |= WSS_DYING; @@ -192,7 +206,7 @@ IntWinStaOkToClose( ppi = PsGetCurrentProcessWin32Process(); - if(ppi && (OkToCloseParameters->Handle == ppi->hwinsta)) + if (ppi && (OkToCloseParameters->Handle == ppi->hwinsta)) { return STATUS_ACCESS_DENIED; } @@ -390,6 +404,7 @@ IntCreateWindowStation( OUT HWINSTA* phWinSta, IN POBJECT_ATTRIBUTES ObjectAttributes, IN KPROCESSOR_MODE AccessMode, + IN KPROCESSOR_MODE OwnerMode, IN ACCESS_MASK dwDesiredAccess, DWORD Unknown2, DWORD Unknown3, @@ -398,8 +413,8 @@ IntCreateWindowStation( DWORD Unknown6) { NTSTATUS Status; - HWINSTA WindowStation; - PWINSTATION_OBJECT WindowStationObject; + HWINSTA hWinSta; + PWINSTATION_OBJECT WindowStation; TRACE("IntCreateWindowStation called\n"); @@ -412,60 +427,61 @@ IntCreateWindowStation( NULL, dwDesiredAccess, NULL, - (PVOID*)&WindowStation); + (PVOID*)&hWinSta); if (NT_SUCCESS(Status)) { - TRACE("IntCreateWindowStation opened window station %wZ\n", + TRACE("IntCreateWindowStation opened window station '%wZ'\n", ObjectAttributes->ObjectName); - *phWinSta = WindowStation; + *phWinSta = hWinSta; return Status; } /* - * No existing window station found, try to create new one. + * No existing window station found, try to create a new one. */ /* Create the window station object */ - Status = ObCreateObject(KernelMode, + Status = ObCreateObject(AccessMode, ExWindowStationObjectType, ObjectAttributes, - AccessMode, + OwnerMode, NULL, sizeof(WINSTATION_OBJECT), 0, 0, - (PVOID*)&WindowStationObject); + (PVOID*)&WindowStation); if (!NT_SUCCESS(Status)) { - ERR("ObCreateObject failed with %lx for window station %wZ\n", - Status, ObjectAttributes->ObjectName); + ERR("ObCreateObject failed for window station '%wZ', Status 0x%08lx\n", + ObjectAttributes->ObjectName, Status); SetLastNtError(Status); return Status; } /* Initialize the window station */ - RtlZeroMemory(WindowStationObject, sizeof(WINSTATION_OBJECT)); + RtlZeroMemory(WindowStation, sizeof(WINSTATION_OBJECT)); - InitializeListHead(&WindowStationObject->DesktopListHead); - WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId; - Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); + InitializeListHead(&WindowStation->DesktopListHead); + WindowStation->dwSessionId = NtCurrentPeb()->SessionId; + Status = RtlCreateAtomTable(37, &WindowStation->AtomTable); if (!NT_SUCCESS(Status)) { - ERR("RtlCreateAtomTable failed with %lx for window station %wZ\n", Status, ObjectAttributes->ObjectName); - ObDereferenceObject(WindowStationObject); + ERR("RtlCreateAtomTable failed for window station '%wZ', Status 0x%08lx\n", + ObjectAttributes->ObjectName, Status); + ObDereferenceObject(WindowStation); SetLastNtError(Status); return Status; } - Status = ObInsertObject(WindowStationObject, + Status = ObInsertObject(WindowStation, NULL, dwDesiredAccess, 0, NULL, - (PVOID*)&WindowStation); + (PVOID*)&hWinSta); if (!NT_SUCCESS(Status)) { - ERR("ObInsertObject failed with %lx for window station\n", Status); + ERR("ObInsertObject failed for window station, Status 0x%08lx\n", Status); SetLastNtError(Status); return Status; } @@ -475,24 +491,182 @@ IntCreateWindowStation( if (InputWindowStation == NULL) { ERR("Initializing input window station\n"); - InputWindowStation = WindowStationObject; - WindowStationObject->Flags &= ~WSS_NOIO; + /* Only Winlogon can create the interactive window station */ + ASSERT(gpidLogon == PsGetCurrentProcessId()); + InputWindowStation = WindowStation; + WindowStation->Flags &= ~WSS_NOIO; InitCursorImpl(); } else { - WindowStationObject->Flags |= WSS_NOIO; + WindowStation->Flags |= WSS_NOIO; } - TRACE("IntCreateWindowStation created object 0x%p with name %wZ handle 0x%p\n", - WindowStationObject, ObjectAttributes->ObjectName, WindowStation); + TRACE("IntCreateWindowStation created window station '%wZ' object 0x%p handle 0x%p\n", + ObjectAttributes->ObjectName, WindowStation, hWinSta); - *phWinSta = WindowStation; + *phWinSta = hWinSta; return STATUS_SUCCESS; } +static VOID +FreeUserModeWindowStationName( + IN OUT PUNICODE_STRING WindowStationName, + IN PUNICODE_STRING TebStaticUnicodeString, + IN OUT POBJECT_ATTRIBUTES UserModeObjectAttributes OPTIONAL, + IN POBJECT_ATTRIBUTES LocalObjectAttributes OPTIONAL) +{ + SIZE_T MemSize = 0; + + /* Try to restore the user's UserModeObjectAttributes */ + if (UserModeObjectAttributes && LocalObjectAttributes) + { + _SEH2_TRY + { + ProbeForWrite(UserModeObjectAttributes, sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); + *UserModeObjectAttributes = *LocalObjectAttributes; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + NOTHING; + } + _SEH2_END; + } + + /* Free the user-mode memory */ + if (WindowStationName && (WindowStationName != TebStaticUnicodeString)) + { + ZwFreeVirtualMemory(ZwCurrentProcess(), + (PVOID*)&WindowStationName, + &MemSize, + MEM_RELEASE); + } +} + +static NTSTATUS +BuildUserModeWindowStationName( + IN OUT POBJECT_ATTRIBUTES UserModeObjectAttributes, + IN OUT POBJECT_ATTRIBUTES LocalObjectAttributes, + OUT PUNICODE_STRING* WindowStationName, + OUT PUNICODE_STRING* TebStaticUnicodeString) +{ + NTSTATUS Status; + SIZE_T MemSize; + + LUID CallerLuid; + PTEB Teb; + USHORT StrSize; + + *WindowStationName = NULL; + *TebStaticUnicodeString = NULL; + + /* Retrieve the current process LUID */ + Status = GetProcessLuid(NULL, NULL, &CallerLuid); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to retrieve the caller LUID, Status 0x%08lx\n", Status); + return Status; + } + + /* Compute the needed string size */ + MemSize = _scwprintf(L"%wZ\\Service-0x%x-%x$", + &gustrWindowStationsDir, + CallerLuid.HighPart, + CallerLuid.LowPart); + MemSize = MemSize * sizeof(WCHAR) + sizeof(UNICODE_NULL); + if (MemSize > MAXUSHORT) + { + ERR("Window station name length is too long.\n"); + return STATUS_NAME_TOO_LONG; + } + StrSize = (USHORT)MemSize; + + /* + * Check whether it's short enough so that we can use the static buffer + * in the TEB. Otherwise continue with virtual memory allocation. + */ + Teb = NtCurrentTeb(); + if (Teb && (StrSize <= sizeof(Teb->StaticUnicodeBuffer))) + { + /* We can use the TEB's static unicode string */ + ASSERT(Teb->StaticUnicodeString.Buffer == Teb->StaticUnicodeBuffer); + ASSERT(Teb->StaticUnicodeString.MaximumLength == sizeof(Teb->StaticUnicodeBuffer)); + + /* Remember the TEB's static unicode string address for later */ + *TebStaticUnicodeString = &Teb->StaticUnicodeString; + + *WindowStationName = *TebStaticUnicodeString; + (*WindowStationName)->Length = 0; + } + else + { + /* The TEB's static unicode string is too small, allocate some user-mode virtual memory */ + MemSize += ALIGN_UP(sizeof(UNICODE_STRING), sizeof(PVOID)); + + /* Allocate the memory in user-mode */ + Status = ZwAllocateVirtualMemory(ZwCurrentProcess(), + (PVOID*)WindowStationName, + 0, + &MemSize, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + ERR("ZwAllocateVirtualMemory() failed, Status 0x%08lx\n", Status); + return Status; + } + + RtlInitEmptyUnicodeString(*WindowStationName, + (PWCHAR)((ULONG_PTR)*WindowStationName + + ALIGN_UP(sizeof(UNICODE_STRING), sizeof(PVOID))), + StrSize); + } + + /* Build a valid window station name from the LUID */ + Status = RtlStringCbPrintfW((*WindowStationName)->Buffer, + (*WindowStationName)->MaximumLength, + L"%wZ\\Service-0x%x-%x$", + &gustrWindowStationsDir, + CallerLuid.HighPart, + CallerLuid.LowPart); + if (!NT_SUCCESS(Status)) + { + ERR("Impossible to build a valid window station name, Status 0x%08lx\n", Status); + goto Quit; + } + (*WindowStationName)->Length = (USHORT)(wcslen((*WindowStationName)->Buffer) * sizeof(WCHAR)); + + /* Try to update the user's UserModeObjectAttributes */ + _SEH2_TRY + { + ProbeForWrite(UserModeObjectAttributes, sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); + *LocalObjectAttributes = *UserModeObjectAttributes; + + UserModeObjectAttributes->ObjectName = *WindowStationName; + UserModeObjectAttributes->RootDirectory = NULL; + + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + +Quit: + if (!NT_SUCCESS(Status)) + { + /* Release the window station name */ + FreeUserModeWindowStationName(*WindowStationName, + *TebStaticUnicodeString, + NULL, NULL); + } + + return Status; +} + HWINSTA APIENTRY NtUserCreateWindowStation( @@ -504,108 +678,103 @@ NtUserCreateWindowStation( DWORD Unknown5, DWORD Unknown6) { - NTSTATUS Status; - HWINSTA hWinSta; + NTSTATUS Status = STATUS_SUCCESS; + HWINSTA hWinSta = NULL; OBJECT_ATTRIBUTES LocalObjectAttributes; - UNICODE_STRING WindowStationName; - KPROCESSOR_MODE AccessMode = UserMode; + PUNICODE_STRING WindowStationName = NULL; + PUNICODE_STRING TebStaticUnicodeString = NULL; + KPROCESSOR_MODE OwnerMode = UserMode; TRACE("NtUserCreateWindowStation called\n"); - /* Capture window station name */ + /* Capture the object attributes and the window station name */ _SEH2_TRY { ProbeForRead(ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); LocalObjectAttributes = *ObjectAttributes; - if (LocalObjectAttributes.ObjectName || - LocalObjectAttributes.RootDirectory - /* && - LocalObjectAttributes.ObjectName->Buffer && - LocalObjectAttributes.ObjectName->Length > 0 */) + if (LocalObjectAttributes.Length != sizeof(OBJECT_ATTRIBUTES)) { - Status = IntSafeCopyUnicodeStringTerminateNULL(&WindowStationName, - LocalObjectAttributes.ObjectName); - LocalObjectAttributes.ObjectName = &WindowStationName; + ERR("Invalid ObjectAttributes length!\n"); + Status = STATUS_INVALID_PARAMETER; + _SEH2_LEAVE; } - else + + /* + * Check whether the caller provided a window station name together + * with a RootDirectory handle. + * + * If the caller did not provide a window station name, build a new one + * based on the logon session identifier for the calling process. + * The new name is allocated in user-mode, as the rest of ObjectAttributes + * already is, so that the validation performed by the Object Manager + * can be done adequately. + */ + if ((LocalObjectAttributes.ObjectName == NULL || + LocalObjectAttributes.ObjectName->Buffer == NULL || + LocalObjectAttributes.ObjectName->Length == 0 || + LocalObjectAttributes.ObjectName->Buffer[0] == UNICODE_NULL) + /* && + LocalObjectAttributes.RootDirectory == NULL */) { - LocalObjectAttributes.ObjectName = NULL; - Status = STATUS_SUCCESS; + /* No, build the new window station name */ + Status = BuildUserModeWindowStationName(ObjectAttributes, + &LocalObjectAttributes, + &WindowStationName, + &TebStaticUnicodeString); + if (!NT_SUCCESS(Status)) + { + ERR("BuildUserModeWindowStationName() failed, Status 0x%08lx\n", Status); + _SEH2_LEAVE; + } + OwnerMode = KernelMode; } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status =_SEH2_GetExceptionCode(); + ERR("ObjectAttributes capture failed, Status 0x%08lx\n", Status); } - _SEH2_END + _SEH2_END; if (!NT_SUCCESS(Status)) { - ERR("Failed reading or capturing window station name, Status 0x%08lx\n", Status); SetLastNtError(Status); return NULL; } - /* - * If the caller did not provide a window station name, build a new one - * based on the logon session identifier for the calling process. - */ - if (!LocalObjectAttributes.ObjectName) - { - LUID CallerLuid; - WCHAR ServiceWinStaName[MAX_PATH]; - - /* Retrieve the LUID of the current process */ - Status = GetProcessLuid(NULL, NULL, &CallerLuid); - if (!NT_SUCCESS(Status)) - { - ERR("Failed to retrieve the caller LUID, Status 0x%08lx\n", Status); - SetLastNtError(Status); - return NULL; - } - - /* Build a valid window station name from the LUID */ - Status = RtlStringCbPrintfW(ServiceWinStaName, - sizeof(ServiceWinStaName), - L"%wZ\\Service-0x%x-%x$", - &gustrWindowStationsDir, - CallerLuid.HighPart, - CallerLuid.LowPart); - if (!NT_SUCCESS(Status)) - { - ERR("Impossible to build a valid window station name, Status 0x%08lx\n", Status); - SetLastNtError(Status); - return NULL; - } - - RtlInitUnicodeString(&WindowStationName, ServiceWinStaName); - LocalObjectAttributes.ObjectName = &WindowStationName; - AccessMode = KernelMode; - } - - // TODO: Capture and use the SecurityQualityOfService! - + /* Create the window station */ Status = IntCreateWindowStation(&hWinSta, - &LocalObjectAttributes, - AccessMode, + ObjectAttributes, + UserMode, + OwnerMode, dwDesiredAccess, Unknown2, Unknown3, Unknown4, Unknown5, Unknown6); - - if ((AccessMode == UserMode) && LocalObjectAttributes.ObjectName) - ExFreePoolWithTag(LocalObjectAttributes.ObjectName->Buffer, TAG_STRING); - if (NT_SUCCESS(Status)) { - TRACE("NtUserCreateWindowStation created a window station with handle 0x%p\n", hWinSta); + TRACE("NtUserCreateWindowStation created window station '%wZ' with handle 0x%p\n", + ObjectAttributes->ObjectName, hWinSta); } else { ASSERT(hWinSta == NULL); - TRACE("NtUserCreateWindowStation failed to create a window station!\n"); + ERR("NtUserCreateWindowStation failed to create window station '%wZ', Status 0x%08lx\n", + ObjectAttributes->ObjectName, Status); + } + + /* Try to restore the user's ObjectAttributes and release the window station name */ + FreeUserModeWindowStationName(WindowStationName, + TebStaticUnicodeString, + (OwnerMode == KernelMode ? ObjectAttributes : NULL), + &LocalObjectAttributes); + + if (!NT_SUCCESS(Status)) + { + ASSERT(hWinSta == NULL); + SetLastNtError(Status); } return hWinSta; @@ -635,32 +804,130 @@ NtUserCreateWindowStation( * @implemented */ -HWINSTA APIENTRY +HWINSTA +APIENTRY NtUserOpenWindowStation( - POBJECT_ATTRIBUTES ObjectAttributes, - ACCESS_MASK dwDesiredAccess) + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ACCESS_MASK dwDesiredAccess) { - HWINSTA hwinsta; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + HWINSTA hWinSta = NULL; + OBJECT_ATTRIBUTES LocalObjectAttributes; + PUNICODE_STRING WindowStationName = NULL; + PUNICODE_STRING TebStaticUnicodeString = NULL; + KPROCESSOR_MODE OwnerMode = UserMode; + + TRACE("NtUserOpenWindowStation called\n"); + + /* Capture the object attributes and the window station name */ + _SEH2_TRY + { + ProbeForRead(ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); + LocalObjectAttributes = *ObjectAttributes; + if (LocalObjectAttributes.Length != sizeof(OBJECT_ATTRIBUTES)) + { + ERR("Invalid ObjectAttributes length!\n"); + Status = STATUS_INVALID_PARAMETER; + _SEH2_LEAVE; + } + + /* + * Check whether the caller did not provide a window station name, + * or provided the special "Service-0x00000000-00000000$" name. + * + * NOTE: On Windows, the special "Service-0x00000000-00000000$" string + * is used instead of an empty name (observed when API-monitoring + * OpenWindowStation() called with an empty window station name). + */ + if ((LocalObjectAttributes.ObjectName == NULL || + LocalObjectAttributes.ObjectName->Buffer == NULL || + LocalObjectAttributes.ObjectName->Length == 0 || + LocalObjectAttributes.ObjectName->Buffer[0] == UNICODE_NULL) + /* && + LocalObjectAttributes.RootDirectory == NULL */) + { + /* No, remember that for later */ + LocalObjectAttributes.ObjectName = NULL; + } + if (LocalObjectAttributes.ObjectName && + LocalObjectAttributes.ObjectName->Length == + sizeof(L"Service-0x00000000-00000000$") - sizeof(UNICODE_NULL) && + _wcsnicmp(LocalObjectAttributes.ObjectName->Buffer, + L"Service-0x00000000-00000000$", + LocalObjectAttributes.ObjectName->Length / sizeof(WCHAR)) == 0) + { + /* No, remember that for later */ + LocalObjectAttributes.ObjectName = NULL; + } + + /* + * If the caller did not provide a window station name, build a new one + * based on the logon session identifier for the calling process. + * The new name is allocated in user-mode, as the rest of ObjectAttributes + * already is, so that the validation performed by the Object Manager + * can be done adequately. + */ + if (!LocalObjectAttributes.ObjectName) + { + /* No, build the new window station name */ + Status = BuildUserModeWindowStationName(ObjectAttributes, + &LocalObjectAttributes, + &WindowStationName, + &TebStaticUnicodeString); + if (!NT_SUCCESS(Status)) + { + ERR("BuildUserModeWindowStationName() failed, Status 0x%08lx\n", Status); + _SEH2_LEAVE; + } + OwnerMode = KernelMode; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status =_SEH2_GetExceptionCode(); + ERR("ObjectAttributes capture failed, Status 0x%08lx\n", Status); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return NULL; + } + + /* Open the window station */ Status = ObOpenObjectByName(ObjectAttributes, ExWindowStationObjectType, UserMode, NULL, dwDesiredAccess, NULL, - (PVOID*)&hwinsta); + (PVOID*)&hWinSta); + if (NT_SUCCESS(Status)) + { + TRACE("NtUserOpenWindowStation opened window station '%wZ' with handle 0x%p\n", + ObjectAttributes->ObjectName, hWinSta); + } + else + { + ASSERT(hWinSta == NULL); + ERR("NtUserOpenWindowStation failed to open window station '%wZ', Status 0x%08lx\n", + ObjectAttributes->ObjectName, Status); + } + + /* Try to restore the user's ObjectAttributes and release the window station name */ + FreeUserModeWindowStationName(WindowStationName, + TebStaticUnicodeString, + (OwnerMode == KernelMode ? ObjectAttributes : NULL), + &LocalObjectAttributes); if (!NT_SUCCESS(Status)) { - ERR("NtUserOpenWindowStation failed\n"); + ASSERT(hWinSta == NULL); SetLastNtError(Status); - return 0; } - TRACE("Opened window station %wZ with handle %p\n", ObjectAttributes->ObjectName, hwinsta); - - return hwinsta; + return hWinSta; } /* @@ -677,7 +944,7 @@ NtUserOpenWindowStation( * * Remarks * The window station handle can be created with NtUserCreateWindowStation - * or NtUserOpenWindowStation. Attemps to close a handle to the window + * or NtUserOpenWindowStation. Attempts to close a handle to the window * station assigned to the calling process will fail. * * Status @@ -1713,5 +1980,4 @@ Leave: return Ret; } - /* EOF */ diff --git a/win32ss/user/ntuser/winsta.h b/win32ss/user/ntuser/winsta.h index 19b1479ec0..20575e0a90 100644 --- a/win32ss/user/ntuser/winsta.h +++ b/win32ss/user/ntuser/winsta.h @@ -112,6 +112,7 @@ IntCreateWindowStation( OUT HWINSTA* phWinSta, IN POBJECT_ATTRIBUTES ObjectAttributes, IN KPROCESSOR_MODE AccessMode, + IN KPROCESSOR_MODE OwnerMode, IN ACCESS_MASK dwDesiredAccess, DWORD Unknown2, DWORD Unknown3,

6 years, 4 months

08/18: [WIN32K:NTUSER] Similarly to what was done in USERSRV for harderrors, introduce the _scwprintf() helper function based on the imported _vscwprintf().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26933a0965aad1473684d… commit 26933a0965aad1473684d71634ff6ed6bbbde695 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jul 17 01:47:59 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:34 2018 +0200 [WIN32K:NTUSER] Similarly to what was done in USERSRV for harderrors, introduce the _scwprintf() helper function based on the imported _vscwprintf(). --- win32ss/user/ntuser/misc.c | 24 ++++++++++++++++++++++++ win32ss/user/ntuser/userfuncs.h | 6 ++++++ 2 files changed, 30 insertions(+) diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index fee2e91388..83d0ad1fe5 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -9,6 +9,30 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMisc); + +/* + * NOTE: _scwprintf() is NOT exported by ntoskrnl.exe, + * only _vscwprintf() is, so we need to implement it here. + * Code comes from sdk/lib/crt/printf/_scwprintf.c . + * See also win32ss/user/winsrv/usersrv/harderror.c . + */ +int +__cdecl +_scwprintf( + const wchar_t *format, + ...) +{ + int len; + va_list args; + + va_start(args, format); + len = _vscwprintf(format, args); + va_end(args); + + return len; +} + + /* * Test the Thread to verify and validate it. Hard to the core tests are required. */ diff --git a/win32ss/user/ntuser/userfuncs.h b/win32ss/user/ntuser/userfuncs.h index efa89aec13..29ae2394dd 100644 --- a/win32ss/user/ntuser/userfuncs.h +++ b/win32ss/user/ntuser/userfuncs.h @@ -92,6 +92,12 @@ HKL FASTCALL UserGetKeyboardLayout(DWORD dwThreadId); /*************** MISC.C ***************/ +int +__cdecl +_scwprintf( + const wchar_t *format, + ...); + BOOL FASTCALL UserSystemParametersInfo( UINT uiAction,

6 years, 4 months

07/18: [WIN32K:NTUSER] Get rid of the cached window station Name member, and instead just use the name stored in the NT Object's header. CORE-11933 and PR #621.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43e2ab208a2d3d50b12b4… commit 43e2ab208a2d3d50b12b4689347f57ca83568dd9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 17 19:40:32 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:32 2018 +0200 [WIN32K:NTUSER] Get rid of the cached window station Name member, and instead just use the name stored in the NT Object's header. CORE-11933 and PR #621. - Remove the related hack-FIXMEs; - Adjust NtUserGetObjectInformation() in accordance. - Retrieve the window-station/desktop object type string in NtUserGetObjectInformation() also from the NT Object's header. Also simplify the UOI_FLAGS case of NtUserGetObjectInformation() by reading the handle inheritance information directly from the OBJECT_HANDLE_INFORMATION structure returned by ObReferenceObjectByHandle(). --- win32ss/user/ntuser/sysparams.c | 3 +- win32ss/user/ntuser/winsta.c | 106 +++++++++++++++++++--------------------- win32ss/user/ntuser/winsta.h | 1 - 3 files changed, 51 insertions(+), 59 deletions(-) diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index 7eedc028de..d0badba00e 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -33,7 +33,8 @@ BOOL g_PaintDesktopVersion = FALSE; } \ else \ { \ - ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", &GetW32ProcessInfo()->prpwinsta->Name); \ + ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", \ + &(OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(GetW32ProcessInfo()->prpwinsta))->Name)); \ } \ EngSetLastError(err); \ return 0; \ diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index f373b1cedf..ba1b1eb57d 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -114,8 +114,6 @@ IntWinStaObjectDelete( RtlDestroyAtomTable(WinSta->AtomTable); - RtlFreeUnicodeString(&WinSta->Name); - return STATUS_SUCCESS; } @@ -449,8 +447,6 @@ IntCreateWindowStation( RtlZeroMemory(WindowStationObject, sizeof(WINSTATION_OBJECT)); InitializeListHead(&WindowStationObject->DesktopListHead); - WindowStationObject->Name = *ObjectAttributes->ObjectName; - ObjectAttributes->ObjectName = NULL; // FIXME! (see NtUserCreateWindowStation()) WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId; Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); if (!NT_SUCCESS(Status)) @@ -491,7 +487,7 @@ IntCreateWindowStation( } TRACE("IntCreateWindowStation created object 0x%p with name %wZ handle 0x%p\n", - WindowStationObject, &WindowStationObject->Name, WindowStation); + WindowStationObject, ObjectAttributes->ObjectName, WindowStation); *phWinSta = WindowStation; return STATUS_SUCCESS; @@ -582,23 +578,7 @@ NtUserCreateWindowStation( return NULL; } - WindowStationName.Length = wcslen(ServiceWinStaName) * sizeof(WCHAR); - WindowStationName.MaximumLength = - WindowStationName.Length + sizeof(UNICODE_NULL); - WindowStationName.Buffer = - ExAllocatePoolWithTag(PagedPool, - WindowStationName.MaximumLength, - TAG_STRING); - if (!WindowStationName.Buffer) - { - Status = STATUS_NO_MEMORY; - ERR("Impossible to build a valid window station name, Status 0x%08lx\n", Status); - SetLastNtError(Status); - return NULL; - } - RtlStringCbCopyW(WindowStationName.Buffer, - WindowStationName.MaximumLength, - ServiceWinStaName); + RtlInitUnicodeString(&WindowStationName, ServiceWinStaName); LocalObjectAttributes.ObjectName = &WindowStationName; AccessMode = KernelMode; } @@ -615,12 +595,7 @@ NtUserCreateWindowStation( Unknown5, Unknown6); - // FIXME! Because in some situations we store the allocated window station name - // inside the window station, we must not free it now! We know this fact when - // IntCreateWindowStation() sets LocalObjectAttributes.ObjectName to NULL. - // This hack must be removed once we just use the stored Ob name instead - // (in which case we will always free the allocated name here). - if (LocalObjectAttributes.ObjectName) + if ((AccessMode == UserMode) && LocalObjectAttributes.ObjectName) ExFreePoolWithTag(LocalObjectAttributes.ObjectName->Buffer, TAG_STRING); if (NT_SUCCESS(Status)) @@ -802,7 +777,11 @@ NtUserGetObjectInformation( NTSTATUS Status; PWINSTATION_OBJECT WinStaObject = NULL; PDESKTOP DesktopObject = NULL; + POBJECT_HEADER ObjectHeader; + POBJECT_HEADER_NAME_INFO NameInfo; + OBJECT_HANDLE_INFORMATION HandleInfo; USEROBJECTFLAGS ObjectFlags; + PUNICODE_STRING pStrNameU = NULL; PVOID pvData = NULL; SIZE_T nDataSize = 0; @@ -820,13 +799,13 @@ NtUserGetObjectInformation( _SEH2_END; /* Try window station */ - TRACE("Trying to open window station %p\n", hObject); + TRACE("Trying to open window station 0x%p\n", hObject); Status = ObReferenceObjectByHandle(hObject, 0, ExWindowStationObjectType, UserMode, (PVOID*)&WinStaObject, - NULL); + &HandleInfo); if (Status == STATUS_OBJECT_TYPE_MISMATCH) { @@ -852,23 +831,8 @@ NtUserGetObjectInformation( { case UOI_FLAGS: { - OBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo; - ULONG BytesWritten; - ObjectFlags.fReserved = FALSE; - - /* Check whether this handle is inheritable */ - Status = ZwQueryObject(hObject, - ObjectHandleFlagInformation, - &HandleInfo, - sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION), - &BytesWritten); - if (!NT_SUCCESS(Status)) - { - ERR("ZwQueryObject failed, Status 0x%08lx\n", Status); - break; - } - ObjectFlags.fInherit = HandleInfo.Inherit; + ObjectFlags.fInherit = !!(HandleInfo.HandleAttributes & OBJ_INHERIT); ObjectFlags.dwFlags = 0; if (WinStaObject != NULL) @@ -893,11 +857,24 @@ NtUserGetObjectInformation( case UOI_NAME: { - // FIXME: Use either ObQueryNameString() or read directly that name inside the Object section! if (WinStaObject != NULL) { - pvData = WinStaObject->Name.Buffer; - nDataSize = WinStaObject->Name.Length + sizeof(WCHAR); + ObjectHeader = OBJECT_TO_OBJECT_HEADER(WinStaObject); + NameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + + if (NameInfo && (NameInfo->Name.Length > 0)) + { + /* Named window station */ + pStrNameU = &NameInfo->Name; + nDataSize = pStrNameU->Length + sizeof(UNICODE_NULL); + } + else + { + /* Unnamed window station (should never happen!) */ + ASSERT(FALSE); + pStrNameU = NULL; + nDataSize = sizeof(UNICODE_NULL); + } Status = STATUS_SUCCESS; } else if (DesktopObject != NULL) @@ -917,14 +894,16 @@ NtUserGetObjectInformation( { if (WinStaObject != NULL) { - pvData = L"WindowStation"; - nDataSize = sizeof(L"WindowStation"); + ObjectHeader = OBJECT_TO_OBJECT_HEADER(WinStaObject); + pStrNameU = &ObjectHeader->Type->Name; + nDataSize = pStrNameU->Length + sizeof(UNICODE_NULL); Status = STATUS_SUCCESS; } else if (DesktopObject != NULL) { - pvData = L"Desktop"; - nDataSize = sizeof(L"Desktop"); + ObjectHeader = OBJECT_TO_OBJECT_HEADER(DesktopObject); + pStrNameU = &ObjectHeader->Type->Name; + nDataSize = pStrNameU->Length + sizeof(UNICODE_NULL); Status = STATUS_SUCCESS; } else @@ -954,10 +933,25 @@ Exit: *nLengthNeeded = nDataSize; /* Try to copy data to caller */ - if (Status == STATUS_SUCCESS) + if (Status == STATUS_SUCCESS && (nDataSize > 0)) { TRACE("Trying to copy data to caller (len = %lu, len needed = %lu)\n", nLength, nDataSize); - RtlCopyMemory(pvInformation, pvData, nDataSize); + if (pvData) + { + /* Copy the data */ + RtlCopyMemory(pvInformation, pvData, nDataSize); + } + else if (pStrNameU) + { + /* Copy and NULL-terminate the string */ + RtlCopyMemory(pvInformation, pStrNameU->Buffer, pStrNameU->Length); + ((PWCHAR)pvInformation)[pStrNameU->Length / sizeof(WCHAR)] = UNICODE_NULL; + } + else + { + /* Zero the memory */ + RtlZeroMemory(pvInformation, nDataSize); + } } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1026,8 +1020,6 @@ NtUserSetObjectInformation( } - - HWINSTA FASTCALL UserGetProcessWindowStation(VOID) { diff --git a/win32ss/user/ntuser/winsta.h b/win32ss/user/ntuser/winsta.h index 085f3bcb26..19b1479ec0 100644 --- a/win32ss/user/ntuser/winsta.h +++ b/win32ss/user/ntuser/winsta.h @@ -15,7 +15,6 @@ typedef struct _WINSTATION_OBJECT { DWORD dwSessionId; - UNICODE_STRING Name; LIST_ENTRY DesktopListHead; PRTL_ATOM_TABLE AtomTable; HANDLE ShellWindow;

6 years, 4 months

06/18: [WIN32K:NTUSER] Detect when the NtUserCreateWindowStation() caller has provided an empty window station name, and if so, generate a name in the format: "Service-0x<luidhigh>-<luidlow>$" .

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dae57caa3605c6a7898e5… commit dae57caa3605c6a7898e5db4094f4e06c3968195 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 16 19:45:20 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:32 2018 +0200 [WIN32K:NTUSER] Detect when the NtUserCreateWindowStation() caller has provided an empty window station name, and if so, generate a name in the format: "Service-0x<luidhigh>-<luidlow>$" . CORE-11933 and PR #621. --- win32ss/user/ntuser/winsta.c | 74 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index eb3ca30e74..f373b1cedf 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -512,6 +512,7 @@ NtUserCreateWindowStation( HWINSTA hWinSta; OBJECT_ATTRIBUTES LocalObjectAttributes; UNICODE_STRING WindowStationName; + KPROCESSOR_MODE AccessMode = UserMode; TRACE("NtUserCreateWindowStation called\n"); @@ -520,9 +521,21 @@ NtUserCreateWindowStation( { ProbeForRead(ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); LocalObjectAttributes = *ObjectAttributes; - Status = IntSafeCopyUnicodeStringTerminateNULL(&WindowStationName, - LocalObjectAttributes.ObjectName); - LocalObjectAttributes.ObjectName = &WindowStationName; + if (LocalObjectAttributes.ObjectName || + LocalObjectAttributes.RootDirectory + /* && + LocalObjectAttributes.ObjectName->Buffer && + LocalObjectAttributes.ObjectName->Length > 0 */) + { + Status = IntSafeCopyUnicodeStringTerminateNULL(&WindowStationName, + LocalObjectAttributes.ObjectName); + LocalObjectAttributes.ObjectName = &WindowStationName; + } + else + { + LocalObjectAttributes.ObjectName = NULL; + Status = STATUS_SUCCESS; + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -537,11 +550,64 @@ NtUserCreateWindowStation( return NULL; } + /* + * If the caller did not provide a window station name, build a new one + * based on the logon session identifier for the calling process. + */ + if (!LocalObjectAttributes.ObjectName) + { + LUID CallerLuid; + WCHAR ServiceWinStaName[MAX_PATH]; + + /* Retrieve the LUID of the current process */ + Status = GetProcessLuid(NULL, NULL, &CallerLuid); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to retrieve the caller LUID, Status 0x%08lx\n", Status); + SetLastNtError(Status); + return NULL; + } + + /* Build a valid window station name from the LUID */ + Status = RtlStringCbPrintfW(ServiceWinStaName, + sizeof(ServiceWinStaName), + L"%wZ\\Service-0x%x-%x$", + &gustrWindowStationsDir, + CallerLuid.HighPart, + CallerLuid.LowPart); + if (!NT_SUCCESS(Status)) + { + ERR("Impossible to build a valid window station name, Status 0x%08lx\n", Status); + SetLastNtError(Status); + return NULL; + } + + WindowStationName.Length = wcslen(ServiceWinStaName) * sizeof(WCHAR); + WindowStationName.MaximumLength = + WindowStationName.Length + sizeof(UNICODE_NULL); + WindowStationName.Buffer = + ExAllocatePoolWithTag(PagedPool, + WindowStationName.MaximumLength, + TAG_STRING); + if (!WindowStationName.Buffer) + { + Status = STATUS_NO_MEMORY; + ERR("Impossible to build a valid window station name, Status 0x%08lx\n", Status); + SetLastNtError(Status); + return NULL; + } + RtlStringCbCopyW(WindowStationName.Buffer, + WindowStationName.MaximumLength, + ServiceWinStaName); + LocalObjectAttributes.ObjectName = &WindowStationName; + AccessMode = KernelMode; + } + // TODO: Capture and use the SecurityQualityOfService! Status = IntCreateWindowStation(&hWinSta, &LocalObjectAttributes, - UserMode, + AccessMode, dwDesiredAccess, Unknown2, Unknown3,

6 years, 4 months

05/18: [WIN32K:NTUSER] Split NtUserCreateWindowStation() into the part that captures the user-mode data and the internal worker IntCreateWindowStation() function, which will also be used later.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba018294d3a3bca3b18c1… commit ba018294d3a3bca3b18c12ccb4b6a332aea2e703 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 16 19:45:07 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:31 2018 +0200 [WIN32K:NTUSER] Split NtUserCreateWindowStation() into the part that captures the user-mode data and the internal worker IntCreateWindowStation() function, which will also be used later. Add a FIXME note about how we currently handle the window station name. --- win32ss/user/ntuser/winsta.c | 172 ++++++++++++++++++++++++++++++------------- win32ss/user/ntuser/winsta.h | 13 ++++ 2 files changed, 135 insertions(+), 50 deletions(-) diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index 901897857b..eb3ca30e74 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -386,108 +386,96 @@ CheckWinstaAttributeAccess(ACCESS_MASK DesiredAccess) * @implemented */ -HWINSTA APIENTRY -NtUserCreateWindowStation( - POBJECT_ATTRIBUTES ObjectAttributes, - ACCESS_MASK dwDesiredAccess, +NTSTATUS +FASTCALL +IntCreateWindowStation( + OUT HWINSTA* phWinSta, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN KPROCESSOR_MODE AccessMode, + IN ACCESS_MASK dwDesiredAccess, DWORD Unknown2, DWORD Unknown3, DWORD Unknown4, DWORD Unknown5, DWORD Unknown6) { - UNICODE_STRING WindowStationName; - PWINSTATION_OBJECT WindowStationObject; - HWINSTA WindowStation; NTSTATUS Status; + HWINSTA WindowStation; + PWINSTATION_OBJECT WindowStationObject; - TRACE("NtUserCreateWindowStation called\n"); + TRACE("IntCreateWindowStation called\n"); + + ASSERT(phWinSta); + *phWinSta = NULL; Status = ObOpenObjectByName(ObjectAttributes, ExWindowStationObjectType, - UserMode, + AccessMode, NULL, dwDesiredAccess, NULL, (PVOID*)&WindowStation); - if (NT_SUCCESS(Status)) { - TRACE("NtUserCreateWindowStation opened window station %wZ\n", ObjectAttributes->ObjectName); - return (HWINSTA)WindowStation; + TRACE("IntCreateWindowStation opened window station %wZ\n", + ObjectAttributes->ObjectName); + *phWinSta = WindowStation; + return Status; } /* - * No existing window station found, try to create new one + * No existing window station found, try to create new one. */ - /* Capture window station name */ - _SEH2_TRY - { - ProbeForRead( ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), 1); - Status = IntSafeCopyUnicodeStringTerminateNULL(&WindowStationName, ObjectAttributes->ObjectName); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status =_SEH2_GetExceptionCode(); - } - _SEH2_END - - if (! NT_SUCCESS(Status)) - { - ERR("Failed reading capturing window station name\n"); - SetLastNtError(Status); - return NULL; - } - /* Create the window station object */ - Status = ObCreateObject(UserMode, + Status = ObCreateObject(KernelMode, ExWindowStationObjectType, ObjectAttributes, - UserMode, + AccessMode, NULL, sizeof(WINSTATION_OBJECT), 0, 0, (PVOID*)&WindowStationObject); - if (!NT_SUCCESS(Status)) { - ERR("ObCreateObject failed with %lx for window station %wZ\n", Status, &WindowStationName); - ExFreePoolWithTag(WindowStationName.Buffer, TAG_STRING); - SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - return 0; + ERR("ObCreateObject failed with %lx for window station %wZ\n", + Status, ObjectAttributes->ObjectName); + SetLastNtError(Status); + return Status; } /* Initialize the window station */ RtlZeroMemory(WindowStationObject, sizeof(WINSTATION_OBJECT)); InitializeListHead(&WindowStationObject->DesktopListHead); - WindowStationObject->Name = WindowStationName; + WindowStationObject->Name = *ObjectAttributes->ObjectName; + ObjectAttributes->ObjectName = NULL; // FIXME! (see NtUserCreateWindowStation()) WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId; Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); if (!NT_SUCCESS(Status)) { - ERR("RtlCreateAtomTable failed with %lx for window station %wZ\n", Status, &WindowStationName); + ERR("RtlCreateAtomTable failed with %lx for window station %wZ\n", Status, ObjectAttributes->ObjectName); ObDereferenceObject(WindowStationObject); - SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - return 0; + SetLastNtError(Status); + return Status; } - Status = ObInsertObject((PVOID)WindowStationObject, + Status = ObInsertObject(WindowStationObject, NULL, dwDesiredAccess, 0, NULL, (PVOID*)&WindowStation); - if (!NT_SUCCESS(Status)) { ERR("ObInsertObject failed with %lx for window station\n", Status); - SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - return 0; + SetLastNtError(Status); + return Status; } + // FIXME! TODO: Add this new window station to a linked list + if (InputWindowStation == NULL) { ERR("Initializing input window station\n"); @@ -502,9 +490,84 @@ NtUserCreateWindowStation( WindowStationObject->Flags |= WSS_NOIO; } - TRACE("NtUserCreateWindowStation created object %p with name %wZ handle %p\n", - WindowStation, &WindowStationObject->Name, WindowStation); - return WindowStation; + TRACE("IntCreateWindowStation created object 0x%p with name %wZ handle 0x%p\n", + WindowStationObject, &WindowStationObject->Name, WindowStation); + + *phWinSta = WindowStation; + return STATUS_SUCCESS; +} + +HWINSTA +APIENTRY +NtUserCreateWindowStation( + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ACCESS_MASK dwDesiredAccess, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4, + DWORD Unknown5, + DWORD Unknown6) +{ + NTSTATUS Status; + HWINSTA hWinSta; + OBJECT_ATTRIBUTES LocalObjectAttributes; + UNICODE_STRING WindowStationName; + + TRACE("NtUserCreateWindowStation called\n"); + + /* Capture window station name */ + _SEH2_TRY + { + ProbeForRead(ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); + LocalObjectAttributes = *ObjectAttributes; + Status = IntSafeCopyUnicodeStringTerminateNULL(&WindowStationName, + LocalObjectAttributes.ObjectName); + LocalObjectAttributes.ObjectName = &WindowStationName; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status =_SEH2_GetExceptionCode(); + } + _SEH2_END + + if (!NT_SUCCESS(Status)) + { + ERR("Failed reading or capturing window station name, Status 0x%08lx\n", Status); + SetLastNtError(Status); + return NULL; + } + + // TODO: Capture and use the SecurityQualityOfService! + + Status = IntCreateWindowStation(&hWinSta, + &LocalObjectAttributes, + UserMode, + dwDesiredAccess, + Unknown2, + Unknown3, + Unknown4, + Unknown5, + Unknown6); + + // FIXME! Because in some situations we store the allocated window station name + // inside the window station, we must not free it now! We know this fact when + // IntCreateWindowStation() sets LocalObjectAttributes.ObjectName to NULL. + // This hack must be removed once we just use the stored Ob name instead + // (in which case we will always free the allocated name here). + if (LocalObjectAttributes.ObjectName) + ExFreePoolWithTag(LocalObjectAttributes.ObjectName->Buffer, TAG_STRING); + + if (NT_SUCCESS(Status)) + { + TRACE("NtUserCreateWindowStation created a window station with handle 0x%p\n", hWinSta); + } + else + { + ASSERT(hWinSta == NULL); + TRACE("NtUserCreateWindowStation failed to create a window station!\n"); + } + + return hWinSta; } /* @@ -764,6 +827,7 @@ NtUserGetObjectInformation( case UOI_NAME: { + // FIXME: Use either ObQueryNameString() or read directly that name inside the Object section! if (WinStaObject != NULL) { pvData = WinStaObject->Name.Buffer; @@ -1136,6 +1200,14 @@ BuildWindowStationNameList( POBJECT_DIRECTORY_INFORMATION DirEntry; WCHAR NullWchar; + // + // FIXME: Fully wrong! Since, by calling NtUserCreateWindowStation + // with judicious parameters one can create window stations elsewhere + // than in Windows\WindowStations directory, Win32k definitely MUST + // maintain a list of window stations it has created, and not rely + // on the enumeration of Windows\WindowStations !!! + // + /* * Try to open the directory. */ diff --git a/win32ss/user/ntuser/winsta.h b/win32ss/user/ntuser/winsta.h index b41834e7c1..085f3bcb26 100644 --- a/win32ss/user/ntuser/winsta.h +++ b/win32ss/user/ntuser/winsta.h @@ -107,6 +107,19 @@ IntValidateWindowStationHandle( PWINSTATION_OBJECT *Object, POBJECT_HANDLE_INFORMATION pObjectHandleInfo); +NTSTATUS +FASTCALL +IntCreateWindowStation( + OUT HWINSTA* phWinSta, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN KPROCESSOR_MODE AccessMode, + IN ACCESS_MASK dwDesiredAccess, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4, + DWORD Unknown5, + DWORD Unknown6); + BOOL FASTCALL UserSetProcessWindowStation(HWINSTA hWindowStation); BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID);

6 years, 4 months

04/18: [WIN32K:NTUSER] In UserCreateWinstaDirectory(), use a string-safe printf, and use OBJ_KERNEL_HANDLE as well as a suitable desired access value in a ZwCreateDirectoryObject() call.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f47afc3b61cc182bfe4ee… commit f47afc3b61cc182bfe4ee8cf95bf62a4e03659c6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 16 19:44:56 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:30 2018 +0200 [WIN32K:NTUSER] In UserCreateWinstaDirectory(), use a string-safe printf, and use OBJ_KERNEL_HANDLE as well as a suitable desired access value in a ZwCreateDirectoryObject() call. --- win32ss/user/ntuser/winsta.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index 44a8f40505..901897857b 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -47,11 +47,11 @@ NTSTATUS NTAPI UserCreateWinstaDirectory(VOID) { - PPEB Peb; NTSTATUS Status; - WCHAR wstrWindowStationsDir[MAX_PATH]; + PPEB Peb; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hWinstaDir; + WCHAR wstrWindowStationsDir[MAX_PATH]; /* Create the WindowStations directory and cache its path for later use */ Peb = NtCurrentPeb(); @@ -64,11 +64,14 @@ UserCreateWinstaDirectory(VOID) } else { - swprintf(wstrWindowStationsDir, - L"%ws\\%lu%ws", - SESSION_DIR, - Peb->SessionId, - WINSTA_OBJ_DIR); + Status = RtlStringCbPrintfW(wstrWindowStationsDir, + sizeof(wstrWindowStationsDir), + L"%ws\\%lu%ws", + SESSION_DIR, + Peb->SessionId, + WINSTA_OBJ_DIR); + if (!NT_SUCCESS(Status)) + return Status; if (!RtlCreateUnicodeString(&gustrWindowStationsDir, wstrWindowStationsDir)) { @@ -78,10 +81,10 @@ UserCreateWinstaDirectory(VOID) InitializeObjectAttributes(&ObjectAttributes, &gustrWindowStationsDir, - 0, + OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwCreateDirectoryObject(&hWinstaDir, 0, &ObjectAttributes); + Status = ZwCreateDirectoryObject(&hWinstaDir, DIRECTORY_CREATE_OBJECT, &ObjectAttributes); if (!NT_SUCCESS(Status)) { ERR("Could not create %wZ directory (Status 0x%X)\n", &gustrWindowStationsDir, Status);

6 years, 4 months

03/18: [WIN32K:NTUSER] Add an extra optional "Process" parameter to the GetProcessLuid() function to be used alternatively in place of "Thread" to retrieve the LUID.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2345d63ce3c88492a241f… commit 2345d63ce3c88492a241ff8410056a4b75724ff4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 16 19:44:27 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:30 2018 +0200 [WIN32K:NTUSER] Add an extra optional "Process" parameter to the GetProcessLuid() function to be used alternatively in place of "Thread" to retrieve the LUID. --- win32ss/user/ntuser/misc.c | 38 ++++++++++++++++++++++++++------------ win32ss/user/ntuser/shutdown.c | 6 +++--- win32ss/user/ntuser/userfuncs.h | 1 + 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index ceaa7ccc13..fee2e91388 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -766,30 +766,44 @@ GetW32ThreadInfo(VOID) NTSTATUS GetProcessLuid( IN PETHREAD Thread OPTIONAL, + IN PEPROCESS Process OPTIONAL, OUT PLUID Luid) { NTSTATUS Status; - PACCESS_TOKEN Token; + PACCESS_TOKEN Token = NULL; SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; BOOLEAN CopyOnOpen, EffectiveOnly; - if (Thread == NULL) + if (Thread && Process) + return STATUS_INVALID_PARAMETER; + + /* If nothing has been specified, use the current thread */ + if (!Thread && !Process) Thread = PsGetCurrentThread(); - /* Use a thread token */ - Token = PsReferenceImpersonationToken(Thread, - &CopyOnOpen, - &EffectiveOnly, - &ImpersonationLevel); - if (Token == NULL) + if (Thread) + { + /* Use a thread token */ + ASSERT(!Process); + Token = PsReferenceImpersonationToken(Thread, + &CopyOnOpen, + &EffectiveOnly, + &ImpersonationLevel); + + /* If we don't have a thread token, use a process token */ + if (!Token) + Process = PsGetThreadProcess(Thread); + } + if (!Token && Process) { - /* We don't have a thread token, use a process token */ - Token = PsReferencePrimaryToken(PsGetThreadProcess(Thread)); + /* Use a process token */ + Token = PsReferencePrimaryToken(Process); - /* If no token, fail */ - if (Token == NULL) + /* If we don't have a token, fail */ + if (!Token) return STATUS_NO_TOKEN; } + ASSERT(Token); /* Query the LUID */ Status = SeQueryAuthenticationIdToken(Token, Luid); diff --git a/win32ss/user/ntuser/shutdown.c b/win32ss/user/ntuser/shutdown.c index a750a08fb8..860db7cf50 100644 --- a/win32ss/user/ntuser/shutdown.c +++ b/win32ss/user/ntuser/shutdown.c @@ -181,7 +181,7 @@ UserInitiateShutdown(IN PETHREAD Thread, TRACE("UserInitiateShutdown\n"); /* Get the caller's LUID */ - Status = GetProcessLuid(Thread, &CallerLuid); + Status = GetProcessLuid(Thread, NULL, &CallerLuid); if (!NT_SUCCESS(Status)) { ERR("UserInitiateShutdown: GetProcessLuid failed\n"); @@ -302,10 +302,10 @@ UserEndShutdown(IN PETHREAD Thread, */ //STUB; - Status = GetProcessLuid(Thread, &CallerLuid); + Status = GetProcessLuid(Thread, NULL, &CallerLuid); if (!NT_SUCCESS(Status)) { - ERR("GetProcessLuid failed\n"); + ERR("UserEndShutdown: GetProcessLuid failed\n"); return Status; } diff --git a/win32ss/user/ntuser/userfuncs.h b/win32ss/user/ntuser/userfuncs.h index 016180a598..efa89aec13 100644 --- a/win32ss/user/ntuser/userfuncs.h +++ b/win32ss/user/ntuser/userfuncs.h @@ -108,6 +108,7 @@ HBRUSH FASTCALL GetControlColor(PWND,PWND,HDC,UINT); NTSTATUS GetProcessLuid( IN PETHREAD Thread OPTIONAL, + IN PEPROCESS Process OPTIONAL, OUT PLUID Luid); /*************** MESSAGE.C ***************/

6 years, 4 months

02/18: [WIN32K:NTUSER] Move the GetProcessLuid() function to the miscellaneous module.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d77c4932130c2b434dcc3… commit d77c4932130c2b434dcc303611cb374ad39f5f2b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 16 19:44:15 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:29 2018 +0200 [WIN32K:NTUSER] Move the GetProcessLuid() function to the miscellaneous module. --- win32ss/user/ntuser/misc.c | 37 +++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/shutdown.c | 36 ------------------------------------ win32ss/user/ntuser/userfuncs.h | 5 +++++ 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 856806ef11..ceaa7ccc13 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -762,4 +762,41 @@ GetW32ThreadInfo(VOID) return (PTHREADINFO)PsGetCurrentThreadWin32Thread(); } + +NTSTATUS +GetProcessLuid( + IN PETHREAD Thread OPTIONAL, + OUT PLUID Luid) +{ + NTSTATUS Status; + PACCESS_TOKEN Token; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + BOOLEAN CopyOnOpen, EffectiveOnly; + + if (Thread == NULL) + Thread = PsGetCurrentThread(); + + /* Use a thread token */ + Token = PsReferenceImpersonationToken(Thread, + &CopyOnOpen, + &EffectiveOnly, + &ImpersonationLevel); + if (Token == NULL) + { + /* We don't have a thread token, use a process token */ + Token = PsReferencePrimaryToken(PsGetThreadProcess(Thread)); + + /* If no token, fail */ + if (Token == NULL) + return STATUS_NO_TOKEN; + } + + /* Query the LUID */ + Status = SeQueryAuthenticationIdToken(Token, Luid); + + /* Get rid of the token and return */ + ObDereferenceObject(Token); + return Status; +} + /* EOF */ diff --git a/win32ss/user/ntuser/shutdown.c b/win32ss/user/ntuser/shutdown.c index 8286235340..a750a08fb8 100644 --- a/win32ss/user/ntuser/shutdown.c +++ b/win32ss/user/ntuser/shutdown.c @@ -88,42 +88,6 @@ IntClientShutdown(IN PWND pWindow, return lResult; } - -NTSTATUS -GetProcessLuid(IN PETHREAD Thread OPTIONAL, - OUT PLUID Luid) -{ - NTSTATUS Status; - PACCESS_TOKEN Token; - SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; - BOOLEAN CopyOnOpen, EffectiveOnly; - - if (Thread == NULL) - Thread = PsGetCurrentThread(); - - /* Use a thread token */ - Token = PsReferenceImpersonationToken(Thread, - &CopyOnOpen, - &EffectiveOnly, - &ImpersonationLevel); - if (Token == NULL) - { - /* We don't have a thread token, use a process token */ - Token = PsReferencePrimaryToken(PsGetThreadProcess(Thread)); - - /* If no token, fail */ - if (Token == NULL) - return STATUS_NO_TOKEN; - } - - /* Query the LUID */ - Status = SeQueryAuthenticationIdToken(Token, Luid); - - /* Get rid of the token and return */ - ObDereferenceObject(Token); - return Status; -} - BOOLEAN HasPrivilege(IN PPRIVILEGE_SET Privilege) { diff --git a/win32ss/user/ntuser/userfuncs.h b/win32ss/user/ntuser/userfuncs.h index 33f3cd285b..016180a598 100644 --- a/win32ss/user/ntuser/userfuncs.h +++ b/win32ss/user/ntuser/userfuncs.h @@ -105,6 +105,11 @@ PTHREADINFO FASTCALL IntTID2PTI(HANDLE); HBRUSH FASTCALL GetControlBrush(PWND,HDC,UINT); HBRUSH FASTCALL GetControlColor(PWND,PWND,HDC,UINT); +NTSTATUS +GetProcessLuid( + IN PETHREAD Thread OPTIONAL, + OUT PLUID Luid); + /*************** MESSAGE.C ***************/ BOOL FASTCALL UserPostMessage(HWND Wnd,UINT Msg, WPARAM wParam, LPARAM lParam);

6 years, 4 months

← Newer
1
...
9
10
11
12
13
14
15
...
31
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 August 2018