* Sync up to trunk r55544.

svn path=/branches/usb-bringup-trunk/; revision=55545

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

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

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

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

diff --cc base/applications/network/ping/lang/bg-BG.rc
index 0000000,5bcba10..5bcba10
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/applications/network/ping/lang/bg-BG.rc
+++ b/base/applications/network/ping/lang/bg-BG.rc

diff --cc base/applications/network/ping/ping.rc
Simple merge

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

diff --cc base/applications/rapps/lang/fr-FR.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/abiword28x.txt
Simple merge

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

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

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

diff --cc base/applications/rapps/rapps/bittorrent.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/dosblaster.txt
Simple merge

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

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

diff --cc base/applications/rapps/rapps/fap.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/firefox5.txt
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc base/applications/rapps/rapps/mirandaim.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/mono2.txt
Simple merge

diff --cc base/applications/rapps/rapps/mpc.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/offbyone.txt
Simple merge

diff --cc base/applications/rapps/rapps/openoffice2.4.txt
Simple merge

diff --cc base/applications/rapps/rapps/openoffice3.0.txt
Simple merge

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

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

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

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

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

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

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

diff --cc base/applications/rapps/rapps/rosbe.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/sbforvmware.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/seamonkey.txt
Simple merge

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

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

diff --cc base/applications/rapps/rapps/sumatrapdf.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/thunderbird5.txt
Simple merge

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

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

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

diff --cc base/applications/rapps/rapps/utorrent.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/vc2008sp1run.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/regedit/lang/bg-BG.rc
Simple merge

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

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

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

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

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

diff --cc base/services/eventlog/eventlog.h
Simple merge

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

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

diff --cc base/setup/usetup/lang/bg-BG.h
Simple merge

diff --cc base/system/CMakeLists.txt
Simple merge

diff --cc base/system/autochk/autochk.c
Simple merge

diff --cc base/system/format/lang/bg-BG.rc
Simple merge

diff --cc base/system/smss/client.c
Simple merge

diff --cc base/system/smss/debug.c
Simple merge

diff --cc base/system/smss/init.c
Simple merge

diff --cc base/system/smss/initdosdev.c
Simple merge

diff --cc base/system/smss/initenv.c
Simple merge

diff --cc base/system/smss/initmv.c
Simple merge

diff --cc base/system/smss/initobdir.c
Simple merge

diff --cc base/system/smss/initpage.c
Simple merge

diff --cc base/system/smss/initreg.c
Simple merge

diff --cc base/system/smss/initrun.c
Simple merge

diff --cc base/system/smss/initwkdll.c
Simple merge

diff --cc base/system/smss/print.c
Simple merge

diff --cc base/system/smss/smapi.c
Simple merge

diff --cc base/system/smss/smapiexec.c
Simple merge

diff --cc base/system/smss/smapiquery.c
Simple merge

diff --cc base/system/smss2/CMakeLists.txt
index 0000000,35dd1f8..35dd1f8
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/smss2/CMakeLists.txt
+++ b/base/system/smss2/CMakeLists.txt

diff --cc base/system/smss2/crashdmp.c
index 0000000,a956d8b..a956d8b
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/smss2/crashdmp.c
+++ b/base/system/smss2/crashdmp.c

diff --cc base/system/smss2/pagefile.c
index 0000000,7c3c21a..7c3c21a
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/smss2/pagefile.c
+++ b/base/system/smss2/pagefile.c

diff --cc base/system/smss2/sminit.c
index 0000000,3da3fce..3da3fce
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/smss2/sminit.c
+++ b/base/system/smss2/sminit.c

diff --cc base/system/smss2/smloop.c
index 0000000,8958e04..8958e04
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/smss2/smloop.c
+++ b/base/system/smss2/smloop.c

diff --cc base/system/smss2/smsbapi.c
index 0000000,d72b582..d72b582
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/smss2/smsbapi.c
+++ b/base/system/smss2/smsbapi.c

diff --cc base/system/smss2/smsessn.c
index 0000000,6cee473..6cee473
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/smss2/smsessn.c
+++ b/base/system/smss2/smsessn.c

diff --cc base/system/smss2/smss.c
index 0000000,a3df5c6..a3df5c6
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/smss2/smss.c
+++ b/base/system/smss2/smss.c

diff --cc base/system/smss2/smss.h
index 0000000,dabd9dc..dabd9dc
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/smss2/smss.h
+++ b/base/system/smss2/smss.h

