February 2018 - Wine-devel - list.winehq.org

[PATCH 1/5] ddraw: Set WINED3D_RESOURCE_ACCESS_MAP on buffers.
by Henri Verbeet 09 Feb '18

09 Feb '18

Since ddraw buffers can always be mapped. WINED3D_RESOURCE_ACCESS_MAP is currently not enforced on buffers in wined3d, but we'd like to change that. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/executebuffer.c | 2 +- dlls/ddraw/vertexbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index d710b34..59ff83b 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -632,7 +632,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * desc.byte_width = new_size * sizeof(D3DTLVERTEX); desc.usage = WINED3DUSAGE_STATICDECL; - desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc, NULL, NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer))) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index df8531d..0ce5446 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -127,7 +127,7 @@ static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; else - desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; desc.structure_byte_stride = 0; -- 2.1.4

1 0

[PATCH resend 5/5] XInput: Implement XInputEnable
by Aric Stewart 09 Feb '18

09 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 59 ++++++++++++++++++++++++++++++++--------- dlls/xinput1_3/xinput_main.c | 12 ++++++++- dlls/xinput1_3/xinput_private.h | 1 + 3 files changed, 58 insertions(+), 14 deletions(-)

1 0

[PATCH resend 4/5] XInput: Implement XInputSetState
by Aric Stewart 09 Feb '18

09 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/xinput1_3/xinput_main.c | 6 ++++-- dlls/xinput1_3/xinput_private.h | 1 + include/xinput.h | 6 ++++++ 4 files changed, 53 insertions(+), 2 deletions(-)

1 0

[PATCH v2 3/5] XInput: Update state of HID device
by Aric Stewart 09 Feb '18

09 Feb '18

v2: Correct state_ex to state Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 94 ++++++++++++++++++++++++++++++++++++++--- dlls/xinput1_3/xinput_main.c | 14 +++--- dlls/xinput1_3/xinput_private.h | 1 + 3 files changed, 96 insertions(+), 13 deletions(-)

1 0

[PATCH resed 2/5] XInput: Detect and setup HID gamepads
by Aric Stewart 09 Feb '18

09 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/xinput1_1/Makefile.in | 2 + dlls/xinput1_2/Makefile.in | 2 + dlls/xinput1_3/Makefile.in | 2 + dlls/xinput1_3/hid.c | 331 ++++++++++++++++++++++++++++++++++++++++ dlls/xinput1_3/xinput_main.c | 26 ++-- dlls/xinput1_3/xinput_private.h | 30 ++++ dlls/xinput1_4/Makefile.in | 2 + dlls/xinput9_1_0/Makefile.in | 2 + 8 files changed, 386 insertions(+), 11 deletions(-) create mode 100644 dlls/xinput1_3/hid.c create mode 100644 dlls/xinput1_3/xinput_private.h

1 0

[PATCH resend 1/5] winebus.sys: Be more specific as to what we offer as IG_ enumerated devices
by Aric Stewart 09 Feb '18

09 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_iohid.c | 48 +++++++++++++++++++++++++-- dlls/winebus.sys/bus_udev.c | 79 +++++++++++++++++++++++++++++++++----------- dlls/winebus.sys/main.c | 29 ++++++++++++++++ 4 files changed, 135 insertions(+), 22 deletions(-)

1 0

[PATCH vkd3d 1/3] libs/vkd3d: Add remaining helper functions for CPU descriptor handles.
by Józef Kucia 09 Feb '18

09 Feb '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 8 ++++---- libs/vkd3d/device.c | 12 ++++++------ libs/vkd3d/vkd3d_private.h | 10 ++++++++++ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3b7d2ee4f086..4273a665e800 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3390,7 +3390,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->fb_height = 0; for (i = 0; i < render_target_descriptor_count; ++i) { - const struct d3d12_rtv_desc *rtv_desc = (const struct d3d12_rtv_desc *)render_target_descriptors[i].ptr; + const struct d3d12_rtv_desc *rtv_desc = d3d12_rtv_desc_from_cpu_handle(render_target_descriptors[i]); d3d12_command_list_track_resource_usage(list, rtv_desc->resource); @@ -3403,7 +3403,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi if (depth_stencil_descriptor) { - const struct d3d12_dsv_desc *dsv_desc = (const struct d3d12_dsv_desc *)depth_stencil_descriptor->ptr; + const struct d3d12_dsv_desc *dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor); d3d12_command_list_track_resource_usage(list, dsv_desc->resource); @@ -3523,7 +3523,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra { const union VkClearValue clear_value = {.depthStencil = {depth, stencil}}; struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - struct d3d12_dsv_desc *dsv_desc = (struct d3d12_dsv_desc *)dsv.ptr; + const struct d3d12_dsv_desc *dsv_desc = d3d12_dsv_desc_from_cpu_handle(dsv); struct VkAttachmentDescription attachment_desc; struct VkAttachmentReference ds_reference; @@ -3570,7 +3570,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra { const union VkClearValue clear_value = {{{color[0], color[1], color[2], color[3]}}}; struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - struct d3d12_rtv_desc *rtv_desc = (struct d3d12_rtv_desc *)rtv.ptr; + const struct d3d12_rtv_desc *rtv_desc = d3d12_rtv_desc_from_cpu_handle(rtv); struct VkAttachmentDescription attachment_desc; struct VkAttachmentReference color_reference; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 31fee8affb22..54b3d0e43077 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1605,7 +1605,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateConstantBufferView(ID3D12Device { TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr); - d3d12_desc_create_cbv((struct d3d12_desc *)descriptor.ptr, + d3d12_desc_create_cbv(d3d12_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), desc); } @@ -1616,7 +1616,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateShaderResourceView(ID3D12Device TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", iface, resource, desc, descriptor.ptr); - d3d12_desc_create_srv((struct d3d12_desc *)descriptor.ptr, + d3d12_desc_create_srv(d3d12_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), unsafe_impl_from_ID3D12Resource(resource), desc); } @@ -1627,7 +1627,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateUnorderedAccessView(ID3D12Devic TRACE("iface %p, resource %p, counter_resource %p, desc %p, descriptor %#lx.\n", iface, resource, counter_resource, desc, descriptor.ptr); - d3d12_desc_create_uav((struct d3d12_desc *)descriptor.ptr, + d3d12_desc_create_uav(d3d12_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), unsafe_impl_from_ID3D12Resource(resource), unsafe_impl_from_ID3D12Resource(counter_resource), desc); } @@ -1639,7 +1639,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateRenderTargetView(ID3D12Device * TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", iface, resource, desc, descriptor.ptr); - d3d12_rtv_desc_create_rtv((struct d3d12_rtv_desc *)descriptor.ptr, + d3d12_rtv_desc_create_rtv(d3d12_rtv_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), unsafe_impl_from_ID3D12Resource(resource), desc); } @@ -1650,7 +1650,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateDepthStencilView(ID3D12Device * TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", iface, resource, desc, descriptor.ptr); - d3d12_dsv_desc_create_dsv((struct d3d12_dsv_desc *)descriptor.ptr, + d3d12_dsv_desc_create_dsv(d3d12_dsv_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), unsafe_impl_from_ID3D12Resource(resource), desc); } @@ -1659,7 +1659,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateSampler(ID3D12Device *iface, { TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr); - d3d12_desc_create_sampler((struct d3d12_desc *)descriptor.ptr, + d3d12_desc_create_sampler(d3d12_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), desc); } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f22287121be3..89e4f23680c8 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -286,6 +286,11 @@ struct d3d12_rtv_desc struct d3d12_resource *resource; }; +static inline struct d3d12_rtv_desc *d3d12_rtv_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle) +{ + return (struct d3d12_rtv_desc *)cpu_handle.ptr; +} + void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; @@ -299,6 +304,11 @@ struct d3d12_dsv_desc struct d3d12_resource *resource; }; +static inline struct d3d12_dsv_desc *d3d12_dsv_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle) +{ + return (struct d3d12_dsv_desc *)cpu_handle.ptr; +} + void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN; -- 2.13.6

