Correct the agument count for RtlInitializeGenericTable().
Fix my own brown paper bag in RtlFillMemoryUlong(). RtlGetNtVersionNumbers() should never return < 5. Remove RtlCopyMemory(), its not an ntdll export. Implement RtlCompareMemoryUlong(), RtlComputeCrc32(). Documentation updates.
This commit is contained in:
Jon Griffiths
Alexandre Julliard
parent
03e4ea1789
commit
ccf2f6162b
|
|
@ -295,10 +295,11 @@
|
|||
@ stdcall RtlClearBits(ptr long long) RtlClearBits
|
||||
@ stdcall RtlCompactHeap(long long) RtlCompactHeap
|
||||
@ stdcall RtlCompareMemory(ptr ptr long) RtlCompareMemory
|
||||
@ stub RtlCompareMemoryUlong
|
||||
@ stdcall RtlCompareMemoryUlong(ptr ptr long) RtlCompareMemoryUlong
|
||||
@ stdcall RtlCompareString(ptr ptr long) RtlCompareString
|
||||
@ stdcall RtlCompareUnicodeString (ptr ptr long) RtlCompareUnicodeString
|
||||
@ stub RtlCompressBuffer
|
||||
@ stdcall RtlComputeCrc32(long ptr long) RtlComputeCrc32
|
||||
@ stub RtlConsoleMultiByteToUnicodeN
|
||||
@ stub RtlConvertExclusiveToShared
|
||||
@ stdcall -ret64 RtlConvertLongToLargeInteger(long) RtlConvertLongToLargeInteger
|
||||
|
|
@ -428,7 +429,7 @@
|
|||
@ stub RtlInitializeContext
|
||||
@ stdcall RtlInitializeCriticalSection(ptr) RtlInitializeCriticalSection
|
||||
@ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) RtlInitializeCriticalSectionAndSpinCount
|
||||
@ stdcall RtlInitializeGenericTable() RtlInitializeGenericTable
|
||||
@ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) RtlInitializeGenericTable
|
||||
@ stub RtlInitializeRXact
|
||||
@ stdcall RtlInitializeResource(ptr) RtlInitializeResource
|
||||
@ stdcall RtlInitializeSid(ptr ptr long) RtlInitializeSid
|
||||
|
|
|
|||
183
dlls/ntdll/rtl.c
183
dlls/ntdll/rtl.c
|
|
@ -5,6 +5,7 @@
|
|||
*
|
||||
* Copyright 1996-1998 Marcus Meissner
|
||||
* 1999 Alex Korobka
|
||||
* Crc32 code Copyright 1986 Gary S. Brown (Public domain)
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
|
|
@ -21,6 +22,9 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "wine/port.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
|
@ -37,6 +41,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
|
|||
|
||||
static RTL_CRITICAL_SECTION peb_lock = CRITICAL_SECTION_INIT("peb_lock");
|
||||
|
||||
/* 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
|
||||
};
|
||||
|
||||
/*
|
||||
* resource functions
|
||||
*/
|
||||
|
|
@ -398,27 +450,28 @@ DWORD WINAPI RtlQueryEnvironmentVariable_U(DWORD x1,PUNICODE_STRING key,PUNICODE
|
|||
FIXME("(0x%08lx,%s,%p),stub!\n",x1,debugstr_w(key->Buffer),val);
|
||||
return 0;
|
||||
}
|
||||
/******************************************************************************
|
||||
* RtlInitializeGenericTable [NTDLL.@]
|
||||
*/
|
||||
DWORD WINAPI RtlInitializeGenericTable(void)
|
||||
{
|
||||
FIXME("\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* RtlCopyMemory [NTDLL]
|
||||
*
|
||||
* RtlInitializeGenericTable [NTDLL.@]
|
||||
*/
|
||||
#undef RtlCopyMemory
|
||||
VOID WINAPI RtlCopyMemory( VOID *Destination, CONST VOID *Source, SIZE_T Length )
|
||||
PVOID WINAPI RtlInitializeGenericTable(PVOID pTable, PVOID arg2, PVOID arg3, PVOID arg4, PVOID arg5)
|
||||
{
|
||||
memcpy(Destination, Source, Length);
|
||||
FIXME("(%p,%p,%p,%p,%p) stub!\n", pTable, arg2, arg3, arg4, arg5);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* RtlMoveMemory [NTDLL.@]
|
||||
*
|
||||
* Move a block of memory that may overlap.
|
||||
*
|
||||
* PARAMS
|
||||
* Destination [O] End destination for block
|
||||
* Source [O] Where to start copying from
|
||||
* Length [I] Number of bytes to copy
|
||||
*
|
||||
* RETURNS
|
||||
* Nothing.
|
||||
*/
|
||||
#undef RtlMoveMemory
|
||||
VOID WINAPI RtlMoveMemory( VOID *Destination, CONST VOID *Source, SIZE_T Length )
|
||||
|
|
@ -428,6 +481,16 @@ VOID WINAPI RtlMoveMemory( VOID *Destination, CONST VOID *Source, SIZE_T Length
|
|||
|
||||
/******************************************************************************
|
||||
* RtlFillMemory [NTDLL.@]
|
||||
*
|
||||
* Set a block of memory with a value.
|
||||
*
|
||||
* PARAMS
|
||||
* Destination [O] Block to fill
|
||||
* Length [I] Number of bytes to fill
|
||||
* Fill [I] Value to set
|
||||
*
|
||||
* RETURNS
|
||||
* Nothing.
|
||||
*/
|
||||
#undef RtlFillMemory
|
||||
VOID WINAPI RtlFillMemory( VOID *Destination, SIZE_T Length, BYTE Fill )
|
||||
|
|
@ -437,6 +500,15 @@ VOID WINAPI RtlFillMemory( VOID *Destination, SIZE_T Length, BYTE Fill )
|
|||
|
||||
/******************************************************************************
|
||||
* RtlZeroMemory [NTDLL.@]
|
||||
*
|
||||
* Set a block of memory with 0's.
|
||||
*
|
||||
* PARAMS
|
||||
* Destination [O] Block to fill
|
||||
* Length [I] Number of bytes to fill
|
||||
*
|
||||
* RETURNS
|
||||
* Nothing.
|
||||
*/
|
||||
#undef RtlZeroMemory
|
||||
VOID WINAPI RtlZeroMemory( VOID *Destination, SIZE_T Length )
|
||||
|
|
@ -446,17 +518,54 @@ VOID WINAPI RtlZeroMemory( VOID *Destination, SIZE_T Length )
|
|||
|
||||
/******************************************************************************
|
||||
* 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.
|
||||
*/
|
||||
SIZE_T WINAPI RtlCompareMemory( const VOID *Source1, const VOID *Source2, SIZE_T Length)
|
||||
{
|
||||
int i;
|
||||
SIZE_T i;
|
||||
for(i=0; (i<Length) && (((LPBYTE)Source1)[i]==((LPBYTE)Source2)[i]); i++);
|
||||
return i;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* RtlCompareMemoryUlong [NTDLL.@]
|
||||
*
|
||||
* Compare a block of memory with a value, a ULONG at a time
|
||||
*
|
||||
* PARAMS
|
||||
* Source1 [I] Source block. This must be ULONG aligned
|
||||
* Length [I] Number of bytes to compare. This should be a multiple of 4
|
||||
* dwVal [I] Value to compare to
|
||||
*
|
||||
* RETURNS
|
||||
* The byte position of the first byte at which Source1 is not dwVal.
|
||||
*/
|
||||
SIZE_T WINAPI RtlCompareMemoryUlong(const ULONG *Source1, SIZE_T Length, ULONG dwVal)
|
||||
{
|
||||
SIZE_T i;
|
||||
for(i = 0; i < Length/sizeof(ULONG) && Source1[i] == dwVal; i++);
|
||||
return i * sizeof(ULONG);
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* RtlAssert [NTDLL.@]
|
||||
*
|
||||
* Fail a debug assertion.
|
||||
*
|
||||
* RETURNS
|
||||
* Nothing. This call does not return control to its caller.
|
||||
*
|
||||
* NOTES
|
||||
* Not implemented in non-debug versions.
|
||||
*/
|
||||
void WINAPI RtlAssert(LPVOID x1,LPVOID x2,DWORD x3, DWORD x4)
|
||||
|
|
@ -467,6 +576,17 @@ void WINAPI RtlAssert(LPVOID x1,LPVOID x2,DWORD x3, DWORD x4)
|
|||
/******************************************************************************
|
||||
* RtlGetNtVersionNumbers [NTDLL.@]
|
||||
*
|
||||
* Get the version numbers of the run time library.
|
||||
*
|
||||
* PARAMS
|
||||
* major [O] Destination for the Major version
|
||||
* minor [O] Destination for the Minor version
|
||||
* build [O] Destination for the Build version
|
||||
*
|
||||
* RETURNS
|
||||
* Nothing.
|
||||
*
|
||||
* NOTES
|
||||
* Introduced in Windows XP (NT5.1)
|
||||
*/
|
||||
void WINAPI RtlGetNtVersionNumbers(LPDWORD major, LPDWORD minor, LPDWORD build)
|
||||
|
|
@ -477,7 +597,11 @@ void WINAPI RtlGetNtVersionNumbers(LPDWORD major, LPDWORD minor, LPDWORD build)
|
|||
|
||||
if (major)
|
||||
{
|
||||
*major = versionInfo.dwMajorVersion;
|
||||
/* msvcrt.dll as released with XP Home fails in DLLMain() if the
|
||||
* major version is not 5. So, we should never set a version < 5 ...
|
||||
* This makes sense since this call didn't exist before XP anyway.
|
||||
*/
|
||||
*major = versionInfo.dwMajorVersion < 5 ? 5 : versionInfo.dwMajorVersion;
|
||||
}
|
||||
|
||||
if (minor)
|
||||
|
|
@ -509,6 +633,7 @@ VOID WINAPI RtlFillMemoryUlong(ULONG* lpDest, ULONG ulCount, ULONG ulValue)
|
|||
{
|
||||
TRACE("(%p,%ld,%ld)\n", lpDest, ulCount, ulValue);
|
||||
|
||||
ulCount /= sizeof(ULONG);
|
||||
while(ulCount--)
|
||||
*lpDest++ = ulValue;
|
||||
}
|
||||
|
|
@ -529,3 +654,31 @@ DWORD WINAPI RtlGetLongestNtPathLength(void)
|
|||
TRACE("()\n");
|
||||
return 277;
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
* 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.
|
||||
*/
|
||||
DWORD WINAPI RtlComputeCrc32(DWORD dwInitial, PBYTE pData, INT iLen)
|
||||
{
|
||||
DWORD crc = ~dwInitial;
|
||||
|
||||
TRACE("(%ld,%p,%d)\n", dwInitial, pData, iLen);
|
||||
|
||||
while (iLen > 0)
|
||||
{
|
||||
crc = CRC_table[(crc ^ *pData) & 0xff] ^ (crc >> 8);
|
||||
pData++;
|
||||
iLen--;
|
||||
}
|
||||
return ~crc;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -897,6 +897,7 @@ void WINAPI RtlClearBits(PRTL_BITMAP,ULONG,ULONG);
|
|||
ULONG WINAPI RtlCompactHeap(HANDLE,ULONG);
|
||||
LONG WINAPI RtlCompareString(const STRING*,const STRING*,BOOLEAN);
|
||||
LONG WINAPI RtlCompareUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);
|
||||
DWORD WINAPI RtlComputeCrc32(DWORD,PBYTE,INT);
|
||||
NTSTATUS WINAPI RtlConvertSidToUnicodeString(PUNICODE_STRING,PSID,BOOLEAN);
|
||||
LONGLONG WINAPI RtlConvertLongToLargeInteger(LONG);
|
||||
ULONGLONG WINAPI RtlConvertUlongToLargeInteger(ULONG);
|
||||
|
|
@ -916,6 +917,7 @@ DWORD WINAPI RtlDeleteSecurityObject(DWORD);
|
|||
DWORD WINAPI RtlDestroyEnvironment(DWORD);
|
||||
HANDLE WINAPI RtlDestroyHeap(HANDLE);
|
||||
BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(LPWSTR,PUNICODE_STRING,DWORD,DWORD);
|
||||
WCHAR WINAPI RtlDowncaseUnicodeChar(WCHAR);
|
||||
void WINAPI RtlDumpResource(LPRTL_RWLOCK);
|
||||
|
||||
LONGLONG WINAPI RtlEnlargedIntegerMultiply(INT,INT);
|
||||
|
|
@ -923,6 +925,8 @@ ULONGLONG WINAPI RtlEnlargedUnsignedMultiply(UINT,UINT);
|
|||
UINT WINAPI RtlEnlargedUnsignedDivide(ULONGLONG,UINT,UINT *);
|
||||
NTSTATUS WINAPI RtlEnterCriticalSection(RTL_CRITICAL_SECTION *);
|
||||
void WINAPI RtlEraseUnicodeString(UNICODE_STRING*);
|
||||
NTSTATUS WINAPI RtlEqualComputerName(const UNICODE_STRING*,const UNICODE_STRING*);
|
||||
NTSTATUS WINAPI RtlEqualDomainName(const UNICODE_STRING*,const UNICODE_STRING*);
|
||||
BOOL WINAPI RtlEqualPrefixSid(PSID,PSID);
|
||||
BOOL WINAPI RtlEqualSid(PSID,PSID);
|
||||
BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN);
|
||||
|
|
|
|||
Loading…
Reference in New Issue