October 2019 - Wine-Commits

Francois Gouget : mshtml/tests: Fix the spelling of an ok() message.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: bbf0602cb4cda118166351482c7f9456ee70e0f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbf0602cb4cda11816635148… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 21 06:23:09 2019 +0200 mshtml/tests: Fix the spelling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/protocol.c | 6 +++--- dlls/mshtml/tests/style.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 80e356344d..8f37d09c55 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -640,7 +640,7 @@ static void do_test_about_protocol(IClassFactory *factory, DWORD bf) hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(cb == sizeof(blank_html), "cb=%d\n", cb); - ok(!memcmp(buf, blank_html, cb), "Readed wrong data\n"); + ok(!memcmp(buf, blank_html, cb), "Read wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); @@ -650,7 +650,7 @@ static void do_test_about_protocol(IClassFactory *factory, DWORD bf) hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(cb == sizeof(test_html), "cb=%d\n", cb); - ok(!memcmp(buf, test_html, cb), "Readed wrong data\n"); + ok(!memcmp(buf, test_html, cb), "Read wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); @@ -660,7 +660,7 @@ static void do_test_about_protocol(IClassFactory *factory, DWORD bf) hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(cb == sizeof(blank_html), "cb=%d\n", cb); - ok(!memcmp(buf, blank_html, cb), "Readed wrong data\n"); + ok(!memcmp(buf, blank_html, cb), "Read wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 52a3a5ccdf..37a1426270 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2719,7 +2719,7 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_borderTopColor(style, &v); ok(hres == S_OK, "get_borderTopColor: %08x\n", hres); - ok(!strcmp_wa(V_BSTR(&v), "red"), "expecte red = %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!strcmp_wa(V_BSTR(&v), "red"), "expected red = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_put_borderTopColor(style, vDefault);

1 0

Zebediah Figura : quartz/filtergraph: Correctly implement IMediaSeeking::GetStopPosition().
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: a0043c1c5c363533b0549dbeb803b58c686cbc5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0043c1c5c363533b0549dbe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 19 10:48:23 2019 -0500 quartz/filtergraph: Correctly implement IMediaSeeking::GetStopPosition(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 43 +++++++++++++++++++++++++++++------------ dlls/quartz/tests/filtergraph.c | 14 +++++++------- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7e72c76eac..21ba86ff5a 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2466,24 +2466,43 @@ static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *p return hr; } -static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *pStop) +static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - HRESULT hr = S_OK; + IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface); + HRESULT hr = E_NOTIMPL, filter_hr; + IMediaSeeking *seeking; + struct filter *filter; + LONGLONG filter_stop; - TRACE("(%p/%p)->(%p)\n", This, iface, pStop); + TRACE("graph %p, stop %p.\n", graph, stop); - if (!pStop) + if (!stop) return E_POINTER; - EnterCriticalSection(&This->cs); - if (This->stop_position < 0) - /* Stop position not set, use duration instead */ - hr = IMediaSeeking_GetDuration(iface, pStop); - else - *pStop = This->stop_position; - LeaveCriticalSection(&This->cs); + *stop = 0; + + EnterCriticalSection(&graph->cs); + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) + { + if (FAILED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void **)&seeking))) + continue; + + filter_hr = IMediaSeeking_GetStopPosition(seeking, &filter_stop); + IMediaSeeking_Release(seeking); + if (SUCCEEDED(filter_hr)) + { + hr = S_OK; + *stop = max(*stop, filter_stop); + } + else if (filter_hr != E_NOTIMPL) + { + LeaveCriticalSection(&graph->cs); + return filter_hr; + } + } + + LeaveCriticalSection(&graph->cs); return hr; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 74a4b43de8..5dc32eb36a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3766,31 +3766,31 @@ static void test_graph_seeking(void) filter2.seek_stop = 0x65432; hr = IMediaSeeking_GetStopPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); + ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); filter2.seek_stop = 0x54321; filter1.seek_stop = 0x65432; hr = IMediaSeeking_GetStopPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); + ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); filter1.seek_hr = filter2.seek_hr = 0xbeef; hr = IMediaSeeking_GetStopPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); + ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); filter1.seek_hr = E_NOTIMPL; hr = IMediaSeeking_GetStopPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(time == 0x54321, "Got time %s.\n", wine_dbgstr_longlong(time)); + ok(time == 0x54321, "Got time %s.\n", wine_dbgstr_longlong(time)); filter1.seek_hr = 0xdeadbeef; hr = IMediaSeeking_GetStopPosition(seeking, &time); - todo_wine ok(hr == 0xdeadbeef, "Got hr %#x.\n", hr); + ok(hr == 0xdeadbeef, "Got hr %#x.\n", hr); filter1.seek_hr = filter2.seek_hr = E_NOTIMPL; hr = IMediaSeeking_GetStopPosition(seeking, &time); - todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); filter1.seek_hr = filter2.seek_hr = S_OK; hr = IMediaSeeking_GetCurrentPosition(seeking, &time); @@ -3801,7 +3801,7 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current)); - todo_wine ok(stop == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(stop)); + ok(stop == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(stop)); current = 0x123; stop = 0x321;

