Fixed or added exported object type variables

svn path=/trunk/; revision=1146
This commit is contained in:
Eric Kohl
2000-05-09 16:16:07 +00:00
parent a3160d79cd
commit 5c644fe59b
12 changed files with 133 additions and 83 deletions
+17 -1
View File
@@ -1,5 +1,17 @@
/* $Id: extypes.h,v 1.3 2000/05/09 16:12:47 ekohl Exp $ */
extern POBJECT_TYPE ExEventType;
#ifndef __INCLUDE_DDK_EXTYPES_H
#define __INCLUDE_DDK_EXTYPES_H
#ifdef __NTOSKRNL__
extern POBJECT_TYPE EXPORTED ExDesktopObjectType;
extern POBJECT_TYPE EXPORTED ExEventObjectType;
extern POBJECT_TYPE EXPORTED ExWindowStationObjectType;
#else
extern POBJECT_TYPE IMPORTED ExDesktopObjectType;
extern POBJECT_TYPE IMPORTED ExEventObjectType;
extern POBJECT_TYPE IMPORTED ExWindowStationObjectType;
#endif
typedef ULONG INTERLOCKED_RESULT;
typedef ULONG WORK_QUEUE_TYPE;
@@ -126,3 +138,7 @@ typedef struct
LIST_ENTRY ListEntry;
FAST_MUTEX Lock;
} PAGED_LOOKASIDE_LIST, *PPAGED_LOOKASIDE_LIST;
#endif /* __INCLUDE_DDK_EXTYPES_H */
/* EOF */
+15 -1
View File
@@ -1,10 +1,24 @@
/* $Id: iotypes.h,v 1.15 2000/03/26 22:00:06 dwelch Exp $
/* $Id: iotypes.h,v 1.16 2000/05/09 16:12:47 ekohl Exp $
*
*/
#ifndef __INCLUDE_DDK_IOTYPES_H
#define __INCLUDE_DDK_IOTYPES_H
#ifdef __NTOSKRNL__
extern POBJECT_TYPE EXPORTED IoAdapterObjectType;
extern POBJECT_TYPE EXPORTED IoDeviceHandlerObjectType;
extern POBJECT_TYPE EXPORTED IoDeviceObjectType;
extern POBJECT_TYPE EXPORTED IoDriverObjectType;
extern POBJECT_TYPE EXPORTED IoFileObjectType;
#else
extern POBJECT_TYPE IMPORTED IoAdapterObjectType;
extern POBJECT_TYPE IMPORTED IoDeviceHandlerObjectType;
extern POBJECT_TYPE IMPORTED IoDeviceObjectType;
extern POBJECT_TYPE IMPORTED IoDriverObjectType;
extern POBJECT_TYPE IMPORTED IoFileObjectType;
#endif
/*
* These are referenced before they can be fully defined
*/
+9 -1
View File
@@ -1,6 +1,14 @@
/* $Id: mmtypes.h,v 1.6 2000/05/09 16:12:47 ekohl Exp $ */
#ifndef _INCLUDE_DDK_MMTYPES_H
#define _INCLUDE_DDK_MMTYPES_H
/* $Id: mmtypes.h,v 1.5 2000/04/07 02:23:57 dwelch Exp $ */
#ifdef __NTOSKRNL__
extern POBJECT_TYPE EXPORTED MmSectionObjectType;
#else
extern POBJECT_TYPE IMPORTED MmSectionObjectType;
#endif
struct _EPROCESS;
+1 -3
View File
@@ -1,4 +1,4 @@
/* $Id: io.h,v 1.10 2000/03/29 13:11:51 dwelch Exp $
/* $Id: io.h,v 1.11 2000/05/09 16:13:07 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -15,8 +15,6 @@
#include <ddk/ntddk.h>
#include <internal/ob.h>
extern POBJECT_TYPE EXPORTED IoDeviceObjectType;
extern POBJECT_TYPE EXPORTED IoFileObjectType;
extern POBJECT_TYPE IoSymbolicLinkObjectType;
/*
+6
View File
@@ -11,6 +11,12 @@
#include <ddk/ntddk.h>
#include <internal/ex.h>
/* DATA **********************************************************************/
POBJECT_TYPE EXPORTED ExDesktopObjectType = NULL;
POBJECT_TYPE EXPORTED ExWindowStationObjectType = NULL;
/* FUNCTIONS ****************************************************************/
VOID ExInit (VOID)
+1 -2
View File
@@ -1,4 +1,4 @@
/* $Id: adapter.c,v 1.2 2000/03/26 19:38:20 ea Exp $
/* $Id: adapter.c,v 1.3 2000/05/09 16:13:49 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -20,7 +20,6 @@
POBJECT_TYPE EXPORTED IoAdapterObjectType = NULL; /* FIXME */
POBJECT_TYPE EXPORTED IoDeviceHandlerObjectType = NULL; /* FIXME */
USHORT EXPORTED IoDeviceHandlerObjectSize = 0; /* FIXME */
ULONG EXPORTED IoReadOperationCount = 0; /* FIXME */
/* FUNCTIONS *****************************************************************/
+4 -1
View File
@@ -1,4 +1,4 @@
/* $Id: iomgr.c,v 1.9 2000/03/26 19:38:25 ea Exp $
/* $Id: iomgr.c,v 1.10 2000/05/09 16:13:49 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -25,6 +25,9 @@
POBJECT_TYPE EXPORTED IoDeviceObjectType = NULL;
POBJECT_TYPE EXPORTED IoFileObjectType = NULL;
ULONG EXPORTED IoReadOperationCount = 0; /* FIXME: unknown type */
ULONG EXPORTED IoReadTransferCount = 0; /* FIXME: unknown type */
ULONG EXPORTED IoWriteOperationCount = 0; /* FIXME: unknown type */
ULONG EXPORTED IoWriteTransferCount = 0; /* FIXME: unknown type */
ULONG EXPORTED IoStatisticsLock = 0; /* FIXME: unknown type */
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: rw.c,v 1.28 2000/03/26 19:38:26 ea Exp $
/* $Id: rw.c,v 1.29 2000/05/09 16:13:49 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -86,7 +86,7 @@ NTSTATUS STDCALL NtReadFile(HANDLE FileHandle,
{
Status = ObReferenceObjectByHandle(EventHandle,
SYNCHRONIZE,
ExEventType,
ExEventObjectType,
UserMode,
(PVOID *) ptrEvent,
NULL);
+21 -21
View File
@@ -1,4 +1,4 @@
/* $Id: loader.c,v 1.53 2000/04/05 15:51:11 ekohl Exp $
/* $Id: loader.c,v 1.54 2000/05/09 16:14:07 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -47,7 +47,7 @@ NTSTATUS IoInitializeDriver(PDRIVER_INITIALIZE DriverEntry);
/* GLOBALS *******************************************************************/
LIST_ENTRY ModuleListHead;
POBJECT_TYPE ObModuleType = NULL;
POBJECT_TYPE EXPORTED IoDriverObjectType = NULL;
/* FORWARD DECLARATIONS ******************************************************/
@@ -88,24 +88,24 @@ VOID LdrInitModuleManagement(VOID)
PMODULE_OBJECT ModuleObject;
/* Register the process object type */
ObModuleType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE));
ObModuleType->TotalObjects = 0;
ObModuleType->TotalHandles = 0;
ObModuleType->MaxObjects = ULONG_MAX;
ObModuleType->MaxHandles = ULONG_MAX;
ObModuleType->PagedPoolCharge = 0;
ObModuleType->NonpagedPoolCharge = sizeof(MODULE);
ObModuleType->Dump = NULL;
ObModuleType->Open = NULL;
ObModuleType->Close = NULL;
ObModuleType->Delete = NULL;
ObModuleType->Parse = NULL;
ObModuleType->Security = NULL;
ObModuleType->QueryName = NULL;
ObModuleType->OkayToClose = NULL;
ObModuleType->Create = LdrCreateModule;
IoDriverObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE));
IoDriverObjectType->TotalObjects = 0;
IoDriverObjectType->TotalHandles = 0;
IoDriverObjectType->MaxObjects = ULONG_MAX;
IoDriverObjectType->MaxHandles = ULONG_MAX;
IoDriverObjectType->PagedPoolCharge = 0;
IoDriverObjectType->NonpagedPoolCharge = sizeof(MODULE);
IoDriverObjectType->Dump = NULL;
IoDriverObjectType->Open = NULL;
IoDriverObjectType->Close = NULL;
IoDriverObjectType->Delete = NULL;
IoDriverObjectType->Parse = NULL;
IoDriverObjectType->Security = NULL;
IoDriverObjectType->QueryName = NULL;
IoDriverObjectType->OkayToClose = NULL;
IoDriverObjectType->Create = LdrCreateModule;
RtlInitAnsiString(&AnsiString, "Module");
RtlAnsiStringToUnicodeString(&ObModuleType->TypeName, &AnsiString, TRUE);
RtlAnsiStringToUnicodeString(&IoDriverObjectType->TypeName, &AnsiString, TRUE);
/* Create Modules object directory */
wcscpy(NameBuffer, MODULE_ROOT_NAME);
@@ -138,7 +138,7 @@ VOID LdrInitModuleManagement(VOID)
ModuleObject = ObCreateObject(&ModuleHandle,
STANDARD_RIGHTS_REQUIRED,
&ObjectAttributes,
ObModuleType);
IoDriverObjectType);
assert(ModuleObject != NULL);
InitializeListHead(&ModuleListHead);
@@ -766,7 +766,7 @@ LdrPEProcessModule(PVOID ModuleLoadBase, PUNICODE_STRING pModuleName)
ModuleObject = ObCreateObject(&ModuleHandle,
STANDARD_RIGHTS_REQUIRED,
&ObjectAttributes,
ObModuleType);
IoDriverObjectType);
/* Initialize ModuleObject data */
ModuleObject->Base = DriverBase;
+26 -27
View File
@@ -18,7 +18,7 @@
/* GLOBALS *******************************************************************/
POBJECT_TYPE ExEventType = NULL;
POBJECT_TYPE EXPORTED ExEventObjectType = NULL;
/* FUNCTIONS *****************************************************************/
@@ -47,26 +47,26 @@ VOID NtInitializeEventImplementation(VOID)
{
ANSI_STRING AnsiName;
ExEventType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE));
ExEventObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE));
RtlInitAnsiString(&AnsiName,"Event");
RtlAnsiStringToUnicodeString(&ExEventType->TypeName,&AnsiName,TRUE);
RtlAnsiStringToUnicodeString(&ExEventObjectType->TypeName,&AnsiName,TRUE);
ExEventType->MaxObjects = ULONG_MAX;
ExEventType->MaxHandles = ULONG_MAX;
ExEventType->TotalObjects = 0;
ExEventType->TotalHandles = 0;
ExEventType->PagedPoolCharge = 0;
ExEventType->NonpagedPoolCharge = sizeof(KEVENT);
ExEventType->Dump = NULL;
ExEventType->Open = NULL;
ExEventType->Close = NULL;
ExEventType->Delete = NULL;
ExEventType->Parse = NULL;
ExEventType->Security = NULL;
ExEventType->QueryName = NULL;
ExEventType->OkayToClose = NULL;
ExEventType->Create = NtpCreateEvent;
ExEventObjectType->MaxObjects = ULONG_MAX;
ExEventObjectType->MaxHandles = ULONG_MAX;
ExEventObjectType->TotalObjects = 0;
ExEventObjectType->TotalHandles = 0;
ExEventObjectType->PagedPoolCharge = 0;
ExEventObjectType->NonpagedPoolCharge = sizeof(KEVENT);
ExEventObjectType->Dump = NULL;
ExEventObjectType->Open = NULL;
ExEventObjectType->Close = NULL;
ExEventObjectType->Delete = NULL;
ExEventObjectType->Parse = NULL;
ExEventObjectType->Security = NULL;
ExEventObjectType->QueryName = NULL;
ExEventObjectType->OkayToClose = NULL;
ExEventObjectType->Create = NtpCreateEvent;
}
NTSTATUS STDCALL NtClearEvent (IN HANDLE EventHandle)
@@ -76,7 +76,7 @@ NTSTATUS STDCALL NtClearEvent (IN HANDLE EventHandle)
Status = ObReferenceObjectByHandle(EventHandle,
EVENT_MODIFY_STATE,
ExEventType,
ExEventObjectType,
UserMode,
(PVOID*)&Event,
NULL);
@@ -97,12 +97,12 @@ NTSTATUS STDCALL NtCreateEvent (OUT PHANDLE EventHandle,
IN BOOLEAN InitialState)
{
PKEVENT Event;
DPRINT("NtCreateEvent()\n");
Event = ObCreateObject(EventHandle,
DesiredAccess,
ObjectAttributes,
ExEventType);
ExEventObjectType);
KeInitializeEvent(Event,
ManualReset ? NotificationEvent : SynchronizationEvent,
InitialState );
@@ -116,14 +116,13 @@ NTSTATUS STDCALL NtOpenEvent (OUT PHANDLE EventHandle,
IN POBJECT_ATTRIBUTES ObjectAttributes)
{
NTSTATUS Status;
PKEVENT Event;
PKEVENT Event;
Status = ObReferenceObjectByName(ObjectAttributes->ObjectName,
ObjectAttributes->Attributes,
NULL,
DesiredAccess,
ExEventType,
ExEventObjectType,
UserMode,
NULL,
(PVOID*)&Event);
@@ -131,7 +130,7 @@ NTSTATUS STDCALL NtOpenEvent (OUT PHANDLE EventHandle,
{
return(Status);
}
Status = ObCreateHandle(PsGetCurrentProcess(),
Event,
DesiredAccess,
@@ -170,7 +169,7 @@ NTSTATUS STDCALL NtResetEvent(HANDLE EventHandle,
Status = ObReferenceObjectByHandle(EventHandle,
EVENT_MODIFY_STATE,
ExEventType,
ExEventObjectType,
UserMode,
(PVOID*)&Event,
NULL);
@@ -194,7 +193,7 @@ NTSTATUS STDCALL NtSetEvent(IN HANDLE EventHandle,
Status = ObReferenceObjectByHandle(EventHandle,
EVENT_MODIFY_STATE,
ExEventType,
ExEventObjectType,
UserMode,
(PVOID*)&Event,
NULL);
+16 -13
View File
@@ -1,4 +1,4 @@
; $Id: ntoskrnl.def,v 1.69 2000/05/01 14:15:02 ea Exp $
; $Id: ntoskrnl.def,v 1.70 2000/05/09 16:16:07 ekohl Exp $
;
; reactos/ntoskrnl/ntoskrnl.def
;
@@ -31,6 +31,8 @@ ExDeleteNPagedLookasideList
ExDeletePagedLookasideList
ExDeleteResource
ExDeleteResourceLite
ExDesktopObjectType DATA
ExEventObjectType DATA
ExExtendZone
ExFreePool
ExFreeToNPagedLookasideList
@@ -81,6 +83,7 @@ ExReleaseResourceForThread
ExReleaseResourceForThreadLite
ExSystemTimeToLocalTime
ExTryToAcquireResourceExclusiveLite
ExWindowStationObjectType DATA
FsRtlAddLargeMcbEntry@28
FsRtlAddMcbEntry@16
FsRtlAddToTunnelCache@32
@@ -167,6 +170,7 @@ FsRtlUninitializeMcb@4
FsRtlUninitializeOplock@4
IoAcquireCancelSpinLock@4
IoAcquireVpbSpinLock@4
IoAdapterObjectType DATA
IoAllocateAdapterChannel@20
IoAllocateController@16
IoAllocateErrorLogEntry@8
@@ -202,10 +206,9 @@ IoDeleteSymbolicLink@4
IoDetachDevice@4
IoDeviceHandlerObjectSize DATA
IoDeviceHandlerObjectType DATA
IoDeviceObjectType DATA
IoDisconnectInterrupt@4
IoDeviceObjectType DATA
IoDriverObjectType=IoFileObjectType DATA
IoDriverObjectType DATA
IoEnqueueIrp@4
IoFastQueryNetworkAttributes@20
IoFileObjectType DATA
@@ -238,7 +241,7 @@ IoQueueThreadIrp@4
IoRaiseHardError@12
IoRaiseInformationalHardError@12
IoReadOperationCount DATA
IoReadTransferCount=IoAdapterObjectType DATA
IoReadTransferCount DATA
IoRegisterDriverReinitialization@12
IoRegisterFileSystem@4
IoRegisterFsRegistrationChange@8
@@ -268,14 +271,14 @@ IoUnregisterShutdownNotification@4
IoUpdateShareAccess@8
IoVerifyVolume@8
IoWriteErrorLogEntry@4
IoWriteOperationCount=IoDeviceObjectType DATA
IoWriteOperationCount DATA
IoWriteTransferCount DATA
;@IofCallDriver@8
IofCallDriver@8
;@IofCompleteRequest@8
IofCompleteRequest@8
KdDebuggerEnabled DATA
KdDebuggerNotPresent DATA
KdDebuggerEnabled DATA
KdDebuggerNotPresent DATA
KdPollBreakIn@0
KeAddSystemServiceTable@20
KeBugCheck
@@ -293,7 +296,7 @@ KeInsertQueueDpc
KeQuerySystemTime
KeReadStateEvent
KeResetEvent
KeServiceDescriptorTable DATA
KeServiceDescriptorTable DATA
KeSetEvent
KeSetTimer
KeSynchronizeExecution
@@ -346,11 +349,11 @@ MmUnmapViewInSystemSpace@4
MmUnmapViewOfSection@8
MmUnsecureVirtualMemory@4
MmUserProbeAddress DATA
NlsAnsiCodePage DATA
NlsLeadByteInfo DATA
NlsMbCodePageTag DATA
NlsMbOemCodePageTag DATA
NlsOemLeadByteInfo DATA
NlsAnsiCodePage DATA
NlsLeadByteInfo DATA
NlsMbCodePageTag DATA
NlsMbOemCodePageTag DATA
NlsOemLeadByteInfo DATA
NtAddAtom@8
NtAdjustPrivilegesToken@24
NtAllocateLocallyUniqueId@4
+15 -11
View File
@@ -1,4 +1,4 @@
; $Id: ntoskrnl.edf,v 1.56 2000/05/01 14:15:02 ea Exp $
; $Id: ntoskrnl.edf,v 1.57 2000/05/09 16:16:07 ekohl Exp $
;
; reactos/ntoskrnl/ntoskrnl.def
;
@@ -31,6 +31,8 @@ ExDeleteNPagedLookasideList
ExDeletePagedLookasideList
ExDeleteResource
ExDeleteResourceLite
ExDesktopObjectType DATA
ExEventObjectType DATA
ExExtendZone
ExFreePool
ExFreeToNPagedLookasideList
@@ -81,6 +83,7 @@ ExReleaseResourceForThread
ExReleaseResourceForThreadLite
ExSystemTimeToLocalTime
ExTryToAcquireResourceExclusiveLite
ExWindowStationObjectType DATA
FsRtlAddLargeMcbEntry=FsRtlAddLargeMcbEntry@28
FsRtlAddMcbEntry=FsRtlAddMcbEntry@16
FsRtlAddToTunnelCache=FsRtlAddToTunnelCache@32
@@ -167,6 +170,7 @@ FsRtlUninitializeMcb=FsRtlUninitializeMcb@4
FsRtlUninitializeOplock=FsRtlUninitializeOplock@4
IoAcquireCancelSpinLock=IoAcquireCancelSpinLock@4
IoAcquireVpbSpinLock=IoAcquireVpbSpinLock@4
IoAdapterObjectType DATA
IoAllocateAdapterChannel=IoAllocateAdapterChannel@20
IoAllocateIrp=IoAllocateIrp@8
IoAllocateMdl=IoAllocateMdl@20
@@ -204,7 +208,7 @@ IoDeviceHandlerObjectSize DATA
IoDeviceHandlerObjectType DATA
IoDeviceObjectType DATA
IoDisconnectInterrupt=IoDisconnectInterrupt@4
IoDriverObjectType=IoFileObjectType DATA
IoDriverObjectType DATA
IoEnqueueIrp=IoEnqueueIrp@4
IoFastQueryNetworkAttributes=IoFastQueryNetworkAttributes@20
IoFileObjectType DATA
@@ -237,7 +241,7 @@ IoQueueThreadIrp=IoQueueThreadIrp@4
IoRaiseHardError=IoRaiseHardError@12
IoRaiseInformationalHardError=IoRaiseInformationalHardError@12
IoReadOperationCount DATA
IoReadTransferCount=IoAdapterObjectType DATA
IoReadTransferCount DATA
IoRegisterDriverReinitialization=IoRegisterDriverReinitialization@12
IoRegisterFileSystem=IoRegisterFileSystem@4
IoRegisterFsRegistrationChange=IoRegisterFsRegistrationChange@8
@@ -267,14 +271,14 @@ IoUnregisterShutdownNotification=IoUnregisterShutdownNotification@4
IoUpdateShareAccess=IoUpdateShareAccess@8
IoVerifyVolume=IoVerifyVolume@8
IoWriteErrorLogEntry=IoWriteErrorLogEntry@4
IoWriteOperationCount=IoDeviceObjectType DATA
IoWriteOperationCount DATA
IoWriteTransferCount DATA
;IofCallDriver=@IofCallDriver@0
IofCallDriver=IofCallDriver@8
;IofCompleteRequest=@IofCompleteRequest@0
IofCompleteRequest=IofCompleteRequest@8
KdDebuggerEnabled DATA
KdDebuggerNotPresent DATA
KdDebuggerEnabled DATA
KdDebuggerNotPresent DATA
KdPollBreakIn=KdPollBreakIn@0
KeAddSystemServiceTable=KeAddSystemServiceTable@20
KeBugCheck
@@ -345,11 +349,11 @@ MmUnmapViewInSystemSpace=MmUnmapViewInSystemSpace@4
MmUnmapViewOfSection=MmUnmapViewOfSection@8
MmUnsecureVirtualMemory=MmUnsecureVirtualMemory@4
MmUserProbeAddress DATA
NlsAnsiCodePage DATA
NlsLeadByteInfo DATA
NlsMbCodePageTag DATA
NlsMbOemCodePageTag DATA
NlsOemLeadByteInfo DATA
NlsAnsiCodePage DATA
NlsLeadByteInfo DATA
NlsMbCodePageTag DATA
NlsMbOemCodePageTag DATA
NlsOemLeadByteInfo DATA
NtAddAtom=NtAddAtom@8
NtAdjustPrivilegesToken=NtAdjustPrivilegesToken@24
NtAllocateLocallyUniqueId=NtAllocateLocallyUniqueId@4