Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 70662: [TASKMGR] protect some variables with the critical section Patch by Mark Jansen. CORE-10787
by spetreolle＠svn.reactos.org 30 Jan '16

30 Jan '16

Author: spetreolle Date: Sat Jan 30 17:01:04 2016 New Revision: 70662 URL: http://svn.reactos.org/svn/reactos?rev=70662&view=rev Log: [TASKMGR] protect some variables with the critical section Patch by Mark Jansen. CORE-10787 Modified: trunk/reactos/base/applications/taskmgr/perfdata.c Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Sat Jan 30 17:01:04 2016 @@ -477,17 +477,29 @@ ULONG PerfDataGetProcessCount(void) { - return ProcessCount; + ULONG Result; + EnterCriticalSection(&PerfDataCriticalSection); + Result = ProcessCount; + LeaveCriticalSection(&PerfDataCriticalSection); + return Result; } ULONG PerfDataGetProcessorUsage(void) { - return (ULONG)dbIdleTime; + ULONG Result; + EnterCriticalSection(&PerfDataCriticalSection); + Result = (ULONG)dbIdleTime; + LeaveCriticalSection(&PerfDataCriticalSection); + return Result; } ULONG PerfDataGetProcessorSystemUsage(void) { - return (ULONG)dbKernelTime; + ULONG Result; + EnterCriticalSection(&PerfDataCriticalSection); + Result = (ULONG)dbKernelTime; + LeaveCriticalSection(&PerfDataCriticalSection); + return Result; } BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, ULONG nMaxCount)

1 0

[hbelusca] 70661: [WALLPAPERS] - Update the wallpapers for FOSDEM 2016. - Since we don't have any mechanism at the moment to preselect a non-bitmap wallpaper to use, I'm forced to convert the wallp...
by hbelusca＠svn.reactos.org 29 Jan '16

29 Jan '16

Author: hbelusca Date: Fri Jan 29 13:24:17 2016 New Revision: 70661 URL: http://svn.reactos.org/svn/reactos?rev=70661&view=rev Log: [WALLPAPERS] - Update the wallpapers for FOSDEM 2016. - Since we don't have any mechanism at the moment to preselect a non-bitmap wallpaper to use, I'm forced to convert the wallpaper we want to use to bitmap first, and then add its entry into the registry (I cannot just use the jpg file in the registry). See r66772. Added: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue.bmp (with props) branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue.jpg - copied, changed from r70660, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue_1.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold.jpg - copied, changed from r70660, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold_1.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_Light_16-9.jpg - copied, changed from r70647, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Light_16-9.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_Light_4-3.jpg - copied, changed from r70647, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Light_4-3.jpg Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/1920px_Polarlicht.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/Angelus/ branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue_1.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue_2.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold_1.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold_2.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_Hexagons.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/grass.jpg branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/wallpapers.txt Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/CMakeLists.txt branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReadMe.txt Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Fri Jan 29 13:24:17 2016 @@ -64,7 +64,7 @@ HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000" HKCU,"Control Panel\Desktop","Pattern",2,"(None)" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Web\Wallpaper\ReactOS_CirclesBlue.bmp" HKCU,"Control Panel\Desktop","TileWallpaper",2,"0" HKCU,"Control Panel\Desktop","WallpaperStyle",2,"2" HKCU,"Control Panel\Desktop","FontSmoothing",0,"1" Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/1920px_Polarlicht.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Modified: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/CMakeLists.txt [iso-8859-1] Fri Jan 29 13:24:17 2016 @@ -1,2 +1,16 @@ -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_02_ROSWP_4-3_1024x768.jpg DESTINATION reactos/Web/Wallpaper FOR all) +list(APPEND WALLPAPER_FILES + Angelus_02_ROSWP_4-3_1440x1080.jpg + Angelus_02_ROSWP_4-3_1024x768.jpg + clouds.jpg + lake.jpg + ReactOS_CirclesBlue.bmp + ReactOS_CirclesBlue.jpg + ReactOS_CirclesGold.jpg + ReactOS_Light_4-3.jpg + ReactOS_Light_16-9.jpg + ReadMe.txt) + +foreach(item ${WALLPAPER_FILES}) + add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/Web/Wallpaper FOR all) +endforeach(item) Added: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Copied: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue.jpg (from r70660, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue_1.jpg) URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary files - no diff available. Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue_1.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesBlue_2.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Copied: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold.jpg (from r70660, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold_1.jpg) URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary files - no diff available. Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold_1.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_CirclesGold_2.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_Hexagons.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Copied: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_Light_16-9.jpg (from r70647, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Light_16-9.jpg) URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary files - no diff available. Copied: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReactOS_Light_4-3.jpg (from r70647, branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Light_4-3.jpg) URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReadMe.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/ReadMe.txt [iso-8859-1] Fri Jan 29 13:24:17 2016 @@ -1,17 +1,15 @@ Wallpapers =========== +Most of the wallpapers are adapted from the original ones for the FOSDEM 2016. + File Name | Author | Origin -------------------------------------------------------------------------------------------------------------------------------------------------- -Angelus collection | Forum user "Angelus" (jedi.knight(a)wanadoo.es) | http://www.reactos.org/forum/viewtopic.php?p=50543#p50543 -Angelus_02_ROSWP_4-3_1440x1080.jpg | See above | See above +Angelus_02_ROSWP_4-3_1440x1080.jpg | Forum user "Angelus" (jedi.knight(a)wanadoo.es) | http://www.reactos.org/forum/viewtopic.php?p=50543#p50543 Angelus_02_ROSWP_4-3_1024x768.jpg | See above | See above -1920px_Polarlicht.jpg | Public domain | https://jira.reactos.org/browse/CORE-8446 and links inside -grass.jpg | See above | See above clouds.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732 -lake.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732 -ReactOS_CirclesBlue_1.jpg | Forum user "henrytang5247" (Henry Tang) | http://www.reactos.org/forum/viewtopic.php?p=109529#p109529 -ReactOS_CirclesBlue_2.jpg | See above | See above -ReactOS_CirclesGold_1.jpg | See above | See above -ReactOS_CirclesGold_2.jpg | See above | See above -ReactOS_Hexagons.jpg | See above | http://www.reactos.org/forum/viewtopic.php?p=109866#p109866 +lake.jpg | See above | See above +ReactOS_CirclesBlue.jpg | Forum user "henrytang5247" (Henry Tang) | http://www.reactos.org/forum/viewtopic.php?p=109529#p109529 +ReactOS_CirclesGold.jpg | See above | See above +ReactOS_Light_4-3.jpg | Forum user "Angelus" (jedi.knight(a)wanadoo.es) | http://www.reactos.org/forum/viewtopic.php?p=50543#p50543 +ReactOS_Light_16-9.jpg | See above | See above Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/grass.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== Binary file - no diff available. Removed: branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/wallpapers.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/wallpa… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/wallpapers.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/wallpapers/wallpapers.txt (removed) @@ -1,69 +0,0 @@ -ReactOS Wallpapers suggestion: - - - -ReactOS Wallpapers for Version 0.3: - -* ReactOS Wallpaper (original with new text; GNU GPL) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wallp&… - -* ReactOS Computer Wallpaper #1 (GNU GPL) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wallp&… - -* hill and water (BSD-license) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wallp&… - -* ReactOS wallpaper - 3d with holes (GNU LGPL) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wallp&… - -* ReactOS Wallpapers (Earth) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wallp&… - -* Ros Nature (Flowers + Logo) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wallp&… - - - -GPL Wallpapers from kde-look.org: - -* Nature #1 (Fruit) - http://www.kde-look.org/content/files/16183-green.jpg - -* Nature #2 (Wood) - http://www.kde-look.org/content/files/10274-p1010076.jpg - -* Nature #3 (Sea) - http://arg0.net/users/vgough/images/2007-taupo.png - -* Nature #4 (Bees #1) - http://kdelook.org/content/files/16382-img_0511c1_xga.jpg - -* Nature #5 (Bees #2) - http://www.kde-look.org/content/files/16498-Beon.jpg - -* Nature #6 (Bees #3) - http://www.kde-look.org/content/files/6524-Bee%20in%20Flower.jpg - -* Nature #7 (Summer) - http://www.kde-look.org/content/files/20979-altabadia_summer_1200.jpg - - - -Some useful links: - -* GNOME-LOOK.ORG - http://www.gnome-look.org - -* KDE-LOOK.ORG - http://www.kde-look.org/ - -* Frik85's ReactOS Fanpage - http://frik85.reactos.at - (-> http://reactosde.re.funpic.de/mediagroup.php?sec=Graphic%20arts) - - - -History: - -2005-02-25 Klemens Friedl -2005-05-31 Klemens Friedl

