wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Anton Baskanov : quartz: Set the result to 1.0 in FilterGraph::GetRate.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: f253e6cf9395c5895920ea4f09bd0994d253483e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f253e6cf9395c5895920ea4f0… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Feb 13 22:12:56 2016 +0600 quartz: Set the result to 1.0 in FilterGraph::GetRate. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 5cb670e..39fa783 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2632,6 +2632,11 @@ static HRESULT WINAPI MediaSeeking_GetRate(IMediaSeeking *iface, double *pdRate) FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pdRate); + if (!pdRate) + return E_POINTER; + + *pdRate = 1.0; + return S_OK; }

1 0

Charles Davis : ntdll: Add some more NTSTATUS->DOS error mappings.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: e0311318fc85aa8cc2edd91e7560636b661f6c2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0311318fc85aa8cc2edd91e7… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 15 01:44:17 2016 -0700 ntdll: Add some more NTSTATUS->DOS error mappings. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/error.c | 317 +++++++++++++++++++++++++++++------------------ dlls/ntdll/tests/error.c | 144 ++++++++++++++++++++- 2 files changed, 341 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0311318fc85aa8cc2edd…

1 0

Hans Leidekker : msi: Fix the CHAR column type.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 7b21373bf112aed3cce495f1ef51334cf51224bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b21373bf112aed3cce495f1e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 15 10:16:12 2016 +0100 msi: Fix the CHAR column type. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/sql.y | 2 +- dlls/msi/tests/db.c | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 553cc6d..366764d 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -355,7 +355,7 @@ data_type_l: data_type: TK_CHAR { - $$ = MSITYPE_STRING | 1; + $$ = MSITYPE_STRING | 0x400; } | TK_CHAR TK_LP data_count TK_RP { diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 98e0e96..7dd878a 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1286,13 +1286,15 @@ static void test_viewgetcolumninfo(void) r = run_query( hdb, 0, "CREATE TABLE `Properties` " "( `Property` CHAR(255), " - " `Value` CHAR(1), " - " `Intvalue` INT, " - " `Integervalue` INTEGER, " - " `Shortvalue` SHORT, " - " `Longvalue` LONG, " - " `Longcharvalue` LONGCHAR " - " PRIMARY KEY `Property`)" ); + " `Value` CHAR(1), " + " `Intvalue` INT, " + " `Integervalue` INTEGER, " + " `Shortvalue` SHORT, " + " `Longvalue` LONG, " + " `Longcharvalue` LONGCHAR, " + " `Charvalue` CHAR, " + " `Localizablevalue` CHAR LOCALIZABLE " + " PRIMARY KEY `Property`)" ); ok( r == ERROR_SUCCESS , "Failed to create table\n" ); /* check the column types */ @@ -1306,6 +1308,8 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 5, "I2"), "wrong record type\n"); ok( check_record( rec, 6, "I4"), "wrong record type\n"); ok( check_record( rec, 7, "S0"), "wrong record type\n"); + ok( check_record( rec, 8, "S0"), "wrong record type\n"); + ok( check_record( rec, 9, "L0"), "wrong record type\n"); MsiCloseHandle( rec ); @@ -1317,6 +1321,8 @@ static void test_viewgetcolumninfo(void) ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n"); ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n"); ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 7 ), "_columns table wrong\n"); + ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 8 ), "_columns table wrong\n"); + ok( 0x1f00 == get_columns_table_type(hdb, "Properties", 9 ), "_columns table wrong\n"); /* now try the names */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES ); @@ -1329,6 +1335,8 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 5, "Shortvalue"), "wrong record type\n"); ok( check_record( rec, 6, "Longvalue"), "wrong record type\n"); ok( check_record( rec, 7, "Longcharvalue"), "wrong record type\n"); + ok( check_record( rec, 8, "Charvalue"), "wrong record type\n"); + ok( check_record( rec, 9, "Localizablevalue"), "wrong record type\n"); MsiCloseHandle( rec );

1 0

