February 2017 - Wine-commits

Piotr Caban : msvcrt: Add __ExceptionPtrCopyException implementation.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: 15b144b35dfebbe334fb00220edc0393b8d1e84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b144b35dfebbe334fb00220… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 23 13:24:47 2017 +0100 msvcrt: Add __ExceptionPtrCopyException implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 +- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr120_app/msvcr120_app.spec | 4 +- dlls/msvcrt/cpp.c | 81 +++++++++++++++++++++++++++++++++++++ 6 files changed, 91 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index fb3d709..9a3052d 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1695,8 +1695,8 @@ @ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z -@ stub -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX(a)Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPAX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX(a)Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPEAX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX(a)Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPAX(a)Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8604767..6a70e83 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -414,8 +414,8 @@ @ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy -@ stub -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z -@ stub -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException +@ cdecl -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException @ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX(a)Z(ptr) __ExceptionPtrCreate @ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX(a)Z(ptr) __ExceptionPtrCreate @ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX(a)Z(ptr) __ExceptionPtrCurrentException diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 143eccc..77a4ab6 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -692,8 +692,8 @@ @ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy -@ stub -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z -@ stub -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException +@ cdecl -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException @ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX(a)Z(ptr) __ExceptionPtrCreate @ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX(a)Z(ptr) __ExceptionPtrCreate @ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX(a)Z(ptr) __ExceptionPtrCurrentException diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index cc38421..a447fde 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -674,8 +674,8 @@ @ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy -@ stub -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z -@ stub -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException +@ cdecl -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException @ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX(a)Z(ptr) __ExceptionPtrCreate @ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX(a)Z(ptr) __ExceptionPtrCreate @ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX(a)Z(ptr) __ExceptionPtrCurrentException diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 90fdd97..96413a0 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -670,8 +670,8 @@ @ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z -@ stub -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX(a)Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPAX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX(a)Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPEAX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX(a)Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPAX(a)Z diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index f7127a3..daf7aee 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1499,6 +1499,87 @@ MSVCRT_bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) return !!ep->rec; } +/********************************************************************* + * ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z + * ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z + */ +#ifndef __x86_64__ +void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, + exception *object, const cxx_exception_type *type) +{ + const cxx_type_info *ti; + void **data; + + __ExceptionPtrDestroy(ep); + + ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); + ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); + *ep->ref = 1; + + memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); + ep->rec->ExceptionCode = CXX_EXCEPTION; + ep->rec->ExceptionFlags = EH_NONCONTINUABLE; + ep->rec->NumberParameters = 3; + ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; + ep->rec->ExceptionInformation[2] = (ULONG_PTR)type; + + ti = type->type_info_table->info[0]; + data = HeapAlloc(GetProcessHeap(), 0, ti->size); + if (ti->flags & CLASS_IS_SIMPLE_TYPE) + { + memcpy(data, object, ti->size); + if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); + } + else if (ti->copy_ctor) + { + call_copy_ctor(ti->copy_ctor, data, get_this_pointer(&ti->offsets, object), + ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); + } + else + memcpy(data, get_this_pointer(&ti->offsets, object), ti->size); + ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; +} +#else +void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, + exception *object, const cxx_exception_type *type) +{ + const cxx_type_info *ti; + void **data; + char *base; + + RtlPcToFileHeader((void*)type, (void**)&base); + __ExceptionPtrDestroy(ep); + + ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); + ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); + *ep->ref = 1; + + memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); + ep->rec->ExceptionCode = CXX_EXCEPTION; + ep->rec->ExceptionFlags = EH_NONCONTINUABLE; + ep->rec->NumberParameters = 4; + ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; + ep->rec->ExceptionInformation[2] = (ULONG_PTR)type; + ep->rec->ExceptionInformation[3] = (ULONG_PTR)base; + + ti = (const cxx_type_info*)(base + ((const cxx_type_info_table*)(base + type->type_info_table))->info[0]); + data = HeapAlloc(GetProcessHeap(), 0, ti->size); + if (ti->flags & CLASS_IS_SIMPLE_TYPE) + { + memcpy(data, object, ti->size); + if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); + } + else if (ti->copy_ctor) + { + call_copy_ctor(base + ti->copy_ctor, data, get_this_pointer(&ti->offsets, object), + ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); + } + else + memcpy(data, get_this_pointer(&ti->offsets, object), ti->size); + ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; +} +#endif + void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj);

1 0

