Merge the rest from header branch.

svn path=/trunk/; revision=46582
This commit is contained in:
Timo Kreuzer 2010-03-30 05:34:20 +00:00
parent ce874eb1b4
commit 7809161280
5 changed files with 11020 additions and 4775 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -394,22 +394,33 @@ typedef struct _IMAGE_NT_HEADERS64 {
ULONG Signature; ULONG Signature;
IMAGE_FILE_HEADER FileHeader; IMAGE_FILE_HEADER FileHeader;
IMAGE_OPTIONAL_HEADER64 OptionalHeader; IMAGE_OPTIONAL_HEADER64 OptionalHeader;
} IMAGE_NT_HEADERS64, *PIMAGE_NT_HEADERS64; } IMAGE_NT_HEADERS64;
typedef struct _IMAGE_NT_HEADERS { typedef struct _IMAGE_NT_HEADERS {
ULONG Signature; ULONG Signature;
IMAGE_FILE_HEADER FileHeader; IMAGE_FILE_HEADER FileHeader;
IMAGE_OPTIONAL_HEADER32 OptionalHeader; IMAGE_OPTIONAL_HEADER32 OptionalHeader;
} IMAGE_NT_HEADERS32, *PIMAGE_NT_HEADERS32; } IMAGE_NT_HEADERS32;
#ifdef _WIN64 #ifdef _WIN64
typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS; typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS;
typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS;
#else #else
typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS; typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS;
#endif
#ifndef _NTDDK_
typedef struct _IMAGE_NT_HEADERS *PIMAGE_NT_HEADERS32;
typedef struct _IMAGE_NT_HEADERS64 *PIMAGE_NT_HEADERS64;
#ifdef _WIN64
typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS;
#else
typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS; typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS;
#endif #endif
#endif /* _NTDDK_ */
// //
// Retreives the first image section header from the Nt Header // Retreives the first image section header from the Nt Header
// //

File diff suppressed because it is too large Load diff

View file

@ -546,17 +546,6 @@ typedef enum _KAPC_ENVIRONMENT
InsertApcEnvironment InsertApcEnvironment
} KAPC_ENVIRONMENT; } KAPC_ENVIRONMENT;
//
// CPU Cache Types
//
typedef enum _PROCESSOR_CACHE_TYPE
{
CacheUnified,
CacheInstruction,
CacheData,
CacheTrace,
} PROCESSOR_CACHE_TYPE;
// //
// PRCB DPC Data // PRCB DPC Data
// //
@ -577,18 +566,6 @@ typedef struct _PP_LOOKASIDE_LIST
struct _GENERAL_LOOKASIDE *L; struct _GENERAL_LOOKASIDE *L;
} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST; } PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST;
//
// CPU Cache Descriptor
//
typedef struct _CACHE_DESCRIPTOR
{
UCHAR Level;
UCHAR Associativity;
USHORT LineSize;
ULONG Size;
PROCESSOR_CACHE_TYPE Type;
} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR;
// //
// Architectural Types // Architectural Types
// //