Signed-off-by: Francois Gouget fgouget@free.fr --- dlls/urlmon/tests/stream.c | 4 ++-- dlls/urlmon/tests/url.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 6717198b311..bf8867290f8 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -204,7 +204,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { HRESULT hres; - DWORD readed; + DWORD read; BYTE buf[512];
CHECK_EXPECT2(OnDataAvailable); @@ -230,7 +230,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR }
if(U(*pstgmed).pstm) { - do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed); + do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &read); while(hres == S_OK); ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08x\n", hres); } diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 287eb2702e4..7c8d1abdb76 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1988,7 +1988,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { HRESULT hres; - DWORD readed; + DWORD read; BYTE buf[512]; CHAR clipfmt[512];
@@ -2075,8 +2075,8 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW
if(callback_read) { do { - hres = IStream_Read(stream, buf, 512, &readed); - if(test_protocol == HTTP_TEST && emulate_protocol && readed) + hres = IStream_Read(stream, buf, 512, &read); + if(test_protocol == HTTP_TEST && emulate_protocol && read) ok(buf[0] == (use_cache_file && !(bindf&BINDF_ASYNCHRONOUS) ? 'X' : '?'), "buf[0] = '%c'\n", buf[0]); }while(hres == S_OK); ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08x\n", hres); @@ -3245,7 +3245,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t)
if(unk) { BYTE buf[512]; - DWORD readed; + DWORD read; IStream *stream;
hres = IUnknown_QueryInterface(unk, &IID_IStream, (void**)&stream); @@ -3253,14 +3253,14 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) IUnknown_Release(unk);
do { - readed = 0xdeadbeef; - hres = IStream_Read(stream, buf, sizeof(buf), &readed); - ok(readed != 0xdeadbeef, "readed = 0xdeadbeef\n"); - if(emulate_protocol && test_protocol == HTTP_TEST && readed) + read = 0xdeadbeef; + hres = IStream_Read(stream, buf, sizeof(buf), &read); + ok(read != 0xdeadbeef, "read = 0xdeadbeef\n"); + if(emulate_protocol && test_protocol == HTTP_TEST && read) ok(buf[0] == (use_cache_file && !(bindf&BINDF_ASYNCHRONOUS) ? 'X' : '?'), "buf[0] = '%c'\n", buf[0]); }while(hres == S_OK); ok(hres == S_FALSE, "IStream_Read returned %08x\n", hres); - ok(!readed, "readed = %d\n", readed); + ok(!read, "read = %d\n", read);
IStream_Release(stream); }
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=61833
Your paranoid android.
=== w8adm (32 bit report) ===
urlmon: url.c:1484: Test failed: progress 32: status = 200 url.c:1484: Test failed: progress 1: status = 200 url.c:1484: Test failed: progress 2: status = 200 url.c:1484: Test failed: progress 32: status = 200 url.c:1484: Test failed: progress 32: status = 200 url.c:1484: Test failed: progress 32: status = 200 url.c:1484: Test failed: progress 32: status = 200 url.c:1484: Test failed: progress 32: status = 200 url.c:1484: Test failed: progress 32: status = 200 url.c:1480: Test failed: progress 2: hres = 1, expected 0 url.c:1484: Test failed: progress 32: status = 200 url.c:1484: Test failed: progress 32: status = 200
=== w864 (32 bit report) ===
urlmon: url.c:1484: Test failed: progress 32: status = 200
=== w1064v1507 (32 bit report) ===
urlmon: url.c:3675: Test failed: expected OnProgress_DOWNLOADINGDATA url.c:1879: Test failed: binding failed: 800c0006, expected 00000000 url.c:1890: Test failed: res = 00002f4f, expected 00000000 url.c:3209: Test failed: expected OnProgress_SENDINGREQUEST url.c:3217: Test failed: expected OnProgress_MIMETYPEAVAILABLE url.c:3218: Test failed: expected OnProgress_BEGINDOWNLOADDATA url.c:3219: Test failed: expected OnProgress_ENDDOWNLOADDATA url.c:3231: Test failed: expected OnDataAvailable
=== w1064v1809 (32 bit report) ===
urlmon: url.c:1484: Test failed: progress 32: status = 200 url.c:1484: Test failed: progress 2: status = 200
=== w1064v1809_2scr (32 bit report) ===
urlmon: url.c:1484: Test failed: progress 32: status = 200
=== w1064v1809_ar (32 bit report) ===
urlmon: url.c:3675: Test failed: expected OnProgress_DOWNLOADINGDATA
=== w1064v1809_he (32 bit report) ===
urlmon: url.c:3675: Test failed: expected OnProgress_DOWNLOADINGDATA
=== w1064v1809_ja (32 bit report) ===
urlmon: url.c:3675: Test failed: expected OnProgress_DOWNLOADINGDATA
=== w864 (64 bit report) ===
urlmon: url.c:1484: Test failed: progress 32: status = 200 url.c:1484: Test failed: progress 1: status = 200 url.c:1484: Test failed: progress 2: status = 200 url.c:1484: Test failed: progress 32: status = 200 url.c:1484: Test failed: progress 32: status = 200 url.c:1484: Test failed: progress 32: status = 200
=== w1064v1507 (64 bit report) ===
urlmon: url.c:1484: Test failed: progress 32: status = 200 url.c:1484: Test failed: progress 1: status = 200 url.c:1484: Test failed: progress 2: status = 200 url.c:3675: Test failed: expected OnProgress_DOWNLOADINGDATA url.c:1879: Test failed: binding failed: 800c0006, expected 00000000 url.c:1890: Test failed: res = 00002f4f, expected 00000000 url.c:3209: Test failed: expected OnProgress_SENDINGREQUEST url.c:3217: Test failed: expected OnProgress_MIMETYPEAVAILABLE url.c:3218: Test failed: expected OnProgress_BEGINDOWNLOADDATA url.c:3219: Test failed: expected OnProgress_ENDDOWNLOADDATA url.c:3231: Test failed: expected OnDataAvailable
=== w1064v1809 (64 bit report) ===
urlmon: url.c:1484: Test failed: progress 32: status = 200 url.c:1484: Test failed: progress 32: status = 200
-
Francois Gouget -
Marvin