Jactry Zeng : user32/tests: Test DDE end to end with Chinese text that starts with Latin characters.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 477b713a72e599cd8a18ee6fdbb64459ce2afbc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=477b713a72e599cd8a18ee6fd… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Feb 15 14:33:53 2016 +0800 user32/tests: Test DDE end to end with Chinese text that starts with Latin characters. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index f2e3cea..c90bac9 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -43,6 +43,15 @@ static WNDPROC old_dde_client_wndproc; static const DWORD default_timeout = 200; +static BOOL is_cjk(void) +{ + int lang_id = PRIMARYLANGID(GetUserDefaultLangID()); + + if (lang_id == LANG_CHINESE || lang_id == LANG_JAPANESE || lang_id == LANG_KOREAN) + return TRUE; + return FALSE; +} + static void flush_events(void) { MSG msg; @@ -2385,6 +2394,7 @@ static WCHAR test_cmd_w_to_w[][32] = { { 0x2018, 0x2019, 0x0161, 0x0041, 0x02dc, 0 }, /* some chars that should map properly to CP1252 */ { 0x2026, 0x2020, 0x2021, 0x0d0a, 0 }, /* false negative for IsTextUnicode */ { 0x4efa, 0x4efc, 0x0061, 0x4efe, 0 }, /* some Chinese chars */ + { 0x0061, 0x0062, 0x0063, 0x9152, 0 }, /* Chinese with latin characters begin */ }; static const int nb_callbacks = 5 + sizeof(test_cmd_w_to_w)/sizeof(test_cmd_w_to_w[0]); @@ -2545,6 +2555,41 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV "Expected %s, msg_index=%d\n", wine_dbgstr_w(cmd_w), msg_index); } break; + case 5: /* Chinese with latin characters begin */ + if (unicode_server && unicode_client) + { + todo_wine ok(size == size_w, "Wrong size %d expected %d, msg_index=%d\n", size, size_w, msg_index); + MultiByteToWideChar(CP_ACP, 0, test_cmd_w_to_a, size_w, test_cmd_a_to_w, + sizeof(test_cmd_a_to_w)/sizeof(WCHAR)); + todo_wine ok(!lstrcmpW((WCHAR*)buffer, cmd_w), + "Expected %s got %s, msg_index=%d\n", wine_dbgstr_w(cmd_w), wine_dbgstr_w((WCHAR *)buffer), msg_index); + } + else if (unicode_server) + { + todo_wine ok(size == size_w, "Wrong size %d expected %d, msg_index=%d\n", size, size_w, msg_index); + MultiByteToWideChar(CP_ACP, 0, test_cmd_w_to_a, size_w, test_cmd_a_to_w, + sizeof(test_cmd_a_to_w)/sizeof(WCHAR)); + if (!is_cjk()) + todo_wine ok(!lstrcmpW((WCHAR*)buffer, test_cmd_a_to_w), "Expected %s, got %s, msg_index=%d\n", + wine_dbgstr_w(test_cmd_a_to_w), wine_dbgstr_w((WCHAR*)buffer), msg_index); + else + todo_wine ok(!lstrcmpW((WCHAR*)buffer, cmd_w), + "Expected %s got %s, msg_index=%d\n", wine_dbgstr_w(cmd_w), wine_dbgstr_w((WCHAR *)buffer), msg_index); + } + else if (unicode_client) + { + ok(size == size_w_to_a, "Wrong size %d expected %d, msg_index=%d\n", size, size_w_to_a, msg_index); + ok(!lstrcmpA((CHAR*)buffer, test_cmd_w_to_a), "Expected %s, got %s, msg_index=%d\n", + test_cmd_w_to_a, buffer, msg_index); + } + else + { + todo_wine ok(size == size_w_to_a || size == (size_w_to_a - 1), "Wrong size %d expected %d or %d, msg_index=%d\n", + size, size_w_to_a, size_w_to_a - 1, msg_index); + todo_wine ok(!lstrcmpA((CHAR*)buffer, test_cmd_w_to_a), "Expected %s, got %s, msg_index=%d\n", + test_cmd_w_to_a, buffer, msg_index); + } + break; default: ok( 0, "Invalid message %u\n", msg_index );

1 0

