wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Nikolay Sivov : dwrite: Create fontface instance for each run.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: fdd8e011ed30d31d0bd39de5e2e2c32213db4793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd8e011ed30d31d0bd39de5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 6 23:57:15 2015 +0300 dwrite: Create fontface instance for each run. --- dlls/dwrite/layout.c | 57 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index e788c6a..c430b2a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -229,6 +229,8 @@ static void free_layout_runs(struct dwrite_textlayout *layout) struct layout_run *cur, *cur2; LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &layout->runs, struct layout_run, entry) { list_remove(&cur->entry); + if (cur->run.fontFace) + IDWriteFontFace_Release(cur->run.fontFace); heap_free(cur); } } @@ -297,11 +299,14 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, return S_OK; } +static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *layout, UINT32 pos); + static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) { IDWriteTextAnalyzer *analyzer; - struct layout_range *cur; - HRESULT hr = S_OK; + struct layout_range *range; + struct layout_run *run; + HRESULT hr; free_layout_runs(layout); @@ -309,10 +314,10 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) if (FAILED(hr)) return hr; - LIST_FOR_EACH_ENTRY(cur, &layout->ranges, struct layout_range, entry) { + LIST_FOR_EACH_ENTRY(range, &layout->ranges, struct layout_range, entry) { /* inline objects override actual text in a range */ - if (cur->object) { - hr = layout_update_breakpoints_range(layout, cur); + if (range->object) { + hr = layout_update_breakpoints_range(layout, range); if (FAILED(hr)) return hr; continue; @@ -320,17 +325,55 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) /* initial splitting by script */ hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &layout->IDWriteTextAnalysisSource_iface, - cur->range.startPosition, cur->range.length, &layout->IDWriteTextAnalysisSink_iface); + range->range.startPosition, range->range.length, &layout->IDWriteTextAnalysisSink_iface); if (FAILED(hr)) break; /* this splits it further */ hr = IDWriteTextAnalyzer_AnalyzeBidi(analyzer, &layout->IDWriteTextAnalysisSource_iface, - cur->range.startPosition, cur->range.length, &layout->IDWriteTextAnalysisSink_iface); + range->range.startPosition, range->range.length, &layout->IDWriteTextAnalysisSink_iface); if (FAILED(hr)) break; } + /* fill run info */ + LIST_FOR_EACH_ENTRY(run, &layout->runs, struct layout_run, entry) { + IDWriteFontFamily *family; + IDWriteFont *font; + BOOL exists = TRUE; + UINT32 index; + + range = get_layout_range_by_pos(layout, run->descr.textPosition); + + hr = IDWriteFontCollection_FindFamilyName(range->collection, range->fontfamily, &index, &exists); + if (FAILED(hr) || !exists) { + WARN("[%u,%u]: family %s not found in collection %p\n", run->descr.textPosition, run->descr.textPosition+run->descr.stringLength, + debugstr_w(range->fontfamily), range->collection); + continue; + } + + hr = IDWriteFontCollection_GetFontFamily(range->collection, index, &family); + if (FAILED(hr)) + continue; + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, range->weight, range->stretch, range->style, &font); + IDWriteFontFamily_Release(family); + if (FAILED(hr)) { + WARN("[%u,%u]: failed to get a matching font\n", run->descr.textPosition, run->descr.textPosition+run->descr.stringLength); + continue; + } + + hr = IDWriteFont_CreateFontFace(font, &run->run.fontFace); + IDWriteFont_Release(font); + if (FAILED(hr)) + continue; + + run->run.fontEmSize = range->fontsize; + run->descr.localeName = range->locale; + + /* FIXME: set glyph indices, cluster map, advances */ + } + IDWriteTextAnalyzer_Release(analyzer); return hr; }

1 0

