wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Zebediah Figura : strmbase: Properly implement IVideoWindow::get_WindowState().
by Alexandre Julliard 09 Oct '19

09 Oct '19

Module: wine Branch: master Commit: a3d3b399ff724205470f0ba6c27110fba3995bd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3d3b399ff724205470f0ba6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 8 20:02:20 2019 -0500 strmbase: Properly implement IVideoWindow::get_WindowState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 14 +++++++------- dlls/strmbase/window.c | 21 ++++++++++++++------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 1c16fa1f82..96a2b1cabb 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1487,7 +1487,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_HIDE, "Got state %d.\n", state); + ok(state == SW_HIDE, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OAFALSE, "Got state %d.\n", state); @@ -1501,7 +1501,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); + ok(state == SW_SHOW, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OATRUE, "Got state %d.\n", state); @@ -1518,7 +1518,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_MINIMIZE, "Got state %d.\n", state); + ok(state == SW_MINIMIZE, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OATRUE, "Got state %d.\n", state); @@ -1533,7 +1533,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); + ok(state == SW_SHOW, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OATRUE, "Got state %d.\n", state); @@ -1566,7 +1566,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_HIDE, "Got state %d.\n", state); + ok(state == SW_HIDE, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OAFALSE, "Got state %d.\n", state); @@ -1581,7 +1581,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); + ok(state == SW_SHOW, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OATRUE, "Got state %d.\n", state); @@ -1596,7 +1596,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_HIDE, "Got state %d.\n", state); + ok(state == SW_HIDE, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OAFALSE, "Got state %d.\n", state); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 206aecb8de..57dbaca8bf 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -402,15 +402,22 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowState(IVideoWindow *iface, LONG W return S_OK; } -HRESULT WINAPI BaseControlWindowImpl_get_WindowState(IVideoWindow *iface, LONG *WindowState) +HRESULT WINAPI BaseControlWindowImpl_get_WindowState(IVideoWindow *iface, LONG *state) { - WINDOWPLACEMENT place; - BaseControlWindow* This = impl_from_IVideoWindow(iface); + BaseControlWindow *window = impl_from_IVideoWindow(iface); + DWORD style; - place.length = sizeof(place); - GetWindowPlacement(This->baseWindow.hWnd, &place); - TRACE("(%p/%p)->(%p)\n", This, iface, WindowState); - *WindowState = place.showCmd; + TRACE("window %p, state %p.\n", window, state); + + style = GetWindowLongPtrW(window->baseWindow.hWnd, GWL_STYLE); + if (!(style & WS_VISIBLE)) + *state = SW_HIDE; + else if (style & WS_MINIMIZE) + *state = SW_MINIMIZE; + else if (style & WS_MAXIMIZE) + *state = SW_MAXIMIZE; + else + *state = SW_SHOW; return S_OK; }

1 0

Zebediah Figura : strmbase: Don't move or activate the window in IVideoWindow::put_WindowStyle().
by Alexandre Julliard 09 Oct '19

09 Oct '19

Module: wine Branch: master Commit: ab98626afa03674db2ae3cb6c5eaffce31505617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab98626afa03674db2ae3cb6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 8 20:02:19 2019 -0500 strmbase: Don't move or activate the window in IVideoWindow::put_WindowStyle(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/strmbase/window.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 558dc26cb9..1c16fa1f82 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1438,7 +1438,7 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw style = GetWindowLongA(hwnd, GWL_STYLE); todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); - todo_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); + ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); hr = IVideoWindow_get_WindowStyleEx(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index ecedc17489..206aecb8de 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -330,7 +330,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG W return E_INVALIDARG; SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, WindowStyle); - SetWindowPos(This->baseWindow.hWnd,0,0,0,0,0,SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOZORDER); + SetWindowPos(This->baseWindow.hWnd, 0, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); This->baseWindow.WindowStyles = WindowStyle; return S_OK;

1 0

Zebediah Figura : strmbase: IVideoWindow::get_Visible() returns OATRUE, not TRUE.
by Alexandre Julliard 09 Oct '19

09 Oct '19