Nikolay Sivov : dwrite: Suppress noisy message when parsing name records.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: c7305c07af92ca82707567745050f933bf39a5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7305c07af92ca82707567745… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 21:54:37 2016 +0300 dwrite: Suppress noisy message when parsing name records. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7d59bf8..7fb1749 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1367,7 +1367,7 @@ static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT la const char *locale_name = NULL; if (lang_id > TT_NAME_MAC_LANGID_AZER_ROMAN) - ERR("invalid mac lang id %d\n", lang_id); + WARN("invalid mac lang id %d\n", lang_id); else if (!name_mac_langid_to_locale[lang_id][0]) FIXME("failed to map mac lang id %d to locale name\n", lang_id); else

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 2c88713a5f2d03905c9c7d6134e6007dfc0c34d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c88713a5f2d03905c9c7d613… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 19:15:51 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/po/ru.po b/po/ru.po index 278e8fb..d88342b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-02-09 23:19+0300\n" +"PO-Revision-Date: 2016-02-14 19:13+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.6\n" +"X-Generator: Poedit 1.8.7\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -11619,22 +11619,16 @@ msgid "(Default)" msgstr "(По умолчанию)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Вы уверены что хотите удалить эти значения?" +msgstr "Вы точно хотите удалить параметр реестра «%1»?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Удалить значение «%s»?" +msgstr "Вы точно хотите удалить все параметры реестра из «%s»?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Удалить «%1»?" +msgstr "Вы точно хотите удалить ключ реестра «%1»?" #: regedit.rc:34 msgid "&Registry"

1 0

