Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [GDI32_APITEST] Remove broken EngDeleteSemaphore.c (#655)
by Serge Gautherie 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=155bd681a0eeaf0e63eb5… commit 155bd681a0eeaf0e63eb53513f5cd3bc80143b2a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Aug 19 22:33:56 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Aug 19 22:33:56 2018 +0200 [GDI32_APITEST] Remove broken EngDeleteSemaphore.c (#655) - Checks are actually uses-after-free, "by design" :-< - Actual test code duplicates EngCreateSemaphore.c, EngAcquireSemaphore.c and EngReleaseSemaphore.c. --- modules/rostests/apitests/gdi32/CMakeLists.txt | 1 - .../rostests/apitests/gdi32/EngDeleteSemaphore.c | 67 ---------------------- modules/rostests/apitests/gdi32/testlist.c | 2 - 3 files changed, 70 deletions(-) diff --git a/modules/rostests/apitests/gdi32/CMakeLists.txt b/modules/rostests/apitests/gdi32/CMakeLists.txt index 4290fce8d6..42453d1e98 100644 --- a/modules/rostests/apitests/gdi32/CMakeLists.txt +++ b/modules/rostests/apitests/gdi32/CMakeLists.txt @@ -21,7 +21,6 @@ list(APPEND SOURCE DPtoLP.c EngAcquireSemaphore.c EngCreateSemaphore.c - EngDeleteSemaphore.c EngReleaseSemaphore.c EnumFontFamilies.c ExcludeClipRect.c diff --git a/modules/rostests/apitests/gdi32/EngDeleteSemaphore.c b/modules/rostests/apitests/gdi32/EngDeleteSemaphore.c deleted file mode 100644 index d8c1218e3e..0000000000 --- a/modules/rostests/apitests/gdi32/EngDeleteSemaphore.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * PROJECT: ReactOS api tests - * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for EngDeleteSemaphore - * PROGRAMMERS: Magnus Olsen - */ - -#include "precomp.h" - -void Test_EngDeleteSemaphore() -{ - HSEMAPHORE hsem; - PRTL_CRITICAL_SECTION lpcrit; - - /* test Create then delete */ - hsem = EngCreateSemaphore(); - ok(hsem != NULL, "EngCreateSemaphore failed\n"); - if (!hsem) return; - lpcrit = (PRTL_CRITICAL_SECTION)hsem; - EngDeleteSemaphore(hsem); - -// ok(lpcrit->LockCount > 0); doesn't work on XP - ok(lpcrit->RecursionCount == 0, "lpcrit->RecursionCount=%ld\n", lpcrit->RecursionCount); - ok(lpcrit->OwningThread == 0, "lpcrit->OwningThread=%p\n", lpcrit->OwningThread); - ok(lpcrit->LockSemaphore == 0, "lpcrit->LockSemaphore=%p\n", lpcrit->LockSemaphore); - ok(lpcrit->SpinCount == 0, "lpcrit->SpinCount=%ld\n", lpcrit->SpinCount); - - //ok(lpcrit->DebugInfo != NULL, "no DebugInfo\n"); - if (lpcrit->DebugInfo) - { - ok(lpcrit->DebugInfo->Type != 0, "DebugInfo->Type=%d\n", lpcrit->DebugInfo->Type); - ok(lpcrit->DebugInfo->CreatorBackTraceIndex != 0, "DebugInfo->CreatorBackTraceIndex=%d\n", lpcrit->DebugInfo->CreatorBackTraceIndex); - //ok(lpcrit->DebugInfo->EntryCount != 0, "DebugInfo->EntryCount=%ld\n", lpcrit->DebugInfo->EntryCount); - //ok(lpcrit->DebugInfo->ContentionCount != 0, "DebugInfo->ContentionCount=%ld\n", lpcrit->DebugInfo->ContentionCount); - } - - /* test EngAcquireSemaphore and release it, then delete it */ - hsem = EngCreateSemaphore(); - ok(hsem != NULL, "EngCreateSemaphore failed\n"); - if (!hsem) return; - lpcrit = (PRTL_CRITICAL_SECTION)hsem; - - EngAcquireSemaphore(hsem); - EngReleaseSemaphore(hsem); - EngDeleteSemaphore(hsem); - - //ok(lpcrit->LockCount > 0, "lpcrit->LockCount=%ld\n", lpcrit->LockCount); - ok(lpcrit->RecursionCount == 0, "lpcrit->RecursionCount=%ld\n", lpcrit->RecursionCount); - ok(lpcrit->OwningThread == 0, "lpcrit->OwningThread=%p\n", lpcrit->OwningThread); - ok(lpcrit->LockSemaphore == 0, "lpcrit->LockSemaphore=%p\n", lpcrit->LockSemaphore); - ok(lpcrit->SpinCount == 0, "lpcrit->SpinCount=%ld\n", lpcrit->SpinCount); - - //ok(lpcrit->DebugInfo != NULL, "no DebugInfo\n"); - if (lpcrit->DebugInfo) - { - ok(lpcrit->DebugInfo->Type != 0, "DebugInfo->Type=%d\n", lpcrit->DebugInfo->Type); - ok(lpcrit->DebugInfo->CreatorBackTraceIndex != 0, "DebugInfo->CreatorBackTraceIndex=%d\n", lpcrit->DebugInfo->CreatorBackTraceIndex); - //ok(lpcrit->DebugInfo->EntryCount != 0, "DebugInfo->EntryCount=%ld\n", lpcrit->DebugInfo->EntryCount); - //ok(lpcrit->DebugInfo->ContentionCount != 0, "DebugInfo->ContentionCount=%ld\n", lpcrit->DebugInfo->ContentionCount); - } -} - -START_TEST(EngDeleteSemaphore) -{ - Test_EngDeleteSemaphore(); -} - diff --git a/modules/rostests/apitests/gdi32/testlist.c b/modules/rostests/apitests/gdi32/testlist.c index c466cde5bd..2c9e70af4a 100644 --- a/modules/rostests/apitests/gdi32/testlist.c +++ b/modules/rostests/apitests/gdi32/testlist.c @@ -22,7 +22,6 @@ extern void func_CreateRectRgn(void); extern void func_DPtoLP(void); extern void func_EngAcquireSemaphore(void); extern void func_EngCreateSemaphore(void); -extern void func_EngDeleteSemaphore(void); extern void func_EngReleaseSemaphore(void); extern void func_EnumFontFamilies(void); extern void func_ExcludeClipRect(void); @@ -96,7 +95,6 @@ const struct test winetest_testlist[] = { "DPtoLP", func_DPtoLP }, { "EngAcquireSemaphore", func_EngAcquireSemaphore }, { "EngCreateSemaphore", func_EngCreateSemaphore }, - { "EngDeleteSemaphore", func_EngDeleteSemaphore }, { "EngReleaseSemaphore", func_EngReleaseSemaphore }, { "EnumFontFamilies", func_EnumFontFamilies }, { "ExcludeClipRect", func_ExcludeClipRect },

1 0

18/18: [WIN32K:NTUSER] In UserSetProcessWindowStation(), use a duplicated window station handle to be set in the EPROCESS:Win32WindowStation cache.
by Hermès Bélusca-Maïto 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0632b0bca74e7aed85a5… commit d0632b0bca74e7aed85a58d65245e951b31aa63b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jul 23 01:17:14 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:42 2018 +0200 [WIN32K:NTUSER] In UserSetProcessWindowStation(), use a duplicated window station handle to be set in the EPROCESS:Win32WindowStation cache. Fixes most of the user32:desktop window station handle reference count tests. --- win32ss/user/ntuser/winsta.c | 75 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 15 deletions(-) diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index 13b968516c..12a1b90d3a 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -972,7 +972,6 @@ NtUserCloseWindowStation( 0, &Object, NULL); - if (!NT_SUCCESS(Status)) { ERR("Validation of window station handle (%p) failed\n", hWinSta); @@ -1319,11 +1318,11 @@ NtUserGetProcessWindowStation(VOID) BOOL FASTCALL UserSetProcessWindowStation(HWINSTA hWindowStation) { - PPROCESSINFO ppi; NTSTATUS Status; - HWINSTA hwinstaOld; + PPROCESSINFO ppi; OBJECT_HANDLE_INFORMATION ObjectHandleInfo; PWINSTATION_OBJECT NewWinSta = NULL, OldWinSta; + HWINSTA hCacheWinSta; ppi = PsGetCurrentProcessWin32Process(); @@ -1337,15 +1336,14 @@ UserSetProcessWindowStation(HWINSTA hWindowStation) &ObjectHandleInfo); if (!NT_SUCCESS(Status)) { - TRACE("Validation of window station handle (%p) failed\n", - hWindowStation); + TRACE("Validation of window station handle 0x%p failed\n", hWindowStation); SetLastNtError(Status); return FALSE; } } OldWinSta = ppi->prpwinsta; - hwinstaOld = PsGetProcessWin32WindowStation(ppi->peProcess); + hCacheWinSta = PsGetProcessWin32WindowStation(ppi->peProcess); /* Dereference the previous window station */ if (OldWinSta != NULL) @@ -1353,17 +1351,64 @@ UserSetProcessWindowStation(HWINSTA hWindowStation) ObDereferenceObject(OldWinSta); } - /* Check if we have a stale handle (it should happen for console apps) */ - if (hwinstaOld != ppi->hwinsta) - { - ObCloseHandle(hwinstaOld, UserMode); - } - /* - * FIXME: Don't allow changing the window station if there are threads that are attached to desktops and own GUI objects. + * FIXME: Don't allow changing the window station if there are threads that are attached to desktops and own GUI objects? */ - PsSetProcessWindowStation(ppi->peProcess, hWindowStation); + /* Close the cached EPROCESS window station handle if needed */ + if (hCacheWinSta != NULL) + { + /* Reference the window station */ + Status = ObReferenceObjectByHandle(hCacheWinSta, + 0, + ExWindowStationObjectType, + UserMode, + (PVOID*)&OldWinSta, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to reference the inherited window station, Status 0x%08lx\n", Status); + /* We failed, reset the cache */ + hCacheWinSta = NULL; + PsSetProcessWindowStation(ppi->peProcess, hCacheWinSta); + } + else + { + /* + * Close the old handle and reset the cache only + * if we are setting a different window station. + */ + if (NewWinSta != OldWinSta) + { + ObCloseHandle(hCacheWinSta, UserMode); + hCacheWinSta = NULL; + PsSetProcessWindowStation(ppi->peProcess, hCacheWinSta); + } + + /* Dereference the window station */ + ObDereferenceObject(OldWinSta); + } + } + + /* Duplicate and save a new cached EPROCESS window station handle */ + if ((hCacheWinSta == NULL) && (hWindowStation != NULL)) + { + Status = ZwDuplicateObject(ZwCurrentProcess(), + hWindowStation, + ZwCurrentProcess(), + (PHANDLE)&hCacheWinSta, + 0, + 0, + DUPLICATE_SAME_ACCESS); + if (!NT_SUCCESS(Status)) + { + ERR("UserSetProcessWindowStation: Failed to duplicate the window station handle, Status 0x%08lx\n", Status); + } + else + { + PsSetProcessWindowStation(ppi->peProcess, hCacheWinSta); + } + } ppi->prpwinsta = NewWinSta; ppi->hwinsta = hWindowStation; @@ -1383,7 +1428,7 @@ UserSetProcessWindowStation(HWINSTA hWindowStation) { ppi->W32PF_flags |= W32PF_IOWINSTA; } - else // Might be closed if the handle is null. + else /* Might be closed if the handle is NULL */ { ppi->W32PF_flags &= ~W32PF_IOWINSTA; }

1 0

17/18: [WIN32K:NTUSER] For processes that start without any window station and no desktops but manage these (e.g. winlogon.exe), assign their startup desktop when they assign a desktop to one of their threads.
by Hermès Bélusca-Maïto 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3b9152935c03c40e02a3… commit e3b9152935c03c40e02a372ee2224124ffdc0d91 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jul 23 00:15:23 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:41 2018 +0200 [WIN32K:NTUSER] For processes that start without any window station and no desktops but manage these (e.g. winlogon.exe), assign their startup desktop when they assign a desktop to one of their threads. --- win32ss/user/ntuser/desktop.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index ad070ad4f2..4cfdde9af7 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -3210,6 +3210,39 @@ IntSetThreadDesktop(IN HDESK hDesktop, } } + /* + * Processes, in particular Winlogon.exe, that manage window stations + * (especially the interactive WinSta0 window station) and desktops, + * may not be able to connect at startup to a window station and have + * an associated desktop as well, if none exists on the system already. + * Because creating a new window station does not affect the window station + * associated to the process, and because neither by associating a window + * station to the process nor creating a new desktop on it does associate + * a startup desktop to that process, the process has to actually assigns + * one of its threads to a desktop so that it gets automatically an assigned + * startup desktop. + * + * This is what actually happens for Winlogon.exe, which is started without + * any window station and desktop. By creating the first (and therefore + * interactive) WinSta0 window station, then assigning WinSta0 to itself + * and creating the Default desktop on it, and then assigning this desktop + * to its main thread, Winlogon.exe basically does the similar steps that + * would have been done automatically at its startup if there were already + * an existing WinSta0 window station and Default desktop. + * + * Of course all this must not be done if we are a SYSTEM or CSRSS thread. + */ + // if (pti->ppi->peProcess != gpepCSRSS) + if (!(pti->TIF_flags & (TIF_SYSTEMTHREAD | TIF_CSRSSTHREAD)) && + pti->ppi->rpdeskStartup == NULL && hDesktop != NULL) + { + ERR("The process 0x%p '%s' didn't have an assigned startup desktop before, assigning it now!\n", + pti->ppi->peProcess, pti->ppi->peProcess->ImageFileName); + + pti->ppi->hdeskStartup = hDesktop; + pti->ppi->rpdeskStartup = pdesk; + } + /* free all classes or move them to the shared heap */ if (pti->rpdesk != NULL) {

1 0

16/18: [WIN32K:NTUSER] Add a temporary winsta/desktop-connection hack for CSRSS/USERSRV (connection to WinSta0).
by Hermès Bélusca-Maïto 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3270979327444f7870057… commit 3270979327444f7870057a0917cddd1072ea108f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 22 23:11:00 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:40 2018 +0200 [WIN32K:NTUSER] Add a temporary winsta/desktop-connection hack for CSRSS/USERSRV (connection to WinSta0). Normally CSRSS must not be connected to any winsta or desktop by default. It should manually connect to a winsta/desktop only when it has to do some GUI operations, and then disconnect afterwards. [USERSRV] Temporarily hackfix the harderror dialog display to the current input desktop. --- win32ss/user/ntuser/main.c | 7 ++++++- win32ss/user/winsrv/usersrv/harderror.c | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 21fba73d1d..73d39d3bd5 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -577,7 +577,8 @@ InitThreadCallback(PETHREAD Thread) */ // if (ptiCurrent->ppi->hdeskStartup == NULL && InputWindowStation != NULL) /* Last things to do only if we are not a SYSTEM or CSRSS thread */ - if (!(ptiCurrent->TIF_flags & (TIF_SYSTEMTHREAD | TIF_CSRSSTHREAD)) && + // HACK Part #1: Temporarily disabled to have our current USERSRV running, but normally this is its duty to connect itself to the required desktop! + if (// !(ptiCurrent->TIF_flags & (TIF_SYSTEMTHREAD | TIF_CSRSSTHREAD)) && /**/ptiCurrent->ppi->hdeskStartup == NULL &&/**/ InputWindowStation != NULL) { @@ -586,6 +587,10 @@ InitThreadCallback(PETHREAD Thread) UNICODE_STRING DesktopPath; PDESKTOP pdesk; + // HACK Part #2: We force USERSRV to connect to WinSta0 by setting the STARTF_INHERITDESKTOP flag. + if (ptiCurrent->TIF_flags & (TIF_SYSTEMTHREAD | TIF_CSRSSTHREAD)) + ProcessParams->WindowFlags |= STARTF_INHERITDESKTOP; + /* * Inherit the thread desktop and process window station (if not yet inherited) * from the process startup info structure. See documentation of CreateProcess(). diff --git a/win32ss/user/winsrv/usersrv/harderror.c b/win32ss/user/winsrv/usersrv/harderror.c index 85ef9fe23d..6ff336aff5 100644 --- a/win32ss/user/winsrv/usersrv/harderror.c +++ b/win32ss/user/winsrv/usersrv/harderror.c @@ -1012,16 +1012,34 @@ UserpMessageBox( IN ULONG Timeout) { ULONG MessageBoxResponse; + HDESK hDesk, hOldDesk; DPRINT("Text = '%S', Caption = '%S', Type = 0x%lx\n", TextStringU->Buffer, CaptionStringU->Buffer, Type); + // TEMPORARY HACK to fix desktop assignment for harderror message boxes. + hDesk = OpenInputDesktop(0, FALSE, GENERIC_WRITE); + if (!hDesk) + return ResponseNotHandled; + + /* Assign the desktop to this thread */ + hOldDesk = GetThreadDesktop(GetCurrentThreadId()); + if (!SetThreadDesktop(hDesk)) + { + CloseDesktop(hDesk); + return ResponseNotHandled; + } + /* Display a message box */ MessageBoxResponse = MessageBoxTimeoutW(NULL, TextStringU->Buffer, CaptionStringU->Buffer, Type, 0, Timeout); + /* Restore the original desktop */ + SetThreadDesktop(hOldDesk); + CloseDesktop(hDesk); + /* Return response value */ switch (MessageBoxResponse) {

1 0

15/18: [INCLUDE][WINLOGON] Rename the STARTF_SCRNSAVER flag to STARTF_SCREENSAVER, as documented in "Advanced Windows NT" by Jeffrey M. Richter (Microsoft Press), and in https://is.muni.cz/el/1433/jaro2010/PB167/um/cv5/undocumented_CreateProcess.pdf .
by Hermès Bélusca-Maïto 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd39f92fcb8545f9f9eff… commit fd39f92fcb8545f9f9eff46362827339dc3eab30 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 22 20:45:16 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:40 2018 +0200 [INCLUDE][WINLOGON] Rename the STARTF_SCRNSAVER flag to STARTF_SCREENSAVER, as documented in "Advanced Windows NT" by Jeffrey M. Richter (Microsoft Press), and in https://is.muni.cz/el/1433/jaro2010/PB167/um/cv5/undocumented_CreateProcess… . [INCLUDE][SERVICES][WIN32K:NTUSER] Add an undocumented STARTF_INHERITDESKTOP flag for the STARTUPINFO::dwFlags structure member, whose purpose is to tell Win32k that the created handles to the window station and desktop to which the process is connecting to, can be inherited by its child processes. It is used when starting interactive services. Observed via API monitoring on Windows 2003. --- base/system/services/database.c | 3 +++ base/system/winlogon/screensaver.c | 2 +- sdk/include/reactos/undocuser.h | 7 +++++-- win32ss/user/ntuser/main.c | 6 +++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index 0a710659bb..409fab4c71 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -17,6 +17,8 @@ #include <userenv.h> #include <strsafe.h> +#include <reactos/undocuser.h> + #define NDEBUG #include <debug.h> @@ -1674,6 +1676,7 @@ ScmStartUserModeService(PSERVICE Service, if ((NoInteractiveServices == 0) && (Service->Status.dwServiceType & SERVICE_INTERACTIVE_PROCESS)) { + StartupInfo.dwFlags |= STARTF_INHERITDESKTOP; StartupInfo.lpDesktop = L"WinSta0\\Default"; } diff --git a/base/system/winlogon/screensaver.c b/base/system/winlogon/screensaver.c index a6139280ad..e56c688df8 100644 --- a/base/system/winlogon/screensaver.c +++ b/base/system/winlogon/screensaver.c @@ -327,7 +327,7 @@ StartScreenSaver( ZeroMemory(&StartupInfo, sizeof(STARTUPINFOW)); ZeroMemory(&ProcessInformation, sizeof(PROCESS_INFORMATION)); StartupInfo.cb = sizeof(STARTUPINFOW); - StartupInfo.dwFlags = STARTF_SCRNSAVER; + StartupInfo.dwFlags = STARTF_SCREENSAVER; /* FIXME: run the screen saver on the screen saver desktop */ ret = CreateProcessW(szApplicationName, diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index 7001e985f0..5e2074a217 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -156,8 +156,11 @@ extern "C" { #define DFCS_MENUARROWUP 0x0008 #define DFCS_MENUARROWDOWN 0x0010 - -#define STARTF_SCRNSAVER 0x80000000 +// +// Undocumented flags for CreateProcess +// +#define STARTF_INHERITDESKTOP 0x40000000 +#define STARTF_SCREENSAVER 0x80000000 #define MOD_WINLOGON_SAS 0x8000 diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 2fc1b69082..21fba73d1d 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -165,8 +165,8 @@ UserProcessCreate(PEPROCESS Process) /* Setup process flags */ ppiCurrent->W32PF_flags |= W32PF_PROCESSCONNECTED; - if ( Process->Peb->ProcessParameters && - Process->Peb->ProcessParameters->WindowFlags & STARTF_SCRNSAVER ) + if (Process->Peb->ProcessParameters && + (Process->Peb->ProcessParameters->WindowFlags & STARTF_SCREENSAVER)) { ppiScrnSaver = ppiCurrent; ppiCurrent->W32PF_flags |= W32PF_SCREENSAVER; @@ -603,7 +603,7 @@ InitThreadCallback(PETHREAD Thread) Status = IntResolveDesktop(Process, &DesktopPath, - FALSE, + !!(ProcessParams->WindowFlags & STARTF_INHERITDESKTOP), &hWinSta, &hDesk);

1 0

14/18: [WIN32K:NTUSER] NtUserCloseDesktop(): Use ObCloseHandle instead.
by Hermès Bélusca-Maïto 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3699c383894289007ef2… commit f3699c383894289007ef2dd1637834f25bfcd4bd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 22 20:38:46 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:39 2018 +0200 [WIN32K:NTUSER] NtUserCloseDesktop(): Use ObCloseHandle instead. --- win32ss/user/ntuser/desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index a90a27caa1..ad070ad4f2 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -2656,7 +2656,7 @@ NtUserCloseDesktop(HDESK hDesktop) ObDereferenceObject(pdesk); - Status = ZwClose(hDesktop); + Status = ObCloseHandle(hDesktop, UserMode); if (!NT_SUCCESS(Status)) { ERR("Failed to close desktop handle 0x%p\n", hDesktop);

1 0

13/18: [WIN32K:NTUSER] Make NtUserResolveDesktop() and IntResolveDesktop() work in a more Win2k3-compatible manner. CORE-11933 and PR #621.
by Hermès Bélusca-Maïto 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c697f191cf72ce02d987a… commit c697f191cf72ce02d987aeac7cfff87174461622 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 22 20:38:26 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:37 2018 +0200 [WIN32K:NTUSER] Make NtUserResolveDesktop() and IntResolveDesktop() work in a more Win2k3-compatible manner. CORE-11933 and PR #621. Since this API is also called from WINSRV when calling the AllocConsole() API, it can be tested more-or-less easily. The internal helper IntResolveDesktop() is also tested during process connection to a window station, when such process first calls a USER32 or GDI32 function. This is also the functionality tested by the user32:desktop apitest. - Adjust how IntResolveDesktop() is called. --- win32ss/include/ntuser.h | 4 +- win32ss/user/ntuser/desktop.c | 838 ++++++++++++++++++--- win32ss/user/ntuser/desktop.h | 15 +- win32ss/user/ntuser/main.c | 36 +- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c | 2 +- 5 files changed, 762 insertions(+), 133 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 9e4b70938b..68f37ebff8 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -2912,11 +2912,11 @@ NtUserRemoveProp( ATOM Atom); HDESK -APIENTRY +NTAPI NtUserResolveDesktop( IN HANDLE ProcessHandle, IN PUNICODE_STRING DesktopPath, - DWORD dwUnknown, + IN BOOL bInherit, OUT HWINSTA* phWinSta); DWORD diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 8f0555a746..a90a27caa1 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -447,139 +447,726 @@ GetSystemVersionString(OUT PWSTR pwszzVersion, } -NTSTATUS FASTCALL -IntParseDesktopPath(PEPROCESS Process, - PUNICODE_STRING DesktopPath, - HWINSTA *hWinSta, - HDESK *hDesktop) +/* + * IntResolveDesktop + * + * The IntResolveDesktop function attempts to retrieve valid handles to + * a desktop and a window station suitable for the specified process. + * The specified desktop path string is used only as a hint for the resolution. + * + * - If the process is already assigned to a window station and a desktop, + * handles to these objects are returned directly regardless of the specified + * desktop path string. This is what happens when this function is called for + * a process that has been already started and connected to the Win32 USER. + * + * - If the process is being connected to the Win32 USER, or is in a state + * where a window station is assigned to it but no desktop yet, the desktop + * path string is used as a hint for the resolution. + * A specified window station (if any, otherwise "WinSta0" is used as default) + * is tested for existence and accessibility. If the checks are OK a handle + * to it is returned. Otherwise we either fail (the window station does not + * exist) or, in case a default window station was used, we attempt to open + * or create a non-interactive Service-0xXXXX-YYYY$ window station. This is + * typically what happens when a non-interactive process is started while + * the WinSta0 window station was used as the default one. + * A specified desktop (if any, otherwise "Default" is used as default) + * is then tested for existence on the opened window station. + * + * - Rules for the choice of the default window station, when none is specified + * in the desktop path: + * + * 1. By default, a SYSTEM process connects to a non-interactive window + * station, either the Service-0x0-3e7$ (from the SYSTEM LUID) station, + * or one that has been inherited and that is non-interactive. + * Only when the interactive window station WinSta0 is specified that + * the process can connect to it (e.g. the case of interactive services). + * + * 2. An interactive process, i.e. a process whose LUID is the same as the + * one assigned to WinSta0 by Winlogon on user logon, connects by default + * to the WinSta0 window station, unless it has inherited from another + * interactive window station (which must be... none other than WinSta0). + * + * 3. A non-interactive (but not SYSTEM) process connects by default to + * a non-interactive Service-0xXXXX-YYYY$ window station (whose name + * is derived from the process' LUID), or to another non-interactive + * window station that has been inherited. + * Otherwise it may be able connect to the interactive WinSta0 only if + * it has explicit access rights to it. + * + * Parameters + * Process + * The user process object. + * + * DesktopPath + * The desktop path string used as a hint for desktop resolution. + * + * bInherit + * Whether or not the returned handles are inheritable. + * + * phWinSta + * Pointer to a window station handle. + * + * phDesktop + * Pointer to a desktop handle. + * + * Return Value + * Status code. + */ + +NTSTATUS +FASTCALL +IntResolveDesktop( + IN PEPROCESS Process, + IN PUNICODE_STRING DesktopPath, + IN BOOL bInherit, + OUT HWINSTA* phWinSta, + OUT HDESK* phDesktop) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING ObjectName; NTSTATUS Status; - WCHAR wstrWinstaFullName[MAX_PATH], *pwstrWinsta = NULL, *pwstrDesktop = NULL; - - ASSERT(hWinSta); - ASSERT(hDesktop); + HWINSTA hWinSta = NULL, hWinStaDup = NULL; + HDESK hDesktop = NULL, hDesktopDup = NULL; + PPROCESSINFO ppi; + HANDLE hProcess = NULL; + LUID ProcessLuid; + USHORT StrSize; + SIZE_T MemSize; + POBJECT_ATTRIBUTES ObjectAttributes = NULL; + PUNICODE_STRING ObjectName; + UNICODE_STRING WinStaName, DesktopName; + const UNICODE_STRING WinSta0Name = RTL_CONSTANT_STRING(L"WinSta0"); + PWINSTATION_OBJECT WinStaObject; + HWINSTA hTempWinSta = NULL; + BOOLEAN bUseDefaultWinSta = FALSE; + BOOLEAN bInteractive = FALSE; + BOOLEAN bAccessAllowed = FALSE; + + ASSERT(phWinSta); + ASSERT(phDesktop); ASSERT(DesktopPath); - *hWinSta = NULL; - *hDesktop = NULL; + *phWinSta = NULL; + *phDesktop = NULL; + + ppi = PsGetProcessWin32Process(Process); + /* ppi is typically NULL for console applications that connect to Win32 USER */ + if (!ppi) TRACE("IntResolveDesktop: ppi is NULL!\n"); + + if (ppi && ppi->hwinsta != NULL && ppi->hdeskStartup != NULL) + { + /* + * If this process is the current one, just return the cached handles. + * Otherwise, open the window station and desktop objects. + */ + if (Process == PsGetCurrentProcess()) + { + hWinSta = ppi->hwinsta; + hDesktop = ppi->hdeskStartup; + } + else + { + Status = ObOpenObjectByPointer(ppi->prpwinsta, + 0, + NULL, + MAXIMUM_ALLOWED, + ExWindowStationObjectType, + UserMode, + (PHANDLE)&hWinSta); + if (!NT_SUCCESS(Status)) + { + ERR("IntResolveDesktop: Could not reference window station 0x%p\n", ppi->prpwinsta); + SetLastNtError(Status); + return Status; + } + + Status = ObOpenObjectByPointer(ppi->rpdeskStartup, + 0, + NULL, + MAXIMUM_ALLOWED, + ExDesktopObjectType, + UserMode, + (PHANDLE)&hDesktop); + if (!NT_SUCCESS(Status)) + { + ERR("IntResolveDesktop: Could not reference desktop 0x%p\n", ppi->rpdeskStartup); + ObCloseHandle(hWinSta, UserMode); + SetLastNtError(Status); + return Status; + } + } + + *phWinSta = hWinSta; + *phDesktop = hDesktop; + return STATUS_SUCCESS; + } + + /* We will by default use the default window station and desktop */ + RtlInitEmptyUnicodeString(&WinStaName, NULL, 0); + RtlInitEmptyUnicodeString(&DesktopName, NULL, 0); + /* + * Parse the desktop path string which can be of the form "WinSta\Desktop" + * or just "Desktop". In the latter case we use the default window station + * on which the process is attached to (or if none, "WinSta0"). + */ if (DesktopPath->Buffer != NULL && DesktopPath->Length > sizeof(WCHAR)) + { + DesktopName = *DesktopPath; + + /* Find the separator */ + while (DesktopName.Length > 0 && *DesktopName.Buffer && + *DesktopName.Buffer != OBJ_NAME_PATH_SEPARATOR) + { + DesktopName.Buffer++; + DesktopName.Length -= sizeof(WCHAR); + DesktopName.MaximumLength -= sizeof(WCHAR); + } + if (DesktopName.Length > 0) + { + RtlInitEmptyUnicodeString(&WinStaName, DesktopPath->Buffer, + DesktopPath->Length - DesktopName.Length); + // (USHORT)((ULONG_PTR)DesktopName.Buffer - (ULONG_PTR)DesktopPath->Buffer); + WinStaName.Length = WinStaName.MaximumLength; + + /* Skip the separator */ + DesktopName.Buffer++; + DesktopName.Length -= sizeof(WCHAR); + DesktopName.MaximumLength -= sizeof(WCHAR); + } + else + { + RtlInitEmptyUnicodeString(&WinStaName, NULL, 0); + DesktopName = *DesktopPath; + } + } + + TRACE("IntResolveDesktop: WinStaName:'%wZ' ; DesktopName:'%wZ'\n", &WinStaName, &DesktopName); + + /* Retrieve the process LUID */ + Status = GetProcessLuid(NULL, Process, &ProcessLuid); + if (!NT_SUCCESS(Status)) + { + ERR("IntResolveDesktop: Failed to retrieve the process LUID, Status 0x%08lx\n", Status); + SetLastNtError(Status); + return Status; + } + + /* + * If this process is not the current one, obtain a temporary handle + * to it so that we can perform handles duplication later. + */ + if (Process != PsGetCurrentProcess()) + { + Status = ObOpenObjectByPointer(Process, + OBJ_KERNEL_HANDLE, + NULL, + 0, + *PsProcessType, + KernelMode, + &hProcess); + if (!NT_SUCCESS(Status)) + { + ERR("IntResolveDesktop: Failed to obtain a handle to process 0x%p, Status 0x%08lx\n", Process, Status); + SetLastNtError(Status); + return Status; + } + ASSERT(hProcess); + } + + /* + * If no window station has been specified, search the process handle table + * for inherited window station handles, otherwise use a default one. + */ + if (WinStaName.Buffer == NULL) { /* - * Parse the desktop path string which can be in the form "WinSta\Desktop" - * or just "Desktop". In latter case WinSta0 will be used. + * We want to find a suitable default window station. + * For applications that can be interactive, i.e. that have allowed + * access to the single interactive window station on the system, + * the default window station is 'WinSta0'. + * For applications that cannot be interactive, i.e. that do not have + * access to 'WinSta0' (e.g. non-interactive services), the default + * window station is 'Service-0xXXXX-YYYY$' (created if needed). + * Precedence will however be taken by any inherited window station + * that possesses the required interactivity property. */ + bUseDefaultWinSta = TRUE; + + /* + * Use the default 'WinSta0' window station. Whether we should + * use 'Service-0xXXXX-YYYY$' instead will be determined later. + */ + // RtlInitUnicodeString(&WinStaName, L"WinSta0"); + WinStaName = WinSta0Name; + + if (ObFindHandleForObject(Process, + NULL, + ExWindowStationObjectType, + NULL, + (PHANDLE)&hWinSta)) + { + TRACE("IntResolveDesktop: Inherited window station is: 0x%p\n", hWinSta); + } + } + + /* + * If no desktop has been specified, search the process handle table + * for inherited desktop handles, otherwise use the Default desktop. + * Note that the inherited desktop that we may use, may not belong + * to the window station we will connect to. + */ + if (DesktopName.Buffer == NULL) + { + /* Use a default desktop name */ + RtlInitUnicodeString(&DesktopName, L"Default"); + + if (ObFindHandleForObject(Process, + NULL, + ExDesktopObjectType, + NULL, + (PHANDLE)&hDesktop)) + { + TRACE("IntResolveDesktop: Inherited desktop is: 0x%p\n", hDesktop); + } + } + + + /* + * We are going to open either a window station or a desktop. + * Even if this operation is done from kernel-mode, we should + * "emulate" an opening from user-mode (i.e. using an ObjectAttributes + * allocated in user-mode, with AccessMode == UserMode) for the + * Object Manager to perform proper access validation to the + * window station or desktop. + */ + + /* + * Estimate the maximum size needed for the window station name + * and desktop name to be given to ObjectAttributes->ObjectName. + */ + StrSize = 0; + + /* Window station name */ + MemSize = _scwprintf(L"Service-0x%x-%x$", MAXULONG, MAXULONG) * sizeof(WCHAR); + MemSize = gustrWindowStationsDir.Length + sizeof(OBJ_NAME_PATH_SEPARATOR) + + max(WinStaName.Length, MemSize) + sizeof(UNICODE_NULL); + if (MemSize > MAXUSHORT) + { + ERR("IntResolveDesktop: Window station name length is too long.\n"); + Status = STATUS_NAME_TOO_LONG; + goto Quit; + } + StrSize = max(StrSize, (USHORT)MemSize); + + /* Desktop name */ + MemSize = max(DesktopName.Length + sizeof(UNICODE_NULL), sizeof(L"Default")); + StrSize = max(StrSize, (USHORT)MemSize); + + /* Size for the OBJECT_ATTRIBUTES */ + MemSize = ALIGN_UP(sizeof(OBJECT_ATTRIBUTES), sizeof(PVOID)); + + /* Add the string size */ + MemSize += ALIGN_UP(sizeof(UNICODE_STRING), sizeof(PVOID)); + MemSize += StrSize; + + /* Allocate the memory in user-mode */ + Status = ZwAllocateVirtualMemory(ZwCurrentProcess(), + (PVOID*)&ObjectAttributes, + 0, + &MemSize, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + ERR("ZwAllocateVirtualMemory() failed, Status 0x%08lx\n", Status); + goto Quit; + } + + ObjectName = (PUNICODE_STRING)((ULONG_PTR)ObjectAttributes + + ALIGN_UP(sizeof(OBJECT_ATTRIBUTES), sizeof(PVOID))); + + RtlInitEmptyUnicodeString(ObjectName, + (PWCHAR)((ULONG_PTR)ObjectName + + ALIGN_UP(sizeof(UNICODE_STRING), sizeof(PVOID))), + StrSize); + - pwstrDesktop = wcschr(DesktopPath->Buffer, L'\\'); - if (pwstrDesktop != NULL) + /* If we got an inherited window station handle, duplicate and use it */ + if (hWinSta) + { + ASSERT(bUseDefaultWinSta); + + /* Duplicate the handle if it belongs to another process than the current one */ + if (Process != PsGetCurrentProcess()) { - *pwstrDesktop = 0; - pwstrDesktop++; - pwstrWinsta = DesktopPath->Buffer; + ASSERT(hProcess); + Status = ZwDuplicateObject(hProcess, + hWinSta, + ZwCurrentProcess(), + (PHANDLE)&hWinStaDup, + 0, + 0, + DUPLICATE_SAME_ACCESS); + if (!NT_SUCCESS(Status)) + { + ERR("IntResolveDesktop: Failed to duplicate the window station handle, Status 0x%08lx\n", Status); + /* We will use a default window station */ + hWinSta = NULL; + } + else + { + hWinSta = hWinStaDup; + } + } + } + + /* + * If we have an inherited window station, check whether + * it is interactive and remember that for later. + */ + if (hWinSta) + { + ASSERT(bUseDefaultWinSta); + + /* Reference the inherited window station */ + Status = ObReferenceObjectByHandle(hWinSta, + 0, + ExWindowStationObjectType, + KernelMode, + (PVOID*)&WinStaObject, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to reference the inherited window station, Status 0x%08lx\n", Status); + /* We will use a default window station */ + if (hWinStaDup) + { + ASSERT(hWinSta == hWinStaDup); + ObCloseHandle(hWinStaDup, UserMode); + hWinStaDup = NULL; + } + hWinSta = NULL; } else { - pwstrDesktop = DesktopPath->Buffer; - pwstrWinsta = NULL; + ERR("Process LUID is: 0x%x-%x, inherited window station LUID is: 0x%x-%x\n", + ProcessLuid.HighPart, ProcessLuid.LowPart, + WinStaObject->luidUser.HighPart, WinStaObject->luidUser.LowPart); + + /* Check whether this window station is interactive, and remember it for later */ + bInteractive = !(WinStaObject->Flags & WSS_NOIO); + + /* Dereference the window station */ + ObDereferenceObject(WinStaObject); } + } - TRACE("IntParseDesktopPath pwstrWinsta:%S pwstrDesktop:%S\n", pwstrWinsta, pwstrDesktop); + /* Build a valid window station name */ + Status = RtlStringCbPrintfW(ObjectName->Buffer, + ObjectName->MaximumLength, + L"%wZ\\%wZ", + &gustrWindowStationsDir, + &WinStaName); + if (!NT_SUCCESS(Status)) + { + ERR("Impossible to build a valid window station name, Status 0x%08lx\n", Status); + goto Quit; } + ObjectName->Length = (USHORT)(wcslen(ObjectName->Buffer) * sizeof(WCHAR)); -#if 0 - /* Search the process handle table for (inherited) window station - handles, use a more appropriate one than WinSta0 if possible. */ - if (!ObFindHandleForObject(Process, - NULL, - ExWindowStationObjectType, + TRACE("Parsed initial window station: '%wZ'\n", ObjectName); + + /* Try to open the window station */ + InitializeObjectAttributes(ObjectAttributes, + ObjectName, + OBJ_CASE_INSENSITIVE, NULL, - (PHANDLE)hWinSta)) -#endif + NULL); + if (bInherit) + ObjectAttributes->Attributes |= OBJ_INHERIT; + + Status = ObOpenObjectByName(ObjectAttributes, + ExWindowStationObjectType, + UserMode, + NULL, + WINSTA_ACCESS_ALL, + NULL, + (PHANDLE)&hTempWinSta); + if (!NT_SUCCESS(Status)) { - /* We had no luck searching for opened handles, use WinSta0 now */ - if (!pwstrWinsta) - pwstrWinsta = L"WinSta0"; + ERR("Failed to open the window station '%wZ', Status 0x%08lx\n", ObjectName, Status); } + else + { + // + // FIXME TODO: Perform a window station access check!! + // If we fail AND bUseDefaultWinSta == FALSE we just quit. + // -#if 0 - /* Search the process handle table for (inherited) desktop - handles, use a more appropriate one than Default if possible. */ - if (!ObFindHandleForObject(Process, - NULL, - ExDesktopObjectType, - NULL, - (PHANDLE)hDesktop)) -#endif + /* + * Check whether we are opening the (single) interactive + * window station, and if so, perform an access check. + */ + /* Check whether we are allowed to perform interactions */ + if (RtlEqualUnicodeString(&WinStaName, &WinSta0Name, TRUE)) + { + LUID SystemLuid = SYSTEM_LUID; + + /* Interactive window station: check for user LUID */ + WinStaObject = InputWindowStation; + + Status = STATUS_ACCESS_DENIED; + + // TODO: Check also that we compare wrt. window station WinSta0 + // which is the only one that can be interactive on the system. + if (((!bUseDefaultWinSta || bInherit) && RtlEqualLuid(&ProcessLuid, &SystemLuid)) || + RtlEqualLuid(&ProcessLuid, &WinStaObject->luidUser)) + { + /* We are interactive on this window station */ + bAccessAllowed = TRUE; + Status = STATUS_SUCCESS; + } + } + else + { + /* Non-interactive window station: we have access since we were able to open it */ + bAccessAllowed = TRUE; + Status = STATUS_SUCCESS; + } + } + + /* If we failed, bail out if we were not trying to open the default window station */ + if (!NT_SUCCESS(Status) && !bUseDefaultWinSta) // if (!bAccessAllowed) + goto Quit; + + if (/* bAccessAllowed && */ bInteractive || !bAccessAllowed) + { + /* + * Close WinSta0 if the inherited window station is interactive so that + * we can use it, or we do not have access to the interactive WinSta0. + */ + ObCloseHandle(hTempWinSta, UserMode); + hTempWinSta = NULL; + } + if (bInteractive == bAccessAllowed) + { + /* Keep using the inherited window station */ + NOTHING; + } + else // if (bInteractive != bAccessAllowed) { - /* We had no luck searching for opened handles, use Desktop now */ - if (!pwstrDesktop) - pwstrDesktop = L"Default"; + /* + * Close the inherited window station, we will either keep using + * the interactive WinSta0, or use Service-0xXXXX-YYYY$. + */ + if (hWinStaDup) + { + ASSERT(hWinSta == hWinStaDup); + ObCloseHandle(hWinStaDup, UserMode); + hWinStaDup = NULL; + } + hWinSta = hTempWinSta; // hTempWinSta is NULL in case bAccessAllowed == FALSE } - if (*hWinSta == NULL) + if (bUseDefaultWinSta) { - swprintf(wstrWinstaFullName, L"%wZ\\%ws", &gustrWindowStationsDir, pwstrWinsta); - RtlInitUnicodeString( &ObjectName, wstrWinstaFullName); + if (hWinSta == NULL && !bInteractive) + { + /* Build a valid window station name from the LUID */ + Status = RtlStringCbPrintfW(ObjectName->Buffer, + ObjectName->MaximumLength, + L"%wZ\\Service-0x%x-%x$", + &gustrWindowStationsDir, + ProcessLuid.HighPart, + ProcessLuid.LowPart); + if (!NT_SUCCESS(Status)) + { + ERR("Impossible to build a valid window station name, Status 0x%08lx\n", Status); + goto Quit; + } + ObjectName->Length = (USHORT)(wcslen(ObjectName->Buffer) * sizeof(WCHAR)); + + /* + * Create or open the non-interactive window station. + * NOTE: The non-interactive window station handle is never inheritable. + */ + // FIXME: Set security! + InitializeObjectAttributes(ObjectAttributes, + ObjectName, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + NULL, + NULL); - TRACE("parsed initial winsta: %wZ\n", &ObjectName); + Status = IntCreateWindowStation(&hWinSta, + ObjectAttributes, + UserMode, + KernelMode, + MAXIMUM_ALLOWED, + 0, 0, 0, 0, 0); + if (!NT_SUCCESS(Status)) + { + ASSERT(hWinSta == NULL); + ERR("Failed to create or open the non-interactive window station '%wZ', Status 0x%08lx\n", + ObjectName, Status); + goto Quit; + } - /* Open the window station */ - InitializeObjectAttributes(&ObjectAttributes, - &ObjectName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); + // + // FIXME: We might not need to always create or open the "Default" + // desktop on the Service-0xXXXX-YYYY$ window station; we may need + // to use another one.... + // + + /* Create or open the Default desktop on the window station */ + Status = RtlStringCbCopyW(ObjectName->Buffer, + ObjectName->MaximumLength, + L"Default"); + if (!NT_SUCCESS(Status)) + { + ERR("Impossible to build a valid desktop name, Status 0x%08lx\n", Status); + goto Quit; + } + ObjectName->Length = (USHORT)(wcslen(ObjectName->Buffer) * sizeof(WCHAR)); + + /* NOTE: The non-interactive desktop handle is never inheritable. */ + // FIXME: Set security! + InitializeObjectAttributes(ObjectAttributes, + ObjectName, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + hWinSta, + NULL); - Status = ObOpenObjectByName(&ObjectAttributes, - ExWindowStationObjectType, - KernelMode, - NULL, - WINSTA_ACCESS_ALL, - NULL, - (HANDLE*)hWinSta); + Status = IntCreateDesktop(&hDesktop, + ObjectAttributes, + UserMode, + NULL, + NULL, + 0, + MAXIMUM_ALLOWED); + if (!NT_SUCCESS(Status)) + { + ASSERT(hDesktop == NULL); + ERR("Failed to create or open the desktop '%wZ' on window station 0x%p, Status 0x%08lx\n", + ObjectName, hWinSta, Status); + } - if (!NT_SUCCESS(Status)) + goto Quit; + } +/* + if (hWinSta == NULL) { - SetLastNtError(Status); - ERR("Failed to reference window station %wZ PID: --!\n", &ObjectName ); - return Status; + Status = STATUS_UNSUCCESSFUL; + goto Quit; } +*/ } - if (*hDesktop == NULL) + /* + * If we got an inherited desktop handle, duplicate and use it, + * otherwise open a new desktop. + */ + if (hDesktop != NULL) { - RtlInitUnicodeString(&ObjectName, pwstrDesktop); + /* Duplicate the handle if it belongs to another process than the current one */ + if (Process != PsGetCurrentProcess()) + { + ASSERT(hProcess); + Status = ZwDuplicateObject(hProcess, + hDesktop, + ZwCurrentProcess(), + (PHANDLE)&hDesktopDup, + 0, + 0, + DUPLICATE_SAME_ACCESS); + if (!NT_SUCCESS(Status)) + { + ERR("IntResolveDesktop: Failed to duplicate the desktop handle, Status 0x%08lx\n", Status); + /* We will use a default desktop */ + hDesktop = NULL; + } + else + { + hDesktop = hDesktopDup; + } + } + } - TRACE("parsed initial desktop: %wZ\n", &ObjectName); + if ((hWinSta != NULL) && (hDesktop == NULL)) + { + Status = RtlStringCbCopyNW(ObjectName->Buffer, + ObjectName->MaximumLength, + DesktopName.Buffer, + DesktopName.Length); + if (!NT_SUCCESS(Status)) + { + ERR("Impossible to build a valid desktop name, Status 0x%08lx\n", Status); + goto Quit; + } + ObjectName->Length = (USHORT)(wcslen(ObjectName->Buffer) * sizeof(WCHAR)); + + TRACE("Parsed initial desktop: '%wZ'\n", ObjectName); /* Open the desktop object */ - InitializeObjectAttributes(&ObjectAttributes, - &ObjectName, + InitializeObjectAttributes(ObjectAttributes, + ObjectName, OBJ_CASE_INSENSITIVE, - *hWinSta, + hWinSta, NULL); + if (bInherit) + ObjectAttributes->Attributes |= OBJ_INHERIT; - Status = ObOpenObjectByName(&ObjectAttributes, + Status = ObOpenObjectByName(ObjectAttributes, ExDesktopObjectType, - KernelMode, + UserMode, NULL, DESKTOP_ALL_ACCESS, NULL, - (HANDLE*)hDesktop); - + (PHANDLE)&hDesktop); if (!NT_SUCCESS(Status)) { - *hDesktop = NULL; - NtClose(*hWinSta); - *hWinSta = NULL; - SetLastNtError(Status); - ERR("Failed to reference desktop %wZ PID: --!\n", &ObjectName); - return Status; + ERR("Failed to open the desktop '%wZ' on window station 0x%p, Status 0x%08lx\n", + ObjectName, hWinSta, Status); + goto Quit; } } - return STATUS_SUCCESS; + +Quit: + /* Release the object attributes */ + if (ObjectAttributes) + { + MemSize = 0; + ZwFreeVirtualMemory(ZwCurrentProcess(), + (PVOID*)&ObjectAttributes, + &MemSize, + MEM_RELEASE); + } + + /* Close the temporary process handle */ + if (hProcess) // if (Process != PsGetCurrentProcess()) + ObCloseHandle(hProcess, KernelMode); + + if (NT_SUCCESS(Status)) + { + *phWinSta = hWinSta; + *phDesktop = hDesktop; + return STATUS_SUCCESS; + } + else + { + ERR("IntResolveDesktop(%wZ) failed, Status 0x%08lx\n", DesktopPath, Status); + + if (hDesktopDup) + ObCloseHandle(hDesktopDup, UserMode); + if (hWinStaDup) + ObCloseHandle(hWinStaDup, UserMode); + + if (hDesktop) + ObCloseHandle(hDesktop, UserMode); + if (hWinSta) + ObCloseHandle(hWinSta, UserMode); + + SetLastNtError(Status); + return Status; + } } /* @@ -2115,15 +2702,24 @@ NtUserPaintDesktop(HDC hDC) /* * NtUserResolveDesktop * - * The NtUserResolveDesktop function retrieves handles to the desktop and - * the window station specified by the desktop path string. + * The NtUserResolveDesktop function attempts to retrieve valid handles to + * a desktop and a window station suitable for the specified process. + * The specified desktop path string is used only as a hint for the resolution. + * + * See the description of IntResolveDesktop for more details. * * Parameters * ProcessHandle * Handle to a user process. * * DesktopPath - * The desktop path string. + * The desktop path string used as a hint for desktop resolution. + * + * bInherit + * Whether or not the returned handles are inheritable. + * + * phWinSta + * Pointer to a window station handle. * * Return Value * Handle to the desktop (direct return value) and @@ -2138,17 +2734,18 @@ NtUserPaintDesktop(HDC hDC) */ HDESK -APIENTRY +NTAPI NtUserResolveDesktop( IN HANDLE ProcessHandle, IN PUNICODE_STRING DesktopPath, - DWORD dwUnknown, + IN BOOL bInherit, OUT HWINSTA* phWinSta) { NTSTATUS Status; - PEPROCESS Process = NULL; + PEPROCESS Process; HWINSTA hWinSta = NULL; HDESK hDesktop = NULL; + UNICODE_STRING CapturedDesktopPath; /* Allow only the Console Server to perform this operation (via CSRSS) */ if (PsGetCurrentProcess() != gpepCSRSS) @@ -2161,44 +2758,63 @@ NtUserResolveDesktop( UserMode, (PVOID*)&Process, NULL); - if (!NT_SUCCESS(Status)) return NULL; + if (!NT_SUCCESS(Status)) + return NULL; // UserEnterShared(); _SEH2_TRY { - UNICODE_STRING CapturedDesktopPath; + /* Probe the handle pointer */ + // ProbeForWriteHandle + ProbeForWrite(phWinSta, sizeof(HWINSTA), sizeof(HWINSTA)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(goto Quit); + } + _SEH2_END; - /* Capture the user desktop path string */ - Status = IntSafeCopyUnicodeStringTerminateNULL(&CapturedDesktopPath, - DesktopPath); - if (!NT_SUCCESS(Status)) _SEH2_YIELD(goto Quit); + /* Capture the user desktop path string */ + Status = ProbeAndCaptureUnicodeString(&CapturedDesktopPath, + UserMode, + DesktopPath); + if (!NT_SUCCESS(Status)) + goto Quit; - /* Call the internal function */ - Status = IntParseDesktopPath(Process, - &CapturedDesktopPath, - &hWinSta, - &hDesktop); - if (!NT_SUCCESS(Status)) - { - ERR("IntParseDesktopPath failed, Status = 0x%08lx\n", Status); - hWinSta = NULL; - hDesktop = NULL; - } + /* Call the internal function */ + Status = IntResolveDesktop(Process, + &CapturedDesktopPath, + bInherit, + &hWinSta, + &hDesktop); + if (!NT_SUCCESS(Status)) + { + ERR("IntResolveDesktop failed, Status 0x%08lx\n", Status); + hWinSta = NULL; + hDesktop = NULL; + } + _SEH2_TRY + { /* Return the window station handle */ *phWinSta = hWinSta; - - /* Free the captured string */ - if (CapturedDesktopPath.Buffer) - ExFreePoolWithTag(CapturedDesktopPath.Buffer, TAG_STRING); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); + + /* We failed, close the opened desktop and window station */ + if (hDesktop) ObCloseHandle(hDesktop, UserMode); + hDesktop = NULL; + if (hWinSta) ObCloseHandle(hWinSta, UserMode); } _SEH2_END; + /* Free the captured string */ + ReleaseCapturedUnicodeString(&CapturedDesktopPath, UserMode); + Quit: // UserLeave(); diff --git a/win32ss/user/ntuser/desktop.h b/win32ss/user/ntuser/desktop.h index 7156f22bf7..0e1950ff64 100644 --- a/win32ss/user/ntuser/desktop.h +++ b/win32ss/user/ntuser/desktop.h @@ -161,6 +161,15 @@ IntHideDesktop(PDESKTOP Desktop); BOOL IntSetThreadDesktop(IN HDESK hDesktop, IN BOOL FreeOnFailure); +NTSTATUS +FASTCALL +IntResolveDesktop( + IN PEPROCESS Process, + IN PUNICODE_STRING DesktopPath, + IN BOOL bInherit, + OUT HWINSTA* phWinSta, + OUT HDESK* phDesktop); + NTSTATUS FASTCALL IntValidateDesktopHandle( HDESK Desktop, @@ -179,12 +188,6 @@ IntCreateDesktop( IN DWORD dwFlags, IN ACCESS_MASK dwDesiredAccess); -NTSTATUS FASTCALL -IntParseDesktopPath(PEPROCESS Process, - PUNICODE_STRING DesktopPath, - HWINSTA *hWinSta, - HDESK *hDesktop); - VOID APIENTRY UserRedrawDesktop(VOID); BOOL IntRegisterShellHookWindow(HWND hWnd); BOOL IntDeRegisterShellHookWindow(HWND hWnd); diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index c10e48230e..2fc1b69082 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -532,12 +532,12 @@ InitThreadCallback(PETHREAD Thread) ptiCurrent->TIF_flags &= ~TIF_INCLEANUP; + // FIXME: Flag SYSTEM threads with... TIF_SYSTEMTHREAD !! + /* CSRSS threads have some special features */ if (Process == gpepCSRSS) ptiCurrent->TIF_flags = TIF_CSRSSTHREAD | TIF_DONTATTACHQUEUE; - // FIXME: Flag SYSTEM threads with... TIF_SYSTEMTHREAD !! - ptiCurrent->pcti = &ptiCurrent->cti; /* Initialize the CLIENTINFO */ @@ -570,9 +570,16 @@ InitThreadCallback(PETHREAD Thread) } } - /* Assign a default window station and desktop to the process */ - /* Do not try to open a desktop or window station before winlogon initializes */ - if (ptiCurrent->ppi->hdeskStartup == NULL && gpidLogon != 0) + /* + * Assign a default window station and desktop to the process. + * Do not try to open a desktop or window station before the very first + * (interactive) window station has been created by Winlogon. + */ + // if (ptiCurrent->ppi->hdeskStartup == NULL && InputWindowStation != NULL) + /* Last things to do only if we are not a SYSTEM or CSRSS thread */ + if (!(ptiCurrent->TIF_flags & (TIF_SYSTEMTHREAD | TIF_CSRSSTHREAD)) && + /**/ptiCurrent->ppi->hdeskStartup == NULL &&/**/ + InputWindowStation != NULL) { HWINSTA hWinSta = NULL; HDESK hDesk = NULL; @@ -580,8 +587,8 @@ InitThreadCallback(PETHREAD Thread) PDESKTOP pdesk; /* - * inherit the thread desktop and process window station (if not yet inherited) from the process startup - * info structure. See documentation of CreateProcess() + * Inherit the thread desktop and process window station (if not yet inherited) + * from the process startup info structure. See documentation of CreateProcess(). */ Status = STATUS_UNSUCCESSFUL; @@ -594,17 +601,18 @@ InitThreadCallback(PETHREAD Thread) RtlInitUnicodeString(&DesktopPath, NULL); } - Status = IntParseDesktopPath(Process, - &DesktopPath, - &hWinSta, - &hDesk); + Status = IntResolveDesktop(Process, + &DesktopPath, + FALSE, + &hWinSta, + &hDesk); if (DesktopPath.Buffer) ExFreePoolWithTag(DesktopPath.Buffer, TAG_STRING); if (!NT_SUCCESS(Status)) { - ERR_CH(UserThread, "Failed to assign default dekstop and winsta to process\n"); + ERR_CH(UserThread, "Failed to assign default desktop and winsta to process\n"); goto error; } @@ -615,7 +623,7 @@ InitThreadCallback(PETHREAD Thread) goto error; } - /* Validate the new desktop. */ + /* Validate the new desktop */ Status = IntValidateDesktopHandle(hDesk, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { @@ -624,6 +632,8 @@ InitThreadCallback(PETHREAD Thread) } /* Store the parsed desktop as the initial desktop */ + ASSERT(ptiCurrent->ppi->hdeskStartup == NULL); + ASSERT(Process->UniqueProcessId != gpidLogon); ptiCurrent->ppi->hdeskStartup = hDesk; ptiCurrent->ppi->rpdeskStartup = pdesk; } diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c index a3ebb0390c..258b1e28e6 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c @@ -324,7 +324,7 @@ GuiInit(IN PCONSOLE_INIT_INFO ConsoleInitInfo, hDesk = NtUserResolveDesktop(ConsoleLeaderProcessHandle, &DesktopPath, - 0, + FALSE, &hWinSta); DPRINT("NtUserResolveDesktop(DesktopPath = '%wZ') returned hDesk = 0x%p; hWinSta = 0x%p\n", &DesktopPath, hDesk, hWinSta);

1 0

12/18: [WIN32K:NTUSER] Code style fixes only.
by Hermès Bélusca-Maïto 19 Aug '18

19 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83104d9f00ba8a7442391… commit 83104d9f00ba8a74423917f4fae3e198f2f148b0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 22 20:32:12 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] Code style fixes only. --- win32ss/user/ntuser/desktop.c | 22 +++++++++++----------- win32ss/user/ntuser/sysparams.c | 6 ++++-- win32ss/user/ntuser/winsta.c | 8 ++++---- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 2776cbe27a..8f0555a746 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -1753,7 +1753,7 @@ IntCreateDesktop( /* In case the object was not created (eg if it existed), return now */ if (Context == FALSE) { - TRACE("NtUserCreateDesktop opened desktop %wZ\n", ObjectAttributes->ObjectName); + TRACE("IntCreateDesktop opened desktop '%wZ'\n", ObjectAttributes->ObjectName); Status = STATUS_SUCCESS; goto Quit; } @@ -1825,8 +1825,8 @@ IntCreateDesktop( Cs.cx = Cs.cy = 100; Cs.style = WS_POPUP|WS_CLIPCHILDREN; Cs.hInstance = hModClient; // hModuleWin; // Server side winproc! - Cs.lpszName = (LPCWSTR) &WindowName; - Cs.lpszClass = (LPCWSTR) &ClassName; + Cs.lpszName = (LPCWSTR)&WindowName; + Cs.lpszClass = (LPCWSTR)&ClassName; pWnd = IntCreateWindow(&Cs, &WindowName, pcls, NULL, NULL, NULL, pdesk); if (pWnd == NULL) { @@ -2050,7 +2050,7 @@ NtUserCloseDesktop(HDESK hDesktop) NTSTATUS Status; DECLARE_RETURN(BOOL); - TRACE("NtUserCloseDesktop called (0x%p)\n", hDesktop); + TRACE("NtUserCloseDesktop(0x%p) called\n", hDesktop); UserEnterExclusive(); if (hDesktop == gptiCurrent->hdesk || hDesktop == gptiCurrent->ppi->hdeskStartup) @@ -2060,10 +2060,10 @@ NtUserCloseDesktop(HDESK hDesktop) RETURN(FALSE); } - Status = IntValidateDesktopHandle( hDesktop, UserMode, 0, &pdesk); + Status = IntValidateDesktopHandle(hDesktop, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { - ERR("Validation of desktop handle (0x%p) failed\n", hDesktop); + ERR("Validation of desktop handle 0x%p failed\n", hDesktop); RETURN(FALSE); } @@ -2236,10 +2236,10 @@ NtUserSwitchDesktop(HDESK hdesk) UserEnterExclusive(); TRACE("Enter NtUserSwitchDesktop(0x%p)\n", hdesk); - Status = IntValidateDesktopHandle( hdesk, UserMode, 0, &pdesk); + Status = IntValidateDesktopHandle(hdesk, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { - ERR("Validation of desktop handle (0x%p) failed\n", hdesk); + ERR("Validation of desktop handle 0x%p failed\n", hdesk); RETURN(FALSE); } @@ -2539,10 +2539,10 @@ IntSetThreadDesktop(IN HDESK hDesktop, if (hDesktop != NULL) { /* Validate the new desktop. */ - Status = IntValidateDesktopHandle( hDesktop, UserMode, 0, &pdesk); + Status = IntValidateDesktopHandle(hDesktop, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { - ERR("Validation of desktop handle (0x%p) failed\n", hDesktop); + ERR("Validation of desktop handle 0x%p failed\n", hDesktop); return FALSE; } @@ -2583,7 +2583,7 @@ IntSetThreadDesktop(IN HDESK hDesktop, return FALSE; } - pctiNew = DesktopHeapAlloc( pdesk, sizeof(CLIENTTHREADINFO)); + pctiNew = DesktopHeapAlloc(pdesk, sizeof(CLIENTTHREADINFO)); if (pctiNew == NULL) { ERR("Failed to allocate new pcti\n"); diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index d0badba00e..0fede4ceec 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -25,6 +25,7 @@ BOOL g_PaintDesktopVersion = FALSE; #define METRIC2REG(met) (-((((met) * 1440)- 0) / dpi)) #define REQ_INTERACTIVE_WINSTA(err) \ +do { \ if (GetW32ProcessInfo()->prpwinsta != InputWindowStation) \ { \ if (GetW32ProcessInfo()->prpwinsta == NULL) \ @@ -33,12 +34,13 @@ BOOL g_PaintDesktopVersion = FALSE; } \ else \ { \ - ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", \ + 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; \ - } + } \ +} while (0) static const WCHAR* KEY_MOUSE = L"Control Panel\\Mouse"; static const WCHAR* VAL_MOUSE1 = L"MouseThreshold1"; diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index 1400827bc6..13b968516c 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -971,7 +971,7 @@ NtUserCloseWindowStation( UserMode, 0, &Object, - 0); + NULL); if (!NT_SUCCESS(Status)) { @@ -1449,7 +1449,7 @@ NtUserLockWindowStation(HWINSTA hWindowStation) UserMode, 0, &Object, - 0); + NULL); if (!NT_SUCCESS(Status)) { TRACE("Validation of window station handle (%p) failed\n", @@ -1494,7 +1494,7 @@ NtUserUnlockWindowStation(HWINSTA hWindowStation) UserMode, 0, &Object, - 0); + NULL); if (!NT_SUCCESS(Status)) { TRACE("Validation of window station handle (%p) failed\n", @@ -1718,7 +1718,7 @@ BuildDesktopNameList( UserMode, 0, &WindowStation, - 0); + NULL); if (! NT_SUCCESS(Status)) { return Status;

1 0

11/18: [WIN32K:NTUSER] Rename some variables with more natural names.
by Hermès Bélusca-Maïto 19 Aug '18

19 Aug '18

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_);

1 0

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 19 Aug '18

19 Aug '18

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,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs