From 950f55d8b7bf85bb0c3a42a933968513ba82e463 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Mon, 25 May 2015 15:04:09 +0000
Subject: [PATCH] [RTL][NTOSKRNL] - Don't cast CONTAINING_RECORD

svn path=/trunk/; revision=67906
---
 reactos/lib/rtl/generictable.c  | 12 ++++++------
 reactos/ntoskrnl/ex/sysinfo.c   |  3 +--
 reactos/ntoskrnl/fsrtl/tunnel.c | 12 ++++++------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/reactos/lib/rtl/generictable.c b/reactos/lib/rtl/generictable.c
index a61a9699e99..9703d7d2073 100644
--- a/reactos/lib/rtl/generictable.c
+++ b/reactos/lib/rtl/generictable.c
@@ -438,9 +438,9 @@ RtlGetElementGenericTable(IN PRTL_GENERIC_TABLE Table,
     if (NextI == OrderedElement)
     {
         /* Return it */
-        return &((PTABLE_ENTRY_HEADER)CONTAINING_RECORD(OrderedNode,
-                                                        TABLE_ENTRY_HEADER,
-                                                        ListEntry))->UserData;
+        return &CONTAINING_RECORD(OrderedNode,
+                                  TABLE_ENTRY_HEADER,
+                                  ListEntry)->UserData;
     }
 
     /* Now check if we're farther behind */
@@ -505,9 +505,9 @@ RtlGetElementGenericTable(IN PRTL_GENERIC_TABLE Table,
     Table->WhichOrderedElement = NextI;
 
     /* Return the element */
-    return &((PTABLE_ENTRY_HEADER)CONTAINING_RECORD(OrderedNode,
-                                                    TABLE_ENTRY_HEADER,
-                                                    ListEntry))->UserData;
+    return &CONTAINING_RECORD(OrderedNode,
+                              TABLE_ENTRY_HEADER,
+                              ListEntry)->UserData;
 }
 
 /* EOF */
diff --git a/reactos/ntoskrnl/ex/sysinfo.c b/reactos/ntoskrnl/ex/sysinfo.c
index a31be1423c5..d2bbac4815a 100644
--- a/reactos/ntoskrnl/ex/sysinfo.c
+++ b/reactos/ntoskrnl/ex/sysinfo.c
@@ -918,8 +918,7 @@ QSI_DEF(SystemProcessInformation)
                 CurrentEntry = Process->Pcb.ThreadListHead.Flink;
                 while (CurrentEntry != &Process->Pcb.ThreadListHead)
                 {
-                    CurrentThread = (PETHREAD)CONTAINING_RECORD(CurrentEntry, KTHREAD,
-                        ThreadListEntry);
+                    CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD, Tcb.ThreadListEntry);
 
                     ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement);
                     ThreadInfo->UserTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.UserTime, KeMaximumIncrement);
diff --git a/reactos/ntoskrnl/fsrtl/tunnel.c b/reactos/ntoskrnl/fsrtl/tunnel.c
index e07bb27e996..aeb9ebcf7bf 100644
--- a/reactos/ntoskrnl/fsrtl/tunnel.c
+++ b/reactos/ntoskrnl/fsrtl/tunnel.c
@@ -105,7 +105,7 @@ FsRtlPruneTunnelCache(
     while(Entry != &Cache->TimerQueue)
     {
         /* get node entry */
-        CurEntry = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry);
+        CurEntry = CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry);
 
         /* get next entry */
          NextEntry = Entry->Flink;
@@ -124,7 +124,7 @@ FsRtlPruneTunnelCache(
     /* If we have too many entries */
     while (Cache->NumEntries > TunnelMaxEntries)
     {
-        CurEntry = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry);
+        CurEntry = CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry);
         FsRtlRemoveNodeFromTunnel(Cache, CurEntry, PoolList, &Rebalance);
     }
 }
@@ -295,7 +295,7 @@ FsRtlEmptyFreePoolList(
     {
         /* and free them, one by one */
         CurEntry = RemoveHeadList(PoolList);
-        CurNode = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(CurEntry, TUNNEL_NODE_ENTRY, TimerQueueEntry);
+        CurNode = CONTAINING_RECORD(CurEntry, TUNNEL_NODE_ENTRY, TimerQueueEntry);
         FsRtlFreeTunnelNode(CurNode, 0);
     }
 }
@@ -609,7 +609,7 @@ FsRtlDeleteKeyFromTunnelCache(IN PTUNNEL Cache,
     CurEntry = Cache->Cache;
     while (CurEntry)
     {
-        CurNode = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(CurEntry, TUNNEL_NODE_ENTRY, SplayInfo);
+        CurNode = CONTAINING_RECORD(CurEntry, TUNNEL_NODE_ENTRY, SplayInfo);
 
         if (CurNode->DirectoryKey > DirectoryKey)
         {
@@ -647,7 +647,7 @@ FsRtlDeleteKeyFromTunnelCache(IN PTUNNEL Cache,
     /* delete any matching key */
     do
     {
-        CurNode = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(LastEntry, TUNNEL_NODE_ENTRY, SplayInfo);
+        CurNode = CONTAINING_RECORD(LastEntry, TUNNEL_NODE_ENTRY, SplayInfo);
 
         Successors = RtlRealSuccessor(LastEntry);
         if (CurNode->DirectoryKey != DirectoryKey)
@@ -704,7 +704,7 @@ FsRtlDeleteTunnelCache(IN PTUNNEL Cache)
     while(Entry != &Cache->TimerQueue)
     {
         /* get node entry */
-        CurEntry = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry);
+        CurEntry = CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry);
 
         /* get next entry */
          NextEntry = Entry->Flink;