Sync with trunk (r48042), except win32k/ntuser/cursoricon.c
authorJérôme Gardou <jerome.gardou@reactos.org>
Wed, 14 Jul 2010 20:15:30 +0000 (20:15 +0000)
committerJérôme Gardou <jerome.gardou@reactos.org>
Wed, 14 Jul 2010 20:15:30 +0000 (20:15 +0000)
***branch DOES NOT BUILD with this commit***

svn path=/branches/reactos-yarotows/; revision=48048

182 files changed:
1  2 
base/applications/applications.rbuild
boot/bootdata/packages/reactos.dff
dll/3rdparty/3rdparty.rbuild
dll/3rdparty/libjpeg/README
dll/3rdparty/libjpeg/ansi2knr.c
dll/3rdparty/libjpeg/change.log
dll/3rdparty/libjpeg/cjpeg.c
dll/3rdparty/libjpeg/ckconfig.c
dll/3rdparty/libjpeg/djpeg.c
dll/3rdparty/libjpeg/example.c
dll/3rdparty/libjpeg/jaricom.c
dll/3rdparty/libjpeg/jcapimin.c
dll/3rdparty/libjpeg/jcarith.c
dll/3rdparty/libjpeg/jccoefct.c
dll/3rdparty/libjpeg/jcdctmgr.c
dll/3rdparty/libjpeg/jchuff.c
dll/3rdparty/libjpeg/jcinit.c
dll/3rdparty/libjpeg/jcmainct.c
dll/3rdparty/libjpeg/jcmarker.c
dll/3rdparty/libjpeg/jcmaster.c
dll/3rdparty/libjpeg/jcparam.c
dll/3rdparty/libjpeg/jcprepct.c
dll/3rdparty/libjpeg/jcsample.c
dll/3rdparty/libjpeg/jctrans.c
dll/3rdparty/libjpeg/jdapimin.c
dll/3rdparty/libjpeg/jdapistd.c
dll/3rdparty/libjpeg/jdarith.c
dll/3rdparty/libjpeg/jdatadst.c
dll/3rdparty/libjpeg/jdatasrc.c
dll/3rdparty/libjpeg/jdcoefct.c
dll/3rdparty/libjpeg/jddctmgr.c
dll/3rdparty/libjpeg/jdhuff.c
dll/3rdparty/libjpeg/jdinput.c
dll/3rdparty/libjpeg/jdmainct.c
dll/3rdparty/libjpeg/jdmarker.c
dll/3rdparty/libjpeg/jdmaster.c
dll/3rdparty/libjpeg/jdsample.c
dll/3rdparty/libjpeg/jdtrans.c
dll/3rdparty/libjpeg/jfdctflt.c
dll/3rdparty/libjpeg/jfdctfst.c
dll/3rdparty/libjpeg/jfdctint.c
dll/3rdparty/libjpeg/jidctflt.c
dll/3rdparty/libjpeg/jidctint.c
dll/3rdparty/libjpeg/jpegtran.c
dll/3rdparty/libjpeg/jutils.c
dll/3rdparty/libjpeg/libjpeg.rbuild
dll/3rdparty/libjpeg/rdbmp.c
dll/3rdparty/libjpeg/rdjpgcom.c
dll/3rdparty/libjpeg/rdppm.c
dll/3rdparty/libjpeg/rdswitch.c
dll/3rdparty/libjpeg/transupp.c
dll/3rdparty/libjpeg/wrppm.c
dll/3rdparty/libpng/docs/ANNOUNCE
dll/3rdparty/libpng/docs/CHANGES
dll/3rdparty/libpng/docs/INSTALL
dll/3rdparty/libpng/docs/LICENSE
dll/3rdparty/libpng/docs/README
dll/3rdparty/libpng/docs/TODO
dll/3rdparty/libpng/docs/example.c
dll/3rdparty/libpng/docs/libpng-1.4.3.txt
dll/3rdparty/libpng/libpng.rbuild
dll/3rdparty/libpng/new_push_process_row.c
dll/3rdparty/libpng/png.c
dll/3rdparty/libpng/pngerror.c
dll/3rdparty/libpng/pngget.c
dll/3rdparty/libpng/pngmem.c
dll/3rdparty/libpng/pngpread.c
dll/3rdparty/libpng/pngread.c
dll/3rdparty/libpng/pngrio.c
dll/3rdparty/libpng/pngrtran.c
dll/3rdparty/libpng/pngrutil.c
dll/3rdparty/libpng/pngset.c
dll/3rdparty/libpng/pngtest.c
dll/3rdparty/libpng/pngtrans.c
dll/3rdparty/libpng/pngwio.c
dll/3rdparty/libpng/pngwrite.c
dll/3rdparty/libpng/pngwtran.c
dll/3rdparty/libpng/pngwutil.c
dll/3rdparty/libtiff/libtiff.def
dll/3rdparty/libtiff/libtiff.rbuild
dll/3rdparty/libtiff/mkg3states.c
dll/3rdparty/libtiff/tif_aux.c
dll/3rdparty/libtiff/tif_close.c
dll/3rdparty/libtiff/tif_codec.c
dll/3rdparty/libtiff/tif_color.c
dll/3rdparty/libtiff/tif_compress.c
dll/3rdparty/libtiff/tif_dir.c
dll/3rdparty/libtiff/tif_dirinfo.c
dll/3rdparty/libtiff/tif_dirread.c
dll/3rdparty/libtiff/tif_dirwrite.c
dll/3rdparty/libtiff/tif_dumpmode.c
dll/3rdparty/libtiff/tif_error.c
dll/3rdparty/libtiff/tif_extension.c
dll/3rdparty/libtiff/tif_fax3.c
dll/3rdparty/libtiff/tif_fax3sm.c
dll/3rdparty/libtiff/tif_flush.c
dll/3rdparty/libtiff/tif_getimage.c
dll/3rdparty/libtiff/tif_jbig.c
dll/3rdparty/libtiff/tif_jpeg.c
dll/3rdparty/libtiff/tif_luv.c
dll/3rdparty/libtiff/tif_lzw.c
dll/3rdparty/libtiff/tif_next.c
dll/3rdparty/libtiff/tif_ojpeg.c
dll/3rdparty/libtiff/tif_open.c
dll/3rdparty/libtiff/tif_packbits.c
dll/3rdparty/libtiff/tif_pixarlog.c
dll/3rdparty/libtiff/tif_predict.c
dll/3rdparty/libtiff/tif_print.c
dll/3rdparty/libtiff/tif_read.c
dll/3rdparty/libtiff/tif_strip.c
dll/3rdparty/libtiff/tif_swab.c
dll/3rdparty/libtiff/tif_thunder.c
dll/3rdparty/libtiff/tif_tile.c
dll/3rdparty/libtiff/tif_version.c
dll/3rdparty/libtiff/tif_warning.c
dll/3rdparty/libtiff/tif_win32.c
dll/3rdparty/libtiff/tif_write.c
dll/3rdparty/libtiff/tif_zip.c
dll/win32/dnsapi/dnsapi.rbuild
dll/win32/dnsapi/dnsapi.spec
dll/win32/dnsapi/dnsapi/memory.c
dll/win32/msafd/include/helpers.h
dll/win32/msafd/misc/helpers.c
dll/win32/user32/user32.pspec
dll/win32/user32/windows/cursoricon.c
dll/win32/win32.rbuild
dll/win32/windowscodecs/windowscodecs.rbuild
dll/win32/wing32/wing32.c
dll/win32/wing32/wing32.rbuild
dll/win32/wing32/wing32.spec
dll/win32/ws2_32/misc/catalog.c
drivers/network/afd/afd/main.c
include/psdk/winsock2.h
include/psdk/wsahelp.h
include/reactos/libs/libjpeg/cderror.h
include/reactos/libs/libjpeg/cdjpeg.h
include/reactos/libs/libjpeg/jconfig.h
include/reactos/libs/libjpeg/jdct.h
include/reactos/libs/libjpeg/jerror.h
include/reactos/libs/libjpeg/jmorecfg.h
include/reactos/libs/libjpeg/jpegint.h
include/reactos/libs/libjpeg/jpeglib.h
include/reactos/libs/libjpeg/jversion.h
include/reactos/libs/libjpeg/rosdiff.patch
include/reactos/libs/libjpeg/transupp.h
include/reactos/libs/libpng/png.h
include/reactos/libs/libpng/pngconf.h
include/reactos/libs/libpng/pngpriv.h
include/reactos/libs/libtiff/t4.h
include/reactos/libs/libtiff/tif_config.h
include/reactos/libs/libtiff/tif_config.vc.h
include/reactos/libs/libtiff/tif_dir.h
include/reactos/libs/libtiff/tif_fax3.h
include/reactos/libs/libtiff/tif_predict.h
include/reactos/libs/libtiff/tiff.h
include/reactos/libs/libtiff/tiffconf.h
include/reactos/libs/libtiff/tiffconf.vc.h
include/reactos/libs/libtiff/tiffio.h
include/reactos/libs/libtiff/tiffio.hxx
include/reactos/libs/libtiff/tiffiop.h
include/reactos/libs/libtiff/tiffvers.h
include/reactos/libs/libtiff/uvcode.h
include/reactos/libs/zlib/crc32.h
include/reactos/libs/zlib/deflate.h
include/reactos/libs/zlib/gzguts.h
include/reactos/libs/zlib/inffast.h
include/reactos/libs/zlib/inffixed.h
include/reactos/libs/zlib/inflate.h
include/reactos/libs/zlib/inftrees.h
include/reactos/libs/zlib/trees.h
include/reactos/libs/zlib/zconf.h
include/reactos/libs/zlib/zlib.h
include/reactos/libs/zlib/zutil.h
include/reactos/win32k/ntuser.h
include/reactos/wine/config.h
include/reactos/winsock/msafd.h
include/reactos/winsock/msafdlib.h
include/reactos/winsock/mswinsock.h
include/reactos/winsock/rnr20lib.h
include/reactos/winsock/wsmobile.h
subsystems/win32/win32k/ntuser/simplecall.c
subsystems/win32/win32k/w32ksvc.db

