Move pushlock definition. It is gone from MS headers now.
Modified: trunk/reactos/include/ndk/extypes.h
Modified: trunk/reactos/w32api/include/ddk/ntifs.h
_____
Modified: trunk/reactos/include/ndk/extypes.h
--- trunk/reactos/include/ndk/extypes.h 2005-12-29 18:28:05 UTC (rev
20429)
+++ trunk/reactos/include/ndk/extypes.h 2005-12-29 18:45:00 UTC (rev
20430)
@@ -101,6 +101,17 @@
#define MAXIMUM_HARDERROR_PARAMETERS 4
//
+// Pushlock bits
+//
+#define EX_PUSH_LOCK_LOCK_V ((ULONG_PTR)0x0)
+#define EX_PUSH_LOCK_LOCK ((ULONG_PTR)0x1)
+#define EX_PUSH_LOCK_WAITING ((ULONG_PTR)0x2)
+#define EX_PUSH_LOCK_WAKING ((ULONG_PTR)0x4)
+#define EX_PUSH_LOCK_MULTIPLE_SHARED ((ULONG_PTR)0x8)
+#define EX_PUSH_LOCK_SHARE_INC ((ULONG_PTR)0x10)
+#define EX_PUSH_LOCK_PTR_BITS ((ULONG_PTR)0xf)
+
+//
// Pushlock Wait Block Flags
//
#define EX_PUSH_LOCK_FLAGS_EXCLUSIVE 1
@@ -305,6 +316,26 @@
} EX_RUNDOWN_WAIT_BLOCK, *PEX_RUNDOWN_WAIT_BLOCK;
//
+// Executive Pushlock
+//
+typedef struct _EX_PUSH_LOCK
+{
+ union
+ {
+ struct
+ {
+ ULONG_PTR Locked:1;
+ ULONG_PTR Waiting:1;
+ ULONG_PTR Waking:1;
+ ULONG_PTR MultipleShared:1;
+ ULONG_PTR Shared:sizeof (ULONG_PTR) * 8 - 4;
+ };
+ ULONG_PTR Value;
+ PVOID Ptr;
+ };
+} EX_PUSH_LOCK, *PEX_PUSH_LOCK;
+
+//
// Executive Pushlock Wait Block
//
#ifndef __GNUC__ // WARNING! PUSHLOCKS WILL NOT WORK IN GCC FOR NOW!!!
_____
Modified: trunk/reactos/w32api/include/ddk/ntifs.h
--- trunk/reactos/w32api/include/ddk/ntifs.h 2005-12-29 18:28:05 UTC
(rev 20429)
+++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-12-29 18:45:00 UTC
(rev 20430)
@@ -619,31 +619,6 @@
ULONG CompressedChunkSizes[ANYSIZE_ARRAY];
} COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO;
-#define EX_PUSH_LOCK_LOCK_V ((ULONG_PTR)0x0)
-#define EX_PUSH_LOCK_LOCK ((ULONG_PTR)0x1)
-#define EX_PUSH_LOCK_WAITING ((ULONG_PTR)0x2)
-#define EX_PUSH_LOCK_WAKING ((ULONG_PTR)0x4)
-#define EX_PUSH_LOCK_MULTIPLE_SHARED ((ULONG_PTR)0x8)
-#define EX_PUSH_LOCK_SHARE_INC ((ULONG_PTR)0x10)
-#define EX_PUSH_LOCK_PTR_BITS ((ULONG_PTR)0xf)
-
-typedef struct _EX_PUSH_LOCK
-{
- union
- {
- struct
- {
- ULONG_PTR Locked:1;
- ULONG_PTR Waiting:1;
- ULONG_PTR Waking:1;
- ULONG_PTR MultipleShared:1;
- ULONG_PTR Shared:sizeof (ULONG_PTR) * 8 - 4;
- };
- ULONG_PTR Value;
- PVOID Ptr;
- };
-} EX_PUSH_LOCK, *PEX_PUSH_LOCK;
-
typedef struct _SID_IDENTIFIER_AUTHORITY {
BYTE Value[6];
}
SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AU
THORITY;
@@ -2186,6 +2161,7 @@
#if (VER_PRODUCTBUILD >= 2600)
+#ifndef __NTOSKRNL__
NTKERNELAPI
VOID
FASTCALL
@@ -2244,6 +2220,7 @@
IN PEX_RUNDOWN_REF RunRef
);
+#endif
#endif /* (VER_PRODUCTBUILD >= 2600) */
#define FlagOn(x, f) ((x) & (f))
Show replies by date