Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
3155079e
Commit
3155079e
authored
Nov 04, 2016
by
Hadrien Boizard
Committed by
Alexandre Julliard
Nov 08, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
uxtheme: Use straight assignments instead of CopyRect().
Signed-off-by:
Hadrien Boizard
<
h.boizard@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ad77b4c5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
draw.c
dlls/uxtheme/draw.c
+6
-6
No files found.
dlls/uxtheme/draw.c
View file @
3155079e
...
@@ -686,7 +686,7 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId,
...
@@ -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:
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment