- Wine-Commits - list.winehq.org

Paul Gofman : wined3d: Use RB tree for storing lights.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 71da110b4689d7fc8ca1439dfb7944146b6d8d9d URL: https://gitlab.winehq.org/wine/wine/-/commit/71da110b4689d7fc8ca1439dfb7944… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 16 21:12:24 2023 -0600 wined3d: Use RB tree for storing lights. --- dlls/wined3d/cs.c | 5 +- dlls/wined3d/device.c | 62 ++++++++--------- dlls/wined3d/stateblock.c | 155 +++++++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 8 +-- 4 files changed, 98 insertions(+), 132 deletions(-)

1 0

Bartosz Kosiorek : gdiplus: Limit calculating transformation points to resampling.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 66ebf9169ed5062e0a0a7585900f64af1b50bd00 URL: https://gitlab.winehq.org/wine/wine/-/commit/66ebf9169ed5062e0a0a7585900f64… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sun May 21 20:35:17 2023 +0200 gdiplus: Limit calculating transformation points to resampling. Calculating transformation points and not using it it is a waste of CPU time. With this patch the code was moved where it is used. It is improving performance of GdipDrawImagePointsRect when resampling is not needed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53947 --- dlls/gdiplus/graphics.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6831cfcb247..11dc06e6c9e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3152,14 +3152,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image GpRectF graphics_bounds; GpRect src_area; int i, x, y, src_stride, dst_stride; - GpMatrix dst_to_src; - REAL m11, m12, m21, m22, mdx, mdy; LPBYTE src_data, dst_data, dst_dyn_data=NULL; BitmapData lockeddata; InterpolationMode interpolation = graphics->interpolation; PixelOffsetMode offset_mode = graphics->pixeloffset; - GpPointF dst_to_src_points[3] = {{0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}}; - REAL x_dx, x_dy, y_dx, y_dy; static const GpImageAttributes defaultImageAttributes = {WrapModeClamp, 0, FALSE}; if (!imageAttributes) @@ -3187,18 +3183,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (IsRectEmpty(&dst_area)) return Ok; - m11 = (ptf[1].X - ptf[0].X) / srcwidth; - m21 = (ptf[2].X - ptf[0].X) / srcheight; - mdx = ptf[0].X - m11 * srcx - m21 * srcy; - m12 = (ptf[1].Y - ptf[0].Y) / srcwidth; - m22 = (ptf[2].Y - ptf[0].Y) / srcheight; - mdy = ptf[0].Y - m12 * srcx - m22 * srcy; - - GdipSetMatrixElements(&dst_to_src, m11, m12, m21, m22, mdx, mdy); - - stat = GdipInvertMatrix(&dst_to_src); - if (stat != Ok) return stat; - if (do_resampling) { get_bitmap_sample_size(interpolation, imageAttributes->wrap, @@ -3248,6 +3232,23 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (do_resampling) { + GpMatrix dst_to_src; + REAL m11, m12, m21, m22, mdx, mdy; + GpPointF dst_to_src_points[3] = {{0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}}; + REAL x_dx, x_dy, y_dx, y_dy; + + m11 = (ptf[1].X - ptf[0].X) / srcwidth; + m21 = (ptf[2].X - ptf[0].X) / srcheight; + m12 = (ptf[1].Y - ptf[0].Y) / srcwidth; + m22 = (ptf[2].Y - ptf[0].Y) / srcheight; + mdx = ptf[0].X - m11 * srcx - m21 * srcy; + mdy = ptf[0].Y - m12 * srcx - m22 * srcy; + + GdipSetMatrixElements(&dst_to_src, m11, m12, m21, m22, mdx, mdy); + + stat = GdipInvertMatrix(&dst_to_src); + if (stat != Ok) return stat; + /* Transform the bits as needed to the destination. */ dst_data = dst_dyn_data = heap_alloc_zero(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); if (!dst_data)

1 0

