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

Alexandre Julliard : winebuild: Allow specifying a spec file also for Unix libraries.
by Alexandre Julliard 06 Jul '20

06 Jul '20

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

Bernhard Rosenkränzer : include: Correct a spelling error in the definition of IXACT3Engine_Initialize.
by Alexandre Julliard 06 Jul '20

06 Jul '20

Module: wine Branch: master Commit: ef90b6e54ce710f607b76a5f9b476052db5dcdd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef90b6e54ce710f607b76a5f… Author: Bernhard Rosenkränzer <bero(a)lindev.ch> Date: Sun Jul 5 11:41:48 2020 -0500 include: Correct a spelling error in the definition of IXACT3Engine_Initialize. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/xact3.h b/include/xact3.h index d66874a511..80059c124a 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -679,7 +679,7 @@ DECLARE_INTERFACE_(IXACT3Engine,IUnknown) #define IXACT3Engine_GetRendererCount(p,a) (p)->lpVtbl->GetRendererCount(p,a) #define IXACT3Engine_GetRendererDetails(p,a,b) (p)->lpVtbl->GetRendererDetails(p,a,b) #define IXACT3Engine_GetFinalMixFormat(p,a) (p)->lpVtbl->GetFinalMixFormat(p,a) -#define IXACT3Engine_Initialize(p,a) (p)->lpVtbl->Initialze(p,a) +#define IXACT3Engine_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) #define IXACT3Engine_Shutdown(p) (p)->lpVtbl->Shutdown(p) #define IXACT3Engine_DoWork(p) (p)->lpVtbl->DoWork(p) #define IXACT3Engine_CreateSoundBank(p,a,b,c,d,e) (p)->lpVtbl->CreateSoundBank(p,a,b,c,d,e)

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

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

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 : 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

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

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

Rémi Bernon : kernel32: Catch process creation breakpoint exceptions.
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: ceeb11d2a6545ae9db0c6825fb8d26b5cfe71889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceeb11d2a6545ae9db0c6825… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 3 10:13:30 2020 +0200 kernel32: Catch process creation breakpoint exceptions. Metal Gear Solid V: Ground Zeroes attaches itself and continues this specific breakpoint with DBG_EXCEPTION_NOT_HANDLED. It crashes the child process and the game terminates. It is correct for old Windows versions, but more recent versions are apparently catching exceptions here, and the process should continue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44127 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 9 +++++++++ dlls/kernel32/tests/debugger.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8f506fcf13..cfc11c867a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -155,6 +155,15 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) SetLastError( 0 ); /* clear error code */ if (being_debugged) DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY + + __TRY + { ExitThread( call_process_entry( peb, entry )); } __EXCEPT(UnhandledExceptionFilter) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 33e18d82e6..0a43fe91e6 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1062,15 +1062,46 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, if (flag) { + DWORD last_thread; + next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); ok(ctx.pid == pi.dwProcessId, "unexpected dwProcessId %x\n", ctx.ev.dwProcessId == ctx.pid); next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + last_thread = ctx.ev.dwThreadId; wait_for_breakpoint(&ctx); ok(ctx.dll_cnt > 2, "dll_cnt = %d\n", ctx.dll_cnt); + + ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwThreadId == last_thread, "unexpected thread\n"); + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); + + /* Except for wxppro and w2008, the initial breakpoint is now somewhere else, possibly within LdrInitShimEngineDynamic, + * It's also catching exceptions and ContinueDebugEvent(DBG_EXCEPTION_NOT_HANDLED) should not crash the child now */ + if (broken(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint)) + { + win_skip("Ignoring initial breakpoint address check\n"); + pass_exception = FALSE; + } + else + { + todo_wine + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress != pDbgBreakPoint, "ExceptionAddress == pDbgBreakPoint\n"); + } + + if (pass_exception) + { + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_EXCEPTION_NOT_HANDLED); + ok(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + ctx.ev.dwDebugEventCode = -1; + + next_event(&ctx, WAIT_EVENT_TIMEOUT); + ok(ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + } } else { @@ -1713,6 +1744,7 @@ START_TEST(debugger) test_debug_children(myARGV[0], DEBUG_PROCESS|DEBUG_ONLY_THIS_PROCESS, FALSE, FALSE); test_debug_children(myARGV[0], 0, FALSE, FALSE); test_debug_children(myARGV[0], 0, FALSE, TRUE); + test_debug_children(myARGV[0], DEBUG_ONLY_THIS_PROCESS, FALSE, TRUE); test_debugger(myARGV[0]); } }

1 0

Alexandre Julliard : ntdll: Use pthread mutexes for uninterrupted sections in the Unix library.
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: 72fc2ceaa6ae472a809b4d5c02be98c44388c1b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72fc2ceaa6ae472a809b4d5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:02:58 2020 +0200 ntdll: Use pthread mutexes for uninterrupted sections in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 22 ++---- dlls/ntdll/unix/signal_i386.c | 23 ++---- dlls/ntdll/unix/unix_private.h | 5 +- dlls/ntdll/unix/virtual.c | 174 ++++++++++++++++++++--------------------- 4 files changed, 102 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72fc2ceaa6ae472a809b…

1 0