Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 21:05:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Imitate NT and set some of the private object info for desktop/winsta inside win32k, not inside the kernel, so we don't need to know about win32k's private objects

Browse source 
svn path=/trunk/; revision=16275
This commit is contained in:
Alex Ionescu 2005-06-26 04:49:10 +00:00
parent c6af94415d
commit 3251827a3d
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/ntoskrnl/ex/win32k.c
View file

@ -69,7 +69,7 @@ ExpWinStaObjectDelete(PVOID DeletedObject)
PVOID PVOID
STDCALL STDCALL
ExpWinStaObjectFind(PWINSTATION_OBJECT WinStaObject, ExpWinStaObjectFind(PVOID WinStaObject,
PWSTR Name, PWSTR Name,
ULONG Attributes) ULONG Attributes)
{ {
@ -130,7 +130,6 @@ ExpWin32kInit(VOID)
RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer));
RtlInitUnicodeString(&Name, L"WindowStation"); RtlInitUnicodeString(&Name, L"WindowStation");
ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer);
ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(WINSTATION_OBJECT);
ObjectTypeInitializer.GenericMapping = ExpWindowStationMapping; ObjectTypeInitializer.GenericMapping = ExpWindowStationMapping;
ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.PoolType = NonPagedPool;
ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.UseDefaultObject = TRUE;
@ -141,7 +140,6 @@ ExpWin32kInit(VOID)
/* Create desktop object type */ /* Create desktop object type */
RtlInitUnicodeString(&Name, L"Desktop"); RtlInitUnicodeString(&Name, L"Desktop");
ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DESKTOP_OBJECT);
ObjectTypeInitializer.GenericMapping = ExpDesktopMapping; ObjectTypeInitializer.GenericMapping = ExpDesktopMapping;
ObjectTypeInitializer.OpenProcedure = NULL; ObjectTypeInitializer.OpenProcedure = NULL;
ObjectTypeInitializer.DeleteProcedure = ExpDesktopDelete; ObjectTypeInitializer.DeleteProcedure = ExpDesktopDelete;

6
reactos/subsys/system/directory.xml
View file

@ -13,12 +13,6 @@
<directory name="expand"> <directory name="expand">
<xi:include href="expand/expand.xml" /> <xi:include href="expand/expand.xml" />
</directory> </directory>
<directory name="explorer">
<xi:include href="explorer/explorer.xml" />
</directory>
<directory name="ibrowser">
<xi:include href="ibrowser/ibrowser.xml" />
</directory>
<directory name="format"> <directory name="format">
<xi:include href="format/format.xml" /> <xi:include href="format/format.xml" />
</directory> </directory>

4
reactos/subsys/win32k/ntuser/desktop.c
View file

@ -44,6 +44,10 @@ BOOL g_PaintDesktopVersion = FALSE;
NTSTATUS FASTCALL NTSTATUS FASTCALL
InitDesktopImpl(VOID) InitDesktopImpl(VOID)
{ {
/* Set Desktop Object Attributes */
ExDesktopObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(DESKTOP_OBJECT);
/* FIXME: Set Generic Mapping correctly */
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

6
reactos/subsys/win32k/ntuser/winsta.c
View file

@ -70,7 +70,11 @@ InitWindowStationImpl(VOID)
"(Status 0x%X)\n", Status); "(Status 0x%X)\n", Status);
return Status; return Status;
} }
/* Set Winsta Object Attributes */
ExWindowStationObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(WINSTATION_OBJECT);
/* FIXME: Set Generic Mapping correctly */
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }