Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[spetreolle] 61635: [THEMES] - Add the Lautus visual style by Pisarz. Based on a patch by Christoph von Wittich. The resulting windows/linux themes have been checked on Windows XP.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Jan 15 23:08:39 2014 New Revision: 61635 URL: http://svn.reactos.org/svn/reactos?rev=61635&view=rev Log: [THEMES] - Add the Lautus visual style by Pisarz. Based on a patch by Christoph von Wittich. The resulting windows/linux themes have been checked on Windows XP. Added: trunk/reactos/media/themes/CMakeLists.txt - copied unchanged from r59059, branches/ros-branch-0_3_15-lt2013/media/themes/CMakeLists.txt trunk/reactos/media/themes/lautus.msstyles/ - copied from r59059, branches/ros-branch-0_3_15-lt2013/media/themes/lautus.msstyles/ Modified: trunk/reactos/ (props changed) trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/media/CMakeLists.txt trunk/reactos/media/themes/lautus.msstyles/lautus.rc Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 15 23:08:39 2014 @@ -9,6 +9,7 @@ /branches/reactx/reactos:49994-49995 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_3_15-lt2013:59059 /branches/ros-csrss:57561-58762 /branches/shell32_new-bringup:51893-53652,53661,53700 /branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Wed Jan 15 23:08:39 2014 @@ -31,6 +31,7 @@ 15 = Resources 16 = Resources\Themes 17 = system32\wbem +18 = Resources\Themes\Lautus .InfEnd Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Wed Jan 15 23:08:39 2014 @@ -189,6 +189,8 @@ set(${var} 16) elseif(${dir} STREQUAL reactos/system32/wbem) set(${var} 17) + elseif(${dir} STREQUAL reactos/Resources/Themes/Lautus) + set(${var} 18) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif() Modified: trunk/reactos/media/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/CMakeLists.txt?rev=6… ============================================================================== --- trunk/reactos/media/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/CMakeLists.txt [iso-8859-1] Wed Jan 15 23:08:39 2014 @@ -1,6 +1,7 @@ add_subdirectory(fonts) add_subdirectory(inf) add_subdirectory(nls) +add_subdirectory(themes) add_subdirectory(vgafonts) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/hosts DESTINATION reactos/system32/drivers/etc FOR all) Modified: trunk/reactos/media/themes/lautus.msstyles/lautus.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] (original) +++ trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] Wed Jan 15 23:08:39 2014 @@ -10,168 +10,168 @@ 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.ini" -LARGEFONTSNORMAL_INI TEXTFILE "textfiles\\LargeFontsNormal.ini" -NORMALNORMAL_INI TEXTFILE "textfiles\\NormalNormal.ini" +EXTRALARGENORMAL_INI TEXTFILE "textfiles/ExtraLargeNormal.INI" +LARGEFONTSNORMAL_INI TEXTFILE "textfiles/LargeFontsNormal.INI" +NORMALNORMAL_INI TEXTFILE "textfiles/NormalNormal.INI" THEMES_INI TEXTFILE {L"\r\n"} -NORMAL_BALLOONCLOSE_BMP BITMAP "bitmaps\\NORMAL_BALLOONCLOSE.bmp" -NORMAL_BUTTON_BMP BITMAP "bitmaps\\NORMAL_BUTTON.bmp" -NORMAL_CHECKBOX13_BMP BITMAP "bitmaps\\NORMAL_CHECKBOX13.bmp" -NORMAL_CHEVRON_BMP BITMAP "bitmaps\\NORMAL_CHEVRON.bmp" -NORMAL_CLOSEBUTTON_BMP BITMAP "bitmaps\\NORMAL_CLOSEBUTTON.bmp" -NORMAL_CLOSEGLYPH9_BMP BITMAP "bitmaps\\NORMAL_CLOSEGLYPH9.bmp" -NORMAL_COMBOBUTTONGLYPH_BMP BITMAP "bitmaps\\NORMAL_COMBOBUTTONGLYPH.bmp" -NORMAL_COMBOBUTTON_BMP BITMAP "bitmaps\\NORMAL_COMBOBUTTON.bmp" -NORMAL_EXPLORERBARHEADERBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_EXPLORERBARHEADERBACKGROUND.bmp" -NORMAL_EXPLORERBARHEADERCLOSE_BMP BITMAP "bitmaps\\NORMAL_EXPLORERBARHEADERCLOSE.bmp" -NORMAL_EXPLORERBARTOOLBARBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_EXPLORERBARTOOLBARBACKGROUND.bmp" -NORMAL_EXPLORERBARTOOLBARBUTTONSSPLITDROPDOWN_BMP BITMAP "bitmaps\\NORMAL_EXPLORERBARTOOLBARBUTTONSSPLITDROPDOWN.bmp" -NORMAL_EXPLORERBARTOOLBARBUTTONSSPLIT_BMP BITMAP "bitmaps\\NORMAL_EXPLORERBARTOOLBARBUTTONSSPLIT.bmp" -NORMAL_FIELDOUTLINEBLUE_BMP BITMAP "bitmaps\\NORMAL_FIELDOUTLINEBLUE.bmp" -NORMAL_FRAMEBOTTOM_BMP BITMAP "bitmaps\\NORMAL_FRAMEBOTTOM.bmp" -NORMAL_FRAMECAPTIONMIN_BMP BITMAP "bitmaps\\NORMAL_FRAMECAPTIONMIN.bmp" -NORMAL_FRAMECAPTIONSIZING_BMP BITMAP "bitmaps\\NORMAL_FRAMECAPTIONSIZING.bmp" -NORMAL_FRAMECAPTION_BMP BITMAP "bitmaps\\NORMAL_FRAMECAPTION.bmp" -NORMAL_FRAMELEFT_BMP BITMAP "bitmaps\\NORMAL_FRAMELEFT.bmp" -NORMAL_FRAMEMAXIMIZED_BMP BITMAP "bitmaps\\NORMAL_FRAMEMAXIMIZED.bmp" -NORMAL_FRAMERIGHT_BMP BITMAP "bitmaps\\NORMAL_FRAMERIGHT.bmp" -NORMAL_GRIPPERVERT_BMP BITMAP "bitmaps\\NORMAL_GRIPPERVERT.bmp" -NORMAL_GRIPPER_BMP BITMAP "bitmaps\\NORMAL_GRIPPER.bmp" -NORMAL_GROUPBOX_BMP BITMAP "bitmaps\\NORMAL_GROUPBOX.bmp" -NORMAL_HELPBUTTON_BMP BITMAP "bitmaps\\NORMAL_HELPBUTTON.bmp" -NORMAL_LISTVIEWHEADERBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_LISTVIEWHEADERBACKGROUND.bmp" -NORMAL_LISTVIEWHEADER_BMP BITMAP "bitmaps\\NORMAL_LISTVIEWHEADER.bmp" -NORMAL_MAXBUTTON_BMP BITMAP "bitmaps\\NORMAL_MAXBUTTON.bmp" -NORMAL_MDICAPTIONBUTTON_BMP BITMAP "bitmaps\\NORMAL_MDICAPTIONBUTTON.bmp" -NORMAL_MDIGLYPHCLOSE_BMP BITMAP "bitmaps\\NORMAL_MDIGLYPHCLOSE.bmp" -NORMAL_MDIGLYPHMINIMIZE_BMP BITMAP "bitmaps\\NORMAL_MDIGLYPHMINIMIZE.bmp" -NORMAL_MDIGLYPHRESTORE_BMP BITMAP "bitmaps\\NORMAL_MDIGLYPHRESTORE.bmp" -NORMAL_MINBUTTON_BMP BITMAP "bitmaps\\NORMAL_MINBUTTON.bmp" -NORMAL_NORMALGROUPBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_NORMALGROUPBACKGROUND.bmp" -NORMAL_NORMALGROUPHEAD_BMP BITMAP "bitmaps\\NORMAL_NORMALGROUPHEAD.bmp" -NORMAL_PLACEBARBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_PLACEBARBACKGROUND.bmp" -NORMAL_PLACEBARBUTTONS_BMP BITMAP "bitmaps\\NORMAL_PLACEBARBUTTONS.bmp" -NORMAL_PROGRESSCHUNKVERT_BMP BITMAP "bitmaps\\NORMAL_PROGRESSCHUNKVERT.bmp" -NORMAL_PROGRESSCHUNK_BMP BITMAP "bitmaps\\NORMAL_PROGRESSCHUNK.bmp" -NORMAL_PROGRESSTRACKVERT_BMP BITMAP "bitmaps\\NORMAL_PROGRESSTRACKVERT.bmp" -NORMAL_PROGRESSTRACK_BMP BITMAP "bitmaps\\NORMAL_PROGRESSTRACK.bmp" -NORMAL_RADIOBUTTON13_BMP BITMAP "bitmaps\\NORMAL_RADIOBUTTON13.bmp" -NORMAL_RESIZEGRIP2_BMP BITMAP "bitmaps\\NORMAL_RESIZEGRIP2.bmp" -NORMAL_RESTOREBUTTON_BMP BITMAP "bitmaps\\NORMAL_RESTOREBUTTON.bmp" -NORMAL_SCROLLARROWGLYPHSSMALL_BMP BITMAP "bitmaps\\NORMAL_SCROLLARROWGLYPHSSMALL.bmp" -NORMAL_SCROLLARROWGLYPHS_BMP BITMAP "bitmaps\\NORMAL_SCROLLARROWGLYPHS.bmp" -NORMAL_SCROLLARROWS_BMP BITMAP "bitmaps\\NORMAL_SCROLLARROWS.bmp" -NORMAL_SCROLLSHAFTHORIZONTAL_BMP BITMAP "bitmaps\\NORMAL_SCROLLSHAFTHORIZONTAL.bmp" -NORMAL_SCROLLSHAFTVERTICAL_BMP BITMAP "bitmaps\\NORMAL_SCROLLSHAFTVERTICAL.bmp" -NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL_BMP BITMAP "bitmaps\\NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp" -NORMAL_SCROLLTHUMBGRIPPERVERTICAL_BMP BITMAP "bitmaps\\NORMAL_SCROLLTHUMBGRIPPERVERTICAL.bmp" -NORMAL_SCROLLTHUMBHORIZONTAL_BMP BITMAP "bitmaps\\NORMAL_SCROLLTHUMBHORIZONTAL.bmp" -NORMAL_SCROLLTHUMBVERTICAL_BMP BITMAP "bitmaps\\NORMAL_SCROLLTHUMBVERTICAL.bmp" -NORMAL_SEPARATORVERT_BMP BITMAP "bitmaps\\NORMAL_SEPARATORVERT.bmp" -NORMAL_SEPARATOR_BMP BITMAP "bitmaps\\NORMAL_SEPARATOR.bmp" -NORMAL_SLIDERTRACK_BMP BITMAP "bitmaps\\NORMAL_SLIDERTRACK.bmp" -NORMAL_SMALLCLOSEBUTTON_BMP BITMAP "bitmaps\\NORMAL_SMALLCLOSEBUTTON.bmp" -NORMAL_SMALLFRAMECAPTIONSIZING_BMP BITMAP "bitmaps\\NORMAL_SMALLFRAMECAPTIONSIZING.bmp" -NORMAL_SMALLFRAMECAPTION_BMP BITMAP "bitmaps\\NORMAL_SMALLFRAMECAPTION.bmp" -NORMAL_SPECIALGROUPBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_SPECIALGROUPBACKGROUND.bmp" -NORMAL_SPECIALGROUPHEAD_BMP BITMAP "bitmaps\\NORMAL_SPECIALGROUPHEAD.bmp" -NORMAL_SPINBUTTONBACKGROUNDDOWN_BMP BITMAP "bitmaps\\NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp" -NORMAL_SPINBUTTONBACKGROUNDLEFT_BMP BITMAP "bitmaps\\NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp" -NORMAL_SPINBUTTONBACKGROUNDRIGHT_BMP BITMAP "bitmaps\\NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp" -NORMAL_SPINBUTTONBACKGROUNDUP_BMP BITMAP "bitmaps\\NORMAL_SPINBUTTONBACKGROUNDUP.bmp" -NORMAL_SPINDOWNGLYPH_BMP BITMAP "bitmaps\\NORMAL_SPINDOWNGLYPH.bmp" -NORMAL_SPINLEFTGLYPH_BMP BITMAP "bitmaps\\NORMAL_SPINLEFTGLYPH.bmp" -NORMAL_SPINRIGHTGLYPH_BMP BITMAP "bitmaps\\NORMAL_SPINRIGHTGLYPH.bmp" -NORMAL_SPINUPGLYPH_BMP BITMAP "bitmaps\\NORMAL_SPINUPGLYPH.bmp" -NORMAL_STARTBUTTON_BMP BITMAP "bitmaps\\NORMAL_STARTBUTTON.bmp" -NORMAL_STARTGROUPBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_STARTGROUPBACKGROUND.bmp" -NORMAL_STARTGROUPNEWAPPBUTTON_BMP BITMAP "bitmaps\\NORMAL_STARTGROUPNEWAPPBUTTON.bmp" -NORMAL_STARTGROUPSEPERATOR_BMP BITMAP "bitmaps\\NORMAL_STARTGROUPSEPERATOR.bmp" -NORMAL_STARTGROUPTOOLBARBUTTON_BMP BITMAP "bitmaps\\NORMAL_STARTGROUPTOOLBARBUTTON.bmp" -NORMAL_STARTPANELLOGOFFBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_STARTPANELLOGOFFBACKGROUND.bmp" -NORMAL_STARTPANELLOGOFFBUTTONSHOT_BMP BITMAP "bitmaps\\NORMAL_STARTPANELLOGOFFBUTTONSHOT.bmp" -NORMAL_STARTPANELLOGOFFBUTTONS_BMP BITMAP "bitmaps\\NORMAL_STARTPANELLOGOFFBUTTONS.bmp" -NORMAL_STARTPANELMFUBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_STARTPANELMFUBACKGROUND.bmp" -NORMAL_STARTPANELMOREPROGARROWHOT_BMP BITMAP "bitmaps\\NORMAL_STARTPANELMOREPROGARROWHOT.bmp" -NORMAL_STARTPANELMOREPROGARROW_BMP BITMAP "bitmaps\\NORMAL_STARTPANELMOREPROGARROW.bmp" -NORMAL_STARTPANELMOREPROGBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_STARTPANELMOREPROGBACKGROUND.bmp" -NORMAL_STARTPANELPLACESBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_STARTPANELPLACESBACKGROUND.bmp" -NORMAL_STARTPLACESSEPARATOR_BMP BITMAP "bitmaps\\NORMAL_STARTPLACESSEPARATOR.bmp" -NORMAL_STARTPROGRAMSSEPARATOR_BMP BITMAP "bitmaps\\NORMAL_STARTPROGRAMSSEPARATOR.bmp" -NORMAL_STARTUSERPANEL_BMP BITMAP "bitmaps\\NORMAL_STARTUSERPANEL.bmp" -NORMAL_STATUSBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_STATUSBACKGROUND.bmp" -NORMAL_STATUSPANE_BMP BITMAP "bitmaps\\NORMAL_STATUSPANE.bmp" -NORMAL_TABBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_TABBACKGROUND.bmp" -NORMAL_TABITEMBOTH_BMP BITMAP "bitmaps\\NORMAL_TABITEMBOTH.bmp" -NORMAL_TABITEMLEFT_BMP BITMAP "bitmaps\\NORMAL_TABITEMLEFT.bmp" -NORMAL_TABITEMRIGHT_BMP BITMAP "bitmaps\\NORMAL_TABITEMRIGHT.bmp" -NORMAL_TABITEMTOPBOTH_BMP BITMAP "bitmaps\\NORMAL_TABITEMTOPBOTH.bmp" -NORMAL_TABITEMTOPLEFT_BMP BITMAP "bitmaps\\NORMAL_TABITEMTOPLEFT.bmp" -NORMAL_TABITEMTOPRIGHT_BMP BITMAP "bitmaps\\NORMAL_TABITEMTOPRIGHT.bmp" -NORMAL_TABITEMTOP_BMP BITMAP "bitmaps\\NORMAL_TABITEMTOP.bmp" -NORMAL_TABITEM_BMP BITMAP "bitmaps\\NORMAL_TABITEM.bmp" -NORMAL_TABPANEEDGE_BMP BITMAP "bitmaps\\NORMAL_TABPANEEDGE.bmp" -NORMAL_TASKBANDBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_TASKBANDBACKGROUND.bmp" -NORMAL_TASKBANDBUTTONNOEDGEVERTICAL_BMP BITMAP "bitmaps\\NORMAL_TASKBANDBUTTONNOEDGEVERTICAL.bmp" -NORMAL_TASKBANDBUTTONNOEDGE_BMP BITMAP "bitmaps\\NORMAL_TASKBANDBUTTONNOEDGE.bmp" -NORMAL_TASKBANDBUTTONVERTICAL_BMP BITMAP "bitmaps\\NORMAL_TASKBANDBUTTONVERTICAL.bmp" -NORMAL_TASKBANDBUTTON_BMP BITMAP "bitmaps\\NORMAL_TASKBANDBUTTON.bmp" -NORMAL_TASKBANDFLASHBUTTONGROUPMENU_BMP BITMAP "bitmaps\\NORMAL_TASKBANDFLASHBUTTONGROUPMENU.bmp" -NORMAL_TASKBANDFLASHBUTTON_BMP BITMAP "bitmaps\\NORMAL_TASKBANDFLASHBUTTON.bmp" -NORMAL_TASKBANDHOVER_BMP BITMAP "bitmaps\\NORMAL_TASKBANDHOVER.bmp" -NORMAL_TASKBANDSCROLLARROWGLYPHS_BMP BITMAP "bitmaps\\NORMAL_TASKBANDSCROLLARROWGLYPHS.bmp" -NORMAL_TASKBANDSCROLLARROWS_BMP BITMAP "bitmaps\\NORMAL_TASKBANDSCROLLARROWS.bmp" -NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL_BMP BITMAP "bitmaps\\NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL.bmp" -NORMAL_TASKBANDSCROLLSHAFTVERTICAL_BMP BITMAP "bitmaps\\NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp" -NORMAL_TASKBANDSCROLLTHUMBGRIPPERHORIZONTAL_BMP BITMAP "bitmaps\\NORMAL_TASKBANDSCROLLTHUMBGRIPPERHORIZONTAL.bmp" -NORMAL_TASKBANDSCROLLTHUMBGRIPPERVERTICAL_BMP BITMAP "bitmaps\\NORMAL_TASKBANDSCROLLTHUMBGRIPPERVERTICAL.bmp" -NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL_BMP BITMAP "bitmaps\\NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp" -NORMAL_TASKBANDSCROLLTHUMBVERTICAL_BMP BITMAP "bitmaps\\NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp" -NORMAL_TASKBARBACKGROUNDVERTICAL_BMP BITMAP "bitmaps\\NORMAL_TASKBARBACKGROUNDVERTICAL.bmp" -NORMAL_TASKBARBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_TASKBARBACKGROUND.bmp" -NORMAL_TASKBARCHEVRONVERT_BMP BITMAP "bitmaps\\NORMAL_TASKBARCHEVRONVERT.bmp" -NORMAL_TASKBARCHEVRON_BMP BITMAP "bitmaps\\NORMAL_TASKBARCHEVRON.bmp" -NORMAL_TASKBARGRIPPERVERTICAL_BMP BITMAP "bitmaps\\NORMAL_TASKBARGRIPPERVERTICAL.bmp" -NORMAL_TASKBARGRIPPER_BMP BITMAP "bitmaps\\NORMAL_TASKBARGRIPPER.bmp" -NORMAL_TASKBARSIZINGBARBOTTOM_BMP BITMAP "bitmaps\\NORMAL_TASKBARSIZINGBARBOTTOM.bmp" -NORMAL_TASKBARSIZINGBARLEFT_BMP BITMAP "bitmaps\\NORMAL_TASKBARSIZINGBARLEFT.bmp" -NORMAL_TASKBARSIZINGBARRIGHT_BMP BITMAP "bitmaps\\NORMAL_TASKBARSIZINGBARRIGHT.bmp" -NORMAL_TASKBARSIZINGBARTOP_BMP BITMAP "bitmaps\\NORMAL_TASKBARSIZINGBARTOP.bmp" -NORMAL_TASKBARTRAYVERTICAL_BMP BITMAP "bitmaps\\NORMAL_TASKBARTRAYVERTICAL.bmp" -NORMAL_TASKBARTRAY_BMP BITMAP "bitmaps\\NORMAL_TASKBARTRAY.bmp" -NORMAL_TOOLBARBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_TOOLBARBACKGROUND.bmp" -NORMAL_TOOLBARBUTTONSSPLITDROPDOWNGLYPH_BMP BITMAP "bitmaps\\NORMAL_TOOLBARBUTTONSSPLITDROPDOWNGLYPH.bmp" -NORMAL_TOOLBARBUTTONSSPLITDROPDOWN_BMP BITMAP "bitmaps\\NORMAL_TOOLBARBUTTONSSPLITDROPDOWN.bmp" -NORMAL_TOOLBARBUTTONSSPLIT_BMP BITMAP "bitmaps\\NORMAL_TOOLBARBUTTONSSPLIT.bmp" -NORMAL_TOOLBARBUTTONS_BMP BITMAP "bitmaps\\NORMAL_TOOLBARBUTTONS.bmp" -NORMAL_TOOLBARGRIPPERVERT_BMP BITMAP "bitmaps\\NORMAL_TOOLBARGRIPPERVERT.bmp" -NORMAL_TOOLBARGRIPPER_BMP BITMAP "bitmaps\\NORMAL_TOOLBARGRIPPER.bmp" -NORMAL_TRACKBARDOWN13_BMP BITMAP "bitmaps\\NORMAL_TRACKBARDOWN13.bmp" -NORMAL_TRACKBARDOWN16_BMP BITMAP "bitmaps\\NORMAL_TRACKBARDOWN16.bmp" -NORMAL_TRACKBARDOWN25_BMP BITMAP "bitmaps\\NORMAL_TRACKBARDOWN25.bmp" -NORMAL_TRACKBARHORIZONTAL_BMP BITMAP "bitmaps\\NORMAL_TRACKBARHORIZONTAL.bmp" -NORMAL_TRACKBARLEFT13_BMP BITMAP "bitmaps\\NORMAL_TRACKBARLEFT13.bmp" -NORMAL_TRACKBARLEFT16_BMP BITMAP "bitmaps\\NORMAL_TRACKBARLEFT16.bmp" -NORMAL_TRACKBARLEFT25_BMP BITMAP "bitmaps\\NORMAL_TRACKBARLEFT25.bmp" -NORMAL_TRACKBARRIGHT13_BMP BITMAP "bitmaps\\NORMAL_TRACKBARRIGHT13.bmp" -NORMAL_TRACKBARRIGHT16_BMP BITMAP "bitmaps\\NORMAL_TRACKBARRIGHT16.bmp" -NORMAL_TRACKBARRIGHT25_BMP BITMAP "bitmaps\\NORMAL_TRACKBARRIGHT25.bmp" -NORMAL_TRACKBARUP13_BMP BITMAP "bitmaps\\NORMAL_TRACKBARUP13.bmp" -NORMAL_TRACKBARUP16_BMP BITMAP "bitmaps\\NORMAL_TRACKBARUP16.bmp" -NORMAL_TRACKBARUP25_BMP BITMAP "bitmaps\\NORMAL_TRACKBARUP25.bmp" -NORMAL_TRACKBARVERTICAL_BMP BITMAP "bitmaps\\NORMAL_TRACKBARVERTICAL.bmp" -NORMAL_TRAYCHEVRONHORIZONTALOPEN_BMP BITMAP "bitmaps\\NORMAL_TRAYCHEVRONHORIZONTALOPEN.bmp" -NORMAL_TRAYCHEVRONHORIZONTAL_BMP BITMAP "bitmaps\\NORMAL_TRAYCHEVRONHORIZONTAL.bmp" -NORMAL_TREEEXPANDCOLLAPSE_BMP BITMAP "bitmaps\\NORMAL_TREEEXPANDCOLLAPSE.bmp" -NORMAL_USERTILEBACKGROUND_BMP BITMAP "bitmaps\\NORMAL_USERTILEBACKGROUND.bmp" +NORMAL_BALLOONCLOSE_BMP BITMAP "bitmaps/NORMAL_BALLOONCLOSE.bmp" +NORMAL_BUTTON_BMP BITMAP "bitmaps/NORMAL_BUTTON.bmp" +NORMAL_CHECKBOX13_BMP BITMAP "bitmaps/NORMAL_CHECKBOX13.bmp" +NORMAL_CHEVRON_BMP BITMAP "bitmaps/NORMAL_CHEVRON.bmp" +NORMAL_CLOSEBUTTON_BMP BITMAP "bitmaps/NORMAL_CLOSEBUTTON.bmp" +NORMAL_CLOSEGLYPH9_BMP BITMAP "bitmaps/NORMAL_CLOSEGLYPH9.bmp" +NORMAL_COMBOBUTTONGLYPH_BMP BITMAP "bitmaps/NORMAL_COMBOBUTTONGLYPH.bmp" +NORMAL_COMBOBUTTON_BMP BITMAP "bitmaps/NORMAL_COMBOBUTTON.bmp" +NORMAL_EXPLORERBARHEADERBACKGROUND_BMP BITMAP "bitmaps/NORMAL_EXPLORERBARHEADERBACKGROUND.bmp" +NORMAL_EXPLORERBARHEADERCLOSE_BMP BITMAP "bitmaps/NORMAL_EXPLORERBARHEADERCLOSE.bmp" +NORMAL_EXPLORERBARTOOLBARBACKGROUND_BMP BITMAP "bitmaps/NORMAL_EXPLORERBARTOOLBARBACKGROUND.bmp" +NORMAL_EXPLORERBARTOOLBARBUTTONSSPLITDROPDOWN_BMP BITMAP "bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLITDROPDOWN.bmp" +NORMAL_EXPLORERBARTOOLBARBUTTONSSPLIT_BMP BITMAP "bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLIT.bmp" +NORMAL_FIELDOUTLINEBLUE_BMP BITMAP "bitmaps/NORMAL_FIELDOUTLINEBLUE.bmp" +NORMAL_FRAMEBOTTOM_BMP BITMAP "bitmaps/NORMAL_FRAMEBOTTOM.bmp" +NORMAL_FRAMECAPTIONMIN_BMP BITMAP "bitmaps/NORMAL_FRAMECAPTIONMIN.bmp" +NORMAL_FRAMECAPTIONSIZING_BMP BITMAP "bitmaps/NORMAL_FRAMECAPTIONSIZING.bmp" +NORMAL_FRAMECAPTION_BMP BITMAP "bitmaps/NORMAL_FRAMECAPTION.bmp" +NORMAL_FRAMELEFT_BMP BITMAP "bitmaps/NORMAL_FRAMELEFT.bmp" +NORMAL_FRAMEMAXIMIZED_BMP BITMAP "bitmaps/NORMAL_FRAMEMAXIMIZED.bmp" +NORMAL_FRAMERIGHT_BMP BITMAP "bitmaps/NORMAL_FRAMERIGHT.bmp" +NORMAL_GRIPPERVERT_BMP BITMAP "bitmaps/NORMAL_GRIPPERVERT.bmp" +NORMAL_GRIPPER_BMP BITMAP "bitmaps/NORMAL_GRIPPER.bmp" +NORMAL_GROUPBOX_BMP BITMAP "bitmaps/NORMAL_GROUPBOX.bmp" +NORMAL_HELPBUTTON_BMP BITMAP "bitmaps/NORMAL_HELPBUTTON.bmp" +NORMAL_LISTVIEWHEADERBACKGROUND_BMP BITMAP "bitmaps/NORMAL_LISTVIEWHEADERBACKGROUND.bmp" +NORMAL_LISTVIEWHEADER_BMP BITMAP "bitmaps/NORMAL_LISTVIEWHEADER.bmp" +NORMAL_MAXBUTTON_BMP BITMAP "bitmaps/NORMAL_MAXBUTTON.bmp" +NORMAL_MDICAPTIONBUTTON_BMP BITMAP "bitmaps/NORMAL_MDICAPTIONBUTTON.bmp" +NORMAL_MDIGLYPHCLOSE_BMP BITMAP "bitmaps/NORMAL_MDIGLYPHCLOSE.bmp" +NORMAL_MDIGLYPHMINIMIZE_BMP BITMAP "bitmaps/NORMAL_MDIGLYPHMINIMIZE.bmp" +NORMAL_MDIGLYPHRESTORE_BMP BITMAP "bitmaps/NORMAL_MDIGLYPHRESTORE.bmp" +NORMAL_MINBUTTON_BMP BITMAP "bitmaps/NORMAL_MINBUTTON.bmp" +NORMAL_NORMALGROUPBACKGROUND_BMP BITMAP "bitmaps/NORMAL_NORMALGROUPBACKGROUND.bmp" +NORMAL_NORMALGROUPHEAD_BMP BITMAP "bitmaps/NORMAL_NORMALGROUPHEAD.bmp" +NORMAL_PLACEBARBACKGROUND_BMP BITMAP "bitmaps/NORMAL_PLACEBARBACKGROUND.bmp" +NORMAL_PLACEBARBUTTONS_BMP BITMAP "bitmaps/NORMAL_PLACEBARBUTTONS.bmp" +NORMAL_PROGRESSCHUNKVERT_BMP BITMAP "bitmaps/NORMAL_PROGRESSCHUNKVERT.bmp" +NORMAL_PROGRESSCHUNK_BMP BITMAP "bitmaps/NORMAL_PROGRESSCHUNK.bmp" +NORMAL_PROGRESSTRACKVERT_BMP BITMAP "bitmaps/NORMAL_PROGRESSTRACKVERT.bmp" +NORMAL_PROGRESSTRACK_BMP BITMAP "bitmaps/NORMAL_PROGRESSTRACK.bmp" +NORMAL_RADIOBUTTON13_BMP BITMAP "bitmaps/NORMAL_RADIOBUTTON13.bmp" +NORMAL_RESIZEGRIP2_BMP BITMAP "bitmaps/NORMAL_RESIZEGRIP2.bmp" +NORMAL_RESTOREBUTTON_BMP BITMAP "bitmaps/NORMAL_RESTOREBUTTON.bmp" +NORMAL_SCROLLARROWGLYPHSSMALL_BMP BITMAP "bitmaps/NORMAL_SCROLLARROWGLYPHSSMALL.bmp" +NORMAL_SCROLLARROWGLYPHS_BMP BITMAP "bitmaps/NORMAL_SCROLLARROWGLYPHS.bmp" +NORMAL_SCROLLARROWS_BMP BITMAP "bitmaps/NORMAL_SCROLLARROWS.bmp" +NORMAL_SCROLLSHAFTHORIZONTAL_BMP BITMAP "bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp" +NORMAL_SCROLLSHAFTVERTICAL_BMP BITMAP "bitmaps/NORMAL_SCROLLSHAFTVERTICAL.bmp" +NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL_BMP BITMAP "bitmaps/NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp" +NORMAL_SCROLLTHUMBGRIPPERVERTICAL_BMP BITMAP "bitmaps/NORMAL_SCROLLTHUMBGRIPPERVERTICAL.bmp" +NORMAL_SCROLLTHUMBHORIZONTAL_BMP BITMAP "bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp" +NORMAL_SCROLLTHUMBVERTICAL_BMP BITMAP "bitmaps/NORMAL_SCROLLTHUMBVERTICAL.bmp" +NORMAL_SEPARATORVERT_BMP BITMAP "bitmaps/NORMAL_SEPARATORVERT.bmp" +NORMAL_SEPARATOR_BMP BITMAP "bitmaps/NORMAL_SEPARATOR.bmp" +NORMAL_SLIDERTRACK_BMP BITMAP "bitmaps/NORMAL_SLIDERTRACK.bmp" +NORMAL_SMALLCLOSEBUTTON_BMP BITMAP "bitmaps/NORMAL_SMALLCLOSEBUTTON.bmp" +NORMAL_SMALLFRAMECAPTIONSIZING_BMP BITMAP "bitmaps/NORMAL_SMALLFRAMECAPTIONSIZING.bmp" +NORMAL_SMALLFRAMECAPTION_BMP BITMAP "bitmaps/NORMAL_SMALLFRAMECAPTION.bmp" +NORMAL_SPECIALGROUPBACKGROUND_BMP BITMAP "bitmaps/NORMAL_SPECIALGROUPBACKGROUND.bmp" +NORMAL_SPECIALGROUPHEAD_BMP BITMAP "bitmaps/NORMAL_SPECIALGROUPHEAD.bmp" +NORMAL_SPINBUTTONBACKGROUNDDOWN_BMP BITMAP "bitmaps/NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp" +NORMAL_SPINBUTTONBACKGROUNDLEFT_BMP BITMAP "bitmaps/NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp" +NORMAL_SPINBUTTONBACKGROUNDRIGHT_BMP BITMAP "bitmaps/NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp" +NORMAL_SPINBUTTONBACKGROUNDUP_BMP BITMAP "bitmaps/NORMAL_SPINBUTTONBACKGROUNDUP.bmp" +NORMAL_SPINDOWNGLYPH_BMP BITMAP "bitmaps/NORMAL_SPINDOWNGLYPH.bmp" +NORMAL_SPINLEFTGLYPH_BMP BITMAP "bitmaps/NORMAL_SPINLEFTGLYPH.bmp" +NORMAL_SPINRIGHTGLYPH_BMP BITMAP "bitmaps/NORMAL_SPINRIGHTGLYPH.bmp" +NORMAL_SPINUPGLYPH_BMP BITMAP "bitmaps/NORMAL_SPINUPGLYPH.bmp" +NORMAL_STARTBUTTON_BMP BITMAP "bitmaps/NORMAL_STARTBUTTON.bmp" +NORMAL_STARTGROUPBACKGROUND_BMP BITMAP "bitmaps/NORMAL_STARTGROUPBACKGROUND.bmp" +NORMAL_STARTGROUPNEWAPPBUTTON_BMP BITMAP "bitmaps/NORMAL_STARTGROUPNEWAPPBUTTON.bmp" +NORMAL_STARTGROUPSEPERATOR_BMP BITMAP "bitmaps/NORMAL_STARTGROUPSEPERATOR.bmp" +NORMAL_STARTGROUPTOOLBARBUTTON_BMP BITMAP "bitmaps/NORMAL_STARTGROUPTOOLBARBUTTON.bmp" +NORMAL_STARTPANELLOGOFFBACKGROUND_BMP BITMAP "bitmaps/NORMAL_STARTPANELLOGOFFBACKGROUND.bmp" +NORMAL_STARTPANELLOGOFFBUTTONSHOT_BMP BITMAP "bitmaps/NORMAL_STARTPANELLOGOFFBUTTONSHOT.bmp" +NORMAL_STARTPANELLOGOFFBUTTONS_BMP BITMAP "bitmaps/NORMAL_STARTPANELLOGOFFBUTTONS.bmp" +NORMAL_STARTPANELMFUBACKGROUND_BMP BITMAP "bitmaps/NORMAL_STARTPANELMFUBACKGROUND.bmp" +NORMAL_STARTPANELMOREPROGARROWHOT_BMP BITMAP "bitmaps/NORMAL_STARTPANELMOREPROGARROWHOT.bmp" +NORMAL_STARTPANELMOREPROGARROW_BMP BITMAP "bitmaps/NORMAL_STARTPANELMOREPROGARROW.bmp" +NORMAL_STARTPANELMOREPROGBACKGROUND_BMP BITMAP "bitmaps/NORMAL_STARTPANELMOREPROGBACKGROUND.bmp" +NORMAL_STARTPANELPLACESBACKGROUND_BMP BITMAP "bitmaps/NORMAL_STARTPANELPLACESBACKGROUND.bmp" +NORMAL_STARTPLACESSEPARATOR_BMP BITMAP "bitmaps/NORMAL_STARTPLACESSEPARATOR.bmp" +NORMAL_STARTPROGRAMSSEPARATOR_BMP BITMAP "bitmaps/NORMAL_STARTPROGRAMSSEPARATOR.bmp" +NORMAL_STARTUSERPANEL_BMP BITMAP "bitmaps/NORMAL_STARTUSERPANEL.bmp" +NORMAL_STATUSBACKGROUND_BMP BITMAP "bitmaps/NORMAL_STATUSBACKGROUND.bmp" +NORMAL_STATUSPANE_BMP BITMAP "bitmaps/NORMAL_STATUSPANE.bmp" +NORMAL_TABBACKGROUND_BMP BITMAP "bitmaps/NORMAL_TABBACKGROUND.bmp" +NORMAL_TABITEMBOTH_BMP BITMAP "bitmaps/NORMAL_TABITEMBOTH.bmp" +NORMAL_TABITEMLEFT_BMP BITMAP "bitmaps/NORMAL_TABITEMLEFT.bmp" +NORMAL_TABITEMRIGHT_BMP BITMAP "bitmaps/NORMAL_TABITEMRIGHT.bmp" +NORMAL_TABITEMTOPBOTH_BMP BITMAP "bitmaps/NORMAL_TABITEMTOPBOTH.bmp" +NORMAL_TABITEMTOPLEFT_BMP BITMAP "bitmaps/NORMAL_TABITEMTOPLEFT.bmp" +NORMAL_TABITEMTOPRIGHT_BMP BITMAP "bitmaps/NORMAL_TABITEMTOPRIGHT.bmp" +NORMAL_TABITEMTOP_BMP BITMAP "bitmaps/NORMAL_TABITEMTOP.bmp" +NORMAL_TABITEM_BMP BITMAP "bitmaps/NORMAL_TABITEM.bmp" +NORMAL_TABPANEEDGE_BMP BITMAP "bitmaps/NORMAL_TABPANEEDGE.bmp" +NORMAL_TASKBANDBACKGROUND_BMP BITMAP "bitmaps/NORMAL_TASKBANDBACKGROUND.bmp" +NORMAL_TASKBANDBUTTONNOEDGEVERTICAL_BMP BITMAP "bitmaps/NORMAL_TASKBANDBUTTONNOEDGEVERTICAL.bmp" +NORMAL_TASKBANDBUTTONNOEDGE_BMP BITMAP "bitmaps/NORMAL_TASKBANDBUTTONNOEDGE.bmp" +NORMAL_TASKBANDBUTTONVERTICAL_BMP BITMAP "bitmaps/NORMAL_TASKBANDBUTTONVERTICAL.bmp" +NORMAL_TASKBANDBUTTON_BMP BITMAP "bitmaps/NORMAL_TASKBANDBUTTON.bmp" +NORMAL_TASKBANDFLASHBUTTONGROUPMENU_BMP BITMAP "bitmaps/NORMAL_TASKBANDFLASHBUTTONGROUPMENU.bmp" +NORMAL_TASKBANDFLASHBUTTON_BMP BITMAP "bitmaps/NORMAL_TASKBANDFLASHBUTTON.bmp" +NORMAL_TASKBANDHOVER_BMP BITMAP "bitmaps/NORMAL_TASKBANDHOVER.bmp" +NORMAL_TASKBANDSCROLLARROWGLYPHS_BMP BITMAP "bitmaps/NORMAL_TASKBANDSCROLLARROWGLYPHS.bmp" +NORMAL_TASKBANDSCROLLARROWS_BMP BITMAP "bitmaps/NORMAL_TASKBANDSCROLLARROWS.bmp" +NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL_BMP BITMAP "bitmaps/NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL.bmp" +NORMAL_TASKBANDSCROLLSHAFTVERTICAL_BMP BITMAP "bitmaps/NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp" +NORMAL_TASKBANDSCROLLTHUMBGRIPPERHORIZONTAL_BMP BITMAP "bitmaps/NORMAL_TASKBANDSCROLLTHUMBGRIPPERHORIZONTAL.bmp" +NORMAL_TASKBANDSCROLLTHUMBGRIPPERVERTICAL_BMP BITMAP "bitmaps/NORMAL_TASKBANDSCROLLTHUMBGRIPPERVERTICAL.bmp" +NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL_BMP BITMAP "bitmaps/NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp" +NORMAL_TASKBANDSCROLLTHUMBVERTICAL_BMP BITMAP "bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp" +NORMAL_TASKBARBACKGROUNDVERTICAL_BMP BITMAP "bitmaps/NORMAL_TASKBARBACKGROUNDVERTICAL.bmp" +NORMAL_TASKBARBACKGROUND_BMP BITMAP "bitmaps/NORMAL_TASKBARBACKGROUND.bmp" +NORMAL_TASKBARCHEVRONVERT_BMP BITMAP "bitmaps/NORMAL_TASKBARCHEVRONVERT.bmp" +NORMAL_TASKBARCHEVRON_BMP BITMAP "bitmaps/NORMAL_TASKBARCHEVRON.bmp" +NORMAL_TASKBARGRIPPERVERTICAL_BMP BITMAP "bitmaps/NORMAL_TASKBARGRIPPERVERTICAL.bmp" +NORMAL_TASKBARGRIPPER_BMP BITMAP "bitmaps/NORMAL_TASKBARGRIPPER.bmp" +NORMAL_TASKBARSIZINGBARBOTTOM_BMP BITMAP "bitmaps/NORMAL_TASKBARSIZINGBARBOTTOM.bmp" +NORMAL_TASKBARSIZINGBARLEFT_BMP BITMAP "bitmaps/NORMAL_TASKBARSIZINGBARLEFT.bmp" +NORMAL_TASKBARSIZINGBARRIGHT_BMP BITMAP "bitmaps/NORMAL_TASKBARSIZINGBARRIGHT.bmp" +NORMAL_TASKBARSIZINGBARTOP_BMP BITMAP "bitmaps/NORMAL_TASKBARSIZINGBARTOP.bmp" +NORMAL_TASKBARTRAYVERTICAL_BMP BITMAP "bitmaps/NORMAL_TASKBARTRAYVERTICAL.bmp" +NORMAL_TASKBARTRAY_BMP BITMAP "bitmaps/NORMAL_TASKBARTRAY.bmp" +NORMAL_TOOLBARBACKGROUND_BMP BITMAP "bitmaps/NORMAL_TOOLBARBACKGROUND.bmp" +NORMAL_TOOLBARBUTTONSSPLITDROPDOWNGLYPH_BMP BITMAP "bitmaps/NORMAL_TOOLBARBUTTONSSPLITDROPDOWNGLYPH.bmp" +NORMAL_TOOLBARBUTTONSSPLITDROPDOWN_BMP BITMAP "bitmaps/NORMAL_TOOLBARBUTTONSSPLITDROPDOWN.bmp" +NORMAL_TOOLBARBUTTONSSPLIT_BMP BITMAP "bitmaps/NORMAL_TOOLBARBUTTONSSPLIT.bmp" +NORMAL_TOOLBARBUTTONS_BMP BITMAP "bitmaps/NORMAL_TOOLBARBUTTONS.bmp" +NORMAL_TOOLBARGRIPPERVERT_BMP BITMAP "bitmaps/NORMAL_TOOLBARGRIPPERVERT.bmp" +NORMAL_TOOLBARGRIPPER_BMP BITMAP "bitmaps/NORMAL_TOOLBARGRIPPER.bmp" +NORMAL_TRACKBARDOWN13_BMP BITMAP "bitmaps/NORMAL_TRACKBARDOWN13.bmp" +NORMAL_TRACKBARDOWN16_BMP BITMAP "bitmaps/NORMAL_TRACKBARDOWN16.bmp" +NORMAL_TRACKBARDOWN25_BMP BITMAP "bitmaps/NORMAL_TRACKBARDOWN25.bmp" +NORMAL_TRACKBARHORIZONTAL_BMP BITMAP "bitmaps/NORMAL_TRACKBARHORIZONTAL.bmp" +NORMAL_TRACKBARLEFT13_BMP BITMAP "bitmaps/NORMAL_TRACKBARLEFT13.bmp" +NORMAL_TRACKBARLEFT16_BMP BITMAP "bitmaps/NORMAL_TRACKBARLEFT16.bmp" +NORMAL_TRACKBARLEFT25_BMP BITMAP "bitmaps/NORMAL_TRACKBARLEFT25.bmp" +NORMAL_TRACKBARRIGHT13_BMP BITMAP "bitmaps/NORMAL_TRACKBARRIGHT13.bmp" +NORMAL_TRACKBARRIGHT16_BMP BITMAP "bitmaps/NORMAL_TRACKBARRIGHT16.bmp" +NORMAL_TRACKBARRIGHT25_BMP BITMAP "bitmaps/NORMAL_TRACKBARRIGHT25.bmp" +NORMAL_TRACKBARUP13_BMP BITMAP "bitmaps/NORMAL_TRACKBARUP13.bmp" +NORMAL_TRACKBARUP16_BMP BITMAP "bitmaps/NORMAL_TRACKBARUP16.bmp" +NORMAL_TRACKBARUP25_BMP BITMAP "bitmaps/NORMAL_TRACKBARUP25.bmp" +NORMAL_TRACKBARVERTICAL_BMP BITMAP "bitmaps/NORMAL_TRACKBARVERTICAL.bmp" +NORMAL_TRAYCHEVRONHORIZONTALOPEN_BMP BITMAP "bitmaps/NORMAL_TRAYCHEVRONHORIZONTALOPEN.bmp" +NORMAL_TRAYCHEVRONHORIZONTAL_BMP BITMAP "bitmaps/NORMAL_TRAYCHEVRONHORIZONTAL.bmp" +NORMAL_TREEEXPANDCOLLAPSE_BMP BITMAP "bitmaps/NORMAL_TREEEXPANDCOLLAPSE.bmp" +NORMAL_USERTILEBACKGROUND_BMP BITMAP "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" +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" STRINGTABLE {

