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
0874c7be
Commit
0874c7be
authored
Jan 15, 2016
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jan 15, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Store locale name range attribute in lower case.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c5fce83f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
layout.c
dlls/dwrite/layout.c
+3
-1
layout.c
dlls/dwrite/tests/layout.c
+1
-3
No files found.
dlls/dwrite/layout.c
View file @
0874c7be
...
...
@@ -2158,8 +2158,10 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_
break
;
case
LAYOUT_RANGE_ATTR_LOCALE
:
changed
=
strcmpiW
(
dest
->
locale
,
value
->
u
.
locale
)
!=
0
;
if
(
changed
)
if
(
changed
)
{
strcpyW
(
dest
->
locale
,
value
->
u
.
locale
);
strlwrW
(
dest
->
locale
);
}
break
;
case
LAYOUT_RANGE_ATTR_FONTFAMILY
:
changed
=
strcmpW
(
dest
->
fontfamily
,
value
->
u
.
fontfamily
)
!=
0
;
...
...
dlls/dwrite/tests/layout.c
View file @
0874c7be
...
...
@@ -2097,7 +2097,6 @@ if (0) /* crashes on native */
range
.
length
=
0
;
hr
=
IDWriteTextLayout_GetLocaleName
(
layout
,
0
,
buffW
,
sizeof
(
buffW
)
/
sizeof
(
WCHAR
),
&
range
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
todo_wine
ok
(
!
lstrcmpW
(
buffW
,
enusW
),
"got %s
\n
"
,
wine_dbgstr_w
(
buffW
));
ok
((
range
.
startPosition
==
0
&&
range
.
length
==
~
0u
)
||
broken
(
range
.
startPosition
==
0
&&
range
.
length
==
4
)
/* vista/win7 */
,
"got %u,%u
\n
"
,
range
.
startPosition
,
range
.
length
);
...
...
@@ -2107,7 +2106,6 @@ todo_wine
range
.
length
=
0
;
hr
=
IDWriteTextLayout_GetLocaleName
(
layout
,
100
,
buffW
,
sizeof
(
buffW
)
/
sizeof
(
WCHAR
),
&
range
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
todo_wine
ok
(
!
lstrcmpW
(
buffW
,
enusW
),
"got %s
\n
"
,
wine_dbgstr_w
(
buffW
));
ok
((
range
.
startPosition
==
0
&&
range
.
length
==
~
0u
)
||
broken
(
range
.
startPosition
==
4
&&
range
.
length
==
~
0u
-
4
)
/* vista/win7 */
,
"got %u,%u
\n
"
,
range
.
startPosition
,
range
.
length
);
...
...
@@ -4418,7 +4416,7 @@ todo_wine
flush_sequence
(
sequences
,
RENDERER_ID
);
hr
=
IDWriteTextLayout_Draw
(
layout
,
NULL
,
&
testrenderer
,
0
.
0
f
,
0
.
0
f
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok_sequence
(
sequences
,
RENDERER_ID
,
drawunderline3_seq
,
"draw underline test 2"
,
TRU
E
);
ok_sequence
(
sequences
,
RENDERER_ID
,
drawunderline3_seq
,
"draw underline test 2"
,
FALS
E
);
IDWriteTextLayout_Release
(
layout
);
...
...
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