1 0

[hbelusca] 70660: [BOOTDATA]: Update readme.txt for FOSDEM 2016.
by hbelusca＠svn.reactos.org 29 Jan '16

29 Jan '16

Author: hbelusca Date: Fri Jan 29 03:00:41 2016 New Revision: 70660 URL: http://svn.reactos.org/svn/reactos?rev=70660&view=rev Log: [BOOTDATA]: Update readme.txt for FOSDEM 2016. Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/readme.txt Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/readme.txt [iso-8859-1] Fri Jan 29 03:00:41 2016 @@ -1,7 +1,23 @@ -======================== -ReactOS Version 0.4.x -Updated January 5, 2016 -======================== +================================================================================ +ReactOS Version 0.4.0-RC Preview +for FOSDEM 2016 +================================================================================ + +0. CD-ROM Contents +------------------ + +* ReactOS LiveCD and Installation +* ReactOS on QEMU virtual machine +* ReactOS Build Environment (RosBE) for Windows and Unix-like OSes +* ReactOS source code + +This CD-ROM starts an AutoRun program under Windows. Alternatively you can +browse the contents of this CD-ROM with any file browser. The folder names +should be self-explanatory. + +The source code of ReactOS can be compiled using the ReactOS Build Environment +under Windows or Unix-like operating systems such as Linux. + 1. What is ReactOS? ------------------- @@ -47,9 +63,3 @@ The tutorials contain more information on the project, compiling and testing ReactOS - amongst other topics. Contributors to the project are always welcome. - - -6. Author ---------- - -This document was written by Jason Filby (jasonfilby(a)yahoo.com).

1 0

[hbelusca] 70659: [WELCOME]: Adapt the welcome autorum program by taking what was done for FOSDEM 2015 and CLT 2015.
by hbelusca＠svn.reactos.org 29 Jan '16

29 Jan '16

Author: hbelusca Date: Fri Jan 29 02:14:13 2016 New Revision: 70659 URL: http://svn.reactos.org/svn/reactos?rev=70659&view=rev Log: [WELCOME]: Adapt the welcome autorum program by taking what was done for FOSDEM 2015 and CLT 2015. Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/bg-BG.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/cs-CZ.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/da-DK.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/el-GR.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/es-ES.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/et-EE.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/he-IL.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/hu-HU.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/id-ID.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/it-IT.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/ja-JP.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/lt-LT.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/ms-MY.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/nl-NL.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/no-NO.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/pl-PL.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/pt-BR.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/ro-RO.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/ru-RU.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/sk-SK.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/sq-AL.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/sv-SE.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/th-TH.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/tr-TR.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/uk-UA.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/zh-CN.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/zh-TW.rc Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/de-DE.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/en-US.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/fr-FR.rc branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/welcome.rc [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Removed: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/setup/welcome/welcome.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto…

1 0

[hbelusca] 70658: [VERSION]: Adjust again the version release type. Addendum to r70652. [BOOTDATA]: Addendum to r70657: shorten a bit the boot menu title string.
by hbelusca＠svn.reactos.org 29 Jan '16

29 Jan '16

Author: hbelusca Date: Fri Jan 29 01:59:05 2016 New Revision: 70658 URL: http://svn.reactos.org/svn/reactos?rev=70658&view=rev Log: [VERSION]: Adjust again the version release type. Addendum to r70652. [BOOTDATA]: Addendum to r70657: shorten a bit the boot menu title string. Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hybridcd.ini branches/ReactOS-0.4.0-FOSDEM2016/reactos/include/reactos/version.cmake Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hybridcd.ini URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] Fri Jan 29 01:59:05 2016 @@ -3,7 +3,7 @@ TimeOut=20 [Display] -TitleText=ReactOS 0.4.0 RC2 Hybrid-CD - FOSDEM 2016 +TitleText=ReactOS 0.4.0-RC for FOSDEM 2016 StatusBarColor=Cyan StatusBarTextColor=Black BackdropTextColor=White Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/include/reactos/version.cmake [iso-8859-1] Fri Jan 29 01:59:05 2016 @@ -25,7 +25,7 @@ set(KERNEL_VERSION_BUILD_TYPE "") # KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) -set(KERNEL_VERSION_RELEASE_TYPE "RC2-FOSDEM2016") +set(KERNEL_VERSION_RELEASE_TYPE "FOSDEM2016RC") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") if(KERNEL_VERSION_PATCH_LEVEL)

