April 2021 - Wine-commits - list.winehq.org

Nikolay Sivov : mfplay: Implement CreateMediaItemFromObject().
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 6b2627d59fcab7d5c6ff8ee90157f9f1da034126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2627d59fcab7d5c6ff8ee9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 16 15:36:08 2021 +0300 mfplay: Implement CreateMediaItemFromObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 111 insertions(+), 9 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index e57db8e107d..d6ed6ef5c39 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -61,6 +61,7 @@ struct media_item IMFPresentationDescriptor *pd; DWORD_PTR user_data; WCHAR *url; + IUnknown *object; }; struct media_player @@ -340,6 +341,8 @@ static ULONG WINAPI media_item_Release(IMFPMediaItem *iface) IMFMediaSource_Release(item->source); if (item->pd) IMFPresentationDescriptor_Release(item->pd); + if (item->object) + IUnknown_Release(item->object); free(item->url); free(item); } @@ -377,11 +380,19 @@ static HRESULT WINAPI media_item_GetURL(IMFPMediaItem *iface, LPWSTR *url) return S_OK; } -static HRESULT WINAPI media_item_GetObject(IMFPMediaItem *iface, IUnknown **obj) +static HRESULT WINAPI media_item_GetObject(IMFPMediaItem *iface, IUnknown **object) { - FIXME("%p, %p.\n", iface, obj); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, object); + + if (!item->object) + return MF_E_NOT_FOUND; + + *object = item->object; + IUnknown_AddRef(*object); + + return S_OK; } static HRESULT WINAPI media_item_GetUserData(IMFPMediaItem *iface, DWORD_PTR *user_data) @@ -856,29 +867,112 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, } static HRESULT WINAPI media_player_CreateMediaItemFromURL(IMFPMediaPlayer *iface, - const WCHAR *url, BOOL sync, DWORD_PTR user_data, IMFPMediaItem **ret) + const WCHAR *url, BOOL sync, DWORD_PTR user_data, IMFPMediaItem **item) { struct media_player *player = impl_from_IMFPMediaPlayer(iface); HRESULT hr; - TRACE("%p, %s, %d, %lx, %p.\n", iface, debugstr_w(url), sync, user_data, ret); + TRACE("%p, %s, %d, %lx, %p.\n", iface, debugstr_w(url), sync, user_data, item); EnterCriticalSection(&player->cs); if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) hr = MF_E_SHUTDOWN; else - hr = media_player_create_item_from_url(player, url, sync, user_data, ret); + hr = media_player_create_item_from_url(player, url, sync, user_data, item); LeaveCriticalSection(&player->cs); return hr; } +static HRESULT media_player_create_item_from_object(struct media_player *player, + IUnknown *object, BOOL sync, DWORD_PTR user_data, IMFPMediaItem **ret) +{ + struct media_item *item; + MF_OBJECT_TYPE obj_type; + HRESULT hr; + IMFByteStream *stream = NULL; + IMFMediaSource *source = NULL; + + *ret = NULL; + + if (FAILED(hr = create_media_item(&player->IMFPMediaPlayer_iface, user_data, &item))) + return hr; + + item->object = object; + IUnknown_AddRef(item->object); + + if (FAILED(IUnknown_QueryInterface(object, &IID_IMFMediaSource, (void **)&source))) + IUnknown_QueryInterface(object, &IID_IMFByteStream, (void **)&stream); + + if (!source && !stream) + { + WARN("Unsupported object type.\n"); + IMFPMediaItem_Release(&item->IMFPMediaItem_iface); + return E_UNEXPECTED; + } + + if (sync) + { + if (stream) + hr = IMFSourceResolver_CreateObjectFromByteStream(player->resolver, stream, NULL, + MF_RESOLUTION_MEDIASOURCE, player->propstore, &obj_type, &object); + else + IUnknown_AddRef(object); + + if (SUCCEEDED(hr)) + hr = media_item_set_source(item, object); + + IUnknown_Release(object); + + if (SUCCEEDED(hr)) + { + *ret = &item->IMFPMediaItem_iface; + IMFPMediaItem_AddRef(*ret); + } + + IMFPMediaItem_Release(&item->IMFPMediaItem_iface); + } + else + { + if (stream) + { + hr = IMFSourceResolver_BeginCreateObjectFromByteStream(player->resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, + player->propstore, NULL, &player->resolver_callback, (IUnknown *)&item->IMFPMediaItem_iface); + } + else + { + /* Resolver callback will check again if item's object is a source. */ + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_MULTITHREADED, &player->resolver_callback, + (IUnknown *)&item->IMFPMediaItem_iface); + } + + IMFPMediaItem_Release(&item->IMFPMediaItem_iface); + } + + if (source) + IMFMediaSource_Release(source); + if (stream) + IMFByteStream_Release(stream); + + return hr; +} + static HRESULT WINAPI media_player_CreateMediaItemFromObject(IMFPMediaPlayer *iface, IUnknown *object, BOOL sync, DWORD_PTR user_data, IMFPMediaItem **item) { - FIXME("%p, %p, %d, %lx, %p.\n", iface, object, sync, user_data, item); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %d, %lx, %p.\n", iface, object, sync, user_data, item); + + EnterCriticalSection(&player->cs); + if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) + hr = MF_E_SHUTDOWN; + else + hr = media_player_create_item_from_object(player, object, sync, user_data, item); + LeaveCriticalSection(&player->cs); + + return hr; } static HRESULT media_item_get_stream_type(IMFStreamDescriptor *sd, GUID *major) @@ -1344,7 +1438,15 @@ static HRESULT WINAPI media_player_resolver_callback_Invoke(IMFAsyncCallback *if item = impl_from_IMFPMediaItem((IMFPMediaItem *)state); - if (SUCCEEDED(hr = IMFSourceResolver_EndCreateObjectFromURL(player->resolver, result, &obj_type, &object))) + if (item->object) + { + if (FAILED(hr = IUnknown_QueryInterface(item->object, &IID_IMFMediaSource, (void **)&object))) + hr = IMFSourceResolver_EndCreateObjectFromByteStream(player->resolver, result, &obj_type, &object); + } + else + hr = IMFSourceResolver_EndCreateObjectFromURL(player->resolver, result, &obj_type, &object); + + if (SUCCEEDED(hr)) { hr = media_item_set_source(item, object); IUnknown_Release(object);

1 0

Nikolay Sivov : evr/presenter: Add IMFQualityAdviseLimits stub.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: b7ac7ebbd6b70dd12fb9712b1d70ddade958afcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ac7ebbd6b70dd12fb9712b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 16 16:15:57 2021 +0300 evr/presenter: Add IMFQualityAdviseLimits stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 18 ++++++++++-------- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 8d633124db2..4614fa5eed2 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -79,6 +79,7 @@ struct video_presenter IMFVideoPositionMapper IMFVideoPositionMapper_iface; IQualProp IQualProp_iface; IMFQualityAdvise IMFQualityAdvise_iface; + IMFQualityAdviseLimits IMFQualityAdviseLimits_iface; IDirect3DDeviceManager9 IDirect3DDeviceManager9_iface; IMFVideoSampleAllocatorNotify allocator_cb; IUnknown IUnknown_inner; @@ -166,6 +167,11 @@ static struct video_presenter *impl_from_IMFQualityAdvise(IMFQualityAdvise *ifac return CONTAINING_RECORD(iface, struct video_presenter, IMFQualityAdvise_iface); } +static struct video_presenter *impl_from_IMFQualityAdviseLimits(IMFQualityAdviseLimits *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFQualityAdviseLimits_iface); +} + static struct video_presenter *impl_from_IDirect3DDeviceManager9(IDirect3DDeviceManager9 *iface) { return CONTAINING_RECORD(iface, struct video_presenter, IDirect3DDeviceManager9_iface); @@ -775,6 +781,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFQualityAdvise_iface; } + else if (IsEqualIID(riid, &IID_IMFQualityAdviseLimits)) + { + *obj = &presenter->IMFQualityAdviseLimits_iface; + } else if (IsEqualIID(riid, &IID_IDirect3DDeviceManager9)) { *obj = &presenter->IDirect3DDeviceManager9_iface; @@ -1870,6 +1880,47 @@ static const IDirect3DDeviceManager9Vtbl video_presenter_device_manager_vtbl = video_presenter_device_manager_GetVideoService, }; +static HRESULT WINAPI video_presenter_qa_limits_QueryInterface(IMFQualityAdviseLimits *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFQualityAdviseLimits(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_qa_limits_AddRef(IMFQualityAdviseLimits *iface) +{ + struct video_presenter *presenter = impl_from_IMFQualityAdviseLimits(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_qa_limits_Release(IMFQualityAdviseLimits *iface) +{ + struct video_presenter *presenter = impl_from_IMFQualityAdviseLimits(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_qa_limits_GetMaximumDropMode(IMFQualityAdviseLimits *iface, MF_QUALITY_DROP_MODE *mode) +{ + FIXME("%p, %p.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_qa_limits_GetMinimumQualityLevel(IMFQualityAdviseLimits *iface, MF_QUALITY_LEVEL *level) +{ + FIXME("%p, %p.\n", iface, level); + + return E_NOTIMPL; +} + +static const IMFQualityAdviseLimitsVtbl video_presenter_qa_limits_vtbl = +{ + video_presenter_qa_limits_QueryInterface, + video_presenter_qa_limits_AddRef, + video_presenter_qa_limits_Release, + video_presenter_qa_limits_GetMaximumDropMode, + video_presenter_qa_limits_GetMinimumQualityLevel, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -1940,6 +1991,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFVideoPositionMapper_iface.lpVtbl = &video_presenter_position_mapper_vtbl; object->IQualProp_iface.lpVtbl = &video_presenter_qualprop_vtbl; object->IMFQualityAdvise_iface.lpVtbl = &video_presenter_quality_advise_vtbl; + object->IMFQualityAdviseLimits_iface.lpVtbl = &video_presenter_qa_limits_vtbl; object->allocator_cb.lpVtbl = &video_presenter_allocator_cb_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->IDirect3DDeviceManager9_iface.lpVtbl = &video_presenter_device_manager_vtbl; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 94bf327dd92..fb4a2130f37 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1154,7 +1154,7 @@ static void test_default_presenter(void) check_interface(presenter, &IID_IMFVideoDeviceID, TRUE); check_interface(presenter, &IID_IMFQualityAdvise, TRUE); check_interface(presenter, &IID_IDirect3DDeviceManager9, TRUE); - todo_wine check_interface(presenter, &IID_IMFQualityAdviseLimits, TRUE); + check_interface(presenter, &IID_IMFQualityAdviseLimits, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPresenter, TRUE); @@ -1165,7 +1165,7 @@ static void test_default_presenter(void) check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFGetService, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDeviceID, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdvise, TRUE); - todo_wine check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdviseLimits, TRUE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdviseLimits, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTransform, FALSE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); @@ -2018,30 +2018,32 @@ static void test_presenter_quality_control(void) ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdviseLimits, (void **)&qa_limits); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdvise, (void **)&advise); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -if (qa_limits) -{ hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, NULL); +todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, &mode); +todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); + if (SUCCEEDED(hr)) + ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, NULL); +todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, &level); +todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(level == MF_QUALITY_NORMAL, "Unexpected level %d.\n", level); + if (SUCCEEDED(hr)) + ok(level == MF_QUALITY_NORMAL, "Unexpected level %d.\n", level); IMFQualityAdviseLimits_Release(qa_limits); -} todo_wine { mode = 1;

1 0

Nikolay Sivov : evr/presenter: Set vertex processing flag for created d3d9 device.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 77052268026592e88922097d77ef225b1ec5b17a URL: https://source.winehq.org/git/wine.git/?a=commit;h=77052268026592e88922097d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 16 16:15:58 2021 +0300 evr/presenter: Set vertex processing flag for created d3d9 device. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 4614fa5eed2..868a265e3ee 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1949,7 +1949,7 @@ static HRESULT video_presenter_init_d3d(struct video_presenter *presenter) present_params.Flags = D3DPRESENTFLAG_VIDEO; present_params.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE; hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, GetDesktopWindow(), - 0, &present_params, &device); + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_params, &device); IDirect3D9_Release(d3d);

1 0

Nikolay Sivov : mf/evr: Reinitialize presenter on clock change.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 55110df7eb51fc296e29e352189385d831df633b URL: https://source.winehq.org/git/wine.git/?a=commit;h=55110df7eb51fc296e29e352… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 16 16:54:55 2021 +0300 mf/evr: Reinitialize presenter on clock change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 55 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 3479bade251..6c71741436b 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -169,18 +169,31 @@ static struct video_stream *impl_from_stream_IMFAttributes(IMFAttributes *iface) return CONTAINING_RECORD(iface, struct video_stream, IMFAttributes_iface); } -static void video_renderer_release_services(struct video_renderer *renderer) +static HRESULT video_renderer_init_presenter_services(struct video_renderer *renderer) { IMFTopologyServiceLookupClient *lookup_client; + HRESULT hr; - if (renderer->flags & EVR_MIXER_INITED_SERVICES && SUCCEEDED(IMFTransform_QueryInterface(renderer->mixer, - &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client))) + if (SUCCEEDED(hr = IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFTopologyServiceLookupClient, + (void **)&lookup_client))) { - IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); + renderer->flags |= EVR_INIT_SERVICES; + if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, + &renderer->IMFTopologyServiceLookup_iface))) + { + renderer->flags |= EVR_PRESENTER_INITED_SERVICES; + } + renderer->flags &= ~EVR_INIT_SERVICES; IMFTopologyServiceLookupClient_Release(lookup_client); - renderer->flags &= ~EVR_MIXER_INITED_SERVICES; } + return hr; +} + +static void video_renderer_release_presenter_services(struct video_renderer *renderer) +{ + IMFTopologyServiceLookupClient *lookup_client; + if (renderer->flags & EVR_PRESENTER_INITED_SERVICES && SUCCEEDED(IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client))) { @@ -190,6 +203,21 @@ static void video_renderer_release_services(struct video_renderer *renderer) } } +static void video_renderer_release_services(struct video_renderer *renderer) +{ + IMFTopologyServiceLookupClient *lookup_client; + + if (renderer->flags & EVR_MIXER_INITED_SERVICES && SUCCEEDED(IMFTransform_QueryInterface(renderer->mixer, + &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client))) + { + IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); + IMFTopologyServiceLookupClient_Release(lookup_client); + renderer->flags &= ~EVR_MIXER_INITED_SERVICES; + } + + video_renderer_release_presenter_services(renderer); +} + static HRESULT WINAPI video_stream_sink_QueryInterface(IMFStreamSink *iface, REFIID riid, void **obj) { struct video_stream *stream = impl_from_IMFStreamSink(iface); @@ -1280,12 +1308,15 @@ static void video_renderer_set_presentation_clock(struct video_renderer *rendere IMFPresentationClock_RemoveClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); IMFPresentationClock_Release(renderer->clock); } + video_renderer_release_presenter_services(renderer); + renderer->clock = clock; if (renderer->clock) { IMFPresentationClock_AddRef(renderer->clock); IMFPresentationClock_AddClockStateSink(renderer->clock, &renderer->IMFClockStateSink_iface); } + video_renderer_init_presenter_services(renderer); } static HRESULT WINAPI video_renderer_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock) @@ -1579,7 +1610,6 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) static HRESULT video_renderer_configure_presenter(struct video_renderer *renderer) { - IMFTopologyServiceLookupClient *lookup_client; IMFVideoDisplayControl *control; HRESULT hr; @@ -1589,18 +1619,7 @@ static HRESULT video_renderer_configure_presenter(struct video_renderer *rendere IMFVideoDisplayControl_Release(control); } - if (SUCCEEDED(hr = IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFTopologyServiceLookupClient, - (void **)&lookup_client))) - { - renderer->flags |= EVR_INIT_SERVICES; - if (SUCCEEDED(hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, - &renderer->IMFTopologyServiceLookup_iface))) - { - renderer->flags |= EVR_PRESENTER_INITED_SERVICES; - } - renderer->flags &= ~EVR_INIT_SERVICES; - IMFTopologyServiceLookupClient_Release(lookup_client); - } + hr = video_renderer_init_presenter_services(renderer); if (FAILED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IUnknown, (void **)&renderer->device_manager)))

1 0

Nikolay Sivov : mf/evr: Return current clock for MR_VIDEO_RENDER_SERVICE requests.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 0e43ee27461d57efb6e7996b2b99a1d17c673d92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e43ee27461d57efb6e7996b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 16 16:54:56 2021 +0300 mf/evr: Return current clock for MR_VIDEO_RENDER_SERVICE requests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 7 +++++++ dlls/mf/tests/mf.c | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 6c71741436b..9cb6763da4e 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -2068,6 +2068,13 @@ static HRESULT WINAPI video_renderer_service_lookup_LookupService(IMFTopologySer *objects = &renderer->IMediaEventSink_iface; IUnknown_AddRef((IUnknown *)*objects); } + else if (IsEqualIID(riid, &IID_IMFClock)) + { + *objects = renderer->clock; + if (*objects) + IUnknown_AddRef((IUnknown *)*objects); + hr = *objects ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s for render service.\n", debugstr_guid(riid)); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a5c306a93a0..bf482ae4c71 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4212,9 +4212,11 @@ static void test_evr(void) IMFStreamSink *stream_sink, *stream_sink2; IMFVideoDisplayControl *display_control; IMFMediaType *media_type, *media_type2; + IMFPresentationTimeSource *time_source; IMFVideoSampleAllocator *allocator; IMFMediaTypeHandler *type_handler; IMFVideoRenderer *video_renderer; + IMFPresentationClock *clock; IMFMediaSink *sink, *sink2; IMFAttributes *attributes; DWORD flags, count, value; @@ -4228,8 +4230,8 @@ static void test_evr(void) HRESULT hr; GUID guid; - hr = CoInitialize(NULL); - ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Startup failure, hr %#x.\n", hr); hr = MFCreateVideoRenderer(&IID_IMFVideoRenderer, (void **)&video_renderer); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -4481,7 +4483,35 @@ todo_wine IMFActivate_Release(activate); - CoUninitialize(); + /* Set clock. */ + window = create_window(); + + hr = MFCreateVideoRendererActivate(window, &activate); + ok(hr == S_OK, "Failed to create activate object, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateSystemTimeSource(&time_source); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreatePresentationClock(&clock); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationClock_SetTimeSource(clock, time_source); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFPresentationTimeSource_Release(time_source); + + hr = IMFMediaSink_SetPresentationClock(sink, clock); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFPresentationClock_Release(clock); + + IMFActivate_Release(activate); + DestroyWindow(window); + + hr = MFShutdown(); + ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); } static void test_MFCreateSimpleTypeHandler(void)

1 0

Andrey Gusev : make_specfiles: Add a few api-ms-win-core-* to kernel32 group.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 99a5ef720cd285e4d0d9536b9e684271abb8236a URL: https://source.winehq.org/git/wine.git/?a=commit;h=99a5ef720cd285e4d0d9536b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Apr 16 16:38:32 2021 +0300 make_specfiles: Add a few api-ms-win-core-* to kernel32 group. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-namedpipe-ansi-l1-1-0.spec | 4 ++-- tools/make_specfiles | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec index d1e0b146dca..bc8c479cf28 100644 --- a/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec +++ b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec @@ -1,3 +1,3 @@ @ stub GetNamedPipeClientComputerNameA -@ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) kernel32.GetNamedPipeHandleStateA -@ stdcall WaitNamedPipeA (str long) kernel32.WaitNamedPipeA +@ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr ptr long) kernel32.GetNamedPipeHandleStateA +@ stdcall WaitNamedPipeA(str long) kernel32.WaitNamedPipeA diff --git a/tools/make_specfiles b/tools/make_specfiles index 04109775928..7486bd57647 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -256,6 +256,7 @@ my @dll_groups = "api-ms-win-core-largeinteger-l1-1-0", "api-ms-win-core-libraryloader-l1-2-1", "api-ms-win-core-libraryloader-l1-2-2", + "api-ms-win-core-libraryloader-l2-1-0", "api-ms-win-core-localization-l1-1-0", "api-ms-win-core-localization-l1-2-0", "api-ms-win-core-localization-l2-1-0", @@ -267,6 +268,7 @@ my @dll_groups = "api-ms-win-core-memory-l1-1-1", "api-ms-win-core-memory-l1-1-2", "api-ms-win-core-memory-l1-1-3", + "api-ms-win-core-memory-l1-1-4", "api-ms-win-core-namespace-l1-1-0", "api-ms-win-core-normalization-l1-1-0", "api-ms-win-core-privateprofile-l1-1-1", @@ -285,6 +287,7 @@ my @dll_groups = "api-ms-win-core-fibers-l1-1-0", "api-ms-win-core-fibers-l1-1-1", "api-ms-win-core-localization-l1-2-1", + "api-ms-win-core-localization-l1-2-2", "api-ms-win-core-datetime-l1-1-0", "api-ms-win-core-datetime-l1-1-1", "api-ms-win-core-windowserrorreporting-l1-1-0", @@ -308,6 +311,7 @@ my @dll_groups = [ "kernel32", "advapi32", + "api-ms-win-core-namedpipe-ansi-l1-1-0", "api-ms-win-core-namedpipe-l1-1-0", "api-ms-win-core-namedpipe-l1-2-0", "api-ms-win-core-processthreads-l1-1-0",

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_get_blend_state().
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: ff5e133b1b5c7a7ac451045d28dbe984aae7ae96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff5e133b1b5c7a7ac451045d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 16 10:49:22 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_get_blend_state(). 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/d3d11/device.c | 4 ++-- dlls/wined3d/device.c | 9 +++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d93256e77ad..70d14c7f2c5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2137,7 +2137,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnord static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11DeviceContext1 *iface, ID3D11BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_blend_state *wined3d_state; struct d3d_blend_state *blend_state_impl; @@ -2145,7 +2145,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11Devi iface, blend_state, blend_factor, sample_mask); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_get_blend_state(device->wined3d_device, + if ((wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, (struct wined3d_color *)blend_factor, sample_mask))) { blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 974db90037d..39701886450 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1603,12 +1603,12 @@ void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, wined3d_device_context_set_blend_state(&device->cs->c, blend_state, blend_factor, sample_mask); } -struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct wined3d_device *device, +struct wined3d_blend_state * CDECL wined3d_device_context_get_blend_state(const struct wined3d_device_context *context, struct wined3d_color *blend_factor, unsigned int *sample_mask) { - const struct wined3d_state *state = device->cs->c.state; + const struct wined3d_state *state = context->state; - TRACE("device %p, blend_factor %p, sample_mask %p.\n", device, blend_factor, sample_mask); + TRACE("context %p, blend_factor %p, sample_mask %p.\n", context, blend_factor, sample_mask); *blend_factor = state->blend_factor; *sample_mask = state->sample_mask; @@ -3921,6 +3921,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; const struct wined3d_saved_states *changed = &stateblock->changed; const unsigned int word_bit_count = sizeof(DWORD) * CHAR_BIT; + struct wined3d_device_context *context = &device->cs->c; unsigned int i, j, start, idx; struct wined3d_range range; uint32_t map; @@ -4153,7 +4154,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) wined3d_color_from_d3dcolor(&colour, state->rs[WINED3D_RS_BLENDFACTOR]); else - wined3d_device_get_blend_state(device, &colour, &sample_mask); + wined3d_device_context_get_blend_state(context, &colour, &sample_mask); if ((entry = wine_rb_get(&device->blend_states, &desc))) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 406e511c0f6..35fbc44ee64 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -55,7 +55,6 @@ @ cdecl wined3d_device_end_scene(ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) -@ cdecl wined3d_device_get_blend_state(ptr ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_compute_shader(ptr) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) @@ -170,6 +169,7 @@ @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_flush(ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) +@ cdecl wined3d_device_context_get_blend_state(ptr ptr ptr) @ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_issue_query(ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1a58c671934..7dcb969966c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2375,8 +2375,6 @@ HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); void __cdecl wined3d_device_flush(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); -struct wined3d_blend_state * __cdecl wined3d_device_get_blend_state(const struct wined3d_device *device, - struct wined3d_color *blend_factor, unsigned int *sample_mask); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, struct wined3d_clip_status *clip_status); struct wined3d_shader * __cdecl wined3d_device_get_compute_shader(const struct wined3d_device *device); @@ -2565,6 +2563,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); +struct wined3d_blend_state * __cdecl wined3d_device_context_get_blend_state( + const struct wined3d_device_context *context, struct wined3d_color *blend_factor, unsigned int *sample_mask); struct wined3d_buffer * __cdecl wined3d_device_context_get_constant_buffer(const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx); struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_get_depth_stencil_state().
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: aca1fa4cf29fe6feeae08b1f12975aff5a0e6c85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aca1fa4cf29fe6feeae08b1f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 16 10:49:23 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_get_depth_stencil_state(). 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/d3d11/device.c | 4 ++-- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 70d14c7f2c5..d56be188cf6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2161,7 +2161,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11Devi static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3D11DeviceContext1 *iface, ID3D11DepthStencilState **depth_stencil_state, UINT *stencil_ref) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_depth_stencil_state *wined3d_state; struct d3d_depthstencil_state *state_impl; @@ -2169,7 +2169,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3 iface, depth_stencil_state, stencil_ref); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_get_depth_stencil_state(device->wined3d_device, stencil_ref))) + if ((wined3d_state = wined3d_device_context_get_depth_stencil_state(context->wined3d_context, stencil_ref))) { state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 39701886450..c370c5dff7c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1623,12 +1623,12 @@ void CDECL wined3d_device_set_depth_stencil_state(struct wined3d_device *device, wined3d_device_context_set_depth_stencil_state(&device->cs->c, depth_stencil_state, stencil_ref); } -struct wined3d_depth_stencil_state * CDECL wined3d_device_get_depth_stencil_state(const struct wined3d_device *device, - unsigned int *stencil_ref) +struct wined3d_depth_stencil_state * CDECL wined3d_device_context_get_depth_stencil_state( + const struct wined3d_device_context *context, unsigned int *stencil_ref) { - const struct wined3d_state *state = device->cs->c.state; + const struct wined3d_state *state = context->state; - TRACE("device %p, stencil_ref %p.\n", device, stencil_ref); + TRACE("context %p, stencil_ref %p.\n", context, stencil_ref); *stencil_ref = state->stencil_ref; return state->depth_stencil_state; @@ -4221,7 +4221,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_STENCILREF)) stencil_ref = state->rs[WINED3D_RS_STENCILREF]; else - wined3d_device_get_depth_stencil_state(device, &stencil_ref); + wined3d_device_context_get_depth_stencil_state(context, &stencil_ref); if ((entry = wine_rb_get(&device->depth_stencil_states, &desc))) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 35fbc44ee64..e9650c10024 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -61,7 +61,6 @@ @ cdecl wined3d_device_get_cs_resource_view(ptr long) @ cdecl wined3d_device_get_cs_sampler(ptr long) @ cdecl wined3d_device_get_cs_uav(ptr long) -@ cdecl wined3d_device_get_depth_stencil_state(ptr) @ cdecl wined3d_device_get_depth_stencil_view(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) @@ -171,6 +170,7 @@ @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) @ cdecl wined3d_device_context_get_blend_state(ptr ptr ptr) @ cdecl wined3d_device_context_get_constant_buffer(ptr long long) +@ cdecl wined3d_device_context_get_depth_stencil_state(ptr ptr) @ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7dcb969966c..188a73cb694 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2385,8 +2385,6 @@ struct wined3d_shader_resource_view * __cdecl wined3d_device_get_cs_resource_vie struct wined3d_sampler * __cdecl wined3d_device_get_cs_sampler(const struct wined3d_device *device, unsigned int idx); struct wined3d_unordered_access_view * __cdecl wined3d_device_get_cs_uav(const struct wined3d_device *device, unsigned int idx); -struct wined3d_depth_stencil_state * __cdecl wined3d_device_get_depth_stencil_state( - const struct wined3d_device *device, unsigned int *stencil_ref); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, @@ -2567,6 +2565,8 @@ struct wined3d_blend_state * __cdecl wined3d_device_context_get_blend_state( const struct wined3d_device_context *context, struct wined3d_color *blend_factor, unsigned int *sample_mask); struct wined3d_buffer * __cdecl wined3d_device_context_get_constant_buffer(const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx); +struct wined3d_depth_stencil_state * __cdecl wined3d_device_context_get_depth_stencil_state( + const struct wined3d_device_context *context, unsigned int *stencil_ref); struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, enum wined3d_shader_type type); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_get_rasterizer_state().
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 850a90e1684e9d61a50b6f2297a180f1d2c22b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=850a90e1684e9d61a50b6f22… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 16 10:49:24 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_get_rasterizer_state(). 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/d3d11/device.c | 6 +++--- dlls/wined3d/device.c | 7 ++++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d56be188cf6..29b5b11aebd 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2211,14 +2211,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceC static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceContext1 *iface, ID3D11RasterizerState **rasterizer_state) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_rasterizer_state *rasterizer_state_impl; struct wined3d_rasterizer_state *wined3d_state; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_get_rasterizer_state(device->wined3d_device))) + if ((wined3d_state = wined3d_device_context_get_rasterizer_state(context->wined3d_context))) { rasterizer_state_impl = wined3d_rasterizer_state_get_parent(wined3d_state); ID3D11RasterizerState_AddRef(*rasterizer_state = &rasterizer_state_impl->ID3D11RasterizerState_iface); @@ -5501,7 +5501,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetState(ID3D10Device1 *iface, ID3D TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_get_rasterizer_state(device->wined3d_device))) + if ((wined3d_state = wined3d_device_context_get_rasterizer_state(device->immediate_context.wined3d_context))) { rasterizer_state_impl = wined3d_rasterizer_state_get_parent(wined3d_state); ID3D10RasterizerState_AddRef(*rasterizer_state = &rasterizer_state_impl->ID3D10RasterizerState_iface); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c370c5dff7c..452c3b35414 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1642,11 +1642,12 @@ void CDECL wined3d_device_set_rasterizer_state(struct wined3d_device *device, wined3d_device_context_set_rasterizer_state(&device->cs->c, rasterizer_state); } -struct wined3d_rasterizer_state * CDECL wined3d_device_get_rasterizer_state(struct wined3d_device *device) +struct wined3d_rasterizer_state * CDECL wined3d_device_context_get_rasterizer_state( + struct wined3d_device_context *context) { - TRACE("device %p.\n", device); + TRACE("context %p.\n", context); - return device->cs->c.state->rasterizer_state; + return context->state->rasterizer_state; } void CDECL wined3d_device_set_render_state(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e9650c10024..2af21d5a31c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -84,7 +84,6 @@ @ cdecl wined3d_device_get_ps_resource_view(ptr long) @ cdecl wined3d_device_get_ps_sampler(ptr long) @ cdecl wined3d_device_get_raster_status(ptr long ptr) -@ cdecl wined3d_device_get_rasterizer_state(ptr) @ cdecl wined3d_device_get_render_state(ptr long) @ cdecl wined3d_device_get_rendertarget_view(ptr long) @ cdecl wined3d_device_get_scissor_rects(ptr ptr ptr) @@ -171,6 +170,7 @@ @ cdecl wined3d_device_context_get_blend_state(ptr ptr ptr) @ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_depth_stencil_state(ptr ptr) +@ cdecl wined3d_device_context_get_rasterizer_state(ptr) @ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 188a73cb694..6923b8ce9cb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2417,7 +2417,6 @@ struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ps_resource_vie struct wined3d_sampler * __cdecl wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_raster_status *raster_status); -struct wined3d_rasterizer_state * __cdecl wined3d_device_get_rasterizer_state(struct wined3d_device *device); DWORD __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_rendertarget_view(const struct wined3d_device *device, unsigned int view_idx); @@ -2567,6 +2566,8 @@ struct wined3d_buffer * __cdecl wined3d_device_context_get_constant_buffer(const enum wined3d_shader_type shader_type, unsigned int idx); struct wined3d_depth_stencil_state * __cdecl wined3d_device_context_get_depth_stencil_state( const struct wined3d_device_context *context, unsigned int *stencil_ref); +struct wined3d_rasterizer_state * __cdecl wined3d_device_context_get_rasterizer_state( + struct wined3d_device_context *context); struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, enum wined3d_shader_type type); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context,

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 8f8d0bf570f72f67bf2f4432c0418810ed7a4c30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f8d0bf570f72f67bf2f4432… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Apr 16 09:37:50 2021 +0200 po: Update Polish translation. Signed-off-by: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 1648 ++++++++++++++++++++++++++++---------------------------------- 1 file changed, 734 insertions(+), 914 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f8d0bf570f72f67bf2f…

1 0