wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Zebediah Figura : d3d8: Use wined3d_device_context methods.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 19d5e7cae26f1f764c9b5ea4ed7cc11b87711a8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=19d5e7cae26f1f764c9b5ea4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 5 23:40:19 2021 -0500 d3d8: Use wined3d_device_context methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index bb25be16de0..755991a64c7 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -114,6 +114,7 @@ struct d3d8_device struct wined3d_device_parent device_parent; LONG ref; struct wined3d_device *wined3d_device; + struct wined3d_device_context *immediate_context; unsigned int adapter_ordinal; struct d3d8 *d3d_parent; struct d3d8_handle_table handle_table; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f0bfab660a7..8464b99e32c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1534,17 +1534,17 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, original_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device); rtv = ds_impl ? d3d8_surface_acquire_rendertarget_view(ds_impl) : NULL; - hr = wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); + hr = wined3d_device_context_set_depth_stencil_view(device->immediate_context, rtv); d3d8_surface_release_rendertarget_view(ds_impl, rtv); if (SUCCEEDED(hr)) { rtv = render_target ? d3d8_surface_acquire_rendertarget_view(rt_impl) : NULL; if (render_target) { - if (SUCCEEDED(hr = wined3d_device_set_rendertarget_view(device->wined3d_device, 0, rtv, TRUE))) + if (SUCCEEDED(hr = wined3d_device_context_set_rendertarget_view(device->immediate_context, 0, rtv, TRUE))) device_reset_viewport_state(device); else - wined3d_device_set_depth_stencil_view(device->wined3d_device, original_dsv); + wined3d_device_context_set_depth_stencil_view(device->immediate_context, original_dsv); } d3d8_surface_release_rendertarget_view(rt_impl, rtv); } @@ -2495,7 +2495,6 @@ static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); unsigned int vertex_count; - HRESULT hr; TRACE("iface %p, primitive_type %#x, start_vertex %u, primitive_count %u.\n", iface, primitive_type, start_vertex, primitive_count); @@ -2505,10 +2504,10 @@ static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, d3d8_device_upload_sysmem_vertex_buffers(device, start_vertex, vertex_count); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); + wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 0); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, @@ -2535,7 +2534,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); + wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_index, start_idx, index_count, 0, 0); wined3d_mutex_unlock(); return D3D_OK; @@ -2629,7 +2628,7 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); + wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vtx_count, 0, 0); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); done: @@ -2687,6 +2686,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; struct wined3d_resource *ib, *vb; + unsigned int base_vertex_idx; UINT vb_pos, ib_pos, align; HRESULT hr; @@ -2753,11 +2753,13 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, wined3dformat_from_d3dformat(index_format)); - wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vertex_stride - min_vertex_idx); + base_vertex_idx = vb_pos / vertex_stride - min_vertex_idx; + wined3d_stateblock_set_base_vertex_index(device->state, base_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); + wined3d_device_context_draw_indexed(device->immediate_context, + base_vertex_idx, ib_pos / idx_fmt_size, idx_count, 0, 0); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); @@ -3775,6 +3777,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } + device->immediate_context = wined3d_device_get_immediate_context(device->wined3d_device); wined3d_get_device_caps(wined3d_adapter, wined3d_device_type_from_d3d(device_type), &caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst;

1 0

Zebediah Figura : d3d9: Use wined3d_device_context methods.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: a1ae5f1eca75ca24430e123ed44a0e32b7c9c712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1ae5f1eca75ca24430e123e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 5 23:40:18 2021 -0500 d3d9: Use wined3d_device_context methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 25 +++++++++++-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index dc7c4ca3b1c..7bb277c2a75 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -93,6 +93,7 @@ struct d3d9_device struct wined3d_device_parent device_parent; LONG refcount; struct wined3d_device *wined3d_device; + struct wined3d_device_context *immediate_context; unsigned int adapter_ordinal; struct d3d9 *d3d_parent; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index aa216edfcc0..2cd9d73d0d9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2025,7 +2025,7 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO wined3d_mutex_lock(); rtv = surface_impl ? d3d9_surface_acquire_rendertarget_view(surface_impl) : NULL; - hr = wined3d_device_set_rendertarget_view(device->wined3d_device, idx, rtv, TRUE); + hr = wined3d_device_context_set_rendertarget_view(device->immediate_context, idx, rtv, TRUE); d3d9_surface_release_rendertarget_view(surface_impl, rtv); if (SUCCEEDED(hr)) { @@ -2086,7 +2086,7 @@ static HRESULT WINAPI d3d9_device_SetDepthStencilSurface(IDirect3DDevice9Ex *ifa wined3d_mutex_lock(); rtv = ds_impl ? d3d9_surface_acquire_rendertarget_view(ds_impl) : NULL; - hr = wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); + hr = wined3d_device_context_set_depth_stencil_view(device->immediate_context, rtv); d3d9_surface_release_rendertarget_view(ds_impl, rtv); wined3d_mutex_unlock(); @@ -3018,7 +3018,6 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); unsigned int vertex_count; - HRESULT hr; TRACE("iface %p, primitive_type %#x, start_vertex %u, primitive_count %u.\n", iface, primitive_type, start_vertex, primitive_count); @@ -3035,12 +3034,11 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, d3d9_device_upload_sysmem_vertex_buffers(device, 0, start_vertex, vertex_count); d3d9_generate_auto_mipmaps(device); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); - hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); - if (SUCCEEDED(hr)) - d3d9_rts_flag_auto_gen_mipmap(device); + wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 0); + d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface, @@ -3072,10 +3070,9 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); d3d9_generate_auto_mipmaps(device); - wined3d_stateblock_set_base_vertex_index(device->state, base_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); + wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_idx, start_idx, index_count, 0, 0); d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); @@ -3183,10 +3180,9 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, d3d9_generate_auto_mipmaps(device); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); + wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vtx_count, 0, 0); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); - if (SUCCEEDED(hr)) - d3d9_rts_flag_auto_gen_mipmap(device); + d3d9_rts_flag_auto_gen_mipmap(device); done: wined3d_mutex_unlock(); @@ -3322,11 +3318,11 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa d3d9_generate_auto_mipmaps(device); wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, wined3dformat_from_d3dformat(index_format)); - wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vertex_stride - min_vertex_idx); wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); - wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); + wined3d_device_context_draw_indexed(device->immediate_context, + vb_pos / vertex_stride - min_vertex_idx, ib_pos / idx_fmt_size, idx_count, 0, 0); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); @@ -4737,6 +4733,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine return hr; } + device->immediate_context = wined3d_device_get_immediate_context(device->wined3d_device); wined3d_get_device_caps(wined3d_adapter, wined3d_device_type_from_d3d(device_type), &wined3d_caps); d3d9_caps_from_wined3dcaps(parent, adapter, &caps, &wined3d_caps); device->max_user_clip_planes = caps.MaxUserClipPlanes;

