mirror of
https://github.com/reactos/reactos.git
synced 2025-08-06 09:43:04 +00:00
Fix horribly wrong defintions of ULONG32 and ULONG, as well as elf support which depended on these wrong definitions.
svn path=/trunk/; revision=12713
This commit is contained in:
parent
28dff13100
commit
3be1a720e8
4 changed files with 10 additions and 10 deletions
|
@ -63,7 +63,7 @@ typedef long LONG32, *PLONG32;
|
||||||
#ifndef XFree86Server
|
#ifndef XFree86Server
|
||||||
typedef int INT32, *PINT32;
|
typedef int INT32, *PINT32;
|
||||||
#endif /* ndef XFree86Server */
|
#endif /* ndef XFree86Server */
|
||||||
typedef unsigned long ULONG32, *PULONG32;
|
typedef unsigned int ULONG32, *PULONG32;
|
||||||
typedef unsigned int DWORD32, *PDWORD32;
|
typedef unsigned int DWORD32, *PDWORD32;
|
||||||
typedef unsigned int UINT32, *PUINT32;
|
typedef unsigned int UINT32, *PUINT32;
|
||||||
|
|
||||||
|
|
|
@ -71,9 +71,9 @@ typedef short SHORT;
|
||||||
|
|
||||||
typedef INT32 INT, *PINT;
|
typedef INT32 INT, *PINT;
|
||||||
typedef LONG32 LONG, *PLONG;
|
typedef LONG32 LONG, *PLONG;
|
||||||
typedef ULONG32 DWORD, *PDWORD;
|
typedef unsigned long DWORD, *PDWORD;
|
||||||
typedef UINT32 UINT, *PUINT;
|
typedef UINT32 UINT, *PUINT;
|
||||||
typedef ULONG32 ULONG, *PULONG;
|
typedef unsigned long ULONG, *PULONG;
|
||||||
|
|
||||||
#ifndef _WCHAR_T_
|
#ifndef _WCHAR_T_
|
||||||
#define _WCHAR_T_
|
#define _WCHAR_T_
|
||||||
|
|
|
@ -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
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
*
|
*
|
||||||
* @implemented
|
* @implemented
|
||||||
*/
|
*/
|
||||||
ULONG STDCALL
|
SIZE_T STDCALL
|
||||||
RtlCompareMemory(IN const VOID *Source1,
|
RtlCompareMemory(IN const VOID *Source1,
|
||||||
IN const VOID *Source2,
|
IN const VOID *Source2,
|
||||||
IN SIZE_T Length)
|
IN SIZE_T Length)
|
||||||
|
|
|
@ -37,7 +37,7 @@ static __inline BOOLEAN Intsafe_CanAddULong32
|
||||||
|
|
||||||
static __inline BOOLEAN Intsafe_AddULong32
|
static __inline BOOLEAN Intsafe_AddULong32
|
||||||
(
|
(
|
||||||
OUT PULONG Result,
|
OUT PULONG32 Result,
|
||||||
IN ULONG Addend1,
|
IN ULONG Addend1,
|
||||||
IN ULONG Addend2
|
IN ULONG Addend2
|
||||||
)
|
)
|
||||||
|
@ -83,7 +83,7 @@ static __inline BOOLEAN Intsafe_CanMulULong32
|
||||||
|
|
||||||
static __inline BOOLEAN Intsafe_MulULong32
|
static __inline BOOLEAN Intsafe_MulULong32
|
||||||
(
|
(
|
||||||
OUT PULONG Result,
|
OUT PULONG32 Result,
|
||||||
IN ULONG Factor1,
|
IN ULONG Factor1,
|
||||||
IN ULONG Factor2
|
IN ULONG Factor2
|
||||||
)
|
)
|
||||||
|
@ -239,7 +239,7 @@ static __inline ULONG64 ElfFmtpSafeReadULong64
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
PBYTE p;
|
PBYTE p;
|
||||||
ULONG nSafeInput;
|
ULONG64 nSafeInput;
|
||||||
|
|
||||||
RtlRetrieveUlonglong(&nSafeInput, Input);
|
RtlRetrieveUlonglong(&nSafeInput, Input);
|
||||||
|
|
||||||
|
@ -257,7 +257,7 @@ static __inline ULONG64 ElfFmtpSafeReadULong64
|
||||||
|
|
||||||
static __inline ULONG ElfFmtpSafeReadULong
|
static __inline ULONG ElfFmtpSafeReadULong
|
||||||
(
|
(
|
||||||
IN CONST ULONG * Input,
|
IN CONST ULONG32 * Input,
|
||||||
IN ULONG DataType
|
IN ULONG DataType
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
@ -367,7 +367,7 @@ Elf64FmtCreateSection
|
||||||
PMM_SECTION_SEGMENT pssSegments;
|
PMM_SECTION_SEGMENT pssSegments;
|
||||||
Elf_Addr nImageBase = 0;
|
Elf_Addr nImageBase = 0;
|
||||||
Elf_Addr nEntryPoint;
|
Elf_Addr nEntryPoint;
|
||||||
ULONG nPrevVirtualEndOfSegment;
|
ULONG32 nPrevVirtualEndOfSegment;
|
||||||
ULONG i;
|
ULONG i;
|
||||||
ULONG j;
|
ULONG j;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue