February 2020 - Wine-devel - list.winehq.org

[PATCH] gdi32: Handle 0 count in GetCharacterPlacementW.
by Sven Baars 26 Feb '20

26 Feb '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/gdi32/font.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d451f30c3e..8788426a2c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3313,6 +3313,9 @@ GetCharacterPlacementW( TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags); + if (!uCount) + return 0; + if (!lpResults) return GetTextExtentPoint32W(hdc, lpString, uCount, &size) ? MAKELONG(size.cx, size.cy) : 0; -- 2.24.0

4 9

netconnection.c:300：create_netconn_socket: Assertion 'server->addr_len' failed.
by 何文阳 26 Feb '20

26 Feb '20

When running Tencent QQ on Wine, I get this error which caused the program to crash: netconnection.c:300：create_netconn_socket: Assertion 'server->addr_len' failed. It appears that on line 300 of the source file, there was an assertion checking for `server->addr_len` which failed. I suspect this was because of the application misuing the API and filling the struct without setting the `addr_len` field. However, Windows is already full of legacy hacks and it might be sensible to just ignore that field and remove the assertion. I'm just a regular user of Wine and does not really understand the source code yet, but it would be helpful if a Wine developer who has a better understanding of the source code to look at this line and make the modifications. Thanks!

2 1

[tools] testbot/WineRunReconfig: Clarify the email in case of a failed build.
by Francois Gouget 26 Feb '20