1 0

Jacek Caban : winegcc: Add Wine include directories before standard directories on search list.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 4f787812999b3b26f04b322fa0d78724596878c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f787812999b3b26f04b322f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 6 00:36:41 2021 +0200 winegcc: Add Wine include directories before standard directories on search list. This is especially important for msvcrt headers, which need to be used instead of system ones. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ae8f64f099d..694e2544a24 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -915,16 +915,17 @@ no_compat_defines: } strarray_add(comp_args, "-D__MSVCRT__"); } - if (includedir) + if (includedir) strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir )); + for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) { - strarray_add( comp_args, strmake( "-I%s", includedir )); - strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir )); + if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; + strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] )); } + if (includedir) strarray_add( comp_args, strmake( "%s%s", isystem, includedir )); for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) { if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; - strarray_add(comp_args, strmake( "-I%s%s", root, incl_dirs[j] )); - strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] )); + strarray_add(comp_args, strmake( "%s%s%s", isystem, root, incl_dirs[j] )); } } else if (opts->wine_objdir)

1 0

Jacek Caban : winegcc: Use paths for found libraries on PE targets when using msvcrt.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: c7a210bc2f2758204e99d6c80544348c21e8703e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7a210bc2f2758204e99d6c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 6 00:36:29 2021 +0200 winegcc: Use paths for found libraries on PE targets when using msvcrt. We use -nodefaultlibs now, so we don't need to worry about GCC additions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9297a9b75bd..ae8f64f099d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1393,7 +1393,7 @@ static void build(struct options* opts) strarray_add(link_args, name); break; case 'a': - if (is_pe && !opts->lib_suffix && strchr(name, '/')) + if (is_pe && !opts->use_msvcrt && !opts->lib_suffix && strchr(name, '/')) { /* turn the path back into -Ldir -lfoo options * this makes sure that we use the specified libs even

1 0

