Author: akhaldi
Date: Thu Aug 18 10:46:40 2016
New Revision: 72310
URL: http://svn.reactos.org/svn/reactos?rev=72310&view=rev
Log:
[URLMON_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866
Modified:
trunk/rostests/winetests/urlmon/misc.c
trunk/rostests/winetests/urlmon/protocol.c
trunk/rostests/winetests/urlmon/stream.c
trunk/rostests/winetests/urlmon/url.c
Modified: trunk/rostests/winetests/urlmon/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/misc.c?rev=72310&r1=72309&r2=72310&view=diff
==============================================================================
--- trunk/rostests/winetests/urlmon/misc.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/urlmon/misc.c [iso-8859-1] Thu Aug 18
10:46:40 2016
@@ -1642,7 +1642,7 @@
ok(mon != NULL, "mon == NULL\n");
hres = IMoniker_GetDisplayName(mon, NULL, 0, &name);
- ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres);
+ ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres);
ok(!lstrcmpW(name, url9), "wrong display name %s\n", wine_dbgstr_w(name));
CoTaskMemFree(name);
Modified: trunk/rostests/winetests/urlmon/protocol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol.c?rev=72310&r1=72309&r2=72310&view=diff
==============================================================================
--- trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] Thu Aug 18
10:46:40 2016
@@ -2585,9 +2585,7 @@
hres = IInternetProtocol_UnlockRequest(protocol);
ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres);
hres = IInternetProtocol_Read(protocol, buf, 2, &cb);
- if(file_with_hash) /* FIXME: An effect of UnlockRequest call? */
- todo_wine ok(hres == S_OK, "Read failed: %08x\n", hres);
- else
+ todo_wine_if(file_with_hash) /* FIXME: An effect of UnlockRequest
call? */
ok(hres == S_OK, "Read failed: %08x\n", hres);
hres = IInternetProtocol_Terminate(protocol, 0);
ok(hres == S_OK, "Terminate failed: %08x\n", hres);
Modified: trunk/rostests/winetests/urlmon/stream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/stream.c?rev=72310&r1=72309&r2=72310&view=diff
==============================================================================
--- trunk/rostests/winetests/urlmon/stream.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/urlmon/stream.c [iso-8859-1] Thu Aug 18
10:46:40 2016
@@ -333,6 +333,21 @@
ok(pStream != NULL, "pStream is NULL\n");
if(pStream)
{
+ buffer[0] = 0;
+ hr = IStream_Read(pStream, buffer, sizeof(buffer), NULL);
+ ok(hr == S_OK, "IStream_Read failed with error 0x%08x\n", hr);
+ ok(!memcmp(buffer, szHtmlDoc, sizeof(szHtmlDoc)-1), "read data differs
from file\n");
+
+ IStream_Release(pStream);
+ }
+
+ hr = URLOpenBlockingStreamW(NULL, INDEX_HTML, &pStream, 0, NULL);
+ ok(hr == S_OK, "URLOpenBlockingStreamW failed with error 0x%08x\n", hr);
+
+ ok(pStream != NULL, "pStream is NULL\n");
+ if(pStream)
+ {
+ buffer[0] = 0;
hr = IStream_Read(pStream, buffer, sizeof(buffer), NULL);
ok(hr == S_OK, "IStream_Read failed with error 0x%08x\n", hr);
ok(!memcmp(buffer, szHtmlDoc, sizeof(szHtmlDoc)-1), "read data differs
from file\n");
@@ -370,6 +385,9 @@
CHECK_CALLED(OnProgress_ENDDOWNLOADDATA);
CHECK_CALLED(OnDataAvailable);
CHECK_CALLED(OnStopBinding);
+
+ hr = URLOpenStreamW(NULL, INDEX_HTML, 0, NULL);
+ ok(hr == S_OK, "URLOpenStreamW failed with error 0x%08x\n", hr);
}
START_TEST(stream)
Modified: trunk/rostests/winetests/urlmon/url.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/url.c?rev=72310&r1=72309&r2=72310&view=diff
==============================================================================
--- trunk/rostests/winetests/urlmon/url.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/urlmon/url.c [iso-8859-1] Thu Aug 18
10:46:40 2016
@@ -3095,14 +3095,10 @@
if(!no_callback) {
CLEAR_CALLED(QueryInterface_IBindStatusCallbackEx); /* IE 8 */
CHECK_CALLED(GetBindInfo);
- if(abort_start)
- todo_wine CHECK_CALLED(QueryInterface_IInternetProtocol);
- else
+ todo_wine_if(abort_start)
CHECK_CALLED(QueryInterface_IInternetProtocol);
if(!emulate_protocol) {
- if(abort_start)
- todo_wine CHECK_CALLED(QueryService_IInternetProtocol);
- else
+ todo_wine_if(abort_start)
CHECK_CALLED(QueryService_IInternetProtocol);
}
CHECK_CALLED(OnStartBinding);