diff --cc base/system/smss2/smss.rc
index 0000000,98ad190..98ad190
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/smss2/smss.rc
+++ b/base/system/smss2/smss.rc

diff --cc base/system/smss2/smss2.rbuild
index 0000000,23e97cc..23e97cc
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/smss2/smss2.rbuild
+++ b/base/system/smss2/smss2.rbuild

diff --cc base/system/smss2/smsubsys.c
index 0000000,d0bfbd8..d0bfbd8
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/smss2/smsubsys.c
+++ b/base/system/smss2/smsubsys.c

diff --cc base/system/smss2/smutil.c
index 0000000,af472c2..af472c2
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/smss2/smutil.c
+++ b/base/system/smss2/smutil.c

diff --cc base/system/subst/lang/bg-BG.rc
index 0000000,63dfb02..63dfb02
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/base/system/subst/lang/bg-BG.rc
+++ b/base/system/subst/lang/bg-BG.rc

diff --cc base/system/subst/rsrc.rc
Simple merge

diff --cc base/system/system.rbuild
Simple merge

diff --cc boot/bootdata/livecd.inf
Simple merge

diff --cc boot/bootdata/packages/reactos.dff
index 80a8dd0,0000000..512ead1
mode 100644,000000..100644
--- 1/boot/bootdata/packages/reactos.dff
--- /dev/null
+++ b/boot/bootdata/packages/reactos.dff
@@@ -1,888 -1,0 +1,890 @@@
 +; Main ReactOS package
 +
 +.Set DiskLabelTemplate="ReactOS"                ; Label of disk
 +.Set CabinetNameTemplate="reactos.cab"          ; reactos.cab
 +.Set InfFileName="reactos.inf"                  ; reactos.inf
 +
 +
 +;.Set Cabinet=on
 +;.Set Compress=on
 +
 +.InfBegin
 +[Version]
 +Signature = "$ReactOS$"
 +
 +[Directories]
 +1 = system32
 +2 = system32\drivers
 +3 = Fonts
 +4 =
 +5 = system32\drivers\etc
 +6 = inf
 +7 = bin
 +8 = media
 +
 +.InfEnd
 +
 +; Contents of disk
 +.InfBegin
 +[SourceFiles]
 +.InfEnd
 +
 +
 +; Base files
 +base\applications\cacls\cacls.exe                       1
 +base\applications\calc\calc.exe                         1
 +base\applications\charmap\charmap.exe                   1
 +base\applications\cmdutils\dbgprint\dbgprint.exe        1
 +base\applications\cmdutils\doskey\doskey.exe            1
 +base\applications\cmdutils\find\find.exe                1
 +base\applications\cmdutils\hostname\hostname.exe        1
 +base\applications\cmdutils\lodctr\lodctr.exe            1
 +base\applications\cmdutils\more\more.exe                1
 +base\applications\cmdutils\reg\reg.exe                  1
 +base\applications\cmdutils\xcopy\xcopy.exe              1
 +base\applications\control\control.exe                   1
 +base\applications\dxdiag\dxdiag.exe                     1
 +base\applications\extrac32\extrac32.exe                 1
 +base\applications\findstr\findstr.exe                   1
 +base\applications\fontview\fontview.exe                 1
 +base\applications\iexplore\iexplore.exe                 1
 +base\applications\games\solitaire\sol.exe               1
 +base\applications\games\spider\spider.exe               1
 +base\applications\games\winmine\winmine.exe             1
 +base\applications\hh\hh.exe                             4
 +base\applications\kbswitch\kbswitch.exe                 1
 +base\applications\kbswitch\kbsdll\kbsdll.dll            1
 +base\applications\logoff\logoff.exe                     1
 +base\applications\magnify\magnify.exe                   1
 +base\applications\mplay32\mplay32.exe                   1
 +base\applications\msconfig\msconfig.exe                 1
 +base\applications\mscutils\devmgmt\devmgmt.exe          1
 +base\applications\mscutils\eventvwr\eventvwr.exe        1
 +base\applications\mscutils\servman\servman.exe          1
 +base\applications\mspaint\mspaint.exe                   1
 +base\applications\mstsc\mstsc.exe                       1
 +base\applications\network\arp\arp.exe                   1
 +base\applications\network\dwnl\dwnl.exe                 1
 +base\applications\network\finger\finger.exe             1
 +base\applications\network\ftp\ftp.exe                   1
 +base\applications\network\ipconfig\ipconfig.exe         1
 +base\applications\network\net\net.exe                   1
 +base\applications\network\netstat\netstat.exe           1
 +base\applications\network\nslookup\nslookup.exe         1
 +base\applications\network\ping\ping.exe                 1
 +base\applications\network\route\route.exe               1
 +base\applications\network\telnet\telnet.exe             1
 +base\applications\network\tracert\tracert.exe           1
 +base\applications\network\whois\whois.exe               1
 +base\applications\network\wlanconf\wlanconf.exe         1
 +base\applications\notepad\notepad.exe                   1
 +base\applications\rapps\rapps.exe                       1
 +base\applications\regedit\regedit.exe                   4
 +base\applications\regedit\clb\clb.dll                   1
 +base\applications\regedt32\regedt32.exe                 1
 +base\applications\sc\sc.exe                             1
 +base\applications\screensavers\3dtext\3dtext.scr        1
 +base\applications\screensavers\logon\logon.scr          1
 +base\applications\shutdown\shutdown.exe                 1
 +base\applications\sndrec32\sndrec32.exe                 1
 +base\applications\sndvol32\sndvol32.exe                 1
 +base\applications\taskmgr\taskmgr.exe                   1
 +base\applications\winhlp32\winhlp32.exe                 4
 +base\applications\winver\winver.exe                     1
 +base\applications\wordpad\wordpad.exe                   1
 +base\applications\write\write.exe                       1
 +
 +base\services\audiosrv\audiosrv.exe                 1
 +base\services\eventlog\eventlog.exe                 1
 +base\services\rpcss\rpcss.exe                       1
 +base\services\spoolsv\spoolsv.exe                   1
 +base\services\svchost\svchost.exe                   1
 +base\services\tcpsvcs\tcpsvcs.exe                   1
 +base\services\tcpsvcs\quotes                        5
 +base\services\telnetd\telnetd.exe                   1
 +base\services\thmsvc\thmsvc.exe                     1
 +base\services\umpnpmgr\umpnpmgr.exe                 1
 +base\services\wlansvc\wlansvc.exe                   1
 +
 +base\setup\setup\setup.exe                          1
 +base\setup\vmwinst\vmwinst.exe                      1
 +
 +base\shell\cmd\cmd.exe                              1
 +base\shell\explorer\explorer.exe                    4   optional
 +base\shell\explorer\explorer-cfg-template.xml       4   optional
 +base\shell\explorer\notifyhook\notifyhook.dll       1   optional
 +base\shell\explorer-new\explorer_new.exe            4   optional
 +
 +base\system\autochk\autochk.exe                     1
 +base\system\bootok\bootok.exe                       1
 +base\system\diskpart\diskpart.exe                   1
 +base\system\expand\expand.exe                       1
 +base\system\subst\subst.exe                         1
 +base\system\format\format.exe                       1
 +base\system\lsass\lsass.exe                         1
 +base\system\msiexec\msiexec.exe                     1
 +base\system\regsvr32\regsvr32.exe                   1
 +base\system\rundll32\rundll32.exe                   1
 +base\system\runonce\runonce.exe                     1
 +base\system\services\services.exe                   1
 +base\system\smss\smss.exe                           1
++base\system\smss2\smss2.exe                         1
 +base\system\userinit\userinit.exe                   1
 +base\system\winlogon\winlogon.exe                   1
 +
 +; Dynamic Link Libraries
 +dll\3rdparty\dxtn\dxtn.dll                          1   optional
 +dll\3rdparty\libjpeg\libjpeg.dll                    1
 +dll\3rdparty\libpng\libpng.dll                      1
 +dll\3rdparty\libtiff\libtiff.dll                    1
 +dll\3rdparty\libxslt\libxslt.dll                    1
 +dll\3rdparty\mesa32\mesa32.dll                      1
 +
 +dll\cpl\access\access.cpl                           1
 +dll\cpl\appwiz\appwiz.cpl                           1
 +dll\cpl\console\console.dll                         1
 +dll\cpl\desk\desk.cpl                               1
 +dll\cpl\hdwwiz\hdwwiz.cpl                           1
 +dll\cpl\input\input.dll                             1
 +dll\cpl\inetcpl\inetcpl.cpl                         1
 +dll\cpl\intl\intl.cpl                               1
 +dll\cpl\joy\joy.cpl                                 1
 +;dll\cpl\liccpa\liccpa.cpl                          1
 +dll\cpl\main\main.cpl                               1
 +dll\cpl\mmsys\mmsys.cpl                             1
 +dll\cpl\ncpa\ncpa.cpl                               1
 +;dll\cpl\odbccp32\odbccp32.cp