Partially fixed up tree after merge from HEAD. More to do.

[reactos.git] / reactos / boot / bootdata / packages / reactos.dff

diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 8e0845d..4daba9f 100644 (file)
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -32,8 +32,6 @@ Signature = "$ReactOS$"
 ; Base files
 base\applications\cacls\cacls.exe                   1
 base\applications\calc\calc.exe                     1
-base\applications\cmdutils\find\find.exe            1
-base\applications\cmdutils\more\more.exe            1
 base\applications\control\control.exe               1
 base\applications\devmgr\devmgrapp.exe              1
 base\applications\devmgmt\devmgmt.exe               1
@@ -61,11 +59,9 @@ base\applications\regedit\clb\clb.dll               1
 ;base\applications\reporterror\reporterror.exe      1
 base\applications\sc\sc.exe                         1
 base\applications\screenshot\screenshot.exe         1
-base\applications\screensavers\matrix\matrix.scr    1
 base\applications\servman\servman.exe               1
 base\applications\shutdown\shutdown.exe             1
-base\applications\sm\sm.exe                         1
-base\applications\sndvol32\sndvol32.exe             1
+;base\applications\sm\sm.exe                        1
 base\applications\taskmgr\taskmgr.exe               1
 ;base\applications\utils\rosperf\rosperf.exe        1
 ;base\applications\utils\ps\ps.exe                  1
@@ -174,7 +170,7 @@ dll\win32\imm32\imm32.dll                           1
 dll\win32\iphlpapi\iphlpapi.dll                     1
 dll\win32\kernel32\kernel32.dll                     1
 dll\win32\lsasrv\lsasrv.dll                         1
-dll\win32\lz32\lz32.dll                             1
+dll\win32\lzexpand\lz32.dll                         1
 dll\win32\mapi32\mapi32.dll                         1
 dll\win32\winmm\midimap\midimap.dll                 1
 dll\win32\mmdrv\mmdrv.dll                           1
@@ -202,7 +198,7 @@ dll\win32\opengl32\opengl32.dll                     1
 dll\win32\psapi\psapi.dll                           1
 dll\win32\powrprof\powrprof.dll                     1
 dll\win32\riched20\riched20.dll                     1
-dll\win32\riched32\riched32.dll                     1
+dll\win32\richedit\riched32.dll                     1
 dll\win32\rpcrt4\rpcrt4.dll                         1
 dll\win32\samlib\samlib.dll                         1
 dll\win32\samsrv\samsrv.dll                         1
@@ -215,7 +211,7 @@ dll\win32\shfolder\shfolder.dll                     1
 dll\win32\shlwapi\shlwapi.dll                       1
 dll\win32\smdll\smdll.dll                           1
 dll\win32\syssetup\syssetup.dll                     1
-dll\win32\twain_32\twain_32.dll                     1
+dll\win32\twain\twain_32.dll                        1
 dll\win32\ufat\ufat.dll                             1
 dll\win32\ufatx\ufatx.dll                           1   optional
 dll\win32\urlmon\urlmon.dll                         1
@@ -223,7 +219,6 @@ dll\win32\user32\user32.dll                         1
 dll\win32\userenv\userenv.dll                       1
 dll\win32\uxtheme\uxtheme.dll                       1
 dll\win32\version\version.dll                       1
-dll\win32\vdmdbg\vdmdbg.dll                         1
 dll\win32\wininet\wininet.dll                       1
 dll\win32\winmm\winmm.dll                           1
 dll\win32\winspool\winspool.drv                     1
@@ -441,7 +436,9 @@ modules\rosky\dll\win32\libskygi\libskygi.dll       1   optional
 modules\vms\server\vmssrv.dll                       1   optional
 modules\vms\dll\win32\vmsdll\vmsdll.dll             1   optional
 modules\rosapps\cmdutils\comp\comp.exe              1   optional
+modules\rosapps\cmdutils\find\find.exe              1   optional
 modules\rosapps\cmdutils\mode\mode.exe              1   optional
+modules\rosapps\cmdutils\more\more.exe              1   optional
 modules\rosapps\cmdutils\sort\sort.exe              1   optional
 modules\rosapps\cmdutils\tee\tee.exe                1   optional
 modules\rosapps\cmdutils\touch\touch.exe            1   optional
@@ -452,7 +449,7 @@ modules\rosapps\net\niclist\niclist.exe             1   optional
 modules\rosapps\notevil\notevil.exe                 1   optional
 modules\rosapps\packmgr\cmd-line\rosget.exe         1   optional
 modules\rosapps\packmgr\gui\packmgr.exe             1   optional
-modules\rosapps\packmgr\lib\package.dll             1   optional
+modules\rosapps\packmgr\dll\win32\package.dll       1   optional
 modules\rosapps\sysutils\ctm\ctm.exe                1   optional
 modules\rosapps\sysutils\lsdd\lsdd.exe              1   optional
 modules\rosapps\sysutils\man\man.exe                1   optional