Modified: trunk/reactos/include/basetsd.h
Modified: trunk/reactos/include/ntos/types.h
Modified: trunk/reactos/lib/rtl/mem.c
Modified: trunk/reactos/ntoskrnl/mm/elf.c
--- trunk/reactos/include/basetsd.h 2005-01-02 01:06:17 UTC (rev 12712)
+++ trunk/reactos/include/basetsd.h 2005-01-02 04:27:29 UTC (rev 12713)
@@ -63,7 +63,7 @@
#ifndef XFree86Server
typedef int INT32, *PINT32;
#endif /* ndef XFree86Server */
-typedef unsigned long ULONG32, *PULONG32;
+typedef unsigned int ULONG32, *PULONG32;
typedef unsigned int DWORD32, *PDWORD32;
typedef unsigned int UINT32, *PUINT32;
--- trunk/reactos/include/ntos/types.h 2005-01-02 01:06:17 UTC (rev 12712)
+++ trunk/reactos/include/ntos/types.h 2005-01-02 04:27:29 UTC (rev 12713)
@@ -71,9 +71,9 @@
typedef INT32 INT, *PINT;
typedef LONG32 LONG, *PLONG;
-typedef ULONG32 DWORD, *PDWORD;
+typedef unsigned long DWORD, *PDWORD;
typedef UINT32 UINT, *PUINT;
-typedef ULONG32 ULONG, *PULONG;
+typedef unsigned long ULONG, *PULONG;
#ifndef _WCHAR_T_
#define _WCHAR_T_
--- trunk/reactos/lib/rtl/mem.c 2005-01-02 01:06:17 UTC (rev 12712)
+++ trunk/reactos/lib/rtl/mem.c 2005-01-02 04:27:29 UTC (rev 12713)
@@ -1,5 +1,5 @@
-/* $Id: mem.c,v 1.3 2004/11/25 19:25:06 ekohl Exp $
+/* $Id$
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -39,7 +39,7 @@
*
* @implemented
*/
-ULONG STDCALL
+SIZE_T STDCALL
RtlCompareMemory(IN const VOID *Source1,
IN const VOID *Source2,
IN SIZE_T Length)
--- trunk/reactos/ntoskrnl/mm/elf.c 2005-01-02 01:06:17 UTC (rev 12712)
+++ trunk/reactos/ntoskrnl/mm/elf.c 2005-01-02 04:27:29 UTC (rev 12713)
@@ -37,7 +37,7 @@
static __inline BOOLEAN Intsafe_AddULong32
(
- OUT PULONG Result,
+ OUT PULONG32 Result,
IN ULONG Addend1,
IN ULONG Addend2
)
@@ -83,7 +83,7 @@
static __inline BOOLEAN Intsafe_MulULong32
(
- OUT PULONG Result,
+ OUT PULONG32 Result,
IN ULONG Factor1,
IN ULONG Factor2
)
@@ -239,7 +239,7 @@
)
{
PBYTE p;
- ULONG nSafeInput;
+ ULONG64 nSafeInput;
RtlRetrieveUlonglong(&nSafeInput, Input);
@@ -257,7 +257,7 @@
static __inline ULONG ElfFmtpSafeReadULong
(
- IN CONST ULONG * Input,
+ IN CONST ULONG32 * Input,
IN ULONG DataType
)
{
@@ -367,7 +367,7 @@
PMM_SECTION_SEGMENT pssSegments;
Elf_Addr nImageBase = 0;
Elf_Addr nEntryPoint;
- ULONG nPrevVirtualEndOfSegment;
+ ULONG32 nPrevVirtualEndOfSegment;
ULONG i;
ULONG j;