- Fix/take decisions on the minor NDK FIXMEs.

Modified: trunk/reactos/include/ndk/arch/ketypes.h
Modified: trunk/reactos/include/ndk/extypes.h
Modified: trunk/reactos/include/ndk/fixmes.txt
Modified: trunk/reactos/include/ndk/ketypes.h
Modified: trunk/reactos/include/ndk/lpctypes.h

--- trunk/reactos/include/ndk/arch/ketypes.h	2005-11-26 22:12:15 UTC (rev 19661)
+++ trunk/reactos/include/ndk/arch/ketypes.h	2005-11-26 22:51:59 UTC (rev 19662)
@@ -20,23 +20,6 @@

 #define _ARCH_KETYPES_H
 
 //

-// FIXME: Find a solution to take these out of here!
-//
-typedef struct _KDPC_DATA
-{
-    LIST_ENTRY DpcListHead;
-    ULONG DpcLock;
-    ULONG DpcQueueDepth;
-    ULONG DpcCount;
-} KDPC_DATA, *PKDPC_DATA;
-
-typedef struct _PP_LOOKASIDE_LIST
-{
-    struct _GENERAL_LOOKASIDE *P;
-    struct _GENERAL_LOOKASIDE *L;
-} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST;
-
-//

 // Include the right file for this architecture.
 //
 #ifdef _M_IX86

--- trunk/reactos/include/ndk/extypes.h	2005-11-26 22:12:15 UTC (rev 19661)
+++ trunk/reactos/include/ndk/extypes.h	2005-11-26 22:51:59 UTC (rev 19662)
@@ -48,6 +48,11 @@

 extern POBJECT_TYPE NTSYSAPI ExTimerType;
 
 //

+// Exported NT Build Number
+//
+extern ULONG NTSYSAPI NtBuildNumber;
+
+//

 // Invalid Handle Value Constant
 //
 #define INVALID_HANDLE_VALUE            (HANDLE)-1
@@ -80,11 +85,6 @@

 #endif
 
 //

-// Port Object Access Masks (FIXME: lpctypes.h?)
-//
-#define PORT_ALL_ACCESS                 0x1
-
-//

 // Event Pair Access Masks
 //
 #define EVENT_PAIR_ALL_ACCESS           0x1F0000L

--- trunk/reactos/include/ndk/fixmes.txt	2005-11-26 22:12:15 UTC (rev 19661)
+++ trunk/reactos/include/ndk/fixmes.txt	2005-11-26 22:51:59 UTC (rev 19662)
@@ -23,14 +23,6 @@

 |extypes.h	- Class 42 (SYSTEM_POWER_INFORMATION causes conflict).
 |extypes.h	- Classes 13, 20, 30, 31, 49, 51, 52, 54+ are undefined.
 |ntndk.h	- Incorrect rounding macro names

-|
-[MINOR]		- Related to location of functions, comments, etc.
-|arch/ketypes.h	- _KDPC_DATA, PP_LOOKASIDE_LIST shouldn't be there.
-|pstypes.h	- Check if _PAGEFAULT_HISTORY shouldn't go in mmtypes.h instead.
-|lpctypes.h	- Consider moving _CLIENT_DIED_MSG to pstypes.h?
-|ketypes.h	- Consider moving KNODE to mmtypes.h?
-|ketypes.h	- Consider moving NtBuildNumber to extypes.h?
-|extypes.h	- consider moving PORT_ALL_ACCESS to lpctypes.h

 |_____________________________________________________________________________________
 
 

--- trunk/reactos/include/ndk/ketypes.h	2005-11-26 22:12:15 UTC (rev 19661)
+++ trunk/reactos/include/ndk/ketypes.h	2005-11-26 22:51:59 UTC (rev 19662)
@@ -28,7 +28,6 @@

 #include <haltypes.h>
 #include <potypes.h>
 #include <ifssupp.h>

-#include <arch/ketypes.h>

 #endif
 
 //
@@ -305,6 +304,41 @@

 #else
 
 //

+// APC Environment Types
+//
+typedef enum _KAPC_ENVIRONMENT
+{
+    OriginalApcEnvironment,
+    AttachedApcEnvironment,
+    CurrentApcEnvironment
+} KAPC_ENVIRONMENT;
+
+//
+// PRCB DPC Data
+//
+typedef struct _KDPC_DATA
+{
+    LIST_ENTRY DpcListHead;
+    ULONG DpcLock;
+    ULONG DpcQueueDepth;
+    ULONG DpcCount;
+} KDPC_DATA, *PKDPC_DATA;
+
+//
+// Per-Processor Lookaside List
+//
+typedef struct _PP_LOOKASIDE_LIST
+{
+    struct _GENERAL_LOOKASIDE *P;
+    struct _GENERAL_LOOKASIDE *L;
+} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST;
+
+//
+// Architectural Types
+//
+#include <arch/ketypes.h>
+
+//

 // ARC Component Data
 //
 typedef struct _CONFIGURATION_COMPONENT_DATA
@@ -316,16 +350,6 @@

 } CONFIGURATION_COMPONENT_DATA, *PCONFIGURATION_COMPONENT_DATA;
 
 //

-// APC Environment Types
-//
-typedef enum _KAPC_ENVIRONMENT
-{
-    OriginalApcEnvironment,
-    AttachedApcEnvironment,
-    CurrentApcEnvironment
-} KAPC_ENVIRONMENT;
-
-//

 // Kernel Memory Node (FIXME: mmtypes?
 //
 typedef struct _KNODE
@@ -704,11 +728,6 @@

 extern ULONG NTSYSAPI KeIcacheFlushCount;
 
 //

-// Exported NT Build Number (FIXME: move?)
-//
-extern ULONG NTSYSAPI NtBuildNumber;
-
-//

 // Exported System Service Descriptor Tables
 //
 extern KSERVICE_TABLE_DESCRIPTOR NTSYSAPI KeServiceDescriptorTable[SSDT_MAX_ENTRIES];

--- trunk/reactos/include/ndk/lpctypes.h	2005-11-26 22:12:15 UTC (rev 19661)
+++ trunk/reactos/include/ndk/lpctypes.h	2005-11-26 22:51:59 UTC (rev 19662)
@@ -31,6 +31,11 @@

 #define PORT_MAXIMUM_MESSAGE_LENGTH     256
 
 //

+// Port Object Access Masks
+//
+#define PORT_ALL_ACCESS                 0x1
+
+//

 // LPC Message Types
 //
 typedef enum _LPC_TYPE