André Hentschel : Update copyright info for 2015.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 25f24f2b0093ca14f8ac0a7878462c50b1c5a713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f24f2b0093ca14f8ac0a787… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 6 18:47:53 2015 +0100 Update copyright info for 2015. --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 429646c..6dbf8c0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2014 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index d8aeaf8..5938582 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -106,7 +106,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2014 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Bruno Jesus : cmd: Ensure environment variables fit in memory.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 5a469f1b87e58fd96dfb68f1e892c0d3cae5a97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a469f1b87e58fd96dfb68f1e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 6 14:55:01 2015 -0200 cmd: Ensure environment variables fit in memory. --- programs/cmd/batch.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 294a153..1a78b55 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -496,15 +496,23 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) WCHAR *begin = strchrW(firstModifier, '$') + 1; WCHAR *end = strchrW(firstModifier, ':'); WCHAR env[MAX_PATH]; - WCHAR fullpath[MAX_PATH]; + DWORD size; /* Extract the env var */ memcpy(env, begin, (end-begin) * sizeof(WCHAR)); env[(end-begin)] = 0x00; - /* If env var not found, return empty string */ - if ((GetEnvironmentVariableW(env, fullpath, MAX_PATH) == 0) || - (SearchPathW(fullpath, outputparam, NULL, MAX_PATH, outputparam, NULL) == 0)) { + size = GetEnvironmentVariableW(env, NULL, 0); + if (size > 0) { + WCHAR *fullpath = heap_alloc(size * sizeof(WCHAR)); + if (!fullpath || (GetEnvironmentVariableW(env, fullpath, size) == 0) || + (SearchPathW(fullpath, outputparam, NULL, MAX_PATH, outputparam, NULL) == 0)) + size = 0; + heap_free(fullpath); + } + + if (!size) { + /* If env var not found, return empty string */ finaloutput[0] = 0x00; outputparam[0] = 0x00; skipFileParsing = TRUE;

1 0

Nikolay Sivov : dwrite/tests: Fix buffer overflow when filling test string.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: de09e9b94ed340c8004a0919157a52fd90cb9f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de09e9b94ed340c8004a09191… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 6 19:45:04 2015 +0300 dwrite/tests: Fix buffer overflow when filling test string. --- dlls/dwrite/tests/layout.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b90d7af..1a1cfd9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -927,7 +927,7 @@ todo_wine { static void test_SetLocaleName(void) { static const WCHAR strW[] = {'a','b','c','d',0}; - WCHAR buffW[LOCALE_NAME_MAX_LENGTH+5]; + WCHAR buffW[LOCALE_NAME_MAX_LENGTH+sizeof(strW)/sizeof(WCHAR)]; IDWriteTextFormat *format; IDWriteTextLayout *layout; DWRITE_TEXT_RANGE range; @@ -971,10 +971,8 @@ if (0) /* crashes on native */ /* name is too long */ lstrcpyW(buffW, strW); - while (lstrlenW(buffW) < LOCALE_NAME_MAX_LENGTH) { + while (lstrlenW(buffW) <= LOCALE_NAME_MAX_LENGTH) lstrcatW(buffW, strW); - } - lstrcatW(buffW, strW); range.startPosition = 0; range.length = 1;

1 0

Francois Gouget : ws2_32: Add a trailing '\n' to a TRACE() call.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: b46a62843f783a3f6e463d189559b8dc23727a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46a62843f783a3f6e463d189… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 6 16:49:29 2015 +0100 ws2_32: Add a trailing '\n' to a TRACE() call. --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4edc38f..4c8d705 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6368,7 +6368,7 @@ int WINAPI __WSAFDIsSet(SOCKET s, WS_fd_set *set) break; } - TRACE("(socket %04lx, fd_set %p, count %i) <- %d", s, set, i, ret); + TRACE("(socket %04lx, fd_set %p, count %i) <- %d\n", s, set, i, ret); return ret; }

1 0

Mark Harmstone : include: Add xaudio2.h.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: db75d7bf26ca31ddd5427678a39aabfa594020ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=db75d7bf26ca31ddd5427678a… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Jan 4 13:06:33 2015 +0000 include: Add xaudio2.h. --- include/Makefile.in | 1 + include/xaudio2.idl | 526 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 527 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db75d7bf26ca31ddd5427…

1 0

Seán de Búrca : kernel32: Implement Get{Time, Date}FormatEx.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 6cd0eb202726616a1c3d9e59915be90016e42862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd0eb202726616a1c3d9e599… Author: Seán de Búrca <leftmostcat(a)gmail.com> Date: Wed Dec 24 11:52:04 2014 -0500 kernel32: Implement Get{Time,Date}FormatEx. --- .../api-ms-win-core-datetime-l1-1-1.spec | 4 +- dlls/kernel32/kernel32.spec | 2 + dlls/kernel32/lcformat.c | 71 +++++ dlls/kernel32/tests/locale.c | 300 +++++++++++++++++++++ include/winnls.h | 2 + 5 files changed, 377 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cd0eb202726616a1c3d9…

1 0

Nikolay Sivov : oleaut32: Use CoTaskMem* functions for safearrays.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: adc091b8dad2a02d81fa50b488396b614f169632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc091b8dad2a02d81fa50b48… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 6 12:45:16 2015 +0300 oleaut32: Use CoTaskMem* functions for safearrays. --- dlls/oleaut32/safearray.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 99ffe27..01dbfc3 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -95,18 +95,18 @@ static const USHORT ignored_copy_features = FADF_CREATEVECTOR; /* Allocate memory */ -static inline LPVOID SAFEARRAY_Malloc(ULONG ulSize) +static inline void* SAFEARRAY_Malloc(ULONG size) { - /* FIXME: Memory should be allocated and freed using a per-thread IMalloc - * instance returned from CoGetMalloc(). - */ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ulSize); + void *ret = CoTaskMemAlloc(size); + if (ret) + memset(ret, 0, size); + return ret; } /* Free memory */ -static inline BOOL SAFEARRAY_Free(LPVOID lpData) +static inline void SAFEARRAY_Free(void *ptr) { - return HeapFree(GetProcessHeap(), 0, lpData); + CoTaskMemFree(ptr); } /* Get the size of a supported VT type (0 means unsupported) */ @@ -772,8 +772,7 @@ HRESULT WINAPI SafeArrayDestroyDescriptor(SAFEARRAY *psa) !(psa->fFeatures & FADF_DATADELETED)) SAFEARRAY_DestroyData(psa, 0); /* Data not previously deleted */ - if (!SAFEARRAY_Free(lpv)) - return E_UNEXPECTED; + SAFEARRAY_Free(lpv); } return S_OK; } @@ -1283,8 +1282,7 @@ HRESULT WINAPI SafeArrayDestroyData(SAFEARRAY *psa) /* If this is not a vector, free the data memory block */ if (!(psa->fFeatures & FADF_CREATEVECTOR)) { - if (!SAFEARRAY_Free(psa->pvData)) - return E_UNEXPECTED; + SAFEARRAY_Free(psa->pvData); psa->pvData = NULL; } else

1 0

Nikolay Sivov : dwrite: Move range bounds check to an attribute setting helper.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 35a91741d30e33ad354273ebd430660f3dca21c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a91741d30e33ad354273ebd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 3 00:35:04 2015 +0300 dwrite: Move range bounds check to an attribute setting helper. --- dlls/dwrite/layout.c | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 6117d69..e788c6a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -639,6 +639,9 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo BOOL changed = FALSE; DWRITE_TEXT_RANGE r; + if (!validate_text_range(layout, &value->range)) + return S_OK; + /* If new range is completely within existing range, split existing range in two */ if ((outer = find_outer_range(layout, &value->range))) { @@ -1097,9 +1100,6 @@ static HRESULT WINAPI dwritetextlayout_SetFontCollection(IDWriteTextLayout2 *ifa TRACE("(%p)->(%p %s)\n", This, collection, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.collection = collection; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_FONTCOLL, &value); @@ -1115,12 +1115,8 @@ static HRESULT WINAPI dwritetextlayout_SetFontFamilyName(IDWriteTextLayout2 *ifa if (!name) return E_INVALIDARG; - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.fontfamily = name; - return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_FONTFAMILY, &value); } @@ -1131,9 +1127,6 @@ static HRESULT WINAPI dwritetextlayout_SetFontWeight(IDWriteTextLayout2 *iface, TRACE("(%p)->(%d %s)\n", This, weight, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.weight = weight; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_WEIGHT, &value); @@ -1146,9 +1139,6 @@ static HRESULT WINAPI dwritetextlayout_SetFontStyle(IDWriteTextLayout2 *iface, D TRACE("(%p)->(%d %s)\n", This, style, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.style = style; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_STYLE, &value); @@ -1161,9 +1151,6 @@ static HRESULT WINAPI dwritetextlayout_SetFontStretch(IDWriteTextLayout2 *iface, TRACE("(%p)->(%d %s)\n", This, stretch, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.stretch = stretch; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_STRETCH, &value); @@ -1176,9 +1163,6 @@ static HRESULT WINAPI dwritetextlayout_SetFontSize(IDWriteTextLayout2 *iface, FL TRACE("(%p)->(%.2f %s)\n", This, size, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.fontsize = size; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_FONTSIZE, &value); @@ -1191,9 +1175,6 @@ static HRESULT WINAPI dwritetextlayout_SetUnderline(IDWriteTextLayout2 *iface, B TRACE("(%p)->(%d %s)\n", This, underline, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.underline = underline; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_UNDERLINE, &value); @@ -1206,9 +1187,6 @@ static HRESULT WINAPI dwritetextlayout_SetStrikethrough(IDWriteTextLayout2 *ifac TRACE("(%p)->(%d %s)\n", This, strikethrough, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.underline = strikethrough; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_STRIKETHROUGH, &value); @@ -1221,9 +1199,6 @@ static HRESULT WINAPI dwritetextlayout_SetDrawingEffect(IDWriteTextLayout2 *ifac TRACE("(%p)->(%p %s)\n", This, effect, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.effect = effect; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_EFFECT, &value); @@ -1236,12 +1211,8 @@ static HRESULT WINAPI dwritetextlayout_SetInlineObject(IDWriteTextLayout2 *iface TRACE("(%p)->(%p %s)\n", This, object, debugstr_range(&range)); - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.object = object; - return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_INLINE, &value); } @@ -1262,12 +1233,8 @@ static HRESULT WINAPI dwritetextlayout_SetLocaleName(IDWriteTextLayout2 *iface, if (!locale || strlenW(locale) > LOCALE_NAME_MAX_LENGTH-1) return E_INVALIDARG; - if (!validate_text_range(This, &range)) - return S_OK; - value.range = range; value.u.locale = locale; - return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_LOCALE, &value); }

1 0

Nikolay Sivov : dwrite: Unify temp value variable name.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 48d84eedb5ab48b84e661b2ac7fbc2206d4c4904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d84eedb5ab48b84e661b2ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 2 22:25:28 2015 +0300 dwrite: Unify temp value variable name. --- dlls/dwrite/layout.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0fbaf4a..6117d69 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1232,17 +1232,17 @@ static HRESULT WINAPI dwritetextlayout_SetDrawingEffect(IDWriteTextLayout2 *ifac static HRESULT WINAPI dwritetextlayout_SetInlineObject(IDWriteTextLayout2 *iface, IDWriteInlineObject *object, DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - struct layout_range_attr_value attr; + struct layout_range_attr_value value; TRACE("(%p)->(%p %s)\n", This, object, debugstr_range(&range)); if (!validate_text_range(This, &range)) return S_OK; - attr.range = range; - attr.u.object = object; + value.range = range; + value.u.object = object; - return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_INLINE, &attr); + return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_INLINE, &value); } static HRESULT WINAPI dwritetextlayout_SetTypography(IDWriteTextLayout2 *iface, IDWriteTypography* typography, DWRITE_TEXT_RANGE range) @@ -1255,7 +1255,7 @@ static HRESULT WINAPI dwritetextlayout_SetTypography(IDWriteTextLayout2 *iface, static HRESULT WINAPI dwritetextlayout_SetLocaleName(IDWriteTextLayout2 *iface, WCHAR const* locale, DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - struct layout_range_attr_value attr; + struct layout_range_attr_value value; TRACE("(%p)->(%s %s)\n", This, debugstr_w(locale), debugstr_range(&range)); @@ -1265,10 +1265,10 @@ static HRESULT WINAPI dwritetextlayout_SetLocaleName(IDWriteTextLayout2 *iface, if (!validate_text_range(This, &range)) return S_OK; - attr.range = range; - attr.u.locale = locale; + value.range = range; + value.u.locale = locale; - return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_LOCALE, &attr); + return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_LOCALE, &value); } static FLOAT WINAPI dwritetextlayout_GetMaxWidth(IDWriteTextLayout2 *iface)

1 0

← Newer
1
...
24
25
26
27
28
29
30
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2015