Jactry Zeng : comdlg32: Calculate button height of toolbar with DPI for item dialog.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 80b332c050e25247eebe4fa9e2a86a42b8425709 URL: https://gitlab.winehq.org/wine/wine/-/commit/80b332c050e25247eebe4fa9e2a86a… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu May 18 01:36:26 2023 -0500 comdlg32: Calculate button height of toolbar with DPI for item dialog. --- dlls/comdlg32/itemdlg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 95778c2f358..e6f4ecb55b9 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1896,6 +1896,7 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) HWND htoolbar; TBADDBITMAP tbab; TBBUTTON button[2]; + int height; htoolbar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, @@ -1920,7 +1921,8 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) button[1].iString = 0; SendMessageW(htoolbar, TB_ADDBUTTONSW, 2, (LPARAM)button); - SendMessageW(htoolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(24,24)); + height = MulDiv(24, This->dpi_y, USER_DEFAULT_SCREEN_DPI); + SendMessageW(htoolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(height, height)); SendMessageW(htoolbar, TB_AUTOSIZE, 0, 0); }

1 0

Jactry Zeng : comdlg32: Set a size for toolbar buttons of the file access dialog.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 3a59a4d1cd5f03c9ed92f09023f816a18a0b1b70 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a59a4d1cd5f03c9ed92f09023f816… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu May 18 02:02:52 2023 -0500 comdlg32: Set a size for toolbar buttons of the file access dialog. The default size is too small for HiDPI, so set the same height as the look-in combo box to it. And since in owner draw mode, the height of combo box is calculated and updated when drawing items, this patch set button height for toolbar from FILEDLG95_LOOKIN_DrawItem() too. --- dlls/comdlg32/filedlg.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 415c0580461..acb9b4f35a4 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -180,7 +180,7 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd); /* Functions used by the Look In combo box */ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo); -static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct); +static LRESULT FILEDLG95_LOOKIN_DrawItem(HWND hwnd, LPDRAWITEMSTRUCT pDIStruct); static BOOL FILEDLG95_LOOKIN_OnCommand(HWND hwnd, WORD wNotifyCode); static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId); static int FILEDLG95_LOOKIN_SearchItem(HWND hwnd,WPARAM searchArg,int iSearchMethod); @@ -1392,7 +1392,7 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l switch(((LPDRAWITEMSTRUCT)lParam)->CtlID) { case IDC_LOOKIN: - FILEDLG95_LOOKIN_DrawItem((LPDRAWITEMSTRUCT) lParam); + FILEDLG95_LOOKIN_DrawItem(hwnd, (LPDRAWITEMSTRUCT)lParam); return TRUE; } } @@ -3368,13 +3368,12 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) * * WM_DRAWITEM message handler */ -static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) +static LRESULT FILEDLG95_LOOKIN_DrawItem(HWND hwnd, LPDRAWITEMSTRUCT pDIStruct) { COLORREF crWin = GetSysColor(COLOR_WINDOW); COLORREF crHighLight = GetSysColor(COLOR_HIGHLIGHT); COLORREF crText = GetSysColor(COLOR_WINDOWTEXT); - RECT rectText; - RECT rectIcon; + RECT rectText, rectIcon, lookin_rect; SHFILEINFOW sfi; HIMAGELIST ilItemImage; int iIndentation; @@ -3382,6 +3381,8 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) LPSFOLDER tmpFolder; UINT shgfi_flags = SHGFI_PIDL | SHGFI_OPENICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME; UINT icon_width, icon_height; + FileOpenDlgInfos *dialog; + int height; TRACE("\n"); @@ -3452,6 +3453,12 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) /* Draw the associated text */ TextOutW(pDIStruct->hDC,rectText.left,rectText.top,sfi.szDisplayName,lstrlenW(sfi.szDisplayName)); + + dialog = get_filedlg_infoptr(hwnd); + GetWindowRect(dialog->DlgInfos.hwndLookInCB, &lookin_rect); + height = lookin_rect.bottom - lookin_rect.top; + SendMessageW(dialog->DlgInfos.hwndTB, TB_SETBUTTONSIZE, 0, MAKELPARAM(height, height)); + return NOERROR; }

