March 2022 - Wine-Commits - list.winehq.org

Jan Sikorski : wined3d: Add poll_in_cs field to wined3d_query().
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 9204569061bf7ea814fa3014ecaac03d21007050 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9204569061bf7ea814fa3014… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Mar 4 18:12:56 2022 +0100 wined3d: Add poll_in_cs field to wined3d_query(). Its eventual purpose is to allow for skipping the poll list mechanism by calling query_poll() in the application thread. In this patch it is only used for when we don't have a separate CS thread. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++++- dlls/wined3d/query.c | 21 ++++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b150f1ae097..ce297d724f2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2312,8 +2312,12 @@ static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) poll = query->query_ops->query_issue(query, op->flags); - if (!cs->thread) + if (!query->poll_in_cs) + { + if (op->flags & WINED3DISSUE_END) + InterlockedIncrement(&query->counter_retrieved); return; + } if (poll && list_empty(&query->poll_list_entry)) { diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 7b6c2325523..093b412bf18 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -143,6 +143,7 @@ static void wined3d_query_init(struct wined3d_query *query, struct wined3d_devic query->data = data; query->data_size = data_size; query->query_ops = query_ops; + query->poll_in_cs = !!device->cs->thread; list_init(&query->poll_list_entry); } @@ -469,23 +470,21 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, return WINED3DERR_INVALIDCALL; } - if (query->device->cs->thread) + if (query->counter_main != query->counter_retrieved + || (query->buffer_object && !wined3d_query_buffer_is_valid(query))) { - if (query->counter_main != query->counter_retrieved - || (query->buffer_object && !wined3d_query_buffer_is_valid(query))) - { - if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) - query->device->cs->c.ops->flush(&query->device->cs->c); - return S_FALSE; - } - if (query->buffer_object) - query->data = query->map_ptr; + if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) + query->device->cs->c.ops->flush(&query->device->cs->c); + return S_FALSE; } - else if (!query->query_ops->query_poll(query, flags)) + else if (!query->poll_in_cs && !query->query_ops->query_poll(query, flags)) { return S_FALSE; } + if (query->buffer_object) + query->data = query->map_ptr; + if (data) memcpy(data, query->data, min(data_size, query->data_size)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e21c4e6507b..b6f2cf060d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1955,6 +1955,7 @@ struct wined3d_query GLuint buffer_object; UINT64 *map_ptr; + bool poll_in_cs; }; HRESULT wined3d_query_gl_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent,

1 0

Rémi Bernon : include: Add Windows.Devices.Power.IBatteryReport interface definition.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: e8dd8b010899acf62f995ee61d245ee519ead5c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8dd8b010899acf62f995ee6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 7 10:40:28 2022 +0100 include: Add Windows.Devices.Power.IBatteryReport interface definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.devices.power.idl | 15 +++++++++++++++ include/windows.foundation.idl | 1 + include/windows.system.power.idl | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index ae551abd4c0..9578c557af7 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -792,6 +792,7 @@ SOURCES = \ windows.media.speechsynthesis.idl \ windows.storage.streams.idl \ windows.system.idl \ + windows.system.power.idl \ windows.system.userprofile.idl \ windowscontracts.idl \ windowsx.h \ diff --git a/include/windows.devices.power.idl b/include/windows.devices.power.idl index 4bf2599686c..f91c8fac6e3 100644 --- a/include/windows.devices.power.idl +++ b/include/windows.devices.power.idl @@ -22,11 +22,26 @@ import "inspectable.idl"; import "windows.foundation.idl"; +import "windows.system.power.idl"; namespace Windows.Devices.Power { interface IBatteryReport; runtimeclass BatteryReport; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Devices.Power.BatteryReport), + uuid(c9858c3a-4e13-420a-a8d0-24f18f395401) + ] + interface IBatteryReport : IInspectable + { + [propget] HRESULT ChargeRateInMilliwatts([out, retval] Windows.Foundation.IReference<INT32> **value); + [propget] HRESULT DesignCapacityInMilliwattHours([out, retval] Windows.Foundation.IReference<INT32> **value); + [propget] HRESULT FullChargeCapacityInMilliwattHours([out, retval] Windows.Foundation.IReference<INT32> **value); + [propget] HRESULT RemainingCapacityInMilliwattHours([out, retval] Windows.Foundation.IReference<INT32> **value); + [propget] HRESULT Status([out, retval] Windows.System.Power.BatteryStatus *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 50e134d3900..a92a5d82424 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -167,6 +167,7 @@ namespace Windows { interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*>; interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>; interface Windows.Foundation.IAsyncOperation<boolean>; + interface Windows.Foundation.IReference<INT32>; } } } diff --git a/include/windows.system.power.idl b/include/windows.system.power.idl new file mode 100644 index 00000000000..366042dbf2f --- /dev/null +++ b/include/windows.system.power.idl @@ -0,0 +1,37 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows.System.Power { + typedef enum BatteryStatus BatteryStatus; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum BatteryStatus + { + NotPresent = 0, + Discharging = 1, + Idle = 2, + Charging = 3, + }; +}

1 0

Francois Gouget : windows.gaming.input: Add a linefeed to a TRACE() message.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: ea79e50f9827bddd6920f8f520c6e7732de1ecec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea79e50f9827bddd6920f8f5… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 7 15:38:32 2022 +0100 windows.gaming.input: Add a linefeed to a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/vector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c index 918262af8e1..441c13dab4c 100644 --- a/dlls/windows.gaming.input/vector.c +++ b/dlls/windows.gaming.input/vector.c @@ -459,6 +459,6 @@ HRESULT vector_create( REFIID iid, REFIID view_iid, void **out ) impl->ref = 1; *out = &impl->IVector_IInspectable_iface; - TRACE( "created %p", *out ); + TRACE( "created %p\n", *out ); return S_OK; }

1 0

Jacek Caban : win32u: Move class management implementation from user32.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 7c76aa05a9d27dd6f5705c4ef90c16862af14f3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c76aa05a9d27dd6f5705c4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 7 14:42:32 2022 +0100 win32u: Move class management implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 280 ++++++------------------------------------- dlls/user32/controls.h | 7 -- dlls/user32/painting.c | 2 +- dlls/user32/user_main.c | 2 + dlls/user32/user_private.h | 2 +- dlls/win32u/class.c | 251 +++++++++++++++++++++++++++++++++++++- dlls/win32u/gdiobj.c | 3 + dlls/win32u/ntuser_private.h | 11 ++ dlls/win32u/win32u.spec | 6 +- dlls/win32u/win32u_private.h | 8 ++ dlls/win32u/wrappers.c | 22 ++++ include/ntuser.h | 7 ++ 12 files changed, 341 insertions(+), 260 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7c76aa05a9d27dd6f570…

1 0

Jan Sikorski : wined3d: Track pending Vulkan queries separately for each query.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 7f1473e4beab6f1a6128f431cb8af74b634208d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f1473e4beab6f1a6128f431… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Mar 4 18:12:57 2022 +0100 wined3d: Track pending Vulkan queries separately for each query. This is mostly to enable polling queries from the application thread by removing the need to access the shared context. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 65 ------------------------------------------ dlls/wined3d/query.c | 45 +++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 23 ++------------- 3 files changed, 35 insertions(+), 98 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index a3489c23f1d..dcb94eb7c1a 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1577,7 +1577,6 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_pipeline_statistics_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_stream_output_statistics_query_pools); wine_rb_destroy(&context_vk->bo_slab_available, wined3d_context_vk_destroy_bo_slab, context_vk); - heap_free(context_vk->pending_queries.queries); heap_free(context_vk->submitted.buffers); heap_free(context_vk->retired.objects); @@ -1589,69 +1588,6 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) wined3d_context_cleanup(&context_vk->c); } -void wined3d_context_vk_remove_pending_queries(struct wined3d_context_vk *context_vk, - struct wined3d_query_vk *query_vk) -{ - struct wined3d_pending_queries_vk *pending = &context_vk->pending_queries; - struct wined3d_pending_query_vk *p; - size_t i; - - pending->free_idx = ~(size_t)0; - for (i = pending->count; i; --i) - { - p = &pending->queries[i - 1]; - - if (p->query_vk) - { - if (p->query_vk != query_vk && !wined3d_query_vk_accumulate_data(p->query_vk, context_vk, &p->pool_idx)) - continue; - --p->query_vk->pending_count; - } - - if (i == pending->count) - { - --pending->count; - continue; - } - - p->query_vk = NULL; - p->pool_idx.pool_vk = NULL; - p->pool_idx.idx = pending->free_idx; - pending->free_idx = i - 1; - } -} - -void wined3d_context_vk_accumulate_pending_queries(struct wined3d_context_vk *context_vk) -{ - wined3d_context_vk_remove_pending_queries(context_vk, NULL); -} - -void wined3d_context_vk_add_pending_query(struct wined3d_context_vk *context_vk, struct wined3d_query_vk *query_vk) -{ - struct wined3d_pending_queries_vk *pending = &context_vk->pending_queries; - struct wined3d_pending_query_vk *p; - - if (pending->free_idx != ~(size_t)0) - { - p = &pending->queries[pending->free_idx]; - pending->free_idx = p->pool_idx.idx; - } - else - { - if (!wined3d_array_reserve((void **)&pending->queries, &pending->size, - pending->count + 1, sizeof(*pending->queries))) - { - ERR("Failed to allocate entry.\n"); - return; - } - p = &pending->queries[pending->count++]; - } - - p->query_vk = query_vk; - p->pool_idx = query_vk->pool_idx; - ++query_vk->pending_count; -} - VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -1701,7 +1637,6 @@ VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk return buffer->vk_command_buffer = VK_NULL_HANDLE; } - wined3d_context_vk_accumulate_pending_queries(context_vk); LIST_FOR_EACH_ENTRY(query_vk, &context_vk->active_queries, struct wined3d_query_vk, entry) { if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 093b412bf18..7309b7a68df 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1598,7 +1598,15 @@ void wined3d_query_vk_suspend(struct wined3d_query_vk *query_vk, struct wined3d_ VkCommandBuffer vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer; wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer); - wined3d_context_vk_add_pending_query(context_vk, query_vk); + + if (!wined3d_array_reserve((void **)&query_vk->pending, &query_vk->pending_size, + query_vk->pending_count + 1, sizeof(*query_vk->pending))) + { + ERR("Failed to allocate entry.\n"); + return; + } + + query_vk->pending[query_vk->pending_count++] = query_vk->pool_idx; query_vk->pool_idx.pool_vk = NULL; query_vk->flags &= ~WINED3D_QUERY_VK_FLAG_ACTIVE; } @@ -1615,10 +1623,12 @@ static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) if (query_vk->command_buffer_id == context_vk->current_command_buffer.id) goto unavailable; - if (query_vk->pending_count) - wined3d_context_vk_accumulate_pending_queries(context_vk); - if (query_vk->pending_count) - goto unavailable; + while (query_vk->pending_count) + { + if (!wined3d_query_vk_accumulate_data(query_vk, context_vk, &query_vk->pending[query_vk->pending_count - 1])) + goto unavailable; + query_vk->pending_count--; + } /* If the query was suspended, and then ended before it was resumed, * there's no data to accumulate here. */ @@ -1635,6 +1645,17 @@ unavailable: return FALSE; } +static void wined3d_query_vk_remove_pending_queries(struct wined3d_context_vk *context_vk, + struct wined3d_query_vk *query_vk) +{ + size_t i; + + for (i = 0; i < query_vk->pending_count; ++i) + wined3d_query_pool_vk_mark_complete(query_vk->pending[i].pool_vk, query_vk->pending[i].idx, context_vk); + + query_vk->pending_count = 0; +} + static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) { struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); @@ -1650,7 +1671,7 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); if (query_vk->pending_count) - wined3d_context_vk_remove_pending_queries(context_vk, query_vk); + wined3d_query_vk_remove_pending_queries(context_vk, query_vk); memset((void *)query->data, 0, query->data_size); vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk); if (query_vk->flags & WINED3D_QUERY_VK_FLAG_STARTED) @@ -1732,12 +1753,12 @@ static void wined3d_query_vk_destroy(struct wined3d_query *query) if (query_vk->flags & WINED3D_QUERY_VK_FLAG_STARTED) list_remove(&query_vk->entry); - if (query_vk->pending_count) - { - context_vk = wined3d_context_vk(context_acquire(query_vk->q.device, NULL, 0)); - wined3d_context_vk_remove_pending_queries(context_vk, query_vk); - context_release(&context_vk->c); - } + context_vk = wined3d_context_vk(context_acquire(query_vk->q.device, NULL, 0)); + wined3d_query_vk_remove_pending_queries(context_vk, query_vk); + if (query_vk->pool_idx.pool_vk) + wined3d_query_pool_vk_mark_complete(query_vk->pool_idx.pool_vk, query_vk->pool_idx.idx, context_vk); + context_release(&context_vk->c); + heap_free(query_vk->pending); heap_free(query_vk); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b6f2cf060d4..d035b89a5e5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2086,7 +2086,8 @@ struct wined3d_query_vk uint8_t flags; uint64_t command_buffer_id; uint32_t control_flags; - size_t pending_count; + SIZE_T pending_count, pending_size; + struct wined3d_query_pool_idx_vk *pending; }; static inline struct wined3d_query_vk *wined3d_query_vk(struct wined3d_query *query) @@ -2550,20 +2551,6 @@ struct wined3d_shader_descriptor_writes_vk SIZE_T size, count; }; -struct wined3d_pending_query_vk -{ - struct wined3d_query_vk *query_vk; - struct wined3d_query_pool_idx_vk pool_idx; -}; - -struct wined3d_pending_queries_vk -{ - struct wined3d_pending_query_vk *queries; - SIZE_T free_idx; - SIZE_T size; - SIZE_T count; -}; - struct wined3d_context_vk { struct wined3d_context c; @@ -2619,7 +2606,6 @@ struct wined3d_context_vk struct list render_pass_queries; struct list active_queries; - struct wined3d_pending_queries_vk pending_queries; struct list completed_query_pools; struct list free_occlusion_query_pools; struct list free_timestamp_query_pools; @@ -2638,9 +2624,6 @@ static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_conte return CONTAINING_RECORD(context, struct wined3d_context_vk, c); } -void wined3d_context_vk_accumulate_pending_queries(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -void wined3d_context_vk_add_pending_query(struct wined3d_context_vk *context_vk, - struct wined3d_query_vk *query_vk) DECLSPEC_HIDDEN; bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, enum wined3d_query_type type, struct wined3d_query_pool_idx_vk *pool_idx) DECLSPEC_HIDDEN; VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_context_vk *context_vk, @@ -2688,8 +2671,6 @@ void wined3d_context_vk_image_barrier(struct wined3d_context_vk *context_vk, HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_context_vk_poll_command_buffers(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -void wined3d_context_vk_remove_pending_queries(struct wined3d_context_vk *context_vk, - struct wined3d_query_vk *query_vk) DECLSPEC_HIDDEN; void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk, unsigned int wait_semaphore_count, const VkSemaphore *wait_semaphores, const VkPipelineStageFlags *wait_stages, unsigned int signal_semaphore_count, const VkSemaphore *signal_semaphores) DECLSPEC_HIDDEN;

1 0

Eric Pouech : mf/tests: Use correct integral type.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 572876ee0ae99969d455e7421571469edfeb8353 URL: https://source.winehq.org/git/wine.git/?a=commit;h=572876ee0ae99969d455e742… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:24:37 2022 +0100 mf/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 102 ++++++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=572876ee0ae99969d455…

1 0

Alistair Leslie-Hughes : include: Add IReference<T> interface.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: a05ece8c51a27689ee0130d9509a4e8578a6bed1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a05ece8c51a27689ee0130d9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 7 10:40:27 2022 +0100 include: Add IReference<T> interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.collections.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 7576f331172..ed1f5e30793 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -73,6 +73,15 @@ cpp_quote("#endif") ] delegate HRESULT TypedEventHandler<TSender, TArgs>([in] TSender sender, [in] TArgs args); + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(61c17706-2d65-11e0-9ae8-d48564015472) + ] + interface IReference<T> : IInspectable + { + [propget] HRESULT Value([out, retval] T *value); + } + namespace Collections { [

1 0

Jactry Zeng : d2d1: Add D2D1Shadow effect.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: f8426dbb3b02eedcf52d8150a52a8c7c7024c605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8426dbb3b02eedcf52d8150… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sun Mar 6 22:13:32 2022 -0600 d2d1: Add D2D1Shadow effect. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 1 + dlls/d2d1/tests/d2d1.c | 1 + include/d2d1effects.idl | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 2f1949c073c..e7215c4b38a 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -26,6 +26,7 @@ static const struct d2d_effect_info builtin_effects[] = {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, {&CLSID_D2D1Crop, 1, 1, 1}, + {&CLSID_D2D1Shadow, 1, 1, 1}, }; static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a425395e64a..3ade9634069 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9908,6 +9908,7 @@ static void test_effect(BOOL d3d11) {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, {&CLSID_D2D1Crop, 1, 1, 1}, + {&CLSID_D2D1Shadow, 1, 1, 1}, }; if (!init_test_context(&ctx, d3d11)) diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index 9bd0b7012ad..d448aec162a 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -20,6 +20,7 @@ cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cf cpp_quote("DEFINE_GUID(CLSID_D2D13DPerspectiveTransform, 0xc2844d0b,0x3d86,0x46e7,0x85,0xba,0x52,0x6c,0x92,0x40,0xf3,0xfb);") cpp_quote("DEFINE_GUID(CLSID_D2D1Composite, 0x48fc9f51,0xf6ac,0x48f1,0x8b,0x58,0x3b,0x28,0xac,0x46,0xf7,0x6d);") cpp_quote("DEFINE_GUID(CLSID_D2D1Crop, 0xe23f7110,0x0e9a,0x4324,0xaf,0x47,0x6a,0x2c,0x0c,0x46,0xf3,0x5b);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Shadow, 0xc67ea361,0x1863,0x4e69,0x89,0xdb,0x69,0x5d,0x3e,0x9a,0x5b,0x6b);") typedef enum D2D1_BORDER_MODE {

1 0

Rémi Bernon : windows.gaming.input: Add IGameControllerImpl undocumented interface declaration.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: aca853c73e2ff10a8b78fbbf7f2bc51e8674b1bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=aca853c73e2ff10a8b78fbbf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 7 10:40:26 2022 +0100 windows.gaming.input: Add IGameControllerImpl undocumented interface declaration. This is more likely some specialized interface of a parameterized type, used to create mixin types, but we have no way and no clue where it comes from or how it should be declared. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/provider.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/windows.gaming.input/provider.idl b/dlls/windows.gaming.input/provider.idl index dc67a94acaa..d6c4f1d16ec 100644 --- a/dlls/windows.gaming.input/provider.idl +++ b/dlls/windows.gaming.input/provider.idl @@ -34,6 +34,16 @@ namespace Windows.Gaming.Input.Custom { interface IWineGameControllerProvider; runtimeclass WineGameControllerProvider; + [ + uuid(06e58977-7684-4dc5-bad1-cda52a4aa06d) + ] + interface IGameControllerImpl : IInspectable + requires Windows.Gaming.Input.Custom.IGameControllerInputSink + { + HRESULT Initialize([in] Windows.Gaming.Input.IGameController *outer, + [in] Windows.Gaming.Input.Custom.IGameControllerProvider *provider); + } + [ exclusiveto(Windows.Gaming.Input.Custom.WineGameControllerProvider), uuid(8967b6ef-a4de-4b9a-984a-9f920b4d1b26)

1 0

Christopher Egert : gsm: Enable WAV49 support.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 9799fa80091eeb38865f62fccc8abaaa6e51c52a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9799fa80091eeb38865f62fc… Author: Christopher Egert <cme3000(a)gmail.com> Date: Sun Mar 6 18:33:02 2022 +0100 gsm: Enable WAV49 support. Fixes a regression introduced by 0e7fd41af953b2a9fa23cf6920fac229f2dd2e44 causing missing audio elements in the 64k intros elysian by logicoma and clean state by conspiracy. Signed-off-by: Christopher Egert <cme3000(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/gsm/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/gsm/Makefile.in b/libs/gsm/Makefile.in index 482004cab8d..36c749aa60f 100644 --- a/libs/gsm/Makefile.in +++ b/libs/gsm/Makefile.in @@ -1,5 +1,6 @@ EXTLIB = libgsm.a EXTRAINCL = -I$(srcdir)/inc +EXTRADEFS = -DWAV49 C_SRCS = \ src/add.c \

1 0