wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Louis Lenders : include: Set threading model on UIAnimation* interfaces.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 30e6e49ad48539d2d0f9bfe1660578ea0c07e98c URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e6e49ad48539d2d0f9bfe1… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Oct 21 00:37:22 2019 +0000 include: Set threading model on UIAnimation* interfaces. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uianimation.idl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/uianimation.idl b/include/uianimation.idl index 631af11899..70c710cdf8 100644 --- a/include/uianimation.idl +++ b/include/uianimation.idl @@ -585,7 +585,8 @@ interface IUIAnimationTransitionLibrary : IUnknown library UIAnimation { [ - uuid(bfcd4a0c-06b6-4384-b768-0daa792c380e) + uuid(bfcd4a0c-06b6-4384-b768-0daa792c380e), + threading(both) ] coclass UIAnimationTimer { @@ -593,7 +594,8 @@ library UIAnimation } [ - uuid(4c1fc63a-695c-47e8-a339-1a194be3d0b8) + uuid(4c1fc63a-695c-47e8-a339-1a194be3d0b8), + threading(both) ] coclass UIAnimationManager { @@ -601,7 +603,8 @@ library UIAnimation } [ - uuid(8a9b1cdd-fcd7-419c-8b44-42fd17db1887) + uuid(8a9b1cdd-fcd7-419c-8b44-42fd17db1887), + threading(both) ] coclass UIAnimationTransitionFactory { @@ -609,7 +612,8 @@ library UIAnimation } [ - uuid(1d6322ad-aa85-4ef5-a828-86d71067d145) + uuid(1d6322ad-aa85-4ef5-a828-86d71067d145), + threading(both) ] coclass UIAnimationTransitionLibrary {

1 0

Alistair Leslie-Hughes : oledb32: Support milliseconds when converting BSTR -> DBTIMESTAMP.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: f437d15100997c37d1dfa1fae66744b44f081d1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f437d15100997c37d1dfa1fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 21 00:23:54 2019 +0000 oledb32: Support milliseconds when converting BSTR -> DBTIMESTAMP. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 12 ++++++++++++ dlls/oledb32/tests/convert.c | 25 +++++++++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index a5bbdbc245..2fc65c7403 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -566,6 +566,18 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, d->second = st.wSecond; d->fraction = st.wMilliseconds * 1000000; } + else + { + if(swscanf( s, L"%d-%d-%d %d:%d:%d.%d", &d->year, &d->month, &d->day, &d->hour, &d->minute, + &d->second, &d->fraction) != 7) + { + hr = DISP_E_TYPEMISMATCH; + *dst_status = DBSTATUS_E_CANTCONVERTVALUE; + *dst_len = get_length(dst_type); + } + else + hr = S_OK; + } VariantClear(&var); } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 51fd2f7fa3..28401e68c9 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3953,10 +3953,27 @@ static void test_converttotimestamp(void) bstr = SysAllocString(strFullW); dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); - todo_wine ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + SysFreeString(bstr); + + bstr = SysAllocString(L"2013-05-14 02:04:12.017000000"); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + SysFreeString(bstr); + + bstr = SysAllocString(L"2013/05/14 02:04:12.01700"); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DISP_E_TYPEMISMATCH, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_CANTCONVERTVALUE, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); SysFreeString(bstr); V_VT(&var) = VT_NULL;

1 0

Fabian Maurer : ws2_32: Handle more IGMP socket options.
by Alexandre Julliard 21 Oct '19

21 Oct '19

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