1 0

Zebediah Figura : qcap/tests: Remove duplicated tests for allocator identity.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: bc9c8684fdbde6c39eb7fbeb9954bcf97dec0ac4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc9c8684fdbde6c39eb7fbeb9954bc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 23 11:41:05 2023 -0500 qcap/tests: Remove duplicated tests for allocator identity. We test once above that the source does not use the existing allocator, but then implicitly release the allocator we are testing against (when the source assigns a new allocator to the sink). As a result, these ok() statements were testing that newly allocated allocators had a different address than the original allocator, which of course sometimes fails. Since we don't need to perform this test more than once anyway, just get rid of the offending ok() statements. --- dlls/qcap/tests/audiorecord.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index ed6c54648d0..e0a130fefb3 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -705,8 +705,6 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(testsink->sink.pAllocator && testsink->sink.pAllocator != allocator, - "Got unexpected allocator %p.\n", testsink->sink.pAllocator); hr = IMemAllocator_GetProperties(testsink->sink.pAllocator, &props); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(props.cBuffers == req_props.cBuffers, "Got %ld buffers.\n", props.cBuffers); @@ -728,8 +726,6 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(testsink->sink.pAllocator && testsink->sink.pAllocator != allocator, - "Got unexpected allocator %p.\n", testsink->sink.pAllocator); hr = IMemAllocator_GetProperties(testsink->sink.pAllocator, &props); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(props.cBuffers == 4, "Got %ld buffers.\n", props.cBuffers);

1 0

Ziqing Hui : winegstreamer: Implement GetInputStatus for WMV decoder DMO.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 2a83ef077f9b872832e22306e4008bd192fb40b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a83ef077f9b872832e22306e4008b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 23 12:21:09 2023 +0800 winegstreamer: Implement GetInputStatus for WMV decoder DMO. --- dlls/mf/tests/transform.c | 7 ------- dlls/winegstreamer/wmv_decoder.c | 12 ++++++++++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 70bd2195521..031eb50f319 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -5580,23 +5580,18 @@ static void test_wmv_decoder_media_object(void) /* Test GetInputStatus. */ hr = IMediaObject_GetInputStatus(media_object, 0xdeadbeef, NULL); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputStatus returned %#lx.\n", hr); status = 0xdeadbeef; hr = IMediaObject_GetInputStatus(media_object, 0xdeadbeef, &status); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputStatus returned %#lx.\n", hr); ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); hr = IMediaObject_GetInputStatus(media_object, 0, NULL); - todo_wine ok(hr == E_POINTER, "GetInputStatus returned %#lx.\n", hr); hr = IMediaObject_GetInputStatus(media_object, 0, &status); - todo_wine ok(hr == S_OK, "GetInputStatus returned %#lx.\n", hr); - todo_wine ok(status == DMO_INPUT_STATUSF_ACCEPT_DATA, "Unexpected status %#lx.\n", status); /* Test Discontinuity. */ @@ -5610,9 +5605,7 @@ static void test_wmv_decoder_media_object(void) todo_wine ok(hr == S_OK, "Discontinuity returned %#lx.\n", hr); hr = IMediaObject_GetInputStatus(media_object, 0, &status); - todo_wine ok(hr == S_OK, "GetInputStatus returned %#lx.\n", hr); - todo_wine ok(status == DMO_INPUT_STATUSF_ACCEPT_DATA, "Unexpected status %#lx.\n", status); /* Test Flush. */ diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index 82c69776bd6..75a7068a432 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -680,8 +680,16 @@ static HRESULT WINAPI media_object_FreeStreamingResources(IMediaObject *iface) static HRESULT WINAPI media_object_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %lu, flags %p stub!\n", iface, index, flags); - return E_NOTIMPL; + TRACE("iface %p, index %lu, flags %p.\n", iface, index, flags); + + if (index > 0) + return DMO_E_INVALIDSTREAMINDEX; + if (!flags) + return E_POINTER; + + *flags = DMO_INPUT_STATUSF_ACCEPT_DATA; + + return S_OK; } static HRESULT WINAPI media_object_ProcessInput(IMediaObject *iface, DWORD index,

