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

Rémi Bernon : windows.gaming.input: Implement IForceFeedbackMotor_(Pause|Resume|StopAll)Effects.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 78261e08bfd437145f5658c409ceeb61fdb68cdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=78261e08bfd437145f5658c4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 14:56:20 2022 +0200 windows.gaming.input: Implement IForceFeedbackMotor_(Pause|Resume|StopAll)Effects. And IForceFeedbackMotor_get_AreEffectsPaused. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 8 ------- dlls/windows.gaming.input/force_feedback.c | 34 +++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index f9538f5f56d..6d8701a8c24 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5070,7 +5070,6 @@ static void test_windows_gaming_input(void) .report_id = 1, .report_len = 2, .report_buf = {1, 0x02}, - .todo = TRUE, }; static struct hid_expect expect_resume = { @@ -5078,7 +5077,6 @@ static void test_windows_gaming_input(void) .report_id = 1, .report_len = 2, .report_buf = {1, 0x03}, - .todo = TRUE, }; static struct hid_expect expect_stop = { @@ -5086,7 +5084,6 @@ static void test_windows_gaming_input(void) .report_id = 1, .report_len = 2, .report_buf = {1, 0x06}, - .todo = TRUE, }; static struct hid_expect expect_disable = { @@ -5298,9 +5295,7 @@ static void test_windows_gaming_input(void) paused = TRUE; hr = IForceFeedbackMotor_get_AreEffectsPaused( motor, &paused ); - todo_wine ok( hr == S_OK, "get_AreEffectsPaused returned %#lx\n", hr ); - todo_wine ok( paused == FALSE, "got paused %u\n", paused ); gain = 12345.6; @@ -5328,15 +5323,12 @@ static void test_windows_gaming_input(void) set_hid_expect( file, &expect_pause, sizeof(expect_pause) ); hr = IForceFeedbackMotor_PauseAllEffects( motor ); - todo_wine ok( hr == S_OK, "PauseAllEffects returned %#lx\n", hr ); set_hid_expect( file, &expect_resume, sizeof(expect_resume) ); hr = IForceFeedbackMotor_ResumeAllEffects( motor ); - todo_wine ok( hr == S_OK, "ResumeAllEffects returned %#lx\n", hr ); set_hid_expect( file, &expect_stop, sizeof(expect_stop) ); hr = IForceFeedbackMotor_StopAllEffects( motor ); - todo_wine ok( hr == S_OK, "StopAllEffects returned %#lx\n", hr ); set_hid_expect( file, NULL, 0 ); diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index 6d4e533bc77..fad5ade402c 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -105,8 +105,17 @@ static HRESULT WINAPI motor_GetTrustLevel( IForceFeedbackMotor *iface, TrustLeve static HRESULT WINAPI motor_get_AreEffectsPaused( IForceFeedbackMotor *iface, BOOLEAN *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct motor *impl = impl_from_IForceFeedbackMotor( iface ); + DWORD state; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (FAILED(hr = IDirectInputDevice8_GetForceFeedbackState( impl->device, &state ))) + return hr; + + *value = (state & DIGFFS_PAUSED); + return S_OK; } static HRESULT WINAPI motor_get_MasterGain( IForceFeedbackMotor *iface, double *value ) @@ -171,20 +180,29 @@ static HRESULT WINAPI motor_LoadEffectAsync( IForceFeedbackMotor *iface, IForceF static HRESULT WINAPI motor_PauseAllEffects( IForceFeedbackMotor *iface ) { - FIXME( "iface %p stub!\n", iface ); - return E_NOTIMPL; + struct motor *impl = impl_from_IForceFeedbackMotor( iface ); + + TRACE( "iface %p.\n", iface ); + + return IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_PAUSE ); } static HRESULT WINAPI motor_ResumeAllEffects( IForceFeedbackMotor *iface ) { - FIXME( "iface %p stub!\n", iface ); - return E_NOTIMPL; + struct motor *impl = impl_from_IForceFeedbackMotor( iface ); + + TRACE( "iface %p.\n", iface ); + + return IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_CONTINUE ); } static HRESULT WINAPI motor_StopAllEffects( IForceFeedbackMotor *iface ) { - FIXME( "iface %p stub!\n", iface ); - return E_NOTIMPL; + struct motor *impl = impl_from_IForceFeedbackMotor( iface ); + + TRACE( "iface %p.\n", iface ); + + return IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_STOPALL ); } static HRESULT WINAPI motor_TryDisableAsync( IForceFeedbackMotor *iface, IAsyncOperation_boolean **async_op )

