April 2017 - Wine-commits - list.winehq.org

Akihiro Sagawa : secur32: Return correct key exchange algorithm value.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 8981dac8597f6f853f99951051de2adaead35279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8981dac8597f6f853f9995105… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 17 23:26:04 2017 +0900 secur32: Return correct key exchange algorithm value. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index da83482..44e88bd 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -343,10 +343,9 @@ static ALG_ID schannel_get_kx_algid(int kx) case GNUTLS_KX_DHE_DSS: case GNUTLS_KX_DHE_RSA: return CALG_DH_EPHEM; case GNUTLS_KX_ANON_ECDH: return CALG_ECDH; - /* MSDN mentions CALG_ECDH_EPHEM, but doesn't appear in the Windows SDK. */ case GNUTLS_KX_ECDHE_RSA: - case GNUTLS_KX_ECDHE_PSK: return CALG_ECDH; - case GNUTLS_KX_ECDHE_ECDSA: return CALG_ECDSA; + case GNUTLS_KX_ECDHE_PSK: + case GNUTLS_KX_ECDHE_ECDSA: return CALG_ECDH_EPHEM; default: FIXME("unknown algorithm %d\n", kx); return 0;

1 0

Akihiro Sagawa : secur32: 3DES has a different ALG_ID.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: d5bc3c7bce12cc426cc9865cea7625ac3f8c3397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5bc3c7bce12cc426cc9865ce… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 17 23:26:06 2017 +0900 secur32: 3DES has a different ALG_ID. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 44e88bd..33686bc 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -300,8 +300,8 @@ static ALG_ID schannel_get_cipher_algid(int cipher) case GNUTLS_CIPHER_NULL: return 0; case GNUTLS_CIPHER_ARCFOUR_40: case GNUTLS_CIPHER_ARCFOUR_128: return CALG_RC4; - case GNUTLS_CIPHER_DES_CBC: - case GNUTLS_CIPHER_3DES_CBC: return CALG_DES; + case GNUTLS_CIPHER_DES_CBC: return CALG_DES; + case GNUTLS_CIPHER_3DES_CBC: return CALG_3DES; case GNUTLS_CIPHER_AES_128_CBC: case GNUTLS_CIPHER_AES_128_GCM: return CALG_AES_128; case GNUTLS_CIPHER_AES_192_CBC: return CALG_AES_192;

1 0

Nikolay Sivov : dwrite: Consistently use common point and rect types.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 672ca3d3b8e4f60d84efccfcd24ea2aba87035a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=672ca3d3b8e4f60d84efccfcd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 15:15:24 2017 +0300 dwrite: Consistently use common point and rect types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 111 ++++++++++++++++++++++++--------------------------- 1 file changed, 52 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=672ca3d3b8e4f60d84efc…

1 0

Nikolay Sivov : dwrite/tests: Test to show that canWrapLineAfter is not fixed up by disabled wrapping.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 47455651923e6bf3c6f0773265946ee1942afa05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47455651923e6bf3c6f077326… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 15:15:25 2017 +0300 dwrite/tests: Test to show that canWrapLineAfter is not fixed up by disabled wrapping. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 8a32303..f48fc42 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1858,6 +1858,7 @@ static void test_GetClusterMetrics(void) static const WCHAR str2W[] = {0x202a,0x202c,'a',0}; static const WCHAR strW[] = {'a','b','c','d',0}; static const WCHAR str4W[] = {'a',' ',0}; + static const WCHAR str6W[] = {'a',' ','b',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; DWRITE_CLUSTER_METRICS metrics[22]; DWRITE_TEXT_METRICS text_metrics; @@ -2254,6 +2255,25 @@ todo_wine IDWriteTextLayout_Release(layout); + /* NO_WRAP, check cluster wrapping attribute. */ + hr = IDWriteTextFormat_SetWordWrapping(format, DWRITE_WORD_WRAPPING_NO_WRAP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, str6W, lstrlenW(str6W), format, 1000.0f, 200.0f, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 3, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 3, "got %u\n", count); + + ok(metrics[0].canWrapLineAfter == 0, "got %d\n", metrics[0].canWrapLineAfter); + ok(metrics[1].canWrapLineAfter == 1, "got %d\n", metrics[1].canWrapLineAfter); + ok(metrics[2].canWrapLineAfter == 1, "got %d\n", metrics[2].canWrapLineAfter); + + IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(trimm); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory);

1 0

Nikolay Sivov : dwrite/tests: Initial tests for IDWriteInMemoryFontFileLoader.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 74f6c99621147e8128e62badd925b2b2e595d3e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f6c99621147e8128e62badd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 15:15:26 2017 +0300 dwrite/tests: Initial tests for IDWriteInMemoryFontFileLoader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 8b16d0e..7488189 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7263,6 +7263,125 @@ static void test_object_lifetime(void) ok(ref == 0, "factory not released, %u\n", ref); } +static void test_inmemory_file_loader(void) +{ + IDWriteFontFileLoader *loader, *loader2; + IDWriteInMemoryFontFileLoader *inmemory; + IDWriteFontFile *file, *file2; + IDWriteFontFileStream *stream; + IDWriteFontFace *fontface; + IDWriteFactory5 *factory5; + IDWriteFactory *factory; + const void *key, *data; + UINT32 count, key_size; + UINT64 file_size; + void *context; + HRESULT hr; + ULONG ref; + + factory = create_factory(); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory5, (void **)&factory5); + IDWriteFactory_Release(factory); + if (FAILED(hr)) { + skip("CreateInMemoryFontFileLoader is not supported\n"); + return; + } + + fontface = create_fontface((IDWriteFactory *)factory5); + hr = IDWriteFactory5_CreateInMemoryFontFileLoader(factory5, &loader); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFactory5_CreateInMemoryFontFileLoader(factory5, &loader2); + ok(hr == S_OK, "got %#x\n", hr); + ok(loader != loader2, "unexpected pointer\n"); + IDWriteFontFileLoader_Release(loader2); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteInMemoryFontFileLoader, (void **)&inmemory); + ok(hr == S_OK, "got %#x\n", hr); + IDWriteFontFileLoader_Release(loader); + + /* Use whole font blob to construct in-memory file. */ + count = 1; + hr = IDWriteFontFace_GetFiles(fontface, &count, &file); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontFileLoader_CreateStreamFromKey(loader, key, key_size, &stream); + ok(hr == S_OK, "got %#x\n", hr); + IDWriteFontFileLoader_Release(loader); + IDWriteFontFile_Release(file); + + hr = IDWriteFontFileStream_GetFileSize(stream, &file_size); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontFileStream_ReadFileFragment(stream, &data, 0, file_size, &context); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, + file_size, NULL, &file); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + hr = IDWriteFactory5_RegisterFontFileLoader(factory5, (IDWriteFontFileLoader *)inmemory); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, + file_size, NULL, &file); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, + file_size, NULL, &file2); + ok(hr == S_OK, "got %#x\n", hr); + ok(file2 != file, "got unexpected file\n"); + + /* Check in-memory reference key format. */ + hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); + ok(hr == S_OK, "got %#x\n", hr); + + ok(key && *(DWORD*)key == 1, "got wrong ref key\n"); + ok(key_size == 4, "ref key size %u\n", key_size); + + hr = IDWriteFontFile_GetReferenceKey(file2, &key, &key_size); + ok(hr == S_OK, "got %#x\n", hr); + + ok(key && *(DWORD*)key == 2, "got wrong ref key\n"); + ok(key_size == 4, "ref key size %u\n", key_size); + + /* Release file and index 1, create new one to see if index is reused. */ + IDWriteFontFile_Release(file); + + hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, + file_size, NULL, &file); + ok(hr == S_OK, "got %#x\n", hr); + ok(file2 != file, "got unexpected file\n"); + + hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); + ok(hr == S_OK, "got %#x\n", hr); + + ok(key && *(DWORD*)key == 3, "got wrong ref key\n"); + ok(key_size == 4, "ref key size %u\n", key_size); + + IDWriteFontFile_Release(file); + IDWriteFontFile_Release(file2); + + hr = IDWriteFactory5_UnregisterFontFileLoader(factory5, (IDWriteFontFileLoader *)inmemory); + ok(hr == S_OK, "got %#x\n", hr); + + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + IDWriteFontFileStream_Release(stream); + + IDWriteInMemoryFontFileLoader_Release(inmemory); + + IDWriteFontFace_Release(fontface); + ref = IDWriteFactory5_Release(factory5); + ok(ref == 0, "factory not released, %u\n", ref); +} + START_TEST(font) { IDWriteFactory *factory; @@ -7324,6 +7443,7 @@ START_TEST(font) test_HasVerticalGlyphVariants(); test_HasKerningPairs(); test_ComputeGlyphOrigins(); + test_inmemory_file_loader(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Trace QueryInterface fontface calls on failure ( Coverity).
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 533d3b904ef7fd36f40f9ce057952c93fcc7c3f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533d3b904ef7fd36f40f9ce05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 15:15:27 2017 +0300 dwrite: Trace QueryInterface fontface calls on failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 +++- dlls/dwrite/main.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b665161..c1b2286 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5135,6 +5135,7 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit IDWriteFontFace1 *fontface1; D2D_POINT_2F origin; FLOAT rtl_factor; + HRESULT hr; UINT32 i; *ret = NULL; @@ -5196,7 +5197,8 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit memcpy(analysis->glyphs, desc->run->glyphIndices, desc->run->glyphCount*sizeof(*desc->run->glyphIndices)); IDWriteFontFace_GetMetrics(desc->run->fontFace, &metrics); - IDWriteFontFace_QueryInterface(desc->run->fontFace, &IID_IDWriteFontFace1, (void **)&fontface1); + if (FAILED(hr = IDWriteFontFace_QueryInterface(desc->run->fontFace, &IID_IDWriteFontFace1, (void **)&fontface1))) + WARN("Failed to get IDWriteFontFace1, %#x.\n", hr); origin.x = desc->origin_x * desc->ppdip; origin.y = desc->origin_y * desc->ppdip; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index c17bb5a..73fcb51 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1449,13 +1449,15 @@ static HRESULT compute_glyph_origins(DWRITE_GLYPH_RUN const *run, DWRITE_MEASURI IDWriteFontFace1 *fontface1 = NULL; DWRITE_FONT_METRICS metrics; FLOAT rtl_factor; + HRESULT hr; UINT32 i; rtl_factor = run->bidiLevel & 1 ? -1.0f : 1.0f; if (run->fontFace) { IDWriteFontFace_GetMetrics(run->fontFace, &metrics); - IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void **)&fontface1); + if (FAILED(hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void **)&fontface1))) + WARN("Failed to get IDWriteFontFace1, %#x.\n", hr); } for (i = 0; i < run->glyphCount; i++) {

1 0

Nikolay Sivov : dwrite/tests: Initial tests for GetGlyphImageFormats().
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: ef31887c402c36213969510a9a550a19b3e673fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef31887c402c36213969510a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 15:15:28 2017 +0300 dwrite/tests: Initial tests for GetGlyphImageFormats(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7488189..2e26bc7 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -42,6 +42,9 @@ #define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') #define MS_GSUB_TAG DWRITE_MAKE_OPENTYPE_TAG('G','S','U','B') #define MS_KERN_TAG DWRITE_MAKE_OPENTYPE_TAG('k','e','r','n') +#define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f') +#define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') +#define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -7382,6 +7385,120 @@ static void test_inmemory_file_loader(void) ok(ref == 0, "factory not released, %u\n", ref); } +static BOOL face_has_table(IDWriteFontFace4 *fontface, UINT32 tag) +{ + BOOL exists = FALSE; + const void *data; + void *context; + UINT32 size; + HRESULT hr; + + hr = IDWriteFontFace4_TryGetFontTable(fontface, tag, &data, &size, &context, &exists); + ok(hr == S_OK, "TryGetFontTable() failed, %#x\n", hr); + if (exists) + IDWriteFontFace4_ReleaseFontTable(fontface, context); + + return exists; +} + +static DWORD get_face_glyph_image_formats(IDWriteFontFace4 *fontface) +{ + DWORD ret = DWRITE_GLYPH_IMAGE_FORMATS_NONE; + + if (face_has_table(fontface, MS_GLYF_TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE; + + if (face_has_table(fontface, MS_CFF__TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_CFF; + + if (face_has_table(fontface, MS_COLR_TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_COLR; + + /* TODO: handle SVG and bitmap data */ + return ret; +} + +static void test_GetGlyphImageFormats(void) +{ + IDWriteFontCollection *syscollection; + IDWriteFactory *factory; + UINT32 i, count; + HRESULT hr; + ULONG ref; + IDWriteFontFace *fontface; + IDWriteFontFace4 *fontface4; + + factory = create_factory(); + + fontface = create_fontface(factory); + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace4, (void **)&fontface4); + IDWriteFontFace_Release(fontface); + if (FAILED(hr)) { + win_skip("GetGlyphImageFormats() is not supported\n"); + IDWriteFactory_Release(factory); + return; + } + IDWriteFontFace4_Release(fontface4); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < count; i++) { + WCHAR familynameW[256], facenameW[128]; + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 j, fontcount; + IDWriteFont *font; + + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, familynameW, sizeof(familynameW)/sizeof(*familynameW)); + IDWriteLocalizedStrings_Release(names); + + fontcount = IDWriteFontFamily_GetFontCount(family); + for (j = 0; j < fontcount; j++) { + DWORD formats, expected_formats; + + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_GetFaceNames(font, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, facenameW, sizeof(facenameW)/sizeof(*facenameW)); + + IDWriteLocalizedStrings_Release(names); + + IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace4, (void **)&fontface4); + + /* Mask describes font as a whole. */ + formats = IDWriteFontFace4_GetGlyphImageFormats(fontface4); + expected_formats = get_face_glyph_image_formats(fontface4); + todo_wine + ok(formats == expected_formats, "%s - %s, expected formats %#x, got formats %#x.\n", + wine_dbgstr_w(familynameW), wine_dbgstr_w(facenameW), expected_formats, formats); + + IDWriteFontFace4_Release(fontface4); + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); + } + + IDWriteFontFamily_Release(family); + } + + IDWriteFontCollection_Release(syscollection); + ref = IDWriteFactory_Release(factory); + ok(ref == 0, "factory not released, %u\n", ref); +} + START_TEST(font) { IDWriteFactory *factory; @@ -7444,6 +7561,7 @@ START_TEST(font) test_HasKerningPairs(); test_ComputeGlyphOrigins(); test_inmemory_file_loader(); + test_GetGlyphImageFormats(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Make CreateFontFaceFromHdc() properly fail on unsupported font format.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 0344c19692396dca80a98f02fa7f713cee12b344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0344c19692396dca80a98f02f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 15:15:29 2017 +0300 dwrite: Make CreateFontFaceFromHdc() properly fail on unsupported font format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 13 +++++++------ dlls/dwrite/tests/font.c | 24 +++++++++++++++++++++++- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index cf3b3fa..2b3f32d 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -761,14 +761,15 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop1 *iface is_supported = FALSE; hr = IDWriteFontFile_Analyze(file, &is_supported, &filetype, &facetype, &facenum); - if (FAILED(hr) || !is_supported) { - IDWriteFontFile_Release(file); - return hr; + if (SUCCEEDED(hr)) { + if (is_supported) + /* Simulations flags values match DWRITE_FONT_SIMULATIONS */ + hr = IDWriteFactory4_CreateFontFace(This->factory, facetype, 1, &file, info.face_index, + info.simulations, fontface); + else + hr = DWRITE_E_FILEFORMAT; } - /* Simulations flags values match DWRITE_FONT_SIMULATIONS */ - hr = IDWriteFactory4_CreateFontFace(This->factory, facetype, 1, &file, info.face_index, info.simulations, - fontface); IDWriteFontFile_Release(file); return hr; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2e26bc7..2c874df 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -3458,6 +3458,7 @@ static void test_CreateFontFaceFromHdc(void) IDWriteFactory *factory; HFONT hfont, oldhfont; LOGFONTW logfont; + LOGFONTA lf; HRESULT hr; ULONG ref; HDC hdc; @@ -3468,11 +3469,17 @@ static void test_CreateFontFaceFromHdc(void) hr = IDWriteFactory_GetGdiInterop(factory, &interop); ok(hr == S_OK, "got 0x%08x\n", hr); + /* Invalid HDC. */ fontface = (void*)0xdeadbeef; hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, NULL, &fontface); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(fontface == NULL, "got %p\n", fontface); + fontface = (void *)0xdeadbeef; + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, (HDC)0xdeadbeef, &fontface); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(fontface == NULL, "got %p\n", fontface); + memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; logfont.lfWidth = 12; @@ -3489,6 +3496,21 @@ static void test_CreateFontFaceFromHdc(void) ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFontFace_Release(fontface); DeleteObject(SelectObject(hdc, oldhfont)); + + /* Select bitmap font MS Sans Serif, format that's not supported by DirectWrite. */ + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -12; + strcpy(lf.lfFaceName, "MS Sans Serif"); + + hfont = CreateFontIndirectA(&lf); + oldhfont = SelectObject(hdc, hfont); + + fontface = (void *)0xdeadbeef; + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, hdc, &fontface); + ok(hr == DWRITE_E_FILEFORMAT || broken(hr == E_FAIL) /* Vista */, "got 0x%08x\n", hr); + ok(fontface == NULL, "got %p\n", fontface); + + DeleteObject(SelectObject(hdc, oldhfont)); DeleteDC(hdc); IDWriteGdiInterop_Release(interop);

1 0

Alexandre Julliard : glu32: Import quadric functions from Mesa.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 845b1ff5bf0d704ff7de4503b6f6e2984e59cb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=845b1ff5bf0d704ff7de4503b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 14 09:36:54 2017 +0200 glu32: Import quadric functions from Mesa. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/Makefile.in | 3 +- dlls/glu32/glu.c | 114 ----- dlls/glu32/glu32.spec | 22 +- dlls/glu32/quad.c | 1176 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1189 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=845b1ff5bf0d704ff7de4…

1 0

Jacek Caban : mshtml.idl: Added HTMLLabelElement coclass declaration.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: a17e6b33c7189f13de6f96703d61b6cd7f77601c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17e6b33c7189f13de6f96703… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:35:40 2017 +0200 mshtml.idl: Added HTMLLabelElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 4 ++-- include/mshtml.idl | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 58919f5..3a03611 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1371,11 +1371,11 @@ HRESULT HTMLInputElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem return S_OK; } -typedef struct { +struct HTMLLabelElement { HTMLElement element; IHTMLLabelElement IHTMLLabelElement_iface; -} HTMLLabelElement; +}; static inline HTMLLabelElement *impl_from_IHTMLLabelElement(IHTMLLabelElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 24721eb..a6072a6 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -10101,6 +10101,23 @@ methods: } /***************************************************************************** + * HTMLLabelElement coclass + */ +[ + noncreatable, + uuid(3050f32b-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLLabelElement +{ + [default] dispinterface DispHTMLLabelElement; + /* [source, default] dispinterface HTMLLabelEvents; */ + /* [source] dispinterface HTMLLabelEvents2; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLLabelElement; + interface IHTMLLabelElement2; +} + +/***************************************************************************** * IHTMLElementCollection interface */ [

1 0