Nikolay Sivov : dwrite/tests: Test runHeight underline attribute with all available fonts.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: fd6e12af9801eb72f5f972a79d6e076352dfb686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd6e12af9801eb72f5f972a79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 23 16:39:24 2017 +0300 dwrite/tests: Test runHeight underline attribute with all available fonts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 206 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 162 insertions(+), 44 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 07c2ebd..868a465 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1,7 +1,7 @@ /* * Text layout/format tests * - * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2017 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 @@ -222,6 +222,46 @@ static void get_script_analysis(const WCHAR *str, UINT32 len, DWRITE_SCRIPT_ANAL IDWriteFactory_Release(factory); } +static IDWriteFontFace *get_fontface_from_format(IDWriteTextFormat *format) +{ + IDWriteFontCollection *collection; + IDWriteFontFamily *family; + IDWriteFontFace *fontface; + IDWriteFont *font; + WCHAR nameW[255]; + UINT32 index; + BOOL exists; + HRESULT hr; + + hr = IDWriteTextFormat_GetFontCollection(format, &collection); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_GetFontFamilyName(format, nameW, sizeof(nameW)/sizeof(WCHAR)); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_FindFamilyName(collection, nameW, &index, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontCollection_Release(collection); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, + IDWriteTextFormat_GetFontWeight(format), + IDWriteTextFormat_GetFontStretch(format), + IDWriteTextFormat_GetFontStyle(format), + &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDWriteFont_Release(font); + IDWriteFontFamily_Release(family); + + return fontface; +} + #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { @@ -447,6 +487,7 @@ struct renderer_context { FLOAT ppdip; FLOAT originX; FLOAT originY; + IDWriteTextFormat *format; }; static HRESULT WINAPI testrenderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, @@ -555,6 +596,26 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface, if (ctxt) TEST_MEASURING_MODE(ctxt, underline->measuringMode); +todo_wine + ok(underline->runHeight > 0.0f, "Expected non-zero run height\n"); + if (ctxt && ctxt->format) { + DWRITE_FONT_METRICS metrics; + IDWriteFontFace *fontface; + FLOAT emsize; + + fontface = get_fontface_from_format(ctxt->format); + emsize = IDWriteTextFormat_GetFontSize(ctxt->format); + IDWriteFontFace_GetMetrics(fontface, &metrics); + + 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 */ + todo_wine + ok(abs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f\n", + metrics.capHeight, underline->runHeight); + + IDWriteFontFace_Release(fontface); + } + entry.kind = DRAW_UNDERLINE; if (effect) entry.kind |= DRAW_EFFECT; @@ -1506,8 +1567,7 @@ static void test_Draw(void) factory = create_factory(); - ctxt.gdicompat = FALSE; - ctxt.use_gdi_natural = FALSE; + memset(&ctxt, 0, sizeof(ctxt)); ctxt.snapping_disabled = TRUE; hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_NORMAL, @@ -3273,46 +3333,6 @@ static void test_SetDrawingEffect(void) IDWriteFactory_Release(factory); } -static IDWriteFontFace *get_fontface_from_format(IDWriteTextFormat *format) -{ - IDWriteFontCollection *collection; - IDWriteFontFamily *family; - IDWriteFontFace *fontface; - IDWriteFont *font; - WCHAR nameW[255]; - UINT32 index; - BOOL exists; - HRESULT hr; - - hr = IDWriteTextFormat_GetFontCollection(format, &collection); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDWriteTextFormat_GetFontFamilyName(format, nameW, sizeof(nameW)/sizeof(WCHAR)); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDWriteFontCollection_FindFamilyName(collection, nameW, &index, &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDWriteFontCollection_Release(collection); - - hr = IDWriteFontFamily_GetFirstMatchingFont(family, - IDWriteTextFormat_GetFontWeight(format), - IDWriteTextFormat_GetFontStretch(format), - IDWriteTextFormat_GetFontStyle(format), - &font); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDWriteFont_CreateFontFace(font, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); - - IDWriteFont_Release(font); - IDWriteFontFamily_Release(family); - - return fontface; -} - static BOOL get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT32 size) { UINT32 index; @@ -4852,12 +4872,13 @@ static void test_SetUnderline(void) { static const WCHAR encaW[] = {'e','n','-','C','A',0}; static const WCHAR strW[] = {'a','e',0x0300,'d',0}; /* accent grave */ + IDWriteFontCollection *syscollection; DWRITE_CLUSTER_METRICS clusters[4]; IDWriteTextFormat *format; IDWriteTextLayout *layout; DWRITE_TEXT_RANGE range; IDWriteFactory *factory; - UINT32 count; + UINT32 count, i; HRESULT hr; factory = create_factory(); @@ -4948,6 +4969,103 @@ todo_wine IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); + + /* Test runHeight value with all available fonts */ + 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++) { + DWRITE_FONT_METRICS fontmetrics; + IDWriteLocalizedStrings *names; + struct renderer_context ctxt; + IDWriteFontFamily *family; + IDWriteFontFace *fontface; + IDWriteFont *font; + WCHAR nameW[256]; + BOOL exists; + + format = NULL; + layout = NULL; + + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + DWRITE_FONT_STYLE_NORMAL, &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 = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (!(exists = get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])))) { + IDWriteLocalFontFileLoader *localloader; + IDWriteFontFileLoader *loader; + IDWriteFontFile *file; + const void *key; + UINT32 keysize; + UINT32 count; + + count = 1; + hr = IDWriteFontFace_GetFiles(fontface, &count, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void**)&localloader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFileLoader_Release(loader); + + hr = IDWriteFontFile_GetReferenceKey(file, &key, &keysize); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteLocalFontFileLoader_GetFilePathFromKey(localloader, key, keysize, nameW, sizeof(nameW)/sizeof(*nameW)); + ok(hr == S_OK, "got 0x%08x\n", hr); + + skip("Failed to get English family name, font file %s\n", wine_dbgstr_w(nameW)); + + IDWriteLocalFontFileLoader_Release(localloader); + IDWriteFontFile_Release(file); + } + + IDWriteLocalizedStrings_Release(names); + IDWriteFont_Release(font); + + if (!exists) + 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, 2, format, 30000.0f, 100.0f, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.startPosition = 0; + range.length = 2; + hr = IDWriteTextLayout_SetUnderline(layout, TRUE, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&ctxt, 0, sizeof(ctxt)); + ctxt.format = format; + hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + cleanup: + if (layout) + IDWriteTextLayout_Release(layout); + if (format) + IDWriteTextFormat_Release(format); + IDWriteFontFace_Release(fontface); + IDWriteFontFamily_Release(family); + } + IDWriteFontCollection_Release(syscollection); + IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Set runHeight attribute for underlines.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: 849b5dd96d8efd0eb1520072bf32428fd8479a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=849b5dd96d8efd0eb1520072b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 23 16:39:25 2017 +0300 dwrite: Set runHeight attribute for underlines. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 10 ++++++---- dlls/dwrite/tests/layout.c | 2 -- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index f850c95..a7fff46 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1,7 +1,7 @@ /* * Text format and layout * - * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2017 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 @@ -1662,27 +1662,29 @@ static BOOL is_same_u_splitting(struct layout_underline_splitting_params *left, static HRESULT layout_add_underline(struct dwrite_textlayout *layout, struct layout_effective_run *first, struct layout_effective_run *last) { + FLOAT thickness, offset, runheight; struct layout_effective_run *cur; DWRITE_FONT_METRICS metrics; - FLOAT thickness, offset; if (first == layout_get_prev_erun(layout, last)) { layout_get_erun_font_metrics(layout, first, &metrics); thickness = SCALE_FONT_METRIC(metrics.underlineThickness, first->run->u.regular.run.fontEmSize, &metrics); offset = SCALE_FONT_METRIC(metrics.underlinePosition, first->run->u.regular.run.fontEmSize, &metrics); + runheight = SCALE_FONT_METRIC(metrics.capHeight, first->run->u.regular.run.fontEmSize, &metrics); } else { FLOAT width = 0.0f; /* Single underline is added for consecutive underlined runs. In this case underline parameters are calculated as weighted average, where run width acts as a weight. */ - thickness = offset = 0.0f; + thickness = offset = runheight = 0.0f; cur = first; do { layout_get_erun_font_metrics(layout, cur, &metrics); thickness += SCALE_FONT_METRIC(metrics.underlineThickness, cur->run->u.regular.run.fontEmSize, &metrics) * cur->width; offset += SCALE_FONT_METRIC(metrics.underlinePosition, cur->run->u.regular.run.fontEmSize, &metrics) * cur->width; + runheight = max(SCALE_FONT_METRIC(metrics.capHeight, cur->run->u.regular.run.fontEmSize, &metrics), runheight); width += cur->width; cur = layout_get_next_erun(layout, cur); @@ -1721,7 +1723,7 @@ static HRESULT layout_add_underline(struct dwrite_textlayout *layout, struct lay /* Font metrics convention is to have it negative when below baseline, for rendering however Y grows from baseline down for horizontal baseline. */ u->u.offset = -offset; - u->u.runHeight = 0.0f; /* FIXME */ + u->u.runHeight = runheight; u->u.readingDirection = is_run_rtl(cur) ? DWRITE_READING_DIRECTION_RIGHT_TO_LEFT : DWRITE_READING_DIRECTION_LEFT_TO_RIGHT; u->u.flowDirection = layout->format.flow; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 868a465..0d73716 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -596,7 +596,6 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface, if (ctxt) TEST_MEASURING_MODE(ctxt, underline->measuringMode); -todo_wine ok(underline->runHeight > 0.0f, "Expected non-zero run height\n"); if (ctxt && ctxt->format) { DWRITE_FONT_METRICS metrics; @@ -609,7 +608,6 @@ todo_wine 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 */ - todo_wine ok(abs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f\n", metrics.capHeight, underline->runHeight);

