May 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 5.9
by Alexandre Julliard May 22, 2020

May 22, 2020

Module: website Branch: master Commit: f1a7cc8f5d84a2dac60bb10781b64830b9f39812 URL: https://source.winehq.org/git/website.git/?a=commit;h=f1a7cc8f5d84a2dac60bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 20:51:25 2020 +0200 Wine release 5.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020052201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2020052201.xml b/news/en/2020052201.xml new file mode 100644 index 00000000..3ad9bf0a --- /dev/null +++ b/news/en/2020052201.xml @@ -0,0 +1,16 @@ +<news> +<date>May 22, 2020</date> +<title>Wine 5.9 Released</title> +<body> + The Wine development release 5.9 is now available. + <a href="{$root}/announce/5.9">What's new</a> in this release: +<ul> + <li>Major progress on the WineD3D Vulkan backend.</li> + <li>Initial support for splitting dlls into PE and Unix parts.</li> + <li>Support for generating PDB files when building PE dlls.</li> + <li>Timestamp updates in the Kernel User Shared Data.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.9.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Esme Povirk : maintainers: Changing my name.
by Alexandre Julliard May 22, 2020

May 22, 2020

Module: wine Branch: master Commit: 9ddceebe52fc79f6839f11e75e27b03c87f6e90b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ddceebe52fc79f6839f11e7… Author: Esme Povirk <vincent(a)codeweavers.com> Date: Fri May 22 11:35:41 2020 -0500 maintainers: Changing my name. Also my X11 Driver knowledge is quite stale, so I'm removing myself there. Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index cfbeaeb12b..6cc1699665 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -53,7 +53,7 @@ P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ Common Item Dialog -P: Vincent Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <vincent(a)codeweavers.com> F: dlls/comdlg32/itemdlg.c F: dlls/comdlg32/tests/itemdlg.c @@ -122,7 +122,7 @@ M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/dwrite/ DotNet Runtime -M: Vincent Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/mscoree/ GDI @@ -130,7 +130,7 @@ M: Huw Davies <huw(a)codeweavers.com> F: dlls/gdi32/ GDIPlus -M: Vincent Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/gdiplus/ GPhoto Driver @@ -202,7 +202,7 @@ F: dlls/ole32/stubmanager.c F: dlls/ole32/usrmarshal.c OLE Storage -M: Vincent Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/ole32/filelockbytes.c F: dlls/ole32/memlockbytes.c F: dlls/ole32/stg_stream.c @@ -243,7 +243,7 @@ F: dlls/rpcrt4 F: tools/widl TWAIN -P: Vincent Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <vincent(a)codeweavers.com> F: dlls/twain_32/ F: dlls/sane.ds/ F: dlls/gphoto2.ds/ @@ -271,7 +271,7 @@ F: dlls/mshtml/ F: dlls/shdocvw/ Windows Imaging Component -M: Vincent Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/windowscodecs/ F: dlls/windowscodecsext/ @@ -315,7 +315,6 @@ F: dlls/wpcap/ X11 Driver M: Alexandre Julliard <julliard(a)winehq.org> -P: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/winex11.drv/ XML parsing @@ -329,7 +328,7 @@ P: Alex Henrie <alexhenrie24(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Jacek Caban <jacek(a)codeweavers.com> -P: Vincent Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <vincent(a)codeweavers.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: * F: */

1 0

Zebediah Figura : ntoskrnl.exe: Protect the two relocated pages independently.
by Alexandre Julliard May 22, 2020

May 22, 2020

