Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-08 04:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed prototypes of NtCreateMutant(), NtQueryMutant(), NtQuerySemaphore(), NtQueryTimer(), NtReleaseMutant(), NtReleaseSemaphore(), NtSetTimerResolution() and NtSetTimer()

Browse source 
svn path=/trunk/; revision=11418
This commit is contained in:
Thomas Bluemel 2004-10-24 16:49:49 +00:00
parent 4a6dd7de44
commit b4e530e530
10 changed files with 120 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/include/funcs.h
View file

@ -8140,7 +8140,13 @@ SetTimer(
UINT uElapse,
TIMERPROC lpTimerFunc);
typedef
VOID STDCALL_FUNC
(*PTIMERAPCROUTINE)(
LPVOID lpArgToCompletionRoutine,
DWORD dwTimerLowValue,
DWORD dwTimerHighValue
);
WINBOOL
STDCALL
SetWaitableTimer(HANDLE hTimer,

8
reactos/include/ntos/types.h
View file

@ -456,14 +456,6 @@ typedef struct _SMALL_RECT
SHORT Bottom;
} SMALL_RECT, *PSMALL_RECT;
typedef VOID STDCALL_FUNC
(*PTIMERAPCROUTINE)(
LPVOID lpArgToCompletionRoutine,
DWORD dwTimerLowValue,
DWORD dwTimerHighValue
);
#include "except.h"
#else /* __USE_W32API */

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

@ -1,5 +1,5 @@
/* $Id: zw.h,v 1.31 2004/10/24 15:26:13 weiden Exp $
/* $Id: zw.h,v 1.32 2004/10/24 16:49:48 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -761,7 +761,7 @@ STDCALL
NtCreateMutant(
OUT PHANDLE MutantHandle,
IN ACCESS_MASK DesiredAccess,
IN POBJECT_ATTRIBUTES ObjectAttributes,
IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL,
IN BOOLEAN InitialOwner
);
@ -770,7 +770,7 @@ STDCALL
ZwCreateMutant(
OUT PHANDLE MutantHandle,
IN ACCESS_MASK DesiredAccess,
IN POBJECT_ATTRIBUTES ObjectAttributes,
IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL,
IN BOOLEAN InitialOwner
);
@ -2996,20 +2996,20 @@ NTSTATUS
STDCALL
NtQueryMutant(
IN HANDLE MutantHandle,
IN CINT MutantInformationClass,
IN MUTANT_INFORMATION_CLASS MutantInformationClass,
OUT PVOID MutantInformation,
IN ULONG Length,
OUT PULONG ResultLength
IN ULONG MutantInformationLength,
OUT PULONG ResultLength OPTIONAL
);
NTSTATUS
STDCALL
ZwQueryMutant(
IN HANDLE MutantHandle,
IN CINT MutantInformationClass,
IN MUTANT_INFORMATION_CLASS MutantInformationClass,
OUT PVOID MutantInformation,
IN ULONG Length,
OUT PULONG ResultLength
IN ULONG MutantInformationLength,
OUT PULONG ResultLength OPTIONAL
);
/*
@ -3055,7 +3055,7 @@ NtQuerySemaphore(
IN SEMAPHORE_INFORMATION_CLASS SemaphoreInformationClass,
OUT PVOID SemaphoreInformation,
IN ULONG Length,
OUT PULONG ReturnLength
OUT PULONG ReturnLength OPTIONAL
);
NTSTATUS
@ -3065,7 +3065,7 @@ ZwQuerySemaphore(
IN SEMAPHORE_INFORMATION_CLASS SemaphoreInformationClass,
OUT PVOID SemaphoreInformation,
IN ULONG Length,
OUT PULONG ReturnLength
OUT PULONG ReturnLength OPTIONAL
);
@ -3172,19 +3172,19 @@ NTSTATUS
STDCALL
NtQueryTimer(
IN HANDLE TimerHandle,
IN CINT TimerInformationClass,
IN TIMER_INFORMATION_CLASS TimerInformationClass,
OUT PVOID TimerInformation,
IN ULONG Length,
OUT PULONG ResultLength
IN ULONG TimerInformationLength,
OUT PULONG ReturnLength OPTIONAL
);
NTSTATUS
STDCALL
ZwQueryTimer(
IN HANDLE TimerHandle,
IN CINT TimerInformationClass,
IN TIMER_INFORMATION_CLASS TimerInformationClass,
OUT PVOID TimerInformation,
IN ULONG Length,
OUT PULONG ResultLength
IN ULONG TimerInformationLength,
OUT PULONG ReturnLength OPTIONAL
);
/*
@ -3519,14 +3519,14 @@ NTSTATUS
STDCALL
NtReleaseMutant(
IN HANDLE MutantHandle,
IN PULONG ReleaseCount OPTIONAL
IN PLONG PreviousCount OPTIONAL
);
NTSTATUS
STDCALL
ZwReleaseMutant(
IN HANDLE MutantHandle,
IN PULONG ReleaseCount OPTIONAL
IN PLONG PreviousCount OPTIONAL
);
/*
@ -3542,7 +3542,7 @@ STDCALL
NtReleaseSemaphore(
IN HANDLE SemaphoreHandle,
IN LONG ReleaseCount,
OUT PLONG PreviousCount
OUT PLONG PreviousCount OPTIONAL
);
NTSTATUS
@ -3550,7 +3550,7 @@ STDCALL
ZwReleaseSemaphore(
IN HANDLE SemaphoreHandle,
IN LONG ReleaseCount,
OUT PLONG PreviousCount
OUT PLONG PreviousCount OPTIONAL
);
/*
@ -4316,16 +4316,16 @@ ZwSetSystemTime(
NTSTATUS
STDCALL
NtSetTimerResolution(
IN ULONG RequestedResolution,
IN BOOL SetOrUnset,
OUT PULONG ActualResolution
IN ULONG DesiredResolution,
IN BOOLEAN SetResolution,
OUT PULONG CurrentResolution
);
NTSTATUS
STDCALL
ZwSetTimerResolution(
IN ULONG RequestedResolution,
IN BOOL SetOrUnset,
OUT PULONG ActualResolution
IN ULONG DesiredResolution,
IN BOOLEAN SetResolution,
OUT PULONG CurrentResolution
);
/*
@ -5561,11 +5561,11 @@ STDCALL
NtSetTimer(
IN HANDLE TimerHandle,
IN PLARGE_INTEGER DueTime,
IN PTIMERAPCROUTINE TimerApcRoutine,
IN PVOID TimerContext,
IN BOOL WakeTimer,
IN ULONG Period OPTIONAL,
OUT PBOOLEAN PreviousState OPTIONAL
IN PTIMER_APC_ROUTINE TimerApcRoutine OPTIONAL,
IN PVOID TimerContext OPTIONAL,
IN BOOLEAN ResumeTimer,
IN LONG Period OPTIONAL,
OUT PBOOLEAN PreviousState OPTIONAL
);
/*
@ -6326,11 +6326,11 @@ STDCALL
ZwSetTimer(
IN HANDLE TimerHandle,
IN PLARGE_INTEGER DueTime,
IN PTIMERAPCROUTINE TimerApcRoutine,
IN PVOID TimerContext,
IN BOOL WakeTimer,
IN ULONG Period OPTIONAL,
OUT PBOOLEAN PreviousState OPTIONAL
IN PTIMER_APC_ROUTINE TimerApcRoutine OPTIONAL,
IN PVOID TimerContext OPTIONAL,
IN BOOLEAN ResumeTimer,
IN LONG Period OPTIONAL,
OUT PBOOLEAN PreviousState OPTIONAL
);
/*

6
reactos/include/ntos/zwtypes.h
View file

@ -1793,6 +1793,12 @@ typedef struct _KINTERRUPT
typedef struct _KINTERRUPT *PKINTERRUPT;
typedef VOID STDCALL_FUNC
(*PTIMER_APC_ROUTINE)(
IN PVOID TimerContext,
IN ULONG TimerLowValue,
IN LONG TimerHighValue);
#endif /* __USE_W32API */
/* BEGIN REACTOS ONLY */

