Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 05:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed prototypes of NtSetEvent(), NtResetEvent(), NtQueryEvent(), NtPulseEvent(), NtOpenEvent() and NtCreateEvent()

Browse source 
svn path=/trunk/; revision=11417
This commit is contained in:
Thomas Bluemel 2004-10-24 15:26:14 +00:00
parent 4bd798e343
commit 4a6dd7de44
10 changed files with 61 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/dd/ramdrv/ramdrv.c
View file

@ -160,7 +160,7 @@ NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject,
Status = NtCreateEvent( &event,
0,
&objattr,
TRUE,
NotificationEvent,
FALSE );
if( !NT_SUCCESS( Status ) )
{

26
reactos/include/ntos/zw.h
View file

@ -1,5 +1,5 @@
/* $Id: zw.h,v 1.30 2004/08/21 13:20:25 tamlin Exp $
/* $Id: zw.h,v 1.31 2004/10/24 15:26:13 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -533,8 +533,8 @@ STDCALL
NtCreateEvent(
OUT PHANDLE EventHandle,
IN ACCESS_MASK DesiredAccess,
IN POBJECT_ATTRIBUTES ObjectAttributes,
IN BOOLEAN ManualReset,
IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL,
IN EVENT_TYPE EventType,
IN BOOLEAN InitialState
);
@ -543,8 +543,8 @@ STDCALL
ZwCreateEvent(
OUT PHANDLE EventHandle,
IN ACCESS_MASK DesiredAccess,
IN POBJECT_ATTRIBUTES ObjectAttributes,
IN BOOLEAN ManualReset,
IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL,
IN EVENT_TYPE EventType,
IN BOOLEAN InitialState
);
@ -2443,14 +2443,14 @@ NTSTATUS
STDCALL
NtPulseEvent(
IN HANDLE EventHandle,
IN PULONG PulseCount OPTIONAL
OUT PLONG PreviousState OPTIONAL
);
NTSTATUS
STDCALL
ZwPulseEvent(
IN HANDLE EventHandle,
IN PULONG PulseCount OPTIONAL
OUT PLONG PreviousState OPTIONAL
);
/*
@ -2659,7 +2659,7 @@ NtQueryEvent(
IN EVENT_INFORMATION_CLASS EventInformationClass,
OUT PVOID EventInformation,
IN ULONG EventInformationLength,
OUT PULONG ReturnLength
OUT PULONG ReturnLength OPTIONAL
);
NTSTATUS
STDCALL
@ -2668,7 +2668,7 @@ ZwQueryEvent(
IN EVENT_INFORMATION_CLASS EventInformationClass,
OUT PVOID EventInformation,
IN ULONG EventInformationLength,
OUT PULONG ReturnLength
OUT PULONG ReturnLength OPTIONAL
);
NTSTATUS STDCALL
@ -3668,13 +3668,13 @@ NTSTATUS
STDCALL
NtResetEvent(
HANDLE EventHandle,
PULONG NumberOfWaitingThreads OPTIONAL
OUT PLONG PreviousState OPTIONAL
);
NTSTATUS
STDCALL
ZwResetEvent(
HANDLE EventHandle,
PULONG NumberOfWaitingThreads OPTIONAL
OUT PLONG PreviousState OPTIONAL
);
//draft
NTSTATUS
@ -3899,14 +3899,14 @@ NTSTATUS
STDCALL
NtSetEvent(
IN HANDLE EventHandle,
PULONG NumberOfThreadsReleased
OUT PLONG PreviousState OPTIONAL
);
NTSTATUS
STDCALL
ZwSetEvent(
IN HANDLE EventHandle,
PULONG NumberOfThreadsReleased
OUT PLONG PreviousState OPTIONAL
);
/*

18
reactos/lib/kernel32/synch/event.c
View file

@ -1,4 +1,4 @@
/* $Id: event.c,v 1.19 2004/10/24 12:16:54 weiden Exp $
/* $Id: event.c,v 1.20 2004/10/24 15:26:14 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@ -90,9 +90,9 @@ CreateEventW(LPSECURITY_ATTRIBUTES lpEventAttributes,
}
Status = NtCreateEvent(&hEvent,
STANDARD_RIGHTS_ALL|EVENT_READ_ACCESS|EVENT_WRITE_ACCESS,
STANDARD_RIGHTS_ALL | EVENT_READ_ACCESS | EVENT_WRITE_ACCESS,
&ObjectAttributes,
bManualReset,
(bManualReset ? NotificationEvent : SynchronizationEvent),
bInitialState);
DPRINT( "Called\n" );
if (!NT_SUCCESS(Status))
@ -188,11 +188,9 @@ OpenEventW(DWORD dwDesiredAccess,
BOOL STDCALL
PulseEvent(HANDLE hEvent)
{
ULONG Count;
NTSTATUS Status;
Status = NtPulseEvent(hEvent,
&Count);
Status = NtPulseEvent(hEvent, NULL);
if (!NT_SUCCESS(Status))
{
SetLastErrorByStatus (Status);
@ -210,10 +208,8 @@ BOOL STDCALL
ResetEvent(HANDLE hEvent)
{
NTSTATUS Status;
ULONG Count;
Status = NtResetEvent(hEvent,
&Count);
Status = NtClearEvent(hEvent);
if (!NT_SUCCESS(Status))
{
SetLastErrorByStatus(Status);
@ -231,10 +227,8 @@ BOOL STDCALL
SetEvent(HANDLE hEvent)
{
NTSTATUS Status;
ULONG Count;
Status = NtSetEvent(hEvent,
&Count);
Status = NtSetEvent(hEvent, NULL);
if (!NT_SUCCESS(Status))
{
SetLastErrorByStatus(Status);

6
reactos/ntoskrnl/io/event.c
View file

@ -1,4 +1,4 @@
/* $Id: event.c,v 1.8 2004/08/15 16:39:03 chorns Exp $
/* $Id: event.c,v 1.9 2004/10/24 15:26:14 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -37,7 +37,7 @@ IoCreateNotificationEvent(PUNICODE_STRING EventName,
Status = NtCreateEvent(&Handle,
EVENT_ALL_ACCESS,
&ObjectAttributes,
FALSE,
NotificationEvent,
TRUE);
if (!NT_SUCCESS(Status))
{
@ -78,7 +78,7 @@ IoCreateSynchronizationEvent(PUNICODE_STRING EventName,
Status = NtCreateEvent(&Handle,
EVENT_ALL_ACCESS,
&ObjectAttributes,
TRUE,
SynchronizationEvent,
TRUE);
if (!NT_SUCCESS(Status))
{

4
reactos/ntoskrnl/ke/main.c
View file

@ -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: main.c,v 1.201 2004/10/24 12:00:01 ekohl Exp $
/* $Id: main.c,v 1.202 2004/10/24 15:26:14 weiden Exp $
*
* PROJECT: ReactOS kernel
* FILE: ntoskrnl/ke/main.c
@ -746,7 +746,7 @@ ExpInitializeExecutive(VOID)
Status = NtCreateEvent(&InitDoneEventHandle,
EVENT_ALL_ACCESS,
&ObjectAttributes,
FALSE, /* Synchronization event */
SynchronizationEvent,
FALSE); /* Not signalled */
if (!NT_SUCCESS(Status))
{

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

@ -118,21 +118,20 @@ NtClearEvent(IN HANDLE EventHandle)
* @implemented
*/
NTSTATUS STDCALL
NtCreateEvent(OUT PHANDLE UnsafeEventHandle,
NtCreateEvent(OUT PHANDLE EventHandle,
IN ACCESS_MASK DesiredAccess,
IN POBJECT_ATTRIBUTES UnsafeObjectAttributes,
IN BOOLEAN ManualReset,
IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL,
IN EVENT_TYPE EventType,
IN BOOLEAN InitialState)
{
PKEVENT Event;
HANDLE EventHandle;
HANDLE hEvent;
NTSTATUS Status;
OBJECT_ATTRIBUTES SafeObjectAttributes;
POBJECT_ATTRIBUTES ObjectAttributes;
if (UnsafeObjectAttributes != NULL)
if (ObjectAttributes != NULL)
{
Status = MmCopyFromCaller(&SafeObjectAttributes, UnsafeObjectAttributes,
Status = MmCopyFromCaller(&SafeObjectAttributes, ObjectAttributes,
sizeof(OBJECT_ATTRIBUTES));
if (!NT_SUCCESS(Status))
{
@ -140,10 +139,6 @@ NtCreateEvent(OUT PHANDLE UnsafeEventHandle,
}
ObjectAttributes = &SafeObjectAttributes;
}
else
{
ObjectAttributes = NULL;
}
Status = ObCreateObject(ExGetPreviousMode(),
ExEventObjectType,
@ -159,7 +154,7 @@ NtCreateEvent(OUT PHANDLE UnsafeEventHandle,
return(Status);
}
KeInitializeEvent(Event,
ManualReset ? NotificationEvent : SynchronizationEvent,
EventType,
InitialState);
Status = ObInsertObject ((PVOID)Event,
@ -167,17 +162,17 @@ NtCreateEvent(OUT PHANDLE UnsafeEventHandle,
DesiredAccess,
0,
NULL,
&EventHandle);
&hEvent);
ObDereferenceObject(Event);
if (!NT_SUCCESS(Status))
{
return Status;
}
Status = MmCopyToCaller(UnsafeEventHandle, &EventHandle, sizeof(HANDLE));
Status = MmCopyToCaller(EventHandle, &hEvent, sizeof(HANDLE));
if (!NT_SUCCESS(Status))
{
ZwClose(EventHandle);
ZwClose(hEvent);
return(Status);
}
return(STATUS_SUCCESS);
@ -185,12 +180,12 @@ NtCreateEvent(OUT PHANDLE UnsafeEventHandle,
NTSTATUS STDCALL
NtOpenEvent(OUT PHANDLE UnsafeEventHandle,
NtOpenEvent(OUT PHANDLE EventHandle,
IN ACCESS_MASK DesiredAccess,
IN POBJECT_ATTRIBUTES ObjectAttributes)
{
NTSTATUS Status;
HANDLE EventHandle;
HANDLE hEvent;
DPRINT("ObjectName '%wZ'\n", ObjectAttributes->ObjectName);
@ -200,14 +195,14 @@ NtOpenEvent(OUT PHANDLE UnsafeEventHandle,
UserMode,
DesiredAccess,
NULL,
&EventHandle);
&hEvent);
if (!NT_SUCCESS(Status))
{
return(Status);
}
Status = MmCopyToCaller(UnsafeEventHandle, &EventHandle, sizeof(HANDLE));
Status = MmCopyToCaller(EventHandle, &hEvent, sizeof(HANDLE));
if (!NT_SUCCESS(Status))
{
ZwClose(EventHandle);
@ -220,7 +215,7 @@ NtOpenEvent(OUT PHANDLE UnsafeEventHandle,
NTSTATUS STDCALL
NtPulseEvent(IN HANDLE EventHandle,
IN PULONG UnsafePulseCount OPTIONAL)
OUT PLONG PreviousState OPTIONAL)
{
PKEVENT Event;
NTSTATUS Status;
@ -249,14 +244,14 @@ NtPulseEvent(IN HANDLE EventHandle,
NTSTATUS STDCALL
NtQueryEvent(IN HANDLE EventHandle,
IN EVENT_INFORMATION_CLASS EventInformationClass,
OUT PVOID UnsafeEventInformation,
OUT PVOID EventInformation,
IN ULONG EventInformationLength,
OUT PULONG UnsafeReturnLength)
OUT PULONG ReturnLength OPTIONAL)
{
EVENT_BASIC_INFORMATION Info;
PKEVENT Event;
NTSTATUS Status;
ULONG ReturnLength;
ULONG RetLen;
if (EventInformationClass > EventBasicInformation)
return STATUS_INVALID_INFO_CLASS;
@ -279,7 +274,7 @@ NtQueryEvent(IN HANDLE EventHandle,
Info.EventType = SynchronizationEvent;
Info.EventState = KeReadStateEvent(Event);
Status = MmCopyToCaller(UnsafeEventInformation, &Event,
Status = MmCopyToCaller(EventInformation, &Event,
sizeof(EVENT_BASIC_INFORMATION));
if (!NT_SUCCESS(Status))
{
@ -287,8 +282,8 @@ NtQueryEvent(IN HANDLE EventHandle,
return(Status);
}
ReturnLength = sizeof(EVENT_BASIC_INFORMATION);
Status = MmCopyToCaller(UnsafeReturnLength, &ReturnLength, sizeof(ULONG));
RetLen = sizeof(EVENT_BASIC_INFORMATION);
Status = MmCopyToCaller(ReturnLength, &RetLen, sizeof(ULONG));
if (!NT_SUCCESS(Status))
{
ObDereferenceObject(Event);
@ -303,7 +298,7 @@ NtQueryEvent(IN HANDLE EventHandle,
NTSTATUS STDCALL
NtResetEvent(IN HANDLE EventHandle,
OUT PULONG UnsafeNumberOfWaitingThreads OPTIONAL)
OUT PLONG PreviousState OPTIONAL)
{
PKEVENT Event;
NTSTATUS Status;
@ -331,7 +326,7 @@ NtResetEvent(IN HANDLE EventHandle,
*/
NTSTATUS STDCALL
NtSetEvent(IN HANDLE EventHandle,
OUT PULONG UnsafeNumberOfThreadsReleased)
OUT PLONG PreviousState OPTIONAL)
{
PKEVENT Event;
NTSTATUS Status;

4
reactos/ntoskrnl/se/semgr.c
View file

@ -1,4 +1,4 @@
/* $Id: semgr.c,v 1.48 2004/10/22 20:48:00 ekohl Exp $
/* $Id: semgr.c,v 1.49 2004/10/24 15:26:14 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -104,7 +104,7 @@ SeInitSRM(VOID)
Status = NtCreateEvent(&EventHandle,
EVENT_ALL_ACCESS,
&ObjectAttributes,
FALSE,
SynchronizationEvent,
FALSE);
if (!NT_SUCCESS(Status))
{

4
reactos/subsys/smss/init.c
View file

@ -1,4 +1,4 @@
/* $Id: init.c,v 1.55 2004/06/05 09:35:52 navaraf Exp $
/* $Id: init.c,v 1.56 2004/10/24 15:26:14 weiden Exp $
*
* init.c - Session Manager initialization
*
@ -943,7 +943,7 @@ InitSessionManager(HANDLE Children[])
Status = NtCreateEvent(&CsrssInitEvent,
EVENT_ALL_ACCESS,
&ObjectAttributes,
TRUE,
NotificationEvent,
FALSE);
if (!NT_SUCCESS(Status))
{

6
reactos/w32api/include/ddk/ntifs.h
View file

@ -4393,7 +4393,7 @@ NTSTATUS
NTAPI
ZwPulseEvent (
IN HANDLE EventHandle,
OUT PULONG PreviousState OPTIONAL
OUT PLONG PreviousState OPTIONAL
);
NTSYSAPI
@ -4543,7 +4543,7 @@ NTSTATUS
NTAPI
ZwResetEvent (
IN HANDLE EventHandle,
OUT PULONG PreviousState OPTIONAL
OUT PLONG PreviousState OPTIONAL
);
#if (VER_PRODUCTBUILD >= 2195)
@ -4601,7 +4601,7 @@ NTSTATUS
NTAPI
ZwSetEvent (
IN HANDLE EventHandle,
OUT PULONG PreviousState OPTIONAL
OUT PLONG PreviousState OPTIONAL
);
NTSYSAPI

12
reactos/w32api/include/ddk/winddk.h
View file

@ -8651,8 +8651,8 @@ DDKAPI
NtCreateEvent(
OUT PHANDLE EventHandle,
IN ACCESS_MASK DesiredAccess,
IN POBJECT_ATTRIBUTES ObjectAttributes,
IN BOOLEAN ManualReset,
IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL,
IN EVENT_TYPE EventType,
IN BOOLEAN InitialState);
NTOSAPI
@ -8661,8 +8661,8 @@ DDKAPI
ZwCreateEvent(
OUT PHANDLE EventHandle,
IN ACCESS_MASK DesiredAccess,
IN POBJECT_ATTRIBUTES ObjectAttributes,
IN BOOLEAN ManualReset,
IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL,
IN EVENT_TYPE EventType,
IN BOOLEAN InitialState);
NTOSAPI
@ -8935,14 +8935,14 @@ NTSTATUS
DDKAPI
NtSetEvent(
IN HANDLE EventHandle,
IN PULONG NumberOfThreadsReleased);
OUT PLONG PreviousState OPTIONAL);
NTOSAPI
NTSTATUS
DDKAPI
ZwSetEvent(
IN HANDLE EventHandle,
IN PULONG NumberOfThreadsReleased);
OUT PLONG PreviousState OPTIONAL);
NTOSAPI
NTSTATUS