[ros-diffs] [hbelusca] 59461: [CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll.

Author: hbelusca
Date: Sat Jul 13 04:54:49 2013
New Revision: 59461

URL: http://svn.reactos.org/svn/reactos?rev=59461&view=rev
Log:
[CONSRV-WINSRV]
Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll.

Added:
    trunk/reactos/win32ss/user/winsrv/consrv/
      - copied from r59454, trunk/reactos/win32ss/user/consrv/
    trunk/reactos/win32ss/user/winsrv/consrv.cmake
      - copied, changed from r59454, trunk/reactos/win32ss/user/consrv/CMakeLists.txt
    trunk/reactos/win32ss/user/winsrv/consrv/include/conio2.h
      - copied, changed from r59454, trunk/reactos/win32ss/user/consrv/conio.h
    trunk/reactos/win32ss/user/winsrv/usersrv/   (with props)
    trunk/reactos/win32ss/user/winsrv/usersrv.cmake
      - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/CMakeLists.txt
    trunk/reactos/win32ss/user/winsrv/usersrv/api.h
      - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/api.h
    trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c
      - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/harderror.c
    trunk/reactos/win32ss/user/winsrv/usersrv/init.c
      - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/init.c
    trunk/reactos/win32ss/user/winsrv/usersrv/lang/
      - copied from r59454, trunk/reactos/win32ss/user/winsrv/lang/
    trunk/reactos/win32ss/user/winsrv/usersrv/register.c
      - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/register.c
    trunk/reactos/win32ss/user/winsrv/usersrv/resource.h
      - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/resource.h
    trunk/reactos/win32ss/user/winsrv/usersrv/rsrc.rc
      - copied unchanged from r59454, trunk/reactos/win32ss/user/winsrv/rsrc.rc
    trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c
      - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/shutdown.c
    trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h
      - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/winsrv.h
    trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.rc
      - copied, changed from r59454, trunk/reactos/win32ss/user/winsrv/winsrv.rc
Removed:
    trunk/reactos/win32ss/user/consrv/
    trunk/reactos/win32ss/user/winsrv/api.h
    trunk/reactos/win32ss/user/winsrv/consrv/CMakeLists.txt
    trunk/reactos/win32ss/user/winsrv/consrv/conio.h
    trunk/reactos/win32ss/user/winsrv/consrv/consrv.spec
    trunk/reactos/win32ss/user/winsrv/harderror.c
    trunk/reactos/win32ss/user/winsrv/lang/
    trunk/reactos/win32ss/user/winsrv/register.c
    trunk/reactos/win32ss/user/winsrv/resource.h
    trunk/reactos/win32ss/user/winsrv/rsrc.rc
    trunk/reactos/win32ss/user/winsrv/shutdown.c
    trunk/reactos/win32ss/user/winsrv/winsrv.h
Modified:
    trunk/reactos/boot/bootdata/hivesys.inf
    trunk/reactos/dll/cpl/console/CMakeLists.txt
    trunk/reactos/win32ss/CMakeLists.txt
    trunk/reactos/win32ss/user/winsrv/CMakeLists.txt
    trunk/reactos/win32ss/user/winsrv/consrv/alias.c
    trunk/reactos/win32ss/user/winsrv/consrv/alias.h
    trunk/reactos/win32ss/user/winsrv/consrv/api.h
    trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c
    trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c
    trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c
    trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c
    trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c
    trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c
    trunk/reactos/win32ss/user/winsrv/consrv/coninput.c
    trunk/reactos/win32ss/user/winsrv/consrv/coninput.h
    trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c
    trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h
    trunk/reactos/win32ss/user/winsrv/consrv/console.c
    trunk/reactos/win32ss/user/winsrv/consrv/console.h
    trunk/reactos/win32ss/user/winsrv/consrv/consrv.h
    trunk/reactos/win32ss/user/winsrv/consrv/consrv.rc
    trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h
    trunk/reactos/win32ss/user/winsrv/consrv/handle.c
    trunk/reactos/win32ss/user/winsrv/consrv/handle.h
    trunk/reactos/win32ss/user/winsrv/consrv/heap.h
    trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h
    trunk/reactos/win32ss/user/winsrv/consrv/include/console.h
    trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h
    trunk/reactos/win32ss/user/winsrv/consrv/init.c
    trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c
    trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h
    trunk/reactos/win32ss/user/winsrv/consrv/procinit.h
    trunk/reactos/win32ss/user/winsrv/consrv/resource.h
    trunk/reactos/win32ss/user/winsrv/consrv/settings.c
    trunk/reactos/win32ss/user/winsrv/init.c
    trunk/reactos/win32ss/user/winsrv/winsrv.rc
    trunk/reactos/win32ss/user/winsrv/winsrv.spec

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/reactos/boot/bootdata/hivesys.inf
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?r...

Modified: trunk/reactos/dll/cpl/console/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/CMakeLists....

Modified: trunk/reactos/win32ss/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev=...

Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/CMakeLi...

Removed: trunk/reactos/win32ss/user/winsrv/api.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/api.h?r...

Copied: trunk/reactos/win32ss/user/winsrv/consrv.cmake (from r59454, trunk/reactos/win32ss/user/consrv/CMakeLists.txt)
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv....

Removed: trunk/reactos/win32ss/user/winsrv/consrv/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/CMakeLi...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/api.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Removed: trunk/reactos/win32ss/user/winsrv/consrv/conio.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conio.h...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Removed: trunk/reactos/win32ss/user/winsrv/consrv/consrv.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consrv....

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/heap.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Copied: trunk/reactos/win32ss/user/winsrv/consrv/include/conio2.h (from r59454, trunk/reactos/win32ss/user/consrv/conio.h)
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/console.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/procinit.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Modified: trunk/reactos/win32ss/user/winsrv/consrv/settings.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/...

Removed: trunk/reactos/win32ss/user/winsrv/harderror.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/harderr...

Modified: trunk/reactos/win32ss/user/winsrv/init.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/init.c?...

Removed: trunk/reactos/win32ss/user/winsrv/register.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/registe...

Removed: trunk/reactos/win32ss/user/winsrv/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/resourc...

Removed: trunk/reactos/win32ss/user/winsrv/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/rsrc.rc...

Removed: trunk/reactos/win32ss/user/winsrv/shutdown.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/shutdow...

Copied: trunk/reactos/win32ss/user/winsrv/usersrv.cmake (from r59454, trunk/reactos/win32ss/user/winsrv/CMakeLists.txt)
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersrv...

Copied: trunk/reactos/win32ss/user/winsrv/usersrv/api.h (from r59454, trunk/reactos/win32ss/user/winsrv/api.h)
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersrv...

Copied: trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c (from r59454, trunk/reactos/win32ss/user/winsrv/harderror.c)
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersrv...

Copied: trunk/reactos/win32ss/user/winsrv/usersrv/init.c (from r59454, trunk/reactos/win32ss/user/winsrv/init.c)
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersrv...

Copied: trunk/reactos/win32ss/user/winsrv/usersrv/register.c (from r59454, trunk/reactos/win32ss/user/winsrv/register.c)
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersrv...

Copied: trunk/reactos/win32ss/user/winsrv/usersrv/resource.h (from r59454, trunk/reactos/win32ss/user/winsrv/resource.h)
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersrv...

Copied: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c (from r59454, trunk/reactos/win32ss/user/winsrv/shutdown.c)
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersrv...

Copied: trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h (from r59454, trunk/reactos/win32ss/user/winsrv/winsrv.h)
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersrv...

Copied: trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.rc (from r59454, trunk/reactos/win32ss/user/winsrv/winsrv.rc)
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersrv...

Removed: trunk/reactos/win32ss/user/winsrv/winsrv.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv....

Modified: trunk/reactos/win32ss/user/winsrv/winsrv.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv....

Modified: trunk/reactos/win32ss/user/winsrv/winsrv.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv....