August 2015 - Wine-Commits - list.winehq.org

Akihiro Sagawa : usp10: Display the blank glyph for some control characters (truetype/opentype).
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 22e8046fcb7663c24243da50a16cf5097cd392a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e8046fcb7663c24243da50a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Aug 12 00:54:39 2015 +0900 usp10: Display the blank glyph for some control characters (truetype/opentype). --- dlls/usp10/shape.c | 5 ++++- dlls/usp10/tests/usp10.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index e942880..52c6a8b 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -950,7 +950,10 @@ static void ContextualShape_Control(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * { switch (pwcChars[i]) { - case 0x000D: pwOutGlyphs[i] = psc->sfp.wgBlank; break; + case 0x000A: + case 0x000D: + pwOutGlyphs[i] = psc->sfp.wgBlank; + break; default: if (pwcChars[i] < 0x1C) pwOutGlyphs[i] = psc->sfp.wgDefault; diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1702f20..7670dc2 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1486,7 +1486,7 @@ static void test_ScriptShape(HDC hdc) hr = ScriptShape(hdc, &sc, &blanks[j], 1, 1, &items[0].a, glyphs2, logclust, attrs, &nb); ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, blanks[j], hr); ok(nb == 1, "%s: [%02x] expected 1, got %d\n", lf.lfFaceName, blanks[j], nb); - if (i == 0 && blanks[j] != '\n') + if (i == 0) ok(glyphs[0] == glyphs2[0] || broken(glyphs2[0] == blanks[j] && (blanks[j] < 0x10)), "%s: [%02x] expected %04x, got %04x\n", lf.lfFaceName, blanks[j], glyphs[0], glyphs2[0]);

1 0

Sebastian Lackner : ntdll: Move cookie initialization code from memory management to loader.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 38076fa63308417429617f959ce44315b604424c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38076fa63308417429617f959… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 10 18:31:56 2015 +0200 ntdll: Move cookie initialization code from memory management to loader. --- dlls/ntdll/loader.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/virtual.c | 49 -------------------------------------------- 2 files changed, 57 insertions(+), 49 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0e91af4..d15b140 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -50,6 +50,12 @@ WINE_DECLARE_DEBUG_CHANNEL(snoop); WINE_DECLARE_DEBUG_CHANNEL(loaddll); WINE_DECLARE_DEBUG_CHANNEL(imports); +#ifdef _WIN64 +#define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232) +#endif +#define DEFAULT_SECURITY_COOKIE_32 0xbb40e64e +#define DEFAULT_SECURITY_COOKIE_16 (DEFAULT_SECURITY_COOKIE_32 >> 16) + /* we don't want to include winuser.h */ #define RT_MANIFEST ((ULONG_PTR)24) #define ISOLATIONAWARE_MANIFEST_RESOURCE_ID ((ULONG_PTR)2) @@ -1602,6 +1608,55 @@ static void load_builtin_callback( void *module, const char *filename ) } +/*********************************************************************** + * set_security_cookie + * + * Create a random security cookie for buffer overflow protection. Make + * sure it does not accidentally match the default cookie value. + */ +static void set_security_cookie( void *module, SIZE_T len ) +{ + static ULONG seed; + IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg; + ULONG loadcfg_size; + ULONG_PTR *cookie; + + loadcfg = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); + if (!loadcfg) return; + if (loadcfg_size < offsetof(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(loadcfg->SecurityCookie)) return; + if (!loadcfg->SecurityCookie) return; + if (loadcfg->SecurityCookie < (ULONG_PTR)module || + loadcfg->SecurityCookie > (ULONG_PTR)module + len - sizeof(ULONG_PTR)) + { + WARN( "security cookie %p outside of image %p-%p\n", + (void *)loadcfg->SecurityCookie, module, (char *)module + len ); + return; + } + + cookie = (ULONG_PTR *)loadcfg->SecurityCookie; + TRACE( "initializing security cookie %p\n", cookie ); + + if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId(); + for (;;) + { + if (*cookie == DEFAULT_SECURITY_COOKIE_16) + *cookie = RtlRandom( &seed ) >> 16; /* leave the high word clear */ + else if (*cookie == DEFAULT_SECURITY_COOKIE_32) + *cookie = RtlRandom( &seed ); +#ifdef DEFAULT_SECURITY_COOKIE_64 + else if (*cookie == DEFAULT_SECURITY_COOKIE_64) + { + *cookie = RtlRandom( &seed ); + /* fill up, but keep the highest word clear */ + *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16; + } +#endif + else + break; + } +} + + /****************************************************************************** * load_native_dll (internal) */ @@ -1636,6 +1691,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, goto done; } + set_security_cookie( module, len ); + /* fixup imports */ nt = RtlImageNtHeader( module ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 676675f..fe17518 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -61,12 +61,6 @@ WINE_DECLARE_DEBUG_CHANNEL(module); #define MAP_NORESERVE 0 #endif -#ifdef _WIN64 -#define DEFAULT_SECURITY_COOKIE_64 (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232) -#endif -#define DEFAULT_SECURITY_COOKIE_32 0xbb40e64e -#define DEFAULT_SECURITY_COOKIE_16 (DEFAULT_SECURITY_COOKIE_32 >> 16) - /* File view */ struct file_view { @@ -1060,37 +1054,6 @@ static NTSTATUS stat_mapping_file( struct file_view *view, struct stat *st ) } /*********************************************************************** - * set_security_cookie - * - * Create a random security cookie for buffer overflow protection. Make - * sure it does not accidentally match the default cookie value. - */ -static void set_security_cookie(ULONG_PTR *cookie) -{ - static ULONG seed; - - if (!cookie) return; - if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId(); - while (1) - { - if (*cookie == DEFAULT_SECURITY_COOKIE_16) - *cookie = RtlRandom( &seed ) >> 16; /* leave the high word clear */ - else if (*cookie == DEFAULT_SECURITY_COOKIE_32) - *cookie = RtlRandom( &seed ); -#ifdef DEFAULT_SECURITY_COOKIE_64 - else if (*cookie == DEFAULT_SECURITY_COOKIE_64) - { - *cookie = RtlRandom( &seed ); - /* fill up, but keep the highest word clear */ - *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16; - } -#endif - else - break; - } -} - -/*********************************************************************** * map_image * * Map an executable (PE format) image into memory. @@ -1103,8 +1066,6 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz IMAGE_SECTION_HEADER sections[96]; IMAGE_SECTION_HEADER *sec; IMAGE_DATA_DIRECTORY *imports; - IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg; - ULONG loadcfg_size; NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; off_t pos; @@ -1316,16 +1277,6 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz } } - /* randomize security cookie */ - - loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE, - IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); - if (loadcfg && loadcfg_size >= offsetof(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(loadcfg->SecurityCookie) && - (ULONG_PTR)ptr <= loadcfg->SecurityCookie && loadcfg->SecurityCookie <= (ULONG_PTR)ptr + total_size - sizeof(ULONG_PTR)) - { - set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie); - } - /* set the image protections */ VIRTUAL_SetProt( view, ptr, ROUND_SIZE( 0, header_size ), VPROT_COMMITTED | VPROT_READ );

1 0

Akihiro Sagawa : usp10: Display the blank glyph for some control characters (non truetype/ opentype).
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: e083986df52bd706d0c7e8ae8820a5d886942585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e083986df52bd706d0c7e8ae8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Aug 12 00:54:40 2015 +0900 usp10: Display the blank glyph for some control characters (non truetype/opentype). --- dlls/usp10/tests/usp10.c | 6 +----- dlls/usp10/usp10.c | 9 +++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7670dc2..f9b43d1 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1486,11 +1486,7 @@ static void test_ScriptShape(HDC hdc) hr = ScriptShape(hdc, &sc, &blanks[j], 1, 1, &items[0].a, glyphs2, logclust, attrs, &nb); ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, blanks[j], hr); ok(nb == 1, "%s: [%02x] expected 1, got %d\n", lf.lfFaceName, blanks[j], nb); - if (i == 0) - ok(glyphs[0] == glyphs2[0] || - broken(glyphs2[0] == blanks[j] && (blanks[j] < 0x10)), - "%s: [%02x] expected %04x, got %04x\n", lf.lfFaceName, blanks[j], glyphs[0], glyphs2[0]); - else todo_wine + ok(glyphs[0] == glyphs2[0] || broken(glyphs2[0] == blanks[j] && (blanks[j] < 0x10)), "%s: [%02x] expected %04x, got %04x\n", lf.lfFaceName, blanks[j], glyphs[0], glyphs2[0]); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 628f45c..fa4dc79 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2967,6 +2967,15 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, /* No mirroring done here */ if (rtl) idx = cChars - 1 - i; pwOutGlyphs[i] = pwcChars[idx]; + + /* overwrite some basic control glyphs to blank */ + if (psa && psa->eScript == Script_Control && + pwcChars[idx] < ((ScriptCache *)*psc)->tm.tmFirstChar) + { + if (pwcChars[idx] == 0x0009 || pwcChars[idx] == 0x000A || + pwcChars[idx] == 0x000D || pwcChars[idx] >= 0x001C) + pwOutGlyphs[i] = ((ScriptCache *)*psc)->sfp.wgBlank; + } } }

