This patch cleans up int21 handling and prepares for
migration of nontrivial functions to winedos.
Winedos no longer uses INT_Int21Handler as default
handler for unknown functions.
Changelog:
Clean up int21 handling. Move error handling to winedos.
Call INT_Int21Handler only to emulate selected functions.
Index: dlls/winedos/int21.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/int21.c,v
retrieving revision 1.16
diff -u -r1.16 int21.c
--- dlls/winedos/int21.c 2 Dec 2002 18:58:32 -0000 1.16
+++ dlls/winedos/int21.c 2 Dec 2002 19:51:55 -0000
@@ -32,6 +32,7 @@
#include "miscemu.h"
#include "msdos.h"
#include "file.h"
+#include "winerror.h"
#include "wine/unicode.h"
#include "wine/debug.h"
@@ -42,7 +43,11 @@
WINE_DEFAULT_DEBUG_CHANNEL(int21);
-void WINAPI DOSVM_Int21Handler_Ioctl( CONTEXT86 *context )
+
+/***********************************************************************
+ * INT21_Ioctl
+ */
+static void INT21_Ioctl( CONTEXT86 *context )
{
static const WCHAR emmxxxx0W[] = {'E','M','M','X','X','X','X','0',0};
const DOS_DEVICE *dev = DOSFS_GetDeviceByHandle(
@@ -74,50 +79,168 @@
}
}
+
/***********************************************************************
- * DOSVM_Int21Handler (WINEDOS16.133)
- *
- * int 21h handler. Most calls are passed directly to DOS3Call.
+ * INT21_GetExtendedError
*/
-void WINAPI DOSVM_Int21Handler( CONTEXT86 *context )
+static void INT21_GetExtendedError( CONTEXT86 *context )
{
- BYTE ascii;
+ BYTE class, action, locus;
+ WORD error = GetLastError();
- if (DOSVM_IsWin16()) {
- INT_Int21Handler( context );
- return;
+ switch(error)
+ {
+ case ERROR_SUCCESS:
+ class = action = locus = 0;
+ break;
+ case ERROR_DIR_NOT_EMPTY:
+ class = EC_Exists;
+ action = SA_Ignore;
+ locus = EL_Disk;
+ break;
+ case ERROR_ACCESS_DENIED:
+ class = EC_AccessDenied;
+ action = SA_Abort;
+ locus = EL_Disk;
+ break;
+ case ERROR_CANNOT_MAKE:
+ class = EC_AccessDenied;
+ action = SA_Abort;
+ locus = EL_Unknown;
+ break;
+ case ERROR_DISK_FULL:
+ case ERROR_HANDLE_DISK_FULL:
+ class = EC_MediaError;
+ action = SA_Abort;
+ locus = EL_Disk;
+ break;
+ case ERROR_FILE_EXISTS:
+ case ERROR_ALREADY_EXISTS:
+ class = EC_Exists;
+ action = SA_Abort;
+ locus = EL_Disk;
+ break;
+ case ERROR_FILE_NOT_FOUND:
+ class = EC_NotFound;
+ action = SA_Abort;
+ locus = EL_Disk;
+ break;
+ case ER_GeneralFailure:
+ class = EC_SystemFailure;
+ action = SA_Abort;
+ locus = EL_Unknown;
+ break;
+ case ERROR_INVALID_DRIVE:
+ class = EC_MediaError;
+ action = SA_Abort;
+ locus = EL_Disk;
+ break;
+ case ERROR_INVALID_HANDLE:
+ class = EC_ProgramError;
+ action = SA_Abort;
+ locus = EL_Disk;
+ break;
+ case ERROR_LOCK_VIOLATION:
+ class = EC_AccessDenied;
+ action = SA_Abort;
+ locus = EL_Disk;
+ break;
+ case ERROR_NO_MORE_FILES:
+ class = EC_MediaError;
+ action = SA_Abort;
+ locus = EL_Disk;
+ break;
+ case ER_NoNetwork:
+ class = EC_NotFound;
+ action = SA_Abort;
+ locus = EL_Network;
+ break;
+ case ERROR_NOT_ENOUGH_MEMORY:
+ class = EC_OutOfResource;
+ action = SA_Abort;
+ locus = EL_Memory;
+ break;
+ case ERROR_PATH_NOT_FOUND:
+ class = EC_NotFound;
+ action = SA_Abort;
+ locus = EL_Disk;
+ break;
+ case ERROR_SEEK:
+ class = EC_NotFound;
+ action = SA_Ignore;
+ locus = EL_Disk;
+ break;
+ case ERROR_SHARING_VIOLATION:
+ class = EC_Temporary;
+ action = SA_Retry;
+ locus = EL_Disk;
+ break;
+ case ERROR_TOO_MANY_OPEN_FILES:
+ class = EC_ProgramError;
+ action = SA_Abort;
+ locus = EL_Disk;
+ break;
+ default:
+ FIXME("Unknown error %d\n", error );
+ class = EC_SystemFailure;
+ action = SA_Abort;
+ locus = EL_Unknown;
+ break;
}
+ TRACE("GET EXTENDED ERROR code 0x%02x class 0x%02x action 0x%02x locus %02x\n",
+ error, class, action, locus );
+ SET_AX( context, error );
+ SET_BH( context, class );
+ SET_BL( context, action );
+ SET_CH( context, locus );
+}
- RESET_CFLAG(context); /* Not sure if this is a good idea */
- if(AH_reg(context) == 0x0c) /* FLUSH BUFFER AND READ STANDARD INPUT */
- {
- BYTE al = AL_reg(context); /* Input function to execute after flush. */
-
- /* FIXME: buffers are not flushed */
+/***********************************************************************
+ * DOSVM_Int21Handler (WINEDOS16.133)
+ *
+ * Interrupt 0x21 handler.
+ */
+void WINAPI DOSVM_Int21Handler( CONTEXT86 *context )
+{
+ BOOL bSetDOSExtendedError = FALSE;
- /*
- * If AL is not one of 0x01, 0x06, 0x07, 0x08, or 0x0a,
- * the buffer is flushed but no input is attempted.
- */
- if(al != 0x01 && al != 0x06 && al != 0x07 && al != 0x08 && al != 0x0a)
- return;
+ TRACE( "AX=%04x BX=%04x CX=%04x DX=%04x "
+ "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08lx\n",
+ AX_reg(context), BX_reg(context),
+ CX_reg(context), DX_reg(context),
+ SI_reg(context), DI_reg(context),
+ (WORD)context->SegDs, (WORD)context->SegEs,
+ context->EFlags );
+
+ /*
+ * Extended error is used by (at least) functions 0x2f to 0x62.
+ * Function 0x59 returns extended error and error should not
+ * be cleared before handling the function.
+ */
+ if (AH_reg(context) >= 0x2f && AH_reg(context) != 0x59)
+ SetLastError(0);
- SET_AH( context, al );
- }
+ RESET_CFLAG(context); /* Not sure if this is a good idea. */
switch(AH_reg(context))
{
case 0x00: /* TERMINATE PROGRAM */
TRACE("TERMINATE PROGRAM\n");
- MZ_Exit( context, FALSE, 0 );
+ if (DOSVM_IsWin16())
+ ExitThread( 0 );
+ else
+ MZ_Exit( context, FALSE, 0 );
break;
case 0x01: /* READ CHARACTER FROM STANDARD INPUT, WITH ECHO */
- TRACE("DIRECT CHARACTER INPUT WITH ECHO\n");
- DOSVM_Int16ReadChar(&ascii, NULL, FALSE);
- SET_AL( context, ascii );
- DOSVM_PutChar(AL_reg(context));
+ {
+ BYTE ascii;
+ TRACE("DIRECT CHARACTER INPUT WITH ECHO\n");
+ DOSVM_Int16ReadChar(&ascii, NULL, FALSE);
+ SET_AL( context, ascii );
+ DOSVM_PutChar(AL_reg(context));
+ }
break;
case 0x02: /* WRITE CHARACTER TO STANDARD OUTPUT */
@@ -125,6 +248,12 @@
DOSVM_PutChar(DL_reg(context));
break;
+ case 0x03: /* READ CHARACTER FROM STDAUX */
+ case 0x04: /* WRITE CHARACTER TO STDAUX */
+ case 0x05: /* WRITE CHARACTER TO PRINTER */
+ INT_BARF( context, 0x21 );
+ break;
+
case 0x06: /* DIRECT CONSOLE IN/OUTPUT */
/* FIXME: Use DOSDEV_Peek/Read/Write(DOSDEV_Console(),...) !! */
if (DL_reg(context) == 0xff) {
@@ -136,6 +265,7 @@
RESET_ZFLAG(context);
scan = 0;
} else {
+ BYTE ascii;
if (DOSVM_Int16ReadChar(&ascii,&scan,TRUE)) {
DOSVM_Int16ReadChar(&ascii,&scan,FALSE);
/* return ASCII code */
@@ -157,20 +287,35 @@
break;
case 0x07: /* DIRECT CHARACTER INPUT WITHOUT ECHO */
- /* FIXME: Use DOSDEV_Peek/Read(DOSDEV_Console(),...) !! */
- TRACE("DIRECT CHARACTER INPUT WITHOUT ECHO\n");
- DOSVM_Int16ReadChar(&ascii, NULL, FALSE);
- SET_AL( context, ascii );
+ {
+ BYTE ascii;
+ /* FIXME: Use DOSDEV_Peek/Read(DOSDEV_Console(),...) !! */
+ TRACE("DIRECT CHARACTER INPUT WITHOUT ECHO\n");
+ DOSVM_Int16ReadChar(&ascii, NULL, FALSE);
+ SET_AL( context, ascii );
+ }
break;
case 0x08: /* CHARACTER INPUT WITHOUT ECHO */
- /* FIXME: Use DOSDEV_Peek/Read(DOSDEV_Console(),...) !! */
- TRACE("CHARACTER INPUT WITHOUT ECHO\n");
- DOSVM_Int16ReadChar(&ascii, NULL, FALSE);
- SET_AL( context, ascii );
+ {
+ BYTE ascii;
+ /* FIXME: Use DOSDEV_Peek/Read(DOSDEV_Console(),...) !! */
+ TRACE("CHARACTER INPUT WITHOUT ECHO\n");
+ DOSVM_Int16ReadChar(&ascii, NULL, FALSE);
+ SET_AL( context, ascii );
+ }
+ break;
+
+ case 0x09: /* WRITE STRING TO STANDARD OUTPUT */
+ INT_Int21Handler( context );
+ break;
+
+ case 0x0a: /* BUFFERED INPUT */
+ INT_Int21Handler( context );
break;
case 0x0b: /* GET STDIN STATUS */
+ TRACE( "GET STDIN STATUS\n" );
{
BIOSDATA *data = BIOS_DATA;
if(data->FirstKbdCharPtr == data->NextKbdCharPtr)
@@ -180,23 +325,184 @@
}
break;
+ case 0x0c: /* FLUSH BUFFER AND READ STANDARD INPUT */
+ {
+ BYTE al = AL_reg(context); /* Input function to execute after flush. */
+
+ TRACE( "FLUSH BUFFER AND READ STANDARD INPUT - 0x%02x\n", al );
+
+ /* FIXME: buffers are not flushed */
+
+ /*
+ * If AL is one of 0x01, 0x06, 0x07, 0x08, or 0x0a,
+ * int21 function identified by AL will be called.
+ */
+ if(al == 0x01 || al == 0x06 || al == 0x07 || al == 0x08 || al == 0x0a)
+ {
+ SET_AH( context, al );
+ DOSVM_Int21Handler( context );
+ }
+ }
+ break;
+
+ case 0x0d: /* DISK BUFFER FLUSH */
+ TRACE("DISK BUFFER FLUSH ignored\n");
+ RESET_CFLAG( context ); /* dos 6+ only */
+ break;
+
+ case 0x0e: /* SELECT DEFAULT DRIVE */
+ INT_Int21Handler( context );
+ break;
+
+ case 0x0f: /* OPEN FILE USING FCB */
+ case 0x10: /* CLOSE FILE USING FCB */
+ INT_BARF( context, 0x21 );
+ break;
+
+ case 0x11: /* FIND FIRST MATCHING FILE USING FCB */
+ case 0x12: /* FIND NEXT MATCHING FILE USING FCB */
+ case 0x13: /* DELETE FILE USING FCB */
+ INT_Int21Handler( context );
+ break;
+
+ case 0x14: /* SEQUENTIAL READ FROM FCB FILE */
+ case 0x15: /* SEQUENTIAL WRITE TO FCB FILE */
+ case 0x16: /* CREATE OR TRUNCATE FILE USING FCB */
+ INT_BARF( context, 0x21 );
+ break;
+
+ case 0x17: /* RENAME FILE USING FCB */
+ INT_Int21Handler( context );
+ break;
+
+ case 0x18: /* NULL FUNCTION FOR CP/M COMPATIBILITY */
+ SET_AL( context, 0 );
+ break;
+
+ case 0x19: /* GET CURRENT DEFAULT DRIVE */
+ case 0x1a: /* SET DISK TRANSFER AREA ADDRESS */
+ case 0x1b: /* GET ALLOCATION INFORMATION FOR DEFAULT DRIVE */
+ case 0x1c: /* GET ALLOCATION INFORMATION FOR SPECIFIC DRIVE */
+ INT_Int21Handler( context );
+ break;
+
+ case 0x1d: /* NULL FUNCTION FOR CP/M COMPATIBILITY */
+ case 0x1e: /* NULL FUNCTION FOR CP/M COMPATIBILITY */
+ SET_AL( context, 0 );
+ break;
+
+ case 0x1f: /* GET DRIVE PARAMETER BLOCK FOR DEFAULT DRIVE */
+ INT_Int21Handler( context );
+ break;
+
+ case 0x20: /* NULL FUNCTION FOR CP/M COMPATIBILITY */
+ SET_AL( context, 0 );
+ break;
+
+ case 0x21: /* READ RANDOM RECORD FROM FCB FILE */
+ case 0x22: /* WRITE RANDOM RECORD TO FCB FILE */
+ case 0x23: /* GET FILE SIZE FOR FCB */
+ case 0x24: /* SET RANDOM RECORD NUMBER FOR FCB */
+ INT_BARF( context, 0x21 );
+ break;
+
case 0x25: /* SET INTERRUPT VECTOR */
- DOSVM_SetRMHandler( AL_reg(context),
- (FARPROC16)MAKESEGPTR( context->SegDs, DX_reg(context)));
+ TRACE("SET INTERRUPT VECTOR 0x%02x\n",AL_reg(context));
+ {
+ FARPROC16 ptr = (FARPROC16)MAKESEGPTR( context->SegDs, DX_reg(context) );
+ if (DOSVM_IsWin16())
+ DOSVM_SetPMHandler16( AL_reg(context), ptr );
+ else
+ DOSVM_SetRMHandler( AL_reg(context), ptr );
+ }
+ break;
+
+ case 0x26: /* CREATE NEW PROGRAM SEGMENT PREFIX */
+ case 0x27: /* RANDOM BLOCK READ FROM FCB FILE */
+ case 0x28: /* RANDOM BLOCK WRITE TO FCB FILE */
+ INT_BARF( context, 0x21 );
+ break;
+
+ case 0x29: /* PARSE FILENAME INTO FCB */
+ case 0x2a: /* GET SYSTEM DATE */
+ INT_Int21Handler( context );
+ break;
+
+ case 0x2b: /* SET SYSTEM DATE */
+ FIXME("SetSystemDate(%02d/%02d/%04d): not allowed\n",
+ DL_reg(context), DH_reg(context), CX_reg(context) );
+ SET_AL( context, 0 ); /* Let's pretend we succeeded */
+ break;
+
+ case 0x2c: /* GET SYSTEM TIME */
+ INT_Int21Handler( context );
+ break;
+
+ case 0x2d: /* SET SYSTEM TIME */
+ FIXME("SetSystemTime(%02d:%02d:%02d.%02d): not allowed\n",
+ CH_reg(context), CL_reg(context),
+ DH_reg(context), DL_reg(context) );
+ SET_AL( context, 0 ); /* Let's pretend we succeeded */
+ break;
+
+ case 0x2e: /* SET VERIFY FLAG */
+ TRACE("SET VERIFY FLAG ignored\n");
+ /* we cannot change the behaviour anyway, so just ignore it */
+ break;
+
+ case 0x2f: /* GET DISK TRANSFER AREA ADDRESS */
+ case 0x30: /* GET DOS VERSION */
+ INT_Int21Handler( context );
+ break;
+
+ case 0x31: /* TERMINATE AND STAY RESIDENT */
+ FIXME("TERMINATE AND STAY RESIDENT stub\n");
+ break;
+
+ case 0x32: /* GET DOS DRIVE PARAMETER BLOCK FOR SPECIFIC DRIVE */
+ case 0x33: /* MULTIPLEXED */
+ case 0x34: /* GET ADDRESS OF INDOS FLAG */
+ INT_Int21Handler( context );
break;
case 0x35: /* GET INTERRUPT VECTOR */
TRACE("GET INTERRUPT VECTOR 0x%02x\n",AL_reg(context));
{
- FARPROC16 addr = DOSVM_GetRMHandler( AL_reg(context) );
+ FARPROC16 addr;
+ if (DOSVM_IsWin16())
+ addr = DOSVM_GetPMHandler16( AL_reg(context) );
+ else
+ addr = DOSVM_GetRMHandler( AL_reg(context) );
context->SegEs = SELECTOROF(addr);
SET_BX( context, OFFSETOF(addr) );
}
break;
- case 0x40: /* WRITE TO FILE OR DEVICE */
+ case 0x36: /* GET FREE DISK SPACE */
+ case 0x37: /* SWITCHAR */
+ INT_Int21Handler( context );
+ break;
+
+ case 0x38: /* GET COUNTRY-SPECIFIC INFORMATION */
+ TRACE( "GET COUNTRY-SPECIFIC INFORMATION for country 0x%02x\n",
+ AL_reg(context) );
+ SET_AX( context, 0x02 ); /* no country support available */
+ SET_CFLAG( context );
+ break;
+
+ case 0x39: /* "MKDIR" - CREATE SUBDIRECTORY */
+ case 0x3a: /* "RMDIR" - REMOVE SUBDIRECTORY */
+ case 0x3b: /* "CHDIR" - SET CURRENT DIRECTORY */
+ case 0x3c: /* "CREAT" - CREATE OR TRUNCATE FILE */
+ case 0x3d: /* "OPEN" - OPEN EXISTING FILE */
+ case 0x3e: /* "CLOSE" - CLOSE FILE */
+ case 0x3f: /* "READ" - READ FROM FILE OR DEVICE */
+ INT_Int21Handler( context );
+ break;
+
+ case 0x40: /* "WRITE" - WRITE TO FILE OR DEVICE */
/* Writes to stdout are handled here. */
- if (BX_reg(context) == 1) {
+ if (!DOSVM_IsWin16() && BX_reg(context) == 1) {
BYTE *ptr = CTX_SEG_OFF_TO_LIN(context,
context->SegDs,
context->Edx);
@@ -208,11 +514,31 @@
INT_Int21Handler( context );
break;
+ case 0x41: /* "UNLINK" - DELETE FILE */
+ case 0x42: /* "LSEEK" - SET CURRENT FILE POSITION */
+ case 0x43: /* FILE ATTRIBUTES */
+ INT_Int21Handler( context );
+ break;
+
case 0x44: /* IOCTL */
- DOSVM_Int21Handler_Ioctl( context );
+ INT21_Ioctl( context );
+ break;
+
+ case 0x45: /* "DUP" - DUPLICATE FILE HANDLE */
+ case 0x46: /* "DUP2", "FORCEDUP" - FORCE DUPLICATE FILE HANDLE */
+ case 0x47: /* "CWD" - GET CURRENT DIRECTORY */
+ case 0x48: /* ALLOCATE MEMORY */
+ case 0x49: /* FREE MEMORY */
+ case 0x4a: /* RESIZE MEMORY BLOCK */
+ INT_Int21Handler( context );
break;
case 0x4b: /* "EXEC" - LOAD AND/OR EXECUTE PROGRAM */
+ if(DOSVM_IsWin16()) {
+ INT_Int21Handler( context );
+ break;
+ }
+
TRACE("EXEC %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx ));
if (!MZ_Exec( context, CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx),
AL_reg(context), CTX_SEG_OFF_TO_LIN(context, context->SegEs, context->Ebx) ))
@@ -223,8 +549,11 @@
break;
case 0x4c: /* "EXIT" - TERMINATE WITH RETURN CODE */
- TRACE("EXIT with return code %d\n",AL_reg(context));
- MZ_Exit( context, FALSE, AL_reg(context) );
+ TRACE( "EXIT with return code %d\n", AL_reg(context) );
+ if (DOSVM_IsWin16())
+ ExitThread( AL_reg(context) );
+ else
+ MZ_Exit( context, FALSE, AL_reg(context) );
break;
case 0x4d: /* GET RETURN CODE */
@@ -233,12 +562,22 @@
DOSVM_retval = 0;
break;
+ case 0x4e: /* "FINDFIRST" - FIND FIRST MATCHING FILE */
+ case 0x4f: /* "FINDNEXT" - FIND NEXT MATCHING FILE */
+ INT_Int21Handler( context );
+ break;
+
case 0x50: /* SET CURRENT PROCESS ID (SET PSP ADDRESS) */
TRACE("SET CURRENT PROCESS ID (SET PSP ADDRESS)\n");
DOSVM_psp = BX_reg(context);
break;
case 0x51: /* GET PSP ADDRESS */
+ if (DOSVM_IsWin16()) {
+ INT_Int21Handler( context );
+ break;
+ }
+
TRACE("GET CURRENT PROCESS ID (GET PSP ADDRESS)\n");
/* FIXME: should we return the original DOS PSP upon */
/* Windows startup ? */
@@ -247,20 +586,104 @@
case 0x52: /* "SYSVARS" - GET LIST OF LISTS */
TRACE("SYSVARS - GET LIST OF LISTS\n");
+ if (DOSVM_IsWin16())
+ {
+ FIXME("LOLSeg broken for now\n");
+ context->SegEs = 0;
+ SET_BX( context, 0 );
+ }
+ else
{
context->SegEs = HIWORD(DOS_LOLSeg);
SET_BX( context, FIELD_OFFSET(DOS_LISTOFLISTS, ptr_first_DPB) );
}
break;
+ case 0x54: /* Get Verify Flag */
+ TRACE("Get Verify Flag - Not Supported\n");
+ SET_AL( context, 0x00 ); /* pretend we can tell. 00h = off 01h = on */
+ break;
+
+ case 0x56: /* "RENAME" - RENAME FILE */
+ case 0x57: /* FILE DATE AND TIME */
+ case 0x58: /* GET OR SET MEMORY/UMB ALLOCATION STRATEGY */
+ INT_Int21Handler( context );
+ break;
+
+ case 0x59: /* GET EXTENDED ERROR INFO */
+ INT21_GetExtendedError( context );
+ break;
+
+ case 0x5a: /* CREATE TEMPORARY FILE */
+ case 0x5b: /* CREATE NEW FILE */
+ case 0x5c: /* "FLOCK" - RECORD LOCKING */
+ case 0x5d: /* NETWORK 5D */
+ case 0x5e: /* NETWORK 5E */
+ case 0x5f: /* NETWORK 5F */
+ case 0x60: /* "TRUENAME" - CANONICALIZE FILENAME OR PATH */
+ case 0x61: /* UNUSED */
+ INT_Int21Handler( context );
+ break;
+
case 0x62: /* GET PSP ADDRESS */
+ if (DOSVM_IsWin16()) {
+ INT_Int21Handler( context );
+ break;
+ }
+
TRACE("GET CURRENT PSP ADDRESS\n");
/* FIXME: should we return the original DOS PSP upon */
/* Windows startup ? */
SET_BX( context, DOSVM_psp );
break;
- default:
+ case 0x63: /* MISC. LANGUAGE SUPPORT */
+ case 0x64: /* OS/2 DOS BOX */
+ case 0x65: /* GET EXTENDED COUNTRY INFORMATION */
+ case 0x66: /* GLOBAL CODE PAGE TABLE */
+ case 0x67: /* SET HANDLE COUNT */
+ case 0x68: /* "FFLUSH" - COMMIT FILE */
+ case 0x69: /* DISK SERIAL NUMBER */
+ case 0x6a: /* COMMIT FILE */
+ INT_Int21Handler( context );
+ break;
+
+ case 0x6b: /* NULL FUNCTION FOR CP/M COMPATIBILITY */
+ SET_AL( context, 0 );
+ break;
+
+ case 0x6c: /* EXTENDED OPEN/CREATE */
+ case 0x70: /* MS-DOS 7 (Windows95) - ??? (country-specific?)*/
+ case 0x71: /* MS-DOS 7 (Windows95) - LONG FILENAME FUNCTIONS */
+ case 0x72: /* MS-DOS 7 (Windows95) - ??? */
+ case 0x73: /* MULTIPLEXED: Win95 OSR2/Win98 FAT32 calls */
+ case 0xdc: /* CONNECTION SERVICES - GET CONNECTION NUMBER */
+ case 0xea: /* NOVELL NETWARE - RETURN SHELL VERSION */
INT_Int21Handler( context );
+ break;
+
+ default:
+ INT_BARF( context, 0x21 );
+ break;
+
+ } /* END OF SWITCH */
+
+ /* Set general error condition. */
+ if (bSetDOSExtendedError)
+ {
+ SET_AX( context, GetLastError() );
+ SET_CFLAG( context );
}
+
+ /* Print error code if carry flag is set. */
+ if (context->EFlags & 0x0001)
+ TRACE("failed, error %ld\n", GetLastError() );
+
+ TRACE( "returning: AX=%04x BX=%04x CX=%04x DX=%04x "
+ "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08lx\n",
+ AX_reg(context), BX_reg(context),
+ CX_reg(context), DX_reg(context),
+ SI_reg(context), DI_reg(context),
+ (WORD)context->SegDs, (WORD)context->SegEs,
+ context->EFlags );
}
Index: msdos/int21.c
===================================================================
RCS file: /home/wine/wine/msdos/int21.c,v
retrieving revision 1.78
diff -u -r1.78 int21.c
--- msdos/int21.c 2 Dec 2002 18:58:32 -0000 1.78
+++ msdos/int21.c 2 Dec 2002 19:52:01 -0000
@@ -1004,120 +1004,6 @@
Dosvm.ASPIHandler( context );
}
-/***********************************************************************
- * INT21_GetExtendedError
- */
-static void INT21_GetExtendedError( CONTEXT86 *context )
-{
- BYTE class, action, locus;
- WORD error = GetLastError();
-
- switch(error)
- {
- case ERROR_SUCCESS:
- class = action = locus = 0;
- break;
- case ERROR_DIR_NOT_EMPTY:
- class = EC_Exists;
- action = SA_Ignore;
- locus = EL_Disk;
- break;
- case ERROR_ACCESS_DENIED:
- class = EC_AccessDenied;
- action = SA_Abort;
- locus = EL_Disk;
- break;
- case ERROR_CANNOT_MAKE:
- class = EC_AccessDenied;
- action = SA_Abort;
- locus = EL_Unknown;
- break;
- case ERROR_DISK_FULL:
- case ERROR_HANDLE_DISK_FULL:
- class = EC_MediaError;
- action = SA_Abort;
- locus = EL_Disk;
- break;
- case ERROR_FILE_EXISTS:
- case ERROR_ALREADY_EXISTS:
- class = EC_Exists;
- action = SA_Abort;
- locus = EL_Disk;
- break;
- case ERROR_FILE_NOT_FOUND:
- class = EC_NotFound;
- action = SA_Abort;
- locus = EL_Disk;
- break;
- case ER_GeneralFailure:
- class = EC_SystemFailure;
- action = SA_Abort;
- locus = EL_Unknown;
- break;
- case ERROR_INVALID_DRIVE:
- class = EC_MediaError;
- action = SA_Abort;
- locus = EL_Disk;
- break;
- case ERROR_INVALID_HANDLE:
- class = EC_ProgramError;
- action = SA_Abort;
- locus = EL_Disk;
- break;
- case ERROR_LOCK_VIOLATION:
- class = EC_AccessDenied;
- action = SA_Abort;
- locus = EL_Disk;
- break;
- case ERROR_NO_MORE_FILES:
- class = EC_MediaError;
- action = SA_Abort;
- locus = EL_Disk;
- break;
- case ER_NoNetwork:
- class = EC_NotFound;
- action = SA_Abort;
- locus = EL_Network;
- break;
- case ERROR_NOT_ENOUGH_MEMORY:
- class = EC_OutOfResource;
- action = SA_Abort;
- locus = EL_Memory;
- break;
- case ERROR_PATH_NOT_FOUND:
- class = EC_NotFound;
- action = SA_Abort;
- locus = EL_Disk;
- break;
- case ERROR_SEEK:
- class = EC_NotFound;
- action = SA_Ignore;
- locus = EL_Disk;
- break;
- case ERROR_SHARING_VIOLATION:
- class = EC_Temporary;
- action = SA_Retry;
- locus = EL_Disk;
- break;
- case ERROR_TOO_MANY_OPEN_FILES:
- class = EC_ProgramError;
- action = SA_Abort;
- locus = EL_Disk;
- break;
- default:
- FIXME("Unknown error %d\n", error );
- class = EC_SystemFailure;
- action = SA_Abort;
- locus = EL_Unknown;
- break;
- }
- TRACE("GET EXTENDED ERROR code 0x%02x class 0x%02x action 0x%02x locus %02x\n",
- error, class, action, locus );
- SET_AX( context, error );
- SET_BH( context, class );
- SET_BL( context, action );
- SET_CH( context, locus );
-}
/***********************************************************************
* INT_Int21Handler
@@ -1126,67 +1012,8 @@
{
BOOL bSetDOSExtendedError = FALSE;
-
- TRACE("AX=%04x BX=%04x CX=%04x DX=%04x "
- "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08lx\n",
- AX_reg(context), BX_reg(context), CX_reg(context), DX_reg(context),
- SI_reg(context), DI_reg(context),
- (WORD)context->SegDs, (WORD)context->SegEs,
- context->EFlags );
-
-
- if (AH_reg(context) == 0x59) /* Get extended error info */
- {
- INT21_GetExtendedError( context );
- return;
- }
-
- if (AH_reg(context) == 0x0C) /* Flush buffer and read standard input */
- {
- TRACE("FLUSH BUFFER AND READ STANDARD INPUT\n");
- /* no flush here yet */
- SET_AH( context, AL_reg(context) );
- }
-
- if (AH_reg(context)>=0x2f) {
- /* extended error is used by (at least) functions 0x2f to 0x62 */
- SetLastError(0);
- }
- RESET_CFLAG(context); /* Not sure if this is a good idea */
-
switch(AH_reg(context))
{
- case 0x01: /* READ CHARACTER FROM STANDARD INPUT, WITH ECHO */
- case 0x02: /* WRITE CHARACTER TO STANDARD OUTPUT */
- case 0x03: /* READ CHARACTER FROM STDAUX */
- case 0x04: /* WRITE CHARACTER TO STDAUX */
- case 0x05: /* WRITE CHARACTER TO PRINTER */
- case 0x06: /* DIRECT CONSOLE IN/OUTPUT */
- case 0x07: /* DIRECT CHARACTER INPUT WITHOUT ECHO */
- case 0x08: /* CHARACTER INPUT WITHOUT ECHO */
- case 0x0b: /* GET STDIN STATUS */
- case 0x0f: /* OPEN FILE USING FCB */
- case 0x10: /* CLOSE FILE USING FCB */
- case 0x14: /* SEQUENTIAL READ FROM FCB FILE */
- case 0x15: /* SEQUENTIAL WRITE TO FCB FILE */
- case 0x16: /* CREATE OR TRUNCATE FILE USING FCB */
- case 0x21: /* READ RANDOM RECORD FROM FCB FILE */
- case 0x22: /* WRITE RANDOM RECORD TO FCB FILE */
- case 0x23: /* GET FILE SIZE FOR FCB */
- case 0x24: /* SET RANDOM RECORD NUMBER FOR FCB */
- case 0x26: /* CREATE NEW PROGRAM SEGMENT PREFIX */
- case 0x27: /* RANDOM BLOCK READ FROM FCB FILE */
- case 0x28: /* RANDOM BLOCK WRITE TO FCB FILE */
- case 0x4d: /* GET RETURN CODE */
- case 0x50: /* SET CURRENT PROCESS ID (SET PSP ADDRESS) */
- INT_BARF( context, 0x21 );
- break;
-
- case 0x00: /* TERMINATE PROGRAM */
- TRACE("TERMINATE PROGRAM\n");
- ExitThread( 0 );
- break;
-
case 0x09: /* WRITE STRING TO STANDARD OUTPUT */
TRACE("WRITE '$'-terminated string from %04lX:%04X to stdout\n",
context->SegDs,DX_reg(context) );
@@ -1218,28 +1045,10 @@
break;
}
- case 0x2e: /* SET VERIFY FLAG */
- TRACE("SET VERIFY FLAG ignored\n");
- /* we cannot change the behaviour anyway, so just ignore it */
- break;
-
- case 0x18: /* NULL FUNCTIONS FOR CP/M COMPATIBILITY */
- case 0x1d:
- case 0x1e:
- case 0x20:
- case 0x6b: /* NULL FUNCTION */
- SET_AL( context, 0 );
- break;
-
case 0x5c: /* "FLOCK" - RECORD LOCKING */
fLock(context);
break;
- case 0x0d: /* DISK BUFFER FLUSH */
- TRACE("DISK BUFFER FLUSH ignored\n");
- RESET_CFLAG(context); /* dos 6+ only */
- break;
-
case 0x0e: /* SELECT DEFAULT DRIVE */
TRACE("SELECT DEFAULT DRIVE %d\n", DL_reg(context));
DRIVE_SetCurrentDrive( DL_reg(context) );
@@ -1293,10 +1102,6 @@
GetDrivePB(context, DRIVE_GetCurrentDrive());
break;
- case 0x25: /* SET INTERRUPT VECTOR */
- FIXME("set interrupt vector - move to winedos...");
- break;
-
case 0x29: /* PARSE FILENAME INTO FCB */
INT21_ParseFileNameIntoFCB(context);
break;
@@ -1305,23 +1110,10 @@
INT21_GetSystemDate(context);
break;
- case 0x2b: /* SET SYSTEM DATE */
- FIXME("SetSystemDate(%02d/%02d/%04d): not allowed\n",
- DL_reg(context), DH_reg(context), CX_reg(context) );
- SET_AL( context, 0 ); /* Let's pretend we succeeded */
- break;
-
case 0x2c: /* GET SYSTEM TIME */
INT21_GetSystemTime(context);
break;
- case 0x2d: /* SET SYSTEM TIME */
- FIXME("SetSystemTime(%02d:%02d:%02d.%02d): not allowed\n",
- CH_reg(context), CL_reg(context),
- DH_reg(context), DL_reg(context) );
- SET_AL( context, 0 ); /* Let's pretend we succeeded */
- break;
-
case 0x2f: /* GET DISK TRANSFER AREA ADDRESS */
TRACE("GET DISK TRANSFER AREA ADDRESS\n");
{
@@ -1344,10 +1136,6 @@
SET_CX( context, 0x0000 );
break;
- case 0x31: /* TERMINATE AND STAY RESIDENT */
- FIXME("TERMINATE AND STAY RESIDENT stub\n");
- break;
-
case 0x32: /* GET DOS DRIVE PARAMETER BLOCK FOR SPECIFIC DRIVE */
TRACE("GET DOS DRIVE PARAMETER BLOCK FOR DRIVE %s\n",
INT21_DriveName( DL_reg(context)));
@@ -1410,16 +1198,6 @@
SET_BX( context, (int)&heap->InDosFlag - (int)heap );
break;
- case 0x35: /* GET INTERRUPT VECTOR */
- TRACE("GET INTERRUPT VECTOR 0x%02x\n",AL_reg(context));
- {
- FARPROC16 addr = 0;
- FIXME("get interrupt vector - move to winedos...\n");
- context->SegEs = SELECTOROF(addr);
- SET_BX( context, OFFSETOF(addr) );
- }
- break;
-
case 0x36: /* GET FREE DISK SPACE */
TRACE("GET FREE DISK SPACE FOR DRIVE %s\n",
INT21_DriveName( DL_reg(context)));
@@ -1448,13 +1226,6 @@
break;
}
- case 0x38: /* GET COUNTRY-SPECIFIC INFORMATION */
- TRACE("GET COUNTRY-SPECIFIC INFORMATION for country 0x%02x\n",
- AL_reg(context));
- SET_AX( context, 0x02 ); /* no country support available */
- SET_CFLAG(context);
- break;
-
case 0x39: /* "MKDIR" - CREATE SUBDIRECTORY */
TRACE("MKDIR %s\n",
(LPCSTR)CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx));
@@ -1808,11 +1579,6 @@
if (AX_reg(context) < 32) SET_CFLAG(context);
break;
- case 0x4c: /* "EXIT" - TERMINATE WITH RETURN CODE */
- TRACE("EXIT with return code %d\n",AL_reg(context));
- ExitThread( AL_reg(context) );
- break;
-
case 0x4e: /* "FINDFIRST" - FIND FIRST MATCHING FILE */
TRACE("FINDFIRST mask 0x%04x spec %s\n",CX_reg(context),
(LPCSTR)CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx));
@@ -1841,24 +1607,6 @@
SET_BX( context, GetCurrentPDB16() );
break;
- case 0x52: /* "SYSVARS" - GET LIST OF LISTS */
- TRACE("SYSVARS - GET LIST OF LISTS\n");
-#if 0
- {
- context->SegEs = LOWORD(DOS_LOLSeg);
- SET_BX( context, FIELD_OFFSET(DOS_LISTOFLISTS, ptr_first_DPB) );
- }
-#endif
- FIXME("LOLSeg broken for now\n");
- context->SegEs = 0;
- SET_BX( context, 0 );
- break;
-
- case 0x54: /* Get Verify Flag */
- TRACE("Get Verify Flag - Not Supported\n");
- SET_AL( context, 0x00 ); /* pretend we can tell. 00h = off 01h = on */
- break;
-
case 0x56: /* "RENAME" - RENAME FILE */
TRACE("RENAME %s to %s\n",
(LPCSTR)CTX_SEG_OFF_TO_LIN(context, context->SegDs,context->Edx),
@@ -2381,7 +2129,6 @@
break;
-
case 0xdc: /* CONNECTION SERVICES - GET CONNECTION NUMBER */
case 0xea: /* NOVELL NETWARE - RETURN SHELL VERSION */
break;
@@ -2397,14 +2144,4 @@
SET_AX( context, GetLastError() );
SET_CFLAG(context);
}
-
- if ((context->EFlags & 0x0001))
- TRACE("failed, error %ld\n", GetLastError() );
-
- TRACE("returning: AX=%04x BX=%04x CX=%04x DX=%04x "
- "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08lx\n",
- AX_reg(context), BX_reg(context), CX_reg(context),
- DX_reg(context), SI_reg(context), DI_reg(context),
- (WORD)context->SegDs, (WORD)context->SegEs,
- context->EFlags);
}
--
Jukka Heinonen <http://www.iki.fi/jhei/>
