Module: wine Branch: master Commit: 26a42f845284bdf642b863597dcb1a90d17b3e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26a42f845284bdf642b863597d...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Jan 5 14:26:05 2010 +0100
winedos: Merge all of winedos back into krnl386.
---
configure | 10 - configure.ac | 2 - dlls/ifsmgr.vxd/Makefile.in | 2 +- dlls/ifsmgr.vxd/ifsmgr.c | 24 +- dlls/krnl386.exe16/Makefile.in | 25 + dlls/{winedos => krnl386.exe16}/dma.c | 0 dlls/{winedos => krnl386.exe16}/dosaspi.c | 0 dlls/{winedos => krnl386.exe16}/dosconf.c | 0 dlls/{winedos/devices.c => krnl386.exe16/dosdev.c} | 0 dlls/{winedos/module.c => krnl386.exe16/dosexe.c} | 18 +- dlls/{winedos => krnl386.exe16}/dosexe.h | 19 +- dlls/krnl386.exe16/dosmem.c | 501 ++++++++++++++++-- dlls/{winedos => krnl386.exe16}/dosvm.c | 23 +- dlls/{winedos => krnl386.exe16}/fpu.c | 0 dlls/krnl386.exe16/global.c | 18 - dlls/krnl386.exe16/instr.c | 33 +- dlls/{winedos => krnl386.exe16}/int09.c | 0 dlls/{winedos => krnl386.exe16}/int10.c | 2 +- dlls/{winedos => krnl386.exe16}/int13.c | 0 dlls/{winedos => krnl386.exe16}/int15.c | 0 dlls/{winedos => krnl386.exe16}/int16.c | 0 dlls/{winedos => krnl386.exe16}/int21.c | 1 + dlls/{winedos => krnl386.exe16}/int25.c | 0 dlls/{winedos => krnl386.exe16}/int26.c | 0 dlls/{winedos => krnl386.exe16}/int2f.c | 52 -- dlls/{winedos => krnl386.exe16}/int31.c | 13 +- dlls/{winedos => krnl386.exe16}/int33.c | 0 dlls/{winedos => krnl386.exe16}/int67.c | 0 dlls/{winedos => krnl386.exe16}/interrupts.c | 19 +- dlls/{winedos => krnl386.exe16}/ioports.c | 9 +- dlls/krnl386.exe16/kernel16_private.h | 59 +-- dlls/krnl386.exe16/krnl386.exe16.spec | 4 + dlls/krnl386.exe16/ne_module.c | 1 + dlls/krnl386.exe16/relay.c | 176 ++++++- dlls/{winedos => krnl386.exe16}/soundblaster.c | 0 dlls/{winedos => krnl386.exe16}/timer.c | 0 dlls/{winedos => krnl386.exe16}/vga.c | 0 dlls/{winedos => krnl386.exe16}/vga.h | 0 dlls/krnl386.exe16/vxd.c | 1 + dlls/vwin32.vxd/Makefile.in | 2 +- dlls/vwin32.vxd/vwin32.c | 35 +-- dlls/winedos/Makefile.in | 39 -- dlls/winedos/dosmem.c | 551 -------------------- dlls/winedos/relay.c | 204 -------- dlls/winedos/winedos.spec | 13 - dlls/winedos/wprocs.spec | 19 - programs/winevdm/winevdm.c | 14 +- 47 files changed, 736 insertions(+), 1153 deletions(-)
Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26a42f845284bdf642b863...