Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[tfaber] 73856: [KS] - Avoid leaking AllocatorFraming in KsCreateDefaultAllocatorEx. Patch by Sebastian Gasiorek CORE-12797 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Feb 20 11:35:24 2017 New Revision: 73856 URL: http://svn.reactos.org/svn/reactos?rev=73856&view=rev Log: [KS] - Avoid leaking AllocatorFraming in KsCreateDefaultAllocatorEx. Patch by Sebastian Gasiorek CORE-12797 #resolve Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/alloca… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] Mon Feb 20 11:35:24 2017 @@ -593,20 +593,27 @@ /* check the valid file alignment */ if (AllocatorFraming->FileAlignment > (PAGE_SIZE-1)) + { + FreeItem(AllocatorFraming); return STATUS_INVALID_PARAMETER; + } /* allocate allocator struct */ Allocator = AllocateItem(NonPagedPool, sizeof(ALLOCATOR)); if (!Allocator) + { + FreeItem(AllocatorFraming); return STATUS_INSUFFICIENT_RESOURCES; + } /* allocate object header */ Status = KsAllocateObjectHeader((KSOBJECT_HEADER*)&Allocator->Header, 0, NULL, Irp, &DispatchTable); if (!NT_SUCCESS(Status)) { - FreeItem(Allocator); - return Status; + FreeItem(AllocatorFraming); + FreeItem(Allocator); + return Status; } /* set allocator type in object header */ @@ -652,6 +659,7 @@ /* backup allocator framing */ RtlMoveMemory(&Allocator->Status.Framing, AllocatorFraming, sizeof(KSALLOCATOR_FRAMING)); + FreeItem(AllocatorFraming); return Status; }

7 years, 7 months

[khornicek] 73855: [WIN32K] - Don't try to delete the pattern bitmap in UserInitialize. - Set the correct owner before deleting the update region in co_UserFreeWindow. - Fixes some "Trying to delet...

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Feb 20 10:10:37 2017 New Revision: 73855 URL: http://svn.reactos.org/svn/reactos?rev=73855&view=rev Log: [WIN32K] - Don't try to delete the pattern bitmap in UserInitialize. - Set the correct owner before deleting the update region in co_UserFreeWindow. - Fixes some "Trying to delete global object" debug prints. Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Mon Feb 20 10:10:37 2017 @@ -154,9 +154,8 @@ if (hPattern55AABitmap == NULL) return STATUS_INSUFFICIENT_RESOURCES; - //NT_VERIFY(GreSetBitmapOwner(hPattern55AABitmap, GDI_OBJ_HMGR_PUBLIC)); gpsi->hbrGray = IntGdiCreatePatternBrush(hPattern55AABitmap); - GreDeleteObject(hPattern55AABitmap); + if (gpsi->hbrGray == NULL) return STATUS_INSUFFICIENT_RESOURCES; } Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Mon Feb 20 10:10:37 2017 @@ -602,6 +602,7 @@ MsqDecPaintCountQueue(Window->head.pti); if (Window->hrgnUpdate > HRGN_WINDOW && GreIsHandleValid(Window->hrgnUpdate)) { + IntGdiSetRegionOwner(Window->hrgnUpdate, GDI_OBJ_HMGR_POWNED); GreDeleteObject(Window->hrgnUpdate); } Window->hrgnUpdate = NULL;

7 years, 7 months