1 0

Jacek Caban : shlobj.h: Added SHGetPathFromIDListEx declaration.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: dd99871cecfe312ca7c4620bb080c3223a868dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd99871cecfe312ca7c4620bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 23 15:42:33 2017 +0100 shlobj.h: Added SHGetPathFromIDListEx declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlobj.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/shlobj.h b/include/shlobj.h index c40be95..0f754d0 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -57,6 +57,15 @@ typedef enum KF_FLAG_ALIAS_ONLY = 0x80000000 } KNOWN_FOLDER_FLAG; +enum +{ + GPFIDL_DEFAULT = 0x00, + GPFIDL_ALTNAME = 0x01, + GPFIDL_UNCPRINTER = 0x02 +}; + +typedef int GPFIDL_FLAGS; + UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM); LPVOID WINAPI SHAlloc(ULONG) __WINE_ALLOC_SIZE(1); HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*); @@ -83,6 +92,7 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); #define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList) +BOOL WINAPI SHGetPathFromIDListEx(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); INT WINAPI SHHandleUpdateImage(LPCITEMIDLIST); HRESULT WINAPI SHILCreateFromPath(LPCWSTR,LPITEMIDLIST*,DWORD*); HRESULT WINAPI SHLoadOLE(LPARAM);

1 0