Nikolay Sivov : mfplay: Add support for same-thread event callback.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 826be590c00e22adb60b6aabe98c3a9400ad464d URL: https://source.winehq.org/git/wine.git/?a=commit;h=826be590c00e22adb60b6aab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 6 10:25:32 2021 +0300 mfplay: Add support for same-thread event callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/Makefile.in | 2 +- dlls/mfplay/player.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index 8f0fb61fe6f..c353fa33cc1 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplay.dll IMPORTLIB = mfplay -IMPORTS = mfplat mf uuid mfuuid +IMPORTS = mfplat mf user32 uuid mfuuid EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index c08f496b508..246704c2799 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -30,7 +30,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static const WCHAR eventclassW[] = L"MediaPlayerEventCallbackClass"; + static LONG startup_refcount; +static HINSTANCE mfplay_instance; static void platform_startup(void) { @@ -65,6 +68,7 @@ struct media_player IPropertyStore *propstore; IMFSourceResolver *resolver; MFP_CREATION_OPTIONS options; + HWND event_window; }; struct generic_event @@ -225,6 +229,23 @@ static HRESULT media_event_create(MFP_EVENT_TYPE event_type, HRESULT hr, return S_OK; } +static LRESULT WINAPI media_player_event_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + struct media_event *event = (void *)lparam; + struct media_player *player; + + if (msg == WM_USER) + { + player = impl_from_IMFPMediaPlayer(event->u.header.pMediaPlayer); + if (player->callback) + IMFPMediaPlayerCallback_OnMediaPlayerEvent(player->callback, &event->u.header); + IUnknown_Release(&event->IUnknown_iface); + return 0; + } + + return DefWindowProcW(hwnd, msg, wparam, lparam); +} + static HRESULT WINAPI media_item_QueryInterface(IMFPMediaItem *iface, REFIID riid, void **obj) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); @@ -539,7 +560,8 @@ static void media_player_queue_event(struct media_player *player, struct media_e } else { - /* FIXME: same-thread callback notification */ + IUnknown_AddRef(&event->IUnknown_iface); + PostMessageW(player->event_window, WM_USER, 0, (LPARAM)event); } } @@ -595,6 +617,7 @@ static ULONG WINAPI media_player_Release(IMFPMediaPlayer *iface) IPropertyStore_Release(player->propstore); if (player->resolver) IMFSourceResolver_Release(player->resolver); + DestroyWindow(player->event_window); heap_free(player); platform_shutdown(); @@ -1168,6 +1191,11 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C goto failed; if (FAILED(hr = MFCreateSourceResolver(&object->resolver))) goto failed; + if (!(object->options & MFP_OPTION_FREE_THREADED_CALLBACK)) + { + object->event_window = CreateWindowW(eventclassW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, + 0, mfplay_instance, NULL); + } *player = &object->IMFPMediaPlayer_iface; @@ -1179,3 +1207,32 @@ failed: return hr; } + +static void media_player_register_window_class(void) +{ + WNDCLASSW cls = { 0 }; + + cls.lpfnWndProc = media_player_event_proc; + cls.hInstance = mfplay_instance; + cls.lpszClassName = eventclassW; + + RegisterClassW(&cls); +} + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + mfplay_instance = instance; + DisableThreadLibraryCalls(instance); + media_player_register_window_class(); + break; + case DLL_PROCESS_DETACH: + if (reserved) break; + UnregisterClassW(eventclassW, instance); + break; + } + + return TRUE; +}

1 0

Nikolay Sivov : mfplay: Add support for async user callback.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: ef908ef248237a0b8aee68cbe74d35581bd1f666 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef908ef248237a0b8aee68cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 6 10:25:31 2021 +0300 mfplay: Add support for async user callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 216 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef908ef248237a0b8aee…

1 0