Module: wine Branch: master Commit: 6ef97acd1b151f801a824835c9cbfcc24d24040e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ef97acd1b151f801a824835… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 8 20:02:18 2019 -0500 strmbase: IVideoWindow::get_Visible() returns OATRUE, not TRUE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 16 ++++++++-------- dlls/strmbase/window.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index e1b1f17c72..558dc26cb9 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1504,7 +1504,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); - todo_wine ok(state == OATRUE, "Got state %d.\n", state); + ok(state == OATRUE, "Got state %d.\n", state); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(!IsIconic(hwnd), "Window should not be minimized.\n"); @@ -1521,7 +1521,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw todo_wine ok(state == SW_MINIMIZE, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); - todo_wine ok(state == OATRUE, "Got state %d.\n", state); + ok(state == OATRUE, "Got state %d.\n", state); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(IsIconic(hwnd), "Window should be minimized.\n"); @@ -1536,7 +1536,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); - todo_wine ok(state == OATRUE, "Got state %d.\n", state); + ok(state == OATRUE, "Got state %d.\n", state); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(!IsIconic(hwnd), "Window should not be minimized.\n"); @@ -1551,7 +1551,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw ok(state == SW_MAXIMIZE, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); - todo_wine ok(state == OATRUE, "Got state %d.\n", state); + ok(state == OATRUE, "Got state %d.\n", state); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(!IsIconic(hwnd), "Window should be minimized.\n"); @@ -1584,7 +1584,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); - todo_wine ok(state == OATRUE, "Got state %d.\n", state); + ok(state == OATRUE, "Got state %d.\n", state); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(!IsIconic(hwnd), "Window should not be minimized.\n"); @@ -1828,7 +1828,7 @@ static void test_video_window_owner(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_Visible(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == OATRUE, "Got state %d.\n", state); + ok(state == OATRUE, "Got state %d.\n", state); } static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our_hwnd) @@ -1938,14 +1938,14 @@ static void test_video_window_autoshow(IVideoWindow *window, IFilterGraph2 *grap hr = IVideoWindow_get_Visible(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVideoWindow_get_Visible(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IVideoWindow_put_AutoShow(window, OAFALSE); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 66db2d6c07..ecedc17489 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -449,7 +449,7 @@ HRESULT WINAPI BaseControlWindowImpl_get_Visible(IVideoWindow *iface, LONG *pVis TRACE("(%p/%p)->(%p)\n", This, iface, pVisible); - *pVisible = IsWindowVisible(This->baseWindow.hWnd); + *pVisible = IsWindowVisible(This->baseWindow.hWnd) ? OATRUE : OAFALSE; return S_OK; }

1 0

Zebediah Figura : strmbase: IVideoWindow::get_AutoShow() returns OATRUE, not TRUE.
by Alexandre Julliard 09 Oct '19

09 Oct '19

Module: wine Branch: master Commit: 7272891efbd28998bc1c1515007f478a6661e219 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7272891efbd28998bc1c1515… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 8 20:02:17 2019 -0500 strmbase: IVideoWindow::get_AutoShow() returns OATRUE, not TRUE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/strmbase/window.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index f1f901d164..e1b1f17c72 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1928,7 +1928,7 @@ static void test_video_window_autoshow(IVideoWindow *window, IFilterGraph2 *grap hr = IVideoWindow_get_AutoShow(window, &l); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(l == OATRUE, "Got %d.\n", l); + ok(l == OATRUE, "Got %d.\n", l); hr = IVideoWindow_put_Visible(window, OAFALSE); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index cb41aee2f4..66db2d6c07 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -203,7 +203,7 @@ HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, if (SUCCEEDED(hr)) { pControlWindow->IVideoWindow_iface.lpVtbl = lpVtbl; - pControlWindow->AutoShow = TRUE; + pControlWindow->AutoShow = OATRUE; pControlWindow->hwndDrain = NULL; pControlWindow->hwndOwner = NULL; pControlWindow->pFilter = owner;

1 0

Dmitry Timoshkov : ieframe: Implement InternetExplorer typelib methods.
by Alexandre Julliard 08 Oct '19

08 Oct '19

Module: wine Branch: master Commit: 89d9bcb1f19a03ffafa9a93a5f32049b4bfdaa00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89d9bcb1f19a03ffafa9a93a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 7 12:30:34 2019 +0800 ieframe: Implement InternetExplorer typelib methods. These are copies of appropriate methods from webbrowser.c Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ie.c | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index d7e3aa150c..99ec88e7c3 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -103,16 +103,29 @@ static ULONG WINAPI InternetExplorer_Release(IWebBrowser2 *iface) static HRESULT WINAPI InternetExplorer_GetTypeInfoCount(IWebBrowser2 *iface, UINT *pctinfo) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI InternetExplorer_GetTypeInfo(IWebBrowser2 *iface, UINT iTInfo, LCID lcid, LPTYPEINFO *ppTInfo) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); + + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); + if(FAILED(hres)) + return hres; + + ITypeInfo_AddRef(typeinfo); + *ppTInfo = typeinfo; + return S_OK; } static HRESULT WINAPI InternetExplorer_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid, @@ -120,9 +133,17 @@ static HRESULT WINAPI InternetExplorer_GetIDsOfNames(IWebBrowser2 *iface, REFIID LCID lcid, DISPID *rgDispId) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); + if(FAILED(hres)) + return hres; + + return ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); } static HRESULT WINAPI InternetExplorer_Invoke(IWebBrowser2 *iface, DISPID dispIdMember, @@ -131,9 +152,18 @@ static HRESULT WINAPI InternetExplorer_Invoke(IWebBrowser2 *iface, DISPID dispId EXCEPINFO *pExepInfo, UINT *puArgErr) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - return E_NOTIMPL; + + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); + if(FAILED(hres)) + return hres; + + return ITypeInfo_Invoke(typeinfo, &This->IWebBrowser2_iface, dispIdMember, wFlags, pDispParams, + pVarResult, pExepInfo, puArgErr); } static HRESULT WINAPI InternetExplorer_GoBack(IWebBrowser2 *iface)