Jacek Caban : shlwapi: Fixed error handling in StrRetToBufW.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: dfb846c214a3073d743854e3f165b91dbfa7bec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb846c214a3073d743854e3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 23 15:42:41 2017 +0100 shlwapi: Fixed error handling in StrRetToBufW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/string.c | 79 ++++++++++++++++++++++++++------------------- dlls/shlwapi/tests/string.c | 21 +++++++++++- 2 files changed, 65 insertions(+), 35 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 8c4cb71..0b34d43 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1521,47 +1521,58 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, U */ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, UINT len) { - TRACE("dest=%p len=0x%x strret=%p pidl=%p\n", dest, len, src, pidl); + TRACE("dest=%p len=0x%x strret=%p pidl=%p\n", dest, len, src, pidl); - if (!src) - { - WARN("Invalid lpStrRet would crash under Win32!\n"); - if (dest) - *dest = '\0'; - return E_FAIL; - } + if (!dest || !len) + return E_FAIL; - if (!dest || !len) - return E_FAIL; + if (!src) + { + WARN("Invalid lpStrRet would crash under Win32!\n"); + if (dest) + *dest = '\0'; + return E_FAIL; + } - *dest = '\0'; + *dest = '\0'; + + switch (src->uType) { + case STRRET_WSTR: { + size_t dst_len; + if (!src->u.pOleStr) + return E_FAIL; + dst_len = strlenW(src->u.pOleStr); + memcpy(dest, src->u.pOleStr, min(dst_len, len-1) * sizeof(WCHAR)); + dest[min(dst_len, len-1)] = 0; + CoTaskMemFree(src->u.pOleStr); + if (len <= dst_len) + { + dest[0] = 0; + return E_NOT_SUFFICIENT_BUFFER; + } + break; + } - switch (src->uType) - { - case STRRET_WSTR: - lstrcpynW(dest, src->u.pOleStr, len); - CoTaskMemFree(src->u.pOleStr); - break; + case STRRET_CSTR: + if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len )) + dest[len-1] = 0; + break; - case STRRET_CSTR: - if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len )) - dest[len-1] = 0; - break; + case STRRET_OFFSET: + if (pidl) + { + if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, -1, + dest, len )) + dest[len-1] = 0; + } + break; - case STRRET_OFFSET: - if (pidl) - { - if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, -1, - dest, len )) - dest[len-1] = 0; - } - break; + default: + FIXME("unknown type!\n"); + return E_NOTIMPL; + } - default: - FIXME("unknown type!\n"); - return E_NOTIMPL; - } - return S_OK; + return S_OK; } /************************************************************************* diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index ac14db0..f23ae3f 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -988,6 +988,7 @@ static void test_StrXXX_overflows(void) WCHAR wstr1[2*MAX_PATH+1], wbuf[2*MAX_PATH]; const WCHAR fmt[] = {'%','s',0}; STRRET strret; + HRESULT hres; int ret; int i; @@ -1059,9 +1060,27 @@ if (0) memset(wbuf, 0xbf, sizeof(wbuf)); strret.uType = STRRET_WSTR; U(strret).pOleStr = StrDupW(wstr1); - expect_eq2(pStrRetToBufW(&strret, NULL, wbuf, 10), S_OK, E_NOT_SUFFICIENT_BUFFER /* Vista */, HRESULT, "%x"); + hres = pStrRetToBufW(&strret, NULL, wbuf, 10); + ok(hres == E_NOT_SUFFICIENT_BUFFER || broken(hres == S_OK) /* winxp */, + "StrRetToBufW returned %08x\n", hres); + if (hres == E_NOT_SUFFICIENT_BUFFER) + expect_eq(wbuf[0], 0, WCHAR, "%x"); expect_eq(wbuf[9], 0, WCHAR, "%x"); expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); + + memset(wbuf, 0xbf, sizeof(wbuf)); + strret.uType = STRRET_CSTR; + StrCpyNA(U(strret).cStr, str1, MAX_PATH); + hres = pStrRetToBufW(&strret, NULL, wbuf, 10); + ok(hres == S_OK, "StrRetToBufW returned %08x\n", hres); + ok(!memcmp(wbuf, wstr1, 9*sizeof(WCHAR)) && !wbuf[9], "StrRetToBuf returned %s\n", wine_dbgstr_w(wbuf)); + + memset(wbuf, 0xbf, sizeof(wbuf)); + strret.uType = STRRET_WSTR; + U(strret).pOleStr = NULL; + hres = pStrRetToBufW(&strret, NULL, wbuf, 10); + ok(hres == E_FAIL, "StrRetToBufW returned %08x\n", hres); + ok(!wbuf[0], "StrRetToBuf returned %s\n", wine_dbgstr_w(wbuf)); } else win_skip("StrRetToBufW() is not available\n");