1 0

[hbelusca] 70657: [BOOTDATA]: Customize the boot menu ("user-friendliness").
by hbelusca＠svn.reactos.org 29 Jan '16

29 Jan '16

Author: hbelusca Date: Fri Jan 29 01:30:30 2016 New Revision: 70657 URL: http://svn.reactos.org/svn/reactos?rev=70657&view=rev Log: [BOOTDATA]: Customize the boot menu ("user-friendliness"). Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hybridcd.ini Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hybridcd.ini URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] Fri Jan 29 01:30:30 2016 @@ -1,9 +1,9 @@ [FREELOADER] -DefaultOS=Setup -TimeOut=5 +DefaultOS=LiveCD_RamDisk +TimeOut=20 [Display] -TitleText=ReactOS Hybrid-CD +TitleText=ReactOS 0.4.0 RC2 Hybrid-CD - FOSDEM 2016 StatusBarColor=Cyan StatusBarTextColor=Black BackdropTextColor=White @@ -13,62 +13,33 @@ TitleBoxColor=Red MessageBoxTextColor=White MessageBoxColor=Blue -MenuTextColor=Gray -MenuColor=Black -TextColor=Gray +MenuTextColor=White +MenuColor=Blue +TextColor=Yellow SelectedTextColor=Black SelectedColor=Gray -ShowTime=No -MenuBox=No -CenterMenu=No -MinimalUI=Yes -TimeText=Seconds until highlighted choice will be started automatically: +SpecialEffects=Yes [Operating Systems] -Setup="Setup" -LiveCD="LiveCD" -LiveCD_Debug="LiveCD (Debug)" -LiveCD_Screen="LiveCD (Screen)" -LiveCD_LogFile="LiveCD (Log file)" -LiveCD_RamDisk="LiveCD in RAM" -LiveCD_RamDisk_Debug="LiveCD in RAM (Debug)" -LiveCD_RamDisk_Screen="LiveCD in RAM (Screen)" +Setup="ReactOS Setup" +LiveCD="ReactOS Live" +LiveCD_RamDisk="ReactOS Live in RAM" +HddBoot="Boot from first hard disk" [Setup] BootType=ReactOSSetup -SystemPath=\bootcd +SystemPath=\setup [LiveCD] BootType=Windows2003 -SystemPath=\livecd\reactos -Options=/MININT - -[LiveCD_Debug] -BootType=Windows2003 -SystemPath=\livecd\reactos +SystemPath=\reactos Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT - -[LiveCD_Screen] -BootType=Windows2003 -SystemPath=\livecd\reactos -Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT - -[LiveCD_LogFile] -BootType=Windows2003 -SystemPath=\livecd\reactos -Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT [LiveCD_RamDisk] BootType=Windows2003 SystemPath=ramdisk(0)\reactos -Options=/MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD +Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd.iso /RDEXPORTASCD -[LiveCD_RamDisk_Debug] -BootType=Windows2003 -SystemPath=ramdisk(0)\reactos -Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD - -[LiveCD_RamDisk_Screen] -BootType=Windows2003 -SystemPath=ramdisk(0)\reactos -Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD +[HddBoot] +BootType=Drive +BootDrive=hd0

1 0

[hbelusca] 70656: [BOOTDATA]: Import hybridcd/livecd modification from r70655.
by hbelusca＠svn.reactos.org 29 Jan '16

29 Jan '16

Author: hbelusca Date: Fri Jan 29 01:20:00 2016 New Revision: 70656 URL: http://svn.reactos.org/svn/reactos?rev=70656&view=rev Log: [BOOTDATA]: Import hybridcd/livecd modification from r70655. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/boot/CMakeLists.txt Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 29 01:20:00 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651,70655 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 29 01:20:00 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651,70655 Modified: branches/ros-branch-0_4_0/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/boot/C… ============================================================================== --- branches/ros-branch-0_4_0/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/boot/CMakeLists.txt [iso-8859-1] Fri Jan 29 01:20:00 2016 @@ -58,7 +58,7 @@ #create the empty Desktop, Favorites, and Start Menu folders file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Favorites\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Favorites\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs\n") add_custom_target(hybridcd

1 0

