Sync with trunk r62754.

svn path=/branches/shell-experiments/; revision=62756

diff --cc CREDITS
Simple merge

diff --cc base/applications/atactl/CMakeLists.txt
Simple merge

diff --cc base/applications/atactl/atactl.cpp
Simple merge

diff --cc base/applications/calc/lang/tr-TR.rc
Simple merge

diff --cc base/applications/calc/resource.rc
Simple merge

diff --cc base/applications/charmap/charmap.c
Simple merge

diff --cc base/applications/charmap/charmap.rc
Simple merge

diff --cc base/applications/charmap/lang/ro-RO.rc
Simple merge

diff --cc base/applications/charmap/lang/tr-TR.rc
Simple merge

diff --cc base/applications/charmap/lrgcell.c
Simple merge

diff --cc base/applications/charmap/map.c
Simple merge

diff --cc base/applications/charmap/settings.c
Simple merge

diff --cc base/applications/cmdutils/CMakeLists.txt
Simple merge

diff --cc base/applications/cmdutils/comp/CMakeLists.txt
index 0000000,4401ba8..4401ba8
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/cmdutils/comp/CMakeLists.txt
+++ b/base/applications/cmdutils/comp/CMakeLists.txt

diff --cc base/applications/cmdutils/comp/comp.c
index 0000000,0bec824..0bec824
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/cmdutils/comp/comp.c
+++ b/base/applications/cmdutils/comp/comp.c

diff --cc base/applications/cmdutils/comp/comp.rc
index 0000000,b83ca54..b83ca54
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/cmdutils/comp/comp.rc
+++ b/base/applications/cmdutils/comp/comp.rc

diff --cc base/applications/cmdutils/sort/CMakeLists.txt
index 0000000,4e2fe0b..4e2fe0b
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/cmdutils/sort/CMakeLists.txt
+++ b/base/applications/cmdutils/sort/CMakeLists.txt

diff --cc base/applications/cmdutils/sort/sort.c
index 0000000,0d6cc56..0d6cc56
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/cmdutils/sort/sort.c
+++ b/base/applications/cmdutils/sort/sort.c

diff --cc base/applications/cmdutils/sort/sort.rc
index 0000000,596435c..596435c
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/cmdutils/sort/sort.rc
+++ b/base/applications/cmdutils/sort/sort.rc

diff --cc base/applications/control/CMakeLists.txt
Simple merge

diff --cc base/applications/control/control.c
Simple merge

diff --cc base/applications/dxdiag/dxdiag.rc
Simple merge

diff --cc base/applications/dxdiag/lang/tr-TR.rc
Simple merge

diff --cc base/applications/dxdiag/network.c
Simple merge

diff --cc base/applications/fontview/fontview.c
Simple merge

diff --cc base/applications/fontview/fontview.rc
Simple merge

diff --cc base/applications/fontview/lang/cs-CZ.rc
index 0000000,7735019..7735019
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/fontview/lang/cs-CZ.rc
+++ b/base/applications/fontview/lang/cs-CZ.rc

diff --cc base/applications/fontview/lang/tr-TR.rc
Simple merge

diff --cc base/applications/games/solitaire/lang/tr-TR.rc
Simple merge

diff --cc base/applications/games/spider/lang/tr-TR.rc
Simple merge

diff --cc base/applications/games/winmine/lang/tr-TR.rc
Simple merge

diff --cc base/applications/kbswitch/kbswitch.c
Simple merge

diff --cc base/applications/kbswitch/kbswitch.rc
Simple merge

diff --cc base/applications/kbswitch/lang/tr-TR.rc
Simple merge

diff --cc base/applications/magnify/lang/ro-RO.rc
Simple merge

diff --cc base/applications/magnify/lang/tr-TR.rc
Simple merge

diff --cc base/applications/mmc/lang/tr-TR.rc
Simple merge

diff --cc base/applications/mmc/mmc.rc
Simple merge

diff --cc base/applications/mplay32/lang/ro-RO.rc
Simple merge

diff --cc base/applications/mplay32/lang/tr-TR.rc
Simple merge

diff --cc base/applications/mplay32/mplay32.rc
Simple merge

diff --cc base/applications/msconfig/lang/tr-TR.rc
Simple merge

diff --cc base/applications/msconfig/msconfig.rc
Simple merge

diff --cc base/applications/msconfig/srvpage.c
Simple merge

diff --cc base/applications/msconfig/startuppage.c
Simple merge

diff --cc base/applications/mscutils/devmgmt/devmgmt.rc
Simple merge

diff --cc base/applications/mscutils/devmgmt/lang/tr-TR.rc
Simple merge

diff --cc base/applications/mscutils/devmgmt_new/lang/tr-TR.rc
Simple merge

