- Don't use ULONG for storing pointers.

svn path=/trunk/; revision=10761
This commit is contained in:
Filip Navara 2004-08-31 23:48:02 +00:00
parent 1d76d6dd93
commit 92b839476c
2 changed files with 8 additions and 6 deletions

View file

@ -775,7 +775,8 @@ NtEnumerateValueKey(IN HANDLE KeyHandle,
ValueCell->NameSize);
}
ValueFullInformation->DataOffset =
(ULONG)ValueFullInformation->Name - (ULONG)ValueFullInformation +
(ULONG_PTR)ValueFullInformation->Name -
(ULONG_PTR)ValueFullInformation +
ValueFullInformation->NameLength;
ValueFullInformation->DataOffset =
ROUND_UP(ValueFullInformation->DataOffset, sizeof(PVOID));
@ -1243,7 +1244,8 @@ NtQueryValueKey(IN HANDLE KeyHandle,
ValueCell->NameSize);
}
ValueFullInformation->DataOffset =
(ULONG)ValueFullInformation->Name - (ULONG)ValueFullInformation +
(ULONG_PTR)ValueFullInformation->Name -
(ULONG_PTR)ValueFullInformation +
ValueFullInformation->NameLength;
ValueFullInformation->DataOffset =
ROUND_UP(ValueFullInformation->DataOffset, sizeof(PVOID));
@ -1707,11 +1709,11 @@ NtQueryMultipleValueKey (IN HANDLE KeyHandle,
if (BufferLength + (ValueCell->DataSize & REG_DATA_SIZE_MASK) <= *Length)
{
DataPtr = (PUCHAR)ROUND_UP((ULONG)DataPtr, sizeof(PVOID));
DataPtr = (PUCHAR)ROUND_UP((ULONG_PTR)DataPtr, sizeof(PVOID));
ValueList[i].Type = ValueCell->DataType;
ValueList[i].DataLength = ValueCell->DataSize & REG_DATA_SIZE_MASK;
ValueList[i].DataOffset = (ULONG) DataPtr - (ULONG) Buffer;
ValueList[i].DataOffset = (ULONG_PTR)DataPtr - (ULONG_PTR)Buffer;
if (!(ValueCell->DataSize & REG_DATA_IN_OFFSET))
{

View file

@ -7,7 +7,7 @@
*/
#include <ntoskrnl.h>
#define NDEBUG
//#define NDEBUG
#include <internal/debug.h>
#include "cm.h"
@ -634,7 +634,7 @@ CmiCheckAndFixHive(PREGISTRY_HIVE RegistryHive)
/* Initialize bitmap */
RtlInitializeBitMap(&BlockBitMap,
(PVOID)((ULONG)LogHeader + REG_BLOCK_SIZE + sizeof(ULONG)),
(PVOID)((ULONG_PTR)LogHeader + REG_BLOCK_SIZE + sizeof(ULONG)),
BitmapSize * 8);
/* FIXME: Update dirty blocks */