Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-07 18:56:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[win32k]

Browse source 
- Store the initial desktop handle and use it evey time a new thread is created.

svn path=/trunk/; revision=51483
This commit is contained in:
Giannis Adamopoulos 2011-04-28 20:33:16 +00:00
parent f80c0cc156
commit 16afe3648f
1 changed files with 60 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
reactos/subsystems/win32/win32k/main/dllmain.c
View file

@ -154,6 +154,13 @@ Win32kProcessCallback(struct _EPROCESS *Process,
LogonProcess = NULL; LogonProcess = NULL;
} }
/* Close the startup desktop */
ASSERT(Win32Process->rpdeskStartup);
ASSERT(Win32Process->hdeskStartup);
ObDereferenceObject(Win32Process->rpdeskStartup);
ZwClose(Win32Process->hdeskStartup);
/* Close the current window station */
UserSetProcessWindowStation(NULL); UserSetProcessWindowStation(NULL);
/* Destroy GDI pools */ /* Destroy GDI pools */
@ -211,6 +218,7 @@ Win32kThreadCallback(struct _ETHREAD *Thread,
HDESK hDesk = NULL; HDESK hDesk = NULL;
NTSTATUS Status; NTSTATUS Status;
PUNICODE_STRING DesktopPath; PUNICODE_STRING DesktopPath;
PDESKTOP pdesk;
PRTL_USER_PROCESS_PARAMETERS ProcessParams = (Process->Peb ? Process->Peb->ProcessParameters : NULL); PRTL_USER_PROCESS_PARAMETERS ProcessParams = (Process->Peb ? Process->Peb->ProcessParameters : NULL);
DPRINT("Creating W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); DPRINT("Creating W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql());
@ -223,37 +231,6 @@ Win32kThreadCallback(struct _ETHREAD *Thread,
InitializeListHead(&Win32Thread->aphkStart[i]); InitializeListHead(&Win32Thread->aphkStart[i]);
} }
/*
* inherit the thread desktop and process window station (if not yet inherited) from the process startup
* info structure. See documentation of CreateProcess()
*/
DesktopPath = (ProcessParams ? ((ProcessParams->DesktopInfo.Length > 0) ? &ProcessParams->DesktopInfo : NULL) : NULL);
Status = IntParseDesktopPath(Process,
DesktopPath,
&hWinSta,
&hDesk);
if(NT_SUCCESS(Status))
{
if(hWinSta != NULL)
{
if(!UserSetProcessWindowStation(hWinSta))
{
DPRINT1("Failed to set process window station\n");
}
}
if (hDesk != NULL)
{
if (!IntSetThreadDesktop(hDesk, FALSE))
{
DPRINT1("Unable to set thread desktop\n");
}
}
}
else
{
DPRINT1("No Desktop handle for this Thread!\n");
}
Win32Thread->TIF_flags &= ~TIF_INCLEANUP; Win32Thread->TIF_flags &= ~TIF_INCLEANUP;
co_IntDestroyCaret(Win32Thread); co_IntDestroyCaret(Win32Thread);
Win32Thread->ppi = PsGetCurrentProcessWin32Process(); Win32Thread->ppi = PsGetCurrentProcessWin32Process();
@ -266,6 +243,58 @@ Win32kThreadCallback(struct _ETHREAD *Thread,
} }
Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread);
Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout();
/* HAAAAAAAACK! This should go to Win32kProcessCallback */
if(Win32Thread->ppi->hdeskStartup == NULL)
{
/*
* inherit the thread desktop and process window station (if not yet inherited) from the process startup
* info structure. See documentation of CreateProcess()
*/
DesktopPath = (ProcessParams ? ((ProcessParams->DesktopInfo.Length > 0) ? &ProcessParams->DesktopInfo : NULL) : NULL);
Status = IntParseDesktopPath(Process,
DesktopPath,
&hWinSta,
&hDesk);
if(NT_SUCCESS(Status))
{
if(hWinSta != NULL)
{
if(!UserSetProcessWindowStation(hWinSta))
{
DPRINT1("Failed to set process window station\n");
}
}
if (hDesk != NULL)
{
/* Validate the new desktop. */
Status = IntValidateDesktopHandle(hDesk,
UserMode,
0,
&pdesk);
if(NT_SUCCESS(Status))
{
Win32Thread->ppi->hdeskStartup = hDesk;
Win32Thread->ppi->rpdeskStartup = pdesk;
}
}
}
else
{
DPRINT1("No Desktop handle for this Thread!\n");
}
}
if (Win32Thread->ppi->hdeskStartup != NULL)
{
if (!IntSetThreadDesktop(Win32Thread->ppi->hdeskStartup, FALSE))
{
DPRINT1("Unable to set thread desktop\n");
}
}
pTeb = NtCurrentTeb(); pTeb = NtCurrentTeb();
if (pTeb) if (pTeb)
{ /* Attempt to startup client support which should have been initialized in IntSetThreadDesktop. */ { /* Attempt to startup client support which should have been initialized in IntSetThreadDesktop. */