Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[cwittich] 20853: implemented PS_DOT, PS_DASH and PS_INSIDEFRAME in IntGdiCreatePenIndirect

by cwittich＠svn.reactos.org

implemented PS_DOT, PS_DASH and PS_INSIDEFRAME in IntGdiCreatePenIndirect (speeds up Thunderbird a bit (much less debug output) Modified: trunk/reactos/subsys/win32k/objects/pen.c _____ Modified: trunk/reactos/subsys/win32k/objects/pen.c --- trunk/reactos/subsys/win32k/objects/pen.c 2006-01-14 15:49:24 UTC (rev 20852) +++ trunk/reactos/subsys/win32k/objects/pen.c 2006-01-14 16:08:57 UTC (rev 20853) @@ -33,6 +33,8 @@ HPEN hPen; PGDIBRUSHOBJ PenObject; static const WORD wPatternAlternate[] = {0x5555}; + static const WORD wPatternDash[] = {0x0F0F}; + static const WORD wPatternDot[] = {0x3333}; if (LogPen->lopnStyle > PS_INSIDEFRAME) return 0; @@ -66,6 +68,21 @@ PenObject->hbmPattern = NtGdiCreateBitmap(8, 1, 1, 1, (LPBYTE)wPatternAlternate); break; + case PS_DOT: + PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; + PenObject->hbmPattern = NtGdiCreateBitmap(8, 1, 1, 1, (LPBYTE)wPatternDot); + break; + + case PS_DASH: + PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; + PenObject->hbmPattern = NtGdiCreateBitmap(8, 1, 1, 1, (LPBYTE)wPatternDash); + break; + + case PS_INSIDEFRAME: + /* FIXME: does it need some additional work? */ + PenObject->flAttrs |= GDIBRUSH_IS_SOLID; + break; + default: DPRINT1("FIXME: IntGdiCreatePenIndirect is UNIMPLEMENTED\n"); }

18 years, 8 months

[mflyer] 20852: Logos for press, developers and fans. Sorry for the big Illustrator file, but we agreed it should be in SVN.

by mflyer＠svn.reactos.org