Simple merge
index 0420340,0000000..c12ef6a
mode 100644,000000..100644
--- /dev/null
@@@ -1,853 -1,0 +1,862 @@@
- base\applications\mscutils\devmgmt\devmgmt.exe          1
- base\applications\mscutils\eventvwr\eventvwr.exe        1
 +; 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\fontview\fontview.exe                 1
- base\applications\network\route\route.exe               1
 +base\applications\games\solitaire\sol.exe               1
 +base\applications\games\spider\spider.exe               1
 +base\applications\games\winemine\winemine.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\mstsc\mstsc.exe                       1
 +base\applications\network\arp\arp.exe                   1
 +base\applications\network\dwnl\dwnl.exe                 1
- base\applications\mscutils\servman\servman.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\notepad\notepad.exe                   1
 +base\applications\paint\paint.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\services\telnetd\telnetd.exe                   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\svchost\svchost.exe                   1
 +base\services\tcpsvcs\quotes                        5
++base\services\telnetd\telnetd.exe                   1
 +base\services\umpnpmgr\umpnpmgr.exe                 1
 +base\services\wlansvc\wlansvc.exe                   1
- base\system\expand\expand.exe                       1
- base\system\smss\smss.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
 +base\shell\explorer\explorer-cfg-template.xml       4
 +base\shell\explorer\notifyhook\notifyhook.dll       1
 +base\shell\explorer-new\explorer_new.exe            4   optional
 +
 +base\system\autochk\autochk.exe                     1
 +base\system\bootok\bootok.exe                       1
++base\system\expand\expand.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\userinit\userinit.exe                   1
 +base\system\winlogon\winlogon.exe                   1
- dll\3rdparty\mesa32\mesa32.dll                      1
 +
 +; Dynamic Link Libraries
- dll\3rdparty\dxtn\dxtn.dll                          1   optional
++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\directx\wine\ddraw\ddraw.dll                    1
- dll\directx\d3d8thk\d3d8thk.dll                     1
- dll\directx\devenum\devenum.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\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.cpl                      1
 +dll\cpl\powercfg\powercfg.cpl                       1
 +dll\cpl\sysdm\sysdm.cpl                             1
 +;dll\cpl\telephon\telephon.cpl                      1
 +dll\cpl\timedate\timedate.cpl                       1
 +;dll\cpl\usrmgr\usrmgr.cpl                          1
 +
 +dll\directx\amstream\amstream.dll                   1
 +;dll\directx\bdaplgin\bdaplgin.ax                    1
++dll\directx\d3d8thk\d3d8thk.dll                     1
++dll\directx\devenum\devenum.dll                     1
 +dll\directx\dinput\dinput.dll                       1
 +dll\directx\dinput8\dinput8.dll                     1
 +dll\directx\dmusic\dmusic.dll                       1
 +dll\directx\dplay\dplay.dll                         1
 +dll\directx\dplayx\dplayx.dll                       1
 +dll\directx\dsound\dsound.dll                       1
 +dll\directx\dxdiagn\dxdiagn.dll                     1
- dll\directx\quartz\quartz.dll                       1
 +dll\directx\ksproxy\ksproxy.ax                      1
 +dll\directx\ksuser\ksuser.dll                       1
 +dll\directx\msdmo\msdmo.dll                         1
 +;dll\directx\msdvbnp\msdvbnp.ax                      1
 +;dll\directx\msvidctl\msvidctl.dll                   1
- dll\directx\wine\wined3d\wined3d.dll                1
 +dll\directx\qedit\qedit.dll                         1
++dll\directx\quartz\quartz.dll                       1
++dll\directx\wine\ddraw\ddraw.dll                    1
 +dll\directx\wine\d3d8\d3d8.dll                      1
- dll\keyboard\kbdbga\kbdbga.dll                      1
- dll\keyboard\kbdbe\kbdbe.dll                        1
 +dll\directx\wine\d3d9\d3d9.dll                      1
++dll\directx\wine\wined3d\wined3d.dll                1
 +
 +dll\keyboard\kbda1\kbda1.dll                        1
 +dll\keyboard\kbda2\kbda2.dll                        1
 +dll\keyboard\kbda3\kbda3.dll                        1
 +dll\keyboard\kbdal\kbdal.dll                        1
 +dll\keyboard\kbdarme\kbdarme.dll                    1
 +dll\keyboard\kbdarmw\kbdarmw.dll                    1
 +dll\keyboard\kbdaze\kbdaze.dll                      1
 +dll\keyboard\kbdazel\kbdazel.dll                    1
++dll\keyboard\kbdbe\kbdbe.dll                        1
++dll\keyboard\kbdbga\kbdbga.dll                      1
 +dll\keyboard\kbdbgm\kbdbgm.dll                      1
 +dll\keyboard\kbdbgt\kbdbgt.dll                      1
 +dll\keyboard\kbdblr\kbdblr.dll                      1
 +dll\keyboard\kbdbr\kbdbr.dll                        1
- dll\keyboard\kbdgrist\kbdgrist.dll                  1
 +dll\keyboard\kbdbur\kbdbur.dll                      1
 +dll\keyboard\kbdcan\kbdcan.dll                      1
 +dll\keyboard\kbdcr\kbdcr.dll                        1
 +dll\keyboard\kbdcz\kbdcz.dll                        1
 +dll\keyboard\kbdcz1\kbdcz1.dll                      1
 +dll\keyboard\kbdda\kbdda.dll                        1
 +dll\keyboard\kbddv\kbddv.dll                        1
 +dll\keyboard\kbdes\kbdes.dll                        1
 +dll\keyboard\kbdest\kbdest.dll                      1
 +dll\keyboard\kbdfc\kbdfc.dll                        1
 +dll\keyboard\kbdfi\kbdfi.dll                        1
 +dll\keyboard\kbdfr\kbdfr.dll                        1
 +dll\keyboard\kbdgeo\kbdgeo.dll                      1
 +dll\keyboard\kbdgerg\kbdgerg.dll                    1
 +dll\keyboard\kbdgneo\kbdgneo.dll                    1
