Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge from amd64 branch:

Browse source 
37966: Make IMAGE_ORDINAL_FLAG64 an ULONGLONG (Timo Kreuzer)
38111: Make sure UNALIGNED is not redefined (Samuel Serapión)
38423: Fix RtlAllocateHeap, RtlExtendHeap,RtlSizeHeap definitions.(Samuel Serapión)

svn path=/trunk/; revision=39445
This commit is contained in:
Timo Kreuzer 2009-02-06 23:45:18 +00:00
parent 146a2bfc75
commit 900326bee8
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/include/ddk/ntdef.h
View file

@ -140,6 +140,7 @@ typedef unsigned long POINTER_64; // FIXME! HACK!!!
// FIXME
#undef UNALIGNED
#define UNALIGNED
#define RESTRICTED_POINTER

2
reactos/include/ddk/ntifs.h
View file

@ -4751,7 +4751,7 @@ NTAPI
RtlAllocateHeap (
IN HANDLE HeapHandle,
IN ULONG Flags,
IN ULONG Size
IN SIZE_T Size
);
NTSYSAPI

2
reactos/include/ddk/ntimage.h
View file

@ -480,7 +480,7 @@ typedef struct _IMAGE_THUNK_DATA32 {
} u1;
} IMAGE_THUNK_DATA32, *PIMAGE_THUNK_DATA32;
#define IMAGE_ORDINAL_FLAG64 0x8000000000000000
#define IMAGE_ORDINAL_FLAG64 0x8000000000000000ULL
#define IMAGE_ORDINAL_FLAG32 0x80000000
#define IMAGE_ORDINAL64(Ordinal) (Ordinal & 0xffff)
#define IMAGE_ORDINAL32(Ordinal) (Ordinal & 0xffff)

6
reactos/include/ndk/rtlfuncs.h
View file

@ -481,7 +481,7 @@ NTAPI
RtlAllocateHeap(
IN HANDLE HeapHandle,
IN ULONG Flags,
IN ULONG Size
IN SIZE_T Size
);
NTSYSAPI
@ -539,7 +539,7 @@ RtlExtendHeap(
IN HANDLE Heap,
IN ULONG Flags,
IN PVOID P,
IN ULONG Size
IN SIZE_T Size
);
NTSYSAPI
@ -646,7 +646,7 @@ RtlSetUserFlagsHeap(
);
NTSYSAPI
ULONG
SIZE_T
NTAPI
RtlSizeHeap(
IN PVOID HeapHandle,