10 years, 11 months

[dreimer] 61634: [MSPAINT] MSPaint resource russian translate by zamabuvaraeu CORE-7617 #resolve

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jan 15 22:56:46 2014 New Revision: 61634 URL: http://svn.reactos.org/svn/reactos?rev=61634&view=rev Log: [MSPAINT] MSPaint resource russian translate by zamabuvaraeu CORE-7617 #resolve Modified: trunk/reactos/base/applications/mspaint/lang/ru-RU.rc Modified: trunk/reactos/base/applications/mspaint/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ru-RU.rc [iso-8859-1] Wed Jan 15 22:56:46 2014 @@ -58,7 +58,7 @@ POPUP "&Ð Ð¸ÑÑÐ½Ð¾Ðº" BEGIN MENUITEM "&ÐÑÑÐ°Ð·Ð¸ÑÑ/Ð¿Ð¾Ð²ÐµÑÐ½ÑÑÑ...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Ð Ð°ÑÑÑÐ½ÑÑÑ/ÐÐ°ÐºÐ»Ð¾Ð½Ð¸ÑÑ...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "ÐÐ±ÑÐµ&Ð·Ð°ÑÑ", IDM_IMAGECROP MENUITEM "Ð&Ð±ÑÐ°ÑÐ¸ÑÑ ÑÐ²ÐµÑÐ°\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&ÐÑÑÐ¸Ð±ÑÑÑ...\tCtrl+E", IDM_IMAGEATTRIBUTES @@ -69,8 +69,8 @@ BEGIN MENUITEM "&ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿Ð°Ð»Ð¸ÑÑÑ...", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR - MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE - MENUITEM "Old palette", IDM_COLORSOLDPALETTE + MENUITEM "ÐÐ¾Ð´ÐµÑÐ½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐ¹ Ð²Ð¸Ð´", IDM_COLORSMODERNPALETTE + MENUITEM "Ð¡ÑÐ°ÑÑÐ¹ Ð²Ð¸Ð´", IDM_COLORSOLDPALETTE END POPUP "&?" BEGIN @@ -149,9 +149,9 @@ IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Stretch and skew image" -BEGIN - GROUPBOX "Stretch", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 +CAPTION "Ð Ð°ÑÑÑÐ¶ÐµÐ½Ð¸Ðµ Ð¸ Ð½Ð°ÐºÐ»Ð¾Ð½" +BEGIN + GROUPBOX "Ð Ð°ÑÑÑÐ½ÑÑÑ", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 LTEXT "ÐÐ¾ Ð³Ð¾ÑÐ¸Ð·Ð¾Ð½ÑÐ°Ð»Ð¸:", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSTRETCH, 90, 23, 32, 12 @@ -160,15 +160,15 @@ LTEXT "ÐÐ¾ Ð²ÐµÑÑÐ¸ÐºÐ°Ð»Ð¸:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12 LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10 - GROUPBOX "Skew", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 + GROUPBOX "ÐÐ°ÐºÐ»Ð¾Ð½Ð¸ÑÑ", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32 LTEXT "ÐÐ¾ Ð³Ð¾ÑÐ¸Ð·Ð¾Ð½ÑÐ°Ð»Ð¸:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 + LTEXT "Ð³ÑÐ°Ð´ÑÑÐ¾Ð²", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 ICON IDI_VERTSKEW, IDD_STRETCHSKEWICONVSKEW, 12, 113, 32, 32 LTEXT "ÐÐ¾ Ð²ÐµÑÑÐ¸ÐºÐ°Ð»Ð¸:", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSKEW, 90, 118, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 + LTEXT "Ð³ÑÐ°Ð´ÑÑÐ¾Ð²", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 170, 24, 48, 14 END @@ -202,8 +202,8 @@ IDS_SAVEFILTER "24-ÑÐ°Ð·ÑÑÐ´Ð½ÑÐ¹ ÑÐ¸ÑÑÐ½Ð¾Ðº (*.bmp;*.dib)\1*.bmp;*.dib\1" IDS_FILESIZE "%d Ð±Ð°Ð¹Ñ" IDS_PRINTRES "%d x %d Ð¿Ð¸ÐºÑÐµÐ»ÐµÐ¹ Ð½Ð° Ð¼ÐµÑÑ" - IDS_INTNUMBERS "Please enter integral numbers only!" - IDS_PERCENTAGE "The percentage must be between 1 and 500." - IDS_ANGLE "The angle must be between -89 and 89." - IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_INTNUMBERS, "ÐÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð²Ð²Ð¾Ð´Ð¸ÑÑ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµÐ»ÑÐµ ÑÐ¸ÑÐ»Ð°!" + IDS_PERCENTAGE, "ÐÑÐ¾ÑÐµÐ½Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð² Ð¸Ð½ÑÐµÑÐ²Ð°Ð»Ðµ Ð¾Ñ 1 Ð´Ð¾ 500." + IDS_ANGLE, "Ð£Ð³Ð¾Ð» Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð² Ð¸Ð½ÑÐµÑÐ²Ð°Ð»Ðµ Ð¾Ñ -89 Ð´Ð¾ 89." + IDS_LOADERRORTEXT, "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÑÐ°Ð¹Ð» %s." +END

10 years, 11 months

[dreimer] 61633: Polish translation of devmgmt, explorer-new, devmgr, msgina and cmdutils help. Typo fix for sysdm by Adam Stachowicz CORE-7636 #resolve

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jan 15 22:50:33 2014 New Revision: 61633 URL: http://svn.reactos.org/svn/reactos?rev=61633&view=rev Log: Polish translation of devmgmt, explorer-new, devmgr, msgina and cmdutils help. Typo fix for sysdm by Adam Stachowicz CORE-7636 #resolve Modified: trunk/reactos/base/applications/cmdutils/help/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc Modified: trunk/reactos/base/applications/cmdutils/help/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/lang/pl-PL.rc [iso-8859-1] Wed Jan 15 22:50:33 2014 @@ -5,20 +5,21 @@ * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) + * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (November, 2013) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." + IDS_NO_ENTRY "To polecenie nie jest obsÅugiwane przez narzÄdzie pomocy.\nSprÃ³buj ""%s /?""\n." END STRINGTABLE BEGIN - IDS_USAGE "Provides Help information for ReactOS commands.\n\n\ -HELP [command]\n\n\ - command - Display help information for this command.\n" + IDS_USAGE "Podaje informacje o poleceniach ReactOS.\n\n\ +HELP [polecenie]\n\n\ + polecenie - wyÅwietla informacje o tym poleceniu.\n" IDS_HELP1 "Lista wszystkich dostÄpnych komend (+opisy)\n\n\ help komenda\n\ komenda /? WyÅwietla dokÅadny opis danej komendy\n\n\ Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc [iso-8859-1] Wed Jan 15 22:50:33 2014 @@ -28,7 +28,7 @@ MENUITEM "Zaso&by wedÅug typu", IDC_RESBYTYPE, GRAYED MENUITEM "Za&soby wedÅug poÅÄczenia", IDC_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "PokaÅ¼ ukryte urzÄdzenia", IDC_SHOWHIDDEN END POPUP "Pomo&c" BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] Wed Jan 15 22:50:33 2014 @@ -130,10 +130,10 @@ IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced" +CAPTION "Zaawansowane" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Advanced options", IDC_STATIC, 6, 6, 240, 121 + GROUPBOX "Opcje zaawansowane", IDC_STATIC, 6, 6, 240, 121 AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13, 18, 200, 10 AUTOCHECKBOX "&PokaÅ¼ podglÄd okien (miniaturki)", IDC_TASKBARPROP_WNDPREV, 13, 31, 200, 10 END Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Wed Jan 15 22:50:33 2014 @@ -65,7 +65,7 @@ LTEXT "Informacje o uruchamianiu systemu, awariach systemu i debugowaniu.", IDC_STATIC, 16, 144, 210, 19 PUSHBUTTON "Us&tawienia", IDC_STAREC, 194, 162, 50, 14 PUSHBUTTON "Ustawienia systemowe", IDC_SYSSETTINGS, 2, 192, 80, 15//FIXME - PUSHBUTTON "Z&mienne Årodowiskowe", IDC_ENVVAR, 84, 192, 80, 14 + PUSHBUTTON "Z&mienne Årodowiskowe", IDC_ENVVAR, 84, 192, 80, 14 PUSHBUTTON "&Raportowanie bÅÄdÃ³w", IDC_ERRORREPORT, 170, 192, 80, 14 END @@ -219,7 +219,7 @@ IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Zmienne Årodowiskowe" +CAPTION "Zmienne Årodowiskowe" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Zmienne uÅ¼ytkownika", IDC_STATIC, 7, 12, 238, 100 Modified: trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc [iso-8859-1] Wed Jan 15 22:50:33 2014 @@ -5,7 +5,7 @@ * Updated by xrogers (13.04.2007) * Updated by Caemyr - Olaf Siejka (Jan 2008, Jan 2010) * UTF-8 conversion by Caemyr (May, 2011) - * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (August, 2011) + * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (November, 2011) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -35,12 +35,12 @@ IDS_NOTAVAILABLE "NiedostÄpne" IDS_NOTDIGITALLYSIGNED "Niepodpisany cyfrowo" IDS_NODRIVERS "Å»adne pliki sterownika nie sÄ potrzebne albo nie zostaÅy zaÅadowane dla tego urzÄdzenia." - IDS_RESOURCE_COLUMN "Resource type" - IDS_SETTING_COLUMN "Setting" - IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_COLUMN "Typ zasobu" + IDS_SETTING_COLUMN "Ustawienie" + IDS_RESOURCE_MEMORY_RANGE "Zakres pamiÄci" IDS_RESOURCE_INTERRUPT "IRQ" IDS_RESOURCE_DMA "DMA" - IDS_RESOURCE_PORT "E/A range" + IDS_RESOURCE_PORT "Zakres E/A" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -185,8 +185,8 @@ EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&SzczegÃ³Åy sterownika...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "WyÅwietla informacje szczegÃ³Åowe.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX + PUSHBUTTON "Akt&ualizuj sterownik...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Aktualizuje oprogramowanie sterownika.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 @@ -226,12 +226,12 @@ IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Resources" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Resource settings:", -1, 7, 36, 204, 8 +CAPTION "Zasoby" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Ustawienia zasobÃ³w:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Wed Jan 15 22:50:33 2014 @@ -3,6 +3,7 @@ * testament(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl * UTF-8 conversion by Caemyr (May, 2011) + * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (November, 2013) */ @@ -28,7 +29,7 @@ IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Logon" +CAPTION "Logowanie" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 @@ -47,14 +48,14 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - GROUPBOX "Logon Information", IDC_STATIC, 7, 61, 261, 52 + GROUPBOX "Informacje o logowaniu", IDC_STATIC, 7, 61, 261, 52 LTEXT "<Message>", IDC_LOGONMSG, 15, 73, 245, 18 LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8 CTEXT "Co chcesz teraz zrobiÄ?", IDC_STATIC, 10, 119, 255, 8 PUSHBUTTON "Blokada komputera", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "Wyloguj", IDC_LOGOFF, 90, 135, 70, 14 PUSHBUTTON "WyÅÄcz", IDC_SHUTDOWN, 170, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "ZmieÅ hasÅo", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED PUSHBUTTON "MenedÅ¼er zadaÅ", IDC_TASKMGR, 90, 154, 70, 14 PUSHBUTTON "Anuluj", IDCANCEL, 170, 154, 70, 14 END @@ -90,22 +91,22 @@ IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Change Password" +CAPTION "ZmieÅ hasÅo" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "User name:", IDC_STATIC, 7, 61, 78, 8 + LTEXT "Nazwa uÅ¼ytkownika:", IDC_STATIC, 7, 61, 78, 8 EDITTEXT IDC_CHANGEPWD_USERNAME, 90, 59, 127, 12, ES_AUTOHSCROLL - LTEXT "Log on to:", IDC_STATIC, 7, 78, 78, 8 + LTEXT "Zaloguj siÄ do:", IDC_STATIC, 7, 78, 78, 8 COMBOBOX IDC_CHANGEPWD_DOMAIN, 90, 75, 127, 144, CBS_DROPDOWNLIST | CBS_SORT - LTEXT "Old Password:", IDC_STATIC, 7, 95, 78, 8 + LTEXT "Stare hasÅo:", IDC_STATIC, 7, 95, 78, 8 EDITTEXT IDC_CHANGEPWD_OLDPWD, 90, 92, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "New Password:", IDC_STATIC, 7, 111, 78, 8 + LTEXT "Nowe hasÅo:", IDC_STATIC, 7, 111, 78, 8 EDITTEXT IDC_CHANGEPWD_NEWPWD1, 90, 109, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "Confirm new Password:", IDC_STATIC, 7, 127, 78, 8 + LTEXT "PotwierdÅº hasÅo:", IDC_STATIC, 7, 127, 78, 8 EDITTEXT IDC_CHANGEPWD_NEWPWD2, 90, 125, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 164, 145, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 218, 145, 50, 14 END IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 @@ -127,7 +128,7 @@ IDS_ASKFORUSER "Nazwa uÅ¼ytkownika: " IDS_ASKFORPASSWORD "HasÅo: " IDS_FORCELOGOFF "To wyloguje aktualnego uÅ¼ytkownika i straci on wszystkie niezapisane dane. KontynuowaÄ?" - IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." - IDS_LOGONMSG "You are logged on as %s." + IDS_LOCKMSG "Tylko %s lub Administrator moÅ¼e odblokowaÄ ten komputer." + IDS_LOGONMSG "JesteÅ zalogowany jako %s." IDS_LOGONDATE "Data logowania: %s %s" END

