May 2021 - Wine-devel - list.winehq.org

[PATCH 1/5] server: Avoid calling get_unix_fd() in IOCTL_AFD_CREATE.
by Zebediah Figura 08 May '21

08 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 36fda31f9c1..24a826e4ce5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1087,7 +1087,6 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u return -1; } sock_reselect( sock ); - clear_error(); return 0; } @@ -1354,7 +1353,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) assert( sock->obj.ops == &sock_ops ); - if (get_unix_fd( fd ) == -1 && code != IOCTL_AFD_CREATE) return 0; + if (code != IOCTL_AFD_CREATE && get_unix_fd( fd ) < 0) return 0; switch(code) { -- 2.30.2

2 7

[PATCH] winnt.h: Fix MSVC variants of InterlockedIncrement16 and InterlockedDecrement16.
by Jacek Caban 07 May '21

07 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- FWIW, depending on distro, building in this mode may be as easy as adding CROSSCC=clang to configure. include/winnt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 11

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 07 May '21

07 May '21

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/po/fi.po b/po/fi.po index 84cc113116a..5d6e85d91c1 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3964,10 +3964,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kirjoitussuojattua ominaisuutta '|' ei voi muokata" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[objekti]' ei ole päivämääräobjekti" +msgstr "'this' ei ole Map-objekti" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -14653,10 +14651,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: Järjestelmäavain [%1] ei kelpaa\n" +msgstr "reg: Järjestelmäavain ei kelpaa\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -14687,10 +14683,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:180 -#, fuzzy -#| msgid "reg: Unable to find the specified registry key\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: Annettua rekisteriavainta ei löydy\n" +msgstr "reg: Annetun rekisteriavaimen käyttö tai luonti ei onnistu\n" #: programs/regedit/regedit.rc:34 msgid "&Registry" -- 2.31.1

1 0

[PATCH] user32/tests: Remove the Cygwin/XFree86 checks.
by Francois Gouget 07 May '21

07 May '21

They are very old and likely no longer relevant. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/sysparams.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d49d69989f6..8fab62c951e 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -821,13 +821,6 @@ static void test_SPI_SETBORDER( void ) /* 6 */ "Control Panel\\Desktop\\WindowMetrics","CaptionWidth", dpi); ncmsave.iCaptionWidth = CaptionWidth; - /* These tests hang when XFree86 4.0 for Windows is running (tested on - * WinNT, SP2, Cygwin/XFree 4.1.0. Skip the test when XFree86 is - * running. - */ - if (FindWindowA( NULL, "Cygwin/XFree86" )) - return; - trace("testing SPI_{GET,SET}BORDER\n"); SetLastError(0xdeadbeef); @@ -1127,13 +1120,6 @@ static void test_SPI_SETICONTITLEWRAP( void ) /* 26 */ unsigned int i; ICONMETRICSA im; - /* These tests hang when XFree86 4.0 for Windows is running (tested on - * WinNT, SP2, Cygwin/XFree 4.1.0. Skip the test when XFree86 is - * running. - */ - if (FindWindowA( NULL, "Cygwin/XFree86" )) - return; - trace("testing SPI_{GET,SET}ICONTITLEWRAP\n"); SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETICONTITLEWRAP, 0, &old_b, 0 ); -- 2.20.1

2 1

[PATCH] winegstreamer: Avoid truncating the stream when duration is incorrect.
by Anton Baskanov 07 May '21