[hbelusca] 70655: [BOOTDATA]: Normally, in the hybridcd, the livecd stuff should go into its own subdirectory.
by hbelusca＠svn.reactos.org 29 Jan '16

29 Jan '16

Author: hbelusca Date: Fri Jan 29 01:18:53 2016 New Revision: 70655 URL: http://svn.reactos.org/svn/reactos?rev=70655&view=rev Log: [BOOTDATA]: Normally, in the hybridcd, the livecd stuff should go into its own subdirectory. Modified: trunk/reactos/boot/CMakeLists.txt Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=70… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Fri Jan 29 01:18:53 2016 @@ -58,7 +58,7 @@ #create the empty Desktop, Favorites, and Start Menu folders file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Favorites\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Favorites\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs\n") add_custom_target(hybridcd

1 0

[hbelusca] 70654: [BOOTDATA]: Adjust the autorun path. [CMAKE][BOOTDATA]: Flatten a bit the hybridcd tree otherwise some problems appear for the livecd (see r66114 for more details).
by hbelusca＠svn.reactos.org 29 Jan '16

29 Jan '16

Author: hbelusca Date: Fri Jan 29 01:17:32 2016 New Revision: 70654 URL: http://svn.reactos.org/svn/reactos?rev=70654&view=rev Log: [BOOTDATA]: Adjust the autorun path. [CMAKE][BOOTDATA]: Flatten a bit the hybridcd tree otherwise some problems appear for the livecd (see r66114 for more details). Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/CMakeLists.txt branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/autorun.inf branches/ReactOS-0.4.0-FOSDEM2016/reactos/cmake/CMakeMacros.cmake Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/CMakeLists.txt [iso-8859-1] Fri Jan 29 01:17:32 2016 @@ -57,9 +57,9 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "") #create the empty Desktop, Favorites, and Start Menu folders -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Desktop\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Favorites\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Start Menu/Programs\n") add_custom_target(hybridcd COMMAND native-cdmake -j -m -bootdata:2\#p0,e,b${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin\#pEF,e,b${CMAKE_CURRENT_BINARY_DIR}/efisys.bin @${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst REACTOS ${REACTOS_BINARY_DIR}/hybridcd.iso Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/autorun.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/autorun.inf [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/autorun.inf [iso-8859-1] Fri Jan 29 01:17:32 2016 @@ -1,3 +1,3 @@ [autorun] -open=reactos\welcome.exe +open=setup\reactos\welcome.exe icon=icon.ico Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== --- branches/ReactOS-0.4.0-FOSDEM2016/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Jan 29 01:17:32 2016 @@ -310,7 +310,7 @@ set_property(GLOBAL APPEND PROPERTY BOOTCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") #add it also into the hybridcd if not specified otherwise if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "bootcd/${_CD_DESTINATION}/${__file}=${item}") + set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "setup/${_CD_DESTINATION}/${__file}=${item}") endif() endforeach() if(_CD_TARGET) @@ -349,7 +349,7 @@ set_property(GLOBAL APPEND PROPERTY LIVECD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") #add it also into the hybridcd if not specified otherwise if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "livecd/${_CD_DESTINATION}/${__file}=${item}") + set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") endif() endforeach() endif() #end livecd @@ -425,7 +425,7 @@ add_cd_file( FILE ${CMAKE_CURRENT_BINARY_DIR}/livecd.iso - DESTINATION livecd + DESTINATION root FOR hybridcd) get_property(_filelist GLOBAL PROPERTY BOOTCD_FILE_LIST)

1 0

[hbelusca] 70653: [EXPLORER] Modify the Start Menu banner for FOSDEM 2016, courtesy David Quintana. [VERSION] Versioning for FOSDEM 2016 was updated in r70652.
by hbelusca＠svn.reactos.org 29 Jan '16

29 Jan '16

Author: hbelusca Date: Fri Jan 29 01:09:30 2016 New Revision: 70653 URL: http://svn.reactos.org/svn/reactos?rev=70653&view=rev Log: [EXPLORER] Modify the Start Menu banner for FOSDEM 2016, courtesy David Quintana. [VERSION] Versioning for FOSDEM 2016 was updated in r70652. Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/shell/explorer/res/bmp/158.bmp branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/shell/explorer/res/src/logov.psd Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/shell/explorer/res/bmp/158.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/base/shell/explorer/res/src/logov.psd URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reacto… ============================================================================== Binary files - no diff available.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs