diff --git a/include/debug.h b/include/debug.h index 2fb94479c4..8a880c9b5b 100644 --- a/include/debug.h +++ b/include/debug.h @@ -64,92 +64,94 @@ #define dbch_int 56 #define dbch_int10 57 #define dbch_int16 58 -#define dbch_int21 59 -#define dbch_int31 60 -#define dbch_ipaddress 61 -#define dbch_key 62 -#define dbch_keyboard 63 -#define dbch_ldt 64 -#define dbch_listbox 65 -#define dbch_listview 66 -#define dbch_local 67 -#define dbch_mci 68 -#define dbch_mcianim 69 -#define dbch_mciwave 70 -#define dbch_mdi 71 -#define dbch_menu 72 -#define dbch_message 73 -#define dbch_metafile 74 -#define dbch_midi 75 -#define dbch_mmaux 76 -#define dbch_mmio 77 -#define dbch_mmsys 78 -#define dbch_mmtime 79 -#define dbch_module 80 -#define dbch_mpr 81 -#define dbch_msacm 82 -#define dbch_msg 83 -#define dbch_nativefont 84 -#define dbch_nonclient 85 -#define dbch_ntdll 86 -#define dbch_ole 87 -#define dbch_pager 88 -#define dbch_palette 89 -#define dbch_pidl 90 -#define dbch_print 91 -#define dbch_process 92 -#define dbch_profile 93 -#define dbch_progress 94 -#define dbch_prop 95 -#define dbch_psapi 96 -#define dbch_psdrv 97 -#define dbch_rebar 98 -#define dbch_reg 99 -#define dbch_region 100 -#define dbch_relay 101 -#define dbch_resource 102 -#define dbch_s 103 -#define dbch_scroll 104 -#define dbch_security 105 -#define dbch_segment 106 -#define dbch_selector 107 -#define dbch_sem 108 -#define dbch_sendmsg 109 -#define dbch_shell 110 -#define dbch_shm 111 -#define dbch_snoop 112 -#define dbch_sound 113 -#define dbch_static 114 -#define dbch_statusbar 115 -#define dbch_stress 116 -#define dbch_string 117 -#define dbch_syscolor 118 -#define dbch_system 119 -#define dbch_tab 120 -#define dbch_task 121 -#define dbch_text 122 -#define dbch_thread 123 -#define dbch_thunk 124 -#define dbch_timer 125 -#define dbch_toolbar 126 -#define dbch_toolhelp 127 -#define dbch_tooltips 128 -#define dbch_trackbar 129 -#define dbch_treeview 130 -#define dbch_tweak 131 -#define dbch_uitools 132 -#define dbch_updown 133 -#define dbch_ver 134 -#define dbch_virtual 135 -#define dbch_vxd 136 -#define dbch_win 137 -#define dbch_win16drv 138 -#define dbch_win32 139 -#define dbch_wing 140 -#define dbch_winsock 141 -#define dbch_wnet 142 -#define dbch_x11 143 -#define dbch_x11drv 144 +#define dbch_int17 59 +#define dbch_int19 60 +#define dbch_int21 61 +#define dbch_int31 62 +#define dbch_ipaddress 63 +#define dbch_key 64 +#define dbch_keyboard 65 +#define dbch_ldt 66 +#define dbch_listbox 67 +#define dbch_listview 68 +#define dbch_local 69 +#define dbch_mci 70 +#define dbch_mcianim 71 +#define dbch_mciwave 72 +#define dbch_mdi 73 +#define dbch_menu 74 +#define dbch_message 75 +#define dbch_metafile 76 +#define dbch_midi 77 +#define dbch_mmaux 78 +#define dbch_mmio 79 +#define dbch_mmsys 80 +#define dbch_mmtime 81 +#define dbch_module 82 +#define dbch_mpr 83 +#define dbch_msacm 84 +#define dbch_msg 85 +#define dbch_nativefont 86 +#define dbch_nonclient 87 +#define dbch_ntdll 88 +#define dbch_ole 89 +#define dbch_pager 90 +#define dbch_palette 91 +#define dbch_pidl 92 +#define dbch_print 93 +#define dbch_process 94 +#define dbch_profile 95 +#define dbch_progress 96 +#define dbch_prop 97 +#define dbch_psapi 98 +#define dbch_psdrv 99 +#define dbch_rebar 100 +#define dbch_reg 101 +#define dbch_region 102 +#define dbch_relay 103 +#define dbch_resource 104 +#define dbch_s 105 +#define dbch_scroll 106 +#define dbch_security 107 +#define dbch_segment 108 +#define dbch_selector 109 +#define dbch_sem 110 +#define dbch_sendmsg 111 +#define dbch_shell 112 +#define dbch_shm 113 +#define dbch_snoop 114 +#define dbch_sound 115 +#define dbch_static 116 +#define dbch_statusbar 117 +#define dbch_stress 118 +#define dbch_string 119 +#define dbch_syscolor 120 +#define dbch_system 121 +#define dbch_tab 122 +#define dbch_task 123 +#define dbch_text 124 +#define dbch_thread 125 +#define dbch_thunk 126 +#define dbch_timer 127 +#define dbch_toolbar 128 +#define dbch_toolhelp 129 +#define dbch_tooltips 130 +#define dbch_trackbar 131 +#define dbch_treeview 132 +#define dbch_tweak 133 +#define dbch_uitools 134 +#define dbch_updown 135 +#define dbch_ver 136 +#define dbch_virtual 137 +#define dbch_vxd 138 +#define dbch_win 139 +#define dbch_win16drv 140 +#define dbch_win32 141 +#define dbch_wing 142 +#define dbch_winsock 143 +#define dbch_wnet 144 +#define dbch_x11 145 +#define dbch_x11drv 146 /* Definitions for classes identifiers */ #define dbcl_fixme 0 #define dbcl_err 1 diff --git a/include/debugdefs.h b/include/debugdefs.h index 74987bf5f7..3313d2d6e3 100644 --- a/include/debugdefs.h +++ b/include/debugdefs.h @@ -4,7 +4,7 @@ #include "debugtools.h" #endif -#define DEBUG_CHANNEL_COUNT 145 +#define DEBUG_CHANNEL_COUNT 147 #ifdef DEBUG_RUNTIME short debug_msg_enabled[][DEBUG_CLASS_COUNT] = { {1, 1, 0, 0}, @@ -152,6 +152,8 @@ short debug_msg_enabled[][DEBUG_CLASS_COUNT] = { {1, 1, 0, 0}, {1, 1, 0, 0}, {1, 1, 0, 0}, +{1, 1, 0, 0}, +{1, 1, 0, 0}, }; const char* debug_ch_name[] = { "1", @@ -213,6 +215,8 @@ const char* debug_ch_name[] = { "int", "int10", "int16", +"int17", +"int19", "int21", "int31", "ipaddress", diff --git a/include/miscemu.h b/include/miscemu.h index 7da2383645..6cd4050d10 100644 --- a/include/miscemu.h +++ b/include/miscemu.h @@ -46,15 +46,21 @@ extern void IO_outport( int port, int count, DWORD value ); /* msdos/int10.c */ extern void WINAPI INT_Int10Handler(CONTEXT*); -/* msdos/int10.c */ -extern void WINAPI INT_Int10Handler(CONTEXT*); - /* msdos/int11.c */ extern void WINAPI INT_Int11Handler(CONTEXT*); +/* msdos/int13.c */ +extern void WINAPI INT_Int13Handler(CONTEXT*); + /* msdos/int16.c */ extern void WINAPI INT_Int16Handler(CONTEXT*); - + +/* msdos/int17.c */ +extern void WINAPI INT_Int17Handler(CONTEXT*); + +/* msdos/int19.c */ +extern void WINAPI INT_Int19Handler(CONTEXT*); + /* msdos/int1a.c */ extern DWORD INT1A_GetTicksSinceMidnight(void); extern void WINAPI INT_Int1aHandler(CONTEXT*); diff --git a/msdos/Makefile.in b/msdos/Makefile.in index e0a1d791cc..36b15b8ac2 100644 --- a/msdos/Makefile.in +++ b/msdos/Makefile.in @@ -16,6 +16,8 @@ C_SRCS = \ int13.c \ int15.c \ int16.c \ + int17.c \ + int19.c \ int1a.c \ int20.c \ int21.c \ diff --git a/msdos/interrupts.c b/msdos/interrupts.c index 2374774afb..f18615f01d 100644 --- a/msdos/interrupts.c +++ b/msdos/interrupts.c @@ -111,9 +111,15 @@ int INT_RealModeInterrupt( BYTE intnum, PCONTEXT context ) case 0x11: INT_Int11Handler(context); break; + case 0x13: + INT_Int13Handler(context); + break; case 0x16: INT_Int16Handler(context); break; + case 0x17: + INT_Int17Handler(context); + break; case 0x1a: INT_Int1aHandler(context); break;