10 years, 11 months

[dreimer] 61632: [FONTVIEW] Fixing Wrong Alphabetical Order by Erdem Ersoy CORE-7756 #resolve

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jan 15 22:40:35 2014 New Revision: 61632 URL: http://svn.reactos.org/svn/reactos?rev=61632&view=rev Log: [FONTVIEW] Fixing Wrong Alphabetical Order by Erdem Ersoy CORE-7756 #resolve Modified: trunk/reactos/base/applications/fontview/fontview.rc Modified: trunk/reactos/base/applications/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.rc [iso-8859-1] Wed Jan 15 22:40:35 2014 @@ -13,8 +13,8 @@ STRINGTABLE BEGIN - IDS_CHARSLOWER "abcdefghijklmnopqrstuvmxyz" - IDS_CHARSUPPER "ABCDEFGHIJKLMNOPQRSTUVMXYZ" + IDS_CHARSLOWER "abcdefghijklmnopqrstuvwxyz" + IDS_CHARSUPPER "ABCDEFGHIJKLMNOPQRSTUVWXYZ" IDS_SPECIALCHARS "0123456789.:,;(*!?')" END

10 years, 11 months

[ekohl] 61631: [MSGINA] Implement the log-off dialog.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Jan 15 20:34:21 2014 New Revision: 61631 URL: http://svn.reactos.org/svn/reactos?rev=61631&view=rev Log: [MSGINA] Implement the log-off dialog. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/resource.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -312,6 +312,56 @@ static INT_PTR CALLBACK +LogOffDialogProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDYES: + EndDialog(hwndDlg, IDYES); + return TRUE; + + case IDNO: + EndDialog(hwndDlg, IDNO); + return TRUE; + } + break; + + case WM_CLOSE: + EndDialog(hwndDlg, IDNO); + return TRUE; + } + + return FALSE; +} + + +static +INT +OnLogOff( + IN HWND hwndDlg, + IN PGINA_CONTEXT pgContext) +{ + return pgContext->pWlxFuncs->WlxDialogBoxParam( + pgContext->hWlx, + pgContext->hDllInstance, + MAKEINTRESOURCEW(IDD_LOGOFF_DLG), + hwndDlg, + LogOffDialogProc, + (LPARAM)pgContext); +} + + +static INT_PTR CALLBACK LoggedOnWindowProc( IN HWND hwndDlg, IN UINT uMsg, @@ -342,7 +392,8 @@ EndDialog(hwndDlg, WLX_SAS_ACTION_LOCK_WKSTA); return TRUE; case IDC_LOGOFF: - EndDialog(hwndDlg, WLX_SAS_ACTION_LOGOFF); + if (OnLogOff(hwndDlg, pgContext) == IDYES) + EndDialog(hwndDlg, WLX_SAS_ACTION_LOGOFF); return TRUE; case IDC_SHUTDOWN: EndDialog(hwndDlg, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ´ÑÐ°Ð²ÐµÐ¹ÑÐµ!" Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -105,6 +105,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "VÃtejte!" Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -44,7 +44,7 @@ LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8 CTEXT "Was wollen Sie tun?", IDC_STATIC, 10, 119, 255, 8 PUSHBUTTON "Computer sperren", IDC_LOCK, 10, 135, 76, 14 - PUSHBUTTON "Abmelden", IDC_LOGOFF, 100, 135, 75, 14 + PUSHBUTTON "Abmelden...", IDC_LOGOFF, 100, 135, 75, 14 PUSHBUTTON "Herunterfahren", IDC_SHUTDOWN, 189, 135, 76, 14 PUSHBUTTON "Password Ã¤ndern", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED PUSHBUTTON "Task-Manager", IDC_TASKMGR, 100, 154, 75, 14 @@ -100,6 +100,17 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Von ReactOS abmelden" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Wollen Sie sich wirklich abmelden?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Ja", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Nein", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Willkommen!" Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -44,7 +44,7 @@ LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8 CTEXT "What do you want to do?", IDC_STATIC, 10, 119, 255, 8 PUSHBUTTON "Lock computer", IDC_LOCK, 10, 135, 76, 14 - PUSHBUTTON "Log off", IDC_LOGOFF, 100, 135, 75, 14 + PUSHBUTTON "Log off...", IDC_LOGOFF, 100, 135, 75, 14 PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 189, 135, 76, 14 PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED PUSHBUTTON "Task manager", IDC_TASKMGR, 100, 154, 75, 14 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Welcome!" Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -102,6 +102,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Â¡Bienvenido!" Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bienvenue!" Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "××¨×××× ×××××!" Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Selamat datang!" Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -108,6 +108,17 @@ PUSHBUTTON "Cancella", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Benvenuti!" Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ãããã!" Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -100,6 +100,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Velkommen!" Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -108,6 +108,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Witaj!" Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -102,6 +102,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bun venit!" Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -102,6 +102,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ!" Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -105,6 +105,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Vitajte!" Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -102,6 +102,17 @@ PUSHBUTTON "Ä°ptal", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "HoÅgeldiniz!" Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -108,6 +108,17 @@ PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 END +IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP +CAPTION "Log Off ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ°ÑÐºÐ°Ð²Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð¼Ð¾!" Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Wed Jan 15 20:34:21 2014 @@ -28,6 +28,8 @@ #define IDC_CHANGEPWD_NEWPWD1 1016 #define IDC_CHANGEPWD_NEWPWD2 1017 +#define IDD_LOGOFF_DLG 107 + #define IDI_ROSLOGO 20000 #define IDI_LOCKICON 21

