[ros-diffs] [fireball] 42665: - Merge 42200-42250. Without dll/win32/ws2help (causes merge problems).

Author: fireball
Date: Fri Aug 14 20:56:27 2009
New Revision: 42665

URL: http://svn.reactos.org/svn/reactos?rev=42665&view=rev
Log:
- Merge 42200-42250. Without dll/win32/ws2help (causes merge problems).

Added:
    branches/arwinss/reactos/drivers/filesystems/fs_rec/udfs.h
      - copied unchanged from r42250, trunk/reactos/drivers/filesystems/fs_rec/udfs.h
Removed:
    branches/arwinss/reactos/dll/win32/ws2help_new/
    branches/arwinss/reactos/ntoskrnl/mm/npool.c
Modified:
    branches/arwinss/reactos/   (props changed)
    branches/arwinss/reactos/base/applications/cmdutils/dbgprint/dbgprint.c
    branches/arwinss/reactos/base/services/dhcp/api.c
    branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
    branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c
    branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c
    branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h
    branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h
    branches/arwinss/reactos/boot/freeldr/freeldr/include/freeldr.h
    branches/arwinss/reactos/boot/freeldr/freeldr/machine.c
    branches/arwinss/reactos/boot/freeldr/freeldr/reactos/binhive.c
    branches/arwinss/reactos/boot/freeldr/freeldr/reactos/setupldr.c
    branches/arwinss/reactos/boot/freeldr/freeldr/rtl/libsupp.c
    branches/arwinss/reactos/boot/freeldr/freeldr/ui/tui.c
    branches/arwinss/reactos/boot/freeldr/freeldr/video/fade.c
    branches/arwinss/reactos/dll/win32/advapi32/sec/ac.c
    branches/arwinss/reactos/dll/win32/avicap32/avicap32.c
    branches/arwinss/reactos/dll/win32/avicap32/avicap32.spec
    branches/arwinss/reactos/drivers/filesystems/fs_rec/fs_rec.h
    branches/arwinss/reactos/drivers/filesystems/fs_rec/udfs.c
    branches/arwinss/reactos/drivers/filesystems/msfs/msfs.h
    branches/arwinss/reactos/drivers/input/i8042prt/mouse.c
    branches/arwinss/reactos/drivers/ksfilter/ks/irp.c
    branches/arwinss/reactos/drivers/network/afd/afd/lock.c
    branches/arwinss/reactos/drivers/network/ndis/ndis/misc.c
    branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c
    branches/arwinss/reactos/drivers/storage/ide/atapi/atapi.c
    branches/arwinss/reactos/drivers/video/displays/framebuf/pointer.c
    branches/arwinss/reactos/drivers/video/font/bmfd/bmfd.h
    branches/arwinss/reactos/drivers/video/font/ftfd/ftfd.h
    branches/arwinss/reactos/drivers/video/videoprt/agp.c
    branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c
    branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/private.h
    branches/arwinss/reactos/hal/halx86/mp/apic.c
    branches/arwinss/reactos/hal/halx86/mp/mpsirql.c
    branches/arwinss/reactos/include/crt/process.h
    branches/arwinss/reactos/include/ddk/ddkmapi.h
    branches/arwinss/reactos/include/ddk/hidclass.h
    branches/arwinss/reactos/include/ddk/miniport.h
    branches/arwinss/reactos/include/ddk/ndis.h
    branches/arwinss/reactos/include/ddk/ntdd8042.h
    branches/arwinss/reactos/include/ddk/ntdef.h
    branches/arwinss/reactos/include/ddk/portcls.h
    branches/arwinss/reactos/include/ddk/scsiwmi.h
    branches/arwinss/reactos/include/ddk/srb.h
    branches/arwinss/reactos/include/ddk/stdunk.h
    branches/arwinss/reactos/include/ddk/tdikrnl.h
    branches/arwinss/reactos/include/ddk/video.h
    branches/arwinss/reactos/include/ddk/winddk.h
    branches/arwinss/reactos/include/host/typedefs.h
    branches/arwinss/reactos/include/ndk/dbgkfuncs.h
    branches/arwinss/reactos/include/psdk/delayimp.h
    branches/arwinss/reactos/include/psdk/ks.h
    branches/arwinss/reactos/include/psdk/winnt.h
    branches/arwinss/reactos/include/reactos/win32k/ntgdityp.h
    branches/arwinss/reactos/include/reactos/win32k/ntuser.h
    branches/arwinss/reactos/lib/drivers/ip/transport/tcp/if.c
    branches/arwinss/reactos/lib/drivers/ip/transport/udp/udp.c
    branches/arwinss/reactos/lib/sdk/delayimp/delayimp.c
    branches/arwinss/reactos/lib/sdk/uuid/uuid.rbuild
    branches/arwinss/reactos/ntoskrnl/ex/shutdown.c
    branches/arwinss/reactos/ntoskrnl/include/internal/mm.h
    branches/arwinss/reactos/ntoskrnl/kd/kdmain.c
    branches/arwinss/reactos/ntoskrnl/kdbg/kdb.c
    branches/arwinss/reactos/ntoskrnl/ke/procobj.c
    branches/arwinss/reactos/ntoskrnl/ke/wait.c
    branches/arwinss/reactos/ntoskrnl/mm/ARM3/expool.c
    branches/arwinss/reactos/ntoskrnl/mm/ARM3/hypermap.c
    branches/arwinss/reactos/ntoskrnl/mm/ARM3/i386/init.c
    branches/arwinss/reactos/ntoskrnl/mm/ARM3/miarm.h
    branches/arwinss/reactos/ntoskrnl/mm/dbgpool.c
    branches/arwinss/reactos/ntoskrnl/mm/freelist.c
    branches/arwinss/reactos/ntoskrnl/mm/i386/page.c
    branches/arwinss/reactos/ntoskrnl/mm/mminit.c
    branches/arwinss/reactos/ntoskrnl/mm/pe.c
    branches/arwinss/reactos/ntoskrnl/mm/pool.c
    branches/arwinss/reactos/ntoskrnl/ntoskrnl-generic.rbuild
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c
    branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
    branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.h
    branches/arwinss/reactos/tools/rbuild/module.cpp
    branches/arwinss/reactos/tools/rbuild/rbuild.h
    branches/arwinss/reactos/tools/rsym/rsym.c   (props changed)
    branches/arwinss/reactos/tools/rsym/rsym.h   (props changed)
    branches/arwinss/reactos/tools/rsym/rsym.mak   (props changed)
    branches/arwinss/reactos/tools/rsym/rsym_common.c   (props changed)

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

