Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-26 23:23:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[win32k]

Browse source 
- Store the session id in WINSTATION_OBJECT when we create a window station.
- Don't allow switching to a desktop that belongs to a different session
This is a modified version of the patch from CORE-5531

svn path=/trunk/; revision=58514
This commit is contained in:
Giannis Adamopoulos 2013-03-16 10:12:16 +00:00
parent aa4c4bda1e
commit cbed503fb8
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/win32ss/user/ntuser/desktop.c
View file

@ -1632,6 +1632,12 @@ NtUserSwitchDesktop(HDESK hdesk)
RETURN(FALSE); RETURN(FALSE);
} }
if (PsGetCurrentProcessSessionId() != pdesk->rpwinstaParent->dwSessionId)
{
ERR("NtUserSwitchDesktop called for a desktop of a different session\n");
RETURN(FALSE);
}
if(pdesk == gpdeskInputDesktop) if(pdesk == gpdeskInputDesktop)
{ {
WARN("NtUserSwitchDesktop called for active desktop\n"); WARN("NtUserSwitchDesktop called for active desktop\n");

1
reactos/win32ss/user/ntuser/winsta.c
View file

@ -432,6 +432,7 @@ NtUserCreateWindowStation(
Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable);
WindowStationObject->SystemMenuTemplate = (HANDLE)0; WindowStationObject->SystemMenuTemplate = (HANDLE)0;
WindowStationObject->Name = WindowStationName; WindowStationObject->Name = WindowStationName;
WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId;
if (InputWindowStation == NULL) if (InputWindowStation == NULL)
{ {

2
reactos/win32ss/user/ntuser/winsta.h
View file

@ -9,6 +9,8 @@
typedef struct _WINSTATION_OBJECT typedef struct _WINSTATION_OBJECT
{ {
DWORD dwSessionId;
KSPIN_LOCK Lock; KSPIN_LOCK Lock;
UNICODE_STRING Name; UNICODE_STRING Name;
LIST_ENTRY DesktopListHead; LIST_ENTRY DesktopListHead;