uxtheme: Use straight assignments instead of CopyRect().
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
07f9f71278
commit
74a03b1adc
|
@ -98,9 +98,9 @@ HRESULT WINAPI DrawThemeParentBackground(HWND hwnd, HDC hdc, RECT *prc)
|
||||||
if(!hParent)
|
if(!hParent)
|
||||||
hParent = hwnd;
|
hParent = hwnd;
|
||||||
if(prc) {
|
if(prc) {
|
||||||
CopyRect(&rt, prc);
|
rt = *prc;
|
||||||
MapWindowPoints(hwnd, hParent, (LPPOINT)&rt, 2);
|
MapWindowPoints(hwnd, hParent, (LPPOINT)&rt, 2);
|
||||||
|
|
||||||
clip = CreateRectRgn(0,0,1,1);
|
clip = CreateRectRgn(0,0,1,1);
|
||||||
hasClip = GetClipRgn(hdc, clip);
|
hasClip = GetClipRgn(hdc, clip);
|
||||||
if(hasClip == -1)
|
if(hasClip == -1)
|
||||||
|
@ -142,7 +142,7 @@ HRESULT WINAPI DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId,
|
||||||
opts.dwFlags = 0;
|
opts.dwFlags = 0;
|
||||||
if(pClipRect) {
|
if(pClipRect) {
|
||||||
opts.dwFlags |= DTBG_CLIPRECT;
|
opts.dwFlags |= DTBG_CLIPRECT;
|
||||||
CopyRect(&opts.rcClip, pClipRect);
|
opts.rcClip = *pClipRect;
|
||||||
}
|
}
|
||||||
return DrawThemeBackgroundEx(hTheme, hdc, iPartId, iStateId, pRect, &opts);
|
return DrawThemeBackgroundEx(hTheme, hdc, iPartId, iStateId, pRect, &opts);
|
||||||
}
|
}
|
||||||
|
@ -578,7 +578,7 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId,
|
||||||
int sizingtype = ST_STRETCH;
|
int sizingtype = ST_STRETCH;
|
||||||
BOOL uniformsizing = FALSE;
|
BOOL uniformsizing = FALSE;
|
||||||
|
|
||||||
CopyRect(&rcDst, prc);
|
rcDst = *prc;
|
||||||
|
|
||||||
dstSize.x = rcDst.right-rcDst.left;
|
dstSize.x = rcDst.right-rcDst.left;
|
||||||
dstSize.y = rcDst.bottom-rcDst.top;
|
dstSize.y = rcDst.bottom-rcDst.top;
|
||||||
|
@ -2021,8 +2021,8 @@ HRESULT WINAPI GetThemeTextExtent(HTHEME hTheme, HDC hdc, int iPartId,
|
||||||
return E_HANDLE;
|
return E_HANDLE;
|
||||||
|
|
||||||
if(pBoundingRect)
|
if(pBoundingRect)
|
||||||
CopyRect(&rt, pBoundingRect);
|
rt = *pBoundingRect;
|
||||||
|
|
||||||
hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, TMT_FONT, &logfont);
|
hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, TMT_FONT, &logfont);
|
||||||
if(SUCCEEDED(hr)) {
|
if(SUCCEEDED(hr)) {
|
||||||
hFont = CreateFontIndirectW(&logfont);
|
hFont = CreateFontIndirectW(&logfont);
|
||||||
|
|
Loading…
Reference in New Issue