Ros-diffs January 2017

ros-diffs@reactos.org

15 participants
160 discussions

[tfaber] 73643: [BOOTLIB] - Correctly check for floppy devices in BlockIoEfiGetDeviceInformation. CID 1341189.

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jan 31 13:15:29 2017 New Revision: 73643 URL: http://svn.reactos.org/svn/reactos?rev=73643&view=rev Log: [BOOTLIB] - Correctly check for floppy devices in BlockIoEfiGetDeviceInformation. CID 1341189. Modified: trunk/reactos/boot/environ/lib/io/device.c Modified: trunk/reactos/boot/environ/lib/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/device… ============================================================================== --- trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] Tue Jan 31 13:15:29 2017 @@ -1012,7 +1012,7 @@ { /* We only support floppy drives */ AcpiPath = (ACPI_HID_DEVICE_PATH*)LeafNode; - if ((AcpiPath->HID == EISA_PNP_ID(0x604)) && + if ((AcpiPath->HID == EISA_PNP_ID(0x604)) || (AcpiPath->HID == EISA_PNP_ID(0x700))) { /* Set the boot library specific device types */

7 years, 8 months

[tfaber] 73642: [MSPAINT] - Add missing break in CMainWindow::OnCommand/IDM_FORMATICONBAR. CID 1322024.

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jan 31 12:53:39 2017 New Revision: 73642 URL: http://svn.reactos.org/svn/reactos?rev=73642&view=rev Log: [MSPAINT] - Add missing break in CMainWindow::OnCommand/IDM_FORMATICONBAR. CID 1322024. Modified: trunk/reactos/base/applications/mspaint/winproc.cpp Modified: trunk/reactos/base/applications/mspaint/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.cpp [iso-8859-1] Tue Jan 31 12:53:39 2017 @@ -645,7 +645,7 @@ break; case IDM_FORMATICONBAR: textEditWindow.ShowWindow(textEditWindow.IsWindowVisible() ? SW_HIDE : SW_SHOW); - + break; case IDM_VIEWSHOWGRID: showGrid = !showGrid; imageArea.Invalidate(FALSE);

7 years, 8 months

[tfaber] 73641: [LIBWINE] - Fix broken indentation (-Wmisleading-indentation)

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jan 31 12:46:37 2017 New Revision: 73641 URL: http://svn.reactos.org/svn/reactos?rev=73641&view=rev Log: [LIBWINE] - Fix broken indentation (-Wmisleading-indentation) Modified: trunk/reactos/sdk/lib/3rdparty/libwine/debug.c Modified: trunk/reactos/sdk/lib/3rdparty/libwine/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libwine/d… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/libwine/debug.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libwine/debug.c [iso-8859-1] Tue Jan 31 12:46:37 2017 @@ -424,7 +424,7 @@ if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) ret += wine_dbg_printf( "%s:", debug_classes[cls] ); - if (file && line) + if (file && line) ret += wine_dbg_printf ( "(%s:%d) ", file, line ); else ret += wine_dbg_printf( "%s:%s: ", channel->name, func );

7 years, 8 months

[hbelusca] 73640: [VERSION]: Addendum to r73588: correctly report the version as 0.4.4 (FOSDEM2017RC).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jan 30 22:59:38 2017 New Revision: 73640 URL: http://svn.reactos.org/svn/reactos?rev=73640&view=rev Log: [VERSION]: Addendum to r73588: correctly report the version as 0.4.4 (FOSDEM2017RC). Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/include/reactos/version.cmake Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/include/reactos/version.cmake [iso-8859-1] Mon Jan 30 22:59:38 2017 @@ -17,8 +17,8 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") -set(KERNEL_VERSION_MINOR "5") -set(KERNEL_VERSION_PATCH_LEVEL "0") +set(KERNEL_VERSION_MINOR "4") +set(KERNEL_VERSION_PATCH_LEVEL "4") set(COPYRIGHT_YEAR "2017") # KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release)

7 years, 8 months

