Author: hbelusca
Date: Sun Dec 14 22:57:49 2014
New Revision: 65660

URL: http://svn.reactos.org/svn/reactos?rev=65660&view=rev
Log:
Partial merge of condrv_restructure branch r65657.

Added:
    trunk/reactos/drivers/base/condrv/dispatch.c
      - copied unchanged from r65657, 
branches/condrv_restructure/drivers/base/condrv/dispatch.c
Modified:
    trunk/reactos/   (props changed)
    trunk/reactos/drivers/base/condrv/CMakeLists.txt
    trunk/reactos/drivers/base/condrv/condrv.c
    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/dummyterm.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/frontendctl.c
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c
    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   
(contents, props changed)
    trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h
    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/terminal.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/history.c   (contents, props 
changed)
    trunk/reactos/win32ss/user/winsrv/consrv/history.h
    trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h
    trunk/reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.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/include/term.h
    trunk/reactos/win32ss/user/winsrv/consrv/init.c   (contents, props changed)
    trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c
    trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h
    trunk/reactos/win32ss/user/winsrv/consrv/popup.c   (contents, props changed)
    trunk/reactos/win32ss/user/winsrv/consrv/popup.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/consrv/shutdown.c
    trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c

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

Modified: trunk/reactos/drivers/base/condrv/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/CMakeLists.txt?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/drivers/base/condrv/condrv.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/condrv.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/alias.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/alias.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/api.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/api.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyterm.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyterm.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/coninput.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/coninput.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/console.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/console.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/consrv.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/handle.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/handle.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/heap.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/heap.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/history.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/history.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/history.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/history.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/console.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/include/console.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/term.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/include/term.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/init.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/popup.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/popup.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/popup.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/popup.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/procinit.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/procinit.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/resource.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/resource.h?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/settings.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/settings.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c?rev=65660&r1=65659&r2=65660&view=diff

Modified: trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c?rev=65660&r1=65659&r2=65660&view=diff


Reply via email to