Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 09:16:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.7][WIN32SS] Fix Mask for Draw Frame States CORE-8808

Browse source 
Fixes drawing of caption bar buttons (min/max/close in Mozilla Firefox titlebar when its menubar is disabled).
See CORE-8808.

The fix is a partial port of 0.4.14-dev-1314-g acf135d16d
I left out all changes to the logging and took only the essence of this patch.
This commit is contained in:
Joachim Henze 2022-01-30 22:51:37 +01:00
parent 8ce0417afb
commit 977f89dc13
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
win32ss/user/ntuser/draw.c
View file

@ -757,7 +757,7 @@ BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL
/* Ported from WINE20020904 */ /* Ported from WINE20020904 */
BOOL FASTCALL UITOOLS95_DrawFrameButton(HDC hdc, LPRECT rc, UINT uState) BOOL FASTCALL UITOOLS95_DrawFrameButton(HDC hdc, LPRECT rc, UINT uState)
{ {
switch(uState & 0xff) switch(uState & 0x1f)
{ {
case DFCS_BUTTONPUSH: case DFCS_BUTTONPUSH:
return UITOOLS95_DFC_ButtonPush(hdc, rc, uState); return UITOOLS95_DFC_ButtonPush(hdc, rc, uState);
@ -787,7 +787,7 @@ BOOL FASTCALL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
RECT myr; RECT myr;
INT bkmode; INT bkmode;
WCHAR Symbol; WCHAR Symbol;
switch(uFlags & 0xff) switch(uFlags & 0xf)
{ {
case DFCS_CAPTIONCLOSE: case DFCS_CAPTIONCLOSE:
Symbol = 'r'; Symbol = 'r';
@ -853,7 +853,7 @@ BOOL FASTCALL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags)
RECT myr; RECT myr;
INT bkmode; INT bkmode;
WCHAR Symbol; WCHAR Symbol;
switch(uFlags & 0xff) switch(uFlags & 0x1f)
{ {
case DFCS_SCROLLCOMBOBOX: case DFCS_SCROLLCOMBOBOX:
case DFCS_SCROLLDOWN: case DFCS_SCROLLDOWN:
@ -956,7 +956,7 @@ BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
RECT myr; RECT myr;
INT cxy; INT cxy;
cxy = UITOOLS_MakeSquareRect(r, &myr); cxy = UITOOLS_MakeSquareRect(r, &myr);
switch(uFlags & 0xff) switch(uFlags & 0x1f)
{ {
case DFCS_MENUARROWUP: case DFCS_MENUARROWUP:
Symbol = '5'; Symbol = '5';
@ -999,8 +999,8 @@ BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
/* save font */ /* save font */
hOldFont = NtGdiSelectFont(dc, hFont); hOldFont = NtGdiSelectFont(dc, hFont);
if ((uFlags & 0xff) == DFCS_MENUARROWUP || if ((uFlags & 0x1f) == DFCS_MENUARROWUP ||
(uFlags & 0xff) == DFCS_MENUARROWDOWN ) (uFlags & 0x1f) == DFCS_MENUARROWDOWN )
{ {
#if 0 #if 0
if (uFlags & DFCS_INACTIVE) if (uFlags & DFCS_INACTIVE)

12
win32ss/user/user32/windows/draw.c
View file

@ -781,7 +781,7 @@ static BOOL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL R
/* Ported from WINE20020904 */ /* Ported from WINE20020904 */
static BOOL UITOOLS95_DrawFrameButton(HDC hdc, LPRECT rc, UINT uState) static BOOL UITOOLS95_DrawFrameButton(HDC hdc, LPRECT rc, UINT uState)
{ {
switch(uState & 0xff) switch(uState & 0x1f)
{ {
case DFCS_BUTTONPUSH: case DFCS_BUTTONPUSH:
return UITOOLS95_DFC_ButtonPush(hdc, rc, uState); return UITOOLS95_DFC_ButtonPush(hdc, rc, uState);
@ -812,7 +812,7 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
RECT myr; RECT myr;
INT bkmode; INT bkmode;
TCHAR Symbol; TCHAR Symbol;
switch(uFlags & 0xff) switch(uFlags & 0xf)
{ {
case DFCS_CAPTIONCLOSE: case DFCS_CAPTIONCLOSE:
Symbol = 'r'; Symbol = 'r';
@ -879,7 +879,7 @@ static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags)
RECT myr; RECT myr;
INT bkmode; INT bkmode;
TCHAR Symbol; TCHAR Symbol;
switch(uFlags & 0xff) switch(uFlags & 0x1f)
{ {
case DFCS_SCROLLCOMBOBOX: case DFCS_SCROLLCOMBOBOX:
case DFCS_SCROLLDOWN: case DFCS_SCROLLDOWN:
@ -983,7 +983,7 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
RECT myr; RECT myr;
INT cxy; INT cxy;
cxy = UITOOLS_MakeSquareRect(r, &myr); cxy = UITOOLS_MakeSquareRect(r, &myr);
switch(uFlags & 0xff) switch(uFlags & 0x1f)
{ {
case DFCS_MENUARROWUP: case DFCS_MENUARROWUP:
Symbol = '5'; Symbol = '5';
@ -1024,8 +1024,8 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
/* save font */ /* save font */
hOldFont = SelectObject(dc, hFont); hOldFont = SelectObject(dc, hFont);
if ((uFlags & 0xff) == DFCS_MENUARROWUP || if ((uFlags & 0x1f) == DFCS_MENUARROWUP ||
(uFlags & 0xff) == DFCS_MENUARROWDOWN ) (uFlags & 0x1f) == DFCS_MENUARROWDOWN )
{ {
#if 0 #if 0
if (uFlags & DFCS_INACTIVE) if (uFlags & DFCS_INACTIVE)