[ros-diffs] [fireball] 47975: - Merge everything csrss/console-related 44999:47973. - Remove PrivateCsrssInitialized ReactOS-only export.

Author: fireball
Date: Thu Jul  8 22:11:51 2010
New Revision: 47975

URL: http://svn.reactos.org/svn/reactos?rev=47975&view=rev
Log:
- Merge everything csrss/console-related 44999:47973.
- Remove PrivateCsrssInitialized ReactOS-only export.

Added:
    branches/arwinss/reactos/include/psdk/strsafe.h
      - copied unchanged from r47026, trunk/reactos/include/psdk/strsafe.h
    branches/arwinss/reactos/subsystems/win32/csrss/csrsrv/
      - copied from r47604, trunk/reactos/subsystems/win32/csrss/csrsrv/
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/coninput.c
      - copied, changed from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/conio.h
      - copied, changed from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/conio.h
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/conoutput.c
      - copied, changed from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/console.c
      - copied unchanged from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/console.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.h
      - copied unchanged from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.h
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/handle.c
      - copied unchanged from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/handle.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/harderror.c
      - copied, changed from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/lineinput.c
      - copied, changed from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.h
      - copied unchanged from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h
Removed:
    branches/arwinss/reactos/subsystems/win32/csrss/api/
    branches/arwinss/reactos/subsystems/win32/csrss/csrss.h
    branches/arwinss/reactos/subsystems/win32/csrss/include/conio.h
    branches/arwinss/reactos/subsystems/win32/csrss/include/desktopbg.h
    branches/arwinss/reactos/subsystems/win32/csrss/include/win32csr.h
    branches/arwinss/reactos/subsystems/win32/csrss/init.c
    branches/arwinss/reactos/subsystems/win32/csrss/print.c
    branches/arwinss/reactos/subsystems/win32/csrss/video.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/conio.c
Modified:
    branches/arwinss/reactos/dll/win32/kernel32/misc/console.c   (contents, props
changed)
    branches/arwinss/reactos/dll/win32/user32/legacy.c
    branches/arwinss/reactos/dll/win32/user32/user32.spec
    branches/arwinss/reactos/include/psdk/   (props changed)
    branches/arwinss/reactos/include/reactos/subsys/   (props changed)
    branches/arwinss/reactos/include/reactos/subsys/csrss/csrss.h
    branches/arwinss/reactos/include/reactos/win32k/rosuser.h
    branches/arwinss/reactos/subsystems/win32/csrss/   (props changed)
    branches/arwinss/reactos/subsystems/win32/csrss/csrsrv/api/   (props changed)
    branches/arwinss/reactos/subsystems/win32/csrss/csrss.c
    branches/arwinss/reactos/subsystems/win32/csrss/csrss.rbuild
    branches/arwinss/reactos/subsystems/win32/csrss/include/api.h
    branches/arwinss/reactos/subsystems/win32/csrss/include/csrplugin.h
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/alias.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/appswitch.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c   (contents,
props changed)
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/dllmain.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/exitros.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/guiconsole.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/guiconsole.h
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/resource.h
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/w32csr.h
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.spec
    branches/arwinss/reactos/subsystems/win32/win32k/include/csr.h
    branches/arwinss/reactos/subsystems/win32/win32k/main/csr.c
    branches/arwinss/reactos/subsystems/win32/win32k/main/init.c
    branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db

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

Modified: branches/arwinss/reactos/dll/win32/kernel32/misc/console.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/kerne…

Modified: branches/arwinss/reactos/dll/win32/user32/legacy.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…

Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…

Modified: branches/arwinss/reactos/include/reactos/subsys/csrss/csrss.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos…

Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/csrss.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Removed: branches/arwinss/reactos/subsystems/win32/csrss/csrss.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/csrss.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/include/api.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Removed: branches/arwinss/reactos/subsystems/win32/csrss/include/conio.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/include/csrplugin.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Removed: branches/arwinss/reactos/subsystems/win32/csrss/include/desktopbg.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Removed: branches/arwinss/reactos/subsystems/win32/csrss/include/win32csr.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Removed: branches/arwinss/reactos/subsystems/win32/csrss/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Removed: branches/arwinss/reactos/subsystems/win32/csrss/print.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Removed: branches/arwinss/reactos/subsystems/win32/csrss/video.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/alias.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/appswitch.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Copied: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/coninput.c (from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c)
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Removed: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/conio.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Copied: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/conio.h (from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/conio.h)
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Copied: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/conoutput.c (from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c)
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/exitros.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/guiconsole.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/guiconsole.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Copied: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/harderror.c (from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c)
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Copied: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/lineinput.c (from r47604,
trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c)
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/resource.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/w32csr.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.spec
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/csr.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/csr.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…