1 0

Ziqing Hui : mf/tests: Test Flush for WMV decoder DMO.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: b7e4b5247b6ac8213f1bc02645a4e5eabee00011 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7e4b5247b6ac8213f1bc02645a4e5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 23 12:00:05 2023 +0800 mf/tests: Test Flush for WMV decoder DMO. --- dlls/mf/tests/transform.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index ddb82249ffc..70bd2195521 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -5615,6 +5615,26 @@ static void test_wmv_decoder_media_object(void) todo_wine ok(status == DMO_INPUT_STATUSF_ACCEPT_DATA, "Unexpected status %#lx.\n", status); + /* Test Flush. */ + hr = IMediaObject_ProcessInput(media_object, 0, &input_media_buffer->IMediaBuffer_iface, 0, 0, 0); + ok(hr == S_OK, "ProcessInput returned %#lx.\n", hr); + hr = IMediaObject_Flush(media_object); + todo_wine + ok(hr == S_OK, "Flush returned %#lx.\n", hr); + hr = IMediaObject_Flush(media_object); + todo_wine + ok(hr == S_OK, "Flush returned %#lx.\n", hr); + output_media_buffer->length = 0; + output_data_buffer.pBuffer = &output_media_buffer->IMediaBuffer_iface; + output_data_buffer.dwStatus = 0xdeadbeef; + output_data_buffer.rtTimestamp = 0xdeadbeef; + output_data_buffer.rtTimelength = 0xdeadbeef; + hr = IMediaObject_ProcessOutput(media_object, 0, 1, &output_data_buffer, &status); + todo_wine + ok(hr == S_FALSE, "ProcessOutput returned %#lx.\n", hr); + todo_wine + ok(output_media_buffer->length == 0, "Unexpected length %#lx.\n", output_media_buffer->length); + /* Test ProcessOutput with setting framerate. */ init_dmo_media_type_video(type, &MEDIASUBTYPE_WMV1, data_width, data_height); ((VIDEOINFOHEADER *)type->pbFormat)->AvgTimePerFrame = 100000;

1 0

Ziqing Hui : mf/tests: Test GetInputStatus for WMV decoder DMO.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: ebd3bbc6c891f84f4b9b01353d45f2953a551eaf URL: https://gitlab.winehq.org/wine/wine/-/commit/ebd3bbc6c891f84f4b9b01353d45f2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 23 11:56:14 2023 +0800 mf/tests: Test GetInputStatus for WMV decoder DMO. --- dlls/mf/tests/transform.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index a18aec15b07..f6995b4287e 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -5578,6 +5578,27 @@ static void test_wmv_decoder_media_object(void) diff = check_dmo_output_data_buffer(&output_data_buffer, &output_buffer_desc_nv12, L"nv12frame.bmp", 0, 0); ok(diff == 0, "Got %lu%% diff.\n", diff); + /* Test GetInputStatus. */ + hr = IMediaObject_GetInputStatus(media_object, 0xdeadbeef, NULL); + todo_wine + ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputStatus returned %#lx.\n", hr); + + status = 0xdeadbeef; + hr = IMediaObject_GetInputStatus(media_object, 0xdeadbeef, &status); + todo_wine + ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputStatus returned %#lx.\n", hr); + ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); + + hr = IMediaObject_GetInputStatus(media_object, 0, NULL); + todo_wine + ok(hr == E_POINTER, "GetInputStatus returned %#lx.\n", hr); + + hr = IMediaObject_GetInputStatus(media_object, 0, &status); + todo_wine + ok(hr == S_OK, "GetInputStatus returned %#lx.\n", hr); + todo_wine + ok(status == DMO_INPUT_STATUSF_ACCEPT_DATA, "Unexpected status %#lx.\n", status); + /* Test ProcessOutput with setting framerate. */ init_dmo_media_type_video(type, &MEDIASUBTYPE_WMV1, data_width, data_height); ((VIDEOINFOHEADER *)type->pbFormat)->AvgTimePerFrame = 100000;

