diff --git a/reactos/include/ddk/ndis.h b/reactos/include/ddk/ndis.h
index c6e688e2b6a..1ad9354c187 100644
--- a/reactos/include/ddk/ndis.h
+++ b/reactos/include/ddk/ndis.h
@@ -1806,7 +1806,7 @@ NdisQueryBufferOffset(
                         VirtualAddress, \
                         Length)         \
 {                                       \
-	if (VirtualAddress)                   \
+	if (ARGUMENT_PRESENT(VirtualAddress))                   \
 		*((PVOID*)VirtualAddress) = MmGetSystemAddressForMdl(Buffer); \
                                         \
 	*((PUINT)Length) = MmGetMdlByteCount(Buffer); \
@@ -2032,7 +2032,7 @@ NdisQueryPacket(
     OUT PUINT  TotalPacketLength  OPTIONAL)
 {
     if (FirstBuffer)
-        *((PNDIS_BUFFER*)FirstBuffer) = Packet->Private.Head;
+        *FirstBuffer = Packet->Private.Head;
     if (TotalPacketLength || BufferCount || PhysicalBufferCount)
     {
         if (!Packet->Private.ValidCounts)
@@ -2060,14 +2060,14 @@ NdisQueryPacket(
         }
 
         if (PhysicalBufferCount)
-            *((PUINT)PhysicalBufferCount) = Packet->Private.PhysicalCount;
+            *PhysicalBufferCount = Packet->Private.PhysicalCount;
 
         if (BufferCount)
-            *((PUINT)BufferCount) = Packet->Private.Count;
+            *BufferCount = Packet->Private.Count;
 
         if (TotalPacketLength)
-            *((PUINT)TotalPacketLength) = Packet->Private.TotalLength;
-    } 
+            *TotalPacketLength = Packet->Private.TotalLength;
+    }
 }
 
 /*
diff --git a/reactos/include/ddk/winddk.h b/reactos/include/ddk/winddk.h
index 6c5a206fc1a..1829506de97 100644
--- a/reactos/include/ddk/winddk.h
+++ b/reactos/include/ddk/winddk.h
@@ -5429,7 +5429,7 @@ KfReleaseSpinLock(
 */
 
 #define ARGUMENT_PRESENT(ArgumentPointer) \
-  ((BOOLEAN) ((PVOID)ArgumentPointer != (PVOID)NULL))
+  ((CHAR*)((ULONG_PTR)(ArgumentPointer)) != (CHAR*)NULL)
 
 /*
  * ULONG