1 0

Jacek Caban : shell32: Added SHGetPathFromIDListEx implementation.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: d9fc7d271c570a604c2d1d7db4c45a17b3cafaf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9fc7d271c570a604c2d1d7db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 23 15:42:49 2017 +0100 shell32: Added SHGetPathFromIDListEx implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/pidl.c | 19 +++++++++++++++---- dlls/shell32/shell32.spec | 1 + dlls/shell32/tests/shlfolder.c | 32 +++++++++++++++++++++++++++++--- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index c3a753a..72169d5 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1245,16 +1245,27 @@ BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST pidl, LPSTR pszPath) */ BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST pidl, LPWSTR pszPath) { + return SHGetPathFromIDListEx(pidl, pszPath, MAX_PATH, 0); +} + +/************************************************************************* + * SHGetPathFromIDListEx [SHELL32.@] + */ +BOOL WINAPI SHGetPathFromIDListEx(LPCITEMIDLIST pidl, WCHAR *path, DWORD path_size, GPFIDL_FLAGS flags) +{ HRESULT hr; LPCITEMIDLIST pidlLast; LPSHELLFOLDER psfFolder; DWORD dwAttributes; STRRET strret; - TRACE_(shell)("(pidl=%p,%p)\n", pidl, pszPath); + TRACE_(shell)("(pidl=%p,%p,%u,%x)\n", pidl, path, path_size, flags); pdump(pidl); - *pszPath = '\0'; + if (flags != GPFIDL_DEFAULT) + FIXME("Unsupported flags %x\n", flags); + + *path = '\0'; if (!pidl) return FALSE; @@ -1272,9 +1283,9 @@ BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST pidl, LPWSTR pszPath) IShellFolder_Release(psfFolder); if (FAILED(hr)) return FALSE; - hr = StrRetToBufW(&strret, pidlLast, pszPath, MAX_PATH); + hr = StrRetToBufW(&strret, pidlLast, path, path_size); - TRACE_(shell)("-- %s, 0x%08x\n",debugstr_w(pszPath), hr); + TRACE_(shell)("-- %s, 0x%08x\n",debugstr_w(path), hr); return SUCCEEDED(hr); } diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f758b3c..780fa50 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -390,6 +390,7 @@ @ stdcall SHGetNewLinkInfo(str str ptr ptr long) SHGetNewLinkInfoA @ stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA @ stdcall SHGetPathFromIDListA(ptr ptr) +@ stdcall SHGetPathFromIDListEx(ptr ptr long long) @ stdcall SHGetPathFromIDListW(ptr ptr) @ stdcall SHGetPropertyStoreForWindow(long ptr ptr) @ stdcall SHGetPropertyStoreFromParsingName(wstr ptr long ptr ptr) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 90418bd..759cce6 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -76,6 +76,7 @@ static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFII static HRESULT (WINAPI *pSHCreateShellFolderView)(const SFV_CREATE *pcsfv, IShellView **ppsv); static HRESULT (WINAPI *pSHCreateShellFolderViewEx)(LPCSFV psvcbi, IShellView **ppv); static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); +static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); static WCHAR *make_wstr(const char *str) { @@ -135,6 +136,7 @@ static void init_function_pointers(void) MAKEFUNC(SHCreateDefaultContextMenu); MAKEFUNC(SHCreateShellFolderView); MAKEFUNC(SHCreateShellFolderViewEx); + MAKEFUNC(SHGetPathFromIDListEx); #undef MAKEFUNC #define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) @@ -1347,10 +1349,34 @@ static void test_SHGetPathFromIDList(void) result = pSHGetPathFromIDListW(pidlTestFile, wszPath); ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); - IMalloc_Free(ppM, pidlTestFile); - if (!result) return; ok(0 == lstrcmpW(wszFileName, wszPath), "SHGetPathFromIDListW returned incorrect path for file placed on desktop\n"); + if (pSHGetPathFromIDListEx) + { + result = pSHGetPathFromIDListEx(pidlEmpty, wszPath, MAX_PATH, SFGAO_FILESYSTEM); + ok(result, "SHGetPathFromIDListEx failed: %u\n", GetLastError()); + ok(!lstrcmpiW(wszDesktop, wszPath), "Unexpected SHGetPathFromIDListEx result %s, expected %s\n", + wine_dbgstr_w(wszPath), wine_dbgstr_w(wszDesktop)); + + result = pSHGetPathFromIDListEx(pidlTestFile, wszPath, MAX_PATH, SFGAO_FILESYSTEM); + ok(result, "SHGetPathFromIDListEx failed: %u\n", GetLastError()); + ok(!lstrcmpiW(wszFileName, wszPath), "Unexpected SHGetPathFromIDListEx result %s, expected %s\n", + wine_dbgstr_w(wszPath), wine_dbgstr_w(wszFileName)); + + SetLastError(0xdeadbeef); + memset(wszPath, 0x55, sizeof(wszPath)); + result = pSHGetPathFromIDListEx(pidlTestFile, wszPath, 5, SFGAO_FILESYSTEM); + ok(!result, "SHGetPathFromIDListEx returned: %x(%u)\n", result, GetLastError()); + + SetLastError(0xdeadbeef); + memset(wszPath, 0x55, sizeof(wszPath)); + result = pSHGetPathFromIDListEx(pidlEmpty, wszPath, 5, SFGAO_FILESYSTEM); + ok(!result, "SHGetPathFromIDListEx returned: %x(%u)\n", result, GetLastError()); + } + else + win_skip("SHGetPathFromIDListEx not available\n"); + + IMalloc_Free(ppM, pidlTestFile); /* Test if we can get the path from the start menu "program files" PIDL. */ hr = pSHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidlPrograms); @@ -1358,7 +1384,7 @@ static void test_SHGetPathFromIDList(void) SetLastError(0xdeadbeef); result = pSHGetPathFromIDListW(pidlPrograms, wszPath); - IMalloc_Free(ppM, pidlPrograms); + IMalloc_Free(ppM, pidlPrograms); ok(result, "SHGetPathFromIDListW failed\n"); }

1 0

Stefan Dösinger : d3d9/tests: AMD r500 needs dummy texture output from vertex shaders for point sprites to work.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: f3a0465c5c9d47e834b2ed7eec44b94171fed8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a0465c5c9d47e834b2ed7ee… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Feb 22 22:32:02 2017 +0000 d3d9/tests: AMD r500 needs dummy texture output from vertex shaders for point sprites to work. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 72005ff..c8cab8c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10445,6 +10445,9 @@ static void test_pointsize(void) vertex_pointsize = {64.0f, 64.0f, 0.1f, 48.0f}, vertex_pointsize_scaled = {64.0f, 64.0f, 0.1f, 24.0f}, vertex_pointsize_zero = {64.0f, 64.0f, 0.1f, 0.0f}; + /* Writing a texture coordinate from the shader is technically unnecessary, but is required + * to make Windows AMD r500 drivers work. Without it, texture coordinates in the pixel + * shaders are 0. */ static const DWORD vshader_code[] = { 0xfffe0101, /* vs_1_1 */ @@ -10453,6 +10456,8 @@ static void test_pointsize(void) 0x00000004, 0x800f0000, 0x90550000, 0xa0e40001, 0x80e40000, /* mad r0, v0.y, c1, r0 */ 0x00000004, 0x800f0000, 0x90aa0000, 0xa0e40002, 0x80e40000, /* mad r0, v0.z, c2, r0 */ 0x00000004, 0xc00f0000, 0x90ff0000, 0xa0e40003, 0x80e40000, /* mad oPos, v0.w, c3, r0 */ + 0x00000001, 0xe00f0000, 0x90e40000, /* mov oT0, v0 */ + 0x00000001, 0xe00f0001, 0x90e40000, /* mov oT1, v0 */ 0x0000ffff }; static const DWORD vshader_psize_code[] = @@ -10464,7 +10469,9 @@ static void test_pointsize(void) 0x00000004, 0x800f0000, 0x90550000, 0xa0e40001, 0x80e40000, /* mad r0, v0.y, c1, r0 */ 0x00000004, 0x800f0000, 0x90aa0000, 0xa0e40002, 0x80e40000, /* mad r0, v0.z, c2, r0 */ 0x00000004, 0xc00f0000, 0x90ff0000, 0xa0e40003, 0x80e40000, /* mad oPos, v0.w, c3, r0 */ - 0x00000001, 0xc00f0002, 0x90000001, /* mov oPts, v1.x */ + 0x00000001, 0xc00f0002, 0x90000001, /* mov oPts, v1.x */ + 0x00000001, 0xe00f0000, 0x90e40000, /* mov oT0, v0 */ + 0x00000001, 0xe00f0001, 0x90e40000, /* mov oT1, v0 */ 0x0000ffff }; static const DWORD pshader_code[] = @@ -10508,10 +10515,14 @@ static void test_pointsize(void) 0xfffe0300, /* vs_3_0 */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x0200001f, 0x80000005, 0xe00f0001, /* dcl_texcoord0 o1 */ + 0x0200001f, 0x80010005, 0xe00f0002, /* dcl_texcoord1 o2 */ 0x03000005, 0x800f0000, 0x90000000, 0xa0e40000, /* mul r0, v0.x, c0 */ 0x04000004, 0x800f0000, 0x90550000, 0xa0e40001, 0x80e40000, /* mad r0, v0.y, c1, r0 */ 0x04000004, 0x800f0000, 0x90aa0000, 0xa0e40002, 0x80e40000, /* mad r0, v0.z, c2, r0 */ 0x04000004, 0xe00f0000, 0x90ff0000, 0xa0e40003, 0x80e40000, /* mad o0, v0.w, c3, r0 */ + 0x02000001, 0xe00f0001, 0x90000000, /* mov o1, v0.x */ + 0x02000001, 0xe00f0002, 0x90000000, /* mov o2, v0.x */ 0x0000ffff }; static const DWORD vshader3_psize_code[] = @@ -10521,11 +10532,15 @@ static void test_pointsize(void) 0x0200001f, 0x80000004, 0x90010001, /* dcl_psize v1.x */ 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ 0x0200001f, 0x80000004, 0xe00f0001, /* dcl_psize o1 */ + 0x0200001f, 0x80000005, 0xe00f0002, /* dcl_texcoord0 o2 */ + 0x0200001f, 0x80010005, 0xe00f0003, /* dcl_texcoord1 o3 */ 0x03000005, 0x800f0000, 0x90000000, 0xa0e40000, /* mul r0, v0.x, c0 */ 0x04000004, 0x800f0000, 0x90550000, 0xa0e40001, 0x80e40000, /* mad r0, v0.y, c1, r0 */ 0x04000004, 0x800f0000, 0x90aa0000, 0xa0e40002, 0x80e40000, /* mad r0, v0.z, c2, r0 */ 0x04000004, 0xe00f0000, 0x90ff0000, 0xa0e40003, 0x80e40000, /* mad o0, v0.w, c3, r0 */ 0x02000001, 0xe00f0001, 0x90000001, /* mov o1, v1.x */ + 0x02000001, 0xe00f0002, 0x90000000, /* mov o2, v0.x */ + 0x02000001, 0xe00f0003, 0x90000000, /* mov o3, v0.x */ 0x0000ffff }; static const DWORD pshader3_code[] =