4
reactos/lib/kernel32/synch/timer.c
View file

@ -1,4 +1,4 @@
/* $Id: timer.c,v 1.18 2004/10/24 12:26:27 weiden Exp $
/* $Id: timer.c,v 1.19 2004/10/24 16:49:48 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -188,7 +188,7 @@ SetWaitableTimer(HANDLE hTimer,
Status = NtSetTimer(hTimer,
(LARGE_INTEGER *)pDueTime,
pfnCompletionRoutine,
(PTIMER_APC_ROUTINE)pfnCompletionRoutine,
lpArgToCompletionRoutine,
fResume,
lPeriod,

8
reactos/ntoskrnl/ke/timer.c
View file

@ -1,4 +1,4 @@
/* $Id: timer.c,v 1.83 2004/10/23 14:52:51 blight Exp $
/* $Id: timer.c,v 1.84 2004/10/24 16:49:49 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -95,9 +95,9 @@ NtQueryTimerResolution(OUT PULONG MinimumResolution,
NTSTATUS STDCALL
NtSetTimerResolution(IN ULONG RequestedResolution,
IN BOOL SetOrUnset,
OUT PULONG ActualResolution)
NtSetTimerResolution(IN ULONG DesiredResolution,
IN BOOLEAN SetResolution,
OUT PULONG CurrentResolution)
{
UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED;

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

@ -106,7 +106,7 @@ NtInitializeMutantImplementation(VOID)
NTSTATUS STDCALL
NtCreateMutant(OUT PHANDLE MutantHandle,
IN ACCESS_MASK DesiredAccess,
IN POBJECT_ATTRIBUTES ObjectAttributes,
IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL,
IN BOOLEAN InitialOwner)
{
PKMUTEX Mutant;
@ -159,21 +159,19 @@ NtOpenMutant(OUT PHANDLE MutantHandle,
NTSTATUS STDCALL
NtQueryMutant(IN HANDLE MutantHandle,
IN CINT MutantInformationClass,
IN MUTANT_INFORMATION_CLASS MutantInformationClass,
OUT PVOID MutantInformation,
IN ULONG Length,
OUT PULONG ResultLength)
IN ULONG MutantInformationLength,
OUT PULONG ResultLength OPTIONAL)
{
PMUTANT_BASIC_INFORMATION Info;
MUTANT_BASIC_INFORMATION SafeMutantInformation;
PKMUTANT Mutant;
NTSTATUS Status;
Info = (PMUTANT_BASIC_INFORMATION)MutantInformation;
if (MutantInformationClass > MutantBasicInformation)
return(STATUS_INVALID_INFO_CLASS);
if (Length < sizeof(MUTANT_BASIC_INFORMATION))
if (MutantInformationLength < sizeof(MUTANT_BASIC_INFORMATION))
return(STATUS_INFO_LENGTH_MISMATCH);
Status = ObReferenceObjectByHandle(MutantHandle,
@ -187,23 +185,37 @@ NtQueryMutant(IN HANDLE MutantHandle,
return(Status);
}
Info->Count = KeReadStateMutant(Mutant);
Info->Owned = (Mutant->OwnerThread != NULL);
Info->Abandoned = Mutant->Abandoned;
SafeMutantInformation.Count = KeReadStateMutant(Mutant);
SafeMutantInformation.Owned = (Mutant->OwnerThread != NULL);
SafeMutantInformation.Abandoned = Mutant->Abandoned;
ObDereferenceObject(Mutant);
Status = MmCopyToCaller(MutantInformation, &SafeMutantInformation, sizeof(MUTANT_BASIC_INFORMATION));
if(NT_SUCCESS(Status))
{
if(ResultLength != NULL)
{
ULONG RetLen = sizeof(MUTANT_BASIC_INFORMATION);
Status = MmCopyToCaller(ResultLength, &RetLen, sizeof(ULONG));
}
else
{
Status = STATUS_SUCCESS;
}
}
return(STATUS_SUCCESS);
return Status;
}
NTSTATUS STDCALL
NtReleaseMutant(IN HANDLE MutantHandle,
IN PULONG ReleaseCount OPTIONAL)
IN PLONG PreviousCount OPTIONAL)
{
PKMUTANT Mutant;
NTSTATUS Status;
ULONG Count;
LONG Count;
Status = ObReferenceObjectByHandle(MutantHandle,
MUTANT_ALL_ACCESS,
@ -222,12 +234,16 @@ NtReleaseMutant(IN HANDLE MutantHandle,
FALSE);
ObDereferenceObject(Mutant);
if (ReleaseCount != NULL)
if (PreviousCount != NULL)
{
*ReleaseCount = Count;
Status = MmCopyToCaller(PreviousCount, &Count, sizeof(LONG));
}
else
{
Status = STATUS_SUCCESS;
}
return(STATUS_SUCCESS);
return Status;
}
/* EOF */

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

@ -282,16 +282,18 @@ NtQueryEvent(IN HANDLE EventHandle,
return(Status);
}
RetLen = sizeof(EVENT_BASIC_INFORMATION);
Status = MmCopyToCaller(ReturnLength, &RetLen, sizeof(ULONG));
if (!NT_SUCCESS(Status))
if (ReturnLength != NULL)
{
ObDereferenceObject(Event);
return(Status);
RetLen = sizeof(EVENT_BASIC_INFORMATION);
Status = MmCopyToCaller(ReturnLength, &RetLen, sizeof(ULONG));
if (!NT_SUCCESS(Status))
{
ObDereferenceObject(Event);
return(Status);
}
}
ObDereferenceObject(Event);
return(STATUS_SUCCESS);
}

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

@ -1,4 +1,4 @@
/* $Id: ntsem.c,v 1.22 2004/08/15 16:39:09 chorns Exp $
/* $Id: ntsem.c,v 1.23 2004/10/24 16:49:49 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -76,7 +76,7 @@ NtInitializeSemaphoreImplementation(VOID)
NTSTATUS STDCALL
NtCreateSemaphore(OUT PHANDLE SemaphoreHandle,
IN ACCESS_MASK DesiredAccess,
IN POBJECT_ATTRIBUTES ObjectAttributes,
IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL,
IN LONG InitialCount,
IN LONG MaximumCount)
{
@ -138,7 +138,7 @@ NtQuerySemaphore(IN HANDLE SemaphoreHandle,
IN SEMAPHORE_INFORMATION_CLASS SemaphoreInformationClass,
OUT PVOID SemaphoreInformation,
IN ULONG SemaphoreInformationLength,
OUT PULONG ReturnLength)
OUT PULONG ReturnLength OPTIONAL)
{
PSEMAPHORE_BASIC_INFORMATION Info;
PKSEMAPHORE Semaphore;
@ -164,7 +164,8 @@ NtQuerySemaphore(IN HANDLE SemaphoreHandle,
Info->CurrentCount = KeReadStateSemaphore(Semaphore);
Info->MaximumCount = Semaphore->Limit;
*ReturnLength = sizeof(SEMAPHORE_BASIC_INFORMATION);
if (ReturnLength != NULL)
*ReturnLength = sizeof(SEMAPHORE_BASIC_INFORMATION);
ObDereferenceObject(Semaphore);
@ -174,7 +175,7 @@ NtQuerySemaphore(IN HANDLE SemaphoreHandle,
NTSTATUS STDCALL
NtReleaseSemaphore(IN HANDLE SemaphoreHandle,
IN LONG ReleaseCount,
OUT PLONG PreviousCount)
OUT PLONG PreviousCount OPTIONAL)
{
PKSEMAPHORE Semaphore;
NTSTATUS Status;

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

@ -1,4 +1,4 @@
/* $Id: nttimer.c,v 1.25 2004/10/22 20:41:10 ekohl Exp $
/* $Id: nttimer.c,v 1.26 2004/10/24 16:49:49 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -243,13 +243,13 @@ NtOpenTimer(OUT PHANDLE TimerHandle,
NTSTATUS STDCALL
NtQueryTimer(IN HANDLE TimerHandle,
IN CINT TimerInformationClass,
OUT PVOID UnsafeTimerInformation,
IN ULONG Length,
OUT PULONG UnsafeResultLength)
IN TIMER_INFORMATION_CLASS TimerInformationClass,
OUT PVOID TimerInformation,
IN ULONG TimerInformationLength,
OUT PULONG ReturnLength OPTIONAL)
{
PNTTIMER Timer;
TIMER_BASIC_INFORMATION TimerInformation;
TIMER_BASIC_INFORMATION SafeTimerInformation;
ULONG ResultLength;
NTSTATUS Status;
@ -269,18 +269,18 @@ NtQueryTimer(IN HANDLE TimerHandle,
ObDereferenceObject(Timer);
return(STATUS_INVALID_INFO_CLASS);
}
if (Length < sizeof(TIMER_BASIC_INFORMATION))
if (TimerInformationLength < sizeof(TIMER_BASIC_INFORMATION))
{
ObDereferenceObject(Timer);
return(STATUS_INFO_LENGTH_MISMATCH);
}
memcpy(&TimerInformation.TimeRemaining, &Timer->Timer.DueTime,
memcpy(&SafeTimerInformation.TimeRemaining, &Timer->Timer.DueTime,
sizeof(LARGE_INTEGER));
TimerInformation.SignalState = (BOOLEAN)Timer->Timer.Header.SignalState;
SafeTimerInformation.SignalState = (BOOLEAN)Timer->Timer.Header.SignalState;
ResultLength = sizeof(TIMER_BASIC_INFORMATION);
Status = MmCopyToCaller(UnsafeTimerInformation, &TimerInformation,
Status = MmCopyToCaller(TimerInformation, &SafeTimerInformation,
sizeof(TIMER_BASIC_INFORMATION));
if (!NT_SUCCESS(Status))
{
@ -288,9 +288,9 @@ NtQueryTimer(IN HANDLE TimerHandle,
return(Status);
}
if (UnsafeResultLength != NULL)
if (ReturnLength != NULL)
{
Status = MmCopyToCaller(UnsafeResultLength, &ResultLength,
Status = MmCopyToCaller(ReturnLength, &ResultLength,
sizeof(ULONG));
if (!NT_SUCCESS(Status))
{
@ -306,11 +306,11 @@ NtQueryTimer(IN HANDLE TimerHandle,
NTSTATUS STDCALL
NtSetTimer(IN HANDLE TimerHandle,
IN PLARGE_INTEGER DueTime,
IN PTIMERAPCROUTINE TimerApcRoutine,
IN PVOID TimerContext,
IN BOOL WakeTimer,
IN ULONG Period OPTIONAL,
OUT PBOOLEAN PreviousState OPTIONAL)
IN PTIMER_APC_ROUTINE TimerApcRoutine OPTIONAL,
IN PVOID TimerContext OPTIONAL,
IN BOOLEAN ResumeTimer,
IN LONG Period OPTIONAL,
OUT PBOOLEAN PreviousState OPTIONAL)
{
PNTTIMER Timer;
NTSTATUS Status;