mirror of
https://github.com/reactos/reactos.git
synced 2025-07-27 11:42:43 +00:00
clean up indentation, no code change
svn path=/trunk/; revision=30255
This commit is contained in:
parent
3eca2d9ddf
commit
ddbb4de935
1 changed files with 741 additions and 694 deletions
|
@ -184,8 +184,10 @@ static BOOL IntDrawDiagEdge(HDC hdc, LPRECT rc, UINT uType, UINT uFlags)
|
|||
}
|
||||
}
|
||||
|
||||
if(InnerI != -1) InnerPen = GetSysColorPen(InnerI);
|
||||
if(OuterI != -1) OuterPen = GetSysColorPen(OuterI);
|
||||
if(InnerI != -1)
|
||||
InnerPen = GetSysColorPen(InnerI);
|
||||
if(OuterI != -1)
|
||||
OuterPen = GetSysColorPen(OuterI);
|
||||
|
||||
MoveToEx(hdc, 0, 0, &SavePoint);
|
||||
|
||||
|
@ -346,10 +348,14 @@ static BOOL IntDrawDiagEdge(HDC hdc, LPRECT rc, UINT uType, UINT uFlags)
|
|||
/* Adjust rectangle if asked */
|
||||
if(uFlags & BF_ADJUST)
|
||||
{
|
||||
if(uFlags & BF_LEFT) rc->left += add;
|
||||
if(uFlags & BF_RIGHT) rc->right -= add;
|
||||
if(uFlags & BF_TOP) rc->top += add;
|
||||
if(uFlags & BF_BOTTOM) rc->bottom -= add;
|
||||
if(uFlags & BF_LEFT)
|
||||
rc->left += add;
|
||||
if(uFlags & BF_RIGHT)
|
||||
rc->right -= add;
|
||||
if(uFlags & BF_TOP)
|
||||
rc->top += add;
|
||||
if(uFlags & BF_BOTTOM)
|
||||
rc->bottom -= add;
|
||||
}
|
||||
|
||||
/* Cleanup */
|
||||
|
@ -485,15 +491,23 @@ static BOOL IntDrawRectEdge(HDC hdc, LPRECT rc, UINT uType, UINT uFlags)
|
|||
RBOuterI = RBOuterNormal[uType & (BDR_INNER|BDR_OUTER)];
|
||||
}
|
||||
|
||||
if((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT) LBpenplus = 1;
|
||||
if((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT) RTpenplus = 1;
|
||||
if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT) RBpenplus = 1;
|
||||
if((uFlags & BF_TOPLEFT) == BF_TOPLEFT) LTpenplus = 1;
|
||||
if((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT)
|
||||
LBpenplus = 1;
|
||||
if((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT)
|
||||
RTpenplus = 1;
|
||||
if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT)
|
||||
RBpenplus = 1;
|
||||
if((uFlags & BF_TOPLEFT) == BF_TOPLEFT)
|
||||
LTpenplus = 1;
|
||||
|
||||
if(LTInnerI != -1) LTInnerPen = GetSysColorPen(LTInnerI);
|
||||
if(LTOuterI != -1) LTOuterPen = GetSysColorPen(LTOuterI);
|
||||
if(RBInnerI != -1) RBInnerPen = GetSysColorPen(RBInnerI);
|
||||
if(RBOuterI != -1) RBOuterPen = GetSysColorPen(RBOuterI);
|
||||
if(LTInnerI != -1)
|
||||
LTInnerPen = GetSysColorPen(LTInnerI);
|
||||
if(LTOuterI != -1)
|
||||
LTOuterPen = GetSysColorPen(LTOuterI);
|
||||
if(RBInnerI != -1)
|
||||
RBInnerPen = GetSysColorPen(RBInnerI);
|
||||
if(RBOuterI != -1)
|
||||
RBOuterPen = GetSysColorPen(RBOuterI);
|
||||
if((uFlags & BF_MIDDLE) && retval)
|
||||
{
|
||||
FillRect(hdc, &InnerRect, GetSysColorBrush(uFlags & BF_MONO ?
|
||||
|
@ -554,10 +568,14 @@ static BOOL IntDrawRectEdge(HDC hdc, LPRECT rc, UINT uType, UINT uFlags)
|
|||
int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0)
|
||||
+ (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0);
|
||||
|
||||
if(uFlags & BF_LEFT) InnerRect.left += add;
|
||||
if(uFlags & BF_RIGHT) InnerRect.right -= add;
|
||||
if(uFlags & BF_TOP) InnerRect.top += add;
|
||||
if(uFlags & BF_BOTTOM) InnerRect.bottom -= add;
|
||||
if(uFlags & BF_LEFT)
|
||||
InnerRect.left += add;
|
||||
if(uFlags & BF_RIGHT)
|
||||
InnerRect.right -= add;
|
||||
if(uFlags & BF_TOP)
|
||||
InnerRect.top += add;
|
||||
if(uFlags & BF_BOTTOM)
|
||||
InnerRect.bottom -= add;
|
||||
|
||||
if(uFlags & BF_ADJUST)
|
||||
*rc = InnerRect;
|
||||
|
@ -683,8 +701,10 @@ static BOOL UITOOLS95_DFC_ButtonCheck(HDC dc, LPRECT r, UINT uFlags)
|
|||
UINT flags = BF_RECT | BF_ADJUST;
|
||||
UITOOLS_MakeSquareRect(r, &myr);
|
||||
|
||||
if(uFlags & DFCS_FLAT) flags |= BF_FLAT;
|
||||
else if(uFlags & DFCS_MONO) flags |= BF_MONO;
|
||||
if(uFlags & DFCS_FLAT)
|
||||
flags |= BF_FLAT;
|
||||
else if(uFlags & DFCS_MONO)
|
||||
flags |= BF_MONO;
|
||||
|
||||
IntDrawRectEdge( dc, &myr, EDGE_SUNKEN, flags );
|
||||
|
||||
|
@ -1404,7 +1424,7 @@ IntGrayString(
|
|||
|
||||
if (! BitBlt(hDC, X, Y, nWidth, nHeight, MemDC, 0, 0, SRCCOPY)) goto cleanup;
|
||||
|
||||
cleanup :
|
||||
cleanup:
|
||||
SetTextColor(hDC, ForeColor);
|
||||
SetBkColor(hDC, BackColor);
|
||||
|
||||
|
@ -1449,7 +1469,8 @@ static BOOL PAINTING_DrawStateJam(HDC hdc, UINT opcode,
|
|||
|
||||
case DST_BITMAP:
|
||||
memdc = CreateCompatibleDC(hdc);
|
||||
if(!memdc) return FALSE;
|
||||
if(!memdc)
|
||||
return FALSE;
|
||||
hbmsave = (HBITMAP)SelectObject(memdc, (HBITMAP)lp);
|
||||
if(!hbmsave)
|
||||
{
|
||||
|
@ -1462,7 +1483,8 @@ static BOOL PAINTING_DrawStateJam(HDC hdc, UINT opcode,
|
|||
return retval;
|
||||
|
||||
case DST_COMPLEX:
|
||||
if(func) {
|
||||
if(func)
|
||||
{
|
||||
BOOL bRet;
|
||||
/* DRAWSTATEPROC assumes that it draws at the center of coordinates */
|
||||
|
||||
|
@ -1471,9 +1493,12 @@ static BOOL PAINTING_DrawStateJam(HDC hdc, UINT opcode,
|
|||
/* Restore origin */
|
||||
OffsetViewportOrgEx(hdc, -rc->left, -rc->top, NULL);
|
||||
return bRet;
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
@ -1515,7 +1540,8 @@ IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp,
|
|||
retval = GetTextExtentPoint32W(hdc, (LPWSTR)lp, len, &s);
|
||||
else
|
||||
retval = GetTextExtentPoint32A(hdc, (LPSTR)lp, len, &s);
|
||||
if(!retval) return FALSE;
|
||||
if(!retval)
|
||||
return FALSE;
|
||||
break;
|
||||
|
||||
case DST_ICON:
|
||||
|
@ -1538,8 +1564,10 @@ IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp,
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
if(!cx) cx = s.cx;
|
||||
if(!cy) cy = s.cy;
|
||||
if(!cx)
|
||||
cx = s.cx;
|
||||
if(!cy)
|
||||
cy = s.cy;
|
||||
}
|
||||
|
||||
rc.left = x;
|
||||
|
@ -1568,15 +1596,19 @@ IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp,
|
|||
|
||||
/* From here on we must use "goto cleanup" when something goes wrong */
|
||||
hbm = CreateBitmap(cx, cy, 1, 1, NULL);
|
||||
if(!hbm) goto cleanup;
|
||||
if(!hbm)
|
||||
goto cleanup;
|
||||
memdc = CreateCompatibleDC(hdc);
|
||||
if(!memdc) goto cleanup;
|
||||
if(!memdc)
|
||||
goto cleanup;
|
||||
hbmsave = (HBITMAP)SelectObject(memdc, hbm);
|
||||
if(!hbmsave) goto cleanup;
|
||||
if(!hbmsave)
|
||||
goto cleanup;
|
||||
rc.left = rc.top = 0;
|
||||
rc.right = cx;
|
||||
rc.bottom = cy;
|
||||
if(!FillRect(memdc, &rc, (HBRUSH)GetStockObject(WHITE_BRUSH))) goto cleanup;
|
||||
if(!FillRect(memdc, &rc, (HBRUSH)GetStockObject(WHITE_BRUSH)))
|
||||
goto cleanup;
|
||||
SetBkColor(memdc, RGB(255, 255, 255));
|
||||
SetTextColor(memdc, RGB(0, 0, 0));
|
||||
hfsave = (HFONT)SelectObject(memdc, GetCurrentObject(hdc, OBJ_FONT));
|
||||
|
@ -1584,20 +1616,25 @@ IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp,
|
|||
/* DST_COMPLEX may draw text as well,
|
||||
* so we must be sure that correct font is selected
|
||||
*/
|
||||
if(!hfsave && (opcode <= DST_PREFIXTEXT)) goto cleanup;
|
||||
if(!hfsave && (opcode <= DST_PREFIXTEXT))
|
||||
goto cleanup;
|
||||
tmp = PAINTING_DrawStateJam(memdc, opcode, func, lp, len, &rc, dtflags, unicode);
|
||||
if(hfsave) SelectObject(memdc, hfsave);
|
||||
if(!tmp) goto cleanup;
|
||||
if(hfsave)
|
||||
SelectObject(memdc, hfsave);
|
||||
if(!tmp)
|
||||
goto cleanup;
|
||||
|
||||
/* This state cause the image to be dithered */
|
||||
if(flags & DSS_UNION)
|
||||
{
|
||||
#if 0
|
||||
hbsave = (HBRUSH)SelectObject(memdc, CACHE_GetPattern55AABrush());
|
||||
if(!hbsave) goto cleanup;
|
||||
if(!hbsave)
|
||||
goto cleanup;
|
||||
tmp = PatBlt(memdc, 0, 0, cx, cy, 0x00FA0089);
|
||||
SelectObject(memdc, hbsave);
|
||||
if(!tmp) goto cleanup;
|
||||
if(!tmp)
|
||||
goto cleanup;
|
||||
#else
|
||||
UNIMPLEMENTED;
|
||||
#endif
|
||||
|
@ -1611,10 +1648,13 @@ IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp,
|
|||
/* Draw light or dark shadow */
|
||||
if (flags & (DSS_DISABLED|DSS_DEFAULT))
|
||||
{
|
||||
if(!hbrtmp) goto cleanup;
|
||||
if(!hbrtmp)
|
||||
goto cleanup;
|
||||
hbsave = (HBRUSH)SelectObject(hdc, hbrtmp);
|
||||
if(!hbsave) goto cleanup;
|
||||
if(!BitBlt(hdc, x+1, y+1, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup;
|
||||
if(!hbsave)
|
||||
goto cleanup;
|
||||
if(!BitBlt(hdc, x+1, y+1, cx, cy, memdc, 0, 0, 0x00B8074A))
|
||||
goto cleanup;
|
||||
SelectObject(hdc, hbsave);
|
||||
DeleteObject(hbrtmp);
|
||||
hbrtmp = 0;
|
||||
|
@ -1623,7 +1663,8 @@ IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp,
|
|||
if (flags & DSS_DISABLED)
|
||||
{
|
||||
hbr = hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DSHADOW));
|
||||
if(!hbrtmp) goto cleanup;
|
||||
if(!hbrtmp)
|
||||
goto cleanup;
|
||||
}
|
||||
else if (!hbr)
|
||||
{
|
||||
|
@ -1632,7 +1673,8 @@ IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp,
|
|||
|
||||
hbsave = (HBRUSH)SelectObject(hdc, hbr);
|
||||
|
||||
if(!BitBlt(hdc, x, y, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup;
|
||||
if(!BitBlt(hdc, x, y, cx, cy, memdc, 0, 0, 0x00B8074A))
|
||||
goto cleanup;
|
||||
|
||||
retval = TRUE; /* We succeeded */
|
||||
|
||||
|
@ -1640,11 +1682,16 @@ cleanup:
|
|||
SetTextColor(hdc, fg);
|
||||
SetBkColor(hdc, bg);
|
||||
|
||||
if(hbsave) SelectObject(hdc, hbsave);
|
||||
if(hbmsave) SelectObject(memdc, hbmsave);
|
||||
if(hbrtmp) DeleteObject(hbrtmp);
|
||||
if(hbm) DeleteObject(hbm);
|
||||
if(memdc) DeleteDC(memdc);
|
||||
if(hbsave)
|
||||
SelectObject(hdc, hbsave);
|
||||
if(hbmsave)
|
||||
SelectObject(memdc, hbmsave);
|
||||
if(hbrtmp)
|
||||
DeleteObject(hbrtmp);
|
||||
if(hbm)
|
||||
DeleteObject(hbm);
|
||||
if(memdc)
|
||||
DeleteDC(memdc);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue