September 2019 - Wine-Commits

Alex Henrie : iphlpapi: Implement ParseNetworkString for IPv4 addresses and services.
by Alexandre Julliard Sept. 5, 2019

Sept. 5, 2019

Module: wine Branch: master Commit: faf354cd45e23f6cb8f82dee3fdf340647299b5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=faf354cd45e23f6cb8f82dee… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 4 23:14:15 2019 -0600 iphlpapi: Implement ParseNetworkString for IPv4 addresses and services. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45560 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index abc7152..c5857f2 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -243,7 +243,7 @@ @ stdcall NotifyUnicastIpAddressChange(long ptr ptr long ptr) #@ stub NTPTimeToNTFileTime #@ stub NTTimeToNTPTime -#@ stub ParseNetworkString +@ stdcall ParseNetworkString(wstr long ptr ptr ptr) @ stub _PfAddFiltersToInterface(a)24 @ stub _PfAddGlobalFilterToInterface(a)8 @ stdcall _PfBindInterfaceToIPAddress(a)12(long long ptr) PfBindInterfaceToIPAddress diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f1aa0d1..1f823b4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -46,6 +46,7 @@ #include "winsock2.h" #include "winternl.h" #include "ws2ipdef.h" +#include "windns.h" #include "iphlpapi.h" #include "ifenum.h" #include "ipstats.h" @@ -54,6 +55,7 @@ #include "ifdef.h" #include "netioapi.h" #include "tcpestats.h" +#include "ip2string.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -3333,3 +3335,62 @@ DWORD WINAPI GetBestRoute2(NET_LUID *luid, NET_IFINDEX index, return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * ParseNetworkString (IPHLPAPI.@) + */ +DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type, + NET_ADDRESS_INFO *info, USHORT *port, BYTE *prefix_len) +{ + IN_ADDR temp_addr4; + USHORT temp_port = 0; + NTSTATUS status; + + TRACE("(%s, %d, %p, %p, %p)\n", debugstr_w(str), type, info, port, prefix_len); + + if (!str) + return ERROR_INVALID_PARAMETER; + + if (type & NET_STRING_IPV4_ADDRESS) + { + status = RtlIpv4StringToAddressExW(str, TRUE, &temp_addr4, &temp_port); + if (SUCCEEDED(status) && !temp_port) + { + if (info) + { + info->Format = NET_ADDRESS_IPV4; + info->u.Ipv4Address.sin_addr = temp_addr4; + info->u.Ipv4Address.sin_port = 0; + } + if (port) *port = 0; + if (prefix_len) *prefix_len = 255; + return ERROR_SUCCESS; + } + } + if (type & NET_STRING_IPV4_SERVICE) + { + status = RtlIpv4StringToAddressExW(str, TRUE, &temp_addr4, &temp_port); + if (SUCCEEDED(status) && temp_port) + { + if (info) + { + info->Format = NET_ADDRESS_IPV4; + info->u.Ipv4Address.sin_addr = temp_addr4; + info->u.Ipv4Address.sin_port = temp_port; + } + if (port) *port = ntohs(temp_port); + if (prefix_len) *prefix_len = 255; + return ERROR_SUCCESS; + } + } + + if (info) info->Format = NET_ADDRESS_FORMAT_UNSPECIFIED; + + if (type & ~(NET_STRING_IPV4_ADDRESS|NET_STRING_IPV4_SERVICE)) + { + FIXME("Unimplemented type 0x%x\n", type); + return ERROR_NOT_SUPPORTED; + } + + return ERROR_INVALID_PARAMETER; +}

1 0

Alex Henrie : include: Add ip2string.h.
by Alexandre Julliard Sept. 5, 2019

Sept. 5, 2019

Module: wine Branch: master Commit: 8599d8e52eaf912698e0ea5d96c0d9790aac659f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8599d8e52eaf912698e0ea5d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Sep 5 00:06:17 2019 -0600 include: Add ip2string.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ip2string.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 47a36ff..0f78085 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -323,6 +323,7 @@ SOURCES = \ inspectable.idl \ interactioncontext.h \ intshcut.h \ + ip2string.h \ ipexport.h \ iphlpapi.h \ ipifcons.h \ diff --git a/include/ip2string.h b/include/ip2string.h new file mode 100644 index 0000000..6c96c8d --- /dev/null +++ b/include/ip2string.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2019 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_IP2STRING_H +#define __WINE_IP2STRING_H + +#ifdef __cplusplus +extern "C" { +#endif + +NTSTATUS WINAPI RtlIpv4StringToAddressA(const char *str, BOOLEAN strict, const char **terminator, IN_ADDR *address); +NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const WCHAR **terminator, IN_ADDR *address); +#define RtlIpv4StringToAddress WINELIB_NAME_AW(RtlIpv4StringToAddress) +NTSTATUS WINAPI RtlIpv4StringToAddressExA(const char *str, BOOLEAN strict, IN_ADDR *address, USHORT *port); +NTSTATUS WINAPI RtlIpv4StringToAddressExW(const WCHAR *str, BOOLEAN strict, IN_ADDR *address, USHORT *port); +#define RtlIpv4StringToAddressEx WINELIB_NAME_AW(RtlIpv4StringToAddressEx) + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Zebediah Figura : amstream: Reimplement IPin locally for the primary audio stream.
by Alexandre Julliard Sept. 5, 2019

Sept. 5, 2019

Module: wine Branch: master Commit: 953cf31158926dfc0bf68ab866d5204497bbe8fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=953cf31158926dfc0bf68ab8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 4 19:43:17 2019 -0500 amstream: Reimplement IPin locally for the primary audio stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 318 +++++++++++++++++++++++++++++--------------- 1 file changed, 210 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=953cf31158926dfc0bf6…

1 0

Alistair Leslie-Hughes : wbemprox: Return NULL on error (Coverity).
by Alexandre Julliard Sept. 5, 2019

Sept. 5, 2019