1 0

Akihiro Sagawa : usp10/tests: Add tests for control character glyphs.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 311fce671d7a2a3f77a8464a0152ac0196afcd33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=311fce671d7a2a3f77a8464a0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Aug 12 00:54:38 2015 +0900 usp10/tests: Add tests for control character glyphs. --- dlls/usp10/tests/usp10.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 39240f5..1702f20 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1334,7 +1334,7 @@ static void test_ScriptShape(HDC hdc) WORD glyphs[4], glyphs2[4], logclust[4]; SCRIPT_VISATTR attrs[4]; SCRIPT_ITEM items[2]; - int nb; + int nb, i, j; hr = ScriptItemize(test1, 4, 2, NULL, NULL, items, NULL); ok(hr == S_OK, "ScriptItemize should return S_OK not %08x\n", hr); @@ -1454,6 +1454,51 @@ static void test_ScriptShape(HDC hdc) ok(attrs[3].fZeroWidth == 0, "fZeroWidth incorrect\n"); ScriptFreeCache(&sc); + + /* some control characters are shown as blank */ + for (i = 0; i < 2; i++) + { + static const WCHAR space[] = {' ', 0}; + static const WCHAR blanks[] = {'\t', '\r', '\n', 0x001C, 0x001D, 0x001E, 0x001F,0}; + HFONT font, oldfont = NULL; + LOGFONTA lf; + + font = GetCurrentObject(hdc, OBJ_FONT); + GetObjectA(font, sizeof(lf), &lf); + if (i == 1) { + lstrcpyA(lf.lfFaceName, "MS Sans Serif"); + font = CreateFontIndirectA(&lf); + oldfont = SelectObject(hdc, font); + } + + hr = ScriptItemize(space, 1, 2, NULL, NULL, items, NULL); + ok(hr == S_OK, "%s: expected S_OK, got %08x\n", lf.lfFaceName, hr); + + hr = ScriptShape(hdc, &sc, space, 1, 1, &items[0].a, glyphs, logclust, attrs, &nb); + ok(hr == S_OK, "%s: expected S_OK, got %08x\n", lf.lfFaceName, hr); + ok(nb == 1, "%s: expected 1, got %d\n", lf.lfFaceName, nb); + + for (j = 0; blanks[j]; j++) + { + hr = ScriptItemize(&blanks[j], 1, 2, NULL, NULL, items, NULL); + ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, blanks[j], hr); + + hr = ScriptShape(hdc, &sc, &blanks[j], 1, 1, &items[0].a, glyphs2, logclust, attrs, &nb); + ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, blanks[j], hr); + ok(nb == 1, "%s: [%02x] expected 1, got %d\n", lf.lfFaceName, blanks[j], nb); + if (i == 0 && blanks[j] != '\n') + ok(glyphs[0] == glyphs2[0] || + broken(glyphs2[0] == blanks[j] && (blanks[j] < 0x10)), + "%s: [%02x] expected %04x, got %04x\n", lf.lfFaceName, blanks[j], glyphs[0], glyphs2[0]); + else todo_wine + ok(glyphs[0] == glyphs2[0] || + broken(glyphs2[0] == blanks[j] && (blanks[j] < 0x10)), + "%s: [%02x] expected %04x, got %04x\n", lf.lfFaceName, blanks[j], glyphs[0], glyphs2[0]); + } + if (oldfont) + DeleteObject(SelectObject(hdc, oldfont)); + ScriptFreeCache(&sc); + } } static void test_ScriptPlace(HDC hdc)

1 0

Bruno Jesus : msvfw32: Make it easier to recognize missing media codecs.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 79c37ac88b3b6618514fce05e4411291b480698e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c37ac88b3b6618514fce05e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 11 00:29:28 2015 +0800 msvfw32: Make it easier to recognize missing media codecs. --- dlls/msvfw32/msvideo_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index b6b7507..db56fdf 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -649,8 +649,8 @@ HIC VFWAPI ICLocate(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, if (fccType == streamtypeVIDEO) return ICLocate(ICTYPE_VIDEO, fccHandler, lpbiIn, lpbiOut, wMode); - WARN("(%s,%s,%p,%p,0x%04x) not found!\n", - wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), lpbiIn, lpbiOut, wMode); + ERR("Required media codec '%s %s' not found!\n", + wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler)); return 0; }

1 0

Jacek Caban : mshtml: Wine Gecko 2.40 release.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: a556f9e5c12b76e1d331e49c38b0f63f54e808b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a556f9e5c12b76e1d331e49c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 11 15:11:35 2015 +0200 mshtml: Wine Gecko 2.40 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/nsembed.c | 6 +- dlls/mshtml/nsiface.idl | 114 ++++++++++++++++++++-------------- dlls/mshtml/nsio.c | 155 +++++++++++++++++++++++++++++++++++++---------- 4 files changed, 199 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a556f9e5c12b76e1d331e…

