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
863d29ca
Commit
863d29ca
authored
Oct 26, 2023
by
Hans Leidekker
Committed by
Alexandre Julliard
Oct 30, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32u: Get rid of a special case for non-scalable fonts in NtGdiGetCharABCWidthsW().
parent
31fd0701
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
13 deletions
+1
-13
font.c
dlls/gdi32/tests/font.c
+1
-1
font.c
dlls/win32u/font.c
+0
-12
No files found.
dlls/gdi32/tests/font.c
View file @
863d29ca
...
...
@@ -1186,7 +1186,7 @@ static void test_GetCharABCWidths(void)
ok
(
!
ret
,
"GetCharABCWidthsW should have failed
\n
"
);
ret
=
GetCharABCWidthsW
(
hdc
,
'a'
,
'a'
,
abc
);
ok
(
!
ret
,
"GetCharABCWidthsW should have fail
ed
\n
"
);
ok
(
ret
||
broken
(
!
ret
)
/* < win10 */
,
"GetCharABCWidthsW should have succeed
ed
\n
"
);
ret
=
GetCharABCWidthsFloatW
(
NULL
,
'a'
,
'a'
,
abcf
);
ok
(
!
ret
,
"GetCharABCWidthsFloatW should have failed
\n
"
);
...
...
dlls/win32u/font.c
View file @
863d29ca
...
...
@@ -6243,7 +6243,6 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars
PHYSDEV
dev
;
unsigned
int
i
,
count
=
last
;
BOOL
ret
;
TEXTMETRICW
tm
;
if
(
!
dc
)
return
FALSE
;
...
...
@@ -6260,17 +6259,6 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars
}
else
{
if
(
flags
&
NTGDI_GETCHARABCWIDTHS_INT
)
{
/* unlike float variant, this one is supposed to fail on non-scalable fonts */
dev
=
GET_DC_PHYSDEV
(
dc
,
pGetTextMetrics
);
if
(
!
dev
->
funcs
->
pGetTextMetrics
(
dev
,
&
tm
)
||
!
(
tm
.
tmPitchAndFamily
&
TMPF_VECTOR
))
{
release_dc_ptr
(
dc
);
return
FALSE
;
}
}
if
(
!
chars
)
count
=
last
-
first
+
1
;
dev
=
GET_DC_PHYSDEV
(
dc
,
pGetCharABCWidths
);
ret
=
dev
->
funcs
->
pGetCharABCWidths
(
dev
,
first
,
count
,
chars
,
buffer
);
...
...
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