[BRANCHES]
authorAleksandar Andrejevic <aandrejevic@reactos.org>
Tue, 6 May 2014 17:06:47 +0000 (17:06 +0000)
committerAleksandar Andrejevic <aandrejevic@reactos.org>
Tue, 6 May 2014 17:06:47 +0000 (17:06 +0000)
Merge the NTVDM branch back to trunk. New/changed components are: ntvdm, fast486, basesrv,
ntdll, kernel32 and csrsrv.

svn path=/trunk/; revision=63177

99 files changed:
1  2 
reactos/cmake/msvc.cmake
reactos/dll/ntdll/csr/capture.c
reactos/dll/win32/kernel32/client/proc.c
reactos/dll/win32/kernel32/client/vdm.c
reactos/dll/win32/kernel32/include/vdm.h
reactos/dll/win32/kernel32/k32.h
reactos/include/ddk/isvbop.h
reactos/include/ddk/isvbop.inc
reactos/include/ddk/nt_vdd.h
reactos/include/ddk/vddsvc.h
reactos/include/reactos/libs/fast486/fast486.h
reactos/include/reactos/subsys/win/vdm.h
reactos/lib/CMakeLists.txt
reactos/lib/fast486/CMakeLists.txt
reactos/lib/fast486/COPYING
reactos/lib/fast486/common.c
reactos/lib/fast486/common.h
reactos/lib/fast486/common.inl
reactos/lib/fast486/extraops.c
reactos/lib/fast486/extraops.h
reactos/lib/fast486/fast486.c
reactos/lib/fast486/fpu.c
reactos/lib/fast486/fpu.h
reactos/lib/fast486/opcodes.c
reactos/lib/fast486/opcodes.h
reactos/lib/fast486/opgroups.c
reactos/lib/fast486/opgroups.h
reactos/ntoskrnl/mm/section.c
reactos/subsystems/CMakeLists.txt
reactos/subsystems/ntvdm/CMakeLists.txt
reactos/subsystems/ntvdm/bios/bios.c
reactos/subsystems/ntvdm/bios/bios.h
reactos/subsystems/ntvdm/bios/bios32/bios32.c
reactos/subsystems/ntvdm/bios/bios32/bios32.h
reactos/subsystems/ntvdm/bios/bios32/bios32p.h
reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c
reactos/subsystems/ntvdm/bios/bios32/kbdbios32.h
reactos/subsystems/ntvdm/bios/bios32/vidbios32.c
reactos/subsystems/ntvdm/bios/bios32/vidbios32.h
reactos/subsystems/ntvdm/bios/kbdbios.c
reactos/subsystems/ntvdm/bios/kbdbios.h
reactos/subsystems/ntvdm/bios/rom.c
reactos/subsystems/ntvdm/bios/rom.h
reactos/subsystems/ntvdm/bios/vidbios.c
reactos/subsystems/ntvdm/bios/vidbios.h
reactos/subsystems/ntvdm/bop.c
reactos/subsystems/ntvdm/bop.h
reactos/subsystems/ntvdm/callback.c
reactos/subsystems/ntvdm/callback.h
reactos/subsystems/ntvdm/clock.c
reactos/subsystems/ntvdm/clock.h
reactos/subsystems/ntvdm/dos/dem.c
reactos/subsystems/ntvdm/dos/dem.h
reactos/subsystems/ntvdm/dos/dos32krnl/bios.c
reactos/subsystems/ntvdm/dos/dos32krnl/dos.c
reactos/subsystems/ntvdm/dos/dos32krnl/dos.h
reactos/subsystems/ntvdm/emulator.c
reactos/subsystems/ntvdm/emulator.h
reactos/subsystems/ntvdm/hardware/cmos.c
reactos/subsystems/ntvdm/hardware/cmos.h
reactos/subsystems/ntvdm/hardware/pic.c
reactos/subsystems/ntvdm/hardware/pic.h
reactos/subsystems/ntvdm/hardware/ps2.c
reactos/subsystems/ntvdm/hardware/ps2.h
reactos/subsystems/ntvdm/hardware/speaker.c
reactos/subsystems/ntvdm/hardware/speaker.h
reactos/subsystems/ntvdm/hardware/timer.c
reactos/subsystems/ntvdm/hardware/timer.h
reactos/subsystems/ntvdm/hardware/vga.c
reactos/subsystems/ntvdm/hardware/vga.h
reactos/subsystems/ntvdm/int32.c
reactos/subsystems/ntvdm/int32.h
reactos/subsystems/ntvdm/io.c
reactos/subsystems/ntvdm/io.h
reactos/subsystems/ntvdm/lang/cs-CZ.rc
reactos/subsystems/ntvdm/lang/de-DE.rc
reactos/subsystems/ntvdm/lang/en-US.rc
reactos/subsystems/ntvdm/lang/es-ES.rc
reactos/subsystems/ntvdm/lang/fr-FR.rc
reactos/subsystems/ntvdm/lang/it-IT.rc
reactos/subsystems/ntvdm/lang/pl-PL.rc
reactos/subsystems/ntvdm/ntvdm.c
reactos/subsystems/ntvdm/ntvdm.h
reactos/subsystems/ntvdm/ntvdm.rc
reactos/subsystems/ntvdm/ntvdm.spec
reactos/subsystems/ntvdm/registers.c
reactos/subsystems/ntvdm/registers.h
reactos/subsystems/ntvdm/res/ntvdm.ico
reactos/subsystems/ntvdm/resource.h
reactos/subsystems/ntvdm/utils.c
reactos/subsystems/ntvdm/utils.h
reactos/subsystems/ntvdm/vddsup.c
reactos/subsystems/ntvdm/vddsup.h
reactos/subsystems/win/basesrv/basesrv.h
reactos/subsystems/win/basesrv/init.c
reactos/subsystems/win/basesrv/proc.c
reactos/subsystems/win/basesrv/vdm.c
reactos/subsystems/win/basesrv/vdm.h
reactos/subsystems/win32/csrsrv/procsup.c

Simple merge
Simple merge
Simple merge
index 0000000,088e9e6..088e9e6
mode 000000,100644..100644
--- /dev/null
index 0000000,7a13b4b..7a13b4b
mode 000000,100644..100644
--- /dev/null
index 0000000,b4b6c7d..b4b6c7d
mode 000000,100644..100644
--- /dev/null
index 0000000,eb80822..eb80822
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,2fbdb31..2fbdb31
mode 000000,100644..100644
--- /dev/null
index 0000000,d159169..d159169
mode 000000,100644..100644
--- /dev/null
index 0000000,36f026e..36f026e
mode 000000,100644..100644
--- /dev/null
index 0000000,1bfdb31..1bfdb31
mode 000000,100644..100644
--- /dev/null
index 0000000,fff8fc0..fff8fc0
mode 000000,100644..100644
--- /dev/null
index 0000000,f9fe386..f9fe386
mode 000000,100644..100644
--- /dev/null
index 0000000,eab8e28..eab8e28
mode 000000,100644..100644
--- /dev/null
index 0000000,c47814b..c47814b
mode 000000,100644..100644
--- /dev/null
index 0000000,18f4a89..18f4a89
mode 000000,100644..100644
--- /dev/null
index 0000000,63128a4..63128a4
mode 000000,100644..100644
--- /dev/null
index 0000000,3dffdaa..3dffdaa
mode 000000,100644..100644
--- /dev/null
index 0000000,3d29e47..3d29e47
mode 000000,100644..100644
--- /dev/null
index 0000000,264fa66..264fa66
mode 000000,100644..100644
--- /dev/null
index 0000000,bf55cce..bf55cce
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,12066b5..12066b5
mode 000000,100644..100644
--- /dev/null
index 0000000,cc1bb94..cc1bb94
mode 000000,100644..100644
--- /dev/null
index 0000000,7255086..7255086
mode 000000,100644..100644
--- /dev/null
index 0000000,4648678..4648678
mode 000000,100644..100644
--- /dev/null
index 0000000,e4dbc6b..e4dbc6b
mode 000000,100644..100644
--- /dev/null
index 0000000,01f95e8..01f95e8
mode 000000,100644..100644
--- /dev/null
index 0000000,cec5a70..cec5a70
mode 000000,100644..100644
--- /dev/null
index 0000000,70b3e54..70b3e54
mode 000000,100644..100644
--- /dev/null
index 0000000,4070042..4070042
mode 000000,100644..100644
--- /dev/null
index 0000000,a936d1f..a936d1f
mode 000000,100644..100644
--- /dev/null
index 0000000,34c0bcc..34c0bcc
mode 000000,100644..100644
--- /dev/null
index 0000000,c29ef9c..c29ef9c
mode 000000,100644..100644
--- /dev/null
index 0000000,74e1fe4..74e1fe4
mode 000000,100644..100644
--- /dev/null
index 0000000,53927d2..53927d2
mode 000000,100644..100644
--- /dev/null
index 0000000,f78dab8..f78dab8
mode 000000,100644..100644
--- /dev/null
index 0000000,1e5f2de..1e5f2de
mode 000000,100644..100644
--- /dev/null
index 0000000,fe4bdfd..fe4bdfd
mode 000000,100644..100644
--- /dev/null
index 0000000,20e9a07..20e9a07
mode 000000,100644..100644
--- /dev/null
index 0000000,aa40821..aa40821
mode 000000,100644..100644
--- /dev/null
index 0000000,03d7dd1..03d7dd1
mode 000000,100644..100644
--- /dev/null
index 0000000,c98d32e..c98d32e
mode 000000,100644..100644
--- /dev/null
index 0000000,119e9bd..119e9bd
mode 000000,100644..100644
--- /dev/null
index 0000000,4a4dc1b..4a4dc1b
mode 000000,100644..100644
--- /dev/null
index 0000000,1f142c1..1f142c1
mode 000000,100644..100644
--- /dev/null
index 0000000,b89eb13..b89eb13
mode 000000,100644..100644
--- /dev/null
index 0000000,d6cced2..d6cced2
mode 000000,100644..100644
--- /dev/null
index 0000000,9a85a11..9a85a11
mode 000000,100644..100644
--- /dev/null
index 0000000,9ed80ec..9ed80ec
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,3555ce4..3555ce4
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,244bda9..244bda9
mode 000000,100644..100644
--- /dev/null
index 0000000,d3d5ce1..d3d5ce1
mode 000000,100644..100644
--- /dev/null
index 0000000,09568f3..09568f3
mode 000000,100644..100644
--- /dev/null
index 0000000,161c1b0..161c1b0
mode 000000,100644..100644
Binary files differ
Simple merge
index 0000000,0619376..0619376
mode 000000,100644..100644
--- /dev/null
index 0000000,98ce093..98ce093
mode 000000,100644..100644
--- /dev/null
index 0000000,92a0ff1..92a0ff1
mode 000000,100644..100644
--- /dev/null
index 0000000,4de9178..4de9178
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
index 0000000,3da59d9..3da59d9
mode 000000,100644..100644
--- /dev/null