[ros-diffs] [arty] 35366: Partial merge to keep current.

Author: arty
Date: Fri Aug 15 23:31:02 2008
New Revision: 35366

URL: http://svn.reactos.org/svn/reactos?rev=35366&view=rev
Log:
Partial merge to keep current.

Added:
    branches/arty-newcc/dll/win32/shell32/res/icons/182.ico
      - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/182.ico
    branches/arty-newcc/dll/win32/shell32/res/icons/183.ico
      - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/183.ico
    branches/arty-newcc/dll/win32/shell32/res/icons/184.ico
      - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/184.ico
    branches/arty-newcc/dll/win32/shell32/res/icons/185.ico
      - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/185.ico
    branches/arty-newcc/dll/win32/shell32/res/icons/186.ico
      - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/186.ico
    branches/arty-newcc/dll/win32/shell32/res/icons/187.ico
      - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/res/icons/187.ico
    branches/arty-newcc/dll/win32/shell32/shfldr_admintools.c
      - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/shfldr_admintools.c
    branches/arty-newcc/dll/win32/shell32/shfldr_mydocuments.c
      - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/shfldr_mydocuments.c
    branches/arty-newcc/dll/win32/shell32/shfldr_recyclebin.c
      - copied unchanged from r35355, trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c
    branches/arty-newcc/subsystems/win32/csrss/win32csr/lang/no-NO.rc
      - copied unchanged from r35355, trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc
Modified:
    branches/arty-newcc/ReactOS-arm.rbuild
    branches/arty-newcc/ReactOS-i386.rbuild
    branches/arty-newcc/boot/bootdata/hivesft_i386.inf
    branches/arty-newcc/boot/bootdata/txtsetup.sif
    branches/arty-newcc/boot/freeldr/freeldr/reactos/reactos.c
    branches/arty-newcc/boot/freeldr/freeldr/reactos/setupldr.c
    branches/arty-newcc/dll/3rdparty/dxtn/internal.h
    branches/arty-newcc/dll/3rdparty/mesa32/mesa32.rbuild
    branches/arty-newcc/dll/cpl/access/lang/fr-FR.rc
    branches/arty-newcc/dll/cpl/console/lang/no-NO.rc
    branches/arty-newcc/dll/cpl/desk/lang/fr-FR.rc
    branches/arty-newcc/dll/cpl/intl/lang/it-IT.rc
    branches/arty-newcc/dll/ntdll/ntdll.rbuild
    branches/arty-newcc/dll/win32/advapi32/advapi32.def
    branches/arty-newcc/dll/win32/devmgr/lang/no-NO.rc
    branches/arty-newcc/dll/win32/msgina/lang/it-IT.rc
    branches/arty-newcc/dll/win32/msvcrt/msvcrt.rbuild
    branches/arty-newcc/dll/win32/riched20/riched20.rbuild
    branches/arty-newcc/dll/win32/shell32/classes.c
    branches/arty-newcc/dll/win32/shell32/drive.c
    branches/arty-newcc/dll/win32/shell32/icon_res.rc
    branches/arty-newcc/dll/win32/shell32/lang/bg-BG.rc
    branches/arty-newcc/dll/win32/shell32/lang/ca-ES.rc
    branches/arty-newcc/dll/win32/shell32/lang/cs-CZ.rc
    branches/arty-newcc/dll/win32/shell32/lang/da-DK.rc
    branches/arty-newcc/dll/win32/shell32/lang/de-DE.rc
    branches/arty-newcc/dll/win32/shell32/lang/el-GR.rc
    branches/arty-newcc/dll/win32/shell32/lang/en-GB.rc
    branches/arty-newcc/dll/win32/shell32/lang/en-US.rc
    branches/arty-newcc/dll/win32/shell32/lang/es-ES.rc
    branches/arty-newcc/dll/win32/shell32/lang/fi-FI.rc
    branches/arty-newcc/dll/win32/shell32/lang/fr-FR.rc
    branches/arty-newcc/dll/win32/shell32/lang/hu-HU.rc
    branches/arty-newcc/dll/win32/shell32/lang/it-IT.rc
    branches/arty-newcc/dll/win32/shell32/lang/ja-JP.rc
    branches/arty-newcc/dll/win32/shell32/lang/ko-KR.rc
    branches/arty-newcc/dll/win32/shell32/lang/nl-NL.rc
    branches/arty-newcc/dll/win32/shell32/lang/no-NO.rc
    branches/arty-newcc/dll/win32/shell32/lang/pl-PL.rc
    branches/arty-newcc/dll/win32/shell32/lang/pt-BR.rc
    branches/arty-newcc/dll/win32/shell32/lang/pt-PT.rc
    branches/arty-newcc/dll/win32/shell32/lang/ru-RU.rc
    branches/arty-newcc/dll/win32/shell32/lang/sk-SK.rc
    branches/arty-newcc/dll/win32/shell32/lang/sl-SI.rc
    branches/arty-newcc/dll/win32/shell32/lang/sv-SE.rc
    branches/arty-newcc/dll/win32/shell32/lang/tr-TR.rc
    branches/arty-newcc/dll/win32/shell32/lang/uk-UA.rc
    branches/arty-newcc/dll/win32/shell32/lang/zh-CN.rc
    branches/arty-newcc/dll/win32/shell32/lang/zh-TW.rc
    branches/arty-newcc/dll/win32/shell32/pidl.c
    branches/arty-newcc/dll/win32/shell32/pidl.h
    branches/arty-newcc/dll/win32/shell32/regsvr.c
    branches/arty-newcc/dll/win32/shell32/shell32.rbuild
    branches/arty-newcc/dll/win32/shell32/shell32_main.h
    branches/arty-newcc/dll/win32/shell32/shellole.c
    branches/arty-newcc/dll/win32/shell32/shellord.c
    branches/arty-newcc/dll/win32/shell32/shresdef.h
    branches/arty-newcc/dll/win32/shlwapi/shlwapi_No.rc
    branches/arty-newcc/dll/win32/syssetup/lang/no-NO.rc
    branches/arty-newcc/dll/win32/userenv/setup.c
    branches/arty-newcc/drivers/network/afd/afd/connect.c
    branches/arty-newcc/drivers/network/afd/afd/listen.c
    branches/arty-newcc/drivers/network/afd/afd/lock.c
    branches/arty-newcc/drivers/network/afd/afd/main.c
    branches/arty-newcc/drivers/network/afd/afd/read.c
    branches/arty-newcc/drivers/network/afd/afd/select.c
    branches/arty-newcc/drivers/network/afd/afd/tdi.c
    branches/arty-newcc/drivers/network/afd/afd/tdiconn.c
    branches/arty-newcc/drivers/network/afd/afd/write.c
    branches/arty-newcc/drivers/network/afd/include/afd.h
    branches/arty-newcc/include/psdk/shellapi.h
    branches/arty-newcc/include/psdk/shlguid.h
    branches/arty-newcc/lib/recyclebin/recyclebin.c
    branches/arty-newcc/lib/recyclebin/recyclebin.h
    branches/arty-newcc/lib/sdk/crt/crt.rbuild
    branches/arty-newcc/lib/sdk/crt/stdio/lnx_sprintf.c   (contents, props changed)
    branches/arty-newcc/media/fonts/fonts.rbuild
    branches/arty-newcc/subsystems/win32/csrss/win32csr/lang/fr-FR.rc

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

Modified: branches/arty-newcc/ReactOS-arm.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ReactOS-arm.rbuild?re...

Modified: branches/arty-newcc/ReactOS-i386.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ReactOS-i386.rbuild?r...

Modified: branches/arty-newcc/boot/bootdata/hivesft_i386.inf
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/bootdata/hivesft...

Modified: branches/arty-newcc/boot/bootdata/txtsetup.sif
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/bootdata/txtsetu...

Modified: branches/arty-newcc/boot/freeldr/freeldr/reactos/reactos.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr/...

Modified: branches/arty-newcc/boot/freeldr/freeldr/reactos/setupldr.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr/...

Modified: branches/arty-newcc/dll/3rdparty/dxtn/internal.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/dxtn/int...

Modified: branches/arty-newcc/dll/3rdparty/mesa32/mesa32.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/3rdparty/mesa32/m...

Modified: branches/arty-newcc/dll/cpl/access/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/access/lang/f...