Francois Gouget : mshtml/tests: Fix the name of an unused function parameter.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: f09f5f80f7397b9f1465a6d348cf4ca005c6054f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f09f5f80f7397b9f1465a6d3… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 21 06:23:24 2019 +0200 mshtml/tests: Fix the name of an unused function parameter. 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/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d13381aa0a..4b55fdd0c8 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1672,7 +1672,7 @@ static ULONG WINAPI OleContainer_Release(IOleContainer *iface) } static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer *iface, IBindCtx *pbc, - LPOLESTR pszDiaplayName, ULONG *pchEaten, IMoniker **ppmkOut) + LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { ok(0, "unexpected call\n"); return E_NOTIMPL;

1 0

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

21 Oct '19

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

Francois Gouget : mshtml: Fix the spelling of some variable and field names.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: fd23136ef9e89b0d7f242e3e05680bf28d408449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd23136ef9e89b0d7f242e3e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 21 06:22:36 2019 +0200 mshtml: Fix the spelling of some variable and field names. 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/binding.h | 2 +- dlls/mshtml/navigate.c | 10 +++++----- dlls/mshtml/script.c | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index accf468a25..9926fa0dc3 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -80,7 +80,7 @@ struct BSCallback { LONG ref; request_data_t request_data; - ULONG readed; + ULONG read; DWORD bindf; DWORD bindinfo_options; BOOL bindinfo_ready; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 193b4fe37c..744db468d8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -690,7 +690,7 @@ HRESULT read_stream(BSCallback *This, IStream *stream, void *buf, DWORD size, DW hres = IStream_Read(stream, buf, size, &read_size); - if(!This->readed && This->bom == BOM_NONE) { + if(!This->read && This->bom == BOM_NONE) { if(read_size >= 2 && data[0] == 0xff && data[1] == 0xfe) { This->bom = BOM_UTF16; skip = 2; @@ -705,7 +705,7 @@ HRESULT read_stream(BSCallback *This, IStream *stream, void *buf, DWORD size, DW } } - This->readed += read_size; + This->read += read_size; *ret_size = read_size; return hres; } @@ -1092,7 +1092,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) } do { - BOOL first_read = !This->bsc.readed; + BOOL first_read = !This->bsc.read; hres = read_stream(&This->bsc, stream, This->nsstream->buf+This->nsstream->buf_size, sizeof(This->nsstream->buf)-This->nsstream->buf_size, &read); @@ -1135,7 +1135,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) nsres = nsIStreamListener_OnDataAvailable(This->nslistener, (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, This->nscontext, - &This->nsstream->nsIInputStream_iface, This->bsc.readed-This->nsstream->buf_size, + &This->nsstream->nsIInputStream_iface, This->bsc.read-This->nsstream->buf_size, This->nsstream->buf_size); if(NS_FAILED(nsres)) ERR("OnDataAvailable failed: %08x\n", nsres); @@ -1365,7 +1365,7 @@ static HRESULT async_stop_request(nsChannelBSC *This) { stop_request_task_t *task; - if(!This->bsc.readed) { + if(!This->bsc.read) { TRACE("No data read, calling OnStartRequest\n"); on_start_nsrequest(This); } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index e337b1c900..6f06d3b091 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -824,7 +824,7 @@ static HRESULT get_binding_text(ScriptBSC *bsc, WCHAR **ret) UINT cp = CP_UTF8; WCHAR *text; - if(!bsc->bsc.readed) { + if(!bsc->bsc.read) { text = heap_alloc(sizeof(WCHAR)); if(!text) return E_OUTOFMEMORY; @@ -835,17 +835,17 @@ static HRESULT get_binding_text(ScriptBSC *bsc, WCHAR **ret) switch(bsc->bsc.bom) { case BOM_UTF16: - if(bsc->bsc.readed % sizeof(WCHAR)) { + if(bsc->bsc.read % sizeof(WCHAR)) { FIXME("The buffer is not a valid utf16 string\n"); return E_FAIL; } - text = heap_alloc(bsc->bsc.readed+sizeof(WCHAR)); + text = heap_alloc(bsc->bsc.read+sizeof(WCHAR)); if(!text) return E_OUTOFMEMORY; - memcpy(text, bsc->buf, bsc->bsc.readed); - text[bsc->bsc.readed/sizeof(WCHAR)] = 0; + memcpy(text, bsc->buf, bsc->bsc.read); + text[bsc->bsc.read/sizeof(WCHAR)] = 0; break; default: @@ -855,12 +855,12 @@ static HRESULT get_binding_text(ScriptBSC *bsc, WCHAR **ret) case BOM_UTF8: { DWORD len; - len = MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, NULL, 0); + len = MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.read, NULL, 0); text = heap_alloc((len+1)*sizeof(WCHAR)); if(!text) return E_OUTOFMEMORY; - MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, text, len); + MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.read, text, len); text[len] = 0; } } @@ -988,7 +988,7 @@ static HRESULT ScriptBSC_stop_binding(BSCallback *bsc, HRESULT result) static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream) { ScriptBSC *This = impl_from_BSCallback(bsc); - DWORD readed; + DWORD read; HRESULT hres; if(!This->buf) { @@ -999,7 +999,7 @@ static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream) } do { - if(This->bsc.readed >= This->size) { + if(This->bsc.read >= This->size) { void *new_buf; new_buf = heap_realloc(This->buf, This->size << 1); if(!new_buf) @@ -1008,7 +1008,7 @@ static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream) This->buf = new_buf; } - hres = read_stream(&This->bsc, stream, This->buf+This->bsc.readed, This->size-This->bsc.readed, &readed); + hres = read_stream(&This->bsc, stream, This->buf+This->bsc.read, This->size-This->bsc.read, &read); }while(hres == S_OK); return S_OK;

1 0

Francois Gouget : comctl32/tests: Avoid an unneeded lstrlenW() call.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 77e8de518e19048827f93165da10d8eb1342fdf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77e8de518e19048827f93165… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 21 06:25:47 2019 +0200 comctl32/tests: Avoid an unneeded lstrlenW() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index dd05a98d2d..14071b2ecd 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1166,7 +1166,7 @@ static void test_note(void) size = ARRAY_SIZE(buffer_w); ret = SendMessageA(hwnd, BCM_GETNOTE, (WPARAM)&size, (LPARAM)buffer_w); ok(ret, "Expect BCM_GETNOTE return true\n"); - ok(lstrlenW(buffer_w) == 0, "Expect note length 0\n"); + ok(!*buffer_w, "Expect note length 0\n"); ok(size == ARRAY_SIZE(buffer_w), "Got: %d\n", size); error = GetLastError(); ok(error == NO_ERROR, "Expect last error: 0x%08x, got: 0x%08x\n", NO_ERROR, error);

1 0

Zebediah Figura : quartz/filtergraph: Correctly handle AM_SEEKING_ReturnTime in IMediaSeeking::SetPositions().
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 0705b0f1826dfddabbb00ba61f35f9589306a4b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0705b0f1826dfddabbb00ba6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 19 10:48:25 2019 -0500 quartz/filtergraph: Correctly handle AM_SEEKING_ReturnTime in IMediaSeeking::SetPositions(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 12 +++++++++++- dlls/quartz/tests/filtergraph.c | 18 +++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 15517fee57..96c9ae31f0 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2560,8 +2560,18 @@ struct pos_args { static HRESULT WINAPI found_setposition(IFilterGraphImpl *This, IMediaSeeking *seek, DWORD_PTR pargs) { struct pos_args *args = (void*)pargs; + LONGLONG current = args->current ? *args->current : 0, stop = args->stop ? *args->stop : 0; + HRESULT hr; - return IMediaSeeking_SetPositions(seek, args->current, args->curflags, args->stop, args->stopflags); + if (SUCCEEDED(hr = IMediaSeeking_SetPositions(seek, &current, + args->curflags, &stop, args->stopflags))) + { + if (args->current && (args->curflags & AM_SEEKING_ReturnTime)) + *args->current = current; + if (args->stop && (args->stopflags & AM_SEEKING_ReturnTime)) + *args->stop = stop; + } + return hr; } static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *pCurrent, diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 5dc32eb36a..a768b737fb 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3808,10 +3808,10 @@ static void test_graph_seeking(void) hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning, &stop, AM_SEEKING_AbsolutePositioning); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(current)); - todo_wine ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop)); - todo_wine ok(filter1.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_current)); - todo_wine ok(filter1.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_stop)); + ok(current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(current)); + ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop)); + ok(filter1.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_current)); + ok(filter1.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_stop)); ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current)); ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop)); @@ -3844,7 +3844,7 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); todo_wine ok(current == 12340000, "Got time %s.\n", wine_dbgstr_longlong(current)); - todo_wine ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop)); + ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop)); current = 0x123; stop = 0x321; @@ -3852,9 +3852,9 @@ static void test_graph_seeking(void) &stop, AM_SEEKING_AbsolutePositioning); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(current == 12340000, "Got time %s.\n", wine_dbgstr_longlong(current)); - todo_wine ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop)); + ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop)); ok(filter1.seek_current == 12340000, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_current)); - todo_wine ok(filter1.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_stop)); + ok(filter1.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_stop)); ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current)); ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop)); @@ -3863,9 +3863,9 @@ static void test_graph_seeking(void) hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning, &stop, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(current)); + ok(current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(current)); ok(stop == 43210000, "Got time %s.\n", wine_dbgstr_longlong(stop)); - todo_wine ok(filter1.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_current)); + ok(filter1.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_current)); ok(filter1.seek_stop == 43210000, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_stop)); ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current)); ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop));

1 0

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

21 Oct '19

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

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

21 Oct '19

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

← Newer
1
...
26
27
28
29
30
31
32
...
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