26 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 13557c1007..969741f2ee 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -436,9 +436,11 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) { # We should not have badpatch errors and if the result line is missing we # probably already have an error message that explains why. + my $Status = $LogInfo->{Task} eq "missing" ? + "the log contains no status line." : + "the last log status line says $LogInfo->{Task}."; NotifyAdministrator("The ". $VM->Name ." build failed", - "The ". $VM->Name ." build failed:\n\n". - "$LogInfo->{Task}\n\n". + "The ". $VM->Name ." build failed and $Status\n\n". "See the link below for more details:\n". MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); $NewStatus = "badbuild"; -- 2.20.1

1 0

[tools] testbot: Don't overwrite existing patch series parts.
by Francois Gouget 26 Feb '20

26 Feb '20

Assume any new email bearing the same part number is either a reply, or a collision from another series and should thus be ignored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47042 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PendingPatchSets.pm | 46 +++++++++++---------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index adabf2e6c1..cfa6dc0e59 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -243,50 +243,52 @@ sub NewSubmission($$$) my $Parts = $Set->Parts; my $Part = $Parts->GetItem($SubjectInfo->{PartNo}); - if (! defined($Part)) + if ($Part) { - $Part = $Parts->Add(); - $Part->No($SubjectInfo->{PartNo}); + $Patch->Disposition("Existing part reply / collision"); + return undef; } + $Part = $Parts->Add(); + $Part->No($SubjectInfo->{PartNo}); $Part->Patch($Patch); my ($_ErrKey, $_ErrProperty, $ErrMessage) = $self->Save(); if (defined($ErrMessage)) { $Patch->Disposition("Error occurred during series processing"); + return undef; } if (! $Set->CheckSubsetComplete($SubjectInfo->{PartNo})) { $Patch->Disposition("Set not complete yet"); + return undef; } - else + + my $PartNo = $SubjectInfo->{PartNo}; + my $AllPartsAvailable = 1; + while ($PartNo <= $Set->TotalParts && $AllPartsAvailable && + !defined $ErrMessage) { - my $PartNo = $SubjectInfo->{PartNo}; - my $AllPartsAvailable = 1; - while ($PartNo <= $Set->TotalParts && $AllPartsAvailable && - ! defined($ErrMessage)) + my $Part = $Parts->GetItem($PartNo); + if (defined $Part) { - my $Part = $Parts->GetItem($PartNo); - if (defined($Part)) + $ErrMessage = $Set->SubmitSubset($PartNo, $Part->Patch); + if (!defined $ErrMessage) { - $ErrMessage = $Set->SubmitSubset($PartNo, $Part->Patch); - if (!defined $ErrMessage) - { - ($_ErrProperty, $ErrMessage) = $Part->Patch->Save(); - } + ($_ErrProperty, $ErrMessage) = $Part->Patch->Save(); } - else - { - $AllPartsAvailable = !1; - } - $PartNo++; } - if ($AllPartsAvailable && ! defined($ErrMessage)) + else { - $self->DeleteItem($Set); + $AllPartsAvailable = !1; } + $PartNo++; + } + if ($AllPartsAvailable && ! defined($ErrMessage)) + { + $self->DeleteItem($Set); } return $ErrMessage; -- 2.20.1

1 0

[PATCH v2] ws2_32: Fix return values of WSCGetProviderPath() stub
by Aaro Altonen 26 Feb '20

26 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45801 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v2: - Fix test breakage on Windows, error for invalid GUID should be WSAEINVAL --- dlls/ws2_32/socket.c | 17 +++++++++++++---- dlls/ws2_32/tests/sock.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c284f595ab..3beb704c22 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -9006,12 +9006,21 @@ INT WINAPI WSCEnableNSProvider( LPGUID provider, BOOL enable ) */ INT WINAPI WSCGetProviderPath( LPGUID provider, LPWSTR path, LPINT len, LPINT errcode ) { - FIXME( "(%s %p %p %p) Stub!\n", debugstr_guid(provider), path, len, errcode ); + if (!provider || !len) { + if (errcode) + *errcode = WSAEFAULT; + return SOCKET_ERROR; + } - if (!errcode || !provider || !len) return WSAEFAULT; + FIXME("WSCGetProviderPath not implemented.\n"); - *errcode = WSAEINVAL; - return SOCKET_ERROR; + if (*len <= 0) { + if (errcode) + *errcode = WSAEFAULT; + return SOCKET_ERROR; + } + + return 0; } /*********************************************************************** diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 60c5dfc63f..83c758d535 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -84,6 +84,7 @@ static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSET static int (WINAPI *pWSAEnumNameSpaceProvidersA)(LPDWORD,LPWSANAMESPACE_INFOA); static int (WINAPI *pWSAEnumNameSpaceProvidersW)(LPDWORD,LPWSANAMESPACE_INFOW); static int (WINAPI *pWSAPoll)(WSAPOLLFD *,ULONG,INT); +static int (WINAPI *pWSCGetProviderPath)(LPGUID, LPWSTR, LPINT, LPINT); /* Function pointers from iphlpapi */ static DWORD (WINAPI *pGetAdaptersInfo)(PIP_ADAPTER_INFO,PULONG); @@ -1300,6 +1301,7 @@ static void Init (void) pWSAEnumNameSpaceProvidersA = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersA"); pWSAEnumNameSpaceProvidersW = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersW"); pWSAPoll = (void *)GetProcAddress(hws2_32, "WSAPoll"); + pWSCGetProviderPath = (void *)GetProcAddress(hws2_32, "WSCGetProviderPath"); hiphlpapi = LoadLibraryA("iphlpapi.dll"); if (hiphlpapi) @@ -10600,6 +10602,41 @@ static void test_address_list_query(void) closesocket(s); } +static void test_WSCGetProviderPath(void) +{ + GUID ProviderIdIP = { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x00, 0x0, 0x0, 0x0, 0x0, 0x0 } }; + wchar_t buffer[256]; + INT ret, err, len; + + ret = pWSCGetProviderPath(NULL, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + ret = pWSCGetProviderPath(&ProviderIdIP, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + + ret = pWSCGetProviderPath(NULL, NULL, NULL, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); + + ret = pWSCGetProviderPath(&ProviderIdIP, NULL, NULL, &err); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(err == WSAEFAULT, "Got unexpected error %d.\n", err); + + /* WSCGetProviderPath() can be used determine the path length + * "ret" is SOCKET_ERROR and "len" will contain the length */ + err = 0; + ret = pWSCGetProviderPath(&ProviderIdIP, NULL, &len, &err); + todo_wine ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + todo_wine ok(err == WSAEINVAL, "Got unexpected error %d.\n", err); + + /* Valid pointers and length but invalid GUID */ + err = 0; + len = 256; + ret = pWSCGetProviderPath(&ProviderIdIP, buffer, &len, &err); + todo_wine ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + todo_wine ok(err == WSAEINVAL, "Got unexpected error %d.\n", err); +} + static DWORD WINAPI inet_ntoa_thread_proc(void *param) { ULONG addr; @@ -11681,6 +11718,8 @@ START_TEST( sock ) test_completion_port(); test_address_list_query(); + test_WSCGetProviderPath(); + /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); test_synchronous_WSAIoctl(); -- 2.25.1

2 1

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 26 Feb '20

26 Feb '20

1 0

[PATCH v2 1/5] mp3dmod/tests: Test IMediaBuffer reference counting.
by Zebediah Figura 26 Feb '20

26 Feb '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mp3dmod/tests/mp3dmod.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 99d52e6fd77..1d404248cc1 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -40,8 +40,10 @@ static REFERENCE_TIME samplelen(DWORD samples, int rate) return (REFERENCE_TIME) 10000000 * samples / rate; } -struct test_buffer { +struct test_buffer +{ IMediaBuffer IMediaBuffer_iface; + LONG refcount; BYTE data[5000]; DWORD len; DWORD maxlen; @@ -65,12 +67,14 @@ static HRESULT WINAPI Buffer_QueryInterface(IMediaBuffer *iface, REFIID iid, voi static ULONG WINAPI Buffer_AddRef(IMediaBuffer *iface) { - return 2; + struct test_buffer *buffer = impl_from_IMediaBuffer(iface); + return InterlockedIncrement(&buffer->refcount); } static ULONG WINAPI Buffer_Release(IMediaBuffer *iface) { - return 1; + struct test_buffer *buffer = impl_from_IMediaBuffer(iface); + return InterlockedDecrement(&buffer->refcount); } static HRESULT WINAPI Buffer_SetLength(IMediaBuffer *iface, DWORD len) @@ -107,8 +111,8 @@ static IMediaBufferVtbl Buffer_vtbl = { static void test_convert(void) { static const BYTE mp3hdr[] = {0xff,0xfb,0x14,0xc4}; - struct test_buffer outbuf = {{&Buffer_vtbl}}; - struct test_buffer inbuf = {{&Buffer_vtbl}}; + struct test_buffer outbuf = {.IMediaBuffer_iface = {&Buffer_vtbl}, .refcount = 1}; + struct test_buffer inbuf = {.IMediaBuffer_iface = {&Buffer_vtbl}, .refcount = 1}; DMO_MEDIA_TYPE in = {{0}}, out = {{0}}; MPEGLAYER3WAVEFORMAT mp3fmt = {{0}}; DMO_OUTPUT_DATA_BUFFER output; @@ -169,6 +173,7 @@ static void test_convert(void) inbuf.len = 96 * 5; hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == S_OK, "got %#x\n", hr); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); @@ -194,6 +199,8 @@ static void test_convert(void) ok(output.rtTimestamp == 0, "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(written, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr); @@ -205,6 +212,8 @@ static void test_convert(void) hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); /* write the rest */ outbuf.len = 0; @@ -219,6 +228,8 @@ static void test_convert(void) "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(outbuf.len, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr); @@ -228,6 +239,8 @@ static void test_convert(void) ok(hr == S_OK, "got %#x\n", hr); IMediaObject_Release(dmo); + todo_wine ok(inbuf.refcount == 1, "Got outstanding refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got outstanding refcount %d.\n", outbuf.refcount); } static const GUID IID_test_outer = {0xdeadbeef,0,0,{0,0,0,0,0,0,0,0x66}}; -- 2.25.0

1 4

[PATCH v3 1/3] amstream: Implement AMAudioStream::GetFormat.
by Zebediah Figura 26 Feb '20

26 Feb '20

From: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: Resent with stylistic changes. dlls/amstream/audiostream.c | 21 +++-- dlls/amstream/tests/Makefile.in | 2 +- dlls/amstream/tests/amstream.c | 155 ++++++++++++++++++++++++++++++-- 3 files changed, 166 insertions(+), 12 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 2875e1f59b7..544f70a75cd 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -495,17 +495,28 @@ static HRESULT WINAPI audio_IAudioMediaStream_SendEndOfStream(IAudioMediaStream } /*** IAudioMediaStream methods ***/ -static HRESULT WINAPI audio_IAudioMediaStream_GetFormat(IAudioMediaStream *iface, WAVEFORMATEX *wave_format_current) +static HRESULT WINAPI audio_IAudioMediaStream_GetFormat(IAudioMediaStream *iface, WAVEFORMATEX *format) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format_current); + TRACE("stream %p, format %p.\n", stream, format); - if (!wave_format_current) + if (!format) return E_POINTER; - return MS_E_NOSTREAM; + EnterCriticalSection(&stream->cs); + if (!stream->peer) + { + LeaveCriticalSection(&stream->cs); + return MS_E_NOSTREAM; + } + + *format = *(WAVEFORMATEX *)stream->mt.pbFormat; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI audio_IAudioMediaStream_SetFormat(IAudioMediaStream *iface, const WAVEFORMATEX *wave_format) diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in index 3a1a269feae..81eaed3c152 100644 --- a/dlls/amstream/tests/Makefile.in +++ b/dlls/amstream/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = amstream.dll -IMPORTS = strmiids uuid ddraw ole32 user32 +IMPORTS = strmbase strmiids uuid ddraw ole32 user32 C_SRCS = \ amstream.c diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6497dde91c3..743dbb99cc0 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -27,6 +27,7 @@ #include "ks.h" #include "initguid.h" #include "ksmedia.h" +#include "wine/strmbase.h" static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; static const WCHAR primary_audio_sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -987,16 +988,10 @@ static void test_media_streams(void) if (SUCCEEDED(hr)) { IAudioData* audio_data = NULL; - WAVEFORMATEX format; hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); - hr = IAudioMediaStream_GetFormat(audio_media_stream, NULL); - ok(hr == E_POINTER, "IAudioMediaStream_GetFormat returned: %x\n", hr); - hr = IAudioMediaStream_GetFormat(audio_media_stream, &format); - ok(hr == MS_E_NOSTREAM, "IAudioMediaStream_GetFormat returned: %x\n", hr); - hr = IAudioMediaStream_CreateSample(audio_media_stream, NULL, 0, &audio_sample); ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample); @@ -2293,6 +2288,152 @@ out_unknown: IUnknown_Release(unknown); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; +}; + +static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_BaseFilter(iface); + if (!index) + return &filter->source.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_BaseFilter(iface); + strmbase_source_cleanup(&filter->source); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + return S_OK; +} + +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) +{ + return S_OK; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .base.pin_query_accept = testsource_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); +} + +static void test_audiostream_get_format(void) +{ + static const WAVEFORMATEX pin_format = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 2, + .nSamplesPerSec = 44100, + .wBitsPerSample = 16, + .nBlockAlign = 4, + .nAvgBytesPerSec = 4 * 44100, + }; + AM_MEDIA_TYPE mt = + { + .majortype = MEDIATYPE_Audio, + .subtype = MEDIASUBTYPE_PCM, + .formattype = FORMAT_WaveFormatEx, + .cbFormat = sizeof(WAVEFORMATEX), + .pbFormat = (BYTE *)&pin_format, + }; + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IAudioMediaStream *audio_stream; + struct testfilter source; + IGraphBuilder *graph; + IMediaStream *stream; + WAVEFORMATEX format; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_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 = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + + testfilter_init(&source); + + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, &format); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&format, 0xcc, sizeof(format)); + hr = IAudioMediaStream_GetFormat(audio_stream, &format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(format.wFormatTag == WAVE_FORMAT_PCM, "Got tag %#x.\n", format.wFormatTag); + ok(format.nChannels == 2, "Got %u channels.\n", format.nChannels); + ok(format.nSamplesPerSec == 44100, "Got sample rate %u.\n", format.nSamplesPerSec); + ok(format.nAvgBytesPerSec == 176400, "Got %u bytes/sec.\n", format.nAvgBytesPerSec); + ok(format.nBlockAlign == 4, "Got alignment %u.\n", format.nBlockAlign); + ok(format.wBitsPerSample == 16, "Got %u bits/sample.\n", format.wBitsPerSample); + ok(!format.cbSize, "Got extra size %u.\n", format.cbSize); + + hr = IGraphBuilder_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, &format); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IAudioMediaStream_Release(audio_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { HANDLE file; @@ -2326,5 +2467,7 @@ START_TEST(amstream) test_audiodata_get_format(); test_audiodata_set_format(); + test_audiostream_get_format(); + CoUninitialize(); } -- 2.25.0