1 0

André Hentschel : kernel32/tests: Add more ARM and ARM64 arch strings.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 4b8df74447940c0c91f4877d99f6fa47fd1328d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b8df74447940c0c91f4877d9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 14:03:54 2015 +0200 kernel32/tests: Add more ARM and ARM64 arch strings. --- dlls/kernel32/tests/path.c | 4 ++++ dlls/kernel32/tests/thread.c | 4 ++++ dlls/oleaut32/tests/typelib.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index f8dfdc8..85c4ec3 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -46,6 +46,10 @@ #define ARCH "x86" #elif defined __x86_64__ #define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" #else #define ARCH "none" #endif diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 35e978e..bb6faa0 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -65,6 +65,10 @@ #define ARCH "x86" #elif defined __x86_64__ #define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" #else #define ARCH "none" #endif diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index df68340..3ce2bd7 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -63,6 +63,10 @@ #define ARCH "x86" #elif defined __x86_64__ #define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" #else #define ARCH "none" #endif

1 0

Nikolay Sivov : dwrite: Use better font matching algorithm based on weight /stretch/style triples.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: f5f025f1ddbeb5680c7b51d3b95857d0f7818233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f025f1ddbeb5680c7b51d3b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 10 13:51:28 2015 +0300 dwrite: Use better font matching algorithm based on weight/stretch/style triples. --- dlls/dwrite/font.c | 103 ++++++++++++++++++++++++++++++++++++----------- dlls/dwrite/tests/font.c | 2 +- 2 files changed, 80 insertions(+), 25 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6036720..eda6378 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -42,6 +42,12 @@ static const FLOAT RECOMMENDED_OUTLINE_AA_THRESHOLD = 100.0f; static const FLOAT RECOMMENDED_OUTLINE_A_THRESHOLD = 350.0f; static const FLOAT RECOMMENDED_NATURAL_PPEM = 20.0f; +struct dwrite_font_propvec { + FLOAT stretch; + FLOAT style; + FLOAT weight; +}; + struct dwrite_font_data { LONG ref; @@ -49,6 +55,8 @@ struct dwrite_font_data { DWRITE_FONT_STRETCH stretch; DWRITE_FONT_WEIGHT weight; DWRITE_PANOSE panose; + struct dwrite_font_propvec propvec; + DWRITE_FONT_METRICS1 metrics; IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME+1]; @@ -257,6 +265,23 @@ static void* get_fontface_table(struct dwrite_fontface *fontface, UINT32 tag, st return table->data; } +static void init_font_prop_vec(const struct dwrite_font_props *props, struct dwrite_font_propvec *vec) +{ + vec->stretch = ((INT32)props->stretch - DWRITE_FONT_STRETCH_NORMAL) * 11.0f; + vec->style = props->style * 7.0f; + vec->weight = ((INT32)props->weight - DWRITE_FONT_WEIGHT_NORMAL) / 100.0f * 5.0f; +} + +static FLOAT get_font_prop_vec_distance(const struct dwrite_font_propvec *left, const struct dwrite_font_propvec *right) +{ + return powf(left->stretch - right->stretch, 2) + powf(left->style - right->style, 2) + powf(left->weight - right->weight, 2); +} + +static FLOAT get_font_prop_vec_dotproduct(const struct dwrite_font_propvec *left, const struct dwrite_font_propvec *right) +{ + return left->stretch * right->stretch + left->style * right->style + left->weight * right->weight; +} + static inline void* get_fontface_cmap(struct dwrite_fontface *fontface) { return get_fontface_table(fontface, MS_CMAP_TAG, &fontface->cmap); @@ -1552,14 +1577,44 @@ static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily *iface, return clone_localizedstring(This->data->familyname, names); } -static inline BOOL is_matching_font_style(DWRITE_FONT_STYLE style, DWRITE_FONT_STYLE font_style) +static BOOL is_better_font_match(const struct dwrite_font_propvec *next, const struct dwrite_font_propvec *cur, + const struct dwrite_font_propvec *req) { - if (style == font_style) + FLOAT cur_to_req = get_font_prop_vec_distance(cur, req); + FLOAT next_to_req = get_font_prop_vec_distance(next, req); + FLOAT cur_req_prod, next_req_prod; + + if (next_to_req < cur_to_req) return TRUE; - if (((style == DWRITE_FONT_STYLE_ITALIC) || (style == DWRITE_FONT_STYLE_OBLIQUE)) && font_style == DWRITE_FONT_STYLE_NORMAL) + if (next_to_req > cur_to_req) + return FALSE; + + cur_req_prod = get_font_prop_vec_dotproduct(cur, req); + next_req_prod = get_font_prop_vec_dotproduct(next, req); + + if (next_req_prod > cur_req_prod) return TRUE; + if (next_req_prod < cur_req_prod) + return FALSE; + + if (next->stretch > cur->stretch) + return TRUE; + if (next->stretch < cur->stretch) + return FALSE; + + if (next->style > cur->style) + return TRUE; + if (next->style < cur->style) + return FALSE; + + if (next->weight > cur->weight) + return TRUE; + if (next->weight < cur->weight) + return FALSE; + + /* full match, no reason to prefer new variant */ return FALSE; } @@ -1567,35 +1622,34 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i DWRITE_FONT_STRETCH stretch, DWRITE_FONT_STYLE style, IDWriteFont **font) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); - UINT32 min_weight_diff = ~0u; - int found = -1, i; + struct dwrite_font_props reqprops = { style, stretch, weight }; + DWRITE_FONT_SIMULATIONS simulations; + struct dwrite_font_propvec req; + struct dwrite_font_data *match; + UINT32 i; TRACE("(%p)->(%d %d %d %p)\n", This, weight, stretch, style, font); - for (i = 0; i < This->data->font_count; i++) { - if (is_matching_font_style(style, This->data->fonts[i]->style) && stretch == This->data->fonts[i]->stretch) { - DWRITE_FONT_WEIGHT font_weight = This->data->fonts[i]->weight; - UINT32 weight_diff = abs(font_weight - weight); - if (weight_diff < min_weight_diff) { - min_weight_diff = weight_diff; - found = i; - } - } + if (This->data->font_count == 0) { + *font = NULL; + return DWRITE_E_NOFONT; } - if (found != -1) { - DWRITE_FONT_SIMULATIONS simulations = DWRITE_FONT_SIMULATIONS_NONE; + init_font_prop_vec(&reqprops, &req); + match = This->data->fonts[0]; - if (((style == DWRITE_FONT_STYLE_ITALIC) || (style == DWRITE_FONT_STYLE_OBLIQUE)) && - This->data->fonts[found]->style == DWRITE_FONT_STYLE_NORMAL) { - simulations = DWRITE_FONT_SIMULATIONS_OBLIQUE; - } - return create_font(This->data->fonts[found], iface, simulations, font); + for (i = 1; i < This->data->font_count; i++) { + if (is_better_font_match(&This->data->fonts[i]->propvec, &match->propvec, &req)) + match = This->data->fonts[i]; } - else { - *font = NULL; - return DWRITE_E_NOFONT; + + simulations = DWRITE_FONT_SIMULATIONS_NONE; + if (((style == DWRITE_FONT_STYLE_ITALIC) || (style == DWRITE_FONT_STYLE_OBLIQUE)) && + match->style == DWRITE_FONT_STYLE_NORMAL) { + simulations = DWRITE_FONT_SIMULATIONS_OBLIQUE; } + + return create_font(match, iface, simulations, font); } static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight, @@ -1941,6 +1995,7 @@ static HRESULT init_font_data(IDWriteFactory2 *factory, IDWriteFontFile *file, U data->stretch = props.stretch; data->weight = props.weight; data->panose = props.panose; + init_font_prop_vec(&props, &data->propvec); if (tt_os2) IDWriteFontFileStream_ReleaseFileFragment(*stream, os2_context); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 0664a9a..7ee5c8a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -705,7 +705,7 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); weight = IDWriteFont_GetWeight(font); - ok(weight == DWRITE_FONT_WEIGHT_NORMAL || broken(weight == DWRITE_FONT_WEIGHT_BOLD) /* win7 w/o SP */, + ok(weight == DWRITE_FONT_WEIGHT_NORMAL || weight == DWRITE_FONT_WEIGHT_BOLD, "got %d\n", weight); IDWriteFont_Release(font);

1 0

Huw Davies : ws2_32: Avoid using inet_ntoa() which isn't thread-safe.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 2569123d003be01638978c0bdab2dfe62f935d28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2569123d003be01638978c0bd… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 10 15:08:44 2015 +0100 ws2_32: Avoid using inet_ntoa() which isn't thread-safe. --- dlls/ws2_32/socket.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 79aaaf9..ca82ec9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -283,9 +283,18 @@ static inline const char *debugstr_sockaddr( const struct WS_sockaddr *a ) switch (a->sa_family) { case WS_AF_INET: + { + char buf[16]; + const char *p; + struct WS_sockaddr_in *sin = (struct WS_sockaddr_in *)a; + + p = WS_inet_ntop( WS_AF_INET, &sin->sin_addr, buf, sizeof(buf) ); + if (!p) + p = "(unknown IPv4 address)"; + return wine_dbg_sprintf("{ family AF_INET, address %s, port %d }", - inet_ntoa(((const struct sockaddr_in *)a)->sin_addr), - ntohs(((const struct sockaddr_in *)a)->sin_port)); + p, ntohs(sin->sin_port)); + } case WS_AF_INET6: { char buf[46]; @@ -4004,15 +4013,15 @@ WS_u_short WINAPI WS_ntohs(WS_u_short netshort) */ char* WINAPI WS_inet_ntoa(struct WS_in_addr in) { - char* s = inet_ntoa(*((struct in_addr*)&in)); - if( s ) - { - struct per_thread_data *data = get_per_thread_data(); - strcpy(data->ntoa_buffer, s); - return data->ntoa_buffer; - } - SetLastError(wsaErrno()); - return NULL; + struct per_thread_data *data = get_per_thread_data(); + + sprintf( data->ntoa_buffer, "%u.%u.%u.%u", + (unsigned int)(ntohl( in.WS_s_addr ) >> 24 & 0xff), + (unsigned int)(ntohl( in.WS_s_addr ) >> 16 & 0xff), + (unsigned int)(ntohl( in.WS_s_addr ) >> 8 & 0xff), + (unsigned int)(ntohl( in.WS_s_addr ) & 0xff) ); + + return data->ntoa_buffer; } static const char *debugstr_wsaioctl(DWORD ioctl)

1 0

Piotr Caban : ntdll: Fix modules order in InInitializationOrderModuleList.
by Alexandre Julliard Aug. 12, 2015

Aug. 12, 2015

Module: wine Branch: master Commit: 18d9ca872a2c63ab1ba992d6d527758f29d141bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d9ca872a2c63ab1ba992d6d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 11 19:21:57 2015 +0200 ntdll: Fix modules order in InInitializationOrderModuleList. --- dlls/ntdll/loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index bef0ab1..0e91af4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1166,6 +1166,10 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) if ((status = process_attach( wm->deps[i], lpReserved )) != STATUS_SUCCESS) break; } + if (!wm->ldr.InInitializationOrderModuleList.Flink) + InsertTailList(&NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList, + &wm->ldr.InInitializationOrderModuleList); + /* Call DLL entry point */ if (status == STATUS_SUCCESS) { @@ -1184,10 +1188,6 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) current_modref = prev; } - if (!wm->ldr.InInitializationOrderModuleList.Flink) - InsertTailList(&NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList, - &wm->ldr.InInitializationOrderModuleList); - if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie ); /* Remove recursion flag */ wm->ldr.Flags &= ~LDR_LOAD_IN_PROGRESS;

1 0