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
e8c4951a
Commit
e8c4951a
authored
Jun 17, 2015
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jun 19, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Actually set isWhitespace for space clusters.
parent
f68f6315
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
layout.c
dlls/dwrite/layout.c
+2
-2
layout.c
dlls/dwrite/tests/layout.c
+2
-3
No files found.
dlls/dwrite/layout.c
View file @
e8c4951a
...
@@ -495,10 +495,10 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout,
...
@@ -495,10 +495,10 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout,
metrics
->
canWrapLineAfter
=
breakcondition
==
DWRITE_BREAK_CONDITION_CAN_BREAK
||
metrics
->
canWrapLineAfter
=
breakcondition
==
DWRITE_BREAK_CONDITION_CAN_BREAK
||
breakcondition
==
DWRITE_BREAK_CONDITION_MUST_BREAK
;
breakcondition
==
DWRITE_BREAK_CONDITION_MUST_BREAK
;
if
(
metrics
->
length
==
1
)
{
if
(
metrics
->
length
==
1
)
{
WORD
type
;
WORD
type
=
0
;
GetStringTypeW
(
CT_CTYPE1
,
&
layout
->
str
[
position
],
1
,
&
type
);
GetStringTypeW
(
CT_CTYPE1
,
&
layout
->
str
[
position
],
1
,
&
type
);
metrics
->
isWhitespace
=
type
==
C1_SPACE
;
metrics
->
isWhitespace
=
!!
(
type
&
C1_SPACE
)
;
metrics
->
isNewline
=
FALSE
/* FIXME */
;
metrics
->
isNewline
=
FALSE
/* FIXME */
;
metrics
->
isSoftHyphen
=
layout
->
str
[
position
]
==
0x00ad
/* Unicode Soft Hyphen */
;
metrics
->
isSoftHyphen
=
layout
->
str
[
position
]
==
0x00ad
/* Unicode Soft Hyphen */
;
}
}
...
...
dlls/dwrite/tests/layout.c
View file @
e8c4951a
...
@@ -1716,7 +1716,6 @@ todo_wine
...
@@ -1716,7 +1716,6 @@ todo_wine
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
count
==
2
,
"got %u
\n
"
,
count
);
ok
(
count
==
2
,
"got %u
\n
"
,
count
);
ok
(
metrics
[
0
].
isWhitespace
==
0
,
"got %d
\n
"
,
metrics
[
0
].
isWhitespace
);
ok
(
metrics
[
0
].
isWhitespace
==
0
,
"got %d
\n
"
,
metrics
[
0
].
isWhitespace
);
todo_wine
ok
(
metrics
[
1
].
isWhitespace
==
1
,
"got %d
\n
"
,
metrics
[
1
].
isWhitespace
);
ok
(
metrics
[
1
].
isWhitespace
==
1
,
"got %d
\n
"
,
metrics
[
1
].
isWhitespace
);
IDWriteTextLayout_Release
(
layout
);
IDWriteTextLayout_Release
(
layout
);
...
@@ -2746,10 +2745,10 @@ static void test_GetLineMetrics(void)
...
@@ -2746,10 +2745,10 @@ static void test_GetLineMetrics(void)
memset
(
&
metrics
,
0
,
sizeof
(
metrics
));
memset
(
&
metrics
,
0
,
sizeof
(
metrics
));
hr
=
IDWriteTextLayout_GetLineMetrics
(
layout
,
&
metrics
,
1
,
&
count
);
hr
=
IDWriteTextLayout_GetLineMetrics
(
layout
,
&
metrics
,
1
,
&
count
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
todo_wine
{
todo_wine
ok
(
metrics
.
length
==
5
,
"got %u
\n
"
,
metrics
.
length
);
ok
(
metrics
.
length
==
5
,
"got %u
\n
"
,
metrics
.
length
);
ok
(
metrics
.
trailingWhitespaceLength
==
1
,
"got %u
\n
"
,
metrics
.
trailingWhitespaceLength
);
ok
(
metrics
.
trailingWhitespaceLength
==
1
,
"got %u
\n
"
,
metrics
.
trailingWhitespaceLength
);
}
ok
(
metrics
.
newlineLength
==
0
,
"got %u
\n
"
,
metrics
.
newlineLength
);
ok
(
metrics
.
newlineLength
==
0
,
"got %u
\n
"
,
metrics
.
newlineLength
);
ok
(
metrics
.
isTrimmed
==
FALSE
,
"got %d
\n
"
,
metrics
.
isTrimmed
);
ok
(
metrics
.
isTrimmed
==
FALSE
,
"got %d
\n
"
,
metrics
.
isTrimmed
);
...
...
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