Module: wine Branch: master Commit: d2590f2099779e7e79bd8f1d3125750b7900e85a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2590f2099779e7e79bd8f1d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 4 23:48:51 2019 +0000 wbemprox: Return NULL on error (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index bbc96bf..299a2ed 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3886,7 +3886,7 @@ static struct array *get_systemenclosure_chassistypes( const char *buf, UINT len if (!(types = heap_alloc( sizeof(*types) ))) { heap_free( ret ); - goto done; + return NULL; } types[0] = chassis->type & ~0x80;

1 0

Zebediah Figura : amstream: Get rid of the AudioMediaStreamImpl typedef.
by Alexandre Julliard Sept. 5, 2019

Sept. 5, 2019

Module: wine Branch: master Commit: 47105ce35c39c7b1a0873b85e3481e721428c130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47105ce35c39c7b1a0873b85… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 4 19:43:15 2019 -0500 amstream: Get rid of the AudioMediaStreamImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 69 +++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47105ce35c39c7b1a087…

1 0

Huw Davies : wininet: Include limits.h to define UINT_MAX and ULONG_MAX.
by Alexandre Julliard Sept. 5, 2019

Sept. 5, 2019

Module: wine Branch: master Commit: f5a3d43f45fdc5ab2b451e8592d4f8e1508f22a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5a3d43f45fdc5ab2b451e85… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 5 08:39:56 2019 +0100 wininet: Include limits.h to define UINT_MAX and ULONG_MAX. Fixes build error on macOS introduced by commit 968201424d92a2117d91ba0253f30a9c67018e7e Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 065a8b7..fccbb02 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -43,6 +43,7 @@ #include <time.h> #include <assert.h> #include <errno.h> +#include <limits.h> #include "windef.h" #include "winbase.h"

1 0

Zebediah Figura : winegstreamer: Use strmbase_source_init().
by Alexandre Julliard Sept. 5, 2019

Sept. 5, 2019

Module: wine Branch: master Commit: 06d72b61ced162b0c19102fe48d3f38598cd5c0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=06d72b61ced162b0c19102fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 4 19:43:19 2019 -0500 winegstreamer: Use strmbase_source_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 58 +++++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 06236e2..18d6eb8 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -30,6 +30,7 @@ #include "winuser.h" #include "dshow.h" #include "strmif.h" +#include "wine/heap.h" #include "wine/strmbase.h" #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9e634bc..aa27a36 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -104,7 +104,7 @@ static const IPinVtbl GST_InputPin_Vtbl; static const IBaseFilterVtbl GST_Vtbl; static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl; -static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt); +static BOOL create_pin(GSTImpl *filter, const PIN_INFO *pin_info, const AM_MEDIA_TYPE *mt); static HRESULT GST_RemoveOutputPins(GSTImpl *This); static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface); @@ -825,9 +825,9 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) return; } - hr = GST_AddPin(This, &piOutput, &amt); - if (FAILED(hr)) { - ERR("%08x\n", hr); + if (!create_pin(This, &piOutput, &amt)) + { + ERR("Failed to allocate memory.\n"); return; } @@ -1771,13 +1771,12 @@ static void free_source_pin(GSTOutPin *pin) gst_object_unref(pin->my_sink); CloseHandle(pin->caps_event); DeleteMediaType(pin->pmt); - FreeMediaType(&pin->pin.pin.mtCurrent); gst_segment_free(pin->segment); if (pin->gstpool) gst_object_unref(pin->gstpool); - if (pin->pin.pAllocator) - IMemAllocator_Release(pin->pin.pAllocator); - CoTaskMemFree(pin); + + strmbase_source_cleanup(&pin->pin); + heap_free(pin); } static const IPinVtbl GST_OutputPin_Vtbl = { @@ -1811,27 +1810,30 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { GSTOutPin_DecideAllocator, }; -static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt) +static BOOL create_pin(GSTImpl *filter, const PIN_INFO *pin_info, const AM_MEDIA_TYPE *mt) { - HRESULT hr; - This->ppPins = CoTaskMemRealloc(This->ppPins, (This->cStreams + 1) * sizeof(IPin *)); - - hr = BaseOutputPin_Construct(&GST_OutputPin_Vtbl, sizeof(GSTOutPin), piOutput, &output_BaseOutputFuncTable, &This->filter.csFilter, (IPin**)(This->ppPins + This->cStreams)); - if (SUCCEEDED(hr)) { - GSTOutPin *pin = This->ppPins[This->cStreams]; - memset((char*)pin + sizeof(pin->pin), 0, sizeof(GSTOutPin) - sizeof(pin->pin)); - pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); - CopyMediaType(pin->pmt, amt); - pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface; - pin->caps_event = CreateEventW(NULL, 0, 0, NULL); - pin->segment = gst_segment_new(); - This->cStreams++; - pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; - SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate, &This->filter.csFilter); - BaseFilterImpl_IncrementPinVersion(&This->filter); - } else - ERR("Failed with error %x\n", hr); - return hr; + GSTOutPin *pin, **new_array; + + if (!(new_array = CoTaskMemRealloc(filter->ppPins, (filter->cStreams + 1) * sizeof(*new_array)))) + return FALSE; + filter->ppPins = new_array; + + if (!(pin = heap_alloc_zero(sizeof(*pin)))) + return FALSE; + + strmbase_source_init(&pin->pin, &GST_OutputPin_Vtbl, pin_info, + &output_BaseOutputFuncTable, &filter->filter.csFilter); + pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + CopyMediaType(pin->pmt, mt); + pin->caps_event = CreateEventW(NULL, FALSE, FALSE, NULL); + pin->segment = gst_segment_new(); + pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; + SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, + GST_ChangeCurrent, GST_ChangeRate, &filter->filter.csFilter); + BaseFilterImpl_IncrementPinVersion(&filter->filter); + + filter->ppPins[filter->cStreams++] = pin; + return TRUE; } static HRESULT GST_RemoveOutputPins(GSTImpl *This)

1 0

Zebediah Figura : amstream: Use shorter names for primary audio stream methods.
by Alexandre Julliard Sept. 5, 2019

Sept. 5, 2019

Module: wine Branch: master Commit: d49417c081eef7169b145135a73f9d1d43a867c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d49417c081eef7169b145135… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 4 19:43:18 2019 -0500 amstream: Use shorter names for primary audio stream methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream_private.h | 2 +- dlls/amstream/audiostream.c | 127 +++++++++++++++++++-------------------- dlls/amstream/multimedia.c | 2 +- 3 files changed, 63 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d49417c081eef7169b14…

1 0

Zebediah Figura : amstream: Reimplement IMemInputPin locally for the primary audio stream.
by Alexandre Julliard Sept. 5, 2019

Sept. 5, 2019

Module: wine Branch: master Commit: 55274438656f43f7e4a34d79bc1b44996a082a25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55274438656f43f7e4a34d79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 4 19:43:16 2019 -0500 amstream: Reimplement IMemInputPin locally for the primary audio stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 102 ++++++++++++++++++++++++++++++++++++++++- dlls/amstream/tests/amstream.c | 1 + 2 files changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 683ab7d..966e1ae 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -175,12 +175,16 @@ struct audio_stream { IAMMediaStream IAMMediaStream_iface; IAudioMediaStream IAudioMediaStream_iface; + IMemInputPin IMemInputPin_iface; LONG ref; + IMultiMediaStream* parent; MSPID purpose_id; STREAM_TYPE stream_type; AudioMediaStreamInputPin *input_pin; CRITICAL_SECTION critical_section; + + IMemAllocator *allocator; }; static inline struct audio_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) @@ -219,7 +223,7 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_QueryInterface(IAMMedi else if (IsEqualGUID(riid, &IID_IMemInputPin)) { IAMMediaStream_AddRef(iface); - *ret_iface = &This->input_pin->pin.IMemInputPin_iface; + *ret_iface = &This->IMemInputPin_iface; return S_OK; } @@ -794,6 +798,101 @@ static const BaseInputPinFuncTable AudioMediaStreamInputPin_FuncTable = AudioMediaStreamInputPin_Receive, }; +static inline struct audio_stream *impl_from_IMemInputPin(IMemInputPin *iface) +{ + return CONTAINING_RECORD(iface, struct audio_stream, IMemInputPin_iface); +} + +static HRESULT WINAPI audio_meminput_QueryInterface(IMemInputPin *iface, REFIID iid, void **out) +{ + struct audio_stream *stream = impl_from_IMemInputPin(iface); + return IAMMediaStream_QueryInterface(&stream->IAMMediaStream_iface, iid, out); +} + +static ULONG WINAPI audio_meminput_AddRef(IMemInputPin *iface) +{ + struct audio_stream *stream = impl_from_IMemInputPin(iface); + return IAMMediaStream_AddRef(&stream->IAMMediaStream_iface); +} + +static ULONG WINAPI audio_meminput_Release(IMemInputPin *iface) +{ + struct audio_stream *stream = impl_from_IMemInputPin(iface); + return IAMMediaStream_Release(&stream->IAMMediaStream_iface); +} + +static HRESULT WINAPI audio_meminput_GetAllocator(IMemInputPin *iface, IMemAllocator **allocator) +{ + struct audio_stream *stream = impl_from_IMemInputPin(iface); + + TRACE("stream %p, allocator %p.\n", stream, allocator); + + if (stream->allocator) + { + IMemAllocator_AddRef(*allocator = stream->allocator); + return S_OK; + } + + *allocator = NULL; + return VFW_E_NO_ALLOCATOR; +} + +static HRESULT WINAPI audio_meminput_NotifyAllocator(IMemInputPin *iface, IMemAllocator *allocator, BOOL readonly) +{ + struct audio_stream *stream = impl_from_IMemInputPin(iface); + + TRACE("stream %p, allocator %p, readonly %d.\n", stream, allocator, readonly); + + if (!allocator) + return E_POINTER; + + if (allocator) + IMemAllocator_AddRef(allocator); + if (stream->allocator) + IMemAllocator_Release(stream->allocator); + stream->allocator = allocator; + + return S_OK; +} + +static HRESULT WINAPI audio_meminput_GetAllocatorRequirements(IMemInputPin *iface, ALLOCATOR_PROPERTIES *props) +{ + TRACE("iface %p, props %p.\n", iface, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_meminput_Receive(IMemInputPin *iface, IMediaSample *sample) +{ + FIXME("iface %p, sample %p, stub!\n", iface, sample); + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_meminput_ReceiveMultiple(IMemInputPin *iface, + IMediaSample **samples, LONG count, LONG *processed) +{ + FIXME("iface %p, samples %p, count %u, processed %p, stub!\n", iface, samples, count, processed); + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_meminput_ReceiveCanBlock(IMemInputPin *iface) +{ + TRACE("iface %p.\n", iface); + return S_OK; +} + +static const IMemInputPinVtbl audio_meminput_vtbl = +{ + audio_meminput_QueryInterface, + audio_meminput_AddRef, + audio_meminput_Release, + audio_meminput_GetAllocator, + audio_meminput_NotifyAllocator, + audio_meminput_GetAllocatorRequirements, + audio_meminput_Receive, + audio_meminput_ReceiveMultiple, + audio_meminput_ReceiveCanBlock, +}; + HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) { @@ -812,6 +911,7 @@ HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object->IAMMediaStream_iface.lpVtbl = &AudioMediaStreamImpl_IAMMediaStream_Vtbl; object->IAudioMediaStream_iface.lpVtbl = &AudioMediaStreamImpl_IAudioMediaStream_Vtbl; + object->IMemInputPin_iface.lpVtbl = &audio_meminput_vtbl; object->ref = 1; InitializeCriticalSection(&object->critical_section); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index fd192ce..12d7d9b 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -172,6 +172,7 @@ static void test_interfaces(void) check_interface(stream, &IID_IAMMediaStream, TRUE); check_interface(stream, &IID_IAudioMediaStream, TRUE); check_interface(stream, &IID_IMediaStream, TRUE); + check_interface(stream, &IID_IMemInputPin, TRUE); check_interface(stream, &IID_IPin, TRUE); check_interface(stream, &IID_IUnknown, TRUE);

1 0

Dmitry Timoshkov : localspl: Remove useless NULL checks from AddMonitor trace.
by Alexandre Julliard Sept. 5, 2019

Sept. 5, 2019

Module: wine Branch: master Commit: c113c5b9e7f52d8568e7e474ae2a70b054ff90d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c113c5b9e7f52d8568e7e474… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 5 20:31:06 2019 +0800 localspl: Remove useless NULL checks from AddMonitor trace. AddMonitor dereferences pMonitors later without any checks. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index cb31b19..ccd1981 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1475,9 +1475,7 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) mi2w = (LPMONITOR_INFO_2W) pMonitors; TRACE("(%s, %d, %p): %s %s %s\n", debugstr_w(pName), Level, pMonitors, - debugstr_w(mi2w ? mi2w->pName : NULL), - debugstr_w(mi2w ? mi2w->pEnvironment : NULL), - debugstr_w(mi2w ? mi2w->pDLLName : NULL)); + debugstr_w(mi2w->pName), debugstr_w(mi2w->pEnvironment), debugstr_w(mi2w->pDLLName)); if (copy_servername_from_name(pName, NULL)) { FIXME("server %s not supported\n", debugstr_w(pName));

1 0