wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Alexandre Julliard : ntdll: Reserve memory areas on all platforms.
by Alexandre Julliard 06 Jul '20

06 Jul '20

Module: wine Branch: master Commit: 086072ca6aa98e1d3107cac828c1d96cba01eeca URL: https://source.winehq.org/git/wine.git/?a=commit;h=086072ca6aa98e1d3107cac8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 4 21:16:07 2020 +0200 ntdll: Reserve memory areas on all platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 32d613e119..d16259e5ae 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -286,7 +286,7 @@ static void reserve_area( void *addr, void *end ) static void mmap_init( const struct preload_info *preload_info ) { -#ifdef __i386__ +#ifndef _WIN64 #ifndef __APPLE__ char stack; char * const stack_ptr = &stack; @@ -329,7 +329,7 @@ static void mmap_init( const struct preload_info *preload_info ) #endif reserve_area( user_space_limit, 0 ); -#elif defined(__x86_64__) || defined(__aarch64__) +#else if (preload_info) return; /* if we don't have a preloader, try to reserve the space now */

1 0

Alexandre Julliard : ntdll: Update working set limit also when loading a builtin dll.
by Alexandre Julliard 06 Jul '20

06 Jul '20

Module: wine Branch: master Commit: 695bf7a64532fe9755f2a471ed9e420b9e08539f URL: https://source.winehq.org/git/wine.git/?a=commit;h=695bf7a64532fe9755f2a471… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 4 19:07:22 2020 +0200 ntdll: Update working set limit also when loading a builtin dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 90dfb62eed..32d613e119 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2538,6 +2538,7 @@ NTSTATUS virtual_create_builtin_view( void *module ) set_page_vprot( (char *)base + sec[i].VirtualAddress, sec[i].Misc.VirtualSize, flags ); } VIRTUAL_DEBUG_DUMP_VIEW( view ); + if (is_beyond_limit( base, size, working_set_limit )) working_set_limit = address_space_limit; } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); return status;

1 0

Alexandre Julliard : Wine release 5.12
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: website Branch: master Commit: 68729549ebcb6f22b0f248d30353601e84c62a56 URL: https://source.winehq.org/git/website.git/?a=commit;h=68729549ebcb6f22b0f24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 21:36:30 2020 +0200 Wine release 5.12 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020070301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2020070301.xml b/news/en/2020070301.xml new file mode 100644 index 00000000..ab1bc629 --- /dev/null +++ b/news/en/2020070301.xml @@ -0,0 +1,16 @@ +<news> +<date>July 3, 2020</date> +<title>Wine 5.12 Released</title> +<body> + The Wine development release 5.12 is now available. + <a href="{$root}/announce/5.12">What's new</a> in this release: +<ul> + <li>NTDLL converted to PE format.</li> + <li>Support for the WebSocket API.</li> + <li>Improved RawInput support.</li> + <li>Vulkan spec update.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.12.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

Tag wine-5.12 : Alexandre Julliard : Release 5.12
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: refs/tags/wine-5.12 Tag: 69688a0645ef3e0acea5492e8752ebc0cab1c1b2 URL: https://source.winehq.org/git/wine.git/?a=tag;h=69688a0645ef3e0acea5492e875… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 21:34:44 2020 +0200 Release 5.12

1 0

Alexandre Julliard : Release 5.12.
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: 51dd1ba02e4a96a3e0c9381a434bfd1fd4347d83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51dd1ba02e4a96a3e0c9381a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 21:34:44 2020 +0200 Release 5.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 931 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 464 insertions(+), 489 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=51dd1ba02e4a96a3e0c9…

1 0

