+2004-01-02 Filip Navara <xnavara@volny.cz>
+
+ * include/ddk/winddk.h: Don't care about value of
+ DBG define.
+
+2004-01-02 Danny Smith <dannysmith@users.sourceforge.net>
+ Filip Navara <xnavara@volny.cz>
+
+ * include/ddk/winddk.h (_DDK_DUMMYUNION_MEMBER,
+ _DDK_DUMMYUNION_N_MEMBER): New macros.
+ (ExAllocateFromPagedLookasideList,ExFreeToPagedLookasideList,
+ ExAllocateFromNPagedLookasideList, ExFreeToNPagedLookasideList):
+ Use them.
+
2004-01-01 Filip Navara <xnavara@volny.cz>
* include/objbase.h: Don't care about value of DBG define.
#define RESTRICTED_POINTER
#define POINTER_ALIGNMENT
-
+#ifdef NONAMELESSUNION
+# define _DDK_DUMMYUNION_MEMBER(name) DUMMYUNIONNAME.name
+# define _DDK_DUMMYUNION_N_MEMBER(n, name) DUMMYUNIONNAME##n.name
+#else
+# define _DDK_DUMMYUNION_MEMBER(name) name
+# define _DDK_DUMMYUNION_N_MEMBER(n, name) name
+#endif
/*
** Forward declarations
#define HIGH_PRIORITY 31
#define MAXIMUM_PRIORITY 32
+#define FILE_SUPERSEDED 0x00000000
+#define FILE_OPENED 0x00000001
+#define FILE_CREATED 0x00000002
+#define FILE_OVERWRITTEN 0x00000003
+#define FILE_EXISTS 0x00000004
+#define FILE_DOES_NOT_EXIST 0x00000005
+
+/* also in winnt.h */
#define FILE_LIST_DIRECTORY 0x00000001
#define FILE_READ_DATA 0x00000001
#define FILE_ADD_FILE 0x00000002
#define FILE_READ_ATTRIBUTES 0x00000080
#define FILE_WRITE_ATTRIBUTES 0x00000100
-#define FILE_SUPERSEDED 0x00000000
-#define FILE_OPENED 0x00000001
-#define FILE_CREATED 0x00000002
-#define FILE_OVERWRITTEN 0x00000003
-#define FILE_EXISTS 0x00000004
-#define FILE_DOES_NOT_EXIST 0x00000005
-
#define FILE_SHARE_READ 0x00000001
#define FILE_SHARE_WRITE 0x00000002
#define FILE_SHARE_DELETE 0x00000004
FILE_WRITE_EA | \
FILE_APPEND_DATA | \
SYNCHRONIZE)
+/* end winnt.h */
/* Exported object types */
extern NTOSAPI POBJECT_TYPE ExDesktopObjectType;
typedef struct _IO_REMOVE_LOCK {
IO_REMOVE_LOCK_COMMON_BLOCK Common;
-#if DBG
+#ifdef DBG
IO_REMOVE_LOCK_DBG_BLOCK Dbg;
#endif
} IO_REMOVE_LOCK, *PIO_REMOVE_LOCK;
IN ULONG LineNumber,
IN PCHAR Message);
-#if DBG
+#ifdef DBG
#define ASSERT(exp) \
((!(exp)) ? \
Lookaside->TotalAllocates++;
Entry = InterlockedPopEntrySList(&Lookaside->ListHead);
if (Entry == NULL) {
- Lookaside->AllocateMisses++;
+ Lookaside->_DDK_DUMMYUNION_MEMBER(AllocateMisses)++;
Entry = (Lookaside->Allocate)(Lookaside->Type, Lookaside->Size, Lookaside->Tag);
}
return Entry;
Lookaside->TotalAllocates++;
Entry = InterlockedPopEntrySList(&Lookaside->ListHead);
if (Entry == NULL) {
- Lookaside->AllocateMisses++;
+ Lookaside->_DDK_DUMMYUNION_MEMBER(AllocateMisses)++;
Entry = (Lookaside->Allocate)(Lookaside->Type,
Lookaside->Size, Lookaside->Tag);
}
{
Lookaside->TotalFrees++;
if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) {
- Lookaside->FreeMisses++;
+ Lookaside->_DDK_DUMMYUNION_N_MEMBER(2,FreeMisses)++;
(Lookaside->Free)(Entry);
} else {
InterlockedPushEntrySList(&Lookaside->ListHead,
{
Lookaside->TotalFrees++;
if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) {
- Lookaside->FreeMisses++;
+ Lookaside->_DDK_DUMMYUNION_N_MEMBER(2,FreeMisses)++;
(Lookaside->Free)(Entry);
} else {
InterlockedPushEntrySList(&Lookaside->ListHead, (PSLIST_ENTRY)Entry);
ExVerifySuite(
IN SUITE_TYPE SuiteType);
-#if DBG
+#ifdef DBG
#define PAGED_CODE() { \
if (KeGetCurrentIrql() > APC_LEVEL) { \
IN ULONG Level,
IN BOOLEAN State);
-#if DBG
+#ifdef DBG
#define KdPrint(_x_) DbgPrint _x_
#define KdPrintEx(_x_) DbgPrintEx _x_