[hbelusca] 73639: [NTOS]: Modify the ReactOS boot logo for the FOSDEM 2017 edition, based upon an idea by Jared Smudde. You were numerous to participate to its selection; I thank you all!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jan 30 22:50:03 2017 New Revision: 73639 URL: http://svn.reactos.org/svn/reactos?rev=73639&view=rev Log: [NTOS]: Modify the ReactOS boot logo for the FOSDEM 2017 edition, based upon an idea by Jared Smudde. You were numerous to participate to its selection; I thank you all! Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/ntoskrnl/inbv/logo/1.bmp branches/ReactOS-0.4.4-FOSDEM2017/reactos/ntoskrnl/inbv/logo/2.bmp branches/ReactOS-0.4.4-FOSDEM2017/reactos/ntoskrnl/inbv/logo/3.bmp branches/ReactOS-0.4.4-FOSDEM2017/reactos/ntoskrnl/inbv/logo/4.bmp branches/ReactOS-0.4.4-FOSDEM2017/reactos/ntoskrnl/inbv/logo/5.bmp branches/ReactOS-0.4.4-FOSDEM2017/reactos/ntoskrnl/inbv/logo/8.bmp Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/ntoskrnl/inbv/logo/2.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/ntoskrnl/inbv/logo/3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/ntoskrnl/inbv/logo/4.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/ntoskrnl/inbv/logo/5.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== Binary files - no diff available. Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/ntoskrnl/inbv/logo/8.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== Binary files - no diff available.

7 years, 8 months

[hbelusca] 73638: [WALLPAPERS] - Update the wallpapers for FOSDEM 2017. - 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