Modified: branches/arwinss/reactos/base/applications/cmdutils/dbgprint/dbgprint.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio…

Modified: branches/arwinss/reactos/base/services/dhcp/api.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/services/d…

Modified: branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr…

Modified: branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr…

Modified: branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr…

Modified: branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr…

Modified: branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr…

Modified: branches/arwinss/reactos/boot/freeldr/freeldr/include/freeldr.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr…

Modified: branches/arwinss/reactos/boot/freeldr/freeldr/machine.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr…

Modified: branches/arwinss/reactos/boot/freeldr/freeldr/reactos/binhive.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr…

Modified: branches/arwinss/reactos/boot/freeldr/freeldr/reactos/setupldr.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr…

Modified: branches/arwinss/reactos/boot/freeldr/freeldr/rtl/libsupp.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr…

Modified: branches/arwinss/reactos/boot/freeldr/freeldr/ui/tui.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr…

Modified: branches/arwinss/reactos/boot/freeldr/freeldr/video/fade.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr…

Modified: branches/arwinss/reactos/dll/win32/advapi32/sec/ac.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/advap…

Modified: branches/arwinss/reactos/dll/win32/avicap32/avicap32.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/avica…

Modified: branches/arwinss/reactos/dll/win32/avicap32/avicap32.spec
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/avica…

Modified: branches/arwinss/reactos/drivers/filesystems/fs_rec/fs_rec.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/filesys…

Modified: branches/arwinss/reactos/drivers/filesystems/fs_rec/udfs.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/filesys…

Modified: branches/arwinss/reactos/drivers/filesystems/msfs/msfs.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/filesys…

Modified: branches/arwinss/reactos/drivers/input/i8042prt/mouse.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/input/i…

Modified: branches/arwinss/reactos/drivers/ksfilter/ks/irp.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte…

Modified: branches/arwinss/reactos/drivers/network/afd/afd/lock.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network…

Modified: branches/arwinss/reactos/drivers/network/ndis/ndis/misc.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network…

Modified: branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/storage…

