ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

urlmon: Skip more tests on old IE and ignore BINDSTATUS_PROXYDETECTING notification.

This commit is contained in:
Jacek Caban 2009-01-07 00:42:03 +01:00 committed by Alexandre Julliard
parent 3fd7a474d8
commit 4ac8322db4
1 changed files with 84 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/urlmon/tests/url.c
View File

@ -1248,6 +1248,9 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP
ok(0, "unexpected call\n");
ok(szStatusText == NULL, "Expected szStatusText to be NULL\n");
break;
case BINDSTATUS_PROXYDETECTING:
trace("BINDSTATUS_PROXYDETECTING\n");
break;
default:
ok(0, "unexpected code %d\n", ulStatusCode);
};
@ -1768,7 +1771,7 @@ static void test_CreateAsyncBindCtxEx(void)
IBindCtx_Release(bctx2);
}
static void test_bscholder(IBindStatusCallback *holder)
static BOOL test_bscholder(IBindStatusCallback *holder)
{
IServiceProvider *serv_prov;
IHttpNegotiate *http_negotiate, *http_negotiate_serv;
@ -1776,6 +1779,7 @@ static void test_bscholder(IBindStatusCallback *holder)
IAuthenticate *authenticate, *authenticate_serv;
IInternetProtocol *protocol;
BINDINFO bindinfo = {sizeof(bindinfo)};
BOOL ret = TRUE;
LPWSTR wstr;
DWORD dw;
HRESULT hres;
@ -1847,6 +1851,7 @@ static void test_bscholder(IBindStatusCallback *holder)
IHttpNegotiate_Release(http_negotiate2);
}else {
skip("Could not get IHttpNegotiate2\n");
ret = FALSE;
}
SET_EXPECT(OnProgress_FINDINGRESOURCE);
@ -1897,12 +1902,14 @@ static void test_bscholder(IBindStatusCallback *holder)
CHECK_CALLED(QueryService_IInternetProtocol);
IServiceProvider_Release(serv_prov);
return ret;
}
static void test_RegisterBindStatusCallback(void)
static BOOL test_RegisterBindStatusCallback(void)
{
IBindStatusCallback *prevbsc, *clb;
IBindCtx *bindctx;
BOOL ret = TRUE;
IUnknown *unk;
HRESULT hres;
@ -1933,7 +1940,8 @@ static void test_RegisterBindStatusCallback(void)
ok(hres == S_OK, "QueryInterface(IID_IBindStatusCallback) failed: %08x\n", hres);
ok(clb != &bsc, "bsc == clb\n");
test_bscholder(clb);
if(!test_bscholder(clb))
ret = FALSE;
IBindStatusCallback_Release(clb);
@ -1958,6 +1966,7 @@ static void test_RegisterBindStatusCallback(void)
ok(hres == E_INVALIDARG, "RevokeBindStatusCallback failed: %08x\n", hres);
IBindCtx_Release(bindctx);
return ret;
}
#define BINDTEST_EMULATE 1
@ -2570,7 +2579,8 @@ START_TEST(url)
test_create();
test_CreateAsyncBindCtx();
test_CreateAsyncBindCtxEx();
test_RegisterBindStatusCallback();
if(!test_RegisterBindStatusCallback()) {
test_BindToStorage_fail();
trace("synchronous http test (COM not initialised)...\n");
@ -2674,6 +2684,7 @@ START_TEST(url)
trace("test failures...\n");
test_BindToStorage_fail();
}
DeleteFileA(wszIndexHtmlA);
CloseHandle(complete_event);