Change the V86BASE macro to call DOSMEM_MemoryBase() instead of using

dlls/ntdll/signal_i386.c

@@ -378,7 +378,6 @@ static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext )
 #else
     context->SegGs  = __get_gs();
 #endif
-    if (ISV86(context)) V86BASE(context) = (DWORD)DOSMEM_MemoryBase(0);
 }
 
 

include/winnt.h

@@ -714,7 +714,7 @@ typedef HANDLE *PHANDLE;
 #define RESET_ZFLAG(context) (EFL_reg(context) &= ~0x0040)
 
 #define ISV86(context)       (EFL_reg(context) & 0x00020000)
-#define V86BASE(context)     ((context)->Dr7) /* ugly */
+#define V86BASE(context)     DOSMEM_MemoryBase(0)
 
 
 /* Macros to retrieve the current context */

loader/dos/dosvm.c

@@ -250,7 +250,6 @@ static int DOSVM_Process( LPDOSTASK lpDosTask, int fn, int sig,
   if (ret) return 0;
   ret=0;
  }
- (void*)V86BASE(&context)=lpDosTask->img;
 #ifdef TRY_PICRETURN
  if (VM86->vm86plus.force_return_for_pic) {
    SET_PEND(&context);

msdos/dpmi.c

@@ -157,7 +157,6 @@ static void INT_GetRealModeContext( REALMODECALL *call, CONTEXT86 *context )
     FS_reg(context)  = call->fs;
     GS_reg(context)  = call->gs;
     SS_reg(context)  = call->ss;
-    V86BASE(context) = (DWORD) DOSMEM_MemoryBase(0);
 }