10 years, 11 months

[ekohl] 61630: [WINLOGON] - Use the states STATE_INIT and SATE_LOGGED_OFF_SAS. - State machine clean-up.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jan 14 22:27:34 2014 New Revision: 61630 URL: http://svn.reactos.org/svn/reactos?rev=61630&view=rev Log: [WINLOGON] - Use the states STATE_INIT and SATE_LOGGED_OFF_SAS. - State machine clean-up. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Tue Jan 14 22:27:34 2014 @@ -844,22 +844,28 @@ switch (wlxAction) { case WLX_SAS_ACTION_LOGON: /* 0x01 */ - if (HandleLogon(Session)) - { - SwitchDesktop(Session->ApplicationDesktop); - Session->LogonState = STATE_LOGGED_ON; - } - else - Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + if (Session->LogonState == STATE_LOGGED_OFF_SAS) + { + if (HandleLogon(Session)) + { + SwitchDesktop(Session->ApplicationDesktop); + Session->LogonState = STATE_LOGGED_ON; + } + else + { + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + } + } break; case WLX_SAS_ACTION_NONE: /* 0x02 */ - if (Session->LogonState == STATE_LOGGED_ON_SAS) + if (Session->LogonState == STATE_LOGGED_OFF_SAS) + { + Session->LogonState = STATE_LOGGED_OFF; + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + } + else if (Session->LogonState == STATE_LOGGED_ON_SAS) { Session->LogonState = STATE_LOGGED_ON; - } - else if (Session->LogonState == STATE_LOGGED_OFF) - { - Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); } else if (Session->LogonState == STATE_LOCKED_SAS) { @@ -928,82 +934,95 @@ { DWORD wlxAction = WLX_SAS_ACTION_NONE; HWND hwnd; - - /* Ignore SAS if we are already in an SAS state */ - if (Session->LogonState == STATE_LOGGED_OFF_SAS || - Session->LogonState == STATE_LOGGED_ON_SAS || - Session->LogonState == STATE_LOCKED_SAS) - return; - - if (Session->LogonState == STATE_LOGGED_ON) - { - Session->LogonState = STATE_LOGGED_ON_SAS; - wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOnSAS(Session->Gina.Context, dwSasType, NULL); - } - else if (Session->LogonState == STATE_LOCKED) - { - hwnd = GetTopDialogWindow(); - if (hwnd != NULL) - { - SendMessage(hwnd, WM_USER, 0, 0); - } - - Session->LogonState = STATE_LOCKED_SAS; - wlxAction = (DWORD)Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType); - } - else - { - /* Display a new dialog (if necessary) */ - switch (dwSasType) - { - case WLX_SAS_TYPE_TIMEOUT: /* 0x00 */ - { - Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); - return; - } - default: - { - PSID LogonSid = NULL; /* FIXME */ - - hwnd = GetTopDialogWindow(); - if (hwnd != NULL) + PSID LogonSid = NULL; /* FIXME */ + BOOL bSecure = TRUE; + + switch (dwSasType) + { + case WLX_SAS_TYPE_CTRL_ALT_DEL: + switch (Session->LogonState) + { + case STATE_INIT: + Session->LogonState = STATE_LOGGED_OFF; + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + return; + + case STATE_LOGGED_OFF: + Session->LogonState = STATE_LOGGED_OFF_SAS; + + hwnd = GetTopDialogWindow(); + if (hwnd != NULL) + SendMessage(hwnd, WLX_WM_SAS, 0, 0); + + Session->Options = 0; + + wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOutSAS( + Session->Gina.Context, + Session->SASAction, + &Session->LogonId, + LogonSid, + &Session->Options, + &Session->UserToken, + &Session->MprNotifyInfo, + (PVOID*)&Session->Profile); + break; + + case STATE_LOGGED_OFF_SAS: + /* Ignore SAS if we are already in an SAS state */ + return; + + case STATE_LOGGED_ON: + Session->LogonState = STATE_LOGGED_ON_SAS; + wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOnSAS(Session->Gina.Context, dwSasType, NULL); + break; + + case STATE_LOGGED_ON_SAS: + /* Ignore SAS if we are already in an SAS state */ + return; + + case STATE_LOCKED: + Session->LogonState = STATE_LOCKED_SAS; + + hwnd = GetTopDialogWindow(); + if (hwnd != NULL) + SendMessage(hwnd, WLX_WM_SAS, 0, 0); + + wlxAction = (DWORD)Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType); + break; + + case STATE_LOCKED_SAS: + /* Ignore SAS if we are already in an SAS state */ + return; + + default: + return; + } + break; + + case WLX_SAS_TYPE_TIMEOUT: + return; + + case WLX_SAS_TYPE_SCRNSVR_TIMEOUT: + if (!Session->Gina.Functions.WlxScreenSaverNotify(Session->Gina.Context, &bSecure)) + { + /* Skip start of screen saver */ + SetEvent(Session->hEndOfScreenSaver); + } + else + { + StartScreenSaver(Session); + if (bSecure) { - SendMessage(hwnd, WM_USER, 0, 0); + wlxAction = WLX_SAS_ACTION_LOCK_WKSTA; +// DoGenericAction(Session, WLX_SAS_ACTION_LOCK_WKSTA); } - - Session->Options = 0; - - wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOutSAS( - Session->Gina.Context, - Session->SASAction, - &Session->LogonId, - LogonSid, - &Session->Options, - &Session->UserToken, - &Session->MprNotifyInfo, - (PVOID*)&Session->Profile); - break; - } - } - } - - if (dwSasType == WLX_SAS_TYPE_SCRNSVR_TIMEOUT) - { - BOOL bSecure = TRUE; - if (!Session->Gina.Functions.WlxScreenSaverNotify(Session->Gina.Context, &bSecure)) - { - /* Skip start of screen saver */ - SetEvent(Session->hEndOfScreenSaver); - } - else - { - StartScreenSaver(Session); - if (bSecure) - DoGenericAction(Session, WLX_SAS_ACTION_LOCK_WKSTA); - } - } - else if (dwSasType == WLX_SAS_TYPE_SCRNSVR_ACTIVITY) - SetEvent(Session->hUserActivity); + } + break; + + case WLX_SAS_TYPE_SCRNSVR_ACTIVITY: + SetEvent(Session->hUserActivity); + break; + } DoGenericAction(Session, wlxAction); } Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Tue Jan 14 22:27:34 2014 @@ -429,7 +429,7 @@ //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGCOMPUTERSETTINGS); /* Display logged out screen */ - WLSession->LogonState = STATE_LOGGED_OFF; + WLSession->LogonState = STATE_INIT; RemoveStatusMessage(WLSession); /* Check for pending setup */ @@ -442,7 +442,7 @@ RunSetup(); } else - PostMessageW(WLSession->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_TIMEOUT, 0); + PostMessageW(WLSession->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_CTRL_ALT_DEL, 0); /* Tell kernel that CurrentControlSet is good (needed * to support Last good known configuration boot) */ Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Tue Jan 14 22:27:34 2014 @@ -155,16 +155,6 @@ * STATE_LOCKED. Pressing "Shutdown" changes the state to * STATE_SHUTTING_DOWN. * - * STATE_SCREENSAVER - * Winlogon runs the screen saver. Upon user activity, the screensaver - * terminates and the state changes back to STATE_LOGGED_ON if the secure - * screen saver option is off. Otherwise, the state changes to STATE_LOCKED. - * - * STATE_LOGGING_OFF - * Winlogon shows the logoff dialog. Pressing "Cancel" or a timeout changes - * the state back to STATE_LOGGED_ON_SAS. Pressing "OK" logs off the user - * and changes the state to STATE_LOGGED_OFF. - * * STATE_LOCKED * Winlogon shows the locked message dialog. When the user presses "Ctrl- * Alt-Del" the state changes to STATE_LOCKED_SAS. If DisableCAD is true, @@ -177,6 +167,11 @@ * pressing "OK" unlocks the computer and changes the state to * STATE_LOGGED_ON. * + * STATE_LOGGING_OFF + * Winlogon shows the logoff dialog. Pressing "Cancel" or a timeout changes + * the state back to STATE_LOGGED_ON_SAS. Pressing "OK" logs off the user + * and changes the state to STATE_LOGGED_OFF. + * * STATE_SHUTTING_DOWN * Winlogon shows the shutdown dialog. Presing "Cancel" or a timeout will * change the state back to STATE_LOGGED_ON_SAS. Pressing "OK" will change @@ -184,20 +179,25 @@ * * STATE_SHUT_DOWN * Terminates Winlogon and initiates shut-down. + * + * STATE_SCREENSAVER + * Winlogon runs the screen saver. Upon user activity, the screensaver + * terminates and the state changes back to STATE_LOGGED_ON if the secure + * screen saver option is off. Otherwise, the state changes to STATE_LOCKED. */ typedef enum _LOGON_STATE { - STATE_INIT, // not used yet + STATE_INIT, STATE_LOGGED_OFF, - STATE_LOGGED_OFF_SAS, // not used yet + STATE_LOGGED_OFF_SAS, STATE_LOGGED_ON, STATE_LOGGED_ON_SAS, - STATE_SCREENSAVER, // not used yet STATE_LOCKED, STATE_LOCKED_SAS, STATE_LOGGING_OFF, // not used yet STATE_SHUTTING_DOWN, // not used yet - STATE_SHUT_DOWN // not used yet + STATE_SHUT_DOWN, // not used yet + STATE_SCREENSAVER // not used yet } LOGON_STATE, *PLOGON_STATE; #define LockWorkstation(Session) Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] Tue Jan 14 22:27:34 2014 @@ -155,9 +155,9 @@ return FALSE; } - if (uMsg == WM_USER) - { - EndDialog(hwndDlg, 0); + if (uMsg == WLX_WM_SAS) + { + EndDialog(hwndDlg, WLX_DLG_SAS); return 0; }

