[cgutman] 38548: - Revert r38547 which reverted r38546 which was correct - I fail

Author: cgutman
Date: Sun Jan  4 02:12:13 2009
New Revision: 38548
URL: http://svn.reactos.org/svn/reactos?rev=38548&view=rev
Log:
 - Revert r38547 which reverted r38546 which was correct
 - I fail
Modified:
    trunk/reactos/drivers/network/tcpip/include/memtrack.h
    trunk/reactos/drivers/network/tcpip/include/precomp.h
    trunk/reactos/lib/drivers/ip/network/memtrack.c
Modified: trunk/reactos/drivers/network/tcpip/include/memtrack.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/memtrack.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/memtrack.h [iso-8859-1] Sun Jan  4
02:12:13 2009
@@ -25,20 +25,20 @@
 typedef struct _ALLOCATION_TRACKER {
     LIST_ENTRY Entry;
-    DWORD Tag;
+    ULONG Tag;
     PVOID Thing;
     PCHAR FileName;
-    DWORD LineNo;
+    ULONG LineNo;
 } ALLOCATION_TRACKER, *PALLOCATION_TRACKER;
 VOID TrackingInit();
-VOID TrackWithTag( DWORD Tag, PVOID Thing, PCHAR File, DWORD Line );
+VOID TrackWithTag( ULONG Tag, PVOID Thing, PCHAR File, ULONG Line );
 #define Track(Tag,Thing) TrackWithTag(Tag,Thing,__FILE__,__LINE__)
-VOID UntrackFL( PCHAR File, DWORD Line, PVOID Thing, DWORD Tag );
+VOID UntrackFL( PCHAR File, ULONG Line, PVOID Thing, ULONG Tag );
 #define Untrack(Thing) UntrackFL(__FILE__,__LINE__,Thing)
-VOID TrackDumpFL( PCHAR File, DWORD Line );
+VOID TrackDumpFL( PCHAR File, ULONG Line );
 #define TrackDump() TrackDumpFL(__FILE__,__LINE__)
-VOID TrackTag( DWORD Tag );
+VOID TrackTag( ULONG Tag );
 static __inline PVOID ExAllocateFromNPagedLookasideListX( PNPAGED_LOOKASIDE_LIST List,
PCHAR File, ULONG Line ) {
     PVOID Out = ExAllocateFromNPagedLookasideList( List );
Modified: trunk/reactos/drivers/network/tcpip/include/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/precomp.h [iso-8859-1] Sun Jan  4 02:12:13
2009
@@ -1,6 +1,5 @@
 #include <limits.h>
 #include <ntddk.h>
-#include <windef.h>
 #include <ntifs.h>
 #include <tdi.h>
 #include <tdistat.h>
Modified: trunk/reactos/lib/drivers/ip/network/memtrack.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/mem…
==============================================================================
--- trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] Sun Jan  4 02:12:13 2009
@@ -8,9 +8,9 @@
 static LIST_ENTRY AllocatedObjectsList;
 static KSPIN_LOCK AllocatedObjectsLock;
 static NPAGED_LOOKASIDE_LIST AllocatedObjectsLookasideList;
-DWORD TagsToShow[MEMTRACK_MAX_TAGS_TO_TRACK] = { 0 };
+ULONG TagsToShow[MEMTRACK_MAX_TAGS_TO_TRACK] = { 0 };
-VOID TrackTag( DWORD Tag ) {
+VOID TrackTag( ULONG Tag ) {
     UINT i;
     for( i = 0; TagsToShow[i]; i++ );
@@ -58,7 +58,7 @@
     }
 }
-VOID TrackWithTag( DWORD Tag, PVOID Thing, PCHAR FileName, DWORD LineNo ) {
+VOID TrackWithTag( ULONG Tag, PVOID Thing, PCHAR FileName, ULONG LineNo ) {
     PALLOCATION_TRACKER TrackedThing =
         ExAllocateFromNPagedLookasideList( &AllocatedObjectsLookasideList );
@@ -104,7 +104,7 @@
     /*TrackDumpFL( FileName, LineNo );*/
 }
-BOOLEAN ShowTag( DWORD Tag ) {
+BOOLEAN ShowTag( ULONG Tag ) {
     UINT i;
     for( i = 0; TagsToShow[i] && TagsToShow[i] != Tag; i++ );
@@ -112,7 +112,7 @@
     return TagsToShow[i] ? TRUE : FALSE;
 }
-VOID UntrackFL( PCHAR File, DWORD Line, PVOID Thing, DWORD Tag ) {
+VOID UntrackFL( PCHAR File, ULONG Line, PVOID Thing, ULONG Tag ) {
     KIRQL OldIrql;
     PLIST_ENTRY Entry;
     PALLOCATION_TRACKER ThingInList;
@@ -147,7 +147,7 @@
     TcpipBugCheck( 0 );
 }
-VOID TrackDumpFL( PCHAR File, DWORD Line ) {
+VOID TrackDumpFL( PCHAR File, ULONG Line ) {
     KIRQL OldIrql;
     PLIST_ENTRY Entry;
     PALLOCATION_TRACKER Thing;