[jgardou] 58892: [NTOSKRNL/V86VDM] - Merge the EFLAGS register instead of overwriting it when restoring it from a POPF call.

Author: jgardou
Date: Mon Apr 29 16:17:46 2013
New Revision: 58892

URL: http://svn.reactos.org/svn/reactos?rev=58892&view=rev
Log:
[NTOSKRNL/V86VDM]
 - Merge the EFLAGS register instead of overwriting it when restoring it from a POPF call.

Modified:
    trunk/reactos/ntoskrnl/ke/i386/v86vdm.c

Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?r...
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Mon Apr 29 16:17:46 2013
@@ -155,7 +155,7 @@
     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);