Move int2f handler to winedos.

dlls/kernel/kernel32.spec

@@ -999,6 +999,8 @@
 @ stdcall GetSelectorBase(long) GetSelectorBase
 @ stdcall GetSelectorLimit16(long) GetSelectorLimit16
 @ stdcall GetThreadQueue16(long) GetThreadQueue16
+@ stdcall GetVersion16() GetVersion16
+@ stdcall GetWinFlags16() GetWinFlags16
 @ stdcall GlobalDOSAlloc16(long) GlobalDOSAlloc16
 @ stdcall GlobalDOSFree16(long) GlobalDOSFree16
 @ stdcall GlobalFlags16(long) GlobalFlags16
@@ -1053,7 +1055,6 @@
 @ stdcall INT_Int15Handler(ptr) INT_Int15Handler
 @ stdcall INT_Int25Handler(ptr) INT_Int25Handler
 @ stdcall INT_Int26Handler(ptr) INT_Int26Handler  
-@ stdcall INT_Int2fHandler(ptr) INT_Int2fHandler
 @ stdcall NetBIOSCall16(ptr) NetBIOSCall16
 @ cdecl LOCAL_Alloc(long long long) LOCAL_Alloc
 @ cdecl LOCAL_Compact(long long long) LOCAL_Compact

dlls/ntdll/Makefile.in

@@ -55,7 +55,6 @@ C_SRCS = \
 	$(TOPOBJDIR)/msdos/int21.c \
 	$(TOPOBJDIR)/msdos/int25.c \
 	$(TOPOBJDIR)/msdos/int26.c \
-	$(TOPOBJDIR)/msdos/int2f.c \
 	$(TOPOBJDIR)/msdos/int5c.c \
 	$(TOPOBJDIR)/msdos/ioports.c \
 	$(TOPOBJDIR)/msdos/ppdev.c \

dlls/winedos/Makefile.in

@@ -28,6 +28,7 @@ C_SRCS = \
 	int21.c \
 	int29.c \
 	int2a.c \
+	int2f.c \
 	int31.c \
 	int33.c \
 	int41.c \

dlls/winedos/dosexe.h

@@ -30,7 +30,15 @@
 struct _DOSEVENT;
 struct DPMI_segments;
 
+/* 48-bit segmented pointers for DOS DPMI32 */
+typedef struct {
+  WORD  selector;
+  DWORD offset;
+} SEGPTR48, FARPROC48;
+
 typedef void (*DOSRELAY)(CONTEXT86*,void*);
+typedef void (WINAPI *RMCBPROC)(CONTEXT86*);
+typedef void (WINAPI *INTPROC)(CONTEXT86*);
 
 #define DOS_PRIORITY_REALTIME 0  /* IRQ0 */
 #define DOS_PRIORITY_KEYBOARD 1  /* IRQ1 */
@@ -51,12 +59,16 @@ extern const struct DPMI_segments *DOSVM_dpmi_segments;
 
 #define BIOS_DATA ((void *)0x400)
 
+/* module.c */
 extern void WINAPI MZ_LoadImage( LPCSTR filename, HANDLE hFile );
 extern BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID paramblk );
 extern void WINAPI MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval );
 extern BOOL WINAPI MZ_Current( void );
 extern void WINAPI MZ_AllocDPMITask( void );
 extern void WINAPI MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg );
+extern BOOL DOSVM_IsWin16(void);
+
+/* dosvm.c */
 extern INT WINAPI DOSVM_Enter( CONTEXT86 *context );
 extern void WINAPI DOSVM_Wait( INT read_pipe, HANDLE hObject );
 extern DWORD WINAPI DOSVM_Loop( HANDLE hThread );
@@ -65,7 +77,6 @@ extern void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val );
 extern void WINAPI DOSVM_SetTimer( UINT ticks );
 extern UINT WINAPI DOSVM_GetTimer( void );
 extern void DOSVM_RealModeInterrupt( BYTE intnum, CONTEXT86 *context );
