From 0db4c66b1eaa8180a6d4c5b6c9e11008df9c049c Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Mon, 17 Nov 2003 20:35:46 +0000 Subject: [PATCH] Fixes for ntdll rtl and large int tests. Added crc32 support to ntdll. fix some unimplemented tags. svn path=/trunk/; revision=6680 --- reactos/lib/ntdll/makefile | 4 +- reactos/lib/ntdll/rtl/compress.c | 4 +- reactos/lib/ntdll/rtl/crc32.c | 112 +++++++++++++++++++++++++++++++ reactos/lib/ntdll/rtl/mem.c | 105 +++++++++++++++++++++++------ reactos/lib/ntdll/rtl/misc.c | 4 +- reactos/lib/ntdll/rtl/path.c | 6 +- reactos/lib/ntdll/rtl/time.c | 6 +- reactos/lib/ntdll/stdlib/itoa.c | 105 +++++++++++------------------ reactos/lib/ntdll/stubs/stubs.c | 44 ------------ 9 files changed, 248 insertions(+), 142 deletions(-) create mode 100644 reactos/lib/ntdll/rtl/crc32.c diff --git a/reactos/lib/ntdll/makefile b/reactos/lib/ntdll/makefile index 8693af70e4c..5355c9a7e60 100644 --- a/reactos/lib/ntdll/makefile +++ b/reactos/lib/ntdll/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.94 2003/09/12 17:51:47 vizzini Exp $ +# $Id: makefile,v 1.95 2003/11/17 20:35:46 sedwards Exp $ PATH_TO_TOP = ../.. @@ -54,7 +54,7 @@ RTL_I386_OBJECTS = \ rtl/i386/float.o \ rtl/i386/ftol.o -RTL_OBJECTS = rtl/critical.o rtl/error.o rtl/heap.o rtl/largeint.o \ +RTL_OBJECTS = rtl/critical.o rtl/crc32.o rtl/error.o rtl/heap.o rtl/largeint.o \ rtl/math.o rtl/mem.o rtl/nls.o rtl/process.o rtl/sd.o \ rtl/thread.o rtl/unicode.o rtl/env.o rtl/path.o rtl/ppb.o \ rtl/bitmap.o rtl/time.o rtl/acl.o rtl/sid.o rtl/image.o \ diff --git a/reactos/lib/ntdll/rtl/compress.c b/reactos/lib/ntdll/rtl/compress.c index c21d44b992b..6e816342559 100644 --- a/reactos/lib/ntdll/rtl/compress.c +++ b/reactos/lib/ntdll/rtl/compress.c @@ -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: compress.c,v 1.2 2003/07/11 13:50:23 royce Exp $ +/* $Id: compress.c,v 1.3 2003/11/17 20:35:46 sedwards Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -186,7 +186,7 @@ RtlDescribeChunk(IN USHORT CompressionFormat, /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL RtlGetCompressionWorkSpaceSize(IN USHORT CompressionFormatAndEngine, diff --git a/reactos/lib/ntdll/rtl/crc32.c b/reactos/lib/ntdll/rtl/crc32.c new file mode 100644 index 00000000000..6cbb8ccb6dc --- /dev/null +++ b/reactos/lib/ntdll/rtl/crc32.c @@ -0,0 +1,112 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: crc32 functions + * FILE: lib/ntdll/rtl/crc32.c + * PROGRAMER: Steven Edwards + * REVISION HISTORY: + * 11/15/2000: Created + */ + +/* This work is based off of rtl.c in Wine. + * Please give credit where credit is due: + * + * Copyright 1996-1998 Marcus Meissner + * Copyright 1999 Alex Korobka + * Copyright 2003 Thomas Mertes + * Crc32 code Copyright 1986 Gary S. Brown (Public domain) + */ + +/* INCLUDES *****************************************************************/ + +#include +#include +#include + +/* GLOBALS ******************************************************************/ + +extern ULONG NtGlobalFlag; + +/* FUNCTIONS ****************************************************************/ + +/* CRC polynomial 0xedb88320 */ +static const DWORD CRC_table[256] = +{ + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, + 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, + 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, + 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, + 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, + 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, + 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, + 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, + 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, + 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, + 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, + 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, + 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, + 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, + 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, + 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, + 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, + 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, + 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, + 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, + 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, + 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, + 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, + 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, + 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, + 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, + 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, + 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, + 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, + 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, + 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, + 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, + 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, + 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, + 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, + 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, + 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, + 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, + 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d +}; + +/********************************************************************* + * RtlComputeCrc32 [NTDLL.@] + * + * Calculate the CRC32 checksum of a block of bytes + * + * PARAMS + * dwInitial [I] Initial CRC value + * pData [I] Data block + * iLen [I] Length of the byte block + * + * RETURNS + * The cumulative CRC32 of dwInitial and iLen bytes of the pData block. + * + * @implemented + */ +DWORD STDCALL RtlComputeCrc32(DWORD dwInitial, PBYTE pData, INT iLen) +{ + DWORD crc = ~dwInitial; + +#ifdef DBG + DbgPrint("(%ld,%p,%d)\n", dwInitial, pData, iLen); +#endif + + while (iLen > 0) + { + crc = CRC_table[(crc ^ *pData) & 0xff] ^ (crc >> 8); + pData++; + iLen--; + } + return ~crc; +} + +/* EOF */ diff --git a/reactos/lib/ntdll/rtl/mem.c b/reactos/lib/ntdll/rtl/mem.c index ba089c5c151..9bba7a4e1ba 100644 --- a/reactos/lib/ntdll/rtl/mem.c +++ b/reactos/lib/ntdll/rtl/mem.c @@ -1,4 +1,4 @@ -/* $Id: mem.c,v 1.13 2003/07/11 13:50:23 royce Exp $ +/* $Id: mem.c,v 1.14 2003/11/17 20:35:46 sedwards Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -16,30 +16,31 @@ /* FUNCTIONS *****************************************************************/ +/****************************************************************************** + * RtlCompareMemory [NTDLL.@] + * + * Compare one block of memory with another + * + * PARAMS + * Source1 [I] Source block + * Source2 [I] Block to compare to Source1 + * Length [I] Number of bytes to fill + * + * RETURNS + * The length of the first byte at which Source1 and Source2 differ, or Length + * if they are the same. + * + * @implemented + */ ULONG STDCALL RtlCompareMemory(PVOID Source1, PVOID Source2, ULONG Length) -/* - * FUNCTION: Compares blocks of memory and returns the number of equal bytes - * ARGUMENTS: - * Source1 = Block to compare - * Source2 = Block to compare - * Length = Number of bytes to compare - * RETURNS: Number of equal bytes - */ { - int i,total; - - for (i=0,total=0;i> 8) | (Source << 8); +} + +/************************************************************************* + * RtlUlongByteSwap [NTDLL.@] + * + * Swap the bytes of an unsigned int value. + * + * NOTES + * Based on the inline versions in Wine winternl.h + * + * @implemented + */ +ULONG +FASTCALL +RtlUlongByteSwap( + IN ULONG Source + ) +{ +#if defined(__i386__) && defined(__GNUC__) + ULONG ret; + __asm__("bswap %0" : "=r" (ret) : "0" (Source) ); + return ret; +#else + return ((ULONG)RtlUshortByteSwap((USHORT)Source) << 16) | RtlUshortByteSwap((USHORT)(Source >> 16)); +#endif +} + +/************************************************************************* + * RtlUlonglongByteSwap [NTDLL.@] + * + * Swap the bytes of an unsigned long long value. + * + * PARAMS + * i [I] Value to swap bytes of + * + * RETURNS + * The value with its bytes swapped. + * + * @implemented + */ +ULONGLONG +FASTCALL +RtlUlonglongByteSwap( + IN ULONGLONG Source + ) +{ + return ((ULONGLONG)RtlUlongByteSwap(Source) << 32) | RtlUlongByteSwap(Source>>32); +} + /* EOF */ diff --git a/reactos/lib/ntdll/rtl/misc.c b/reactos/lib/ntdll/rtl/misc.c index 9b173eea653..52055b06f00 100644 --- a/reactos/lib/ntdll/rtl/misc.c +++ b/reactos/lib/ntdll/rtl/misc.c @@ -1,4 +1,4 @@ -/* $Id: misc.c,v 1.8 2003/07/24 19:53:11 hbirr Exp $ +/* $Id: misc.c,v 1.9 2003/11/17 20:35:46 sedwards Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -123,5 +123,3 @@ RtlGetNtVersionNumbers(LPDWORD major, LPDWORD minor, LPDWORD build) *build = (0xF0000000 | pPeb->OSBuildNumber); } } - -/* EOF */ diff --git a/reactos/lib/ntdll/rtl/path.c b/reactos/lib/ntdll/rtl/path.c index 854bf40ed73..3fd39222445 100644 --- a/reactos/lib/ntdll/rtl/path.c +++ b/reactos/lib/ntdll/rtl/path.c @@ -1,4 +1,4 @@ -/* $Id: path.c,v 1.24 2003/10/19 19:51:48 navaraf Exp $ +/* $Id: path.c,v 1.25 2003/11/17 20:35:46 sedwards Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -736,7 +736,7 @@ CHECKPOINT; /* - * @unimplemented + * @implemented */ BOOLEAN STDCALL RtlDosPathNameToNtPathName_U(PWSTR dosname, @@ -931,7 +931,7 @@ RtlDosSearchPath_U ( /* - * @unimplemented + * @implemented */ BOOLEAN STDCALL RtlDoesFileExists_U(IN PWSTR FileName) diff --git a/reactos/lib/ntdll/rtl/time.c b/reactos/lib/ntdll/rtl/time.c index 9c1650a4c43..990a4d03788 100644 --- a/reactos/lib/ntdll/rtl/time.c +++ b/reactos/lib/ntdll/rtl/time.c @@ -1,4 +1,4 @@ -/* $Id: time.c,v 1.16 2003/07/11 23:58:45 ekohl Exp $ +/* $Id: time.c,v 1.17 2003/11/17 20:35:46 sedwards Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -56,7 +56,7 @@ static __inline void NormalizeTimeFields(CSHORT *FieldToNormalize, /* FUNCTIONS *****************************************************************/ /* - * @unimplemented + * @implemented */ VOID STDCALL @@ -141,7 +141,7 @@ RtlTimeToTimeFields( /* - * @unimplemented + * @implemented */ BOOLEAN STDCALL diff --git a/reactos/lib/ntdll/stdlib/itoa.c b/reactos/lib/ntdll/stdlib/itoa.c index b9468e9f438..0e5a5c3105e 100644 --- a/reactos/lib/ntdll/stdlib/itoa.c +++ b/reactos/lib/ntdll/stdlib/itoa.c @@ -7,9 +7,16 @@ * UPDATE HISTORY: * 1995: Created * 1998: Added ltoa Boudewijn Dekker + * 2003: Corrected ltoa implementation - Steven Edwards */ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details + * Copyright 2000 Alexandre Julliard + * Copyright 2000 Jon Griffiths + * Copyright 2003 Thomas Mertes + */ + #include +#include /* * @implemented @@ -60,40 +67,7 @@ _i64toa(__int64 value, char *string, int radix) char * _itoa(int value, char *string, int radix) { - char tmp[33]; - char *tp = tmp; - int i; - unsigned v; - int sign; - char *sp; - - if (radix > 36 || radix <= 1) - { - return 0; - } - - sign = (radix == 10 && value < 0); - if (sign) - v = -value; - else - v = (unsigned)value; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+'0'; - else - *tp++ = i + 'a' - 10; - } - - sp = string; - if (sign) - *sp++ = '-'; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + return _ltoa(value, string, radix); } @@ -103,40 +77,39 @@ _itoa(int value, char *string, int radix) char * _ltoa(long value, char *string, int radix) { - char tmp[33]; - char *tp = tmp; - long i; - unsigned long v; - int sign; - char *sp; + unsigned long val; + int negative; + char buffer[33]; + char *pos; + int digit; - if (radix > 36 || radix <= 1) - { - return 0; - } + if (value < 0 && radix == 10) { + negative = 1; + val = -value; + } else { + negative = 0; + val = value; + } /* if */ - sign = (radix == 10 && value < 0); - if (sign) - v = -value; - else - v = (unsigned long)value; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+'0'; - else - *tp++ = i + 'a' - 10; - } + pos = &buffer[32]; + *pos = '\0'; - sp = string; - if (sign) - *sp++ = '-'; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + do { + digit = val % radix; + val = val / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (val != 0L); + + if (negative) { + *--pos = '-'; + } /* if */ + + memcpy(string, pos, &buffer[32] - pos + 1); + return string; } diff --git a/reactos/lib/ntdll/stubs/stubs.c b/reactos/lib/ntdll/stubs/stubs.c index 7bf9796a127..079ab0f078d 100644 --- a/reactos/lib/ntdll/stubs/stubs.c +++ b/reactos/lib/ntdll/stubs/stubs.c @@ -198,14 +198,6 @@ RtlCaptureContext ( { } -/* - * @unimplemented - */ -DWORD STDCALL RtlComputeCrc32(DWORD dwInitial, PBYTE pData, INT iLen) -{ - return(FALSE); -} - /* * @unimplemented */ @@ -900,42 +892,6 @@ RtlStringFromGUID( return(FALSE); } -/* - * @unimplemented - */ -USHORT -FASTCALL -RtlUshortByteSwap( - IN USHORT Source - ) -{ - return(FALSE); -} - -/* - * @unimplemented - */ -ULONG -FASTCALL -RtlUlongByteSwap( - IN ULONG Source - ) -{ - return(FALSE); -} - -/* - * @unimplemented - */ -ULONGLONG -FASTCALL -RtlUlonglongByteSwap( - IN ULONGLONG Source - ) -{ - return(FALSE); -} - /* * @unimplemented */