1 0

Jacek Caban : win32u: Move clipboard data management from user32.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: eba0a510021ff8597536e83f67174ccf9283ad01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eba0a510021ff8597536e83f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 25 16:59:16 2022 +0200 win32u: Move clipboard data management 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/clipboard.c | 292 +++++++------------------------------------ dlls/user32/edit.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 16 +++ dlls/user32/user_private.h | 2 + dlls/win32u/clipboard.c | 302 +++++++++++++++++++++++++++++++++++++++++++-- dlls/win32u/sysparams.c | 4 - include/ntuser.h | 25 +++- 8 files changed, 383 insertions(+), 262 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eba0a510021ff8597536…

1 0

Stefan Dösinger : wined3d: Tell Vulkan about discarded and cleared framebuffer attachments.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 2a283004abfbd94d9d967b929ddff9d86b11fa8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a283004abfbd94d9d967b92… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 24 19:24:47 2022 +0300 wined3d: Tell Vulkan about discarded and cleared framebuffer attachments. Signed-off-by: Stefan Dösinger <stefan(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 | 53 +++++++++++++++++++++++++++++++++++------- dlls/wined3d/view.c | 23 ++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 ++++++- 3 files changed, 76 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index c3108811e2c..059c44fee9a 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1250,6 +1250,7 @@ static void wined3d_render_pass_key_vk_init(struct wined3d_render_pass_key_vk *k struct wined3d_render_pass_attachment_vk *a; struct wined3d_rendertarget_view *view; unsigned int i; + DWORD location; memset(key, 0, sizeof(*key)); @@ -1262,6 +1263,15 @@ static void wined3d_render_pass_key_vk_init(struct wined3d_render_pass_key_vk *k a->vk_format = wined3d_format_vk(view->format)->vk_format; a->vk_samples = max(1, wined3d_resource_get_sample_count(view->resource)); a->vk_layout = wined3d_texture_vk(wined3d_texture_from_resource(view->resource))->layout; + location = wined3d_rendertarget_view_get_locations(view); + + if (clear_flags & WINED3DCLEAR_TARGET) + a->flags = WINED3D_FB_ATTACHMENT_FLAG_CLEAR_C; + else if (location & WINED3D_LOCATION_DISCARDED) + a->flags = WINED3D_FB_ATTACHMENT_FLAG_DISCARDED; + else if (location & WINED3D_LOCATION_CLEARED) + a->flags = WINED3D_FB_ATTACHMENT_FLAG_CLEAR_C; + key->rt_mask |= 1u << i; } @@ -1271,10 +1281,19 @@ static void wined3d_render_pass_key_vk_init(struct wined3d_render_pass_key_vk *k a->vk_format = wined3d_format_vk(view->format)->vk_format; a->vk_samples = max(1, wined3d_resource_get_sample_count(view->resource)); a->vk_layout = wined3d_texture_vk(wined3d_texture_from_resource(view->resource))->layout; + location = wined3d_rendertarget_view_get_locations(view); key->rt_mask |= 1u << WINED3D_MAX_RENDER_TARGETS; - } - key->clear_flags = clear_flags; + if (clear_flags & WINED3DCLEAR_STENCIL) + a->flags = WINED3D_FB_ATTACHMENT_FLAG_CLEAR_S; + if (clear_flags & WINED3DCLEAR_ZBUFFER) + a->flags |= WINED3D_FB_ATTACHMENT_FLAG_CLEAR_Z; + + if (!a->flags && (location & WINED3D_LOCATION_DISCARDED)) + a->flags = WINED3D_FB_ATTACHMENT_FLAG_DISCARDED; + else if (location & WINED3D_LOCATION_CLEARED) + a->flags = WINED3D_FB_ATTACHMENT_FLAG_CLEAR_S | WINED3D_FB_ATTACHMENT_FLAG_CLEAR_Z; + } } static void wined3d_render_pass_vk_cleanup(struct wined3d_render_pass_vk *pass, @@ -1315,10 +1334,14 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, attachment->flags = 0; attachment->format = a->vk_format; attachment->samples = a->vk_samples; - if (key->clear_flags & WINED3DCLEAR_TARGET) + + if (a->flags & WINED3D_FB_ATTACHMENT_FLAG_DISCARDED) + attachment->loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + else if (a->flags & WINED3D_FB_ATTACHMENT_FLAG_CLEAR_C) attachment->loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; else attachment->loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + attachment->storeOp = VK_ATTACHMENT_STORE_OP_STORE; attachment->stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; attachment->stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; @@ -1348,15 +1371,22 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, attachment->flags = 0; attachment->format = a->vk_format; attachment->samples = a->vk_samples; - if (key->clear_flags & WINED3DCLEAR_ZBUFFER) + + if (a->flags & WINED3D_FB_ATTACHMENT_FLAG_DISCARDED) + attachment->loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + else if (a->flags & WINED3D_FB_ATTACHMENT_FLAG_CLEAR_Z) attachment->loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; else attachment->loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - attachment->storeOp = VK_ATTACHMENT_STORE_OP_STORE; - if (key->clear_flags & WINED3DCLEAR_STENCIL) + + if (a->flags & WINED3D_FB_ATTACHMENT_FLAG_DISCARDED) + attachment->stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + else if (a->flags & WINED3D_FB_ATTACHMENT_FLAG_CLEAR_S) attachment->stencilLoadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; else attachment->stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + + attachment->storeOp = VK_ATTACHMENT_STORE_OP_STORE; attachment->stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; attachment->initialLayout = a->vk_layout; attachment->finalLayout = a->vk_layout; @@ -2464,6 +2494,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont VkCommandBuffer vk_command_buffer, const struct wined3d_state *state, const struct wined3d_vk_info *vk_info) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + static const VkClearValue clear_values[WINED3D_MAX_RENDER_TARGETS + 1]; VkImageView vk_views[WINED3D_MAX_RENDER_TARGETS + 1]; unsigned int fb_width, fb_height, fb_layer_count; struct wined3d_rendertarget_view_vk *rtv_vk; @@ -2485,6 +2516,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont attachment_count = 0; context_vk->rt_count = 0; + begin_info.clearValueCount = 0; for (i = 0; i < ARRAY_SIZE(state->fb.render_targets); ++i) { if (!(view = state->fb.render_targets[i]) || view->format->id == WINED3DFMT_NULL) @@ -2503,6 +2535,9 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont fb_layer_count = view->layer_count; context_vk->rt_count = i + 1; ++attachment_count; + + if (wined3d_rendertarget_view_get_locations(view) & WINED3D_LOCATION_CLEARED) + begin_info.clearValueCount = attachment_count; } if ((view = state->fb.depth_stencil)) @@ -2519,6 +2554,9 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont if (view->layer_count < fb_layer_count) fb_layer_count = view->layer_count; ++attachment_count; + + if (wined3d_rendertarget_view_get_locations(view) & WINED3D_LOCATION_CLEARED) + begin_info.clearValueCount = attachment_count; } if (!(context_vk->vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, &state->fb, @@ -2552,8 +2590,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont begin_info.renderArea.offset.y = 0; begin_info.renderArea.extent.width = fb_width; begin_info.renderArea.extent.height = fb_height; - begin_info.clearValueCount = 0; - begin_info.pClearValues = NULL; + begin_info.pClearValues = clear_values; VK_CALL(vkCmdBeginRenderPass(vk_command_buffer, &begin_info, VK_SUBPASS_CONTENTS_INLINE)); LIST_FOR_EACH_ENTRY(query_vk, &context_vk->render_pass_queries, struct wined3d_query_vk, entry) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 051da2891f3..752563508c8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -511,6 +511,29 @@ void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_v wined3d_view_invalidate_location(view->resource, &view->desc, location); } +/* Note: This may return 0 if the selected layers do not have a location in common. */ +DWORD wined3d_rendertarget_view_get_locations(const struct wined3d_rendertarget_view *view) +{ + struct wined3d_resource *resource = view->resource; + unsigned int i, sub_resource_idx, layer_count; + const struct wined3d_texture *texture; + DWORD ret = ~0u; + + if (resource->type == WINED3D_RTYPE_BUFFER) + return buffer_from_resource(resource)->locations; + + texture = texture_from_resource(resource); + sub_resource_idx = view->sub_resource_idx; + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? view->layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + ret &= texture->sub_resources[sub_resource_idx].locations; + + if (!ret) + WARN("View %p (texture %p) layers do not have a location in common.\n", view, texture); + + return ret; +} + static void wined3d_render_target_view_gl_cs_init(void *object) { struct wined3d_rendertarget_view_gl *view_gl = object; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ddad7ee5ec..35925b04cd1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2456,11 +2456,17 @@ struct wined3d_retired_objects_vk SIZE_T count; }; +#define WINED3D_FB_ATTACHMENT_FLAG_DISCARDED 1 +#define WINED3D_FB_ATTACHMENT_FLAG_CLEAR_C 2 +#define WINED3D_FB_ATTACHMENT_FLAG_CLEAR_S 4 +#define WINED3D_FB_ATTACHMENT_FLAG_CLEAR_Z 8 + struct wined3d_render_pass_attachment_vk { VkFormat vk_format; VkSampleCountFlagBits vk_samples; VkImageLayout vk_layout; + uint32_t flags; }; struct wined3d_render_pass_key_vk @@ -2468,7 +2474,6 @@ struct wined3d_render_pass_key_vk struct wined3d_render_pass_attachment_vk rt[WINED3D_MAX_RENDER_TARGETS]; struct wined3d_render_pass_attachment_vk ds; uint32_t rt_mask; - uint32_t clear_flags; }; struct wined3d_render_pass_vk @@ -5283,6 +5288,8 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) DECLSPEC_HIDDEN; +DWORD wined3d_rendertarget_view_get_locations(const struct wined3d_rendertarget_view *view) + DECLSPEC_HIDDEN; HRESULT wined3d_rendertarget_view_no3d_init(struct wined3d_rendertarget_view *view_no3d, const struct wined3d_view_desc *desc, struct wined3d_resource *resource,

1 0

Jacek Caban : win32u: Add more clipboard stubs.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: cad4adedaa92e3114eef34d7cdbb0bace548276d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad4adedaa92e3114eef34d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 25 16:59:10 2022 +0200 win32u: Add more clipboard stubs. 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/win32u/clipboard.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 4 ++++ dlls/win32u/win32u.spec | 8 ++++---- dlls/win32u/win32u_private.h | 5 +++++ dlls/win32u/wrappers.c | 24 ++++++++++++++++++++++++ include/ntuser.h | 14 ++++++++++++++ 6 files changed, 87 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cad4adedaa92e3114eef…

1 0

Rémi Bernon : windows.gaming.input: Acquire the device exclusively when creating ForceFeedbackMotor.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: cd24005266caa7d67e740b326c27e91fe274de99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd24005266caa7d67e740b32… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 14:56:18 2022 +0200 windows.gaming.input: Acquire the device exclusively when creating ForceFeedbackMotor. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 4 +--- dlls/windows.gaming.input/force_feedback.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index c298206eb20..9c9af8b6389 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5048,7 +5048,6 @@ static void test_windows_gaming_input(void) .report_id = 1, .report_len = 2, .report_buf = {1, 0x01}, - .todo = TRUE, }, /* device gain */ { @@ -5056,7 +5055,6 @@ static void test_windows_gaming_input(void) .report_id = 6, .report_len = 2, .report_buf = {6, 0xff}, - .todo = TRUE, }, }; static struct hid_expect expect_set_gain = @@ -5284,7 +5282,7 @@ static void test_windows_gaming_input(void) set_hid_expect( file, expect_acquire, sizeof(expect_acquire) ); hr = IRawGameController_get_ForceFeedbackMotors( raw_controller, &motors_view ); ok( hr == S_OK, "get_ForceFeedbackMotors returned %#lx\n", hr ); - wait_hid_expect_( __FILE__, __LINE__, file, 100, TRUE ); /* device gain reports are written asynchronously */ + wait_hid_expect( file, 100 ); /* device gain reports are written asynchronously */ hr = IVectorView_ForceFeedbackMotor_get_Size( motors_view, &size ); ok( hr == S_OK, "get_Size returned %#lx\n", hr ); diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index 24617d16733..54742475e7b 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -211,9 +211,14 @@ static const struct IForceFeedbackMotorVtbl motor_vtbl = HRESULT force_feedback_motor_create( IDirectInputDevice8W *device, IForceFeedbackMotor **out ) { struct motor *impl; + HRESULT hr; TRACE( "device %p, out %p\n", device, out ); + if (FAILED(hr = IDirectInputDevice8_Unacquire( device ))) goto failed; + if (FAILED(hr = IDirectInputDevice8_SetCooperativeLevel( device, GetDesktopWindow(), DISCL_BACKGROUND | DISCL_EXCLUSIVE ))) goto failed; + if (FAILED(hr = IDirectInputDevice8_Acquire( device ))) goto failed; + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; impl->IForceFeedbackMotor_iface.lpVtbl = &motor_vtbl; impl->ref = 1; @@ -224,4 +229,10 @@ HRESULT force_feedback_motor_create( IDirectInputDevice8W *device, IForceFeedbac *out = &impl->IForceFeedbackMotor_iface; TRACE( "created ForceFeedbackMotor %p\n", *out ); return S_OK; + +failed: + IDirectInputDevice8_SetCooperativeLevel( device, 0, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE ); + IDirectInputDevice8_Acquire( device ); + WARN( "Failed to acquire device exclusively, hr %#lx\n", hr ); + return hr; }

1 0

Jacek Caban : winex11: Remove unused cf_xdnd from XDNDDATA.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 306ad4786d980b44785c6f1cb9f9c65f7fba2c56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=306ad4786d980b44785c6f1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 25 16:59:25 2022 +0200 winex11: Remove unused cf_xdnd from XDNDDATA. 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/winex11.drv/clipboard.c | 4 ++-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xdnd.c | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 137bc04c659..8fdfb87a671 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1051,7 +1051,7 @@ static HANDLE import_selection( Display *display, Window win, Atom selection, */ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection, Atom *targets, UINT count, - void (*callback)( Atom, UINT, HANDLE )) + void (*callback)( UINT, HANDLE )) { UINT i; HANDLE handle; @@ -1064,7 +1064,7 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select if (!(format = find_x11_format( targets[i] ))) continue; if (!format->id) continue; if (!(handle = import_selection( display, win, selection, format ))) continue; - callback( targets[i], format->id, handle ); + callback( format->id, handle ); } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index da037297745..a8d2f78aa6b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -299,7 +299,7 @@ extern void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) DECLS extern void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection, Atom *targets, UINT count, - void (*callback)( Atom, UINT, HANDLE )) DECLSPEC_HIDDEN; + void (*callback)( UINT, HANDLE )) DECLSPEC_HIDDEN; /************************************************************************** * X11 GDI driver diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index eb685613b7b..b9bba1ff872 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -48,7 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(xdnd); typedef struct tagXDNDDATA { int cf_win; - Atom cf_xdnd; HANDLE contents; struct list entry; } XDNDDATA, *LPXDNDDATA; @@ -63,7 +62,7 @@ static HWND XDNDLastTargetWnd; /* might be an ancestor of XDNDLastTargetWnd */ static HWND XDNDLastDropTargetWnd; -static void X11DRV_XDND_InsertXDNDData( Atom property, UINT format, HANDLE contents ); +static void X11DRV_XDND_InsertXDNDData( UINT format, HANDLE contents ); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); static BOOL X11DRV_XDND_HasHDROP(void); @@ -565,14 +564,13 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, * * Cache available XDND property */ -static void X11DRV_XDND_InsertXDNDData( Atom property, UINT format, HANDLE contents ) +static void X11DRV_XDND_InsertXDNDData( UINT format, HANDLE contents ) { LPXDNDDATA current = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(XDNDDATA)); if (current) { EnterCriticalSection(&xdnd_cs); - current->cf_xdnd = property; current->cf_win = format; current->contents = contents; list_add_tail(&xdndData, &current->entry);

1 0

Rémi Bernon : windows.gaming.input: Return an empty vector from RawGameController_get_ForceFeedbackMotors.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 5c88fea5e7263f8e82e59feee3702894f7101f71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c88fea5e7263f8e82e59fee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 14:56:16 2022 +0200 windows.gaming.input: Return an empty vector from RawGameController_get_ForceFeedbackMotors. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 3 +-- dlls/windows.gaming.input/controller.c | 19 +++++++++++++++++-- include/windows.gaming.input.forcefeedback.idl | 3 +++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 068f5bf1a7e..e4d17175c68 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5283,10 +5283,8 @@ static void test_windows_gaming_input(void) set_hid_expect( file, expect_acquire, sizeof(expect_acquire) ); hr = IRawGameController_get_ForceFeedbackMotors( raw_controller, &motors_view ); - todo_wine ok( hr == S_OK, "get_ForceFeedbackMotors returned %#lx\n", hr ); wait_hid_expect_( __FILE__, __LINE__, file, 100, TRUE ); /* device gain reports are written asynchronously */ - if (!motors_view) goto skip_tests; hr = IVectorView_ForceFeedbackMotor_get_Size( motors_view, &size ); ok( hr == S_OK, "get_Size returned %#lx\n", hr ); @@ -5296,6 +5294,7 @@ static void test_windows_gaming_input(void) todo_wine ok( hr == S_OK, "GetAt returned %#lx\n", hr ); IVectorView_ForceFeedbackMotor_Release( motors_view ); + if (hr != S_OK) goto skip_tests; check_interface( motor, &IID_IUnknown, TRUE ); check_interface( motor, &IID_IInspectable, TRUE ); diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 03a3ae398cf..d68da6b3142 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -229,8 +229,23 @@ static HRESULT WINAPI raw_controller_get_ButtonCount( IRawGameController *iface, static HRESULT WINAPI raw_controller_get_ForceFeedbackMotors( IRawGameController *iface, IVectorView_ForceFeedbackMotor **value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + static const struct vector_iids iids = + { + .vector = &IID_IVector_ForceFeedbackMotor, + .view = &IID_IVectorView_ForceFeedbackMotor, + .iterable = &IID_IIterable_ForceFeedbackMotor, + .iterator = &IID_IIterator_ForceFeedbackMotor, + }; + IVector_ForceFeedbackMotor *vector; + HRESULT hr; + + TRACE( "iface %p, value %p\n", iface, value ); + + if (FAILED(hr = vector_create( &iids, (void **)&vector ))) return hr; + hr = IVector_ForceFeedbackMotor_GetView( vector, value ); + IVector_ForceFeedbackMotor_Release( vector ); + + return hr; } static HRESULT WINAPI raw_controller_get_HardwareProductId( IRawGameController *iface, UINT16 *value ) diff --git a/include/windows.gaming.input.forcefeedback.idl b/include/windows.gaming.input.forcefeedback.idl index 432b60a5592..639e0c5cd57 100644 --- a/include/windows.gaming.input.forcefeedback.idl +++ b/include/windows.gaming.input.forcefeedback.idl @@ -36,7 +36,10 @@ namespace Windows.Gaming.Input.ForceFeedback { declare { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>; interface Windows.Foundation.IAsyncOperation<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>; + interface Windows.Foundation.Collections.IIterator<Windows.Gaming.Input.ForceFeedback.ForceFeedbackMotor *>; + interface Windows.Foundation.Collections.IIterable<Windows.Gaming.Input.ForceFeedback.ForceFeedbackMotor *>; interface Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.ForceFeedback.ForceFeedbackMotor *>; + interface Windows.Foundation.Collections.IVector<Windows.Gaming.Input.ForceFeedback.ForceFeedbackMotor *>; } [

1 0

Huw Davies : winecoreaudio: Implement Wow64 midi entry points in the Unix libraray.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 860a5f69b897044743491ef9e5796bab0c0a674e URL: https://source.winehq.org/git/wine.git/?a=commit;h=860a5f69b897044743491ef9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 25 07:58:38 2022 +0100 winecoreaudio: Implement Wow64 midi entry points in the Unix libraray. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 8 +- dlls/winecoreaudio.drv/coremidi.c | 367 +++++++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/unixlib.h | 7 + 3 files changed, 378 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=860a5f69b89704474349…

1 0

Huw Davies : winecoreaudio: Implement Wow64 mmdevapi entry points in the Unix libraray.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: b20c658f24faa943ab4123763027a05d7e7802d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b20c658f24faa943ab412376… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 25 07:58:37 2022 +0100 winecoreaudio: Implement Wow64 mmdevapi entry points in the Unix libraray. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 313 +++++++++++++++++++++++++++++++++++++ 1 file changed, 313 insertions(+) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 463a330eeda..fb36298ba57 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1661,3 +1661,316 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_in_message, midi_notify_wait, }; + +#ifdef _WIN64 + +typedef UINT PTR32; + +static NTSTATUS wow64_get_endpoint_ids(void *args) +{ + struct + { + EDataFlow flow; + PTR32 endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; + } *params32 = args; + struct get_endpoint_ids_params params = + { + .flow = params32->flow, + .endpoints = ULongToPtr(params32->endpoints), + .size = params32->size + }; + get_endpoint_ids(&params); + params32->size = params.size; + params32->result = params.result; + params32->num = params.num; + params32->default_idx = params.default_idx; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_create_stream(void *args) +{ + struct + { + DWORD dev_id; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + REFERENCE_TIME duration; + REFERENCE_TIME period; + PTR32 fmt; + HRESULT result; + PTR32 stream; + } *params32 = args; + struct create_stream_params params = + { + .dev_id = params32->dev_id, + .flow = params32->flow, + .share = params32->share, + .duration = params32->duration, + .period = params32->period, + .fmt = ULongToPtr(params32->fmt), + .stream = ULongToPtr(params32->stream) + }; + create_stream(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_render_buffer(void *args) +{ + struct + { + stream_handle stream; + UINT32 frames; + HRESULT result; + PTR32 data; + } *params32 = args; + BYTE *data = NULL; + struct get_render_buffer_params params = + { + .stream = params32->stream, + .frames = params32->frames, + .data = &data + }; + get_render_buffer(&params); + params32->result = params.result; + *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data); + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_capture_buffer(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 data; + PTR32 frames; + PTR32 flags; + PTR32 devpos; + PTR32 qpcpos; + } *params32 = args; + BYTE *data = NULL; + struct get_capture_buffer_params params = + { + .stream = params32->stream, + .data = &data, + .frames = ULongToPtr(params32->frames), + .flags = ULongToPtr(params32->flags), + .devpos = ULongToPtr(params32->devpos), + .qpcpos = ULongToPtr(params32->qpcpos) + }; + get_capture_buffer(&params); + params32->result = params.result; + *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data); + return STATUS_SUCCESS; +}; + +static NTSTATUS wow64_is_format_supported(void *args) +{ + struct + { + EDataFlow flow; + DWORD dev_id; + AUDCLNT_SHAREMODE share; + PTR32 fmt_in; + PTR32 fmt_out; + HRESULT result; + } *params32 = args; + struct is_format_supported_params params = + { + .flow = params32->flow, + .dev_id = params32->dev_id, + .share = params32->share, + .fmt_in = ULongToPtr(params32->fmt_in), + .fmt_out = ULongToPtr(params32->fmt_out) + }; + is_format_supported(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_mix_format(void *args) +{ + struct + { + EDataFlow flow; + DWORD dev_id; + PTR32 fmt; + HRESULT result; + } *params32 = args; + struct get_mix_format_params params = + { + .flow = params32->flow, + .dev_id = params32->dev_id, + .fmt = ULongToPtr(params32->fmt) + }; + get_mix_format(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_buffer_size(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 frames; + } *params32 = args; + struct get_buffer_size_params params = + { + .stream = params32->stream, + .frames = ULongToPtr(params32->frames) + }; + get_buffer_size(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_latency(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 latency; + } *params32 = args; + struct get_latency_params params = + { + .stream = params32->stream, + .latency = ULongToPtr(params32->latency) + }; + get_latency(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_current_padding(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 padding; + } *params32 = args; + struct get_current_padding_params params = + { + .stream = params32->stream, + .padding = ULongToPtr(params32->padding) + }; + get_current_padding(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_next_packet_size(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 frames; + } *params32 = args; + struct get_next_packet_size_params params = + { + .stream = params32->stream, + .frames = ULongToPtr(params32->frames) + }; + get_next_packet_size(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_position(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 pos; + PTR32 qpctime; + } *params32 = args; + struct get_position_params params = + { + .stream = params32->stream, + .pos = ULongToPtr(params32->pos), + .qpctime = ULongToPtr(params32->qpctime) + }; + get_position(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_frequency(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 freq; + } *params32 = args; + struct get_frequency_params params = + { + .stream = params32->stream, + .freq = ULongToPtr(params32->freq) + }; + get_frequency(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_set_volumes(void *args) +{ + struct + { + stream_handle stream; + float master_volume; + PTR32 volumes; + PTR32 session_volumes; + int channel; + } *params32 = args; + struct set_volumes_params params = + { + .stream = params32->stream, + .master_volume = params32->master_volume, + .volumes = ULongToPtr(params32->volumes), + .session_volumes = ULongToPtr(params32->session_volumes), + .channel = params32->channel + }; + return set_volumes(&params); +} + +unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + wow64_get_endpoint_ids, + wow64_create_stream, + release_stream, + start, + stop, + reset, + wow64_get_render_buffer, + release_render_buffer, + wow64_get_capture_buffer, + release_capture_buffer, + wow64_get_mix_format, + wow64_is_format_supported, + wow64_get_buffer_size, + wow64_get_latency, + wow64_get_current_padding, + wow64_get_next_packet_size, + wow64_get_position, + wow64_get_frequency, + is_started, + wow64_set_volumes, + midi_init, + midi_release, + midi_out_message, + midi_in_message, + midi_notify_wait, +}; + +#endif /* _WIN64 */

1 0

Mohamad Al-Jaf : include: Add windows.media.closedcaptioning.idl file.
by Alexandre Julliard April 25, 2022

April 25, 2022

Module: wine Branch: master Commit: 425d1b9be41b0f0952befa8fde7b084becdcd6e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=425d1b9be41b0f0952befa8f… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Apr 24 23:49:52 2022 -0400 include: Add windows.media.closedcaptioning.idl file. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> 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.media.closedcaptioning.idl | 139 +++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2be5a2c2a31..31dc14a39d1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -793,6 +793,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.globalization.idl \ windows.h \ + windows.media.closedcaptioning.idl \ windows.media.devices.idl \ windows.media.idl \ windows.media.speechrecognition.idl \ diff --git a/include/windows.media.closedcaptioning.idl b/include/windows.media.closedcaptioning.idl new file mode 100644 index 00000000000..5e53ced1a50 --- /dev/null +++ b/include/windows.media.closedcaptioning.idl @@ -0,0 +1,139 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * 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 "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.ui.idl"; + +namespace Windows.Media.ClosedCaptioning { + typedef enum ClosedCaptionColor ClosedCaptionColor; + typedef enum ClosedCaptionEdgeEffect ClosedCaptionEdgeEffect; + typedef enum ClosedCaptionOpacity ClosedCaptionOpacity; + typedef enum ClosedCaptionSize ClosedCaptionSize; + typedef enum ClosedCaptionStyle ClosedCaptionStyle; + + interface IClosedCaptionPropertiesStatics; + + runtimeclass ClosedCaptionProperties; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum ClosedCaptionColor + { + Default = 0, + White = 1, + Black = 2, + Red = 3, + Green = 4, + Blue = 5, + Yellow = 6, + Magenta = 7, + Cyan = 8, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum ClosedCaptionEdgeEffect + { + Default = 0, + None = 1, + Raised = 2, + Depressed = 3, + Uniform = 4, + DropShadow = 5, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum ClosedCaptionOpacity + { + Default = 0, + OneHundredPercent = 1, + SeventyFivePercent = 2, + TwentyFivePercent = 3, + ZeroPercent = 4, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum ClosedCaptionSize + { + Default = 0, + FiftyPercent = 1, + OneHundredPercent = 2, + OneHundredFiftyPercent = 3, + TwoHundredPercent = 4, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum ClosedCaptionStyle + { + Default = 0, + MonospacedWithSerifs = 1, + ProportionalWithSerifs = 2, + MonospacedWithoutSerifs = 3, + ProportionalWithoutSerifs = 4, + Casual = 5, + Cursive = 6, + SmallCapitals = 7, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.ClosedCaptioning.ClosedCaptionProperties), + uuid(10aa1f84-cc30-4141-b503-5272289e0c20) + ] + interface IClosedCaptionPropertiesStatics : IInspectable + { + [propget] HRESULT FontColor([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionColor *value); + [propget] HRESULT ComputedFontColor([out, retval] Windows.UI.Color *value); + [propget] HRESULT FontOpacity([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionOpacity *value); + [propget] HRESULT FontSize([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionSize *value); + [propget] HRESULT FontStyle([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionStyle *value); + [propget] HRESULT FontEffect([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionEdgeEffect *value); + [propget] HRESULT BackgroundColor([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionColor *value); + [propget] HRESULT ComputedBackgroundColor([out, retval] Windows.UI.Color *value); + [propget] HRESULT BackgroundOpacity([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionOpacity *value); + [propget] HRESULT RegionColor([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionColor *value); + [propget] HRESULT ComputedRegionColor([out, retval] Windows.UI.Color *value); + [propget] HRESULT RegionOpacity([out, retval] Windows.Media.ClosedCaptioning.ClosedCaptionOpacity *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Media.ClosedCaptioning.IClosedCaptionPropertiesStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass ClosedCaptionProperties + { + } +}

1 0