[XDK]

- Remove RESULT_NEGATIVE, RESULT_ZERO and RESULT_POSITIVE from amd64/ke.h
- INTERLOCKED_RESULT isn't x86 only.
[DDK]
- Update wdm.h and ntddk.h to reflect the XDK changes.

svn path=/branches/header-work/; revision=47170

diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h
index 5c03ef7..4d99fa8 100644 (file)
--- a/include/ddk/ntddk.h
+++ b/include/ddk/ntddk.h
@@ -3283,14 +3283,14 @@ ExFreeToZone(
 #define ExIsResourceAcquired ExIsResourceAcquiredSharedLite
 #define ExReleaseResourceForThread ExReleaseResourceForThreadLite
 
-#ifdef _X86_
-
 typedef enum _INTERLOCKED_RESULT {
   ResultNegative = RESULT_NEGATIVE,
   ResultZero = RESULT_ZERO,
   ResultPositive = RESULT_POSITIVE
 } INTERLOCKED_RESULT;
 
+#ifdef _X86_
+
 NTKERNELAPI
 INTERLOCKED_RESULT
 FASTCALL
@@ -3309,6 +3309,7 @@ FASTCALL
 Exfi386InterlockedExchangeUlong(
   IN PULONG  Target,
   IN ULONG  Value);
+
 #endif
 
 

diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index dd4b5d0..a285043 100644 (file)
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -7844,11 +7844,6 @@ _KeQueryTickCount(
 #define EFLAG_ZERO              0x4000
 #define EFLAG_SELECT            (EFLAG_SIGN | EFLAG_ZERO)
 
-#define RESULT_NEGATIVE         ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
-#define RESULT_ZERO             ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT)
-#define RESULT_POSITIVE         ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
-
-
 typedef struct _KFLOATING_SAVE {
   ULONG Dummy;
 } KFLOATING_SAVE, *PKFLOATING_SAVE;

diff --git a/include/reactos/arm/armddk.h b/include/reactos/arm/armddk.h
index 82e6d9f..80f49db 100644 (file)
--- a/include/reactos/arm/armddk.h
+++ b/include/reactos/arm/armddk.h
@@ -185,7 +185,7 @@ struct _TEB* NtCurrentTeb(VOID)
 }
 
 NTSYSAPI
-PKTHREAD
+struct _KTHREAD*
 NTAPI
 KeGetCurrentThread(VOID);
 

diff --git a/include/xdk/amd64/ke.h b/include/xdk/amd64/ke.h
index d744cd5..833aca8 100644 (file)
--- a/include/xdk/amd64/ke.h
+++ b/include/xdk/amd64/ke.h
@@ -27,11 +27,6 @@ $if (_WDMDDK_)
 #define EFLAG_ZERO              0x4000
 #define EFLAG_SELECT            (EFLAG_SIGN | EFLAG_ZERO)
 
-#define RESULT_NEGATIVE         ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
-#define RESULT_ZERO             ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT)
-#define RESULT_POSITIVE         ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
-
-
 typedef struct _KFLOATING_SAVE {
   ULONG Dummy;
 } KFLOATING_SAVE, *PKFLOATING_SAVE;

diff --git a/include/xdk/exfuncs.h b/include/xdk/exfuncs.h
index 3f02d3d..5cad0ff 100644 (file)
--- a/include/xdk/exfuncs.h
+++ b/include/xdk/exfuncs.h
@@ -299,14 +299,14 @@ ExFreeToZone(
 #define ExIsResourceAcquired ExIsResourceAcquiredSharedLite
 #define ExReleaseResourceForThread ExReleaseResourceForThreadLite
 
-#ifdef _X86_
-
 typedef enum _INTERLOCKED_RESULT {
   ResultNegative = RESULT_NEGATIVE,
   ResultZero = RESULT_ZERO,
   ResultPositive = RESULT_POSITIVE
 } INTERLOCKED_RESULT;
 
+#ifdef _X86_
+
 NTKERNELAPI
 INTERLOCKED_RESULT
 FASTCALL