10 years, 11 months

[tkreuzer] 61629: [PCIIDEX] Revert unwanted changes

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 14 21:30:49 2014 New Revision: 61629 URL: http://svn.reactos.org/svn/reactos?rev=61629&view=rev Log: [PCIIDEX] Revert unwanted changes Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] Tue Jan 14 21:30:49 2014 @@ -351,63 +351,6 @@ *pDeviceRelations = DeviceRelations; return STATUS_SUCCESS; -} - -//GUID_PCIIDE_INTERRUPT_INTERFACE -//GUID_PCIIDE_REQUEST_PROPER_RESOURCES - -DEFINE_GUID(GUID_PCIIDE_SYNC_ACCESS_INTERFACE, 0x681190EB, 0xE4EA, 0x11D0, 0xAB, 0x82, 0x00, 0xA0, 0xC9, 0x06, 0x96, 0x2F); -DEFINE_GUID(GUID_PCIIDE_XFER_MODE_INTERFACE, 0x681190EC, 0xE4EA, 0x11D0, 0xAB, 0x82, 0x00, 0xA0, 0xC9, 0x06, 0x96, 0x2F); - - - -NTSTATUS -PciIdeXPdoPnpQueryInterface( - PIRP Irp) -{ -#if 0 - PIO_STACK_LOCATION IrpStack = IoGetCurrentIrpStackLocation(Irp); - PACPI_INTERFACE_STANDARD AcpiInterface; - - if (IrpStack->Parameters.QueryInterface.Version != 1) - { - DPRINT1("Invalid version number: %d\n", - IrpStack->Parameters.QueryInterface.Version); - return STATUS_INVALID_PARAMETER; - } - - if (IsEqualGUID(IrpStack->Parameters.QueryInterface.InterfaceType, - &GUID_PCIIDE_XFER_MODE_INTERFACE)) - { - DPRINT1("GUID_PCIIDE_XFER_MODE_INTERFACE\n"); - - if (IrpStack->Parameters.QueryInterface.Size < sizeof(ACPI_INTERFACE_STANDARD)) - { - DPRINT1("Buffer too small! (%d)\n", IrpStack->Parameters.QueryInterface.Size); - return STATUS_BUFFER_TOO_SMALL; - } - - AcpiInterface = (PACPI_INTERFACE_STANDARD)IrpStack->Parameters.QueryInterface.Interface; - - AcpiInterface->InterfaceReference = AcpiInterfaceReference; - AcpiInterface->InterfaceDereference = AcpiInterfaceDereference; - AcpiInterface->GpeConnectVector = AcpiInterfaceConnectVector; - AcpiInterface->GpeDisconnectVector = AcpiInterfaceDisconnectVector; - AcpiInterface->GpeEnableEvent = AcpiInterfaceEnableEvent; - AcpiInterface->GpeDisableEvent = AcpiInterfaceDisableEvent; - AcpiInterface->GpeClearStatus = AcpiInterfaceClearStatus; - AcpiInterface->RegisterForDeviceNotifications = AcpiInterfaceNotificationsRegister; - AcpiInterface->UnregisterForDeviceNotifications = AcpiInterfaceNotificationsUnregister; - - return STATUS_SUCCESS; - } - else - { - DPRINT1("Invalid GUID\n"); - return STATUS_NOT_SUPPORTED; - } -#endif - return STATUS_NOT_IMPLEMENTED; } NTSTATUS NTAPI @@ -576,11 +519,6 @@ } break; } - case IRP_MN_QUERY_INTERFACE: - { - Status = PciIdeXPdoPnpQueryInterface(Irp); - break; - } default: { /* We can't forward request to the lower driver, because

10 years, 11 months

