[XDK] Move more stuff from ntddk.template.h into appropriate headers

[reactos.git] / include / ddk / wdm.h

diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index 419cfa0..fac1d74 100644 (file)
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -552,7 +552,6 @@ typedef BOOLEAN
  *                              Kernel Types                                  *
  ******************************************************************************/
 
-
 typedef UCHAR KIRQL, *PKIRQL;
 typedef CCHAR KPROCESSOR_MODE;
 typedef LONG KPRIORITY;
@@ -3688,8 +3687,6 @@ typedef enum _CM_ERROR_CONTROL_TYPE {
                                          CM_SERVICE_VIRTUAL_DISK_BOOT_LOAD |  \
                                          CM_SERVICE_USB_DISK_BOOT_LOAD)
 
-
-
 /******************************************************************************
  *                         I/O Manager Types                                  *
  ******************************************************************************/
@@ -7563,7 +7560,6 @@ extern POBJECT_TYPE NTSYSAPI PsProcessType;
  *                           Process Manager Types                            *
  ******************************************************************************/
 
-
 #define QUOTA_LIMITS_HARDWS_MIN_ENABLE  0x00000001
 #define QUOTA_LIMITS_HARDWS_MIN_DISABLE 0x00000002
 #define QUOTA_LIMITS_HARDWS_MAX_ENABLE  0x00000004
@@ -7599,6 +7595,7 @@ extern POBJECT_TYPE NTSYSAPI PsProcessType;
 #define HIGH_PRIORITY                     31
 #define MAXIMUM_PRIORITY                  32
 
+
 /******************************************************************************
  *                          WMI Library Support Types                         *
  ******************************************************************************/
@@ -7820,6 +7817,8 @@ _KeQueryTickCount(
 
 
 
+
+
 #elif defined(_M_AMD64)
 /** Kernel definitions for AMD64 **/
 
@@ -7935,6 +7934,8 @@ KeGetCurrentThread(VOID)
 #define KI_USER_SHARED_DATA ((ULONG_PTR)(KADDRESS_BASE + 0xFFFE0000))
 extern volatile LARGE_INTEGER KeTickCount;
 
+#define PAUSE_PROCESSOR __yield();
+
 FORCEINLINE
 VOID
 KeFlushWriteBuffer(VOID)
@@ -14155,6 +14156,13 @@ ObDereferenceObjectDeferDeleteWithTag(
  *                          Process Manager Functions                         *
  ******************************************************************************/
 
+NTKERNELAPI
+NTSTATUS
+NTAPI
+PsWrapApcWow64Thread(
+  IN OUT PVOID *ApcContext,
+  IN OUT PVOID *ApcRoutine);
+
 /*
  * PEPROCESS
  * PsGetCurrentProcess(VOID)
@@ -14163,7 +14171,6 @@ ObDereferenceObjectDeferDeleteWithTag(
 
 #if !defined(_PSGETCURRENTTHREAD_)
 #define _PSGETCURRENTTHREAD_
-
 FORCEINLINE
 PETHREAD
 NTAPI
@@ -14171,12 +14178,11 @@ PsGetCurrentThread(VOID)
 {
   return (PETHREAD)KeGetCurrentThread();
 }
+#endif /* !_PSGETCURRENTTHREAD_ */
 
-#endif
 
 #if (NTDDI_VERSION >= NTDDI_WIN2K)
 
-
 NTKERNELAPI
 NTSTATUS
 NTAPI
@@ -14195,15 +14201,8 @@ NTAPI
 PsTerminateSystemThread(
   IN NTSTATUS ExitStatus);
 
-#endif
-
 
-NTKERNELAPI
-NTSTATUS
-NTAPI
-PsWrapApcWow64Thread(
-  IN OUT PVOID *ApcContext,
-  IN OUT PVOID *ApcRoutine);
+#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
 
 /******************************************************************************
  *                          WMI Library Support Functions                     *