Modified: branches/arty-newcc/dll/cpl/console/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/console/lang/...

Modified: branches/arty-newcc/dll/cpl/desk/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/desk/lang/fr-...

Modified: branches/arty-newcc/dll/cpl/intl/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/intl/lang/it-...

Modified: branches/arty-newcc/dll/ntdll/ntdll.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/ntdll/ntdll.rbuil...

Modified: branches/arty-newcc/dll/win32/advapi32/advapi32.def
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/advapi32/ad...

Modified: branches/arty-newcc/dll/win32/devmgr/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/devmgr/lang...

Modified: branches/arty-newcc/dll/win32/msgina/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/msgina/lang...

Modified: branches/arty-newcc/dll/win32/msvcrt/msvcrt.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/msvcrt/msvc...

Modified: branches/arty-newcc/dll/win32/riched20/riched20.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/riched20/ri...

Modified: branches/arty-newcc/dll/win32/shell32/classes.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/cla...

Modified: branches/arty-newcc/dll/win32/shell32/drive.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/dri...

Modified: branches/arty-newcc/dll/win32/shell32/icon_res.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/ico...

Modified: branches/arty-newcc/dll/win32/shell32/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/ca-ES.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/da-DK.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/en-GB.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/fi-FI.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/hu-HU.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/ja-JP.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/ko-KR.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/nl-NL.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/pt-BR.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/pt-PT.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/sl-SI.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/tr-TR.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/lang/zh-TW.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/lan...

Modified: branches/arty-newcc/dll/win32/shell32/pidl.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/pid...

Modified: branches/arty-newcc/dll/win32/shell32/pidl.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/pid...

Modified: branches/arty-newcc/dll/win32/shell32/regsvr.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/reg...

Modified: branches/arty-newcc/dll/win32/shell32/shell32.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/she...

Modified: branches/arty-newcc/dll/win32/shell32/shell32_main.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/she...

Modified: branches/arty-newcc/dll/win32/shell32/shellole.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/she...

Modified: branches/arty-newcc/dll/win32/shell32/shellord.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/she...

Modified: branches/arty-newcc/dll/win32/shell32/shresdef.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shell32/shr...

Modified: branches/arty-newcc/dll/win32/shlwapi/shlwapi_No.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/shlwapi/shl...

Modified: branches/arty-newcc/dll/win32/syssetup/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/syssetup/la...

Modified: branches/arty-newcc/dll/win32/userenv/setup.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/userenv/set...

Modified: branches/arty-newcc/drivers/network/afd/afd/connect.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/a...

Modified: branches/arty-newcc/drivers/network/afd/afd/listen.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/a...

Modified: branches/arty-newcc/drivers/network/afd/afd/lock.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/a...

Modified: branches/arty-newcc/drivers/network/afd/afd/main.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/a...

Modified: branches/arty-newcc/drivers/network/afd/afd/read.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/a...

Modified: branches/arty-newcc/drivers/network/afd/afd/select.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/a...

Modified: branches/arty-newcc/drivers/network/afd/afd/tdi.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/a...

Modified: branches/arty-newcc/drivers/network/afd/afd/tdiconn.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/a...

Modified: branches/arty-newcc/drivers/network/afd/afd/write.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/a...

Modified: branches/arty-newcc/drivers/network/afd/include/afd.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/i...

Modified: branches/arty-newcc/include/psdk/shellapi.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/psdk/shellapi...

Modified: branches/arty-newcc/include/psdk/shlguid.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/psdk/shlguid....

Modified: branches/arty-newcc/lib/recyclebin/recyclebin.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/recyclebin/recycl...

Modified: branches/arty-newcc/lib/recyclebin/recyclebin.h
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/recyclebin/recycl...

Modified: branches/arty-newcc/lib/sdk/crt/crt.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/sdk/crt/crt.rbuil...

Modified: branches/arty-newcc/lib/sdk/crt/stdio/lnx_sprintf.c
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/sdk/crt/stdio/lnx...

Modified: branches/arty-newcc/media/fonts/fonts.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/fonts/fonts.rbu...

Modified: branches/arty-newcc/subsystems/win32/csrss/win32csr/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/subsystems/win32/csrs...