Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
842e2e53
Commit
842e2e53
authored
May 15, 2017
by
Nikolay Sivov
Committed by
Alexandre Julliard
May 15, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Fix locale data buffer length passed to GetLocaleInfoEx().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a86fee5e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
analyzer.c
dlls/dwrite/analyzer.c
+6
-3
No files found.
dlls/dwrite/analyzer.c
View file @
842e2e53
...
...
@@ -31,6 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite);
extern
const
unsigned
short
wine_linebreak_table
[]
DECLSPEC_HIDDEN
;
extern
const
unsigned
short
wine_scripts_table
[]
DECLSPEC_HIDDEN
;
/* Number of characters needed for LOCALE_SNATIVEDIGITS */
#define NATIVE_DIGITS_LEN 11
struct
dwritescript_properties
{
DWRITE_SCRIPT_PROPERTIES
props
;
UINT32
scripttag
;
/* OpenType script tag */
...
...
@@ -1065,7 +1068,7 @@ static DWRITE_NUMBER_SUBSTITUTION_METHOD get_number_substitutes(IDWriteNumberSub
switch
(
method
)
{
case
DWRITE_NUMBER_SUBSTITUTION_METHOD_NATIONAL
:
GetLocaleInfoEx
(
numbersubst
->
locale
,
lctype
|
LOCALE_SNATIVEDIGITS
,
digits
,
sizeof
(
digits
)
/
sizeof
(
digits
[
0
])
);
GetLocaleInfoEx
(
numbersubst
->
locale
,
lctype
|
LOCALE_SNATIVEDIGITS
,
digits
,
NATIVE_DIGITS_LEN
);
break
;
case
DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL
:
case
DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL
:
...
...
@@ -1079,7 +1082,7 @@ static DWRITE_NUMBER_SUBSTITUTION_METHOD get_number_substitutes(IDWriteNumberSub
break
;
}
}
GetLocaleInfoEx
(
numbersubst
->
locale
,
lctype
|
LOCALE_SNATIVEDIGITS
,
digits
,
sizeof
(
digits
)
/
sizeof
(
digits
[
0
])
);
GetLocaleInfoEx
(
numbersubst
->
locale
,
lctype
|
LOCALE_SNATIVEDIGITS
,
digits
,
NATIVE_DIGITS_LEN
);
break
;
default:
;
...
...
@@ -1106,8 +1109,8 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface,
struct
scriptshaping_context
context
;
struct
scriptshaping_cache
*
cache
=
NULL
;
BOOL
update_cluster
,
need_vertical
;
WCHAR
digits
[
NATIVE_DIGITS_LEN
];
IDWriteFontFace1
*
fontface1
;
WCHAR
digits
[
11
];
WCHAR
*
string
;
UINT32
i
,
g
;
HRESULT
hr
=
S_OK
;
...
...
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