Logos for press, developers and fans. Sorry for the big Illustrator file, but we agreed it should be in SVN. Added: trunk/press-media/art/ Added: trunk/press-media/art/logo_alpha.png Added: trunk/press-media/art/logo_vector.ai Added: trunk/press-media/art/logo_vector.svgz Added: trunk/press-media/art/readme.txt _____ Added: trunk/press-media/art/logo_alpha.png (Binary files differ) Property changes on: trunk/press-media/art/logo_alpha.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/press-media/art/logo_vector.ai --- trunk/press-media/art/logo_vector.ai 2006-01-14 14:52:50 UTC (rev 20851) +++ trunk/press-media/art/logo_vector.ai 2006-01-14 15:49:24 UTC (rev 20852) @@ -0,0 +1,38774 @@ +%PDF-1.4%ÔÒ¤Ë +1 0 obj<< /Type /Catalog /Pages 2 0 R /Metadata 9770 0 R >> endobj2 0 obj<< /Type /Pages /Kids [ 5 0 R ] /Count 1 >> endobj3 0 obj<< /ModDate (D:20050813202145+02'00')/CreationDate (D:20050813191649+02'00')/Producer (Adobe PDF library 5.00)/Creator (Adobe Illustrator 10.0)>> endobj5 0 obj<< /Type /Page /MediaBox [ 0 0 612 792 ] /Parent 2 0 R /PieceInfo << /Illustrator 7766 1 R >> /LastModified (D:20050813202117+02'00')/ArtBox [ -966 -508 1578 1300 ] /Group 9765 0 R /TrimBox [ 0 0 612 792 ] /Thumb 9766 0 R /Contents 9768 0 R /Resources << /XObject << /Fm0 9681 0 R /Fm1 9703 0 R /Fm2 9720 0 R /Fm3 9737 0 R /Fm4 9754 0 R >> /ExtGState << /GS0 9696 0 R /GS1 9713 0 R /GS2 9730 0 R /GS3 9747 0 R /GS4 9764 0 R >> >> >> endobj7 1 obj<< /Length 1154 >> stream +%!PS-Adobe-3.0 +%%Creator: Adobe Illustrator(R) 10.0 +%%AI8_CreatorVersion: 10.0 +%%For: (Adobe) () +%%Title: (F:\\reactos\\irritator imports\\logotest.ai) +%%CreationDate: 8/13/2005 8:21 PM +%%BoundingBox: -945 -509 1608 1300 +%%HiResBoundingBox: -945 -509 1608 1300 +%%DocumentProcessColors: Cyan Magenta Yellow Black +%AI5_FileFormat 6.0 +%AI3_ColorUsage: Color +%AI7_ImageSettings: 0 +%%RGBProcessColor: 0 0 0 ([Registration]) +%%AI6_ColorSeparationSet: 1 1 (AI6 Default Color Separation Set) +%%+ Options: 1 16 0 1 0 1 0 0 0 0 1 1 1 18 0 0 0 0 0 0 0 0 -1 -1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 1 2 3 4 +%%+ PPD: 1 21 0 0 60 45 2 2 1 0 0 1 0 0 0 0 0 0 0 0 0 0 () +%AI3_Cropmarks: -966 -508 1578 1300 +%AI3_TemplateBox: 306.5 395.5 306.5 395.5 +%AI3_TileBox: 30 33 582 761 +%AI3_DocumentPreview: None +%AI5_ArtSize: 612 792 +%AI5_RulerUnits: 2 +%AI9_ColorModel: 1 +%AI5_ArtFlags: 1 0 0 1 0 0 1 0 0 +%AI5_TargetResolution: 800 +%AI5_NumLayers: 5 +%AI9_OpenToView: -794 1352 0.6667 1578 1096 18 0 1 36 70 0 0 1 1 1 0 +%AI5_OpenViewLayers: 77777 +%%PageOrigin:30 33 +%AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 +%AI9_Flatten: 1 +%%EndComments +endstreamendobj8 1 obj<< /Length 8568 >> stream +%%BoundingBox: -945 -509 1608 1300 +%%HiResBoundingBox: -945 -509 1608 1300 +%AI7_Thumbnail: 128 92 8 +%%BeginData: 8020 Hex Bytes +%0000330000660000990000CC0033000033330033660033990033CC0033FF +%0066000066330066660066990066CC0066FF009900009933009966009999 +%0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 +%00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 +%3333663333993333CC3333FF3366003366333366663366993366CC3366FF +%3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 +%33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 +%6600666600996600CC6600FF6633006633336633666633996633CC6633FF +%6666006666336666666666996666CC6666FF669900669933669966669999 +%6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 +%66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF +%9933009933339933669933999933CC9933FF996600996633996666996699 +%9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 +%99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF +%CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 +%CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 +%CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF +%CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC +%FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 +%FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 +%FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 +%000011111111220000002200000022222222440000004400000044444444 +%550000005500000055555555770000007700000077777777880000008800 +%000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB +%DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF +%00FF0000FFFFFF0000FF00FFFFFF00FFFFFF +%524C45FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF +%27FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD +%2BFFA8A87DA87DA8A8FD1BFFA8A87DA87DA8A8FD2BFF27FD29FFA87DA8A8 +%FD05FFA87D7DA8A8FD12FFA87D7D7DA8A8FD04FFA87D7DA8FD28FF52FD28 +%FFA8A8FD0CFFA87DA8FD0EFF7DA8A8FD0CFFA8A8FD27FF52FD27FFA8A8FF +%FFFFA8FFA8FD09FFA8A87DFD09FFA87D7DFD0BFFA8FFA8FFFFA8A8FD26FF +%52FD26FFA87DFFA8FFA8FFA8A87DA87DFD09FF7DA8A8FD05FF7DA8FD08FF +%A8A87DA8A8FFA8FFA8FFA87DA8FD25FF52FD24FFA87D52FD0BFF7D7D7DFD +%07FFA87D7DFFA87DA8FD07FFA87D7DA8FD0AFFA87D7DFD24FF52FD24FFA8 +%A8A8FD0EFF7DA8A8FD10FFA87DA8FD0EFF7DA8A8FD23FF52FD23FFA8A8FF +%7DFD11FFA8A87D7D5353282E282E538484FFA8A8A8FD10FFA8FFA8FD23FF +%52FD23FF7DFFFFA8FD10FF5953282E062E282E282E282E2E53537EA8FD11 +%FF7DFFA8A8FD22FF27FD22FFA8A8FFFF7DFD0DFFA87D2E2E282E05280528 +%0528052E282E282E2E5959A8A8FD0EFFA8FFFF7DFD22FF52FD23FFA8FFFF +%A8FD0CFF84847E7E53592E2E052E0528052E282E282E2E2F2E595984A8FD +%0DFF7DFFFFA8FD22FF52FD22FFA8A8FFFF7DFD0AFFA87EA884A87E592E2E +%282805280528052E282E282E282E2853538484AFFD0BFFA8FFFF7DFD22FF +%52FD23FFA8FFFFA8FD09FF8484AFA8AF84A859592E2E28280528052E282F +%2E2E282F2E2F2E53537E84FD0BFF7DFFFFA8FD22FF52FD22FFA8A8FFFF7D +%FD07FFA87D538484A9A8A87E7E532E272805050528052E062E282E28532E +%2E2853538484AFA8FD07FF7DA8FFFF7DFD22FF52FD23FFA8FFFFFFA8FD06 +%FF7D537E84A984A9848459592E53282E052E282E282E2E2F2E59597E5359 +%2E535384A8AFAFFD06FFA8FFFFFFA8FD22FF52FD23FFA8FFFFFFA8FD05FF +%7D2E59537E7E84848459592F2E282E0528052E282E282E2E53537E7D5953 +%532E5353A8A8A9AFFD05FF7DFFFFFF7DFD22FF52FD23FF7DFFFFFF7DFD04 +%FFA82E532E59597E598459592E592E2E052E2828052E2E532E59597D5984 +%7D7D53592F5959A8A9AFFD04FFA8FD04FFA8FD22FF27FD23FF7DA8FFFFFF +%7DFFFFA8282F2E2F2E53535953592E2E282E052805280528052E2E59597E +%597E597E59592E532F5959A9A8A8FFFFFF7DFFFFFFA8A8FD22FF52FD23FF +%A8A8FFFFFFA8FFFF53592E2F2E532E532E532E2E282E282E052E282E052E +%282E2E597DA884A97E7E537D597E598484AFA8FFFFFFA8FFFFFF7DFD23FF +%52FD24FF7DFFFFFFA8A8A8532E2F282E282E282E282E282E052E05280528 +%0528052E282E2859598484A87D59537E597E598484A9A8FF7DFD04FF7DFD +%23FF52FD24FFA8A8FFFFFF7DAF7D592E2F2E2E282F2E2E282E2E2E282E28 +%2E282E282E282E282E2E597D8484A87D8484A984847DA8A9FFA8A8FFFFFF +%A8A8FD23FF52FD24FFA87DFFFFFF7D52A8532E282E282E282E282E282E28 +%2E282E282E272E282E052E285959847EA87E847EA884847D7E7EFFA97DA8 +%FFFFFF7DFD24FF52FD25FF7DFFFFFF5953A8842E532E532E595259525953 +%59525952532E532E532E2F2E5359A8A8AFA8FFA8A9A8AF84847EA9FFA87D +%FFFFFFA8A8FD24FF52FD26FF7DFFFF59537DA8592E532E532E5952595259 +%5359525952532E532E2E28532E7D7DA9A8AFA8A984A884A9848484FF5284 +%A8FFFF7DFD25FF52FD26FFA8FFFF595959A8847D52595359537D597D597D +%597D537D535952592E532E597D8484AFA8AF84AFA8A984A9A8FF7DA87EA8 +%FFA8A8FD25FF27FD26FFA87DA8A8597D52FFA859537D597D59FD047D7E7D +%7D597D535952592E532E5959847E8484A884AFA8A9A8FFA87D848484FF7D +%FD26FF52FD27FF7DA8A884597E7DFF7D7E7D847D847EA87DA87EA87DA87D +%7E597D597D537D597E7E8484A9A8FFA9FFA9FFFF7DA8AF84FF7DFD27FF52 +%FD28FF52FF847D597D84A87DA87EA87DA87EA87EA884A87DA87D7E7D7E59 +%7D597E597E5AA884AFA8FFA8FFFFA8A8A984A9A87DFD27FF52FD28FF7D7D +%FF7E7E7D7DA8A884FD0BA87EA87E847D847D847EFD0484AFAFFFA8FFFFA8 +%7DFFA9AFA87D7DFD27FF52FD26FFA8A953537DA97E7E7D7DA8AFFD05A8A9 +%FD06A87EA87D847D847E847EA9A8AFA8FFA8FFA8FF52FFA8FFA87D52A87D +%FD26FF52FD26FFA8A859597DFFAF84A884A8FFFFA8FFA8FFA9FFA8FFA8FF +%A8AFA8A8A8A9A8A8A8AFA9FFA9FD05FF7DFD04FFA9527EA8FF7DFD25FF52 +%FD25FFA8A8FF2E59597DA8A984AF7DA8A8FFA8FFA8FFA8FFA8FFA8AFA8AF +%A8A8A8AFA8AFA8FFA8FFA8FFFFFF7DA8A8FFA8FF527D53A8FFA8A8FD24FF +%52FD25FF7DFFA85959847DA8FFFFA8FF7DFFAFFFFFFFAFFFFFFFA8FFAFFF +%A8FFA8FFA8FFA9FFA8FD05FFA8A8A8FFFFFF7D84597DA8FFFF7DFD24FF27 +%FD24FF7DFFFFFF2E5959A852A8AFFFA8FF52A8A8FFA9FFA8FFA9FFA8FFA8 +%FFA8AFA8A9A8AFA8AFA8FFA8FF7DA8A8FFA8FF7D59535959A8FFFFA8A8FD +%23FF52FD23FFA8A8FFFFFF59597E84AF7DFD05FF7DFD0BFFA9FFA8FFA8FF +%A8AFA8FFAFFFA87DFFFFAFFFA87D597D5984A8FFFFFF7DFD23FF52FD23FF +%7DFD04FF5959598484A959FFA8FFFFFF7DFFFFFFAFFFFFFFA8FFA9FFA8FF +%A8A8A8A9A8A8A8FFA87DA8AFA8FFA87D7D59537D7DA8FD04FF7DFD22FF52 +%FD23FFA8FFFFFFA884597E7EA8A8AF7DFD05FF52FD0BFFA8FFA8A9A8A9A8 +%FFA87D84A884AFA87D7D7E59597D84A8FD04FFA8FD22FF52FD22FF7DFD04 +%FFA8A85959847EA9A8A87DFFA8FFFFA852FFFFFFA8FFFFFFA8FFA8FFA8AF +%A8A8A8FFA8597D7E7DA8A85253595259537D7DFF7DFFFFFFA8A8FD21FF52 +%FD21FFA8A8FFFFFFA8A8FF597E7EA8A8FFFFA8A8FD05FF7DFD09FFA9FFA8 +%AFA8FFA87D7D7E7EA9A87D597D537D597D7DFFFFA8A8FFFFFF7DFD21FF52 +%FD21FF7DA8FFFFFF7DFFAF7E59847EA9A8FFFFA87DFD05FF7DFD05FFA8FF +%A8FFA8AFA8FFA87D7D7D53A8A87D59595359527D597DA8FFFF7DFFFFFFA8 +%7DFD20FF52FD21FF7DFFFFFFA8FFFFFFA87E7DA8A8FFA9FFFFA8A8FD05FF +%7DFD05FFA9FFA8AFA8FF847D7D7E597EA87D7D7D53595359597E7EFFFFFF +%7DFD04FFA8FD20FF27FD20FF7DA8FFFFFF7DFFFFA8FF7D7E7DA8A8FFA8FF +%FFA87DFFFFFFA8FF7DA8A8FFA9FFA8FFA8FF7D7D7D7E7DA8A8522E595359 +%5259537D53FD05FF7DFFFFFF7DFD20FF52FD20FFA8FD04FFA8FD04FFA87D +%A8A8AFA9FD04FFA8A8FD05FF7DA8FD04FFA9FF7DA8848484AFA97D535953 +%59537D597D59A8FD05FFA8FD04FFA8FD1FFF52FD20FF7DFFFFFF7DFD05FF +%A87E7DA884AFA8FFFFFFA8A87DFD05FF7DA8FFFFA8FFA8A87EA87EAFA853 +%59592E595359527D5959A8FD05FFA8A8FFFFFF7DFD1FFF52FD20FFA8FFFF +%FFA8FD06FFA8847EA8A8FFA9FD04FFA87DFD05FFA87DFFFFA8AF84A87EA9 +%A87D597E5359597D597D597D84FD07FF7DFFFFFF7DFD1FFF52FD1FFFA8A8 +%FFFFA8A8FD05FFA8A87D7E7DA8A8AFA8FFA8FFA8A853FFA8FFA8FFA87DA8 +%FFA8A87E847D52597D53595359537D53597DFD08FF7DA8FFFF7DFD1FFF52 +%FD1FFFA8FFFFFF7DFD07FFA8AF7EA884A9A8FFAFFFAFFFFFFF7DFFFFFFA8 +%FFAF7D7DFFA9A984847E847D7E597D537D597D7DFD09FFA8A8FFFF7DFD1F +%FF52FD1FFFA8A8FFFFA8FD06FFA8FFA8A87D847EA884AFA8FFA8FFA8A87D +%A8A9FFA8A9A8A852FFA8A87D7E7D7D53595259527D59FD0BFF7DFFFFA8FD +%1FFF52FD1FFFA8FFFFFF7DFD09FFA8A87D8484A8A8AFA9FFA8FFA8AF7DA8 +%FFFFFD04A87DA8AFAF7D84597D5359537D59FD0CFFA8FFFF7DFD1FFF27FD +%1FFFA8A8FFFFA8FD08FFA8FFA8A87D847DA884FFA8FFA8A884A87D7DA8FF +%A8A87D7D53527DAFA8A87D5952597DFD0DFF7DFFFF7DFD1FFF52FD20FFA8 +%FFFF7DFD0BFFA8FFA8A8A8FFFFFFA87D7EA8A8A9847D7DFFA8A87D847D59 +%53AFA9FF7D7D7EFD0EFFA8FFFF7DFD1FFF52FD20FF7DFFFFA8FD0CFFA8FF +%A8FFA8A8597D84A87EA87E847D7D52A8A87E5959527D527DA8A8A8FD0FFF +%A8FFA8A8FD1FFF52FD21FF7DFFA8FD0FFFA87D7DA87EA884A8A9AF597D59 +%7D527DA8A8597D52597D7D7DFD12FF7DFD20FF52FD21FFA87DA8FD0CFFA8 +%A852A8A8FFA8FFA8FFA87D527D53592E5228527DFD04A8FFFFFF7D7D7DFD +%0DFF7D7DA8FD20FF52FD23FF52FD09FFA8A87DA8A8FD07FFA87D7DA87D84 +%7D7E597E7E847DFD09FF7DA8A8FD09FF7D7DA8FD21FF52FD24FF527D7DA8 +%7DA87DA87DA8A8FD08FFA87DA8FD0CFF7D7DA8FD08FFA87DA87DA87DA8FD +%047DFD23FF52FD24FFA8A8FD0FFF7D7DA8FD10FFA87DA8FD0FFF7DA8FD23 +%FF27FD25FFA87DFD0BFF7D7D7DFD15FFA87D7DA8A8FD09FFA87DA8FD24FF +%52FD27FF7DA87DFFA8FFA8A87DA8A8FD1BFFA8A87DA87DFFA8FFA8A87DA8 +%FD26FF52FD2AFFFD04A8FD24FFFD04A8FD29FF52FD7FFF52FD7FFF52FD7F +%FF52FD7FFF52FD7FFF27FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7FFF52 +%FD7FFF52FD7FFF52FD7FFF27FD7FFF52FD7FFF52FD7FFF52FD7FFF52FD7F +%FFFF +%%EndData +endstreamendobj9 1 obj<< /Filter [ /FlateDecode ] /Length 10 1 R >> stream +HëýW]o?}7Ó 0}ÉáuvåfCú(@råiÇ&1£ý?ª0ÈxÛ ++Kå$w?²§=¸Æ#ì,?ø}¤£HæþâC×s¯Õ¢/~w§±??«?1\?Îuu~÷ÔE\?Ýj}Y±ÚÛÝb±©?«ÚÈ? ÙWUS?«Ú. Â¢)w?0¼7¾i?rw-ÐË/¨±Wi?WtÛË|?p2]~?îº¥lWø¤fþÙ §|K#T¾¹çizïSïi¦j;lÂ»g¾W??`nÂ?ÒÝwì³NÈÁ«?KÐTW´Þû?z\Ì?ùwa§f?Û?)]]Þ?Uì®? ¬æ5¤Þ¤¾Ùa¾57v½/Å¸?r{Á^}6ø©Z¼Íø?*?2[V´fw©2½?6,½f½?ÿ}¨ ¤°À ·&?V}??Vå9oÕ?³²Oa

18 years, 8 months

[weiden] 20851: fixed SeSetWorldSecurityDescriptor() so it creates a security descriptor that is at least valid

by weiden＠svn.reactos.org

fixed SeSetWorldSecurityDescriptor() so it creates a security descriptor that is at least valid Modified: trunk/reactos/ntoskrnl/se/sd.c _____ Modified: trunk/reactos/ntoskrnl/se/sd.c --- trunk/reactos/ntoskrnl/se/sd.c 2006-01-14 13:37:08 UTC (rev 20850) +++ trunk/reactos/ntoskrnl/se/sd.c 2006-01-14 14:52:50 UTC (rev 20851) @@ -125,6 +125,7 @@ ULONG SidSize; ULONG SdSize; NTSTATUS Status; + PISECURITY_DESCRIPTOR_RELATIVE SdRel = (PISECURITY_DESCRIPTOR_RELATIVE)SecurityDescriptor; DPRINT("SeSetWorldSecurityDescriptor() called\n"); @@ -133,8 +134,17 @@ return STATUS_ACCESS_DENIED; } + /* calculate the minimum size of the buffer */ SidSize = RtlLengthSid(SeWorldSid); - SdSize = sizeof(SECURITY_DESCRIPTOR) + (2 * SidSize); + SdSize = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + if (SecurityInformation & OWNER_SECURITY_INFORMATION) + SdSize += SidSize; + if (SecurityInformation & GROUP_SECURITY_INFORMATION) + SdSize += SidSize; + if (SecurityInformation & DACL_SECURITY_INFORMATION) + { + SdSize += sizeof(ACL) + sizeof(ACE) + SidSize; + } if (*BufferLength < SdSize) { @@ -144,42 +154,57 @@ *BufferLength = SdSize; - Status = RtlCreateSecurityDescriptor(SecurityDescriptor, - SECURITY_DESCRIPTOR_REVISION); + Status = RtlCreateSecurityDescriptorRelative(SdRel, + SECURITY_DESCRIPTOR_REVISION); if (!NT_SUCCESS(Status)) { return Status; } - SecurityDescriptor->Control |= SE_SELF_RELATIVE; - Current = (ULONG_PTR)SecurityDescriptor + sizeof(SECURITY_DESCRIPTOR); + Current = (ULONG_PTR)(SdRel + 1); if (SecurityInformation & OWNER_SECURITY_INFORMATION) { RtlCopyMemory((PVOID)Current, - SeWorldSid, - SidSize); - SecurityDescriptor->Owner = (PSID)((ULONG_PTR)Current - (ULONG_PTR)SecurityDescriptor); + SeWorldSid, + SidSize); + SdRel->Owner = (DWORD)((ULONG_PTR)Current - (ULONG_PTR)SdRel); Current += SidSize; } if (SecurityInformation & GROUP_SECURITY_INFORMATION) { RtlCopyMemory((PVOID)Current, - SeWorldSid, - SidSize); - SecurityDescriptor->Group = (PSID)((ULONG_PTR)Current - (ULONG_PTR)SecurityDescriptor); + SeWorldSid, + SidSize); + SdRel->Group = (DWORD)((ULONG_PTR)Current - (ULONG_PTR)SdRel); Current += SidSize; } if (SecurityInformation & DACL_SECURITY_INFORMATION) { - SecurityDescriptor->Control |= SE_DACL_PRESENT; + PACL Dacl = (PACL)Current; + SdRel->Control |= SE_DACL_PRESENT; + + Status = RtlCreateAcl(Dacl, + sizeof(ACL) + sizeof(ACE) + SidSize, + ACL_REVISION); + if (!NT_SUCCESS(Status)) + return Status; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + SeWorldSid); + if (!NT_SUCCESS(Status)) + return Status; + + SdRel->Dacl = (DWORD)((ULONG_PTR)Current - (ULONG_PTR)SdRel); } if (SecurityInformation & SACL_SECURITY_INFORMATION) { - SecurityDescriptor->Control |= SE_SACL_PRESENT; + /* FIXME - SdRel->Control |= SE_SACL_PRESENT; */ } return STATUS_SUCCESS;

