From d41581dbde8c0b5b1c9d7b03910f8fffb100ae87 Mon Sep 17 00:00:00 2001
From: Jukka Heinonen <jhei@iki.fi>
Date: Fri, 15 Nov 2002 01:35:52 +0000
Subject: [PATCH] DeviceIoControl now calls winedos interrupt handlers. Fixed
 RawModeSwitch.

---
 dlls/winedos/interrupts.c | 13 +++++++++++++
 dlls/winedos/winedos.spec |  1 +
 include/callback.h        |  1 +
 msdos/dpmi.c              |  1 +
 win32/device.c            | 37 ++++++++++++++++++++++++++-----------
 5 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/dlls/winedos/interrupts.c b/dlls/winedos/interrupts.c
index 5f13705538f..457b626c4dd 100644
--- a/dlls/winedos/interrupts.c
+++ b/dlls/winedos/interrupts.c
@@ -103,6 +103,8 @@ void WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *context, BYTE intnum )
 
   if(context->SegCs == DOSVM_dpmi_segments->int48_sel) 
     islong = FALSE;
+  else if(context->SegCs == DOSVM_dpmi_segments->dpmi_sel)
+    islong = FALSE;
   else if(DOSVM_IsDos32())
     islong = TRUE;
   else if(IS_SELECTOR_32BIT(context->SegCs)) {
@@ -256,3 +258,14 @@ INTPROC DOSVM_GetBuiltinHandler( BYTE intnum )
   WARN("int%x not implemented, returning dummy handler\n", intnum );
   return DOSVM_DefaultHandler;
 }
+
+/**********************************************************************
+ *         DOSVM_CallBuiltinHandler
+ *
+ * Execute Wine interrupt handler procedure.
+ */
+void WINAPI DOSVM_CallBuiltinHandler( CONTEXT86 *context, BYTE intnum ) 
+{
+  INTPROC proc = DOSVM_GetBuiltinHandler( intnum );
+  proc( context );
+}
diff --git a/dlls/winedos/winedos.spec b/dlls/winedos/winedos.spec
index 4404e0f542e..d8644a543bb 100644
--- a/dlls/winedos/winedos.spec
+++ b/dlls/winedos/winedos.spec
@@ -1,5 +1,6 @@
 @ stdcall LoadDosExe(str long) MZ_LoadImage
 @ stdcall EmulateInterruptPM(ptr long) DOSVM_EmulateInterruptPM
+@ stdcall CallBuiltinHandler(ptr long) DOSVM_CallBuiltinHandler
 
 # DPMI functions
 @ stdcall CallRMInt(ptr) DOSVM_CallRMInt
diff --git a/include/callback.h b/include/callback.h
index 18a49d0f911..272ae8a3e90 100644
--- a/include/callback.h
+++ b/include/callback.h
@@ -27,6 +27,7 @@
 typedef struct {
     void (WINAPI *LoadDosExe)( LPCSTR filename, HANDLE hFile );
     void (WINAPI *EmulateInterruptPM)( CONTEXT86 *context, BYTE intnum );
+    void (WINAPI *CallBuiltinHandler)( CONTEXT86 *context, BYTE intnum );
 
     /* DPMI functions */
     void (WINAPI *CallRMInt)( CONTEXT86 *context );
diff --git a/msdos/dpmi.c b/msdos/dpmi.c
index 27982547074..653f6141333 100644
--- a/msdos/dpmi.c
+++ b/msdos/dpmi.c
@@ -75,6 +75,7 @@ BOOL DPMI_LoadDosSystem(void)
     GET_ADDR(outport);
     GET_ADDR(ASPIHandler);
     GET_ADDR(EmulateInterruptPM);
+    GET_ADDR(CallBuiltinHandler);
 #undef GET_ADDR
     return TRUE;
 }
diff --git a/win32/device.c b/win32/device.c
index b87eadef225..51950ccd2c7 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -44,6 +44,7 @@
 #include "stackframe.h"
 #include "wine/server.h"
 #include "wine/debug.h"