1 0

Nikolay Sivov : mf/tests: Add a test for SAR time source.
by Alexandre Julliard 08 Oct '19

08 Oct '19

Module: wine Branch: master Commit: 5a919ad67c0d7864e0f147792bcd5d1e9f1d72a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a919ad67c0d7864e0f14779… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 15:58:57 2019 +0300 mf/tests: Add a test for SAR time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 33 +++++++++++++++++++++++++++++++++ include/mferror.h | 12 ++++++++++++ include/mfidl.idl | 2 ++ 3 files changed, 47 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 830bb38259..0428c22ed3 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2552,6 +2552,38 @@ static void test_quality_manager(void) IMFQualityManager_Release(manager); } +static void test_sar(void) +{ + IMFPresentationTimeSource *time_source; + IMFMediaSink *sink; + HRESULT hr; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + hr = MFCreateAudioRenderer(NULL, &sink); + if (hr == MF_E_NO_AUDIO_PLAYBACK_DEVICE) + { + skip("No audio playback device available.\n"); + CoUninitialize(); + return; + } + +todo_wine + ok(hr == S_OK, "Failed to create renderer, hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFPresentationTimeSource, (void **)&time_source); + ok(hr == S_OK, "Failed to get time source interface, hr %#x.\n", hr); + IMFPresentationTimeSource_Release(time_source); + + IMFMediaSink_Release(sink); +} + + CoUninitialize(); +} + START_TEST(mf) { test_topology(); @@ -2564,4 +2596,5 @@ START_TEST(mf) test_sample_grabber(); test_video_processor(); test_quality_manager(); + test_sar(); } diff --git a/include/mferror.h b/include/mferror.h index ba4d365a79..6d7031ecc8 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -108,6 +108,18 @@ #define MF_E_SINK_NO_SAMPLES_PROCESSED _HRESULT_TYPEDEF_(0xc00d4a44) #define MF_E_SINK_HEADERS_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d4a45) +#define MF_E_VIDEO_REN_NO_PROCAMP_HW _HRESULT_TYPEDEF_(0xc00d4e20) +#define MF_E_VIDEO_REN_NO_DEINTERLACE_HW _HRESULT_TYPEDEF_(0xc00d4e21) +#define MF_E_VIDEO_REN_COPYPROT_FAILED _HRESULT_TYPEDEF_(0xc00d4e22) +#define MF_E_VIDEO_REN_SURFACE_NOT_SHARED _HRESULT_TYPEDEF_(0xc00d4e23) +#define MF_E_VIDEO_DEVICE_LOCKED _HRESULT_TYPEDEF_(0xc00d4e24) +#define MF_E_NEW_VIDEO_DEVICE _HRESULT_TYPEDEF_(0xc00d4e25) +#define MF_E_NO_VIDEO_SAMPLE_AVAILABLE _HRESULT_TYPEDEF_(0xc00d4e26) +#define MF_E_NO_AUDIO_PLAYBACK_DEVICE _HRESULT_TYPEDEF_(0xc00d4e84) +#define MF_E_AUDIO_PLAYBACK_DEVICE_IN_USE _HRESULT_TYPEDEF_(0xc00d4e85) +#define MF_E_AUDIO_PLAYBACK_DEVICE_INVALIDATED _HRESULT_TYPEDEF_(0xc00d4e86) +#define MF_E_AUDIO_SERVICE_NOT_RUNNING _HRESULT_TYPEDEF_(0xc00d4e87) + #define MF_E_TOPO_INVALID_OPTIONAL_NODE _HRESULT_TYPEDEF_(0xc00d520e) #define MF_E_TOPO_CANNOT_FIND_DECRYPTOR _HRESULT_TYPEDEF_(0xc00d5211) #define MF_E_TOPO_CODEC_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d5212) diff --git a/include/mfidl.idl b/include/mfidl.idl index df48cb3ab9..9c14c5604b 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -567,6 +567,8 @@ interface IMFSampleGrabberSinkCallback2 : IMFSampleGrabberSinkCallback } cpp_quote("HRESULT WINAPI CreatePropertyStore(IPropertyStore **store);") +cpp_quote("HRESULT WINAPI MFCreateAudioRenderer(IMFAttributes *config, IMFMediaSink **sink);") +cpp_quote("HRESULT WINAPI MFCreateAudioRendererActivate(IMFActivate **activate);") cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream);")

1 0

Nikolay Sivov : mf: Adjust sample grabber sink flags in rateless mode.
by Alexandre Julliard 08 Oct '19

08 Oct '19

Module: wine Branch: master Commit: d5b79e6a795811b4316a3df4b8fe811e583f9425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5b79e6a795811b4316a3df4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 15:58:56 2019 +0300 mf: Adjust sample grabber sink flags in rateless mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 2 ++ dlls/mf/tests/mf.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index af9666c86c..c3dc2e1b7f 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -862,6 +862,8 @@ static HRESULT WINAPI sample_grabber_sink_GetCharacteristics(IMFMediaSink *iface return MF_E_SHUTDOWN; *flags = MEDIASINK_FIXED_STREAMS; + if (grabber->ignore_clock) + *flags |= MEDIASINK_RATELESS; return S_OK; } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 7f9edfe241..830bb38259 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2166,6 +2166,32 @@ todo_wine refcount = IMFActivate_Release(activate); ok(!refcount, "Unexpected refcount %u.\n", refcount); + /* Rateless mode with MF_SAMPLEGRABBERSINK_IGNORE_CLOCK. */ + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &grabber_callback, &activate); + ok(hr == S_OK, "Failed to create grabber activate, hr %#x.\n", hr); + + hr = IMFActivate_SetUINT32(activate, &MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, 1); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate object, hr %#x.\n", hr); + + hr = IMFMediaSink_GetCharacteristics(sink, &flags); + ok(hr == S_OK, "Failed to get sink flags, hr %#x.\n", hr); + ok(flags & MEDIASINK_RATELESS, "Unexpected flags %#x.\n", flags); + + IMFMediaSink_Release(sink); + IMFActivate_Release(activate); + IMFMediaType_Release(media_type); + hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); }

1 0

Nikolay Sivov : mf: Copy preferred types when cloning nodes.
by Alexandre Julliard 08 Oct '19

08 Oct '19

Module: wine Branch: master Commit: c1c77f22bc3ccde601134ac1f9375ac3c504bef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c77f22bc3ccde601134ac1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 15:58:55 2019 +0300 mf: Copy preferred types when cloning nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/topology.c | 26 ++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 038bfeacd1..7f9edfe241 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -656,6 +656,71 @@ static void test_topology(void) IMFTopologyNode_Release(node); IMFTopologyNode_Release(node2); + /* Cloning nodes of different types. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = IMFTopologyNode_CloneFrom(node, node2); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + IMFTopologyNode_Release(node2); + + /* Cloning preferred types. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetOutputPrefType(node2, 0, mediatype); + ok(hr == S_OK, "Failed to set preferred type, hr %#x.\n", hr); + + /* Vista checks for additional attributes. */ + hr = IMFTopologyNode_CloneFrom(node, node2); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Vista */, "Failed to clone a node, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetOutputPrefType(node, 0, &mediatype2); + ok(hr == S_OK, "Failed to get preferred type, hr %#x.\n", hr); + ok(mediatype == mediatype2, "Unexpected media type.\n"); + + IMFMediaType_Release(mediatype2); + IMFMediaType_Release(mediatype); + + IMFTopologyNode_Release(node2); + + /* Existing preferred types are not cleared. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetOutputCount(node, &count); + ok(hr == S_OK, "Failed to get output count, hr %#x.\n", hr); + ok(count == 1, "Unexpected output count.\n"); + + hr = IMFTopologyNode_CloneFrom(node, node2); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Vista */, "Failed to clone a node, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetOutputCount(node, &count); + ok(hr == S_OK, "Failed to get output count, hr %#x.\n", hr); + ok(count == 1, "Unexpected output count.\n"); + + hr = IMFTopologyNode_GetOutputPrefType(node, 0, &mediatype2); + ok(hr == S_OK, "Failed to get preferred type, hr %#x.\n", hr); + ok(!!mediatype2, "Unexpected media type.\n"); + IMFMediaType_Release(mediatype2); + + hr = IMFTopologyNode_CloneFrom(node2, node); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Vista */, "Failed to clone a node, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetOutputCount(node2, &count); + ok(hr == S_OK, "Failed to get output count, hr %#x.\n", hr); + ok(count == 1, "Unexpected output count.\n"); + + IMFTopologyNode_Release(node2); + IMFTopologyNode_Release(node); + IMFTopology_Release(topology); } diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index ad89739d4a..db82816328 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1628,7 +1628,9 @@ static HRESULT WINAPI topology_node_CloneFrom(IMFTopologyNode *iface, IMFTopolog { struct topology_node *node = impl_from_IMFTopologyNode(iface); MF_TOPOLOGY_TYPE node_type; + IMFMediaType *mediatype; IUnknown *object; + DWORD count, i; TOPOID topoid; HRESULT hr; @@ -1656,6 +1658,30 @@ static HRESULT WINAPI topology_node_CloneFrom(IMFTopologyNode *iface, IMFTopolog if (SUCCEEDED(hr)) node->id = topoid; + if (SUCCEEDED(IMFTopologyNode_GetInputCount(src_node, &count))) + { + for (i = 0; i < count; ++i) + { + if (SUCCEEDED(IMFTopologyNode_GetInputPrefType(src_node, i, &mediatype))) + { + IMFTopologyNode_SetInputPrefType(iface, i, mediatype); + IMFMediaType_Release(mediatype); + } + } + } + + if (SUCCEEDED(IMFTopologyNode_GetOutputCount(src_node, &count))) + { + for (i = 0; i < count; ++i) + { + if (SUCCEEDED(IMFTopologyNode_GetOutputPrefType(src_node, i, &mediatype))) + { + IMFTopologyNode_SetOutputPrefType(iface, i, mediatype); + IMFMediaType_Release(mediatype); + } + } + } + LeaveCriticalSection(&node->cs); if (object)

1 0

Nikolay Sivov : mf/tests: Use separate session instance for events tests.
by Alexandre Julliard 08 Oct '19

08 Oct '19

Module: wine Branch: master Commit: 34c52b946ad7526d20ca0fa79c17740fea1f8869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34c52b946ad7526d20ca0fa7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 15:58:54 2019 +0300 mf/tests: Use separate session instance for events tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2a5efc99e8..038bfeacd1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1041,8 +1041,6 @@ todo_wine IMFGetService_Release(gs); - test_session_events(session); - IMFMediaSession_Release(session); hr = MFCreateMediaSession(NULL, &session); @@ -1077,6 +1075,14 @@ todo_wine IMFAttributes_Release(attributes); + /* Basic events behavior. */ + hr = MFCreateMediaSession(NULL, &session); + ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + + test_session_events(session); + + IMFMediaSession_Release(session); + hr = MFShutdown(); ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); }

1 0

Nikolay Sivov : dwrite: Update to IDWriteFontFamily2.
by Alexandre Julliard 08 Oct '19

08 Oct '19

Module: wine Branch: master Commit: 30cf1bef0f5873043fa19e356da12676a6850acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=30cf1bef0f5873043fa19e35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 13:04:35 2019 +0300 dwrite: Update to IDWriteFontFamily2. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 206 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 117 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=30cf1bef0f5873043fa1…

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
62
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 October 2019