[ros-diffs] [fireball] 45174: - Merge 44013:44084

Author: fireball
Date: Thu Jan 21 11:36:58 2010
New Revision: 45174

URL: http://svn.reactos.org/svn/reactos?rev=45174&view=rev
Log:
- Merge 44013:44084

Added:
    branches/arwinss/reactos/hal/halx86/generic/bus/pcidata.c
      - copied unchanged from r44084, trunk/reactos/hal/halx86/generic/bus/pcidata.c
    branches/arwinss/reactos/ntoskrnl/kd64/amd64/kdx64.c
      - copied unchanged from r44084, trunk/reactos/ntoskrnl/kd64/amd64/kdx64.c
    branches/arwinss/reactos/ntoskrnl/kd64/arm/kdarm.c
      - copied unchanged from r44084, trunk/reactos/ntoskrnl/kd64/arm/kdarm.c
    branches/arwinss/reactos/ntoskrnl/kd64/i386/kdx86.c
      - copied unchanged from r44084, trunk/reactos/ntoskrnl/kd64/i386/kdx86.c
    branches/arwinss/reactos/ntoskrnl/ke/freeze.c
      - copied unchanged from r44084, trunk/reactos/ntoskrnl/ke/freeze.c
Removed:
    branches/arwinss/reactos/ntoskrnl/kd64/amd64/kdsup.c
    branches/arwinss/reactos/ntoskrnl/kd64/arm/kdsup.c
    branches/arwinss/reactos/ntoskrnl/kd64/i386/kdsup.c
