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
73c7420c
Commit
73c7420c
authored
May 02, 2006
by
Troy Rollo
Committed by
Alexandre Julliard
May 05, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi: Fix GetTextExentExPointW to return values consistent with GetTextExtentPointW.
parent
4bb446f8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
font.c
dlls/gdi/font.c
+2
-3
No files found.
dlls/gdi/font.c
View file @
73c7420c
...
...
@@ -1239,12 +1239,12 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count,
size
->
cx
=
size
->
cy
=
nFit
=
extent
=
0
;
for
(
index
=
0
;
index
<
count
;
index
++
)
{
if
(
!
GetTextExtentPoint32W
(
hdc
,
str
,
1
,
&
tSize
))
goto
done
;
if
(
!
GetTextExtentPoint32W
(
hdc
,
str
,
index
+
1
,
&
tSize
))
goto
done
;
/* GetTextExtentPoint includes intercharacter spacing. */
/* FIXME - justification needs doing yet. Remember that the base
* data will not be in logical coordinates.
*/
extent
+
=
tSize
.
cx
;
extent
=
tSize
.
cx
;
if
(
!
lpnFit
||
extent
<=
maxExt
)
/* It is allowed to be equal. */
{
...
...
@@ -1252,7 +1252,6 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count,
if
(
alpDx
)
alpDx
[
index
]
=
extent
;
}
if
(
tSize
.
cy
>
size
->
cy
)
size
->
cy
=
tSize
.
cy
;
str
++
;
}
size
->
cx
=
extent
;
if
(
lpnFit
)
*
lpnFit
=
nFit
;
...
...
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