- dll\keyboard\kbdko\kbdko.dll                        1
 +dll\keyboard\kbdgr\kbdgr.dll                        1
++dll\keyboard\kbdgrist\kbdgrist.dll                  1
 +dll\keyboard\kbdhe\kbdhe.dll                        1
 +dll\keyboard\kbdheb\kbdheb.dll                      1
 +dll\keyboard\kbdhu\kbdhu.dll                        1
 +dll\keyboard\kbdic\kbdic.dll                        1
 +dll\keyboard\kbdinasa\kbdinasa.dll                  1
 +dll\keyboard\kbdinben\kbdinben.dll                  1
 +dll\keyboard\kbdindev\kbdindev.dll                  1
 +dll\keyboard\kbdinguj\kbdinguj.dll                  1
 +dll\keyboard\kbdinmal\kbdinmal.dll                  1
 +dll\keyboard\kbdir\kbdir.dll                        1
 +dll\keyboard\kbdit\kbdit.dll                        1
 +dll\keyboard\kbdja\kbdja.dll                        1
 +dll\keyboard\kbdkaz\kbdkaz.dll                      1
++dll\keyboard\kbdko\kbdko.dll                        1
 +dll\keyboard\kbdla\kbdla.dll                        1
 +dll\keyboard\kbdlt1\kbdlt1.dll                      1
 +dll\keyboard\kbdlv\kbdlv.dll                        1
 +dll\keyboard\kbdmac\kbdmac.dll                      1
 +dll\keyboard\kbdne\kbdne.dll                        1
 +dll\keyboard\kbdno\kbdno.dll                        1
 +dll\keyboard\kbdpl1\kbdpl1.dll                      1
 +dll\keyboard\kbdpo\kbdpo.dll                        1
 +dll\keyboard\kbdro\kbdro.dll                        1
 +dll\keyboard\kbdru\kbdru.dll                        1
 +dll\keyboard\kbdru1\kbdru1.dll                      1
 +dll\keyboard\kbdsg\kbdsg.dll                        1
 +dll\keyboard\kbdsk\kbdsk.dll                        1
 +dll\keyboard\kbdsk1\kbdsk1.dll                      1
 +dll\keyboard\kbdsw\kbdsw.dll                        1
 +dll\keyboard\kbdtat\kbdtat.dll                      1
 +dll\keyboard\kbdth0\kbdth0.dll                      1
 +dll\keyboard\kbdth1\kbdth1.dll                      1
 +dll\keyboard\kbdth2\kbdth2.dll                      1
 +dll\keyboard\kbdth3\kbdth3.dll                      1
 +dll\keyboard\kbdtuf\kbdtuf.dll                      1
 +dll\keyboard\kbdtuq\kbdtuq.dll                      1
 +dll\keyboard\kbduk\kbduk.dll                        1
 +dll\keyboard\kbdur\kbdur.dll                        1
 +dll\keyboard\kbdurs\kbdurs.dll                      1
 +dll\keyboard\kbdus\kbdus.dll                        1
 +dll\keyboard\kbdusa\kbdusa.dll                      1
 +dll\keyboard\kbdusl\kbdusl.dll                      1
 +dll\keyboard\kbdusr\kbdusr.dll                      1
 +dll\keyboard\kbdusx\kbdusx.dll                      1
 +dll\keyboard\kbduzb\kbduzb.dll                      1
 +dll\keyboard\kbdvntc\kbdvntc.dll                    1
 +dll\keyboard\kbdycc\kbdycc.dll                      1
 +dll\keyboard\kbdycl\kbdycl.dll                      1
- dll\win32\actxprxy\actxprxy.dll                     1
 +
 +dll\ntdll\ntdll.dll                                 1
 +
 +dll\win32\acledit\acledit.dll                       1
 +dll\win32\aclui\aclui.dll                           1
 +dll\win32\activeds\activeds.dll                     1
++dll\win32\actxprxy\actxprxy.dll                     1
 +dll\win32\advapi32\advapi32.dll                     1
 +dll\win32\advpack\advpack.dll                       1
- dll\win32\dwmapi\dwmapi.dll                         1
 +dll\win32\atl\atl.dll                               1
 +dll\win32\authz\authz.dll                           1
 +dll\win32\avicap32\avicap32.dll                     1
 +dll\win32\avifil32\avifil32.dll                     1
 +dll\win32\batt\batt.dll                             1
 +dll\win32\bcrypt\bcrypt.dll                         1
 +dll\win32\beepmidi\beepmidi.dll                     1
 +dll\win32\browseui\browseui.dll                     1
 +dll\win32\cabinet\cabinet.dll                       1
 +dll\win32\cards\cards.dll                           1
 +dll\win32\cfgmgr32\cfgmgr32.dll                     1
 +dll\win32\clusapi\clusapi.dll                       1
 +dll\win32\comcat\comcat.dll                         1
 +dll\win32\comctl32\comctl32.dll                     1
 +dll\win32\comdlg32\comdlg32.dll                     1
 +dll\win32\compstui\compstui.dll                     1
 +dll\win32\credui\credui.dll                         1
 +dll\win32\crtdll\crtdll.dll                         1
 +dll\win32\crypt32\crypt32.dll                       1
 +dll\win32\cryptdlg\cryptdlg.dll                     1
 +dll\win32\cryptdll\cryptdll.dll                     1
 +dll\win32\cryptnet\cryptnet.dll                     1
 +dll\win32\cryptui\cryptui.dll                       1
 +dll\win32\dbghelp\dbghelp.dll                       1
 +dll\win32\dciman32\dciman32.dll                     1
- dll\win32\resutils\resutils.dll                     1
 +dll\win32\devmgr\devmgr.dll                         1
 +dll\win32\dhcpcsvc\dhcpcsvc.dll                     1
 +dll\win32\dnsapi\dnsapi.dll                         1
++dll\win32\dwmapi\dwmapi.dll                         1
 +dll\win32\faultrep\faultrep.dll                     1
 +dll\win32\fmifs\fmifs.dll                           1
 +dll\win32\fusion\fusion.dll                         1
 +dll\win32\gdi32\gdi32.dll                           1
 +dll\win32\gdiplus\gdiplus.dll                       1
 +dll\win32\getuname\getuname.dll                     1
 +dll\win32\glu32\glu32.dll                           1
 +dll\win32\hhctrl.ocx\hhctrl.ocx                     1
 +dll\win32\hid\hid.dll                               1
 +dll\win32\hlink\hlink.dll                           1
 +dll\win32\hnetcfg\hnetcfg.dll                       1
 +dll\win32\httpapi\httpapi.dll                       1
 +dll\win32\iccvid\iccvid.dll                         1
 +dll\win32\icmp\icmp.dll                             1
 +dll\win32\imaadp32.acm\imaadp32.acm                 1
 +dll\win32\imagehlp\imagehlp.dll                     1
 +dll\win32\imm32\imm32.dll                           1
 +dll\win32\inetcomm\inetcomm.dll                     1
 +dll\win32\inetmib1\inetmib1.dll                     1
 +dll\win32\initpki\initpki.dll                       1
 +dll\win32\inseng\inseng.dll                         1
 +dll\win32\iphlpapi\iphlpapi.dll                     1
 +dll\win32\itircl\itircl.dll                         1
 +dll\win32\itss\itss.dll                             1
 +dll\win32\jscript\jscript.dll                       1
 +dll\win32\kernel32\kernel32.dll                     1
 +dll\win32\loadperf\loadperf.dll                     1
 +dll\win32\localspl\localspl.dll                     1
 +dll\win32\localui\localui.dll                       1
++dll\win32\lpk\lpk.dll                               1
 +dll\win32\lsasrv\lsasrv.dll                         1
 +dll\win32\lz32\lz32.dll                             1
 +dll\win32\mapi32\mapi32.dll                         1
 +dll\win32\mciavi32\mciavi32.dll                     1
 +dll\win32\mcicda\mcicda.dll                         1
 +dll\win32\mciqtz32\mciqtz32.dll                     1
 +dll\win32\mciseq\mciseq.dll                         1
 +dll\win32\mciwave\mciwave.dll                       1
 +dll\win32\mlang\mlang.dll                           1
 +dll\win32\mmdrv\mmdrv.dll                           1
 +dll\win32\modemui\modemui.dll                       1
 +dll\win32\mpr\mpr.dll                               1
 +dll\win32\mprapi\mprapi.dll                         1
 +dll\win32\msacm32\msacm32.dll                       1
 +dll\win32\msacm32\msacm32.drv\msacm32.drv           1
 +dll\win32\msadp32.acm\msadp32.acm                   1
 +dll\win32\msafd\msafd.dll                           1
 +dll\win32\mscat32\mscat32.dll                       1
 +dll\win32\mscms\mscms.dll                           1
 +dll\win32\mscoree\mscoree.dll                       1
 +dll\win32\msctf\msctf.dll                           1
 +dll\win32\msftedit\msftedit.dll                     1
 +dll\win32\msg711.acm\msg711.acm                     1
 +dll\win32\msgina\msgina.dll                         1
 +dll\win32\msgsm32.acm\msgsm32.acm                   1
 +dll\win32\mshtml\mshtml.dll                         1
 +dll\win32\mshtml.tlb\mshtml.tlb                     1
 +dll\win32\msi\msi.dll                               1
 +dll\win32\msimg32\msimg32.dll                       1
 +dll\win32\msimtf\msimtf.dll                         1
 +dll\win32\msisip\msisip.dll                         1
 +dll\win32\msisys.ocx\msisys.ocx                     1
 +dll\win32\msnet32\msnet32.dll                       1
 +dll\win32\msrle32\msrle32.dll                       1
 +dll\win32\mssign32\mssign32.dll                     1
 +dll\win32\mssip32\mssip32.dll                       1
 +dll\win32\mstask\mstask.dll                         1
 +dll\win32\msvcrt\msvcrt.dll                         1
 +dll\win32\msvcrt20\msvcrt20.dll                     1
 +dll\win32\msvcrt40\msvcrt40.dll                     1
 +dll\win32\msvfw32\msvfw32.dll                       1
 +dll\win32\msvidc32\msvidc32.dll                     1
 +dll\win32\mswsock\mswsock.dll                       1
 +dll\win32\msxml3\msxml3.dll                         1
 +dll\win32\nddeapi\nddeapi.dll                       1
 +dll\win32\netapi32\netapi32.dll                     1
 +dll\win32\netcfgx\netcfgx.dll                       1
 +dll\win32\netevent\netevent.dll                     1
 +dll\win32\netid\netid.dll                           1
 +dll\win32\netshell\netshell.dll                     1
 +dll\win32\newdev\newdev.dll                         1
 +dll\win32\ntdsapi\ntdsapi.dll                       1
 +dll\win32\ntlanman\ntlanman.dll                     1
 +dll\win32\ntmarta\ntmarta.dll                       1
 +dll\win32\ntprint\ntprint.dll                       1
 +dll\win32\objsel\objsel.dll                         1
 +dll\win32\odbc32\odbc32.dll                         1
 +dll\win32\odbccp32\odbccp32.dll                     1
 +dll\win32\ole32\ole32.dll                           1
 +dll\win32\oleacc\oleacc.dll                         1
 +dll\win32\oleaut32\oleaut32.dll                     1
 +dll\win32\olecli32\olecli32.dll                     1
 +dll\win32\oledlg\oledlg.dll                         1
 +dll\win32\olepro32\olepro32.dll                     1
 +dll\win32\olesvr32\olesvr32.dll                     1
 +dll\win32\olethk32\olethk32.dll                     1
 +dll\win32\opengl32\opengl32.dll                     1
 +dll\win32\pdh\pdh.dll                               1
 +dll\win32\pidgen\pidgen.dll                         1
 +dll\win32\powrprof\powrprof.dll                     1
 +dll\win32\printui\printui.dll                       1
 +dll\win32\psapi\psapi.dll                           1
 +dll\win32\pstorec\pstorec.dll                       1
 +dll\win32\qmgr\qmgr.dll                             1
 +dll\win32\qmgrprxy\qmgrprxy.dll                     1
 +dll\win32\query\query.dll                           1
 +dll\win32\rasadhlp\rasadhlp.dll                     1
 +dll\win32\rasapi32\rasapi32.dll                     1
 +dll\win32\rasdlg\rasdlg.dll                         1
- dll\win32\wlanapi\wlanapi.dll                       1
 +dll\win32\rasman\rasman.dll                         1
++dll\win32\resutils\resutils.dll                     1
 +dll\win32\riched20\riched20.dll                     1
 +dll\win32\riched32\riched32.dll                     1
 +dll\win32\rpcrt4\rpcrt4.dll                         1
 +dll\win32\rsabase\rsabase.dll                       1
 +dll\win32\rsaenh\rsaenh.dll                         1
 +dll\win32\samlib\samlib.dll                         1
 +dll\win32\samsrv\samsrv.dll                         1
 +dll\win32\sccbase\sccbase.dll                       1
 +dll\win32\schannel\schannel.dll                     1
 +dll\win32\secur32\secur32.dll                       1
 +dll\win32\security\security.dll                     1
 +dll\win32\sensapi\sensapi.dll                       1
 +dll\win32\serialui\serialui.dll                     1
 +dll\win32\setupapi\setupapi.dll                     1
 +dll\win32\sfc\sfc.dll                               1
 +dll\win32\sfc_os\sfc_os.dll                         1
 +dll\win32\shdoclc\shdoclc.dll                       1
 +dll\win32\shdocvw\shdocvw.dll                       1
 +dll\win32\shell32\shell32.dll                       1
 +dll\win32\shfolder\shfolder.dll                     1
 +dll\win32\shimgvw\shimgvw.dll                       1
 +dll\win32\shlwapi\shlwapi.dll                       1
 +dll\win32\slbcsp\slbcsp.dll                         1
 +dll\win32\smdll\smdll.dll                           1
++dll\win32\sndblst\sndblst.dll                       1
 +dll\win32\snmpapi\snmpapi.dll                       1
 +dll\win32\softpub\softpub.dll                       1
 +dll\win32\spoolss\spoolss.dll                       1
 +dll\win32\srclient\srclient.dll                     1
 +dll\win32\stdole2.tlb\stdole2.tlb                   1
 +dll\win32\stdole32.tlb\stdole32.tlb                 1
 +dll\win32\sti\sti.dll                               1
 +dll\win32\sxs\sxs.dll                               1
 +dll\win32\syssetup\syssetup.dll                     1
 +dll\win32\t2embed\t2embed.dll                       1
 +dll\win32\tapi32\tapi32.dll                         1
 +dll\win32\tapiui\tapiui.dll                         1
 +dll\win32\traffic\traffic.dll                       1
 +dll\win32\twain_32\twain_32.dll                     1
 +dll\win32\uext2\uext2.dll                           1
 +dll\win32\ufat\ufat.dll                             1
 +dll\win32\ufatx\ufatx.dll                           1   optional
 +dll\win32\untfs\untfs.dll                           1
 +dll\win32\updspapi\updspapi.dll                     1
 +dll\win32\url\url.dll                               1
 +dll\win32\urlmon\urlmon.dll                         1
 +dll\win32\user32\user32.dll                         1
 +dll\win32\userenv\userenv.dll                       1
 +dll\win32\usp10\usp10.dll                           1
 +dll\win32\uxtheme\uxtheme.dll                       1
 +dll\win32\vdmdbg\vdmdbg.dll                         1
 +dll\win32\version\version.dll                       1
++dll\win32\wdmaud.drv\wdmaud.drv                     1
 +dll\win32\windowscodecs\windowscodecs.dll           1
 +dll\win32\winemp3.acm\winemp3.acm                   1
 +dll\win32\winfax\winfax.dll                         1
++dll\win32\wing32\wing32.dll                         1
 +dll\win32\winhttp\winhttp.dll                       1
 +dll\win32\wininet\wininet.dll                       1
 +dll\win32\winmm\winmm.dll                           1
++dll\win32\winmm\midimap\midimap.dll                 1
 +dll\win32\winspool\winspool.drv                     1
 +dll\win32\winsta\winsta.dll                         1
- dll\win32\winmm\midimap\midimap.dll                 1
- dll\win32\wdmaud.drv\wdmaud.drv                     1
 +dll\win32\wintrust\wintrust.dll                     1
++dll\win32\wlanapi\wlanapi.dll                       1
 +dll\win32\wldap32\wldap32.dll                       1
 +dll\win32\wmi\wmi.dll                               1
 +dll\win32\ws2_32\ws2_32.dll                         1
 +dll\win32\ws2help\ws2help.dll                       1
 +dll\win32\wshirda\wshirda.dll                       1
 +dll\win32\wshtcpip\wshtcpip.dll                     1
 +dll\win32\wsock32\wsock32.dll                       1
 +dll\win32\wtsapi32\wtsapi32.dll                     1
 +dll\win32\wuapi\wuapi.dll                           1
 +dll\win32\xinput1_1\xinput1_1.dll                   1
 +dll\win32\xinput1_2\xinput1_2.dll                   1
 +dll\win32\xinput1_3\xinput1_3.dll                   1
 +dll\win32\xinput9_1_0\xinput9_1_0.dll               1
 +dll\win32\xmllite\xmllite.dll                       1
- drivers\base\bootvid\bootvid.dll                    1
 +
 +; Shell Extensions
 +dll\shellext\deskadp\deskadp.dll                    1
 +dll\shellext\deskmon\deskmon.dll                    1
++dll\shellext\devcpux\devcpux.dll                    1
++dll\shellext\fontext\fontext.dll                    1
++dll\shellext\slayer\slayer.dll                      1
 +
 +; Drivers
- drivers\base\null\null.sys                          2
 +drivers\base\beep\beep.sys                          2
++drivers\base\bootvid\bootvid.dll                    1
 +drivers\base\nmidebug\nmidebug.sys                  2
++drivers\base\null\null.sys                          2
 +
 +drivers\battery\battc\battc.sys                     2
 +
 +drivers\bus\acpi\cmbatt\cmbatt.sys                  2
 +drivers\bus\acpi\compbatt\compbatt.sys              2
 +
 +drivers\directx\dxapi\dxapi.sys                     2
 +drivers\directx\dxg\dxg.sys                         2
 +drivers\directx\dxgthk\dxgthk.sys                   2
 +
 +drivers\filesystems\fs_rec\fs_rec.sys               2
 +drivers\filesystems\msfs\msfs.sys                   2
 +drivers\filesystems\mup\mup.sys                     2
 +drivers\filesystems\npfs\npfs.sys                   2
 +
 +drivers\input\mouclass\mouclass.sys                 2
 +drivers\input\sermouse\sermouse.sys                 2
 +
 +drivers\ksfilter\ks\ks.sys                          2
 +;drivers\multimedia\bdasup\bdasup.sys                2
 +
 +drivers\network\afd\afd.sys                         2
 +drivers\network\ndis\ndis.sys                       2
 +drivers\network\tcpip\tcpip.sys                     2
 +drivers\network\tdi\tdi.sys                         2
 +drivers\network\dd\ne2000\ne2000.sys                2
 +drivers\network\dd\pcnet\pcnet.sys                  2
 +
 +drivers\serial\serenum\serenum.sys                  2
 +drivers\serial\serial\serial.sys                    2
 +
 +drivers\storage\ide\pciide\pciide.sys               2
 +drivers\storage\ide\pciidex\pciidex.sys             2
 +
 +;drivers\usb\miniport\usbohci\usbohci.sys           2
 +;drivers\usb\miniport\usbuhci\usbuhci.sys           2
 +;drivers\usb\usbhub\usbhub.sys                      2
 +;drivers\usb\usbport\usbport.sys                    2
 +drivers\usb\nt4compat\usbdriver\usbdriver.sys       2
 +
 +drivers\video\displays\vga\vgaddi.dll               1
 +drivers\video\displays\framebuf\framebuf.dll        1
 +drivers\video\miniport\vga\vgamp.sys                2
 +drivers\video\miniport\vbe\vbemp.sys                2
 +drivers\video\videoprt\videoprt.sys                 2
 +drivers\video\font\ftfd\ftfd.dll                   1
 +
 +drivers\wdm\audio\filters\kmixer\kmixer.sys         2
 +drivers\wdm\audio\sysaudio\sysaudio.sys             2
 +drivers\wdm\audio\legacy\wdmaud\wdmaud.sys          2
 +drivers\wdm\audio\backpln\portcls\portcls.sys       2
 +drivers\wdm\audio\drm\drmk\drmk.sys                 2
 +drivers\wmi\wmilib.sys                              2
 +
 +; Media
 +media\fonts\DejaVuSans.ttf                          3
 +media\fonts\DejaVuSans-Bold.ttf                     3
 +media\fonts\DejaVuSans-BoldOblique.ttf              3
 +media\fonts\DejaVuSansMono.ttf                      3
 +media\fonts\DejaVuSansMono-Bold.ttf                 3
 +media\fonts\DejaVuSansMono-BoldOblique.ttf          3
 +media\fonts\DejaVuSansMono-Oblique.ttf              3
 +media\fonts\DejaVuSans-Oblique.ttf                  3
 +media\fonts\DejaVuSerif.ttf                         3
 +media\fonts\DejaVuSerif-Bold.ttf                    3
 +media\fonts\DejaVuSerif-BoldItalic.ttf              3
 +media\fonts\DejaVuSerif-Italic.ttf                  3
 +
 +media\fonts\FreeMono.ttf                            3
 +media\fonts\FreeMonoBold.ttf                        3
 +media\fonts\FreeMonoBoldOblique.ttf                 3
 +media\fonts\FreeMonoOblique.ttf                     3
 +
 +media\fonts\LiberationMono-Bold.ttf                 3
 +media\fonts\LiberationMono-BoldItalic.ttf           3
 +media\fonts\LiberationMono-Italic.ttf               3
 +media\fonts\LiberationMono-Regular.ttf              3
 +media\fonts\LiberationSans-Bold.ttf                 3
 +media\fonts\LiberationSans-BoldItalic.ttf           3
 +media\fonts\LiberationSans-Italic.ttf               3
 +media\fonts\LiberationSans-Regular.ttf              3
 +media\fonts\LiberationSerif-Bold.ttf                3
 +media\fonts\LiberationSerif-BoldItalic.ttf          3
 +media\fonts\LiberationSerif-Italic.ttf              3
 +media\fonts\LiberationSerif-Regular.ttf             3
 +
 +media\fonts\Marlett.ttf                             3
 +media\fonts\symbol.ttf                              3
 +media\fonts\tahoma.ttf                              3
 +media\fonts\tahomabd.ttf                            3
 +
 +media\vgafonts\vgafonts.cab                         4
 +
 +media\nls\c_037.nls                                 1
 +media\nls\c_424.nls                                 1
 +media\nls\c_500.nls                                 1
 +media\nls\c_737.nls                                 1
 +media\nls\c_775.nls                                 1
 +media\nls\c_850.nls                                 1
 +media\nls\c_852.nls                                 1
 +media\nls\c_855.nls                                 1
 +media\nls\c_856.nls                                 1
 +media\nls\c_857.nls                                 1
 +media\nls\c_860.nls                                 1
 +media\nls\c_861.nls                                 1
 +media\nls\c_862.nls                                 1
 +media\nls\c_863.nls                                 1
 +media\nls\c_864.nls                                 1
 +media\nls\c_865.nls                                 1
 +media\nls\c_866.nls                                 1
 +media\nls\c_869.nls                                 1
 +media\nls\c_874.nls                                 1
 +media\nls\c_875.nls                                 1
 +media\nls\c_878.nls                                 1
 +media\nls\c_932.nls                                 1
 +media\nls\c_936.nls                                 1
 +media\nls\c_949.nls                                 1
 +media\nls\c_950.nls                                 1
 +media\nls\c_1006.nls                                1
 +media\nls\c_1026.nls                                1
 +media\nls\c_1250.nls                                1
 +media\nls\c_1251.nls                                1
 +media\nls\c_1253.nls                                1
 +media\nls\c_1254.nls                                1
 +media\nls\c_1255.nls                                1
 +media\nls\c_1256.nls                                1
 +media\nls\c_1257.nls                                1
 +media\nls\c_1258.nls                                1
 +media\nls\c_10000.nls                               1
 +media\nls\c_10006.nls                               1
 +media\nls\c_10007.nls                               1
 +media\nls\c_10029.nls                               1
 +media\nls\c_10079.nls                               1
 +media\nls\c_10081.nls                               1
 +media\nls\c_20866.nls                               1
 +media\nls\c_21866.nls                               1
 +media\nls\c_28591.nls                               1
 +media\nls\c_28592.nls                               1
 +media\nls\c_28593.nls                               1
 +media\nls\c_28594.nls                               1
 +media\nls\c_28595.nls                               1
 +media\nls\c_28596.nls                               1
 +media\nls\c_28597.nls                               1
 +media\nls\c_28598.nls                               1
 +media\nls\c_28599.nls                               1
 +media\nls\c_28600.nls                               1
 +media\nls\c_28603.nls                               1
 +media\nls\c_28604.nls                               1
 +media\nls\c_28605.nls                               1
 +media\nls\c_28606.nls                               1
 +media\drivers\etc\hosts                             5
 +media\drivers\etc\services                          5
 +media\inf\audio.inf                                 6
 +media\inf\acpi.inf                                  6
 +media\inf\battery.inf                               6
 +media\inf\cdrom.inf                                 6
 +media\inf\cpu.inf                                   6
 +media\inf\display.inf                               6
 +media\inf\font.inf                                  6
 +media\inf\fdc.inf                                   6
 +media\inf\hdc.inf                                   6
 +media\inf\intl.inf                                  6
 +media\inf\layout.inf                                6
 +media\inf\machine.inf                               6
 +media\inf\msmouse.inf                               6
 +media\inf\keyboard.inf                              6
 +media\inf\ks.inf                                    6
 +media\inf\NET_NIC.inf                               6
 +media\inf\netamd.inf                                6
 +media\inf\netisa.inf                                6
 +media\inf\netrtpnt.inf                              6
 +media\inf\nettcpip.inf                              6
 +media\inf\ports.inf                                 6
 +media\inf\scsi.inf                                  6
 +media\inf\syssetup.inf                              6
 +media\inf\usbport.inf                               6
 +media\inf\usb.inf                                   6
 +media\inf\usbstor.inf                               6
 +media\inf\xboxdisp.inf                              6
 +
 +
 +; Media Files
 +media\sounds\ReactOS_LogOn.wav                      8
 +
 +; Ini Files
 +boot\bootdata\system.ini                            4
 +
 +; Regression Testing
 +boot\bootdata\bootcdregtest\regtest.cmd             7   optional
 +
 +; Subsystems
 +subsystems\win32\csrss\csrss.exe                    1
 +subsystems\win32\csrss\win32csr\win32csr.dll        1
 +subsystems\win32\csrss\csrsrv\csrsrv.dll            1
 +subsystems\ntvdm\ntvdm.exe                          1
 +subsystems\win32\win32k\win32k.sys                  1
 +
 +; Optional/proprietary files
 +modules\optional\DroidSansFallback.ttf              3  optional
 +modules\optional\NOTICE_for_Droid_Font.txt          4  optional
 +modules\optional\netkvm2k.inf                       6  optional
 +modules\optional\netkvm2k.cat                       6  optional
 +modules\optional\netkvm.sys                         2  optional
 +modules\optional\alcxwdm.inf                        6  optional
 +modules\optional\alcxwdm.sys                        2  optional
 +modules\optional\mfc42.dll                          1  optional
 +modules\optional\mfc42u.dll                         1  optional
 +modules\optional\mfc71.dll                          1  optional
 +modules\optional\mfc71u.dll                         1  optional
 +modules\optional\msvbvm50.dll                       1  optional
 +modules\optional\msvbvm60.dll                       1  optional
 +modules\optional\msvcirt.dll                        1  optional
 +modules\optional\msvcp71.dll                        1  optional
 +modules\optional\msvcr71.dll                        1  optional
 +modules\optional\vmx_fb.dll                         1  optional
 +modules\optional\vmx_mode.dll                       1  optional
 +modules\optional\vmx_svga.inf                       6  optional
 +modules\optional\vmx_svga.sys                       2  optional
 +modules\optional\wine_gecko-1.0.0-x86.cab           4  optional
 +
 +; Rosapps
 +modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr              1   optional
 +modules\rosapps\applications\screensavers\matrix\matrix.scr                1   optional
 +modules\rosapps\applications\screensavers\blankscr\scrnsave.scr            1   optional
 +modules\rosapps\applications\screensavers\starfield\starfield.scr          1   optional
 +modules\rosapps\applications\screensavers\mazescr\mazescr.scr              1   optional
 +modules\rosapps\applications\screensavers\butterflies\butterflies.scr      1   optional
 +modules\rosapps\applications\cmdutils\comp\comp.exe                                     1   optional
 +modules\rosapps\applications\cmdutils\mode\mode.exe                                     1   optional
 +modules\rosapps\applications\cmdutils\sort\sort.exe                                     1   optional
 +modules\rosapps\applications\cmdutils\tee\tee.exe                                       1   optional
 +modules\rosapps\applications\cmdutils\touch\touch.exe                                   1   optional
 +modules\rosapps\applications\cmdutils\uptime\uptime.exe                                 1   optional
 +modules\rosapps\applications\cmdutils\y\y.exe                                           1   optional
 +modules\rosapps\applications\devutils\gdb2\gdb2.exe                                     1   optional
 +modules\rosapps\applications\devutils\gdihv\gdihv.exe                                   1   optional
 +modules\rosapps\applications\devutils\genguid\genguid.exe                               1   optional
 +modules\rosapps\applications\sysutils\gettype\gettype.exe                               1   optional
 +modules\rosapps\applications\net\ncftp\ncftp.exe                                        1   optional
 +modules\rosapps\applications\net\netreg\netreg.exe                                      1   optional
 +modules\rosapps\applications\net\niclist\niclist.exe                                    1   optional
 +modules\rosapps\applications\net\roshttpd\roshttpd.exe                                  1   optional
 +modules\rosapps\applications\notevil\notevil.exe                                        1   optional
 +modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe                                 1   optional
 +modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe                         1   optional
 +modules\rosapps\applications\sysutils\chklib\chklib.exe                                 1   optional
 +modules\rosapps\applications\sysutils\ctm\ctm.exe                                       1   optional
 +modules\rosapps\applications\sysutils\kill\kill.exe                                     1   optional
 +modules\rosapps\applications\sysutils\lsdd\lsdd.exe                                     1   optional
 +modules\rosapps\applications\sysutils\man\man.exe                                       1   optional
 +modules\rosapps\applications\sysutils\pedump\pedump.exe                                 1   optional
 +modules\rosapps\applications\sysutils\regexpl\regexpl.exe                               1   optional
 +modules\rosapps\applications\sysutils\tcat\tcat.exe                                     1   optional
 +modules\rosapps\applications\sysutils\tlist\tlist.exe                                   1   optional
 +modules\rosapps\applications\sysutils\screenshot\screenshot.exe                         1   optional
 +modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe                       1   optional
 +modules\rosapps\applications\sysutils\utils\cat\cat.exe                                 1   optional
 +modules\rosapps\applications\sysutils\utils\driver\load\load.exe                        1   optional
 +modules\rosapps\applications\sysutils\utils\driver\unload\unload.exe                    1   optional
 +modules\rosapps\applications\sysutils\utils\infinst\infinst.exe                         1   optional
 +modules\rosapps\applications\sysutils\utils\nts2w32err\nts2w32err.exe                   1   optional
 +modules\rosapps\applications\sysutils\utils\objdir\objdir.exe                           1   optional
 +modules\rosapps\applications\sysutils\utils\partinfo\partinfo.exe                       1   optional
 +modules\rosapps\applications\sysutils\utils\ps\ps.exe                                   1   optional
 +modules\rosapps\applications\sysutils\utils\rosperf\rosperf.exe                         1   optional
 +modules\rosapps\applications\sysutils\utils\stats\stats.exe                             1   optional
 +modules\rosapps\applications\sysutils\utils\tickcount\tickcount.exe                     1   optional
 +modules\rosapps\applications\winfile\winfile.exe                                        1   optional
 +modules\rosapps\demos\maze\maze.exe                                        1   optional
 +modules\rosapps\drivers\green\green.sys                                    2   optional
 +
 +; Rostests
 +modules\rostests\rosautotest\rosautotest.exe                               1   optional
 +modules\rostests\drivers\kmtest\kmtest.sys                                 2   optional
 +modules\rostests\drivers\kmtest\kmtestassist.sys                           2   optional
 +modules\rostests\tests\pseh2\pseh2_test.exe                                7   optional
 +modules\rostests\winetests\advapi32\advapi32_winetest.exe                  7   optional
 +modules\rostests\winetests\advpack\advpack_winetest.exe                    7   optional
 +modules\rostests\winetests\amstream\amstream_winetest.exe                  7   optional
 +modules\rostests\winetests\atl\atl_winetest.exe                            7   optional
 +modules\rostests\winetests\avifil32\avifil32_winetest.exe                  7   optional
 +modules\rostests\winetests\browseui\browseui_winetest.exe                  7   optional
 +modules\rostests\winetests\cabinet\cabinet_winetest.exe                    7   optional
 +modules\rostests\winetests\comcat\comcat_winetest.exe                      7   optional
 +modules\rostests\winetests\comctl32\comctl32_winetest.exe                  7   optional
 +modules\rostests\winetests\comdlg32\comdlg32_winetest.exe                  7   optional
 +modules\rostests\winetests\credui\credui_winetest.exe                      7   optional
 +modules\rostests\winetests\crypt32\crypt32_winetest.exe                    7   optional
 +modules\rostests\winetests\cryptnet\cryptnet_winetest.exe                  7   optional
 +modules\rostests\winetests\cryptui\cryptui_winetest.exe                    7   optional
 +modules\rostests\winetests\dnsapi\dnsapi_winetest.exe                      7   optional
 +modules\rostests\winetests\dsound\dsound_winetest.exe                      7   optional
 +modules\rostests\winetests\fusion\fusion_winetest.exe                      7   optional
 +modules\rostests\winetests\gdi32\gdi32_winetest.exe                        7   optional
 +modules\rostests\winetests\gdiplus\gdiplus_winetest.exe                    7   optional
 +modules\rostests\winetests\hlink\hlink_winetest.exe                        7   optional
 +modules\rostests\winetests\icmp\icmp_winetest.exe                          7   optional
 +modules\rostests\winetests\imm32\imm32_winetest.exe                        7   optional
 +modules\rostests\winetests\inetcomm\inetcomm_winetest.exe                  7   optional
 +modules\rostests\winetests\inetmib1\inetmib1_winetest.exe                  7   optional
 +modules\rostests\winetests\iphlpapi\iphlpapi_winetest.exe                  7   optional
 +modules\rostests\winetests\itss\itss_winetest.exe                          7   optional
 +modules\rostests\winetests\jscript\jscript_winetest.exe                    7   optional
 +modules\rostests\winetests\kernel32\kernel32_winetest.exe                  7   optional
 +modules\rostests\winetests\localspl\localspl_winetest.exe                  7   optional
 +modules\rostests\winetests\localui\localui_winetest.exe                    7   optional
 +modules\rostests\winetests\lz32\lz32_winetest.exe                          7   optional
 +modules\rostests\winetests\mapi32\mapi32_winetest.exe                      7   optional
 +modules\rostests\winetests\mlang\mlang_winetest.exe                        7   optional
 +modules\rostests\winetests\msacm32\msacm32_winetest.exe                    7   optional
 +modules\rostests\winetests\mscms\mscms_winetest.exe                        7   optional
 +modules\rostests\winetests\msctf\msctf_winetest.exe                        7   optional
 +modules\rostests\winetests\mshtml\mshtml_winetest.exe                      7   optional
 +modules\rostests\winetests\msi\msi_winetest.exe                            7   optional
 +modules\rostests\winetests\mstask\mstask_winetest.exe                      7   optional
 +modules\rostests\winetests\msvcrt\msvcrt_winetest.exe                      7   optional
 +modules\rostests\winetests\msvcrtd\msvcrtd_winetest.exe                    7   optional
 +modules\rostests\winetests\msvfw32\msvfw32_winetest.exe                    7   optional
 +modules\rostests\winetests\msxml3\msxml3_winetest.exe                      7   optional
 +modules\rostests\winetests\netapi32\netapi32_winetest.exe                  7   optional
 +modules\rostests\winetests\ntdll\ntdll_winetest.exe                        7   optional
 +modules\rostests\winetests\ntdsapi\ntdsapi_winetest.exe                    7   optional
 +modules\rostests\winetests\ntprint\ntprint_winetest.exe                    7   optional
 +modules\rostests\winetests\odbccp32\odbccp32_winetest.exe                  7   optional
 +modules\rostests\winetests\ole32\ole32_winetest.exe                        7   optional
 +modules\rostests\winetests\oleacc\oleacc_winetest.exe                      7   optional
 +modules\rostests\winetests\oleaut32\oleaut32_winetest.exe                  7   optional
 +modules\rostests\winetests\opengl32\opengl32_winetest.exe                  7   optional
 +modules\rostests\winetests\pdh\pdh_winetest.exe                            7   optional
 +modules\rostests\winetests\powrprof\powrprof_winetest.exe                  7   optional
 +modules\rostests\winetests\psapi\psapi_winetest.exe                        7   optional
 +modules\rostests\winetests\qmgr\qmgr_winetest.exe                          7   optional
 +modules\rostests\winetests\quartz\quartz_winetest.exe                      7   optional
 +modules\rostests\winetests\rasapi32\rasapi32_winetest.exe                  7   optional
 +modules\rostests\winetests\riched20\riched20_winetest.exe                  7   optional
 +modules\rostests\winetests\riched32\riched32_winetest.exe                  7   optional
 +modules\rostests\winetests\rpcrt4\rpcrt4_winetest.exe                      7   optional
 +modules\rostests\winetests\rsabase\rsabase_winetest.exe                    7   optional
 +modules\rostests\winetests\rsaenh\rsaenh_winetest.exe                      7   optional
 +modules\rostests\winetests\schannel\schannel_winetest.exe                  7   optional
 +modules\rostests\winetests\secur32\secur32_winetest.exe                    7   optional
 +modules\rostests\winetests\serialui\serialui_winetest.exe                  7   optional
 +modules\rostests\winetests\setupapi\setupapi_winetest.exe                  7   optional
 +modules\rostests\winetests\shdocvw\shdocvw_winetest.exe                    7   optional
 +modules\rostests\winetests\shell32\shell32_winetest.exe                    7   optional
 +modules\rostests\winetests\shlwapi\shlwapi_winetest.exe                    7   optional
 +modules\rostests\winetests\snmpapi\snmpapi_winetest.exe                    7   optional
 +modules\rostests\winetests\spoolss\spoolss_winetest.exe                    7   optional
 +modules\rostests\winetests\twain_32\twain_32_winetest.exe                  7   optional
 +modules\rostests\winetests\urlmon\urlmon_winetest.exe                      7   optional
 +modules\rostests\winetests\user32\user32_winetest.exe                      7   optional
 +modules\rostests\winetests\usp10\usp10_winetest.exe                        7   optional
 +modules\rostests\winetests\uxtheme\uxtheme_winetest.exe                    7   optional
 +modules\rostests\winetests\version\version_winetest.exe                    7   optional
 +modules\rostests\winetests\winhttp\winhttp_winetest.exe                    7   optional
 +modules\rostests\winetests\wininet\wininet_winetest.exe                    7   optional
 +modules\rostests\winetests\winmm\winmm_winetest.exe                        7   optional
 +modules\rostests\winetests\wintrust\wintrust_winetest.exe                  7   optional
 +modules\rostests\winetests\wlanapi\wlanapi_winetest.exe                    7   optional
 +modules\rostests\winetests\wldap32\wldap32_winetest.exe                    7   optional
 +modules\rostests\winetests\ws2_32\ws2_32_winetest.exe                      7   optional
 +modules\rostests\winetests\xmllite\xmllite_winetest.exe                    7   optional
 +
 +
 +modules\wallpaper\Angelus_02_ROSWP.bmp                                     4   optional
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,f43e2ea..f43e2ea
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,0b7ea55..0b7ea55
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
index 0000000,c858b24..c858b24
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
index 0000000,5f6c7c2..5f6c7c2
mode 000000,100644..100644
--- /dev/null
index 0000000,0dff489..0dff489
mode 000000,100644..100644
--- /dev/null
index 0000000,584ac04..584ac04
mode 000000,100644..100644
--- /dev/null
index 0000000,dd89a66..dd89a66
mode 000000,100644..100644
--- /dev/null
index 0000000,799f3eb..799f3eb
mode 000000,100644..100644
--- /dev/null
index 0000000,0af8d82..0af8d82
mode 000000,100644..100644
--- /dev/null
index 0000000,d9960db..d9960db
mode 000000,100644..100644
--- /dev/null
index 0000000,dab4f36..dab4f36
mode 000000,100644..100644
--- /dev/null
index 0000000,633eae2..633eae2
mode 000000,100644..100644
--- /dev/null
index 0000000,abe721b..abe721b
mode 000000,100644..100644
--- /dev/null
index 0000000,c8a3f6f..c8a3f6f
mode 000000,100644..100644
--- /dev/null
index 0000000,3280d34..3280d34
mode 000000,100644..100644
--- /dev/null
index 0000000,92060d2..92060d2
mode 000000,100644..100644
--- /dev/null
index 0000000,59059ca..59059ca
mode 000000,100644..100644
--- /dev/null
index 0000000,b5e8f1a..b5e8f1a
mode 000000,100644..100644
--- /dev/null
index 0000000,416e5d2..416e5d2
mode 000000,100644..100644
--- /dev/null
index 0000000,1f972c4..1f972c4
mode 000000,100644..100644
--- /dev/null
index 0000000,836441d..836441d
mode 000000,100644..100644
--- /dev/null
index 0000000,f80679a..f80679a
mode 000000,100644..100644
--- /dev/null
index 0000000,513a71a..513a71a
mode 000000,100644..100644
--- /dev/null
index 0000000,0252051..0252051
mode 000000,100644..100644
--- /dev/null
index 0000000,070caa5..070caa5
mode 000000,100644..100644
--- /dev/null
index 0000000,19feb1d..19feb1d
mode 000000,100644..100644
--- /dev/null
index 0000000,3caefd8..3caefd8
mode 000000,100644..100644
--- /dev/null
index 0000000,7f4346b..7f4346b
mode 000000,100644..100644
--- /dev/null
index 0000000,272f0d9..272f0d9
mode 000000,100644..100644
--- /dev/null
index 0000000,02591ba..02591ba
mode 000000,100644..100644
--- /dev/null
index 0000000,d5c6fd1..d5c6fd1
mode 000000,100644..100644
--- /dev/null
index 0000000,02eb346..02eb346
mode 000000,100644..100644
--- /dev/null
index 0000000,ac44b38..ac44b38
mode 000000,100644..100644
--- /dev/null
index 0000000,2377abd..2377abd
mode 000000,100644..100644
--- /dev/null
index 0000000,9eec4ab..9eec4ab
mode 000000,100644..100644
--- /dev/null
index 0000000,822191e..822191e
mode 000000,100644..100644
--- /dev/null
index 0000000,7ecc4d8..7ecc4d8
mode 000000,100644..100644
--- /dev/null
index 0000000,c92ee3d..c92ee3d
mode 000000,100644..100644
--- /dev/null
index 0000000,a967827..a967827
mode 000000,100644..100644
--- /dev/null
index 0000000,eb622b9..eb622b9
mode 000000,100644..100644
--- /dev/null
index 0000000,d423866..d423866
mode 000000,100644..100644
--- /dev/null
index 0000000,d7652bb..d7652bb
mode 000000,100644..100644
--- /dev/null
index 0000000,9ae856c..9ae856c
mode 000000,100644..100644
--- /dev/null
index 0000000,3b3b2ce..3b3b2ce
mode 000000,100644..100644
--- /dev/null
index 0000000,eb4b1e7..eb4b1e7
mode 000000,100644..100644
--- /dev/null
index 0000000,8ac0ae6..8ac0ae6
mode 000000,100644..100644
--- /dev/null
index 0000000,63dec6b..63dec6b
mode 000000,100644..100644
--- /dev/null
index 0000000,e4f1a6d..e4f1a6d
mode 000000,100644..100644
--- /dev/null
index 0000000,d8379e6..d8379e6
mode 000000,100644..100644
--- /dev/null
index 0000000,2ab944b..2ab944b
mode 000000,100644..100644
--- /dev/null
index 0000000,bd08418..bd08418
mode 000000,100644..100644
--- /dev/null
index 0000000,15091f8..15091f8
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,b8ea30c..b8ea30c
mode 000000,100644..100644
--- /dev/null
index 0000000,4b18189..4b18189
mode 000000,100644..100644
--- /dev/null
index 0000000,67d3bb8..67d3bb8
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,842f3fc..842f3fc
mode 000000,100644..100644
--- /dev/null
index 0000000,870704f..870704f
mode 000000,100644..100644
--- /dev/null
index 0000000,8053b61..8053b61
mode 000000,100644..100644
--- /dev/null
index 0000000,d35639d..d35639d
mode 000000,100644..100644
--- /dev/null
index 0000000,685d5d7..685d5d7
mode 000000,100644..100644
--- /dev/null
index 0000000,bfbba83..bfbba83
mode 000000,100644..100644
--- /dev/null
index 0000000,643a8bf..643a8bf
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,b29294f..b29294f
mode 000000,100644..100644
--- /dev/null
Simple merge