Author: hbelusca Date: Mon Jan 30 22:24:44 2017 New Revision: 73638 URL: http://svn.reactos.org/svn/reactos?rev=73638&view=rev Log: [WALLPAPERS] - Update the wallpapers for FOSDEM 2017. - 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.4-FOSDEM2017/wallpapers/Angelus_DeepSea_16-9_1920x1080.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/DeepSea/Angelus.04_DeepSea_16-9_1920x1080.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_DeepSea_4-3_1440x1080.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/DeepSea/Angelus.04_DeepSea_4-3_1440x1080.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_ROSWP_16-9_1920x1080.jpg - copied unchanged from r73636, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/VistaReactOS/Angelus.02_ROSWP_16-9_1920x1080.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_ROSWP_4-3_1024x768.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_02_ROSWP_4-3_1024x768.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_ROSWP_4-3_1440x1080.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_02_ROSWP_4-3_1440x1080.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_ReactOS_Blue_16-9.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Blue_16-9.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_ReactOS_Blue_4-3.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Blue_4-3.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_ReactOS_Dark_16-9.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Dark_16-9.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_ReactOS_Dark_4-3.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Dark_4-3.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_ReactOS_Light_16-9.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Light_16-9.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_ReactOS_Light_4-3.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/ReactOS/Angelus.ReactOS7.Light_4-3.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_Sky4_16x9.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/Sky/Angelus.Sky4_16x9.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_Sky4_4x3.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/Sky/Angelus.Sky4_4x3.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_Sky5_16x9.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/Sky/Angelus.Sky5_16x9.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_Sky5_4x3.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/Sky/Angelus.Sky5_4x3.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_Sky7_16x9.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/Sky/Angelus.Sky7_16x9.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_Sky7_4x3.jpg - copied unchanged from r73637, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/Sky/Angelus.Sky7_4x3.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReactOS_FOSDEM_1.bmp (with props) branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReactOS_FOSDEM_1.jpg - copied, changed from r73636, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReactOS_CirclesGold_1.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReactOS_FOSDEM_2.jpg - copied, changed from r73636, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReactOS_CirclesGold_2.jpg Removed: branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/1920px_Polarlicht.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus/ branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_02_ROSWP_4-3_1024x768.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_02_ROSWP_4-3_1440x1080.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReactOS_Hexagons.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/clouds.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/grass.jpg branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/wallpapers.txt Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hivedef.inf branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/CMakeLists.txt branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReadMe.txt Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Mon Jan 30 22:24:44 2017 @@ -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_FOSDEM_1.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.4-FOSDEM2017/wallpapers/1920px_Polarlicht.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/wallpa… ============================================================================== Binary file - no diff available. Removed: branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_02_ROSWP_4-3_1024x768.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/wallpa… ============================================================================== Binary file - no diff available. Removed: branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/Angelus_02_ROSWP_4-3_1440x1080.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/wallpa… ============================================================================== Binary file - no diff available. Modified: branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/wallpa… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/CMakeLists.txt [iso-8859-1] Mon Jan 30 22:24:44 2017 @@ -1,2 +1,32 @@ -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_DeepSea_16-9_1920x1080.jpg + Angelus_DeepSea_4-3_1440x1080.jpg + Angelus_ReactOS_Blue_16-9.jpg + Angelus_ReactOS_Blue_4-3.jpg + Angelus_ReactOS_Dark_16-9.jpg + Angelus_ReactOS_Dark_4-3.jpg + Angelus_ReactOS_Light_16-9.jpg + Angelus_ReactOS_Light_4-3.jpg + Angelus_ROSWP_16-9_1920x1080.jpg + Angelus_ROSWP_4-3_1024x768.jpg + Angelus_ROSWP_4-3_1440x1080.jpg + Angelus_Sky4_16x9.jpg + Angelus_Sky4_4x3.jpg + Angelus_Sky5_16x9.jpg + Angelus_Sky5_4x3.jpg + Angelus_Sky7_16x9.jpg + Angelus_Sky7_4x3.jpg + lake.jpg + ReactOS_CirclesBlue_1.jpg + ReactOS_CirclesBlue_2.jpg + ReactOS_CirclesGold_1.jpg + ReactOS_CirclesGold_2.jpg + ReactOS_FOSDEM_1.bmp + ReactOS_FOSDEM_1.jpg + ReactOS_FOSDEM_2.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.4-FOSDEM2017/wallpapers/ReactOS_FOSDEM_1.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/wallpa… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReactOS_FOSDEM_1.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Copied: branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReactOS_FOSDEM_1.jpg (from r73636, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReactOS_CirclesGold_1.jpg) URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/wallpa… ============================================================================== Binary files - no diff available. Copied: branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReactOS_FOSDEM_2.jpg (from r73636, branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReactOS_CirclesGold_2.jpg) URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/wallpa… ============================================================================== Binary files - no diff available. Removed: branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReactOS_Hexagons.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/wallpa… ============================================================================== Binary file - no diff available. Modified: branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/wallpa… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReadMe.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/ReadMe.txt [iso-8859-1] Mon Jan 30 22:24:44 2017 @@ -1,17 +1,21 @@ Wallpapers =========== + +Most of the wallpapers are adapted from the original ones for the FOSDEM 2017. 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_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 +ReactOS_FOSDEM_1.jpg | FOSDEM version of ReactOS_CirclesGold_1.jpg | See above +ReactOS_FOSDEM_2.jpg | FOSDEM version of ReactOS_CirclesGold_2.jpg | See above + +Angelus' Wallpapers +=================== +Forum User "Angelus" (jedi.knight(a)wanadoo.es) +Under Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. +See forum thread: http://www.reactos.org/forum/viewtopic.php?f=25&t=6153 Removed: branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/clouds.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/wallpa… ============================================================================== Binary file - no diff available. Removed: branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/grass.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/wallpa… ============================================================================== Binary file - no diff available. Removed: branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/wallpapers.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/wallpa… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/wallpapers/wallpapers.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/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

7 years, 8 months

[tfaber] 73637: [ACPI] - Fix some broken indentation (and GCC6 -Wmisleading-indentation warnings with it)

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Jan 30 19:20:54 2017 New Revision: 73637 URL: http://svn.reactos.org/svn/reactos?rev=73637&view=rev Log: [ACPI] - Fix some broken indentation (and GCC6 -Wmisleading-indentation warnings with it) Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c trunk/reactos/drivers/bus/acpi/buspdo.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Mon Jan 30 19:20:54 2017 @@ -1470,8 +1470,8 @@ if (device->pnp.cid_list) ExFreePoolWithTag(device->pnp.cid_list, 'DpcA'); - if (device->pnp.hardware_id) - ExFreePoolWithTag(device->pnp.hardware_id, 'DpcA'); + if (device->pnp.hardware_id) + ExFreePoolWithTag(device->pnp.hardware_id, 'DpcA'); if (device) ExFreePoolWithTag(device, 'DpcA'); Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Mon Jan 30 19:20:54 2017 @@ -685,77 +685,77 @@ case DeviceTextDescription: if (!Irp->IoStatus.Information) { - if (wcsstr (DeviceData->HardwareIDs, L"PNP000") != 0) - Temp = L"Programmable interrupt controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP010") != 0) - Temp = L"System timer"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP020") != 0) - Temp = L"DMA controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP03") != 0) - Temp = L"Keyboard"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP040") != 0) - Temp = L"Parallel port"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP05") != 0) - Temp = L"Serial port"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP06") != 0) - Temp = L"Disk controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP07") != 0) - Temp = L"Disk controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP09") != 0) - Temp = L"Display adapter"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A0") != 0) - Temp = L"Bus controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0E0") != 0) - Temp = L"PCMCIA controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0F") != 0) - Temp = L"Mouse device"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP8") != 0) - Temp = L"Network adapter"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNPA0") != 0) - Temp = L"SCSI controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNPB0") != 0) - Temp = L"Multimedia device"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNPC00") != 0) - Temp = L"Modem"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0C") != 0) - Temp = L"Power Button"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0E") != 0) - Temp = L"Sleep Button"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0D") != 0) - Temp = L"Lid Switch"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C09") != 0) - Temp = L"ACPI Embedded Controller"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0B") != 0) - Temp = L"ACPI Fan"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0 || - wcsstr(DeviceData->HardwareIDs, L"PNP0A08") != 0 ) - Temp = L"PCI Root Bridge"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0A") != 0) - Temp = L"ACPI Battery"; - else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0F") != 0) - Temp = L"PCI Interrupt Link"; - else if (wcsstr(DeviceData->HardwareIDs, L"ACPI_PWR") != 0) - Temp = L"ACPI Power Resource"; - else if (wcsstr(DeviceData->HardwareIDs, L"Processor") != 0) - { - if (ProcessorNameString != NULL) - Temp = ProcessorNameString; - else - Temp = L"Processor"; - } - else if (wcsstr(DeviceData->HardwareIDs, L"ThermalZone") != 0) - Temp = L"ACPI Thermal Zone"; - else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0002") != 0) - Temp = L"Smart Battery"; - else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0003") != 0) - Temp = L"AC Adapter"; - /* Simply checking if AcpiHandle is NULL eliminates the need to check - * for the 4 different names that ACPI knows the fixed feature button as internally - */ - else if (!DeviceData->AcpiHandle) - Temp = L"ACPI Fixed Feature Button"; - else - Temp = L"Other ACPI device"; + if (wcsstr (DeviceData->HardwareIDs, L"PNP000") != 0) + Temp = L"Programmable interrupt controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP010") != 0) + Temp = L"System timer"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP020") != 0) + Temp = L"DMA controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP03") != 0) + Temp = L"Keyboard"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP040") != 0) + Temp = L"Parallel port"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP05") != 0) + Temp = L"Serial port"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP06") != 0) + Temp = L"Disk controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP07") != 0) + Temp = L"Disk controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP09") != 0) + Temp = L"Display adapter"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A0") != 0) + Temp = L"Bus controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0E0") != 0) + Temp = L"PCMCIA controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0F") != 0) + Temp = L"Mouse device"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP8") != 0) + Temp = L"Network adapter"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNPA0") != 0) + Temp = L"SCSI controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNPB0") != 0) + Temp = L"Multimedia device"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNPC00") != 0) + Temp = L"Modem"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0C") != 0) + Temp = L"Power Button"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0E") != 0) + Temp = L"Sleep Button"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0D") != 0) + Temp = L"Lid Switch"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C09") != 0) + Temp = L"ACPI Embedded Controller"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0B") != 0) + Temp = L"ACPI Fan"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0 || + wcsstr(DeviceData->HardwareIDs, L"PNP0A08") != 0) + Temp = L"PCI Root Bridge"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0A") != 0) + Temp = L"ACPI Battery"; + else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0F") != 0) + Temp = L"PCI Interrupt Link"; + else if (wcsstr(DeviceData->HardwareIDs, L"ACPI_PWR") != 0) + Temp = L"ACPI Power Resource"; + else if (wcsstr(DeviceData->HardwareIDs, L"Processor") != 0) + { + if (ProcessorNameString != NULL) + Temp = ProcessorNameString; + else + Temp = L"Processor"; + } + else if (wcsstr(DeviceData->HardwareIDs, L"ThermalZone") != 0) + Temp = L"ACPI Thermal Zone"; + else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0002") != 0) + Temp = L"Smart Battery"; + else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0003") != 0) + Temp = L"AC Adapter"; + /* Simply checking if AcpiHandle is NULL eliminates the need to check + * for the 4 different names that ACPI knows the fixed feature button as internally + */ + else if (!DeviceData->AcpiHandle) + Temp = L"ACPI Fixed Feature Button"; + else + Temp = L"Other ACPI device"; Buffer = ExAllocatePoolWithTag(PagedPool, (wcslen(Temp) + 1) * sizeof(WCHAR), 'IpcA');