18 years, 8 months

[weiden] 20850: implemented GetFinalPathNameByHandleA() and added stub for GetFinalPathNameByHandleW()

by weiden＠svn.reactos.org

implemented GetFinalPathNameByHandleA() and added stub for GetFinalPathNameByHandleW() Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/kernel32.def Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2006-01-14 12:42:04 UTC (rev 20849) +++ trunk/reactos/lib/kernel32/file/file.c 2006-01-14 13:37:08 UTC (rev 20850) @@ -1600,4 +1600,87 @@ return TRUE; } + +/* + * @implemented + */ +DWORD +WINAPI +GetFinalPathNameByHandleA(IN HANDLE hFile, + OUT LPSTR lpszFilePath, + IN DWORD cchFilePath, + IN DWORD dwFlags) +{ + WCHAR FilePathW[MAX_PATH]; + UNICODE_STRING FilePathU; + DWORD PrevLastError; + DWORD Ret = 0; + + if (cchFilePath != 0 && + cchFilePath > sizeof(FilePathW) / sizeof(FilePathW[0])) + { + FilePathU.Length = 0; + FilePathU.MaximumLength = cchFilePath * sizeof(WCHAR); + FilePathU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + FilePathU.MaximumLength); + if (FilePathU.Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + } + else + { + FilePathU.Length = 0; + FilePathU.MaximumLength = sizeof(FilePathW); + FilePathU.Buffer = FilePathW; + } + + /* save the last error code */ + PrevLastError = GetLastError(); + SetLastError(ERROR_SUCCESS); + + /* call the unicode version that does all the work */ + Ret = GetFinalPathNameByHandleW(hFile, + FilePathU.Buffer, + cchFilePath, + dwFlags); + + if (GetLastError() == ERROR_SUCCESS) + { + /* no error, restore the last error code and convert the string */ + SetLastError(PrevLastError); + + Ret = FilenameU2A_FitOrFail(lpszFilePath, + cchFilePath, + &FilePathU); + } + + /* free allocated memory if necessary */ + if (FilePathU.Buffer != FilePathW) + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FilePathU.Buffer); + } + + return Ret; +} + + +/* + * @unimplemented + */ +DWORD +WINAPI +GetFinalPathNameByHandleW(IN HANDLE hFile, + OUT LPWSTR lpszFilePath, + IN DWORD cchFilePath, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return 0; +} + /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2006-01-14 12:42:04 UTC (rev 20849) +++ trunk/reactos/lib/kernel32/kernel32.def 2006-01-14 13:37:08 UTC (rev 20850) @@ -387,6 +387,8 @@ GetFileSizeEx@8 GetFileTime@16 GetFileType@4 +GetFinalPathNameByHandleA@16 +GetFinalPathNameByHandleW@16 GetFirmwareEnvironmentVariableA@16 GetFirmwareEnvironmentVariableW@16 GetFullPathNameA@16 _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2006-01-14 12:42:04 UTC (rev 20849) +++ trunk/reactos/w32api/include/winbase.h 2006-01-14 13:37:08 UTC (rev 20850) @@ -1368,6 +1368,8 @@ DWORD WINAPI GetFileAttributesA(LPCSTR); #if (_WIN32_WINNT >= 0x0600) BOOL WINAPI GetFileAttributesByHandle(HANDLE,LPDWORD,DWORD); +DWORD WINAPI GetFinalPathNameByHandleA(HANDLE,LPSTR,DWORD,DWORD); +DWORD WINAPI GetFinalPathNameByHandleW(HANDLE,LPWSTR,DWORD,DWORD); #endif DWORD WINAPI GetFileAttributesW(LPCWSTR); BOOL WINAPI GetFileAttributesExA(LPCSTR,GET_FILEEX_INFO_LEVELS,PVOID); @@ -2042,8 +2044,11 @@ #define GetEnvironmentStrings GetEnvironmentStringsW #define GetEnvironmentVariable GetEnvironmentVariableW #define GetFileAttributes GetFileAttributesW +#define GetFileAttributesEx GetFileAttributesExW #define GetFileSecurity GetFileSecurityW -#define GetFileAttributesEx GetFileAttributesExW +#if (_WIN32_WINNT >= 0x0600) +#define GetFinalPathNameByHandle GetFinalPathNameByHandleW +#endif #define GetFullPathName GetFullPathNameW #define GetLogicalDriveStrings GetLogicalDriveStringsW #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) @@ -2241,8 +2246,11 @@ #define GetDriveType GetDriveTypeA #define GetEnvironmentVariable GetEnvironmentVariableA #define GetFileAttributes GetFileAttributesA +#define GetFileAttributesEx GetFileAttributesExA #define GetFileSecurity GetFileSecurityA -#define GetFileAttributesEx GetFileAttributesExA +#if (_WIN32_WINNT >= 0x0600) +#define GetFinalPathNameByHandle GetFinalPathNameByHandleA +#endif #define GetFullPathName GetFullPathNameA #define GetLogicalDriveStrings GetLogicalDriveStringsA #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)