1 0

Nikolay Sivov : comdlg32/tests: Use win_skip() instead when appropriate.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 3dc3d4998e00dfca6a6af0bbacbeba65872bc817 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dc3d4998e00dfca6a6af0bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 20 23:44:05 2019 +0300 comdlg32/tests: Use win_skip() instead when appropriate. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/itemdlg.c | 2 +- dlls/comdlg32/tests/printdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 787c4e48e8..6ee0d5fc3d 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -441,7 +441,7 @@ static BOOL test_instantiation(void) &IID_IFileSaveDialog, (void**)&pfsd); if(FAILED(hr)) { - skip("Could not instantiate the FileSaveDialog.\n"); + win_skip("Could not instantiate the FileSaveDialog.\n"); return FALSE; } ok(hr == S_OK, "got 0x%08x.\n", hr); diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 4c6a47355c..0376872e67 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -375,7 +375,7 @@ static void test_PrintDlgExW(void) /* PrintDlgEx not present before w2k */ if (!pPrintDlgExW) { - skip("PrintDlgExW not available\n"); + win_skip("PrintDlgExW not available\n"); return; }

1 0

Zebediah Figura : quartz/filtergraph: Remove the no longer used "stop_position" field from IFilterGraphImpl.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: c1f2e8476db8a2afc2d15d0da28ef1a47ec79bd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1f2e8476db8a2afc2d15d0d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 19 10:48:24 2019 -0500 quartz/filtergraph: Remove the no longer used "stop_position" field from IFilterGraphImpl. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 21ba86ff5a..15517fee57 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -204,7 +204,6 @@ typedef struct _IFilterGraphImpl { GUID timeformatseek; REFERENCE_TIME start_time; REFERENCE_TIME pause_time; - LONGLONG stop_position; LONG recursioncount; IUnknown *pSite; LONG version; @@ -2583,9 +2582,8 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * (dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) FIXME("Adjust method %x not handled yet!\n", dwCurrentFlags & 0x7); - if ((dwStopFlags & 0x7) == AM_SEEKING_AbsolutePositioning) - This->stop_position = *pStop; - else if ((dwStopFlags & 0x7) != AM_SEEKING_NoPositioning) + if ((dwStopFlags & 0x7) != AM_SEEKING_NoPositioning + && (dwStopFlags & 0x7) != AM_SEEKING_AbsolutePositioning) FIXME("Stop position not handled yet!\n"); if (state == State_Running && !(dwCurrentFlags & AM_SEEKING_NoFlush)) @@ -5702,7 +5700,6 @@ static HRESULT filter_graph_common_create(IUnknown *outer, void **out, BOOL thre fimpl->nItfCacheEntries = 0; memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); fimpl->start_time = fimpl->pause_time = 0; - fimpl->stop_position = -1; fimpl->punkFilterMapper2 = NULL; fimpl->recursioncount = 0; fimpl->version = 0;

1 0

Alistair Leslie-Hughes : wmvcore: IWMReader GetOutputCount return zero outputs.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 7891e1d7141ba53124278ab18433a3727c2194bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7891e1d7141ba53124278ab1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Oct 19 09:50:01 2019 +0000 wmvcore: IWMReader GetOutputCount return zero outputs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/reader.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c index 6041c567e9..6945f10a65 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/wmvcore/reader.c @@ -176,7 +176,12 @@ static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs) { WMReader *This = impl_from_IWMReader(iface); FIXME("(%p)->(%p)\n", This, outputs); - return E_NOTIMPL; + + if(!outputs) + return E_INVALIDARG; + + *outputs = 0; + return S_OK; } static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps **output)