1 2

[PATCH 2/2] shell32: Make SHChangeNotify() dwItenN checks stricter
by Serge Gautherie 26 Feb '20

26 Feb '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/shell32/changenotify.c | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 6c77a6c..6f2cf46 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -280,31 +280,47 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID if(uFlags & ~(SHCNF_TYPE|SHCNF_FLUSH)) FIXME("ignoring unsupported flags: %x\n", uFlags); + /* FIXME: Either set to NULL or return, not both */ if( ( wEventId & SHCNE_NOITEMEVENTS ) && ( dwItem1 || dwItem2 ) ) { - TRACE("dwItem1 and dwItem2 are not zero, but should be\n"); - dwItem1 = 0; - dwItem2 = 0; + WARN("dwItem1 and/or dwItem2 are not NULL, but should be\n"); + dwItem1 = NULL; + dwItem2 = NULL; return; } else if( ( wEventId & SHCNE_ONEITEMEVENTS ) && dwItem2 ) { - TRACE("dwItem2 is not zero, but should be\n"); - dwItem2 = 0; + WARN("dwItem2 is not NULL, but should be\n"); + dwItem2 = NULL; + return; + } + else if ((wEventId & SHCNE_SECONDITEMEVENTS) && dwItem1) + { + WARN("dwItem1 is not NULL, but should be\n"); + dwItem1 = NULL; + return; + } + else if (!dwItem1 || !dwItem2) + { + WARN("dwItem1 and/or dwItem2 are NULL, but should not be\n"); return; } - if( ( ( wEventId & SHCNE_NOITEMEVENTS ) && - ( wEventId & ~SHCNE_NOITEMEVENTS ) ) || - ( ( wEventId & SHCNE_ONEITEMEVENTS ) && - ( wEventId & ~SHCNE_ONEITEMEVENTS ) ) || - ( ( wEventId & SHCNE_TWOITEMEVENTS ) && - ( wEventId & ~SHCNE_TWOITEMEVENTS ) ) ) + if (((wEventId & SHCNE_NOITEMEVENTS ) && (wEventId & ~SHCNE_NOITEMEVENTS )) || + ((wEventId & SHCNE_ONEITEMEVENTS ) && (wEventId & ~SHCNE_ONEITEMEVENTS )) || + ((wEventId & SHCNE_SECONDITEMEVENTS) && (wEventId & ~SHCNE_SECONDITEMEVENTS)) || + ((wEventId & SHCNE_TWOITEMEVENTS ) && (wEventId & ~SHCNE_TWOITEMEVENTS ))) { WARN("mutually incompatible events listed\n"); return; } + if ((wEventId & SHCNE_SECONDITEMEVENTS)) + { + FIXME("SHChangeNotify with (wEventId & SHCNE_SECONDITEMEVENTS)\n"); + return; + } + /* convert paths in IDLists*/ switch (uFlags & SHCNF_TYPE) { @@ -351,6 +367,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID notify = TRUE; else if( wEventId & ( SHCNE_ONEITEMEVENTS | SHCNE_TWOITEMEVENTS ) ) notify = should_notify( Pidls[0], pidl, subtree ); + /* FIXME: Following if() is masked by previous one */ else if( wEventId & SHCNE_TWOITEMEVENTS ) notify = should_notify( Pidls[1], pidl, subtree ); } -- 2.10.0.windows.1

