Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USER32] Implement the special case in CreateWindowStationW() that, when no window station name is provided (either NULL or empty string), does not open any WindowStation directory handle to be passed to the Win32k function.

Browse source 
Observed via API monitoring.
This corresponds to the case where Win32k creates a window station whose name is based on the logon session identifier for the calling process.

Add also a note about the fact that we need to use a per-session-based WindowStation directory name, as done already in Win32k.

CORE-11933 and PR #621.
This commit is contained in:
Hermès Bélusca-Maïto 2018-06-16 19:43:59 +02:00
parent 8cd5c4e7bd
commit 9c0564063d
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
win32ss/user/user32/misc/winsta.c
View file

@ -60,32 +60,49 @@ CreateWindowStationW(
NTSTATUS Status;
HWINSTA hWinSta;
UNICODE_STRING WindowStationName;
// FIXME: We should cache a per-session directory (see ntuser\winsta.c!UserCreateWinstaDirectory).
UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations");
OBJECT_ATTRIBUTES ObjectAttributes;
HANDLE hWindowStationsDir;
/* Open WindowStations directory */
InitializeObjectAttributes(&ObjectAttributes,
&WindowStationsDir,
OBJ_CASE_INSENSITIVE,
NULL,
NULL);
Status = NtOpenDirectoryObject(&hWindowStationsDir,
DIRECTORY_CREATE_OBJECT,
&ObjectAttributes);
if (!NT_SUCCESS(Status))
/*
* If provided, the window station name is always relative to the
* current user session's WindowStations directory.
* Otherwise (the window station name is NULL or an empty string),
* pass both an empty string and no WindowStations directory handle
* to win32k, so that it will create a window station whose name
* is based on the logon session identifier for the calling process.
*/
if (lpwinsta && *lpwinsta)
{
ERR("Failed to open WindowStations directory\n");
return NULL;
}
/* Open WindowStations directory */
InitializeObjectAttributes(&ObjectAttributes,
&WindowStationsDir,
OBJ_CASE_INSENSITIVE,
NULL,
NULL);
RtlInitUnicodeString(&WindowStationName, lpwinsta);
Status = NtOpenDirectoryObject(&hWindowStationsDir,
DIRECTORY_CREATE_OBJECT,
&ObjectAttributes);
if (!NT_SUCCESS(Status))
{
ERR("Failed to open WindowStations directory\n");
return NULL;
}
RtlInitUnicodeString(&WindowStationName, lpwinsta);
}
else
{
lpwinsta = NULL;
hWindowStationsDir = NULL;
}
/* Create the window station object */
InitializeObjectAttributes(&ObjectAttributes,
&WindowStationName,
OBJ_CASE_INSENSITIVE,
lpwinsta ? &WindowStationName : NULL,
OBJ_CASE_INSENSITIVE | OBJ_OPENIF,
hWindowStationsDir,
NULL);
@ -99,7 +116,8 @@ CreateWindowStationW(
dwDesiredAccess,
0, 0, 0, 0, 0);
NtClose(hWindowStationsDir);
if (hWindowStationsDir)
NtClose(hWindowStationsDir);
return hWinSta;
}
@ -349,6 +367,7 @@ OpenWindowStationW(
NTSTATUS Status;
HWINSTA hWinSta;
UNICODE_STRING WindowStationName;
// FIXME: We should cache a per-session directory (see ntuser\winsta.c!UserCreateWinstaDirectory).
UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations");
OBJECT_ATTRIBUTES ObjectAttributes;
HANDLE hWindowStationsDir;