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

2003-06-07 Casper S. Hornstrup <chorns@users.sourceforge.net>

Browse source 
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
This commit is contained in:
Casper Hornstrup 2003-06-07 12:23:14 +00:00
parent 1e6c809d07
commit 685119e0cd
18 changed files with 107 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/ChangeLog
View file

@ -3,7 +3,7 @@
Changes for compiling with w32api Changes for compiling with w32api
* include/ddk/obfuncs.h (ObCreateObject): Remove. * 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 * ntoskrnl/ntoskrnl.def, ntoskrnl/ntoskrnl.edf: Export ObCreateObject@36
and ObRosCreateObject@20. and ObRosCreateObject@20.
* ntoskrnl/cm/ntfunc.c, ntoskrnl/cm/registry.c, ntoskrnl/cm/regobj.c, * ntoskrnl/cm/ntfunc.c, ntoskrnl/cm/registry.c, ntoskrnl/cm/regobj.c,

9
reactos/ntoskrnl/lpc/connect.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -11,7 +11,8 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <internal/ob.h> #include <internal/ob.h>
#include <internal/port.h> #include <internal/port.h>
#include <internal/dbg.h> #include <internal/dbg.h>
@ -62,7 +63,7 @@ EiConnectPort(IN PEPORT* ConnectedPort,
/* /*
* Create a port to represent our side of the connection * Create a port to represent our side of the connection
*/ */
Status = ObCreateObject (NULL, Status = ObRosCreateObject (NULL,
PORT_ALL_ACCESS, PORT_ALL_ACCESS,
NULL, NULL,
ExPortType, ExPortType,
@ -547,7 +548,7 @@ NtAcceptConnectPort (PHANDLE ServerPortHandle,
*/ */
if (AcceptIt) if (AcceptIt)
{ {
Status = ObCreateObject(ServerPortHandle, Status = ObRosCreateObject(ServerPortHandle,
PORT_ALL_ACCESS, PORT_ALL_ACCESS,
NULL, NULL,
ExPortType, ExPortType,

7
reactos/ntoskrnl/lpc/create.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -11,7 +11,8 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <internal/port.h> #include <internal/port.h>
#include <internal/dbg.h> #include <internal/dbg.h>
@ -113,7 +114,7 @@ NtCreatePort (PHANDLE PortHandle,
return (Status); return (Status);
} }
/* Ask Ob to create the object */ /* Ask Ob to create the object */
Status = ObCreateObject (PortHandle, Status = ObRosCreateObject (PortHandle,
PORT_ALL_ACCESS, PORT_ALL_ACCESS,
ObjectAttributes, ObjectAttributes,
ExPortType, ExPortType,

11
reactos/ntoskrnl/mm/section.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * PROJECT: ReactOS kernel
* FILE: ntoskrnl/mm/section.c * FILE: ntoskrnl/mm/section.c
@ -29,7 +29,8 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <limits.h> #include <limits.h>
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <internal/mm.h> #include <internal/mm.h>
#include <internal/io.h> #include <internal/io.h>
#include <internal/ps.h> #include <internal/ps.h>
@ -2090,7 +2091,7 @@ MmCreatePageFileSection(PHANDLE SectionHandle,
/* /*
* Create the section * Create the section
*/ */
Status = ObCreateObject(SectionHandle, Status = ObRosCreateObject(SectionHandle,
DesiredAccess, DesiredAccess,
ObjectAttributes, ObjectAttributes,
MmSectionObjectType, MmSectionObjectType,
@ -2186,7 +2187,7 @@ MmCreateDataFileSection(PHANDLE SectionHandle,
/* /*
* Create the section * Create the section
*/ */
Status = ObCreateObject(SectionHandle, Status = ObRosCreateObject(SectionHandle,
DesiredAccess, DesiredAccess,
ObjectAttributes, ObjectAttributes,
MmSectionObjectType, MmSectionObjectType,
@ -2555,7 +2556,7 @@ MmCreateImageSection(PHANDLE SectionHandle,
/* /*
* Create the section * Create the section
*/ */
Status = ObCreateObject(SectionHandle, Status = ObRosCreateObject(SectionHandle,
DesiredAccess, DesiredAccess,
ObjectAttributes, ObjectAttributes,
MmSectionObjectType, MmSectionObjectType,

7
reactos/ntoskrnl/nt/evtpair.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -11,7 +11,8 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <ntos/synch.h> #include <ntos/synch.h>
#include <limits.h> #include <limits.h>
@ -83,7 +84,7 @@ NtCreateEventPair(OUT PHANDLE EventPairHandle,
NTSTATUS Status; NTSTATUS Status;
DPRINT("NtCreateEventPair()\n"); DPRINT("NtCreateEventPair()\n");
Status = ObCreateObject(EventPairHandle, Status = ObRosCreateObject(EventPairHandle,
DesiredAccess, DesiredAccess,
ObjectAttributes, ObjectAttributes,
ExEventPairObjectType, ExEventPairObjectType,

5
reactos/ntoskrnl/nt/mutant.c
View file

@ -29,7 +29,8 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <limits.h> #include <limits.h>
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <ntos/synch.h> #include <ntos/synch.h>
#define NDEBUG #define NDEBUG
@ -113,7 +114,7 @@ NtCreateMutant(OUT PHANDLE MutantHandle,
PKMUTEX Mutant; PKMUTEX Mutant;
NTSTATUS Status; NTSTATUS Status;
Status = ObCreateObject(MutantHandle, Status = ObRosCreateObject(MutantHandle,
DesiredAccess, DesiredAccess,
ObjectAttributes, ObjectAttributes,
ExMutantObjectType, ExMutantObjectType,

5
reactos/ntoskrnl/nt/ntevent.c
View file

@ -28,7 +28,8 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <limits.h> #include <limits.h>
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <internal/id.h> #include <internal/id.h>
#include <ntos/synch.h> #include <ntos/synch.h>
#include <internal/pool.h> #include <internal/pool.h>
@ -146,7 +147,7 @@ NtCreateEvent(OUT PHANDLE UnsafeEventHandle,
ObjectAttributes = NULL; ObjectAttributes = NULL;
} }
Status = ObCreateObject(&EventHandle, Status = ObRosCreateObject(&EventHandle,
DesiredAccess, DesiredAccess,
ObjectAttributes, ObjectAttributes,
ExEventObjectType, ExEventObjectType,

7
reactos/ntoskrnl/nt/ntsem.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -12,7 +12,8 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <limits.h> #include <limits.h>
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <ntos/synch.h> #include <ntos/synch.h>
#include <internal/pool.h> #include <internal/pool.h>
#include <internal/ps.h> #include <internal/ps.h>
@ -85,7 +86,7 @@ NtCreateSemaphore(OUT PHANDLE SemaphoreHandle,
PKSEMAPHORE Semaphore; PKSEMAPHORE Semaphore;
NTSTATUS Status; NTSTATUS Status;
Status = ObCreateObject(SemaphoreHandle, Status = ObRosCreateObject(SemaphoreHandle,
DesiredAccess, DesiredAccess,
ObjectAttributes, ObjectAttributes,
ExSemaphoreType, ExSemaphoreType,

7
reactos/ntoskrnl/nt/nttimer.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -11,7 +11,8 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <ntos/synch.h> #include <ntos/synch.h>
#include <internal/ke.h> #include <internal/ke.h>
#include <limits.h> #include <limits.h>
@ -191,7 +192,7 @@ NtCreateTimer(OUT PHANDLE TimerHandle,
NTSTATUS Status; NTSTATUS Status;
DPRINT("NtCreateTimer()\n"); DPRINT("NtCreateTimer()\n");
Status = ObCreateObject(TimerHandle, Status = ObRosCreateObject(TimerHandle,
DesiredAccess, DesiredAccess,
ObjectAttributes, ObjectAttributes,
ExTimerType, ExTimerType,

5
reactos/ntoskrnl/nt/profile.c
View file

@ -27,7 +27,8 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <internal/mm.h> #include <internal/mm.h>
#include <internal/ps.h> #include <internal/ps.h>
#include <internal/pool.h> #include <internal/pool.h>
@ -457,7 +458,7 @@ NtCreateProfile(OUT PHANDLE UnsafeProfileHandle,
/* /*
* Create the object * Create the object
*/ */
Status = ObCreateObject(&ProfileHandle, Status = ObRosCreateObject(&ProfileHandle,
STANDARD_RIGHTS_ALL, STANDARD_RIGHTS_ALL,
NULL, NULL,
ExProfileObjectType, ExProfileObjectType,

7
reactos/ntoskrnl/ob/dirobj.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -11,7 +11,8 @@
/* INCLUDES ***************************************************************/ /* INCLUDES ***************************************************************/
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <internal/ob.h> #include <internal/ob.h>
#include <internal/io.h> #include <internal/io.h>
@ -339,7 +340,7 @@ NtCreateDirectoryObject (OUT PHANDLE DirectoryHandle,
DirectoryHandle, DesiredAccess, ObjectAttributes, DirectoryHandle, DesiredAccess, ObjectAttributes,
ObjectAttributes->ObjectName); ObjectAttributes->ObjectName);
return(ObCreateObject(DirectoryHandle, return(ObRosCreateObject(DirectoryHandle,
DesiredAccess, DesiredAccess,
ObjectAttributes, ObjectAttributes,
ObDirectoryType, ObDirectoryType,

11
reactos/ntoskrnl/ob/namespc.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -12,7 +12,8 @@
/* INCLUDES ***************************************************************/ /* INCLUDES ***************************************************************/
#include <limits.h> #include <limits.h>
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <internal/ob.h> #include <internal/ob.h>
#include <internal/io.h> #include <internal/io.h>
#include <internal/pool.h> #include <internal/pool.h>
@ -393,7 +394,7 @@ ObInit(VOID)
L"ObjectType"); L"ObjectType");
/* create root directory */ /* create root directory */
ObCreateObject(NULL, ObRosCreateObject(NULL,
STANDARD_RIGHTS_REQUIRED, STANDARD_RIGHTS_REQUIRED,
NULL, NULL,
ObDirectoryType, ObDirectoryType,
@ -407,7 +408,7 @@ ObInit(VOID)
OBJ_PERMANENT, OBJ_PERMANENT,
NULL, NULL,
NULL); NULL);
ObCreateObject(NULL, ObRosCreateObject(NULL,
STANDARD_RIGHTS_REQUIRED, STANDARD_RIGHTS_REQUIRED,
&ObjectAttributes, &ObjectAttributes,
ObDirectoryType, ObDirectoryType,
@ -441,7 +442,7 @@ ObpCreateTypeObject(POBJECT_TYPE ObjectType)
OBJ_PERMANENT, OBJ_PERMANENT,
NULL, NULL,
NULL); NULL);
Status = ObCreateObject(NULL, Status = ObRosCreateObject(NULL,
STANDARD_RIGHTS_REQUIRED, STANDARD_RIGHTS_REQUIRED,
&ObjectAttributes, &ObjectAttributes,
ObTypeObjectType, ObTypeObjectType,

37
reactos/ntoskrnl/ob/object.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -11,7 +11,8 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <roscfg.h> #include <roscfg.h>
#include <internal/ob.h> #include <internal/ob.h>
#include <internal/ps.h> #include <internal/ps.h>
@ -337,16 +338,18 @@ ObQueryNameString (IN PVOID Object,
/********************************************************************** /**********************************************************************
* NAME EXPORTED * NAME EXPORTED
* ObCreateObject@36 * ObRosCreateObject@20
* *
* DESCRIPTION * DESCRIPTION
* *
* ARGUMENTS * ARGUMENTS
* *
* NOTE
* Internal ReactOS function
* RETURN VALUE * RETURN VALUE
*/ */
NTSTATUS STDCALL NTSTATUS STDCALL
ObCreateObject (OUT PHANDLE Handle, ObRosCreateObject (OUT PHANDLE Handle,
IN ACCESS_MASK DesiredAccess, IN ACCESS_MASK DesiredAccess,
IN POBJECT_ATTRIBUTES ObjectAttributes, IN POBJECT_ATTRIBUTES ObjectAttributes,
IN POBJECT_TYPE Type, IN POBJECT_TYPE Type,
@ -362,7 +365,7 @@ ObCreateObject (OUT PHANDLE Handle,
assert_irql(APC_LEVEL); 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); Handle, ObjectAttributes, Type);
if (ObjectAttributes != NULL && if (ObjectAttributes != NULL &&
@ -459,6 +462,30 @@ ObCreateObject (OUT PHANDLE Handle,
return(STATUS_SUCCESS); 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 NTSTATUS STDCALL
ObReferenceObjectByPointer(IN PVOID Object, ObReferenceObjectByPointer(IN PVOID Object,

7
reactos/ntoskrnl/ob/symlink.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -12,7 +12,8 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <limits.h> #include <limits.h>
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <internal/ob.h> #include <internal/ob.h>
#define NDEBUG #define NDEBUG
@ -227,7 +228,7 @@ NtCreateSymbolicLinkObject(OUT PHANDLE SymbolicLinkHandle,
ObjectAttributes, ObjectAttributes,
DeviceName); DeviceName);
Status = ObCreateObject(SymbolicLinkHandle, Status = ObRosCreateObject(SymbolicLinkHandle,
DesiredAccess, DesiredAccess,
ObjectAttributes, ObjectAttributes,
ObSymbolicLinkType, ObSymbolicLinkType,

7
reactos/ntoskrnl/ps/create.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -20,7 +20,8 @@
/* INCLUDES ****************************************************************/ /* INCLUDES ****************************************************************/
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <internal/ke.h> #include <internal/ke.h>
#include <internal/ob.h> #include <internal/ob.h>
#include <internal/ps.h> #include <internal/ps.h>
@ -356,7 +357,7 @@ PsInitializeThread(HANDLE ProcessHandle,
/* /*
* Create and initialize thread * Create and initialize thread
*/ */
Status = ObCreateObject(ThreadHandle, Status = ObRosCreateObject(ThreadHandle,
DesiredAccess, DesiredAccess,
ThreadAttributes, ThreadAttributes,
PsThreadType, PsThreadType,

11
reactos/ntoskrnl/ps/process.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -12,7 +12,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <limits.h> #include <limits.h>
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <internal/ob.h> #include <internal/ob.h>
#include <internal/mm.h> #include <internal/mm.h>
#include <internal/ke.h> #include <internal/ke.h>
@ -233,7 +234,7 @@ PsInitProcessManagment(VOID)
/* /*
* Initialize the system process * Initialize the system process
*/ */
Status = ObCreateObject(NULL, Status = ObRosCreateObject(NULL,
PROCESS_ALL_ACCESS, PROCESS_ALL_ACCESS,
NULL, NULL,
PsProcessType, PsProcessType,
@ -500,7 +501,7 @@ NtCreateProcess(OUT PHANDLE ProcessHandle,
return(Status); return(Status);
} }
Status = ObCreateObject(ProcessHandle, Status = ObRosCreateObject(ProcessHandle,
DesiredAccess, DesiredAccess,
ObjectAttributes, ObjectAttributes,
PsProcessType, PsProcessType,
@ -508,7 +509,7 @@ NtCreateProcess(OUT PHANDLE ProcessHandle,
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
ObDereferenceObject(ParentProcess); ObDereferenceObject(ParentProcess);
DPRINT("ObCreateObject() = %x\n",Status); DPRINT("ObRosCreateObject() = %x\n",Status);
return(Status); return(Status);
} }

17
reactos/ntoskrnl/se/token.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -12,7 +12,8 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <limits.h> #include <limits.h>
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <internal/ps.h> #include <internal/ps.h>
#include <internal/se.h> #include <internal/se.h>
#include <internal/safe.h> #include <internal/safe.h>
@ -144,14 +145,14 @@ SepDuplicateToken(PACCESS_TOKEN Token,
PACCESS_TOKEN AccessToken; PACCESS_TOKEN AccessToken;
Status = ObCreateObject(0, Status = ObRosCreateObject(0,
TOKEN_ALL_ACCESS, TOKEN_ALL_ACCESS,
ObjectAttributes, ObjectAttributes,
SepTokenObjectType, SepTokenObjectType,
(PVOID*)&AccessToken); (PVOID*)&AccessToken);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("ObCreateObject() failed (Status %lx)\n"); DPRINT1("ObRosCreateObject() failed (Status %lx)\n");
return(Status); return(Status);
} }
@ -970,7 +971,7 @@ SepCreateSystemProcessToken(struct _EPROCESS* Process)
/* /*
* Initialize the token * Initialize the token
*/ */
Status = ObCreateObject(NULL, Status = ObRosCreateObject(NULL,
TOKEN_ALL_ACCESS, TOKEN_ALL_ACCESS,
NULL, NULL,
SepTokenObjectType, SepTokenObjectType,
@ -1186,14 +1187,14 @@ NtCreateToken(OUT PHANDLE UnsafeTokenHandle,
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
return(Status); return(Status);
Status = ObCreateObject(&TokenHandle, Status = ObRosCreateObject(&TokenHandle,
DesiredAccess, DesiredAccess,
ObjectAttributes, ObjectAttributes,
SepTokenObjectType, SepTokenObjectType,
(PVOID*)&AccessToken); (PVOID*)&AccessToken);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("ObCreateObject() failed (Status %lx)\n"); DPRINT1("ObRosCreateObject() failed (Status %lx)\n");
return(Status); return(Status);
} }
@ -1218,7 +1219,7 @@ NtCreateToken(OUT PHANDLE UnsafeTokenHandle,
/* /*
* Normally we would just point these members into the variable information * 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. * area, so we allocate them seperately and provide a destroy function.
*/ */

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

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -35,7 +35,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <ddk/ntddk.h> #define NTOS_MODE_KERNEL
#include <ntos.h>
#include <ddk/ntddmou.h> #include <ddk/ntddmou.h>
#include <win32k/win32k.h> #include <win32k/win32k.h>
#include <include/winsta.h> #include <include/winsta.h>
@ -276,7 +277,7 @@ NtUserCreateWindowStation(PUNICODE_STRING lpszWindowStationName,
DPRINT("Creating window station (%wZ)\n", &WindowStationName); DPRINT("Creating window station (%wZ)\n", &WindowStationName);
Status = ObCreateObject(&WinSta, Status = ObRosCreateObject(&WinSta,
STANDARD_RIGHTS_REQUIRED, STANDARD_RIGHTS_REQUIRED,
&ObjectAttributes, &ObjectAttributes,
ExWindowStationObjectType, ExWindowStationObjectType,
@ -593,7 +594,7 @@ NtUserCreateDesktop(PUNICODE_STRING lpszDesktopName,
DPRINT("Status for open operation (0x%X)\n", Status); DPRINT("Status for open operation (0x%X)\n", Status);
Status = ObCreateObject(&Desktop, Status = ObRosCreateObject(&Desktop,
STANDARD_RIGHTS_REQUIRED, STANDARD_RIGHTS_REQUIRED,
&ObjectAttributes, &ObjectAttributes,
ExDesktopObjectType, ExDesktopObjectType,