diff --git a/reactos/ntoskrnl/ps/debug.c b/reactos/ntoskrnl/ps/debug.c
index 32c3021c807..2387ec77f6c 100644
--- a/reactos/ntoskrnl/ps/debug.c
+++ b/reactos/ntoskrnl/ps/debug.c
@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: debug.c,v 1.9 2003/06/07 19:13:43 gvg Exp $
+/* $Id: debug.c,v 1.10 2003/06/16 19:19:30 hbirr Exp $
  *
  * PROJECT:                ReactOS kernel
  * FILE:                   ntoskrnl/ps/debug.c
@@ -55,7 +55,7 @@ VOID
 KeContextToTrapFrame(PCONTEXT Context,
 		     PKTRAP_FRAME TrapFrame)
 {
-   if (Context->ContextFlags & CONTEXT_CONTROL)
+   if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL)
      {
 	TrapFrame->Esp = Context->Esp;
 	TrapFrame->Ss = Context->SegSs;
@@ -64,7 +64,7 @@ KeContextToTrapFrame(PCONTEXT Context,
 	TrapFrame->Eflags = Context->EFlags;	
 	TrapFrame->Ebp = Context->Ebp;
      }
-   if (Context->ContextFlags & CONTEXT_INTEGER)
+   if ((Context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER)
      {
 	TrapFrame->Eax = Context->Eax;
 	TrapFrame->Ebx = Context->Ebx;
@@ -77,20 +77,20 @@ KeContextToTrapFrame(PCONTEXT Context,
 	TrapFrame->Esi = Context->Esi;
 	TrapFrame->Edi = Context->Edi;
      }
-   if (Context->ContextFlags & CONTEXT_SEGMENTS)
+   if ((Context->ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS)
      {
 	TrapFrame->Ds = Context->SegDs;
 	TrapFrame->Es = Context->SegEs;
 	TrapFrame->Fs = Context->SegFs;
 	TrapFrame->Gs = Context->SegGs;
      }
-   if (Context->ContextFlags & CONTEXT_FLOATING_POINT)
+   if ((Context->ContextFlags & CONTEXT_FLOATING_POINT) == CONTEXT_FLOATING_POINT)
      {
 	/*
 	 * Not handled
 	 */
      }
-   if (Context->ContextFlags & CONTEXT_DEBUG_REGISTERS)
+   if ((Context->ContextFlags & CONTEXT_DEBUG_REGISTERS) == CONTEXT_DEBUG_REGISTERS)
      {
 	/*
 	 * Not handled
@@ -102,7 +102,7 @@ VOID
 KeTrapFrameToContext(PKTRAP_FRAME TrapFrame,
 		     PCONTEXT Context)
 {
-   if (Context->ContextFlags & CONTEXT_CONTROL)
+   if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL)
      {
 	Context->SegSs = TrapFrame->Ss;
 	Context->Esp = TrapFrame->Esp;
@@ -111,7 +111,7 @@ KeTrapFrameToContext(PKTRAP_FRAME TrapFrame,
 	Context->EFlags = TrapFrame->Eflags;
 	Context->Ebp = TrapFrame->Ebp;
      }
-   if (Context->ContextFlags & CONTEXT_INTEGER)
+   if ((Context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER)
      {
 	Context->Eax = TrapFrame->Eax;
 	Context->Ebx = TrapFrame->Ebx;
@@ -128,27 +128,27 @@ KeTrapFrameToContext(PKTRAP_FRAME TrapFrame,
 	Context->Esi = TrapFrame->Esi;
 	Context->Edi = TrapFrame->Edi;
      }
-   if (Context->ContextFlags & CONTEXT_SEGMENTS)
+   if ((Context->ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS)
      {
 	Context->SegDs = TrapFrame->Ds;
 	Context->SegEs = TrapFrame->Es;
 	Context->SegFs = TrapFrame->Fs;
 	Context->SegGs = TrapFrame->Gs;
      }
-   if (Context->ContextFlags & CONTEXT_DEBUG_REGISTERS)
+   if ((Context->ContextFlags & CONTEXT_DEBUG_REGISTERS) == CONTEXT_DEBUG_REGISTERS)
      {
 	/*
 	 * FIXME: Implement this case
 	 */	
      }
-   if (Context->ContextFlags & CONTEXT_FLOATING_POINT)
+   if ((Context->ContextFlags & CONTEXT_FLOATING_POINT) == CONTEXT_FLOATING_POINT)
      {
 	/*
 	 * FIXME: Implement this case
 	 */
      }
 #if 0
-   if (Context->ContextFlags & CONTEXT_EXTENDED_REGISTERS)
+   if ((Context->ContextFlags & CONTEXT_EXTENDED_REGISTERS) == CONTEXT_EXTENDED_REGISTERS)
      {
 	/*
 	 * FIXME: Investigate this