1 0

Józef Kucia : wined3d: Fix return type for surface_load_texture().
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: 80b17bef3b75543d4ab6805e2a42dd51c46dca43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b17bef3b75543d4ab6805e2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 23 15:00:52 2017 +0100 wined3d: Fix return type for surface_load_texture(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 449c1fa..399f436 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2540,7 +2540,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, return TRUE; } -static HRESULT surface_load_texture(struct wined3d_surface *surface, +static BOOL surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { unsigned int width, height, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch;

1 0

Józef Kucia : wined3d: Fix handling of SM4+ integer registers.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: b1b880fc75932c890ea070311793111e738ebf52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b880fc75932c890ea070311… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 23 15:00:53 2017 +0100 wined3d: Fix handling of SM4+ integer registers. There should be no behavior change for immediate constants and other registers. After this fix a correct GLSL is generated for SM4+ instructions similar to the following: mov r0.xyz, vThreadGroupID.xyzx mov r0.w, vThreadIDInGroupFlattened.x Previously, it was assumed that an integer register is always in a position in which an integer type is expected. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 93 ++++++++++++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 44e1513..f026e78 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2955,6 +2955,48 @@ static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param shader_glsl_swizzle_to_str(param->swizzle, fixup, mask, swizzle_str); } +static void shader_glsl_sprintf_cast(char *dst_param_str, const char *src_param_str, + enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type) +{ + if (dst_data_type == src_data_type) + { + sprintf(dst_param_str, "%s", src_param_str); + return; + } + + if (src_data_type == WINED3D_DATA_FLOAT) + { + switch (dst_data_type) + { + case WINED3D_DATA_INT: + sprintf(dst_param_str, "floatBitsToInt(%s)", src_param_str); + return; + case WINED3D_DATA_RESOURCE: + case WINED3D_DATA_SAMPLER: + case WINED3D_DATA_UINT: + sprintf(dst_param_str, "floatBitsToUint(%s)", src_param_str); + return; + default: + break; + } + } + + if (src_data_type == WINED3D_DATA_UINT && dst_data_type == WINED3D_DATA_FLOAT) + { + sprintf(dst_param_str, "uintBitsToFloat(%s)", src_param_str); + return; + } + + if (src_data_type == WINED3D_DATA_INT && dst_data_type == WINED3D_DATA_FLOAT) + { + sprintf(dst_param_str, "intBitsToFloat(%s)", src_param_str); + return; + } + + FIXME("Unhandled cast from %#x to %#x.\n", src_data_type, dst_data_type); + sprintf(dst_param_str, "%s", src_param_str); +} + /* From a given parameter token, generate the corresponding GLSL string. * Also, return the actual register name and swizzle in case the * caller needs this information as well. */ @@ -2962,8 +3004,10 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src, enum wined3d_data_type data_type) { + enum wined3d_data_type param_data_type; BOOL is_color = FALSE; char swizzle_str[6]; + char reg_name[200]; glsl_src->reg_name[0] = '\0'; glsl_src->param_str[0] = '\0'; @@ -2972,40 +3016,27 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio shader_glsl_get_register_name(&wined3d_src->reg, glsl_src->reg_name, &is_color, ins); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); - if (wined3d_src->reg.type == WINED3DSPR_IMMCONST - || wined3d_src->reg.type == WINED3DSPR_PRIMID - || wined3d_src->reg.type == WINED3DSPR_LOCALTHREADINDEX - || wined3d_src->reg.type == WINED3DSPR_THREADID - || wined3d_src->reg.type == WINED3DSPR_THREADGROUPID - || wined3d_src->reg.type == WINED3DSPR_LOCALTHREADID) + switch (wined3d_src->reg.type) { - shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, glsl_src->param_str); + case WINED3DSPR_IMMCONST: + param_data_type = data_type; + break; + case WINED3DSPR_PRIMID: + param_data_type = WINED3D_DATA_UINT; + break; + case WINED3DSPR_LOCALTHREADINDEX: + case WINED3DSPR_THREADID: + case WINED3DSPR_THREADGROUPID: + case WINED3DSPR_LOCALTHREADID: + param_data_type = WINED3D_DATA_INT; + break; + default: + param_data_type = WINED3D_DATA_FLOAT; + break; } - else - { - char reg_name[200]; - - switch (data_type) - { - case WINED3D_DATA_FLOAT: - sprintf(reg_name, "%s", glsl_src->reg_name); - break; - case WINED3D_DATA_INT: - sprintf(reg_name, "floatBitsToInt(%s)", glsl_src->reg_name); - break; - case WINED3D_DATA_RESOURCE: - case WINED3D_DATA_SAMPLER: - case WINED3D_DATA_UINT: - sprintf(reg_name, "floatBitsToUint(%s)", glsl_src->reg_name); - break; - default: - FIXME("Unhandled data type %#x.\n", data_type); - sprintf(reg_name, "%s", glsl_src->reg_name); - break; - } - shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name, swizzle_str, glsl_src->param_str); - } + shader_glsl_sprintf_cast(reg_name, glsl_src->reg_name, data_type, param_data_type); + shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name, swizzle_str, glsl_src->param_str); } static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins,

