From 685119e0cdd80a46edb256f2fdffc94425a5d68f Mon Sep 17 00:00:00 2001 From: Casper Hornstrup Date: Sat, 7 Jun 2003 12:23:14 +0000 Subject: [PATCH] 2003-06-07 Casper S. Hornstrup Changes for compiling with w32api * include/ddk/obfuncs.h (ObCreateObject): Remove. * include/ntos/zwtypes.h (ObRosCreateObject): Add. * ntoskrnl/ntoskrnl.def, ntoskrnl/ntoskrnl.edf: Export ObCreateObject@36 and ObRosCreateObject@20. * ntoskrnl/cm/ntfunc.c, ntoskrnl/cm/registry.c, ntoskrnl/cm/regobj.c, ntoskrnl/io/create.c, ntoskrnl/io/device.c, ntoskrnl/io/iocomp.c, ntoskrnl/lpc/connect.c, ntoskrnl/lpc/create.c, ntoskrnl/mm/section.c, ntoskrnl/nt/evtpair.c, ntoskrnl/nt/mutant.c, ntoskrnl/nt/ntevent.c, ntoskrnl/nt/ntsem.c, ntoskrnl/nt/nttimer.c, ntoskrnl/nt/profile.c, ntoskrnl/ob/dirobj.c, ntoskrnl/ob/namespc.c, ntoskrnl/ob/symlink.c, ntoskrnl/ps/create.c, ntoskrnl/ps/process.c, ntoskrnl/se/token.c, subsys/win32k/ntuser/winsta.c: Use ObRosCreateObject, not ObCreateObject. * ntoskrnl/ob/object.c (ObRosCreateObject): Rename from ObCreateObject. (ObCreateObject): Add stub. svn path=/trunk/; revision=4867 --- reactos/ChangeLog | 2 +- reactos/ntoskrnl/lpc/connect.c | 9 ++++--- reactos/ntoskrnl/lpc/create.c | 7 ++--- reactos/ntoskrnl/mm/section.c | 11 ++++---- reactos/ntoskrnl/nt/evtpair.c | 7 ++--- reactos/ntoskrnl/nt/mutant.c | 5 ++-- reactos/ntoskrnl/nt/ntevent.c | 5 ++-- reactos/ntoskrnl/nt/ntsem.c | 7 ++--- reactos/ntoskrnl/nt/nttimer.c | 7 ++--- reactos/ntoskrnl/nt/profile.c | 5 ++-- reactos/ntoskrnl/ob/dirobj.c | 7 ++--- reactos/ntoskrnl/ob/namespc.c | 11 ++++---- reactos/ntoskrnl/ob/object.c | 37 +++++++++++++++++++++++---- reactos/ntoskrnl/ob/symlink.c | 7 ++--- reactos/ntoskrnl/ps/create.c | 7 ++--- reactos/ntoskrnl/ps/process.c | 11 ++++---- reactos/ntoskrnl/se/token.c | 17 ++++++------ reactos/subsys/win32k/ntuser/winsta.c | 9 ++++--- 18 files changed, 107 insertions(+), 64 deletions(-) diff --git a/reactos/ChangeLog b/reactos/ChangeLog index 5a579a89db9..0a4b0f30883 100644 --- a/reactos/ChangeLog +++ b/reactos/ChangeLog @@ -3,7 +3,7 @@ Changes for compiling with w32api * include/ddk/obfuncs.h (ObCreateObject): Remove. - * include/ntos/zwtypes.h (ObRosCreateObject): + * include/ntos/zwtypes.h (ObRosCreateObject): Add. * ntoskrnl/ntoskrnl.def, ntoskrnl/ntoskrnl.edf: Export ObCreateObject@36 and ObRosCreateObject@20. * ntoskrnl/cm/ntfunc.c, ntoskrnl/cm/registry.c, ntoskrnl/cm/regobj.c, diff --git a/reactos/ntoskrnl/lpc/connect.c b/reactos/ntoskrnl/lpc/connect.c index 71023d9258b..800a45267a2 100644 --- a/reactos/ntoskrnl/lpc/connect.c +++ b/reactos/ntoskrnl/lpc/connect.c @@ -1,4 +1,4 @@ -/* $Id: connect.c,v 1.15 2003/01/11 15:33:49 hbirr Exp $ +/* $Id: connect.c,v 1.16 2003/06/07 12:23:14 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -11,7 +11,8 @@ /* INCLUDES *****************************************************************/ -#include +#define NTOS_MODE_KERNEL +#include #include #include #include @@ -62,7 +63,7 @@ EiConnectPort(IN PEPORT* ConnectedPort, /* * Create a port to represent our side of the connection */ - Status = ObCreateObject (NULL, + Status = ObRosCreateObject (NULL, PORT_ALL_ACCESS, NULL, ExPortType, @@ -547,7 +548,7 @@ NtAcceptConnectPort (PHANDLE ServerPortHandle, */ if (AcceptIt) { - Status = ObCreateObject(ServerPortHandle, + Status = ObRosCreateObject(ServerPortHandle, PORT_ALL_ACCESS, NULL, ExPortType, diff --git a/reactos/ntoskrnl/lpc/create.c b/reactos/ntoskrnl/lpc/create.c index 081587fc61c..1b7e97f1356 100644 --- a/reactos/ntoskrnl/lpc/create.c +++ b/reactos/ntoskrnl/lpc/create.c @@ -1,4 +1,4 @@ -/* $Id: create.c,v 1.9 2002/09/08 10:23:32 chorns Exp $ +/* $Id: create.c,v 1.10 2003/06/07 12:23:14 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -11,7 +11,8 @@ /* INCLUDES *****************************************************************/ -#include +#define NTOS_MODE_KERNEL +#include #include #include @@ -113,7 +114,7 @@ NtCreatePort (PHANDLE PortHandle, return (Status); } /* Ask Ob to create the object */ - Status = ObCreateObject (PortHandle, + Status = ObRosCreateObject (PortHandle, PORT_ALL_ACCESS, ObjectAttributes, ExPortType, diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c index b92fec9a937..84bc972da17 100644 --- a/reactos/ntoskrnl/mm/section.c +++ b/reactos/ntoskrnl/mm/section.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: section.c,v 1.115 2003/06/07 11:34:36 chorns Exp $ +/* $Id: section.c,v 1.116 2003/06/07 12:23:14 chorns Exp $ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/section.c @@ -29,7 +29,8 @@ /* INCLUDES *****************************************************************/ #include -#include +#define NTOS_MODE_KERNEL +#include #include #include #include @@ -2090,7 +2091,7 @@ MmCreatePageFileSection(PHANDLE SectionHandle, /* * Create the section */ - Status = ObCreateObject(SectionHandle, + Status = ObRosCreateObject(SectionHandle, DesiredAccess, ObjectAttributes, MmSectionObjectType, @@ -2186,7 +2187,7 @@ MmCreateDataFileSection(PHANDLE SectionHandle, /* * Create the section */ - Status = ObCreateObject(SectionHandle, + Status = ObRosCreateObject(SectionHandle, DesiredAccess, ObjectAttributes, MmSectionObjectType, @@ -2555,7 +2556,7 @@ MmCreateImageSection(PHANDLE SectionHandle, /* * Create the section */ - Status = ObCreateObject(SectionHandle, + Status = ObRosCreateObject(SectionHandle, DesiredAccess, ObjectAttributes, MmSectionObjectType, diff --git a/reactos/ntoskrnl/nt/evtpair.c b/reactos/ntoskrnl/nt/evtpair.c index 9537613b737..1e4c714357c 100644 --- a/reactos/ntoskrnl/nt/evtpair.c +++ b/reactos/ntoskrnl/nt/evtpair.c @@ -1,4 +1,4 @@ -/* $Id: evtpair.c,v 1.13 2002/09/08 10:23:38 chorns Exp $ +/* $Id: evtpair.c,v 1.14 2003/06/07 12:23:14 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -11,7 +11,8 @@ /* INCLUDES *****************************************************************/ -#include +#define NTOS_MODE_KERNEL +#include #include #include @@ -83,7 +84,7 @@ NtCreateEventPair(OUT PHANDLE EventPairHandle, NTSTATUS Status; DPRINT("NtCreateEventPair()\n"); - Status = ObCreateObject(EventPairHandle, + Status = ObRosCreateObject(EventPairHandle, DesiredAccess, ObjectAttributes, ExEventPairObjectType, diff --git a/reactos/ntoskrnl/nt/mutant.c b/reactos/ntoskrnl/nt/mutant.c index 2f1f627b77e..47589c84027 100644 --- a/reactos/ntoskrnl/nt/mutant.c +++ b/reactos/ntoskrnl/nt/mutant.c @@ -29,7 +29,8 @@ /* INCLUDES *****************************************************************/ #include -#include +#define NTOS_MODE_KERNEL +#include #include #define NDEBUG @@ -113,7 +114,7 @@ NtCreateMutant(OUT PHANDLE MutantHandle, PKMUTEX Mutant; NTSTATUS Status; - Status = ObCreateObject(MutantHandle, + Status = ObRosCreateObject(MutantHandle, DesiredAccess, ObjectAttributes, ExMutantObjectType, diff --git a/reactos/ntoskrnl/nt/ntevent.c b/reactos/ntoskrnl/nt/ntevent.c index 496bc621740..b0944ef0528 100644 --- a/reactos/ntoskrnl/nt/ntevent.c +++ b/reactos/ntoskrnl/nt/ntevent.c @@ -28,7 +28,8 @@ /* INCLUDES *****************************************************************/ #include -#include +#define NTOS_MODE_KERNEL +#include #include #include #include @@ -146,7 +147,7 @@ NtCreateEvent(OUT PHANDLE UnsafeEventHandle, ObjectAttributes = NULL; } - Status = ObCreateObject(&EventHandle, + Status = ObRosCreateObject(&EventHandle, DesiredAccess, ObjectAttributes, ExEventObjectType, diff --git a/reactos/ntoskrnl/nt/ntsem.c b/reactos/ntoskrnl/nt/ntsem.c index 42610055c66..5e4797ed0ca 100644 --- a/reactos/ntoskrnl/nt/ntsem.c +++ b/reactos/ntoskrnl/nt/ntsem.c @@ -1,4 +1,4 @@ -/* $Id: ntsem.c,v 1.17 2002/09/08 10:23:38 chorns Exp $ +/* $Id: ntsem.c,v 1.18 2003/06/07 12:23:14 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -12,7 +12,8 @@ /* INCLUDES *****************************************************************/ #include -#include +#define NTOS_MODE_KERNEL +#include #include #include #include @@ -85,7 +86,7 @@ NtCreateSemaphore(OUT PHANDLE SemaphoreHandle, PKSEMAPHORE Semaphore; NTSTATUS Status; - Status = ObCreateObject(SemaphoreHandle, + Status = ObRosCreateObject(SemaphoreHandle, DesiredAccess, ObjectAttributes, ExSemaphoreType, diff --git a/reactos/ntoskrnl/nt/nttimer.c b/reactos/ntoskrnl/nt/nttimer.c index d9ffa5ba405..9f72c5efd1f 100644 --- a/reactos/ntoskrnl/nt/nttimer.c +++ b/reactos/ntoskrnl/nt/nttimer.c @@ -1,4 +1,4 @@ -/* $Id: nttimer.c,v 1.18 2003/06/05 23:36:48 gdalsnes Exp $ +/* $Id: nttimer.c,v 1.19 2003/06/07 12:23:14 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -11,7 +11,8 @@ /* INCLUDES *****************************************************************/ -#include +#define NTOS_MODE_KERNEL +#include #include #include #include @@ -191,7 +192,7 @@ NtCreateTimer(OUT PHANDLE TimerHandle, NTSTATUS Status; DPRINT("NtCreateTimer()\n"); - Status = ObCreateObject(TimerHandle, + Status = ObRosCreateObject(TimerHandle, DesiredAccess, ObjectAttributes, ExTimerType, diff --git a/reactos/ntoskrnl/nt/profile.c b/reactos/ntoskrnl/nt/profile.c index 12ff5548fa9..d7b4a756b42 100644 --- a/reactos/ntoskrnl/nt/profile.c +++ b/reactos/ntoskrnl/nt/profile.c @@ -27,7 +27,8 @@ /* INCLUDES *****************************************************************/ -#include +#define NTOS_MODE_KERNEL +#include #include #include #include @@ -457,7 +458,7 @@ NtCreateProfile(OUT PHANDLE UnsafeProfileHandle, /* * Create the object */ - Status = ObCreateObject(&ProfileHandle, + Status = ObRosCreateObject(&ProfileHandle, STANDARD_RIGHTS_ALL, NULL, ExProfileObjectType, diff --git a/reactos/ntoskrnl/ob/dirobj.c b/reactos/ntoskrnl/ob/dirobj.c index f70cd8b057e..1a897bb617a 100644 --- a/reactos/ntoskrnl/ob/dirobj.c +++ b/reactos/ntoskrnl/ob/dirobj.c @@ -1,4 +1,4 @@ -/* $Id: dirobj.c,v 1.17 2003/06/02 10:03:52 ekohl Exp $ +/* $Id: dirobj.c,v 1.18 2003/06/07 12:23:14 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -11,7 +11,8 @@ /* INCLUDES ***************************************************************/ -#include +#define NTOS_MODE_KERNEL +#include #include #include @@ -339,7 +340,7 @@ NtCreateDirectoryObject (OUT PHANDLE DirectoryHandle, DirectoryHandle, DesiredAccess, ObjectAttributes, ObjectAttributes->ObjectName); - return(ObCreateObject(DirectoryHandle, + return(ObRosCreateObject(DirectoryHandle, DesiredAccess, ObjectAttributes, ObDirectoryType, diff --git a/reactos/ntoskrnl/ob/namespc.c b/reactos/ntoskrnl/ob/namespc.c index 803f9423a82..dc0f69cc13e 100644 --- a/reactos/ntoskrnl/ob/namespc.c +++ b/reactos/ntoskrnl/ob/namespc.c @@ -1,4 +1,4 @@ -/* $Id: namespc.c,v 1.37 2003/05/12 13:59:09 ekohl Exp $ +/* $Id: namespc.c,v 1.38 2003/06/07 12:23:14 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -12,7 +12,8 @@ /* INCLUDES ***************************************************************/ #include -#include +#define NTOS_MODE_KERNEL +#include #include #include #include @@ -393,7 +394,7 @@ ObInit(VOID) L"ObjectType"); /* create root directory */ - ObCreateObject(NULL, + ObRosCreateObject(NULL, STANDARD_RIGHTS_REQUIRED, NULL, ObDirectoryType, @@ -407,7 +408,7 @@ ObInit(VOID) OBJ_PERMANENT, NULL, NULL); - ObCreateObject(NULL, + ObRosCreateObject(NULL, STANDARD_RIGHTS_REQUIRED, &ObjectAttributes, ObDirectoryType, @@ -441,7 +442,7 @@ ObpCreateTypeObject(POBJECT_TYPE ObjectType) OBJ_PERMANENT, NULL, NULL); - Status = ObCreateObject(NULL, + Status = ObRosCreateObject(NULL, STANDARD_RIGHTS_REQUIRED, &ObjectAttributes, ObTypeObjectType, diff --git a/reactos/ntoskrnl/ob/object.c b/reactos/ntoskrnl/ob/object.c index 33634bce082..767556f1066 100644 --- a/reactos/ntoskrnl/ob/object.c +++ b/reactos/ntoskrnl/ob/object.c @@ -1,4 +1,4 @@ -/* $Id: object.c,v 1.62 2003/06/02 16:49:33 ekohl Exp $ +/* $Id: object.c,v 1.63 2003/06/07 12:23:14 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -11,7 +11,8 @@ /* INCLUDES *****************************************************************/ -#include +#define NTOS_MODE_KERNEL +#include #include #include #include @@ -337,16 +338,18 @@ ObQueryNameString (IN PVOID Object, /********************************************************************** * NAME EXPORTED - * ObCreateObject@36 + * ObRosCreateObject@20 * * DESCRIPTION * * ARGUMENTS * + * NOTE + * Internal ReactOS function * RETURN VALUE */ NTSTATUS STDCALL -ObCreateObject (OUT PHANDLE Handle, +ObRosCreateObject (OUT PHANDLE Handle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, IN POBJECT_TYPE Type, @@ -362,7 +365,7 @@ ObCreateObject (OUT PHANDLE Handle, assert_irql(APC_LEVEL); - DPRINT("ObCreateObject(Handle %x, ObjectAttributes %x, Type %x)\n", + DPRINT("ObRosCreateObject(Handle %x, ObjectAttributes %x, Type %x)\n", Handle, ObjectAttributes, Type); if (ObjectAttributes != NULL && @@ -459,6 +462,30 @@ ObCreateObject (OUT PHANDLE Handle, return(STATUS_SUCCESS); } +/********************************************************************** + * NAME EXPORTED + * ObCreateObject@36 + * + * DESCRIPTION + * + * ARGUMENTS + * + * RETURN VALUE + */ +NTSTATUS STDCALL +ObCreateObject (IN KPROCESSOR_MODE ObjectAttributesAccessMode OPTIONAL, + IN POBJECT_TYPE ObjectType, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN KPROCESSOR_MODE AccessMode, + IN OUT PVOID ParseContext OPTIONAL, + IN ULONG ObjectSize, + IN ULONG PagedPoolCharge OPTIONAL, + IN ULONG NonPagedPoolCharge OPTIONAL, + OUT PVOID *Object) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} NTSTATUS STDCALL ObReferenceObjectByPointer(IN PVOID Object, diff --git a/reactos/ntoskrnl/ob/symlink.c b/reactos/ntoskrnl/ob/symlink.c index efba99b4883..8ca18e74a3a 100644 --- a/reactos/ntoskrnl/ob/symlink.c +++ b/reactos/ntoskrnl/ob/symlink.c @@ -1,4 +1,4 @@ -/* $Id: symlink.c,v 1.1 2003/02/25 16:49:08 ekohl Exp $ +/* $Id: symlink.c,v 1.2 2003/06/07 12:23:14 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -12,7 +12,8 @@ /* INCLUDES *****************************************************************/ #include -#include +#define NTOS_MODE_KERNEL +#include #include #define NDEBUG @@ -227,7 +228,7 @@ NtCreateSymbolicLinkObject(OUT PHANDLE SymbolicLinkHandle, ObjectAttributes, DeviceName); - Status = ObCreateObject(SymbolicLinkHandle, + Status = ObRosCreateObject(SymbolicLinkHandle, DesiredAccess, ObjectAttributes, ObSymbolicLinkType, diff --git a/reactos/ntoskrnl/ps/create.c b/reactos/ntoskrnl/ps/create.c index 629f054aeaf..d3d7cf38a8d 100644 --- a/reactos/ntoskrnl/ps/create.c +++ b/reactos/ntoskrnl/ps/create.c @@ -1,4 +1,4 @@ -/* $Id: create.c,v 1.60 2003/06/05 23:36:35 gdalsnes Exp $ +/* $Id: create.c,v 1.61 2003/06/07 12:23:14 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -20,7 +20,8 @@ /* INCLUDES ****************************************************************/ -#include +#define NTOS_MODE_KERNEL +#include #include #include #include @@ -356,7 +357,7 @@ PsInitializeThread(HANDLE ProcessHandle, /* * Create and initialize thread */ - Status = ObCreateObject(ThreadHandle, + Status = ObRosCreateObject(ThreadHandle, DesiredAccess, ThreadAttributes, PsThreadType, diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c index 2f60f61053d..a9c259d1a3f 100644 --- a/reactos/ntoskrnl/ps/process.c +++ b/reactos/ntoskrnl/ps/process.c @@ -1,4 +1,4 @@ -/* $Id: process.c,v 1.106 2003/06/05 22:45:22 gdalsnes Exp $ +/* $Id: process.c,v 1.107 2003/06/07 12:23:14 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -12,7 +12,8 @@ /* INCLUDES ******************************************************************/ #include -#include +#define NTOS_MODE_KERNEL +#include #include #include #include @@ -233,7 +234,7 @@ PsInitProcessManagment(VOID) /* * Initialize the system process */ - Status = ObCreateObject(NULL, + Status = ObRosCreateObject(NULL, PROCESS_ALL_ACCESS, NULL, PsProcessType, @@ -500,7 +501,7 @@ NtCreateProcess(OUT PHANDLE ProcessHandle, return(Status); } - Status = ObCreateObject(ProcessHandle, + Status = ObRosCreateObject(ProcessHandle, DesiredAccess, ObjectAttributes, PsProcessType, @@ -508,7 +509,7 @@ NtCreateProcess(OUT PHANDLE ProcessHandle, if (!NT_SUCCESS(Status)) { ObDereferenceObject(ParentProcess); - DPRINT("ObCreateObject() = %x\n",Status); + DPRINT("ObRosCreateObject() = %x\n",Status); return(Status); } diff --git a/reactos/ntoskrnl/se/token.c b/reactos/ntoskrnl/se/token.c index 96e92ec5e6e..fc072b7b02b 100644 --- a/reactos/ntoskrnl/se/token.c +++ b/reactos/ntoskrnl/se/token.c @@ -1,4 +1,4 @@ -/* $Id: token.c,v 1.23 2003/05/31 11:10:30 ekohl Exp $ +/* $Id: token.c,v 1.24 2003/06/07 12:23:14 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -12,7 +12,8 @@ /* INCLUDES *****************************************************************/ #include -#include +#define NTOS_MODE_KERNEL +#include #include #include #include @@ -144,14 +145,14 @@ SepDuplicateToken(PACCESS_TOKEN Token, PACCESS_TOKEN AccessToken; - Status = ObCreateObject(0, + Status = ObRosCreateObject(0, TOKEN_ALL_ACCESS, ObjectAttributes, SepTokenObjectType, (PVOID*)&AccessToken); if (!NT_SUCCESS(Status)) { - DPRINT1("ObCreateObject() failed (Status %lx)\n"); + DPRINT1("ObRosCreateObject() failed (Status %lx)\n"); return(Status); } @@ -970,7 +971,7 @@ SepCreateSystemProcessToken(struct _EPROCESS* Process) /* * Initialize the token */ - Status = ObCreateObject(NULL, + Status = ObRosCreateObject(NULL, TOKEN_ALL_ACCESS, NULL, SepTokenObjectType, @@ -1186,14 +1187,14 @@ NtCreateToken(OUT PHANDLE UnsafeTokenHandle, if (!NT_SUCCESS(Status)) return(Status); - Status = ObCreateObject(&TokenHandle, + Status = ObRosCreateObject(&TokenHandle, DesiredAccess, ObjectAttributes, SepTokenObjectType, (PVOID*)&AccessToken); if (!NT_SUCCESS(Status)) { - DPRINT1("ObCreateObject() failed (Status %lx)\n"); + DPRINT1("ObRosCreateObject() failed (Status %lx)\n"); return(Status); } @@ -1218,7 +1219,7 @@ NtCreateToken(OUT PHANDLE UnsafeTokenHandle, /* * Normally we would just point these members into the variable information - * area; however, our ObCreateObject() call can't allocate a variable information + * area; however, our ObRosCreateObject() call can't allocate a variable information * area, so we allocate them seperately and provide a destroy function. */ diff --git a/reactos/subsys/win32k/ntuser/winsta.c b/reactos/subsys/win32k/ntuser/winsta.c index e70342f60a6..4ad2afc97e4 100644 --- a/reactos/subsys/win32k/ntuser/winsta.c +++ b/reactos/subsys/win32k/ntuser/winsta.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: winsta.c,v 1.13 2003/05/18 17:16:17 ea Exp $ +/* $Id: winsta.c,v 1.14 2003/06/07 12:23:14 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -35,7 +35,8 @@ /* INCLUDES ******************************************************************/ -#include +#define NTOS_MODE_KERNEL +#include #include #include #include @@ -276,7 +277,7 @@ NtUserCreateWindowStation(PUNICODE_STRING lpszWindowStationName, DPRINT("Creating window station (%wZ)\n", &WindowStationName); - Status = ObCreateObject(&WinSta, + Status = ObRosCreateObject(&WinSta, STANDARD_RIGHTS_REQUIRED, &ObjectAttributes, ExWindowStationObjectType, @@ -593,7 +594,7 @@ NtUserCreateDesktop(PUNICODE_STRING lpszDesktopName, DPRINT("Status for open operation (0x%X)\n", Status); - Status = ObCreateObject(&Desktop, + Status = ObRosCreateObject(&Desktop, STANDARD_RIGHTS_REQUIRED, &ObjectAttributes, ExDesktopObjectType,