1 0

Ziqing Hui : mf/tests: Test Discontinuity for WMV decoder DMO.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 4f22db5b9f6fc5f9b2234e466cd2ae1f4d193f1d URL: https://gitlab.winehq.org/wine/wine/-/commit/4f22db5b9f6fc5f9b2234e466cd2ae… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 23 12:15:34 2023 +0800 mf/tests: Test Discontinuity for WMV decoder DMO. The tests show that input status is not affected by it. --- dlls/mf/tests/transform.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index f6995b4287e..ddb82249ffc 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -5599,6 +5599,22 @@ static void test_wmv_decoder_media_object(void) todo_wine ok(status == DMO_INPUT_STATUSF_ACCEPT_DATA, "Unexpected status %#lx.\n", status); + /* Test Discontinuity. */ + hr = IMediaObject_Discontinuity(media_object, 0xdeadbeef); + todo_wine + ok(hr == DMO_E_INVALIDSTREAMINDEX, "Discontinuity returned %#lx.\n", hr); + hr = IMediaObject_Discontinuity(media_object, 0); + todo_wine + ok(hr == S_OK, "Discontinuity returned %#lx.\n", hr); + hr = IMediaObject_Discontinuity(media_object, 0); + todo_wine + ok(hr == S_OK, "Discontinuity returned %#lx.\n", hr); + hr = IMediaObject_GetInputStatus(media_object, 0, &status); + todo_wine + ok(hr == S_OK, "GetInputStatus returned %#lx.\n", hr); + todo_wine + ok(status == DMO_INPUT_STATUSF_ACCEPT_DATA, "Unexpected status %#lx.\n", status); + /* Test ProcessOutput with setting framerate. */ init_dmo_media_type_video(type, &MEDIASUBTYPE_WMV1, data_width, data_height); ((VIDEOINFOHEADER *)type->pbFormat)->AvgTimePerFrame = 100000;

1 0

Ziqing Hui : winegstreamer: Implement Discontinuity for WMV decoder DMO.
by Alexandre Julliard May 23, 2023

May 23, 2023

Module: wine Branch: master Commit: 51c5f44bd707f066709759bfe8e0be14d8d9c25f URL: https://gitlab.winehq.org/wine/wine/-/commit/51c5f44bd707f066709759bfe8e0be… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 23 12:22:51 2023 +0800 winegstreamer: Implement Discontinuity for WMV decoder DMO. --- dlls/mf/tests/transform.c | 3 --- dlls/winegstreamer/wmv_decoder.c | 8 ++++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 031eb50f319..b1ac3ffbb14 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -5596,13 +5596,10 @@ static void test_wmv_decoder_media_object(void) /* Test Discontinuity. */ hr = IMediaObject_Discontinuity(media_object, 0xdeadbeef); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "Discontinuity returned %#lx.\n", hr); hr = IMediaObject_Discontinuity(media_object, 0); - todo_wine ok(hr == S_OK, "Discontinuity returned %#lx.\n", hr); hr = IMediaObject_Discontinuity(media_object, 0); - todo_wine ok(hr == S_OK, "Discontinuity returned %#lx.\n", hr); hr = IMediaObject_GetInputStatus(media_object, 0, &status); ok(hr == S_OK, "GetInputStatus returned %#lx.\n", hr); diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index 75a7068a432..a22de7ccb7f 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -662,8 +662,12 @@ static HRESULT WINAPI media_object_Flush(IMediaObject *iface) static HRESULT WINAPI media_object_Discontinuity(IMediaObject *iface, DWORD index) { - FIXME("iface %p, index %lu stub!\n", iface, index); - return E_NOTIMPL; + TRACE("iface %p, index %lu.\n", iface, index); + + if (index > 0) + return DMO_E_INVALIDSTREAMINDEX; + + return S_OK; } static HRESULT WINAPI media_object_AllocateStreamingResources(IMediaObject *iface)

1 0