diff --cc base/applications/mscutils/eventvwr/eventvwr.rc
Simple merge

diff --cc base/applications/mscutils/eventvwr/lang/tr-TR.rc
Simple merge

diff --cc base/applications/mscutils/servman/create.c
Simple merge

diff --cc base/applications/mscutils/servman/delete.c
Simple merge

diff --cc base/applications/mscutils/servman/dependencies_tv1.c
Simple merge

diff --cc base/applications/mscutils/servman/dependencies_tv2.c
Simple merge

diff --cc base/applications/mscutils/servman/lang/tr-TR.rc
Simple merge

diff --cc base/applications/mscutils/servman/listview.c
Simple merge

diff --cc base/applications/mscutils/servman/servman.rc
Simple merge

diff --cc base/applications/mscutils/servman/stop_dependencies.c
Simple merge

diff --cc base/applications/mspaint/lang/tr-TR.rc
Simple merge

diff --cc base/applications/mspaint/rsrc.rc
Simple merge

diff --cc base/applications/mstsc/lang/ro-RO.rc
Simple merge

diff --cc base/applications/mstsc/lang/tr-TR.rc
Simple merge

diff --cc base/applications/mstsc/rdc.rc
Simple merge

diff --cc base/applications/notepad/lang/tr-TR.rc
Simple merge

diff --cc base/applications/rapps/available.c
Simple merge

diff --cc base/applications/rapps/installed.c
Simple merge

diff --cc base/applications/rapps/lang/bg-BG.rc
Simple merge

diff --cc base/applications/rapps/lang/cs-CZ.rc
Simple merge

diff --cc base/applications/rapps/lang/de-DE.rc
Simple merge

diff --cc base/applications/rapps/lang/en-US.rc
Simple merge

diff --cc base/applications/rapps/lang/es-ES.rc
Simple merge

diff --cc base/applications/rapps/lang/fr-FR.rc
Simple merge

diff --cc base/applications/rapps/lang/he-IL.rc
Simple merge

diff --cc base/applications/rapps/lang/it-IT.rc
Simple merge

diff --cc base/applications/rapps/lang/ja-JP.rc
Simple merge

diff --cc base/applications/rapps/lang/no-NO.rc
Simple merge

diff --cc base/applications/rapps/lang/pl-PL.rc
Simple merge

diff --cc base/applications/rapps/lang/pt-BR.rc
Simple merge

diff --cc base/applications/rapps/lang/ro-RO.rc
Simple merge

diff --cc base/applications/rapps/lang/ru-RU.rc
Simple merge

diff --cc base/applications/rapps/lang/sk-SK.rc
Simple merge

diff --cc base/applications/rapps/lang/sq-AL.rc
Simple merge

diff --cc base/applications/rapps/lang/sv-SE.rc
Simple merge

diff --cc base/applications/rapps/lang/tr-TR.rc
Simple merge

diff --cc base/applications/rapps/lang/uk-UA.rc
Simple merge

diff --cc base/applications/rapps/lang/zh-CN.rc
Simple merge

diff --cc base/applications/rapps/lang/zh-TW.rc
Simple merge

diff --cc base/applications/rapps/parser.c
Simple merge

diff --cc base/applications/rapps/rapps.h
Simple merge

diff --cc base/applications/rapps/rapps.rc
Simple merge

diff --cc base/applications/rapps/rapps/7zip.txt
Simple merge

diff --cc base/applications/rapps/rapps/abiword.txt
Simple merge

diff --cc base/applications/rapps/rapps/abiword26.txt
Simple merge

diff --cc base/applications/rapps/rapps/abyss.txt
Simple merge

diff --cc base/applications/rapps/rapps/ants.txt
Simple merge

diff --cc base/applications/rapps/rapps/audiograbber.txt
Simple merge

diff --cc base/applications/rapps/rapps/boswars.txt
Simple merge

diff --cc base/applications/rapps/rapps/comctl32ocx.txt
Simple merge

diff --cc base/applications/rapps/rapps/diablo2.txt
Simple merge

diff --cc base/applications/rapps/rapps/doublecommander.txt
Simple merge

diff --cc base/applications/rapps/rapps/dvdwritenow.txt
Simple merge

diff --cc base/applications/rapps/rapps/excelview.txt
Simple merge

diff --cc base/applications/rapps/rapps/fap.txt
Simple merge

diff --cc base/applications/rapps/rapps/fira.txt
Simple merge

diff --cc base/applications/rapps/rapps/firefox.txt
Simple merge

diff --cc base/applications/rapps/rapps/firefox2.txt
Simple merge

diff --cc base/applications/rapps/rapps/firefox3.txt
Simple merge

diff --cc base/applications/rapps/rapps/firefox36.txt
Simple merge