[gadamopoulos] 73854: [blackshade.msstyles] -Add a skeleton for a theme based on a mockup by David Quintana

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 19 20:40:45 2017 New Revision: 73854 URL: http://svn.reactos.org/svn/reactos?rev=73854&view=rev Log: [blackshade.msstyles] -Add a skeleton for a theme based on a mockup by David Quintana Added: trunk/reactos/media/themes/blackshade.msstyles/ trunk/reactos/media/themes/blackshade.msstyles/BlackShade.png (with props) trunk/reactos/media/themes/blackshade.msstyles/CMakeLists.txt (with props) trunk/reactos/media/themes/blackshade.msstyles/bitmaps/ trunk/reactos/media/themes/blackshade.msstyles/bitmaps/dummy.bmp (with props) trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc (with props) trunk/reactos/media/themes/blackshade.msstyles/lang/ trunk/reactos/media/themes/blackshade.msstyles/lang/en-US.rc (with props) trunk/reactos/media/themes/blackshade.msstyles/textfiles/ - copied from r73835, trunk/reactos/media/themes/lautus.msstyles/textfiles/ Modified: trunk/reactos/media/themes/CMakeLists.txt Modified: trunk/reactos/media/themes/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/CMakeLists.tx… ============================================================================== --- trunk/reactos/media/themes/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/themes/CMakeLists.txt [iso-8859-1] Sun Feb 19 20:40:45 2017 @@ -1,2 +1,3 @@ +add_subdirectory(blackshade.msstyles) add_subdirectory(lautus.msstyles) Added: trunk/reactos/media/themes/blackshade.msstyles/BlackShade.png URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/themes/blackshade.msstyles/BlackShade.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/themes/blackshade.msstyles/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== --- trunk/reactos/media/themes/blackshade.msstyles/CMakeLists.txt (added) +++ trunk/reactos/media/themes/blackshade.msstyles/CMakeLists.txt [iso-8859-1] Sun Feb 19 20:40:45 2017 @@ -0,0 +1,23 @@ + +list(APPEND TEXTFILES + textfiles/ExtraLargeNormal.INI + textfiles/LargeFontsNormal.INI + textfiles/NormalNormal.INI) + +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/textfiles) +foreach(_file ${TEXTFILES}) + get_filename_component(_file_name ${_file} NAME_WE) + string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _converted_file "${_file}") + string(REPLACE ${_file_name} "${_file_name}_utf16" _converted_file ${_converted_file}) + set(_file ${CMAKE_CURRENT_SOURCE_DIR}/${_file}) + set(_converted_file ${CMAKE_CURRENT_BINARY_DIR}/${_converted_file}) + add_custom_command(OUTPUT ${_converted_file} + COMMAND native-utf16le ${_file} ${_converted_file} + DEPENDS native-utf16le ${_file}) + list(APPEND _converted_files ${_converted_file}) +endforeach() + +set_source_files_properties(blackshade.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") +add_library(blackshade.msstyles SHARED blackshade.rc) +set_module_type(blackshade.msstyles module) +set_target_properties(blackshade.msstyles PROPERTIES SUFFIX "") Propchange: trunk/reactos/media/themes/blackshade.msstyles/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/themes/blackshade.msstyles/bitmaps/dummy.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/themes/blackshade.msstyles/bitmaps/dummy.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== --- trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc (added) +++ trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc [iso-8859-1] Sun Feb 19 20:40:45 2017 @@ -0,0 +1,187 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Black Shade Theme\0" +#define REACTOS_STR_INTERNAL_NAME "Black Shade\0" +#define REACTOS_STR_ORIGINAL_FILENAME "blackshade.msstyles\0" +#include <reactos/version.rc> + +#include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 COLORNAMES {L"Normal Color\0\0"} +COMBO COMBODATA {0x0003,0x0003, 0x0000, 0x0003, 0x0006, 0x0001,0x0004,0x0007,0x0002,0x0005,0x08,} +1 PACKTHEM_VERSION {0x03,} +1 FILERESNAMES {L"NORMALNORMAL_INI\0LARGEFONTSNORMAL_INI\0EXTRALARGENORMAL_INI\0\0"} +1 SIZENAMES {L"Normal Size\0Large Fonts\0Extra Large Fonts\0\0"} +1 MINDEPTH {0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x0000,} + +EXTRALARGENORMAL_INI TEXTFILE "textfiles/ExtraLargeNormal_utf16.INI" +LARGEFONTSNORMAL_INI TEXTFILE "textfiles/LargeFontsNormal_utf16.INI" +NORMALNORMAL_INI TEXTFILE "textfiles/NormalNormal_utf16.INI" +THEMES_INI TEXTFILE {L"\r\n"} + +NORMAL_BALLOONCLOSE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_BALLOONCLOSE.bmp" +NORMAL_BUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_BUTTON.bmp" +NORMAL_CHECKBOX13_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp" +NORMAL_CHECKBOX16_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp" +NORMAL_CHECKBOX25_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp" +NORMAL_CHEVRON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_CHEVRON.bmp" +NORMAL_CLOSEBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_CLOSEBUTTON.bmp" +NORMAL_CLOSEGLYPH9_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_CLOSEGLYPH9.bmp" +NORMAL_COMBOBUTTONGLYPH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_COMBOBUTTONGLYPH.bmp" +NORMAL_COMBOBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_COMBOBUTTON.bmp" +NORMAL_EXPLORERBARHEADERBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_EXPLORERBARHEADERBACKGROUND.bmp" +NORMAL_EXPLORERBARHEADERCLOSE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_EXPLORERBARHEADERCLOSE.bmp" +NORMAL_EXPLORERBARTOOLBARBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBACKGROUND.bmp" +NORMAL_EXPLORERBARTOOLBARBUTTONSSPLITDROPDOWN_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLITDROPDOWN.bmp" +NORMAL_EXPLORERBARTOOLBARBUTTONSSPLIT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLIT.bmp" +NORMAL_FIELDOUTLINEBLUE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FIELDOUTLINEBLUE.bmp" +NORMAL_FRAMEBOTTOM_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMEBOTTOM.bmp" +NORMAL_FRAMECAPTIONMIN_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMECAPTIONMIN.bmp" +NORMAL_FRAMECAPTIONSIZING_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMECAPTIONSIZING.bmp" +NORMAL_FRAMECAPTION_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMECAPTION.bmp" +NORMAL_FRAMELEFT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMELEFT.bmp" +NORMAL_FRAMEMAXIMIZED_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMEMAXIMIZED.bmp" +NORMAL_FRAMERIGHT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMERIGHT.bmp" +NORMAL_GRIPPERVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_GRIPPERVERT.bmp" +NORMAL_GRIPPER_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_GRIPPER.bmp" +NORMAL_GROUPBOX_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_GROUPBOX.bmp" +NORMAL_HELPBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_HELPBUTTON.bmp" +NORMAL_LISTVIEWHEADERBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADERBACKGROUND.bmp" +NORMAL_LISTVIEWHEADER_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADER.bmp" +NORMAL_MAXBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_MAXBUTTON.bmp" +NORMAL_MDICAPTIONBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_MDICAPTIONBUTTON.bmp" +NORMAL_MDIGLYPHCLOSE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_MDIGLYPHCLOSE.bmp" +NORMAL_MDIGLYPHMINIMIZE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_MDIGLYPHMINIMIZE.bmp" +NORMAL_MDIGLYPHRESTORE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_MDIGLYPHRESTORE.bmp" +NORMAL_MINBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_MINBUTTON.bmp" +NORMAL_NORMALGROUPBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_NORMALGROUPBACKGROUND.bmp" +NORMAL_NORMALGROUPHEAD_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_NORMALGROUPHEAD.bmp" +NORMAL_PLACEBARBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_PLACEBARBACKGROUND.bmp" +NORMAL_PLACEBARBUTTONS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_PLACEBARBUTTONS.bmp" +NORMAL_PROGRESSCHUNKVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_PROGRESSCHUNKVERT.bmp" +NORMAL_PROGRESSCHUNK_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_PROGRESSCHUNK.bmp" +NORMAL_PROGRESSTRACKVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_PROGRESSTRACKVERT.bmp" +NORMAL_PROGRESSTRACK_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_PROGRESSTRACK.bmp" +NORMAL_RADIOBUTTON13_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_RADIOBUTTON13.bmp" +NORMAL_RESIZEGRIP2_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_RESIZEGRIP2.bmp" +NORMAL_RESTOREBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp" +NORMAL_SCROLLARROWGLYPHSSMALL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLARROWGLYPHSSMALL.bmp" +NORMAL_SCROLLARROWGLYPHS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLARROWGLYPHS.bmp" +NORMAL_SCROLLARROWS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLARROWS.bmp" +NORMAL_SCROLLSHAFTHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp" +NORMAL_SCROLLSHAFTVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLSHAFTVERTICAL.bmp" +NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp" +NORMAL_SCROLLTHUMBGRIPPERVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERVERTICAL.bmp" +NORMAL_SCROLLTHUMBHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp" +NORMAL_SCROLLTHUMBVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBVERTICAL.bmp" +NORMAL_SEPARATORVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SEPARATORVERT.bmp" +NORMAL_SEPARATOR_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SEPARATOR.bmp" +NORMAL_SLIDERTRACK_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SLIDERTRACK.bmp" +NORMAL_SLIDERTRACKVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SLIDERTRACKVERT.bmp" +NORMAL_SMALLCLOSEBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SMALLCLOSEBUTTON.bmp" +NORMAL_SMALLFRAMECAPTIONSIZING_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SMALLFRAMECAPTIONSIZING.bmp" +NORMAL_SMALLFRAMECAPTION_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SMALLFRAMECAPTION.bmp" +NORMAL_SPECIALGROUPBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPECIALGROUPBACKGROUND.bmp" +NORMAL_SPECIALGROUPHEAD_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPECIALGROUPHEAD.bmp" +NORMAL_SPINBUTTONBACKGROUNDDOWN_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp" +NORMAL_SPINBUTTONBACKGROUNDLEFT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp" +NORMAL_SPINBUTTONBACKGROUNDRIGHT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp" +NORMAL_SPINBUTTONBACKGROUNDUP_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDUP.bmp" +NORMAL_SPINDOWNGLYPH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINDOWNGLYPH.bmp" +NORMAL_SPINLEFTGLYPH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINLEFTGLYPH.bmp" +NORMAL_SPINRIGHTGLYPH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINRIGHTGLYPH.bmp" +NORMAL_SPINUPGLYPH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINUPGLYPH.bmp" +NORMAL_STARTBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.bmp" +NORMAL_STARTGROUPBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTGROUPBACKGROUND.bmp" +NORMAL_STARTGROUPNEWAPPBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTGROUPNEWAPPBUTTON.bmp" +NORMAL_STARTGROUPSEPERATOR_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTGROUPSEPERATOR.bmp" +NORMAL_STARTGROUPTOOLBARBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTGROUPTOOLBARBUTTON.bmp" +NORMAL_STARTPANELLOGOFFBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELLOGOFFBACKGROUND.bmp" +NORMAL_STARTPANELLOGOFFBUTTONSHOT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELLOGOFFBUTTONSHOT.bmp" +NORMAL_STARTPANELLOGOFFBUTTONS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELLOGOFFBUTTONS.bmp" +NORMAL_STARTPANELMFUBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELMFUBACKGROUND.bmp" +NORMAL_STARTPANELMOREPROGARROWHOT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELMOREPROGARROWHOT.bmp" +NORMAL_STARTPANELMOREPROGARROW_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELMOREPROGARROW.bmp" +NORMAL_STARTPANELMOREPROGBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELMOREPROGBACKGROUND.bmp" +NORMAL_STARTPANELPLACESBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELPLACESBACKGROUND.bmp" +NORMAL_STARTPLACESSEPARATOR_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPLACESSEPARATOR.bmp" +NORMAL_STARTPROGRAMSSEPARATOR_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPROGRAMSSEPARATOR.bmp" +NORMAL_STARTUSERPANEL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTUSERPANEL.bmp" +NORMAL_STATUSBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STATUSBACKGROUND.bmp" +NORMAL_STATUSPANE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STATUSPANE.bmp" +NORMAL_TABBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABBACKGROUND.bmp" +NORMAL_TABITEMBOTH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp" +NORMAL_TABITEMLEFT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp" +NORMAL_TABITEMRIGHT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp" +NORMAL_TABITEMTOPBOTH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMTOPBOTH.bmp" +NORMAL_TABITEMTOPLEFT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp" +NORMAL_TABITEMTOPRIGHT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMTOPRIGHT.bmp" +NORMAL_TABITEMTOP_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp" +NORMAL_TABITEM_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEM.bmp" +NORMAL_TABPANEEDGE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABPANEEDGE.bmp" +NORMAL_TASKBANDBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDBACKGROUND.bmp" +NORMAL_TASKBANDBUTTONNOEDGEVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDBUTTONNOEDGEVERTICAL.bmp" +NORMAL_TASKBANDBUTTONNOEDGE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDBUTTONNOEDGE.bmp" +NORMAL_TASKBANDBUTTONVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDBUTTONVERTICAL.bmp" +NORMAL_TASKBANDBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDBUTTON.bmp" +NORMAL_TASKBANDFLASHBUTTONGROUPMENU_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDFLASHBUTTONGROUPMENU.bmp" +NORMAL_TASKBANDFLASHBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDFLASHBUTTON.bmp" +NORMAL_TASKBANDHOVER_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDHOVER.bmp" +NORMAL_TASKBANDSCROLLARROWGLYPHS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWGLYPHS.bmp" +NORMAL_TASKBANDSCROLLARROWS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWS.bmp" +NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL.bmp" +NORMAL_TASKBANDSCROLLSHAFTVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp" +NORMAL_TASKBANDSCROLLTHUMBGRIPPERHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBGRIPPERHORIZONTAL.bmp" +NORMAL_TASKBANDSCROLLTHUMBGRIPPERVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBGRIPPERVERTICAL.bmp" +NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp" +NORMAL_TASKBANDSCROLLTHUMBVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp" +NORMAL_TASKBARBACKGROUNDVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARBACKGROUNDVERTICAL.bmp" +NORMAL_TASKBARBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARBACKGROUND.bmp" +NORMAL_TASKBARCHEVRONVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARCHEVRONVERT.bmp" +NORMAL_TASKBARCHEVRON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARCHEVRON.bmp" +NORMAL_TASKBARGRIPPERVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARGRIPPERVERTICAL.bmp" +NORMAL_TASKBARGRIPPER_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARGRIPPER.bmp" +NORMAL_TASKBARSIZINGBARBOTTOM_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARSIZINGBARBOTTOM.bmp" +NORMAL_TASKBARSIZINGBARLEFT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARSIZINGBARLEFT.bmp" +NORMAL_TASKBARSIZINGBARRIGHT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARSIZINGBARRIGHT.bmp" +NORMAL_TASKBARSIZINGBARTOP_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARSIZINGBARTOP.bmp" +NORMAL_TASKBARTRAYVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARTRAYVERTICAL.bmp" +NORMAL_TASKBARTRAY_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARTRAY.bmp" +NORMAL_TOOLBARBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARBACKGROUND.bmp" +NORMAL_TOOLBARBUTTONSSPLITDROPDOWNGLYPH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLITDROPDOWNGLYPH.bmp" +NORMAL_TOOLBARBUTTONSSPLITDROPDOWN_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLITDROPDOWN.bmp" +NORMAL_TOOLBARBUTTONSSPLIT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLIT.bmp" +NORMAL_TOOLBARBUTTONS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARBUTTONS.bmp" +NORMAL_TOOLBARGRIPPERVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARGRIPPERVERT.bmp" +NORMAL_TOOLBARGRIPPER_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARGRIPPER.bmp" +NORMAL_TRACKBARDOWN13_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARDOWN13.bmp" +NORMAL_TRACKBARDOWN16_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARDOWN16.bmp" +NORMAL_TRACKBARDOWN25_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARDOWN25.bmp" +NORMAL_TRACKBARHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARHORIZONTAL.bmp" +NORMAL_TRACKBARLEFT13_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARLEFT13.bmp" +NORMAL_TRACKBARLEFT16_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARLEFT16.bmp" +NORMAL_TRACKBARLEFT25_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARLEFT25.bmp" +NORMAL_TRACKBARRIGHT13_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARRIGHT13.bmp" +NORMAL_TRACKBARRIGHT16_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARRIGHT16.bmp" +NORMAL_TRACKBARRIGHT25_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARRIGHT25.bmp" +NORMAL_TRACKBARUP13_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARUP13.bmp" +NORMAL_TRACKBARUP16_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARUP16.bmp" +NORMAL_TRACKBARUP25_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARUP25.bmp" +NORMAL_TRACKBARVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARVERTICAL.bmp" +NORMAL_TRAYCHEVRONHORIZONTALOPEN_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRAYCHEVRONHORIZONTALOPEN.bmp" +NORMAL_TRAYCHEVRONHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRAYCHEVRONHORIZONTAL.bmp" +NORMAL_TREEEXPANDCOLLAPSE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TREEEXPANDCOLLAPSE.bmp" +NORMAL_USERTILEBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_USERTILEBACKGROUND.bmp" + +/* These three are needed before Windows will accept the theme */ +NORMAL_EXPLORERBARHEADERPIN_BMP BITMAP "bitmaps/dummy.bmp" +NORMAL_EXPLORERBARTOOLBARBUTTONS_BMP BITMAP "bitmaps/dummy.bmp" +NORMAL_IE_PERSONALBARMENU_BMP BITMAP "bitmaps/dummy.bmp" +NORMAL_NORMALGROUPCOLLAPSE_BMP BITMAP "bitmaps/dummy.bmp" +NORMAL_NORMALGROUPEXPAND_BMP BITMAP "bitmaps/dummy.bmp" + +#pragma code_page(65001) + +#include "lang/en-US.rc" + Propchange: trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/themes/blackshade.msstyles/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== --- trunk/reactos/media/themes/blackshade.msstyles/lang/en-US.rc (added) +++ trunk/reactos/media/themes/blackshade.msstyles/lang/en-US.rc [iso-8859-1] Sun Feb 19 20:40:45 2017 @@ -0,0 +1,37 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +{ +1000, "Black Shade" +} + +STRINGTABLE +{ +2000, "Black Shade" +} + +STRINGTABLE +{ +3000, "Normal" +3001, "Large Fonts" +3002, "Extra Large Fonts" +} + +STRINGTABLE +{ +4000, "Normal" +4001, "Large Fonts" +4002, "Extra Large Fonts" +} + +STRINGTABLE +{ +5000, "Black Shade" +5001, "Visual Style" +5002, "ReactOS Foundation" +5003, "Images by David Quintana <gigaherz(a)gmail.com>" +5004, "Images released under CC-BY-SA 4.0" +5005, "http://www.reactos.org" +5006, "1.0" +5007, "Visual Style for ReactOS" +} Propchange: trunk/reactos/media/themes/blackshade.msstyles/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 7 months