Modified: branches/arwinss/reactos/drivers/storage/ide/atapi/atapi.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/storage…

Modified: branches/arwinss/reactos/drivers/video/displays/framebuf/pointer.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/d…

Modified: branches/arwinss/reactos/drivers/video/font/bmfd/bmfd.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/f…

Modified: branches/arwinss/reactos/drivers/video/font/ftfd/ftfd.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/f…

Modified: branches/arwinss/reactos/drivers/video/videoprt/agp.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/v…

Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud…

Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/private.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud…

Modified: branches/arwinss/reactos/hal/halx86/mp/apic.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/mp/a…

Modified: branches/arwinss/reactos/hal/halx86/mp/mpsirql.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/mp/m…

Modified: branches/arwinss/reactos/include/crt/process.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/crt/pro…

Modified: branches/arwinss/reactos/include/ddk/ddkmapi.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ddk…

Modified: branches/arwinss/reactos/include/ddk/hidclass.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/hid…

Modified: branches/arwinss/reactos/include/ddk/miniport.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/min…

Modified: branches/arwinss/reactos/include/ddk/ndis.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ndi…

Modified: branches/arwinss/reactos/include/ddk/ntdd8042.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ntd…

Modified: branches/arwinss/reactos/include/ddk/ntdef.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ntd…

Modified: branches/arwinss/reactos/include/ddk/portcls.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/por…

Modified: branches/arwinss/reactos/include/ddk/scsiwmi.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/scs…

Modified: branches/arwinss/reactos/include/ddk/srb.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/srb…

Modified: branches/arwinss/reactos/include/ddk/stdunk.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/std…

Modified: branches/arwinss/reactos/include/ddk/tdikrnl.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/tdi…

Modified: branches/arwinss/reactos/include/ddk/video.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/vid…

Modified: branches/arwinss/reactos/include/ddk/winddk.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/win…

Modified: branches/arwinss/reactos/include/host/typedefs.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/host/ty…

Modified: branches/arwinss/reactos/include/ndk/dbgkfuncs.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/dbg…

Modified: branches/arwinss/reactos/include/psdk/delayimp.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/de…

Modified: branches/arwinss/reactos/include/psdk/ks.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/ks…

Modified: branches/arwinss/reactos/include/psdk/winnt.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi…

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

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

Modified: branches/arwinss/reactos/lib/drivers/ip/transport/tcp/if.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/…

Modified: branches/arwinss/reactos/lib/drivers/ip/transport/udp/udp.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/…

Modified: branches/arwinss/reactos/lib/sdk/delayimp/delayimp.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/delayim…

Modified: branches/arwinss/reactos/lib/sdk/uuid/uuid.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/uuid/uu…

Modified: branches/arwinss/reactos/ntoskrnl/ex/shutdown.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ex/shu…

Modified: branches/arwinss/reactos/ntoskrnl/include/internal/mm.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/includ…

Modified: branches/arwinss/reactos/ntoskrnl/kd/kdmain.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kd/kdm…

Modified: branches/arwinss/reactos/ntoskrnl/kdbg/kdb.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kdbg/k…

Modified: branches/arwinss/reactos/ntoskrnl/ke/procobj.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/pro…

Modified: branches/arwinss/reactos/ntoskrnl/ke/wait.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/wai…

Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/expool.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM…

Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/hypermap.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM…

Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/i386/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM…

Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/miarm.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM…

Modified: branches/arwinss/reactos/ntoskrnl/mm/dbgpool.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/dbg…

Modified: branches/arwinss/reactos/ntoskrnl/mm/freelist.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/fre…

Modified: branches/arwinss/reactos/ntoskrnl/mm/i386/page.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/i38…

Modified: branches/arwinss/reactos/ntoskrnl/mm/mminit.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/mmi…

Removed: branches/arwinss/reactos/ntoskrnl/mm/npool.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/npo…

Modified: branches/arwinss/reactos/ntoskrnl/mm/pe.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/pe.…

Modified: branches/arwinss/reactos/ntoskrnl/mm/pool.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/poo…

Modified: branches/arwinss/reactos/ntoskrnl/ntoskrnl-generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ntoskr…

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/tools/rbuild/backend/mingw/modulehandler.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/ba…

Modified: branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/ba…

Modified: branches/arwinss/reactos/tools/rbuild/module.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/mo…

Modified: branches/arwinss/reactos/tools/rbuild/rbuild.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/rb…