diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 219ee866a..03f56fa83 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-14  Robert Wruck  <rwruck@users.sourceforge.net>
+
+	* include/ddk/winddk.h (RtlEqualLuid): Correct macro.
+
 2004-04-06  Luke Dunstan  <infidel@users.sourceforge.net>
 
 	* include/ocidl.h (QACONTAINERFLAGS): Correct typedef.
@@ -8,7 +12,7 @@
 	* lib/directx/dxerr.c: Remove dependence on mingw runtime. 
 	Don't include stdio.h or tchar.h.
 	Replace _T() macro with TEXT() macro, throughout.
-	Replace, _stprintf with wsprintf, throughout.
+	Replace _stprintf with wsprintf, throughout.
 
 2004-03-27  Hosaka Yuji  <hos@tamanegi.org>
 
diff --git a/winsup/w32api/include/ddk/winddk.h b/winsup/w32api/include/ddk/winddk.h
index bda8b5318..985303378 100644
--- a/winsup/w32api/include/ddk/winddk.h
+++ b/winsup/w32api/include/ddk/winddk.h
@@ -4398,12 +4398,12 @@ RtlDeleteRegistryValue(
 /*
  * BOOLEAN
  * RtlEqualLuid( 
- *   IN LUID  Luid1,
- *   IN LUID  Luid2)
+ *   IN LUID*  Luid1,
+ *   IN LUID*  Luid2)
  */
-#define RtlEqualLuid(_Luid1, \
-                     _Luid2) \
-  ((Luid1.LowPart == Luid2.LowPart) && (Luid1.HighPart == Luid2.HighPart))
+#define RtlEqualLuid(_Luid1,_Luid2) \
+  ((BOOLEAN) (((_Luid1)->LowPart == (_Luid2)->LowPart) \
+	      && ((_Luid1)->HighPart == (_Luid2)->HighPart)))
 
 /*
  * ULONG