ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

commiting file desktop.x from bug 252 , the patch is from j_anderw it make our win32k lile more stable

Browse Source 
svn path=/trunk/; revision=21561
This commit is contained in:
Magnus Olsen
2006-04-12 10:15:46 +00:00
parent f80351fa44
commit 53a30e2f31
1 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/subsystems/win32/win32k/ntuser/desktop.c
+35 -2
View File
@@ -790,7 +790,9 @@ NtUserCreateDesktop(
CSR_API_MESSAGE Request;
PVOID DesktopHeapSystemBase = NULL;
SIZE_T DesktopInfoSize;
UNICODE_STRING SafeDesktopName;
DECLARE_RETURN(HDESK);
DPRINT("Enter NtUserCreateDesktop: %wZ\n", lpszDesktopName);
UserEnterExclusive();
@@ -808,15 +810,29 @@ NtUserCreateDesktop(
SetLastNtError(Status);
RETURN( NULL);
}
if(lpszDesktopName != NULL)
{
Status = IntSafeCopyUnicodeString(&SafeDesktopName, lpszDesktopName);
if(!NT_SUCCESS(Status))
{
SetLastNtError(Status);
RETURN( NULL);
}
}
else
{
RtlInitUnicodeString(&SafeDesktopName, NULL);
}
if (! IntGetFullWindowStationName(&DesktopName, &WinStaObject->Name,
lpszDesktopName))
&SafeDesktopName))
{
SetLastNtError(STATUS_INSUFFICIENT_RESOURCES);
ObDereferenceObject(WinStaObject);
RtlFreeUnicodeString(&SafeDesktopName);
RETURN( NULL);
}
RtlFreeUnicodeString(&SafeDesktopName);
ObDereferenceObject(WinStaObject);
/*
@@ -998,6 +1014,7 @@ NtUserOpenDesktop(
HWINSTA WinSta;
PWINSTATION_OBJECT WinStaObject;
UNICODE_STRING DesktopName;
UNICODE_STRING SafeDesktopName;
NTSTATUS Status;
HDESK Desktop;
DECLARE_RETURN(HDESK);
@@ -1024,14 +1041,30 @@ NtUserOpenDesktop(
RETURN( 0);
}
if(lpszDesktopName != NULL)
{
Status = IntSafeCopyUnicodeString(&SafeDesktopName, lpszDesktopName);
if(!NT_SUCCESS(Status))
{
SetLastNtError(Status);
RETURN( NULL);
}
}
else
{
RtlInitUnicodeString(&SafeDesktopName, NULL);
}
if (!IntGetFullWindowStationName(&DesktopName, &WinStaObject->Name,
lpszDesktopName))
{
SetLastNtError(STATUS_INSUFFICIENT_RESOURCES);
ObDereferenceObject(WinStaObject);
RtlFreeUnicodeString(&SafeDesktopName);
RETURN( 0);
}
RtlFreeUnicodeString(&SafeDesktopName);
ObDereferenceObject(WinStaObject);
DPRINT("Trying to open desktop (%wZ)\n", &DesktopName);