June 2019 - Wine-Commits - list.winehq.org

Józef Kucia : vkd3d: Introduce FIXME_ONCE().
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: vkd3d Branch: master Commit: 285a19408fa915904768ab750c4a6c119ce30fdd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=285a19408fa915904768ab7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 12 14:08:01 2019 +0200 vkd3d: Introduce FIXME_ONCE(). The debug log level is demoted to WARN after the FIXME is printed once. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_debug.h | 10 ++++++++++ libs/vkd3d/command.c | 10 +++++----- libs/vkd3d/device.c | 4 ++-- libs/vkd3d/state.c | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 2ef8a00..1a44cb9 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -59,6 +59,14 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; const enum vkd3d_dbg_level vkd3d_dbg_level = VKD3D_DBG_LEVEL_##level; \ VKD3D_DBG_PRINTF +#define VKD3D_DBG_LOG_ONCE(first_time_level, level) \ + do { \ + static bool vkd3d_dbg_next_time; \ + const enum vkd3d_dbg_level vkd3d_dbg_level = vkd3d_dbg_next_time \ + ? VKD3D_DBG_LEVEL_##level : VKD3D_DBG_LEVEL_##first_time_level; \ + vkd3d_dbg_next_time = true; \ + VKD3D_DBG_PRINTF + #define VKD3D_DBG_PRINTF(args...) \ vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, args); } while (0) @@ -80,6 +88,8 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; #define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE) #endif +#define FIXME_ONCE VKD3D_DBG_LOG_ONCE(FIXME, WARN) + #define VKD3D_DEBUG_ENV_NAME(name) const char *vkd3d_dbg_env_name = name static inline const char *debugstr_guid(const GUID *guid) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 55a15d9..25c8005 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3538,7 +3538,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetViewports(ID3D12GraphicsCo if (!vk_viewports[i].width || !vk_viewports[i].height) { - FIXME("Invalid viewport %u, ignoring RSSetViewports().\n", i); + FIXME_ONCE("Invalid viewport %u, ignoring RSSetViewports().\n", i); return; } } @@ -3790,7 +3790,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC /* FIXME: Some formats in D3D12 are planar. Each plane is a separate sub-resource. */ if (sub_resource_idx >= d3d12_resource_desc_get_sub_resource_count(&resource->desc)) { - FIXME("Unhandled sub-resource idx %u.\n", sub_resource_idx); + FIXME_ONCE("Unhandled sub-resource idx %u.\n", sub_resource_idx); continue; } @@ -3806,7 +3806,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC } if (have_aliasing_barriers) - FIXME("Aliasing barriers not implemented yet.\n"); + FIXME_ONCE("Aliasing barriers not implemented yet.\n"); /* Vulkan doesn't support split barriers. */ if (have_split_barriers) @@ -4684,7 +4684,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(I static void STDMETHODCALLTYPE d3d12_command_list_DiscardResource(ID3D12GraphicsCommandList1 *iface, ID3D12Resource *resource, const D3D12_DISCARD_REGION *region) { - FIXME("iface %p, resource %p, region %p stub!\n", iface, resource, region); + FIXME_ONCE("iface %p, resource %p, region %p stub!\n", iface, resource, region); } static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsCommandList1 *iface, @@ -4788,7 +4788,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics * count precisely, even when it was signalled that non-precise is enough. */ if (type == D3D12_QUERY_TYPE_BINARY_OCCLUSION) - FIXME("D3D12 guarantees binary occlusion queries result in only 0 and 1.\n"); + FIXME_ONCE("D3D12 guarantees binary occlusion queries result in only 0 and 1.\n"); if (!d3d12_resource_is_buffer(buffer)) { diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index b1da9e9..fa10bb8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2838,7 +2838,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_OpenSharedHandleByName(ID3D12Devic static HRESULT STDMETHODCALLTYPE d3d12_device_MakeResident(ID3D12Device *iface, UINT object_count, ID3D12Pageable * const *objects) { - FIXME("iface %p, object_count %u, objects %p stub!\n", + FIXME_ONCE("iface %p, object_count %u, objects %p stub!\n", iface, object_count, objects); return S_OK; @@ -2847,7 +2847,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_MakeResident(ID3D12Device *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_Evict(ID3D12Device *iface, UINT object_count, ID3D12Pageable * const *objects) { - FIXME("iface %p, object_count %u, objects %p stub!\n", + FIXME_ONCE("iface %p, object_count %u, objects %p stub!\n", iface, object_count, objects); return S_OK; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index be2aa4f..64be72d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1720,7 +1720,7 @@ static void rs_desc_from_d3d12(VkPipelineRasterizationStateCreateInfo *vk_desc, vk_desc->lineWidth = 1.0f; if (d3d12_desc->MultisampleEnable) - FIXME("Ignoring MultisampleEnable %#x.\n", d3d12_desc->MultisampleEnable); + FIXME_ONCE("Ignoring MultisampleEnable %#x.\n", d3d12_desc->MultisampleEnable); if (d3d12_desc->AntialiasedLineEnable) FIXME("Ignoring AntialiasedLineEnable %#x.\n", d3d12_desc->AntialiasedLineEnable); if (d3d12_desc->ForcedSampleCount)

