September 2019 - Wine-Devel

[PATCH] testbot/SetWinLocale: Don't delete the Windows commands in debug mode.
by Francois Gouget Sept. 2, 2019

Sept. 2, 2019

This makes it possible to analyze or re-run them manually. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/SetWinLocale | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index a6015635..76f2edbf 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -807,8 +807,15 @@ if (!$DryRun) FatalError("could not run intl.cpl: ", $TA->GetLastError(), "\n"); } - $TA->Rm("script.bat"); - $TA->Rm("locales.xml"); + if ($Debug) + { + print STDERR "Not deleting script.bat and locales.xml\n"; + } + else + { + $TA->Rm("script.bat"); + $TA->Rm("locales.xml"); + } } if ($OptReboot) -- 2.20.1

1 0

[PATCH] testbot/WineReconfig: Only build testagentd and TestLauncher if given --build.
by Francois Gouget Sept. 2, 2019

Sept. 2, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/WineReconfig.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 4bd939aa..6d7f3b41 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -252,8 +252,8 @@ if ($DataDir =~ /'/) # Run the builds and/or tests # -exit(1) if (!BuildNativeTestAgentd()); -exit(1) if (!BuildTestLauncher()); +exit(1) if ($OptBuild and !BuildNativeTestAgentd()); +exit(1) if ($OptBuild and !BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptAddOns and !UpdateAddOns()); exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm)); -- 2.20.1

1 0

[PATCH] testbot/TestLauncher: Fix a couple of GNU make dependencies.
by Francois Gouget Sept. 2, 2019

Sept. 2, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index 6b41e018..b040353d 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -9,7 +9,7 @@ CROSSZIPEXE = upx-ucl all: TestLauncher32.exe TestLauncher64.exe TestLauncher32.exe: TestLauncher.c - $(CROSSCC32) -Wall -o $@ $< + $(CROSSCC32) -Wall -o $@ TestLauncher.c $(CROSSSTRIP32) $@ if which $(CROSSZIPEXE); \ then \ @@ -17,7 +17,7 @@ TestLauncher32.exe: TestLauncher.c fi TestLauncher64.exe: TestLauncher.c - $(CROSSCC64) -Wall -o $@ $< + $(CROSSCC64) -Wall -o $@ TestLauncher.c $(CROSSSTRIP64) $@ if which $(CROSSZIPEXE); \ then \ -- 2.20.1

1 0

[PATCH] testbot/testagentd: Fix a couple of GNU make dependencies.
by Francois Gouget Sept. 2, 2019

Sept. 2, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/testagentd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 4f16f9c6..b2f9e82a 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -9,7 +9,7 @@ windows: TestAgentd.exe $(builddir)/testagentd: testagentd.o platform_unix.o - $(CC) -o $@ $^ + $(CC) -o $@ testagentd.o platform_unix.o strip $@ .c.o: @@ -17,7 +17,7 @@ $(builddir)/testagentd: testagentd.o platform_unix.o TestAgentd.exe: testagentd.obj platform_windows.obj - $(CROSSCC32) -o $@ $^ -lws2_32 + $(CROSSCC32) -o $@ testagentd.obj platform_windows.obj -lws2_32 $(CROSSSTRIP32) $@ .SUFFIXES: .obj -- 2.20.1

1 0

[PATCH 1/4] amstream/tests: Add more tests for media types.
by Zebediah Figura Sept. 2, 2019

Sept. 2, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/tests/amstream.c | 175 ++++++++++++++++++++++++++++----- 1 file changed, 151 insertions(+), 24 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 000bb40537f..75862e70910 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1039,34 +1039,10 @@ static void test_media_streams(void) ok(nb_pins == expected_nb_pins, "Number of pins is %u instead of %u\n", nb_pins, expected_nb_pins); for (i = 0; i < min(nb_pins, expected_nb_pins); i++) { - IEnumMediaTypes* enum_media_types; - AM_MEDIA_TYPE* media_types[10]; - ULONG nb_media_types; IPin* pin; - PIN_INFO info; - WCHAR id[40]; - - /* Pin name is "I{guid MSPID_PrimaryVideo or MSPID_PrimaryAudio}" */ - id[0] = 'I'; - StringFromGUID2(i ? &MSPID_PrimaryAudio : &MSPID_PrimaryVideo, id + 1, 39); hr = IPin_ConnectedTo(pins[i], &pin); ok(hr == VFW_E_NOT_CONNECTED, "IPin_ConnectedTo returned: %x\n", hr); - hr = IPin_QueryPinInfo(pins[i], &info); - ok(hr == S_OK, "IPin_QueryPinInfo returned: %x\n", hr); - IBaseFilter_Release(info.pFilter); - ok(info.dir == PINDIR_INPUT, "Pin direction is %u instead of %u\n", info.dir, PINDIR_INPUT); - ok(!lstrcmpW(info.achName, id), "Pin name is %s instead of %s\n", wine_dbgstr_w(info.achName), wine_dbgstr_w(id)); - hr = IPin_EnumMediaTypes(pins[i], &enum_media_types); - ok(hr == S_OK, "IPin_EnumMediaTypes returned: %x\n", hr); - hr = IEnumMediaTypes_Next(enum_media_types, ARRAY_SIZE(media_types), media_types, &nb_media_types); - ok(SUCCEEDED(hr), "IEnumMediaTypes_Next returned: %x\n", hr); - ok(nb_media_types > 0, "nb_media_types should be >0\n"); - IEnumMediaTypes_Release(enum_media_types); - hr = IMediaStream_QueryInterface(i ? audio_stream : video_stream, &IID_IPin, (void **)&pin); - ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); - ok(pin == pins[i], "Pin is %p instead of %p\n", pins[i], pin); - IPin_Release(pin); IPin_Release(pins[i]); } IEnumPins_Release(enum_pins); @@ -1780,6 +1756,156 @@ static void test_enum_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_media_types(void) +{ + static const VIDEOINFOHEADER req_vih = {}; + static const WAVEFORMATEX expect_wfx = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 11025, + .nAvgBytesPerSec = 11025 * 2, + .nBlockAlign = 2, + .wBitsPerSample = 16, + .cbSize = 0, + }; + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IEnumMediaTypes *enummt; + IMediaStream *stream; + AM_MEDIA_TYPE *pmt; + ULONG ref, count; + unsigned int i; + HRESULT hr; + IPin *pin; + + static const GUID *rejected_subtypes[] = + { + &MEDIASUBTYPE_RGB1, + &MEDIASUBTYPE_RGB4, + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB555, + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + &MEDIASUBTYPE_ARGB32, + &MEDIASUBTYPE_ARGB1555, + &MEDIASUBTYPE_ARGB4444, + &GUID_NULL, + }; + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + todo_wine ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB8), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + todo_wine ok(pmt->lSampleSize == 10000, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &GUID_NULL), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + pmt->formattype = FORMAT_VideoInfo; + pmt->cbFormat = sizeof(VIDEOINFOHEADER); + pmt->pbFormat = (BYTE *)&req_vih; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = FALSE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = MEDIATYPE_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Audio; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Stream; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Video; + + for (i = 0; i < ARRAY_SIZE(rejected_subtypes); ++i) + { + pmt->subtype = *rejected_subtypes[i]; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x for subtype %s.\n", + hr, wine_dbgstr_guid(rejected_subtypes[i])); + } + + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + IMediaStream_Release(stream); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + ok(count == 1, "Got count %u.\n", count); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + todo_wine ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + todo_wine ok(pmt->lSampleSize == 2, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); + ok(!memcmp(pmt->pbFormat, &expect_wfx, sizeof(WAVEFORMATEX)), "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + } + + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + IMediaStream_Release(stream); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_IDirectDrawStreamSample(void) { DDSURFACEDESC desc = { sizeof(desc) }; @@ -2158,6 +2284,7 @@ START_TEST(amstream) test_pin_info(); test_initialize(); test_enum_media_types(); + test_media_types(); test_IDirectDrawStreamSample(); file = CreateFileW(filenameW, 0, 0, NULL, OPEN_EXISTING, 0, NULL); -- 2.22.0

1 3

[PATCH] wininet/tests: Remove LPVOID argument.
by Andrey Gusev Sept. 2, 2019

Sept. 2, 2019

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6db33e4033..cb96abe612 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5524,7 +5524,7 @@ static void test_http_connection(void) si.hEvent = CreateEventW(NULL, 0, 0, NULL); si.port = 7531; - hThread = CreateThread(NULL, 0, server_thread, (LPVOID) &si, 0, &id); + hThread = CreateThread(NULL, 0, server_thread, &si, 0, &id); ok( hThread != NULL, "create thread failed\n"); r = WaitForSingleObject(si.hEvent, 10000); -- 2.21.0

2 1

[PATCH] quartz: Don't cast from COM object to interface
by Michael Stefaniuc Sept. 2, 2019

Sept. 2, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- The second cast should go too but that requires exposing struct QualityControlImpl in include/wine/strmbase.h . dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 6451f85b5a..3478f95f51 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -394,7 +394,7 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam q.Proportion = 1000; q.Late = jitter; q.TimeStamp = tStart; - IQualityControl_Notify((IQualityControl *)This->renderer.qcimpl, (IBaseFilter*)This, q); + IQualityControl_Notify((IQualityControl *)This->renderer.qcimpl, &This->renderer.filter.IBaseFilter_iface, q); } return hr; } -- 2.20.1

2 1

[PATCH 5/5 v2] msvcrt: Match broken multi-byte character with everything in _mbsspn.
by Piotr Caban Sept. 2, 2019

Sept. 2, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/mbcs.c | 3 +++ dlls/msvcrt/tests/string.c | 3 +++ dlls/ucrtbase/tests/string.c | 41 ++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+)

1 0

[PATCH 4/5 v2] msvcrt: Reimplement _mbsspnp using _mbsspn.
by Piotr Caban Sept. 2, 2019

Sept. 2, 2019

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47693 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/mbcs.c | 47 ++++++++++++-------------------------- dlls/msvcrt/tests/string.c | 4 ++-- 2 files changed, 17 insertions(+), 34 deletions(-)

1 0

[PATCH 3/5 v2] msvcrt: Fix _mbsspn implementation.
by Piotr Caban Sept. 2, 2019

Sept. 2, 2019

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/mbcs.c | 24 ++++++++---------------- dlls/msvcrt/tests/string.c | 4 ++-- 2 files changed, 10 insertions(+), 18 deletions(-)

1 0