Alexandre Julliard : ntoskrnl.exe: Avoid using the CONTEXT86 type.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3161fc517f548ec459000a85a3975b217666174d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3161fc517f548ec459000a85a3...

Author: Alexandre Julliard 
Date:   Wed Oct 20 15:33:58 2010 +0200

ntoskrnl.exe: Avoid using the CONTEXT86 type.

---

dlls/ntoskrnl.exe/instr.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c
index e7046f4..ab80719 100644
--- a/dlls/ntoskrnl.exe/instr.c
+++ b/dlls/ntoskrnl.exe/instr.c
@@ -59,7 +59,7 @@ static inline struct idtr get_idtr(void)
 }

/* store an operand into a register */
-static void store_reg( CONTEXT86 *context, BYTE regmodrm, const BYTE *addr, int long_op )
+static void store_reg( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op )
 {
     switch((regmodrm >> 3) & 7)
     {
@@ -103,7 +103,7 @@ static void store_reg( CONTEXT86 *context, BYTE regmodrm, const BYTE *addr, int
  *
  * Return the address of an instruction operand (from the mod/rm byte).
  */
-static BYTE *INSTR_GetOperandAddr( CONTEXT86 *context, BYTE *instr,
+static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr,
                                    int long_addr, int segprefix, int *len )
 {
     int mod, rm, base = 0, index = 0, ss = 0, seg = 0, off;
@@ -258,7 +258,7 @@ static BYTE *INSTR_GetOperandAddr( CONTEXT86 *context, BYTE *instr,
  * Emulate a privileged instruction.
  * Returns exception continuation status.
  */
-static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context )
+static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
 {
     int prefix, segprefix, prefixlen, len, long_op, long_addr;
     BYTE *instr;
@@ -432,7 +432,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context )
 LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs )
 {
     EXCEPTION_RECORD *record = ptrs->ExceptionRecord;
-    CONTEXT86 *context = ptrs->ContextRecord;
+    CONTEXT *context = ptrs->ContextRecord;

if ((record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION ||
          record->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION))