Author: aandrejevic Date: Tue May 6 17:06:47 2014 New Revision: 63177
URL: http://svn.reactos.org/svn/reactos?rev=63177&view=rev Log: [BRANCHES] Merge the NTVDM branch back to trunk. New/changed components are: ntvdm, fast486, basesrv, ntdll, kernel32 and csrsrv.
Added: trunk/reactos/include/ddk/isvbop.h - copied unchanged from r63176, branches/ntvdm/include/ddk/isvbop.h trunk/reactos/include/ddk/isvbop.inc - copied unchanged from r63176, branches/ntvdm/include/ddk/isvbop.inc trunk/reactos/include/ddk/nt_vdd.h - copied unchanged from r63176, branches/ntvdm/include/ddk/nt_vdd.h trunk/reactos/include/ddk/vddsvc.h - copied unchanged from r63176, branches/ntvdm/include/ddk/vddsvc.h trunk/reactos/include/reactos/libs/fast486/ - copied from r63176, branches/ntvdm/include/reactos/libs/fast486/ trunk/reactos/include/reactos/subsys/win/vdm.h - copied unchanged from r63176, branches/ntvdm/include/reactos/subsys/win/vdm.h trunk/reactos/lib/fast486/ - copied from r63176, branches/ntvdm/lib/fast486/ trunk/reactos/subsystems/ntvdm/bios/ (props changed) - copied from r63176, branches/ntvdm/subsystems/ntvdm/bios/ trunk/reactos/subsystems/ntvdm/bop.c - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/bop.c trunk/reactos/subsystems/ntvdm/bop.h - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/bop.h trunk/reactos/subsystems/ntvdm/callback.c - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/callback.c trunk/reactos/subsystems/ntvdm/callback.h - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/callback.h trunk/reactos/subsystems/ntvdm/clock.c - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/clock.c trunk/reactos/subsystems/ntvdm/clock.h - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/clock.h trunk/reactos/subsystems/ntvdm/dos/ (props changed) - copied from r63176, branches/ntvdm/subsystems/ntvdm/dos/ trunk/reactos/subsystems/ntvdm/emulator.c - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/emulator.h - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/emulator.h trunk/reactos/subsystems/ntvdm/hardware/ (props changed) - copied from r63176, branches/ntvdm/subsystems/ntvdm/hardware/ trunk/reactos/subsystems/ntvdm/int32.c - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/int32.c trunk/reactos/subsystems/ntvdm/int32.h - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/int32.h trunk/reactos/subsystems/ntvdm/io.c - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/io.c trunk/reactos/subsystems/ntvdm/io.h - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/io.h trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/lang/cs-CZ.rc trunk/reactos/subsystems/ntvdm/lang/de-DE.rc - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/lang/de-DE.rc trunk/reactos/subsystems/ntvdm/lang/en-US.rc - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/lang/en-US.rc trunk/reactos/subsystems/ntvdm/lang/es-ES.rc - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/lang/es-ES.rc trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/lang/fr-FR.rc trunk/reactos/subsystems/ntvdm/lang/it-IT.rc - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/lang/it-IT.rc trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/lang/pl-PL.rc trunk/reactos/subsystems/ntvdm/ntvdm.h - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/ntvdm.h trunk/reactos/subsystems/ntvdm/ntvdm.spec - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/ntvdm.spec trunk/reactos/subsystems/ntvdm/registers.c - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/registers.c trunk/reactos/subsystems/ntvdm/registers.h - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/registers.h trunk/reactos/subsystems/ntvdm/res/ (props changed) - copied from r63176, branches/ntvdm/subsystems/ntvdm/res/ trunk/reactos/subsystems/ntvdm/utils.c - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/utils.c trunk/reactos/subsystems/ntvdm/utils.h - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/utils.h trunk/reactos/subsystems/ntvdm/vddsup.c - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/vddsup.c trunk/reactos/subsystems/ntvdm/vddsup.h - copied unchanged from r63176, branches/ntvdm/subsystems/ntvdm/vddsup.h trunk/reactos/subsystems/win/basesrv/vdm.h - copied unchanged from r63176, branches/ntvdm/subsystems/win/basesrv/vdm.h Removed: trunk/reactos/subsystems/ntvdm/lang/bg-BG.rc trunk/reactos/subsystems/ntvdm/lang/hu-HU.rc trunk/reactos/subsystems/ntvdm/lang/id-ID.rc trunk/reactos/subsystems/ntvdm/lang/ja-JP.rc trunk/reactos/subsystems/ntvdm/lang/no-NO.rc trunk/reactos/subsystems/ntvdm/lang/pt-BR.rc trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc trunk/reactos/subsystems/ntvdm/lang/sk-SK.rc trunk/reactos/subsystems/ntvdm/lang/th-TH.rc trunk/reactos/subsystems/ntvdm/lang/uk-UA.rc trunk/reactos/subsystems/ntvdm/lang/zh-CN.rc trunk/reactos/subsystems/ntvdm/lang/zh-TW.rc Modified: trunk/reactos/ (props changed) trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/ntdll/csr/capture.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/client/vdm.c trunk/reactos/dll/win32/kernel32/include/vdm.h trunk/reactos/dll/win32/kernel32/k32.h trunk/reactos/lib/CMakeLists.txt trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/subsystems/CMakeLists.txt trunk/reactos/subsystems/ntvdm/CMakeLists.txt trunk/reactos/subsystems/ntvdm/dos/dos32krnl/ (props changed) trunk/reactos/subsystems/ntvdm/ntvdm.c trunk/reactos/subsystems/ntvdm/ntvdm.rc trunk/reactos/subsystems/ntvdm/resource.h trunk/reactos/subsystems/win/basesrv/basesrv.h trunk/reactos/subsystems/win/basesrv/init.c trunk/reactos/subsystems/win/basesrv/proc.c trunk/reactos/subsystems/win/basesrv/vdm.c trunk/reactos/subsystems/win32/csrsrv/procsup.c
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=63177&...
Modified: trunk/reactos/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/capture.c?rev...
Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/p...
Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/v...
Modified: trunk/reactos/dll/win32/kernel32/include/vdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include/...
Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?re...
Modified: trunk/reactos/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/CMakeLists.txt?rev=6317...
Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=6...
Modified: trunk/reactos/subsystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/CMakeLists.txt?r...
Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/CMakeLists...
Removed: trunk/reactos/subsystems/ntvdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/bg-BG...
Removed: trunk/reactos/subsystems/ntvdm/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/hu-HU...
Removed: trunk/reactos/subsystems/ntvdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/id-ID...
Removed: trunk/reactos/subsystems/ntvdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ja-JP...
Removed: trunk/reactos/subsystems/ntvdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/no-NO...
Removed: trunk/reactos/subsystems/ntvdm/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/pt-BR...
Removed: trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ro-RO...
Removed: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ru-RU...
Removed: trunk/reactos/subsystems/ntvdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/sk-SK...
Removed: trunk/reactos/subsystems/ntvdm/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/th-TH...
Removed: trunk/reactos/subsystems/ntvdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/uk-UA...
Removed: trunk/reactos/subsystems/ntvdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/zh-CN...
Removed: trunk/reactos/subsystems/ntvdm/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/zh-TW...
Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.c?re...
Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.rc?r...
Modified: trunk/reactos/subsystems/ntvdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/resource.h...
Modified: trunk/reactos/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/base...
Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/init...
Modified: trunk/reactos/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/proc...
Modified: trunk/reactos/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/vdm....
Modified: trunk/reactos/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/pro...