-extern BOOL DOSVM_IsWin16(void);
 
 /* devices.c */
 extern void DOSDEV_InstallDOSDevices(void);
@@ -137,8 +148,10 @@ extern void WINAPI DOSVM_Int29Handler(CONTEXT86*);
 /* int2a.c */
 extern void WINAPI DOSVM_Int2aHandler(CONTEXT86*);
 
+/* int2f.c */
+extern void WINAPI DOSVM_Int2fHandler(CONTEXT86*);
+
 /* int31.c */
-typedef void (WINAPI *RMCBPROC)(CONTEXT86*);
 extern void WINAPI DOSVM_Int31Handler(CONTEXT86*);
 extern BOOL DOSVM_IsDos32(void);
 extern FARPROC16 WINAPI DPMI_AllocInternalRMCB(RMCBPROC);

dlls/winedos/interrupts.c

@@ -29,7 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(int);
  *		DOSVM_Int15Handler (WINEDOS16.121)
  *		DOSVM_Int25Handler (WINEDOS16.137)
  *		DOSVM_Int26Handler (WINEDOS16.138)
- *		DOSVM_Int2fHandler (WINEDOS16.147)
  *		DOSVM_Int5cHandler (WINEDOS16.192)
  *
  * FIXME: Interrupt handlers for interrupts implemented in other DLLs.
@@ -40,7 +39,6 @@ void WINAPI DOSVM_Int11Handler( CONTEXT86 *context ) { INT_Int11Handler(context)
 void WINAPI DOSVM_Int15Handler( CONTEXT86 *context ) { INT_Int15Handler(context); }
 void WINAPI DOSVM_Int25Handler( CONTEXT86 *context ) { INT_Int25Handler(context); }
 void WINAPI DOSVM_Int26Handler( CONTEXT86 *context ) { INT_Int26Handler(context); }
-void WINAPI DOSVM_Int2fHandler( CONTEXT86 *context ) { INT_Int2fHandler(context); }
 void WINAPI DOSVM_Int5cHandler( CONTEXT86 *context ) { NetBIOSCall16(context); }
 
 static FARPROC16     DOSVM_Vectors16[256];

include/miscemu.h

@@ -175,12 +175,6 @@ struct DPMI_segments
     WORD int48_sel;
 };
 
-/* 48-bit segmented pointers for DOS DPMI32 */
-typedef struct {
-  WORD  selector;
-  DWORD offset;
-} SEGPTR48, FARPROC48;
-
 extern struct DPMI_segments DOSMEM_dpmi_segments;
 extern const struct DPMI_segments *DOSMEM_GetDPMISegments(void);
 
@@ -198,13 +192,6 @@ extern UINT DOSMEM_MapLinearToDos(LPVOID); /* linear Wine to DOS */
 /* memory/instr.c */
 extern BOOL INSTR_EmulateInstruction( CONTEXT86 *context );
 
-/* msdos/interrupts.c */
-typedef void (WINAPI *INTPROC)(CONTEXT86*);
-extern FARPROC16 INT_GetPMHandler( BYTE intnum );
-extern void INT_SetPMHandler( BYTE intnum, FARPROC16 handler );
-extern FARPROC48 INT_GetPMHandler48( BYTE intnum );
-extern void INT_SetPMHandler48( BYTE intnum, FARPROC48 handler );
-
 /* msdos/ioports.c */
 extern DWORD IO_inport( int port, int count );
 extern void IO_outport( int port, int count, DWORD value );
@@ -221,9 +208,6 @@ extern void WINAPI INT_Int25Handler(CONTEXT86*);
 /* msdos/int26.c */
 extern void WINAPI INT_Int26Handler(CONTEXT86*);
 
-/* msdos/int2f.c */
-extern void WINAPI INT_Int2fHandler(CONTEXT86*);
-
 /* msdos/int5c.c */
 extern void WINAPI NetBIOSCall16(CONTEXT86*);