Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [THEMES][DOC] "Open Sans" -> "Trebuchet MS" (#4983)
by Joachim Henze 08 Jan '23

08 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d5011fb6ba2c86fa8b1d… commit 8d5011fb6ba2c86fa8b1d508a35ec150bced2b64 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Jan 8 16:07:30 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 8 16:07:30 2023 +0100 [THEMES][DOC] "Open Sans" -> "Trebuchet MS" (#4983) [THEMES] Eliminates the last references to "Open Sans" font. This is an addendum to 0.4.13-dev-765-g 04a361d091095a96bb3af376e46daf4c5fe81c63 "Open Sans" has been replaced by "Trebuchet MS" back then. [DOC] Mention trebuc*.ttf as being based on 'Open Sans Fonts' --- media/doc/3rd Party Files.txt | 2 +- .../textfiles/ExtraLargeNormal.INI | 68 +++++++++++----------- .../lautus.msstyles/textfiles/ExtraLargeNormal.INI | 68 +++++++++++----------- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 86e25d83cde..d135337ab31 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -178,7 +178,7 @@ License: media/fonts/doc/DejaVu/LICENSE.txt URL: http://dejavu.sourceforge.net Title: Open Sans Fonts -Path: media/fonts +Path: media/fonts/trebuc*.ttf Used Version: 1.10 License: Apache-2.0 (https://spdx.org/licenses/Apache-2.0.html) URL: http://www.google.com/fonts/specimen/Open+Sans diff --git a/media/themes/Blackshade/blackshade.msstyles/textfiles/ExtraLargeNormal.INI b/media/themes/Blackshade/blackshade.msstyles/textfiles/ExtraLargeNormal.INI index ae865bb0166..411e2c58a91 100644 --- a/media/themes/Blackshade/blackshade.msstyles/textfiles/ExtraLargeNormal.INI +++ b/media/themes/Blackshade/blackshade.msstyles/textfiles/ExtraLargeNormal.INI @@ -13,7 +13,7 @@ Btnface = 239 238 243 BtnHighlight = 255 255 255 BtnShadow = 162 162 162 CaptionBarHeight = 24 -CaptionFont = Open Sans, 8, Bold +CaptionFont = Trebuchet MS, 8, Bold CaptionText = 255 255 255 CssName = cpwebvw.css DkShadow3d = 162 162 162 @@ -24,23 +24,23 @@ GrayText = 172 168 153 Highlight = 75 75 75 HighlightText = 255 255 255 HotTracking = 0 0 128 -IconTitleFont = Open Sans, 8 +IconTitleFont = Trebuchet MS, 8 InactiveCaption = 65 65 65 InactiveCaptionText = 180 180 180 Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 239 238 243 -MenuFont = Open Sans, 8 +MenuFont = Trebuchet MS, 8 MenuHilight = 100 100 100 MenuText = 75 75 75 MinColorDepth = 15 -MsgBoxFont = Open Sans, 8 +MsgBoxFont = Trebuchet MS, 8 ScrollbarHeight = 15 ScrollbarWidth = 15 -SmallCaptionFont = Open Sans, 8, Bold +SmallCaptionFont = Trebuchet MS, 8, Bold SMCaptionBarHeight = 19 SMCaptionBarWidth = 21 -StatusFont = Open Sans, 8 +StatusFont = Trebuchet MS, 8 Window = 255 255 255 XmlName = default.xml @@ -101,7 +101,7 @@ SizingType = Stretch TextColor = 112 112 112 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTSHADOWOFFSET = 1,1 TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 221 221 221 @@ -206,7 +206,7 @@ GradientRatio2 = 255 BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 94 135 217 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold ImageFile = Normal\ExplorerBarHeaderBackground.bmp SizingMargins = 17, 1, 0, 0 SizingType = Stretch @@ -252,7 +252,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -286,7 +286,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 240 243 251 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold ImageFile = Normal\NormalGroupHead.bmp SizingMargins = 3, 15, 3, 1 SizingType = Stretch @@ -297,7 +297,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -331,7 +331,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColor = 2 72 178 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold ImageFile = Normal\SpecialGroupHead.bmp SizingMargins = 3, 6, 5, 16 SizingType = Stretch @@ -416,7 +416,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -683,7 +683,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = ImageFile ContentMargins = 11, 2, 0, 5 DefaultPaneSize = 0, 0, 178, 30 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold HotTracking = 48 112 208 Imagecount = 1 ImageFile = Normal\StartPanelMoreProgBackGround.BMP @@ -749,7 +749,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = None DefaultPaneSize = 0, 0, 357, 28 FillColorHint = 31 113 216 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold Imagecount = 1 ImageFile = Normal\StartUserPanel.bmp ImageLayout = Horizontal @@ -825,7 +825,7 @@ MinDpi2 = 164 StockImageFile = Normal\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 [Tab.Pane] @@ -849,7 +849,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -867,7 +867,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -885,7 +885,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -903,7 +903,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -921,7 +921,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -939,7 +939,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -961,7 +961,7 @@ TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 TEXTCOLOR = 112 112 112 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60 @@ -975,7 +975,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1011,7 +1011,7 @@ Transparent = True TransparentColor = 255 0 255 [TaskBand.GroupCount] -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold TextColor = 255 255 255 [TaskBar.BackgroundBottom] @@ -1663,7 +1663,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -1869,7 +1869,7 @@ AccentColorHint = 48 127 229 BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -1975,7 +1975,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 TEXTSHADOWCOLOR = 0 0 0 TEXTSHADOWOFFSET = 1,1 @@ -2035,7 +2035,7 @@ AccentColorHint = 255 199 60 BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2056,7 +2056,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TaskBandVert::Toolbar.Button] @@ -2083,7 +2083,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2142,7 +2142,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TaskBar::Toolbar.Button] @@ -2169,7 +2169,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2204,7 +2204,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TrayNotify::Toolbar] diff --git a/media/themes/Lautus/lautus.msstyles/textfiles/ExtraLargeNormal.INI b/media/themes/Lautus/lautus.msstyles/textfiles/ExtraLargeNormal.INI index ae865bb0166..411e2c58a91 100644 --- a/media/themes/Lautus/lautus.msstyles/textfiles/ExtraLargeNormal.INI +++ b/media/themes/Lautus/lautus.msstyles/textfiles/ExtraLargeNormal.INI @@ -13,7 +13,7 @@ Btnface = 239 238 243 BtnHighlight = 255 255 255 BtnShadow = 162 162 162 CaptionBarHeight = 24 -CaptionFont = Open Sans, 8, Bold +CaptionFont = Trebuchet MS, 8, Bold CaptionText = 255 255 255 CssName = cpwebvw.css DkShadow3d = 162 162 162 @@ -24,23 +24,23 @@ GrayText = 172 168 153 Highlight = 75 75 75 HighlightText = 255 255 255 HotTracking = 0 0 128 -IconTitleFont = Open Sans, 8 +IconTitleFont = Trebuchet MS, 8 InactiveCaption = 65 65 65 InactiveCaptionText = 180 180 180 Light3d = 241 239 226 Menu = 255 255 255 MenuBar = 239 238 243 -MenuFont = Open Sans, 8 +MenuFont = Trebuchet MS, 8 MenuHilight = 100 100 100 MenuText = 75 75 75 MinColorDepth = 15 -MsgBoxFont = Open Sans, 8 +MsgBoxFont = Trebuchet MS, 8 ScrollbarHeight = 15 ScrollbarWidth = 15 -SmallCaptionFont = Open Sans, 8, Bold +SmallCaptionFont = Trebuchet MS, 8, Bold SMCaptionBarHeight = 19 SMCaptionBarWidth = 21 -StatusFont = Open Sans, 8 +StatusFont = Trebuchet MS, 8 Window = 255 255 255 XmlName = default.xml @@ -101,7 +101,7 @@ SizingType = Stretch TextColor = 112 112 112 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTSHADOWOFFSET = 1,1 TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 221 221 221 @@ -206,7 +206,7 @@ GradientRatio2 = 255 BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 94 135 217 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold ImageFile = Normal\ExplorerBarHeaderBackground.bmp SizingMargins = 17, 1, 0, 0 SizingType = Stretch @@ -252,7 +252,7 @@ BgType = ImageFile BorderColor = 255 255 255 ContentMargins = 8, 8, 7, 7 FillColor = 214 223 247 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\NormalGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -286,7 +286,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 240 243 251 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold ImageFile = Normal\NormalGroupHead.bmp SizingMargins = 3, 15, 3, 1 SizingType = Stretch @@ -297,7 +297,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColorHint = 239 243 255 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\SpecialGroupBackground.bmp SizingMargins = 3, 3, 3, 3 SizingType = Stretch @@ -331,7 +331,7 @@ Transparent = true BgType = ImageFile ContentMargins = 8, 8, 7, 7 FillColor = 2 72 178 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold ImageFile = Normal\SpecialGroupHead.bmp SizingMargins = 3, 6, 5, 16 SizingType = Stretch @@ -416,7 +416,7 @@ SizingType = Stretch [Rebar] Bgtype = imagefile FillColorHint = 241 243 239 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\ToolbarBackground.bmp Sizingmargins = 1, 1, 1, 2 Sizingtype = stretch @@ -683,7 +683,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = ImageFile ContentMargins = 11, 2, 0, 5 DefaultPaneSize = 0, 0, 178, 30 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold HotTracking = 48 112 208 Imagecount = 1 ImageFile = Normal\StartPanelMoreProgBackGround.BMP @@ -749,7 +749,7 @@ TRANSPARENTCOLOR = 255 0 255 BgType = None DefaultPaneSize = 0, 0, 357, 28 FillColorHint = 31 113 216 -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold Imagecount = 1 ImageFile = Normal\StartUserPanel.bmp ImageLayout = Horizontal @@ -825,7 +825,7 @@ MinDpi2 = 164 StockImageFile = Normal\TabBackground.bmp TrueSizeScalingType = Dpi TrueSizeStretchMark = 50 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 [Tab.Pane] @@ -849,7 +849,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -867,7 +867,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -885,7 +885,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -903,7 +903,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -921,7 +921,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -939,7 +939,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -961,7 +961,7 @@ TEXTSHADOWTYPE = Single TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 TEXTCOLOR = 112 112 112 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 [Tab.TopTabItemRightEdge] AccentColorHint = 255 200 60 @@ -975,7 +975,7 @@ Imagelayout = vertical SizingMargins = 6, 6, 6, 6 TRANSPARENT = true TRANSPARENTCOLOR = 255 0 255 -FONT = Open Sans, 8 +FONT = Trebuchet MS, 8 TEXTCOLOR = 112 112 112 TEXTSHADOWCOLOR = 255 255 255 TEXTSHADOWOFFSET = 1,1 @@ -1011,7 +1011,7 @@ Transparent = True TransparentColor = 255 0 255 [TaskBand.GroupCount] -Font = Open Sans, 8, Bold +Font = Trebuchet MS, 8, Bold TextColor = 255 255 255 [TaskBar.BackgroundBottom] @@ -1663,7 +1663,7 @@ OffsetType = TopLeft [ExplorerBar::Rebar] Bgtype = imagefile FillColorHint = 243 247 253 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\ExplorerBarToolbarBackground.bmp Sizingmargins = 0, 0, 34, 0 Sizingtype = stretch @@ -1869,7 +1869,7 @@ AccentColorHint = 48 127 229 BgType = ImageFile ContentMargins = 0, 0, 0, 0 FillColorHint = 255 255 255 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\StartGroupBackground.bmp SizingMargins = 24, 3, 3, 4 SizingType = Stretch @@ -1975,7 +1975,7 @@ SizingMargins = 1, 1, 0, 0 [TaskBand::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 TEXTSHADOWCOLOR = 0 0 0 TEXTSHADOWOFFSET = 1,1 @@ -2035,7 +2035,7 @@ AccentColorHint = 255 199 60 BgType = ImageFile ContentMargins = 6, 11, 6, 6 FillColorHint = 33 87 213 -Font = Open Sans, 8 +Font = Trebuchet MS, 8 ImageFile = Normal\TaskBandBackground.bmp SizingMargins = 6, 6, 6, 6 SizingType = Stretch @@ -2056,7 +2056,7 @@ Transparent = True [TaskBandVert::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TaskBandVert::Toolbar.Button] @@ -2083,7 +2083,7 @@ Transparent = True [TaskBar::Rebar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 123 182 232 [TaskBar::Rebar.Band] @@ -2142,7 +2142,7 @@ TransparentColor = 255 0 255 [TaskBar::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TaskBar::Toolbar.Button] @@ -2169,7 +2169,7 @@ Transparent = True [TaskBarVert::Toolbar] BgType = None -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TaskBarVert::Toolbar(Checked)] @@ -2204,7 +2204,7 @@ SizingType = Stretch Transparent = True [TrayNotify::Clock] -Font = Open Sans, 8 +Font = Trebuchet MS, 8 TextColor = 255 255 255 [TrayNotify::Toolbar]

1 0

[reactos] 03/03: [NTOS:KD] Revisit KdSendPacket() and KdReceivePacket() for DBGKD_DEBUG_IO. (#4914)
by Hermès Bélusca-Maïto 06 Jan '23

06 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84e32e4e90109b3bce75d… commit 84e32e4e90109b3bce75ddb3eee2d3dfc42ab4be Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 27 19:58:56 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jan 6 18:57:32 2023 +0100 [NTOS:KD] Revisit KdSendPacket() and KdReceivePacket() for DBGKD_DEBUG_IO. (#4914) - Use SAL2 annotations. - KdSendPacket(): Validate DEBUG_IO API call. - KdReceivePacket(): Take the LengthOfStringRead into account; use KdbpReadCommand() to read the input, so that correct line edition is available (backspace, etc.) --- ntoskrnl/kd/kdio.c | 163 ++++++++++++++++++++-------------------------------- ntoskrnl/kdbg/kdb.h | 5 ++ 2 files changed, 68 insertions(+), 100 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 3f39e20c173..45733e0b3ca 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -37,7 +37,7 @@ CPPORT SerialPortInfo = {0, DEFAULT_DEBUG_BAUD_RATE, 0}; static CHAR KdpScreenLineBuffer[KdpScreenLineLengthDefault + 1] = ""; static ULONG KdpScreenLineBufferPos = 0, KdpScreenLineLength = 0; -const ULONG KdpDmesgBufferSize = 128 * 1024; // 512*1024; // 5*1024*1024; +const ULONG KdpDmesgBufferSize = 128 * 1024; // 512*1024; PCHAR KdpDmesgBuffer = NULL; volatile ULONG KdpDmesgCurrentPosition = 0; volatile ULONG KdpDmesgFreeBytes = 0; @@ -576,18 +576,34 @@ extern STRING KdbPromptString; VOID NTAPI KdSendPacket( - IN ULONG PacketType, - IN PSTRING MessageHeader, - IN PSTRING MessageData, - IN OUT PKD_CONTEXT Context) + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_opt_ PSTRING MessageData, + _Inout_ PKD_CONTEXT Context) { if (PacketType == PACKET_TYPE_KD_DEBUG_IO) { - PSTRING Output = MessageData; + ULONG ApiNumber = ((PDBGKD_DEBUG_IO)MessageHeader->Buffer)->ApiNumber; PLIST_ENTRY CurrentEntry; PKD_DISPATCH_TABLE CurrentTable; - if (!KdpDebugMode.Value) return; + /* Validate API call */ + if (MessageHeader->Length != sizeof(DBGKD_DEBUG_IO)) + return; + if ((ApiNumber != DbgKdPrintStringApi) && + (ApiNumber != DbgKdGetStringApi)) + { + return; + } + if (!MessageData) + return; + + /* NOTE: MessageData->Length should be equal to + * DebugIo.u.PrintString.LengthOfString, or to + * DebugIo.u.GetString.LengthOfPromptString */ + + if (!KdpDebugMode.Value) + return; /* Call the registered handlers */ CurrentEntry = KdProviders.Flink; @@ -599,7 +615,7 @@ KdSendPacket( KdProvidersList); /* Call it */ - CurrentTable->KdpPrintRoutine(Output->Buffer, Output->Length); + CurrentTable->KdpPrintRoutine(MessageData->Buffer, MessageData->Length); /* Next Table */ CurrentEntry = CurrentEntry->Flink; @@ -672,20 +688,17 @@ KdSendPacket( KDSTATUS NTAPI KdReceivePacket( - IN ULONG PacketType, - OUT PSTRING MessageHeader, - OUT PSTRING MessageData, - OUT PULONG DataLength, - IN OUT PKD_CONTEXT Context) + _In_ ULONG PacketType, + _Out_ PSTRING MessageHeader, + _Out_ PSTRING MessageData, + _Out_ PULONG DataLength, + _Inout_ PKD_CONTEXT Context) { #ifdef KDBG - KIRQL OldIrql; - STRING StringChar; - CHAR Response; - USHORT i; - ULONG DummyScanCode; - CHAR MessageBuffer[100]; + STRING NewLine = RTL_CONSTANT_STRING("\n"); STRING ResponseString; + PDBGKD_DEBUG_IO DebugIo; + CHAR MessageBuffer[512]; #endif if (PacketType == PACKET_TYPE_KD_STATE_MANIPULATE) @@ -724,99 +737,49 @@ KdReceivePacket( return KdPacketTimedOut; #ifdef KDBG - ResponseString.Buffer = MessageBuffer; - ResponseString.Length = 0; - ResponseString.MaximumLength = min(sizeof(MessageBuffer), MessageData->MaximumLength); - StringChar.Buffer = &Response; - StringChar.Length = StringChar.MaximumLength = sizeof(Response); - - /* Display the string and print a new line for log neatness */ - *StringChar.Buffer = '\n'; - KdpPrintString(&StringChar); + DebugIo = (PDBGKD_DEBUG_IO)MessageHeader->Buffer; - /* Print the kdb prompt */ - KdpPrintString(&KdbPromptString); + /* Validate API call */ + if (MessageHeader->MaximumLength != sizeof(DBGKD_DEBUG_IO)) + return KdPacketNeedsResend; + if (DebugIo->ApiNumber != DbgKdGetStringApi) + return KdPacketNeedsResend; - // TODO: Use an improved KdbpReadCommand() function for our purposes. + /* NOTE: We cannot use directly MessageData->Buffer here as it points + * to the temporary KdpMessageBuffer scratch buffer that is being + * shared with all the possible I/O KD operations that may happen. */ + ResponseString.Buffer = MessageBuffer; + ResponseString.Length = 0; + ResponseString.MaximumLength = min(sizeof(MessageBuffer), + MessageData->MaximumLength); + ResponseString.MaximumLength = min(ResponseString.MaximumLength, + DebugIo->u.GetString.LengthOfStringRead); - /* Acquire the printing spinlock without waiting at raised IRQL */ - OldIrql = KdbpAcquireLock(&KdpSerialSpinLock); + /* The prompt string has been printed by KdSendPacket; go to + * new line and print the kdb prompt -- for SYSREG2 support. */ + KdpPrintString(&NewLine); + KdpPrintString(&KdbPromptString); // Alternatively, use "Input> " if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) KbdDisableMouse(); - /* Loop the whole string */ - for (i = 0; i < ResponseString.MaximumLength; i++) - { - /* Check if this is serial debugging mode */ - if (KdbDebugState & KD_DEBUG_KDSERIAL) - { - /* Get the character from serial */ - do - { - Response = KdbpTryGetCharSerial(MAXULONG); - } while (Response == -1); - } - else - { - /* Get the response from the keyboard */ - do - { - Response = KdbpTryGetCharKeyboard(&DummyScanCode, MAXULONG); - } while (Response == -1); - } - - /* Check for return */ - if (Response == '\r') - { - /* - * We might need to discard the next '\n'. - * Wait a bit to make sure we receive it. - */ - KeStallExecutionProcessor(100000); - - /* Check the mode */ - if (KdbDebugState & KD_DEBUG_KDSERIAL) - { - /* Read and discard the next character, if any */ - KdbpTryGetCharSerial(5); - } - else - { - /* Read and discard the next character, if any */ - KdbpTryGetCharKeyboard(&DummyScanCode, 5); - } - - /* - * Null terminate the output string -- documentation states that - * DbgPrompt does not null terminate, but it does - */ - *(PCHAR)(ResponseString.Buffer + i) = 0; - break; - } - - /* Write it back and print it to the log */ - *(PCHAR)(ResponseString.Buffer + i) = Response; - KdbpReleaseLock(&KdpSerialSpinLock, OldIrql); - KdpPrintString(&StringChar); - OldIrql = KdbpAcquireLock(&KdpSerialSpinLock); - } - - /* Release the spinlock */ - KdbpReleaseLock(&KdpSerialSpinLock, OldIrql); - - /* Print a new line */ - *StringChar.Buffer = '\n'; - KdpPrintString(&StringChar); - - /* Return the length */ - RtlCopyMemory(MessageData->Buffer, ResponseString.Buffer, i); - *DataLength = i; + /* Read a line of user input and retrieve the length. + * The output string is NULL-terminated -- documentation states + * that DbgPrompt() does not NULL-terminate, but it does. */ + *DataLength = KdbpReadCommand(ResponseString.Buffer, + ResponseString.MaximumLength); if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) KbdEnableMouse(); + /* Return the length */ + *DataLength = min(*DataLength, DebugIo->u.GetString.LengthOfStringRead); + MessageData->Length = DebugIo->u.GetString.LengthOfStringRead = *DataLength; + + /* Only now we can copy back the data into MessageData->Buffer */ + RtlCopyMemory(MessageData->Buffer, ResponseString.Buffer, *DataLength); #endif + return KdPacketReceived; } diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index d78e2696cdd..8d1e9af2a47 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -98,6 +98,11 @@ KdbpCliMainLoop( VOID KdbpCliInterpretInitFile(VOID); +SIZE_T +KdbpReadCommand( + _Out_ PCHAR Buffer, + _In_ SIZE_T Size); + VOID KdbpPager( _In_ PCHAR Buffer,

1 0

[reactos] 02/03: [NTOS:KDBG] Fix and improve KdbpReadCommand(). (#4914)
by Hermès Bélusca-Maïto 06 Jan '23

06 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e619f890201c24778c38b… commit e619f890201c24778c38b21bcabc205862abfceb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 27 19:45:42 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jan 6 14:44:50 2023 +0100 [NTOS:KDBG] Fix and improve KdbpReadCommand(). (#4914) - Don't read anything and return immediately if the buffer size is zero. - Allow the controlling keys (up/down arrows, backspace) even if the buffer is full! (especially backspace if too much has been written). - Return the number of characters stored, not counting the NULL terminator. --- ntoskrnl/kdbg/kdb_cli.c | 77 ++++++++++++++++++++++++++------------------ ntoskrnl/kdbg/kdb_keyboard.c | 4 +-- 2 files changed, 47 insertions(+), 34 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index ac4e70b7fbc..4a351db9afe 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3333,28 +3333,39 @@ KdbpCommandHistoryAppend( } } -/*!\brief Reads a line of user-input. +/** + * @brief Reads a line of user input from the terminal. * - * \param Buffer Buffer to store the input into. Trailing newlines are removed. - * \param Size Size of \a Buffer. + * @param[out] Buffer + * Buffer where to store the input. Trailing newlines are removed. * - * \note Accepts only \n newlines, \r is ignored. - */ -static VOID + * @param[in] Size + * Size of \a Buffer. + * + * @return + * Returns the number of characters stored, not counting the NULL terminator. + * + * @note Accepts only \n newlines, \r is ignored. + **/ +SIZE_T KdbpReadCommand( - OUT PCHAR Buffer, - IN ULONG Size) + _Out_ PCHAR Buffer, + _In_ SIZE_T Size) { - CHAR Key; PCHAR Orig = Buffer; ULONG ScanCode = 0; + CHAR Key; BOOLEAN EchoOn; static CHAR LastCommand[1024]; static CHAR NextKey = '\0'; INT CmdHistIndex = -1; INT_PTR i; - EchoOn = !((KdbDebugState & KD_DEBUG_KDNOECHO) != 0); + /* Bail out if the buffer is zero-sized */ + if (Size == 0) + return 0; + + EchoOn = ((KdbDebugState & KD_DEBUG_KDNOECHO) == 0); for (;;) { @@ -3393,27 +3404,25 @@ KdbpReadCommand( NextKey = '\0'; } - if ((ULONG)(Buffer - Orig) >= (Size - 1)) - { - /* Buffer is full, accept only newlines */ - if (Key != '\n') - continue; - } - - if (Key == '\r') + /* Check for return or newline */ + if ((Key == '\r') || (Key == '\n')) { - /* Read the next char - this is to throw away a \n which most clients should - * send after \r. - */ - KeStallExecutionProcessor(100000); + if (Key == '\r') + { + /* + * We might need to discard the next '\n' which most clients + * should send after \r. Wait a bit to make sure we receive it. + */ + KeStallExecutionProcessor(100000); - if (KdbDebugState & KD_DEBUG_KDSERIAL) - NextKey = KdbpTryGetCharSerial(5); - else - NextKey = KdbpTryGetCharKeyboard(&ScanCode, 5); + if (KdbDebugState & KD_DEBUG_KDSERIAL) + NextKey = KdbpTryGetCharSerial(5); + else + NextKey = KdbpTryGetCharKeyboard(&ScanCode, 5); - if (NextKey == '\n' || NextKey == -1) /* \n or no response at all */ - NextKey = '\0'; + if (NextKey == '\n' || NextKey == -1) /* \n or no response at all */ + NextKey = '\0'; + } KdpDprintf("\n"); @@ -3432,14 +3441,14 @@ KdbpReadCommand( else *Buffer = '\0'; - return; + return (SIZE_T)(Buffer - Orig); } else if (Key == KEY_BS || Key == KEY_DEL) { if (Buffer > Orig) { Buffer--; - *Buffer = 0; + *Buffer = '\0'; if (EchoOn) KdpDprintf("%c %c", KEY_BS, KEY_BS); @@ -3473,7 +3482,7 @@ KdbpReadCommand( while (Buffer > Orig) { Buffer--; - *Buffer = 0; + *Buffer = '\0'; if (EchoOn) KdpDprintf("%c %c", KEY_BS, KEY_BS); @@ -3502,7 +3511,7 @@ KdbpReadCommand( while (Buffer > Orig) { Buffer--; - *Buffer = 0; + *Buffer = '\0'; if (EchoOn) KdpDprintf("%c %c", KEY_BS, KEY_BS); @@ -3520,6 +3529,10 @@ KdbpReadCommand( } else { + /* Don't accept any key if the buffer is full */ + if ((SIZE_T)(Buffer - Orig) >= (Size - 1)) + continue; + if (EchoOn) KdpDprintf("%c", Key); diff --git a/ntoskrnl/kdbg/kdb_keyboard.c b/ntoskrnl/kdbg/kdb_keyboard.c index 311d9fd46fd..7b0164732ad 100644 --- a/ntoskrnl/kdbg/kdb_keyboard.c +++ b/ntoskrnl/kdbg/kdb_keyboard.c @@ -90,12 +90,12 @@ KbdSendCommandToMouse(UCHAR Command) return; } -VOID KbdEnableMouse() +VOID KbdEnableMouse(VOID) { KbdSendCommandToMouse(MOU_ENAB); } -VOID KbdDisableMouse() +VOID KbdDisableMouse(VOID) { KbdSendCommandToMouse(MOU_DISAB); }

1 0

[reactos] 01/03: [KERNEL32][NTOS:PS][RTL] Cleanup some DbgPrompt() calls.
by Hermès Bélusca-Maïto 06 Jan '23

06 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b25fe161caff2806f47b… commit 1b25fe161caff2806f47b31f4d467d16861ba648 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 27 19:11:29 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jan 6 14:44:49 2023 +0100 [KERNEL32][NTOS:PS][RTL] Cleanup some DbgPrompt() calls. --- dll/win32/kernel32/client/proc.c | 9 ++++----- ntoskrnl/ps/kill.c | 13 +++++-------- sdk/lib/rtl/assert.c | 38 ++++++++++++-------------------------- 3 files changed, 21 insertions(+), 39 deletions(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index d2e38355ddd..22f29ca4bba 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -1625,14 +1625,13 @@ FatalExit(IN int ExitCode) { #if DBG /* On Checked builds, Windows gives the user a nice little debugger UI */ - CHAR ch[2]; - DbgPrint("FatalExit...\n"); - DbgPrint("\n"); + CHAR Action[2]; + DbgPrint("FatalExit...\n\n"); while (TRUE) { - DbgPrompt( "A (Abort), B (Break), I (Ignore)? ", ch, sizeof(ch)); - switch (ch[0]) + DbgPrompt("A (Abort), B (Break), I (Ignore)? ", Action, sizeof(Action)); + switch (Action[0]) { case 'B': case 'b': DbgBreakPoint(); diff --git a/ntoskrnl/ps/kill.c b/ntoskrnl/ps/kill.c index 115768687c4..4a746492486 100644 --- a/ntoskrnl/ps/kill.c +++ b/ntoskrnl/ps/kill.c @@ -42,23 +42,20 @@ PspCatchCriticalBreak(IN PCHAR Message, /* If a debugger isn't present, don't prompt */ if (KdDebuggerNotPresent) break; - /* A debuger is active, prompt for action */ - DbgPrompt("Break, or Ignore (bi)?", Action, sizeof(Action)); + /* A debugger is active, prompt for action */ + DbgPrompt("Break, or Ignore (bi)? ", Action, sizeof(Action)); switch (Action[0]) { /* Break */ case 'B': case 'b': - - /* Do a breakpoint */ DbgBreakPoint(); + /* Fall through */ - /* Ignore */ + /* Ignore: Handle it */ case 'I': case 'i': - - /* Handle it */ Handled = TRUE; - /* Unrecognized */ + /* Unrecognized: Prompt again */ default: break; } diff --git a/sdk/lib/rtl/assert.c b/sdk/lib/rtl/assert.c index 0c6fcaeeefe..6f4facb6239 100644 --- a/sdk/lib/rtl/assert.c +++ b/sdk/lib/rtl/assert.c @@ -43,52 +43,38 @@ RtlAssert(IN PVOID FailedAssertion, LineNumber); /* Prompt for action */ - DbgPrompt("Break repeatedly, break Once, Ignore," - " terminate Process or terminate Thread (boipt)? ", + DbgPrompt("Break repeatedly, break Once, Ignore, " + "terminate Process or terminate Thread (boipt)? ", Action, sizeof(Action)); switch (Action[0]) { - /* Break repeatedly */ + /* Break repeatedly / Break once */ case 'B': case 'b': - - /* Do a breakpoint, then prompt again */ + case 'O': case 'o': DbgPrint("Execute '.cxr %p' to dump context\n", &Context); + /* Do a breakpoint, then prompt again or return */ DbgBreakPoint(); - break; + if ((Action[0] == 'B') || (Action[0] == 'b')) + break; + /* else ('O','o'): fall through */ - /* Ignore */ + /* Ignore: Return to caller */ case 'I': case 'i': - - /* Return to caller */ return; - /* Break once */ - case 'O': case 'o': - - /* Do a breakpoint and return */ - DbgPrint("Execute '.cxr %p' to dump context\n", &Context); - DbgBreakPoint(); - return; - - /* Terminate process*/ + /* Terminate current process */ case 'P': case 'p': - - /* Terminate us */ ZwTerminateProcess(ZwCurrentProcess(), STATUS_UNSUCCESSFUL); break; - /* Terminate thread */ + /* Terminate current thread */ case 'T': case 't': - - /* Terminate us */ ZwTerminateThread(ZwCurrentThread(), STATUS_UNSUCCESSFUL); break; - /* Unrecognized */ + /* Unrecognized: Prompt again */ default: - - /* Prompt again */ break; } }

1 0

[reactos] 01/01: [BOOTDATA] Use the standard "Helv" -> "MS Sans Serif" (#4982)
by Joachim Henze 06 Jan '23

06 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51b4a38ab7beed8cadacb… commit 51b4a38ab7beed8cadacbe8dca8418342d003e1a Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Fri Jan 6 13:31:03 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 6 13:31:03 2023 +0100 [BOOTDATA] Use the standard "Helv" -> "MS Sans Serif" (#4982) This is what Windows does. And we forgot this location here. This is an addendum to 0.4.15-dev-5365-g 9bb5627df60392b90039266f277ff668b574b4cd [SETUP][INF] Use the standard "Helv" -> "MS Sans Serif" substitution... (#4864) --- boot/bootdata/livecd.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index 8eb3553b7d7..67ae5850138 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -44,7 +44,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management","Pagin ; Font Substitution HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma"

1 0

[reactos] 01/01: [RAPPS] Add tooltip for "Refresh" and "Update Database" (#4975)
by Thamatip Chitpong 06 Jan '23

06 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51c38aeb899e12c1f8ba3… commit 51c38aeb899e12c1f8ba34c2b30fc48e24cbb43e Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Fri Jan 6 19:23:25 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 6 13:23:25 2023 +0100 [RAPPS] Add tooltip for "Refresh" and "Update Database" (#4975) --- base/applications/rapps/appview.cpp | 8 ++++++-- base/applications/rapps/include/appview.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 0072d4603e8..11e442d28e3 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -66,6 +66,8 @@ CMainToolbar::CMainToolbar() memset(szUninstallBtn, 0, sizeof(szUninstallBtn)); memset(szModifyBtn, 0, sizeof(szModifyBtn)); memset(szSelectAll, 0, sizeof(szSelectAll)); + memset(szRefreshBtn, 0, sizeof(szRefreshBtn)); + memset(szUpdateDbBtn, 0, sizeof(szUpdateDbBtn)); } VOID CMainToolbar::OnGetDispInfo(LPTOOLTIPTEXT lpttt) @@ -114,14 +116,16 @@ HWND CMainToolbar::Create(HWND hwndParent) { 2, ID_MODIFY, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR)szModifyBtn }, { 3, ID_CHECK_ALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR)szSelectAll }, { -1, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, - { 4, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, - { 5, ID_RESETDB, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 } + { 4, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR)szRefreshBtn }, + { 5, ID_RESETDB, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR)szUpdateDbBtn } }; LoadStringW(hInst, IDS_INSTALL, szInstallBtn, _countof(szInstallBtn)); LoadStringW(hInst, IDS_UNINSTALL, szUninstallBtn, _countof(szUninstallBtn)); LoadStringW(hInst, IDS_MODIFY, szModifyBtn, _countof(szModifyBtn)); LoadStringW(hInst, IDS_SELECT_ALL, szSelectAll, _countof(szSelectAll)); + LoadStringW(hInst, IDS_TOOLTIP_REFRESH, szRefreshBtn, _countof(szRefreshBtn)); + LoadStringW(hInst, IDS_TOOLTIP_UPDATE_DB, szUpdateDbBtn, _countof(szUpdateDbBtn)); m_hWnd = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_LIST, diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index d318c0903e7..3ac3eb21a60 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -285,6 +285,8 @@ class CMainToolbar : WCHAR szUninstallBtn[MAX_STR_LEN]; WCHAR szModifyBtn[MAX_STR_LEN]; WCHAR szSelectAll[MAX_STR_LEN]; + WCHAR szRefreshBtn[MAX_STR_LEN]; + WCHAR szUpdateDbBtn[MAX_STR_LEN]; VOID AddImageToImageList(HIMAGELIST hImageList, UINT ImageIndex);

1 0

[reactos] 01/01: [LIBWINE] Fix GCC build warning. (#4938)
by Hermès Bélusca-Maïto 06 Jan '23

06 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2714e3ee488c69bc3478f… commit 2714e3ee488c69bc3478fb7e8768e73cf735f73b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 10 18:47:34 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jan 6 13:17:21 2023 +0100 [LIBWINE] Fix GCC build warning. (#4938) In file included from ../sdk/lib/3rdparty/libwine/debug_ros.c:9: ../sdk/lib/3rdparty/libwine/debug.c: In function 'get_temp_buffer': ../sdk/lib/3rdparty/libwine/debug.c:343:33: warning: passing argument 1 of '_InterlockedExchangeAdd' from incompatible pointer type [-Wincompatible-pointer-types] idx = interlocked_xchg_add( &pos, 1 ) % (sizeof(list)/sizeof(list[0])); ^~~~ In file included from ../sdk/include/crt/mingw32/intrin.h:98, from ../sdk/include/crt/intrin.h:1017, from sdk/include/psdk/winnt.h:48, from ../sdk/include/psdk/windef.h:202, from ../sdk/include/reactos/wine/debug.h:26, from ../sdk/lib/3rdparty/libwine/debug.c:32, from ../sdk/lib/3rdparty/libwine/debug_ros.c:9: ../sdk/include/crt/mingw32/intrin_x86.h:215:70: note: expected 'volatile long int *' but argument is of type 'int *' __INTRIN_INLINE long __cdecl _InterlockedExchangeAdd(volatile long * Addend, long Value) ~~~~~~~~~~~~~~~~^~~~~~ --- sdk/lib/3rdparty/libwine/debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/3rdparty/libwine/debug.c b/sdk/lib/3rdparty/libwine/debug.c index 9c6eba2c77f..b4814e63698 100644 --- a/sdk/lib/3rdparty/libwine/debug.c +++ b/sdk/lib/3rdparty/libwine/debug.c @@ -336,9 +336,9 @@ int ros_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *chann static char *get_temp_buffer( size_t size ) { static char *list[32]; - static int pos; + static long pos = 0; char *ret; - int idx; + long idx; idx = interlocked_xchg_add( &pos, 1 ) % (sizeof(list)/sizeof(list[0])); if ((ret = realloc( list[idx], size ))) list[idx] = ret;

1 0

[reactos] 12/12: [WIN32K] Add some NULL checks for THREADINFO::rpdesk
by Timo Kreuzer 04 Jan '23

04 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abb75b621472646b4bc06… commit abb75b621472646b4bc06f11e05c012358c85f35 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Dec 26 16:11:14 2022 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 4 10:32:28 2023 +0100 [WIN32K] Add some NULL checks for THREADINFO::rpdesk rpdesk should probably never be NULL, but it happens in rare circumstances, like csrss being terminated. --- win32ss/user/ntuser/desktop.c | 8 ++++++++ win32ss/user/ntuser/window.c | 2 +- win32ss/user/ntuser/winpos.c | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 2344fea0c01..16b7aa0b8c2 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -1788,6 +1788,14 @@ BOOL IntDeRegisterShellHookWindow(HWND hWnd) PLIST_ENTRY ListEntry; PSHELL_HOOK_WINDOW Current; + // FIXME: This probably shouldn't happen, but it does + if (Desktop == NULL) + { + Desktop = IntGetActiveDesktop(); + if (Desktop == NULL) + return FALSE; + } + ListEntry = Desktop->ShellHookWindows.Flink; while (ListEntry != &Desktop->ShellHookWindows) { diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 691b3f2996c..1c2b0474c08 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -493,7 +493,7 @@ static void IntSendDestroyMsg(HWND hWnd) } /* If the window being destroyed is currently tracked... */ - if (ti->rpdesk->spwndTrack == Window) + if (ti->rpdesk && ti->rpdesk->spwndTrack == Window) { IntRemoveTrackMouseEvent(ti->rpdesk); } diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 79e29730f1e..f9ce2583b87 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -436,12 +436,12 @@ co_WinPosActivateOtherWindow(PWND Wnd) // Find any window to bring to top. Works Okay for wine since it does not see X11 windows. WndTo = UserGetDesktopWindow(); - WndTo = WndTo->spwndChild; - if ( WndTo == NULL ) + if ((WndTo == NULL) || (WndTo->spwndChild == NULL)) { //ERR("WinPosActivateOtherWindow No window!\n"); return; } + WndTo = WndTo->spwndChild; for (;;) { if (WndTo == Wnd)

1 0

[reactos] 11/12: [WIN32K] Properly reference owner window
by Timo Kreuzer 04 Jan '23

04 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e56da4854fd3c93b3444e… commit e56da4854fd3c93b3444e11bbbbdb219fa2f2559 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Dec 6 07:02:12 2022 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 4 10:32:28 2023 +0100 [WIN32K] Properly reference owner window --- win32ss/user/ntuser/ime.c | 10 +++++----- win32ss/user/ntuser/window.c | 17 ++++++----------- win32ss/user/ntuser/window.h | 19 +++++++++++++++++++ 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 5c15a2375dd..97021f0daca 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -1192,7 +1192,7 @@ VOID FASTCALL IntImeSetFutureOwner(PWND pImeWnd, PWND pwndOwner) pwndParent = pwndNode->spwndParent; if (!pwndParent || pwndOwner != pwndNode) { - pImeWnd->spwndOwner = pwndNode; + WndSetOwner(pImeWnd, pwndNode); return; } @@ -1218,7 +1218,7 @@ VOID FASTCALL IntImeSetFutureOwner(PWND pImeWnd, PWND pwndOwner) } } - pImeWnd->spwndOwner = pwndNode; + WndSetOwner(pImeWnd, pwndNode); } // Get the last non-IME-like top-most window on the desktop. @@ -1401,7 +1401,7 @@ NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus) } } - pImeWnd->spwndOwner = pwndTopLevel; + WndSetOwner(pImeWnd, pwndTopLevel); IntImeCheckTopmost(pImeWnd); } else @@ -1413,7 +1413,7 @@ NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus) { if (pwndActive && ptiIme == pwndActive->head.pti && !IS_WND_IMELIKE(pwndActive)) { - pImeWnd->spwndOwner = pwndActive; + WndSetOwner(pImeWnd, pwndActive); } else { @@ -2127,7 +2127,7 @@ BOOL FASTCALL IntImeCanDestroyDefIME(PWND pImeWnd, PWND pwndTarget) if (pImeWnd->spwndOwner && pwndTarget != pImeWnd->spwndOwner) return FALSE; - pImeWnd->spwndOwner = NULL; + WndSetOwner(pImeWnd, NULL); return TRUE; } diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index e9026864d57..691b3f2996c 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -588,6 +588,7 @@ LRESULT co_UserFreeWindow(PWND Window, Window->style &= ~WS_VISIBLE; Window->head.pti->cVisWindows--; + WndSetOwner(Window, NULL); /* remove the window already at this point from the thread window list so we don't get into trouble when destroying the thread windows while we're still @@ -662,7 +663,7 @@ LRESULT co_UserFreeWindow(PWND Window, if (ThreadData->spwndDefaultIme && ThreadData->spwndDefaultIme->spwndOwner == Window) { - ThreadData->spwndDefaultIme->spwndOwner = NULL; + WndSetOwner(ThreadData->spwndDefaultIme, NULL); } if (IS_IMM_MODE() && Window == ThreadData->spwndDefaultIme) @@ -1091,6 +1092,7 @@ IntProcessOwnerSwap(PWND Wnd, PWND WndNewOwner, PWND WndOldOwner) // FIXME: System Tray checks. } +static HWND FASTCALL IntSetOwner(HWND hWnd, HWND hWndNewOwner) { @@ -1119,14 +1121,7 @@ IntSetOwner(HWND hWnd, HWND hWndNewOwner) if (IntValidateOwnerDepth(Wnd, WndNewOwner)) { - if (WndNewOwner) - { - Wnd->spwndOwner= WndNewOwner; - } - else - { - Wnd->spwndOwner = NULL; - } + WndSetOwner(Wnd, WndNewOwner); } else { @@ -1869,7 +1864,7 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, */ /* Remember, pWnd->head is setup in object.c ... */ pWnd->spwndParent = ParentWindow; - pWnd->spwndOwner = OwnerWindow; + WndSetOwner(pWnd, OwnerWindow); pWnd->fnid = 0; pWnd->spwndLastActive = pWnd; // Ramp up compatible version sets. @@ -2825,7 +2820,7 @@ VOID FASTCALL IntDestroyOwnedWindows(PWND Window) continue; } - pWnd->spwndOwner = NULL; + WndSetOwner(pWnd, NULL); if (IntWndBelongsToThread(pWnd, PsGetCurrentThreadWin32Thread())) { UserRefObjectCo(pWnd, &Ref); // Temp HACK? diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index 036cd690954..0a463b75c16 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -124,4 +124,23 @@ BOOL FASTCALL IntBroadcastImeShowStatusChange(PWND pImeWnd, BOOL bShow); VOID FASTCALL IntNotifyImeShowStatus(PWND pImeWnd); VOID FASTCALL IntCheckImeShowStatusInThread(PWND pImeWnd); +static inline +VOID +WndSetOwner(_Inout_ PWND pwnd, _In_opt_ PWND pwndOwner) +{ + /* First reference the new owner window */ + if (pwndOwner != NULL) + { + UserReferenceObject(pwndOwner); + } + + /* Now dereference the previous owner window */ + if (pwnd->spwndOwner != NULL) + { + UserDereferenceObject(pwnd->spwndOwner); + } + + pwnd->spwndOwner = pwndOwner; +} + /* EOF */

1 0

[reactos] 10/12: [NTOS] Fix interrupt flag handling in KiPageFault
by Timo Kreuzer 04 Jan '23

04 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12ed9f30a7d076022a74e… commit 12ed9f30a7d076022a74e99a1948f8133668a92a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Dec 15 21:44:43 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 4 10:32:28 2023 +0100 [NTOS] Fix interrupt flag handling in KiPageFault This fixes a crash in kmtest:ZwAllocateVirtualMemory --- ntoskrnl/ke/amd64/trap.S | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 9ca9dacde94..150d08d8133 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -417,13 +417,15 @@ FUNC KiPageFault mov rdx, cr2 mov [rbp + KTRAP_FRAME_FaultAddress], rdx - /* If interrupts are off, treat this as an access violation */ + /* If interrupts are off, do not enable them */ test dword ptr [rbp + KTRAP_FRAME_EFlags], EFLAGS_IF_MASK - jz AccessViolation + jz IntsDisabled /* Enable interrupts for the page fault handler */ sti +IntsDisabled: + /* Call page fault handler */ mov ecx, [rbp + KTRAP_FRAME_ErrorCode] // FaultCode // rdx == Address @@ -443,13 +445,10 @@ FUNC KiPageFault PageFaultError: - /* Disable interrupts again for the debugger */ - cli - /* Set parameter 1 to error code */ mov r9d, [rbp + KTRAP_FRAME_ErrorCode] - /* Set parameter2 to faulting address */ + /* Set parameter 2 to faulting address */ mov r10, cr2 // Param2 = faulting address cmp eax, STATUS_ACCESS_VIOLATION @@ -477,6 +476,10 @@ SpecialCode: call InternalDispatchException PageFaultReturn: + + /* Disable interrupts for the return */ + cli + /* Return */ ExitTrap (TF_SAVE_ALL or TF_CHECKUSERAPC) ENDFUNC

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs