From 5e2ff077e813284bc5f0f93059d98d4fd0501a5e Mon Sep 17 00:00:00 2001 From: Robert Dickenson Date: Sun, 8 Dec 2002 16:23:33 +0000 Subject: [PATCH] minor format modifications to reduce diffs with duplicates elsewhere in tree. comment out depends rule in makefile since it doesn't work when building on windows. svn path=/trunk/; revision=3836 --- reactos/ntoskrnl/Makefile | 5 +- reactos/ntoskrnl/rtl/error.c | 7 +- reactos/ntoskrnl/rtl/largeint.c | 5 +- reactos/ntoskrnl/rtl/mem.c | 8 +- reactos/ntoskrnl/rtl/time.c | 34 +++----- reactos/ntoskrnl/rtl/unicode.c | 145 +++++++++++++++++++++----------- 6 files changed, 123 insertions(+), 81 deletions(-) diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile index be57d4b2075..97e81154f2d 100644 --- a/reactos/ntoskrnl/Makefile +++ b/reactos/ntoskrnl/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.86 2002/10/26 00:32:18 chorns Exp $ +# $Id: Makefile,v 1.87 2002/12/08 16:23:33 robd Exp $ # # ReactOS Operating System # @@ -350,7 +350,8 @@ TAG_OBJECTS := $(join $(dir $(DEP_OBJECTS)),$(patsubst %.o, .%.TAG, $(notdir $(D # Include automatic dependancy tracking # DEP_EXCLUDE_FILTER := ex/napi.% nt/zw.% -include $(PATH_TO_TOP)/tools/depend.mk +# FIXME: Disabled +#include $(PATH_TO_TOP)/tools/depend.mk # Resources diff --git a/reactos/ntoskrnl/rtl/error.c b/reactos/ntoskrnl/rtl/error.c index 57075edd745..8e90792de8a 100644 --- a/reactos/ntoskrnl/rtl/error.c +++ b/reactos/ntoskrnl/rtl/error.c @@ -1,4 +1,4 @@ -/* $Id: error.c,v 1.6 2002/11/10 18:17:42 chorns Exp $ +/* $Id: error.c,v 1.7 2002/12/08 16:23:32 robd Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -826,7 +826,8 @@ RPC_NT_SS_CONTEXT_MISMATCH ERROR_INVALID_HANDLE /* FUNCTIONS ***************************************************************/ -VOID STDCALL +VOID +STDCALL RtlAssert(PVOID FailedAssertion, PVOID FileName, ULONG LineNumber, @@ -880,7 +881,9 @@ RtlNtStatusToDosErrorNoTeb(IN NTSTATUS Status) if (!ret) ret = Status; /* 0 means 1:1 mapping */ else if (ret == ERROR_MR_MID_NOT_FOUND) + { DbgPrint("RTL: RtlNtStatusToDosErrorNoTeb(0x%lx): no valid W32 error mapping\n", Status); + } return ret; } Table++; diff --git a/reactos/ntoskrnl/rtl/largeint.c b/reactos/ntoskrnl/rtl/largeint.c index 7d93b5009e9..2364d9ee22f 100644 --- a/reactos/ntoskrnl/rtl/largeint.c +++ b/reactos/ntoskrnl/rtl/largeint.c @@ -1,4 +1,4 @@ -/* $Id: largeint.c,v 1.12 2002/09/08 10:23:41 chorns Exp $ +/* $Id: largeint.c,v 1.13 2002/12/08 16:23:32 robd Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -119,7 +119,8 @@ RtlExtendedLargeIntegerDivide ( return RC; } -LARGE_INTEGER STDCALL +LARGE_INTEGER +STDCALL RtlExtendedMagicDivide (LARGE_INTEGER Dividend, LARGE_INTEGER MagicDivisor, CCHAR ShiftCount) diff --git a/reactos/ntoskrnl/rtl/mem.c b/reactos/ntoskrnl/rtl/mem.c index c415a12bad0..0234ee08dca 100644 --- a/reactos/ntoskrnl/rtl/mem.c +++ b/reactos/ntoskrnl/rtl/mem.c @@ -1,4 +1,4 @@ -/* $Id: mem.c,v 1.17 2002/11/10 18:17:42 chorns Exp $ +/* $Id: mem.c,v 1.18 2002/12/08 16:23:32 robd Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -64,11 +64,9 @@ MmCopyFromCaller(PVOID Dest, PVOID Src, ULONG NumberOfBytes) ULONG STDCALL -RtlCompareMemory ( - PVOID Source1, +RtlCompareMemory(PVOID Source1, PVOID Source2, - ULONG Length - ) + ULONG Length) /* * FUNCTION: Compares blocks of memory and returns the number of equal bytes * ARGUMENTS: diff --git a/reactos/ntoskrnl/rtl/time.c b/reactos/ntoskrnl/rtl/time.c index e5512f75df2..57188c99030 100644 --- a/reactos/ntoskrnl/rtl/time.c +++ b/reactos/ntoskrnl/rtl/time.c @@ -1,4 +1,4 @@ -/* $Id: time.c,v 1.15 2002/11/10 18:17:42 chorns Exp $ +/* $Id: time.c,v 1.16 2002/12/08 16:23:32 robd Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -60,10 +60,9 @@ static __inline void NormalizeTimeFields(CSHORT *FieldToNormalize, VOID STDCALL -RtlTimeToTimeFields ( +RtlTimeToTimeFields( PLARGE_INTEGER liTime, - PTIME_FIELDS TimeFields - ) + PTIME_FIELDS TimeFields) { const int *Months; int LeapSecondCorrections, SecondsInDay, CurYear; @@ -111,13 +110,13 @@ RtlTimeToTimeFields ( /* compute year */ CurYear = EPOCHYEAR; - /* FIXME: handle calendar modifications */ CurYear += Days / DAYSPERLEAPYEAR; Days -= (CurYear - EPOCHYEAR) * DAYSPERLEAPYEAR; CurYear--; /* The next calculation needs CurYear - 1 */ Days += CurYear - CurYear / 4 + CurYear / 100 - CurYear / 400; CurYear++; Days -= EPOCHYEAR - 1 - (EPOCHYEAR -1) / 4 + (EPOCHYEAR -1) / 100 - (EPOCHYEAR - 1) / 400; + /* FIXME: handle calendar modifications */ while (1) { LeapYear = IsLeapYear(CurYear); @@ -141,10 +140,9 @@ RtlTimeToTimeFields ( BOOLEAN STDCALL -RtlTimeFieldsToTime ( +RtlTimeFieldsToTime( PTIME_FIELDS tfTimeFields, - PLARGE_INTEGER Time - ) + PLARGE_INTEGER Time) { int CurMonth; long long int rcTime; @@ -195,10 +193,9 @@ RtlTimeFieldsToTime ( VOID STDCALL -RtlSecondsSince1970ToTime ( +RtlSecondsSince1970ToTime( ULONG SecondsSince1970, - PLARGE_INTEGER Time - ) + PLARGE_INTEGER Time) { LONGLONG llTime; @@ -210,10 +207,9 @@ RtlSecondsSince1970ToTime ( VOID STDCALL -RtlSecondsSince1980ToTime ( +RtlSecondsSince1980ToTime( ULONG SecondsSince1980, - PLARGE_INTEGER Time - ) + PLARGE_INTEGER Time) { LONGLONG llTime; @@ -225,10 +221,9 @@ RtlSecondsSince1980ToTime ( BOOLEAN STDCALL -RtlTimeToSecondsSince1970 ( +RtlTimeToSecondsSince1970( PLARGE_INTEGER Time, - PULONG SecondsSince1970 - ) + PULONG SecondsSince1970) { LARGE_INTEGER liTime; @@ -246,10 +241,9 @@ RtlTimeToSecondsSince1970 ( BOOLEAN STDCALL -RtlTimeToSecondsSince1980 ( +RtlTimeToSecondsSince1980( PLARGE_INTEGER Time, - PULONG SecondsSince1980 - ) + PULONG SecondsSince1980) { LARGE_INTEGER liTime; diff --git a/reactos/ntoskrnl/rtl/unicode.c b/reactos/ntoskrnl/rtl/unicode.c index a2dbcacd65b..f805475b591 100644 --- a/reactos/ntoskrnl/rtl/unicode.c +++ b/reactos/ntoskrnl/rtl/unicode.c @@ -1,4 +1,4 @@ -/* $Id: unicode.c,v 1.25 2002/11/10 18:17:42 chorns Exp $ +/* $Id: unicode.c,v 1.26 2002/12/08 16:23:32 robd Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -26,7 +26,8 @@ /* FUNCTIONS *****************************************************************/ -WCHAR STDCALL +WCHAR +STDCALL RtlAnsiCharToUnicodeChar(IN CHAR AnsiChar) { ULONG Size; @@ -47,7 +48,8 @@ RtlAnsiCharToUnicodeChar(IN CHAR AnsiChar) } -ULONG STDCALL +ULONG +STDCALL RtlAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString) { ULONG Size; @@ -60,7 +62,8 @@ RtlAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString) } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlAnsiStringToUnicodeString(IN OUT PUNICODE_STRING DestinationString, IN PANSI_STRING SourceString, IN BOOLEAN AllocateDestinationString) @@ -117,7 +120,8 @@ RtlAnsiStringToUnicodeString(IN OUT PUNICODE_STRING DestinationString, } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlAppendAsciizToString(IN OUT PSTRING Destination, IN PCSZ Source) { @@ -144,7 +148,8 @@ RtlAppendAsciizToString(IN OUT PSTRING Destination, } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlAppendStringToString(IN OUT PSTRING Destination, IN PSTRING Source) { @@ -169,7 +174,8 @@ RtlAppendStringToString(IN OUT PSTRING Destination, } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlAppendUnicodeStringToString(IN OUT PUNICODE_STRING Destination, IN PUNICODE_STRING Source) { @@ -226,7 +232,8 @@ RtlAppendUnicodeToString(IN OUT PUNICODE_STRING Destination, } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlCharToInteger(IN PCSZ String, IN ULONG Base, IN OUT PULONG Value) @@ -265,7 +272,8 @@ RtlCharToInteger(IN PCSZ String, } -LONG STDCALL +LONG +STDCALL RtlCompareString(IN PSTRING String1, IN PSTRING String2, IN BOOLEAN CaseInsensitive) @@ -310,7 +318,8 @@ RtlCompareString(IN PSTRING String1, } -LONG STDCALL +LONG +STDCALL RtlCompareUnicodeString(IN PUNICODE_STRING String1, IN PUNICODE_STRING String2, IN BOOLEAN CaseInsensitive) @@ -355,7 +364,8 @@ RtlCompareUnicodeString(IN PUNICODE_STRING String1, } -VOID STDCALL +VOID +STDCALL RtlCopyString(IN OUT PSTRING DestinationString, IN PSTRING SourceString) { @@ -385,7 +395,8 @@ RtlCopyString(IN OUT PSTRING DestinationString, } -VOID STDCALL +VOID +STDCALL RtlCopyUnicodeString(IN OUT PUNICODE_STRING DestinationString, IN PUNICODE_STRING SourceString) { @@ -415,7 +426,8 @@ RtlCopyUnicodeString(IN OUT PUNICODE_STRING DestinationString, } -BOOLEAN STDCALL +BOOLEAN +STDCALL RtlCreateUnicodeString(IN OUT PUNICODE_STRING Destination, IN PWSTR Source) { @@ -440,7 +452,8 @@ RtlCreateUnicodeString(IN OUT PUNICODE_STRING Destination, } -BOOLEAN STDCALL +BOOLEAN +STDCALL RtlCreateUnicodeStringFromAsciiz(IN OUT PUNICODE_STRING Destination, IN PCSZ Source) { @@ -458,7 +471,8 @@ RtlCreateUnicodeStringFromAsciiz(IN OUT PUNICODE_STRING Destination, } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlDowncaseUnicodeString(IN OUT PUNICODE_STRING DestinationString, IN PUNICODE_STRING SourceString, IN BOOLEAN AllocateDestinationString) @@ -510,7 +524,8 @@ RtlDowncaseUnicodeString(IN OUT PUNICODE_STRING DestinationString, } -BOOLEAN STDCALL +BOOLEAN +STDCALL RtlEqualString(IN PSTRING String1, IN PSTRING String2, IN BOOLEAN CaseInsensitive) @@ -552,7 +567,8 @@ RtlEqualString(IN PSTRING String1, } -BOOLEAN STDCALL +BOOLEAN +STDCALL RtlEqualUnicodeString(IN PUNICODE_STRING String1, IN PUNICODE_STRING String2, IN BOOLEAN CaseInsensitive) @@ -593,7 +609,8 @@ RtlEqualUnicodeString(IN PUNICODE_STRING String1, } -VOID STDCALL +VOID +STDCALL RtlFreeAnsiString(IN PANSI_STRING AnsiString) { if (AnsiString->Buffer == NULL) @@ -607,7 +624,8 @@ RtlFreeAnsiString(IN PANSI_STRING AnsiString) } -VOID STDCALL +VOID +STDCALL RtlFreeOemString(IN POEM_STRING OemString) { if (OemString->Buffer == NULL) @@ -621,7 +639,8 @@ RtlFreeOemString(IN POEM_STRING OemString) } -VOID STDCALL +VOID +STDCALL RtlFreeUnicodeString(IN PUNICODE_STRING UnicodeString) { if (UnicodeString->Buffer == NULL) @@ -635,7 +654,8 @@ RtlFreeUnicodeString(IN PUNICODE_STRING UnicodeString) } -VOID STDCALL +VOID +STDCALL RtlInitAnsiString(IN OUT PANSI_STRING DestinationString, IN PCSZ SourceString) { @@ -656,7 +676,8 @@ RtlInitAnsiString(IN OUT PANSI_STRING DestinationString, } -VOID STDCALL +VOID +STDCALL RtlInitString(IN OUT PSTRING DestinationString, IN PCSZ SourceString) { @@ -677,7 +698,8 @@ RtlInitString(IN OUT PSTRING DestinationString, } -VOID STDCALL +VOID +STDCALL RtlInitUnicodeString(IN OUT PUNICODE_STRING DestinationString, IN PCWSTR SourceString) { @@ -702,7 +724,8 @@ RtlInitUnicodeString(IN OUT PUNICODE_STRING DestinationString, } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlIntegerToChar(IN ULONG Value, IN ULONG Base, IN ULONG Length, @@ -747,7 +770,8 @@ RtlIntegerToChar(IN ULONG Value, } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlIntegerToUnicodeString(IN ULONG Value, IN ULONG Base, /* optional */ IN OUT PUNICODE_STRING String) @@ -775,7 +799,8 @@ RtlIntegerToUnicodeString(IN ULONG Value, } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlOemStringToCountedUnicodeString(IN OUT PUNICODE_STRING DestinationString, IN POEM_STRING SourceString, IN BOOLEAN AllocateDestinationString) @@ -830,7 +855,8 @@ RtlOemStringToCountedUnicodeString(IN OUT PUNICODE_STRING DestinationString, } -ULONG STDCALL +ULONG +STDCALL RtlOemStringToUnicodeSize(IN POEM_STRING OemString) { ULONG Size; @@ -843,7 +869,8 @@ RtlOemStringToUnicodeSize(IN POEM_STRING OemString) } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlOemStringToUnicodeString(IN OUT PUNICODE_STRING DestinationString, IN POEM_STRING SourceString, IN BOOLEAN AllocateDestinationString) @@ -900,7 +927,8 @@ RtlOemStringToUnicodeString(IN OUT PUNICODE_STRING DestinationString, } -BOOLEAN STDCALL +BOOLEAN +STDCALL RtlPrefixString(IN PANSI_STRING String1, IN PANSI_STRING String2, IN BOOLEAN CaseInsensitive) @@ -940,7 +968,8 @@ RtlPrefixString(IN PANSI_STRING String1, } -BOOLEAN STDCALL +BOOLEAN +STDCALL RtlPrefixUnicodeString(IN PUNICODE_STRING String1, IN PUNICODE_STRING String2, IN BOOLEAN CaseInsensitive) @@ -981,7 +1010,8 @@ RtlPrefixUnicodeString(IN PUNICODE_STRING String1, } -ULONG STDCALL +ULONG +STDCALL RtlUnicodeStringToAnsiSize(IN PUNICODE_STRING UnicodeString) { ULONG Size; @@ -994,7 +1024,8 @@ RtlUnicodeStringToAnsiSize(IN PUNICODE_STRING UnicodeString) } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlUnicodeStringToAnsiString(IN OUT PANSI_STRING DestinationString, IN PUNICODE_STRING SourceString, IN BOOLEAN AllocateDestinationString) @@ -1046,7 +1077,8 @@ RtlUnicodeStringToAnsiString(IN OUT PANSI_STRING DestinationString, } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlUnicodeStringToCountedOemString(IN OUT POEM_STRING DestinationString, IN PUNICODE_STRING SourceString, IN BOOLEAN AllocateDestinationString) @@ -1108,7 +1140,8 @@ RtlUnicodeStringToCountedOemString(IN OUT POEM_STRING DestinationString, } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlUnicodeStringToInteger(IN PUNICODE_STRING String, IN ULONG Base, OUT PULONG Value) @@ -1195,7 +1228,8 @@ RtlUnicodeStringToInteger(IN PUNICODE_STRING String, } -ULONG STDCALL +ULONG +STDCALL RtlUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString) { ULONG Size; @@ -1207,7 +1241,8 @@ RtlUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString) } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlUnicodeStringToOemString(IN OUT POEM_STRING DestinationString, IN PUNICODE_STRING SourceString, IN BOOLEAN AllocateDestinationString) @@ -1259,7 +1294,8 @@ RtlUnicodeStringToOemString(IN OUT POEM_STRING DestinationString, } -WCHAR STDCALL +WCHAR +STDCALL RtlUpcaseUnicodeChar(IN WCHAR Source) { if (Source < L'a') @@ -1313,7 +1349,8 @@ RtlUpcaseUnicodeString(IN OUT PUNICODE_STRING DestinationString, } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlUpcaseUnicodeStringToAnsiString(IN OUT PANSI_STRING DestinationString, IN PUNICODE_STRING SourceString, IN BOOLEAN AllocateDestinationString) @@ -1365,7 +1402,8 @@ RtlUpcaseUnicodeStringToAnsiString(IN OUT PANSI_STRING DestinationString, } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlUpcaseUnicodeStringToCountedOemString(IN OUT POEM_STRING DestinationString, IN PUNICODE_STRING SourceString, IN BOOLEAN AllocateDestinationString) @@ -1426,7 +1464,8 @@ RtlUpcaseUnicodeStringToCountedOemString(IN OUT POEM_STRING DestinationString, } -NTSTATUS STDCALL +NTSTATUS +STDCALL RtlUpcaseUnicodeStringToOemString(IN OUT POEM_STRING DestinationString, IN PUNICODE_STRING SourceString, IN BOOLEAN AllocateDestinationString) @@ -1478,7 +1517,8 @@ RtlUpcaseUnicodeStringToOemString(IN OUT POEM_STRING DestinationString, } -CHAR STDCALL +CHAR +STDCALL RtlUpperChar(IN CHAR Source) { WCHAR Unicode; @@ -1513,7 +1553,8 @@ RtlUpperChar(IN CHAR Source) } -VOID STDCALL +VOID +STDCALL RtlUpperString(PSTRING DestinationString, PSTRING SourceString) { @@ -1539,31 +1580,35 @@ RtlUpperString(PSTRING DestinationString, } -ULONG STDCALL +ULONG +STDCALL RtlxAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString) { - return(RtlAnsiStringToUnicodeSize(AnsiString)); + return RtlAnsiStringToUnicodeSize(AnsiString); } -ULONG STDCALL +ULONG +STDCALL RtlxOemStringToUnicodeSize(IN POEM_STRING OemString) { - return(RtlOemStringToUnicodeSize((PANSI_STRING)OemString)); + return RtlOemStringToUnicodeSize((PANSI_STRING)OemString); } -ULONG STDCALL +ULONG +STDCALL RtlxUnicodeStringToAnsiSize(IN PUNICODE_STRING UnicodeString) { - return(RtlUnicodeStringToAnsiSize(UnicodeString)); + return RtlUnicodeStringToAnsiSize(UnicodeString); } -ULONG STDCALL +ULONG +STDCALL RtlxUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString) { - return(RtlUnicodeStringToOemSize(UnicodeString)); + return RtlUnicodeStringToOemSize(UnicodeString); } /* EOF */