October 2020 - Wine-Commits

Nikolay Sivov : mfplat: Added MFBeginRegisterWorkQueueWithMMCSS().
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: eb9556bd608300064ba938d90a50edfc4c584de0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb9556bd608300064ba938d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 7 11:40:23 2020 +0300 mfplat: Added MFBeginRegisterWorkQueueWithMMCSS(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/queue.c | 10 ++++++++++ include/mfapi.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 8f5e7db6ae..5f4735cd6f 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -23,7 +23,7 @@ @ stub MFAverageTimePerFrameToFrameRate @ stdcall MFBeginCreateFile(long long long wstr ptr ptr ptr) @ stub MFBeginGetHostByName -@ stub MFBeginRegisterWorkQueueWithMMCSS +@ stdcall MFBeginRegisterWorkQueueWithMMCSS(long wstr long ptr ptr) @ stdcall MFBeginRegisterWorkQueueWithMMCSSEx(long wstr long long ptr ptr) rtworkq.RtwqBeginRegisterWorkQueueWithMMCSS @ stdcall MFBeginUnregisterWorkQueueWithMMCSS(long ptr ptr) rtworkq.RtwqBeginUnregisterWorkQueueWithMMCSS @ stub MFBlockThread diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 2080a79f84..8279929b46 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -140,3 +140,13 @@ HRESULT WINAPI MFGetTimerPeriodicity(DWORD *period) return S_OK; } + +/*********************************************************************** + * MFBeginRegisterWorkQueueWithMMCSS (mfplat.@) + */ +HRESULT WINAPI MFBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *usage_class, DWORD taskid, + IMFAsyncCallback *callback, IUnknown *state) +{ + return RtwqBeginRegisterWorkQueueWithMMCSS(queue, usage_class, taskid, 0, + (IRtwqAsyncCallback *)callback, state); +} diff --git a/include/mfapi.h b/include/mfapi.h index e9b26f322c..499c77ab33 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -488,6 +488,8 @@ HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMODE open_mode, MF_FILE_FLAGS flags, const WCHAR *path, IMFAsyncCallback *callback, IUnknown *state, IUnknown **cancel_cookie); +HRESULT WINAPI MFBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *usage_class, DWORD taskid, + IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFBeginRegisterWorkQueueWithMMCSSEx(DWORD queue, const WCHAR *usage_class, DWORD taskid, LONG priority, IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IMFAsyncCallback *callback, IUnknown *state);

1 0

Henri Verbeet : wined3d: Implement rasteriser discard for the Vulkan adapter.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: f494552c10ece8dccf46ce2749b2791c2b9f2230 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f494552c10ece8dccf46ce27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 16:45:08 2020 +0330 wined3d: Implement rasteriser discard for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index aeb505ebfc..20a4522df5 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1761,6 +1761,7 @@ static void wined3d_context_vk_update_rasterisation_state(const struct wined3d_c if (!state->rasterizer_state) { desc->depthClampEnable = VK_FALSE; + desc->rasterizerDiscardEnable = is_rasterization_disabled(state->shader[WINED3D_SHADER_TYPE_GEOMETRY]); desc->cullMode = VK_CULL_MODE_BACK_BIT; desc->frontFace = VK_FRONT_FACE_CLOCKWISE; desc->depthBiasEnable = VK_FALSE; @@ -1773,6 +1774,7 @@ static void wined3d_context_vk_update_rasterisation_state(const struct wined3d_c r = &state->rasterizer_state->desc; desc->depthClampEnable = !r->depth_clip; + desc->rasterizerDiscardEnable = is_rasterization_disabled(state->shader[WINED3D_SHADER_TYPE_GEOMETRY]); desc->cullMode = vk_cull_mode_from_wined3d(r->cull_mode); desc->frontFace = r->front_ccw ? VK_FRONT_FACE_COUNTER_CLOCKWISE : VK_FRONT_FACE_CLOCKWISE; @@ -2017,7 +2019,8 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } - if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER)) + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER) + || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY))) { wined3d_context_vk_update_rasterisation_state(context_vk, state, key);

1 0

Henri Verbeet : wined3d: Initialise the list of Vulkan device extensions during adapter initialisation.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 10bfc47a48d0cc16673b836710d1cc1e969a7d43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10bfc47a48d0cc16673b8367… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 16:45:09 2020 +0330 wined3d: Initialise the list of Vulkan device extensions during adapter initialisation. There's no reason to wait until wined3d device creation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 174 +++++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 99 insertions(+), 77 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 799ec2601e..e589699bcd 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -274,6 +274,7 @@ static void adapter_vk_destroy(struct wined3d_adapter *adapter) VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); wined3d_unload_vulkan(vk_info); wined3d_adapter_cleanup(&adapter_vk->a); + heap_free(adapter_vk->device_extensions); heap_free(adapter_vk); } @@ -397,82 +398,12 @@ static const struct wined3d_allocator_ops wined3d_allocator_vk_ops = .allocator_destroy_chunk = wined3d_allocator_vk_destroy_chunk, }; -static const struct -{ - const char *name; - unsigned int core_since_version; -} -vulkan_device_extensions[] = -{ - {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u}, - {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1}, - {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1}, - {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u}, -}; - -static bool enable_vulkan_device_extensions(VkPhysicalDevice physical_device, uint32_t *extension_count, - const char *enabled_extensions[], const struct wined3d_vk_info *vk_info) -{ - VkExtensionProperties *extensions = NULL; - bool success = false, found; - unsigned int i, j, count; - VkResult vr; - - *extension_count = 0; - - if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) - { - ERR("Failed to enumerate device extensions, vr %s.\n", wined3d_debug_vkresult(vr)); - goto done; - } - if (!(extensions = heap_calloc(count, sizeof(*extensions)))) - { - WARN("Out of memory.\n"); - goto done; - } - if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, extensions))) < 0) - { - ERR("Failed to enumerate device extensions, vr %s.\n", wined3d_debug_vkresult(vr)); - goto done; - } - - for (i = 0; i < ARRAY_SIZE(vulkan_device_extensions); ++i) - { - if (vulkan_device_extensions[i].core_since_version <= vk_info->api_version) - continue; - - for (j = 0, found = false; j < count; ++j) - { - if (!strcmp(extensions[j].extensionName, vulkan_device_extensions[i].name)) - { - found = true; - break; - } - } - - if (!found) - { - WARN("Required extension '%s' is not available.\n", vulkan_device_extensions[i].name); - goto done; - } - - TRACE("Enabling instance extension '%s'.\n", vulkan_device_extensions[i].name); - enabled_extensions[(*extension_count)++] = vulkan_device_extensions[i].name; - } - success = true; - -done: - heap_free(extensions); - return success; -} - static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk_const(adapter); - const char *enabled_device_extensions[ARRAY_SIZE(vulkan_device_extensions)]; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features; const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; struct wined3d_physical_device_info physical_device_info; @@ -533,13 +464,8 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi device_info.pQueueCreateInfos = &queue_info; device_info.enabledLayerCount = 0; device_info.ppEnabledLayerNames = NULL; - device_info.ppEnabledExtensionNames = enabled_device_extensions; - if (!enable_vulkan_device_extensions(physical_device, - &device_info.enabledExtensionCount, enabled_device_extensions, vk_info)) - { - hr = E_FAIL; - goto fail; - } + device_info.enabledExtensionCount = adapter_vk->device_extension_count; + device_info.ppEnabledExtensionNames = adapter_vk->device_extensions; device_info.pEnabledFeatures = &features2->features; if ((vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device))) < 0) @@ -2146,6 +2072,93 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; } +static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk *adapter_vk) +{ + VkPhysicalDevice physical_device = adapter_vk->physical_device; + struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + unsigned int count, enable_count, i, j; + const char **enabled_extensions = NULL; + VkExtensionProperties *extensions; + bool found, success = false; + SIZE_T enable_size = 0; + VkResult vr; + + static const struct + { + const char *name; + unsigned int core_since_version; + } + info[] = + { + {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u}, + {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1}, + {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1}, + {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u}, + }; + + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) + { + ERR("Failed to enumerate device extensions, vr %s.\n", wined3d_debug_vkresult(vr)); + return false; + } + + if (!(extensions = heap_calloc(count, sizeof(*extensions)))) + { + ERR("Failed to allocate extension properties array.\n"); + return false; + } + + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, extensions))) < 0) + { + ERR("Failed to enumerate device extensions, vr %s.\n", wined3d_debug_vkresult(vr)); + goto done; + } + + for (i = 0, enable_count = 0; i < ARRAY_SIZE(info); ++i) + { + if (info[i].core_since_version <= vk_info->api_version) + continue; + + for (j = 0, found = false; j < count; ++j) + { + if (!strcmp(extensions[j].extensionName, info[i].name)) + { + found = true; + break; + } + } + + if (!found) + { + WARN("Required extension '%s' is not available.\n", info[i].name); + goto done; + } + + TRACE("Enabling device extension '%s'.\n", info[i].name); + if (!wined3d_array_reserve((void **)&enabled_extensions, &enable_size, + enable_count + 1, sizeof(*enabled_extensions))) + { + ERR("Failed to allocate enabled extensions array.\n"); + goto done; + } + enabled_extensions[enable_count++] = info[i].name; + } + success = true; + +done: + if (success) + { + adapter_vk->device_extension_count = enable_count; + adapter_vk->device_extensions = enabled_extensions; + } + else + { + heap_free(enabled_extensions); + } + heap_free(extensions); + return success; +} + static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { @@ -2167,6 +2180,9 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (!(adapter_vk->physical_device = get_vulkan_physical_device(vk_info))) goto fail_vulkan; + if (!wined3d_adapter_vk_init_device_extensions(adapter_vk)) + goto fail_vulkan; + memset(&id_properties, 0, sizeof(id_properties)); id_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; @@ -2184,7 +2200,10 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, luid = (LUID *)id_properties.deviceLUID; if (!wined3d_adapter_init(adapter, ordinal, luid, &wined3d_adapter_vk_ops)) + { + heap_free(adapter_vk->device_extensions); goto fail_vulkan; + } adapter->vertex_pipe = wined3d_spirv_vertex_pipe_init_vk(); adapter->fragment_pipe = wined3d_spirv_fragment_pipe_init_vk(); @@ -2210,6 +2229,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, fail: wined3d_adapter_cleanup(adapter); + heap_free(adapter_vk->device_extensions); fail_vulkan: VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); wined3d_unload_vulkan(vk_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1c783d28bc..a4ab61b186 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3347,6 +3347,8 @@ struct wined3d_adapter_vk struct wined3d_adapter a; struct wined3d_vk_info vk_info; + unsigned int device_extension_count; + const char **device_extensions; VkPhysicalDevice physical_device; VkPhysicalDeviceLimits device_limits;

1 0

Henri Verbeet : wined3d: Only store unique stream output descriptions.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 3d883c640c6309ccadc6757243ea6c150ad4add0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d883c640c6309ccadc67572… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 16:45:10 2020 +0330 wined3d: Only store unique stream output descriptions. This allows us to compare them by pointer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 54 +++++++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 10 +++--- dlls/wined3d/shader.c | 77 ++++++++++++++++++++++++++++++++++-------- dlls/wined3d/shader_spirv.c | 12 ++++--- dlls/wined3d/wined3d_private.h | 16 ++++++--- 5 files changed, 140 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d883c640c6309ccadc6…

1 0

Henri Verbeet : wined3d: Implement stream output for the Vulkan adapter.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: cee2e53c3bdb93fb9e9c269c24a8060ac04bc9e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cee2e53c3bdb93fb9e9c269c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 16:45:12 2020 +0330 wined3d: Implement stream output for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 86 +++++++++++++++++++++++++++++++++++++++--- dlls/wined3d/buffer.c | 13 ++++++- dlls/wined3d/context_vk.c | 74 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++- dlls/wined3d/wined3d_vk.h | 9 +++++ 5 files changed, 181 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cee2e53c3bdb93fb9e9c…

1 0

Nikolay Sivov : evr/presenter: Update cached native size on format negotiation.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 59f3337a394271cf729977a77fefb9950cf460d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59f3337a394271cf729977a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 7 11:40:21 2020 +0300 evr/presenter: Update cached native size on format negotiation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 118 +++++++++++++++++++++++++++++++-------------------- dlls/evr/tests/evr.c | 2 - 2 files changed, 71 insertions(+), 49 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index ba9e09c4e3..ecfa923442 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -103,6 +103,58 @@ static struct video_presenter *impl_from_IMFGetService(IMFGetService *iface) return CONTAINING_RECORD(iface, struct video_presenter, IMFGetService_iface); } +static unsigned int get_gcd(unsigned int a, unsigned int b) +{ + unsigned int m; + + while (b) + { + m = a % b; + a = b; + b = m; + } + + return a; +} + +static void video_presenter_get_native_video_size(struct video_presenter *presenter) +{ + IMFMediaType *media_type; + UINT64 frame_size = 0; + + memset(&presenter->native_size, 0, sizeof(presenter->native_size)); + memset(&presenter->native_ratio, 0, sizeof(presenter->native_ratio)); + + if (!presenter->mixer) + return; + + if (FAILED(IMFTransform_GetInputCurrentType(presenter->mixer, 0, &media_type))) + return; + + if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size))) + { + unsigned int gcd; + + presenter->native_size.cx = frame_size >> 32; + presenter->native_size.cy = frame_size; + + if ((gcd = get_gcd(presenter->native_size.cx, presenter->native_size.cy))) + { + presenter->native_ratio.cx = presenter->native_size.cx / gcd; + presenter->native_ratio.cy = presenter->native_size.cy / gcd; + } + } + + IMFMediaType_Release(media_type); +} + +static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) +{ + video_presenter_get_native_video_size(presenter); + + return S_OK; +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -277,9 +329,26 @@ static HRESULT WINAPI video_presenter_OnClockSetRate(IMFVideoPresenter *iface, M static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, MFVP_MESSAGE_TYPE message, ULONG_PTR param) { - FIXME("%p, %d, %lu.\n", iface, message, param); + struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %d, %lu.\n", iface, message, param); + + EnterCriticalSection(&presenter->cs); + + switch (message) + { + case MFVP_MESSAGE_INVALIDATEMEDIATYPE: + hr = video_presenter_invalidate_media_type(presenter); + break; + default: + FIXME("Unsupported message %u.\n", message); + hr = E_NOTIMPL; + } + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_GetCurrentMediaType(IMFVideoPresenter *iface, IMFVideoMediaType **media_type) @@ -379,51 +448,6 @@ static void video_presenter_set_mixer_rect(struct video_presenter *presenter) } } -static unsigned int get_gcd(unsigned int a, unsigned int b) -{ - unsigned int m; - - while (b) - { - m = a % b; - a = b; - b = m; - } - - return a; -} - -static void video_presenter_get_native_video_size(struct video_presenter *presenter) -{ - IMFMediaType *media_type; - UINT64 frame_size = 0; - - memset(&presenter->native_size, 0, sizeof(presenter->native_size)); - memset(&presenter->native_ratio, 0, sizeof(presenter->native_ratio)); - - if (!presenter->mixer) - return; - - if (FAILED(IMFTransform_GetInputCurrentType(presenter->mixer, 0, &media_type))) - return; - - if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size))) - { - unsigned int gcd; - - presenter->native_size.cx = frame_size >> 32; - presenter->native_size.cy = frame_size; - - if ((gcd = get_gcd(presenter->native_size.cx, presenter->native_size.cy))) - { - presenter->native_ratio.cx = presenter->native_size.cx / gcd; - presenter->native_ratio.cy = presenter->native_size.cy / gcd; - } - } - - IMFMediaType_Release(media_type); -} - static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) { IMFVideoDeviceID *device_id; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 39d2ed72a0..e7eabc5971 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1640,12 +1640,10 @@ static void test_presenter_native_video_size(void) /* Negotiating types updates native video size. */ hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(size.cx == 320 && size.cy == 240, "Unexpected size %u x %u.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy);

1 0

Nikolay Sivov : evr/presenter: Request original reference frame size when attaching the mixer.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 95dcc559fcd9b5f7e6a492e51781c95a257d2dc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95dcc559fcd9b5f7e6a492e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 7 11:40:20 2020 +0300 evr/presenter: Request original reference frame size when attaching the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/evr/tests/evr.c | 17 +++++--------- 2 files changed, 68 insertions(+), 13 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 15ebcd80ac..ba9e09c4e3 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -62,6 +62,8 @@ struct video_presenter MFVideoNormalizedRect src_rect; RECT dst_rect; DWORD rendering_prefs; + SIZE native_size; + SIZE native_ratio; unsigned int state; CRITICAL_SECTION cs; }; @@ -377,6 +379,51 @@ static void video_presenter_set_mixer_rect(struct video_presenter *presenter) } } +static unsigned int get_gcd(unsigned int a, unsigned int b) +{ + unsigned int m; + + while (b) + { + m = a % b; + a = b; + b = m; + } + + return a; +} + +static void video_presenter_get_native_video_size(struct video_presenter *presenter) +{ + IMFMediaType *media_type; + UINT64 frame_size = 0; + + memset(&presenter->native_size, 0, sizeof(presenter->native_size)); + memset(&presenter->native_ratio, 0, sizeof(presenter->native_ratio)); + + if (!presenter->mixer) + return; + + if (FAILED(IMFTransform_GetInputCurrentType(presenter->mixer, 0, &media_type))) + return; + + if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size))) + { + unsigned int gcd; + + presenter->native_size.cx = frame_size >> 32; + presenter->native_size.cy = frame_size; + + if ((gcd = get_gcd(presenter->native_size.cx, presenter->native_size.cy))) + { + presenter->native_ratio.cx = presenter->native_size.cx / gcd; + presenter->native_ratio.cy = presenter->native_size.cy / gcd; + } + } + + IMFMediaType_Release(media_type); +} + static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) { IMFVideoDeviceID *device_id; @@ -410,6 +457,7 @@ static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, I } video_presenter_set_mixer_rect(presenter); + video_presenter_get_native_video_size(presenter); return hr; } @@ -508,9 +556,21 @@ static ULONG WINAPI video_presenter_control_Release(IMFVideoDisplayControl *ifac static HRESULT WINAPI video_presenter_control_GetNativeVideoSize(IMFVideoDisplayControl *iface, SIZE *video_size, SIZE *aspect_ratio) { - FIXME("%p, %p, %p.\n", iface, video_size, aspect_ratio); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, video_size, aspect_ratio); + + if (!video_size && !aspect_ratio) + return E_POINTER; + + EnterCriticalSection(&presenter->cs); + if (video_size) + *video_size = presenter->native_size; + if (aspect_ratio) + *aspect_ratio = presenter->native_ratio; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } static HRESULT WINAPI video_presenter_control_GetIdealVideoSize(IMFVideoDisplayControl *iface, SIZE *min_size, diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index ce2803bcb3..39d2ed72a0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1578,21 +1578,18 @@ static void test_presenter_native_video_size(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, NULL, NULL); -todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); memset(&size, 0xcc, sizeof(size)); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, NULL); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(size.cx == 0 && size.cy == 0, "Unexpected size.\n"); -} + memset(&ratio, 0xcc, sizeof(ratio)); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, NULL, &ratio); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(ratio.cx == 0 && ratio.cy == 0, "Unexpected ratio.\n"); -} + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1623,12 +1620,11 @@ todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); -} + /* Update input type. */ hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)320 << 32 | 240); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1637,24 +1633,23 @@ todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); -} + /* Negotiating types updates native video size. */ hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine ok(size.cx == 320 && size.cy == 240, "Unexpected size %u x %u.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); -} + IMFVideoMediaType_Release(video_type); IMFVideoDisplayControl_Release(display_control); IMFVideoPresenter_Release(presenter);

1 0

Nikolay Sivov : evr/tests: Add some tests for presenter's GetNativeVideoSize().
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: d2beff26236258a9c8853d0a54534a79d595ae7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2beff26236258a9c8853d0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 7 11:40:19 2020 +0300 evr/tests: Add some tests for presenter's GetNativeVideoSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/evr.c | 55 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index 5bd82277d1..c5db2226eb 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = evr.dll -IMPORTS = dxva2 mfplat mfuuid strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 +IMPORTS = dxva2 mfplat mfuuid mf strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 C_SRCS = \ evr.c diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 70c7053efd..ce2803bcb3 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1562,6 +1562,8 @@ static void test_presenter_native_video_size(void) IMFTransform *mixer; SIZE size, ratio; HRESULT hr; + IMFVideoMediaType *video_type; + IDirect3DDeviceManager9 *dm; hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); @@ -1594,6 +1596,27 @@ todo_wine { hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Configure mixer primary stream. */ + hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)dm); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDirect3DDeviceManager9_Release(dm); + + hr = pMFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB32, &video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(mixer, 0, (IMFMediaType *)video_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Native video size is cached on initialization. */ init_test_host(&host, mixer, presenter); hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, &host.IMFTopologyServiceLookup_iface); @@ -1602,9 +1625,37 @@ todo_wine { hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(size.cx == 0 && size.cy == 0, "Unexpected size.\n"); - ok(ratio.cx == 0 && ratio.cy == 0, "Unexpected ratio.\n"); + ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, + "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); +} + /* Update input type. */ + hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)320 << 32 | 240); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(mixer, 0, (IMFMediaType *)video_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, + "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); } + /* Negotiating types updates native video size. */ + hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.cx == 320 && size.cy == 240, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, + "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); +} + IMFVideoMediaType_Release(video_type); IMFVideoDisplayControl_Release(display_control); IMFVideoPresenter_Release(presenter); IMFTransform_Release(mixer);

1 0

Daniel Lehman : tzres: Add Cuba Time Zone.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 3d268f1fdc7798a9b0cce4e1e7f5f279ebc13842 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d268f1fdc7798a9b0cce4e1… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Oct 6 23:13:29 2020 -0700 tzres: Add Cuba Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 18 +++ po/ar.po | 310 ++++++++++++++++++++++++++------------------------- po/ast.po | 310 ++++++++++++++++++++++++++------------------------- po/bg.po | 306 +++++++++++++++++++++++++------------------------- po/ca.po | 310 ++++++++++++++++++++++++++------------------------- po/cs.po | 310 ++++++++++++++++++++++++++------------------------- po/da.po | 310 ++++++++++++++++++++++++++------------------------- po/de.po | 310 ++++++++++++++++++++++++++------------------------- po/el.po | 306 +++++++++++++++++++++++++------------------------- po/en.po | 306 +++++++++++++++++++++++++------------------------- po/en_US.po | 306 +++++++++++++++++++++++++------------------------- po/eo.po | 310 ++++++++++++++++++++++++++------------------------- po/es.po | 310 ++++++++++++++++++++++++++------------------------- po/fa.po | 308 +++++++++++++++++++++++++------------------------- po/fi.po | 310 ++++++++++++++++++++++++++------------------------- po/fr.po | 310 ++++++++++++++++++++++++++------------------------- po/he.po | 310 ++++++++++++++++++++++++++------------------------- po/hi.po | 306 +++++++++++++++++++++++++------------------------- po/hr.po | 310 ++++++++++++++++++++++++++------------------------- po/hu.po | 310 ++++++++++++++++++++++++++------------------------- po/it.po | 310 ++++++++++++++++++++++++++------------------------- po/ja.po | 310 ++++++++++++++++++++++++++------------------------- po/ko.po | 310 ++++++++++++++++++++++++++------------------------- po/lt.po | 310 ++++++++++++++++++++++++++------------------------- po/ml.po | 306 +++++++++++++++++++++++++------------------------- po/nb_NO.po | 310 ++++++++++++++++++++++++++------------------------- po/nl.po | 310 ++++++++++++++++++++++++++------------------------- po/or.po | 306 +++++++++++++++++++++++++------------------------- po/pa.po | 306 +++++++++++++++++++++++++------------------------- po/pl.po | 310 ++++++++++++++++++++++++++------------------------- po/pt_BR.po | 310 ++++++++++++++++++++++++++------------------------- po/pt_PT.po | 310 ++++++++++++++++++++++++++------------------------- po/rm.po | 306 +++++++++++++++++++++++++------------------------- po/ro.po | 310 ++++++++++++++++++++++++++------------------------- po/ru.po | 306 +++++++++++++++++++++++++------------------------- po/si.po | 310 ++++++++++++++++++++++++++------------------------- po/sk.po | 310 ++++++++++++++++++++++++++------------------------- po/sl.po | 310 ++++++++++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 308 +++++++++++++++++++++++++------------------------- po/sr_RS(a)latin.po | 308 +++++++++++++++++++++++++------------------------- po/sv.po | 310 ++++++++++++++++++++++++++------------------------- po/ta.po | 306 +++++++++++++++++++++++++------------------------- po/te.po | 306 +++++++++++++++++++++++++------------------------- po/th.po | 308 +++++++++++++++++++++++++------------------------- po/tr.po | 310 ++++++++++++++++++++++++++------------------------- po/uk.po | 306 +++++++++++++++++++++++++------------------------- po/wa.po | 308 +++++++++++++++++++++++++------------------------- po/wine.pot | 306 +++++++++++++++++++++++++------------------------- po/zh_CN.po | 310 ++++++++++++++++++++++++++------------------------- po/zh_TW.po | 310 ++++++++++++++++++++++++++------------------------- 51 files changed, 7843 insertions(+), 7301 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d268f1fdc7798a9b0cc…

1 0

Jacek Caban : conhost: Scroll window to cursor position when needed.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: a90017845d2f65ecd8c1bd32c3019bcd2b13ecd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a90017845d2f65ecd8c1bd32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 6 18:53:30 2020 +0200 conhost: Scroll window to cursor position when needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a54238c80f..7d3564a120 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -392,6 +392,24 @@ static void empty_update_rect( struct screen_buffer *screen_buffer, RECT *rect ) SetRect( rect, screen_buffer->width, screen_buffer->height, 0, 0 ); } +static void scroll_to_cursor( struct screen_buffer *screen_buffer ) +{ + int w = screen_buffer->win.right - screen_buffer->win.left + 1; + int h = screen_buffer->win.bottom - screen_buffer->win.top + 1; + + if (screen_buffer->cursor_x < screen_buffer->win.left) + screen_buffer->win.left = min( screen_buffer->cursor_x, screen_buffer->width - w ); + else if (screen_buffer->cursor_x > screen_buffer->win.right) + screen_buffer->win.left = max( screen_buffer->cursor_x, w ) - w + 1; + screen_buffer->win.right = screen_buffer->win.left + w - 1; + + if (screen_buffer->cursor_y < screen_buffer->win.top) + screen_buffer->win.top = min( screen_buffer->cursor_y, screen_buffer->height - h ); + else if (screen_buffer->cursor_y > screen_buffer->win.bottom) + screen_buffer->win.top = max( screen_buffer->cursor_y, h ) - h + 1; + screen_buffer->win.bottom = screen_buffer->win.top + h - 1; +} + static void update_output( struct screen_buffer *screen_buffer, RECT *rect ) { int x, y, size, trailing_spaces; @@ -1237,6 +1255,7 @@ static void update_read_output( struct console *console ) if (console->is_unix) set_tty_cursor_relative( screen_buffer->console, update_rect.left, update_rect.top ); update_output( screen_buffer, &update_rect ); + scroll_to_cursor( screen_buffer ); } if (console->is_unix) set_tty_cursor_relative( screen_buffer->console, screen_buffer->cursor_x, screen_buffer->cursor_y ); @@ -1825,6 +1844,7 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, { screen_buffer->cursor_x = info->cursor_x; screen_buffer->cursor_y = info->cursor_y; + scroll_to_cursor( screen_buffer ); } } if (params->mask & SET_CONSOLE_OUTPUT_INFO_SIZE) @@ -1972,6 +1992,7 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR else screen_buffer->cursor_x = update_rect.left; } + scroll_to_cursor( screen_buffer ); update_output( screen_buffer, &update_rect ); tty_sync( screen_buffer->console ); return STATUS_SUCCESS;

1 0