Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/urlmon/tests/url.c | 46 +++++++---------------------------------- 1 file changed, 7 insertions(+), 39 deletions(-)
diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 7c8d1abdb76..3a6ad1390fa 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -43,7 +43,6 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); -static const IID IID_undocumentedIE11 = {0xd5ae15f6,0x2032,0x488e,{0x8f,0x96,0xf9,0x24,0x06,0xd8,0xd8,0xb4}}; extern CLSID CLSID_AboutProtocol;
#define DEFINE_EXPECT(func) \ @@ -366,7 +365,7 @@ static IInternetPriority InternetPriority = { &InternetPriorityVtbl };
static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { - static const IID IID_undocumentedIE10 = {0x7daf9908,0x8415,0x4005,{0x95,0xae,0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; + if (winetest_debug > 1) trace("IInternetProtocol::QueryInterface(%s)\n", debugstr_guid(riid));
*ppv = NULL;
@@ -383,15 +382,6 @@ static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID r return S_OK; }
- if(IsEqualGUID(&IID_IInternetProtocolEx, riid)) - return E_NOINTERFACE; /* TODO */ - - if(IsEqualGUID(&IID_undocumentedIE10, riid)) { - trace("QI(%s)\n", wine_dbgstr_guid(riid)); - return E_NOINTERFACE; /* TODO */ - } - - ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; }
@@ -1403,6 +1393,10 @@ static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { + if (winetest_debug > 1) + trace("IServiceProvider::QueryService(service %s, iid %s)\n", + debugstr_guid(guidService), debugstr_guid(riid)); + if(IsEqualGUID(&IID_IAuthenticate, guidService)) { CHECK_EXPECT(QueryService_IAuthenticate); return E_NOTIMPL; @@ -1430,19 +1424,7 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, return S_OK; }
- if(IsEqualGUID(&IID_IGetBindHandle, guidService)) { - trace("QueryService(IID_IGetBindHandle)\n"); - *ppv = NULL; - return E_NOINTERFACE; - } - - if(IsEqualGUID(&IID_undocumentedIE11, guidService)) { - trace("QueryService(IID_undocumentedIE11)\n"); - *ppv = NULL; - return E_NOINTERFACE; - } - - ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); + *ppv = NULL; return E_NOINTERFACE; }
@@ -1505,7 +1487,7 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress)
static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REFIID riid, void **ppv) { - static const IID IID_undocumentedIE10 = {0xf286fa56,0xc1fd,0x4270,{0x8e,0x67,0xb3,0xeb,0x79,0x0a,0x81,0xe8}}; + if (winetest_debug > 1) trace("IBindStatusCallback::QueryInterface(%s)\n", debugstr_guid(riid));
ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId());
@@ -1554,20 +1536,6 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REF }else if(IsEqualGUID(&IID_IHttpSecurity, riid)) { CHECK_EXPECT2(QueryInterface_IHttpSecurity); return E_NOINTERFACE; - }else if(IsEqualGUID(&IID_IGetBindHandle, riid)) { - trace("QI(IID_IGetBindHandle)\n"); - *ppv = NULL; - return E_NOINTERFACE; - }else if(IsEqualGUID(&IID_undocumentedIE10, riid)) { - trace("QI(IID_undocumentedIE10)\n"); - *ppv = NULL; - return E_NOINTERFACE; - }else if(IsEqualGUID(&IID_undocumentedIE11, riid)) { - trace("QI(IID_undocumentedIE11)\n"); - *ppv = NULL; - return E_NOINTERFACE; - }else { - ok(0, "unexpected interface %s\n", wine_dbgstr_guid(riid)); }
return E_NOINTERFACE;
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/urlmon/tests/url.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 3a6ad1390fa..cfa29248d6c 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1626,6 +1626,10 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u { ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId());
+ if (winetest_debug > 1) + trace("IBindStatusCallbackEx::OnProgress(progress %u/%u, code %u, text %s)\n", + ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText)); + switch(ulStatusCode) { case BINDSTATUS_FINDINGRESOURCE: if(iface == &objbsc) @@ -1785,13 +1789,8 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u ok(szStatusText == NULL, "Expected szStatusText to be NULL\n"); break; case BINDSTATUS_PROXYDETECTING: - trace("BINDSTATUS_PROXYDETECTING\n"); - break; case BINDSTATUS_COOKIE_SENT: - trace("BINDSTATUS_COOKIE_SENT\n"); - break; case BINDSTATUS_DECODING: - trace("BINDSTATUS_DECODING\n"); break; default: ok(0, "unexpected code %d\n", ulStatusCode); @@ -2895,7 +2894,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) prot_state = 0; ResetEvent(complete_event);
- trace("URL: %s\n", wine_dbgstr_w(current_url)); + if (winetest_debug > 1) trace("URL: %s\n", wine_dbgstr_w(current_url)); }
static void test_BindToStorage(int protocol, DWORD flags, DWORD t)
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=63243
Your paranoid android.
=== wxppro (32 bit report) ===
urlmon: url.c:3642: Test failed: expected OnProgress_DOWNLOADINGDATA
=== w8adm (32 bit report) ===
urlmon: url.c:3642: Test failed: expected OnProgress_DOWNLOADINGDATA
=== w1064v1507 (32 bit report) ===
urlmon: url.c:3642: Test failed: expected OnProgress_DOWNLOADINGDATA
=== w1064v1507 (64 bit report) ===
urlmon: url.c:3642: Test failed: expected OnProgress_DOWNLOADINGDATA
=== w1064v1809 (64 bit report) ===
urlmon: url.c:3642: Test failed: expected OnProgress_DOWNLOADINGDATA
Signed-off-by: Jacek Caban jacek@codeweavers.com
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=63242
Your paranoid android.
=== w8adm (32 bit report) ===
urlmon: url.c:1466: Test failed: progress 32: status = 200 url.c:1466: Test failed: progress 32: status = 200 url.c:1466: Test failed: progress 32: status = 200 url.c:1466: Test failed: progress 32: status = 200 url.c:1466: Test failed: progress 32: status = 200 url.c:1466: Test failed: progress 32: status = 200 url.c:1466: Test failed: progress 32: status = 200 url.c:1466: Test failed: progress 32: status = 200 url.c:1466: Test failed: progress 32: status = 200 url.c:1466: Test failed: progress 32: status = 200 url.c:1466: Test failed: progress 32: status = 200 url.c:1462: Test failed: progress 2: hres = 1, expected 0 url.c:3643: Test failed: expected OnProgress_DOWNLOADINGDATA
=== w864 (32 bit report) ===
urlmon: url.c:1466: Test failed: progress 32: status = 200
=== w1064v1507 (32 bit report) ===
urlmon: url.c:3643: Test failed: expected OnProgress_DOWNLOADINGDATA
=== w1064v1809_he (32 bit report) ===
urlmon: url.c:3643: Test failed: expected OnProgress_DOWNLOADINGDATA
=== w864 (64 bit report) ===
urlmon: url.c:1466: Test failed: progress 32: status = 200 url.c:1466: Test failed: progress 32: status = 200
=== w1064v1507 (64 bit report) ===
urlmon: url.c:3643: Test failed: expected OnProgress_DOWNLOADINGDATA
=== w1064v1809 (64 bit report) ===
urlmon: url.c:1466: Test failed: progress 32: status = 200 url.c:1466: Test failed: progress 32: status = 200
-
Jacek Caban -
Marvin -
Zebediah Figura