[ekohl] 73853: [COMCTL32] Update a tool buttons tooltip rectangle when the button gets hidden. Patch will be sent upstream! CORE-12667 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 19 20:39:11 2017 New Revision: 73853 URL: http://svn.reactos.org/svn/reactos?rev=73853&view=rev Log: [COMCTL32] Update a tool buttons tooltip rectangle when the button gets hidden. Patch will be sent upstream! CORE-12667 #resolve Modified: trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sun Feb 19 20:39:11 2017 @@ -1758,6 +1758,7 @@ if (btnPtr->fsState & TBSTATE_HIDDEN) { SetRectEmpty (&btnPtr->rect); + TOOLBAR_TooltipSetRect(infoPtr, btnPtr); continue; }

7 years, 7 months

[ekohl] 73852: [DEVMGR] - NEVER EVER use single line if statements!!!! - Fix indentation and coding style.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 19 19:40:04 2017 New Revision: 73852 URL: http://svn.reactos.org/svn/reactos?rev=73852&view=rev Log: [DEVMGR] - NEVER EVER use single line if statements!!!! - Fix indentation and coding style. Modified: trunk/reactos/dll/win32/devmgr/devmgmt/ClassNode.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp trunk/reactos/dll/win32/devmgr/properties/advprop.cpp Modified: trunk/reactos/dll/win32/devmgr/devmgmt/ClassNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/C… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/ClassNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/ClassNode.cpp [iso-8859-1] Sun Feb 19 19:40:04 2017 @@ -114,7 +114,6 @@ DWORD Size; DWORD dwError; - // First check for a semi colon */ ptr = wcschr(ResourceDescriptor, L';'); if (ptr) @@ -127,15 +126,18 @@ { // This must be a dll resource based descriptor. Find the comma ptr = wcschr(ResourceDescriptor, L','); - if (ptr == NULL) return ERROR_INVALID_DATA; + if (ptr == NULL) + return ERROR_INVALID_DATA; // Terminate the string where the comma was *ptr = UNICODE_NULL; // Expand any environment strings Size = ExpandEnvironmentStringsW(&ResourceDescriptor[1], ModulePath, MAX_PATH); - if (Size > MAX_PATH) return ERROR_BUFFER_OVERFLOW; - if (Size == 0) return GetLastError(); + if (Size > MAX_PATH) + return ERROR_BUFFER_OVERFLOW; + if (Size == 0) + return GetLastError(); // Put the comma back and move past it *ptr = L','; @@ -143,13 +145,15 @@ // Load the dll hModule = LoadLibraryExW(ModulePath, NULL, LOAD_LIBRARY_AS_DATAFILE); - if (hModule == NULL) return GetLastError(); + if (hModule == NULL) + return GetLastError(); // Convert the resource id to a number ResourceId = _wtoi(ptr); // If the number is negative, make it positive - if (ResourceId < 0) ResourceId = -ResourceId; + if (ResourceId < 0) + ResourceId = -ResourceId; // Load the string from the dll if (LoadStringW(hModule, ResourceId, ResString, 256)) Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] Sun Feb 19 19:40:04 2017 @@ -41,7 +41,6 @@ size_t size = wcslen(Node.m_DeviceId) + 1; m_DeviceId = new WCHAR[size]; StringCbCopyW(m_DeviceId, size * sizeof(WCHAR), Node.m_DeviceId); - } CDeviceNode::~CDeviceNode() @@ -65,15 +64,14 @@ // Now get the actual device id cr = CM_Get_Device_IDW(m_DevInst, - m_DeviceId, - ulLength + 1, - 0); + m_DeviceId, + ulLength + 1, + 0); if (cr != CR_SUCCESS || wcscmp(m_DeviceId, L"HTREE\\ROOT\\0") == 0) { delete[] m_DeviceId; m_DeviceId = NULL; } - } // Make sure we got the string @@ -95,7 +93,6 @@ &m_DevinfoData); } - // Check if the device has a problem if (HasProblem()) { @@ -108,9 +105,6 @@ m_OverlayImage = OverlayProblem; } } - - - // Get the class guid for this device ulLength = MAX_GUID_STRING_LEN * sizeof(WCHAR); @@ -131,12 +125,10 @@ m_ClassGuid = GUID_DEVCLASS_UNKNOWN; } - // Get the image for the class this device is in SetupDiGetClassImageIndex(m_ImageListData, &m_ClassGuid, &m_ClassImage); - // Get the description for the device ulLength = DISPLAY_NAME_LEN * sizeof(WCHAR); @@ -155,7 +147,6 @@ m_DisplayName, &ulLength, 0); - } if (cr != CR_SUCCESS) @@ -310,7 +301,6 @@ pcp.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE; pcp.StateChange = (Enable ? DICS_ENABLE : DICS_DISABLE); pcp.HwProfile = 0; - // check both scopes to make sure we can make the change for (int i = 0; i < 2; i++) @@ -374,7 +364,6 @@ bool CDeviceNode::UninstallDevice() { - if (CanUninstall() == false) return false; @@ -388,7 +377,6 @@ // We probably need to walk all the siblings of this // device and ask if they're happy with the uninstall // - // Remove it SetupDiSetClassInstallParamsW(m_hDevInfo, @@ -404,7 +392,6 @@ 0); return true; - } /* PRIVATE METHODS ******************************************************/ @@ -425,8 +412,7 @@ } DWORD -CDeviceNode::GetFlags( - ) +CDeviceNode::GetFlags() { SP_DEVINSTALL_PARAMS DevInstallParams; DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); @@ -480,5 +466,3 @@ } return false; } - - Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Sun Feb 19 19:40:04 2017 @@ -56,7 +56,8 @@ // Get the device image list m_ImageListData.cbSize = sizeof(SP_CLASSIMAGELIST_DATA); BOOL bSuccess = SetupDiGetClassImageList(&m_ImageListData); - if (bSuccess == FALSE) return false; + if (bSuccess == FALSE) + return false; // Create the main treeview m_hTreeView = CreateWindowExW(WS_EX_CLIENTEDGE, @@ -207,7 +208,6 @@ ThreadData->ScanForChanges = ScanForChanges; ThreadData->UpdateView = UpdateView; - HANDLE hThread; hThread = (HANDLE)_beginthreadex(NULL, 0, @@ -348,7 +348,8 @@ cr = CM_Enumerate_Classes(ClassIndex, ClassGuid, 0); - if (cr != CR_SUCCESS) return false; + if (cr != CR_SUCCESS) + return false; // Check if this is the unknown class if (IsEqualGUID(*ClassGuid, GUID_DEVCLASS_UNKNOWN)) @@ -421,7 +422,6 @@ case ResourcesByConnection: break; } - This->SelectNode(LastSelectedNode); @@ -645,7 +645,8 @@ { // Check if the parent device has anything at the same level bSuccess = GetSiblingDevice(Device, &Device); - if (bSuccess == FALSE) break; + if (bSuccess == FALSE) + break; DeviceNode = dynamic_cast<CDeviceNode *>(GetDeviceNode(Device)); if (DeviceNode == nullptr) @@ -686,7 +687,8 @@ } // If there was a problem, expand the ancestors - if (HasProblem) return false; + if (HasProblem) + return false; return true; } @@ -698,7 +700,8 @@ ) { CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); - if (Node == nullptr) return false; + if (Node == nullptr) + return false; if (Enable == false) { @@ -706,9 +709,9 @@ if (str.LoadStringW(g_hThisInstance, IDS_CONFIRM_DISABLE)) { if (MessageBoxW(m_hMainWnd, - str, - Node->GetDisplayName(), - MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2) != IDYES) + str, + Node->GetDisplayName(), + MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2) != IDYES) { return false; } @@ -724,7 +727,8 @@ ) { CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); - if (Node == nullptr) return false; + if (Node == nullptr) + return false; DWORD dwReboot; if (InstallDevInst(m_hMainWnd, Node->GetDeviceId(), TRUE, &dwReboot)) @@ -741,15 +745,16 @@ ) { CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); - if (Node == nullptr) return false; + if (Node == nullptr) + return false; CAtlStringW str; if (str.LoadStringW(g_hThisInstance, IDS_CONFIRM_UNINSTALL)) { if (MessageBoxW(m_hMainWnd, - str, - Node->GetDisplayName(), - MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2) != IDYES) + str, + Node->GetDisplayName(), + MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2) != IDYES) { return false; } @@ -765,7 +770,8 @@ HMODULE hModule; hModule = LoadLibraryW(L"hdwwiz.cpl"); - if (hModule == NULL) return false; + if (hModule == NULL) + return false; pAddHardwareWizard = (PADDHARDWAREWIZARD)GetProcAddress(hModule, "AddHardwareWizard"); @@ -953,7 +959,8 @@ // Check if this node has any children hItem = TreeView_GetChild(m_hTreeView, hParentItem); - if (hItem == NULL) return NULL; + if (hItem == NULL) + return NULL; // The lParam contains the node pointer data tvItem.hItem = hItem; @@ -977,14 +984,16 @@ // This node may have its own children FoundItem = RecurseFindDevice(hItem, Node); - if (FoundItem) return FoundItem; + if (FoundItem) + return FoundItem; // Loop all the siblings for (;;) { // Get the next item at this level hItem = TreeView_GetNextSibling(m_hTreeView, hItem); - if (hItem == NULL) break; + if (hItem == NULL) + break; // The lParam contains the node pointer data tvItem.hItem = hItem; @@ -1007,7 +1016,8 @@ // This node may have its own children FoundItem = RecurseFindDevice(hItem, Node); - if (FoundItem) return FoundItem; + if (FoundItem) + return FoundItem; } return hItem; @@ -1022,7 +1032,8 @@ // Check if there are any items in the tree hRoot = TreeView_GetRoot(m_hTreeView); - if (hRoot == NULL) return; + if (hRoot == NULL) + return; // If we don't want to set select a node, just select root if (Node == nullptr || Node->GetNodeType() == RootNode) @@ -1060,7 +1071,8 @@ CClassNode *Node = nullptr; Pos = m_ClassNodeList.GetHeadPosition(); - if (Pos == NULL) return nullptr; + if (Pos == NULL) + return nullptr; do { @@ -1087,7 +1099,8 @@ CDeviceNode *Node = nullptr; Pos = m_DeviceNodeList.GetHeadPosition(); - if (Pos == NULL) return nullptr; + if (Pos == NULL) + return nullptr; do { @@ -1172,7 +1185,6 @@ ClassIndex++; } while (Success); - // Get all the devices on the local machine hDevInfo = SetupDiGetClassDevsW(NULL, 0, @@ -1189,7 +1201,8 @@ { // Get the devinst for this device Success = SetupDiEnumDeviceInfo(hDevInfo, i, &DeviceInfoData); - if (Success == FALSE) break; + if (Success == FALSE) + break; // create a new device node and add it to the list DeviceNode = new CDeviceNode(DeviceInfoData.DevInst, &m_ImageListData); @@ -1201,7 +1214,6 @@ { ATLASSERT(FALSE); } - } SetupDiDestroyDeviceInfoList(hDevInfo); Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Sun Feb 19 19:40:04 2017 @@ -93,7 +93,6 @@ { } - bool CDeviceManager::Create(_In_ HWND /*hWndParent*/, _In_ HINSTANCE hInst, @@ -130,7 +129,6 @@ return (Ret == 0); } - /* PRIVATE METHODS **********************************************/ @@ -256,11 +254,25 @@ // Get the menu item id switch (Type) { - case DevicesByType: CheckId = IDC_DEVBYTYPE; break; - case DevicesByConnection: CheckId = IDC_DEVBYCONN; break; - case ResourcesByType: CheckId = IDC_RESBYTYPE; break; - case ResourcesByConnection: CheckId = IDC_RESBYCONN; break; - default: ATLASSERT(FALSE); break; + case DevicesByType: + CheckId = IDC_DEVBYTYPE; + break; + + case DevicesByConnection: + CheckId = IDC_DEVBYCONN; + break; + + case ResourcesByType: + CheckId = IDC_RESBYTYPE; + break; + + case ResourcesByConnection: + CheckId = IDC_RESBYCONN; + break; + + default: + ATLASSERT(FALSE); + break; } // Set the new check item @@ -291,7 +303,8 @@ (HMENU)IDC_TOOLBAR, g_hThisInstance, NULL); - if (m_hToolBar == NULL) return FALSE; + if (m_hToolBar == NULL) + return FALSE; // Don't show clipped buttons SendMessageW(m_hToolBar, @@ -394,8 +407,6 @@ } SendMessageW(m_hToolBar, TB_SETSTATE, IDC_DISABLE_DRV, MAKELPARAM(State, 0)); } - - bool CDeviceManager::StatusBarLoadString(_In_ HWND hStatusBar, @@ -793,6 +804,7 @@ } break; } + case WM_TIMER: { if (wParam == REFRESH_TIMER) @@ -829,9 +841,11 @@ } case WM_ACTIVATE: + { if (LOWORD(hwnd)) This->OnActivate(); break; + } case WM_DESTROY: { Modified: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp [iso-8859-1] Sun Feb 19 19:40:04 2017 @@ -31,7 +31,8 @@ HBITMAP hRootImage; hRootImage = LoadBitmapW(g_hThisInstance, MAKEINTRESOURCEW(IDB_ROOT_IMAGE)); - if (hRootImage == NULL) return FALSE; + if (hRootImage == NULL) + return false; // Add this bitmap to the device image list. This is a bit hacky, but it's safe m_ClassImage = ImageList_Add(m_ImageListData->ImageList, Modified: trunk/reactos/dll/win32/devmgr/properties/advprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/propertie… ============================================================================== --- trunk/reactos/dll/win32/devmgr/properties/advprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/properties/advprop.cpp [iso-8859-1] Sun Feb 19 19:40:04 2017 @@ -347,7 +347,7 @@ if (ListView_GetItemCount(hDriversListView) == 0) { - if(LoadStringW(hDllInstance, IDS_NODRIVERS, szBuffer, _countof(szBuffer))) + if (LoadStringW(hDllInstance, IDS_NODRIVERS, szBuffer, _countof(szBuffer))) MessageBoxW(hwndDlg, szBuffer, dap->szDevName, MB_OK); EndDialog(hwndDlg, IDCANCEL); }

7 years, 7 months

[ekohl] 73851: [DEVMGR] Hide "HTREE\ROOT\0" from the device tree. CORE-12670 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 19 19:13:41 2017 New Revision: 73851 URL: http://svn.reactos.org/svn/reactos?rev=73851&view=rev Log: [DEVMGR] Hide "HTREE\ROOT\0" from the device tree. CORE-12670 #resolve #comment Thanks a lot! Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] Sun Feb 19 19:13:41 2017 @@ -68,7 +68,7 @@ m_DeviceId, ulLength + 1, 0); - if (cr != CR_SUCCESS) + if (cr != CR_SUCCESS || wcscmp(m_DeviceId, L"HTREE\\ROOT\\0") == 0) { delete[] m_DeviceId; m_DeviceId = NULL;

7 years, 7 months

[ekohl] 73850: [DEVMGR] Select a treeview item on a right click.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 19 18:31:52 2017 New Revision: 73850 URL: http://svn.reactos.org/svn/reactos?rev=73850&view=rev Log: [DEVMGR] Select a treeview item on a right click. Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Sun Feb 19 18:31:52 2017 @@ -128,10 +128,16 @@ _In_ LPNMHDR NmHdr ) { - HTREEITEM hItem = TreeView_GetNextItem(NmHdr->hwndFrom, 0, TVGN_DROPHILITE); - if (hItem) - { - TreeView_SelectItem(NmHdr->hwndFrom, hItem); + TVHITTESTINFO hitInfo; + HTREEITEM hItem; + + GetCursorPos(&hitInfo.pt); + ScreenToClient(m_hTreeView, &hitInfo.pt); + + hItem = TreeView_HitTest(m_hTreeView, &hitInfo); + if (hItem != NULL && (hitInfo.flags & (TVHT_ONITEM | TVHT_ONITEMICON))) + { + TreeView_SelectItem(m_hTreeView, hItem); } return 0;

7 years, 7 months

[tfaber] 73849: [MSAFD][WS2_32] - Properly return error codes from WSPConnect CORE-12787 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 19 17:50:34 2017 New Revision: 73849 URL: http://svn.reactos.org/svn/reactos?rev=73849&view=rev Log: [MSAFD][WS2_32] - Properly return error codes from WSPConnect CORE-12787 #resolve Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/ws2_32/src/socklife.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Feb 19 17:50:34 2017 @@ -79,16 +79,25 @@ { /* Duplpicating socket from different process */ if ((HANDLE)lpProtocolInfo->dwServiceFlags3 == INVALID_HANDLE_VALUE) - return WSAEINVAL; + { + Status = WSAEINVAL; + goto error; + } if ((HANDLE)lpProtocolInfo->dwServiceFlags4 == INVALID_HANDLE_VALUE) - return WSAEINVAL; + { + Status = WSAEINVAL; + goto error; + } SharedData = MapViewOfFile((HANDLE)lpProtocolInfo->dwServiceFlags3, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(SOCK_SHARED_INFO)); if (!SharedData) - return WSAEINVAL; + { + Status = WSAEINVAL; + goto error; + } InterlockedIncrement(&SharedData->RefCount); AddressFamily = SharedData->AddressFamily; SocketType = SharedData->SocketType; @@ -96,7 +105,10 @@ } if (AddressFamily == AF_UNSPEC && SocketType == 0 && Protocol == 0) - return WSAEINVAL; + { + Status = WSAEINVAL; + goto error; + } /* Set the defaults */ if (AddressFamily == AF_UNSPEC) @@ -167,7 +179,7 @@ Socket = HeapAlloc(GlobalHeap, 0, sizeof(*Socket)); if (!Socket) { - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = WSAENOBUFS; goto error; } RtlZeroMemory(Socket, sizeof(*Socket)); @@ -184,7 +196,7 @@ Socket->SharedData = HeapAlloc(GlobalHeap, 0, sizeof(*Socket->SharedData)); if (!Socket->SharedData) { - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = WSAENOBUFS; goto error; } RtlZeroMemory(Socket->SharedData, sizeof(*Socket->SharedData)); @@ -236,7 +248,7 @@ EABuffer = HeapAlloc(GlobalHeap, 0, SizeOfEA); if (!EABuffer) { - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = WSAENOBUFS; goto error; } @@ -263,6 +275,7 @@ if ((SocketType != SOCK_DGRAM) && (SocketType != SOCK_RAW)) { /* Only RAW or UDP can be Connectionless */ + Status = WSAEINVAL; goto error; } AfdPacket->EndpointFlags |= AFD_ENDPOINT_CONNECTIONLESS; @@ -275,6 +288,7 @@ if ((Socket->SharedData->ServiceFlags1 & XP1_PSEUDO_STREAM) == 0) { /* The Provider doesn't actually support Message Oriented Streams */ + Status = WSAEINVAL; goto error; } } @@ -291,6 +305,7 @@ if ((Socket->SharedData->ServiceFlags1 & XP1_SUPPORT_MULTIPOINT) == 0) { /* The Provider doesn't actually support Multipoint */ + Status = WSAEINVAL; goto error; } AfdPacket->EndpointFlags |= AFD_ENDPOINT_MULTIPOINT; @@ -301,6 +316,7 @@ || ((dwFlags & WSA_FLAG_MULTIPOINT_C_LEAF) != 0)) { /* The Provider doesn't support Control Planes, or you already gave a leaf */ + Status = WSAEINVAL; goto error; } AfdPacket->EndpointFlags |= AFD_ENDPOINT_C_ROOT; @@ -312,6 +328,7 @@ || ((dwFlags & WSA_FLAG_MULTIPOINT_D_LEAF) != 0)) { /* The Provider doesn't support Data Planes, or you already gave a leaf */ + Status = WSAEINVAL; goto error; } AfdPacket->EndpointFlags |= AFD_ENDPOINT_D_ROOT; @@ -346,6 +363,7 @@ if (!NT_SUCCESS(Status)) { ERR("Failed to open socket. Status 0x%08x\n", Status); + Status = TranslateNtStatusError(Status); goto error; } Modified: trunk/reactos/dll/win32/ws2_32/src/socklife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/sockl… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/socklife.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/socklife.c [iso-8859-1] Sun Feb 19 17:50:34 2017 @@ -567,13 +567,6 @@ } /* Check if we got a valid socket */ - if (Status == WSAEINVAL) - { - Status = INVALID_SOCKET; - ErrorCode = WSAEINVAL; - } - - /* Check if we got a valid socket */ if (Status != INVALID_SOCKET) { /* Add an API reference and return */

