Merge changes to ketypes.h and ntimage.h from the last revert back.
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 19 Apr 2010 17:30:34 +0000 (17:30 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 19 Apr 2010 17:30:34 +0000 (17:30 +0000)
svn path=/trunk/; revision=46945

reactos/include/ddk/ntddk.h
reactos/include/ddk/ntimage.h
reactos/include/ddk/wdm.h
reactos/include/ndk/ketypes.h

index 62c1f78..6d8bacd 100644 (file)
@@ -72,6 +72,19 @@ typedef struct _BUS_HANDLER *PBUS_HANDLER;
 
 typedef struct _PEB *PPEB;
 
+#ifndef _NTIMAGE_
+
+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;
+#endif
+
+#endif /* _NTIMAGE_ */
+
 #define EXCEPTION_READ_FAULT    0
 #define EXCEPTION_WRITE_FAULT   1
 #define EXCEPTION_EXECUTE_FAULT 8
index e008a2d..8df9847 100644 (file)
@@ -394,22 +394,33 @@ typedef struct _IMAGE_NT_HEADERS64 {
     ULONG Signature;
     IMAGE_FILE_HEADER FileHeader;
     IMAGE_OPTIONAL_HEADER64 OptionalHeader;
-} IMAGE_NT_HEADERS64, *PIMAGE_NT_HEADERS64;
+} IMAGE_NT_HEADERS64;
 
 typedef struct _IMAGE_NT_HEADERS {
     ULONG Signature;
     IMAGE_FILE_HEADER FileHeader;
     IMAGE_OPTIONAL_HEADER32 OptionalHeader;
-} IMAGE_NT_HEADERS32, *PIMAGE_NT_HEADERS32;
+} IMAGE_NT_HEADERS32;
 
 #ifdef _WIN64
 typedef IMAGE_NT_HEADERS64                  IMAGE_NT_HEADERS;
-typedef PIMAGE_NT_HEADERS64                 PIMAGE_NT_HEADERS;
 #else
 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;
 #endif
 
+#endif /* _NTDDK_ */
+
 //
 // Retreives the first image section header from the Nt Header
 //
index ee2f034..285d216 100644 (file)
@@ -515,6 +515,34 @@ typedef enum _MODE {
 #define SINGLE_GROUP_LEGACY_API        1
 #endif
 
+#define SEMAPHORE_QUERY_STATE (0x0001)
+#define SEMAPHORE_MODIFY_STATE (0x0002)
+#define SEMAPHORE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3)
+
+typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP {
+  RelationProcessorCore,
+  RelationNumaNode,
+  RelationCache,
+  RelationProcessorPackage,
+  RelationGroup,
+  RelationAll = 0xffff
+} LOGICAL_PROCESSOR_RELATIONSHIP;
+
+typedef enum _PROCESSOR_CACHE_TYPE {
+  CacheUnified,
+  CacheInstruction,
+  CacheData,
+  CacheTrace
+} PROCESSOR_CACHE_TYPE;
+
+typedef struct _CACHE_DESCRIPTOR {
+  UCHAR Level;
+  UCHAR Associativity;
+  USHORT LineSize;
+  ULONG Size;
+  PROCESSOR_CACHE_TYPE Type;
+} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR;
+
 /* Processor features */
 #define PF_FLOATING_POINT_PRECISION_ERRATA  0   
 #define PF_FLOATING_POINT_EMULATED          1   
@@ -12580,10 +12608,6 @@ typedef enum {
 #define EVENT_MODIFY_STATE (0x0002)
 #define EVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3)
 
-#define SEMAPHORE_QUERY_STATE (0x0001)
-#define SEMAPHORE_MODIFY_STATE (0x0002)
-#define SEMAPHORE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3)
-
 #define SYMBOLIC_LINK_QUERY               0x0001
 #define SYMBOLIC_LINK_ALL_ACCESS          (STANDARD_RIGHTS_REQUIRED | 0x1)
 
index d4ae1c5..6798537 100644 (file)
@@ -546,17 +546,6 @@ typedef enum _KAPC_ENVIRONMENT
     InsertApcEnvironment
 } KAPC_ENVIRONMENT;
 
-//
-// CPU Cache Types      
-//      
-typedef enum _PROCESSOR_CACHE_TYPE      
-{
-    CacheUnified,       
-    CacheInstruction,   
-    CacheData,          
-    CacheTrace,         
-} PROCESSOR_CACHE_TYPE;
-
 //
 // PRCB DPC Data
 //
@@ -577,18 +566,6 @@ typedef struct _PP_LOOKASIDE_LIST
     struct _GENERAL_LOOKASIDE *L;
 } 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
 //