ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwrite: Improve SetScriptAnalysis()/SetBidiLevel() tracing. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-02-02 01:41:11 +03:00 committed by Alexandre Julliard
parent 8d9bf23fc1
commit e94264e6bd
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/dwrite/analyzer.c
View File

@ -177,6 +177,11 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last
};
#undef _OT
const char *debugstr_sa_script(UINT16 script)
{
return script < Script_LastId ? debugstr_an((char*)&dwritescripts_properties[script].props.isoScriptCode, 4): "not defined";
}
struct dwrite_numbersubstitution {
IDWriteNumberSubstitution IDWriteNumberSubstitution_iface;
LONG ref;

2
dlls/dwrite/dwrite_private.h
View File

@ -99,6 +99,8 @@ static inline const char *debugstr_matrix(const DWRITE_MATRIX *m)
m->dx, m->dy);
}
const char *debugstr_sa_script(UINT16) DECLSPEC_HIDDEN;
static inline unsigned short get_table_entry(const unsigned short *table, WCHAR ch)
{
return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)];

4
dlls/dwrite/layout.c
View File

@ -3977,7 +3977,7 @@ static HRESULT WINAPI dwritetextlayout_sink_SetScriptAnalysis(IDWriteTextAnalysi
struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink1(iface);
struct layout_run *run;
TRACE("%u %u script=%d\n", position, length, sa->script);
TRACE("[%u,%u) script=%u:%s\n", position, position + length, sa->script, debugstr_sa_script(sa->script));
run = alloc_layout_run(LAYOUT_RUN_REGULAR);
if (!run)
@ -4009,7 +4009,7 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink
struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink1(iface);
struct layout_run *cur_run;
TRACE("%u %u %u %u\n", position, length, explicitLevel, resolvedLevel);
TRACE("[%u,%u) %u %u\n", position, position + length, explicitLevel, resolvedLevel);
LIST_FOR_EACH_ENTRY(cur_run, &layout->runs, struct layout_run, entry) {
struct regular_layout_run *cur = &cur_run->u.regular;

2
dlls/dwrite/tests/layout.c
View File

@ -1410,7 +1410,7 @@ static const struct drawcall_entry draw_seq2[] = {
};
static const struct drawcall_entry draw_seq3[] = {
{ DRAW_GLYPHRUN },
{ DRAW_GLYPHRUN, {0x202a,0x202c,0} },
{ DRAW_GLYPHRUN, {'a','b',0} },
{ DRAW_LAST_KIND }
};