[tkreuzer] 61628: [BATTC] Check if MiniportInfo->Pdo is NULL before passing it to IoRegisterDeviceInterface [CMBATT] Fix broken CmBattGetAcpiInterfaces [COMPBATT] Fix "typo" in CompBattAddDevice th...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 14 21:21:29 2014 New Revision: 61628 URL: http://svn.reactos.org/svn/reactos?rev=61628&view=rev Log: [BATTC] Check if MiniportInfo->Pdo is NULL before passing it to IoRegisterDeviceInterface [CMBATT] Fix broken CmBattGetAcpiInterfaces [COMPBATT] Fix "typo" in CompBattAddDevice that caused memory corruption Modified: trunk/reactos/drivers/battery/battc/battc.c trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c trunk/reactos/drivers/storage/ide/pciidex/pdo.c Modified: trunk/reactos/drivers/battery/battc/battc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/batt… ============================================================================== --- trunk/reactos/drivers/battery/battc/battc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/battery/battc/battc.c [iso-8859-1] Tue Jan 14 21:21:29 2014 @@ -151,18 +151,26 @@ ExInitializeFastMutex(&BattClass->Mutex); - Status = IoRegisterDeviceInterface(MiniportInfo->Pdo, - &GUID_DEVICE_BATTERY, - NULL, - &BattClass->InterfaceName); - if (NT_SUCCESS(Status)) - { - DPRINT("Initialized battery interface: %wZ\n", &BattClass->InterfaceName); - IoSetDeviceInterfaceState(&BattClass->InterfaceName, TRUE); - } - else - { - DPRINT1("IoRegisterDeviceInterface failed (0x%x)\n", Status); + if (MiniportInfo->Pdo != NULL) + { + Status = IoRegisterDeviceInterface(MiniportInfo->Pdo, + &GUID_DEVICE_BATTERY, + NULL, + &BattClass->InterfaceName); + if (NT_SUCCESS(Status)) + { + DPRINT("Initialized battery interface: %wZ\n", &BattClass->InterfaceName); + Status = IoSetDeviceInterfaceState(&BattClass->InterfaceName, TRUE); + if (Status == STATUS_OBJECT_NAME_EXISTS) + { + DPRINT1("Got STATUS_OBJECT_NAME_EXISTS for SetDeviceInterfaceState\n"); + Status = STATUS_SUCCESS; + } + } + else + { + DPRINT1("IoRegisterDeviceInterface failed (0x%x)\n", Status); + } } *ClassData = BattClass; Modified: trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/cmbatt/cm… ============================================================================== --- trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c [iso-8859-1] Tue Jan 14 21:21:29 2014 @@ -23,7 +23,7 @@ NTSTATUS Status; PCMBATT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; if (CmBattDebug & 0x20) DbgPrint("CmBattWaitWakeLoop: Entered.\n"); - + /* Check for success */ if ((NT_SUCCESS(IoStatusBlock->Status)) && (DeviceExtension->WaitWakeEnable)) { @@ -48,7 +48,7 @@ DeviceExtension->PowerIrp = NULL; } } - + NTSTATUS NTAPI CmBattIoCompletion(IN PDEVICE_OBJECT DeviceObject, @@ -87,6 +87,7 @@ /* Build the query */ IoStackLocation = IoGetNextIrpStackLocation(Irp); + IoStackLocation->MajorFunction = IRP_MJ_PNP; IoStackLocation->MinorFunction = IRP_MN_QUERY_INTERFACE; IoStackLocation->Parameters.QueryInterface.InterfaceType = &GUID_ACPI_INTERFACE_STANDARD; IoStackLocation->Parameters.QueryInterface.Size = sizeof(ACPI_INTERFACE_STANDARD); @@ -100,16 +101,15 @@ /* Initialize our wait event */ KeInitializeEvent(&Event, SynchronizationEvent, 0); - + /* Set the completion routine */ - IoCopyCurrentIrpStackLocationToNext(Irp); IoSetCompletionRoutine(Irp, (PVOID)CmBattIoCompletion, &Event, TRUE, TRUE, TRUE); - + /* Now call ACPI */ Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) @@ -122,10 +122,10 @@ NULL); Status = Irp->IoStatus.Status; } - + /* Free the IRP */ IoFreeIrp(Irp); - + /* Return status */ if (!(NT_SUCCESS(Status)) && (CmBattDebug & 0xC)) DbgPrint("CmBattGetAcpiInterfaces: Could not get ACPI driver interfaces, status = %x\n", Status); @@ -157,7 +157,7 @@ DeviceExtension, DeviceExtension->FdoType, DeviceExtension->DeviceId); - + /* Make sure it's safe to go ahead */ IoReleaseRemoveLockAndWait(&DeviceExtension->RemoveLock, 0); @@ -168,7 +168,7 @@ IoCancelIrp(DeviceExtension->PowerIrp); DeviceExtension->PowerIrp = NULL; } - + /* Check what type of FDO is being removed */ Context = DeviceExtension->AcpiInterface.Context; if (DeviceExtension->FdoType == CmBattBattery) @@ -187,7 +187,7 @@ CmBattWmiDeRegistration(DeviceExtension); AcAdapterPdo = NULL; } - + /* Detach and delete */ IoDetachDevice(DeviceExtension->AttachedDevice); IoDeleteDevice(DeviceExtension->DeviceObject); @@ -209,30 +209,30 @@ DeviceExtension = DeviceObject->DeviceExtension; switch (IoStackLocation->MinorFunction) { - case IRP_MN_WAIT_WAKE: + case IRP_MN_WAIT_WAKE: if (CmBattDebug & 0x10) DbgPrint("CmBattPowerDispatch: IRP_MN_WAIT_WAKE\n"); break; - + case IRP_MN_POWER_SEQUENCE: if (CmBattDebug & 0x10) DbgPrint("CmBattPowerDispatch: IRP_MN_POWER_SEQUENCE\n"); break; - + case IRP_MN_QUERY_POWER: if (CmBattDebug & 0x10) DbgPrint("CmBattPowerDispatch: IRP_MN_WAIT_WAKE\n"); break; - + case IRP_MN_SET_POWER: if (CmBattDebug & 0x10) DbgPrint("CmBattPowerDispatch: IRP_MN_SET_POWER type: %d, State: %d \n", IoStackLocation->Parameters.Power.Type, IoStackLocation->Parameters.Power.State); break; - + default: - + if (CmBattDebug & 1) DbgPrint("CmBattPowerDispatch: minor %d\n", IoStackLocation->MinorFunction); break; @@ -252,7 +252,7 @@ Status = Irp->IoStatus.Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); } - + /* Return status */ return Status; } @@ -271,12 +271,12 @@ /* Get stack location and device extension */ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); DeviceExtension = DeviceObject->DeviceExtension; - + /* Set default error */ Status = STATUS_NOT_SUPPORTED; /* Try to acquire the lock before doing anything */ - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, 0); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, Irp); if (!NT_SUCCESS(Status)) { /* Complete the request */ @@ -287,9 +287,9 @@ /* What's the operation? */ switch (IoStackLocation->MinorFunction) - { + { case IRP_MN_QUERY_PNP_DEVICE_STATE: - + /* Initialize our wait event */ KeInitializeEvent(&Event, SynchronizationEvent, 0); @@ -322,28 +322,28 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); return Status; - + case IRP_MN_SURPRISE_REMOVAL: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_SURPRISE_REMOVAL\n"); - + /* Lock the device extension and set the handle count to invalid */ ExAcquireFastMutex(&DeviceExtension->FastMutex); DeviceExtension->HandleCount = -1; ExReleaseFastMutex(&DeviceExtension->FastMutex); Status = STATUS_SUCCESS; break; - + case IRP_MN_START_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_START_DEVICE\n"); - + /* Mark the extension as started */ if (DeviceExtension->FdoType == CmBattBattery) DeviceExtension->Started = TRUE; Status = STATUS_SUCCESS; break; - - case IRP_MN_STOP_DEVICE: + + case IRP_MN_STOP_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_STOP_DEVICE\n"); @@ -351,7 +351,7 @@ if (DeviceExtension->FdoType == CmBattBattery) DeviceExtension->Started = FALSE; Status = STATUS_SUCCESS; break; - + case IRP_MN_QUERY_REMOVE_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_QUERY_REMOVE_DEVICE\n"); @@ -376,23 +376,23 @@ /* Fail because there's still open handles */ Status = STATUS_UNSUCCESSFUL; } - + /* Release the lock and return */ ExReleaseFastMutex(&DeviceExtension->FastMutex); break; - + case IRP_MN_REMOVE_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_REMOVE_DEVICE\n"); - + /* Call the remove code */ Status = CmBattRemoveDevice(DeviceObject, Irp); break; - + case IRP_MN_CANCEL_REMOVE_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_CANCEL_REMOVE_DEVICE\n"); - + /* Lock the extension and get the handle count */ ExAcquireFastMutex(&DeviceExtension->FastMutex); if (DeviceExtension->HandleCount == -1) @@ -403,33 +403,33 @@ else if (CmBattDebug & 2) { /* Nop, but warn about it */ - DbgPrint("CmBattPnpDispatch: Received CANCEL_REMOVE when OpenCount == %x\n", + DbgPrint("CmBattPnpDispatch: Received CANCEL_REMOVE when OpenCount == %x\n", DeviceExtension->HandleCount); } - + /* Return success in all cases, and release the lock */ Status = STATUS_SUCCESS; ExReleaseFastMutex(&DeviceExtension->FastMutex); break; - + case IRP_MN_QUERY_STOP_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_QUERY_STOP_DEVICE\n"); - - /* There's no real support for this */ + + /* There's no real support for this */ Status = STATUS_NOT_IMPLEMENTED; break; case IRP_MN_CANCEL_STOP_DEVICE: if (CmBattDebug & 0x20) DbgPrint("CmBattPnpDispatch: IRP_MN_CANCEL_STOP_DEVICE\n"); - - /* There's no real support for this */ + + /* There's no real support for this */ Status = STATUS_NOT_IMPLEMENTED; break; - + case IRP_MN_QUERY_CAPABILITIES: - + /* Initialize our wait event */ KeInitializeEvent(&Event, SynchronizationEvent, 0); @@ -496,14 +496,14 @@ IoStackLocation->MinorFunction); break; } - - /* Release the remove lock */ + + /* Release the remove lock */ IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); /* Set IRP status if we have one */ if (Status != STATUS_NOT_SUPPORTED) Irp->IoStatus.Status = Status; - /* Did someone pick it up? */ + /* Did someone pick it up? */ if ((NT_SUCCESS(Status)) || (Status == STATUS_NOT_SUPPORTED)) { /* Still unsupported, try ACPI */ @@ -539,7 +539,7 @@ ULONG ResultLength; PAGED_CODE(); if (CmBattDebug & 0x220) DbgPrint("CmBattCreateFdo: Entered\n"); - + /* Get unique ID */ Status = CmBattGetUniqueId(DeviceObject, &UniqueId); if (!NT_SUCCESS(Status)) @@ -549,7 +549,7 @@ if (CmBattDebug & 2) DbgPrint("CmBattCreateFdo: Error %x from _UID, assuming unit #0\n", Status); } - + /* Create the FDO */ Status = IoCreateDevice(DriverObject, DeviceExtensionSize, @@ -565,7 +565,7 @@ DbgPrint("CmBattCreateFdo: error (0x%x) creating device object\n", Status); return Status; } - + /* Set FDO flags */ FdoDeviceObject->Flags |= (DO_POWER_PAGABLE | DO_BUFFERED_IO); FdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; @@ -576,7 +576,7 @@ FdoExtension->DeviceObject = FdoDeviceObject; FdoExtension->FdoDeviceObject = FdoDeviceObject; FdoExtension->PdoDeviceObject = DeviceObject; - + /* Attach to ACPI */ FdoExtension->AttachedDevice = IoAttachDeviceToDeviceStack(FdoDeviceObject, DeviceObject); @@ -588,7 +588,7 @@ DbgPrint("CmBattCreateFdo: IoAttachDeviceToDeviceStack failed.\n"); return STATUS_UNSUCCESSFUL; } - + /* Get ACPI interface for EVAL */ Status = CmBattGetAcpiInterfaces(FdoExtension->AttachedDevice, &FdoExtension->AcpiInterface); @@ -604,14 +604,14 @@ /* Setup the rest of the extension */ ExInitializeFastMutex(&FdoExtension->FastMutex); - IoInitializeRemoveLock(&FdoExtension->RemoveLock, 0, 0, 0); + IoInitializeRemoveLock(&FdoExtension->RemoveLock, 'RbmC', 0, 0); FdoExtension->HandleCount = 0; FdoExtension->WaitWakeEnable = FALSE; FdoExtension->DeviceId = UniqueId; FdoExtension->DeviceName = NULL; FdoExtension->DelayNotification = FALSE; FdoExtension->ArFlag = 0; - + /* Open the device key */ Status = IoOpenDeviceRegistryKey(DeviceObject, PLUGPLAY_REGKEY_DEVICE, @@ -630,9 +630,9 @@ if (NT_SUCCESS(Status)) { /* Set value */ - FdoExtension->WaitWakeEnable = *(PULONG)PartialInfo->Data; + FdoExtension->WaitWakeEnable = ((*(PULONG)PartialInfo->Data) != 0); } - + /* Close the handle */ ZwClose(KeyHandle); } @@ -652,7 +652,7 @@ BATTERY_MINIPORT_INFO MiniportInfo; NTSTATUS Status; PDEVICE_OBJECT FdoDeviceObject; - PCMBATT_DEVICE_EXTENSION FdoExtension; + PCMBATT_DEVICE_EXTENSION FdoExtension; PAGED_CODE(); if (CmBattDebug & 0x220) DbgPrint("CmBattAddBattery: pdo %x\n", DeviceObject); @@ -680,7 +680,7 @@ FdoExtension->InterruptTime = KeQueryInterruptTime(); FdoExtension->TripPointSet = CmBattSetTripPpoint(FdoExtension, 0) != STATUS_OBJECT_NAME_NOT_FOUND; - + /* Setup the battery miniport information structure */ RtlZeroMemory(&MiniportInfo, sizeof(MiniportInfo)); MiniportInfo.Pdo = DeviceObject; @@ -694,7 +694,7 @@ MiniportInfo.SetStatusNotify = (PVOID)CmBattSetStatusNotify; MiniportInfo.DisableStatusNotify = (PVOID)CmBattDisableStatusNotify; MiniportInfo.DeviceName = FdoExtension->DeviceName; - + /* Register with the class driver */ Status = BatteryClassInitializeDevice(&MiniportInfo, &FdoExtension->ClassData); if (!NT_SUCCESS(Status)) @@ -714,7 +714,7 @@ DbgPrint("CmBattAddBattery: Could not register as a WMI provider, status = %Lx\n", Status); return Status; } - + /* Register ACPI */ Status = FdoExtension->AcpiInterface.RegisterForDeviceNotifications(FdoExtension->AcpiInterface.Context, (PVOID)CmBattNotifyHandler, @@ -728,7 +728,7 @@ if (CmBattDebug & 0xC) DbgPrint("CmBattAddBattery: Could not register for battery notify, status = %Lx\n", Status); } - + /* Return status */ return Status; } @@ -757,7 +757,7 @@ /* Set this as the AC adapter's PDO */ AcAdapterPdo = PdoDeviceObject; } - + /* Create the FDO for the adapter */ Status = CmBattCreateFdo(DriverObject, PdoDeviceObject, @@ -770,7 +770,7 @@ DbgPrint("CmBattAddAcAdapter: error (0x%x) creating Fdo\n", Status); return Status; } - + /* Set the type and do WMI registration */ DeviceExtension = FdoDeviceObject->DeviceExtension; DeviceExtension->FdoType = CmBattAcAdapter; @@ -781,7 +781,7 @@ if (CmBattDebug & 0xC) DbgPrint("CmBattAddBattery: Could not register as a WMI provider, status = %Lx\n", Status); } - + /* Register with ACPI */ Status = DeviceExtension->AcpiInterface.RegisterForDeviceNotifications(DeviceExtension->AcpiInterface.Context, (PVOID)CmBattNotifyHandler, @@ -809,7 +809,7 @@ PAGED_CODE(); if (CmBattDebug & 0x220) DbgPrint("CmBattAddDevice: Entered with pdo %x\n", PdoDeviceObject); - + /* Make sure we have a PDO */ if (!PdoDeviceObject) { @@ -817,7 +817,7 @@ if (CmBattDebug & 0x24) DbgPrint("CmBattAddDevice: Asked to do detection\n"); return STATUS_NO_MORE_ENTRIES; } - + /* Open the driver key */ Status = IoOpenDeviceRegistryKey(PdoDeviceObject, PLUGPLAY_REGKEY_DRIVER, @@ -846,7 +846,7 @@ DbgPrint("CmBattAddDevice: Could not read the power type identifier: %x\n", Status); return Status; } - + /* Check what kind of power source this is */ PowerSourceType = *(PULONG)PartialInfo->Data; if (PowerSourceType == 1) @@ -866,7 +866,7 @@ DbgPrint("CmBattAddDevice: Invalid POWER_SOURCE_TYPE == %d \n", PowerSourceType); return STATUS_UNSUCCESSFUL; } - + /* Return whatever the FDO creation routine did */ return Status; } Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] Tue Jan 14 21:21:29 2014 @@ -11,7 +11,7 @@ #include "compbatt.h" /* FUNCTIONS ******************************************************************/ - + NTSTATUS NTAPI CompBattPowerDispatch(IN PDEVICE_OBJECT DeviceObject, @@ -19,10 +19,10 @@ { PCOMPBATT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; if (CompBattDebug & 1) DbgPrint("CompBatt: PowerDispatch received power IRP.\n"); - + /* Start the next IRP */ PoStartNextPowerIrp(Irp); - + /* Call the next driver in the stack */ IoSkipCurrentIrpStackLocation(Irp); return PoCallDriver(DeviceExtension->AttachedDevice, Irp); @@ -52,18 +52,18 @@ IoAcquireRemoveLock(&BatteryData->RemoveLock, 0); ExReleaseFastMutex(&DeviceExtension->Lock); IoReleaseRemoveLockAndWait(&BatteryData->RemoveLock, 0); - + /* Remove the entry from the list */ ExAcquireFastMutex(&DeviceExtension->Lock); RemoveEntryList(&BatteryData->BatteryLink); ExReleaseFastMutex(&DeviceExtension->Lock); return BatteryData; } - + /* Next */ NextEntry = NextEntry->Flink; } - + /* Done */ ExReleaseFastMutex(&DeviceExtension->Lock); if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING RemoveBatteryFromList\n"); @@ -80,7 +80,7 @@ BOOLEAN Found = FALSE; if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING IsBatteryAlreadyOnList\n"); - + /* Loop the battery list */ ExAcquireFastMutex(&DeviceExtension->Lock); ListHead = &DeviceExtension->BatteryList; @@ -99,7 +99,7 @@ /* Next */ NextEntry = NextEntry->Flink; } - + /* Release the lock and return search status */ ExReleaseFastMutex(&DeviceExtension->Lock); if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING IsBatteryAlreadyOnList\n"); @@ -119,7 +119,7 @@ PAGED_CODE(); if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING AddNewBattery \"%w\" \n", BatteryName->Buffer); - + /* Is this a new battery? */ if (!IsBatteryAlreadyOnList(BatteryName, DeviceExtension)) { @@ -136,7 +136,7 @@ BatteryData->BatteryName.MaximumLength = BatteryName->Length; BatteryData->BatteryName.Buffer = (PWCHAR)(BatteryData + 1); RtlCopyUnicodeString(&BatteryData->BatteryName, BatteryName); - + /* Get the device object */ Status = CompBattGetDeviceObjectPointer(BatteryName, FILE_ALL_ACCESS, @@ -147,14 +147,14 @@ /* Reference the DO and drop the FO */ ObReferenceObject(BatteryData->DeviceObject); ObDereferenceObject(FileObject); - - /* Allocate the battery IRP */ + + /* Allocate the battery IRP */ Irp = IoAllocateIrp(BatteryData->DeviceObject->StackSize + 1, 0); if (Irp) { /* Save it */ BatteryData->Irp = Irp; - + /* Setup the stack location */ IoStackLocation = IoGetNextIrpStackLocation(Irp); IoStackLocation->Parameters.Others.Argument1 = DeviceExtension; @@ -176,7 +176,7 @@ ExInitializeWorkItem(&BatteryData->WorkItem, (PVOID)CompBattMonitorIrpCompleteWorker, BatteryData); - + /* Setup the IRP work entry */ CompBattMonitorIrpComplete(BatteryData->DeviceObject, Irp, 0); Status = STATUS_SUCCESS; @@ -193,10 +193,10 @@ else if (CompBattDebug & 8) { /* Fail */ - DbgPrint("CompBattAddNewBattery: Failed to get device Object. status = %lx\n", + DbgPrint("CompBattAddNewBattery: Failed to get device Object. status = %lx\n", Status); } - + /* Free the battery data */ ExFreePool(BatteryData); } @@ -229,7 +229,7 @@ /* Dereference and free it */ ObDereferenceObject(BatteryData->DeviceObject); ExFreePool(BatteryData); - + /* Notify class driver */ DeviceExtension->Flags = 0; BatteryClassStatusNotify(DeviceExtension->ClassData); @@ -248,7 +248,7 @@ PWCHAR LinkList; UNICODE_STRING LinkString; if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING GetBatteries\n"); - + /* Get all battery links */ Status = IoGetDeviceInterfaces(&GUID_DEVICE_BATTERY, NULL, 0, &LinkList); p = LinkList; @@ -260,12 +260,12 @@ /* Create the string */ RtlInitUnicodeString(&LinkString, p); if (!LinkString.Length) break; - + /* Add this battery and move on */ Status = CompBattAddNewBattery(&LinkString, DeviceExtension); p += (LinkString.Length / sizeof(WCHAR)) + sizeof(UNICODE_NULL); } - + /* Parsing complete, clean up buffer */ ExFreePool(LinkList); } @@ -274,7 +274,7 @@ /* Fail */ DbgPrint("CompBatt: Couldn't get list of batteries\n"); } - + /* Done */ if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING GetBatteries\n"); return Status; @@ -325,12 +325,12 @@ UNICODE_STRING SymbolicLinkName; BATTERY_MINIPORT_INFO MiniportInfo; if (CompBattDebug & 2) DbgPrint("CompBatt: Got an AddDevice - %x\n", PdoDeviceObject); - + /* Create the device */ RtlInitUnicodeString(&DeviceName, L"\\Device\\CompositeBattery"); Status = IoCreateDevice(DriverObject, sizeof(COMPBATT_DEVICE_EXTENSION), - &DeviceName, + &DeviceName, FILE_DEVICE_BATTERY, FILE_DEVICE_SECURE_OPEN, FALSE, @@ -340,11 +340,11 @@ /* Setup symbolic link for Win32 access */ RtlInitUnicodeString(&SymbolicLinkName, L"\\DosDevices\\CompositeBattery"); IoCreateSymbolicLink(&SymbolicLinkName, &DeviceName); - + /* Initialize the device extension */ DeviceExtension = DeviceObject->DeviceExtension; - RtlZeroMemory(DeviceExtension, 0x1B0u); - + RtlZeroMemory(DeviceExtension, sizeof(COMPBATT_DEVICE_EXTENSION)); + /* Attach to device stack and set DO pointers */ DeviceExtension->AttachedDevice = IoAttachDeviceToDeviceStack(DeviceObject, PdoDeviceObject); @@ -355,7 +355,7 @@ if (CompBattDebug & 8) DbgPrint("CompBattAddDevice: Could not attach to LowerDevice.\n"); IoDeleteDevice(DeviceObject); - return STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } /* Set device object flags */ @@ -367,7 +367,7 @@ InitializeListHead(&DeviceExtension->BatteryList); DeviceExtension->Flags = 0; DeviceExtension->NextTag = 1; - + /* Setup the miniport data */ RtlZeroMemory(&MiniportInfo, sizeof(MiniportInfo)); MiniportInfo.MajorVersion = BATTERY_CLASS_MAJOR_VERSION; @@ -381,7 +381,7 @@ MiniportInfo.SetStatusNotify = (BCLASS_SET_STATUS_NOTIFY)CompBattSetStatusNotify; MiniportInfo.DisableStatusNotify = (BCLASS_DISABLE_STATUS_NOTIFY)CompBattDisableStatusNotify; MiniportInfo.Pdo = NULL; - + /* Register with the class driver */ Status = BatteryClassInitializeDevice(&MiniportInfo, &DeviceExtension->ClassData); @@ -413,7 +413,7 @@ switch (IoStackLocation->MinorFunction) { case IRP_MN_START_DEVICE: - + /* Device is starting, register for new batteries and pick up current ones */ Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, 0, @@ -438,32 +438,32 @@ } break; case IRP_MN_CANCEL_STOP_DEVICE: - + /* Explicitly say ok */ Status = STATUS_SUCCESS; break; - + case IRP_MN_CANCEL_REMOVE_DEVICE: /* Explicitly say ok */ Status = STATUS_SUCCESS; break; - + case IRP_MN_SURPRISE_REMOVAL: - + /* Explicitly say ok */ Status = STATUS_SUCCESS; break; - + case IRP_MN_QUERY_PNP_DEVICE_STATE: - + /* Add this in */ Irp->IoStatus.Information |= PNP_DEVICE_NOT_DISABLEABLE; Status = STATUS_SUCCESS; break; - + default: - + /* Not supported */ Status = STATUS_INVALID_DEVICE_REQUEST; break; @@ -472,7 +472,7 @@ /* Set IRP status if we have one */ if (Status != STATUS_NOT_SUPPORTED) Irp->IoStatus.Status = Status; - /* Did someone pick it up? */ + /* Did someone pick it up? */ if ((NT_SUCCESS(Status)) || (Status == STATUS_NOT_SUPPORTED)) { /* Still unsupported, try ACPI */ Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] Tue Jan 14 21:21:29 2014 @@ -351,6 +351,63 @@ *pDeviceRelations = DeviceRelations; return STATUS_SUCCESS; +} + +//GUID_PCIIDE_INTERRUPT_INTERFACE +//GUID_PCIIDE_REQUEST_PROPER_RESOURCES + +DEFINE_GUID(GUID_PCIIDE_SYNC_ACCESS_INTERFACE, 0x681190EB, 0xE4EA, 0x11D0, 0xAB, 0x82, 0x00, 0xA0, 0xC9, 0x06, 0x96, 0x2F); +DEFINE_GUID(GUID_PCIIDE_XFER_MODE_INTERFACE, 0x681190EC, 0xE4EA, 0x11D0, 0xAB, 0x82, 0x00, 0xA0, 0xC9, 0x06, 0x96, 0x2F); + + + +NTSTATUS +PciIdeXPdoPnpQueryInterface( + PIRP Irp) +{ +#if 0 + PIO_STACK_LOCATION IrpStack = IoGetCurrentIrpStackLocation(Irp); + PACPI_INTERFACE_STANDARD AcpiInterface; + + if (IrpStack->Parameters.QueryInterface.Version != 1) + { + DPRINT1("Invalid version number: %d\n", + IrpStack->Parameters.QueryInterface.Version); + return STATUS_INVALID_PARAMETER; + } + + if (IsEqualGUID(IrpStack->Parameters.QueryInterface.InterfaceType, + &GUID_PCIIDE_XFER_MODE_INTERFACE)) + { + DPRINT1("GUID_PCIIDE_XFER_MODE_INTERFACE\n"); + + if (IrpStack->Parameters.QueryInterface.Size < sizeof(ACPI_INTERFACE_STANDARD)) + { + DPRINT1("Buffer too small! (%d)\n", IrpStack->Parameters.QueryInterface.Size); + return STATUS_BUFFER_TOO_SMALL; + } + + AcpiInterface = (PACPI_INTERFACE_STANDARD)IrpStack->Parameters.QueryInterface.Interface; + + AcpiInterface->InterfaceReference = AcpiInterfaceReference; + AcpiInterface->InterfaceDereference = AcpiInterfaceDereference; + AcpiInterface->GpeConnectVector = AcpiInterfaceConnectVector; + AcpiInterface->GpeDisconnectVector = AcpiInterfaceDisconnectVector; + AcpiInterface->GpeEnableEvent = AcpiInterfaceEnableEvent; + AcpiInterface->GpeDisableEvent = AcpiInterfaceDisableEvent; + AcpiInterface->GpeClearStatus = AcpiInterfaceClearStatus; + AcpiInterface->RegisterForDeviceNotifications = AcpiInterfaceNotificationsRegister; + AcpiInterface->UnregisterForDeviceNotifications = AcpiInterfaceNotificationsUnregister; + + return STATUS_SUCCESS; + } + else + { + DPRINT1("Invalid GUID\n"); + return STATUS_NOT_SUPPORTED; + } +#endif + return STATUS_NOT_IMPLEMENTED; } NTSTATUS NTAPI @@ -519,6 +576,11 @@ } break; } + case IRP_MN_QUERY_INTERFACE: + { + Status = PciIdeXPdoPnpQueryInterface(Irp); + break; + } default: { /* We can't forward request to the lower driver, because