3 7

[PATCH 1/5] winebus.sys: Be more specific as to what we offer as IG_ enumerated devices
by Aric Stewart 09 Feb '18

09 Feb '18

Prepare to handle XInput compatible devices properly Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_iohid.c | 48 +++++++++++++++++++++++++-- dlls/winebus.sys/bus_udev.c | 79 +++++++++++++++++++++++++++++++++----------- dlls/winebus.sys/main.c | 29 ++++++++++++++++ 4 files changed, 135 insertions(+), 22 deletions(-)

2 1

[PATCH 1/2] wmp: Add IWMPPlayer interface
by Anton Romanov 09 Feb '18

09 Feb '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/wmp/oleobj.c | 3 + dlls/wmp/player.c | 271 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 17 +++ dlls/wmp/wmp_private.h | 1 + include/wmp.idl | 27 ++++- 5 files changed, 318 insertions(+), 1 deletion(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index acf38f3223..fbad032648 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -263,6 +263,9 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v }else if(IsEqualGUID(riid, &IID_IWMPPlayer4)) { TRACE("(%p)->(IID_IWMPPlayer4 %p)\n", This, ppv); *ppv = &This->IWMPPlayer4_iface; + }else if(IsEqualGUID(riid, &IID_IWMPPlayer)) { + TRACE("(%p)->(IID_IWMPPlayer %p)\n", This, ppv); + *ppv = &This->IWMPPlayer_iface; }else if(IsEqualGUID(riid, &IID_IWMPSettings)) { TRACE("(%p)->(IID_IWMPSettings %p)\n", This, ppv); *ppv = &This->IWMPSettings_iface; diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 4c11c88d74..accf5401ed 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -27,6 +27,11 @@ static inline WindowsMediaPlayer *impl_from_IWMPPlayer4(IWMPPlayer4 *iface) return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPPlayer4_iface); } +static inline WindowsMediaPlayer *impl_from_IWMPPlayer(IWMPPlayer *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPPlayer_iface); +} + static HRESULT WINAPI WMPPlayer4_QueryInterface(IWMPPlayer4 *iface, REFIID riid, void **ppv) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); @@ -362,6 +367,271 @@ static HRESULT WINAPI WMPPlayer4_openPlayer(IWMPPlayer4 *iface, BSTR url) return E_NOTIMPL; } +static HRESULT WINAPI WMPPlayer_QueryInterface(IWMPPlayer *iface, REFIID riid, void **ppv) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_QueryInterface(&This->IWMPPlayer4_iface, riid, ppv); +} + +static ULONG WINAPI WMPPlayer_AddRef(IWMPPlayer *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_AddRef(&This->IWMPPlayer4_iface); +} + +static ULONG WINAPI WMPPlayer_Release(IWMPPlayer *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_Release(&This->IWMPPlayer4_iface); +} + +static HRESULT WINAPI WMPPlayer_GetTypeInfoCount(IWMPPlayer *iface, UINT *pctinfo) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_GetTypeInfoCount(&This->IWMPPlayer4_iface, pctinfo); +} + +static HRESULT WINAPI WMPPlayer_GetTypeInfo(IWMPPlayer *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + + return WMPPlayer4_GetTypeInfo(&This->IWMPPlayer4_iface, iTInfo, + lcid, ppTInfo); +} + +static HRESULT WINAPI WMPPlayer_GetIDsOfNames(IWMPPlayer *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_GetIDsOfNames(&This->IWMPPlayer4_iface, riid, + rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI WMPPlayer_Invoke(IWMPPlayer *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_Invoke(&This->IWMPPlayer4_iface, dispIdMember, + riid, lcid, wFlags, pDispParams, pVarResult, + pExcepInfo, puArgErr); +} + +static HRESULT WINAPI WMPPlayer_close(IWMPPlayer *iface) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_close(&This->IWMPPlayer4_iface); +} + +static HRESULT WINAPI WMPPlayer_get_URL(IWMPPlayer *iface, BSTR *pbstrURL) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_URL(&This->IWMPPlayer4_iface, pbstrURL); +} + +static HRESULT WINAPI WMPPlayer_put_URL(IWMPPlayer *iface, BSTR url) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_put_URL(&This->IWMPPlayer4_iface, url); +} + +static HRESULT WINAPI WMPPlayer_get_openState(IWMPPlayer *iface, WMPOpenState *pwmpos) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_openState(&This->IWMPPlayer4_iface, pwmpos); +} + +static HRESULT WINAPI WMPPlayer_get_playState(IWMPPlayer *iface, WMPPlayState *pwmpps) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_playState(&This->IWMPPlayer4_iface, pwmpps); +} + +static HRESULT WINAPI WMPPlayer_get_controls(IWMPPlayer *iface, IWMPControls **ppControl) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_controls(&This->IWMPPlayer4_iface, ppControl); +} + +static HRESULT WINAPI WMPPlayer_get_settings(IWMPPlayer *iface, IWMPSettings **ppSettings) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_settings(&This->IWMPPlayer4_iface, ppSettings); +} + +static HRESULT WINAPI WMPPlayer_get_currentMedia(IWMPPlayer *iface, IWMPMedia **ppMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_currentMedia(&This->IWMPPlayer4_iface, ppMedia); +} + +static HRESULT WINAPI WMPPlayer_put_currentMedia(IWMPPlayer *iface, IWMPMedia *pMedia) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_put_currentMedia(&This->IWMPPlayer4_iface, pMedia); +} + +static HRESULT WINAPI WMPPlayer_get_mediaCollection(IWMPPlayer *iface, IWMPMediaCollection **ppMediaCollection) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_mediaCollection(&This->IWMPPlayer4_iface, ppMediaCollection); +} + +static HRESULT WINAPI WMPPlayer_get_playlistCollection(IWMPPlayer *iface, IWMPPlaylistCollection **ppPlaylistCollection) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_playlistCollection(&This->IWMPPlayer4_iface, ppPlaylistCollection); +} + +static HRESULT WINAPI WMPPlayer_get_versionInfo(IWMPPlayer *iface, BSTR *version) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_versionInfo(&This->IWMPPlayer4_iface, version); +} + +static HRESULT WINAPI WMPPlayer_launchURL(IWMPPlayer *iface, BSTR url) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_launchURL(&This->IWMPPlayer4_iface, url); +} + +static HRESULT WINAPI WMPPlayer_get_network(IWMPPlayer *iface, IWMPNetwork **ppQNI) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_network(&This->IWMPPlayer4_iface, ppQNI); +} + +static HRESULT WINAPI WMPPlayer_get_currentPlaylist(IWMPPlayer *iface, IWMPPlaylist **ppPL) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_currentPlaylist(&This->IWMPPlayer4_iface, ppPL); +} + +static HRESULT WINAPI WMPPlayer_put_currentPlaylist(IWMPPlayer *iface, IWMPPlaylist *pPL) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_put_currentPlaylist(&This->IWMPPlayer4_iface, pPL); +} + +static HRESULT WINAPI WMPPlayer_get_cdromCollection(IWMPPlayer *iface, IWMPCdromCollection **ppCdromCollection) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_cdromCollection(&This->IWMPPlayer4_iface, ppCdromCollection); +} + +static HRESULT WINAPI WMPPlayer_get_closedCaption(IWMPPlayer *iface, IWMPClosedCaption **ppClosedCaption) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_closedCaption(&This->IWMPPlayer4_iface, ppClosedCaption); +} + +static HRESULT WINAPI WMPPlayer_get_isOnline(IWMPPlayer *iface, VARIANT_BOOL *pfOnline) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_isOnline(&This->IWMPPlayer4_iface, pfOnline); +} + +static HRESULT WINAPI WMPPlayer_get_Error(IWMPPlayer *iface, IWMPError **ppError) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_Error(&This->IWMPPlayer4_iface, ppError); +} + +static HRESULT WINAPI WMPPlayer_get_Status(IWMPPlayer *iface, BSTR *pbstrStatus) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_Status(&This->IWMPPlayer4_iface, pbstrStatus); +} + +static HRESULT WINAPI WMPPlayer_get_enabled(IWMPPlayer *iface, VARIANT_BOOL *pbEnabled) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_enabled(&This->IWMPPlayer4_iface, pbEnabled); +} + +static HRESULT WINAPI WMPPlayer_put_enabled(IWMPPlayer *iface, VARIANT_BOOL enabled) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_put_enabled(&This->IWMPPlayer4_iface, enabled); +} + +static HRESULT WINAPI WMPPlayer_get_fullScreen(IWMPPlayer *iface, VARIANT_BOOL *pbFullScreen) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_fullScreen(&This->IWMPPlayer4_iface, pbFullScreen); +} + +static HRESULT WINAPI WMPPlayer_put_fullScreen(IWMPPlayer *iface, VARIANT_BOOL fullscreen) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_put_fullScreen(&This->IWMPPlayer4_iface, fullscreen); +} + +static HRESULT WINAPI WMPPlayer_get_enableContextMenu(IWMPPlayer *iface, VARIANT_BOOL *pbEnableContextMenu) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_enableContextMenu(&This->IWMPPlayer4_iface, pbEnableContextMenu); +} + +static HRESULT WINAPI WMPPlayer_put_enableContextMenu(IWMPPlayer *iface, VARIANT_BOOL enable) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_put_enableContextMenu(&This->IWMPPlayer4_iface, enable); +} + +static HRESULT WINAPI WMPPlayer_put_uiMode(IWMPPlayer *iface, BSTR mode) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_put_uiMode(&This->IWMPPlayer4_iface, mode); +} + +static HRESULT WINAPI WMPPlayer_get_uiMode(IWMPPlayer *iface, BSTR *pbstrMode) +{ + WindowsMediaPlayer *This = impl_from_IWMPPlayer(iface); + return WMPPlayer4_get_uiMode(&This->IWMPPlayer4_iface, pbstrMode); +} + +static IWMPPlayerVtbl WMPPlayerVtbl = { + WMPPlayer_QueryInterface, + WMPPlayer_AddRef, + WMPPlayer_Release, + WMPPlayer_GetTypeInfoCount, + WMPPlayer_GetTypeInfo, + WMPPlayer_GetIDsOfNames, + WMPPlayer_Invoke, + WMPPlayer_close, + WMPPlayer_get_URL, + WMPPlayer_put_URL, + WMPPlayer_get_openState, + WMPPlayer_get_playState, + WMPPlayer_get_controls, + WMPPlayer_get_settings, + WMPPlayer_get_currentMedia, + WMPPlayer_put_currentMedia, + WMPPlayer_get_mediaCollection, + WMPPlayer_get_playlistCollection, + WMPPlayer_get_versionInfo, + WMPPlayer_launchURL, + WMPPlayer_get_network, + WMPPlayer_get_currentPlaylist, + WMPPlayer_put_currentPlaylist, + WMPPlayer_get_cdromCollection, + WMPPlayer_get_closedCaption, + WMPPlayer_get_isOnline, + WMPPlayer_get_Error, + WMPPlayer_get_Status, + WMPPlayer_get_enabled, + WMPPlayer_put_enabled, + WMPPlayer_get_fullScreen, + WMPPlayer_put_fullScreen, + WMPPlayer_get_enableContextMenu, + WMPPlayer_put_enableContextMenu, + WMPPlayer_put_uiMode, + WMPPlayer_get_uiMode, +}; + + static IWMPPlayer4Vtbl WMPPlayer4Vtbl = { WMPPlayer4_QueryInterface, WMPPlayer4_AddRef, @@ -664,5 +934,6 @@ static const IWMPSettingsVtbl WMPSettingsVtbl = { void init_player_ifaces(WindowsMediaPlayer *wmp) { wmp->IWMPPlayer4_iface.lpVtbl = &WMPPlayer4Vtbl; + wmp->IWMPPlayer_iface.lpVtbl = &WMPPlayerVtbl; wmp->IWMPSettings_iface.lpVtbl = &WMPSettingsVtbl; } diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 2b646d7b1d..05861e1c10 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -792,6 +792,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) { IWMPSettings *settings, *settings_qi; IWMPPlayer4 *player4; + IWMPPlayer *player; HRESULT hres; hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); @@ -809,6 +810,22 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings_Release(settings); IWMPPlayer4_Release(player4); + + hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer, (void**)&player); + ok(hres == S_OK, "Could not get IWMPPlayer iface: %08x\n", hres); + + settings = NULL; + hres = IWMPPlayer_get_settings(player, &settings); + ok(hres == S_OK, "get_settings failed: %08x\n", hres); + ok(settings != NULL, "settings = NULL\n"); + + hres = IOleObject_QueryInterface(oleobj, &IID_IWMPSettings, (void**)&settings_qi); + ok(hres == S_OK, "Could not get IWMPSettings iface: %08x\n", hres); + ok(settings == settings_qi, "settings != settings_qi\n"); + IWMPSettings_Release(settings_qi); + + IWMPSettings_Release(settings); + IWMPPlayer_Release(player); } #define test_rect_size(a,b,c) _test_rect_size(__LINE__,a,b,c) diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 7b7f51cd63..aaff9777d4 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -30,6 +30,7 @@ struct WindowsMediaPlayer { IConnectionPointContainer IConnectionPointContainer_iface; IOleControl IOleControl_iface; IWMPPlayer4 IWMPPlayer4_iface; + IWMPPlayer IWMPPlayer_iface; IWMPSettings IWMPSettings_iface; LONG ref; diff --git a/include/wmp.idl b/include/wmp.idl index a879ab7c83..442b702138 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -1007,6 +1007,31 @@ library WMPLib { HRESULT openPlayer([in] BSTR bstrURL); } + [ + odl, + uuid(6BF52A4F-394A-11D3-B153-00C04F79FAA6), + dual, + oleautomation + ] + interface IWMPPlayer : IWMPCore { + [id(0x00000013), propget] + HRESULT enabled([out, retval] VARIANT_BOOL* pbEnabled); + [id(0x00000013), propput] + HRESULT enabled([in] VARIANT_BOOL pbEnabled); + [id(0x00000015), propget] + HRESULT fullScreen([out, retval] VARIANT_BOOL* pbFullScreen); + [id(0x00000015), propput] + HRESULT fullScreen(VARIANT_BOOL pbFullScreen); + [id(0x00000016), propget] + HRESULT enableContextMenu([out, retval] VARIANT_BOOL* pbEnableContextMenu); + [id(0x00000016), propput] + HRESULT enableContextMenu(VARIANT_BOOL pbEnableContextMenu); + [id(0x00000017), propput] + HRESULT uiMode([in] BSTR pbstrMode); + [id(0x00000017), propget] + HRESULT uiMode([out, retval] BSTR* pbstrMode); + }; + [ odl, uuid(82a2986c-0293-4fd0-b279-b21b86c058be), @@ -1406,7 +1431,7 @@ library WMPLib { [default] interface IWMPPlayer4; /* interface IWMPPlayer3; */ /* interface IWMPPlayer2; */ - /* interface IWMPPlayer; */ + interface IWMPPlayer; interface IWMPControls; interface IWMPSettings; interface IWMPPlaylist; -- 2.16.1

2 5

[PATCH 1/3] include: Add ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION and related struct/enum.
by Mark Jansen 09 Feb '18

09 Feb '18

2 1