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/application...
Modified: branches/arwinss/reactos/base/services/dhcp/api.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/services/dh...
Modified: branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fre...
Modified: branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fre...
Modified: branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fre...
Modified: branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fre...
Modified: branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fre...
Modified: branches/arwinss/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fre...
Modified: branches/arwinss/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fre...
Modified: branches/arwinss/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fre...
Modified: branches/arwinss/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fre...
Modified: branches/arwinss/reactos/boot/freeldr/freeldr/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fre...
Modified: branches/arwinss/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fre...
Modified: branches/arwinss/reactos/boot/freeldr/freeldr/video/fade.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fre...
Modified: branches/arwinss/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/advapi...
Modified: branches/arwinss/reactos/dll/win32/avicap32/avicap32.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/avicap...
Modified: branches/arwinss/reactos/dll/win32/avicap32/avicap32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/avicap...
Modified: branches/arwinss/reactos/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/filesyst...
Modified: branches/arwinss/reactos/drivers/filesystems/fs_rec/udfs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/filesyst...
Modified: branches/arwinss/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/filesyst...
Modified: branches/arwinss/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/input/i8...
Modified: branches/arwinss/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilter...
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/di...
Modified: branches/arwinss/reactos/drivers/video/font/bmfd/bmfd.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/fo...
Modified: branches/arwinss/reactos/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/fo...
Modified: branches/arwinss/reactos/drivers/video/videoprt/agp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/vi...
Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/audi...
Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/audi...
Modified: branches/arwinss/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/mp/ap...
Modified: branches/arwinss/reactos/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/mp/mp...
Modified: branches/arwinss/reactos/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/crt/proc...
Modified: branches/arwinss/reactos/include/ddk/ddkmapi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ddkm...
Modified: branches/arwinss/reactos/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/hidc...
Modified: branches/arwinss/reactos/include/ddk/miniport.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/mini...
Modified: branches/arwinss/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ndis...
Modified: branches/arwinss/reactos/include/ddk/ntdd8042.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ntdd...
Modified: branches/arwinss/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ntde...
Modified: branches/arwinss/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/port...
Modified: branches/arwinss/reactos/include/ddk/scsiwmi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/scsi...
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/stdu...
Modified: branches/arwinss/reactos/include/ddk/tdikrnl.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/tdik...
Modified: branches/arwinss/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/vide...
Modified: branches/arwinss/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/wind...
Modified: branches/arwinss/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/host/typ...
Modified: branches/arwinss/reactos/include/ndk/dbgkfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/dbgk...
Modified: branches/arwinss/reactos/include/psdk/delayimp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/del...
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/win...
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/t...
Modified: branches/arwinss/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/t...
Modified: branches/arwinss/reactos/lib/sdk/delayimp/delayimp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/delayimp...
Modified: branches/arwinss/reactos/lib/sdk/uuid/uuid.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/uuid/uui...
Modified: branches/arwinss/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ex/shut...
Modified: branches/arwinss/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/include...
Modified: branches/arwinss/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kd/kdma...
Modified: branches/arwinss/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kdbg/kd...
Modified: branches/arwinss/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/proc...
Modified: branches/arwinss/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/wait...
Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM3...
Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/hypermap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM3...
Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM3...
Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM3...
Modified: branches/arwinss/reactos/ntoskrnl/mm/dbgpool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/dbgp...
Modified: branches/arwinss/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/free...
Modified: branches/arwinss/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/i386...
Modified: branches/arwinss/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/mmin...
Removed: branches/arwinss/reactos/ntoskrnl/mm/npool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/npoo...
Modified: branches/arwinss/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/pe.c...
Modified: branches/arwinss/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/pool...
Modified: branches/arwinss/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ntoskrn...
Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32...
Modified: branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/bac...
Modified: branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/bac...
Modified: branches/arwinss/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/mod...
Modified: branches/arwinss/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/rbu...