Skip to content
Permalink
Browse files

[0.4.12][WIN32SS] Workaround Marlett drawing for Window close buttons…

… CORE-16125

It regressed for RC by 0.4.12-RC-16-g
e1ac9dc

and for master by 0.4.13-dev-110-g
19fc941

Thanks to Katayama Hirofumi MZ, the workarounds author.
We think it is a workaround, so we will not commit to master.

Testbot runs (executed on master) seem to be non-alarming
VBox https://reactos.org/testman/compare.php?ids=68471,68479
KVM https://reactos.org/testman/compare.php?ids=68472,68480
  • Loading branch information...
JoachimHenze committed Jul 7, 2019
1 parent 021f498 commit 6f651b6ec5d25072cda94dcc3eca12fdcede6a38
Showing with 2 additions and 1 deletion.
  1. +1 −1 win32ss/user/ntuser/draw.c
  2. +1 −0 win32ss/user/user32/windows/draw.c
@@ -814,7 +814,7 @@ BOOL FASTCALL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
lf.lfWidth = 0;
lf.lfWeight = FW_NORMAL;
lf.lfCharSet = DEFAULT_CHARSET;
lf.lfQuality = NONANTIALIASED_QUALITY;
lf.lfQuality = ANTIALIASED_QUALITY;
RtlCopyMemory(lf.lfFaceName, L"Marlett", sizeof(L"Marlett"));
hFont = GreCreateFontIndirectW(&lf);
/* save font and text color */
@@ -842,6 +842,7 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
lf.lfWidth = 0;
lf.lfWeight = FW_NORMAL;
lf.lfCharSet = DEFAULT_CHARSET;
lf.lfQuality = ANTIALIASED_QUALITY;
lstrcpy(lf.lfFaceName, TEXT("Marlett"));
hFont = CreateFontIndirect(&lf);
/* save font and text color */

0 comments on commit 6f651b6

Please sign in to comment.
You can’t perform that action at this time.