Commit 88ba91de authored by Alexandre Julliard's avatar Alexandre Julliard

msvcp60/tests: Fix printf format warnings on 64-bit.

parent 49482c95
...@@ -1424,7 +1424,7 @@ static void test_istream_tellg(void) ...@@ -1424,7 +1424,7 @@ static void test_istream_tellg(void)
call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &ss.base.base1, spos); call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &ss.base.base1, spos);
rpos = call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); rpos = call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos);
ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %Id found = %Id\n", tests[i].telloff_ss, tpos.off);
ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos);
ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos));
ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state);
...@@ -1453,7 +1453,7 @@ static void test_istream_tellg(void) ...@@ -1453,7 +1453,7 @@ static void test_istream_tellg(void)
call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wss.base.base1, spos); call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wss.base.base1, spos);
rpos = call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); rpos = call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos);
ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %Id found = %Id\n", tests[i].telloff_ss, tpos.off);
ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos);
ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos));
ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state);
...@@ -1488,7 +1488,7 @@ static void test_istream_tellg(void) ...@@ -1488,7 +1488,7 @@ static void test_istream_tellg(void)
ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n",
wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos));
ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos);
ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %Id found %Id\n", tests[i].telloff_fs, tpos.off);
ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state);
call_func1(p_basic_fstream_char_vbase_dtor, &fs); call_func1(p_basic_fstream_char_vbase_dtor, &fs);
...@@ -1511,7 +1511,7 @@ static void test_istream_tellg(void) ...@@ -1511,7 +1511,7 @@ static void test_istream_tellg(void)
ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n",
wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos));
ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos);
ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %Id found %Id\n", tests[i].telloff_fs, tpos.off);
ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state);
call_func1(p_basic_fstream_wchar_vbase_dtor, &wfs); call_func1(p_basic_fstream_wchar_vbase_dtor, &wfs);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment