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

Alexandre Julliard : Wine release 5.7
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: website Branch: master Commit: 7e9449dafc68f4fc52b5bbfea008c7306bc6932c URL: https://source.winehq.org/git/website.git/?a=commit;h=7e9449dafc68f4fc52b5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 22:12:18 2020 +0200 Wine release 5.7 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020042401.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2020042401.xml b/news/en/2020042401.xml new file mode 100644 index 00000000..977d085a --- /dev/null +++ b/news/en/2020042401.xml @@ -0,0 +1,18 @@ +<news> +<date>April 24, 2020</date> +<title>Wine 5.7 Released</title> +<body> + The Wine development release 5.7 is now available. + <a href="{$root}/announce/5.7">What's new</a> in this release: +<ul> + <li>Wine Mono engine updated to 5.0.0, with upstream WPF support.</li> + <li>More progress on the WineD3D Vulkan backend.</li> + <li>Beginnings of a USB device driver.</li> + <li>Support for building with Clang in MSVC mode.</li> + <li>Builtin modules no longer depend on libwine.</li> + <li>Support for configuring Windows version from the command line.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.7.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.7 : Alexandre Julliard : Release 5.7
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: refs/tags/wine-5.7 Tag: d3018ee7923df716264c66330d432d7380c0ecbc URL: https://source.winehq.org/git/wine.git/?a=tag;h=d3018ee7923df716264c66330d4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 22:09:10 2020 +0200 Release 5.7

1 0

Alexandre Julliard : Release 5.7.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: c44e0cf60ad1a967d80fafb427974332b35a0071 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c44e0cf60ad1a967d80fafb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 22:09:10 2020 +0200 Release 5.7. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1107 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 543 insertions(+), 584 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c44e0cf60ad1a967d80f…

1 0

Zebediah Figura : qcap/filewriter: Implement sample processing.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 28f17d8e6ec069a55aed27c8fdabc1c56afb9ea4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28f17d8e6ec069a55aed27c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 23 20:47:05 2020 -0500 qcap/filewriter: Implement sample processing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 26 ++++++++++++++++++ dlls/qcap/tests/filewriter.c | 65 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index caec4936cf..2a3c8df4b9 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -64,10 +64,36 @@ static HRESULT file_writer_sink_query_accept(struct strmbase_pin *iface, const A return S_OK; } +static HRESULT WINAPI file_writer_sink_receive(struct strmbase_sink *iface, IMediaSample *sample) +{ + struct file_writer *filter = impl_from_strmbase_pin(&iface->pin); + REFERENCE_TIME start, stop; + LARGE_INTEGER offset; + HRESULT hr; + DWORD size; + BYTE *data; + + if ((hr = IMediaSample_GetTime(sample, &start, &stop)) != S_OK) + ERR("Failed to get sample time, hr %#x.\n", hr); + + if ((hr = IMediaSample_GetPointer(sample, &data)) != S_OK) + ERR("Failed to get sample pointer, hr %#x.\n", hr); + + offset.QuadPart = start; + if (!SetFilePointerEx(filter->file, offset, NULL, FILE_BEGIN) + || !WriteFile(filter->file, data, stop - start, &size, NULL)) + ERR("Failed to write file, error %u.\n", GetLastError()); + if (size != stop - start) + ERR("Short write, %u/%u.\n", size, (DWORD)(stop - start)); + + return S_OK; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = file_writer_sink_query_interface, .base.pin_query_accept = file_writer_sink_query_accept, + .pfnReceive = file_writer_sink_receive, }; static inline struct file_writer *impl_from_strmbase_filter(struct strmbase_filter *iface) diff --git a/dlls/qcap/tests/filewriter.c b/dlls/qcap/tests/filewriter.c index 57bd2ec872..f0c20e660e 100644 --- a/dlls/qcap/tests/filewriter.c +++ b/dlls/qcap/tests/filewriter.c @@ -549,7 +549,7 @@ static void test_allocator(IMemInputPin *input, IMemAllocator *allocator) ok(hr == E_POINTER, "Got hr %#x.\n", hr); props.cBuffers = 1; - props.cbBuffer = 256; + props.cbBuffer = 512; props.cbAlign = 512; props.cbPrefix = 0; hr = IMemAllocator_SetProperties(allocator, &props, &ret_props); @@ -616,6 +616,68 @@ static void test_filter_state(IMediaControl *control) ok(state == State_Stopped, "Got state %u.\n", state); } +static void test_sample_processing(IMediaControl *control, IMemInputPin *input, + IMemAllocator *allocator, const WCHAR *filename) +{ + REFERENCE_TIME start, stop; + IMediaSample *sample; + BYTE buffer[600]; + FILE *file; + HRESULT hr; + BYTE *data; + LONG size; + + hr = IMemInputPin_ReceiveCanBlock(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + size = IMediaSample_GetSize(sample); + ok(size == 512, "Got size %d.\n", size); + memset(data, 0xcc, size); + start = 0; + stop = 512; + hr = IMediaSample_SetTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + strcpy((char *)data, "abcdefghi"); + hr = IMediaSample_SetActualDataLength(sample, 9); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(data, 0xcc, size); + strcpy((char *)data, "123456"); + hr = IMediaSample_SetActualDataLength(sample, 6); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + file = _wfopen(filename, L"rb"); + ok(!!file, "Failed to open file: %s.\n", strerror(errno)); + size = fread(buffer, 1, sizeof(buffer), file); + ok(size == 512, "Got size %d.\n", size); + ok(!memcmp(buffer, "123456\0\xcc\xcc\xcc", 10), "Got data %s.\n", + debugstr_an((char *)buffer, size)); + fclose(file); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(sample); +} + static void test_connect_pin(void) { AM_MEDIA_TYPE req_mt = @@ -675,6 +737,7 @@ static void test_connect_pin(void) test_allocator(meminput, allocator); test_filter_state(control); + test_sample_processing(control, meminput, allocator, filename); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : qcap/filewriter: Implement IAMFilterMiscFlags.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 91d0d9ec05579309cd61f8a128d9c25633af6016 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91d0d9ec05579309cd61f8a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 23 20:47:06 2020 -0500 qcap/filewriter: Implement IAMFilterMiscFlags. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 46 +++++++++++++++++++++++++++++++++++++++++++- dlls/qcap/tests/filewriter.c | 19 +++++++++++++++++- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 2a3c8df4b9..4d9262e757 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); struct file_writer { struct strmbase_filter filter; + IAMFilterMiscFlags IAMFilterMiscFlags_iface; IFileSinkFilter IFileSinkFilter_iface; struct strmbase_sink sink; @@ -105,7 +106,9 @@ static HRESULT file_writer_query_interface(struct strmbase_filter *iface, REFIID { struct file_writer *filter = impl_from_strmbase_filter(iface); - if (IsEqualGUID(iid, &IID_IFileSinkFilter)) + if (IsEqualGUID(iid, &IID_IAMFilterMiscFlags)) + *out = &filter->IAMFilterMiscFlags_iface; + else if (IsEqualGUID(iid, &IID_IFileSinkFilter)) *out = &filter->IFileSinkFilter_iface; else return E_NOINTERFACE; @@ -228,6 +231,46 @@ static const IFileSinkFilterVtbl filesinkfilter_vtbl = filesinkfilter_GetCurFile, }; +static inline struct file_writer *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) +{ + return CONTAINING_RECORD(iface, struct file_writer, IAMFilterMiscFlags_iface); +} + +static HRESULT WINAPI misc_flags_QueryInterface(IAMFilterMiscFlags *iface, REFIID iid, void **out) +{ + struct file_writer *filter = impl_from_IAMFilterMiscFlags(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, iid, out); +} + +static ULONG WINAPI misc_flags_AddRef(IAMFilterMiscFlags *iface) +{ + struct file_writer *filter = impl_from_IAMFilterMiscFlags(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI misc_flags_Release(IAMFilterMiscFlags *iface) +{ + struct file_writer *filter = impl_from_IAMFilterMiscFlags(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static ULONG WINAPI misc_flags_GetMiscFlags(IAMFilterMiscFlags *iface) +{ + struct file_writer *filter = impl_from_IAMFilterMiscFlags(iface); + + TRACE("filter %p.\n", filter); + + return AM_FILTER_MISC_FLAGS_IS_RENDERER; +} + +static const IAMFilterMiscFlagsVtbl misc_flags_vtbl = +{ + misc_flags_QueryInterface, + misc_flags_AddRef, + misc_flags_Release, + misc_flags_GetMiscFlags, +}; + HRESULT file_writer_create(IUnknown *outer, IUnknown **out) { static const WCHAR sink_name[] = {'i','n',0}; @@ -238,6 +281,7 @@ HRESULT file_writer_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_FileWriter, &filter_ops); object->IFileSinkFilter_iface.lpVtbl = &filesinkfilter_vtbl; + object->IAMFilterMiscFlags_iface.lpVtbl = &misc_flags_vtbl; strmbase_sink_init(&object->sink, &object->filter, sink_name, &sink_ops, NULL); diff --git a/dlls/qcap/tests/filewriter.c b/dlls/qcap/tests/filewriter.c index f0c20e660e..7e8a91d3fb 100644 --- a/dlls/qcap/tests/filewriter.c +++ b/dlls/qcap/tests/filewriter.c @@ -78,7 +78,7 @@ static void test_interfaces(void) ULONG ref; IPin *pin; - todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IFileSinkFilter, TRUE); todo_wine check_interface(filter, &IID_IFileSinkFilter2, TRUE); @@ -769,6 +769,22 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_misc_flags(void) +{ + IBaseFilter *filter = create_file_writer(); + IAMFilterMiscFlags *misc_flags; + ULONG flags, ref; + + IBaseFilter_QueryInterface(filter, &IID_IAMFilterMiscFlags, (void **)&misc_flags); + + flags = IAMFilterMiscFlags_GetMiscFlags(misc_flags); + ok(flags == AM_FILTER_MISC_FLAGS_IS_RENDERER, "Got flags %#x.\n", flags); + + IAMFilterMiscFlags_Release(misc_flags); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(filewriter) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -781,6 +797,7 @@ START_TEST(filewriter) test_media_types(); test_enum_media_types(); test_connect_pin(); + test_misc_flags(); CoUninitialize(); }

1 0

Nikolay Sivov : dwrite: Use unsigned types for single-bit fields.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 73a6470d866df837b4fee13bb4644a03956940f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73a6470d866df837b4fee13b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 24 11:56:57 2020 +0300 dwrite: Use unsigned types for single-bit fields. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bd969a8fa6..ee52c3e321 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -100,8 +100,8 @@ struct dwrite_font_data LOGFONTW lf; /* used to mark font as tested when scanning for simulation candidate */ - BOOL bold_sim_tested : 1; - BOOL oblique_sim_tested : 1; + unsigned int bold_sim_tested : 1; + unsigned int oblique_sim_tested : 1; }; struct dwrite_fontfamily_data @@ -114,9 +114,9 @@ struct dwrite_fontfamily_data size_t size; size_t count; - BOOL has_normal_face : 1; - BOOL has_oblique_face : 1; - BOOL has_italic_face : 1; + unsigned int has_normal_face : 1; + unsigned int has_oblique_face : 1; + unsigned int has_italic_face : 1; }; struct dwrite_fontcollection

1 0

Jacek Caban : msvcp90: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: ddd4a7c3fb4f3ecd32927d69023aec59ef11c495 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd4a7c3fb4f3ecd32927d69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 20:10:36 2020 +0200 msvcp90: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 8 ++------ dlls/msvcp90/ios.c | 8 ++------ dlls/msvcp90/locale.c | 8 ++------ dlls/msvcp90/misc.c | 8 ++------ 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index e75b8cc729..15a6548b21 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1021,9 +1021,7 @@ void __cdecl __ExceptionPtrDestroy(exception_ptr *ep) #define EXCEPTION_VTABLE(name,funcs) __ASM_VTABLE(name,funcs VTABLE_ADD_FUNC(MSVCP_exception__Doraise)) #endif -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(exception_vtables) __ASM_VTABLE(type_info, VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor)); EXCEPTION_VTABLE(exception, @@ -1066,9 +1064,7 @@ void __asm_dummy_vtables(void) { EXCEPTION_VTABLE(range_error, VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor) VTABLE_ADD_FUNC(MSVCP_runtime_error_what)); -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END /* Internal: throws selected exception */ void throw_exception(exception_type et, const char *str) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8513965dd7..32dce89fd4 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -756,9 +756,7 @@ DEFINE_RTTI_DATA8(strstream, sizeof(strstream), &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, "?AVstrstream(a)std@@") -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(ios_vtables) __ASM_VTABLE(iosb, VTABLE_ADD_FUNC(iosb_vector_dtor)); __ASM_VTABLE(ios_base, @@ -1181,9 +1179,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END /* ?setp@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXPAD00(a)Z */ /* ?setp@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXPEAD00(a)Z */ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 9293e0c9ac..dec87c0a4e 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -12737,9 +12737,7 @@ DEFINE_RTTI_DATA1(time_base, 0, &locale_facet_rtti_base_descriptor, ".?AUtime_ba DEFINE_RTTI_DATA2(time_get_char, 0, &time_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@") DEFINE_RTTI_DATA2(time_get_wchar, 0, &time_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@") -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(locale_vtables) __ASM_VTABLE(_Facet_base, VTABLE_ADD_FUNC(locale_facet_vector_dtor) VTABLE_ADD_FUNC(locale_facet__Incref) @@ -13104,9 +13102,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(time_get_wchar_do_get) #endif ); -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END void init_locale(void *base) { diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 810a0bfbc0..acb13af51c 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2391,9 +2391,7 @@ void __thiscall _Concurrent_vector_base_v4__Internal_swap( } #endif -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(vtables) #if _MSVCP_VER == 100 __ASM_VTABLE(iostream_category, VTABLE_ADD_FUNC(custom_category_vector_dtor) @@ -2434,9 +2432,7 @@ void __asm_dummy_vtables(void) { __ASM_VTABLE(_Pad, VTABLE_ADD_FUNC(_Pad__Go)); #endif -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END /********************************************************************* * __crtInitializeCriticalSectionEx (MSVCP140.@)

1 0

Jacek Caban : msvcrt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 3f8ac955de59da9f81a17ccf9d20c7402d6b1773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f8ac955de59da9f81a17ccf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 20:10:47 2020 +0200 msvcrt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 8 ++------ dlls/msvcrt/scheduler.c | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 404aa1146e..500549c31e 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -991,9 +991,7 @@ void __thiscall MSVCRT_improper_scheduler_detach_dtor( #endif /* _MSVCR_VER >= 100 */ -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(vtables) __ASM_VTABLE(type_info, VTABLE_ADD_FUNC(MSVCRT_type_info_vector_dtor)); @@ -1041,9 +1039,7 @@ __ASM_VTABLE(improper_scheduler_detach, VTABLE_ADD_FUNC(MSVCRT_what_exception)); #endif -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) #if _MSVCR_VER >= 80 diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 08a3242e6b..68003e03f6 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -1094,9 +1094,7 @@ DEFINE_RTTI_DATA1(SchedulerBase, 0, &Scheduler_rtti_base_descriptor, ".?AVSchedu DEFINE_RTTI_DATA2(ThreadScheduler, 0, &SchedulerBase_rtti_base_descriptor, &Scheduler_rtti_base_descriptor, ".?AVThreadScheduler(a)details@Concurrency@@") -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(scheduler_vtables) __ASM_VTABLE(ExternalContextBase, VTABLE_ADD_FUNC(ExternalContextBase_GetId) VTABLE_ADD_FUNC(ExternalContextBase_GetVirtualProcessorId) @@ -1125,9 +1123,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ThreadScheduler_IsAvailableLocation) #endif ); -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END void msvcrt_init_scheduler(void *base) {

1 0

Damjan Jovanovic : mshtml: Support implicit RT_FILE resource type in res protocol.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 3e8bca0eb4f3f2c9b3bbf9fc634242512f8759b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e8bca0eb4f3f2c9b3bbf9fc… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 24 18:37:44 2020 +0200 mshtml: Support implicit RT_FILE resource type in res protocol. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47999 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/protocol.c | 13 +++++++++---- dlls/mshtml/tests/protocol.c | 32 ++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 +++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 8677030c35..a311d648f2 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -539,7 +539,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, DWORD grfPI, HANDLE_PTR dwReserved) { InternetProtocol *This = impl_from_IInternetProtocol(iface); - WCHAR *url_dll, *url_file, *url, *mime, *res_type = (LPWSTR)RT_HTML, *ptr; + WCHAR *url_dll, *url_file, *url, *mime, *res_type, *alt_res_type = NULL, *ptr; DWORD grfBINDF = 0, len; BINDINFO bindinfo; HMODULE hdll; @@ -593,7 +593,8 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, res_type = MAKEINTRESOURCEW(res_type_id); }else { url_file = res_type; - res_type = (LPWSTR)RT_HTML; + res_type = MAKEINTRESOURCEW(RT_HTML); + alt_res_type = MAKEINTRESOURCEW(2110 /* RT_FILE */); } /* Ignore query and hash parts. */ @@ -613,12 +614,16 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, TRACE("trying to find resource type %s, name %s\n", debugstr_w(res_type), debugstr_w(url_file)); src = FindResourceW(hdll, url_file, res_type); + if(!src && alt_res_type) + src = FindResourceW(hdll, url_file, alt_res_type); if(!src) { LPWSTR endpoint = NULL; DWORD file_id = wcstol(url_file, &endpoint, 10); - if(endpoint == url_file+lstrlenW(url_file)) + if(!*endpoint) { src = FindResourceW(hdll, MAKEINTRESOURCEW(file_id), res_type); - + if(!src && alt_res_type) + src = FindResourceW(hdll, MAKEINTRESOURCEW(file_id), alt_res_type); + } if(!src) { WARN("Could not find resource\n"); IInternetProtocolSink_ReportResult(pOIProtSink, diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 75063f5ecf..600ec72e16 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -262,6 +262,30 @@ static void protocol_start(IInternetProtocol *protocol, const WCHAR *url) CHECK_CALLED(ReportResult); } +static void test_res_url_fail(const WCHAR *url_suffix) +{ + WCHAR url[INTERNET_MAX_URL_LENGTH]; + IInternetProtocol *protocol; + HRESULT hres; + + wcscpy(url, res_url_base); + wcscat(url, url_suffix); + + hres = CoCreateInstance(&CLSID_ResProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); + ok(hres == S_OK, "Could not create ResProtocol instance: %08x\n", hres); + + SET_EXPECT(GetBindInfo); + SET_EXPECT(ReportResult); + expect_hr_win32err = TRUE; + hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); + ok(HRESULT_FACILITY(hres) == FACILITY_WIN32, + "%s: expected win32 error, got: %08x\n", debugstr_w(url_suffix), hres); + CHECK_CALLED(GetBindInfo); + CHECK_CALLED(ReportResult); + + IInternetProtocol_Release(protocol); +} + static void test_res_url(const char *url_suffix) { WCHAR url[INTERNET_MAX_URL_LENGTH]; @@ -604,6 +628,14 @@ static void test_res_protocol(void) test_res_url("/23/123"); test_res_url("/jstest.html"); + test_res_url("/jstest-rtfile.html"); + test_res_url("/#2110/jstest-rtfile.html"); + test_res_url("/2110/jstest-rtfile.html"); + + test_res_url_fail(L"/doesntexist/jstest-rtfile.html"); + test_res_url_fail(L"/2/jstest-rtfile.html"); + test_res_url_fail(L"/23/jstest-rtfile.html"); /* no fallback from explicit RT_HTML */ + test_res_url("/Test/res.html"); test_res_url("/test/dir/dir2/res.html"); diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 05bc836ac6..12e95b7456 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -28,6 +28,9 @@ asyncscriptload.js HTML "asyncscriptload.js" /* @makedep: jstest.html */ jstest.html HTML "jstest.html" +/* @makedep: jstest.html */ +jstest-rtfile.html 2110 "jstest.html" + /* @makedep: vbtest.html */ vbtest.html HTML "vbtest.html"

1 0

Nikolay Sivov : mf: Make sure to request another sample for sample grabber after current timed sample.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 7948b2519250f7b6eb732ff2fa1d9526cc28696e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7948b2519250f7b6eb732ff2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 24 17:47:04 2020 +0300 mf: Make sure to request another sample for sample grabber after current timed sample. Based on patch by Derek Lesho. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 2167b5001e..7d9fa78732 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -739,14 +739,22 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba if (FAILED(hr = sample_grabber_report_sample(grabber, item->u.sample, &sample_delivered))) WARN("Failed to report a sample, hr %#x.\n", hr); stream_release_pending_item(item); - item = stream_get_next_item(grabber); - if (item && item->type == ITEM_TYPE_SAMPLE) + + /* Schedule next sample, skipping markers. */ + LIST_FOR_EACH_ENTRY(item, &grabber->items, struct scheduled_item, entry) { - if (FAILED(hr = stream_schedule_sample(grabber, item))) - WARN("Failed to schedule a sample, hr %#x.\n", hr); - sample_grabber_stream_request_sample(grabber); - item = NULL; + if (item->type == ITEM_TYPE_SAMPLE) + { + if (FAILED(hr = stream_schedule_sample(grabber, item))) + WARN("Failed to schedule a sample, hr %#x.\n", hr); + break; + } } + + if (sample_delivered) + sample_grabber_stream_request_sample(grabber); + + item = NULL; break; case ITEM_TYPE_MARKER: sample_grabber_stream_report_marker(grabber, &item->u.marker.context, S_OK);

1 0