7 years, 7 months

[pschweitzer] 73848: [EVENTVWR] Don't attempt to free random address CID 1401231

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Feb 19 17:24:13 2017 New Revision: 73848 URL: http://svn.reactos.org/svn/reactos?rev=73848&view=rev Log: [EVENTVWR] Don't attempt to free random address CID 1401231 Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sun Feb 19 17:24:13 2017 @@ -1430,7 +1430,7 @@ ULONG LogIndex; HANDLE hEventLog; - PEVENTLOGRECORD pEvlr; + PEVENTLOGRECORD pEvlr = NULL; PBYTE pEvlrEnd; PBYTE pEvlrBuffer; DWORD dwWanted, dwRead, dwNeeded, dwStatus = ERROR_SUCCESS;

7 years, 7 months

[gadamopoulos] 73847: [UXTHEME] Fix the conversion from color id to theme metric and don't pass the metric id to GetSysColor. CORE-11086

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 19 16:32:44 2017 New Revision: 73847 URL: http://svn.reactos.org/svn/reactos?rev=73847&view=rev Log: [UXTHEME] Fix the conversion from color id to theme metric and don't pass the metric id to GetSysColor. CORE-11086 Modified: trunk/reactos/dll/win32/uxtheme/metric.c Modified: trunk/reactos/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] Sun Feb 19 16:32:44 2017 @@ -61,15 +61,11 @@ HRESULT hr; PTHEME_PROPERTY tp; - // TODO: Check if this is correct - if ( iColorID >= 0 && iColorID < 32) - iColorID += TMT_SCROLLBAR; - TRACE("(%p, %d)\n", hTheme, iColorID); SetLastError(0); if(hTheme) { PTHEME_CLASS ptc = (PTHEME_CLASS) hTheme; - if((tp = MSSTYLES_FindMetric(ptc->tf, TMT_COLOR, iColorID))) { + if((tp = MSSTYLES_FindMetric(ptc->tf, TMT_COLOR, iColorID + TMT_FIRSTCOLOR))) { COLORREF color; hr = MSSTYLES_GetPropertyColor(tp, &color); if(SUCCEEDED(hr))

7 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
36
Older →

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 February 2017