November 2018 - Wine-devel - list.winehq.org

[PATCH 1/5] d3d8: Do not add map access indiscriminately in cubetexture_init().
by Henri Verbeet 13 Nov '18

13 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/texture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 0b86ed9571b..ec5ae034858 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1155,8 +1155,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = edge_length; desc.height = edge_length; desc.depth = 1; -- 2.11.0

2 1

[PATCH] ws2_32: Return WSAEAFNOSUPPORT when ip4/6 disabled
by Brendan McGrath 13 Nov '18

13 Nov '18

Currently, when IPv6 is disabled by the kernel, attempting to use the 'WebRequest' API with .NET native causes a crash. This can be recreated using the following gist: https://gist.github.com/redmcg/7d81ef833c77bee6965b5f441006f697 This patch fixes the crash by returning WSAEAFNOSUPPORT, as expected by .NET. See: https://referencesource.microsoft.com/#System/net/System/Net/Sockets/Socket… --- dlls/ws2_32/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index df068fe8527..62cd7623eef 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7646,6 +7646,8 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, /* invalid combination of valid parameters, like SOCK_STREAM + IPPROTO_UDP */ if (err == WSAEINVAL) err = WSAESOCKTNOSUPPORT; + else if (err == WSAEOPNOTSUPP && (unixaf == AF_INET4 || unixaf == AF_INET6)) + err = WSAEAFNOSUPPORT; else if (err == WSAEOPNOTSUPP) err = WSAEPROTONOSUPPORT; } -- 2.17.1

1 1

[PATCH] winedump: Add IMAGE_DEBUG_TYPE_REPRO
by André Hentschel 13 Nov '18

13 Nov '18

Signed-off-by: Andr� Hentschel <nerv(a)dawncrow.de> --- include/winnt.h | 1 + tools/winedump/pe.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 6b5b66002a..035d5bd097 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3739,6 +3739,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY { #define IMAGE_DEBUG_TYPE_POGO 13 #define IMAGE_DEBUG_TYPE_ILTCG 14 #define IMAGE_DEBUG_TYPE_MPX 15 +#define IMAGE_DEBUG_TYPE_REPRO 16 typedef enum ReplacesCorHdrNumericDefines { diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index ca41bb7439..f8689f7f33 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1382,6 +1382,7 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) case IMAGE_DEBUG_TYPE_POGO: str = "POGO"; break; case IMAGE_DEBUG_TYPE_ILTCG: str = "ILTCG"; break; case IMAGE_DEBUG_TYPE_MPX: str = "MPX"; break; + case IMAGE_DEBUG_TYPE_REPRO: str = "REPRO"; break; } printf(" Type: %u (%s)\n", idd->Type, str); printf(" SizeOfData: %u\n", idd->SizeOfData); -- 2.17.1

1 0

[v2 PATCH] gdi32/tests: Fix some test failures on newer Win10 releases.
by Nikolay Sivov 13 Nov '18

13 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0d0770905d..4f10e2f38d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1003,10 +1003,10 @@ static void test_bitmap_font_metrics(void) memset(&gm, 0, sizeof(gm)); SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); - todo_wine { + todo_wine ok(ret == GDI_ERROR, "GetGlyphOutline should fail for a bitmap font\n"); - ok(GetLastError() == ERROR_CAN_NOT_COMPLETE, "expected ERROR_CAN_NOT_COMPLETE, got %u\n", GetLastError()); - } + ret = GetLastError(); + ok(ret == ERROR_CAN_NOT_COMPLETE || ret == 0xdeadbeef /* Win10 */, "Unexpected error %d.\n", ret); bRet = GetTextMetricsA(hdc, &tm); ok(bRet, "GetTextMetrics error %d\n", GetLastError()); -- 2.19.1

2 1

[PATCH v4] gdi32: Specify the suitable hinting flags explicitly.
by Byeongsik Jeon 13 Nov '18

13 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41639 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v4: make a helper function. Because of the GGO_UNHINTED bit, slightly changed from the comment. dlls/gdi32/freetype.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b62288c453..415aabedf1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6801,6 +6801,34 @@ static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int b return needed; } +static FT_Int get_hinting_flags( UINT format ) +{ + FT_Int hinting_flags = 0; + + switch (format) + { + case GGO_BITMAP: + hinting_flags = FT_LOAD_TARGET_MONO; + break; + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + case WINE_GGO_GRAY16_BITMAP: + hinting_flags = FT_LOAD_TARGET_NORMAL; + break; + case WINE_GGO_HRGB_BITMAP: + case WINE_GGO_HBGR_BITMAP: + hinting_flags = FT_LOAD_TARGET_LCD; + break; + case WINE_GGO_VRGB_BITMAP: + case WINE_GGO_VBGR_BITMAP: + hinting_flags = FT_LOAD_TARGET_LCD_V; + break; + } + + return hinting_flags; +} + static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, @@ -6863,6 +6891,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, load_flags |= FT_LOAD_NO_HINTING; format &= ~GGO_UNHINTED; } + else + load_flags |= get_hinting_flags( format ); if(original_index >= font->gmsize * GM_BLOCK_SIZE) { font->gmsize = (original_index / GM_BLOCK_SIZE + 1); -- 2.19.1

2 1

[PATCH v5] gdi32: Specify the suitable hinting flags explicitly.
by Huw Davies 13 Nov '18

13 Nov '18

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41639 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b62288c453..99b7d8c8f2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6801,6 +6801,37 @@ static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int b return needed; } +static FT_Int get_load_flags( UINT format ) +{ + FT_Int load_flags = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; + + if (format & GGO_UNHINTED) + return load_flags | FT_LOAD_NO_HINTING; + + switch (format & ~GGO_GLYPH_INDEX) + { + case GGO_BITMAP: + load_flags |= FT_LOAD_TARGET_MONO; + break; + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + case WINE_GGO_GRAY16_BITMAP: + load_flags |= FT_LOAD_TARGET_NORMAL; + break; + case WINE_GGO_HRGB_BITMAP: + case WINE_GGO_HBGR_BITMAP: + load_flags |= FT_LOAD_TARGET_LCD; + break; + case WINE_GGO_VRGB_BITMAP: + case WINE_GGO_VBGR_BITMAP: + load_flags |= FT_LOAD_TARGET_LCD_V; + break; + } + + return load_flags; +} + static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, @@ -6820,7 +6851,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FT_Vector adv; INT origin_x = 0, origin_y = 0; FT_Angle angle = 0; - FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; + FT_Int load_flags = get_load_flags(format); double widthRatio = 1.0; FT_Matrix transMat = identityMat; FT_Matrix transMatUnrotated; @@ -6859,10 +6890,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, tategaki = check_unicode_tategaki(glyph); } - if(format & GGO_UNHINTED) { - load_flags |= FT_LOAD_NO_HINTING; - format &= ~GGO_UNHINTED; - } + format &= ~GGO_UNHINTED; if(original_index >= font->gmsize * GM_BLOCK_SIZE) { font->gmsize = (original_index / GM_BLOCK_SIZE + 1); -- 2.18.0

1 0

[PATCH] gdi32/tests: Fix some test failures on newer Win10 releases.
by Nikolay Sivov 13 Nov '18

13 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0d0770905d..0e895fef11 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1003,10 +1003,11 @@ static void test_bitmap_font_metrics(void) memset(&gm, 0, sizeof(gm)); SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); - todo_wine { + todo_wine ok(ret == GDI_ERROR, "GetGlyphOutline should fail for a bitmap font\n"); - ok(GetLastError() == ERROR_CAN_NOT_COMPLETE, "expected ERROR_CAN_NOT_COMPLETE, got %u\n", GetLastError()); - } + ret = GetLastError(); + ok(ret == 0xdeadbeef || broken(ret == ERROR_CAN_NOT_COMPLETE) /* before Win10 */, + "Unexpected error %d.\n", ret); bRet = GetTextMetricsA(hdc, &tm); ok(bRet, "GetTextMetrics error %d\n", GetLastError()); -- 2.19.1

2 1

[PATCH] kernel32: Remove duplicate specfile entries
by Alex Henrie 12 Nov '18

12 Nov '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/kernel32.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c370a068c2..5490b07d8e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -195,7 +195,6 @@ # @ stub BasepFreeActivationContextActivationBlock # @ stub BasepFreeAppCompatData # @ stub BasepMapModuleHandle -# @ stub BaseVerifyUnicodeString @ stdcall Beep(long long) @ stdcall BeginUpdateResourceA(str long) @ stdcall BeginUpdateResourceW(wstr long) @@ -286,13 +285,11 @@ @ stdcall CreateFileMappingA(long ptr long long long str) # @ stub CreateFileMappingNumaA # @ stub CreateFileMappingNumaW -@ stdcall CreateHardLinkTransactedA(str str ptr ptr) -@ stdcall CreateHardLinkTransactedW(wstr wstr ptr ptr) @ stdcall CreateFileMappingW(long ptr long long long wstr) @ stdcall CreateFileW(wstr long long ptr long long long) @ stdcall CreateHardLinkA(str str ptr) -# @ stub CreateHardLinkTransactedA -# @ stub CreateHardLinkTransactedW +@ stdcall CreateHardLinkTransactedA(str str ptr ptr) +@ stdcall CreateHardLinkTransactedW(wstr wstr ptr ptr) @ stdcall CreateHardLinkW(wstr wstr ptr) @ stdcall CreateIoCompletionPort(long long long long) @ stdcall CreateJobObjectA(ptr str) -- 2.19.1

1 0

[PATCH] wincodecs: Grab TIFF decoder reference when creating frames.
by Nikolay Sivov 12 Nov '18

12 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/tiffformat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 966ab3eb4b..3cb2ebc16c 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -766,6 +766,7 @@ static HRESULT WINAPI TiffDecoder_GetFrame(IWICBitmapDecoder *iface, result->IWICMetadataBlockReader_iface.lpVtbl = &TiffFrameDecode_BlockVtbl; result->ref = 1; result->parent = This; + IWICBitmapDecoder_AddRef(iface); result->index = index; result->decode_info = decode_info; result->cached_tile_x = -1; @@ -776,7 +777,7 @@ static HRESULT WINAPI TiffDecoder_GetFrame(IWICBitmapDecoder *iface, else { hr = E_OUTOFMEMORY; - HeapFree(GetProcessHeap(), 0, result); + IWICBitmapFrameDecode_Release(&result->IWICBitmapFrameDecode_iface); } } else hr = E_OUTOFMEMORY; @@ -851,6 +852,7 @@ static ULONG WINAPI TiffFrameDecode_Release(IWICBitmapFrameDecode *iface) if (ref == 0) { + IWICBitmapDecoder_Release(&This->parent->IWICBitmapDecoder_iface); HeapFree(GetProcessHeap(), 0, This->cached_tile); HeapFree(GetProcessHeap(), 0, This); } -- 2.19.1

2 1

Wine staging 3.20 release
by Alistair Leslie-Hughes 12 Nov '18

12 Nov '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.20 (857 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * xaudio2_7: Use assembly wrapper to call OnVoiceProcessingPassStart callback. Added * [36089] wined3d: Improve dirt rendering in SpinTires Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: SpinTires, Halo online * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

5 4