Ros-diffs July 2018

ros-diffs@reactos.org

17 participants
89 discussions

01/01: [AUTOCHK] Improve readability of messages

by David Knapp

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bbb6bd4b5c8bb5e768ad… commit 7bbb6bd4b5c8bb5e768ade7e682677ebfee2c5dc Author: David Knapp <mazecraze96(a)gmail.com> AuthorDate: Thu Jul 26 01:28:42 2018 -0400 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Jul 26 07:28:42 2018 +0200 [AUTOCHK] Improve readability of messages --- base/system/autochk/autochk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/system/autochk/autochk.c b/base/system/autochk/autochk.c index 1940c651ec..5c133a8c5e 100644 --- a/base/system/autochk/autochk.c +++ b/base/system/autochk/autochk.c @@ -361,7 +361,7 @@ CheckVolume( return Status; } - PrintString(" The file system type is %S.\r\n", FileSystem); + PrintString(" The file system type is %S.\r\n\r\n", FileSystem); /* Call provider */ for (Count = 0; Count < sizeof(FileSystems) / sizeof(FileSystems[0]); ++Count) @@ -391,8 +391,8 @@ CheckVolume( /* Let the user decide whether to repair */ PrintString(" The file system on this volume needs to be checked for problems.\r\n"); - PrintString(" You may cancel this check, but it's recommended that you continue.\r\n"); - PrintString(" Press any key within %d second(s) to cancel and resume startup.\r\n", TimeOut); + PrintString(" You may cancel this check, but it's recommended that you continue.\r\n\r\n"); + PrintString(" Press any key within %d second(s) to cancel and resume startup.\r\n\r\n", TimeOut); /* Timeout == fix it! */ WaitStatus = WaitForKeyboard(TimeOut); @@ -404,7 +404,7 @@ CheckVolume( TRUE, // CheckOnlyIfDirty FALSE,// ScanDrive ChkdskCallback); - PrintString(" The system will now check the file system.\r\n"); + PrintString(" The system will now check the file system.\r\n\r\n"); } else {

6 years, 5 months

02/02: [KMTESTS] Add compile time asserts for IO_STACK_LOCATION offsets CORE-14782

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6ea0bcbbf59237c5c4d2… commit e6ea0bcbbf59237c5c4d2d270d7927a3cb49137a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 22 13:03:51 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jul 25 20:22:36 2018 +0200 [KMTESTS] Add compile time asserts for IO_STACK_LOCATION offsets CORE-14782 --- modules/rostests/kmtests/CMakeLists.txt | 1 + modules/rostests/kmtests/kmtest_drv/structs.c | 71 +++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index bb4ee5beba..bcc95c5e91 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -31,6 +31,7 @@ list(APPEND COMMON_SOURCE list(APPEND KMTEST_DRV_SOURCE kmtest_drv/guid.c kmtest_drv/kmtest_drv.c + kmtest_drv/structs.c kmtest_drv/testlist.c example/Example.c diff --git a/modules/rostests/kmtests/kmtest_drv/structs.c b/modules/rostests/kmtests/kmtest_drv/structs.c new file mode 100644 index 0000000000..9ee74dd64b --- /dev/null +++ b/modules/rostests/kmtests/kmtest_drv/structs.c @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Kernel-Mode Test Suite Struct alignment tests + * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include <kmt_test.h> + +// When searching for the correct offset, +// this will generate a compile-time error including the offset: +// char (*__kaboom1)[FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.EaLength)] = 1; +// Taken from https://stackoverflow.com/a/35261673 + +#if !defined(_AMD64_) + +C_ASSERT(sizeof(IO_STACK_LOCATION) == 36); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, MajorFunction) == 0); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, MinorFunction) == 1); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Flags) == 2); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Control) == 3); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.SecurityContext) == 4); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.Options) == 8); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.FileAttributes) == 12); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.ShareAccess) == 14); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.EaLength) == 16); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.WhichSpace) == 4); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.Buffer) == 8); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.Offset) == 12); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.Length) == 16); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.Length) == 4); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.FileInformationClass) == 8); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.FileObject) == 12); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.ReplaceIfExists) == 16); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.AdvanceOnly) == 17); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.ClusterCount) == 16); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.DeleteHandle) == 16); + +#else + +C_ASSERT(sizeof(IO_STACK_LOCATION) == 72); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, MajorFunction) == 0); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, MinorFunction) == 1); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Flags) == 2); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Control) == 3); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.SecurityContext) == 8); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.Options) == 16); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.FileAttributes) == 24); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.ShareAccess) == 26); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.Create.EaLength) == 32); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.WhichSpace) == 8); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.Buffer) == 16); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.Offset) == 24); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.ReadWriteConfig.Length) == 32); + +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.Length) == 8); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.FileInformationClass) == 16); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.FileObject) == 24); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.ReplaceIfExists) == 32); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.AdvanceOnly) == 33); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.ClusterCount) == 32); +C_ASSERT(FIELD_OFFSET(IO_STACK_LOCATION, Parameters.SetFile.DeleteHandle) == 32); + +#endif

6 years, 5 months

01/02: [XDK][NDK] Restore struct alignment for IO_STACK_LOCATION CORE-14782

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=370ffd112363898c9d071… commit 370ffd112363898c9d071797099517350999e910 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 22 13:02:20 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jul 25 20:22:36 2018 +0200 [XDK][NDK] Restore struct alignment for IO_STACK_LOCATION CORE-14782 --- sdk/include/xdk/iotypes.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sdk/include/xdk/iotypes.h b/sdk/include/xdk/iotypes.h index d2a76b8451..8abcd02236 100644 --- a/sdk/include/xdk/iotypes.h +++ b/sdk/include/xdk/iotypes.h @@ -2746,6 +2746,10 @@ typedef struct _ACPI_INTERFACE_STANDARD2 { PUNREGISTER_FOR_DEVICE_NOTIFICATIONS2 UnregisterForDeviceNotifications; } ACPI_INTERFACE_STANDARD2, *PACPI_INTERFACE_STANDARD2; +#if !defined(_AMD64_) && !defined(_ARM_) +#include <pshpack4.h> +#endif + typedef struct _IO_STACK_LOCATION { UCHAR MajorFunction; UCHAR MinorFunction; @@ -2954,6 +2958,11 @@ typedef struct _IO_STACK_LOCATION { PVOID Context; } IO_STACK_LOCATION, *PIO_STACK_LOCATION; +#if !defined(_AMD64_) && !defined(_ARM_) +#include "poppack.h" +#endif + + /* IO_STACK_LOCATION.Control */ #define SL_PENDING_RETURNED 0x01

6 years, 5 months

01/01: [EXPLORER] Fix creation of shortcuts in the start menu.

by Jared Smudde

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f2f03dd76f698795eaf3… commit 1f2f03dd76f698795eaf38730a695d7588dbdd2d Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Sun Jul 22 11:05:50 2018 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jul 25 00:57:58 2018 +0200 [EXPLORER] Fix creation of shortcuts in the start menu. --- base/shell/explorer/startmnucust.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/explorer/startmnucust.cpp b/base/shell/explorer/startmnucust.cpp index 92c41e6cdb..3c0334357f 100644 --- a/base/shell/explorer/startmnucust.cpp +++ b/base/shell/explorer/startmnucust.cpp @@ -26,7 +26,7 @@ VOID OnAddStartMenuItems(HWND hDlg) { WCHAR szPath[MAX_PATH]; - if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, szPath))) + if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_PROGRAMS, NULL, 0, szPath))) { WCHAR szCommand[MAX_PATH] = L"appwiz.cpl,NewLinkHere "; if (SUCCEEDED(StringCchCatW(szCommand, _countof(szCommand), szPath)))

6 years, 5 months

01/01: Update README.md with the latest release

by Alisson Lauffer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7572ff067bc671e6fa5c0… commit 7572ff067bc671e6fa5c021c925b6f62ee258687 Author: Alisson Lauffer <alissonvitortc(a)gmail.com> AuthorDate: Mon Jul 23 20:10:49 2018 -0300 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Jul 24 07:29:06 2018 +0200 Update README.md with the latest release --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4c11c75c83..bd125d188f 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ --- <p align=center> - <a href="https://reactos.org/project-news/reactos-048-released"> - <img alt="ReactOS 0.4.8 Release" src="https://img.shields.io/badge/release-0.4.8-0688CB.svg"> + <a href="https://reactos.org/project-news/reactos-049-released"> + <img alt="ReactOS 0.4.9 Release" src="https://img.shields.io/badge/release-0.4.9-0688CB.svg"> </a> <a href="https://reactos.org/download"> <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg">

6 years, 5 months

01/01: [SERVICES] Keep a global service bits variable that combines the service bits of all running services

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66981e1b07519a5bdce8f… commit 66981e1b07519a5bdce8f3f29498d18a2e38b716 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 22 15:17:02 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Jul 23 01:48:49 2018 +0200 [SERVICES] Keep a global service bits variable that combines the service bits of all running services --- base/system/services/rpcserver.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 2e6e8087f1..fcfb1115a3 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -97,6 +97,7 @@ ScmServiceMapping = {SERVICE_READ, SERVICE_EXECUTE, SERVICE_ALL_ACCESS}; +DWORD g_dwServiceBits = 0; /* FUNCTIONS ***************************************************************/ @@ -1884,14 +1885,20 @@ RI_ScSetServiceBitsW( if (bSetBitsOn) { DPRINT("Old service bits: %08lx\n", pService->dwServiceBits); + DPRINT("Old global service bits: %08lx\n", g_dwServiceBits); pService->dwServiceBits |= dwServiceBits; + g_dwServiceBits |= dwServiceBits; DPRINT("New service bits: %08lx\n", pService->dwServiceBits); + DPRINT("New global service bits: %08lx\n", g_dwServiceBits); } else { DPRINT("Old service bits: %08lx\n", pService->dwServiceBits); + DPRINT("Old global service bits: %08lx\n", g_dwServiceBits); pService->dwServiceBits &= ~dwServiceBits; + g_dwServiceBits &= ~dwServiceBits; DPRINT("New service bits: %08lx\n", pService->dwServiceBits); + DPRINT("New global service bits: %08lx\n", g_dwServiceBits); } return ERROR_SUCCESS; @@ -2540,7 +2547,6 @@ RCreateServiceW( goto done; } -DPRINT1("\n"); /* Write the security descriptor */ dwError = ScmWriteSecurityDescriptor(hServiceKey, lpService->pSecurityDescriptor);

6 years, 5 months

01/01: [KERNEL32] Use RtlStringCbCopyNW() to correctly fill the WIN32_FIND_DATA.cFileName and cAlternateFileName members without any overflow and with a terminating NULL character.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2158f31b7128fea95f0ab… commit 2158f31b7128fea95f0ab5e40067dd93e70b8dca Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 22 21:32:38 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 22 21:32:38 2018 +0200 [KERNEL32] Use RtlStringCbCopyNW() to correctly fill the WIN32_FIND_DATA.cFileName and cAlternateFileName members without any overflow and with a terminating NULL character. --- dll/win32/kernel32/client/file/disk.c | 1 - dll/win32/kernel32/client/file/find.c | 39 +++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dll/win32/kernel32/client/file/disk.c b/dll/win32/kernel32/client/file/disk.c index 6d13e64acb..7fe8061666 100644 --- a/dll/win32/kernel32/client/file/disk.c +++ b/dll/win32/kernel32/client/file/disk.c @@ -19,7 +19,6 @@ */ #include <k32.h> -#include <strsafe.h> #define NDEBUG #include <debug.h> diff --git a/dll/win32/kernel32/client/file/find.c b/dll/win32/kernel32/client/file/find.c index 4a2d1520e6..b5fe7713e5 100644 --- a/dll/win32/kernel32/client/file/find.c +++ b/dll/win32/kernel32/client/file/find.c @@ -5,12 +5,14 @@ * PURPOSE: Find functions * PROGRAMMERS: Ariadne (ariadne(a)xs4all.nl) * Pierre Schweitzer (pierre.schweitzer(a)reactos.org) - * Hermes BELUSCA - MAITO (hermes.belusca(a)sfr.fr) + * Hermes Belusca-Maito */ /* INCLUDES *******************************************************************/ #include <k32.h> +#include <ntstrsafe.h> + #define NDEBUG #include <debug.h> DEBUG_CHANNEL(kernel32file); @@ -71,7 +73,7 @@ typedef struct _FIND_FILE_DATA /* * For handling STATUS_BUFFER_OVERFLOW errors emitted by - * NtQueryDirectoryFile in the FildNextFile function. + * NtQueryDirectoryFile in the FindNextFile function. */ BOOLEAN HasMoreData; @@ -128,9 +130,9 @@ CopyDeviceFindData(OUT LPWIN32_FIND_DATAW lpFindFileData, /* Return the data */ RtlZeroMemory(lpFindFileData, sizeof(*lpFindFileData)); lpFindFileData->dwFileAttributes = FILE_ATTRIBUTE_ARCHIVE; - RtlCopyMemory(lpFindFileData->cFileName, - DeviceName, - Length); + RtlStringCbCopyNW(lpFindFileData->cFileName, + sizeof(lpFindFileData->cFileName), + DeviceName, Length); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -175,22 +177,22 @@ do { \ if (fInfoLevelId == FindExInfoStandard) { - RtlCopyMemory(lpFindFileData->cFileName, - DirInfo.BothDirInfo->FileName, - DirInfo.BothDirInfo->FileNameLength); - lpFindFileData->cFileName[DirInfo.BothDirInfo->FileNameLength / sizeof(WCHAR)] = UNICODE_NULL; - - RtlCopyMemory(lpFindFileData->cAlternateFileName, - DirInfo.BothDirInfo->ShortName, - DirInfo.BothDirInfo->ShortNameLength); - lpFindFileData->cAlternateFileName[DirInfo.BothDirInfo->ShortNameLength / sizeof(WCHAR)] = UNICODE_NULL; + RtlStringCbCopyNW(lpFindFileData->cFileName, + sizeof(lpFindFileData->cFileName), + DirInfo.BothDirInfo->FileName, + DirInfo.BothDirInfo->FileNameLength); + + RtlStringCbCopyNW(lpFindFileData->cAlternateFileName, + sizeof(lpFindFileData->cAlternateFileName), + DirInfo.BothDirInfo->ShortName, + DirInfo.BothDirInfo->ShortNameLength); } else if (fInfoLevelId == FindExInfoBasic) { - RtlCopyMemory(lpFindFileData->cFileName, - DirInfo.FullDirInfo->FileName, - DirInfo.FullDirInfo->FileNameLength); - lpFindFileData->cFileName[DirInfo.FullDirInfo->FileNameLength / sizeof(WCHAR)] = UNICODE_NULL; + RtlStringCbCopyNW(lpFindFileData->cFileName, + sizeof(lpFindFileData->cFileName), + DirInfo.FullDirInfo->FileName, + DirInfo.FullDirInfo->FileNameLength); lpFindFileData->cAlternateFileName[0] = UNICODE_NULL; } @@ -554,6 +556,7 @@ FindClose(HANDLE hFindFile) _SEH2_YIELD(return FALSE); } _SEH2_END; + return TRUE; }

6 years, 5 months

02/02: [WIN32SS:NTUSER] Update SetWindowStationUser() and NtUserSetWindowStationUser() prototypes. Also, improve NtUserSetWindowStationUser() capture order, make psid optional as it should (and avoid a user-mode triggered BSOD), and initialize luidUser only when everything succeeded.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b003d68ca58ce94766141… commit b003d68ca58ce94766141c779332e4c42b7fc430 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 8 20:39:19 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 22 19:26:53 2018 +0200 [WIN32SS:NTUSER] Update SetWindowStationUser() and NtUserSetWindowStationUser() prototypes. Also, improve NtUserSetWindowStationUser() capture order, make psid optional as it should (and avoid a user-mode triggered BSOD), and initialize luidUser only when everything succeeded. --- win32ss/include/ntuser.h | 8 ++-- win32ss/user/ntuser/winsta.c | 80 ++++++++++++++++++++++++++------------- win32ss/user/user32/misc/winsta.c | 6 +-- 3 files changed, 61 insertions(+), 33 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 724e3e612c..9e4b70938b 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -3289,10 +3289,10 @@ NtUserSetWindowsHookEx( BOOL NTAPI NtUserSetWindowStationUser( - HWINSTA hWindowStation, - PLUID pluid, - PSID psid, - DWORD size); + IN HWINSTA hWindowStation, + IN PLUID pluid, + IN PSID psid OPTIONAL, + IN DWORD size); WORD NTAPI diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index e999ba8a2c..44a8f40505 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -1482,16 +1482,18 @@ NtUserLockWorkStation(VOID) return ret; } -BOOL APIENTRY +BOOL +NTAPI NtUserSetWindowStationUser( - HWINSTA hWindowStation, - PLUID pluid, - PSID psid, - DWORD size) + IN HWINSTA hWindowStation, + IN PLUID pluid, + IN PSID psid OPTIONAL, + IN DWORD size) { + BOOL Ret = FALSE; NTSTATUS Status; PWINSTATION_OBJECT WindowStation = NULL; - BOOL Ret = FALSE; + LUID luidUser; UserEnterExclusive(); @@ -1501,53 +1503,79 @@ NtUserSetWindowStationUser( goto Leave; } + /* Validate the window station */ Status = IntValidateWindowStationHandle(hWindowStation, UserMode, 0, &WindowStation, - 0); + NULL); if (!NT_SUCCESS(Status)) { goto Leave; } - if (WindowStation->psidUser) - { - ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); - } - - WindowStation->psidUser = ExAllocatePoolWithTag(PagedPool, size, USERTAG_SECURITY); - if (WindowStation->psidUser == NULL) - { - EngSetLastError(ERROR_OUTOFMEMORY); - goto Leave; - } - + /* Capture the user LUID */ _SEH2_TRY { - ProbeForRead(psid, size, 1); ProbeForRead(pluid, sizeof(LUID), 1); - - RtlCopyMemory(WindowStation->psidUser, psid, size); - WindowStation->luidUser = *pluid; + luidUser = *pluid; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(goto Leave); } _SEH2_END; - if (!NT_SUCCESS(Status)) + /* Reset the window station user LUID */ + RtlZeroMemory(&WindowStation->luidUser, sizeof(LUID)); + + /* Reset the window station user SID */ + if (WindowStation->psidUser) { ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); WindowStation->psidUser = NULL; - goto Leave; } + /* Copy the new user SID if one has been provided */ + if (psid) + { + WindowStation->psidUser = ExAllocatePoolWithTag(PagedPool, size, USERTAG_SECURITY); + if (WindowStation->psidUser == NULL) + { + EngSetLastError(ERROR_OUTOFMEMORY); + goto Leave; + } + + Status = STATUS_SUCCESS; + _SEH2_TRY + { + ProbeForRead(psid, size, 1); + RtlCopyMemory(WindowStation->psidUser, psid, size); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); + WindowStation->psidUser = NULL; + goto Leave; + } + } + + /* Copy the new user LUID */ + WindowStation->luidUser = luidUser; + Ret = TRUE; Leave: - if (WindowStation) ObDereferenceObject(WindowStation); + if (WindowStation) + ObDereferenceObject(WindowStation); + UserLeave(); return Ret; } diff --git a/win32ss/user/user32/misc/winsta.c b/win32ss/user/user32/misc/winsta.c index 11d4bb5a00..24f6d893b2 100644 --- a/win32ss/user/user32/misc/winsta.c +++ b/win32ss/user/user32/misc/winsta.c @@ -399,8 +399,8 @@ BOOL WINAPI SetWindowStationUser( IN HWINSTA hWindowStation, - IN PLUID pluid OPTIONAL, - IN PSID psid, + IN PLUID pluid, + IN PSID psid OPTIONAL, IN DWORD size) { BOOL Success; @@ -410,7 +410,7 @@ SetWindowStationUser( { /* Signal log-on/off to WINSRV */ - /* User is logging on if pluid != LuidNone, otherwise it is a log-off */ + /* User is logging on if *pluid != LuidNone, otherwise it is a log-off */ LUID LuidNone = {0, 0}; BOOL IsLogon = (pluid && !RtlEqualLuid(pluid, &LuidNone));

6 years, 5 months

01/02: [WIN32SS:USER] Code formatting only.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9bf7fb6f423f8915d9ea8… commit 9bf7fb6f423f8915d9ea8fc34548565a98419996 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 16 19:43:40 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 22 19:26:50 2018 +0200 [WIN32SS:USER] Code formatting only. --- win32ss/user/ntuser/main.c | 2 +- win32ss/user/ntuser/winsta.c | 26 +++---- win32ss/user/ntuser/winsta.h | 6 +- win32ss/user/user32/misc/winsta.c | 145 +++++++++++++++++++++----------------- 4 files changed, 95 insertions(+), 84 deletions(-) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index f9aed03b77..c10e48230e 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -941,7 +941,7 @@ DriverEntry( CalloutData.DesktopOkToCloseProcedure = IntDesktopOkToClose; CalloutData.DesktopCloseProcedure = IntDesktopObjectClose; CalloutData.DesktopDeleteProcedure = IntDesktopObjectDelete; - CalloutData.WindowStationOkToCloseProcedure = IntWinstaOkToClose; + CalloutData.WindowStationOkToCloseProcedure = IntWinStaOkToClose; // CalloutData.WindowStationCloseProcedure = NULL; CalloutData.WindowStationDeleteProcedure = IntWinStaObjectDelete; CalloutData.WindowStationParseProcedure = IntWinStaObjectParse; diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index d9ca3ca999..e999ba8a2c 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -96,7 +96,7 @@ UserCreateWinstaDirectory(VOID) /* OBJECT CALLBACKS **********************************************************/ NTSTATUS -APIENTRY +NTAPI IntWinStaObjectDelete( _In_ PVOID Parameters) { @@ -117,7 +117,7 @@ IntWinStaObjectDelete( } NTSTATUS -APIENTRY +NTAPI IntWinStaObjectParse( _In_ PVOID Parameters) { @@ -183,7 +183,7 @@ IntWinStaObjectParse( NTSTATUS NTAPI -IntWinstaOkToClose( +IntWinStaOkToClose( _In_ PVOID Parameters) { PWIN32_OKAYTOCLOSEMETHOD_PARAMETERS OkToCloseParameters = Parameters; @@ -370,7 +370,7 @@ CheckWinstaAttributeAccess(ACCESS_MASK DesiredAccess) * lpSecurity * Security descriptor * - * Unknown3, Unknown4, Unknown5 + * Unknown3, Unknown4, Unknown5, Unknown6 * Unused * * Return Value @@ -379,10 +379,6 @@ CheckWinstaAttributeAccess(ACCESS_MASK DesiredAccess) * exists, the function succeeds and returns a handle to the existing * window station. If the function fails, the return value is NULL. * - * Todo - * Correct the prototype to match the Windows one (with 7 parameters - * on Windows XP). - * * Status * @implemented */ @@ -940,7 +936,7 @@ UserSetProcessWindowStation(HWINSTA hWindowStation) ppi = PsGetCurrentProcessWin32Process(); /* Reference the new window station */ - if(hWindowStation !=NULL) + if (hWindowStation != NULL) { Status = IntValidateWindowStationHandle(hWindowStation, UserMode, @@ -960,13 +956,13 @@ UserSetProcessWindowStation(HWINSTA hWindowStation) hwinstaOld = PsGetProcessWin32WindowStation(ppi->peProcess); /* Dereference the previous window station */ - if(OldWinSta != NULL) + if (OldWinSta != NULL) { ObDereferenceObject(OldWinSta); } /* Check if we have a stale handle (it should happen for console apps) */ - if(hwinstaOld != ppi->hwinsta) + if (hwinstaOld != ppi->hwinsta) { ObCloseHandle(hwinstaOld, UserMode); } @@ -991,7 +987,7 @@ UserSetProcessWindowStation(HWINSTA hWindowStation) ppi->W32PF_flags &= ~W32PF_READSCREENACCESSGRANTED; } - if (NewWinSta && !(NewWinSta->Flags & WSS_NOIO) ) + if (NewWinSta && !(NewWinSta->Flags & WSS_NOIO)) { ppi->W32PF_flags |= W32PF_IOWINSTA; } @@ -1529,8 +1525,8 @@ NtUserSetWindowStationUser( _SEH2_TRY { - ProbeForRead( psid, size, 1); - ProbeForRead( pluid, sizeof(LUID), 1); + ProbeForRead(psid, size, 1); + ProbeForRead(pluid, sizeof(LUID), 1); RtlCopyMemory(WindowStation->psidUser, psid, size); WindowStation->luidUser = *pluid; @@ -1544,7 +1540,7 @@ NtUserSetWindowStationUser( if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); - WindowStation->psidUser = 0; + WindowStation->psidUser = NULL; goto Leave; } diff --git a/win32ss/user/ntuser/winsta.h b/win32ss/user/ntuser/winsta.h index 6ac08cf297..b41834e7c1 100644 --- a/win32ss/user/ntuser/winsta.h +++ b/win32ss/user/ntuser/winsta.h @@ -84,18 +84,18 @@ NTAPI UserCreateWinstaDirectory(VOID); NTSTATUS -APIENTRY +NTAPI IntWinStaObjectDelete( _In_ PVOID Parameters); NTSTATUS -APIENTRY +NTAPI IntWinStaObjectParse( _In_ PVOID Parameters); NTSTATUS NTAPI -IntWinstaOkToClose( +IntWinStaOkToClose( _In_ PVOID Parameters); NTSTATUS diff --git a/win32ss/user/user32/misc/winsta.c b/win32ss/user/user32/misc/winsta.c index b3b888747f..11d4bb5a00 100644 --- a/win32ss/user/user32/misc/winsta.c +++ b/win32ss/user/user32/misc/winsta.c @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS user32.dll - * FILE: win32ss/user/user32/misc/winsta.c - * PURPOSE: Window stations - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * 04-06-2001 CSH Created + * PROJECT: ReactOS user32.dll + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Window stations + * COPYRIGHT: Copyright 2001-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Copyright 2011-2018 Giannis Adamopoulos */ #include <user32.h> @@ -15,14 +13,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsta); /* * @implemented */ -HWINSTA WINAPI -CreateWindowStationA(LPCSTR lpwinsta, - DWORD dwReserved, - ACCESS_MASK dwDesiredAccess, - LPSECURITY_ATTRIBUTES lpsa) +HWINSTA +WINAPI +CreateWindowStationA( + IN LPCSTR lpwinsta OPTIONAL, + IN DWORD dwReserved, + IN ACCESS_MASK dwDesiredAccess, + IN LPSECURITY_ATTRIBUTES lpsa OPTIONAL) { - UNICODE_STRING WindowStationNameU; HWINSTA hWinSta; + UNICODE_STRING WindowStationNameU; if (lpwinsta) { @@ -39,7 +39,7 @@ CreateWindowStationA(LPCSTR lpwinsta, dwDesiredAccess, lpsa); - /* Free the string, if it was allocated */ + /* Free the string if it was allocated */ if (lpwinsta) RtlFreeUnicodeString(&WindowStationNameU); return hWinSta; @@ -49,30 +49,32 @@ CreateWindowStationA(LPCSTR lpwinsta, /* * @implemented */ -HWINSTA WINAPI -CreateWindowStationW(LPCWSTR lpwinsta, - DWORD dwReserved, - ACCESS_MASK dwDesiredAccess, - LPSECURITY_ATTRIBUTES lpsa) +HWINSTA +WINAPI +CreateWindowStationW( + IN LPCWSTR lpwinsta OPTIONAL, + IN DWORD dwReserved, + IN ACCESS_MASK dwDesiredAccess, + IN LPSECURITY_ATTRIBUTES lpsa OPTIONAL) { + NTSTATUS Status; + HWINSTA hWinSta; UNICODE_STRING WindowStationName; UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hWindowStationsDir; - NTSTATUS Status; - HWINSTA hwinsta; /* Open WindowStations directory */ InitializeObjectAttributes(&ObjectAttributes, &WindowStationsDir, OBJ_CASE_INSENSITIVE, - 0, - 0); + NULL, + NULL); - Status = NtOpenDirectoryObject(&hWindowStationsDir, - DIRECTORY_CREATE_OBJECT, + Status = NtOpenDirectoryObject(&hWindowStationsDir, + DIRECTORY_CREATE_OBJECT, &ObjectAttributes); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { ERR("Failed to open WindowStations directory\n"); return NULL; @@ -85,27 +87,28 @@ CreateWindowStationW(LPCWSTR lpwinsta, &WindowStationName, OBJ_CASE_INSENSITIVE, hWindowStationsDir, - 0); + NULL); /* Check if the handle should be inheritable */ if (lpsa && lpsa->bInheritHandle) - { + { ObjectAttributes.Attributes |= OBJ_INHERIT; } - hwinsta = NtUserCreateWindowStation(&ObjectAttributes, + hWinSta = NtUserCreateWindowStation(&ObjectAttributes, dwDesiredAccess, 0, 0, 0, 0, 0); NtClose(hWindowStationsDir); - return hwinsta; + return hWinSta; } /* * Common code for EnumDesktopsA/W and EnumWindowStationsA/W */ -BOOL FASTCALL +BOOL +FASTCALL EnumNamesW(HWINSTA WindowStation, NAMEENUMPROCW EnumFunc, LPARAM Context, @@ -174,7 +177,6 @@ EnumNamesW(HWINSTA WindowStation, return Ret; } - /* For W->A conversion */ typedef struct tagENUMNAMESASCIICONTEXT { @@ -186,7 +188,8 @@ typedef struct tagENUMNAMESASCIICONTEXT * Callback used by Ascii versions. Converts the Unicode name to * Ascii and then calls the user callback */ -BOOL CALLBACK +BOOL +CALLBACK EnumNamesCallback(LPWSTR Name, LPARAM Param) { PENUMNAMESASCIICONTEXT Context = (PENUMNAMESASCIICONTEXT) Param; @@ -247,7 +250,8 @@ EnumNamesCallback(LPWSTR Name, LPARAM Param) /* * Common code for EnumDesktopsA and EnumWindowStationsA */ -BOOL FASTCALL +BOOL +FASTCALL EnumNamesA(HWINSTA WindowStation, NAMEENUMPROCA EnumFunc, LPARAM Context, @@ -264,9 +268,11 @@ EnumNamesA(HWINSTA WindowStation, /* * @implemented */ -BOOL WINAPI -EnumWindowStationsA(WINSTAENUMPROCA EnumFunc, - LPARAM Context) +BOOL +WINAPI +EnumWindowStationsA( + IN WINSTAENUMPROCA EnumFunc, + IN LPARAM Context) { return EnumNamesA(NULL, EnumFunc, Context, FALSE); } @@ -275,9 +281,11 @@ EnumWindowStationsA(WINSTAENUMPROCA EnumFunc, /* * @implemented */ -BOOL WINAPI -EnumWindowStationsW(WINSTAENUMPROCW EnumFunc, - LPARAM Context) +BOOL +WINAPI +EnumWindowStationsW( + IN WINSTAENUMPROCW EnumFunc, + IN LPARAM Context) { return EnumNamesW(NULL, EnumFunc, Context, FALSE); } @@ -286,7 +294,8 @@ EnumWindowStationsW(WINSTAENUMPROCW EnumFunc, /* * @unimplemented on Win32k side */ -BOOL WINAPI +BOOL +WINAPI GetWinStationInfo(PVOID pUnknown) { return (BOOL)NtUserCallOneParam((DWORD_PTR)pUnknown, ONEPARAM_ROUTINE_GETWINSTAINFO); @@ -296,13 +305,15 @@ GetWinStationInfo(PVOID pUnknown) /* * @implemented */ -HWINSTA WINAPI -OpenWindowStationA(LPCSTR lpszWinSta, - BOOL fInherit, - ACCESS_MASK dwDesiredAccess) +HWINSTA +WINAPI +OpenWindowStationA( + IN LPCSTR lpszWinSta, + IN BOOL fInherit, + IN ACCESS_MASK dwDesiredAccess) { - UNICODE_STRING WindowStationNameU; HWINSTA hWinSta; + UNICODE_STRING WindowStationNameU; if (lpszWinSta) { @@ -318,7 +329,7 @@ OpenWindowStationA(LPCSTR lpszWinSta, fInherit, dwDesiredAccess); - /* Free the string, if it was allocated */ + /* Free the string if it was allocated */ if (lpszWinSta) RtlFreeUnicodeString(&WindowStationNameU); return hWinSta; @@ -328,27 +339,29 @@ OpenWindowStationA(LPCSTR lpszWinSta, /* * @implemented */ -HWINSTA WINAPI -OpenWindowStationW(LPCWSTR lpszWinSta, - BOOL fInherit, - ACCESS_MASK dwDesiredAccess) +HWINSTA +WINAPI +OpenWindowStationW( + IN LPCWSTR lpszWinSta, + IN BOOL fInherit, + IN ACCESS_MASK dwDesiredAccess) { + NTSTATUS Status; + HWINSTA hWinSta; UNICODE_STRING WindowStationName; UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hWindowStationsDir; - NTSTATUS Status; - HWINSTA hwinsta; /* Open WindowStations directory */ InitializeObjectAttributes(&ObjectAttributes, &WindowStationsDir, OBJ_CASE_INSENSITIVE, - 0, - 0); + NULL, + NULL); - Status = NtOpenDirectoryObject(&hWindowStationsDir, - DIRECTORY_TRAVERSE, + Status = NtOpenDirectoryObject(&hWindowStationsDir, + DIRECTORY_TRAVERSE, &ObjectAttributes); if(!NT_SUCCESS(Status)) { @@ -363,18 +376,19 @@ OpenWindowStationW(LPCWSTR lpszWinSta, &WindowStationName, OBJ_CASE_INSENSITIVE, hWindowStationsDir, - 0); + NULL); - if(fInherit) + /* Check if the handle should be inheritable */ + if (fInherit) { ObjectAttributes.Attributes |= OBJ_INHERIT; } - hwinsta = NtUserOpenWindowStation(&ObjectAttributes, dwDesiredAccess); + hWinSta = NtUserOpenWindowStation(&ObjectAttributes, dwDesiredAccess); NtClose(hWindowStationsDir); - return hwinsta; + return hWinSta; } @@ -383,10 +397,11 @@ OpenWindowStationW(LPCWSTR lpszWinSta, */ BOOL WINAPI -SetWindowStationUser(HWINSTA hWindowStation, - PLUID pluid, - PSID psid, - DWORD size) +SetWindowStationUser( + IN HWINSTA hWindowStation, + IN PLUID pluid OPTIONAL, + IN PSID psid, + IN DWORD size) { BOOL Success;

6 years, 5 months

03/03: [USER32_APITEST] Add few other tests (validation of the desktop path string); improve the output of some messages, displaying the expected values in case of test failure. See also PR #621.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e90316aeaa4c844b0f589… commit e90316aeaa4c844b0f589a349bd8178b06eaeea2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 17 23:17:52 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 22 19:03:17 2018 +0200 [USER32_APITEST] Add few other tests (validation of the desktop path string); improve the output of some messages, displaying the expected values in case of test failure. See also PR #621. --- modules/rostests/apitests/user32/desktop.c | 175 ++++++++++++++++++----------- 1 file changed, 112 insertions(+), 63 deletions(-) diff --git a/modules/rostests/apitests/user32/desktop.c b/modules/rostests/apitests/user32/desktop.c index f7bffe0721..05f0c13301 100644 --- a/modules/rostests/apitests/user32/desktop.c +++ b/modules/rostests/apitests/user32/desktop.c @@ -15,16 +15,26 @@ struct test_info { WCHAR* ExpectedDesktp; }; -struct test_info TestResults[] = {{L"WinSta0",L"Default"}, - {L"WinSta0",L"Default"}, - {L"WinSta0",L"Default"}, - {NULL, NULL}, - {NULL, NULL}, - {NULL, NULL}, - {NULL, NULL}, - {L"WinSta0",L"Default"}, - {L"TestWinsta", L"TestDesktop"}, - {NULL, NULL}}; +struct test_info TestResults[] = +{ + {L"WinSta0",L"Default"}, + {L"WinSta0",L"Default"}, + {NULL, NULL}, + {NULL, NULL}, + {L"WinSta0",L"Default"}, + {NULL, NULL}, + {NULL, NULL}, + {NULL, NULL}, + {NULL, NULL}, + {L"WinSta0",L"Default"}, + {NULL, NULL}, + {NULL, NULL}, + {NULL, NULL}, + {L"TestWinsta", L"TestDesktop"}, + {NULL, NULL}, + {L"WinSta0",L"Default"}, + {NULL, NULL} +}; void do_InitialDesktop_child(int i) { @@ -34,11 +44,8 @@ void do_InitialDesktop_child(int i) DWORD size; BOOL ret; - if(TestResults[i].ExpectedWinsta == NULL) - { - trace("Process should have failed to initialize\n"); - return; - } + if (TestResults[i].ExpectedWinsta == NULL) + ok(FALSE, "%d: Process should have failed to initialize\n", i); IsGUIThread(TRUE); @@ -47,11 +54,15 @@ void do_InitialDesktop_child(int i) ret = GetUserObjectInformationW( hwinsta, UOI_NAME, buffer, sizeof(buffer), &size ); ok(ret == TRUE, "ret = %d\n", ret); - ok(wcscmp(buffer, TestResults[i].ExpectedWinsta) == 0, "Wrong winsta %S insted of %S\n", buffer, TestResults[i].ExpectedWinsta); + if (TestResults[i].ExpectedWinsta) + ok(wcscmp(buffer, TestResults[i].ExpectedWinsta) == 0, "%d: Wrong winsta %S instead of %S\n", i, buffer, TestResults[i].ExpectedWinsta); + trace("%d: We run on winstation %S\n", i, buffer); ret = GetUserObjectInformationW( hdesktop, UOI_NAME, buffer, sizeof(buffer), &size ); ok(ret == TRUE, "ret = %d\n", ret); - ok(wcscmp(buffer, TestResults[i].ExpectedDesktp) == 0, "Wrong desktop %S insted of %S\n", buffer, TestResults[i].ExpectedDesktp); + if (TestResults[i].ExpectedDesktp) + ok(wcscmp(buffer, TestResults[i].ExpectedDesktp) == 0, "%d: Wrong desktop %S instead of %S\n", i, buffer, TestResults[i].ExpectedDesktp); + trace("%d: We run on desktop %S\n", i, buffer); } void test_CreateProcessWithDesktop(int i, char *argv0, char* Desktop, DWORD expectedExitCode) @@ -77,29 +88,37 @@ void test_CreateProcessWithDesktop(int i, char *argv0, char* Desktop, DWORD expe /* the exit code varies from version to version */ /* xp returns error 128 and 7 returns STATUS_DLL_INIT_FAILED */ - if(ExitCode == 128) ExitCode = STATUS_DLL_INIT_FAILED; + if (ExitCode == 128) ExitCode = STATUS_DLL_INIT_FAILED; ok(ExitCode == expectedExitCode, "%d: expected error 0x%x in child process got 0x%x\n", i, (int)expectedExitCode, (int)ExitCode); CloseHandle(pi.hProcess); } -HWINSTA CreateInheritableWinsta(WCHAR* name, ACCESS_MASK dwDesiredAccess, BOOL inheritable) +HWINSTA CreateInheritableWinsta(WCHAR* name, ACCESS_MASK dwDesiredAccess, BOOL inheritable, DWORD *error) { - SECURITY_ATTRIBUTES sa; - sa.nLength = sizeof(sa); - sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = inheritable; - return CreateWindowStationW(name, 0, dwDesiredAccess, &sa ); + HWINSTA hwinsta; + SECURITY_ATTRIBUTES sa; + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = inheritable; + SetLastError(0xfeedf00d); + hwinsta = CreateWindowStationW(name, 0, dwDesiredAccess, &sa); + *error = GetLastError(); + return hwinsta; } -HDESK CreateInheritableDesktop(WCHAR* name, ACCESS_MASK dwDesiredAccess, BOOL inheritable) +HDESK CreateInheritableDesktop(WCHAR* name, ACCESS_MASK dwDesiredAccess, BOOL inheritable, DWORD *error) { - SECURITY_ATTRIBUTES sa; - sa.nLength = sizeof(sa); - sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = inheritable; - return CreateDesktopW(name, NULL, NULL, 0, dwDesiredAccess, &sa ); + HDESK hdesk; + SECURITY_ATTRIBUTES sa; + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = inheritable; + SetLastError(0xfeedf00d); + hdesk = CreateDesktopW(name, NULL, NULL, 0, dwDesiredAccess, &sa); + *error = GetLastError(); + return hdesk; } void Test_InitialDesktop(char *argv0) @@ -107,36 +126,66 @@ void Test_InitialDesktop(char *argv0) HWINSTA hwinsta = NULL, hwinstaInitial; HDESK hdesktop = NULL; BOOL ret; + DWORD error; hwinstaInitial = GetProcessWindowStation(); + /* Use the default (interactive) window station */ test_CreateProcessWithDesktop(0, argv0, NULL, 0); test_CreateProcessWithDesktop(1, argv0, "Default", 0); - test_CreateProcessWithDesktop(2, argv0, "WinSta0\\Default", 0); - test_CreateProcessWithDesktop(3, argv0, "Winlogon", STATUS_DLL_INIT_FAILED); - test_CreateProcessWithDesktop(4, argv0, "WinSta0/Default", STATUS_DLL_INIT_FAILED); - test_CreateProcessWithDesktop(5, argv0, "NonExistantDesktop", STATUS_DLL_INIT_FAILED); - test_CreateProcessWithDesktop(6, argv0, "NonExistantWinsta\\NonExistantDesktop", STATUS_DLL_INIT_FAILED); - - hwinsta = CreateInheritableWinsta(L"TestWinsta", WINSTA_ALL_ACCESS, TRUE); - ok(hwinsta!=NULL, "CreateWindowStation failed\n"); + test_CreateProcessWithDesktop(2, argv0, "WinSta0\\", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(3, argv0, "\\Default", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(4, argv0, "WinSta0\\Default", 0); + test_CreateProcessWithDesktop(5, argv0, "Winlogon", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(6, argv0, "WinSta0/Default", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(7, argv0, "NonExistantDesktop", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(8, argv0, "NonExistantWinsta\\NonExistantDesktop", STATUS_DLL_INIT_FAILED); + + /* Test on an (non-interactive) window station */ + hwinsta = CreateInheritableWinsta(L"TestWinsta", WINSTA_ALL_ACCESS, TRUE, &error); + ok(hwinsta != NULL && error == NO_ERROR, "CreateWindowStation failed, got 0x%p, 0x%lx\n", hwinsta, error); ret = SetProcessWindowStation(hwinsta); - ok(ret != 0, "SetProcessWindowStation failed\n"); - hdesktop = CreateInheritableDesktop(L"TestDesktop", DESKTOP_ALL_ACCESS, TRUE); - ok(hdesktop!=NULL, "CreateDesktop failed\n"); + ok(ret != FALSE, "SetProcessWindowStation failed\n"); + hdesktop = CreateInheritableDesktop(L"TestDesktop", DESKTOP_ALL_ACCESS, TRUE, &error); + ok(hdesktop != NULL && error == 0xfeedf00d, "CreateDesktop failed, got 0x%p, 0x%lx\n", hdesktop, error); - test_CreateProcessWithDesktop(7, argv0, NULL, 0); - test_CreateProcessWithDesktop(8, argv0, "TestWinsta\\TestDesktop", 0); - test_CreateProcessWithDesktop(8, argv0, "NonExistantWinsta\\NonExistantDesktop", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(9, argv0, NULL, 0); + test_CreateProcessWithDesktop(10, argv0, "TestDesktop", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(11, argv0, "TestWinsta\\", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(12, argv0, "\\TestDesktop", STATUS_DLL_INIT_FAILED); + test_CreateProcessWithDesktop(13, argv0, "TestWinsta\\TestDesktop", 0); + test_CreateProcessWithDesktop(14, argv0, "NonExistantWinsta\\NonExistantDesktop", STATUS_DLL_INIT_FAILED); + + ret = SetProcessWindowStation(hwinstaInitial); + ok(ret != FALSE, "SetProcessWindowStation failed\n"); + + ret = CloseDesktop(hdesktop); + ok(ret != FALSE, "CloseDesktop failed\n"); + + ret = CloseWindowStation(hwinsta); + ok(ret != FALSE, "CloseWindowStation failed\n"); + +#if 0 + /* Test on an non-interactive Service-0xXXXX-YYYY$ window station */ + hwinsta = CreateInheritableWinsta(NULL, WINSTA_ALL_ACCESS, TRUE, &error); + ok(hwinsta != NULL && error == NO_ERROR, "CreateWindowStation failed, got 0x%p, 0x%lx\n", hwinsta, error); + ret = SetProcessWindowStation(hwinsta); + ok(ret != FALSE, "SetProcessWindowStation failed\n"); + hdesktop = CreateInheritableDesktop(L"TestDesktop", DESKTOP_ALL_ACCESS, TRUE, &error); + ok(hdesktop != NULL && error == 0xfeedf00d, "CreateDesktop failed, got 0x%p, 0x%lx\n", hdesktop, error); + + test_CreateProcessWithDesktop(15, argv0, NULL, 0); + test_CreateProcessWithDesktop(16, "TestDesktop", NULL, 0 /*ERROR_ACCESS_DENIED*/); ret = SetProcessWindowStation(hwinstaInitial); - ok(ret != 0, "SetProcessWindowStation failed\n"); + ok(ret != FALSE, "SetProcessWindowStation failed\n"); ret = CloseDesktop(hdesktop); - ok(ret != 0, "CloseDesktop failed\n"); + ok(ret != FALSE, "CloseDesktop failed\n"); ret = CloseWindowStation(hwinsta); - ok(ret != 0, "CloseWindowStation failed\n"); + ok(ret != FALSE, "CloseWindowStation failed\n"); +#endif } void Test_OpenInputDesktop() @@ -175,7 +224,7 @@ void Test_OpenInputDesktop() ok(hwinsta != 0, "CreateWindowStationW failed\n"); ret = SetProcessWindowStation(hwinsta); - ok(ret != 0, "SetProcessWindowStation failed\n"); + ok(ret != FALSE, "SetProcessWindowStation failed\n"); hDeskInput = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); ok(hDeskInput == 0, "OpenInputDesktop should fail\n"); @@ -184,10 +233,10 @@ void Test_OpenInputDesktop() ok(err == ERROR_INVALID_FUNCTION, "Got last error: %lu\n", err); ret = SetProcessWindowStation(hwinstaInitial); - ok(ret != 0, "SetProcessWindowStation failed\n"); + ok(ret != FALSE, "SetProcessWindowStation failed\n"); ret = CloseWindowStation(hwinsta); - ok(ret != 0, "CloseWindowStation failed\n"); + ok(ret != FALSE, "CloseWindowStation failed\n"); } @@ -244,17 +293,17 @@ static void Test_References(void) #define check_ref(handle, hdlcnt, ptrcnt) \ status = NtQueryObject(handle, ObjectBasicInformation, &objectInfo, sizeof(objectInfo), NULL); \ - ok(status == STATUS_SUCCESS, "status = %lx\n", status); \ - ok(objectInfo.HandleCount == (hdlcnt), "HandleCount = %lx\n", objectInfo.HandleCount); \ - ok(objectInfo.PointerCount == (ptrcnt), "PointerCount = %lx\n", objectInfo.PointerCount); + ok(status == STATUS_SUCCESS, "status = 0x%lx\n", status); \ + ok(objectInfo.HandleCount == (hdlcnt), "HandleCount = %lu, expected %lu\n", objectInfo.HandleCount, (ULONG)(hdlcnt)); \ + ok(objectInfo.PointerCount == (ptrcnt), "PointerCount = %lu, expected %lu\n", objectInfo.PointerCount, (ULONG)(ptrcnt)); /* Winsta shouldn't exist */ hwinsta = open_winsta(winstaName, &error); - ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got 0x%p, 0x%lx\n", hwinsta, error); /* Create it -- we get 1/4 instead of 1/3 because Winstas are kept in a list */ hwinsta = create_winsta(winstaName, &error); - ok(hwinsta != NULL && error == NO_ERROR, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta != NULL && error == NO_ERROR, "Got 0x%p, 0x%lx\n", hwinsta, error); check_ref(hwinsta, 1, 4); baseRefs = objectInfo.PointerCount; ok(baseRefs == 4, "Window station initially has %lu references, expected 4\n", baseRefs); @@ -262,7 +311,7 @@ static void Test_References(void) /* Open a second handle */ hwinsta2 = open_winsta(winstaName, &error); - ok(hwinsta2 != NULL && error == 0xfeedf00d, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta2 != NULL && error == 0xfeedf00d, "Got 0x%p, 0x%lx\n", hwinsta, error); check_ref(hwinsta, 2, baseRefs + 1); /* Close second handle -- back to 1/4 */ @@ -272,7 +321,7 @@ static void Test_References(void) /* Same game but using CloseWindowStation */ hwinsta2 = open_winsta(winstaName, &error); - ok(hwinsta2 != NULL && error == 0xfeedf00d, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta2 != NULL && error == 0xfeedf00d, "Got 0x%p, 0x%lx\n", hwinsta, error); check_ref(hwinsta, 2, baseRefs + 1); ret = CloseWindowStation(hwinsta2); ok(ret == TRUE, "ret = %d\n", ret); @@ -285,7 +334,7 @@ static void Test_References(void) /* Create a desktop. It takes a reference */ hdesk = create_desk(deskName, &error); - ok(hdesk != NULL && error == 0xfeedf00d, "Got %p, %lu\n", hdesk, error); + ok(hdesk != NULL && error == 0xfeedf00d, "Got 0x%p, 0x%lx\n", hdesk, error); check_ref(hwinsta, 2, baseRefs + 3); /* CloseHandle fails, must use CloseDesktop */ @@ -298,7 +347,7 @@ static void Test_References(void) /* Desktop no longer exists */ hdesk = open_desk(deskName, &error); - ok(hdesk == NULL && error == ERROR_FILE_NOT_FOUND, "Got %p, %lu\n", hdesk, error); + ok(hdesk == NULL && error == ERROR_FILE_NOT_FOUND, "Got 0x%p, 0x%lx\n", hdesk, error); check_ref(hwinsta, 2, baseRefs + 2); /* Restore the original process Winsta */ @@ -311,18 +360,18 @@ static void Test_References(void) /* Winsta no longer exists */ hwinsta = open_winsta(winstaName, &error); - ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got 0x%p, 0x%lx\n", hwinsta, error); /* Create the Winsta again, and close it while there's still a desktop */ hwinsta = create_winsta(winstaName, &error); - ok(hwinsta != NULL && error == NO_ERROR, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta != NULL && error == NO_ERROR, "Got 0x%p, 0x%lx\n", hwinsta, error); check_ref(hwinsta, 1, baseRefs); hwinstaProcess = GetProcessWindowStation(); SetProcessWindowStation(hwinsta); check_ref(hwinsta, 2, baseRefs + 2); hdesk = create_desk(deskName, &error); - ok(hdesk != NULL && error == 0xfeedf00d, "Got %p, %lu\n", hdesk, error); + ok(hdesk != NULL && error == 0xfeedf00d, "Got 0x%p, 0x%lx\n", hdesk, error); check_ref(hwinsta, 2, baseRefs + 3); /* The reference from the desktop is still there, hence 1/5 */ @@ -331,7 +380,7 @@ static void Test_References(void) ret = CloseHandle(hwinsta); ok(ret == TRUE, "ret = %d\n", ret); hwinsta = open_winsta(winstaName, &error); - ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got %p, %lu\n", hwinsta, error); + ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got 0x%p, 0x%lx\n", hwinsta, error); /* Test references by SetThreadDesktop */ hdesk1 = GetThreadDesktop(GetCurrentThreadId());

6 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2018