From ec8ff3a9062b238b84d56a7a36d4976095755419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= <jerome.gardou@reactos.org>
Date: Mon, 29 Apr 2013 16:17:46 +0000
Subject: [PATCH] [NTOSKRNL/V86VDM]  - Merge the EFLAGS register instead of
 overwriting it when restoring it from a POPF call.

svn path=/trunk/; revision=58892
---
 reactos/ntoskrnl/ke/i386/v86vdm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/ntoskrnl/ke/i386/v86vdm.c b/reactos/ntoskrnl/ke/i386/v86vdm.c
index 9a0c6e01cdc..8f241bedd50 100644
--- a/reactos/ntoskrnl/ke/i386/v86vdm.c
+++ b/reactos/ntoskrnl/ke/i386/v86vdm.c
@@ -155,7 +155,7 @@ KiVdmOpcodePOPF(IN PKTRAP_FRAME TrapFrame,
     V86EFlags |= EFLAGS_V86_MASK;
 
     /* Update EFlags in trap frame */
-    TrapFrame->EFlags = V86EFlags;
+    TrapFrame->EFlags |= V86EFlags;
 
     /* Check if ESP0 needs to be fixed up */
     if (TrapEFlags & EFLAGS_V86_MASK) Ki386AdjustEsp0(TrapFrame);