07 May '21

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- This should fix the Fallout: New Vegas audio looping bug and probably some other games that use mp3 soundtracks. BTW, is it a good idea to submit such workarounds, or is it better to leave it broken until a proper fix is found? Another alternative would be to simply revert commit d7fecebe93938bf1ef2349ac74413e28d6b8e153. --- dlls/winegstreamer/quartz_parser.c | 10 +++++++++- dlls/winegstreamer/wg_parser.c | 6 +++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index e12a0c49eb3..f9260fd72a2 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -863,6 +863,7 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) struct parser *filter = impl_from_strmbase_filter(iface); DWORD stop_flags = AM_SEEKING_NoPositioning; const SourceSeeking *seeking; + uint64_t stop_pos = ((uint64_t)0x80000000) << 32; unsigned int i; if (!filter->sink_connected) @@ -877,8 +878,15 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) seeking = &filter->sources[0]->seek; if (seeking->llStop) stop_flags = AM_SEEKING_AbsolutePositioning; + + /* Stream duration is determined incorrectly for some formats (e.g. mp3). + * Until this is fixed, setting stop position to infinity instead of + * seeking->llDuration helps avoid truncating the stream. */ + if (seeking->llStop != seeking->llDuration) + stop_pos = seeking->llStop; + unix_funcs->wg_parser_stream_seek(filter->sources[0]->wg_stream, seeking->dRate, - seeking->llCurrent, seeking->llStop, AM_SEEKING_AbsolutePositioning, stop_flags); + seeking->llCurrent, stop_pos, AM_SEEKING_AbsolutePositioning, stop_flags); for (i = 0; i < filter->source_count; ++i) { diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5529321490e..096a20b4496 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -673,6 +673,7 @@ static bool CDECL wg_parser_stream_seek(struct wg_parser_stream *stream, double uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags) { GstSeekType start_type = GST_SEEK_TYPE_SET, stop_type = GST_SEEK_TYPE_SET; + gint64 gst_stop_pos = -1; GstSeekFlags flags = 0; if (start_flags & AM_SEEKING_SeekToKeyFrame) @@ -687,8 +688,11 @@ static bool CDECL wg_parser_stream_seek(struct wg_parser_stream *stream, double if ((stop_flags & AM_SEEKING_PositioningBitsMask) == AM_SEEKING_NoPositioning) stop_type = GST_SEEK_TYPE_NONE; + if (stop_pos != (((uint64_t)0x80000000) << 32)) + gst_stop_pos = stop_pos * 100; + return gst_pad_push_event(stream->my_sink, gst_event_new_seek(rate, - GST_FORMAT_TIME, flags, start_type, start_pos * 100, stop_type, stop_pos * 100)); + GST_FORMAT_TIME, flags, start_type, start_pos * 100, stop_type, gst_stop_pos)); } static void CDECL wg_parser_stream_notify_qos(struct wg_parser_stream *stream, -- 2.25.1

2 1

[PATCH] kernel32/tests: Add syscall context handling tests.
by Jacek Caban 07 May '21

07 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 177 +++++++++++++++++++++++++++++++-- 1 file changed, 171 insertions(+), 6 deletions(-)

2 1

[PATCH] winebuild: Use clang -print-prog-name to find LLVM tools.
by Jacek Caban 07 May '21

07 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winebuild/utils.c | 78 +++++++++++++++++++++++++++++++++++------ 1 file changed, 68 insertions(+), 10 deletions(-)

1 0

[PATCH] user32/tests: Add a skip when detecting a Cygwin/XFree86 window.
by Francois Gouget 07 May '21

07 May '21

The report should show that some tests were skipped and why. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Or maybe these checks should be removed entirely since they date back to 2002 and Cygwin/XFree86 may be better behaved nowadays. --- dlls/user32/tests/sysparams.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d49d69989f6..2eedf1f629b 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -826,7 +826,10 @@ static void test_SPI_SETBORDER( void ) /* 6 */ * running. */ if (FindWindowA( NULL, "Cygwin/XFree86" )) + { + win_skip("skipping due to Cygwin/XFree86\n"); return; + } trace("testing SPI_{GET,SET}BORDER\n"); @@ -1132,7 +1135,10 @@ static void test_SPI_SETICONTITLEWRAP( void ) /* 26 */ * running. */ if (FindWindowA( NULL, "Cygwin/XFree86" )) + { + win_skip("skipping due to Cygwin/XFree86\n"); return; + } trace("testing SPI_{GET,SET}ICONTITLEWRAP\n"); SetLastError(0xdeadbeef); -- 2.20.1

3 2

[PATCH] winegstreamer: Ensure that the source reports both PCM and floating point audio formats.
by Giovanni Mascellani 07 May '21

07 May '21

From: Derek Lesho <dlesho(a)codeweavers.com> The patch is originally by Derek Lesho, with some changes by Giovanni Mascellani. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index eb5b9e366ec..d7dcd252a84 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -806,6 +806,48 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) goto done; } } + else if (format.major_type == WG_MAJOR_TYPE_AUDIO) + { + /* Expose at least one PCM and one floating point type for the + source reader to pick from. */ + stream_types = malloc( sizeof(IMFMediaType *) * 2 ); + + stream_types[0] = mf_media_type_from_wg_format(&format); + if (stream_types[0]) + { + GUID base_subtype; + UINT32 sample_rate, channel_count, channel_mask; + + IMFMediaType_GetGUID(stream_types[0], &MF_MT_SUBTYPE, &base_subtype); + IMFMediaType_GetUINT32(stream_types[0], &MF_MT_AUDIO_SAMPLES_PER_SECOND, &sample_rate); + IMFMediaType_GetUINT32(stream_types[0], &MF_MT_AUDIO_NUM_CHANNELS, &channel_count); + IMFMediaType_GetUINT32(stream_types[0], &MF_MT_AUDIO_CHANNEL_MASK, &channel_mask); + + MFCreateMediaType(&stream_types[1]); + IMFMediaType_SetGUID(stream_types[1], &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_AUDIO_SAMPLES_PER_SECOND, sample_rate); + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_AUDIO_NUM_CHANNELS, channel_count); + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_AUDIO_CHANNEL_MASK, channel_mask); + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + + if (IsEqualGUID(&base_subtype, &MFAudioFormat_Float)) + { + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_AUDIO_BITS_PER_SAMPLE, 16); + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_AUDIO_BLOCK_ALIGNMENT, channel_count * 16 / 8); + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, sample_rate * channel_count * 16 / 8); + IMFMediaType_SetGUID(stream_types[1], &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + } + else + { + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_AUDIO_BITS_PER_SAMPLE, 32); + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_AUDIO_BLOCK_ALIGNMENT, channel_count * 32 / 8); + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, sample_rate * channel_count * 32 / 8); + IMFMediaType_SetGUID(stream_types[1], &MF_MT_SUBTYPE, &MFAudioFormat_Float); + } + + type_count = 2; + } + } else { stream_type = mf_media_type_from_wg_format(&format); -- 2.31.1

2 1

[PATCH v2] urlmon/tests: Check that .Net is present in the user-agent string.
by Francois Gouget 07 May '21

07 May '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Takes the Windows 7 user-agent strings into account. Trace the user-agent with WINETEST_DEBUG=2. --- dlls/urlmon/tests/misc.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 2b3df65d5fc..a55937b0250 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1529,6 +1529,8 @@ static void test_user_agent(void) if(i < 8 && i != 1) ok(!strcmp(ua, str2), "unexpected UA for version %u %s, expected %s\n", i, wine_dbgstr_a(ua), wine_dbgstr_a(str2)); + if (winetest_debug > 1) + trace("version=%u user-agent=%s\n", i, wine_dbgstr_a(ua)); p += check_prefix(p, "Mozilla/"); p += check_prefix(p, i < 9 ? "4.0 (" : "5.0 ("); @@ -1544,6 +1546,7 @@ static void test_user_agent(void) }else if(sizeof(void*) == 8) { p += check_prefix(p, "Win64; "); #ifdef __x86_64__ + todo_wine p += check_prefix(p, "x64; "); #endif } @@ -1559,12 +1562,17 @@ static void test_user_agent(void) } if(i == 11) { p += check_prefix(p, "; rv:11.0) like Gecko"); + }else if (i >= 9) { + p += check_prefix(p, ")"); }else { - if(i != 1) - ok(*p == ';' || *p == ')', "unexpected suffix %s for version %u\n", - wine_dbgstr_a(p), i); - if(i < 9) - p = strchr(p, ')'); +#ifdef __x86_64__ + todo_wine +#endif + /* This assumes that either p points at some property before + * '; .NET', or that there is more than one such occurence. + */ + ok(strstr(p, "; .NET"), "no '; .NET' in %s\n", wine_dbgstr_a(p)); + p = strchr(p, ')'); p += check_prefix(p, ")"); } -- 2.20.1

2 1