February 2016 - Wine-Commits

Hugh McMaster : reg: Handle data from REG_NONE.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: f1d45b5f443624229cc9cd98205cf8b84f94ca9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d45b5f443624229cc9cd982… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:31 2016 +1100 reg: Handle data from REG_NONE. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 1 + programs/reg/tests/reg.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index e4289f3..bc0b261 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -228,6 +228,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r switch (reg_type) { + case REG_NONE: case REG_SZ: { *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 4534f7d..74284c7 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -149,7 +149,7 @@ static void test_add(void) /* REG_NONE */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r); - verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, TODO_REG_SIZE); + verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, 0); /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r);

1 0

Hugh McMaster : reg: Call RegCloseKey before exiting if the user chooses to cancel the overwriting operation.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: e0492b27acf1448eb4006aba74194e49303b2fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0492b27acf1448eb4006aba7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 15 23:15:29 2016 +1100 reg: Call RegCloseKey before exiting if the user chooses to cancel the overwriting operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 63b518f..cc8cac2 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -352,6 +352,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, { if (!ask_confirm(STRING_OVERWRITE_VALUE, value_name)) { + RegCloseKey(subkey); output_message(STRING_CANCELLED); return 0; }

1 0

Pierre Schweitzer : mpr: Partially implement WNetUseConnectionW().
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: d070c263adf840cc14dde84eb8e73b04490d1900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d070c263adf840cc14dde84eb… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Feb 12 14:03:44 2016 +0300 mpr: Partially implement WNetUseConnectionW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 71 insertions(+), 9 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 834a826..62e1479 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1582,17 +1582,79 @@ DWORD WINAPI WNetUseConnectionA( HWND hwndOwner, LPNETRESOURCEA lpNetResource, /***************************************************************** * WNetUseConnectionW [MPR.@] */ -DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, LPNETRESOURCEW lpNetResource, - LPCWSTR lpPassword, LPCWSTR lpUserID, DWORD dwFlags, - LPWSTR lpAccessName, LPDWORD lpBufferSize, - LPDWORD lpResult ) +DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, NETRESOURCEW *resource, LPCWSTR password, + LPCWSTR userid, DWORD flags, LPWSTR accessname, DWORD *buffer_size, DWORD *result ) { - FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", - hwndOwner, lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags, - debugstr_w(lpAccessName), lpBufferSize, lpResult ); + WNetProvider *provider; + DWORD index, ret, caps; - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + TRACE( "(%p, %p, %p, %s, 0x%08X, %p, %p, %p)\n", + hwndOwner, resource, password, debugstr_w(userid), flags, + accessname, buffer_size, result ); + + if (!providerTable || providerTable->numProviders == 0) + return WN_NO_NETWORK; + + if (!resource) + return ERROR_INVALID_PARAMETER; + + if (!resource->lpProvider) + { + FIXME("Networking provider selection is not implemented.\n"); + return WN_NO_NETWORK; + } + + if (!resource->lpLocalName && (flags & CONNECT_REDIRECT)) + { + FIXME("Locale device selection is not implemented.\n"); + return WN_NO_NETWORK; + } + + if (flags & CONNECT_INTERACTIVE) + return ERROR_BAD_NET_NAME; + + index = _findProviderIndexW(resource->lpProvider); + if (index == BAD_PROVIDER_INDEX) + return ERROR_BAD_PROVIDER; + + provider = &providerTable->table[index]; + caps = provider->getCaps(WNNC_CONNECTION); + if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) + return ERROR_BAD_PROVIDER; + + if (accessname && buffer_size && *buffer_size) + { + DWORD len; + + if (resource->lpLocalName) + len = strlenW(resource->lpLocalName); + else + len = strlenW(resource->lpRemoteName); + + if (++len > *buffer_size) + { + *buffer_size = len; + return ERROR_MORE_DATA; + } + } + else + accessname = NULL; + + ret = WN_ACCESS_DENIED; + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(hwndOwner, resource, (LPWSTR)password, (LPWSTR)userid, flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(resource, (LPWSTR)password, (LPWSTR)userid); + + if (ret == WN_SUCCESS && accessname) + { + if (resource->lpLocalName) + strcpyW(accessname, resource->lpLocalName); + else + strcpyW(accessname, resource->lpRemoteName); + } + + return ret; } /*********************************************************************

1 0

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

Feb. 15, 2016

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

Aric Stewart : usp10: Handle GSUB SubType 7: Extension Substitution.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 12fb74ac565fc2b8f7f79c3706106b560197e0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=12fb74ac565fc2b8f7f79c370… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 12 11:24:05 2016 -0600 usp10: Handle GSUB SubType 7: Extension Substitution. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 73 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e7f2dfd..5b39663 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -277,6 +277,12 @@ typedef struct{ WORD Alternate[1]; } GSUB_AlternateSet; +typedef struct { + WORD SubstFormat; + WORD ExtensionLookupType; + DWORD ExtensionOffset; +} GSUB_ExtensionPosFormat1; + /* These are all structures needed for the GPOS table */ typedef struct { @@ -725,6 +731,25 @@ static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) return -1; } +static const BYTE *GSUB_get_subtable(const OT_LookupTable *look, int index) +{ + int offset = GET_BE_WORD(look->SubTable[index]); + + if (GET_BE_WORD(look->LookupType) == 7) + { + const GSUB_ExtensionPosFormat1 *ext = (const GSUB_ExtensionPosFormat1 *)((const BYTE *)look + offset); + if (GET_BE_WORD(ext->SubstFormat) == 1) + { + offset += GET_BE_DWORD(ext->ExtensionOffset); + } + else + { + FIXME("Unhandled Extension Substitution Format %i\n",GET_BE_WORD(ext->SubstFormat)); + } + } + return (const BYTE *)look + offset; +} + static INT GSUB_apply_SingleSubst(const OT_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int j; @@ -732,10 +757,7 @@ static INT GSUB_apply_SingleSubst(const OT_LookupTable *look, WORD *glyphs, INT for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GSUB_SingleSubstFormat1 *ssf1; - offset = GET_BE_WORD(look->SubTable[j]); - ssf1 = (const GSUB_SingleSubstFormat1*)((const BYTE*)look+offset); + const GSUB_SingleSubstFormat1 *ssf1 = (const GSUB_SingleSubstFormat1*)GSUB_get_subtable(look, j); if (GET_BE_WORD(ssf1->SubstFormat) == 1) { int offset = GET_BE_WORD(ssf1->Coverage); @@ -783,8 +805,7 @@ static INT GSUB_apply_MultipleSubst(const OT_LookupTable *look, WORD *glyphs, IN { int offset, index; const GSUB_MultipleSubstFormat1 *msf1; - offset = GET_BE_WORD(look->SubTable[j]); - msf1 = (const GSUB_MultipleSubstFormat1*)((const BYTE*)look+offset); + msf1 = (const GSUB_MultipleSubstFormat1*)GSUB_get_subtable(look, j); offset = GET_BE_WORD(msf1->Coverage); index = GSUB_is_glyph_covered((const BYTE*)msf1+offset, glyphs[glyph_index]); @@ -833,8 +854,7 @@ static INT GSUB_apply_AlternateSubst(const OT_LookupTable *look, WORD *glyphs, I const GSUB_AlternateSubstFormat1 *asf1; INT index; - offset = GET_BE_WORD(look->SubTable[j]); - asf1 = (const GSUB_AlternateSubstFormat1*)((const BYTE*)look+offset); + asf1 = (const GSUB_AlternateSubstFormat1*)GSUB_get_subtable(look, j); offset = GET_BE_WORD(asf1->Coverage); index = GSUB_is_glyph_covered((const BYTE*)asf1+offset, glyphs[glyph_index]); @@ -866,8 +886,7 @@ static INT GSUB_apply_LigatureSubst(const OT_LookupTable *look, WORD *glyphs, IN const GSUB_LigatureSubstFormat1 *lsf1; int offset,index; - offset = GET_BE_WORD(look->SubTable[j]); - lsf1 = (const GSUB_LigatureSubstFormat1*)((const BYTE*)look+offset); + lsf1 = (const GSUB_LigatureSubstFormat1*)GSUB_get_subtable(look, j); offset = GET_BE_WORD(lsf1->Coverage); index = GSUB_is_glyph_covered((const BYTE*)lsf1+offset, glyphs[glyph_index]); TRACE(" Coverage index %i\n",index); @@ -933,8 +952,7 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo int dirLookahead = write_dir; int dirBacktrack = -1 * write_dir; - offset = GET_BE_WORD(look->SubTable[j]); - ccsf1 = (const GSUB_ChainContextSubstFormat1*)((const BYTE*)look+offset); + ccsf1 = (const GSUB_ChainContextSubstFormat1*)GSUB_get_subtable(look, j); if (GET_BE_WORD(ccsf1->SubstFormat) == 1) { static int once; @@ -1029,12 +1047,34 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int offset; + int type; const OT_LookupTable *look; offset = GET_BE_WORD(lookup->Lookup[lookup_index]); look = (const OT_LookupTable*)((const BYTE*)lookup + offset); - TRACE("type %i, flag %x, subtables %i\n",GET_BE_WORD(look->LookupType),GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); - switch(GET_BE_WORD(look->LookupType)) + type = GET_BE_WORD(look->LookupType); + TRACE("type %i, flag %x, subtables %i\n",type,GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); + if (type == 7) + { + if (GET_BE_WORD(look->SubTableCount)) + { + const GSUB_ExtensionPosFormat1 *ext = (const GSUB_ExtensionPosFormat1 *)((const BYTE *)look + GET_BE_WORD(look->SubTable[0])); + if (GET_BE_WORD(ext->SubstFormat) == 1) + { + type = GET_BE_WORD(ext->ExtensionLookupType); + TRACE("extension type %i\n",type); + } + else + { + FIXME("Unhandled Extension Substitution Format %i\n",GET_BE_WORD(ext->SubstFormat)); + } + } + else + { + WARN("lookup type is Extension Substitution but no extension subtable exists\n"); + } + } + switch(type) { case 1: return GSUB_apply_SingleSubst(look, glyphs, glyph_index, write_dir, glyph_count); @@ -1046,8 +1086,11 @@ static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD return GSUB_apply_LigatureSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 6: return GSUB_apply_ChainContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); + case 7: + FIXME("Extension Substitution types not valid here\n"); + break; default: - FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); + FIXME("We do not handle SubType %i\n",type); } return GSUB_E_NOGLYPH; }

1 0

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

Feb. 15, 2016

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 Feb. 15, 2016

Feb. 15, 2016

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 : po: Update Russian translation.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

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: Keep factory reference for each layout.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

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

Nikolay Sivov : dwrite: Implement stub for system IDWriteFontFallback.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: af206b1b2dfde25d1817b01b5d27f38dbcbfd7b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af206b1b2dfde25d1817b01b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 14 19:05:06 2016 +0300 dwrite: Implement stub for system IDWriteFontFallback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/dwrite_private.h | 2 ++ dlls/dwrite/main.c | 26 ++++++++++++-- dlls/dwrite/tests/layout.c | 36 +++++++++++++------ 4 files changed, 135 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af206b1b2dfde25d1817b…

1 0