Modified:
    branches/arwinss/reactos/   (props changed)
    branches/arwinss/reactos/base/applications/rapps/loaddlg.c
    branches/arwinss/reactos/base/shell/explorer/notifyhook/notifyhook.def
    branches/arwinss/reactos/boot/bootdata/hivesys_i386.inf
    branches/arwinss/reactos/boot/freeldr/freeldr/options.c
    branches/arwinss/reactos/boot/freeldr/freeldr/windows/winldr.c
    branches/arwinss/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def
    branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec   (props changed)
    branches/arwinss/reactos/dll/directx/dsound_new/   (props changed)
    branches/arwinss/reactos/dll/directx/dsound_new/classfactory.c   (contents, props
changed)
    branches/arwinss/reactos/dll/directx/dsound_new/directsound.c
    branches/arwinss/reactos/dll/directx/dsound_new/dsound.c
    branches/arwinss/reactos/dll/directx/dsound_new/dsound.spec   (props changed)
    branches/arwinss/reactos/dll/directx/dsound_new/regsvr.c   (props changed)
    branches/arwinss/reactos/dll/nls/idndl/idndl.def
    branches/arwinss/reactos/dll/nls/normaliz/normaliz.def
    branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec   (props changed)
    branches/arwinss/reactos/dll/shellext/slayer/slayer.spec   (props changed)
    branches/arwinss/reactos/dll/win32/gdi32/   (props changed)
    branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec   (props changed)
    branches/arwinss/reactos/dll/win32/shell32/pidl.c
    branches/arwinss/reactos/dll/win32/shell32/shell32_main.c
    branches/arwinss/reactos/dll/win32/shell32/shellitem.c
    branches/arwinss/reactos/dll/win32/shell32/shelllink.c
    branches/arwinss/reactos/dll/win32/shell32/shellole.c
    branches/arwinss/reactos/dll/win32/shlwapi/regstream.c
    branches/arwinss/reactos/dll/win32/shlwapi/url.c
    branches/arwinss/reactos/dll/win32/user32/   (props changed)
    branches/arwinss/reactos/dll/win32/winex11.drv/   (props changed)
    branches/arwinss/reactos/drivers/base/kddll/kdcom.c
    branches/arwinss/reactos/drivers/ksfilter/ks/event.c
    branches/arwinss/reactos/drivers/network/tcpip/include/lock.h
    branches/arwinss/reactos/drivers/network/tcpip/tcpip/dispatch.c
    branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c
    branches/arwinss/reactos/drivers/network/tcpip/tcpip/lock.c
    branches/arwinss/reactos/drivers/network/tcpip/tcpip/mocklock.c
    branches/arwinss/reactos/drivers/video/font/ftfd/freetype.def
    branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp
    branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp
    branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp
    branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/private.hpp
    branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp
    branches/arwinss/reactos/hal/halx86/generic/bios.c
    branches/arwinss/reactos/hal/halx86/generic/bus/bushndlr.c
    branches/arwinss/reactos/hal/halx86/generic/bus/halbus.c
    branches/arwinss/reactos/hal/halx86/generic/halinit.c
    branches/arwinss/reactos/hal/halx86/hal_generic.rbuild
    branches/arwinss/reactos/hal/halx86/hal_generic_amd64.rbuild
    branches/arwinss/reactos/hal/halx86/include/bus.h
    branches/arwinss/reactos/hal/halx86/include/halp.h
    branches/arwinss/reactos/include/ndk/amd64/   (props changed)
    branches/arwinss/reactos/include/ndk/amd64/asm.h
    branches/arwinss/reactos/include/ndk/amd64/asmmacro.S   (props changed)
    branches/arwinss/reactos/include/ndk/amd64/ketypes.h
    branches/arwinss/reactos/include/ndk/arm/ketypes.h
    branches/arwinss/reactos/include/ndk/haltypes.h
    branches/arwinss/reactos/include/ndk/i386/asm.h
    branches/arwinss/reactos/include/ndk/i386/ketypes.h
    branches/arwinss/reactos/include/ndk/ldrtypes.h
    branches/arwinss/reactos/include/psdk/   (props changed)
    branches/arwinss/reactos/include/psdk/commctrl.h   (props changed)
    branches/arwinss/reactos/include/psdk/ks.h
    branches/arwinss/reactos/include/psdk/ksmedia.h
    branches/arwinss/reactos/include/reactos/rosldr.h
    branches/arwinss/reactos/lib/drivers/ip/transport/tcp/accept.c
    branches/arwinss/reactos/lib/drivers/ip/transport/tcp/event.c
    branches/arwinss/reactos/lib/drivers/ip/transport/tcp/tcp.c
    branches/arwinss/reactos/lib/sdk/crt/time/   (props changed)
    branches/arwinss/reactos/ntoskrnl/ex/init.c
    branches/arwinss/reactos/ntoskrnl/include/internal/i386/ke.h
    branches/arwinss/reactos/ntoskrnl/include/internal/i386/mm.h
    branches/arwinss/reactos/ntoskrnl/include/internal/kd64.h
    branches/arwinss/reactos/ntoskrnl/include/internal/ke.h
    branches/arwinss/reactos/ntoskrnl/include/internal/ke_x.h
    branches/arwinss/reactos/ntoskrnl/include/internal/mm.h
    branches/arwinss/reactos/ntoskrnl/include/internal/po.h
    branches/arwinss/reactos/ntoskrnl/kd64/kdapi.c
    branches/arwinss/reactos/ntoskrnl/kd64/kddata.c
    branches/arwinss/reactos/ntoskrnl/kd64/kdprint.c
    branches/arwinss/reactos/ntoskrnl/kd64/kdtrap.c
    branches/arwinss/reactos/ntoskrnl/kdbg/kdb_symbols.c
    branches/arwinss/reactos/ntoskrnl/ke/arm/stubs_asm.s
    branches/arwinss/reactos/ntoskrnl/ke/freeldr.c
    branches/arwinss/reactos/ntoskrnl/ke/i386/cpu.c
    branches/arwinss/reactos/ntoskrnl/ke/i386/exp.c
    branches/arwinss/reactos/ntoskrnl/mm/mmdbg.c
    branches/arwinss/reactos/ntoskrnl/mm/sysldr.c
    branches/arwinss/reactos/ntoskrnl/ntoskrnl-generic.rbuild
    branches/arwinss/reactos/ntoskrnl/po/power.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c   (props
changed)
    branches/arwinss/reactos/subsystems/win32/win32k/include/   (props changed)
    branches/arwinss/reactos/subsystems/win32/win32k/include/request.h   (props changed)
    branches/arwinss/reactos/subsystems/win32/win32k/include/user.h   (props changed)
    branches/arwinss/reactos/subsystems/win32/win32k/wine/   (props changed)
    branches/arwinss/reactos/tools/pefixup.c
    branches/arwinss/reactos/tools/rsym/log2lines.c   (props changed)
    branches/arwinss/reactos/tools/rsym/log2lines.mak   (props changed)
    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/rapps/loaddlg.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio…

Modified: branches/arwinss/reactos/base/shell/explorer/notifyhook/notifyhook.def
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/expl…

Modified: branches/arwinss/reactos/boot/bootdata/hivesys_i386.inf
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/bootdata/h…

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

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