diff --cc base/applications/rapps/rapps/glidewrapzbag.txt
Simple merge

diff --cc base/applications/rapps/rapps/hover.txt
Simple merge

diff --cc base/applications/rapps/rapps/kdewin.txt
Simple merge

diff --cc base/applications/rapps/rapps/lazaruside.txt
Simple merge

diff --cc base/applications/rapps/rapps/mfc40.txt
Simple merge

diff --cc base/applications/rapps/rapps/mirc.txt
Simple merge

diff --cc base/applications/rapps/rapps/mirc6.txt
Simple merge

diff --cc base/applications/rapps/rapps/mpxplay.txt
Simple merge

diff --cc base/applications/rapps/rapps/msxml3.txt
Simple merge

diff --cc base/applications/rapps/rapps/net11.txt
Simple merge

diff --cc base/applications/rapps/rapps/net20.txt
Simple merge

diff --cc base/applications/rapps/rapps/net20sp2.txt
Simple merge

diff --cc base/applications/rapps/rapps/openttd.txt
Simple merge

diff --cc base/applications/rapps/rapps/photofiltre.txt
Simple merge

diff --cc base/applications/rapps/rapps/pingus.txt
Simple merge

diff --cc base/applications/rapps/rapps/pptview.txt
Simple merge

diff --cc base/applications/rapps/rapps/ptanks.txt
Simple merge

diff --cc base/applications/rapps/rapps/python.txt
Simple merge

diff --cc base/applications/rapps/rapps/python2.txt
Simple merge

diff --cc base/applications/rapps/rapps/qb64sdl.txt
Simple merge

diff --cc base/applications/rapps/rapps/qmmp.txt
Simple merge

diff --cc base/applications/rapps/rapps/remood.txt
Simple merge

diff --cc base/applications/rapps/rapps/reshack.txt
Simple merge

diff --cc base/applications/rapps/rapps/rocks.txt
Simple merge

diff --cc base/applications/rapps/rapps/rosbeamd64.txt
Simple merge

diff --cc base/applications/rapps/rapps/rosbearm.txt
Simple merge

diff --cc base/applications/rapps/rapps/sambatng.txt
Simple merge

diff --cc base/applications/rapps/rapps/scite.txt
Simple merge

diff --cc base/applications/rapps/rapps/scummvm.txt
Simple merge

diff --cc base/applications/rapps/rapps/sdl_mixer.txt
Simple merge

diff --cc base/applications/rapps/rapps/sdl_runtime.txt
Simple merge

diff --cc base/applications/rapps/rapps/stamina.txt
Simple merge

diff --cc base/applications/rapps/rapps/superdxb.txt
Simple merge

diff --cc base/applications/rapps/rapps/superfinder.txt
Simple merge

diff --cc base/applications/rapps/rapps/tahoma.txt
Simple merge

diff --cc base/applications/rapps/rapps/thunderbird.txt
Simple merge

diff --cc base/applications/rapps/rapps/thunderbird3.txt
Simple merge

diff --cc base/applications/rapps/rapps/tileworld.txt
Simple merge

diff --cc base/applications/rapps/rapps/totalcommander.txt
Simple merge

diff --cc base/applications/rapps/rapps/tuxpaint.txt
Simple merge

diff --cc base/applications/rapps/rapps/vb5run.txt
Simple merge

diff --cc base/applications/rapps/rapps/vb6run.txt
Simple merge

diff --cc base/applications/rapps/rapps/vc2005sp1run.txt
Simple merge

diff --cc base/applications/rapps/rapps/vc2008sp1run.txt
Simple merge

diff --cc base/applications/rapps/rapps/vc2010run.txt
Simple merge

diff --cc base/applications/rapps/rapps/vc6run.txt
Simple merge

diff --cc base/applications/rapps/rapps/winboard.txt
Simple merge

diff --cc base/applications/rapps/rapps/wme9.txt
Simple merge

diff --cc base/applications/rapps/rapps/wordview.txt
Simple merge

diff --cc base/applications/rapps/settingsdlg.c
Simple merge

diff --cc base/applications/rapps/toolbar.c
Simple merge

diff --cc base/applications/rapps/winmain.c
Simple merge

diff --cc base/applications/regedit/clb/clb.rc
Simple merge

diff --cc base/applications/regedit/clb/lang/ro-RO.rc
index 0000000,fc680d3..fc680d3
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/regedit/clb/lang/ro-RO.rc
+++ b/base/applications/regedit/clb/lang/ro-RO.rc

diff --cc base/applications/regedit/clb/lang/tr-TR.rc
Simple merge

diff --cc base/applications/regedit/lang/tr-TR.rc
Simple merge

diff --cc base/applications/regedit/regedit.rc
Simple merge

diff --cc base/applications/sc/query.c
Simple merge