Nikolay Sivov : mfplat: Add tracked sample stub.
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: 3c02d5bed9d6d431db6689e84afa7a06c093a1b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c02d5bed9d6d431db6689e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 3 19:25:09 2020 +0300 mfplat: Add tracked sample stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 89 ++++++++++++++++++++++++++++++++++++++++++---- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 37 +++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 1a31299d24..67c60663b3 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -62,6 +62,7 @@ struct sample { struct attributes attributes; IMFSample IMFSample_iface; + IMFTrackedSample IMFTrackedSample_iface; IMFMediaBuffer **buffers; size_t buffer_count; @@ -87,6 +88,11 @@ static inline struct sample *impl_from_IMFSample(IMFSample *iface) return CONTAINING_RECORD(iface, struct sample, IMFSample_iface); } +static struct sample *impl_from_IMFTrackedSample(IMFTrackedSample *iface) +{ + return CONTAINING_RECORD(iface, struct sample, IMFTrackedSample_iface); +} + static HRESULT WINAPI memory_buffer_QueryInterface(IMFMediaBuffer *iface, REFIID riid, void **out) { struct memory_buffer *buffer = impl_from_IMFMediaBuffer(iface); @@ -711,20 +717,29 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO static HRESULT WINAPI sample_QueryInterface(IMFSample *iface, REFIID riid, void **out) { + struct sample *sample = impl_from_IMFSample(iface); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFSample) || IsEqualIID(riid, &IID_IMFAttributes) || IsEqualIID(riid, &IID_IUnknown)) { - *out = iface; - IMFSample_AddRef(iface); - return S_OK; + *out = &sample->IMFSample_iface; + } + else if (sample->IMFTrackedSample_iface.lpVtbl && IsEqualIID(riid, &IID_IMFTrackedSample)) + { + *out = &sample->IMFTrackedSample_iface; + } + else + { + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; } - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static ULONG WINAPI sample_AddRef(IMFSample *iface) @@ -1448,6 +1463,40 @@ static const IMFSampleVtbl samplevtbl = sample_CopyToBuffer, }; +static HRESULT WINAPI tracked_sample_QueryInterface(IMFTrackedSample *iface, REFIID riid, void **obj) +{ + struct sample *sample = impl_from_IMFTrackedSample(iface); + return IMFSample_QueryInterface(&sample->IMFSample_iface, riid, obj); +} + +static ULONG WINAPI tracked_sample_AddRef(IMFTrackedSample *iface) +{ + struct sample *sample = impl_from_IMFTrackedSample(iface); + return IMFSample_AddRef(&sample->IMFSample_iface); +} + +static ULONG WINAPI tracked_sample_Release(IMFTrackedSample *iface) +{ + struct sample *sample = impl_from_IMFTrackedSample(iface); + return IMFSample_Release(&sample->IMFSample_iface); +} + +static HRESULT WINAPI tracked_sample_SetAllocator(IMFTrackedSample *iface, + IMFAsyncCallback *sample_allocator, IUnknown *state) +{ + FIXME("%p, %p, %p.\n", iface, sample_allocator, state); + + return E_NOTIMPL; +} + +static const IMFTrackedSampleVtbl tracked_sample_vtbl = +{ + tracked_sample_QueryInterface, + tracked_sample_AddRef, + tracked_sample_Release, + tracked_sample_SetAllocator, +}; + /*********************************************************************** * MFCreateSample (mfplat.@) */ @@ -1476,3 +1525,31 @@ HRESULT WINAPI MFCreateSample(IMFSample **sample) return S_OK; } + +/*********************************************************************** + * MFCreateTrackedSample (mfplat.@) + */ +HRESULT WINAPI MFCreateTrackedSample(IMFTrackedSample **sample) +{ + struct sample *object; + HRESULT hr; + + TRACE("%p.\n", sample); + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + if (FAILED(hr = init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return hr; + } + + object->IMFSample_iface.lpVtbl = &samplevtbl; + object->IMFTrackedSample_iface.lpVtbl = &tracked_sample_vtbl; + + *sample = &object->IMFTrackedSample_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 16be972e5b..f55a8237d3 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -70,6 +70,7 @@ @ stdcall MFCreateSystemTimeSource(ptr) @ stub MFCreateSystemUnderlyingClock @ stub MFCreateTempFile +@ stdcall MFCreateTrackedSample(ptr) @ stdcall MFCreateTransformActivate(ptr) @ stub MFCreateURLFromPath @ stub MFCreateUdpSockets diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 8b4012f808..01749dd9ef 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -107,6 +107,7 @@ static HRESULT (WINAPI *pMFCreate2DMediaBuffer)(DWORD width, DWORD height, DWORD static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_type, LONGLONG duration, DWORD min_length, DWORD min_alignment, IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateDXSurfaceBuffer)(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); +static HRESULT (WINAPI *pMFCreateTrackedSample)(IMFTrackedSample **sample); static HWND create_window(void) { @@ -715,6 +716,7 @@ static void init_functions(void) X(MFCreateSourceResolver); X(MFCreateMediaBufferFromMediaType); X(MFCreateMFByteStreamOnStream); + X(MFCreateTrackedSample); X(MFCreateTransformActivate); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); @@ -5465,6 +5467,40 @@ done: DestroyWindow(window); } +static void test_MFCreateTrackedSample(void) +{ + IMFTrackedSample *tracked_sample; + IMFDesiredSample *desired_sample; + IMFSample *sample; + IUnknown *unk; + HRESULT hr; + + if (!pMFCreateTrackedSample) + { + win_skip("MFCreateTrackedSample() is not available.\n"); + return; + } + + hr = pMFCreateTrackedSample(&tracked_sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* It's actually a sample. */ + hr = IMFTrackedSample_QueryInterface(tracked_sample, &IID_IMFSample, (void **)&sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTrackedSample_QueryInterface(tracked_sample, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk == (IUnknown *)sample, "Unexpected pointer.\n"); + IUnknown_Release(unk); + + IMFSample_Release(sample); + + hr = IMFTrackedSample_QueryInterface(tracked_sample, &IID_IMFDesiredSample, (void **)&desired_sample); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + IMFTrackedSample_Release(tracked_sample); +} + START_TEST(mfplat) { char **argv; @@ -5522,6 +5558,7 @@ START_TEST(mfplat) test_MFInitMediaTypeFromWaveFormatEx(); test_MFCreateMFVideoFormatFromMFMediaType(); test_MFCreateDXSurfaceBuffer(); + test_MFCreateTrackedSample(); CoUninitialize(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 1f5fc06dd1..4ceeb707bd 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -648,6 +648,7 @@ cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID cpp_quote("MFTIME WINAPI MFGetSystemTime(void);") cpp_quote("HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type);") cpp_quote("HRESULT WINAPI MFShutdownObject(IUnknown *object);") +cpp_quote("HRESULT WINAPI MFCreateTrackedSample(IMFTrackedSample **sample);") typedef enum _MFMEDIASOURCE_CHARACTERISTICS {

1 0

Nikolay Sivov : evr/tests: Add some tests for sample allocator.
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: ba11eed83be5ab3fe77abfbd84311856ad87a461 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba11eed83be5ab3fe77abfbd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 3 19:22:16 2020 +0300 evr/tests: Add some tests for sample allocator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 123 insertions(+), 4 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5773fedd22..db9b3a80e0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -623,6 +623,7 @@ todo_wine static void test_surface_sample(void) { IDirect3DSurface9 *backbuffer = NULL; + IMFDesiredSample *desired_sample; IMFMediaBuffer *buffer, *buffer2; IDirect3DSwapChain9 *swapchain; IDirect3DDevice9 *device; @@ -662,9 +663,20 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); - hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&unk); + hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&desired_sample); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + + hr = IMFSample_GetCount(sample, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected attribute count %u.\n", count); + + IMFDesiredSample_SetDesiredSampleTimeAndDuration(desired_sample, 123, 456); + + hr = IMFSample_GetCount(sample, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected attribute count %u.\n", count); + + IMFDesiredSample_Release(desired_sample); hr = IMFSample_GetCount(sample, &count); ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); @@ -964,16 +976,123 @@ static void test_MFCreateVideoMixerAndPresenter(void) static void test_MFCreateVideoSampleAllocator(void) { + IMFVideoSampleAllocatorCallback *allocator_cb; + IMFVideoSampleAllocator *allocator; + IMFVideoMediaType *video_type; + IMFSample *sample, *sample2; + IDirect3DSurface9 *surface; + IMFMediaType *media_type; + IMFMediaBuffer *buffer; + IMFGetService *gs; IUnknown *unk; HRESULT hr; + LONG count; hr = MFCreateVideoSampleAllocator(&IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); - hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&unk); + hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&allocator); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + + hr = IMFVideoSampleAllocator_QueryInterface(allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&allocator_cb); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = 10; + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %d.\n", count); +} + hr = IMFVideoSampleAllocator_UninitializeSampleAllocator(allocator); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); +todo_wine + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* It expects IMFVideoMediaType. */ + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, media_type); +todo_wine + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + hr = MFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB32, &video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, (IMFMediaType *)video_type); +todo_wine + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + /* Frame size is required. */ + hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64) 320 << 32 | 240); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, (IMFMediaType *)video_type); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %d.\n", count); +} + sample = NULL; + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(get_refcount(sample) == 3, "Unexpected refcount %u.\n", get_refcount(sample)); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample2); +todo_wine + ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); + + /* Reinitialize with active sample. */ + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 4, (IMFMediaType *)video_type); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (sample) + ok(get_refcount(sample) == 3, "Unexpected refcount %u.\n", get_refcount(sample)); + + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 4, "Unexpected count %d.\n", count); +} + if (sample) + { + hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFSample_QueryInterface(sample, &IID_IMFTrackedSample, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Device manager wasn't set, sample get regular memory buffers. */ + hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + IMFMediaBuffer_Release(buffer); + + IMFGetService_Release(gs); + IMFSample_Release(sample); + } + + IMFVideoSampleAllocatorCallback_Release(allocator_cb); + + IMFMediaType_Release(media_type); + + IMFVideoSampleAllocator_Release(allocator); hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocatorCallback, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr: Add a stub for sample allocator.
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: 2b8462a52075a25c260007900d51db602b337c8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b8462a52075a25c26000790… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 3 19:22:15 2020 +0300 evr: Add a stub for sample allocator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 3 +- dlls/evr/evr.spec | 2 +- dlls/evr/sample.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 19 +++++ include/evr.idl | 1 + include/mfidl.idl | 57 +++++++++++++++ 6 files changed, 279 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b8462a52075a25c2600…

1 0

Paul Gofman : ws2_32: Consider socket with zero ifindex unbound.
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: d888f3ba3672a3e41af5d60c6494023cc38a0a02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d888f3ba3672a3e41af5d60c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 3 17:30:09 2020 +0300 ws2_32: Consider socket with zero ifindex unbound. Real interface index can't be zero. getsockopt(..., IP_UNICAST_IF, ...) may return success and zero interface index if IP_UNICAST_IF was never set. Avoids error output which doesn't inidcate a real error condition for such case. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 402ee86d96..69fbb37af2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3788,7 +3788,7 @@ static void interface_bind_check(int fd, struct sockaddr_in *addr) ret = getsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, &len); if (!ret) ifindex = ntohl(ifindex); #endif - if (!ret) + if (!ret && ifindex) { EnterCriticalSection(&cs_if_addr_cache); if (ifindex < if_addr_cache_size)

1 0

Gijs Vermeulen : amstream: Return E_POINTER on NULL stream in IMediaStreamFilter::GetMediaStream().
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: a2fe0d5759c6f658e2c527928f255e1bcd6dbf82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2fe0d5759c6f658e2c52792… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jul 3 14:41:13 2020 +0200 amstream: Return E_POINTER on NULL stream in IMediaStreamFilter::GetMediaStream(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 3 +++ dlls/amstream/tests/amstream.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 3dff686b21..0e09e492cb 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -513,6 +513,9 @@ static HRESULT WINAPI filter_GetMediaStream(IMediaStreamFilter *iface, REFMSPID TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(idPurpose), ppMediaStream); + if (!ppMediaStream) + return E_POINTER; + for (i = 0; i < This->nb_streams; i++) { IAMMediaStream_GetInformation(This->streams[i], &purpose_id, NULL); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index bbad585d48..3fb77f277a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -701,9 +701,13 @@ static void test_add_stream(void) ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryAudio, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_GetMediaStream(stream_filter, &MSPID_PrimaryAudio, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryVideo, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IMediaStreamFilter_GetMediaStream(stream_filter, &MSPID_PrimaryVideo, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); check_enum_stream(mmstream, stream_filter, 0, NULL);

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020