Re-add the "lake.bmp" wallpaper inclusion (partly imported from the deleted 0.3.1...

The wallpaper is now also added to the %SystemRoot% directory instead of %SystemRoot%\system32

The only thing I did not import is the setting of the default wallpaper in "hivedef.inf". For 0.3.1, we hardcoded the full path to the wallpaper in the "hivedef.inf" file.
For 0.3.3, we should either do this only in the branch or better implement a proper solution like setting the path in 2nd stage setup.

svn path=/trunk/; revision=27250

diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 72795af..e3ef9c4 100644 (file)
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -507,3 +507,4 @@ modules\rostests\winetests\shlwapi\shlwapi_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\version\version_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\version\version_winetest.exe     7   optional

+modules\wallpaper\lake.bmp                                  4   optional

diff --git a/reactos/modules/directory.rbuild b/reactos/modules/directory.rbuild
index c1ce9f3..3692f4b 100644 (file)
--- a/reactos/modules/directory.rbuild
+++ b/reactos/modules/directory.rbuild
@@ -41,6 +41,13 @@
                        </xi:fallback>
                </xi:include>
        </directory>
                        </xi:fallback>
                </xi:include>
        </directory>

+       <directory name="wallpaper">
+               <xi:include href="wallpaper/directory.rbuild">
+                       <xi:fallback>
+                               <xi:include href="empty.rbuild" />
+                       </xi:fallback>
+               </xi:include>
+       </directory>

        <directory name="windows">
                <xi:include href="windows/directory.rbuild">
                        <xi:fallback>
        <directory name="windows">
                <xi:include href="windows/directory.rbuild">
                        <xi:fallback>

diff --git a/wallpaper/directory.rbuild b/wallpaper/directory.rbuild
index c0adec0..a360057 100644 (file)
--- a/wallpaper/directory.rbuild
+++ b/wallpaper/directory.rbuild
@@ -1,3 +1,3 @@
 <group>
 <group>

-       <installfile base="system32">lake.bmp</installfile>
+       <installfile>lake.bmp</installfile>

 </group>
\ No newline at end of file
 </group>
\ No newline at end of file