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

mshtml/tests: Don't use sizeof in ok() to avoid printf format warnings.

This commit is contained in:
Alexandre Julliard 2006-06-13 14:03:01 +02:00
parent be4dccb33f
commit 65459cb344
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/mshtml/tests/htmldoc.c
View File

@ -781,8 +781,7 @@ static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, DO
CHECK_EXPECT(GetHostInfo);
ok(pInfo != NULL, "pInfo=NULL\n");
if(pInfo) {
ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO), "pInfo->cbSize=%lu, expected %u\n",
pInfo->cbSize, sizeof(DOCHOSTUIINFO));
ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO), "pInfo->cbSize=%lu\n", pInfo->cbSize);
ok(!pInfo->dwFlags, "pInfo->dwFlags=%08lx, expected 0\n", pInfo->dwFlags);
pInfo->dwFlags = DOCHOSTUIFLAG_DISABLE_HELP_MENU | DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE
| DOCHOSTUIFLAG_ACTIVATE_CLIENTHIT_ONLY | DOCHOSTUIFLAG_ENABLE_INPLACE_NAVIGATION

15
dlls/mshtml/tests/protocol.c
View File

@ -296,16 +296,14 @@ static void test_res_protocol(void)
sizeof(buf)/sizeof(buf[0]), &size, 0);
ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08lx\n", hres);
ok(buf[0] == '?', "buf changed\n");
ok(size == sizeof(blank_url)/sizeof(WCHAR),
"size=%ld, ezpected %d\n", size, sizeof(wrong_url1)/sizeof(WCHAR));
ok(size == sizeof(blank_url)/sizeof(WCHAR), "size=%ld\n", size);
size = 0xdeadbeef;
hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_DOMAIN, 0, buf,
sizeof(buf)/sizeof(buf[0]), &size, 0);
ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08lx\n", hres);
ok(buf[0] == '?', "buf changed\n");
ok(size == sizeof(wrong_url1)/sizeof(WCHAR),
"size=%ld, ezpected %d\n", size, sizeof(wrong_url1)/sizeof(WCHAR));
ok(size == sizeof(wrong_url1)/sizeof(WCHAR), "size=%ld\n", size);
#if 0 /* Crashes on win9x */
size = 0xdeadbeef;
@ -473,8 +471,7 @@ static void test_about_protocol(void)
sizeof(buf)/sizeof(buf[0]), &size, 0);
ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08lx\n", hres);
ok(buf[0] == '?', "buf changed\n");
ok(size == sizeof(blank_url)/sizeof(WCHAR),
"size=%ld, expected %d\n", size, sizeof(blank_url)/sizeof(WCHAR));
ok(size == sizeof(blank_url)/sizeof(WCHAR), "size=%ld\n", size);
#if 0 /* Crashes on win9x */
size = 0xdeadbeef;
@ -521,7 +518,7 @@ static void test_about_protocol(void)
ok(hres == S_OK, "LockRequest failed: %08lx\n", hres);
hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb);
ok(hres == S_OK, "Read failed: %08lx\n", hres);
ok(cb == sizeof(blank_html), "cb=%ld, expected %d\n", cb, sizeof(blank_html));
ok(cb == sizeof(blank_html), "cb=%ld\n", cb);
ok(!memcmp(buf, blank_html, cb), "Readed wrong data\n");
hres = IInternetProtocol_UnlockRequest(protocol);
ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres);
@ -531,7 +528,7 @@ static void test_about_protocol(void)
ok(hres == S_OK, "LockRequest failed: %08lx\n", hres);
hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb);
ok(hres == S_OK, "Read failed: %08lx\n", hres);
ok(cb == sizeof(test_html), "cb=%ld, expected %d\n", cb, sizeof(test_html));
ok(cb == sizeof(test_html), "cb=%ld\n", cb);
ok(!memcmp(buf, test_html, cb), "Readed wrong data\n");
hres = IInternetProtocol_UnlockRequest(protocol);
ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres);
@ -541,7 +538,7 @@ static void test_about_protocol(void)
ok(hres == S_OK, "LockRequest failed: %08lx\n", hres);
hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb);
ok(hres == S_OK, "Read failed: %08lx\n", hres);
ok(cb == sizeof(blank_html), "cb=%ld, expected %d\n", cb, sizeof(blank_html));
ok(cb == sizeof(blank_html), "cb=%ld\n", cb);
ok(!memcmp(buf, blank_html, cb), "Readed wrong data\n");
hres = IInternetProtocol_UnlockRequest(protocol);
ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres);