wine-commits January 2021

2 participants
472 discussions

Rémi Bernon : d3d11/tests: Add tests for hull shader state swap.

by Alexandre Julliard

Module: wine Branch: master Commit: 24c948df6810550df477fefe15e0d24a756dafea URL: https://source.winehq.org/git/wine.git/?a=commit;h=24c948df6810550df477fefe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 27 20:50:03 2021 +0100 d3d11/tests: Add tests for hull shader state swap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 152 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 133 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24c948df6810550df477…

3 years, 3 months

Rémi Bernon : d3d11/tests: Add more SwapDeviceContextState tests.

by Alexandre Julliard

Module: wine Branch: master Commit: e11aa21ac2ac76ed882c666c1dab4e7df2d8fa55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e11aa21ac2ac76ed882c666c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 27 20:50:02 2021 +0100 d3d11/tests: Add more SwapDeviceContextState tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 79 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7220be73ac7..20bf62b792e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6673,19 +6673,19 @@ static void test_device_context_state(void) 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, }; - ID3DDeviceContextState *context_state, *previous_context_state; + ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; ID3D11SamplerState *sampler, *tmp_sampler; D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; ID3D11ShaderResourceView *tmp_srv, *srv; D3D11_DEVICE_CONTEXT_TYPE context_type; - ID3D11DeviceContext1 *context = NULL; + ID3D11DeviceContext1 *context = NULL, *context2; D3D11_SAMPLER_DESC sampler_desc; D3D_FEATURE_LEVEL feature_level; ID3D11GeometryShader *tmp_gs, *gs; - ID3D11VertexShader *tmp_vs, *vs; + ID3D11VertexShader *tmp_vs, *vs, *vs2; ID3D11PixelShader *tmp_ps, *ps; - ID3D11Device *d3d11_device; - ID3D11Device1 *device; + ID3D11Device *d3d11_device, *d3d11_device2; + ID3D11Device1 *device, *device2; struct vec4 constant; ID3D11Buffer *cb, *srvb, *tmp_cb; ULONG refcount; @@ -6809,6 +6809,8 @@ static void test_device_context_state(void) ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); ID3D11DeviceContext1_VSSetShader(context, vs, NULL, 0); ID3D11DeviceContext1_VSSetShaderResources(context, 0, 1, &srv); + refcount = get_refcount(vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); ID3D11DeviceContext1_GSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext1_GSSetSamplers(context, 0, 1, &sampler); @@ -6820,11 +6822,15 @@ static void test_device_context_state(void) ID3D11DeviceContext1_PSSetShader(context, ps, NULL, 0); ID3D11DeviceContext1_PSSetShaderResources(context, 0, 1, &srv); + previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state); + todo_wine ok(previous_context_state == NULL, "Got unexpected state pointer.\n"); + if (previous_context_state) ID3DDeviceContextState_Release(previous_context_state); previous_context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); - refcount = ID3DDeviceContextState_Release(context_state); - ok(!refcount, "Got refcount %u, expected 0.\n", refcount); ok(previous_context_state != NULL, "Failed to get previous context state\n"); + refcount = get_refcount(vs); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); context_type = ID3D11DeviceContext1_GetType(context); ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); @@ -6868,11 +6874,64 @@ static void test_device_context_state(void) ID3D11DeviceContext1_PSGetShaderResources(context, 0, 1, &tmp_srv); ok(!tmp_srv, "Got unexpected srv %p.\n", tmp_srv); - ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &context_state); - refcount = ID3DDeviceContextState_Release(context_state); - ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + /* updating the device context should also update the device context state */ + hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs2); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + ID3D11DeviceContext1_VSSetShader(context, vs2, NULL, 0); + ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &tmp_context_state); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + todo_wine ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* context states may be used with other devices instances too */ + d3d11_device2 = create_device(NULL); + ok(!!d3d11_device2, "Failed to create device.\n"); + hr = ID3D11Device_QueryInterface(d3d11_device2, &IID_ID3D11Device1, (void **)&device2); + ok(SUCCEEDED(hr), "Failed to query device interface, hr %#x.\n", hr); + ID3D11Device_Release(d3d11_device2); + ID3D11Device1_GetImmediateContext1(device2, &context2); + ok(!!context2, "Failed to get immediate context.\n"); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + refcount = ID3DDeviceContextState_Release(context_state2); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + todo_wine ok(context_state2 == context_state, "Got unexpected state pointer.\n"); + + refcount = ID3D11DeviceContext1_Release(context2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3D11Device1_Release(device2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); + refcount = ID3D11VertexShader_Release(vs2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &tmp_context_state); refcount = ID3DDeviceContextState_Release(previous_context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + refcount = ID3DDeviceContextState_Release(context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + todo_wine ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); + refcount = get_refcount(vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); /* ID3DDeviceContextState retains the previous state. */

3 years, 3 months

Jacek Caban : ieframe: Implement SetQueryNetSessionCount.

by Alexandre Julliard

Module: wine Branch: master Commit: ffecc7f41bccd4c672ac7aa3085dce6b2175db89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffecc7f41bccd4c672ac7aa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 29 14:14:20 2021 +0100 ieframe: Implement SetQueryNetSessionCount. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.h | 9 +++++++++ dlls/ieframe/ieframe.spec | 1 + dlls/ieframe/ieframe_main.c | 22 ++++++++++++++++++++ dlls/ieframe/oleobject.c | 1 + dlls/ieframe/tests/webbrowser.c | 45 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 78 insertions(+) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index a35507e6fb3..633906a70ca 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -385,3 +385,12 @@ static inline LPSTR co_strdupWtoA(LPCWSTR str) WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len, 0, 0); return ret; } + +enum SessionOp +{ + SESSION_QUERY, + SESSION_INCREMENT, + SESSION_DECREMENT +}; + +LONG WINAPI SetQueryNetSessionCount(DWORD session_op); diff --git a/dlls/ieframe/ieframe.spec b/dlls/ieframe/ieframe.spec index 94eb36db9f3..27d73c5aa62 100644 --- a/dlls/ieframe/ieframe.spec +++ b/dlls/ieframe/ieframe.spec @@ -7,3 +7,4 @@ @ stdcall -private DllUnregisterServer() @ stdcall IEGetWriteableHKCU(ptr) @ stdcall OpenURL(long long str long) +@ stdcall SetQueryNetSessionCount(long) diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index 5abe502f1e4..b05686f24f9 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -285,3 +285,25 @@ HRESULT WINAPI IEGetWriteableHKCU(HKEY *pkey) FIXME("(%p) stub\n", pkey); return E_NOTIMPL; } + +/*********************************************************************** + * SetQueryNetSessionCount (ieframe.@) + */ +LONG WINAPI SetQueryNetSessionCount(DWORD session_op) +{ + static LONG session_count; + + TRACE("(%x)\n", session_op); + + switch(session_op) + { + case SESSION_QUERY: + return session_count; + case SESSION_INCREMENT: + return InterlockedIncrement(&session_count); + case SESSION_DECREMENT: + return InterlockedDecrement(&session_count); + }; + + return 0; +} diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index be0e6ec5bfc..b8377b35d43 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -555,6 +555,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE on_offlineconnected_change(This); on_silent_change(This); + SetQueryNetSessionCount(SESSION_INCREMENT); return S_OK; } diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 52d1f707357..903c1062b6c 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -173,6 +173,15 @@ static const WCHAR *current_url; static int wb_version, expect_update_commands_enable, set_update_commands_enable; static BOOL nav_back_todo, nav_forward_todo; /* FIXME */ +enum SessionOp +{ + SESSION_QUERY, + SESSION_INCREMENT, + SESSION_DECREMENT +}; + +static LONG (WINAPI *pSetQueryNetSessionCount)(DWORD); + #define BUSY_FAIL 2 #define DWL_EXPECT_BEFORE_NAVIGATE 0x01 @@ -1946,6 +1955,7 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop { IOleObject *oleobj; IOleInPlaceObject *inplace; + DWORD session_count; HWND hwnd; HRESULT hres; @@ -1969,6 +1979,8 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop ok((hwnd == NULL) ^ (client == NULL), "unexpected hwnd %p\n", hwnd); if(client) { + session_count = pSetQueryNetSessionCount(SESSION_QUERY); + SET_EXPECT(GetContainer); SET_EXPECT(Site_GetWindow); SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -1995,6 +2007,9 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); if(client) { + DWORD count = pSetQueryNetSessionCount(SESSION_QUERY); + ok(count == session_count + 1, "count = %u expected %u\n", count, session_count + 1); + CHECK_CALLED(GetContainer); CHECK_CALLED(Site_GetWindow); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -3837,6 +3852,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_EnumVerbs(webbrowser); test_LocationURL(webbrowser, L""); test_ConnectionPoint(webbrowser, TRUE); + test_ClientSite(webbrowser, &ClientSite, !do_download); test_Extent(webbrowser); test_wb_funcs(webbrowser, TRUE); @@ -4401,6 +4417,29 @@ static void test_SetAdvise(void) IWebBrowser2_Release(browser); } +static void test_SetQueryNetSessionCount(void) +{ + LONG count; + + count = pSetQueryNetSessionCount(SESSION_QUERY); + ok(count == 0, "count = %d\n", count); + + count = pSetQueryNetSessionCount(SESSION_INCREMENT); + ok(count == 1, "count = %d\n", count); + + count = pSetQueryNetSessionCount(SESSION_QUERY); + ok(count == 1, "count = %d\n", count); + + count = pSetQueryNetSessionCount(0xdeadbeef); + ok(count == 0, "count = %d\n", count); + + count = pSetQueryNetSessionCount(SESSION_DECREMENT); + ok(count == 0, "count = %d\n", count); + + count = pSetQueryNetSessionCount(SESSION_QUERY); + ok(count == 0, "count = %d\n", count); +} + static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &outer_test_iid)) { @@ -4460,8 +4499,14 @@ static void test_com_aggregation(void) START_TEST(webbrowser) { + HMODULE ieframe = LoadLibraryW(L"ieframe.dll"); + + pSetQueryNetSessionCount = (void*)GetProcAddress(ieframe, "SetQueryNetSessionCount"); + OleInitialize(NULL); + test_SetQueryNetSessionCount(); + container_hwnd = create_container_window(); trace("Testing WebBrowser (no download)...\n");

3 years, 3 months

Nikolay Sivov : mf/session: Add a stub for IMFTopologyNodeAttributeEditor.

by Alexandre Julliard

Module: wine Branch: master Commit: 9446458f750d5d81bbc36a5067fdcac67153e9fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=9446458f750d5d81bbc36a50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:10:02 2021 +0300 mf/session: Add a stub for IMFTopologyNodeAttributeEditor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 9 +++++++++ 2 files changed, 66 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index af0407f6a0b..5034255339c 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -213,6 +213,7 @@ struct media_session IMFGetService IMFGetService_iface; IMFRateSupport IMFRateSupport_iface; IMFRateControl IMFRateControl_iface; + IMFTopologyNodeAttributeEditor IMFTopologyNodeAttributeEditor_iface; IMFAsyncCallback commands_callback; IMFAsyncCallback events_callback; IMFAsyncCallback sink_finalizer_callback; @@ -362,6 +363,11 @@ static struct media_session *impl_session_from_IMFRateControl(IMFRateControl *if return CONTAINING_RECORD(iface, struct media_session, IMFRateControl_iface); } +static struct media_session *impl_session_from_IMFTopologyNodeAttributeEditor(IMFTopologyNodeAttributeEditor *iface) +{ + return CONTAINING_RECORD(iface, struct media_session, IMFTopologyNodeAttributeEditor_iface); +} + static struct session_op *impl_op_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct session_op, IUnknown_iface); @@ -1999,6 +2005,10 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { return IMFLocalMFTRegistration_QueryInterface(&local_mft_registration, riid, obj); } + else if (IsEqualGUID(service, &MF_TOPONODE_ATTRIBUTE_EDITOR_SERVICE)) + { + *obj = &session->IMFTopologyNodeAttributeEditor_iface; + } else if (IsEqualGUID(service, &MR_VIDEO_RENDER_SERVICE)) { IMFStreamSink *stream_sink; @@ -3566,6 +3576,52 @@ static const IMFRateControlVtbl session_rate_control_vtbl = session_rate_control_GetRate, }; +static HRESULT WINAPI node_attribute_editor_QueryInterface(IMFTopologyNodeAttributeEditor *iface, + REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFTopologyNodeAttributeEditor) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFTopologyNodeAttributeEditor_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI node_attribute_editor_AddRef(IMFTopologyNodeAttributeEditor *iface) +{ + struct media_session *session = impl_session_from_IMFTopologyNodeAttributeEditor(iface); + return IMFMediaSession_AddRef(&session->IMFMediaSession_iface); +} + +static ULONG WINAPI node_attribute_editor_Release(IMFTopologyNodeAttributeEditor *iface) +{ + struct media_session *session = impl_session_from_IMFTopologyNodeAttributeEditor(iface); + return IMFMediaSession_Release(&session->IMFMediaSession_iface); +} + +static HRESULT WINAPI node_attribute_editor_UpdateNodeAttributes(IMFTopologyNodeAttributeEditor *iface, + TOPOID id, DWORD count, MFTOPONODE_ATTRIBUTE_UPDATE *updates) +{ + FIXME("%p, %s, %u, %p.\n", iface, wine_dbgstr_longlong(id), count, updates); + + return E_NOTIMPL; +} + +static const IMFTopologyNodeAttributeEditorVtbl node_attribute_editor_vtbl = +{ + node_attribute_editor_QueryInterface, + node_attribute_editor_AddRef, + node_attribute_editor_Release, + node_attribute_editor_UpdateNodeAttributes, +}; + /*********************************************************************** * MFCreateMediaSession (mf.@) */ @@ -3585,6 +3641,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses object->IMFGetService_iface.lpVtbl = &session_get_service_vtbl; object->IMFRateSupport_iface.lpVtbl = &session_rate_support_vtbl; object->IMFRateControl_iface.lpVtbl = &session_rate_control_vtbl; + object->IMFTopologyNodeAttributeEditor_iface.lpVtbl = &node_attribute_editor_vtbl; object->commands_callback.lpVtbl = &session_commands_callback_vtbl; object->events_callback.lpVtbl = &session_events_callback_vtbl; object->sink_finalizer_callback.lpVtbl = &session_sink_finalizer_callback_vtbl; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 34090d0a9d4..846d311c877 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1176,6 +1176,15 @@ static void test_media_session(void) check_interface(session, &IID_IMFGetService, TRUE); check_interface(session, &IID_IMFAttributes, FALSE); + check_interface(session, &IID_IMFTopologyNodeAttributeEditor, FALSE); + + hr = MFGetService((IUnknown *)session, &MF_TOPONODE_ATTRIBUTE_EDITOR_SERVICE, &IID_IMFTopologyNodeAttributeEditor, + (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(unk, &IID_IMFMediaSession, FALSE); + + IUnknown_Release(unk); hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr);

3 years, 3 months

Nikolay Sivov : mfmediaengine: Use consistent format for traces.

by Alexandre Julliard

Module: wine Branch: master Commit: 21ae610d14f0d508c1b20c8af8516e118e00f4bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ae610d14f0d508c1b20c8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:10:01 2021 +0300 mfmediaengine: Use consistent format for traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 8c3b4f41229..65f207bd4b5 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -952,7 +952,7 @@ static const IMFAsyncCallbackVtbl media_engine_load_handler_vtbl = static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) { - TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFMediaEngine) || IsEqualIID(riid, &IID_IUnknown)) @@ -972,7 +972,7 @@ static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) struct media_engine *engine = impl_from_IMFMediaEngine(iface); ULONG refcount = InterlockedIncrement(&engine->refcount); - TRACE("(%p) ref=%u.\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); return refcount; } @@ -999,7 +999,7 @@ static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) struct media_engine *engine = impl_from_IMFMediaEngine(iface); ULONG refcount = InterlockedDecrement(&engine->refcount); - TRACE("(%p) ref=%u.\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) free_media_engine(engine); @@ -1978,7 +1978,7 @@ static IMFMediaEngineClassFactory media_engine_factory = { &media_engine_factory static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) { - TRACE("(%s, %p).\n", debugstr_guid(riid), obj); + TRACE("%s, %p.\n", debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IClassFactory) || IsEqualGUID(riid, &IID_IUnknown)) @@ -2005,7 +2005,7 @@ static ULONG WINAPI classfactory_Release(IClassFactory *iface) static HRESULT WINAPI classfactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) { - TRACE("(%p, %s, %p).\n", outer, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", outer, debugstr_guid(riid), obj); *obj = NULL; @@ -2034,7 +2034,7 @@ static IClassFactory classfactory = { &class_factory_vtbl }; HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj) { - TRACE("(%s, %s, %p).\n", debugstr_guid(clsid), debugstr_guid(riid), obj); + TRACE("%s, %s, %p.\n", debugstr_guid(clsid), debugstr_guid(riid), obj); if (IsEqualGUID(clsid, &CLSID_MFMediaEngineClassFactory)) return IClassFactory_QueryInterface(&classfactory, riid, obj);

3 years, 3 months

Nikolay Sivov : mfmediaengine: Force returned playback position after presentation ends.

by Alexandre Julliard

Module: wine Branch: master Commit: 35569903876e4893d3430d734442cba759d63f1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=35569903876e4893d3430d73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:10:00 2021 +0300 mfmediaengine: Force returned playback position after presentation ends. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 42aa8a6e92a..8c3b4f41229 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1214,7 +1214,11 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) TRACE("%p.\n", iface); EnterCriticalSection(&engine->cs); - if (SUCCEEDED(IMFPresentationClock_GetTime(engine->clock, &clocktime))) + if (engine->flags & FLAGS_ENGINE_IS_ENDED) + { + ret = engine->duration; + } + else if (SUCCEEDED(IMFPresentationClock_GetTime(engine->clock, &clocktime))) { ret = (double)clocktime / 10000000.0; }

3 years, 3 months

Nikolay Sivov : mfmediaengine: Set "ended" state when session presentation ends.

by Alexandre Julliard

Module: wine Branch: master Commit: 67815c2f6236b65656eb8500cbd11d4b4c9eedff URL: https://source.winehq.org/git/wine.git/?a=commit;h=67815c2f6236b65656eb8500… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:09:59 2021 +0300 mfmediaengine: Set "ended" state when session presentation ends. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index f9872f43a3b..42aa8a6e92a 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -96,6 +96,7 @@ enum media_engine_flags FLAGS_ENGINE_HAS_AUDIO = 0x800, FLAGS_ENGINE_HAS_VIDEO = 0x1000, FLAGS_ENGINE_FIRST_FRAME = 0x2000, + FLAGS_ENGINE_IS_ENDED = 0x4000, }; struct video_frame @@ -634,6 +635,7 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface EnterCriticalSection(&engine->cs); media_engine_set_flag(engine, FLAGS_ENGINE_FIRST_FRAME, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_IS_ENDED, TRUE); engine->video_frame.pts = MINLONGLONG; LeaveCriticalSection(&engine->cs); @@ -1347,9 +1349,16 @@ static HRESULT WINAPI media_engine_GetSeekable(IMFMediaEngine *iface, IMFMediaTi static BOOL WINAPI media_engine_IsEnded(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + BOOL value; - return FALSE; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + value = !!(engine->flags & FLAGS_ENGINE_IS_ENDED); + LeaveCriticalSection(&engine->cs); + + return value; } static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngine *iface) @@ -1419,7 +1428,7 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) if (!(engine->flags & FLAGS_ENGINE_WAITING)) { - media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED | FLAGS_ENGINE_IS_ENDED, FALSE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); var.vt = VT_EMPTY; @@ -1445,7 +1454,7 @@ static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) if (!(engine->flags & FLAGS_ENGINE_PAUSED)) { - media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING | FLAGS_ENGINE_IS_ENDED, FALSE); media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, TRUE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0);

3 years, 3 months

Nikolay Sivov : mfmediaengine: Use existing helper to update engine state flags.

by Alexandre Julliard

Module: wine Branch: master Commit: 85a62b3657fa473c2e012e882e891df3256755e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85a62b3657fa473c2e012e88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:09:58 2021 +0300 mfmediaengine: Use existing helper to update engine state flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 2bf7cf45da1..f9872f43a3b 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -822,10 +822,8 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi return E_UNEXPECTED; } - if (sd_video) - engine->flags |= FLAGS_ENGINE_HAS_VIDEO; - if (sd_audio) - engine->flags |= FLAGS_ENGINE_HAS_AUDIO; + media_engine_set_flag(engine, FLAGS_ENGINE_HAS_VIDEO, !!sd_video); + media_engine_set_flag(engine, FLAGS_ENGINE_HAS_AUDIO, !!sd_audio); /* Assume live source if duration was not provided. */ if (SUCCEEDED(IMFPresentationDescriptor_GetUINT64(pd, &MF_PD_DURATION, &duration))) @@ -1421,13 +1419,13 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) if (!(engine->flags & FLAGS_ENGINE_WAITING)) { - engine->flags &= ~FLAGS_ENGINE_PAUSED; + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, FALSE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); var.vt = VT_EMPTY; IMFMediaSession_Start(engine->session, &GUID_NULL, &var); - engine->flags |= FLAGS_ENGINE_WAITING; + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, TRUE); } IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_WAITING, 0, 0); @@ -1447,8 +1445,8 @@ static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) if (!(engine->flags & FLAGS_ENGINE_PAUSED)) { - engine->flags &= ~FLAGS_ENGINE_WAITING; - engine->flags |= FLAGS_ENGINE_PAUSED; + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, TRUE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PAUSE, 0, 0); @@ -1623,7 +1621,7 @@ static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) hr = MF_E_SHUTDOWN; else { - engine->flags |= FLAGS_ENGINE_SHUT_DOWN; + media_engine_set_flag(engine, FLAGS_ENGINE_SHUT_DOWN, TRUE); IMFMediaSession_Shutdown(engine->session); } LeaveCriticalSection(&engine->cs); @@ -1794,7 +1792,7 @@ static HRESULT WINAPI media_engine_grabber_callback_OnProcessSample(IMFSampleGra if (!(engine->flags & FLAGS_ENGINE_FIRST_FRAME)) { IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_FIRSTFRAMEREADY, 0, 0); - engine->flags |= FLAGS_ENGINE_FIRST_FRAME; + media_engine_set_flag(engine, FLAGS_ENGINE_FIRST_FRAME, TRUE); } engine->video_frame.pts = sample_time;

3 years, 3 months

Nikolay Sivov : mfmediaengine: Use presentation clock interface from the session.

by Alexandre Julliard

Module: wine Branch: master Commit: 39d177b88b77c63f476a995a655d471dd5852a7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=39d177b88b77c63f476a995a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:09:57 2021 +0300 mfmediaengine: Use presentation clock interface from the session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 6f6811ff9ea..2bf7cf45da1 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -126,7 +126,7 @@ struct media_engine MF_MEDIA_ENGINE_READY ready_state; MF_MEDIA_ENGINE_PRELOAD preload; IMFMediaSession *session; - IMFClock *clock; + IMFPresentationClock *clock; IMFSourceResolver *resolver; BSTR current_source; struct video_frame video_frame; @@ -982,7 +982,7 @@ static void free_media_engine(struct media_engine *engine) if (engine->callback) IMFMediaEngineNotify_Release(engine->callback); if (engine->clock) - IMFClock_Release(engine->clock); + IMFPresentationClock_Release(engine->clock); if (engine->session) IMFMediaSession_Release(engine->session); if (engine->attributes) @@ -1208,16 +1208,14 @@ static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngine *iface) static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) { struct media_engine *engine = impl_from_IMFMediaEngine(iface); - LONGLONG clocktime; double ret = 0.0; - MFTIME systime; + MFTIME clocktime; TRACE("%p.\n", iface); EnterCriticalSection(&engine->cs); - if (SUCCEEDED(IMFClock_GetCorrelatedTime(engine->clock, 0, &clocktime, &systime))) + if (SUCCEEDED(IMFPresentationClock_GetTime(engine->clock, &clocktime))) { - /* Assume 100ns clock. */ ret = (double)clocktime / 10000000.0; } LeaveCriticalSection(&engine->cs); @@ -1854,6 +1852,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct { DXGI_FORMAT output_format; UINT64 playback_hwnd; + IMFClock *clock; HRESULT hr; engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; @@ -1877,7 +1876,12 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct if (FAILED(hr = MFCreateMediaSession(NULL, &engine->session))) return hr; - if (FAILED(hr = IMFMediaSession_GetClock(engine->session, &engine->clock))) + if (FAILED(hr = IMFMediaSession_GetClock(engine->session, &clock))) + return hr; + + hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&engine->clock); + IMFClock_Release(clock); + if (FAILED(hr)) return hr; if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, &engine->session_events, NULL)))

3 years, 3 months

Nikolay Sivov : mf/tests: Use interface check helper more.

by Alexandre Julliard

Module: wine Branch: master Commit: be3bab5efbcef1470468b982f342d401af8047c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be3bab5efbcef1470468b982… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:09:56 2021 +0300 mf/tests: Use interface check helper more. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8272064466f..34090d0a9d4 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1154,7 +1154,6 @@ static void test_session_events(IMFMediaSession *session) static void test_media_session(void) { IMFRateControl *rate_control, *rate_control2; - IMFLocalMFTRegistration *local_reg; MFCLOCK_PROPERTIES clock_props; IMFRateSupport *rate_support; IMFAttributes *attributes; @@ -1163,7 +1162,6 @@ static void test_media_session(void) IMFShutdown *shutdown; PROPVARIANT propvar; DWORD status, caps; - IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; @@ -1176,23 +1174,19 @@ static void test_media_session(void) hr = MFCreateMediaSession(NULL, &session); ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); - hr = IMFMediaSession_QueryInterface(session, &IID_IMFAttributes, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + check_interface(session, &IID_IMFGetService, TRUE); + check_interface(session, &IID_IMFAttributes, FALSE); - hr = IMFMediaSession_QueryInterface(session, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - - hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); + hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); - hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); + hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); - hr = IMFGetService_GetService(gs, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, - (void **)&local_reg); + hr = MFGetService((IUnknown *)session, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, (void **)&unk); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get registration service, hr %#x.\n", hr); if (SUCCEEDED(hr)) - IMFLocalMFTRegistration_Release(local_reg); + IUnknown_Release(unk); hr = IMFRateSupport_QueryInterface(rate_support, &IID_IMFMediaSession, (void **)&unk); ok(hr == S_OK, "Failed to get session interface, hr %#x.\n", hr); @@ -1220,6 +1214,8 @@ static void test_media_session(void) hr = IMFMediaSession_GetClock(session, &clock); ok(hr == S_OK, "Failed to get clock, hr %#x.\n", hr); + check_interface(clock, &IID_IMFPresentationClock, TRUE); + hr = IMFClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control2); ok(hr == S_OK, "Failed to get rate control, hr %#x.\n", hr); @@ -1241,8 +1237,6 @@ todo_wine IMFRateControl_Release(rate_control); IMFRateSupport_Release(rate_support); - IMFGetService_Release(gs); - IMFMediaSession_Release(session); hr = MFCreateMediaSession(NULL, &session);

3 years, 3 months

Jump to page:

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 January 2021