Module: wine Branch: master Commit: c750ae6b9dc85fd2173e40a07204388988b64532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c750ae6b9dc85fd2173e40a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 22 09:52:56 2020 -0500 ntoskrnl.exe: Protect the two relocated pages independently. They may have different protection flags. This fixes a regression introduced by 22dfb0df10b44d1c21b3d04b59312670c2318431. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49198 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7ebce5709d..316bc8f032 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3413,8 +3413,8 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len, ULONG page_size ) while (rel < end - 1 && rel->SizeOfBlock) { - void *page = get_rva( module, rel->VirtualAddress ); - DWORD old_prot; + char *page = get_rva( module, rel->VirtualAddress ); + DWORD old_prot1, old_prot2; if (rel->VirtualAddress >= len) { @@ -3424,10 +3424,12 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len, ULONG page_size ) /* Relocation entries may hang over the end of the page, so we need to * protect two pages. */ - VirtualProtect( page, page_size * 2, PAGE_READWRITE, &old_prot ); + VirtualProtect( page, page_size, PAGE_READWRITE, &old_prot1 ); + VirtualProtect( page + page_size, page_size, PAGE_READWRITE, &old_prot2 ); rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); - VirtualProtect( page, page_size * 2, old_prot, &old_prot ); + VirtualProtect( page, page_size, old_prot1, &old_prot1 ); + VirtualProtect( page + page_size, page_size, old_prot2, &old_prot2 ); if (!rel) return STATUS_INVALID_IMAGE_FORMAT; }

1 0

Jacek Caban : math.h: Provide copysign declaration for ucrt.
by Alexandre Julliard May 22, 2020

May 22, 2020

Module: wine Branch: master Commit: 073016ecd484f8d57685cedfde1ee808235840c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=073016ecd484f8d57685cedf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 22 17:16:43 2020 +0200 math.h: Provide copysign declaration for ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 01c4a4b61b..83b252ad5f 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -182,8 +182,13 @@ static inline int _fpclassf(float x) { return _fpclass(x); } static inline float ldexpf(float x, int y) { return ldexp(x, y); } +#ifdef _UCRT +_ACRTIMP double __cdecl copysign(double, double); +_ACRTIMP float __cdecl copysignf(float, float); +#else #define copysign(x,y) _copysign(x,y) #define copysignf(x,y) _copysignf(x,y) +#endif double __cdecl nearbyint(double); float __cdecl nearbyintf(float);

1 0

Jacek Caban : math.h: Add scalbn declaration.
by Alexandre Julliard May 22, 2020

May 22, 2020

Module: wine Branch: master Commit: ff17814d04c109145362748f4b230e7d064a93b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff17814d04c109145362748f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 22 17:16:50 2020 +0200 math.h: Add scalbn declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 83b252ad5f..ee51f28050 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -101,6 +101,9 @@ long __cdecl lrintf(float); long __cdecl lround(double); long __cdecl lroundf(float); +_ACRTIMP double __cdecl scalbn(double,int); +_ACRTIMP float __cdecl scalbnf(float,int); + double __cdecl _copysign (double, double); double __cdecl _chgsign (double); double __cdecl _scalb(double, __msvcrt_long);

1 0

Gijs Vermeulen : ntdll: Fix number of arguments passed to mmap_remove_reserved_area in apple_create_wine_thread.
by Alexandre Julliard May 22, 2020

May 22, 2020

Module: wine Branch: master Commit: 676b6b0fd728fda4b5819ae52d73d169a8c77e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=676b6b0fd728fda4b5819ae5… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 22 18:50:09 2020 +0200 ntdll: Fix number of arguments passed to mmap_remove_reserved_area in apple_create_wine_thread. This fixes a regression introduced by 625209433fa82e233a828329e9e109602f9c0ef0 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index d4480e86f0..a19f0c0149 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1067,7 +1067,7 @@ static void apple_create_wine_thread( void *arg ) if (!pthread_attr_getstacksize( &attr, &info.desired_size ) && mmap_enum_reserved_areas( apple_alloc_thread_stack, &info, 1 )) { - mmap_remove_reserved_area( info.stack, info.desired_size, 0 ); + mmap_remove_reserved_area( info.stack, info.desired_size ); pthread_attr_setstackaddr( &attr, (char*)info.stack + info.desired_size ); } #endif

1 0

Alexandre Julliard : Release 5.9.
by Alexandre Julliard May 22, 2020

May 22, 2020