18 years, 8 months

[cwittich] 20849: fixed LoadCursorIconImage (Thunderbird is now working)

by cwittich＠svn.reactos.org

fixed LoadCursorIconImage (Thunderbird is now working) Modified: trunk/reactos/lib/user32/windows/bitmap.c _____ Modified: trunk/reactos/lib/user32/windows/bitmap.c --- trunk/reactos/lib/user32/windows/bitmap.c 2006-01-14 12:18:10 UTC (rev 20848) +++ trunk/reactos/lib/user32/windows/bitmap.c 2006-01-14 12:42:04 UTC (rev 20849) @@ -30,6 +30,29 @@ #include <user32.h> +#include "pshpack1.h" + +typedef struct { + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; + WORD xHotspot; + WORD yHotspot; + DWORD dwDIBSize; + DWORD dwDIBOffset; +} CURSORICONFILEDIRENTRY; + +typedef struct +{ + WORD idReserved; + WORD idType; + WORD idCount; + CURSORICONFILEDIRENTRY idEntries[1]; +} CURSORICONFILEDIR; + +#include "poppack.h" + /*forward declerations... actualy in user32\windows\icon.c but usful here****/ HICON ICON_CreateCursorFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot); HICON ICON_CreateIconFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot); @@ -71,6 +94,87 @@ } +/* + * The following macro functions account for the irregularities of + * accessing cursor and icon resources in files and resource entries. + */ +typedef BOOL (*fnGetCIEntry)( LPVOID dir, int n, + int *width, int *height, int *bits ); + +/********************************************************************** + * CURSORICON_FindBestCursor2 + * + * Find the cursor closest to the requested size. + * FIXME: parameter 'color' ignored and entries with more than 1 bpp + * ignored too + */ +static int CURSORICON_FindBestCursor2( LPVOID dir, fnGetCIEntry get_entry, + int width, int height, int color ) +{ + int i, maxwidth, maxheight, cx, cy, bits, bestEntry = -1; + + /* Double height to account for AND and XOR masks */ + + height *= 2; + + /* First find the largest one smaller than or equal to the requested size*/ + + maxwidth = maxheight = 0; + for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) + { + if ((cx <= width) && (cy <= height) && + (cx > maxwidth) && (cy > maxheight) && + (bits == 1)) + { + bestEntry = i; + maxwidth = cx; + maxheight = cy; + } + } + if (bestEntry != -1) return bestEntry; + + /* Now find the smallest one larger than the requested size */ + + maxwidth = maxheight = 255; + for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) + { + if (((cx < maxwidth) && (cy < maxheight) && (bits == 1)) || + (bestEntry==-1)) + { + bestEntry = i; + maxwidth = cx; + maxheight = cy; + } + } + + return bestEntry; +} + +static BOOL CURSORICON_GetFileEntry( LPVOID dir, int n, + int *width, int *height, int *bits ) +{ + CURSORICONFILEDIR *filedir = dir; + CURSORICONFILEDIRENTRY *entry; + + if ( filedir->idCount <= n ) + return FALSE; + entry = &filedir->idEntries[n]; + *width = entry->bWidth; + *height = entry->bHeight; + *bits = entry->bColorCount; + return TRUE; +} + +static CURSORICONFILEDIRENTRY *CURSORICON_FindBestCursorFile( CURSORICONFILEDIR *dir, + int width, int height, int color ) +{ + int n = CURSORICON_FindBestCursor2( dir, CURSORICON_GetFileEntry, + width, height, color ); + if ( n < 0 ) + return NULL; + return &dir->idEntries[n]; +} + static HANDLE LoadCursorIconImage( HINSTANCE hinst, @@ -85,19 +189,20 @@ HANDLE hfRes; HANDLE hFile; HANDLE hSection; - CURSORICONDIR *IconDIR; + CURSORICONFILEDIR *IconDIR; HDC hScreenDc; HICON hIcon; ULONG HeaderSize; ULONG ColorCount; ULONG ColorBits; PVOID Data; - CURSORICONDIRENTRY* dirEntry; + CURSORICONFILEDIRENTRY* dirEntry; ICONIMAGE* SafeIconImage = NULL; GRPCURSORICONDIR* IconResDir; INT id; ICONIMAGE *ResIcon; BOOL Icon = (uType == IMAGE_ICON); + DWORD filesize = 0; if (!(fuLoad & LR_LOADFROMFILE)) { @@ -158,14 +263,6 @@ return hIcon; } - /* - * FIXME: This code is incorrect and is likely to crash in many cases. - * In the file the cursor/icon directory records are stored like - * CURSORICONFILEDIR, but we treat them like CURSORICONDIR. In Wine - * this is solved by creating a fake cursor/icon directory in memory - * and passing that to CURSORICON_FindBestIcon. - */ - if (fuLoad & LR_SHARED) { DbgPrint("FIXME: need LR_SHARED support for loading icon images from files\n"); @@ -177,6 +274,7 @@ return NULL; hSection = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); + filesize = GetFileSize( hFile, NULL ); CloseHandle(hFile); if (hSection == NULL) return NULL; @@ -219,7 +317,7 @@ } /* Pick the best size. */ - dirEntry = (CURSORICONDIRENTRY *)CURSORICON_FindBestIcon(IconDIR, width, height, ColorBits); + dirEntry = CURSORICON_FindBestCursorFile( IconDIR, width, height, ColorBits ); if (!dirEntry) { DeleteDC(hScreenDc); @@ -227,7 +325,20 @@ return NULL; } - SafeIconImage = RtlAllocateHeap(GetProcessHeap(), 0, dirEntry->dwBytesInRes); + if ( dirEntry->dwDIBOffset > filesize ) + { + DeleteDC(hScreenDc); + UnmapViewOfFile(IconDIR); + return NULL; + } + + if ( dirEntry->dwDIBOffset + dirEntry->dwDIBSize > filesize ){ + DeleteDC(hScreenDc); + UnmapViewOfFile(IconDIR); + return NULL; + } + + SafeIconImage = RtlAllocateHeap(GetProcessHeap(), 0, dirEntry->dwDIBSize); if (SafeIconImage == NULL) { DeleteDC(hScreenDc); @@ -235,7 +346,7 @@ return NULL; } - memcpy(SafeIconImage, ((PBYTE)IconDIR) + dirEntry->dwImageOffset, dirEntry->dwBytesInRes); + memcpy(SafeIconImage, ((PBYTE)IconDIR) + dirEntry->dwDIBOffset, dirEntry->dwDIBSize); UnmapViewOfFile(IconDIR); /* At this point we have a copy of the icon image to play with. */

18 years, 8 months

[weiden] 20848: add cacls.exe to the bootcd

by weiden＠svn.reactos.org

add cacls.exe to the bootcd Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2006-01-14 09:04:42 UTC (rev 20847) +++ trunk/reactos/bootdata/packages/reactos.dff 2006-01-14 12:18:10 UTC (rev 20848) @@ -183,6 +183,7 @@ subsys\smss\smss.exe 1 subsys\win32k\win32k.sys 1 subsys\system\autochk\autochk.exe 1 +subsys\system\cacls\cacls.exe 1 subsys\system\calc\calc.exe 1 subsys\system\cmd\cmd.exe 1 subsys\system\devmgr\devmgrapp.exe 1

18 years, 8 months

[mf] 20847: add the new icons to the project file

by mf＠svn.reactos.org