7 years, 8 months

[tfaber] 73636: [FREELDR] - Correctly check for vertical retrace in PcVideoSync. CID 513066.

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Jan 30 13:50:10 2017 New Revision: 73636 URL: http://svn.reactos.org/svn/reactos?rev=73636&view=rev Log: [FREELDR] - Correctly check for vertical retrace in PcVideoSync. CID 513066. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Mon Jan 30 13:50:10 2017 @@ -1089,7 +1089,7 @@ VOID PcVideoSync(VOID) { - while (1 == (READ_PORT_UCHAR((UCHAR*)VIDEOPORT_VERTICAL_RETRACE) & 0x08)) + while ((READ_PORT_UCHAR((UCHAR*)VIDEOPORT_VERTICAL_RETRACE) & 0x08)) { /* * Keep reading the port until bit 3 is clear @@ -1099,7 +1099,7 @@ */ } - while (0 == (READ_PORT_UCHAR((UCHAR*)VIDEOPORT_VERTICAL_RETRACE) & 0x08)) + while (!(READ_PORT_UCHAR((UCHAR*)VIDEOPORT_VERTICAL_RETRACE) & 0x08)) { /* * Keep reading the port until bit 3 is set

7 years, 8 months

[tfaber] 73635: [DHCPCSVC] - Addendum to r69652: Avoid some more "Operands don't affect result" warnings. CID 515151, 515152, 515153

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Jan 30 13:43:21 2017 New Revision: 73635 URL: http://svn.reactos.org/svn/reactos?rev=73635&view=rev Log: [DHCPCSVC] - Addendum to r69652: Avoid some more "Operands don't affect result" warnings. CID 515151, 515152, 515153 Modified: trunk/reactos/base/services/dhcpcsvc/include/debug.h Modified: trunk/reactos/base/services/dhcpcsvc/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcpcsvc/inc… ============================================================================== --- trunk/reactos/base/services/dhcpcsvc/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcpcsvc/include/debug.h [iso-8859-1] Mon Jan 30 13:43:21 2017 @@ -25,8 +25,9 @@ #ifdef _MSC_VER #define DH_DbgPrint(_t_, _x_) \ - if (((debug_trace_level & NORMAL_MASK) >= _t_) || \ - ((debug_trace_level & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (debug_trace_level & _t_) > NORMAL_MASK \ + : (debug_trace_level & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ DbgPrint _x_ ; \ } @@ -34,8 +35,9 @@ #else /* _MSC_VER */ #define DH_DbgPrint(_t_, _x_) \ - if (((debug_trace_level & NORMAL_MASK) >= _t_) || \ - ((debug_trace_level & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (debug_trace_level & _t_) > NORMAL_MASK \ + : (debug_trace_level & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_ ; \ }

7 years, 8 months

[tfaber] 73634: [PSDK] - Remove incorrect bit masking from IsRecognizedPartition & IsContainerPartition. CID 1341188.

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Jan 30 13:33:46 2017 New Revision: 73634 URL: http://svn.reactos.org/svn/reactos?rev=73634&view=rev Log: [PSDK] - Remove incorrect bit masking from IsRecognizedPartition & IsContainerPartition. CID 1341188. Modified: trunk/reactos/sdk/include/psdk/winioctl.h Modified: trunk/reactos/sdk/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winioctl.… ============================================================================== --- trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] Mon Jan 30 13:33:46 2017 @@ -592,18 +592,18 @@ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32))||\ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32_XINT13))||\ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13))||\ - ((t&~PARTITION_NTFT)==PARTITION_FAT_12)||\ - ((t&~PARTITION_NTFT)==PARTITION_FAT_16)||\ - ((t&~PARTITION_NTFT)==PARTITION_IFS)||\ - ((t&~PARTITION_NTFT)==PARTITION_HUGE)||\ - ((t&~PARTITION_NTFT)==PARTITION_FAT32)||\ - ((t&~PARTITION_NTFT)==PARTITION_FAT32_XINT13)||\ - ((t&~PARTITION_NTFT)==PARTITION_XINT13)||\ - ((t&~PARTITION_NTFT)==PARTITION_LINUX)||\ - ((t&~PARTITION_NTFT)==PARTITION_OLD_LINUX)||\ - ((t&~PARTITION_NTFT)==PARTITION_FREEBSD)||\ - ((t&~PARTITION_NTFT)==PARTITION_OPENBSD)||\ - ((t&~PARTITION_NTFT)==PARTITION_NETBSD)) + ((t)==PARTITION_FAT_12)||\ + ((t)==PARTITION_FAT_16)||\ + ((t)==PARTITION_IFS)||\ + ((t)==PARTITION_HUGE)||\ + ((t)==PARTITION_FAT32)||\ + ((t)==PARTITION_FAT32_XINT13)||\ + ((t)==PARTITION_XINT13)||\ + ((t)==PARTITION_LINUX)||\ + ((t)==PARTITION_OLD_LINUX)||\ + ((t)==PARTITION_FREEBSD)||\ + ((t)==PARTITION_OPENBSD)||\ + ((t)==PARTITION_NETBSD)) #else #define IsRecognizedPartition(t)\ (((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT_12))||\ @@ -613,19 +613,19 @@ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32))||\ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32_XINT13))||\ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13))||\ - ((t&~PARTITION_NTFT)==PARTITION_FAT_12)||\ - ((t&~PARTITION_NTFT)==PARTITION_FAT_16)||\ - ((t&~PARTITION_NTFT)==PARTITION_IFS)||\ - ((t&~PARTITION_NTFT)==PARTITION_HUGE)||\ - ((t&~PARTITION_NTFT)==PARTITION_FAT32)||\ - ((t&~PARTITION_NTFT)==PARTITION_FAT32_XINT13)||\ - ((t&~PARTITION_NTFT)==PARTITION_XINT13)) + ((t)==PARTITION_FAT_12)||\ + ((t)==PARTITION_FAT_16)||\ + ((t)==PARTITION_IFS)||\ + ((t)==PARTITION_HUGE)||\ + ((t)==PARTITION_FAT32)||\ + ((t)==PARTITION_FAT32_XINT13)||\ + ((t)==PARTITION_XINT13)) #endif #define IsContainerPartition(t)\ (((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_EXTENDED))||\ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13_EXTENDED))||\ - ((t&~PARTITION_NTFT)==PARTITION_EXTENDED)||\ - ((t&~PARTITION_NTFT)==PARTITION_XINT13_EXTENDED)) + ((t)==PARTITION_EXTENDED)||\ + ((t)==PARTITION_XINT13_EXTENDED)) #ifdef _MSC_VER #pragma warning(pop)

7 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2017