Author: akhaldi
Date: Wed May 12 15:02:44 2010
New Revision: 47170
URL:
http://svn.reactos.org/svn/reactos?rev=47170&view=rev
Log:
[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.
Modified:
branches/header-work/include/ddk/ntddk.h
branches/header-work/include/ddk/wdm.h
branches/header-work/include/reactos/arm/armddk.h
branches/header-work/include/xdk/amd64/ke.h
branches/header-work/include/xdk/exfuncs.h
Modified: branches/header-work/include/ddk/ntddk.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h…
==============================================================================
--- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Wed May 12 15:02:44 2010
@@ -3283,14 +3283,14 @@
#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 @@
Exfi386InterlockedExchangeUlong(
IN PULONG Target,
IN ULONG Value);
+
#endif
Modified: branches/header-work/include/ddk/wdm.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r…
==============================================================================
--- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Wed May 12 15:02:44 2010
@@ -7844,11 +7844,6 @@
#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;
Modified: branches/header-work/include/reactos/arm/armddk.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/arm…
==============================================================================
--- branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] (original)
+++ branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] Wed May 12 15:02:44
2010
@@ -185,7 +185,7 @@
}
NTSYSAPI
-PKTHREAD
+struct _KTHREAD*
NTAPI
KeGetCurrentThread(VOID);
Modified: branches/header-work/include/xdk/amd64/ke.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/amd64/k…
==============================================================================
--- branches/header-work/include/xdk/amd64/ke.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/amd64/ke.h [iso-8859-1] Wed May 12 15:02:44 2010
@@ -26,11 +26,6 @@
#define EFLAG_SIGN 0x8000
#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;
Modified: branches/header-work/include/xdk/exfuncs.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/exfuncs…
==============================================================================
--- branches/header-work/include/xdk/exfuncs.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/exfuncs.h [iso-8859-1] Wed May 12 15:02:44 2010
@@ -299,13 +299,13 @@
#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