1 0

Nikolay Sivov : t2embed/tests: Fix some test failures on Win10.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 5ce743d53bcc12493e28497ff7c12d41023d67f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ce743d53bcc12493e28497f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 20 16:35:43 2019 +0300 t2embed/tests: Fix some test failures on Win10. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/tests/t2embed.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index 9f278a57d1..4ffc3daed1 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -43,19 +43,22 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm UINT fsType = otm.otmfsType & 0xf; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NONE, "got %d\n", ret); - - if (fsType == LICENSE_INSTALLABLE) - expected = EMBED_INSTALLABLE; - else if (fsType & LICENSE_EDITABLE) - expected = EMBED_EDITABLE; - else if (fsType & LICENSE_PREVIEWPRINT) - expected = EMBED_PREVIEWPRINT; - else if (fsType & LICENSE_NOEMBEDDING) - expected = EMBED_NOEMBEDDING; - - ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, - expected, otm.otmfsType); + ok(ret == E_NONE || ret == E_NOTATRUETYPEFONT, "Unexpected return value %#x.\n", ret); + + if (ret == E_NONE) + { + if (fsType == LICENSE_INSTALLABLE) + expected = EMBED_INSTALLABLE; + else if (fsType & LICENSE_EDITABLE) + expected = EMBED_EDITABLE; + else if (fsType & LICENSE_PREVIEWPRINT) + expected = EMBED_PREVIEWPRINT; + else if (fsType & LICENSE_NOEMBEDDING) + expected = EMBED_NOEMBEDDING; + + ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, + expected, otm.otmfsType); + } } else { @@ -170,14 +173,6 @@ static void test_TTIsEmbeddingEnabled(void) hdc = CreateCompatibleDC(0); - ret = TTIsEmbeddingEnabled(hdc, NULL); - ok(ret == E_ERRORACCESSINGFACENAME, "got %#x\n", ret); - - status = 123; - ret = TTIsEmbeddingEnabled(hdc, &status); - ok(ret == E_ERRORACCESSINGFACENAME, "got %#x\n", ret); - ok(status == 123, "got %u\n", status); - memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; logfont.lfWeight = FW_NORMAL; @@ -187,6 +182,9 @@ static void test_TTIsEmbeddingEnabled(void) old_font = SelectObject(hdc, hfont); + ret = TTIsEmbeddingEnabled(hdc, NULL); + ok(ret == E_PBENABLEDINVALID, "Unexpected return value %#x.\n", ret); + status = 123; ret = TTIsEmbeddingEnabled(hdc, &status); ok(ret == E_NONE, "got %#x\n", ret);

1 0

Fabian Maurer : ws2_32: Handle more IGMP socket options.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: bf24c316f443185c16513118e30e160b20223134 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf24c316f443185c16513118… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Oct 18 19:32:53 2019 +0200 ws2_32: Handle more IGMP socket options. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47956 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index aa0a164ff9..5c3d1a0dc0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -692,6 +692,10 @@ static const int ws_ip_map[][2] = MAP_OPTION( IP_MULTICAST_LOOP ), MAP_OPTION( IP_ADD_MEMBERSHIP ), MAP_OPTION( IP_DROP_MEMBERSHIP ), + MAP_OPTION( IP_ADD_SOURCE_MEMBERSHIP ), + MAP_OPTION( IP_DROP_SOURCE_MEMBERSHIP ), + MAP_OPTION( IP_BLOCK_SOURCE ), + MAP_OPTION( IP_UNBLOCK_SOURCE ), MAP_OPTION( IP_OPTIONS ), #ifdef IP_HDRINCL MAP_OPTION( IP_HDRINCL ), @@ -5801,6 +5805,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, int woptval; struct linger linger; struct timeval tval; + struct ip_mreq_source mreq_source; TRACE("(socket %04lx, %s, optval %s, optlen %d)\n", s, debugstr_sockopt(level, optname), debugstr_optval(optval, optlen), @@ -6011,6 +6016,22 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPPROTO_IP: switch(optname) { + case WS_IP_ADD_SOURCE_MEMBERSHIP: + case WS_IP_DROP_SOURCE_MEMBERSHIP: + case WS_IP_BLOCK_SOURCE: + case WS_IP_UNBLOCK_SOURCE: + { + WS_IP_MREQ_SOURCE* val = (void*)optval; + mreq_source.imr_interface.s_addr = val->imr_interface.S_un.S_addr; + mreq_source.imr_multiaddr.s_addr = val->imr_multiaddr.S_un.S_addr; + mreq_source.imr_sourceaddr.s_addr = val->imr_sourceaddr.S_un.S_addr; + + optval = (char*)&mreq_source; + optlen = sizeof(mreq_source); + + convert_sockopt(&level, &optname); + break; + } case WS_IP_ADD_MEMBERSHIP: case WS_IP_DROP_MEMBERSHIP: #ifdef IP_HDRINCL

1 0

Nikolay Sivov : dwrite/tests: Relax tests that fail on some Win10 versions.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: f83d141454f437d5f6a46cdb7a237fb245c1e6fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f83d141454f437d5f6a46cdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 20 15:21:55 2019 +0300 dwrite/tests: Relax tests that fail on some Win10 versions. GetString() return value contradicts other methods,and partially buffer writes don't happen elsewhere. It's not worth to replicate this. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 32156fdedd..c2f9dc0b1f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1738,7 +1738,7 @@ static void test_GetFamilyNames(void) ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); hr = IDWriteLocalizedStrings_GetString(names, 10, NULL, 0); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); if (0) hr = IDWriteLocalizedStrings_GetString(names, 0, NULL, 100); @@ -1751,12 +1751,12 @@ static void test_GetFamilyNames(void) buffer[0] = 1; hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len-1); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); - ok(buffer[0] == 0, "got %x\n", buffer[0]); + ok(buffer[0] == 0 || broken(buffer[0] == 'T'), "Unexpected buffer contents, %#x.\n", buffer[0]); buffer[0] = 1; hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); - ok(buffer[0] == 0, "got %x\n", buffer[0]); + ok(buffer[0] == 0 || broken(buffer[0] == 'T'), "Unexpected buffer contents, %#x.\n", buffer[0]); buffer[0] = 0; hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len+1);

