From 005106acbb1111ce9568f901773fec3047e8f2c7 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Mon, 27 Dec 1999 15:06:13 +0000 Subject: [PATCH] Fixed some more STDCALL issues svn path=/trunk/; revision=905 --- reactos/include/ddk/rtl.h | 32 +++++++++++++++++++++- reactos/lib/ntdll/def/ntdll.def | 4 +-- reactos/lib/ntdll/def/ntdll.edf | 4 +-- reactos/lib/ntdll/rtl/security.c | 9 +++++-- reactos/lib/ntdll/rtl/time.c | 18 ++++++++++--- reactos/ntoskrnl/ntoskrnl.def | 14 +++++----- reactos/ntoskrnl/ntoskrnl.edf | 14 +++++----- reactos/ntoskrnl/rtl/time.c | 46 +++++++++++++++++++++++--------- 8 files changed, 103 insertions(+), 38 deletions(-) diff --git a/reactos/include/ddk/rtl.h b/reactos/include/ddk/rtl.h index 547813580c3..34d037a96a3 100644 --- a/reactos/include/ddk/rtl.h +++ b/reactos/include/ddk/rtl.h @@ -1,4 +1,4 @@ -/* $Id: rtl.h,v 1.22 1999/12/26 17:22:18 ea Exp $ +/* $Id: rtl.h,v 1.23 1999/12/27 15:04:50 ekohl Exp $ * */ @@ -865,6 +865,20 @@ RtlRetrieveUshort ( PUSHORT SourceAddress ); +VOID +STDCALL +RtlSecondsSince1970ToTime ( + ULONG SecondsSince1970, + PLARGE_INTEGER Time + ); + +VOID +STDCALL +RtlSecondsSince1980ToTime ( + ULONG SecondsSince1980, + PLARGE_INTEGER Time + ); + NTSTATUS STDCALL RtlSetDaclSecurityDescriptor ( @@ -908,12 +922,28 @@ RtlStoreUshort ( ); BOOLEAN +STDCALL RtlTimeFieldsToTime ( PTIME_FIELDS TimeFields, PLARGE_INTEGER Time ); +BOOLEAN +STDCALL +RtlTimeToSecondsSince1970 ( + PLARGE_INTEGER Time, + PULONG SecondsSince1970 + ); + +BOOLEAN +STDCALL +RtlTimeToSecondsSince1980 ( + PLARGE_INTEGER Time, + PULONG SecondsSince1980 + ); + VOID +STDCALL RtlTimeToTimeFields ( PLARGE_INTEGER Time, PTIME_FIELDS TimeFields diff --git a/reactos/lib/ntdll/def/ntdll.def b/reactos/lib/ntdll/def/ntdll.def index af4edfe8cf6..b76c405b3ca 100644 --- a/reactos/lib/ntdll/def/ntdll.def +++ b/reactos/lib/ntdll/def/ntdll.def @@ -1,4 +1,4 @@ -; $Id: ntdll.def,v 1.31 1999/12/22 14:48:23 dwelch Exp $ +; $Id: ntdll.def,v 1.32 1999/12/27 15:06:13 ekohl Exp $ ; ; ReactOS Operating System ; @@ -487,7 +487,7 @@ RtlLargeIntegerNegate@8 RtlLargeIntegerShiftLeft@12 RtlLargeIntegerShiftRight@12 RtlLargeIntegerSubtract@16 -RtlLengthSecurityDescriptor +RtlLengthSecurityDescriptor@4 RtlLockHeap@4 RtlMoveMemory@12 RtlMultiByteToUnicodeN@20 diff --git a/reactos/lib/ntdll/def/ntdll.edf b/reactos/lib/ntdll/def/ntdll.edf index 30060989dbe..7046965f3b6 100644 --- a/reactos/lib/ntdll/def/ntdll.edf +++ b/reactos/lib/ntdll/def/ntdll.edf @@ -1,4 +1,4 @@ -; $Id: ntdll.edf,v 1.21 1999/12/22 14:48:23 dwelch Exp $ +; $Id: ntdll.edf,v 1.22 1999/12/27 15:06:13 ekohl Exp $ ; ; ReactOS Operating System ; @@ -482,7 +482,7 @@ RtlLargeIntegerNegate=RtlLargeIntegerNegate@8 RtlLargeIntegerShiftLeft=RtlLargeIntegerShiftLeft@12 RtlLargeIntegerShiftRight=RtlLargeIntegerShiftRight@12 RtlLargeIntegerSubtract=RtlLargeIntegerSubtract@16 -RtlLengthSecurityDescriptor +RtlLengthSecurityDescriptor=RtlLengthSecurityDescriptor@4 RtlLockHeap=RtlLockHeap@4 RtlMoveMemory=RtlMoveMemory@12 RtlMultiByteToUnicodeN=RtlMultiByteToUnicodeN@20 diff --git a/reactos/lib/ntdll/rtl/security.c b/reactos/lib/ntdll/rtl/security.c index 36ce218fcce..bcd48a727b6 100644 --- a/reactos/lib/ntdll/rtl/security.c +++ b/reactos/lib/ntdll/rtl/security.c @@ -1,4 +1,5 @@ -/* +/* $Id: security.c,v 1.2 1999/12/27 15:06:00 ekohl Exp $ + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Rtl security functions @@ -16,7 +17,11 @@ /* FUNCTIONS ***************************************************************/ -ULONG RtlLengthSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor) +ULONG +STDCALL +RtlLengthSecurityDescriptor ( + PSECURITY_DESCRIPTOR SecurityDescriptor + ) { UNIMPLEMENTED; } diff --git a/reactos/lib/ntdll/rtl/time.c b/reactos/lib/ntdll/rtl/time.c index ccea5904529..9eefad54763 100644 --- a/reactos/lib/ntdll/rtl/time.c +++ b/reactos/lib/ntdll/rtl/time.c @@ -51,8 +51,12 @@ static __inline void NormalizeTimeFields(CSHORT *FieldToNormalize, /* FUNCTIONS *****************************************************************/ -VOID RtlTimeToTimeFields(PLARGE_INTEGER liTime, - PTIME_FIELDS TimeFields) +VOID +STDCALL +RtlTimeToTimeFields ( + PLARGE_INTEGER liTime, + PTIME_FIELDS TimeFields + ) { const int *Months; int LeapSecondCorrections, SecondsInDay, CurYear; @@ -121,8 +125,12 @@ VOID RtlTimeToTimeFields(PLARGE_INTEGER liTime, TimeFields->Day = (CSHORT) (Days + 1); } -BOOLEAN RtlTimeFieldsToTime(PTIME_FIELDS tfTimeFields, - PLARGE_INTEGER Time) +BOOLEAN +STDCALL +RtlTimeFieldsToTime ( + PTIME_FIELDS tfTimeFields, + PLARGE_INTEGER Time + ) { int CurYear, CurMonth; long long int rcTime; @@ -182,3 +190,5 @@ BOOLEAN RtlTimeFieldsToTime(PTIME_FIELDS tfTimeFields, return TRUE; } + +/* EOF */ \ No newline at end of file diff --git a/reactos/ntoskrnl/ntoskrnl.def b/reactos/ntoskrnl/ntoskrnl.def index e7743dade3a..c6f580e5c9d 100644 --- a/reactos/ntoskrnl/ntoskrnl.def +++ b/reactos/ntoskrnl/ntoskrnl.def @@ -1,4 +1,4 @@ -; $Id: ntoskrnl.def,v 1.34 1999/12/26 20:21:02 ea Exp $ +; $Id: ntoskrnl.def,v 1.35 1999/12/27 15:05:33 ekohl Exp $ ; ; reactos/ntoskrnl/ntoskrnl.def ; @@ -251,12 +251,12 @@ RtlMultiByteToUnicodeSize@12 RtlOemStringToUnicodeSize@4 RtlOemStringToUnicodeString@12 RtlOemToUnicodeN@20 -RtlSecondsSince1970ToTime -RtlSecondsSince1980ToTime -RtlTimeFieldsToTime -RtlTimeToSecondsSince1970 -RtlTimeToSecondsSince1980 -RtlTimeToTimeFields +RtlSecondsSince1970ToTime@8 +RtlSecondsSince1980ToTime@8 +RtlTimeFieldsToTime@8 +RtlTimeToSecondsSince1970@8 +RtlTimeToSecondsSince1980@8 +RtlTimeToTimeFields@8 RtlUnicodeStringToAnsiSize@4 RtlUnicodeStringToAnsiString@12 RtlUnicodeStringToInteger@12 diff --git a/reactos/ntoskrnl/ntoskrnl.edf b/reactos/ntoskrnl/ntoskrnl.edf index 055d1bc5118..cc7affc2cbf 100644 --- a/reactos/ntoskrnl/ntoskrnl.edf +++ b/reactos/ntoskrnl/ntoskrnl.edf @@ -1,4 +1,4 @@ -; $Id: ntoskrnl.edf,v 1.21 1999/12/26 20:21:02 ea Exp $ +; $Id: ntoskrnl.edf,v 1.22 1999/12/27 15:05:33 ekohl Exp $ ; ; reactos/ntoskrnl/ntoskrnl.def ; @@ -250,12 +250,12 @@ RtlMultiByteToUnicodeN=RtlMultiByteToUnicodeN@20 RtlMultiByteToUnicodeSize=RtlMultiByteToUnicodeSize@12 RtlOemStringToUnicodeSize=RtlOemStringToUnicodeSize@4 RtlOemStringToUnicodeString=RtlOemStringToUnicodeString@12 -RtlSecondsSince1970ToTime -RtlSecondsSince1980ToTime -RtlTimeFieldsToTime -RtlTimeToSecondsSince1970 -RtlTimeToSecondsSince1980 -RtlTimeToTimeFields +RtlSecondsSince1970ToTime=RtlSecondsSince1970ToTime@8 +RtlSecondsSince1980ToTime=RtlSecondsSince1980ToTime@8 +RtlTimeFieldsToTime=RtlTimeFieldsToTime@8 +RtlTimeToSecondsSince1970=RtlTimeToSecondsSince1970@8 +RtlTimeToSecondsSince1980=RtlTimeToSecondsSince1980@8 +RtlTimeToTimeFields=RtlTimeToTimeFields@8 RtlUnicodeStringToAnsiSize=RtlUnicodeStringToAnsiSize@4 RtlUnicodeStringToAnsiString=RtlUnicodeStringToAnsiString@12 RtlUnicodeStringToInteger=RtlUnicodeStringToInteger@12 diff --git a/reactos/ntoskrnl/rtl/time.c b/reactos/ntoskrnl/rtl/time.c index 2b64714347e..4bffe35bbcb 100644 --- a/reactos/ntoskrnl/rtl/time.c +++ b/reactos/ntoskrnl/rtl/time.c @@ -1,4 +1,4 @@ -/* $Id: time.c,v 1.8 1999/10/24 17:51:54 ekohl Exp $ +/* $Id: time.c,v 1.9 1999/12/27 15:05:15 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -58,8 +58,12 @@ static __inline void NormalizeTimeFields(CSHORT *FieldToNormalize, /* FUNCTIONS *****************************************************************/ -VOID RtlTimeToTimeFields(PLARGE_INTEGER liTime, - PTIME_FIELDS TimeFields) +VOID +STDCALL +RtlTimeToTimeFields ( + PLARGE_INTEGER liTime, + PTIME_FIELDS TimeFields + ) { const int *Months; int LeapSecondCorrections, SecondsInDay, CurYear; @@ -128,8 +132,12 @@ VOID RtlTimeToTimeFields(PLARGE_INTEGER liTime, TimeFields->Day = (CSHORT) (Days + 1); } -BOOLEAN RtlTimeFieldsToTime(PTIME_FIELDS tfTimeFields, - PLARGE_INTEGER Time) +BOOLEAN +STDCALL +RtlTimeFieldsToTime ( + PTIME_FIELDS tfTimeFields, + PLARGE_INTEGER Time + ) { int CurYear, CurMonth, MonthLength; long long int rcTime; @@ -197,8 +205,11 @@ BOOLEAN RtlTimeFieldsToTime(PTIME_FIELDS tfTimeFields, VOID -RtlSecondsSince1970ToTime (ULONG SecondsSince1970, - PLARGE_INTEGER Time) +STDCALL +RtlSecondsSince1970ToTime ( + ULONG SecondsSince1970, + PLARGE_INTEGER Time + ) { LONGLONG llTime; @@ -209,8 +220,11 @@ RtlSecondsSince1970ToTime (ULONG SecondsSince1970, VOID -RtlSecondsSince1980ToTime (ULONG SecondsSince1980, - PLARGE_INTEGER Time) +STDCALL +RtlSecondsSince1980ToTime ( + ULONG SecondsSince1980, + PLARGE_INTEGER Time + ) { LONGLONG llTime; @@ -221,8 +235,11 @@ RtlSecondsSince1980ToTime (ULONG SecondsSince1980, BOOLEAN -RtlTimeToSecondsSince1970 (PLARGE_INTEGER Time, - PULONG SecondsSince1970) +STDCALL +RtlTimeToSecondsSince1970 ( + PLARGE_INTEGER Time, + PULONG SecondsSince1970 + ) { LARGE_INTEGER liTime; @@ -239,8 +256,11 @@ RtlTimeToSecondsSince1970 (PLARGE_INTEGER Time, BOOLEAN -RtlTimeToSecondsSince1980 (PLARGE_INTEGER Time, - PULONG SecondsSince1980) +STDCALL +RtlTimeToSecondsSince1980 ( + PLARGE_INTEGER Time, + PULONG SecondsSince1980 + ) { LARGE_INTEGER liTime;