2 1

[PATCH 1/5] mp3dmod/tests: Test IMediaBuffer reference counting.
by Zebediah Figura 26 Feb '20

26 Feb '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mp3dmod/tests/mp3dmod.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 99d52e6fd77..1d404248cc1 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -40,8 +40,10 @@ static REFERENCE_TIME samplelen(DWORD samples, int rate) return (REFERENCE_TIME) 10000000 * samples / rate; } -struct test_buffer { +struct test_buffer +{ IMediaBuffer IMediaBuffer_iface; + LONG refcount; BYTE data[5000]; DWORD len; DWORD maxlen; @@ -65,12 +67,14 @@ static HRESULT WINAPI Buffer_QueryInterface(IMediaBuffer *iface, REFIID iid, voi static ULONG WINAPI Buffer_AddRef(IMediaBuffer *iface) { - return 2; + struct test_buffer *buffer = impl_from_IMediaBuffer(iface); + return InterlockedIncrement(&buffer->refcount); } static ULONG WINAPI Buffer_Release(IMediaBuffer *iface) { - return 1; + struct test_buffer *buffer = impl_from_IMediaBuffer(iface); + return InterlockedDecrement(&buffer->refcount); } static HRESULT WINAPI Buffer_SetLength(IMediaBuffer *iface, DWORD len) @@ -107,8 +111,8 @@ static IMediaBufferVtbl Buffer_vtbl = { static void test_convert(void) { static const BYTE mp3hdr[] = {0xff,0xfb,0x14,0xc4}; - struct test_buffer outbuf = {{&Buffer_vtbl}}; - struct test_buffer inbuf = {{&Buffer_vtbl}}; + struct test_buffer outbuf = {.IMediaBuffer_iface = {&Buffer_vtbl}, .refcount = 1}; + struct test_buffer inbuf = {.IMediaBuffer_iface = {&Buffer_vtbl}, .refcount = 1}; DMO_MEDIA_TYPE in = {{0}}, out = {{0}}; MPEGLAYER3WAVEFORMAT mp3fmt = {{0}}; DMO_OUTPUT_DATA_BUFFER output; @@ -169,6 +173,7 @@ static void test_convert(void) inbuf.len = 96 * 5; hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == S_OK, "got %#x\n", hr); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); @@ -194,6 +199,8 @@ static void test_convert(void) ok(output.rtTimestamp == 0, "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(written, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr); @@ -205,6 +212,8 @@ static void test_convert(void) hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); /* write the rest */ outbuf.len = 0; @@ -219,6 +228,8 @@ static void test_convert(void) "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(outbuf.len, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr); @@ -228,6 +239,8 @@ static void test_convert(void) ok(hr == S_OK, "got %#x\n", hr); IMediaObject_Release(dmo); + todo_wine ok(inbuf.refcount == 1, "Got outstanding refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got outstanding refcount %d.\n", outbuf.refcount); } static const GUID IID_test_outer = {0xdeadbeef,0,0,{0,0,0,0,0,0,0,0x66}}; -- 2.25.0

2 5