Sync with trunk r63283
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Tue, 13 May 2014 22:15:21 +0000 (22:15 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Tue, 13 May 2014 22:15:21 +0000 (22:15 +0000)
svn path=/branches/condrv_restructure/; revision=63285

406 files changed:
1  2 
CMakeLists.txt
base/applications/cmdutils/doskey/lang/de-DE.rc
base/applications/cmdutils/find/lang/de-DE.rc
base/applications/cmdutils/help/lang/de-DE.rc
base/applications/cmdutils/hostname/lang/de-DE.rc
base/applications/cmdutils/reg/lang/de-DE.rc
base/applications/cmdutils/taskkill/lang/de-DE.rc
base/applications/dxdiag/lang/tr-TR.rc
base/applications/games/solitaire/lang/tr-TR.rc
base/applications/logoff/lang/de-DE.rc
base/applications/magnify/lang/de-DE.rc
base/applications/msconfig/lang/de-DE.rc
base/applications/msconfig/lang/tr-TR.rc
base/applications/mscutils/devmgmt/lang/cs-CZ.rc
base/applications/mscutils/devmgmt/lang/de-DE.rc
base/applications/mscutils/eventvwr/eventvwr.rc
base/applications/mscutils/eventvwr/lang/cs-CZ.rc
base/applications/mscutils/servman/lang/cs-CZ.rc
base/applications/mscutils/servman/lang/de-DE.rc
base/applications/mscutils/servman/lang/tr-TR.rc
base/applications/mscutils/servman/servman.rc
base/applications/mstsc/lang/de-DE.rc
base/applications/network/ipconfig/lang/de-DE.rc
base/applications/network/ping/lang/de-DE.rc
base/applications/notepad/lang/de-DE.rc
base/applications/rapps/lang/cs-CZ.rc
base/applications/rapps/lang/tr-TR.rc
base/applications/rapps/rapps/abiword.txt
base/applications/rapps/rapps/abiword26.txt
base/applications/rapps/rapps/abyss.txt
base/applications/rapps/rapps/ac97forvirtualbox.txt
base/applications/rapps/rapps/alreader.txt
base/applications/rapps/rapps/ants.txt
base/applications/rapps/rapps/audiograbber.txt
base/applications/rapps/rapps/bittorrent.txt
base/applications/rapps/rapps/bochs.txt
base/applications/rapps/rapps/boswars.txt
base/applications/rapps/rapps/boundaround.txt
base/applications/rapps/rapps/christmasbound.txt
base/applications/rapps/rapps/chromium.txt
base/applications/rapps/rapps/cnt.txt
base/applications/rapps/rapps/codeblocks.txt
base/applications/rapps/rapps/codeblocks_gcc.txt
base/applications/rapps/rapps/codeblocks_gcc_2.txt
base/applications/rapps/rapps/comctl32ocx.txt
base/applications/rapps/rapps/devcpp_mingw32.txt
base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt
base/applications/rapps/rapps/diablo2.txt
base/applications/rapps/rapps/dosblaster.txt
base/applications/rapps/rapps/dosbox.txt
base/applications/rapps/rapps/doublecommander.txt
base/applications/rapps/rapps/dplus.txt
base/applications/rapps/rapps/dvdwritenow.txt
base/applications/rapps/rapps/excelview.txt
base/applications/rapps/rapps/fap.txt
base/applications/rapps/rapps/fira.txt
base/applications/rapps/rapps/firefox.txt
base/applications/rapps/rapps/firefox2.txt
base/applications/rapps/rapps/firefox3.txt
base/applications/rapps/rapps/firefox36.txt
base/applications/rapps/rapps/freebasic.txt
base/applications/rapps/rapps/glidewrapzbag.txt
base/applications/rapps/rapps/globulation2.txt
base/applications/rapps/rapps/hover.txt
base/applications/rapps/rapps/hxd.txt
base/applications/rapps/rapps/indiftpd.txt
base/applications/rapps/rapps/irfanview.txt
base/applications/rapps/rapps/irfanviewplugins.txt
base/applications/rapps/rapps/kdewin.txt
base/applications/rapps/rapps/kyodai.txt
base/applications/rapps/rapps/lazaruside.txt
base/applications/rapps/rapps/lbreakout2.txt
base/applications/rapps/rapps/lgeneral.txt
base/applications/rapps/rapps/libreoffice.txt
base/applications/rapps/rapps/lmarbles.txt
base/applications/rapps/rapps/mcwin32.txt
base/applications/rapps/rapps/mfc40.txt
base/applications/rapps/rapps/mirandaim.txt
base/applications/rapps/rapps/mirc.txt
base/applications/rapps/rapps/mirc6.txt
base/applications/rapps/rapps/mono2.txt
base/applications/rapps/rapps/mpc.txt
base/applications/rapps/rapps/mpxplay.txt
base/applications/rapps/rapps/msxml3.txt
base/applications/rapps/rapps/net11.txt
base/applications/rapps/rapps/net20.txt
base/applications/rapps/rapps/net20sp2.txt
base/applications/rapps/rapps/npp.txt
base/applications/rapps/rapps/offbyone.txt
base/applications/rapps/rapps/opencodecs.txt
base/applications/rapps/rapps/openoffice.txt
base/applications/rapps/rapps/openoffice2.4.txt
base/applications/rapps/rapps/openttd.txt
base/applications/rapps/rapps/opera.txt
base/applications/rapps/rapps/opera9.txt
base/applications/rapps/rapps/peazip.txt
base/applications/rapps/rapps/pengupop.txt
base/applications/rapps/rapps/photofiltre.txt
base/applications/rapps/rapps/pingus.txt
base/applications/rapps/rapps/pptview.txt
base/applications/rapps/rapps/pspad.txt
base/applications/rapps/rapps/ptanks.txt
base/applications/rapps/rapps/putty.txt
base/applications/rapps/rapps/python.txt
base/applications/rapps/rapps/python2.txt
base/applications/rapps/rapps/qb64sdl.txt
base/applications/rapps/rapps/qmmp.txt
base/applications/rapps/rapps/remood.txt
base/applications/rapps/rapps/reshack.txt
base/applications/rapps/rapps/rocks.txt
base/applications/rapps/rapps/rosbe.txt
base/applications/rapps/rapps/rosbeamd64.txt
base/applications/rapps/rapps/rosbearm.txt
base/applications/rapps/rapps/sambatng.txt
base/applications/rapps/rapps/sbforvmware.txt
base/applications/rapps/rapps/scite.txt
base/applications/rapps/rapps/scummvm.txt
base/applications/rapps/rapps/sdl_mixer.txt
base/applications/rapps/rapps/sdl_runtime.txt
base/applications/rapps/rapps/seamonkey.txt
base/applications/rapps/rapps/smplayer.txt
base/applications/rapps/rapps/snoopy.txt
base/applications/rapps/rapps/stamina.txt
base/applications/rapps/rapps/steam.txt
base/applications/rapps/rapps/sumatrapdf.txt
base/applications/rapps/rapps/summerbound.txt
base/applications/rapps/rapps/superdxb.txt
base/applications/rapps/rapps/superfinder.txt
base/applications/rapps/rapps/supertux.txt
base/applications/rapps/rapps/tahoma.txt
base/applications/rapps/rapps/thunderbird.txt
base/applications/rapps/rapps/thunderbird3.txt
base/applications/rapps/rapps/tileworld.txt
base/applications/rapps/rapps/totalcommander.txt
base/applications/rapps/rapps/tuxpaint.txt
base/applications/rapps/rapps/ultravnc.txt
base/applications/rapps/rapps/utorrent.txt
base/applications/rapps/rapps/vb5run.txt
base/applications/rapps/rapps/vb6run.txt
base/applications/rapps/rapps/vc2005sp1run.txt
base/applications/rapps/rapps/vc2008sp1run.txt
base/applications/rapps/rapps/vc2010run.txt
base/applications/rapps/rapps/vc6run.txt
base/applications/rapps/rapps/vlc.txt
base/applications/rapps/rapps/winboard.txt
base/applications/rapps/rapps/wme9.txt
base/applications/rapps/rapps/wordview.txt
base/applications/rapps/rapps/zaz.txt
base/applications/regedit/lang/de-DE.rc
base/applications/regedit/lang/tr-TR.rc
base/applications/sndvol32/lang/tr-TR.rc
base/applications/taskmgr/lang/tr-TR.rc
base/applications/wordpad/lang/De.rc
base/setup/reactos/lang/tr-TR.rc
base/setup/reactos/reactos.rc
base/setup/usetup/bootsup.c
base/setup/usetup/bootsup.h
base/setup/usetup/chkdsk.c
base/setup/usetup/drivesup.c
base/setup/usetup/drivesup.h
base/setup/usetup/filequeue.c
base/setup/usetup/filequeue.h
base/setup/usetup/filesup.c
base/setup/usetup/filesup.h
base/setup/usetup/format.c
base/setup/usetup/fslist.c
base/setup/usetup/fslist.h
base/setup/usetup/genlist.c
base/setup/usetup/genlist.h
base/setup/usetup/host.h
base/setup/usetup/inffile.c
base/setup/usetup/inffile.h
base/setup/usetup/inicache.c
base/setup/usetup/inicache.h
base/setup/usetup/lang/de-DE.h
base/setup/usetup/mui.c
base/setup/usetup/mui.h
base/setup/usetup/muilanguages.h
base/setup/usetup/progress.c
base/setup/usetup/progress.h
base/setup/usetup/registry.c
base/setup/usetup/registry.h
base/setup/usetup/settings.c
base/setup/usetup/settings.h
base/setup/usetup/usetup.h
base/setup/vmwinst/lang/tr-TR.rc
base/setup/vmwinst/vmwinst.rc
base/setup/welcome/lang/tr-TR.rc
base/setup/welcome/welcome.rc
base/shell/cmd/copy.c
base/shell/cmd/replace.c
base/shell/explorer-new/lang/tr-TR.rc
base/shell/explorer/explorer-cz.rc
base/shell/explorer/explorer.rc
base/system/rundll32/lang/tr-TR.rc
base/system/rundll32/rundll32.rc
base/system/runonce/lang/tr-TR.rc
base/system/runonce/runonce.rc
base/system/userinit/lang/tr-TR.rc
base/system/userinit/userinit.rc
base/system/winlogon/lang/tr-TR.rc
base/system/winlogon/winlogon.rc
dll/cpl/access/access.rc
dll/cpl/access/lang/cs-CZ.rc
dll/cpl/access/lang/de-DE.rc
dll/cpl/desk/lang/de-DE.rc
dll/cpl/hdwwiz/hdwwiz.rc
dll/cpl/hdwwiz/lang/cs-CZ.rc
dll/cpl/hdwwiz/lang/de-DE.rc
dll/cpl/inetcpl/inetcpl.rc
dll/cpl/inetcpl/lang/cs-CZ.rc
dll/cpl/inetcpl/lang/de-DE.rc
dll/cpl/input/lang/de-DE.rc
dll/cpl/intl/lang/de-DE.rc
dll/cpl/joy/joy.rc
dll/cpl/joy/lang/cs-CZ.rc
dll/cpl/mmsys/lang/cs-CZ.rc
dll/cpl/mmsys/lang/de-DE.rc
dll/cpl/mmsys/mmsys.rc
dll/cpl/powercfg/lang/cs-CZ.rc
dll/cpl/powercfg/powercfg.rc
dll/cpl/sysdm/lang/de-DE.rc
dll/cpl/timedate/lang/cs-CZ.rc
dll/cpl/timedate/lang/de-DE.rc
dll/cpl/timedate/timedate.rc
dll/cpl/usrmgr/lang/cs-CZ.rc
dll/cpl/usrmgr/lang/de-DE.rc
dll/cpl/usrmgr/lang/en-US.rc
dll/cpl/usrmgr/lang/fr-FR.rc
dll/cpl/usrmgr/lang/he-IL.rc
dll/cpl/usrmgr/lang/ru-RU.rc
dll/cpl/usrmgr/lang/uk-UA.rc
dll/cpl/usrmgr/usrmgr.rc
dll/directx/wine/quartz/avisplit.c
dll/ntdll/def/ntdll.spec
dll/ntdll/rtl/libsupp.c
dll/shellext/deskadp/lang/de-DE.rc
dll/shellext/slayer/lang/de-DE.rc
dll/win32/aclui/lang/de-DE.rc
dll/win32/atl/CMakeLists.txt
dll/win32/comctl32/lang/comctl_De.rc
dll/win32/comctl32/treeview.c
dll/win32/comdlg32/lang/cdlg_De.rc
dll/win32/cryptui/lang/cryptui_De.rc
dll/win32/devmgr/lang/de-DE.rc
dll/win32/iccvid/lang/iccvid_De.rc
dll/win32/icmp/icmp_main.c
dll/win32/ieframe/shelluihelper.c
dll/win32/jscript/lang/jscript_De.rc
dll/win32/kernel32/client/time.c
dll/win32/localspl/lang/spl_De.rc
dll/win32/localui/lang/ui_De.rc
dll/win32/lsasrv/lang/de-DE.rc
dll/win32/mapi32/lang/De.rc
dll/win32/msgina/lang/de-DE.rc
dll/win32/mshtml/CMakeLists.txt
dll/win32/mshtml/lang/De.rc
dll/win32/mshtml/msvc.S
dll/win32/msports/lang/de-DE.rc
dll/win32/msvcrt/msvcrt.spec
dll/win32/msvfw32/lang/msvfw32_De.rc
dll/win32/netcfgx/lang/de-DE.rc
dll/win32/netid/lang/de-DE.rc
dll/win32/netshell/lang/de-DE.rc
dll/win32/oleacc/lang/oleacc_De.rc
dll/win32/oledlg/lang/oledlg_De.rc
dll/win32/rpcrt4/rpc_transport.c
dll/win32/rpcrt4/rpcrt4_ros.diff
dll/win32/samsrv/lang/de-DE.rc
dll/win32/serialui/lang/de-DE.rc
dll/win32/setupapi/CMakeLists.txt
dll/win32/setupapi/install.c
dll/win32/setupapi/misc.c
dll/win32/setupapi/setupapi.spec
dll/win32/setupapi/setupapi_private.h
dll/win32/shell32/folders/cpanel.cpp
dll/win32/shell32/lang/cs-CZ.rc
dll/win32/shell32/lang/de-DE.rc
dll/win32/shell32/shlexec.cpp
dll/win32/syssetup/lang/cs-CZ.rc
dll/win32/syssetup/lang/de-DE.rc
dll/win32/winmm/lang/winmm_De.rc
drivers/base/kdcom/kdserial.c
drivers/bus/acpi/compbatt/compmisc.c
drivers/crypto/ksecdd/random.c
drivers/filters/mountmgr/device.c
drivers/ksfilter/ks/api.c
drivers/ksfilter/ks/event.c
drivers/ksfilter/ks/ksfunc.h
drivers/ksfilter/ks/methods.c
drivers/ksfilter/ks/misc.c
drivers/ksfilter/ks/pin.c
drivers/ksfilter/ks/property.c
drivers/ksfilter/ks/swenum.c
drivers/ksfilter/ks/topology.c
drivers/network/afd/afd/bind.c
drivers/network/afd/afd/select.c
drivers/network/afd/afd/tdi.c
drivers/network/tcpip/tcpip/dispatch.c
drivers/storage/floppy/floppy.c
drivers/wdm/audio/legacy/wdmaud/control.c
drivers/wdm/audio/legacy/wdmaud/deviface.c
drivers/wdm/audio/legacy/wdmaud/mmixer.c
drivers/wdm/audio/legacy/wdmaud/sup.c
drivers/wdm/audio/sysaudio/deviface.c
drivers/wdm/audio/sysaudio/pin.c
drivers/wmi/CMakeLists.txt
include/ddk/ntddk.h
include/ddk/ntifs.h
include/ddk/vddsvc.h
include/ddk/wdm.h
include/psdk/ks.h
include/reactos/libs/pseh/pseh3.h
include/reactos/wine/port.h
include/xdk/ccfuncs.h
include/xdk/extypes.h
include/xdk/fsrtlfuncs.h
include/xdk/haltypes.h
include/xdk/ia64/ke.h
include/xdk/iotypes.h
include/xdk/kdfuncs.h
include/xdk/ketypes.h
include/xdk/mmtypes.h
include/xdk/ntifs.template.h
include/xdk/obtypes.h
include/xdk/rtltypes.h
include/xdk/sefuncs.h
include/xdk/wdm.template.h
lib/rtl/actctx.c
lib/rtl/nls.c
lib/rtl/rtlp.h
lib/sdk/cpprt/amd64/cpprt.s
lib/sdk/crt/include/internal/safecrt.h
lib/sdk/crt/printf/_sxprintf.c
lib/sdk/crt/stdio/file.c
lib/sdk/crt/stdio/stat64.c
lib/sdk/crt/stdlib/errno.c
lib/sdk/crt/stdlib/senv.c
lib/sdk/crt/string/_tsplitpath_x.h
lib/sdk/crt/string/itoa.c
lib/sdk/crt/string/itow.c
lib/sdk/crt/string/strerror.c
lib/sdk/crt/string/wcs.c
lib/sdk/crt/time/gmtime.c
lib/sdk/crt/wine/heap.c
media/inf/audio.inf
media/inf/battery.inf
media/inf/bth.inf
media/inf/cdrom.inf
media/inf/disk.inf
media/inf/display.inf
media/inf/flpydisk.inf
media/inf/hal.inf
media/inf/hdc.inf
media/inf/input.inf
media/inf/keyboard.inf
media/inf/legcydrv.inf
media/inf/machine.inf
media/inf/monitor.inf
media/inf/shortcuts.inf
media/inf/unknown.inf
media/inf/usb.inf
ntoskrnl/ex/event.c
ntoskrnl/ex/sem.c
ntoskrnl/ex/sysinfo.c
ntoskrnl/fsrtl/fsrtlpc.c
ntoskrnl/include/internal/amd64/mm.h
ntoskrnl/include/internal/fsrtl.h
ntoskrnl/include/internal/kd.h
ntoskrnl/include/internal/kd64.h
ntoskrnl/include/ntoskrnl.h
ntoskrnl/kd64/kdapi.c
ntoskrnl/kd64/kddata.c
ntoskrnl/kd64/kdinit.c
ntoskrnl/ke/time.c
ntoskrnl/ntoskrnl.spec
ntoskrnl/ps/quota.c
subsystems/ntvdm/CMakeLists.txt
subsystems/ntvdm/bios/bios32/kbdbios32.c
subsystems/ntvdm/bios/kbdbios.h
subsystems/ntvdm/bios/vidbios.c
subsystems/ntvdm/bios/vidbios.h
subsystems/ntvdm/callback.c
subsystems/ntvdm/dos/dem.c
subsystems/ntvdm/dos/dos32krnl/bios.c
subsystems/ntvdm/dos/dos32krnl/dos.c
subsystems/ntvdm/dos/dos32krnl/dos.h
subsystems/ntvdm/dos/dos32krnl/dosfiles.c
subsystems/ntvdm/emulator.c
subsystems/ntvdm/emulator.h
subsystems/ntvdm/hardware/pic.c
subsystems/ntvdm/hardware/vga.c
subsystems/ntvdm/hardware/vga.h
subsystems/ntvdm/int32.c
subsystems/ntvdm/ntvdm.c
subsystems/ntvdm/ntvdm.h
win32ss/drivers/videoprt/child.c
win32ss/gdi/eng/engevent.c
win32ss/gdi/eng/mem.c
win32ss/user/ntuser/main.c
win32ss/user/ntuser/message.c
win32ss/user/ntuser/misc.c
win32ss/user/ntuser/misc/rtlstr.c
win32ss/user/ntuser/winpos.c
win32ss/user/user32/windows/accel.c
win32ss/w32ksvc.h

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,6684727..6684727
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,96d2228..96d2228
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/rtl/nls.c
Simple merge
diff --cc lib/rtl/rtlp.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 9841771,b197c0e..b197c0e
Binary files differ
index cb5ae49,55b259d..55b259d
Binary files differ
index 4a61fae,bff8acc..bff8acc
Binary files differ
index 967b5ff,7e50b19..7e50b19
Binary files differ
index 7650e5f,e580e93..e580e93
Binary files differ
index c9fa74f,abff970..abff970
Binary files differ
index 6a1aeeb,0000000..a6e0177
mode 100644,000000..100644
Binary files differ
index 25f902d,2686870..2686870
Binary files differ
index d72b07f,98738eb..98738eb
Binary files differ
index f1e79d1,789bef3..789bef3
Binary files differ
index 93d08dc,8fe2e0b..8fe2e0b
Binary files differ
index f2296d1,a30b2da..a30b2da
Binary files differ
index e64177f,8938bd8..8938bd8
Binary files differ
index 4916939,4415a11..4415a11
Binary files differ
index 013a54e,8d7ff54..8d7ff54
Binary files differ
index 6a32d97,9bc33ce..9bc33ce
Binary files differ
index 75b348c,e7e701f..e7e701f
Binary files differ
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge