[ros-diffs] [fireball] 44336: - Merge 44301 (network revert).

fireball at svn.reactos.org fireball at svn.reactos.org
Mon Nov 30 22:52:07 CET 2009


Author: fireball
Date: Mon Nov 30 22:52:07 2009
New Revision: 44336

URL: http://svn.reactos.org/svn/reactos?rev=44336&view=rev
Log:
- Merge 44301 (network revert).

Added:
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/irp.h
      - copied unchanged from r44301, trunk/reactos/drivers/network/tcpip/include/irp.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/memtrack.h
      - copied unchanged from r44301, trunk/reactos/drivers/network/tcpip/include/memtrack.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/recmutex/   (props changed)
      - copied from r44301, trunk/reactos/drivers/network/tcpip/recmutex/
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/irp.c
      - copied unchanged from r44301, trunk/reactos/drivers/network/tcpip/tcpip/irp.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/memtrack.c
      - copied unchanged from r44301, trunk/reactos/lib/drivers/ip/network/memtrack.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/oskittcp/include/memtrack.h
      - copied unchanged from r44301, trunk/reactos/lib/drivers/oskittcp/include/memtrack.h
Removed:
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/tags.h
Modified:
    branches/ros-branch-0_3_11/reactos/   (props changed)
    branches/ros-branch-0_3_11/reactos/dll/directx/d3d8/d3d8.spec   (props changed)
    branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/   (props changed)
    branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/classfactory.c   (props changed)
    branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/dsound.spec   (props changed)
    branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/regsvr.c   (props changed)
    branches/ros-branch-0_3_11/reactos/dll/shellext/devcpux/devcpux.spec   (props changed)
    branches/ros-branch-0_3_11/reactos/dll/shellext/slayer/slayer.spec   (props changed)
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/datalink/lan.c
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/address.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/datagram.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/debug.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/dispatch.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/fileobjs.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/ip.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/lock.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/neighbor.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/precomp.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/routines.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/tcp.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/titypes.h
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip.rbuild
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/ainfo.c
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/buffer.c
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/dispatch.c
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/fileobjs.c
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/iinfo.c
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/lock.c
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/main.c
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/mocklock.c
    branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/ninfo.c
    branches/ros-branch-0_3_11/reactos/include/ndk/amd64/   (props changed)
    branches/ros-branch-0_3_11/reactos/include/ndk/amd64/asmmacro.S   (props changed)
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/ip.rbuild
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/address.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/ip.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/neighbor.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/ports.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/receive.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/router.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/routines.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/transmit.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/datagram/datagram.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/rawip/rawip.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/accept.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/event.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/if.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/tcp.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/udp/udp.c
    branches/ros-branch-0_3_11/reactos/lib/drivers/oskittcp/include/oskittcp.h
    branches/ros-branch-0_3_11/reactos/lib/drivers/oskittcp/oskittcp/interface.c
    branches/ros-branch-0_3_11/reactos/lib/sdk/crt/time/   (props changed)
    branches/ros-branch-0_3_11/reactos/subsystems/win32/win32k/include/engobjects.h   (props changed)
    branches/ros-branch-0_3_11/reactos/tools/rsym/log2lines.c   (props changed)
    branches/ros-branch-0_3_11/reactos/tools/rsym/log2lines.mak   (props changed)
    branches/ros-branch-0_3_11/reactos/tools/rsym/rsym.c   (props changed)
    branches/ros-branch-0_3_11/reactos/tools/rsym/rsym.h   (props changed)
    branches/ros-branch-0_3_11/reactos/tools/rsym/rsym.mak   (props changed)
    branches/ros-branch-0_3_11/reactos/tools/rsym/rsym_common.c   (props changed)

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

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/datalink/lan.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/datalink/lan.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/address.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/address.h?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/datagram.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/datagram.h?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/debug.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/debug.h?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/dispatch.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/dispatch.h?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/fileobjs.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/fileobjs.h?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/ip.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/ip.h?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/lock.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/lock.h?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/neighbor.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/neighbor.h?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/precomp.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/precomp.h?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/routines.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/routines.h?rev=44336&r1=44335&r2=44336&view=diff

Removed: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/tags.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/tags.h?rev=44335&view=auto

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/tcp.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/tcp.h?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/titypes.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/titypes.h?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip.rbuild?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/ainfo.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/ainfo.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/buffer.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/buffer.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/dispatch.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/dispatch.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/fileobjs.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/fileobjs.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/iinfo.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/iinfo.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/lock.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/lock.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/main.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/main.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/mocklock.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/mocklock.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/ninfo.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/ninfo.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/ip.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/ip.rbuild?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/address.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/address.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/ip.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/ip.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/neighbor.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/neighbor.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/ports.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/ports.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/receive.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/receive.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/router.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/router.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/routines.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/routines.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/transmit.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/transmit.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/datagram/datagram.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/datagram/datagram.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/rawip/rawip.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/rawip/rawip.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/accept.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/accept.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/event.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/event.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/if.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/if.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/tcp.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/tcp.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/udp/udp.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/udp/udp.c?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/oskittcp/include/oskittcp.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/oskittcp/include/oskittcp.h?rev=44336&r1=44335&r2=44336&view=diff

Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/oskittcp/oskittcp/interface.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/drivers/oskittcp/oskittcp/interface.c?rev=44336&r1=44335&r2=44336&view=diff




More information about the Ros-diffs mailing list