July 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Add platform-specific versions of the thread data structure.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: f1ef8a4d9d08377c1b04908e413d0fc1c549c7f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ef8a4d9d08377c1b04908e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 15:14:24 2017 +0200 ntdll: Add platform-specific versions of the thread data structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 127 ++++++++++++++++++++++++++------------------- dlls/ntdll/signal_x86_64.c | 22 ++++++-- 2 files changed, 91 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1ef8a4d9d08377c1b049…

1 0

Hugh McMaster : regedit: Export value names from the export_data() function.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: 6effc48365b97e058175ded31e260423182bb80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6effc48365b97e058175ded31… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 19 05:29:22 2017 +0000 regedit: Export value names from the export_data() function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index d3a1f6d..57be5da 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1311,9 +1311,11 @@ static void export_newline(FILE *fp, BOOL unicode) REGPROC_write_line(fp, newline, unicode); } -static void export_data(FILE *fp, DWORD type, size_t line_len, void *data, size_t size, BOOL unicode) +static void export_data(FILE *fp, WCHAR *value_name, DWORD value_len, DWORD type, + void *data, size_t size, BOOL unicode) { WCHAR *buf = NULL; + size_t line_len = export_value_name(fp, value_name, value_len, unicode); switch (type) { @@ -1385,8 +1387,7 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); if (rc == ERROR_SUCCESS) { - size_t line_len = export_value_name(fp, value_name, value_len, unicode); - export_data(fp, type, line_len, data, data_size, unicode); + export_data(fp, value_name, value_len, type, data, data_size, unicode); i++; } else if (rc == ERROR_MORE_DATA)

1 0

Hugh McMaster : regedit: Export REG_SZ data via the export_data() function.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: 37b5607ff6fbb8818f439a10b9370805e16b8fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b5607ff6fbb8818f439a10b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 19 05:29:05 2017 +0000 regedit: Export REG_SZ data via the export_data() function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 239 ++++++--------------------------------------- 1 file changed, 29 insertions(+), 210 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37b5607ff6fbb8818f439…

1 0

Jacek Caban : mshtml: Forward duplicated IHTMLDOMNode3 functions to IHTMLDOMNode implementation.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: 03b80411195bb500e3efc6af073901c51fd1a0a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b80411195bb500e3efc6af0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 20:32:49 2017 +0200 mshtml: Forward duplicated IHTMLDOMNode3 functions to IHTMLDOMNode implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ae63e03..d3c1473 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1282,29 +1282,29 @@ static HRESULT WINAPI HTMLDOMNode3_isDefaultNamespace(IHTMLDOMNode3 *iface, VARI static HRESULT WINAPI HTMLDOMNode3_appendChild(IHTMLDOMNode3 *iface, IHTMLDOMNode *newChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + TRACE("(%p)->()\n", This); + return IHTMLDOMNode_appendChild(&This->IHTMLDOMNode_iface, newChild, node); } static HRESULT WINAPI HTMLDOMNode3_insertBefore(IHTMLDOMNode3 *iface, IHTMLDOMNode *newChild, VARIANT refChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), node); - return E_NOTIMPL; + TRACE("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), node); + return IHTMLDOMNode_insertBefore(&This->IHTMLDOMNode_iface, newChild, refChild, node); } static HRESULT WINAPI HTMLDOMNode3_removeChild(IHTMLDOMNode3 *iface, IHTMLDOMNode *oldChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->(%p %p)\n", This, oldChild, node); - return E_NOTIMPL; + TRACE("(%p)->(%p %p)\n", This, oldChild, node); + return IHTMLDOMNode_removeChild(&This->IHTMLDOMNode_iface, oldChild, node); } static HRESULT WINAPI HTMLDOMNode3_replaceChild(IHTMLDOMNode3 *iface, IHTMLDOMNode *newChild, IHTMLDOMNode *oldChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->(%p %p %p)\n", This, newChild, oldChild, node); - return E_NOTIMPL; + TRACE("(%p)->(%p %p %p)\n", This, newChild, oldChild, node); + return IHTMLDOMNode_replaceChild(&This->IHTMLDOMNode_iface, newChild, oldChild, node); } static HRESULT WINAPI HTMLDOMNode3_isSameNode(IHTMLDOMNode3 *iface, IHTMLDOMNode3 *otherNode, VARIANT_BOOL *isSame)

1 0

Piotr Caban : gdiplus: Store newer gdi+ version in created GdipRegions.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: 55453327f55afa550499c2d639f13094dd1963db URL: http://source.winehq.org/git/wine.git/?a=commit;h=55453327f55afa550499c2d63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 18 18:59:40 2017 +0200 gdiplus: Store newer gdi+ version in created GdipRegions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/region.c | 4 ++-- dlls/gdiplus/tests/region.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 390b50f..a905f0d 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -764,7 +764,7 @@ static void write_element(const region_element* element, DWORD *buffer, else pathheader->size += 2 * sizeof(FLOAT) * path->pathdata.Count; pathheader->size += get_pathtypes_size(path); - pathheader->magic = VERSION_MAGIC; + pathheader->magic = VERSION_MAGIC2; pathheader->count = path->pathdata.Count; *filled += 4; @@ -852,7 +852,7 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, region_header = (struct region_header *)buffer; region_header->size = sizeheader_size + get_element_size(&region->node); region_header->checksum = 0; - region_header->magic = VERSION_MAGIC; + region_header->magic = VERSION_MAGIC2; region_header->num_children = region->num_children; filled += 4; /* With few exceptions, everything written is DWORD aligned, diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index d4d8772..2bf4470 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -37,7 +37,7 @@ #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) < (precision), "Expected %f, got %f\n", (expected), (got)) #define expectf(expected, got) expectf_((expected), (got), 0.001) -#define expect_magic(value) ok(*(value) == RGNDATA_MAGIC || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value)) +#define expect_magic(value) ok(broken(*(value) == RGNDATA_MAGIC) || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value)) #define expect_dword(value, expected) expect((expected), *(value)) #define expect_float(value, expected) expectf((expected), *(FLOAT *)(value))

1 0

Mark Jansen : shell32: Prevent a possible null pointer dereference in SHGetFileInfoW.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: 32520439e18e5cfb666dd8d28324a1f16249d3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=32520439e18e5cfb666dd8d28… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Wed Jul 19 17:23:07 2017 +0200 shell32: Prevent a possible null pointer dereference in SHGetFileInfoW. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 34b906c..0ed6790 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -431,7 +431,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, TRACE("%s fattr=0x%x sfi=%p(attr=0x%08x) size=0x%x flags=0x%x\n", (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes, - psfi, psfi->dwAttributes, sizeofpsfi, flags); + psfi, psfi ? psfi->dwAttributes : 0, sizeofpsfi, flags); if (!path) return FALSE;

1 0

Jactry Zeng : kernel32: Add stub for ResolveLocaleName.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: b9a9fe4a042f98521efea3275ded4af4b7cba4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a9fe4a042f98521efea3275… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jun 28 15:05:21 2017 +0800 kernel32: Add stub for ResolveLocaleName. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-localization-l1-1-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 12 ++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winnls.h | 1 + 7 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec index 31abadc..1e9ea4a 100644 --- a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec +++ b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec @@ -39,7 +39,7 @@ @ stub NlsUpdateLocale @ stub NlsUpdateSystemLocale @ stub NlsWriteEtwEvent -@ stub ResolveLocaleName +@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName @ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW @ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW @ stdcall SetThreadLocale(long) kernel32.SetThreadLocale diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index bdbcbb8..49c6d2e 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -47,7 +47,7 @@ @ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx @ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW @ stdcall LocaleNameToLCID(wstr long) kernel32.LocaleNameToLCID -@ stub ResolveLocaleName +@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName @ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW @ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW @ stub SetProcessPreferredUILanguages diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec index 98ec923..6272d01 100644 --- a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -48,7 +48,7 @@ @ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx @ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW @ stdcall LocaleNameToLCID(wstr long) kernel32.LocaleNameToLCID -@ stub ResolveLocaleName +@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName @ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW @ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW @ stub SetProcessPreferredUILanguages diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1a11af5..7ba1978 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1281,7 +1281,7 @@ @ stdcall ResetEvent(long) @ stdcall ResetWriteWatch(ptr long) @ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) ntdll.LdrResolveDelayLoadedAPI -# @ stub ResolveLocaleName +@ stdcall ResolveLocaleName(wstr ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) @ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a72a8aa..64966e5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -5893,3 +5893,15 @@ BOOL WINAPI GetFileMUIInfo(DWORD flags, PCWSTR path, FILEMUIINFO *info, DWORD *s SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/****************************************************************************** + * ResolveLocaleName (KERNEL32.@) + */ + +INT WINAPI ResolveLocaleName(LPCWSTR name, LPWSTR localename, INT len) +{ + FIXME("stub: %s, %p, %d\n", wine_dbgstr_w(name), localename, len); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index bb80f21..5dc6fa6 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1345,7 +1345,7 @@ @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch @ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) kernel32.ResolveDelayLoadedAPI # @ stub ResolveDelayLoadsFromDll -@ stub ResolveLocaleName +@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName @ stdcall RestoreLastError(long) kernel32.RestoreLastError @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall RevertToSelf() advapi32.RevertToSelf diff --git a/include/winnls.h b/include/winnls.h index 470acf84..8cb8af6 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -950,6 +950,7 @@ WINBASEAPI INT WINAPI LCMapStringEx(LPCWSTR,DWORD,LPCWSTR,INT,LPWSTR,INT WINBASEAPI LCID WINAPI LocaleNameToLCID(LPCWSTR,DWORD); WINBASEAPI INT WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,INT,LPWSTR,INT); WINNORMALIZEAPI INT WINAPI NormalizeString(NORM_FORM,LPCWSTR,INT,LPWSTR,INT); +WINBASEAPI INT WINAPI ResolveLocaleName(LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI SetCalendarInfoA(LCID,CALID,CALTYPE,LPCSTR); WINBASEAPI INT WINAPI SetCalendarInfoW(LCID,CALID,CALTYPE,LPCWSTR); #define SetCalendarInfo WINELIB_NAME_AW(SetCalendarInfo)

1 0

Nikolay Sivov : dwrite/tests: Use empty text in line metrics test.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: ddb78d73abd590ab62c69e491767e647afc7c2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb78d73abd590ab62c69e491… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 19 14:42:32 2017 +0300 dwrite/tests: Use empty text in line metrics test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 843ab0d..1d9d38a 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -511,6 +511,7 @@ struct renderer_context { FLOAT originX; FLOAT originY; IDWriteTextFormat *format; + const WCHAR *familyW; }; static HRESULT WINAPI testrenderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, @@ -634,8 +635,8 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface, ok(emsize == metrics.designUnitsPerEm, "Unexpected font size %f\n", emsize); /* Expected height is in design units, allow some absolute difference from it. Seems to only happen on Vista */ - ok(abs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f\n", - metrics.capHeight, underline->runHeight); + ok(abs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n", + metrics.capHeight, underline->runHeight, wine_dbgstr_w(ctxt->familyW)); IDWriteFontFace_Release(fontface); } @@ -3406,6 +3407,7 @@ static void test_GetLineMetrics(void) static const WCHAR strW[] = {'a','b','c','d',' ',0}; static const WCHAR str2W[] = {'a','b','\r','c','d',0}; static const WCHAR str4W[] = {'a','\r',0}; + static const WCHAR emptyW[] = {0}; IDWriteFontCollection *syscollection; DWRITE_FONT_METRICS fontmetrics; DWRITE_LINE_METRICS metrics[6]; @@ -3450,7 +3452,6 @@ static void test_GetLineMetrics(void) familycount = IDWriteFontCollection_GetFontFamilyCount(syscollection); for (i = 0; i < familycount; i++) { - static const WCHAR mvboliW[] = {'M','V',' ','B','o','l','i',0}; IDWriteLocalizedStrings *names; IDWriteFontFamily *family; IDWriteFont *font; @@ -3509,23 +3510,17 @@ static void test_GetLineMetrics(void) if (!exists) goto cleanup; - /* This will effectively skip on Vista/2008 only, newer systems work just fine with this font. */ - if (!lstrcmpW(nameW, mvboliW)) { - skip("Skipping line metrics test for %s, gives inconsistent results\n", wine_dbgstr_w(nameW)); - goto cleanup; - } - IDWriteFontFace_GetMetrics(fontface, &fontmetrics); hr = IDWriteFactory_CreateTextFormat(factory, nameW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, fontmetrics.designUnitsPerEm, enusW, &format); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 5, format, 30000.0f, 100.0f, &layout); + hr = IDWriteFactory_CreateTextLayout(factory, emptyW, 1, format, 30000.0f, 100.0f, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); memset(metrics, 0, sizeof(metrics)); count = 0; - hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 2, &count); + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, sizeof(metrics)/sizeof(metrics[0]), &count); ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 1, "got %u\n", count); @@ -5101,6 +5096,7 @@ todo_wine memset(&ctxt, 0, sizeof(ctxt)); ctxt.format = format; + ctxt.familyW = nameW; hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : dwrite: Added ability to specify multiple families per fallback range.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: f4b7e4b5ed13ea17280702ecd4418559d24c3acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b7e4b5ed13ea17280702ecd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 19 14:42:31 2017 +0300 dwrite: Added ability to specify multiple families per fallback range. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 3a820e7..3d187d4 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -189,7 +189,8 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last const char *debugstr_sa_script(UINT16 script) { - return script < Script_LastId ? debugstr_an((char*)&dwritescripts_properties[script].props.isoScriptCode, 4): "not defined"; + return script < Script_LastId ? debugstr_an((char*)&dwritescripts_properties[script].props.isoScriptCode, 4): + "undefined"; } /* system font falback configuration */ @@ -197,13 +198,13 @@ static const WCHAR meiryoW[] = {'M','e','i','r','y','o',0}; struct fallback_mapping { DWRITE_UNICODE_RANGE range; - const WCHAR *family; + const WCHAR *families[5]; }; 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 */ + { { 0x3000, 0x30ff }, { meiryoW } }, /* CJK Symbols and Punctuation, Hiragana, Katakana */ + { { 0x31f0, 0x31ff }, { meiryoW } }, /* Katakana Phonetic Extensions */ + { { 0x4e00, 0x9fff }, { meiryoW } }, /* CJK Unified Ideographs */ }; struct dwrite_fontfallback { @@ -2026,28 +2027,41 @@ 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, - 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; + UINT32 i = 0; HRESULT hr; + *mapped_font = NULL; + mapping = find_fallback_mapping(fallback, text[0]); if (!mapping) { - WARN("no mapping for 0x%x\n", text[0]); + WARN("No mapping range for %#x.\n", text[0]); return E_FAIL; } - /* now let's see what fallback can handle */ - hr = create_matching_font((IDWriteFontCollection*)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); - return hr; + /* Now let's see what fallback can handle. Pick first font that could be created. */ + while (mapping->families[i]) { + hr = create_matching_font((IDWriteFontCollection *)fallback->systemcollection, mapping->families[i], + weight, style, stretch, mapped_font); + if (hr == S_OK) { + TRACE("Created fallback font for range [%#x, %#x], using family %s.\n", mapping->range.first, + mapping->range.last, debugstr_w(mapping->families[i])); + break; + } + i++; + } + + if (!*mapped_font) { + WARN("Failed to create fallback font for range [%#x, %#x].\n", mapping->range.first, mapping->range.last); + return E_FAIL; } hr = fallback_map_characters(*mapped_font, text, length, mapped_length); if (FAILED(hr)) - WARN("mapping with fallback font %s failed, 0x%08x\n", debugstr_w(mapping->family), hr); + WARN("Mapping with fallback family %s failed, hr %#x.\n", debugstr_w(mapping->families[i]), hr); if (!*mapped_length) { IDWriteFont_Release(*mapped_font);

1 0

Alexandre Julliard : ntdll: Add support for debug registers in exceptions on x86-64.
by Alexandre Julliard July 19, 2017

July 19, 2017

Module: wine Branch: master Commit: a1b563f41c2246f94467b17d67a369cfbe144a2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b563f41c2246f94467b17d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 17:11:38 2017 +0200 ntdll: Add support for debug registers in exceptions on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 114 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 96 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f0127f7..08881e7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -310,6 +310,12 @@ static wine_signal_handler handlers[256]; struct amd64_thread_data { + DWORD_PTR dr0; /* debug registers */ + DWORD_PTR dr1; + DWORD_PTR dr2; + DWORD_PTR dr3; + DWORD_PTR dr6; + DWORD_PTR dr7; void *exit_frame; /* exit frame pointer */ }; @@ -1661,7 +1667,7 @@ static inline BOOL is_inside_signal_stack( void *ptr ) */ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) { - context->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS; + context->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_DEBUG_REGISTERS; context->Rax = RAX_sig(sigcontext); context->Rcx = RCX_sig(sigcontext); context->Rdx = RDX_sig(sigcontext); @@ -1698,6 +1704,12 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) #else __asm__("movw %%ss,%0" : "=m" (context->SegSs)); #endif + context->Dr0 = amd64_thread_data()->dr0; + context->Dr1 = amd64_thread_data()->dr1; + context->Dr2 = amd64_thread_data()->dr2; + context->Dr3 = amd64_thread_data()->dr3; + context->Dr6 = amd64_thread_data()->dr6; + context->Dr7 = amd64_thread_data()->dr7; if (FPU_sig(sigcontext)) { context->ContextFlags |= CONTEXT_FLOATING_POINT; @@ -1714,6 +1726,12 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) */ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; RAX_sig(sigcontext) = context->Rax; RCX_sig(sigcontext) = context->Rcx; RDX_sig(sigcontext) = context->Rdx; @@ -1873,6 +1891,16 @@ __ASM_GLOBAL_FUNC( set_full_cpu_context, static void set_cpu_context( const CONTEXT *context ) { DWORD flags = context->ContextFlags & ~CONTEXT_AMD64; + + if (flags & CONTEXT_DEBUG_REGISTERS) + { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; + } if (flags & CONTEXT_FULL) { if (!(flags & CONTEXT_CONTROL)) @@ -2081,10 +2109,20 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) */ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) { - NTSTATUS ret; - BOOL self; + NTSTATUS ret = STATUS_SUCCESS; + BOOL self = (handle == GetCurrentThread()); + + /* debug registers require a server call */ + if (self && (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64))) + self = (amd64_thread_data()->dr0 == context->Dr0 && + amd64_thread_data()->dr1 == context->Dr1 && + amd64_thread_data()->dr2 == context->Dr2 && + amd64_thread_data()->dr3 == context->Dr3 && + amd64_thread_data()->dr6 == context->Dr6 && + amd64_thread_data()->dr7 == context->Dr7); + + if (!self) ret = set_thread_context( handle, context, &self ); - ret = set_thread_context( handle, context, &self ); if (self && ret == STATUS_SUCCESS) set_cpu_context( context ); return ret; } @@ -2109,12 +2147,25 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) needed_flags &= ~context->ContextFlags; } - if (self && needed_flags) + if (self) { - CONTEXT ctx; - RtlCaptureContext( &ctx ); - copy_context( context, &ctx, ctx.ContextFlags & needed_flags ); - context->ContextFlags |= ctx.ContextFlags & needed_flags; + if (needed_flags) + { + CONTEXT ctx; + RtlCaptureContext( &ctx ); + copy_context( context, &ctx, ctx.ContextFlags & needed_flags ); + context->ContextFlags |= ctx.ContextFlags & needed_flags; + } + /* update the cached version of the debug registers */ + if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64)) + { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; + } } return STATUS_SUCCESS; } @@ -2618,14 +2669,42 @@ static void raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) case 3: /* BREAKPOINT_LOAD_SYMBOLS */ case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ - goto done; + set_cpu_context( context ); } break; } - status = raise_exception( rec, context, TRUE ); - if (status) raise_status( status, rec ); -done: - set_cpu_context( context ); + status = NtRaiseException( rec, context, TRUE ); + raise_status( status, rec ); +} + + +/********************************************************************** + * raise_trap_exception + */ +static void raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + NTSTATUS status; + + if (rec->ExceptionCode == EXCEPTION_SINGLE_STEP) + { + /* when single stepping can't tell whether this is a hw bp or a + * single step interrupt. try to avoid as much overhead as possible + * and only do a server call if there is any hw bp enabled. */ + + if( !(context->EFlags & 0x100) || (amd64_thread_data()->dr7 & 0xff) ) + { + /* (possible) hardware breakpoint, fetch the debug registers */ + DWORD saved_flags = context->ContextFlags; + context->ContextFlags = CONTEXT_DEBUG_REGISTERS; + NtGetContextThread(GetCurrentThread(), context); + context->ContextFlags |= saved_flags; /* restore flags */ + } + + context->EFlags &= ~0x100; /* clear single-step flag */ + } + + status = NtRaiseException( rec, context, TRUE ); + raise_status( status, rec ); } @@ -2636,9 +2715,8 @@ done: */ static void raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { - NTSTATUS status = raise_exception( rec, context, TRUE ); - if (status) raise_status( status, rec ); - set_cpu_context( context ); + NTSTATUS status = NtRaiseException( rec, context, TRUE ); + raise_status( status, rec ); } @@ -2747,7 +2825,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_generic_exception ); + EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_trap_exception ); switch (siginfo->si_code) {

1 0