February 2016 - Wine-commits

Ken Thomases : wined3d: Change calls of GetDC() to GetDCEx() with DCX_CACHE so the HDC is not shared with other threads.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 52a99f2eadf04394a99d81f97a9a6d2a454fa959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a99f2eadf04394a99d81f97… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 15 14:48:27 2016 -0600 wined3d: Change calls of GetDC() to GetDCEx() with DCX_CACHE so the HDC is not shared with other threads. Windows created by the app may use the CS_CLASSDC or CS_OWNDC class styles. In that case, GetDC() would return the same HDC to all callers. It's not safe, though, for multiple threads to use the same HDC without synchronization. The app may be using that HDC from multiple threads and using some synchronization scheme to make that safe, but wined3d is not able to cooperate in such a scheme. Using GetDCEx() with DCX_CACHE ensures that wined3d gets an independent HDC. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/swapchain.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 664ef73..442516a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -790,7 +790,7 @@ static BOOL context_restore_pixel_format(struct wined3d_context *ctx) { if (ctx->gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) { - HDC dc = GetDC(ctx->restore_pf_win); + HDC dc = GetDCEx(ctx->restore_pf_win, 0, DCX_USESTYLE | DCX_CACHE); if (dc) { if (!(ret = GL_EXTCALL(wglSetPixelFormatWINE(dc, ctx->restore_pf)))) @@ -966,7 +966,7 @@ static void context_update_window(struct wined3d_context *context) context->needs_set = 1; context->valid = 1; - if (!(context->hdc = GetDC(context->win_handle))) + if (!(context->hdc = GetDCEx(context->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { ERR("Failed to get a device context for window %p.\n", context->win_handle); context->valid = 0; @@ -1526,7 +1526,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } } - if (!(hdc = GetDC(swapchain->win_handle))) + if (!(hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { WARN("Failed to retrieve device context, trying swapchain backup.\n"); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2eb4750..6e56def 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -257,7 +257,7 @@ HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *s if (flags) FIXME("Ignoring flags %#x.\n", flags); - dc = GetDC(swapchain->device_window); + dc = GetDCEx(swapchain->device_window, 0, DCX_USESTYLE | DCX_CACHE); SetDeviceGammaRamp(dc, (void *)ramp); ReleaseDC(swapchain->device_window, dc); @@ -277,7 +277,7 @@ HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *s TRACE("swapchain %p, ramp %p.\n", swapchain, ramp); - dc = GetDC(swapchain->device_window); + dc = GetDCEx(swapchain->device_window, 0, DCX_USESTYLE | DCX_CACHE); GetDeviceGammaRamp(dc, ramp); ReleaseDC(swapchain->device_window, dc);

1 0

Nikolay Sivov : dwrite: Use itemizer hint to reset invisible run glyph count.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: fca83b0915fd1087ea775496a383cfeb34e369bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca83b0915fd1087ea775496a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 16 00:59:25 2016 +0300 dwrite: Use itemizer hint to reset invisible run glyph count. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 7 +++---- dlls/dwrite/tests/layout.c | 11 +++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 164ac48..fbe1eaa 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -965,10 +965,9 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) run->run.glyphAdvances = run->advances; run->run.glyphOffsets = run->offsets; - /* Special treatment of control script, shaping code adds normal glyphs for it, - with non-zero advances, and layout code exposes those as zero width clusters, - so we have to do it manually. */ - if (run->sa.script == Script_Common) + /* Special treatment for runs that don't produce visual output, shaping code adds normal glyphs for them, + with valid cluster map and potentially with non-zero advances; layout code exposes those as zero width clusters. */ + if (run->sa.shapes == DWRITE_SCRIPT_SHAPES_NO_VISUAL) run->run.glyphCount = 0; else run->run.glyphCount = run->glyphcount; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a6da532..0fe9151 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -33,7 +33,6 @@ static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; static const WCHAR enusW[] = {'e','n','-','u','s',0}; static DWRITE_SCRIPT_ANALYSIS g_sa; -static DWRITE_SCRIPT_ANALYSIS g_control_sa; /* test IDWriteTextAnalysisSink */ static HRESULT WINAPI analysissink_QueryInterface(IDWriteTextAnalysisSink *iface, REFIID riid, void **obj) @@ -513,7 +512,9 @@ static HRESULT WINAPI testrenderer_DrawGlyphRun(IDWriteTextRenderer *iface, /* see what's reported for control codes runs */ get_script_analysis(descr->string, descr->stringLength, &sa); - if (sa.script == g_control_sa.script) { + if (sa.shapes == DWRITE_SCRIPT_SHAPES_NO_VISUAL) { + UINT32 i; + /* glyphs are not reported at all for control code runs */ ok(run->glyphCount == 0, "got %u\n", run->glyphCount); ok(run->glyphAdvances != NULL, "advances array %p\n", run->glyphAdvances); @@ -523,6 +524,8 @@ static HRESULT WINAPI testrenderer_DrawGlyphRun(IDWriteTextRenderer *iface, ok(descr->string != NULL, "got string %p\n", descr->string); ok(descr->stringLength > 0, "got string length %u\n", descr->stringLength); ok(descr->clusterMap != NULL, "clustermap %p\n", descr->clusterMap); + for (i = 0; i < descr->stringLength; i++) + ok(descr->clusterMap[i] == i, "got %u\n", descr->clusterMap[i]); } entry.kind = DRAW_GLYPHRUN; @@ -4852,7 +4855,6 @@ todo_wine START_TEST(layout) { - static const WCHAR ctrlstrW[] = {0x202a,0}; IDWriteFactory *factory; if (!(factory = create_factory())) { @@ -4860,9 +4862,6 @@ START_TEST(layout) return; } - /* actual script ids are not fixed */ - get_script_analysis(ctrlstrW, 1, &g_control_sa); - init_call_sequences(sequences, NUM_CALL_SEQUENCES); init_call_sequences(expected_seq, 1);

1 0

Nikolay Sivov : dwrite: Add fallback data for some of Japanese ranges.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 1a92176b6741cc27e3ea2d472d6365bc281b7ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a92176b6741cc27e3ea2d472… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 16 00:59:26 2016 +0300 dwrite: Add fallback data for some of Japanese ranges. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 23 ++++++++++++++++------- dlls/dwrite/tests/layout.c | 1 + 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 1b52eb7..30f54d7 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -191,6 +191,8 @@ struct fallback_mapping { }; static const struct fallback_mapping fontfallback_neutral_data[] = { + { { 0x3000, 0x30ff }, meiryoW }, /* CJK Symbols and Punctuation, Hiragana, Katakana */ + { { 0x31f0, 0x31ff }, meiryoW }, /* Katakana Phonetic Extensions */ { { 0x4e00, 0x9fff }, meiryoW }, /* CJK Unified Ideographs */ }; @@ -1736,16 +1738,23 @@ static ULONG WINAPI fontfallback_Release(IDWriteFontFallback *iface) return IDWriteFactory2_Release(fallback->factory); } -static const struct fallback_mapping *find_fallback_mapping(struct dwrite_fontfallback *fallback, UINT32 ch) +static int compare_fallback_mapping(const void *a, const void *b) { - UINT32 i; + UINT32 ch = *(UINT32*)a; + struct fallback_mapping *mapping = (struct fallback_mapping*)b; - for (i = 0; i < fallback->count; i++) { - if (fallback->mappings[i].range.first <= ch && fallback->mappings[i].range.last >= ch) - return &fallback->mappings[i]; - } + if (ch > mapping->range.last) + return 1; + else if (ch < mapping->range.first) + return -1; + else + return 0; +} - return NULL; +static const struct fallback_mapping *find_fallback_mapping(struct dwrite_fontfallback *fallback, UINT32 ch) +{ + return bsearch(&ch, fallback->mappings, fallback->count, sizeof(*fallback->mappings), + compare_fallback_mapping); } HRESULT create_matching_font(IDWriteFontCollection *collection, const WCHAR *name, diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 0fe9151..b3e0df0 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4200,6 +4200,7 @@ static HRESULT WINAPI fontcollection_FindFamilyName(IDWriteFontCollection *iface *exists = TRUE; return S_OK; } +todo_wine ok(0, "unexpected call, name %s\n", wine_dbgstr_w(name)); return E_NOTIMPL; }

1 0

Nikolay Sivov : dwrite: Always use system font collection to create fallback fonts.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 5ec7a860bf7e5822f397c5b900836235b29d19a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec7a860bf7e5822f397c5b90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 16 00:59:27 2016 +0300 dwrite: Always use system font collection to create fallback fonts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 41 +++++++++++++++++++---------------------- dlls/dwrite/tests/layout.c | 1 - 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 30f54d7..891ace4 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -199,6 +199,7 @@ static const struct fallback_mapping fontfallback_neutral_data[] = { struct dwrite_fontfallback { IDWriteFontFallback IDWriteFontFallback_iface; IDWriteFactory2 *factory; + IDWriteFontCollection *systemcollection; const struct fallback_mapping *mappings; UINT32 count; }; @@ -1810,8 +1811,7 @@ static HRESULT fallback_map_characters(IDWriteFont *font, const WCHAR *text, UIN } static HRESULT fallback_get_fallback_font(struct dwrite_fontfallback *fallback, const WCHAR *text, UINT32 length, - IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, - UINT32 *mapped_length, IDWriteFont **mapped_font) + DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, UINT32 *mapped_length, IDWriteFont **mapped_font) { const struct fallback_mapping *mapping; HRESULT hr; @@ -1823,7 +1823,7 @@ static HRESULT fallback_get_fallback_font(struct dwrite_fontfallback *fallback, } /* now let's see what fallback can handle */ - hr = create_matching_font(collection, mapping->family, weight, style, stretch, mapped_font); + hr = create_matching_font(fallback->systemcollection, mapping->family, weight, style, stretch, mapped_font); if (FAILED(hr)) { WARN("failed to create fallback font %s for range [0x%x,0x%x], 0x%08x\n", debugstr_w(mapping->family), mapping->range.first, mapping->range.last, hr); @@ -1865,21 +1865,14 @@ static HRESULT WINAPI fontfallback_MapCharacters(IDWriteFontFallback *iface, IDW if (length == 0) return S_OK; - if (!basecollection) { - hr = IDWriteFactory2_GetSystemFontCollection(fallback->factory, &basecollection, FALSE); - if (FAILED(hr)) - return hr; - } - else - IDWriteFontCollection_AddRef(basecollection); + if (!basecollection) + basecollection = fallback->systemcollection; hr = get_text_source_ptr(source, position, length, &text, &buff); if (FAILED(hr)) goto done; if (basefamily && *basefamily) { - IDWriteFont *mapped_font; - hr = create_matching_font(basecollection, basefamily, weight, style, stretch, ret_font); if (FAILED(hr)) goto done; @@ -1887,25 +1880,27 @@ static HRESULT WINAPI fontfallback_MapCharacters(IDWriteFontFallback *iface, IDW hr = fallback_map_characters(*ret_font, text, length, mapped_length); if (FAILED(hr)) goto done; + } - if (!*mapped_length) { - hr = fallback_get_fallback_font(fallback, text, length, basecollection, weight, style, stretch, mapped_length, &mapped_font); - if (FAILED(hr)) { + if (!*mapped_length) { + IDWriteFont *mapped_font; + + hr = fallback_get_fallback_font(fallback, text, length, weight, style, stretch, mapped_length, &mapped_font); + if (FAILED(hr)) { + /* fallback wasn't found, keep base font if any, so we can get at least some visual output */ + if (*ret_font) { *mapped_length = length; hr = S_OK; - goto done; } - else { + } + else { + if (*ret_font) IDWriteFont_Release(*ret_font); - *ret_font = mapped_font; - } + *ret_font = mapped_font; } } - else - hr = fallback_get_fallback_font(fallback, text, length, basecollection, weight, style, stretch, mapped_length, ret_font); done: - IDWriteFontCollection_Release(basecollection); heap_free(buff); return hr; } @@ -1931,6 +1926,7 @@ HRESULT create_system_fontfallback(IDWriteFactory2 *factory, IDWriteFontFallback fallback->factory = factory; fallback->mappings = fontfallback_neutral_data; fallback->count = sizeof(fontfallback_neutral_data)/sizeof(fontfallback_neutral_data[0]); + IDWriteFactory2_GetSystemFontCollection(fallback->factory, &fallback->systemcollection, FALSE); *ret = &fallback->IDWriteFontFallback_iface; return S_OK; @@ -1939,5 +1935,6 @@ HRESULT create_system_fontfallback(IDWriteFactory2 *factory, IDWriteFontFallback void release_system_fontfallback(IDWriteFontFallback *iface) { struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback(iface); + IDWriteFontCollection_Release(fallback->systemcollection); heap_free(fallback); } diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b3e0df0..0fe9151 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4200,7 +4200,6 @@ static HRESULT WINAPI fontcollection_FindFamilyName(IDWriteFontCollection *iface *exists = TRUE; return S_OK; } -todo_wine ok(0, "unexpected call, name %s\n", wine_dbgstr_w(name)); return E_NOTIMPL; }

1 0

Nikolay Sivov : include: Add initial dwrite_3.idl.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 9cf095a1d4224c5a535b10e3156e5e746b462b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf095a1d4224c5a535b10e31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 16 02:25:39 2016 +0300 include: Add initial dwrite_3.idl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dwrite_3.idl | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 010abe5..8224e28 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -58,6 +58,7 @@ IDL_SRCS = \ dwrite.idl \ dwrite_1.idl \ dwrite_2.idl \ + dwrite_3.idl \ dxgi.idl \ dxgi1_2.idl \ dxva2api.idl \ diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl new file mode 100644 index 0000000..410e693 --- /dev/null +++ b/include/dwrite_3.idl @@ -0,0 +1,215 @@ +/* + * Copyright 2016 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "dwrite_2.idl"; + +interface IDWriteFontFaceReference; +interface IDWriteFontFace3; +interface IDWriteFont3; +interface IDWriteFontSet; + +typedef enum DWRITE_LOCALITY +{ + DWRITE_LOCALITY_REMOTE, + DWRITE_LOCALITY_PARTIAL, + DWRITE_LOCALITY_LOCAL +} DWRITE_LOCALITY; + +typedef enum DWRITE_RENDERING_MODE1 +{ + DWRITE_RENDERING_MODE1_DEFAULT, + DWRITE_RENDERING_MODE1_ALIASED, + DWRITE_RENDERING_MODE1_GDI_CLASSIC, + DWRITE_RENDERING_MODE1_GDI_NATURAL, + DWRITE_RENDERING_MODE1_NATURAL, + DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC, + DWRITE_RENDERING_MODE1_OUTLINE, + DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED +} DWRITE_RENDERING_MODE1; + +[ + local, + object, + uuid(b7924baa-391b-412a-8c5c-e44cc2d867dc) +] +interface IDWriteRenderingParams3 : IDWriteRenderingParams2 +{ + DWRITE_RENDERING_MODE1 GetRenderingMode1(); +} + +[ + local, + object, + uuid(da20d8ef-812a-4c43-9802-62ec4abd7adf) +] +interface IDWriteFontFamily1 : IDWriteFontFamily +{ + DWRITE_LOCALITY GetFontLocality(UINT32 index); + HRESULT GetFont(UINT32 index, IDWriteFont3 **font); + HRESULT GetFontFaceReference(UINT32 index, IDWriteFontFaceReference **reference); +} + +[ + local, + object, + uuid(53585141-d9f8-4095-8321-d73cf6bd116c) +] +interface IDWriteFontCollection1 : IDWriteFontCollection +{ + HRESULT GetFontSet(IDWriteFontSet **fontset); + HRESULT GetFontFamily(UINT32 index, IDWriteFontFamily1 **family); +} + +[ + local, + object, + uuid(5e7fa7ca-dde3-424c-89f0-9fcd6fed58cd) +] +interface IDWriteFontFaceReference : IUnknown +{ + HRESULT CreateFontFace(IDWriteFontFace3 **fontface); + HRESULT CreateFontFaceWithSimulations(DWRITE_FONT_SIMULATIONS simulations, + IDWriteFontFace3 **fontface); + BOOL Equals(IDWriteFontFaceReference *reference); + UINT32 GetFontFaceIndex(); + DWRITE_FONT_SIMULATIONS GetSimulations(); + HRESULT GetFontFile(IDWriteFontFile **fontfile); + UINT64 GetLocalFileSize(); + UINT64 GetFileSize(); + HRESULT GetFileTime(FILETIME *writetime); + DWRITE_LOCALITY GetLocality(); + HRESULT EnqueueFontDownloadRequest(); + HRESULT EnqueueCharacterDownloadRequest(WCHAR const *chars, UINT32 count); + HRESULT EnqueueGlyphDownloadRequest(UINT16 const *glyphs, UINT32 count); + HRESULT EnqueueFileFragmentDownloadRequest(UINT64 offset, UINT64 size); +} + +[ + local, + object, + uuid(da20d8ef-812a-4c43-9802-62ec4abd7ade) +] +interface IDWriteFontList1 : IDWriteFontList +{ + DWRITE_LOCALITY GetFontLocality(UINT32 index); + HRESULT GetFont(UINT32 index, IDWriteFont3 **font); + HRESULT GetFontFaceReference(UINT32 index, IDWriteFontFaceReference **reference); +} + +[ + local, + object, + uuid(d37d7598-09be-4222-a236-2081341cc1f2) +] +interface IDWriteFontFace3 : IDWriteFontFace2 +{ + HRESULT GetFontFaceReference(IDWriteFontFaceReference **reference); + void GetPanose(DWRITE_PANOSE *panose); + DWRITE_FONT_WEIGHT GetWeight(); + DWRITE_FONT_STRETCH GetStretch(); + DWRITE_FONT_STYLE GetStyle(); + HRESULT GetFamilyNames(IDWriteLocalizedStrings **names); + HRESULT GetFaceNames(IDWriteLocalizedStrings **names); + HRESULT GetInformationalStrings(DWRITE_INFORMATIONAL_STRING_ID stringid, + IDWriteLocalizedStrings **strings, + BOOL *exists); + BOOL HasCharacter(UINT32 character); + HRESULT GetRecommendedRenderingMode( + FLOAT emsize, + FLOAT dpi_x, + FLOAT dpi_y, + DWRITE_MATRIX const *transform, + BOOL is_sideways, + DWRITE_OUTLINE_THRESHOLD threshold, + DWRITE_MEASURING_MODE measuring_mode, + IDWriteRenderingParams *params, + DWRITE_RENDERING_MODE1 *rendering_mode, + DWRITE_GRID_FIT_MODE *gridfit_mode); + BOOL IsCharacterLocal(UINT32 character); + BOOL IsGlyphLocal(UINT16 glyph); + HRESULT AreCharactersLocal(WCHAR const *characters, + UINT32 count, BOOL enqueue_if_not, BOOL *are_local); + HRESULT AreGlyphsLocal(UINT16 *const glyphs, UINT32 count, + BOOL enqueue_if_not, BOOL *are_local); +} + +[ + local, + object, + uuid(cfee3140-1257-47ca-8b85-31bfcf3f2d0e) +] +interface IDWriteStringList : IUnknown +{ + UINT32 GetCount(); + HRESULT GetLocaleNameLength(UINT32 index, UINT32 *length); + HRESULT GetLocaleName(UINT32 index, WCHAR *name, UINT32 size); + HRESULT GetStringLength(UINT32 index, UINT32 *length); + HRESULT GetString(UINT32 index, WCHAR *string, UINT32 size); +} + +typedef struct DWRITE_LINE_METRICS1 +{ + UINT32 length; + UINT32 trailingWhitespaceLength; + UINT32 newlineLength; + FLOAT height; + FLOAT baseline; + BOOL isTrimmed; + FLOAT leadingBefore; + FLOAT leadingAfter; +} DWRITE_LINE_METRICS1; + +typedef enum DWRITE_FONT_LINE_GAP_USAGE +{ + DWRITE_FONT_LINE_GAP_USAGE_DEFAULT, + DWRITE_FONT_LINE_GAP_USAGE_DISABLED, + DWRITE_FONT_LINE_GAP_USAGE_ENABLED +} DWRITE_FONT_LINE_GAP_USAGE; + +typedef struct DWRITE_LINE_SPACING +{ + DWRITE_LINE_SPACING_METHOD method; + FLOAT height; + FLOAT baseline; + FLOAT leadingBefore; + DWRITE_FONT_LINE_GAP_USAGE fontLineGapUsage; +} DWRITE_LINE_SPACING; + +[ + local, + object, + uuid(f67e0edd-9e3d-4ecc-8c32-4183253dfe70) +] +interface IDWriteTextFormat2 : IDWriteTextFormat1 +{ + HRESULT SetLineSpacing(DWRITE_LINE_SPACING const *spacing); + HRESULT GetLineSpacing(DWRITE_LINE_SPACING *spacing); +} + +[ + local, + object, + uuid(07ddcd52-020e-4de8-ac33-6c953d83f92d) +] +interface IDWriteTextLayout3 : IDWriteTextLayout2 +{ + HRESULT InvalidateLayout(); + HRESULT SetLineSpacing(DWRITE_LINE_SPACING const *spacing); + HRESULT GetLineSpacing(DWRITE_LINE_SPACING *spacing); + HRESULT GetLineMetrics(DWRITE_LINE_METRICS1 *metrics, UINT32 max_count, UINT32 *count); +}

1 0

André Hentschel : crypt32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: ad1a4ecdc5713f064a7af2296f1969cd1abbcf66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1a4ecdc5713f064a7af2296… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 15 23:14:32 2016 +0100 crypt32/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 90 ++++++---------------------------------------- dlls/crypt32/tests/store.c | 11 ++---- dlls/crypt32/tests/str.c | 55 +++++----------------------- 3 files changed, 20 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad1a4ecdc5713f064a7af…

1 0

André Hentschel : gdiplus/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 1ff3264debed2900af9cc3242779ec37836d8a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff3264debed2900af9cc3242… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 15 23:14:36 2016 +0100 gdiplus/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphicspath.c | 11 ++--------- dlls/gdiplus/tests/image.c | 14 ++++---------- dlls/gdiplus/tests/metafile.c | 22 +++++----------------- 3 files changed, 11 insertions(+), 36 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index aa44911..400123c 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -87,10 +87,7 @@ static void ok_path(GpPath* path, const path_test_t *expected, INT expected_size return; } - if(todo_size) todo_wine - ok(size == expected_size, "Path size %d does not match expected size %d\n", - size, expected_size); - else + todo_wine_if (todo_size) ok(size == expected_size, "Path size %d does not match expected size %d\n", size, expected_size); @@ -113,11 +110,7 @@ static void ok_path(GpPath* path, const path_test_t *expected, INT expected_size stringify_point_type(expected[eidx].type, ename); stringify_point_type(types[idx], name); - if (expected[eidx].todo || numskip) todo_wine - ok(match, "Expected #%d: %s (%.1f,%.1f) but got %s (%.1f,%.1f)\n", eidx, - ename, expected[eidx].X, expected[eidx].Y, - name, points[idx].X, points[idx].Y); - else + todo_wine_if (expected[eidx].todo || numskip) ok(match, "Expected #%d: %s (%.1f,%.1f) but got %s (%.1f,%.1f)\n", eidx, ename, expected[eidx].X, expected[eidx].Y, name, points[idx].X, points[idx].Y); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 6be4a5b..6a51714 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -55,9 +55,7 @@ static void expect_guid(REFGUID expected, REFGUID got, int line, BOOL todo) WideCharToMultiByte(CP_ACP, 0, bufferW, sizeof(bufferW)/sizeof(bufferW[0]), buffer, sizeof(buffer), NULL, NULL); StringFromGUID2(expected, bufferW, sizeof(bufferW)/sizeof(bufferW[0])); WideCharToMultiByte(CP_ACP, 0, bufferW, sizeof(bufferW)/sizeof(bufferW[0]), buffer2, sizeof(buffer2), NULL, NULL); - if(todo) - todo_wine ok_(__FILE__, line)(IsEqualGUID(expected, got), "Expected %s, got %s\n", buffer2, buffer); - else + todo_wine_if (todo) ok_(__FILE__, line)(IsEqualGUID(expected, got), "Expected %s, got %s\n", buffer2, buffer); } @@ -4298,10 +4296,8 @@ static void test_DrawImage_scale(void) expect(Ok, status); match = memcmp(dst_8x1, td[i].image, sizeof(dst_8x1)) == 0; - if (!match && td[i].todo) - todo_wine ok(match, "%d: data should match\n", i); - else - ok(match, "%d: data should match\n", i); + todo_wine_if (!match && td[i].todo) + ok(match, "%d: data should match\n", i); if (!match) { UINT i, size = sizeof(dst_8x1); @@ -4679,9 +4675,7 @@ static void test_supported_encoders(void) ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); status = GdipSaveImageToStream((GpImage *)bm, stream, &clsid, NULL); - if (td[i].todo) - todo_wine ok(status == Ok, "GdipSaveImageToStream error %d\n", status); - else + todo_wine_if (td[i].todo) ok(status == Ok, "GdipSaveImageToStream error %d\n", status); IStream_Release(stream); diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index a4b3f59..0c52718 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -47,11 +47,7 @@ typedef struct emfplus_check_state static void check_record(int count, const char *desc, const struct emfplus_record *expected, const struct emfplus_record *actual) { - if (expected->todo) - todo_wine ok(expected->record_type == actual->record_type, - "%s.%i: Expected record type 0x%x, got 0x%x\n", desc, count, - expected->record_type, actual->record_type); - else + todo_wine_if (expected->todo) ok(expected->record_type == actual->record_type, "%s.%i: Expected record type 0x%x, got 0x%x\n", desc, count, expected->record_type, actual->record_type); @@ -142,9 +138,7 @@ static void check_emfplus(HENHMETAFILE hemf, const emfplus_record *expected, con EnumEnhMetaFile(0, hemf, enum_emf_proc, &state, NULL); - if (expected[state.count].todo) - todo_wine ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); - else + todo_wine_if (expected[state.count].todo) ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); } @@ -196,9 +190,7 @@ static void check_metafile(GpMetafile *metafile, const emfplus_record *expected, 3, src_rect, src_unit, enum_metafile_proc, &state, NULL); expect(Ok, stat); - if (expected[state.count].todo) - todo_wine ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); - else + todo_wine_if (expected[state.count].todo) ok(expected[state.count].record_type == 0, "%s: Got %i records, expecting more\n", desc, state.count); GdipDeleteGraphics(graphics); @@ -216,17 +208,13 @@ static BOOL CALLBACK play_metafile_proc(EmfPlusRecordType record_type, unsigned if (state->expected[state->count].record_type) { - if (state->expected[state->count].playback_todo) - todo_wine ok(stat == Ok, "%s.%i: GdipPlayMetafileRecord failed with stat %i\n", state->desc, state->count, stat); - else + todo_wine_if (state->expected[state->count].playback_todo) ok(stat == Ok, "%s.%i: GdipPlayMetafileRecord failed with stat %i\n", state->desc, state->count, stat); state->count++; } else { - if (state->expected[state->count].playback_todo) - todo_wine ok(0, "%s: too many records\n", state->desc); - else + todo_wine_if (state->expected[state->count].playback_todo) ok(0, "%s: too many records\n", state->desc); return FALSE;

1 0

André Hentschel : wininet/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 676e615613f3cf70f0e1e9ca9569813a8add9504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=676e615613f3cf70f0e1e9ca9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 15 23:14:40 2016 +0100 wininet/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ee347f9..36710b7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -207,9 +207,7 @@ static void _test_status_code(unsigned line, HINTERNET req, DWORD excode, BOOL i size = sizeof(code); res = HttpQueryInfoA(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, NULL); ok_(__FILE__,line)(res, "[1] HttpQueryInfoA(HTTP_QUERY_STATUS_CODE|number) failed: %u\n", GetLastError()); - if (is_todo) - todo_wine ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); - else + todo_wine_if (is_todo) ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); ok_(__FILE__,line)(size == sizeof(code), "size = %u\n", size); @@ -218,10 +216,8 @@ static void _test_status_code(unsigned line, HINTERNET req, DWORD excode, BOOL i size = sizeof(code); res = HttpQueryInfoA(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); ok_(__FILE__,line)(res, "[2] HttpQueryInfoA(HTTP_QUERY_STATUS_CODE|number index) failed: %u\n", GetLastError()); - if (is_todo) - todo_wine ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); - else - ok_(__FILE__,line)(!index, "index = %d, expected 0\n", code); + todo_wine_if (is_todo) + ok_(__FILE__,line)(!index, "index = %d, expected 0\n", index); ok_(__FILE__,line)(size == sizeof(code), "size = %u\n", size); sprintf(exbuf, "%u", excode); @@ -229,9 +225,7 @@ static void _test_status_code(unsigned line, HINTERNET req, DWORD excode, BOOL i size = sizeof(bufa); res = HttpQueryInfoA(req, HTTP_QUERY_STATUS_CODE, bufa, &size, NULL); ok_(__FILE__,line)(res, "[3] HttpQueryInfoA(HTTP_QUERY_STATUS_CODE) failed: %u\n", GetLastError()); - if (is_todo) - todo_wine ok_(__FILE__,line)(!strcmp(bufa, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); - else + todo_wine_if (is_todo) ok_(__FILE__,line)(!strcmp(bufa, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); ok_(__FILE__,line)(size == strlen(exbuf), "unexpected size %d for \"%s\"\n", size, exbuf); @@ -244,9 +238,7 @@ static void _test_status_code(unsigned line, HINTERNET req, DWORD excode, BOOL i size = sizeof(bufw); res = HttpQueryInfoW(req, HTTP_QUERY_STATUS_CODE, bufw, &size, NULL); ok_(__FILE__,line)(res, "[5] HttpQueryInfoW(HTTP_QUERY_STATUS_CODE) failed: %u\n", GetLastError()); - if (is_todo) - todo_wine ok_(__FILE__,line)(!strcmp_wa(bufw, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); - else + todo_wine_if (is_todo) ok_(__FILE__,line)(!strcmp_wa(bufw, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); ok_(__FILE__,line)(size == strlen(exbuf)*sizeof(WCHAR), "unexpected size %d for \"%s\"\n", size, exbuf); @@ -291,10 +283,8 @@ static void _test_request_flags(unsigned line, HINTERNET req, DWORD exflags, BOO /* FIXME: Remove once we have INTERNET_REQFLAG_CACHE_WRITE_DISABLED implementation */ flags &= ~INTERNET_REQFLAG_CACHE_WRITE_DISABLED; - if(!is_todo) + todo_wine_if (is_todo) ok_(__FILE__,line)(flags == exflags, "flags = %x, expected %x\n", flags, exflags); - else - todo_wine ok_(__FILE__,line)(flags == exflags, "flags = %x, expected %x\n", flags, exflags); } #define test_http_version(a) _test_http_version(__LINE__,a)

1 0

André Hentschel : reg/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: d15a807c3cdd5f7d5cdcf8e5a7abcb198d9b0fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15a807c3cdd5f7d5cdcf8e5a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 15 23:14:42 2016 +0100 reg/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 80fc7d3..4b780b0 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -72,17 +72,11 @@ static void verify_reg_(unsigned line, HKEY hkey, const char* value, if (err != ERROR_SUCCESS) return; - if (todo & TODO_REG_TYPE) - todo_wine lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); - else + todo_wine_if (todo & TODO_REG_TYPE) lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); - if (todo & TODO_REG_SIZE) - todo_wine lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); - else + todo_wine_if (todo & TODO_REG_SIZE) lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); - if (todo & TODO_REG_DATA) - todo_wine lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); - else + todo_wine_if (todo & TODO_REG_DATA) lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); }

1 0

André Hentschel : advapi32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 4684dc2bfbf739ceae27694a4cefcdcbe6f33560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4684dc2bfbf739ceae27694a4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 15 23:14:46 2016 +0100 advapi32/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 742ede1..881b3ec 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5210,11 +5210,8 @@ static void test_named_pipe_security(HANDLE token) ok(ret, "DuplicateHandle error %d\n", GetLastError()); access = get_obj_access(dup); - if (map[i].todo) -todo_wine - ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); - else - ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + todo_wine_if (map[i].todo) + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); CloseHandle(dup); }

1 0