Nikolay Sivov : dwrite: Use current layout fallback when creating run font faces.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 7fc7f2f074105757ae48c0fb10ae94a45700e950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc7f2f074105757ae48c0fb1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 19:05:10 2016 +0300 dwrite: Use current layout fallback when creating run font faces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 +- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/layout.c | 127 ++++++++++++++++++++++++++++++------------- 3 files changed, 91 insertions(+), 40 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 10ff0a2..66fa29c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1745,7 +1745,7 @@ static const struct fallback_mapping *find_fallback_mapping(struct dwrite_fontfa return NULL; } -static HRESULT create_matching_font(IDWriteFontCollection *collection, const WCHAR *name, +HRESULT create_matching_font(IDWriteFontCollection *collection, const WCHAR *name, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, IDWriteFont **font) { IDWriteFontFamily *family; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 1e4cf59..5a01061 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -145,6 +145,8 @@ extern HRESULT create_colorglyphenum(FLOAT,FLOAT,const DWRITE_GLYPH_RUN*,const D extern BOOL lb_is_newline_char(WCHAR) DECLSPEC_HIDDEN; extern HRESULT create_system_fontfallback(IDWriteFactory2*,IDWriteFontFallback**) DECLSPEC_HIDDEN; extern void release_system_fontfallback(IDWriteFontFallback*) DECLSPEC_HIDDEN; +extern HRESULT create_matching_font(IDWriteFontCollection*,const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, + IDWriteFont**) DECLSPEC_HIDDEN; /* Opentype font table functions */ struct dwrite_font_props { diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b60f2ce..164ac48 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -696,39 +696,6 @@ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const s #define SCALE_FONT_METRIC(metric, emSize, metrics) ((FLOAT)(metric) * (emSize) / (FLOAT)(metrics)->designUnitsPerEm) -static HRESULT create_fontface_by_pos(struct dwrite_textlayout *layout, struct layout_range *range, IDWriteFontFace **fontface) -{ - static DWRITE_GLYPH_RUN_DESCRIPTION descr = { 0 }; - IDWriteFontFamily *family; - BOOL exists = FALSE; - IDWriteFont *font; - UINT32 index; - HRESULT hr; - - *fontface = NULL; - - hr = IDWriteFontCollection_FindFamilyName(range->collection, range->fontfamily, &index, &exists); - if (FAILED(hr) || !exists) { - WARN("%s: family %s not found in collection %p\n", debugstr_rundescr(&descr), debugstr_w(range->fontfamily), range->collection); - return hr; - } - - hr = IDWriteFontCollection_GetFontFamily(range->collection, index, &family); - if (FAILED(hr)) - return hr; - - hr = IDWriteFontFamily_GetFirstMatchingFont(family, range->weight, range->stretch, range->style, &font); - IDWriteFontFamily_Release(family); - if (FAILED(hr)) { - WARN("%s: failed to get a matching font\n", debugstr_rundescr(&descr)); - return hr; - } - - hr = IDWriteFont_CreateFontFace(font, fontface); - IDWriteFont_Release(font); - return hr; -} - static void layout_get_font_metrics(struct dwrite_textlayout *layout, IDWriteFontFace *fontface, FLOAT emsize, DWRITE_FONT_METRICS *fontmetrics) { @@ -749,6 +716,7 @@ static void layout_get_font_height(FLOAT emsize, DWRITE_FONT_METRICS *fontmetric static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) { + IDWriteFontFallback *fallback; IDWriteTextAnalyzer *analyzer; struct layout_range *range; struct layout_run *r; @@ -808,6 +776,82 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) break; } + if (layout->format.fallback) { + fallback = layout->format.fallback; + IDWriteFontFallback_AddRef(fallback); + } + else { + hr = IDWriteFactory2_GetSystemFontFallback(layout->factory, &fallback); + if (FAILED(hr)) + return hr; + } + + /* resolve run fonts */ + LIST_FOR_EACH_ENTRY(r, &layout->runs, struct layout_run, entry) { + struct regular_layout_run *run = &r->u.regular; + UINT32 length; + + if (r->kind == LAYOUT_RUN_INLINE) + continue; + + range = get_layout_range_by_pos(layout, run->descr.textPosition); + length = run->descr.stringLength; + + while (length) { + UINT32 mapped_length; + IDWriteFont *font; + FLOAT scale; + + run = &r->u.regular; + + hr = IDWriteFontFallback_MapCharacters(fallback, + (IDWriteTextAnalysisSource*)&layout->IDWriteTextAnalysisSource1_iface, + run->descr.textPosition, + run->descr.stringLength, + range->collection, + range->fontfamily, + range->weight, + range->style, + range->stretch, + &mapped_length, + &font, + &scale); + if (FAILED(hr)) { + WARN("%s: failed to map family %s, collection %p\n", debugstr_rundescr(&run->descr), debugstr_w(range->fontfamily), range->collection); + return hr; + } + + hr = IDWriteFont_CreateFontFace(font, &run->run.fontFace); + IDWriteFont_Release(font); + if (FAILED(hr)) + return hr; + run->run.fontEmSize = range->fontsize * scale; + + if (mapped_length < length) { + struct regular_layout_run *nextrun = &r->u.regular; + struct layout_run *nextr; + + /* keep mapped part for current run, add another run for the rest */ + nextr = alloc_layout_run(LAYOUT_RUN_REGULAR); + if (!nextr) + return E_OUTOFMEMORY; + + *nextr = *r; + nextrun = &nextr->u.regular; + nextrun->descr.textPosition = run->descr.textPosition + mapped_length; + nextrun->descr.stringLength = run->descr.stringLength - mapped_length; + nextrun->descr.string = &layout->str[nextrun->descr.textPosition]; + run->descr.stringLength = mapped_length; + list_add_after(&r->entry, &nextr->entry); + r = nextr; + } + + length -= mapped_length; + } + } + + IDWriteFontFallback_Release(fallback); + /* fill run info */ LIST_FOR_EACH_ENTRY(r, &layout->runs, struct layout_run, entry) { DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props = NULL; @@ -850,11 +894,6 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) } range = get_layout_range_by_pos(layout, run->descr.textPosition); - hr = create_fontface_by_pos(layout, range, &run->run.fontFace); - if (FAILED(hr)) - continue; - - run->run.fontEmSize = range->fontsize; run->descr.localeName = range->locale; run->clustermap = heap_alloc(run->descr.stringLength*sizeof(UINT16)); @@ -1606,10 +1645,20 @@ static HRESULT layout_set_dummy_line_metrics(struct dwrite_textlayout *layout, U DWRITE_LINE_METRICS metrics; struct layout_range *range; IDWriteFontFace *fontface; + IDWriteFont *font; HRESULT hr; range = get_layout_range_by_pos(layout, pos); - hr = create_fontface_by_pos(layout, range, &fontface); + hr = create_matching_font(range->collection, + range->fontfamily, + range->weight, + range->style, + range->stretch, + &font); + if (FAILED(hr)) + return hr; + hr = IDWriteFont_CreateFontFace(font, &fontface); + IDWriteFont_Release(font); if (FAILED(hr)) return hr;

1 0

Nikolay Sivov : dwrite: Initial implementation of MapCharacters().
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 5d174042876b31c51d4c75523e00d62bec04f696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d174042876b31c51d4c75523… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 19:05:09 2016 +0300 dwrite: Initial implementation of MapCharacters(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 176 +++++++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/layout.c | 31 ++++---- 2 files changed, 185 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d174042876b31c51d4c7…

1 0

Nikolay Sivov : dwrite: Move local stream tracing to a separate channel.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 2c29838b11f3239fc3b0276cb234793b1e246e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c29838b11f3239fc3b0276cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 19:05:08 2016 +0300 dwrite: Move local stream tracing to a separate channel. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9bd5404..292866e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -27,6 +27,7 @@ #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +WINE_DECLARE_DEBUG_CHANNEL(dwrite_file); #define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') #define MS_OS2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') @@ -3793,7 +3794,7 @@ static inline struct dwrite_localfontfilestream *impl_from_IDWriteFontFileStream static HRESULT WINAPI localfontfilestream_QueryInterface(IDWriteFontFileStream *iface, REFIID riid, void **obj) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE_(dwrite_file)("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteFontFileStream)) { *obj = iface; @@ -3809,7 +3810,7 @@ static ULONG WINAPI localfontfilestream_AddRef(IDWriteFontFileStream *iface) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE_(dwrite_file)("(%p)->(%d)\n", This, ref); return ref; } @@ -3825,7 +3826,7 @@ static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE_(dwrite_file)("(%p)->(%d)\n", This, ref); if (!ref) { UnmapViewOfFile(This->file_ptr); @@ -3840,7 +3841,7 @@ static HRESULT WINAPI localfontfilestream_ReadFileFragment(IDWriteFontFileStream { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE("(%p)->(%p, %s, %s, %p)\n",This, fragment_start, + TRACE_(dwrite_file)("(%p)->(%p, %s, %s, %p)\n",This, fragment_start, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(fragment_size), fragment_context); *fragment_context = NULL; @@ -3857,13 +3858,13 @@ static HRESULT WINAPI localfontfilestream_ReadFileFragment(IDWriteFontFileStream static void WINAPI localfontfilestream_ReleaseFileFragment(IDWriteFontFileStream *iface, void *fragment_context) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE("(%p)->(%p)\n", This, fragment_context); + TRACE_(dwrite_file)("(%p)->(%p)\n", This, fragment_context); } static HRESULT WINAPI localfontfilestream_GetFileSize(IDWriteFontFileStream *iface, UINT64 *size) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE("(%p)->(%p)\n", This, size); + TRACE_(dwrite_file)("(%p)->(%p)\n", This, size); *size = This->size; return S_OK; } @@ -3873,7 +3874,7 @@ static HRESULT WINAPI localfontfilestream_GetLastWriteTime(IDWriteFontFileStream struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); ULARGE_INTEGER li; - TRACE("(%p)->(%p)\n", This, last_writetime); + TRACE_(dwrite_file)("(%p)->(%p)\n", This, last_writetime); li.u.LowPart = This->entry->key->writetime.dwLowDateTime; li.u.HighPart = This->entry->key->writetime.dwHighDateTime;

1 0

Nikolay Sivov : dwrite: Keep factory reference for each layout.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Module: wine Branch: master Commit: 4d512f9e4e54f36aeaeb87253fa5e4d681d0a4f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d512f9e4e54f36aeaeb87253… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 19:05:07 2016 +0300 dwrite: Keep factory reference for each layout. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 5 +++-- dlls/dwrite/layout.c | 19 +++++++++++++------ dlls/dwrite/main.c | 4 ++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9f0171b..1e4cf59 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -115,8 +115,9 @@ extern HRESULT convert_fontface_to_logfont(IDWriteFontFace*, LOGFONTW*) DECLSPEC extern HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD,const WCHAR *locale,BOOL,IDWriteNumberSubstitution**) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; -extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,IDWriteTextLayout**) DECLSPEC_HIDDEN; -extern HRESULT create_gdicompat_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,FLOAT,const DWRITE_MATRIX*,BOOL,IDWriteTextLayout**) DECLSPEC_HIDDEN; +extern HRESULT create_textlayout(IDWriteFactory2*,const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,IDWriteTextLayout**) DECLSPEC_HIDDEN; +extern HRESULT create_gdicompat_textlayout(IDWriteFactory2*,const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,FLOAT, + const DWRITE_MATRIX*,BOOL,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_trimmingsign(IDWriteFactory2*,IDWriteTextFormat*,IDWriteInlineObject**) DECLSPEC_HIDDEN; extern HRESULT create_typography(IDWriteTypography**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteFactory2*,IDWriteGdiInterop**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 1d09460..b60f2ce 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -238,6 +238,8 @@ struct dwrite_textlayout { IDWriteTextAnalysisSource1 IDWriteTextAnalysisSource1_iface; LONG ref; + IDWriteFactory2 *factory; + WCHAR *str; UINT32 len; struct dwrite_textformat_data format; @@ -2548,6 +2550,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout2 *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { + IDWriteFactory2_Release(This->factory); free_layout_ranges_list(This); free_layout_eruns(This); free_layout_runs(This); @@ -4353,7 +4356,8 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I return IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); } -static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, struct dwrite_textlayout *layout) +static HRESULT init_textlayout(IDWriteFactory2 *factory, const WCHAR *str, UINT32 len, IDWriteTextFormat *format, + FLOAT maxwidth, FLOAT maxheight, struct dwrite_textlayout *layout) { struct layout_range_header *range, *strike, *underline, *effect, *spacing, *typography; static const DWRITE_TEXT_RANGE r = { 0, ~0u }; @@ -4421,6 +4425,8 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * goto fail; } + layout->factory = factory; + IDWriteFactory2_AddRef(layout->factory); list_add_head(&layout->ranges, &range->entry); list_add_head(&layout->strike_ranges, &strike->entry); list_add_head(&layout->underline_ranges, &underline->entry); @@ -4434,7 +4440,8 @@ fail: return hr; } -HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, IDWriteTextLayout **ret) +HRESULT create_textlayout(IDWriteFactory2 *factory, const WCHAR *str, UINT32 len, IDWriteTextFormat *format, + FLOAT maxwidth, FLOAT maxheight, IDWriteTextLayout **ret) { struct dwrite_textlayout *layout; HRESULT hr; @@ -4447,15 +4454,15 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma layout = heap_alloc(sizeof(struct dwrite_textlayout)); if (!layout) return E_OUTOFMEMORY; - hr = init_textlayout(str, len, format, maxwidth, maxheight, layout); + hr = init_textlayout(factory, str, len, format, maxwidth, maxheight, layout); if (hr == S_OK) *ret = (IDWriteTextLayout*)&layout->IDWriteTextLayout2_iface; return hr; } -HRESULT create_gdicompat_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, - FLOAT ppdip, const DWRITE_MATRIX *transform, BOOL use_gdi_natural, IDWriteTextLayout **ret) +HRESULT create_gdicompat_textlayout(IDWriteFactory2 *factory, const WCHAR *str, UINT32 len, IDWriteTextFormat *format, + FLOAT maxwidth, FLOAT maxheight, FLOAT ppdip, const DWRITE_MATRIX *transform, BOOL use_gdi_natural, IDWriteTextLayout **ret) { struct dwrite_textlayout *layout; HRESULT hr; @@ -4468,7 +4475,7 @@ HRESULT create_gdicompat_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFor layout = heap_alloc(sizeof(struct dwrite_textlayout)); if (!layout) return E_OUTOFMEMORY; - hr = init_textlayout(str, len, format, maxwidth, maxheight, layout); + hr = init_textlayout(factory, str, len, format, maxwidth, maxheight, layout); if (hr == S_OK) { layout->measuringmode = use_gdi_natural ? DWRITE_MEASURING_MODE_GDI_NATURAL : DWRITE_MEASURING_MODE_GDI_CLASSIC; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 5885498..4e30375 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1059,7 +1059,7 @@ static HRESULT WINAPI dwritefactory_CreateTextLayout(IDWriteFactory2 *iface, WCH TRACE("(%p)->(%s:%u %p %f %f %p)\n", This, debugstr_wn(string, len), len, format, max_width, max_height, layout); - return create_textlayout(string, len, format, max_width, max_height, layout); + return create_textlayout(iface, string, len, format, max_width, max_height, layout); } static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory2 *iface, WCHAR const* string, @@ -1071,7 +1071,7 @@ static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory TRACE("(%p)->(%s:%u %p %f %f %f %p %d %p)\n", This, debugstr_wn(string, len), len, format, layout_width, layout_height, pixels_per_dip, transform, use_gdi_natural, layout); - return create_gdicompat_textlayout(string, len, format, layout_width, layout_height, pixels_per_dip, transform, + return create_gdicompat_textlayout(iface, string, len, format, layout_width, layout_height, pixels_per_dip, transform, use_gdi_natural, layout); }

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2016