diff --cc base/applications/sc/start.c
Simple merge

diff --cc base/applications/screensavers/3dtext/lang/tr-TR.rc
Simple merge

diff --cc base/applications/screensavers/3dtext/rsrc.rc
Simple merge

diff --cc base/applications/screensavers/logon/lang/tr-TR.rc
Simple merge

diff --cc base/applications/screensavers/logon/logon.rc
Simple merge

diff --cc base/applications/setup16/main.c
Simple merge

diff --cc base/applications/shutdown/lang/cs-CZ.rc
Simple merge

diff --cc base/applications/sndrec32/lang/tr-TR.rc
Simple merge

diff --cc base/applications/sndrec32/rsrc.rc
Simple merge

diff --cc base/applications/sndvol32/lang/tr-TR.rc
Simple merge

diff --cc base/applications/sndvol32/sndvol32.rc
Simple merge

diff --cc base/applications/taskmgr/lang/tr-TR.rc
Simple merge

diff --cc base/applications/taskmgr/taskmgr.c
Simple merge

diff --cc base/applications/taskmgr/taskmgr.rc
Simple merge

diff --cc base/applications/winhlp32/lang/Tr.rc
Simple merge

diff --cc base/applications/winhlp32/rsrc.rc
Simple merge

diff --cc base/applications/wordpad/lang/Ro.rc
Simple merge

diff --cc base/applications/wordpad/lang/Tr.rc
Simple merge

diff --cc base/applications/wordpad/rsrc.rc
Simple merge

diff --cc base/applications/write/CMakeLists.txt
Simple merge

diff --cc base/applications/write/lang/Tr.rc
Simple merge

diff --cc base/applications/write/rsrc.rc
Simple merge

diff --cc base/services/eventlog/file.c
Simple merge

diff --cc base/services/eventlog/rpc.c
Simple merge

diff --cc base/services/svchost/netbios.c
Simple merge

diff --cc base/services/tcpsvcs/qotd.c
Simple merge

diff --cc base/services/tcpsvcs/skelserver.c
Simple merge

diff --cc base/setup/reactos/lang/tr-TR.rc
Simple merge

diff --cc base/setup/usetup/interface/usetup.c
Simple merge

diff --cc base/setup/usetup/registry.c
Simple merge

diff --cc base/setup/usetup/registry.h
Simple merge

diff --cc base/setup/vmwinst/lang/tr-TR.rc
Simple merge

diff --cc base/setup/welcome/lang/tr-TR.rc
Simple merge

diff --cc base/shell/cmd/lang/ro-RO.rc
Simple merge

diff --cc base/shell/explorer-new/lang/tr-TR.rc
Simple merge

diff --cc base/shell/explorer/CMakeLists.txt
index 5e9617f,0000000..f212782
mode 100644,000000..100644
--- 1/base/shell/explorer/CMakeLists.txt
--- /dev/null
+++ b/base/shell/explorer/CMakeLists.txt
@@@ -1,62 -1,0 +1,66 @@@
 +
 +add_subdirectory(notifyhook)
 +
 +set_cpp(WITH_RTTI WITH_EXCEPTIONS WITH_STL)
 +
 +add_definitions(
 +    -DWIN32
 +    -D__WINDRES__)
 +
 +include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 +
 +list(APPEND SOURCE
 +    shell/mainframe.cpp
 +    shell/unixfs.cpp
 +    shell/ntobjfs.cpp
 +    shell/filechild.cpp
 +    shell/shellfs.cpp
 +    shell/fatfs.cpp
 +    shell/pane.cpp
 +    shell/regfs.cpp
 +    shell/webchild.cpp
 +    shell/entries.cpp
 +    shell/shellbrowser.cpp
 +    shell/winfs.cpp
 +    dialogs/searchprogram.cpp
 +    dialogs/settings.cpp
 +    taskbar/taskbar.cpp
 +    taskbar/favorites.cpp
 +    taskbar/quicklaunch.cpp
 +    taskbar/desktopbar.cpp
 +    taskbar/startmenu.cpp
 +    taskbar/traynotify.cpp
 +    services/shellservices.cpp
 +    desktop/desktop.cpp
 +    explorer.cpp
 +    utility/xs-native.cpp
 +    utility/shellclasses.cpp
 +    utility/dragdropimpl.cpp
 +    utility/utility.cpp
 +    utility/xmlstorage.cpp
 +    utility/window.cpp
 +    utility/shellbrowserimpl.cpp
 +    precomp.h) #    utility/shelltests.cpp
 +
 +if(ARCH STREQUAL "i386")
 +    list(APPEND I386_SOURCE i386-stub-win32.c)
 +endif()
 +
 +add_executable(explorer_old
 +    ${SOURCE}