Modified: branches/arwinss/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/3rdparty/me…

Modified: branches/arwinss/reactos/dll/directx/dsound_new/classfactory.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/directx/dso…

Modified: branches/arwinss/reactos/dll/directx/dsound_new/directsound.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/directx/dso…

Modified: branches/arwinss/reactos/dll/directx/dsound_new/dsound.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/directx/dso…

Modified: branches/arwinss/reactos/dll/nls/idndl/idndl.def
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/nls/idndl/i…

Modified: branches/arwinss/reactos/dll/nls/normaliz/normaliz.def
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/nls/normali…

Modified: branches/arwinss/reactos/dll/win32/shell32/pidl.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/shell…

Modified: branches/arwinss/reactos/dll/win32/shell32/shell32_main.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/shell…

Modified: branches/arwinss/reactos/dll/win32/shell32/shellitem.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/shell…

Modified: branches/arwinss/reactos/dll/win32/shell32/shelllink.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/shell…

Modified: branches/arwinss/reactos/dll/win32/shell32/shellole.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/shell…

Modified: branches/arwinss/reactos/dll/win32/shlwapi/regstream.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/shlwa…

Modified: branches/arwinss/reactos/dll/win32/shlwapi/url.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/shlwa…

Modified: branches/arwinss/reactos/drivers/base/kddll/kdcom.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/base/kd…

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

Modified: branches/arwinss/reactos/drivers/network/tcpip/include/lock.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network…

Modified: branches/arwinss/reactos/drivers/network/tcpip/tcpip/dispatch.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network…

Modified: branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network…

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

Modified: branches/arwinss/reactos/drivers/network/tcpip/tcpip/mocklock.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network…

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

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

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

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

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

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

Modified: branches/arwinss/reactos/hal/halx86/generic/bios.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/gene…

Modified: branches/arwinss/reactos/hal/halx86/generic/bus/bushndlr.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/gene…

Modified: branches/arwinss/reactos/hal/halx86/generic/bus/halbus.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/gene…

Modified: branches/arwinss/reactos/hal/halx86/generic/halinit.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/gene…

Modified: branches/arwinss/reactos/hal/halx86/hal_generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/hal_…

Modified: branches/arwinss/reactos/hal/halx86/hal_generic_amd64.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/hal_…

Modified: branches/arwinss/reactos/hal/halx86/include/bus.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/incl…

Modified: branches/arwinss/reactos/hal/halx86/include/halp.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/incl…

Modified: branches/arwinss/reactos/include/ndk/amd64/asm.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/amd…

Modified: branches/arwinss/reactos/include/ndk/amd64/ketypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/amd…

Modified: branches/arwinss/reactos/include/ndk/arm/ketypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/arm…

Modified: branches/arwinss/reactos/include/ndk/haltypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/hal…

Modified: branches/arwinss/reactos/include/ndk/i386/asm.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/i38…

Modified: branches/arwinss/reactos/include/ndk/i386/ketypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/i38…

Modified: branches/arwinss/reactos/include/ndk/ldrtypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/ldr…

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/ksmedia.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/ks…

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

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

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

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

Modified: branches/arwinss/reactos/ntoskrnl/ex/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ex/ini…

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

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

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

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

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

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/include/internal/po.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/includ…

Removed: branches/arwinss/reactos/ntoskrnl/kd64/amd64/kdsup.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kd64/a…

Removed: branches/arwinss/reactos/ntoskrnl/kd64/arm/kdsup.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kd64/a…

Removed: branches/arwinss/reactos/ntoskrnl/kd64/i386/kdsup.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kd64/i…

Modified: branches/arwinss/reactos/ntoskrnl/kd64/kdapi.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kd64/k…

Modified: branches/arwinss/reactos/ntoskrnl/kd64/kddata.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kd64/k…

Modified: branches/arwinss/reactos/ntoskrnl/kd64/kdprint.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kd64/k…

Modified: branches/arwinss/reactos/ntoskrnl/kd64/kdtrap.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kd64/k…

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

Modified: branches/arwinss/reactos/ntoskrnl/ke/arm/stubs_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/arm…

Modified: branches/arwinss/reactos/ntoskrnl/ke/freeldr.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/fre…

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

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

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

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

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

Modified: branches/arwinss/reactos/ntoskrnl/po/power.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/po/pow…

Modified: branches/arwinss/reactos/tools/pefixup.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/pefixup.c…