Sync with trunk (48237)

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

diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index dd4b5d0..3b4e063 100644 (file)
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -131,7 +131,7 @@ extern "C" {
 #if !defined(USE_DMA_MACROS) && !defined(_NTHAL_)
 #define USE_DMA_MACROS
 #endif
-#ifndef NO_LEGACY_DRIVERS
+#if !defined(NO_LEGACY_DRIVERS) && !defined(__REACTOS__)
 #define NO_LEGACY_DRIVERS
 #endif
 #endif /* defined(_WIN64) */
@@ -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;
@@ -8159,8 +8154,8 @@ InitializeListHead(
   ListHead->Flink = ListHead->Blink = ListHead;
 }
 
-BOOLEAN
 FORCEINLINE
+BOOLEAN
 IsListEmpty(
   IN CONST LIST_ENTRY * ListHead)
 {
@@ -9440,7 +9435,7 @@ RtlCheckBit(
 
 #define ASSERTMSG(msg, exp) \
   (VOID)((!(exp)) ? \
-    RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, msg ), FALSE : TRUE)
+    RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE)
 
 #define RTL_SOFT_ASSERT(exp) \
   (VOID)((!(exp)) ? \
@@ -9526,8 +9521,8 @@ InitializeSListHead(
 
 #else
 
-VOID
 FORCEINLINE
+VOID
 InitializeSListHead(
   OUT PSLIST_HEADER SListHead)
 {
@@ -12900,8 +12895,8 @@ IoMarkIrpPending(
   IoInitializeRemoveLockEx(Lock, AllocateTag, MaxLockedMinutes, \
     HighWatermark, sizeof(IO_REMOVE_LOCK))
 
-VOID
 FORCEINLINE
+VOID
 IoInitializeDpcRequest(
   IN PDEVICE_OBJECT DeviceObject,
   IN PIO_DPC_ROUTINE DpcRoutine)
@@ -12954,8 +12949,8 @@ IoGetRemainingStackSize(VOID)
 }
 
 #if (NTDDI_VERSION >= NTDDI_WS03)
-VOID
 FORCEINLINE
+VOID
 IoInitializeThreadedDpcRequest(
   IN PDEVICE_OBJECT DeviceObject,
   IN PIO_DPC_ROUTINE DpcRoutine)