10 years, 11 months

[tfaber] 61627: [LWIP] - Fix warning. Already applied upstream. [CMAKE] - Make C4013 (implicit function declaration) an error CORE-7538

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jan 14 21:04:39 2014 New Revision: 61627 URL: http://svn.reactos.org/svn/reactos?rev=61627&view=rev Log: [LWIP] - Fix warning. Already applied upstream. [CMAKE] - Make C4013 (implicit function declaration) an error CORE-7538 Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/lib/drivers/lwip/src/api/tcpip.c Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=61627… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Jan 14 21:04:39 2014 @@ -33,11 +33,16 @@ add_compile_flags("/FS") endif () -# C++ exception specification ignored... yeah we don't care +# Disable overly sensitive warnings as well as those that generally aren't +# useful to us. +# - TODO: C4018: signed/unsigned mismatch +# - TODO: C4244: integer truncation +# - C4290: C++ exception specification ignored +#add_compile_flags("/wd4018 /wd4244 /wd4290") add_compile_flags("/wd4290") # The following warnings are treated as errors: -# - TODO: C4013: implicit function declaration +# - C4013: implicit function declaration # - C4022: pointer type mismatch for parameter # - TODO: C4028: formal parameter different from declaration # - C4047: different level of indirection @@ -49,7 +54,7 @@ # - TODO: C4133: incompatible types # - C4229: modifiers on data are ignored # - C4700: uninitialized variable usage -add_compile_flags("/we4022 /we4047 /we4098 /we4113 /we4129 /we4229 /we4700") +add_compile_flags("/we4013 /we4022 /we4047 /we4098 /we4113 /we4129 /we4229 /we4700") # Enable warnings above the default level, but don't treat them as errors: # - C4115: named type definition in parentheses Modified: trunk/reactos/lib/drivers/lwip/src/api/tcpip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/api/t… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/api/tcpip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/api/tcpip.c [iso-8859-1] Tue Jan 14 21:04:39 2014 @@ -46,6 +46,7 @@ #include "lwip/pbuf.h" #include "lwip/tcpip.h" #include "lwip/init.h" +#include "lwip/ip.h" #include "netif/etharp.h" #include "netif/ppp_oe.h"

10 years, 11 months

[tkreuzer] 61626: [LSASRV] Make the LSAP_POLICY_AUDIT_EVENTS_DATA structure compatible to the one used in Windows, so that the registry data is compatible between Windows and ReactOS lsasrv. Window...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 14 20:24:43 2014 New Revision: 61626 URL: http://svn.reactos.org/svn/reactos?rev=61626&view=rev Log: [LSASRV] Make the LSAP_POLICY_AUDIT_EVENTS_DATA structure compatible to the one used in Windows, so that the registry data is compatible between Windows and ReactOS lsasrv. Windows does not actually use dynamically sized structures, but always stores a full structure and the AuditEventsCount is AFTER the AuditEvents array, so that it is in fact pretty pointless. But that's how it works. Modified: trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/dll/win32/lsasrv/lsasrv.h Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Tue Jan 14 20:24:43 2014 @@ -241,8 +241,6 @@ PSID AccountDomainSid = NULL; PSECURITY_DESCRIPTOR PolicySd = NULL; ULONG PolicySdSize = 0; - ULONG AuditEventsCount; - ULONG AuditEventsSize; ULONG i; NTSTATUS Status; @@ -263,17 +261,15 @@ AuditLogInfo.NextAuditRecordId = 0; // DWORD /* Initialize the Audit Events attribute */ - AuditEventsCount = AuditCategoryAccountLogon - AuditCategorySystem + 1; - AuditEventsSize = sizeof(LSAP_POLICY_AUDIT_EVENTS_DATA) + AuditEventsCount * sizeof(DWORD); AuditEventsInfo = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, - AuditEventsSize); + sizeof(LSAP_POLICY_AUDIT_EVENTS_DATA)); if (AuditEventsInfo == NULL) return STATUS_INSUFFICIENT_RESOURCES; AuditEventsInfo->AuditingMode = FALSE; - AuditEventsInfo->MaximumAuditEventCount = AuditEventsCount; - for (i = 0; i < AuditEventsCount; i++) + AuditEventsInfo->MaximumAuditEventCount = POLICY_AUDIT_EVENT_TYPE_COUNT; + for (i = 0; i < POLICY_AUDIT_EVENT_TYPE_COUNT; i++) AuditEventsInfo->AuditEvents[i] = 0; /* Initialize the DNS Domain GUID attribute */ @@ -351,7 +347,7 @@ LsapSetObjectAttribute(PolicyObject, L"PolAdtEv", AuditEventsInfo, - AuditEventsSize); + sizeof(LSAP_POLICY_AUDIT_EVENTS_DATA)); /* Set the DNS Domain Name attribute */ LsapSetObjectAttribute(PolicyObject, @@ -984,7 +980,7 @@ NULL); if (!NT_SUCCESS(Status)) { - ERR("NtCreateKey failed for '%S' with status 0x%lx\n", + ERR("NtCreateKey failed for '%S' with status 0x%lx\n", AttributeName, Status); return Status; } @@ -998,7 +994,7 @@ if (!NT_SUCCESS(Status)) { - ERR("RtlpNtSetValueKey failed for '%S' with status 0x%lx\n", + ERR("RtlpNtSetValueKey failed for '%S' with status 0x%lx\n", AttributeName, Status); } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Tue Jan 14 20:24:43 2014 @@ -65,12 +65,12 @@ #define LSAP_DB_SIGNATURE 0x12345678 - +#define POLICY_AUDIT_EVENT_TYPE_COUNT (AuditCategoryAccountLogon - AuditCategorySystem + 1) typedef struct _LSAP_POLICY_AUDIT_EVENTS_DATA { BOOLEAN AuditingMode; + DWORD AuditEvents[POLICY_AUDIT_EVENT_TYPE_COUNT]; DWORD MaximumAuditEventCount; - DWORD AuditEvents[0]; } LSAP_POLICY_AUDIT_EVENTS_DATA, *PLSAP_POLICY_AUDIT_EVENTS_DATA; typedef struct _LSAP_LOGON_CONTEXT

10 years, 11 months

← Newer
1
...
24
25
26
27
28
29
30
...
43
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 January 2014