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
e6ce0e9f
Commit
e6ce0e9f
authored
Mar 13, 2015
by
Nikolay Sivov
Committed by
Alexandre Julliard
Mar 13, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Fix GetClusterMetrics() return value.
parent
8a46a010
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
layout.c
dlls/dwrite/layout.c
+1
-1
layout.c
dlls/dwrite/tests/layout.c
+2
-3
No files found.
dlls/dwrite/layout.c
View file @
e6ce0e9f
...
...
@@ -1730,7 +1730,7 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa
memcpy
(
metrics
,
This
->
clusters
,
sizeof
(
DWRITE_CLUSTER_METRICS
)
*
min
(
max_count
,
This
->
clusters_count
));
*
count
=
This
->
clusters_count
;
return
max_count
<
This
->
clusters_count
?
S_OK
:
E_NOT_SUFFICIENT_BUFFER
;
return
max_count
>=
This
->
clusters_count
?
S_OK
:
E_NOT_SUFFICIENT_BUFFER
;
}
static
HRESULT
WINAPI
dwritetextlayout_DetermineMinWidth
(
IDWriteTextLayout2
*
iface
,
FLOAT
*
min_width
)
...
...
dlls/dwrite/tests/layout.c
View file @
e6ce0e9f
...
...
@@ -947,7 +947,6 @@ static void test_GetClusterMetrics(void)
count
=
0
;
hr
=
IDWriteTextLayout_GetClusterMetrics
(
layout
,
NULL
,
0
,
&
count
);
todo_wine
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"got 0x%08x
\n
"
,
hr
);
ok
(
count
==
4
,
"got %u
\n
"
,
count
);
...
...
@@ -962,10 +961,10 @@ todo_wine
/* inline object takes a separate cluster, replaced codepoints number doesn't matter */
count
=
0
;
hr
=
IDWriteTextLayout_GetClusterMetrics
(
layout
,
NULL
,
0
,
&
count
);
todo_wine
{
ok
(
hr
==
E_NOT_SUFFICIENT_BUFFER
,
"got 0x%08x
\n
"
,
hr
);
todo_wine
ok
(
count
==
3
,
"got %u
\n
"
,
count
);
}
IDWriteInlineObject_Release
(
trimm
);
IDWriteTextLayout_Release
(
layout
);
IDWriteTextFormat_Release
(
format
);
...
...
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