+#include "callback.h"
 
 /* int 13 stuff */
 #ifdef HAVE_SYS_IOCTL_H
@@ -1573,9 +1574,13 @@ static BOOL DeviceIo_IFSMgr(DWORD dwIoControlCode, LPVOID lpvInBuffer, DWORD cbI
 
 		if(dwIoControlCode==IFS_IOCTL_21)
 		{
-			DOS3Call(&cxt); /* Call int 21h */
-		} else {
-			INT_Int2fHandler(&cxt); /* Call int 2Fh */
+                    if(Dosvm.CallBuiltinHandler || DPMI_LoadDosSystem())
+                        Dosvm.CallBuiltinHandler( &cxt, 0x21 );
+               } 
+                else 
+                {
+                    if(Dosvm.CallBuiltinHandler || DPMI_LoadDosSystem())
+                        Dosvm.CallBuiltinHandler( &cxt, 0x2f );
 		}
 
 		CONTEXT_2_win32apieq(&cxt,pOut);
@@ -1640,7 +1645,8 @@ static DWORD VxDCall_VWin32( DWORD service, CONTEXT86 *context )
 
 	SET_AX( context, callnum );
         SET_CX( context, parm );
-	INT_Int31Handler(context);
+        if(Dosvm.CallBuiltinHandler || DPMI_LoadDosSystem())
+            Dosvm.CallBuiltinHandler( context, 0x31 );
 
 	return LOWORD(context->Eax);
     }
@@ -1983,6 +1989,7 @@ static BOOL DeviceIo_VWin32(DWORD dwIoControlCode,
         CONTEXT86 cxt;
         DIOC_REGISTERS *pIn  = (DIOC_REGISTERS *)lpvInBuffer;
         DIOC_REGISTERS *pOut = (DIOC_REGISTERS *)lpvOutBuffer;
+        BYTE intnum = 0;
 
         TRACE( "Control '%s': "
                "eax=0x%08lx, ebx=0x%08lx, ecx=0x%08lx, "
@@ -1998,17 +2005,25 @@ static BOOL DeviceIo_VWin32(DWORD dwIoControlCode,
 
         switch (dwIoControlCode)
         {
-        case VWIN32_DIOC_DOS_IOCTL: DOS3Call( &cxt ); break; /* Call int 21h */
-        case VWIN32_DIOC_DOS_INT13: INT_Int13Handler( &cxt ); break;
+        case VWIN32_DIOC_DOS_IOCTL: /* Call int 21h */
         case 0x10: /* Int 0x21 call, call it VWIN_DIOC_INT21 ? */
-				    DOS3Call( &cxt ); break;
-        case VWIN32_DIOC_DOS_INT25: INT_Int25Handler( &cxt ); break;
-        case VWIN32_DIOC_DOS_INT26: INT_Int26Handler( &cxt ); break;
+        case VWIN32_DIOC_DOS_DRIVEINFO:        /* Call int 21h 730x */
+            intnum = 0x21;
+            break;
+        case VWIN32_DIOC_DOS_INT25: 
+            intnum = 0x25;
+            break;
+        case VWIN32_DIOC_DOS_INT26:
+            intnum = 0x26;
+            break;
         case 0x29: /* Int 0x31 call, call it VWIN_DIOC_INT31 ? */
-				    INT_Int31Handler( &cxt ); break;
-        case VWIN32_DIOC_DOS_DRIVEINFO:	DOS3Call( &cxt ); break; /* Call int 21h 730x */
+            intnum = 0x31;
+            break;
         }
 
+        if(Dosvm.CallBuiltinHandler || DPMI_LoadDosSystem())
+            Dosvm.CallBuiltinHandler( &cxt, intnum );
+
         CONTEXT_2_DIOCRegs( &cxt, pOut );
     }
     break;
-- 
2.11.4.GIT