1 0

Alistair Leslie-Hughes : wmvcore: IWMProfile3 GetStreamCount return zero streams.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 877f8aa32ce29b7a8c41f16815c4639408698078 URL: https://source.winehq.org/git/wine.git/?a=commit;h=877f8aa32ce29b7a8c41f168… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Oct 19 09:50:03 2019 +0000 wmvcore: IWMProfile3 GetStreamCount return zero streams. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/reader.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c index 6945f10a65..68e35cfd48 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/wmvcore/reader.c @@ -1756,7 +1756,12 @@ static HRESULT WINAPI profile3_GetStreamCount(IWMProfile3 *iface, DWORD *count) { WMReader *This = impl_from_IWMProfile3(iface); FIXME("%p, %p\n", This, count); - return E_NOTIMPL; + + if (!count) + return E_INVALIDARG; + + *count = 0; + return S_OK; } static HRESULT WINAPI profile3_GetStream(IWMProfile3 *iface, DWORD index, IWMStreamConfig **config)

1 0

Zebediah Figura : quartz/tests: Add more tests for stream start time.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 445d2d9617b3fa298f54c12ee06583ab715be04e URL: https://source.winehq.org/git/wine.git/?a=commit;h=445d2d9617b3fa298f54c12e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 19 10:48:21 2019 -0500 quartz/tests: Add more tests for stream start time. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 842f3168cb..3d6571c789 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3114,6 +3114,16 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Paused); + hr = IMediaFilter_Run(filter, 0xdeadf00d); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Running); + ok(source.start_time == 0xdeadf00d, "Got time %s.\n", wine_dbgstr_longlong(source.start_time)); + ok(sink.start_time == 0xdeadf00d, "Got time %s.\n", wine_dbgstr_longlong(sink.start_time)); + + hr = IMediaFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + hr = IMediaFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped); @@ -3130,6 +3140,35 @@ todo_wine ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + Sleep(600); + hr = IMediaFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + + hr = IMediaFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Running); + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", + wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + + hr = IMediaFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + Sleep(600); + + start_time += 600 * 10000; + hr = IMediaFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Running); + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", + wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + hr = IMediaFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped);

1 0