add the new icons to the project file Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/explorer.dsp Modified: trunk/reactos/subsys/system/explorer/explorer.vcproj Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Modified: trunk/reactos/subsys/system/explorer/globals.h Modified: trunk/reactos/subsys/system/explorer/resource.h Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-14 08:49:10 UTC (rev 20846) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-14 09:04:42 UTC (rev 20847) @@ -478,9 +478,9 @@ return _icons[ICID_NONE]; } -const Icon& IconCache::extract(LPCTSTR path, int idx, ICONCACHE_FLAGS flags) +const Icon& IconCache::extract(LPCTSTR path, int icon_idx, ICONCACHE_FLAGS flags) { - IdxCacheKey key(path, make_pair(idx, (flags|ICF_HICON)&~ICF_SYSCACHE)); + IdxCacheKey key(path, make_pair(icon_idx, (flags|ICF_HICON)&~ICF_SYSCACHE)); key.first.toLower(); @@ -491,7 +491,7 @@ HICON hIcon; - if ((int)ExtractIconEx(path, idx, NULL, &hIcon, 1) > 0) { + if ((int)ExtractIconEx(path, icon_idx, NULL, &hIcon, 1) > 0) { const Icon& icon = add(hIcon, IT_CACHED); _idxCache[key] = icon; @@ -505,13 +505,13 @@ } } -const Icon& IconCache::extract(IExtractIcon* pExtract, LPCTSTR path, int idx, ICONCACHE_FLAGS flags) +const Icon& IconCache::extract(IExtractIcon* pExtract, LPCTSTR path, int icon_idx, ICONCACHE_FLAGS flags) { HICON hIconLarge = 0; HICON hIcon; bool large_icons = flags & ICF_LARGE; - HRESULT hr = pExtract->Extract(path, idx, &hIconLarge, &hIcon, MAKELONG(GetSystemMetrics(SM_CXICON), ICON_SIZE_X)); + HRESULT hr = pExtract->Extract(path, icon_idx, &hIconLarge, &hIcon, MAKELONG(GetSystemMetrics(SM_CXICON), ICON_SIZE_X)); if (hr == NOERROR) { //@@ oder SUCCEEDED(hr) ? if (large_icons) { //@@ OK? _____ Modified: trunk/reactos/subsys/system/explorer/explorer.dsp --- trunk/reactos/subsys/system/explorer/explorer.dsp 2006-01-14 08:49:10 UTC (rev 20846) +++ trunk/reactos/subsys/system/explorer/explorer.dsp 2006-01-14 09:04:42 UTC (rev 20847) @@ -320,6 +320,10 @@ # End Source File # Begin Source File +SOURCE=.\res\administration.ico +# End Source File +# Begin Source File + SOURCE=.\res\appicon.ico # End Source File # Begin Source File @@ -352,6 +356,14 @@ # End Source File # Begin Source File +SOURCE=".\res\control-panel.ico" +# End Source File +# Begin Source File + +SOURCE=".\res\desktop-settings.ico" +# End Source File +# Begin Source File + SOURCE=.\res\documents.ico # End Source File # Begin Source File @@ -432,6 +444,11 @@ # End Source File # Begin Source File +SOURCE=".\explorer-uk.rc" +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + SOURCE=.\explorer.exe.manifest # End Source File # Begin Source File @@ -532,6 +549,10 @@ # End Source File # Begin Source File +SOURCE=".\res\network-conns.ico" +# End Source File +# Begin Source File + SOURCE=.\res\network.ico # End Source File # Begin Source File @@ -552,6 +573,10 @@ # End Source File # Begin Source File +SOURCE=".\res\recent-documents.ico" +# End Source File +# Begin Source File + SOURCE=.\resource.h # End Source File # Begin Source File @@ -572,6 +597,10 @@ # End Source File # Begin Source File +SOURCE=.\res\shutdown.ico +# End Source File +# Begin Source File + SOURCE=.\res\speaker.ico # End Source File # Begin Source File _____ Modified: trunk/reactos/subsys/system/explorer/explorer.vcproj --- trunk/reactos/subsys/system/explorer/explorer.vcproj 2006-01-14 08:49:10 UTC (rev 20846) +++ trunk/reactos/subsys/system/explorer/explorer.vcproj 2006-01-14 09:04:42 UTC (rev 20847) @@ -1088,6 +1088,10 @@ > </File> <File + RelativePath=".\res\administration.ico" + > + </File> + <File RelativePath="res\appicon.ico" > </File> @@ -1120,6 +1124,14 @@ > </File> <File + RelativePath=".\res\control-panel.ico" + > + </File> + <File + RelativePath=".\res\desktop-settings.ico" + > + </File> + <File RelativePath="res\documents.ico" > </File> @@ -1958,6 +1970,14 @@ > </File> <File + RelativePath=".\res\minimize.ico" + > + </File> + <File + RelativePath=".\res\network-conns.ico" + > + </File> + <File RelativePath="res\network.ico" > </File> @@ -1978,6 +1998,10 @@ > </File> <File + RelativePath=".\res\recent-documents.ico" + > + </File> + <File RelativePath="resource.h" > </File> @@ -1998,6 +2022,10 @@ > </File> <File + RelativePath=".\res\shutdown.ico" + > + </File> + <File RelativePath="res\speaker.ico" > </File> @@ -2009,6 +2037,10 @@ RelativePath="res\toolbar.bmp" > </File> + <File + RelativePath=".\res\winefile.ico" + > + </File> </Filter> <Filter Name="taskbar" _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-14 08:49:10 UTC (rev 20846) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-14 09:04:42 UTC (rev 20847) @@ -102,7 +102,7 @@ "#endif\r\n" "END\r\n" "#endif\r\n" - "#ifndef _DEBUG\r\n" + "#ifndef _DEBUG\r\n" "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE ""explorer.exe.manifest""\r\n" "#endif\r\n" "\r\n" @@ -165,13 +165,12 @@ IDI_ARROW_DOWN ICON DISCARDABLE "res/arrow_dwn.ico" IDI_NOTIFY_L ICON DISCARDABLE "res/notify_l.ico" IDI_NOTIFY_R ICON DISCARDABLE "res/notify_r.ico" -IDI_MINIMIZE ICON DISCARDABLE "res/minimize.ico" +IDI_MINIMIZE ICON DISCARDABLE "res/minimize.ico" IDI_CONTROLPAN ICON DISCARDABLE "res/control-panel.ico" IDI_DESKSETTING ICON DISCARDABLE "res/desktop-settings.ico" IDI_NETCONNS ICON DISCARDABLE "res/network-conns.ico" IDI_ADMINISTRATION ICON DISCARDABLE "res/administration.ico" IDI_RECENT ICON DISCARDABLE "res/recent-documents.ico" - #endif // Neutral resources //////////////////////////////////////////////////////////////////////// ///// _____ Modified: trunk/reactos/subsys/system/explorer/globals.h --- trunk/reactos/subsys/system/explorer/globals.h 2006-01-14 08:49:10 UTC (rev 20846) +++ trunk/reactos/subsys/system/explorer/globals.h 2006-01-14 09:04:42 UTC (rev 20847) @@ -127,8 +127,8 @@ void init(); const Icon& extract(LPCTSTR path, ICONCACHE_FLAGS flags=ICF_NORMAL); - const Icon& extract(LPCTSTR path, int idx, ICONCACHE_FLAGS flags=ICF_HICON); - const Icon& extract(IExtractIcon* pExtract, LPCTSTR path, int idx, ICONCACHE_FLAGS flags=ICF_HICON); + const Icon& extract(LPCTSTR path, int icon_idx, ICONCACHE_FLAGS flags=ICF_HICON); + const Icon& extract(IExtractIcon* pExtract, LPCTSTR path, int icon_idx, ICONCACHE_FLAGS flags=ICF_HICON); const Icon& add(HICON hIcon, ICON_TYPE type=IT_DYNAMIC); const Icon& add(int sys_idx/*, ICON_TYPE type=IT_SYSCACHE*/); _____ Modified: trunk/reactos/subsys/system/explorer/resource.h --- trunk/reactos/subsys/system/explorer/resource.h 2006-01-14 08:49:10 UTC (rev 20846) +++ trunk/reactos/subsys/system/explorer/resource.h 2006-01-14 09:04:42 UTC (rev 20847) @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by explorer-hu.rc +// Used by explorer_intres.rc // #define IDS_TITLE 1 #define MANIFEST_RESOURCE_ID 1 _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2006-01-14 08:49:10 UTC (rev 20846) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2006-01-14 09:04:42 UTC (rev 20847) @@ -293,7 +293,6 @@ int ShellBrowser::InsertSubitems(HTREEITEM hParentItem, Entry* entry, IShellFolder* pParentFolder) { - HTREEITEM hchild, hnext; CONTEXT("ShellBrowser::InsertSubitems()"); WaitCursor wait; @@ -309,8 +308,11 @@ } // remove old children items - hnext = hchild = TreeView_GetChild(_left_hwnd, hParentItem); - while((hchild=hnext) != NULL) { + HTREEITEM hchild, hnext; + + hnext = TreeView_GetChild(_left_hwnd, hParentItem); + + while((hchild=hnext) != 0) { hnext = TreeView_GetNextSibling(_left_hwnd, hchild); TreeView_DeleteItem(_left_hwnd, hchild); }

18 years, 8 months

[ion] 20846: - Fix flaw in win32k hardware message queue which used KMUTEX instead of KMUTANT, thus double-disabling Kernel APCs during the parsing of the queue, which would result in actually deliving hardware message callbacks with Kernel APCs disabled when going to user-mode. This was detected when my new user-mode callback rewrite added checks for this situation, and it originally caused a bugcheck. Since the message queue code is now fixed, the bugcheck has been re-enabled, hopefully no oth

by ion＠svn.reactos.org

- Fix flaw in win32k hardware message queue which used KMUTEX instead of KMUTANT, thus double-disabling Kernel APCs during the parsing of the queue, which would result in actually deliving hardware message callbacks with Kernel APCs disabled when going to user-mode. This was detected when my new user-mode callback rewrite added checks for this situation, and it originally caused a bugcheck. Since the message queue code is now fixed, the bugcheck has been re-enabled, hopefully no other such violations will be detected (I was able to run/install firefox for a couple of minutes and there was no APC_INDEX_MISMATCH crash). Fixes bug 1272, and thanks to Filip for doing some late-night IRC analysis with me. Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-14 04:32:37 UTC (rev 20845) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-14 08:49:10 UTC (rev 20846) @@ -87,7 +87,6 @@ AtPassive: -#if 0 /* Make sure that we are not attached and that APCs are not disabled */ movzx eax, byte ptr [ebx+KTHREAD_APC_STATE_INDEX] mov edx, [ebx+KTHREAD_COMBINED_APC_DISABLE] @@ -104,7 +103,6 @@ push 0 push APC_INDEX_MISMATCH call _KeBugCheckEx@20 -#endif ApcsEnabled: #endif _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2006-01-14 04:32:37 UTC (rev 20845) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2006-01-14 08:49:10 UTC (rev 20846) @@ -46,7 +46,7 @@ static ULONG volatile HardwareMessageQueueStamp = 0; static LIST_ENTRY HardwareMessageQueueHead; -static KMUTEX HardwareMessageQueueLock; +static KMUTANT HardwareMessageQueueLock; static KEVENT HardwareMessageEvent; @@ -60,7 +60,7 @@ KeReleaseSpinLock(&SystemMessageQueueLock, OldIrql) #define IntUnLockSystemHardwareMessageQueueLock(Wait) \ - KeReleaseMutex(&HardwareMessageQueueLock, Wait) + KeReleaseMutant(&HardwareMessageQueueLock, IO_NO_INCREMENT, FALSE, Wait) /* FUNCTIONS *****************************************************************/ @@ -122,7 +122,7 @@ InitializeListHead(&HardwareMessageQueueHead); KeInitializeEvent(&HardwareMessageEvent, NotificationEvent, 0); KeInitializeSpinLock(&SystemMessageQueueLock); - KeInitializeMutex(&HardwareMessageQueueLock, 0); + KeInitializeMutant(&HardwareMessageQueueLock, 0); ExInitializePagedLookasideList(&MessageLookasideList, NULL,

18 years, 8 months

[weiden] 20845: An initial implementation of cacls.exe. Only displaying ACLs works, editing is not implemented.

by weiden＠svn.reactos.org

An initial implementation of cacls.exe. Only displaying ACLs works, editing is not implemented. Added: trunk/reactos/subsys/system/cacls/ Added: trunk/reactos/subsys/system/cacls/En.rc Added: trunk/reactos/subsys/system/cacls/cacls.c Added: trunk/reactos/subsys/system/cacls/cacls.rc Added: trunk/reactos/subsys/system/cacls/cacls.xml Added: trunk/reactos/subsys/system/cacls/precomp.h Added: trunk/reactos/subsys/system/cacls/resource.h Modified: trunk/reactos/subsys/system/directory.xml _____ Added: trunk/reactos/subsys/system/cacls/En.rc --- trunk/reactos/subsys/system/cacls/En.rc 2006-01-14 01:00:56 UTC (rev 20844) +++ trunk/reactos/subsys/system/cacls/En.rc 2006-01-14 04:32:37 UTC (rev 20845) @@ -0,0 +1,74 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +{ + +IDS_HELP, "Displays or modifies access control lists (ACLs) of files\n\n\ +CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\ + [/P user:perm [...]] [/D user [...]]\n\ + filename Displays ACLs.\n\ + /T Changes ACLs of specified files in\n\ + the current directory and all subdirectories.\n\ + /E Edit ACL instead of replacing it.\n\ + /C Continue on access denied errors.\n\ + /G user:perm Grant specified user access rights.\n\ + Perm can be: R Read\n\ + W Write\n\ + C Change (write)\n\ + F Full control\n\ + /R user Revoke specified user's access rights (only valid with /E).\n\ + /P user:perm Replace specified user's access rights.\n\ + Perm can be: N None\n\ + R Read\n\ + W Write\n\ + C Change (write)\n\ + F Full control\n\ + /D user Deny specified user access.\n\ +Wildcards can be used to specify more that one file in a command.\n\ +You can specify more than one user in a command.\n\n\ +Abbreviations:\n\ + CI - Container Inherit.\n\ + The ACE will be inherited by directories.\n\ + OI - Object Inherit.\n\ + The ACE will be inherited by files.\n\ + IO - Inherit Only.\n\ + The ACE does not apply to the current file/directory.\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(DENY)" +IDS_SPECIAL_ACCESS, "(special access:)" +IDS_GENERIC_READ, "GENERIC_READ" +IDS_GENERIC_WRITE, "GENERIC_WRITE" +IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" +IDS_GENERIC_ALL, "GENERIC_ALL" +IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" +IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" +IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" +IDS_FILE_READ_DATA, "FILE_READ_DATA" +IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" +IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" +IDS_FILE_READ_EA, "FILE_READ_EA" +IDS_FILE_WRITE_EA, "FILE_WRITE_EA" +IDS_FILE_EXECUTE, "FILE_EXECUTE" +IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" +IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" +IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" +IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" +IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" +IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" +IDS_SYNCHRONIZE, "SYNCHRONIZE" +IDS_WRITE_OWNER, "WRITE_OWNER" +IDS_WRITE_DAC, "WRITE_DAC" +IDS_READ_CONTROL, "READ_CONTROL" +IDS_DELETE, "DELETE" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" +} Property changes on: trunk/reactos/subsys/system/cacls/En.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/cacls/cacls.c --- trunk/reactos/subsys/system/cacls/cacls.c 2006-01-14 01:00:56 UTC (rev 20844) +++ trunk/reactos/subsys/system/cacls/cacls.c 2006-01-14 04:32:37 UTC (rev 20845) @@ -0,0 +1,585 @@ +/* + * ReactOS Control ACLs Program + * Copyright (C) 2006 Thomas Weidenmueller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <precomp.h> + + +static GENERIC_MAPPING FileGenericMapping = +{ + FILE_GENERIC_READ, + FILE_GENERIC_WRITE, + FILE_GENERIC_EXECUTE, + FILE_ALL_ACCESS +}; + +static INT +LengthOfStrResource(IN HINSTANCE hInst, + IN UINT uID) +{ + HRSRC hrSrc; + HGLOBAL hRes; + LPWSTR lpName, lpStr; + + if (hInst == NULL) + { + hInst = GetModuleHandle(NULL); + } + + /* There are always blocks of 16 strings */ + lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); + + /* Find the string table block */ + if ((hrSrc = FindResourceW(hInst, + lpName, + (LPWSTR)RT_STRING)) && + (hRes = LoadResource(hInst, + hrSrc)) && + (lpStr = LockResource(hRes))) + { + UINT x; + + /* Find the string we're looking for */ + uID &= 0xF; /* position in the block, same as % 16 */ + for (x = 0; x < uID; x++) + { + lpStr += (*lpStr) + 1; + } + + /* Found the string */ + return (int)(*lpStr); + } + return -1; +} + + +static INT +AllocAndLoadString(OUT LPTSTR *lpTarget, + IN HINSTANCE hInst, + IN UINT uID) +{ + INT ln; + + ln = LengthOfStrResource(hInst, + uID); + if (ln++ > 0) + { + (*lpTarget) = (LPTSTR)HeapAlloc(GetProcessHeap(), + 0, + ln * sizeof(TCHAR)); + if ((*lpTarget) != NULL) + { + INT Ret; + if (!(Ret = LoadString(hInst, + uID, + *lpTarget, + ln))) + { + HeapFree(GetProcessHeap(), + 0, + *lpTarget); + } + return Ret; + } + } + return 0; +} + + +static VOID +PrintHelp(VOID) +{ + LPTSTR szHelp; + + if (AllocAndLoadString(&szHelp, + NULL, + IDS_HELP) != 0) + { + _tprintf(_T("%s"), + szHelp); + + HeapFree(GetProcessHeap(), + 0, + szHelp); + } +} + + +static VOID +PrintErrorMessage(IN DWORD dwError) +{ + LPTSTR szError; + + if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_IGNORE_INSERTS | + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + dwError, + MAKELANGID(LANG_NEUTRAL, + SUBLANG_DEFAULT), + (LPTSTR)&szError, + 0, + NULL) != 0) + { + _tprintf(_T("%s"), + szError); + LocalFree((HLOCAL)szError); + } +} + + +static DWORD +LoadAndPrintString(IN HINSTANCE hInst, + IN UINT uID) +{ + TCHAR szTemp[255]; + DWORD Len; + + Len = (DWORD)LoadString(hInst, + uID, + szTemp, + sizeof(szTemp) / sizeof(szTemp[0])); + + if (Len != 0) + { + _tprintf(_T("%s"), + szTemp); + } + + return Len; +} + + +static BOOL +PrintFileDacl(IN LPTSTR FilePath, + IN LPTSTR FileName) +{ + SIZE_T Indent; + PSECURITY_DESCRIPTOR SecurityDescriptor; + DWORD SDSize = 0; + TCHAR FullFileName[MAX_PATH + 1]; + BOOL Ret = FALSE; + + Indent = _tcslen(FilePath) + _tcslen(FileName); + if (Indent++ > MAX_PATH - 1) + { + /* file name too long */ + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + _tcscpy(FullFileName, + FilePath); + _tcscat(FullFileName, + FileName); + + /* find out how much memory we need */ + if (!GetFileSecurity(FullFileName, + DACL_SECURITY_INFORMATION, + NULL, + 0, + &SDSize) && + GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + return FALSE; + } + + SecurityDescriptor = (PSECURITY_DESCRIPTOR)HeapAlloc(GetProcessHeap(), + 0, + SDSize); + if (SecurityDescriptor != NULL) + { + if (GetFileSecurity(FullFileName, + DACL_SECURITY_INFORMATION, + SecurityDescriptor, + SDSize, + &SDSize)) + { + PACL Dacl; + BOOL DaclPresent; + BOOL DaclDefaulted; + + if (GetSecurityDescriptorDacl(SecurityDescriptor, + &DaclPresent, + &Dacl, + &DaclDefaulted)) + { + if (DaclPresent) + { + PACCESS_ALLOWED_ACE Ace; + DWORD AceIndex = 0; + + /* dump the ACL */ + while (GetAce(Dacl, + AceIndex, + (PVOID*)&Ace)) + { + SID_NAME_USE Use; + DWORD NameSize = 0; + DWORD DomainSize = 0; + LPTSTR Name = NULL; + LPTSTR Domain = NULL; + LPTSTR SidString = NULL; + DWORD IndentAccess; + DWORD AccessMask = Ace->Mask; + PSID Sid = (PSID)&Ace->SidStart; + + /* attempt to translate the SID into a readable string */ + if (!LookupAccountSid(NULL, + Sid, + Name, + &NameSize, + Domain, + &DomainSize, + &Use)) + { + if (GetLastError() == ERROR_NONE_MAPPED) + { + if (!ConvertSidToStringSid(Sid, + &SidString)) + { + break; + } + } + else + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + break; + } + + Name = (LPTSTR)HeapAlloc(GetProcessHeap(), + 0, + (NameSize + DomainSize) * sizeof(TCHAR)); + if (Name == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + break; + } + + Domain = Name + NameSize; + Name[0] = Domain[0] = _T('\0'); + if (!LookupAccountSid(NULL, + Sid, + Name, + &NameSize, + Domain, + &DomainSize, + &Use)) + { + HeapFree(GetProcessHeap(), + 0, + Name); + break; + } + } + } + + /* print the file name or space */ + _tprintf(_T("%s "), + FullFileName); + + /* attempt to map the SID to a user name */ + if (AceIndex == 0) + { + DWORD i = 0; + + /* overwrite the full file name with spaces so we + only print the file name once */ + while (FullFileName[i] != _T('\0')) + FullFileName[i++] = _T(' '); + } + + /* print the domain and/or user if possible, or the SID string */ + if (Name != NULL && Domain[0] != _T('\0')) + { + _tprintf(_T("%s\\%s:"), + Domain, + Name); + IndentAccess = _tcslen(Domain) + _tcslen(Name); + } + else + { + LPTSTR DisplayString = (Name != NULL ? Name : SidString); + + _tprintf(_T("%s:"), + DisplayString); + IndentAccess = _tcslen(DisplayString); + } + + /* print the ACE Flags */ + if (Ace->Header.AceFlags & CONTAINER_INHERIT_ACE) + { + IndentAccess += LoadAndPrintString(NULL, + IDS_ABBR_CI); + } + if (Ace->Header.AceFlags & OBJECT_INHERIT_ACE) + { + IndentAccess += LoadAndPrintString(NULL, + IDS_ABBR_OI); + } + if (Ace->Header.AceFlags & INHERIT_ONLY_ACE) + { + IndentAccess += LoadAndPrintString(NULL, + IDS_ABBR_IO); + } + + IndentAccess += 2; + + /* print the access rights */ + MapGenericMask(&AccessMask, + &FileGenericMapping); + if (Ace->Header.AceType & ACCESS_DENIED_ACE_TYPE) + { + if (AccessMask == FILE_ALL_ACCESS) + { + LoadAndPrintString(NULL, + IDS_ABBR_NONE); + } + else + { + LoadAndPrintString(NULL, + IDS_DENY); + goto PrintSpecialAccess; + } + } + else + { + if (AccessMask == FILE_ALL_ACCESS) + { + LoadAndPrintString(NULL, + IDS_ABBR_FULL); + } + else if (!(Ace->Mask & (GENERIC_READ | GENERIC_EXECUTE)) && + AccessMask == (FILE_GENERIC_READ | FILE_EXECUTE)) + { + LoadAndPrintString(NULL, + IDS_ABBR_READ); + } + else if (AccessMask == (FILE_GENERIC_READ | FILE_GENERIC_WRITE | FILE_EXECUTE | DELETE)) + { + LoadAndPrintString(NULL, + IDS_ABBR_CHANGE); + } + else if (AccessMask == FILE_GENERIC_WRITE) + { + LoadAndPrintString(NULL, + IDS_ABBR_WRITE); + } + else + { + DWORD x, x2; + static const struct + { + DWORD Access; + UINT uID; + } + AccessRights[] = { + {FILE_WRITE_ATTRIBUTES, IDS_FILE_WRITE_ATTRIBUTES}, + {FILE_READ_ATTRIBUTES, IDS_FILE_READ_ATTRIBUTES}, + {FILE_DELETE_CHILD, IDS_FILE_DELETE_CHILD}, + {FILE_EXECUTE, IDS_FILE_EXECUTE}, + {FILE_WRITE_EA, IDS_FILE_WRITE_EA}, + {FILE_READ_EA, IDS_FILE_READ_EA}, + {FILE_APPEND_DATA, IDS_FILE_APPEND_DATA}, + {FILE_WRITE_DATA, IDS_FILE_WRITE_DATA}, + {FILE_READ_DATA, IDS_FILE_READ_DATA}, + {FILE_GENERIC_EXECUTE, IDS_FILE_GENERIC_EXECUTE}, + {FILE_GENERIC_WRITE, IDS_FILE_GENERIC_WRITE}, + {FILE_GENERIC_READ, IDS_FILE_GENERIC_READ}, + {GENERIC_ALL, IDS_GENERIC_ALL}, + {GENERIC_EXECUTE, IDS_GENERIC_EXECUTE}, + {GENERIC_WRITE, IDS_GENERIC_WRITE}, + {GENERIC_READ, IDS_GENERIC_READ}, + {MAXIMUM_ALLOWED, IDS_MAXIMUM_ALLOWED}, + {ACCESS_SYSTEM_SECURITY, IDS_ACCESS_SYSTEM_SECURITY}, + {SPECIFIC_RIGHTS_ALL, IDS_SPECIFIC_RIGHTS_ALL}, + {STANDARD_RIGHTS_REQUIRED, IDS_STANDARD_RIGHTS_REQUIRED}, + {SYNCHRONIZE, IDS_SYNCHRONIZE}, + {WRITE_OWNER, IDS_WRITE_OWNER}, + {WRITE_DAC, IDS_WRITE_DAC}, + {READ_CONTROL, IDS_READ_CONTROL}, + {DELETE, IDS_DELETE}, + {STANDARD_RIGHTS_ALL, IDS_STANDARD_RIGHTS_ALL}, + }; + + LoadAndPrintString(NULL, + IDS_ALLOW); + +PrintSpecialAccess: + LoadAndPrintString(NULL, + IDS_SPECIAL_ACCESS); + + /* print the special access rights */ + x = sizeof(AccessRights) / sizeof(AccessRights[0]); + while (x-- != 0) + { + if ((Ace->Mask & AccessRights[x].Access) == AccessRights[x].Access) + { + _tprintf(_T("\n%s "), + FullFileName); + for (x2 = 0; + x2 < IndentAccess; + x2++) + { + _tprintf(_T(" ")); + } + + LoadAndPrintString(NULL, + AccessRights[x].uID); + } + } + + _tprintf(_T("\n")); + } + } + + _tprintf(_T("\n")); + + /* free up all resources */ + if (Name != NULL) + { + HeapFree(GetProcessHeap(), + 0, + Name); + } + + if (SidString != NULL) + { + LocalFree((HLOCAL)SidString); + } + + AceIndex++; + } + + Ret = TRUE; + } + else + { + SetLastError(ERROR_NO_SECURITY_ON_OBJECT); + } + } + } + + HeapFree(GetProcessHeap(), + 0, + SecurityDescriptor); + } + else + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + + return Ret; +} + + +#ifdef _UNICODE +int main(void) +#else +int _main (int argc, char *argv[]) +#endif +{ +#ifdef _UNICODE + PWCHAR *argv; + int argc = 0; + argv = CommandLineToArgvW(GetCommandLineW(), &argc); +#endif + + if (argc < 2) + { + PrintHelp(); + return 1; + } + else + { + TCHAR FullPath[MAX_PATH + 1]; + TCHAR *FilePart = NULL; + WIN32_FIND_DATA FindData; + HANDLE hFind; + BOOL ContinueAccessDenied = FALSE; + + if (argc > 2) + { + /* FIXME - parse arguments */ + } + + /* get the full path of where we're searching in */ + if (GetFullPathName(argv[1], + sizeof(FullPath) / sizeof(FullPath[0]), + FullPath, + &FilePart) != 0) + { + if (FilePart != NULL) + *FilePart = _T('\0'); + } + else + goto Error; + + /* find the file(s) */ + hFind = FindFirstFile(argv[1], + &FindData); + if (hFind != INVALID_HANDLE_VALUE) + { + do + { + if (!(FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || + (_tcscmp(FindData.cFileName, + _T(".")) && + _tcscmp(FindData.cFileName, + _T("..")))) + { + if (argc > 2) + { + /* FIXME - edit or replace the descriptor */ + } + else + { + if (!PrintFileDacl(FullPath, + FindData.cFileName)) + { + if (GetLastError() == ERROR_ACCESS_DENIED && + !ContinueAccessDenied) + { + break; + } + } + else + _tprintf(_T("\n")); + } + } + } while (FindNextFile(hFind, + &FindData)); + + FindClose(hFind); + + if (GetLastError() != ERROR_NO_MORE_FILES) + { + goto Error; + } + } + else + { +Error: + PrintErrorMessage(GetLastError()); + return 1; + } + } + + return 0; +} Property changes on: trunk/reactos/subsys/system/cacls/cacls.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/cacls/cacls.rc --- trunk/reactos/subsys/system/cacls/cacls.rc 2006-01-14 01:00:56 UTC (rev 20844) +++ trunk/reactos/subsys/system/cacls/cacls.rc 2006-01-14 04:32:37 UTC (rev 20845) @@ -0,0 +1,12 @@ +#include <windows.h> +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Control ACLs Program\0" +#define REACTOS_STR_INTERNAL_NAME "cacls\0" +#define REACTOS_STR_ORIGINAL_FILENAME "cacls.exe\0" +#include <reactos/version.rc> + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#include "En.rc" + Property changes on: trunk/reactos/subsys/system/cacls/cacls.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/cacls/cacls.xml --- trunk/reactos/subsys/system/cacls/cacls.xml 2006-01-14 01:00:56 UTC (rev 20844) +++ trunk/reactos/subsys/system/cacls/cacls.xml 2006-01-14 04:32:37 UTC (rev 20845) @@ -0,0 +1,15 @@ +<module name="cacls" type="win32cui" installbase="system32" installname="cacls.exe" usewrc="false"> + <include base="cacls">.</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> + <library>kernel32</library> + <library>advapi32</library> + <library>ntdll</library> + <file>cacls.c</file> + <file>cacls.rc</file> + <pch>precomp.h</pch> +</module> Property changes on: trunk/reactos/subsys/system/cacls/cacls.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/cacls/precomp.h --- trunk/reactos/subsys/system/cacls/precomp.h 2006-01-14 01:00:56 UTC (rev 20844) +++ trunk/reactos/subsys/system/cacls/precomp.h 2006-01-14 04:32:37 UTC (rev 20845) @@ -0,0 +1,10 @@ +#ifndef _CACLS_PRECOMP_H +#define _CACLS_PRECOMP_H + +#include <windows.h> +#include <sddl.h> +#include <tchar.h> +#include <stdio.h> +#include "resource.h" + +#endif /* _CACLS_PRECOMP_H */ Property changes on: trunk/reactos/subsys/system/cacls/precomp.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/cacls/resource.h --- trunk/reactos/subsys/system/cacls/resource.h 2006-01-14 01:00:56 UTC (rev 20844) +++ trunk/reactos/subsys/system/cacls/resource.h 2006-01-14 04:32:37 UTC (rev 20845) @@ -0,0 +1,44 @@ +#ifndef _CACLS_RESOURCE_H +#define _CACLS_RESOURCE_H + +#define IDS_HELP 101 +#define IDS_ABBR_CI 102 +#define IDS_ABBR_OI 103 +#define IDS_ABBR_IO 104 +#define IDS_ABBR_FULL 105 +#define IDS_ABBR_READ 106 +#define IDS_ABBR_WRITE 107 +#define IDS_ABBR_CHANGE 108 +#define IDS_ABBR_NONE 109 +#define IDS_ALLOW 110 +#define IDS_DENY 111 +#define IDS_SPECIAL_ACCESS 112 + +#define IDS_GENERIC_READ 113 +#define IDS_GENERIC_WRITE 114 +#define IDS_GENERIC_EXECUTE 115 +#define IDS_GENERIC_ALL 116 +#define IDS_FILE_GENERIC_EXECUTE 118 +#define IDS_FILE_GENERIC_READ 119 +#define IDS_FILE_GENERIC_WRITE 120 +#define IDS_FILE_READ_DATA 121 +#define IDS_FILE_WRITE_DATA 122 +#define IDS_FILE_APPEND_DATA 123 +#define IDS_FILE_READ_EA 124 +#define IDS_FILE_WRITE_EA 125 +#define IDS_FILE_EXECUTE 126 +#define IDS_FILE_DELETE_CHILD 127 +#define IDS_FILE_READ_ATTRIBUTES 128 +#define IDS_FILE_WRITE_ATTRIBUTES 129 +#define IDS_MAXIMUM_ALLOWED 130 +#define IDS_ACCESS_SYSTEM_SECURITY 131 +#define IDS_SPECIFIC_RIGHTS_ALL 132 +#define IDS_STANDARD_RIGHTS_REQUIRED 133 +#define IDS_SYNCHRONIZE 134 +#define IDS_WRITE_OWNER 135 +#define IDS_WRITE_DAC 136 +#define IDS_READ_CONTROL 137 +#define IDS_DELETE 138 +#define IDS_STANDARD_RIGHTS_ALL 139 + +#endif /* _CACLS_RESOURCE_H */ Property changes on: trunk/reactos/subsys/system/cacls/resource.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2006-01-14 01:00:56 UTC (rev 20844) +++ trunk/reactos/subsys/system/directory.xml 2006-01-14 04:32:37 UTC (rev 20845) @@ -2,6 +2,9 @@ <directory name="autochk"> <xi:include href="autochk/autochk.xml" /> </directory> +<directory name="cacls"> + <xi:include href="cacls/cacls.xml" /> +</directory> <directory name="calc"> <xi:include href="calc/calc.xml" /> </directory>

18 years, 8 months

[npwoods] 20844: Rbuild: Added "description" field to the various backend factories, and then used the description field to generate the help text.

by npwoods＠svn.reactos.org

Rbuild: Added "description" field to the various backend factories, and then used the description field to generate the help text. (updated the patch in bugzilla bug #790) Modified: trunk/reactos/tools/rbuild/backend/backend.cpp Modified: trunk/reactos/tools/rbuild/backend/backend.h Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/backend.cpp --- trunk/reactos/tools/rbuild/backend/backend.cpp 2006-01-14 00:51:00 UTC (rev 20843) +++ trunk/reactos/tools/rbuild/backend/backend.cpp 2006-01-14 01:00:56 UTC (rev 20844) @@ -29,13 +29,15 @@ int Backend::Factory::ref = 0; -Backend::Factory::Factory ( const std::string& name_ ) +Backend::Factory::Factory ( const std::string& name_, const std::string& description_ ) { string name(name_); strlwr ( &name[0] ); if ( !ref++ ) factories = new map<string,Factory*>; (*factories)[name] = this; + m_name = name; + m_description = description_; } Backend::Factory::~Factory () _____ Modified: trunk/reactos/tools/rbuild/backend/backend.h --- trunk/reactos/tools/rbuild/backend/backend.h 2006-01-14 00:51:00 UTC (rev 20843) +++ trunk/reactos/tools/rbuild/backend/backend.h 2006-01-14 01:00:56 UTC (rev 20844) @@ -32,10 +32,12 @@ { static std::map<std::string,Factory*>* factories; static int ref; + std::string m_name; + std::string m_description; protected: - Factory ( const std::string& name_ ); + Factory ( const std::string& name_, const std::string& description_ ); virtual ~Factory(); virtual Backend* operator() ( Project&, @@ -45,6 +47,19 @@ static Backend* Create ( const std::string& name, Project& project, Configuration& configuration ); + + static std::map<std::string,Factory*>::iterator map_begin(void) + { + return factories->begin(); + } + + static std::map<std::string,Factory*>::iterator map_end(void) + { + return factories->end(); + } + + const char *Name(void) { return m_name.c_str(); } + const char *Description(void) { return m_description.c_str(); } }; protected: _____ Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp --- trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2006-01-14 00:51:00 UTC (rev 20843) +++ trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2006-01-14 01:00:56 UTC (rev 20844) @@ -32,7 +32,7 @@ { public: - DevCppFactory() : Factory("devcpp") {} + DevCppFactory() : Factory("devcpp", "Dev C++") {} Backend *operator() (Project &project, Configuration& configuration) { _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2006-01-14 00:51:00 UTC (rev 20843) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2006-01-14 01:00:56 UTC (rev 20844) @@ -58,7 +58,7 @@ static class MingwFactory : public Backend::Factory { public: - MingwFactory() : Factory ( "mingw" ) {} + MingwFactory() : Factory ( "mingw", "Minimalist GNU Win32" ) {} Backend* operator() ( Project& project, Configuration& configuration ) { _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2006-01-14 00:51:00 UTC (rev 20843) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2006-01-14 01:00:56 UTC (rev 20844) @@ -38,7 +38,7 @@ { public: - MSVCFactory() : Factory("MSVC") {} + MSVCFactory() : Factory("MSVC", "Microsoft Visual C") {} Backend *operator() (Project &project, Configuration& configuration) { _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2006-01-14 00:51:00 UTC (rev 20843) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2006-01-14 01:00:56 UTC (rev 20844) @@ -17,6 +17,7 @@ */ #include "pch.h" #include <typeinfo> +#include <algorithm> #include <stdio.h> #ifdef WIN32 @@ -239,9 +240,13 @@ printf ( " -vs{version} Version of MS VS project files. Default is %s.\n", MS_VS_DEF_VERSION ); printf ( "\n" ); printf ( " buildsystem Target build system. Can be one of:\n" ); - printf ( " mingw MinGW\n" ); - printf ( " devcpp DevC++\n" ); - printf ( " msvc MS Visual Studio\n" ); + + std::map<std::string,Backend::Factory*>::iterator iter; + for (iter = Backend::Factory::map_begin(); iter != Backend::Factory::map_end(); iter++) + { + Backend::Factory *factory = iter->second; + printf ( " %-10s %s\n", factory->Name(), factory->Description()); + } return 1; } try

18 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
59
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 2006