diff --git a/dlls/urlmon/tests/Makefile.in b/dlls/urlmon/tests/Makefile.in index a0634017900..48fd3d614f9 100644 --- a/dlls/urlmon/tests/Makefile.in +++ b/dlls/urlmon/tests/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ TESTDLL = urlmon.dll IMPORTS = urlmon user32 kernel32 ole32 EXTRALIBS = -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ generated.c \ diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 802eb4b2a3a..c7d8280179b 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -78,88 +78,88 @@ static void test_CreateFormatEnum(void) }; hres = CreateFormatEnumerator(0, formatetc, &fenum); - ok(hres == E_FAIL, "CreateFormatEnumerator failed: %08lx, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "CreateFormatEnumerator failed: %08x, expected E_FAIL\n", hres); hres = CreateFormatEnumerator(0, formatetc, NULL); - ok(hres == E_INVALIDARG, "CreateFormatEnumerator failed: %08lx, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "CreateFormatEnumerator failed: %08x, expected E_INVALIDARG\n", hres); hres = CreateFormatEnumerator(5, formatetc, NULL); - ok(hres == E_INVALIDARG, "CreateFormatEnumerator failed: %08lx, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "CreateFormatEnumerator failed: %08x, expected E_INVALIDARG\n", hres); hres = CreateFormatEnumerator(5, formatetc, &fenum); - ok(hres == S_OK, "CreateFormatEnumerator failed: %08lx\n", hres); + ok(hres == S_OK, "CreateFormatEnumerator failed: %08x\n", hres); if(FAILED(hres)) return; hres = IEnumFORMATETC_Next(fenum, 2, NULL, &ul); - ok(hres == E_INVALIDARG, "Next failed: %08lx, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "Next failed: %08x, expected E_INVALIDARG\n", hres); ul = 100; hres = IEnumFORMATETC_Next(fenum, 0, fetc, &ul); - ok(hres == S_OK, "Next failed: %08lx\n", hres); - ok(ul == 0, "ul=%ld, expected 0\n", ul); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(ul == 0, "ul=%d, expected 0\n", ul); hres = IEnumFORMATETC_Next(fenum, 2, fetc, &ul); - ok(hres == S_OK, "Next failed: %08lx\n", hres); - ok(fetc[0].lindex == 0, "fetc[0].lindex=%ld, expected 0\n", fetc[0].lindex); - ok(fetc[1].lindex == 1, "fetc[1].lindex=%ld, expected 1\n", fetc[1].lindex); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(fetc[0].lindex == 0, "fetc[0].lindex=%d, expected 0\n", fetc[0].lindex); + ok(fetc[1].lindex == 1, "fetc[1].lindex=%d, expected 1\n", fetc[1].lindex); ok(fetc[0].ptd == &dev, "fetc[0].ptd=%p, expected %p\n", fetc[0].ptd, &dev); - ok(ul == 2, "ul=%ld, expected 2\n", ul); + ok(ul == 2, "ul=%d, expected 2\n", ul); hres = IEnumFORMATETC_Skip(fenum, 1); - ok(hres == S_OK, "Skip failed: %08lx\n", hres); + ok(hres == S_OK, "Skip failed: %08x\n", hres); hres = IEnumFORMATETC_Next(fenum, 4, fetc, &ul); - ok(hres == S_FALSE, "Next failed: %08lx, expected S_FALSE\n", hres); - ok(fetc[0].lindex == 3, "fetc[0].lindex=%ld, expected 3\n", fetc[0].lindex); - ok(fetc[1].lindex == 4, "fetc[1].lindex=%ld, expected 4\n", fetc[1].lindex); + ok(hres == S_FALSE, "Next failed: %08x, expected S_FALSE\n", hres); + ok(fetc[0].lindex == 3, "fetc[0].lindex=%d, expected 3\n", fetc[0].lindex); + ok(fetc[1].lindex == 4, "fetc[1].lindex=%d, expected 4\n", fetc[1].lindex); ok(fetc[0].ptd == NULL, "fetc[0].ptd=%p, expected NULL\n", fetc[0].ptd); - ok(ul == 2, "ul=%ld, expected 2\n", ul); + ok(ul == 2, "ul=%d, expected 2\n", ul); hres = IEnumFORMATETC_Next(fenum, 4, fetc, &ul); - ok(hres == S_FALSE, "Next failed: %08lx, expected S_FALSE\n", hres); - ok(ul == 0, "ul=%ld, expected 0\n", ul); + ok(hres == S_FALSE, "Next failed: %08x, expected S_FALSE\n", hres); + ok(ul == 0, "ul=%d, expected 0\n", ul); ul = 100; hres = IEnumFORMATETC_Next(fenum, 0, fetc, &ul); - ok(hres == S_OK, "Next failed: %08lx\n", hres); - ok(ul == 0, "ul=%ld, expected 0\n", ul); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(ul == 0, "ul=%d, expected 0\n", ul); hres = IEnumFORMATETC_Skip(fenum, 3); - ok(hres == S_FALSE, "Skip failed: %08lx, expected S_FALSE\n", hres); + ok(hres == S_FALSE, "Skip failed: %08x, expected S_FALSE\n", hres); hres = IEnumFORMATETC_Reset(fenum); - ok(hres == S_OK, "Reset failed: %08lx\n", hres); + ok(hres == S_OK, "Reset failed: %08x\n", hres); hres = IEnumFORMATETC_Next(fenum, 5, fetc, NULL); - ok(hres == S_OK, "Next failed: %08lx\n", hres); - ok(fetc[0].lindex == 0, "fetc[0].lindex=%ld, expected 0\n", fetc[0].lindex); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(fetc[0].lindex == 0, "fetc[0].lindex=%d, expected 0\n", fetc[0].lindex); hres = IEnumFORMATETC_Reset(fenum); - ok(hres == S_OK, "Reset failed: %08lx\n", hres); + ok(hres == S_OK, "Reset failed: %08x\n", hres); hres = IEnumFORMATETC_Skip(fenum, 2); - ok(hres == S_OK, "Skip failed: %08lx\n", hres); + ok(hres == S_OK, "Skip failed: %08x\n", hres); hres = IEnumFORMATETC_Clone(fenum, NULL); - ok(hres == E_INVALIDARG, "Clone failed: %08lx, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "Clone failed: %08x, expected E_INVALIDARG\n", hres); hres = IEnumFORMATETC_Clone(fenum, &fenum2); - ok(hres == S_OK, "Clone failed: %08lx\n", hres); + ok(hres == S_OK, "Clone failed: %08x\n", hres); if(SUCCEEDED(hres)) { ok(fenum != fenum2, "fenum == fenum2\n"); hres = IEnumFORMATETC_Next(fenum2, 2, fetc, &ul); - ok(hres == S_OK, "Next failed: %08lx\n", hres); - ok(fetc[0].lindex == 2, "fetc[0].lindex=%ld, expected 2\n", fetc[0].lindex); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(fetc[0].lindex == 2, "fetc[0].lindex=%d, expected 2\n", fetc[0].lindex); IEnumFORMATETC_Release(fenum2); } hres = IEnumFORMATETC_Next(fenum, 2, fetc, &ul); - ok(hres == S_OK, "Next failed: %08lx\n", hres); - ok(fetc[0].lindex == 2, "fetc[0].lindex=%ld, expected 2\n", fetc[0].lindex); + ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(fetc[0].lindex == 2, "fetc[0].lindex=%d, expected 2\n", fetc[0].lindex); hres = IEnumFORMATETC_Skip(fenum, 1); - ok(hres == S_OK, "Skip failed: %08lx\n", hres); + ok(hres == S_OK, "Skip failed: %08x\n", hres); IEnumFORMATETC_Release(fenum); } @@ -178,61 +178,61 @@ static void test_RegisterFormatEnumerator(void) CreateBindCtx(0, &bctx); hres = CreateFormatEnumerator(1, &formatetc, &format); - ok(hres == S_OK, "CreateFormatEnumerator failed: %08lx\n", hres); + ok(hres == S_OK, "CreateFormatEnumerator failed: %08x\n", hres); if(FAILED(hres)) return; hres = RegisterFormatEnumerator(NULL, format, 0); ok(hres == E_INVALIDARG, - "RegisterFormatEnumerator failed: %08lx, expected E_INVALIDARG\n", hres); + "RegisterFormatEnumerator failed: %08x, expected E_INVALIDARG\n", hres); hres = RegisterFormatEnumerator(bctx, NULL, 0); ok(hres == E_INVALIDARG, - "RegisterFormatEnumerator failed: %08lx, expected E_INVALIDARG\n", hres); + "RegisterFormatEnumerator failed: %08x, expected E_INVALIDARG\n", hres); hres = RegisterFormatEnumerator(bctx, format, 0); - ok(hres == S_OK, "RegisterFormatEnumerator failed: %08lx\n", hres); + ok(hres == S_OK, "RegisterFormatEnumerator failed: %08x\n", hres); hres = IBindCtx_GetObjectParam(bctx, wszEnumFORMATETC, &unk); - ok(hres == S_OK, "GetObjectParam failed: %08lx\n", hres); + ok(hres == S_OK, "GetObjectParam failed: %08x\n", hres); ok(unk == (IUnknown*)format, "unk != format\n"); hres = RevokeFormatEnumerator(NULL, format); ok(hres == E_INVALIDARG, - "RevokeFormatEnumerator failed: %08lx, expected E_INVALIDARG\n", hres); + "RevokeFormatEnumerator failed: %08x, expected E_INVALIDARG\n", hres); hres = RevokeFormatEnumerator(bctx, format); - ok(hres == S_OK, "RevokeFormatEnumerator failed: %08lx\n", hres); + ok(hres == S_OK, "RevokeFormatEnumerator failed: %08x\n", hres); hres = RevokeFormatEnumerator(bctx, format); - ok(hres == E_FAIL, "RevokeFormatEnumerator failed: %08lx, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "RevokeFormatEnumerator failed: %08x, expected E_FAIL\n", hres); hres = IBindCtx_GetObjectParam(bctx, wszEnumFORMATETC, &unk); - ok(hres == E_FAIL, "GetObjectParam failed: %08lx, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "GetObjectParam failed: %08x, expected E_FAIL\n", hres); hres = RegisterFormatEnumerator(bctx, format, 0); - ok(hres == S_OK, "RegisterFormatEnumerator failed: %08lx\n", hres); + ok(hres == S_OK, "RegisterFormatEnumerator failed: %08x\n", hres); hres = CreateFormatEnumerator(1, &formatetc, &format2); - ok(hres == S_OK, "CreateFormatEnumerator failed: %08lx\n", hres); + ok(hres == S_OK, "CreateFormatEnumerator failed: %08x\n", hres); if(SUCCEEDED(hres)) { hres = RevokeFormatEnumerator(bctx, format); - ok(hres == S_OK, "RevokeFormatEnumerator failed: %08lx\n", hres); + ok(hres == S_OK, "RevokeFormatEnumerator failed: %08x\n", hres); IEnumFORMATETC_Release(format2); } hres = IBindCtx_GetObjectParam(bctx, wszEnumFORMATETC, &unk); - ok(hres == E_FAIL, "GetObjectParam failed: %08lx, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "GetObjectParam failed: %08x, expected E_FAIL\n", hres); IEnumFORMATETC_Release(format); hres = RegisterFormatEnumerator(bctx, format, 0); - ok(hres == S_OK, "RegisterFormatEnumerator failed: %08lx\n", hres); + ok(hres == S_OK, "RegisterFormatEnumerator failed: %08x\n", hres); hres = RevokeFormatEnumerator(bctx, NULL); - ok(hres == S_OK, "RevokeFormatEnumerator failed: %08lx\n", hres); + ok(hres == S_OK, "RevokeFormatEnumerator failed: %08x\n", hres); hres = IBindCtx_GetObjectParam(bctx, wszEnumFORMATETC, &unk); - ok(hres == E_FAIL, "GetObjectParam failed: %08lx, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "GetObjectParam failed: %08x, expected E_FAIL\n", hres); IBindCtx_Release(bctx); } @@ -292,26 +292,26 @@ static void test_CoInternetParseUrl(void) memset(buf, 0xf0, sizeof(buf)); hres = CoInternetParseUrl(parse_tests[0].url, PARSE_SCHEMA, 0, buf, 3, &size, 0); - ok(hres == E_POINTER, "schema failed: %08lx, expected E_POINTER\n", hres); + ok(hres == E_POINTER, "schema failed: %08x, expected E_POINTER\n", hres); for(i=0; i < sizeof(parse_tests)/sizeof(parse_tests[0]); i++) { memset(buf, 0xf0, sizeof(buf)); hres = CoInternetParseUrl(parse_tests[i].url, PARSE_SECURITY_URL, 0, buf, sizeof(buf)/sizeof(WCHAR), &size, 0); - ok(hres == parse_tests[i].secur_hres, "[%d] security url failed: %08lx, expected %08lx\n", + ok(hres == parse_tests[i].secur_hres, "[%d] security url failed: %08x, expected %08x\n", i, hres, parse_tests[i].secur_hres); memset(buf, 0xf0, sizeof(buf)); hres = CoInternetParseUrl(parse_tests[i].url, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), &size, 0); - ok(hres == S_OK, "[%d] encoding failed: %08lx\n", i, hres); + ok(hres == S_OK, "[%d] encoding failed: %08x\n", i, hres); ok(size == lstrlenW(parse_tests[i].encoded_url), "[%d] wrong size\n", i); ok(!lstrcmpW(parse_tests[i].encoded_url, buf), "[%d] wrong encoded url\n", i); memset(buf, 0xf0, sizeof(buf)); hres = CoInternetParseUrl(parse_tests[i].url, PARSE_PATH_FROM_URL, 0, buf, sizeof(buf)/sizeof(WCHAR), &size, 0); - ok(hres == parse_tests[i].path_hres, "[%d] path failed: %08lx, expected %08lx\n", + ok(hres == parse_tests[i].path_hres, "[%d] path failed: %08x, expected %08x\n", i, hres, parse_tests[i].path_hres); if(parse_tests[i].path) { ok(size == lstrlenW(parse_tests[i].path), "[%d] wrong size\n", i); @@ -321,7 +321,7 @@ static void test_CoInternetParseUrl(void) memset(buf, 0xf0, sizeof(buf)); hres = CoInternetParseUrl(parse_tests[i].url, PARSE_SCHEMA, 0, buf, sizeof(buf)/sizeof(WCHAR), &size, 0); - ok(hres == S_OK, "[%d] schema failed: %08lx\n", i, hres); + ok(hres == S_OK, "[%d] schema failed: %08x\n", i, hres); ok(size == lstrlenW(parse_tests[i].schema), "[%d] wrong size\n", i); ok(!lstrcmpW(parse_tests[i].schema, buf), "[%d] wrong schema\n", i); } @@ -443,23 +443,23 @@ static void test_FindMimeFromData(void) mime = (LPWSTR)0xf0f0f0f0; hres = FindMimeFromData(NULL, mime_tests[i].url, NULL, 0, NULL, 0, &mime, 0); if(mime_tests[i].mime) { - ok(hres == S_OK, "[%d] FindMimeFromData failed: %08lx\n", i, hres); + ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!lstrcmpW(mime, mime_tests[i].mime), "[%d] wrong mime\n", i); CoTaskMemFree(mime); }else { - ok(hres == E_FAIL, "FindMimeFromData failed: %08lx, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "FindMimeFromData failed: %08x, expected E_FAIL\n", hres); ok(mime == (LPWSTR)0xf0f0f0f0, "[%d] mime != 0xf0f0f0f0\n", i); } mime = (LPWSTR)0xf0f0f0f0; hres = FindMimeFromData(NULL, mime_tests[i].url, NULL, 0, mimeTextPlain, 0, &mime, 0); - ok(hres == S_OK, "[%d] FindMimeFromData failed: %08lx\n", i, hres); + ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!lstrcmpW(mime, mimeTextPlain), "[%d] wrong mime\n", i); CoTaskMemFree(mime); mime = (LPWSTR)0xf0f0f0f0; hres = FindMimeFromData(NULL, mime_tests[i].url, NULL, 0, mimeAppOctetStream, 0, &mime, 0); - ok(hres == S_OK, "[%d] FindMimeFromData failed: %08lx\n", i, hres); + ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!lstrcmpW(mime, mimeAppOctetStream), "[%d] wrong mime\n", i); CoTaskMemFree(mime); } @@ -467,13 +467,13 @@ static void test_FindMimeFromData(void) for(i=0; i < sizeof(mime_tests2)/sizeof(mime_tests2[0]); i++) { hres = FindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, NULL, 0, &mime, 0); - ok(hres == S_OK, "[%d] FindMimeFromData failed: %08lx\n", i, hres); + ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime\n", i); CoTaskMemFree(mime); hres = FindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, mimeTextHtml, 0, &mime, 0); - ok(hres == S_OK, "[%d] FindMimeFromData failed: %08lx\n", i, hres); + ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); if(!lstrcmpW(mimeAppOctetStream, mime_tests2[i].mime) || !lstrcmpW(mimeTextPlain, mime_tests2[i].mime)) ok(!lstrcmpW(mime, mimeTextHtml), "[%d] wrong mime\n", i); @@ -482,7 +482,7 @@ static void test_FindMimeFromData(void) hres = FindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, mimeImagePjpeg, 0, &mime, 0); - ok(hres == S_OK, "[%d] FindMimeFromData failed: %08lx\n", i, hres); + ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); if(!lstrcmpW(mimeAppOctetStream, mime_tests2[i].mime) || i == 17) ok(!lstrcmpW(mime, mimeImagePjpeg), "[%d] wrong mime\n", i); else @@ -492,39 +492,39 @@ static void test_FindMimeFromData(void) } hres = FindMimeFromData(NULL, url1, data1, sizeof(data1), NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08lx\n", hres); + ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime\n"); CoTaskMemFree(mime); hres = FindMimeFromData(NULL, url1, data1, sizeof(data1), mimeAppOctetStream, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08lx\n", hres); + ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime\n"); CoTaskMemFree(mime); hres = FindMimeFromData(NULL, url4, data1, sizeof(data1), mimeAppOctetStream, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08lx\n", hres); + ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime\n"); CoTaskMemFree(mime); hres = FindMimeFromData(NULL, NULL, NULL, 0, NULL, 0, &mime, 0); - ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08lx, excepted E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, excepted E_INVALIDARG\n", hres); hres = FindMimeFromData(NULL, NULL, NULL, 0, mimeTextPlain, 0, &mime, 0); - ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08lx, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, expected E_INVALIDARG\n", hres); hres = FindMimeFromData(NULL, NULL, data1, 0, NULL, 0, &mime, 0); - ok(hres == E_FAIL, "FindMimeFromData failed: %08lx, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "FindMimeFromData failed: %08x, expected E_FAIL\n", hres); hres = FindMimeFromData(NULL, url1, data1, 0, NULL, 0, &mime, 0); - ok(hres == E_FAIL, "FindMimeFromData failed: %08lx, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "FindMimeFromData failed: %08x, expected E_FAIL\n", hres); hres = FindMimeFromData(NULL, NULL, data1, 0, mimeTextPlain, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08lx\n", hres); + ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime\n"); CoTaskMemFree(mime); hres = FindMimeFromData(NULL, NULL, data1, 0, mimeTextPlain, 0, NULL, 0); - ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08lx, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, expected E_INVALIDARG\n", hres); } static const BYTE secid1[] = {'f','i','l','e',':',0,0,0,0}; @@ -561,7 +561,7 @@ static void test_SecurityManager(void) HRESULT hres; hres = CoInternetCreateSecurityManager(NULL, &secmgr, 0); - ok(hres == S_OK, "CoInternetCreateSecurityManager failed: %08lx\n", hres); + ok(hres == S_OK, "CoInternetCreateSecurityManager failed: %08x\n", hres); if(FAILED(hres)) return; @@ -570,9 +570,9 @@ static void test_SecurityManager(void) hres = IInternetSecurityManager_MapUrlToZone(secmgr, secmgr_tests[i].url, &zone, 0); ok(hres == secmgr_tests[i].zone_hres, - "[%d] MapUrlToZone failed: %08lx, expected %08lx\n", + "[%d] MapUrlToZone failed: %08x, expected %08x\n", i, hres, secmgr_tests[i].zone_hres); - ok(zone == secmgr_tests[i].zone, "[%d] zone=%ld, expected %ld\n", i, zone, + ok(zone == secmgr_tests[i].zone, "[%d] zone=%d, expected %d\n", i, zone, secmgr_tests[i].zone); size = sizeof(buf); @@ -580,10 +580,10 @@ static void test_SecurityManager(void) hres = IInternetSecurityManager_GetSecurityId(secmgr, secmgr_tests[i].url, buf, &size, 0); ok(hres == secmgr_tests[i].secid_hres, - "[%d] GetSecurityId failed: %08lx, expected %08lx\n", + "[%d] GetSecurityId failed: %08x, expected %08x\n", i, hres, secmgr_tests[i].secid_hres); if(secmgr_tests[i].secid) { - ok(size == secmgr_tests[i].secid_size, "[%d] size=%ld, expected %ld\n", + ok(size == secmgr_tests[i].secid_size, "[%d] size=%d, expected %d\n", i, size, secmgr_tests[i].secid_size); ok(!memcmp(buf, secmgr_tests[i].secid, size), "[%d] wrong secid\n", i); } @@ -591,20 +591,20 @@ static void test_SecurityManager(void) zone = 100; hres = IInternetSecurityManager_MapUrlToZone(secmgr, NULL, &zone, 0); - ok(hres == E_INVALIDARG, "MapUrlToZone failed: %08lx, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "MapUrlToZone failed: %08x, expected E_INVALIDARG\n", hres); size = sizeof(buf); hres = IInternetSecurityManager_GetSecurityId(secmgr, NULL, buf, &size, 0); ok(hres == E_INVALIDARG, - "GetSecurityId failed: %08lx, expected E_INVALIDARG\n", hres); + "GetSecurityId failed: %08x, expected E_INVALIDARG\n", hres); hres = IInternetSecurityManager_GetSecurityId(secmgr, secmgr_tests[1].url, NULL, &size, 0); ok(hres == E_INVALIDARG, - "GetSecurityId failed: %08lx, expected E_INVALIDARG\n", hres); + "GetSecurityId failed: %08x, expected E_INVALIDARG\n", hres); hres = IInternetSecurityManager_GetSecurityId(secmgr, secmgr_tests[1].url, buf, NULL, 0); ok(hres == E_INVALIDARG, - "GetSecurityId failed: %08lx, expected E_INVALIDARG\n", hres); + "GetSecurityId failed: %08x, expected E_INVALIDARG\n", hres); IInternetSecurityManager_Release(secmgr); } @@ -616,30 +616,30 @@ static void test_ZoneManager(void) HRESULT hres; hres = CoInternetCreateZoneManager(NULL, &zonemgr, 0); - ok(hres == S_OK, "CoInternetCreateZoneManager failed: %08lx\n", hres); + ok(hres == S_OK, "CoInternetCreateZoneManager failed: %08x\n", hres); if(FAILED(hres)) return; hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, 0x1a10, buf, sizeof(DWORD), URLZONEREG_DEFAULT); - ok(hres == S_OK, "GetZoneActionPolicy failed: %08lx\n", hres); - ok(*(DWORD*)buf == 1, "policy=%ld, expected 1\n", *(DWORD*)buf); + ok(hres == S_OK, "GetZoneActionPolicy failed: %08x\n", hres); + ok(*(DWORD*)buf == 1, "policy=%d, expected 1\n", *(DWORD*)buf); hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, 0x1a10, NULL, sizeof(DWORD), URLZONEREG_DEFAULT); - ok(hres == E_INVALIDARG, "GetZoneActionPolicy failed: %08lx, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "GetZoneActionPolicy failed: %08x, expected E_INVALIDARG\n", hres); hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, 0x1a10, buf, 2, URLZONEREG_DEFAULT); - ok(hres == E_INVALIDARG, "GetZoneActionPolicy failed: %08lx, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "GetZoneActionPolicy failed: %08x, expected E_INVALIDARG\n", hres); hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, 0x1fff, buf, sizeof(DWORD), URLZONEREG_DEFAULT); - ok(hres == E_FAIL, "GetZoneActionPolicy failed: %08lx, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "GetZoneActionPolicy failed: %08x, expected E_FAIL\n", hres); hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 13, 0x1a10, buf, sizeof(DWORD), URLZONEREG_DEFAULT); - ok(hres == E_INVALIDARG, "GetZoneActionPolicy failed: %08lx, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "GetZoneActionPolicy failed: %08x, expected E_INVALIDARG\n", hres); IInternetZoneManager_Release(zonemgr); } @@ -653,13 +653,13 @@ static void register_protocols(void) static const WCHAR wszAbout[] = {'a','b','o','u','t',0}; hres = CoInternetGetSession(0, &session, 0); - ok(hres == S_OK, "CoInternetGetSession failed: %08lx\n", hres); + ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); if(FAILED(hres)) return; hres = CoGetClassObject(&CLSID_AboutProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&factory); - ok(hres == S_OK, "Coud not get AboutProtocol factory: %08lx\n", hres); + ok(hres == S_OK, "Coud not get AboutProtocol factory: %08x\n", hres); if(FAILED(hres)) return; @@ -796,21 +796,21 @@ static void test_NameSpace(void) static const WCHAR wszTest[] = {'t','e','s','t',0}; hres = CoInternetGetSession(0, &session, 0); - ok(hres == S_OK, "CoInternetGetSession failed: %08lx\n", hres); + ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); if(FAILED(hres)) return; hres = IInternetSession_RegisterNameSpace(session, NULL, &IID_NULL, wszTest, 0, NULL, 0); - ok(hres == E_INVALIDARG, "RegisterNameSpace failed: %08lx\n", hres); + ok(hres == E_INVALIDARG, "RegisterNameSpace failed: %08x\n", hres); hres = IInternetSession_RegisterNameSpace(session, &test_protocol_cf, &IID_NULL, NULL, 0, NULL, 0); - ok(hres == E_INVALIDARG, "RegisterNameSpace failed: %08lx\n", hres); + ok(hres == E_INVALIDARG, "RegisterNameSpace failed: %08x\n", hres); hres = IInternetSession_RegisterNameSpace(session, &test_protocol_cf, &IID_NULL, wszTest, 0, NULL, 0); - ok(hres == S_OK, "RegisterNameSpace failed: %08lx\n", hres); + ok(hres == S_OK, "RegisterNameSpace failed: %08x\n", hres); qiret = E_NOINTERFACE; expect_cf = &test_protocol_cf; @@ -820,7 +820,7 @@ static void test_NameSpace(void) hres = CoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), &size, 0); - ok(hres == S_OK, "CoInternetParseUrl failed: %08lx\n", hres); + ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); CHECK_CALLED(CreateInstance); @@ -832,55 +832,55 @@ static void test_NameSpace(void) hres = CoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), &size, 0); - ok(hres == S_OK, "CoInternetParseUrl failed: %08lx\n", hres); + ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); CHECK_CALLED(ParseUrl); hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); - ok(hres == S_OK, "UnregisterNameSpace failed: %08lx\n", hres); + ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres); hres = CoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), &size, 0); - ok(hres == S_OK, "CoInternetParseUrl failed: %08lx\n", hres); + ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); hres = IInternetSession_RegisterNameSpace(session, &test_protocol_cf2, &IID_NULL, wszTest, 0, NULL, 0); - ok(hres == S_OK, "RegisterNameSpace failed: %08lx\n", hres); + ok(hres == S_OK, "RegisterNameSpace failed: %08x\n", hres); hres = IInternetSession_RegisterNameSpace(session, &test_protocol_cf, &IID_NULL, wszTest, 0, NULL, 0); - ok(hres == S_OK, "RegisterNameSpace failed: %08lx\n", hres); + ok(hres == S_OK, "RegisterNameSpace failed: %08x\n", hres); hres = IInternetSession_RegisterNameSpace(session, &test_protocol_cf, &IID_NULL, wszTest, 0, NULL, 0); - ok(hres == S_OK, "RegisterNameSpace failed: %08lx\n", hres); + ok(hres == S_OK, "RegisterNameSpace failed: %08x\n", hres); SET_EXPECT(QI_IInternetProtocolInfo); SET_EXPECT(ParseUrl); hres = CoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), &size, 0); - ok(hres == S_OK, "CoInternetParseUrl failed: %08lx\n", hres); + ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); CHECK_CALLED(ParseUrl); hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); - ok(hres == S_OK, "UnregisterNameSpace failed: %08lx\n", hres); + ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres); SET_EXPECT(QI_IInternetProtocolInfo); SET_EXPECT(ParseUrl); hres = CoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), &size, 0); - ok(hres == S_OK, "CoInternetParseUrl failed: %08lx\n", hres); + ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); CHECK_CALLED(ParseUrl); hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); - ok(hres == S_OK, "UnregisterNameSpace failed: %08lx\n", hres); + ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres); expect_cf = &test_protocol_cf2; SET_EXPECT(QI_IInternetProtocolInfo); @@ -888,26 +888,26 @@ static void test_NameSpace(void) hres = CoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), &size, 0); - ok(hres == S_OK, "CoInternetParseUrl failed: %08lx\n", hres); + ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); CHECK_CALLED(ParseUrl); hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); - ok(hres == S_OK, "UnregisterNameSpace failed: %08lx\n", hres); + ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres); hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); - ok(hres == S_OK, "UnregisterNameSpace failed: %08lx\n", hres); + ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres); hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, NULL); - ok(hres == E_INVALIDARG, "UnregisterNameSpace failed: %08lx\n", hres); + ok(hres == E_INVALIDARG, "UnregisterNameSpace failed: %08x\n", hres); hres = IInternetSession_UnregisterNameSpace(session, NULL, wszTest); - ok(hres == E_INVALIDARG, "UnregisterNameSpace failed: %08lx\n", hres); + ok(hres == E_INVALIDARG, "UnregisterNameSpace failed: %08x\n", hres); hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf2, wszTest); - ok(hres == S_OK, "UnregisterNameSpace failed: %08lx\n", hres); + ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres); hres = CoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, sizeof(buf)/sizeof(WCHAR), &size, 0); - ok(hres == S_OK, "CoInternetParseUrl failed: %08lx\n", hres); + ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); IInternetSession_Release(session); } @@ -936,7 +936,7 @@ static void test_ReleaseBindInfo(void) bi.pUnk = &unk; SET_EXPECT(unk_Release); ReleaseBindInfo(&bi); - ok(bi.cbSize == sizeof(BINDINFO), "bi.cbSize=%ld\n", bi.cbSize); + ok(bi.cbSize == sizeof(BINDINFO), "bi.cbSize=%d\n", bi.cbSize); ok(bi.pUnk == NULL, "bi.pUnk=%p, expected NULL\n", bi.pUnk); CHECK_CALLED(unk_Release); @@ -944,13 +944,13 @@ static void test_ReleaseBindInfo(void) bi.cbSize = offsetof(BINDINFO, pUnk); bi.pUnk = &unk; ReleaseBindInfo(&bi); - ok(bi.cbSize == offsetof(BINDINFO, pUnk), "bi.cbSize=%ld\n", bi.cbSize); + ok(bi.cbSize == offsetof(BINDINFO, pUnk), "bi.cbSize=%d\n", bi.cbSize); ok(bi.pUnk == &unk, "bi.pUnk=%p, expected %p\n", bi.pUnk, &unk); memset(&bi, 0, sizeof(bi)); bi.pUnk = &unk; ReleaseBindInfo(&bi); - ok(!bi.cbSize, "bi.cbSize=%ld, expected 0\n", bi.cbSize); + ok(!bi.cbSize, "bi.cbSize=%d, expected 0\n", bi.cbSize); ok(bi.pUnk == &unk, "bi.pUnk=%p, expected %p\n", bi.pUnk, &unk); } @@ -962,36 +962,36 @@ static void test_UrlMkGetSessionOption(void) size = encoding = 0xdeadbeef; hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding, sizeof(encoding), &size, 0); - ok(hres == S_OK, "UrlMkGetSessionOption failed: %08lx\n", hres); + ok(hres == S_OK, "UrlMkGetSessionOption failed: %08x\n", hres); ok(encoding != 0xdeadbeef, "encoding not changed\n"); - ok(size == sizeof(encoding), "size=%ld\n", size); + ok(size == sizeof(encoding), "size=%d\n", size); size = encoding = 0xdeadbeef; hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding, sizeof(encoding)+1, &size, 0); - ok(hres == S_OK, "UrlMkGetSessionOption failed: %08lx\n", hres); + ok(hres == S_OK, "UrlMkGetSessionOption failed: %08x\n", hres); ok(encoding != 0xdeadbeef, "encoding not changed\n"); - ok(size == sizeof(encoding), "size=%ld\n", size); + ok(size == sizeof(encoding), "size=%d\n", size); size = encoding = 0xdeadbeef; hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding, sizeof(encoding)-1, &size, 0); - ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08lx\n", hres); - ok(encoding == 0xdeadbeef, "encoding = %08lx, exepcted 0xdeadbeef\n", encoding); - ok(size == 0xdeadbeef, "size=%ld\n", size); + ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08x\n", hres); + ok(encoding == 0xdeadbeef, "encoding = %08x, exepcted 0xdeadbeef\n", encoding); + ok(size == 0xdeadbeef, "size=%d\n", size); size = encoding = 0xdeadbeef; hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, NULL, sizeof(encoding)-1, &size, 0); - ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08lx\n", hres); - ok(encoding == 0xdeadbeef, "encoding = %08lx, exepcted 0xdeadbeef\n", encoding); - ok(size == 0xdeadbeef, "size=%ld\n", size); + ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08x\n", hres); + ok(encoding == 0xdeadbeef, "encoding = %08x, exepcted 0xdeadbeef\n", encoding); + ok(size == 0xdeadbeef, "size=%d\n", size); encoding = 0xdeadbeef; hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding, sizeof(encoding)-1, NULL, 0); - ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08lx\n", hres); - ok(encoding == 0xdeadbeef, "encoding = %08lx, exepcted 0xdeadbeef\n", encoding); + ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08x\n", hres); + ok(encoding == 0xdeadbeef, "encoding = %08x, exepcted 0xdeadbeef\n", encoding); } START_TEST(misc) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 341f4fbd207..53c5bc468c4 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -127,7 +127,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, ok(!lstrcmpW(header, szHeaders), "Unexpected szHeaders\n"); } - ok(!dwReserved, "dwReserved=%ld, expected 0\n", dwReserved); + ok(!dwReserved, "dwReserved=%d, expected 0\n", dwReserved); ok(pszAdditionalHeaders != NULL, "pszAdditionalHeaders == NULL\n"); if(pszAdditionalHeaders) ok(*pszAdditionalHeaders == NULL, "*pszAdditionalHeaders != NULL\n"); @@ -140,7 +140,7 @@ static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD dwR { CHECK_EXPECT(OnResponse); - ok(dwResponseCode == 200, "dwResponseCode=%ld, expected 200\n", dwResponseCode); + ok(dwResponseCode == 200, "dwResponseCode=%d, expected 200\n", dwResponseCode); ok(szResponseHeaders != NULL, "szResponseHeaders == NULL\n"); ok(szRequestHeaders == NULL, "szRequestHeaders != NULL\n"); ok(pszAdditionalRequestHeaders == NULL, "pszAdditionalHeaders != NULL\n"); @@ -160,7 +160,7 @@ static HRESULT WINAPI HttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, ok(pcbSecurityId != NULL, "pcbSecurityId == NULL\n"); if(pcbSecurityId) { - ok(*pcbSecurityId == 512, "*pcbSecurityId=%ld, expected 512\n", *pcbSecurityId); + ok(*pcbSecurityId == 512, "*pcbSecurityId=%d, expected 512\n", *pcbSecurityId); *pcbSecurityId = sizeof(sec_id); } @@ -298,7 +298,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(!lstrcmpW(szStatusText, text_html), "szStatusText != text/html\n"); break; default: - ok(0, "Unexpected call %ld\n", ulStatusCode); + ok(0, "Unexpected call %d\n", ulStatusCode); }; return S_OK; @@ -310,11 +310,11 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR if(tested_protocol == FILE_TEST) { CHECK_EXPECT2(ReportData); - ok(ulProgress == ulProgressMax, "ulProgress (%ld) != ulProgressMax (%ld)\n", + ok(ulProgress == ulProgressMax, "ulProgress (%d) != ulProgressMax (%d)\n", ulProgress, ulProgressMax); - ok(ulProgressMax == 13, "ulProgressMax=%ld, expected 13\n", ulProgressMax); + ok(ulProgressMax == 13, "ulProgressMax=%d, expected 13\n", ulProgressMax); ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION), - "grcfBSCF = %08lx\n", grfBSCF); + "grcfBSCF = %08x\n", grfBSCF); }else if(tested_protocol == HTTP_TEST) { if(!(grfBSCF & BSCF_LASTDATANOTIFICATION)) CHECK_EXPECT(ReportData); @@ -322,12 +322,12 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR ok(ulProgress, "ulProgress == 0\n"); if(first_data_notif) { - ok(grfBSCF == BSCF_FIRSTDATANOTIFICATION, "grcfBSCF = %08lx\n", grfBSCF); + ok(grfBSCF == BSCF_FIRSTDATANOTIFICATION, "grcfBSCF = %08x\n", grfBSCF); first_data_notif = FALSE; } else { ok(grfBSCF == BSCF_INTERMEDIATEDATANOTIFICATION || grfBSCF == (BSCF_LASTDATANOTIFICATION|BSCF_INTERMEDIATEDATANOTIFICATION), - "grcfBSCF = %08lx\n", grfBSCF); + "grcfBSCF = %08x\n", grfBSCF); } } return S_OK; @@ -338,10 +338,10 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR { CHECK_EXPECT(ReportResult); - ok(hrResult == expect_hrResult, "hrResult = %08lx, expected: %08lx\n", + ok(hrResult == expect_hrResult, "hrResult = %08x, expected: %08x\n", hrResult, expect_hrResult); if(SUCCEEDED(hrResult)) - ok(dwError == ERROR_SUCCESS, "dwError = %ld, expected ERROR_SUCCESS\n", dwError); + ok(dwError == ERROR_SUCCESS, "dwError = %d, expected ERROR_SUCCESS\n", dwError); else ok(dwError != ERROR_SUCCESS, "dwError == ERROR_SUCCESS\n"); ok(!szResult, "szResult != NULL\n"); @@ -403,7 +403,7 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfB ok(grfBINDF != NULL, "grfBINDF == NULL\n"); ok(pbindinfo != NULL, "pbindinfo == NULL\n"); - ok(pbindinfo->cbSize == sizeof(BINDINFO), "wrong size of pbindinfo: %ld\n", pbindinfo->cbSize); + ok(pbindinfo->cbSize == sizeof(BINDINFO), "wrong size of pbindinfo: %d\n", pbindinfo->cbSize); *grfBINDF = bindf; cbSize = pbindinfo->cbSize; @@ -425,9 +425,9 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS switch(ulStringType) { case BINDSTRING_ACCEPT_MIMES: CHECK_EXPECT(GetBindString_ACCEPT_MIMES); - ok(cEl == 256, "cEl=%ld, expected 256\n", cEl); + ok(cEl == 256, "cEl=%d, expected 256\n", cEl); if(pcElFetched) { - ok(*pcElFetched == 256, "*pcElFetched=%ld, expected 256\n", *pcElFetched); + ok(*pcElFetched == 256, "*pcElFetched=%d, expected 256\n", *pcElFetched); *pcElFetched = 1; } if(ppwzStr) { @@ -437,9 +437,9 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS return S_OK; case BINDSTRING_USER_AGENT: CHECK_EXPECT(GetBindString_USER_AGENT); - ok(cEl == 1, "cEl=%ld, expected 1\n", cEl); + ok(cEl == 1, "cEl=%d, expected 1\n", cEl); if(pcElFetched) { - ok(*pcElFetched == 0, "*pcElFetch=%ld, expectd 0\n", *pcElFetched); + ok(*pcElFetched == 0, "*pcElFetch=%d, expectd 0\n", *pcElFetched); *pcElFetched = 1; } if(ppwzStr) { @@ -472,20 +472,20 @@ static void test_priority(IInternetProtocol *protocol) hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); - ok(hres == S_OK, "QueryInterface(IID_IInternetPriority) failed: %08lx\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IInternetPriority) failed: %08x\n", hres); if(FAILED(hres)) return; hres = IInternetPriority_GetPriority(priority, &pr); - ok(hres == S_OK, "GetPriority failed: %08lx\n", hres); - ok(pr == 0, "pr=%ld, expected 0\n", pr); + ok(hres == S_OK, "GetPriority failed: %08x\n", hres); + ok(pr == 0, "pr=%d, expected 0\n", pr); hres = IInternetPriority_SetPriority(priority, 1); - ok(hres == S_OK, "SetPriority failed: %08lx\n", hres); + ok(hres == S_OK, "SetPriority failed: %08x\n", hres); hres = IInternetPriority_GetPriority(priority, &pr); - ok(hres == S_OK, "GetPriority failed: %08lx\n", hres); - ok(pr == 1, "pr=%ld, expected 1\n", pr); + ok(hres == S_OK, "GetPriority failed: %08x\n", hres); + ok(pr == 1, "pr=%d, expected 1\n", pr); IInternetPriority_Release(priority); } @@ -512,7 +512,7 @@ static void file_protocol_start(IInternetProtocol *protocol, LPCWSTR url, BOOL i expect_hrResult = S_OK; hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); - ok(hres == S_OK, "Start failed: %08lx\n", hres); + ok(hres == S_OK, "Start failed: %08x\n", hres); CHECK_CALLED(GetBindInfo); if(!(bindf & BINDF_FROMURLMON)) @@ -539,13 +539,13 @@ static void test_file_protocol_url(LPCWSTR url) hres = CoGetClassObject(&CLSID_FileProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "CoGetClassObject failed: %08lx\n", hres); + ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); if(!SUCCEEDED(hres)) return; hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&protocol_info); ok(hres == E_NOINTERFACE, - "Could not get IInternetProtocolInfo interface: %08lx, expected E_NOINTERFACE\n", hres); + "Could not get IInternetProtocolInfo interface: %08x, expected E_NOINTERFACE\n", hres); hres = IUnknown_QueryInterface(unk, &IID_IClassFactory, (void**)&factory); ok(hres == S_OK, "Could not get IClassFactory interface\n"); @@ -554,63 +554,63 @@ static void test_file_protocol_url(LPCWSTR url) BYTE buf[512]; ULONG cb; hres = IClassFactory_CreateInstance(factory, NULL, &IID_IInternetProtocol, (void**)&protocol); - ok(hres == S_OK, "Could not get IInternetProtocol: %08lx\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); if(SUCCEEDED(hres)) { file_protocol_start(protocol, url, TRUE); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_OK, "Read failed: %08lx\n", hres); - ok(cb == 2, "cb=%lu expected 2\n", cb); + ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(cb == 2, "cb=%u expected 2\n", cb); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == S_FALSE, "Read failed: %08lx\n", hres); + ok(hres == S_FALSE, "Read failed: %08x\n", hres); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == S_FALSE, "Read failed: %08lx expected S_FALSE\n", hres); - ok(cb == 0, "cb=%lu expected 0\n", cb); + ok(hres == S_FALSE, "Read failed: %08x expected S_FALSE\n", hres); + ok(cb == 0, "cb=%u expected 0\n", cb); hres = IInternetProtocol_UnlockRequest(protocol); - ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres); + ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); file_protocol_start(protocol, url, FALSE); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_FALSE, "Read failed: %08lx\n", hres); + ok(hres == S_FALSE, "Read failed: %08x\n", hres); hres = IInternetProtocol_LockRequest(protocol, 0); - ok(hres == S_OK, "LockRequest failed: %08lx\n", hres); + ok(hres == S_OK, "LockRequest failed: %08x\n", hres); hres = IInternetProtocol_UnlockRequest(protocol); - ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres); + ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); IInternetProtocol_Release(protocol); } hres = IClassFactory_CreateInstance(factory, NULL, &IID_IInternetProtocol, (void**)&protocol); - ok(hres == S_OK, "Could not get IInternetProtocol: %08lx\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); if(SUCCEEDED(hres)) { file_protocol_start(protocol, url, TRUE); hres = IInternetProtocol_LockRequest(protocol, 0); - ok(hres == S_OK, "LockRequest failed: %08lx\n", hres); + ok(hres == S_OK, "LockRequest failed: %08x\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); - ok(hres == S_OK, "Terminate failed: %08lx\n", hres); + ok(hres == S_OK, "Terminate failed: %08x\n", hres); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_OK, "Read failed: %08lx\n\n", hres); + ok(hres == S_OK, "Read failed: %08x\n\n", hres); hres = IInternetProtocol_UnlockRequest(protocol); - ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres); + ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_OK, "Read failed: %08lx\n", hres); + ok(hres == S_OK, "Read failed: %08x\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); - ok(hres == S_OK, "Terminate failed: %08lx\n", hres); + ok(hres == S_OK, "Terminate failed: %08x\n", hres); IInternetProtocol_Release(protocol); } hres = IClassFactory_CreateInstance(factory, NULL, &IID_IInternetProtocol, (void**)&protocol); - ok(hres == S_OK, "Could not get IInternetProtocol: %08lx\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); if(SUCCEEDED(hres)) { file_protocol_start(protocol, url, TRUE); hres = IInternetProtocol_Terminate(protocol, 0); - ok(hres == S_OK, "Terminate failed: %08lx\n", hres); + ok(hres == S_OK, "Terminate failed: %08x\n", hres); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_OK, "Read failed: %08lx\n", hres); - ok(cb == 2, "cb=%lu expected 2\n", cb); + ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(cb == 2, "cb=%u expected 2\n", cb); IInternetProtocol_Release(protocol); } @@ -631,14 +631,14 @@ static void test_file_protocol_fail(void) hres = CoCreateInstance(&CLSID_FileProtocol, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IInternetProtocol, (void**)&protocol); - ok(hres == S_OK, "CoCreateInstance failed: %08lx\n", hres); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); if(FAILED(hres)) return; SET_EXPECT(GetBindInfo); expect_hrResult = MK_E_SYNTAX; hres = IInternetProtocol_Start(protocol, wszIndexHtml, &protocol_sink, &bind_info, 0, 0); - ok(hres == MK_E_SYNTAX, "Start failed: %08lx, expected MK_E_SYNTAX\n", hres); + ok(hres == MK_E_SYNTAX, "Start failed: %08x, expected MK_E_SYNTAX\n", hres); CHECK_CALLED(GetBindInfo); SET_EXPECT(GetBindInfo); @@ -649,7 +649,7 @@ static void test_file_protocol_fail(void) expect_hrResult = INET_E_RESOURCE_NOT_FOUND; hres = IInternetProtocol_Start(protocol, index_url, &protocol_sink, &bind_info, 0, 0); ok(hres == INET_E_RESOURCE_NOT_FOUND, - "Start failed: %08lx expected INET_E_RESOURCE_NOT_FOUND\n", hres); + "Start failed: %08x expected INET_E_RESOURCE_NOT_FOUND\n", hres); CHECK_CALLED(GetBindInfo); if(!(bindf & BINDF_FROMURLMON)) CHECK_CALLED(ReportProgress_DIRECTBIND); @@ -660,7 +660,7 @@ static void test_file_protocol_fail(void) hres = CoCreateInstance(&CLSID_FileProtocol, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IInternetProtocol, (void**)&protocol); - ok(hres == S_OK, "CoCreateInstance failed: %08lx\n", hres); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); if(FAILED(hres)) return; @@ -673,7 +673,7 @@ static void test_file_protocol_fail(void) hres = IInternetProtocol_Start(protocol, index_url2, &protocol_sink, &bind_info, 0, 0); ok(hres == INET_E_RESOURCE_NOT_FOUND, - "Start failed: %08lx, expected INET_E_RESOURCE_NOT_FOUND\n", hres); + "Start failed: %08x, expected INET_E_RESOURCE_NOT_FOUND\n", hres); CHECK_CALLED(GetBindInfo); if(!(bindf & BINDF_FROMURLMON)) CHECK_CALLED(ReportProgress_DIRECTBIND); @@ -769,7 +769,7 @@ static BOOL http_protocol_start(LPCWSTR url, BOOL is_first) hres = IInternetProtocol_Start(http_protocol, url, &protocol_sink, &bind_info, 0, 0); todo_wine { - ok(hres == S_OK, "Start failed: %08lx\n", hres); + ok(hres == S_OK, "Start failed: %08x\n", hres); } if(FAILED(hres)) return FALSE; @@ -795,13 +795,13 @@ static void test_http_protocol_url(LPCWSTR url) hres = CoGetClassObject(&CLSID_HttpProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "CoGetClassObject failed: %08lx\n", hres); + ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); if(!SUCCEEDED(hres)) return; hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&protocol_info); ok(hres == E_NOINTERFACE, - "Could not get IInternetProtocolInfo interface: %08lx, expected E_NOINTERFACE\n", + "Could not get IInternetProtocolInfo interface: %08x, expected E_NOINTERFACE\n", hres); hres = IUnknown_QueryInterface(unk, &IID_IClassFactory, (void**)&factory); @@ -812,7 +812,7 @@ static void test_http_protocol_url(LPCWSTR url) hres = IClassFactory_CreateInstance(factory, NULL, &IID_IInternetProtocol, (void**)&http_protocol); - ok(hres == S_OK, "Could not get IInternetProtocol: %08lx\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); if(SUCCEEDED(hres)) { BYTE buf[512]; DWORD cb; @@ -830,8 +830,8 @@ static void test_http_protocol_url(LPCWSTR url) return; hres = IInternetProtocol_Read(http_protocol, buf, 2, &cb); - ok(hres == E_PENDING, "Read failed: %08lx, expected E_PENDING\n", hres); - ok(!cb, "cb=%ld, expected 0\n", cb); + ok(hres == E_PENDING, "Read failed: %08x, expected E_PENDING\n", hres); + ok(!cb, "cb=%d, expected 0\n", cb); SET_EXPECT(Switch); SET_EXPECT(ReportResult); @@ -877,7 +877,7 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam } hres = IInternetProtocol_Continue(http_protocol, (PROTOCOLDATA*)lParam); - ok(hres == S_OK, "Continue failed: %08lx\n", hres); + ok(hres == S_OK, "Continue failed: %08x\n", hres); CHECK_CALLED(ReportData); if(!state) { @@ -888,7 +888,7 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam do hres = IInternetProtocol_Read(http_protocol, buf, sizeof(buf), &cb); while(cb); - ok(hres == S_FALSE || hres == E_PENDING, "Read failed: %08lx\n", hres); + ok(hres == S_FALSE || hres == E_PENDING, "Read failed: %08x\n", hres); if(hres == S_FALSE) PostMessageW(protocol_hwnd, WM_USER+1, 0, 0); @@ -897,11 +897,11 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam state = 1; hres = IInternetProtocol_LockRequest(http_protocol, 0); - ok(hres == S_OK, "LockRequest failed: %08lx\n", hres); + ok(hres == S_OK, "LockRequest failed: %08x\n", hres); do hres = IInternetProtocol_Read(http_protocol, buf, sizeof(buf), &cb); while(cb); - ok(hres == S_FALSE || hres == E_PENDING, "Read failed: %08lx\n", hres); + ok(hres == S_FALSE || hres == E_PENDING, "Read failed: %08x\n", hres); } } diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index aa33013ca84..7734f426906 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -105,10 +105,10 @@ static void test_CreateURLMoniker(LPCWSTR url1, LPCWSTR url2) IMoniker *mon2 = NULL; hr = CreateURLMoniker(NULL, url1, &mon1); - ok(SUCCEEDED(hr), "failed to create moniker: 0x%08lx\n", hr); + ok(SUCCEEDED(hr), "failed to create moniker: 0x%08x\n", hr); if(SUCCEEDED(hr)) { hr = CreateURLMoniker(mon1, url2, &mon2); - ok(SUCCEEDED(hr), "failed to create moniker: 0x%08lx\n", hr); + ok(SUCCEEDED(hr), "failed to create moniker: 0x%08x\n", hr); } if(mon1) IMoniker_Release(mon1); if(mon2) IMoniker_Release(mon2); @@ -158,22 +158,22 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(szUrl && !lstrcmpW(szUrl, urls[test_protocol]), "wrong url\n"); ok(pOIProtSink != NULL, "pOIProtSink == NULL\n"); ok(pOIBindInfo != NULL, "pOIBindInfo == NULL\n"); - ok(grfPI == 0, "grfPI=%ld, expected 0\n", grfPI); - ok(dwReserved == 0, "dwReserved=%ld, expected 0\n", dwReserved); + ok(grfPI == 0, "grfPI=%d, expected 0\n", grfPI); + ok(dwReserved == 0, "dwReserved=%d, expected 0\n", dwReserved); memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(bindinfo); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); - ok(hres == S_OK, "GetBindInfo failed: %08lx\n", hres); + ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres); if(test_protocol == FILE_TEST) { ok(bindf == (BINDF_ASYNCHRONOUS|BINDF_ASYNCSTORAGE|BINDF_PULLDATA |BINDF_FROMURLMON), - "bindf=%08lx\n", bindf); + "bindf=%08x\n", bindf); }else { ok(bindf == (BINDF_ASYNCHRONOUS|BINDF_ASYNCSTORAGE|BINDF_PULLDATA| BINDF_FROMURLMON|BINDF_NEEDFILE), - "bindf=%08lx\n", bindf); + "bindf=%08x\n", bindf); } ok(!memcmp(&bindinfo, &bi, sizeof(bindinfo)), "wrong bindinfo\n"); @@ -183,25 +183,25 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); ok(hres == S_OK, - "ReportProgress(BINDSTATUS_SENDINGREQUEST) failed: %08lx\n", hres); + "ReportProgress(BINDSTATUS_SENDINGREQUEST) failed: %08x\n", hres); CHECK_CALLED(OnProgress_SENDINGREQUEST); hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_CACHEFILENAMEAVAILABLE, &null_char); ok(hres == S_OK, - "ReportProgress(BINDSTATUS_CACHEFILENAMEAVAILABLE) failed: %08lx\n", hres); + "ReportProgress(BINDSTATUS_CACHEFILENAMEAVAILABLE) failed: %08x\n", hres); SET_EXPECT(OnProgress_MIMETYPEAVAILABLE); hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, wszTextHtml); ok(hres == S_OK, - "ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08lx\n", hres); + "ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); }else { hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, wszTextHtml); ok(hres == S_OK, - "ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08lx\n", hres); + "ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); } if(test_protocol == ABOUT_TEST) @@ -217,7 +217,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, SET_EXPECT(OnStopBinding); hres = IInternetProtocolSink_ReportData(pOIProtSink, bscf, 13, 13); - ok(hres == S_OK, "ReportData failed: %08lx\n", hres); + ok(hres == S_OK, "ReportData failed: %08x\n", hres); CHECK_CALLED(Read); if(test_protocol != FILE_TEST) @@ -230,7 +230,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, SET_EXPECT(Terminate); hres = IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); - ok(hres == S_OK, "ReportResult failed: %08lx\n", hres); + ok(hres == S_OK, "ReportResult failed: %08x\n", hres); CHECK_CALLED(Terminate); return S_OK; @@ -253,7 +253,7 @@ static HRESULT WINAPI Protocol_Abort(IInternetProtocol *iface, HRESULT hrReason, static HRESULT WINAPI Protocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) { CHECK_EXPECT(Terminate); - ok(dwOptions == 0, "dwOptions=%ld, expected 0\n", dwOptions); + ok(dwOptions == 0, "dwOptions=%d, expected 0\n", dwOptions); return S_OK; } @@ -285,7 +285,7 @@ static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, ok(cb != 0, "cb == 0\n"); ok(pcbRead != NULL, "pcbRead == NULL\n"); if(pcbRead) { - ok(*pcbRead == 0, "*pcbRead=%ld, expected 0\n", *pcbRead); + ok(*pcbRead == 0, "*pcbRead=%d, expected 0\n", *pcbRead); *pcbRead = 13; read = 13; } @@ -423,7 +423,7 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP ok(!lstrcmpW(INDEX_HTML+7, szStatusText), "wrong szStatusText\n"); break; default: - todo_wine { ok(0, "unexpexted code %ld\n", ulStatusCode); } + todo_wine { ok(0, "unexpexted code %d\n", ulStatusCode); } }; return S_OK; } @@ -435,7 +435,7 @@ static HRESULT WINAPI statusclb_OnStopBinding(IBindStatusCallback *iface, HRESUL /* ignore DNS failure */ if (hresult != HRESULT_FROM_WIN32(ERROR_INTERNET_NAME_NOT_RESOLVED)) { - ok(SUCCEEDED(hresult), "Download failed: %08lx\n", hresult); + ok(SUCCEEDED(hresult), "Download failed: %08x\n", hresult); ok(szError == NULL, "szError should be NULL\n"); } stopped_binding = TRUE; @@ -487,7 +487,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR if(U(*pstgmed).pstm) { do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed); while(hres == S_OK); - ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08lx\n", hres); + ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08x\n", hres); } return S_OK; @@ -523,25 +523,25 @@ static void test_CreateAsyncBindCtx(void) BIND_OPTS bindopts; hres = CreateAsyncBindCtx(0, NULL, NULL, &bctx); - ok(hres == E_INVALIDARG, "CreateAsyncBindCtx failed. expected: E_INVALIDARG, got: %08lx\n", hres); + ok(hres == E_INVALIDARG, "CreateAsyncBindCtx failed. expected: E_INVALIDARG, got: %08x\n", hres); ok(bctx == (IBindCtx*)0x0ff00ff0, "bctx should not be changed\n"); hres = CreateAsyncBindCtx(0, NULL, NULL, NULL); - ok(hres == E_INVALIDARG, "CreateAsyncBindCtx failed. expected: E_INVALIDARG, got: %08lx\n", hres); + ok(hres == E_INVALIDARG, "CreateAsyncBindCtx failed. expected: E_INVALIDARG, got: %08x\n", hres); hres = CreateAsyncBindCtx(0, &bsc, NULL, &bctx); - ok(SUCCEEDED(hres), "CreateAsyncBindCtx failed: %08lx\n", hres); + ok(SUCCEEDED(hres), "CreateAsyncBindCtx failed: %08x\n", hres); bindopts.cbStruct = sizeof(bindopts); hres = IBindCtx_GetBindOptions(bctx, &bindopts); - ok(SUCCEEDED(hres), "IBindCtx_GetBindOptions failed: %08lx\n", hres); + ok(SUCCEEDED(hres), "IBindCtx_GetBindOptions failed: %08x\n", hres); ok(bindopts.grfFlags == BIND_MAYBOTHERUSER, - "bindopts.grfFlags = %08lx, expected: BIND_MAYBOTHERUSER\n", bindopts.grfFlags); + "bindopts.grfFlags = %08x, expected: BIND_MAYBOTHERUSER\n", bindopts.grfFlags); ok(bindopts.grfMode == (STGM_READWRITE | STGM_SHARE_EXCLUSIVE), - "bindopts.grfMode = %08lx, expected: STGM_READWRITE | STGM_SHARE_EXCLUSIVE\n", + "bindopts.grfMode = %08x, expected: STGM_READWRITE | STGM_SHARE_EXCLUSIVE\n", bindopts.grfMode); ok(bindopts.dwTickCountDeadline == 0, - "bindopts.dwTickCountDeadline = %08lx, expected: 0\n", bindopts.dwTickCountDeadline); + "bindopts.dwTickCountDeadline = %08x, expected: 0\n", bindopts.dwTickCountDeadline); ref = IBindCtx_Release(bctx); ok(ref == 0, "bctx should be destroyed here\n"); @@ -554,41 +554,41 @@ static void test_CreateAsyncBindCtxEx(void) HRESULT hres; hres = CreateAsyncBindCtxEx(NULL, 0, NULL, NULL, NULL, 0); - ok(hres == E_INVALIDARG, "CreateAsyncBindCtx failed: %08lx, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "CreateAsyncBindCtx failed: %08x, expected E_INVALIDARG\n", hres); hres = CreateAsyncBindCtxEx(NULL, 0, NULL, NULL, &bctx, 0); - ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08lx\n", hres); + ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08x\n", hres); if(SUCCEEDED(hres)) { bindopts.cbStruct = sizeof(bindopts); hres = IBindCtx_GetBindOptions(bctx, &bindopts); - ok(SUCCEEDED(hres), "IBindCtx_GetBindOptions failed: %08lx\n", hres); + ok(SUCCEEDED(hres), "IBindCtx_GetBindOptions failed: %08x\n", hres); ok(bindopts.grfFlags == BIND_MAYBOTHERUSER, - "bindopts.grfFlags = %08lx, expected: BIND_MAYBOTHERUSER\n", bindopts.grfFlags); + "bindopts.grfFlags = %08x, expected: BIND_MAYBOTHERUSER\n", bindopts.grfFlags); ok(bindopts.grfMode == (STGM_READWRITE | STGM_SHARE_EXCLUSIVE), - "bindopts.grfMode = %08lx, expected: STGM_READWRITE | STGM_SHARE_EXCLUSIVE\n", + "bindopts.grfMode = %08x, expected: STGM_READWRITE | STGM_SHARE_EXCLUSIVE\n", bindopts.grfMode); ok(bindopts.dwTickCountDeadline == 0, - "bindopts.dwTickCountDeadline = %08lx, expected: 0\n", bindopts.dwTickCountDeadline); + "bindopts.dwTickCountDeadline = %08x, expected: 0\n", bindopts.dwTickCountDeadline); IBindCtx_Release(bctx); } CreateBindCtx(0, &bctx_arg); hres = CreateAsyncBindCtxEx(NULL, 0, NULL, NULL, &bctx, 0); - ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08lx\n", hres); + ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08x\n", hres); if(SUCCEEDED(hres)) { bindopts.cbStruct = sizeof(bindopts); hres = IBindCtx_GetBindOptions(bctx, &bindopts); - ok(SUCCEEDED(hres), "IBindCtx_GetBindOptions failed: %08lx\n", hres); + ok(SUCCEEDED(hres), "IBindCtx_GetBindOptions failed: %08x\n", hres); ok(bindopts.grfFlags == BIND_MAYBOTHERUSER, - "bindopts.grfFlags = %08lx, expected: BIND_MAYBOTHERUSER\n", bindopts.grfFlags); + "bindopts.grfFlags = %08x, expected: BIND_MAYBOTHERUSER\n", bindopts.grfFlags); ok(bindopts.grfMode == (STGM_READWRITE | STGM_SHARE_EXCLUSIVE), - "bindopts.grfMode = %08lx, expected: STGM_READWRITE | STGM_SHARE_EXCLUSIVE\n", + "bindopts.grfMode = %08x, expected: STGM_READWRITE | STGM_SHARE_EXCLUSIVE\n", bindopts.grfMode); ok(bindopts.dwTickCountDeadline == 0, - "bindopts.dwTickCountDeadline = %08lx, expected: 0\n", bindopts.dwTickCountDeadline); + "bindopts.dwTickCountDeadline = %08x, expected: 0\n", bindopts.dwTickCountDeadline); IBindCtx_Release(bctx); } @@ -596,7 +596,7 @@ static void test_CreateAsyncBindCtxEx(void) IBindCtx_Release(bctx_arg); hres = CreateAsyncBindCtxEx(NULL, 0, &bsc, NULL, &bctx, 0); - ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08lx\n", hres); + ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08x\n", hres); if(SUCCEEDED(hres)) IBindCtx_Release(bctx); @@ -614,18 +614,18 @@ static void test_BindToStorage(void) IBinding *bind; hres = CreateAsyncBindCtx(0, &bsc, NULL, &bctx); - ok(SUCCEEDED(hres), "CreateAsyncBindCtx failed: %08lx\n\n", hres); + ok(SUCCEEDED(hres), "CreateAsyncBindCtx failed: %08x\n\n", hres); if(FAILED(hres)) return; hres = RegisterBindStatusCallback(bctx, &bsc, &previousclb, 0); - ok(SUCCEEDED(hres), "RegisterBindStatusCallback failed: %08lx\n", hres); + ok(SUCCEEDED(hres), "RegisterBindStatusCallback failed: %08x\n", hres); ok(previousclb == &bsc, "previousclb(%p) != sclb(%p)\n", previousclb, &bsc); if(previousclb) IBindStatusCallback_Release(previousclb); hres = CreateURLMoniker(NULL, urls[test_protocol], &mon); - ok(SUCCEEDED(hres), "failed to create moniker: %08lx\n", hres); + ok(SUCCEEDED(hres), "failed to create moniker: %08x\n", hres); if(FAILED(hres)) { IBindCtx_Release(bctx); return; @@ -640,7 +640,7 @@ static void test_BindToStorage(void) IBinding_Release(bind); hres = IMoniker_GetDisplayName(mon, bctx, NULL, &display_name); - ok(hres == S_OK, "GetDisplayName failed %08lx\n", hres); + ok(hres == S_OK, "GetDisplayName failed %08x\n", hres); ok(!lstrcmpW(display_name, urls[test_protocol]), "GetDisplayName got wrong name\n"); SET_EXPECT(GetBindInfo); @@ -670,7 +670,7 @@ static void test_BindToStorage(void) trace( "Network unreachable, skipping tests\n" ); return; } - ok(SUCCEEDED(hres), "IMoniker_BindToStorage failed: %08lx\n", hres); + ok(SUCCEEDED(hres), "IMoniker_BindToStorage failed: %08x\n", hres); if (!SUCCEEDED(hres)) return; if(test_protocol == HTTP_TEST) { @@ -755,15 +755,15 @@ static void test_BindToStorage_fail(void) HRESULT hres; hres = CreateURLMoniker(NULL, ABOUT_BLANK, &mon); - ok(hres == S_OK, "CreateURLMoniker failed: %08lx\n", hres); + ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); if(FAILED(hres)) return; hres = CreateAsyncBindCtxEx(NULL, 0, NULL, NULL, &bctx, 0); - ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08lx\n", hres); + ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08x\n", hres); hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); - ok(hres == MK_E_SYNTAX, "hres=%08lx, expected INET_E_SYNTAX\n", hres); + ok(hres == MK_E_SYNTAX, "hres=%08x, expected INET_E_SYNTAX\n", hres); IBindCtx_Release(bctx);