[PATCH] mshtml: Always report available data before stop_binding.
Even if custom protocol handlers call ReportResult in LockRequest. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46213 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/urlmon/binding.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index a74970033b3..708b81194c7 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1177,6 +1177,14 @@ static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *i TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + /* Make sure we don't call stop_binding before available data has been reported, + as some custom protocol handlers call ReportResult within LockRequest */ + if (!(This->state & BINDING_LOCKED) && hrResult == S_OK) + { + This->download_state = END_DOWNLOAD; + return S_OK; + } + stop_binding(This, hrResult, szResult); IInternetProtocolEx_Terminate(&This->protocol->IInternetProtocolEx_iface, 0); -- 2.33.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=100848 Your paranoid android. === debiant2 (32 bit report) === urlmon: url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3537: Test failed: mon should be destroyed here url.c:3774: Test failed: CreateFile failed url.c:3231: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:555: Test failed: wait timed out url.c:3161: Test failed: wait timed out url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:1846: Test failed: binding failed: 80040154, expected 00000000 url.c:3454: Test failed: IMoniker_BindToObject failed: 80040154 url.c:3537: Test failed: mon should be destroyed here url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate === debiant2 (32 bit Chinese:China report) === urlmon: url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3537: Test failed: mon should be destroyed here url.c:3774: Test failed: CreateFile failed url.c:3231: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:555: Test failed: wait timed out url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:1846: Test failed: binding failed: 80040154, expected 00000000 url.c:3454: Test failed: IMoniker_BindToObject failed: 80040154 url.c:3537: Test failed: mon should be destroyed here url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate === debiant2 (32 bit WoW report) === urlmon: url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3537: Test failed: mon should be destroyed here url.c:3774: Test failed: CreateFile failed url.c:3231: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:555: Test failed: wait timed out url.c:3161: Test failed: wait timed out url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:1846: Test failed: binding failed: 80040154, expected 00000000 url.c:3454: Test failed: IMoniker_BindToObject failed: 80040154 url.c:3537: Test failed: mon should be destroyed here url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate === debiant2 (64 bit WoW report) === urlmon: protocol.c:1178: Test failed: unexpected call ReportResult protocol.c:1186: Test failed: hrResult = 00000000, expected: 80004004 protocol.c:3311: Test failed: Read failed: 00000001 url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3537: Test failed: mon should be destroyed here url.c:3774: Test failed: CreateFile failed url.c:3231: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:555: Test failed: wait timed out url.c:3161: Test failed: wait timed out url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:1846: Test failed: binding failed: 80040154, expected 00000000 url.c:3454: Test failed: IMoniker_BindToObject failed: 80040154 url.c:3537: Test failed: mon should be destroyed here url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate
On 10/27/21 3:51 PM, Marvin wrote:
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=100848
Your paranoid android.
=== debiant2 (32 bit report) ===
urlmon: url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3537: Test failed: mon should be destroyed here url.c:3774: Test failed: CreateFile failed url.c:3231: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:555: Test failed: wait timed out url.c:3161: Test failed: wait timed out url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:1846: Test failed: binding failed: 80040154, expected 00000000 url.c:3454: Test failed: IMoniker_BindToObject failed: 80040154 url.c:3537: Test failed: mon should be destroyed here url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate
=== debiant2 (32 bit Chinese:China report) ===
urlmon: url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3537: Test failed: mon should be destroyed here url.c:3774: Test failed: CreateFile failed url.c:3231: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:555: Test failed: wait timed out url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:1846: Test failed: binding failed: 80040154, expected 00000000 url.c:3454: Test failed: IMoniker_BindToObject failed: 80040154 url.c:3537: Test failed: mon should be destroyed here url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate
=== debiant2 (32 bit WoW report) ===
urlmon: url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3537: Test failed: mon should be destroyed here url.c:3774: Test failed: CreateFile failed url.c:3231: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:555: Test failed: wait timed out url.c:3161: Test failed: wait timed out url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:1846: Test failed: binding failed: 80040154, expected 00000000 url.c:3454: Test failed: IMoniker_BindToObject failed: 80040154 url.c:3537: Test failed: mon should be destroyed here url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate
=== debiant2 (64 bit WoW report) ===
urlmon: protocol.c:1178: Test failed: unexpected call ReportResult protocol.c:1186: Test failed: hrResult = 00000000, expected: 80004004 protocol.c:3311: Test failed: Read failed: 00000001 url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3537: Test failed: mon should be destroyed here url.c:3774: Test failed: CreateFile failed url.c:3231: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3482: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:555: Test failed: wait timed out url.c:3161: Test failed: wait timed out url.c:3231: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:3231: Test failed: expected Terminate url.c:1846: Test failed: binding failed: 80040154, expected 00000000 url.c:3454: Test failed: IMoniker_BindToObject failed: 80040154 url.c:3537: Test failed: mon should be destroyed here url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate url.c:909: Test failed: expected Terminate
Eh I guess it's not right then. Note that both this and 218240 are needed to resolve https://bugs.winehq.org/show_bug.cgi?id=46213 -- Rémi Bernon <rbernon(a)codeweavers.com>
On 10/27/21 4:09 PM, Rémi Bernon wrote:
Eh I guess it's not right then. Note that both this and 218240 are needed to resolve https://bugs.winehq.org/show_bug.cgi?id=46213
Yeah, a test in tests/protocol.c emulating application's behaviour would be interesting to see how it's supposed to work. Thanks, Jacek
participants (3)
-
Jacek Caban -
Marvin -
Rémi Bernon