Nikolay Sivov : include: Add event types for mfplay.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 1f5095f331f0934f9ee18c2c33919e7c34df6d3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f5095f331f0934f9ee18c2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 6 10:25:30 2021 +0300 include: Add event types for mfplay. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfplay.idl | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/include/mfplay.idl b/include/mfplay.idl index 1a20a6b8900..f130ce12287 100644 --- a/include/mfplay.idl +++ b/include/mfplay.idl @@ -20,6 +20,8 @@ import "unknwn.idl"; import "propsys.idl"; import "evr.idl"; +interface IMFNetCredential; + typedef [v1_enum] enum _MFP_CREATION_OPTIONS { MFP_OPTION_NONE = 0, @@ -64,6 +66,18 @@ typedef [v1_enum] enum _MFP_MEDIAITEM_CHARACTERISTICS MFP_MEDIAITEM_HAS_SLOW_SEEK = 0x00000008, } _MFP_MEDIAITEM_CHARACTERISTICS; +typedef UINT32 MFP_CREDENTIAL_FLAGS; + +typedef [v1_enum] enum _MFP_CREDENTIAL_FLAGS +{ + MFP_CREDENTIAL_PROMPT = 0x00000001, + MFP_CREDENTIAL_SAVE = 0x00000002, + MFP_CREDENTIAL_DO_NOT_CACHE = 0x00000004, + MFP_CREDENTIAL_CLEAR_TEXT = 0x00000008, + MFP_CREDENTIAL_PROXY = 0x00000010, + MFP_CREDENTIAL_LOGGED_ON_USER = 0x00000020, +} _MFP_CREDENTIAL_FLAGS; + interface IMFPMediaPlayer; interface IMFPMediaItem; @@ -76,6 +90,96 @@ typedef struct MFP_EVENT_HEADER IPropertyStore *pPropertyStore; } MFP_EVENT_HEADER; +typedef struct MFP_PLAY_EVENT +{ + MFP_EVENT_HEADER header; + IMFPMediaItem *pMediaItem; +} MFP_PLAY_EVENT; + +typedef struct MFP_PAUSE_EVENT +{ + MFP_EVENT_HEADER header; + IMFPMediaItem *pMediaItem; +} MFP_PAUSE_EVENT; + +typedef struct MFP_STOP_EVENT +{ + MFP_EVENT_HEADER header; + IMFPMediaItem *pMediaItem; +} MFP_STOP_EVENT; + +typedef struct MFP_POSITION_SET_EVENT +{ + MFP_EVENT_HEADER header; + IMFPMediaItem *pMediaItem; +} MFP_POSITION_SET_EVENT; + +typedef struct MFP_RATE_SET_EVENT +{ + MFP_EVENT_HEADER header; + IMFPMediaItem *pMediaItem; + float flRate; +} MFP_RATE_SET_EVENT; + +typedef struct MFP_MEDIAITEM_CREATED_EVENT +{ + MFP_EVENT_HEADER header; + IMFPMediaItem *pMediaItem; + DWORD_PTR dwUserData; +} MFP_MEDIAITEM_CREATED_EVENT; + +typedef struct MFP_MEDIAITEM_SET_EVENT +{ + MFP_EVENT_HEADER header; + IMFPMediaItem *pMediaItem; +} MFP_MEDIAITEM_SET_EVENT; + +typedef struct MFP_FRAME_STEP_EVENT +{ + MFP_EVENT_HEADER header; + IMFPMediaItem *pMediaItem; +} MFP_FRAME_STEP_EVENT; + +typedef struct MFP_MEDIAITEM_CLEARED_EVENT +{ + MFP_EVENT_HEADER header; + IMFPMediaItem *pMediaItem; +} MFP_MEDIAITEM_CLEARED_EVENT; + +typedef struct MFP_MF_EVENT +{ + MFP_EVENT_HEADER header; + MediaEventType MFEventType; + IMFMediaEvent *pMFMediaEvent; + IMFPMediaItem *pMediaItem; +} MFP_MF_EVENT; + +typedef struct MFP_ERROR_EVENT +{ + MFP_EVENT_HEADER header; +} MFP_ERROR_EVENT; + +typedef struct MFP_PLAYBACK_ENDED_EVENT +{ + MFP_EVENT_HEADER header; + IMFPMediaItem *pMediaItem; +} MFP_PLAYBACK_ENDED_EVENT; + +typedef struct MFP_ACQUIRE_USER_CREDENTIAL_EVENT +{ + MFP_EVENT_HEADER header; + DWORD_PTR dwUserData; + BOOL fProceedWithAuthentication; + HRESULT hrAuthenticationStatus; + LPCWSTR pwszURL; + LPCWSTR pwszSite; + LPCWSTR pwszRealm; + LPCWSTR pwszPackage; + LONG nRetries; + MFP_CREDENTIAL_FLAGS flags; + IMFNetCredential *pCredential; +} MFP_ACQUIRE_USER_CREDENTIAL_EVENT; + [ object, uuid(766c8ffb-5fdb-4fea-a28d-b912996f51bd),

1 0

Nikolay Sivov : mfplay: Implement GetCharacteristics().
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 527723bb6dcf7c4c0c4d7ae9fddb4c26d18d5000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=527723bb6dcf7c4c0c4d7ae9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 6 10:25:29 2021 +0300 mfplay: Implement GetCharacteristics(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 854698774a6..5a85d9f0505 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -295,9 +295,20 @@ static HRESULT WINAPI media_item_GetPresentationAttribute(IMFPMediaItem *iface, static HRESULT WINAPI media_item_GetCharacteristics(IMFPMediaItem *iface, MFP_MEDIAITEM_CHARACTERISTICS *flags) { - FIXME("%p, %p.\n", iface, flags); + struct media_item *item = impl_from_IMFPMediaItem(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, flags); + + *flags = 0; + + if (SUCCEEDED(hr = IMFMediaSource_GetCharacteristics(item->source, flags))) + { + *flags &= (MFP_MEDIAITEM_IS_LIVE | MFP_MEDIAITEM_CAN_SEEK | + MFP_MEDIAITEM_CAN_PAUSE | MFP_MEDIAITEM_HAS_SLOW_SEEK); + } + + return hr; } static HRESULT WINAPI media_item_SetStreamSink(IMFPMediaItem *iface, DWORD index, IUnknown *sink)

1 0

Nikolay Sivov : mfplay: Implement IsProtected().
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 7bbf8e53fc86b5a7b93b999687c85fcd03b5d859 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bbf8e53fc86b5a7b93b9996… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 6 10:25:28 2021 +0300 mfplay: Implement IsProtected(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/Makefile.in | 2 +- dlls/mfplay/player.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index 91a8e5cc5a6..8f0fb61fe6f 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplay.dll IMPORTLIB = mfplay -IMPORTS = mfplat uuid mfuuid +IMPORTS = mfplat mf uuid mfuuid EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index bc9e04c91b7..854698774a6 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -215,9 +215,13 @@ static HRESULT WINAPI media_item_HasAudio(IMFPMediaItem *iface, BOOL *has_audio, static HRESULT WINAPI media_item_IsProtected(IMFPMediaItem *iface, BOOL *protected) { - FIXME("%p, %p.\n", iface, protected); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, protected); + + *protected = MFRequireProtectedEnvironment(item->pd) == S_OK; + + return S_OK; } static HRESULT WINAPI media_item_GetDuration(IMFPMediaItem *iface, REFGUID format, PROPVARIANT *value)

1 0

Nikolay Sivov : mfplay: Forward some methods to descriptor API.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 4e7f95220a1e47929e2f7d8e5373c2599bce366a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e7f95220a1e47929e2f7d8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 6 10:25:27 2021 +0300 mfplay: Forward some methods to descriptor API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 49 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index cef44c8b7ce..bc9e04c91b7 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -229,39 +229,64 @@ static HRESULT WINAPI media_item_GetDuration(IMFPMediaItem *iface, REFGUID forma static HRESULT WINAPI media_item_GetNumberOfStreams(IMFPMediaItem *iface, DWORD *count) { - FIXME("%p, %p.\n", iface, count); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, count); + + return IMFPresentationDescriptor_GetStreamDescriptorCount(item->pd, count); } -static HRESULT WINAPI media_item_GetStreamSelection(IMFPMediaItem *iface, DWORD index, BOOL *enabled) +static HRESULT WINAPI media_item_GetStreamSelection(IMFPMediaItem *iface, DWORD index, BOOL *selected) { - FIXME("%p, %u, %p.\n", iface, index, enabled); + struct media_item *item = impl_from_IMFPMediaItem(iface); + IMFStreamDescriptor *sd; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, index, selected); + + if (SUCCEEDED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, index, selected, &sd))) + IMFStreamDescriptor_Release(sd); + + return hr; } -static HRESULT WINAPI media_item_SetStreamSelection(IMFPMediaItem *iface, DWORD index, BOOL enabled) +static HRESULT WINAPI media_item_SetStreamSelection(IMFPMediaItem *iface, DWORD index, BOOL select) { - FIXME("%p, %u, %d.\n", iface, index, enabled); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %u, %d.\n", iface, index, select); + + return select ? IMFPresentationDescriptor_SelectStream(item->pd, index) : + IMFPresentationDescriptor_DeselectStream(item->pd, index); } static HRESULT WINAPI media_item_GetStreamAttribute(IMFPMediaItem *iface, DWORD index, REFGUID key, PROPVARIANT *value) { - FIXME("%p, %u, %s, %p.\n", iface, index, debugstr_guid(key), value); + struct media_item *item = impl_from_IMFPMediaItem(iface); + IMFStreamDescriptor *sd; + BOOL selected; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %s, %p.\n", iface, index, debugstr_guid(key), value); + + if (SUCCEEDED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, index, &selected, &sd))) + { + hr = IMFStreamDescriptor_GetItem(sd, key, value); + IMFStreamDescriptor_Release(sd); + } + + return hr; } static HRESULT WINAPI media_item_GetPresentationAttribute(IMFPMediaItem *iface, REFGUID key, PROPVARIANT *value) { - FIXME("%p, %s, %p.\n", iface, debugstr_guid(key), value); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(key), value); + + return IMFPresentationDescriptor_GetItem(item->pd, key, value); } static HRESULT WINAPI media_item_GetCharacteristics(IMFPMediaItem *iface, MFP_MEDIAITEM_CHARACTERISTICS *flags)

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021