1 0

Paul Gofman : ddraw: Increase maximum active light count.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 83ca9a95de80083d906a2aeb5d1e5ca2ed611199 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83ca9a95de80083d906a2aeb… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jun 11 13:06:22 2019 +0300 ddraw: Increase maximum active light count. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index e7a9c1d..adfb029 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -66,7 +66,7 @@ struct FvfToDecl | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART \ | WINED3D_LEGACY_CUBEMAP_FILTERING) -#define DDRAW_MAX_ACTIVE_LIGHTS 8 +#define DDRAW_MAX_ACTIVE_LIGHTS 32 enum ddraw_device_state {

1 0

Nikolay Sivov : mfplat: Give priority to local bytestream handlers.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 1cc06fb257fb7728604c826a753239b2085845b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cc06fb257fb7728604c826a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 11 15:40:03 2019 +0300 mfplat: Give priority to local bytestream handlers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c24407f..78ae417 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5031,9 +5031,9 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA IMFAttributes *attributes; const WCHAR *url_ext; WCHAR *mimeW = NULL; + HRESULT hr = E_FAIL; unsigned int i, j; UINT32 length; - HRESULT hr; *handler = NULL; @@ -5053,7 +5053,28 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA return MF_E_UNSUPPORTED_BYTESTREAM_TYPE; } - /* FIXME: check local handlers first */ + if (!(flags & MF_RESOLUTION_DISABLE_LOCAL_PLUGINS)) + { + struct local_handler *local_handler; + + EnterCriticalSection(&local_handlers_section); + + LIST_FOR_EACH_ENTRY(local_handler, &local_bytestream_handlers, struct local_handler, entry) + { + if ((mimeW && !lstrcmpiW(mimeW, local_handler->u.bytestream.mime)) + || (url_ext && !lstrcmpiW(url_ext, local_handler->u.bytestream.extension))) + { + if (SUCCEEDED(hr = IMFActivate_ActivateObject(local_handler->activate, &IID_IMFByteStreamHandler, + (void **)handler))) + break; + } + } + + LeaveCriticalSection(&local_handlers_section); + + if (*handler) + return hr; + } for (i = 0, hr = E_FAIL; i < ARRAY_SIZE(hkey_roots); ++i) {

1 0

Zebediah Figura : strmbase: Don' t increment the pin reference count in filter_get_pin().
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 690838a0e01368d475ab3cd1dd1910309edb606f URL: https://source.winehq.org/git/wine.git/?a=commit;h=690838a0e01368d475ab3cd1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 10:42:16 2019 -0400 strmbase: Don't increment the pin reference count in filter_get_pin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 13 ++++--------- dlls/qcap/avimux.c | 15 ++++----------- dlls/qcap/smartteefilter.c | 15 +++++---------- dlls/qcap/vfwcapture.c | 1 - dlls/qedit/samplegrabber.c | 13 ++++--------- dlls/quartz/filesource.c | 10 ++++------ dlls/quartz/parser.c | 8 +++----- dlls/strmbase/enumpins.c | 24 ++++++++---------------- dlls/strmbase/filter.c | 8 ++------ dlls/strmbase/renderer.c | 1 - dlls/strmbase/transform.c | 1 - dlls/winegstreamer/gstdemux.c | 16 +++++----------- dlls/wineqtdecoder/qtsplitter.c | 12 ------------ 13 files changed, 39 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=690838a0e01368d475ab…

1 0

Paul Gofman : ddraw: Do not limit inactive light count in viewport.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: d864cece537a129f48445a4701ec5de8483aabe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d864cece537a129f48445a47… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jun 11 13:06:19 2019 +0300 ddraw: Do not limit inactive light count in viewport. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 3 +++ dlls/ddraw/light.c | 15 +++++++++++++-- dlls/ddraw/viewport.c | 29 ++++++++++++++++++----------- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7a1d357..e7a9c1d 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -661,4 +661,7 @@ struct member_info HRESULT hr_ddraw_from_wined3d(HRESULT hr) DECLSPEC_HIDDEN; +void viewport_alloc_active_light_index(struct d3d_light *light) DECLSPEC_HIDDEN; +void viewport_free_active_light_index(struct d3d_light *light) DECLSPEC_HIDDEN; + #endif diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index a86f046..22ebe20 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -59,9 +59,14 @@ void light_activate(struct d3d_light *light) return; device = light->active_viewport->active_device; - light_update(light); if (light->light.dwFlags & D3DLIGHT_ACTIVE) + { + viewport_alloc_active_light_index(light); + if (!light->active_light_index) + return; + light_update(light); IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, TRUE); + } } /***************************************************************************** @@ -79,11 +84,17 @@ void light_deactivate(struct d3d_light *light) if (!light->active_viewport || !light->active_viewport->active_device || light->active_viewport->active_device->current_viewport != light->active_viewport) + { + assert(!light->active_light_index); return; + } device = light->active_viewport->active_device; - if (light->light.dwFlags & D3DLIGHT_ACTIVE) + if (light->active_light_index) + { IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, FALSE); + viewport_free_active_light_index(light); + } } static inline struct d3d_light *impl_from_IDirect3DLight(IDirect3DLight *iface) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 3172440..07fd197 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -122,7 +122,7 @@ void viewport_deactivate(struct d3d_viewport *viewport) } } -static void viewport_alloc_active_light_index(struct d3d_light *light) +void viewport_alloc_active_light_index(struct d3d_light *light) { struct d3d_viewport *vp = light->active_viewport; unsigned int i; @@ -150,6 +150,23 @@ static void viewport_alloc_active_light_index(struct d3d_light *light) vp->map_lights |= 1u << i; } +void viewport_free_active_light_index(struct d3d_light *light) +{ + struct d3d_viewport *vp = light->active_viewport; + + TRACE("vp %p, light %p, index %u, active_lights_count %u, map_lights %#x.\n", + vp, light, light->active_light_index, vp->active_lights_count, vp->map_lights); + + if (!light->active_light_index) + return; + + assert(vp->map_lights & (1u << (light->active_light_index - 1))); + + --vp->active_lights_count; + vp->map_lights &= ~(1u << (light->active_light_index - 1)); + light->active_light_index = 0; +} + /***************************************************************************** * _dump_D3DVIEWPORT, _dump_D3DVIEWPORT2 * @@ -798,19 +815,11 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *viewport, IDirec } light_impl->active_viewport = vp; - viewport_alloc_active_light_index(light_impl); - if (!light_impl->active_light_index) - { - light_impl->active_viewport = NULL; - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; - } /* Add the light in the 'linked' chain */ list_add_head(&vp->light_list, &light_impl->entry); IDirect3DLight_AddRef(light); - /* Attach the light to the viewport */ light_activate(light_impl); wined3d_mutex_unlock(); @@ -851,8 +860,6 @@ static HRESULT WINAPI d3d_viewport_DeleteLight(IDirect3DViewport3 *iface, IDirec list_remove(&l->entry); l->active_viewport = NULL; IDirect3DLight_Release(lpDirect3DLight); - --viewport->active_lights_count; - viewport->map_lights &= ~(1 << l->active_light_index); wined3d_mutex_unlock();

1 0

Paul Gofman : ddraw: Factor out viewport_alloc_active_light_index() function.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 87a0edafbb451aaac8a1a00a18abef8fea34a45c URL: https://source.winehq.org/git/wine.git/?a=commit;h=87a0edafbb451aaac8a1a00a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jun 11 13:06:18 2019 +0300 ddraw: Factor out viewport_alloc_active_light_index() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 6 +++-- dlls/ddraw/light.c | 6 ++--- dlls/ddraw/viewport.c | 66 +++++++++++++++++++++++++++++----------------- 3 files changed, 49 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7137f78..7a1d357 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -66,6 +66,8 @@ struct FvfToDecl | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART \ | WINED3D_LEGACY_CUBEMAP_FILTERING) +#define DDRAW_MAX_ACTIVE_LIGHTS 8 + enum ddraw_device_state { DDRAW_DEVICE_STATE_OK, @@ -445,7 +447,7 @@ struct d3d_light D3DLIGHT2 light; D3DLIGHT7 light7; - DWORD dwLightIndex; + DWORD active_light_index; struct list entry; }; @@ -499,7 +501,7 @@ struct d3d_viewport /* If this viewport is active for one device, put the device here */ struct d3d_device *active_device; - DWORD num_lights; + DWORD active_lights_count; DWORD map_lights; enum ddraw_viewport_version version; diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index c6513ff..a86f046 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -39,7 +39,7 @@ static void light_update(struct d3d_light *light) if (!light->active_viewport || !light->active_viewport->active_device) return; device = light->active_viewport->active_device; - IDirect3DDevice7_SetLight(&device->IDirect3DDevice7_iface, light->dwLightIndex, &light->light7); + IDirect3DDevice7_SetLight(&device->IDirect3DDevice7_iface, light->active_light_index, &light->light7); } /***************************************************************************** @@ -61,7 +61,7 @@ void light_activate(struct d3d_light *light) light_update(light); if (light->light.dwFlags & D3DLIGHT_ACTIVE) - IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, TRUE); + IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, TRUE); } /***************************************************************************** @@ -83,7 +83,7 @@ void light_deactivate(struct d3d_light *light) device = light->active_viewport->active_device; if (light->light.dwFlags & D3DLIGHT_ACTIVE) - IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, FALSE); + IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, FALSE); } static inline struct d3d_light *impl_from_IDirect3DLight(IDirect3DLight *iface) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index daa5ac8..3172440 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -122,6 +122,34 @@ void viewport_deactivate(struct d3d_viewport *viewport) } } +static void viewport_alloc_active_light_index(struct d3d_light *light) +{ + struct d3d_viewport *vp = light->active_viewport; + unsigned int i; + DWORD map; + + TRACE("vp %p, light %p, index %u, active_lights_count %u.\n", + vp, light, light->active_light_index, vp->active_lights_count); + + if (light->active_light_index) + return; + + if (vp->active_lights_count >= DDRAW_MAX_ACTIVE_LIGHTS) + return; + + map = vp->map_lights; + + i = 0; + while (map & 1) + { + map >>= 1; + ++i; + } + light->active_light_index = i + 1; + ++vp->active_lights_count; + vp->map_lights |= 1u << i; +} + /***************************************************************************** * _dump_D3DVIEWPORT, _dump_D3DVIEWPORT2 * @@ -753,23 +781,15 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, * DDERR_INVALIDPARAMS if there are 8 lights or more * *****************************************************************************/ -static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3DLight *lpDirect3DLight) +static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *viewport, IDirect3DLight *light) { - struct d3d_viewport *This = impl_from_IDirect3DViewport3(iface); - struct d3d_light *light_impl = unsafe_impl_from_IDirect3DLight(lpDirect3DLight); - DWORD i = 0; - DWORD map = This->map_lights; + struct d3d_light *light_impl = unsafe_impl_from_IDirect3DLight(light); + struct d3d_viewport *vp = impl_from_IDirect3DViewport3(viewport); - TRACE("iface %p, light %p.\n", iface, lpDirect3DLight); + TRACE("viewport %p, light %p.\n", viewport, light); wined3d_mutex_lock(); - if (This->num_lights >= 8) - { - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; - } - if (light_impl->active_viewport) { wined3d_mutex_unlock(); @@ -777,22 +797,20 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3D return D3DERR_LIGHTHASVIEWPORT; } - /* Find a light number and update both light and viewports objects accordingly */ - while (map & 1) + light_impl->active_viewport = vp; + viewport_alloc_active_light_index(light_impl); + if (!light_impl->active_light_index) { - map >>= 1; - ++i; + light_impl->active_viewport = NULL; + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; } - light_impl->dwLightIndex = i; - This->num_lights++; - This->map_lights |= 1<<i; /* Add the light in the 'linked' chain */ - list_add_head(&This->light_list, &light_impl->entry); - IDirect3DLight_AddRef(lpDirect3DLight); + list_add_head(&vp->light_list, &light_impl->entry); + IDirect3DLight_AddRef(light); /* Attach the light to the viewport */ - light_impl->active_viewport = This; light_activate(light_impl); wined3d_mutex_unlock(); @@ -833,8 +851,8 @@ static HRESULT WINAPI d3d_viewport_DeleteLight(IDirect3DViewport3 *iface, IDirec list_remove(&l->entry); l->active_viewport = NULL; IDirect3DLight_Release(lpDirect3DLight); - --viewport->num_lights; - viewport->map_lights &= ~(1 << l->dwLightIndex); + --viewport->active_lights_count; + viewport->map_lights &= ~(1 << l->active_light_index); wined3d_mutex_unlock();

1 0

Nikolay Sivov : mf: Forward grabber clock state change calls to user callback.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 672ce5c7d1c1ea92ef56e762d26cb51d69404e5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=672ce5c7d1c1ea92ef56e762… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 11 15:40:05 2019 +0300 mf: Forward grabber clock state change calls to user callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 7bc566f..af9666c 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1127,7 +1127,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockStart(IMFClockStateSink * sample_grabber_set_state(grabber, SINK_STATE_RUNNING); - return S_OK; + return IMFSampleGrabberSinkCallback_OnClockStart(sample_grabber_get_callback(grabber), systime, offset); } static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) @@ -1138,14 +1138,16 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *i sample_grabber_set_state(grabber, SINK_STATE_STOPPED); - return S_OK; + return IMFSampleGrabberSinkCallback_OnClockStop(sample_grabber_get_callback(grabber), systime); } static HRESULT WINAPI sample_grabber_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) { + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); - return S_OK; + return IMFSampleGrabberSinkCallback_OnClockPause(sample_grabber_get_callback(grabber), systime); } static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) @@ -1156,14 +1158,16 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink sample_grabber_set_state(grabber, SINK_STATE_RUNNING); - return S_OK; + return IMFSampleGrabberSinkCallback_OnClockRestart(sample_grabber_get_callback(grabber), systime); } static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) { - FIXME("%p, %s, %f.\n", iface, wine_dbgstr_longlong(systime), rate); + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - return E_NOTIMPL; + TRACE("%p, %s, %f.\n", iface, wine_dbgstr_longlong(systime), rate); + + return IMFSampleGrabberSinkCallback_OnClockSetRate(sample_grabber_get_callback(grabber), systime, rate); } static HRESULT WINAPI sample_grabber_events_QueryInterface(IMFMediaEventGenerator *iface, REFIID riid, void **obj)

1 0

Nikolay Sivov : mfplat: Add MFRegisterLocalByteStreamHandler().
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: c7b956f8fcf18c0b66271c22a8d82369bb0788f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7b956f8fcf18c0b66271c22… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 11 15:40:01 2019 +0300 mfplat: Add MFRegisterLocalByteStreamHandler(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 75 +++++++++++++++++++++++++++++++++++++--------- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 15 ++++++++++ 3 files changed, 77 insertions(+), 14 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c0866f7..f759b5c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -47,13 +47,22 @@ static LONG platform_lock; struct local_handler { struct list entry; - WCHAR *scheme; + union + { + WCHAR *scheme; + struct + { + WCHAR *extension; + WCHAR *mime; + } bytestream; + } u; IMFActivate *activate; }; static CRITICAL_SECTION local_handlers_section = { NULL, -1, 0, 0, 0, 0 }; static struct list local_scheme_handlers = LIST_INIT(local_scheme_handlers); +static struct list local_bytestream_handlers = LIST_INIT(local_bytestream_handlers); struct system_clock { @@ -7153,21 +7162,25 @@ static const IMFAsyncCallbackVtbl async_create_file_callback_vtbl = async_create_file_callback_Invoke, }; -static WCHAR *heap_strdupW(const WCHAR *str) +static HRESULT heap_strdupW(const WCHAR *str, WCHAR **dest) { - WCHAR *ret = NULL; + HRESULT hr = S_OK; if (str) { unsigned int size; size = (lstrlenW(str) + 1) * sizeof(WCHAR); - ret = heap_alloc(size); - if (ret) - memcpy(ret, str, size); + *dest = heap_alloc(size); + if (*dest) + memcpy(*dest, str, size); + else + hr = E_OUTOFMEMORY; } + else + *dest = NULL; - return ret; + return hr; } /*********************************************************************** @@ -7201,12 +7214,8 @@ HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMOD async->access_mode = access_mode; async->open_mode = open_mode; async->flags = flags; - async->path = heap_strdupW(path); - if (!async->path) - { - hr = E_OUTOFMEMORY; + if (FAILED(hr = heap_strdupW(path, &async->path))) goto failed; - } hr = MFCreateAsyncResult(NULL, &async->IMFAsyncCallback_iface, (IUnknown *)caller, &item); if (FAILED(hr)) @@ -7300,6 +7309,7 @@ HRESULT WINAPI MFCancelCreateFile(IUnknown *cancel_cookie) HRESULT WINAPI MFRegisterLocalSchemeHandler(const WCHAR *scheme, IMFActivate *activate) { struct local_handler *handler; + HRESULT hr; TRACE("%s, %p.\n", debugstr_w(scheme), activate); @@ -7309,10 +7319,10 @@ HRESULT WINAPI MFRegisterLocalSchemeHandler(const WCHAR *scheme, IMFActivate *ac if (!(handler = heap_alloc(sizeof(*handler)))) return E_OUTOFMEMORY; - if (!(handler->scheme = heap_strdupW(scheme))) + if (FAILED(hr = heap_strdupW(scheme, &handler->u.scheme))) { heap_free(handler); - return E_OUTOFMEMORY; + return hr; } handler->activate = activate; IMFActivate_AddRef(handler->activate); @@ -7323,3 +7333,40 @@ HRESULT WINAPI MFRegisterLocalSchemeHandler(const WCHAR *scheme, IMFActivate *ac return S_OK; } + +/*********************************************************************** + * MFRegisterLocalByteStreamHandler (mfplat.@) + */ +HRESULT WINAPI MFRegisterLocalByteStreamHandler(const WCHAR *extension, const WCHAR *mime, IMFActivate *activate) +{ + struct local_handler *handler; + HRESULT hr; + + TRACE("%s, %s, %p.\n", debugstr_w(extension), debugstr_w(mime), activate); + + if ((!extension && !mime) || !activate) + return E_INVALIDARG; + + if (!(handler = heap_alloc_zero(sizeof(*handler)))) + return E_OUTOFMEMORY; + + hr = heap_strdupW(extension, &handler->u.bytestream.extension); + if (SUCCEEDED(hr)) + hr = heap_strdupW(mime, &handler->u.bytestream.mime); + + if (FAILED(hr)) + goto failed; + + EnterCriticalSection(&local_handlers_section); + list_add_head(&local_bytestream_handlers, &handler->entry); + LeaveCriticalSection(&local_handlers_section); + + return hr; + +failed: + heap_free(handler->u.bytestream.extension); + heap_free(handler->u.bytestream.mime); + heap_free(handler); + + return hr; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 2dfa92f..1ae0927 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -128,6 +128,7 @@ @ stdcall MFPutWorkItemEx(long ptr) @ stdcall MFPutWorkItemEx2(long long ptr) @ stub MFRecordError +@ stdcall MFRegisterLocalByteStreamHandler(wstr wstr ptr) @ stdcall MFRegisterLocalSchemeHandler(wstr ptr) @ stdcall MFRemovePeriodicCallback(long) @ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ab651c5..e63efc1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3591,6 +3591,21 @@ static void test_local_handlers(void) hr = pMFRegisterLocalSchemeHandler(localW, &local_activate); ok(hr == S_OK, "Failed to register scheme handler, hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(NULL, NULL, &local_activate); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(NULL, localW, &local_activate); + ok(hr == S_OK, "Failed to register stream handler, hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(localW, NULL, &local_activate); + ok(hr == S_OK, "Failed to register stream handler, hr %#x.\n", hr); + + hr = pMFRegisterLocalByteStreamHandler(localW, localW, &local_activate); + ok(hr == S_OK, "Failed to register stream handler, hr %#x.\n", hr); } START_TEST(mfplat)

1 0

Andrew Eikum : winebus.sys: Close SDL handles when a device is removed.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: f8a04c7f2e2c77eef663c5bb2109e3dbd51b22e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8a04c7f2e2c77eef663c5bb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 11 10:29:14 2019 -0500 winebus.sys: Close SDL handles when a device is removed. This fixes opening SDL haptic handles after a device is removed and re-added. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 1a938aa..d24e21c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -75,6 +75,7 @@ static void *sdl_handle = NULL; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(SDL_GetError); MAKE_FUNCPTR(SDL_Init); +MAKE_FUNCPTR(SDL_JoystickClose); MAKE_FUNCPTR(SDL_JoystickEventState); MAKE_FUNCPTR(SDL_JoystickGetGUID); MAKE_FUNCPTR(SDL_JoystickGetGUIDString); @@ -89,6 +90,7 @@ MAKE_FUNCPTR(SDL_JoystickNumHats); MAKE_FUNCPTR(SDL_JoystickGetAxis); MAKE_FUNCPTR(SDL_JoystickGetHat); MAKE_FUNCPTR(SDL_IsGameController); +MAKE_FUNCPTR(SDL_GameControllerClose); MAKE_FUNCPTR(SDL_GameControllerGetAxis); MAKE_FUNCPTR(SDL_GameControllerGetButton); MAKE_FUNCPTR(SDL_GameControllerName); @@ -879,13 +881,28 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) static void try_remove_device(SDL_JoystickID index) { DEVICE_OBJECT *device = NULL; + struct platform_private *private; + SDL_Joystick *sdl_joystick; + SDL_GameController *sdl_controller; + SDL_Haptic *sdl_haptic; device = bus_find_hid_device(&sdl_vtbl, ULongToPtr(index)); if (!device) return; + private = impl_from_DEVICE_OBJECT(device); + sdl_joystick = private->sdl_joystick; + sdl_controller = private->sdl_controller; + sdl_haptic = private->sdl_haptic; + IoInvalidateDeviceRelations(device, RemovalRelations); bus_remove_hid_device(device); + + pSDL_JoystickClose(sdl_joystick); + if (sdl_controller) + pSDL_GameControllerClose(sdl_controller); + if (sdl_haptic) + pSDL_HapticClose(sdl_haptic); } static void try_add_device(SDL_JoystickID index) @@ -1085,6 +1102,7 @@ NTSTATUS sdl_driver_init(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(sdl_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} LOAD_FUNCPTR(SDL_GetError); LOAD_FUNCPTR(SDL_Init); + LOAD_FUNCPTR(SDL_JoystickClose); LOAD_FUNCPTR(SDL_JoystickEventState); LOAD_FUNCPTR(SDL_JoystickGetGUID); LOAD_FUNCPTR(SDL_JoystickGetGUIDString); @@ -1099,6 +1117,7 @@ NTSTATUS sdl_driver_init(void) LOAD_FUNCPTR(SDL_JoystickGetAxis); LOAD_FUNCPTR(SDL_JoystickGetHat); LOAD_FUNCPTR(SDL_IsGameController); + LOAD_FUNCPTR(SDL_GameControllerClose); LOAD_FUNCPTR(SDL_GameControllerGetAxis); LOAD_FUNCPTR(SDL_GameControllerGetButton); LOAD_FUNCPTR(SDL_GameControllerName);

1 0

Zebediah Figura : quartz/filtergraph: Use the type info cache for IBasicVideo.
by Alexandre Julliard June 11, 2019

June 11, 2019

Module: wine Branch: master Commit: 6edee72560651f45c01dd05385c95633f377bc8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6edee72560651f45c01dd053… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 10:42:15 2019 -0400 quartz/filtergraph: Use the type info cache for IBasicVideo. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 95 ++++++++++++----------------------------- dlls/quartz/tests/filtergraph.c | 27 +++++++++--- 2 files changed, 49 insertions(+), 73 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 046a0a1..c9710f1 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -3234,90 +3234,51 @@ static ULONG WINAPI BasicVideo_Release(IBasicVideo2 *iface) return IUnknown_Release(This->outer_unk); } -/*** IDispatch methods ***/ -static HRESULT WINAPI BasicVideo_GetTypeInfoCount(IBasicVideo2 *iface, UINT *pctinfo) +static HRESULT WINAPI BasicVideo_GetTypeInfoCount(IBasicVideo2 *iface, UINT *count) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - IBasicVideo *pBasicVideo; - HRESULT hr; - - TRACE("(%p/%p)->(%p)\n", This, iface, pctinfo); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IBasicVideo, (LPVOID*)&pBasicVideo); - - if (hr == S_OK) - hr = IBasicVideo_GetTypeInfoCount(pBasicVideo, pctinfo); - - LeaveCriticalSection(&This->cs); - - return hr; + TRACE("iface %p, count %p.\n", iface, count); + *count = 1; + return S_OK; } -static HRESULT WINAPI BasicVideo_GetTypeInfo(IBasicVideo2 *iface, UINT iTInfo, LCID lcid, - ITypeInfo **ppTInfo) +static HRESULT WINAPI BasicVideo_GetTypeInfo(IBasicVideo2 *iface, UINT index, + LCID lcid, ITypeInfo **typeinfo) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - IBasicVideo *pBasicVideo; - HRESULT hr; - - TRACE("(%p/%p)->(%d, %d, %p)\n", This, iface, iTInfo, lcid, ppTInfo); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IBasicVideo, (LPVOID*)&pBasicVideo); - - if (hr == S_OK) - hr = IBasicVideo_GetTypeInfo(pBasicVideo, iTInfo, lcid, ppTInfo); - - LeaveCriticalSection(&This->cs); - - return hr; + TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo); + return strmbase_get_typeinfo(IBasicVideo_tid, typeinfo); } -static HRESULT WINAPI BasicVideo_GetIDsOfNames(IBasicVideo2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +static HRESULT WINAPI BasicVideo_GetIDsOfNames(IBasicVideo2 *iface, REFIID iid, + LPOLESTR *names, UINT count, LCID lcid, DISPID *ids) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - IBasicVideo *pBasicVideo; + ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p/%p)->(%s, %p, %d, %d, %p)\n", This, iface, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IBasicVideo, (LPVOID*)&pBasicVideo); - - if (hr == S_OK) - hr = IBasicVideo_GetIDsOfNames(pBasicVideo, riid, rgszNames, cNames, lcid, rgDispId); - - LeaveCriticalSection(&This->cs); + TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n", + iface, debugstr_guid(iid), names, count, lcid, ids); + if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo))) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, ids); + ITypeInfo_Release(typeinfo); + } return hr; } -static HRESULT WINAPI BasicVideo_Invoke(IBasicVideo2 *iface, DISPID dispIdMember, REFIID riid, - LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, - UINT *puArgErr) +static HRESULT WINAPI BasicVideo_Invoke(IBasicVideo2 *iface, DISPID id, REFIID iid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - IBasicVideo *pBasicVideo; + ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p/%p)->(%d, %s, %d, %04x, %p, %p, %p, %p)\n", This, iface, dispIdMember, - debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - - EnterCriticalSection(&This->cs); - - hr = GetTargetInterface(This, &IID_IBasicVideo, (LPVOID*)&pBasicVideo); - - if (hr == S_OK) - hr = IBasicVideo_Invoke(pBasicVideo, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - - LeaveCriticalSection(&This->cs); + TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n", + iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg); + if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo))) + { + hr = ITypeInfo_Invoke(typeinfo, iface, id, flags, params, result, excepinfo, error_arg); + ITypeInfo_Release(typeinfo); + } return hr; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 976617e..d89c9e2 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2494,7 +2494,9 @@ static void test_control_delegation(void) IBasicAudio *audio, *filter_audio; IBaseFilter *renderer; IVideoWindow *window; - IBasicVideo *video; + IBasicVideo2 *video; + ITypeInfo *typeinfo; + TYPEATTR *typeattr; ULONG count; HRESULT hr; LONG val; @@ -2564,15 +2566,28 @@ static void test_control_delegation(void) /* IBasicVideo and IVideoWindow */ - hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicVideo, (void **)&video); + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicVideo2, (void **)&video); ok(hr == S_OK, "got %#x\n", hr); hr = IFilterGraph2_QueryInterface(graph, &IID_IVideoWindow, (void **)&window); ok(hr == S_OK, "got %#x\n", hr); /* Unlike IBasicAudio, these return E_NOINTERFACE. */ - hr = IBasicVideo_get_BitRate(video, &val); + hr = IBasicVideo2_get_BitRate(video, &val); ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IBasicVideo2_GetTypeInfoCount(video, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + + hr = IBasicVideo2_GetTypeInfo(video, 0, 0, &typeinfo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(typeattr->typekind == TKIND_DISPATCH, "Got kind %u.\n", typeattr->typekind); + ok(IsEqualGUID(&typeattr->guid, &IID_IBasicVideo), "Got IID %s.\n", wine_dbgstr_guid(&typeattr->guid)); + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); + ITypeInfo_Release(typeinfo); + hr = IVideoWindow_SetWindowForeground(window, OAFALSE); ok(hr == E_NOINTERFACE, "got %#x\n", hr); @@ -2586,7 +2601,7 @@ static void test_control_delegation(void) hr = IFilterGraph2_AddFilter(graph, renderer, NULL); ok(hr == S_OK, "got %#x\n", hr); - hr = IBasicVideo_get_BitRate(video, &val); + hr = IBasicVideo2_get_BitRate(video, &val); ok(hr == VFW_E_NOT_CONNECTED, "got %#x\n", hr); hr = IVideoWindow_SetWindowForeground(window, OAFALSE); ok(hr == VFW_E_NOT_CONNECTED, "got %#x\n", hr); @@ -2594,13 +2609,13 @@ static void test_control_delegation(void) hr = IFilterGraph2_RemoveFilter(graph, renderer); ok(hr == S_OK, "got %#x\n", hr); - hr = IBasicVideo_get_BitRate(video, &val); + hr = IBasicVideo2_get_BitRate(video, &val); ok(hr == E_NOINTERFACE, "got %#x\n", hr); hr = IVideoWindow_SetWindowForeground(window, OAFALSE); ok(hr == E_NOINTERFACE, "got %#x\n", hr); IBaseFilter_Release(renderer); - IBasicVideo_Release(video); + IBasicVideo2_Release(video); IVideoWindow_Release(window); IFilterGraph2_Release(graph); }

1 0