July 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : winebuild: Allow specifying a spec file also for Unix libraries.
by Alexandre Julliard July 6, 2020

July 6, 2020

Module: wine Branch: master Commit: 66fb3802d31b34360f87edd11eb6508bca785824 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66fb3802d31b34360f87edd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 6 15:50:00 2020 +0200 winebuild: Allow specifying a spec file also for Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 ++ tools/winebuild/import.c | 9 +++++++++ tools/winebuild/spec32.c | 11 +++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index bdeae8f65a..825458156f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3349,6 +3349,7 @@ static void output_module( struct makefile *make ) strarray_add( &make->all_targets, unix_lib ); add_install_rule( make, make->module, unix_lib, strmake( "p$(dlldir)/%s", unix_lib )); output( "%s:", unix_lib ); + if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->unixobj_files ); output_filenames( unix_deps ); output_filename( tools_path( make, "winebuild" )); @@ -3357,6 +3358,7 @@ static void output_module( struct makefile *make ) output_winegcc_command( make, 0 ); output_filename( "-munix" ); output_filename( "-shared" ); + if (spec_file) output_filename( spec_file ); if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) output_filename( "-nodefaultlibs" ); output_filenames_obj_dir( make, make->unixobj_files ); output_filenames( unix_libs ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 616b9842ce..125b6132b6 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -460,6 +460,9 @@ static void add_undef_import( const char *name, int is_ordinal ) static int has_stubs( const DLLSPEC *spec ) { int i; + + if (unix_lib) return 0; + for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; @@ -503,6 +506,8 @@ static void check_undefined_forwards( DLLSPEC *spec ) char *link_name, *api_name, *dll_name, *p; int i; + if (unix_lib) return; + for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; @@ -533,6 +538,8 @@ static void check_undefined_exports( DLLSPEC *spec ) { int i; + if (unix_lib) return; + for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; @@ -570,6 +577,8 @@ static char *create_undef_symbols_file( DLLSPEC *spec ) int i; unsigned int j; + if (unix_lib) return NULL; + as_file = open_temp_output_file( ".s" ); output( "\t.data\n" ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 5f74d2f29b..f7eeb785b8 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -96,6 +96,13 @@ static int has_relays( DLLSPEC *spec ) return 0; } +static int get_exports_count( DLLSPEC *spec ) +{ + if (unix_lib) return 0; + if (spec->base > spec->limit) return 0; + return spec->limit - spec->base + 1; +} + static int cmp_func_args( const void *p1, const void *p2 ) { const ORDDEF *odp1 = *(const ORDDEF **)p1; @@ -384,7 +391,7 @@ void output_exports( DLLSPEC *spec ) int i, fwd_size = 0; int needs_imports = 0; int needs_relay = has_relays( spec ); - int nr_exports = spec->base <= spec->limit ? spec->limit - spec->base + 1 : 0; + int nr_exports = get_exports_count( spec ); const char *func_ptr = (target_platform == PLATFORM_WINDOWS) ? ".rva" : get_asm_ptr_keyword(); const char *name; @@ -704,7 +711,7 @@ void output_module( DLLSPEC *spec ) output( "\t.long 0\n" ); /* LoaderFlags */ output( "\t.long 16\n" ); /* NumberOfRvaAndSizes */ - if (spec->base <= spec->limit) + if (get_exports_count( spec )) data_dirs[0] = ".L__wine_spec_exports"; /* DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT] */ if (has_imports()) data_dirs[1] = ".L__wine_spec_imports"; /* DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT] */

1 0

Alexandre Julliard : ntdll: Update working set limit also when loading a builtin dll.
by Alexandre Julliard July 6, 2020

July 6, 2020

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 July 3, 2020

July 3, 2020

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

Nikolay Sivov : evr: Add a stub for sample allocator.
by Alexandre Julliard July 3, 2020

July 3, 2020

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

Alexandre Julliard : Release 5.12.
by Alexandre Julliard July 3, 2020

July 3, 2020

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 July 3, 2020

July 3, 2020

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 July 3, 2020

July 3, 2020

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

Tag wine-5.12 : Alexandre Julliard : Release 5.12
by Alexandre Julliard July 3, 2020

July 3, 2020

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

Paul Gofman : ws2_32: Consider socket with zero ifindex unbound.
by Alexandre Julliard July 3, 2020

July 3, 2020

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

Alexandre Julliard : ntdll: Use malloc() to allocate async I/O data.
by Alexandre Julliard July 3, 2020

July 3, 2020

Module: wine Branch: master Commit: e9951dbe37c9fb018e677d872df9f563a0861295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9951dbe37c9fb018e677d87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:04:40 2020 +0200 ntdll: Use malloc() to allocate async I/O data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 18 +++++++++--------- dlls/ntdll/unix/serial.c | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 5ed7a21d8e..223c863dca 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4489,11 +4489,11 @@ static struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, while (io) { struct async_fileio *next = io->next; - RtlFreeHeap( GetProcessHeap(), 0, io ); + free( io ); io = next; } - if ((io = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + if ((io = malloc( size ))) { io->callback = callback; io->handle = handle; @@ -4676,7 +4676,7 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a } SERVER_END_REQ; - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, async ); + if (status != STATUS_PENDING) free( async ); if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), io ); return status; @@ -4714,7 +4714,7 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE } SERVER_END_REQ; - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, async ); + if (status != STATUS_PENDING) free( async ); if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), io ); return status; @@ -4759,7 +4759,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, async ); + if (status != STATUS_PENDING) free( async ); if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), io ); return status; @@ -4922,7 +4922,7 @@ static NTSTATUS register_async_file_read( HANDLE handle, HANDLE event, } SERVER_END_REQ; - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + if (status != STATUS_PENDING) free( fileio ); return status; } @@ -5388,7 +5388,7 @@ NTSTATUS WINAPI NtWriteFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, v } SERVER_END_REQ; - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + if (status != STATUS_PENDING) free( fileio ); goto err; } else /* synchronous write, wait for the fd to become ready */ @@ -5752,7 +5752,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE handle, IO_STATUS_BLOCK *io ) } SERVER_END_REQ; - if (ret != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, async ); + if (ret != STATUS_PENDING) free( async ); if (wait_handle) ret = wait_async( wait_handle, FALSE, io ); } @@ -5883,7 +5883,7 @@ NTSTATUS WINAPI NtNotifyChangeDirectoryFile( HANDLE handle, HANDLE event, PIO_AP } SERVER_END_REQ; - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + if (status != STATUS_PENDING) free( fileio ); return status; } diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index b807ee1e46..1c61a5e02f 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -1007,7 +1007,7 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) } stop_waiting(commio->hDevice); if (commio->hEvent) NtSetEvent(commio->hEvent, NULL); - RtlFreeHeap(GetProcessHeap(), 0, commio); + free( commio ); return 0; } @@ -1019,7 +1019,7 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK if ((status = NtResetEvent(hEvent, NULL))) return status; - commio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof (async_commio)); + commio = malloc( sizeof(async_commio) ); if (!commio) return STATUS_NO_MEMORY; commio->hDevice = hDevice; @@ -1030,7 +1030,7 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK status = get_wait_mask(commio->hDevice, &commio->evtmask, &commio->cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL, TRUE); if (status) { - RtlFreeHeap(GetProcessHeap(), 0, commio); + free( commio ); return status; } @@ -1098,7 +1098,7 @@ error_caps: #endif out_now: stop_waiting(commio->hDevice); - RtlFreeHeap(GetProcessHeap(), 0, commio); + free( commio ); return status; }

1 0