Module: wine Branch: master Commit: 056c9df854817670dc4fb9c095cba29c99089ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=056c9df854817670dc4fb9c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 20:49:34 2020 +0200 Release 5.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 890 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 6 +- VERSION | 2 +- configure | 18 +- 5 files changed, 469 insertions(+), 448 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=056c9df854817670dc4f…

1 0

Tag wine-5.9 : Alexandre Julliard : Release 5.9
by Alexandre Julliard May 22, 2020

May 22, 2020

Module: wine Branch: refs/tags/wine-5.9 Tag: 101643a8b92702a5dbbe888c040b54d07e09eabe URL: https://source.winehq.org/git/wine.git/?a=tag;h=101643a8b92702a5dbbe888c040… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 20:49:34 2020 +0200 Release 5.9

1 0

Ziqing Hui : windowscodecs/tests: Add tests for DdsDecoder_GetFrame() and DdsFrameDecode_GetSize().
by Alexandre Julliard May 22, 2020

May 22, 2020

Module: wine Branch: master Commit: ff9b2936edfc81e7a4909ee24cdccefcf3a8a69a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff9b2936edfc81e7a4909ee2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri May 22 11:17:31 2020 +0800 windowscodecs/tests: Add tests for DdsDecoder_GetFrame() and DdsFrameDecode_GetSize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 123 ++++++++++++++++++++++++++--------- 1 file changed, 94 insertions(+), 29 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index bc22cc5072..e31ca576fc 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -120,6 +120,21 @@ static BYTE test_dds_array[] = { 0xCC, 0x55, 0xCC, 0x55, 0x0E, 0x84, 0x0E, 0x84, 0x00, 0x00, 0x00, 0x00 }; +static struct test_data { + void *data; + UINT size; + UINT expected_frame_count; + WICDdsParameters expected_parameters; +} test_data[] = { + { test_dds_image, sizeof(test_dds_image), 1, + { 4, 4, 1, 1, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, + { test_dds_mipmaps, sizeof(test_dds_mipmaps), 3, + { 4, 4, 1, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, + { test_dds_volume, sizeof(test_dds_volume), 7, + { 4, 4, 4, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture3D, WICDdsAlphaModePremultiplied } }, + { test_dds_array, sizeof(test_dds_array), 9, + { 4, 4, 1, 3, 3, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown } }, +}; static IWICImagingFactory *factory = NULL; @@ -278,22 +293,6 @@ static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) static void test_dds_decoder_image_parameters(void) { - static struct test_data { - void *data; - UINT size; - UINT expected_frame_count; - WICDdsParameters expected_parameters; - } test_data[] = { - { test_dds_image, sizeof(test_dds_image), 1, - { 4, 4, 1, 1, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, - { test_dds_mipmaps, sizeof(test_dds_mipmaps), 3, - { 4, 4, 1, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, - { test_dds_volume, sizeof(test_dds_volume), 7, - { 4, 4, 4, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture3D, WICDdsAlphaModePremultiplied } }, - { test_dds_array, sizeof(test_dds_array), 9, - { 4, 4, 1, 3, 3, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown } }, - }; - int i; HRESULT hr; WICDdsParameters parameters; @@ -368,28 +367,94 @@ static void test_dds_decoder_image_parameters(void) } } -static void test_dds_decoder(void) +static void test_dds_decoder_frame_size(IWICBitmapDecoder *decoder, IWICBitmapFrameDecode *frame_decode, + UINT frame_count, int i, int frame_index) { HRESULT hr; - IWICStream *stream = NULL; - IWICBitmapDecoder *decoder = NULL; - - stream = create_stream(test_dds_image, sizeof(test_dds_image)); - if (!stream) goto end; + WICDdsParameters params; + IWICDdsDecoder *dds_decoder; + UINT width, height ,expected_width, expected_height, slice_index, depth; - decoder = create_decoder(); - if (!decoder) goto end; + hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (void **)&dds_decoder); + ok(hr == S_OK, "%d: QueryInterface failed, hr=%x\n", i, hr); + if (hr != S_OK) goto end; + hr = IWICDdsDecoder_GetParameters(dds_decoder, &params); + ok (hr == S_OK, "%d: GetParameters failed, hr=%x\n", i, hr); + if (hr != S_OK) goto end; - hr = init_decoder(decoder, stream, S_OK, -1); + hr = IWICBitmapFrameDecode_GetSize(frame_decode, &width, &height); + todo_wine ok (hr == S_OK, "%d: GetSize failed for frame %d, hr=%x\n", i, frame_index, hr); if (hr != S_OK) goto end; + depth = params.Depth; + expected_width = params.Width; + expected_height = params.Height; + slice_index = frame_index % (frame_count / params.ArraySize); + while (slice_index >= depth) + { + if (expected_width > 1) expected_width /= 2; + if (expected_height > 1) expected_height /= 2; + slice_index -= depth; + if (depth > 1) depth /= 2; + } + ok (width == expected_width, "%d: Expected width %d for frame %d, got %d\n", i, expected_width, frame_index, width); + ok (height == expected_height, "%d: Expected height %d for frame %d, got %d\n", i, expected_height, frame_index, height); + +end: + if (dds_decoder) IWICDdsDecoder_Release(dds_decoder); +} + +static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i) +{ + HRESULT hr; + UINT frame_count, j; + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + ok (hr == S_OK, "%d: GetFrameCount failed, hr=%x\n", i, hr); + if (hr != S_OK) return; + + for (j = 0; j < frame_count; j++) + { + IWICBitmapFrameDecode *frame_decode = NULL; + + hr = IWICBitmapDecoder_GetFrame(decoder, j, &frame_decode); + ok (hr == S_OK, "%d: GetFrame failed for frame %d, hr=%x\n", i, j, hr); + if (hr != S_OK) { + IWICBitmapFrameDecode_Release(frame_decode); + continue; + } + + test_dds_decoder_frame_size(decoder, frame_decode, frame_count, i, j); + } +} + +static void test_dds_decoder(void) +{ + int i; + HRESULT hr; + test_dds_decoder_initialize(); - test_dds_decoder_global_properties(decoder); test_dds_decoder_image_parameters(); -end: - if (decoder) IWICBitmapDecoder_Release(decoder); - if (stream) IWICStream_Release(stream); + for (i = 0; i < ARRAY_SIZE(test_data); i++) + { + IWICStream *stream = NULL; + IWICBitmapDecoder *decoder = NULL; + + stream = create_stream(test_data[i].data, test_data[i].size); + if (!stream) goto next; + decoder = create_decoder(); + if (!decoder) goto next; + hr = init_decoder(decoder, stream, S_OK, -1); + if (hr != S_OK) goto next; + + test_dds_decoder_global_properties(decoder); + test_dds_decoder_frame(decoder, i); + + next: + if (decoder) IWICBitmapDecoder_Release(decoder); + if (stream) IWICStream_Release(stream); + } } START_TEST(ddsformat)

1 0

Nikolay Sivov : mf/topology: Remove logic already present in stream resize helper.
by Alexandre Julliard May 22, 2020

May 22, 2020

Module: wine Branch: master Commit: af4d5c96d47169cf4c6782d12004eff945918ac3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af4d5c96d47169cf4c6782d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 17:15:10 2020 +0300 mf/topology: Remove logic already present in stream resize helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 91635fd6b8..432979206b 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1612,15 +1612,7 @@ static HRESULT WINAPI topology_node_SetInputPrefType(IMFTopologyNode *iface, DWO break; default: if (SUCCEEDED(hr = topology_node_reserve_streams(&node->inputs, index))) - { - if (index >= node->inputs.count) - { - memset(&node->inputs.streams[node->inputs.count], 0, - (index - node->inputs.count + 1) * sizeof(*node->inputs.streams)); - node->inputs.count = index + 1; - } topology_node_set_stream_type(&node->inputs.streams[index], mediatype); - } } LeaveCriticalSection(&node->cs);

1 0