1 0

Józef Kucia : wined3d: Handle structured UAV declarations.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: a78afa1c716b03083f7ede461ffdc041a8134c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78afa1c716b03083f7ede461… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 23 15:00:54 2017 +0100 wined3d: Handle structured UAV declarations. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 15 +++++++++++++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f026e78..9893d11 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9352,7 +9352,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_RAW */ shader_glsl_nop, - /* WINED3DSIH_DCL_UAV_STRUCTURED */ NULL, + /* WINED3DSIH_DCL_UAV_STRUCTURED */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_TYPED */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3b5d6ee..3085248 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1058,6 +1058,21 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st reg_maps->uav_resource_info[reg_idx].data_type = WINED3D_DATA_UINT; reg_maps->uav_resource_info[reg_idx].flags = WINED3D_VIEW_BUFFER_RAW; } + else if (ins.handler_idx == WINED3DSIH_DCL_UAV_STRUCTURED) + { + unsigned int reg_idx = ins.declaration.structured_resource.reg.reg.idx[0].offset; + if (reg_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV resource index %u.\n", reg_idx); + break; + } + if (ins.flags) + FIXME("Ignoring structured UAV flags %#x.\n", ins.flags); + reg_maps->uav_resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_BUFFER; + reg_maps->uav_resource_info[reg_idx].data_type = WINED3D_DATA_UINT; + reg_maps->uav_resource_info[reg_idx].flags = 0; + reg_maps->uav_resource_info[reg_idx].stride = ins.declaration.structured_resource.byte_stride / 4; + } else if (ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) { if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index baffe2d..877b27d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -753,6 +753,8 @@ static void shader_sm5_read_dcl_uav_structured(struct wined3d_shader_instruction shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_UAV, &ins->declaration.structured_resource.reg); ins->flags = (opcode_token & WINED3D_SM5_UAV_FLAGS_MASK) >> WINED3D_SM5_UAV_FLAGS_SHIFT; ins->declaration.structured_resource.byte_stride = *tokens; + if (ins->declaration.structured_resource.byte_stride % 4) + FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); } static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 087e4d2..7950011 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -827,6 +827,7 @@ struct wined3d_shader_resource_info enum wined3d_shader_resource_type type; enum wined3d_data_type data_type; unsigned int flags; + unsigned int stride; }; #define WINED3D_SAMPLER_DEFAULT ~0x0u

1 0