Rename old DOS3Call as INT_Int21Handler and make new DOS3Call call
directly winedos int21 handler.
This commit is contained in:
parent
c71cf7e60f
commit
742142521a
|
@ -986,7 +986,6 @@
|
|||
@ stdcall AllocCStoDSAlias16(long) AllocCStoDSAlias16
|
||||
@ stdcall AllocSelectorArray16(long) AllocSelectorArray16
|
||||
@ stdcall ConvertDialog32To16(ptr long ptr) ConvertDialog32To16
|
||||
@ stdcall DOS3Call(ptr) DOS3Call
|
||||
@ stdcall ExitKernel16() ExitKernel16
|
||||
@ stdcall FarGetOwner16(long) FarGetOwner16
|
||||
@ stdcall FarSetOwner16(long long) FarSetOwner16
|
||||
|
@ -1057,6 +1056,7 @@
|
|||
@ cdecl DOSMEM_GetDPMISegments() DOSMEM_GetDPMISegments
|
||||
@ cdecl DOSMEM_Init(long) DOSMEM_Init
|
||||
@ cdecl DRIVE_OpenDevice(long long) DRIVE_OpenDevice
|
||||
@ stdcall INT_Int21Handler(ptr) INT_Int21Handler
|
||||
@ cdecl LOCAL_Alloc(long long long) LOCAL_Alloc
|
||||
@ cdecl LOCAL_Compact(long long long) LOCAL_Compact
|
||||
@ cdecl LOCAL_CountFree(long) LOCAL_CountFree
|
||||
|
|
|
@ -35,6 +35,11 @@
|
|||
#include "wine/unicode.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
/*
|
||||
* FIXME: Delete this reference when all int21 code has been moved to winedos.
|
||||
*/
|
||||
extern void WINAPI INT_Int21Handler( CONTEXT86 *context );
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(int21);
|
||||
|
||||
void WINAPI DOSVM_Int21Handler_Ioctl( CONTEXT86 *context )
|
||||
|
@ -65,7 +70,7 @@ void WINAPI DOSVM_Int21Handler_Ioctl( CONTEXT86 *context )
|
|||
RESET_CFLAG(context);
|
||||
break;
|
||||
default:
|
||||
DOS3Call( context );
|
||||
INT_Int21Handler( context );
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -79,7 +84,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context )
|
|||
BYTE ascii;
|
||||
|
||||
if (DOSVM_IsWin16()) {
|
||||
DOS3Call( context );
|
||||
INT_Int21Handler( context );
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -200,7 +205,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context )
|
|||
for(i=0; i<CX_reg(context); i++)
|
||||
DOSVM_PutChar(ptr[i]);
|
||||
} else
|
||||
DOS3Call( context );
|
||||
INT_Int21Handler( context );
|
||||
break;
|
||||
|
||||
case 0x44: /* IOCTL */
|
||||
|
@ -256,6 +261,6 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context )
|
|||
break;
|
||||
|
||||
default:
|
||||
DOS3Call( context );
|
||||
INT_Int21Handler( context );
|
||||
}
|
||||
}
|
||||
|
|
21
msdos/dpmi.c
21
msdos/dpmi.c
|
@ -24,6 +24,7 @@
|
|||
#include "winbase.h"
|
||||
#include "callback.h"
|
||||
#include "wine/debug.h"
|
||||
#include "wine/windef16.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(int31);
|
||||
|
||||
|
@ -66,3 +67,23 @@ void WINAPI NetBIOSCall16( CONTEXT86 *context )
|
|||
if (Dosvm.CallBuiltinHandler || DPMI_LoadDosSystem())
|
||||
Dosvm.CallBuiltinHandler( context, 0x5c );
|
||||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* DOS3Call (KERNEL.102)
|
||||
*/
|
||||
void WINAPI DOS3Call( CONTEXT86 *context )
|
||||
{
|
||||
if (Dosvm.CallBuiltinHandler || DPMI_LoadDosSystem())
|
||||
Dosvm.CallBuiltinHandler( context, 0x21 );
|
||||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* GetSetKernelDOSProc (KERNEL.311)
|
||||
*/
|
||||
FARPROC16 WINAPI GetSetKernelDOSProc16( FARPROC16 DosProc )
|
||||
{
|
||||
FIXME("(DosProc=0x%08x): stub\n", (UINT)DosProc);
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -1120,10 +1120,9 @@ static void INT21_GetExtendedError( CONTEXT86 *context )
|
|||
}
|
||||
|
||||
/***********************************************************************
|
||||
* DOS3Call (KERNEL.102)
|
||||
* INT_Int21Handler (WPROCS.133)
|
||||
* INT_Int21Handler
|
||||
*/
|
||||
void WINAPI DOS3Call( CONTEXT86 *context )
|
||||
void WINAPI INT_Int21Handler( CONTEXT86 *context )
|
||||
{
|
||||
BOOL bSetDOSExtendedError = FALSE;
|
||||
|
||||
|
@ -2409,12 +2408,3 @@ void WINAPI DOS3Call( CONTEXT86 *context )
|
|||
(WORD)context->SegDs, (WORD)context->SegEs,
|
||||
context->EFlags);
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* GetSetKernelDOSProc (KERNEL.311)
|
||||
*/
|
||||
FARPROC16 WINAPI GetSetKernelDOSProc16(FARPROC16 DosProc)
|
||||
{
|
||||
FIXME("(DosProc=0x%08x): stub\n", (UINT)DosProc);
|
||||
return NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue