From 1a6afad1a447a1a4e8d9e7d33bf92902c70d8822 Mon Sep 17 00:00:00 2001 From: Jukka Heinonen Date: Wed, 20 Nov 2002 19:39:11 +0000 Subject: [PATCH] Removed obsolete code. --- dlls/kernel/wprocs.spec | 1 - dlls/ntdll/Makefile.in | 2 - include/miscemu.h | 35 -------------- msdos/int13.c | 100 ---------------------------------------- msdos/int20.c | 33 ------------- 5 files changed, 171 deletions(-) delete mode 100644 msdos/int13.c delete mode 100644 msdos/int20.c diff --git a/dlls/kernel/wprocs.spec b/dlls/kernel/wprocs.spec index 71dc3e347fe..15d8c540a3d 100644 --- a/dlls/kernel/wprocs.spec +++ b/dlls/kernel/wprocs.spec @@ -2,7 +2,6 @@ # The '-interrupt' keyword takes care of the flags pushed on the stack by the interrupt 117 pascal -interrupt INT_Int11Handler() INT_Int11Handler 121 pascal -interrupt INT_Int15Handler() INT_Int15Handler -132 pascal -interrupt INT_Int20Handler() INT_Int20Handler 133 pascal -interrupt INT_Int21Handler() DOS3Call # Note: int 25 and 26 don't pop the flags from the stack 137 pascal -register INT_Int25Handler() INT_Int25Handler diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index dfd1e81c1da..a8d0e8714e8 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -51,9 +51,7 @@ C_SRCS = \ $(TOPOBJDIR)/msdos/dosmem.c \ $(TOPOBJDIR)/msdos/dpmi.c \ $(TOPOBJDIR)/msdos/int11.c \ - $(TOPOBJDIR)/msdos/int13.c \ $(TOPOBJDIR)/msdos/int15.c \ - $(TOPOBJDIR)/msdos/int20.c \ $(TOPOBJDIR)/msdos/int21.c \ $(TOPOBJDIR)/msdos/int25.c \ $(TOPOBJDIR)/msdos/int26.c \ diff --git a/include/miscemu.h b/include/miscemu.h index c41a6bc4644..c1bb8e4c5be 100644 --- a/include/miscemu.h +++ b/include/miscemu.h @@ -212,56 +212,21 @@ extern void IO_outport( int port, int count, DWORD value ); /* msdos/int11.c */ extern void WINAPI INT_Int11Handler(CONTEXT86*); -/* msdos/int12.c */ -extern void WINAPI INT_Int12Handler(CONTEXT86*); - -/* msdos/int13.c */ -extern void WINAPI INT_Int13Handler(CONTEXT86*); - /* msdos/int15.c */ extern void WINAPI INT_Int15Handler(CONTEXT86*); -/* msdos/int1a.c */ -extern DWORD INT1A_GetTicksSinceMidnight(void); -extern void WINAPI INT_Int1aHandler(CONTEXT86*); - -/* msdos/int20.c */ -extern void WINAPI INT_Int20Handler(CONTEXT86*); - /* msdos/int25.c */ extern void WINAPI INT_Int25Handler(CONTEXT86*); /* msdos/int26.c */ extern void WINAPI INT_Int26Handler(CONTEXT86*); -/* msdos/int2a.c */ -extern void WINAPI INT_Int2aHandler(CONTEXT86*); - /* msdos/int2f.c */ extern void WINAPI INT_Int2fHandler(CONTEXT86*); -/* msdos/int41.c */ -extern void WINAPI INT_Int41Handler(CONTEXT86*); - -/* msdos/int4b.c */ -extern void WINAPI INT_Int4bHandler(CONTEXT86*); - /* msdos/int5c.c */ extern void WINAPI NetBIOSCall16(CONTEXT86*); -/* fpu.c */ -extern void WINAPI INT_Int34Handler(CONTEXT86*); -extern void WINAPI INT_Int35Handler(CONTEXT86*); -extern void WINAPI INT_Int36Handler(CONTEXT86*); -extern void WINAPI INT_Int37Handler(CONTEXT86*); -extern void WINAPI INT_Int38Handler(CONTEXT86*); -extern void WINAPI INT_Int39Handler(CONTEXT86*); -extern void WINAPI INT_Int3aHandler(CONTEXT86*); -extern void WINAPI INT_Int3bHandler(CONTEXT86*); -extern void WINAPI INT_Int3cHandler(CONTEXT86*); -extern void WINAPI INT_Int3dHandler(CONTEXT86*); -extern void WINAPI INT_Int3eHandler(CONTEXT86*); - /* msdos/dpmi.c */ extern BOOL DPMI_LoadDosSystem(void); diff --git a/msdos/int13.c b/msdos/int13.c deleted file mode 100644 index dba23a39de4..00000000000 --- a/msdos/int13.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - * BIOS interrupt 13h handler - * - * Copyright 1997 Andreas Mohr - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "config.h" - -#include -#include -#ifdef HAVE_UNISTD_H -# include -#endif - -#include "winbase.h" -#include "winioctl.h" -#include "miscemu.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(int); - -static void DIOCRegs_2_CONTEXT( DIOC_REGISTERS *pIn, CONTEXT86 *pCxt ) -{ - memset( pCxt, 0, sizeof(*pCxt) ); - /* Note: segment registers == 0 means that CTX_SEG_OFF_TO_LIN - will interpret 32-bit register contents as linear pointers */ - - pCxt->ContextFlags=CONTEXT86_INTEGER|CONTEXT86_CONTROL; - pCxt->Eax = pIn->reg_EAX; - pCxt->Ebx = pIn->reg_EBX; - pCxt->Ecx = pIn->reg_ECX; - pCxt->Edx = pIn->reg_EDX; - pCxt->Esi = pIn->reg_ESI; - pCxt->Edi = pIn->reg_EDI; - - /* FIXME: Only partial CONTEXT86_CONTROL */ - pCxt->EFlags = pIn->reg_Flags; -} - -static void CONTEXT_2_DIOCRegs( CONTEXT86 *pCxt, DIOC_REGISTERS *pOut ) -{ - memset( pOut, 0, sizeof(DIOC_REGISTERS) ); - - pOut->reg_EAX = pCxt->Eax; - pOut->reg_EBX = pCxt->Ebx; - pOut->reg_ECX = pCxt->Ecx; - pOut->reg_EDX = pCxt->Edx; - pOut->reg_ESI = pCxt->Esi; - pOut->reg_EDI = pCxt->Edi; - - /* FIXME: Only partial CONTEXT86_CONTROL */ - pOut->reg_Flags = pCxt->EFlags; -} - -/********************************************************************** - * INT_Int13Handler (WPROCS.119) - * - * Handler for int 13h (disk I/O). - */ -void WINAPI INT_Int13Handler( CONTEXT86 *context ) -{ - HANDLE hVWin32; - DIOC_REGISTERS regs; - DWORD dwRet; - - hVWin32 = CreateFileA("\\\\.\\VWIN32", GENERIC_READ|GENERIC_WRITE, - 0, NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, 0); - - if(hVWin32!=INVALID_HANDLE_VALUE) - { - CONTEXT_2_DIOCRegs( context, ®s); - - if(!DeviceIoControl(hVWin32, VWIN32_DIOC_DOS_INT13, - ®s, sizeof regs, ®s, sizeof regs, &dwRet, NULL)) - DIOCRegs_2_CONTEXT(®s, context); - else - SET_CFLAG(context); - - CloseHandle(hVWin32); - } - else - { - ERR("Failed to open device VWIN32\n"); - SET_CFLAG(context); - } -} diff --git a/msdos/int20.c b/msdos/int20.c deleted file mode 100644 index 038653a3feb..00000000000 --- a/msdos/int20.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * DOS interrupt 20h handler (TERMINATE PROGRAM) - * - * Copyright 1997 Andreas Mohr - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include "winbase.h" -#include "miscemu.h" - -/********************************************************************** - * INT_Int20Handler (WPROCS.132) - * - * Handler for int 20h. - */ -void WINAPI INT_Int20Handler( CONTEXT86 *context ) -{ - ExitThread( 0 ); -}