[REACTOS]
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Wed, 10 Sep 2014 00:08:04 +0000 (00:08 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Wed, 10 Sep 2014 00:08:04 +0000 (00:08 +0000)
Merge back condrv_restructure branch with everything up to revision 64079 (and up for maintenance), that made console kernel32 & winsrv CSR structures Win2k3 compliant.
CORE-7931 #comment Merged back to trunk in revision 64102.
CORE-7481 #comment kernel32 / winsrv console CSR structures are Win2k3-compliant in trunk since revision 64102 (and since revision 64079 in the condrv_restructure branch, see CORE-7931 for more details).

svn path=/trunk/; revision=64102

71 files changed:
1  2 
reactos/dll/cpl/console/font.c
reactos/dll/cpl/console/lang/bg-BG.rc
reactos/dll/cpl/console/lang/cs-CZ.rc
reactos/dll/cpl/console/lang/de-DE.rc
reactos/dll/cpl/console/lang/en-US.rc
reactos/dll/cpl/console/lang/es-ES.rc
reactos/dll/cpl/console/lang/fr-FR.rc
reactos/dll/cpl/console/lang/he-IL.rc
reactos/dll/cpl/console/lang/id-ID.rc
reactos/dll/cpl/console/lang/it-IT.rc
reactos/dll/cpl/console/lang/no-NO.rc
reactos/dll/cpl/console/lang/pl-PL.rc
reactos/dll/cpl/console/lang/ro-RO.rc
reactos/dll/cpl/console/lang/ru-RU.rc
reactos/dll/cpl/console/lang/sk-SK.rc
reactos/dll/cpl/console/lang/sq-AL.rc
reactos/dll/cpl/console/lang/tr-TR.rc
reactos/dll/cpl/console/lang/uk-UA.rc
reactos/dll/cpl/console/lang/zh-CN.rc
reactos/dll/cpl/console/layout.c
reactos/dll/win32/kernel32/client/console/console.c
reactos/dll/win32/kernel32/client/console/history.c
reactos/dll/win32/kernel32/client/console/init.c
reactos/dll/win32/kernel32/client/console/readwrite.c
reactos/dll/win32/kernel32/client/console/vista.c
reactos/dll/win32/kernel32/client/dllmain.c
reactos/dll/win32/kernel32/client/proc.c
reactos/dll/win32/kernel32/include/console.h
reactos/include/psdk/wincon.h
reactos/include/reactos/subsys/win/basemsg.h
reactos/include/reactos/subsys/win/conmsg.h
reactos/win32ss/user/winsrv/consrv.cmake
reactos/win32ss/user/winsrv/consrv/alias.c
reactos/win32ss/user/winsrv/consrv/condrv/coninput.c
reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c
reactos/win32ss/user/winsrv/consrv/condrv/console.c
reactos/win32ss/user/winsrv/consrv/condrv/dummyterm.c
reactos/win32ss/user/winsrv/consrv/condrv/text.c
reactos/win32ss/user/winsrv/consrv/coninput.c
reactos/win32ss/user/winsrv/consrv/coninput.h
reactos/win32ss/user/winsrv/consrv/conoutput.c
reactos/win32ss/user/winsrv/consrv/conoutput.h
reactos/win32ss/user/winsrv/consrv/console.c
reactos/win32ss/user/winsrv/consrv/console.h
reactos/win32ss/user/winsrv/consrv/consrv.h
reactos/win32ss/user/winsrv/consrv/frontendctl.c
reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h
reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h
reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc
reactos/win32ss/user/winsrv/consrv/frontends/input.c
reactos/win32ss/user/winsrv/consrv/frontends/terminal.c
reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
reactos/win32ss/user/winsrv/consrv/handle.c
reactos/win32ss/user/winsrv/consrv/history.c
reactos/win32ss/user/winsrv/consrv/history.h
reactos/win32ss/user/winsrv/consrv/include/conio.h
reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h
reactos/win32ss/user/winsrv/consrv/include/settings.h
reactos/win32ss/user/winsrv/consrv/include/term.h
reactos/win32ss/user/winsrv/consrv/init.c
reactos/win32ss/user/winsrv/consrv/lineinput.c
reactos/win32ss/user/winsrv/consrv/lineinput.h
reactos/win32ss/user/winsrv/consrv/popup.c
reactos/win32ss/user/winsrv/consrv/popup.h
reactos/win32ss/user/winsrv/consrv/procinit.h
reactos/win32ss/user/winsrv/consrv/settings.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge