November 2020 - Wine-commits

Nikolay Sivov : evr/mixer: Set timestamp and duration for output samples.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 8e82c72083b9f5fcf2cde2ce26187c283ffc390f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e82c72083b9f5fcf2cde2ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 17 13:41:35 2020 +0300 evr/mixer: Set timestamp and duration for output samples. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 11 +++++++++++ dlls/evr/tests/evr.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 997c5054f12..ddf34d05f44 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1272,8 +1272,19 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D } if (SUCCEEDED(hr)) + { video_mixer_render(mixer, surface); + timestamp = duration = 0; + if (SUCCEEDED(IMFSample_GetSampleTime(mixer->inputs[0].sample, &timestamp))) + { + IMFSample_SetSampleTime(buffers->pSample, timestamp); + + IMFSample_GetSampleDuration(mixer->inputs[0].sample, &duration); + IMFSample_SetSampleDuration(buffers->pSample, duration); + } + } + if (SUCCEEDED(hr)) { for (i = 0; i < mixer->input_count; ++i) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index c456bcf5653..c83ce0374eb 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2219,13 +2219,14 @@ static void test_mixer_samples(void) IMFDesiredSample *desired; IDirect3DDevice9 *device; IMFMediaType *video_type; - DWORD color, status; + DWORD count, flags, color, status; IMFTransform *mixer; - IMFSample *sample; + IMFSample *sample, *sample2; IDirect3D9 *d3d; HWND window; UINT token; HRESULT hr; + LONGLONG pts, duration; window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -2395,6 +2396,57 @@ static void test_mixer_samples(void) hr = IMFTransform_ProcessInput(mixer, 5, sample, 0); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + /* ProcessOutput() sets sample time and duration. */ + hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetUINT32(sample2, &IID_IMFSample, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleFlags(sample2, 0x123); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetSampleTime(sample2, &pts); + ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetSampleDuration(sample2, &duration); + ok(hr == MF_E_NO_SAMPLE_DURATION, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleTime(sample, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleDuration(sample, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + memset(buffers, 0, sizeof(buffers)); + buffers[0].pSample = sample2; + hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetSampleTime(sample2, &pts); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!pts, "Unexpected sample time.\n"); + + hr = IMFSample_GetSampleDuration(sample2, &duration); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!duration, "Unexpected duration\n"); + + /* Flags are not copied. */ + hr = IMFSample_GetSampleFlags(sample2, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(flags == 0x123, "Unexpected flags %#x.\n", flags); + + /* Attributes are not removed. */ + hr = IMFSample_GetCount(sample2, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected attribute count %u.\n", count); + + hr = IMFSample_GetCount(sample, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected attribute count %u.\n", count); + + IMFSample_Release(sample2); + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_COMMAND_DRAIN, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/mixer: Improve GetService() handling of unsupported interfaces/services.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 315cf3b60fbea22092c399cdcf58654f2545cf88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=315cf3b60fbea22092c399cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 17 13:41:36 2020 +0300 evr/mixer: Improve GetService() handling of unsupported interfaces/services. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 +++- dlls/evr/tests/evr.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index ddf34d05f44..a7ce3949bec 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1650,11 +1650,13 @@ static HRESULT WINAPI video_mixer_getservice_GetService(IMFGetService *iface, RE { return IMFGetService_QueryInterface(iface, riid, obj); } + + return E_NOINTERFACE; } FIXME("Unsupported service %s, riid %s.\n", debugstr_guid(service), debugstr_guid(riid)); - return E_NOTIMPL; + return MF_E_UNSUPPORTED_SERVICE; } static const IMFGetServiceVtbl video_mixer_getservice_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index c83ce0374eb..60d74d1a224 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -489,6 +489,10 @@ static void test_default_mixer(void) check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, TRUE); check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, TRUE); check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); + check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, FALSE); + + hr = MFGetService((IUnknown *)transform, &MR_VIDEO_RENDER_SERVICE, &IID_IUnknown, (void **)&unk); + ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(MFGetService((IUnknown *)transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, (void **)&mixer_control2))) {

1 0

Nikolay Sivov : evr/presenter: Fix error code for unsupported services.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: fcb08263a508d2d29e2f7bf16f376a3ef817208d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcb08263a508d2d29e2f7bf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 17 13:41:37 2020 +0300 evr/presenter: Fix error code for unsupported services. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 2 +- dlls/evr/tests/evr.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 84ef223e0fc..51792cdc2cd 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1258,7 +1258,7 @@ static HRESULT WINAPI video_presenter_getservice_GetService(IMFGetService *iface FIXME("Unimplemented service %s.\n", debugstr_guid(service)); - return E_NOTIMPL; + return MF_E_UNSUPPORTED_SERVICE; } static const IMFGetServiceVtbl video_presenter_getservice_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 60d74d1a224..55986414a70 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1129,6 +1129,7 @@ static void test_default_presenter(void) IDirect3DDeviceManager9 *dm; IMFVideoDeviceID *deviceid; HWND hwnd, hwnd2; + IUnknown *unk; DWORD flags; float rate; HRESULT hr; @@ -1162,8 +1163,12 @@ static void test_default_presenter(void) check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFGetService, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDeviceID, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdvise, TRUE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTransform, FALSE); check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); + hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_MIXER_SERVICE, &IID_IUnknown, (void **)&unk); + ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/presenter: Add IDirect3DDeviceManager9 as a supported interface.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 81ba62654573ba624c394b2ed3559d022f9a7003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81ba62654573ba624c394b2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 17 13:41:38 2020 +0300 evr/presenter: Add IDirect3DDeviceManager9 as a supported interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 19 ++++++++++- 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 51792cdc2cd..ac81634f7ca 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -68,6 +68,7 @@ struct video_presenter IMFVideoPositionMapper IMFVideoPositionMapper_iface; IQualProp IQualProp_iface; IMFQualityAdvise IMFQualityAdvise_iface; + IDirect3DDeviceManager9 IDirect3DDeviceManager9_iface; IMFVideoSampleAllocatorNotify allocator_cb; IUnknown IUnknown_inner; IUnknown *outer_unk; @@ -152,6 +153,11 @@ static struct video_presenter *impl_from_IMFQualityAdvise(IMFQualityAdvise *ifac return CONTAINING_RECORD(iface, struct video_presenter, IMFQualityAdvise_iface); } +static struct video_presenter *impl_from_IDirect3DDeviceManager9(IDirect3DDeviceManager9 *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IDirect3DDeviceManager9_iface); +} + static void video_presenter_notify_renderer(struct video_presenter *presenter, LONG event, LONG_PTR param1, LONG_PTR param2) { @@ -480,6 +486,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFQualityAdvise_iface; } + else if (IsEqualIID(riid, &IID_IDirect3DDeviceManager9)) + { + *obj = &presenter->IDirect3DDeviceManager9_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -1486,6 +1496,85 @@ static const IMFQualityAdviseVtbl video_presenter_quality_advise_vtbl = video_presenter_quality_advise_DropTime, }; +static HRESULT WINAPI video_presenter_device_manager_QueryInterface(IDirect3DDeviceManager9 *iface, + REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_device_manager_AddRef(IDirect3DDeviceManager9 *iface) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_device_manager_Release(IDirect3DDeviceManager9 *iface) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_device_manager_ResetDevice(IDirect3DDeviceManager9 *iface, + IDirect3DDevice9 *device, UINT token) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_ResetDevice(presenter->device_manager, device, token); +} + +static HRESULT WINAPI video_presenter_device_manager_OpenDeviceHandle(IDirect3DDeviceManager9 *iface, HANDLE *hdevice) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_OpenDeviceHandle(presenter->device_manager, hdevice); +} + +static HRESULT WINAPI video_presenter_device_manager_CloseDeviceHandle(IDirect3DDeviceManager9 *iface, HANDLE hdevice) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_CloseDeviceHandle(presenter->device_manager, hdevice); +} + +static HRESULT WINAPI video_presenter_device_manager_TestDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_TestDevice(presenter->device_manager, hdevice); +} + +static HRESULT WINAPI video_presenter_device_manager_LockDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice, + IDirect3DDevice9 **device, BOOL block) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_LockDevice(presenter->device_manager, hdevice, device, block); +} + +static HRESULT WINAPI video_presenter_device_manager_UnlockDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice, + BOOL savestate) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_UnlockDevice(presenter->device_manager, hdevice, savestate); +} + +static HRESULT WINAPI video_presenter_device_manager_GetVideoService(IDirect3DDeviceManager9 *iface, HANDLE hdevice, + REFIID riid, void **service) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_GetVideoService(presenter->device_manager, hdevice, riid, service); +} + +static const IDirect3DDeviceManager9Vtbl video_presenter_device_manager_vtbl = +{ + video_presenter_device_manager_QueryInterface, + video_presenter_device_manager_AddRef, + video_presenter_device_manager_Release, + video_presenter_device_manager_ResetDevice, + video_presenter_device_manager_OpenDeviceHandle, + video_presenter_device_manager_CloseDeviceHandle, + video_presenter_device_manager_TestDevice, + video_presenter_device_manager_LockDevice, + video_presenter_device_manager_UnlockDevice, + video_presenter_device_manager_GetVideoService, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -1558,6 +1647,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFQualityAdvise_iface.lpVtbl = &video_presenter_quality_advise_vtbl; object->allocator_cb.lpVtbl = &video_presenter_allocator_cb_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; + object->IDirect3DDeviceManager9_iface.lpVtbl = &video_presenter_device_manager_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; object->src_rect.right = object->src_rect.bottom = 1.0f; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 55986414a70..34a69559b65 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1128,8 +1128,8 @@ static void test_default_presenter(void) IMFRateSupport *rate_support; IDirect3DDeviceManager9 *dm; IMFVideoDeviceID *deviceid; + IUnknown *unk, *unk2; HWND hwnd, hwnd2; - IUnknown *unk; DWORD flags; float rate; HRESULT hr; @@ -1153,6 +1153,7 @@ static void test_default_presenter(void) check_interface(presenter, &IID_IMFVideoPresenter, TRUE); check_interface(presenter, &IID_IMFVideoDeviceID, TRUE); check_interface(presenter, &IID_IMFQualityAdvise, TRUE); + check_interface(presenter, &IID_IDirect3DDeviceManager9, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPresenter, TRUE); @@ -1164,8 +1165,24 @@ static void test_default_presenter(void) check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDeviceID, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdvise, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTransform, FALSE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); + /* Query arbitrary supported interface back from device manager wrapper. */ + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IDirect3DDeviceManager9, (void **)&dm); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_QueryInterface(dm, &IID_IQualProp, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IDirect3DDeviceManager9_QueryInterface(dm, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk == unk2, "Unexpected interface.\n"); + IUnknown_Release(unk2); + IUnknown_Release(unk); + IDirect3DDeviceManager9_Release(dm); + hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_MIXER_SERVICE, &IID_IUnknown, (void **)&unk); ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/tests: Presenter should support IMFQualityAdviseLimits.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 22d934c078e2c54d93390eff3e336c43d28960a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22d934c078e2c54d93390eff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 17 13:41:39 2020 +0300 evr/tests: Presenter should support IMFQualityAdviseLimits. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 34a69559b65..18822e1e4fa 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1154,6 +1154,7 @@ static void test_default_presenter(void) check_interface(presenter, &IID_IMFVideoDeviceID, TRUE); check_interface(presenter, &IID_IMFQualityAdvise, TRUE); check_interface(presenter, &IID_IDirect3DDeviceManager9, TRUE); + todo_wine check_interface(presenter, &IID_IMFQualityAdviseLimits, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPresenter, TRUE);

1 0

Nikolay Sivov : evr/presenter: Implement sample presenting functionality.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 4b87269d003039090648d942f1bb94532bea0306 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b87269d003039090648d942… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 17 13:41:40 2020 +0300 evr/presenter: Implement sample presenting functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 324 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 273 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b87269d003039090648…

1 0

Georg Lehmann : winevulkan: Initialize Vulkan in native_vkGetInstanceProcAddrWINE.
by Alexandre Julliard 16 Nov '20

16 Nov '20

Module: wine Branch: master Commit: 80fcfbc25a6ae1edd15f77dae95c0c1a12456610 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80fcfbc25a6ae1edd15f77da… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Nov 6 17:06:30 2020 +0100 winevulkan: Initialize Vulkan in native_vkGetInstanceProcAddrWINE. In the past this was done in DllMain, the removal broke winelib applications. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 8e369d95f47..b0a8559fe2c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -2053,6 +2053,10 @@ static void *wine_vk_get_global_proc_addr(const char *name) */ void *native_vkGetInstanceProcAddrWINE(VkInstance instance, const char *name) { + wine_vk_init_once(); + if (!vk_funcs) + return NULL; + return vk_funcs->p_vkGetInstanceProcAddr(instance, name); }

1 0

Rémi Bernon : widl: Support repetition for some attributes.
by Alexandre Julliard 16 Nov '20

16 Nov '20

Module: wine Branch: master Commit: 92eb5ef5a1ada34853b57626b4e5201010decc21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92eb5ef5a1ada34853b57626… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 4 19:49:27 2020 +0100 widl: Support repetition for some attributes. Some attributes can be specified multiple times, this is the case for instance for "custom" attribute, as well as WinRT "static". Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: PuetzKevinA(a)JohnDeere.com Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 249 +++++++++++++++++++++++++++------------------------- 1 file changed, 127 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92eb5ef5a1ada34853b5…

1 0

Rémi Bernon : widl: Restrict some keywords to WinRT mode only.
by Alexandre Julliard 16 Nov '20

16 Nov '20

Module: wine Branch: master Commit: a154a42c0d72ed863d317cdbad9678ffa212467c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a154a42c0d72ed863d317cdb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 4 19:49:28 2020 +0100 widl: Restrict some keywords to WinRT mode only. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 339 ++++++++++++++++++++++++++-------------------------- 1 file changed, 170 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a154a42c0d72ed863d31…

1 0

Rémi Bernon : widl: Prefer mangled name over typedef in WinRT mode.
by Alexandre Julliard 16 Nov '20

16 Nov '20

Module: wine Branch: master Commit: a35ca92362750f8a49fc15efddc2c48caa07959e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a35ca92362750f8a49fc15ef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 4 19:49:29 2020 +0100 widl: Prefer mangled name over typedef in WinRT mode. For types under a non-global namespace. MIDL generates prefixed mangled name for every use of enum, struct and union types. When the types are in the global namespace, the typedef name is used instead. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 22 ++++++++++++++-------- tools/widl/typetree.c | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 743d86f0ee9..015bbe2ece7 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -192,7 +192,7 @@ const char *get_name(const var_t *v) return v->name; } -static void write_fields(FILE *h, var_list_t *fields) +static void write_fields(FILE *h, var_list_t *fields, enum name_type name_type) { unsigned nameless_struct_cnt = 0, nameless_struct_i = 0, nameless_union_cnt = 0, nameless_union_i = 0; const char *name; @@ -250,7 +250,7 @@ static void write_fields(FILE *h, var_list_t *fields) default: ; } - write_type_v(h, &v->declspec, TRUE, v->declonly, name, NAME_DEFAULT); + write_type_v(h, &v->declspec, TRUE, v->declonly, name, name_type); fprintf(h, ";\n"); } } @@ -322,7 +322,7 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i if ((ds->qualifier & TYPE_QUALIFIER_CONST) && (type_is_alias(t) || !is_ptr(t))) fprintf(h, "const "); - if (type_is_alias(t)) fprintf(h, "%s", t->name); + if (!winrt_mode && type_is_alias(t)) fprintf(h, "%s", t->name); else { switch (type_get_type_detect_alias(t)) { case TYPE_ENUM: @@ -347,9 +347,9 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i t->written = TRUE; indentation++; if (type_get_type(t) != TYPE_STRUCT) - write_fields(h, type_encapsulated_union_get_fields(t)); + write_fields(h, type_encapsulated_union_get_fields(t), name_type); else - write_fields(h, type_struct_get_fields(t)); + write_fields(h, type_struct_get_fields(t), name_type); indent(h, -1); fprintf(h, "}"); } @@ -362,7 +362,7 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i else fprintf(h, "union {\n"); t->written = TRUE; indentation++; - write_fields(h, type_union_get_cases(t)); + write_fields(h, type_union_get_cases(t), name_type); indent(h, -1); fprintf(h, "}"); } @@ -464,9 +464,13 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i break; } case TYPE_ALIAS: - /* handled elsewhere */ - assert(0); + { + const decl_spec_t *ds = type_alias_get_aliasee(t); + int in_namespace = ds && ds->type && ds->type->namespace && !is_global_namespace(ds->type->namespace); + if (!in_namespace) fprintf(h, "%s", t->name); + else write_type_left(h, ds, name_type, declonly, write_callconv); break; + } } } } @@ -801,6 +805,8 @@ static void write_generic_handle_routines(FILE *header) static void write_typedef(FILE *header, type_t *type, int declonly) { + type_t *t = type_alias_get_aliasee_type(type); + if (winrt_mode && t->namespace && !is_global_namespace(t->namespace)) return; fprintf(header, "typedef "); write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name, NAME_DEFAULT); fprintf(header, ";\n"); diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index e9afc6fdd28..c0547b36a96 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -82,7 +82,7 @@ const char *type_get_name(const type_t *type, enum name_type name_type) case NAME_DEFAULT: return type->name; case NAME_C: - return type->c_name; + return type->c_name ? type->c_name : type->name; } assert(0);

1 0