ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uxtheme: Use straight assignments instead of CopyRect(). 

Signed-off-by: Hadrien Boizard <h.boizard@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hadrien Boizard 2016-11-04 16:56:23 +01:00 committed by Alexandre Julliard
parent ad77b4c5fd
commit 3155079e41
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/uxtheme/draw.c
View File

@ -686,7 +686,7 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId,
} }
oldSrc = SelectObject(hdcSrc, bmpSrc); oldSrc = SelectObject(hdcSrc, bmpSrc);
CopyRect(&rcDst, pRect); rcDst = *pRect;
get_transparency (hTheme, iPartId, iStateId, hasAlpha, &transparent, get_transparency (hTheme, iPartId, iStateId, hasAlpha, &transparent,
&transparentcolor, FALSE); &transparentcolor, FALSE);
@ -863,7 +863,7 @@ draw_error:
DeleteDC(hdcSrc); DeleteDC(hdcSrc);
if (bmpSrcResized) DeleteObject(bmpSrcResized); if (bmpSrcResized) DeleteObject(bmpSrcResized);
if (hdcOrigSrc) DeleteDC(hdcOrigSrc); if (hdcOrigSrc) DeleteDC(hdcOrigSrc);
CopyRect(pRect, &rcDst); *pRect = rcDst;
return hr; return hr;
} }
@ -1001,7 +1001,7 @@ static HRESULT UXTHEME_DrawBorderBackground(HTHEME hTheme, HDC hdc, int iPartId,
HRESULT hr; HRESULT hr;
RECT rt; RECT rt;
CopyRect(&rt, pRect); rt = *pRect;
hr = UXTHEME_DrawBorderRectangle(hTheme, hdc, iPartId, iStateId, &rt, pOptions); hr = UXTHEME_DrawBorderRectangle(hTheme, hdc, iPartId, iStateId, &rt, pOptions);
if(FAILED(hr)) if(FAILED(hr))
@ -1043,7 +1043,7 @@ HRESULT WINAPI DrawThemeBackgroundEx(HTHEME hTheme, HDC hdc, int iPartId,
else else
IntersectClipRect(hdc, opts->rcClip.left, opts->rcClip.top, opts->rcClip.right, opts->rcClip.bottom); IntersectClipRect(hdc, opts->rcClip.left, opts->rcClip.top, opts->rcClip.right, opts->rcClip.bottom);
} }
CopyRect(&rt, pRect); rt = *pRect;
if(bgtype == BT_IMAGEFILE) if(bgtype == BT_IMAGEFILE)
hr = UXTHEME_DrawImageBackground(hTheme, hdc, iPartId, iStateId, &rt, opts); hr = UXTHEME_DrawImageBackground(hTheme, hdc, iPartId, iStateId, &rt, opts);
@ -1641,7 +1641,7 @@ HRESULT WINAPI DrawThemeText(HTHEME hTheme, HDC hdc, int iPartId, int iStateId,
TRACE("%d %d\n", iPartId, iStateId); TRACE("%d %d\n", iPartId, iStateId);
CopyRect(&rt, pRect); rt = *pRect;
opts.dwSize = sizeof(opts); opts.dwSize = sizeof(opts);
if (flags2 & DTT_GRAYED) { if (flags2 & DTT_GRAYED) {
@ -2033,7 +2033,7 @@ HRESULT WINAPI GetThemeTextExtent(HTHEME hTheme, HDC hdc, int iPartId,
oldFont = SelectObject(hdc, hFont); oldFont = SelectObject(hdc, hFont);
DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags|DT_CALCRECT); DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags|DT_CALCRECT);
CopyRect(pExtentRect, &rt); *pExtentRect = rt;
if(hFont) { if(hFont) {
SelectObject(hdc, oldFont); SelectObject(hdc, oldFont);