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

urlmon: Do not use BindToStorage_hack for INTERNET_SCHEME_HTTP.

This commit is contained in:
Misha Koshelev 2007-08-08 20:24:57 -05:00 committed by Alexandre Julliard
parent a893bb32d6
commit 42dea36e5a
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/urlmon/tests/url.c
View File

@ -641,12 +641,9 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR
download_state); download_state);
data_available = TRUE; data_available = TRUE;
if (0)
{
/* FIXME: Uncomment after removing BindToStorage hack. */
ok(pformatetc != NULL, "pformatetx == NULL\n"); ok(pformatetc != NULL, "pformatetx == NULL\n");
if(pformatetc) { if(pformatetc) {
if (mime_type[0]) { if (mime_type[0]) todo_wine {
clipfmt[0] = 0; clipfmt[0] = 0;
ok(GetClipboardFormatName(pformatetc->cfFormat, clipfmt, sizeof(clipfmt)-1), ok(GetClipboardFormatName(pformatetc->cfFormat, clipfmt, sizeof(clipfmt)-1),
"GetClipboardFormatName failed, error %d\n", GetLastError()); "GetClipboardFormatName failed, error %d\n", GetLastError());
@ -667,7 +664,6 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR
ok(U(*pstgmed).pstm != NULL, "pstm == NULL\n"); ok(U(*pstgmed).pstm != NULL, "pstm == NULL\n");
ok(pstgmed->pUnkForRelease != NULL, "pUnkForRelease == NULL\n"); ok(pstgmed->pUnkForRelease != NULL, "pUnkForRelease == NULL\n");
} }
}
if(U(*pstgmed).pstm) { if(U(*pstgmed).pstm) {
do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed); do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed);
@ -895,17 +891,16 @@ static void test_BindToStorage(int protocol, BOOL emul)
DispatchMessage(&msg); DispatchMessage(&msg);
} }
todo_wine CHECK_NOT_CALLED(QueryInterface_IServiceProvider);
CHECK_CALLED(GetBindInfo); CHECK_CALLED(GetBindInfo);
CHECK_CALLED(OnStartBinding); CHECK_CALLED(OnStartBinding);
if(emulate_protocol) { if(emulate_protocol) {
todo_wine CHECK_NOT_CALLED(QueryInterface_IServiceProvider);
CHECK_CALLED(Start); CHECK_CALLED(Start);
CHECK_CALLED(UnlockRequest); CHECK_CALLED(UnlockRequest);
}else { }else {
if(test_protocol == HTTP_TEST) { if(test_protocol == HTTP_TEST) {
CHECK_NOT_CALLED(QueryInterface_IServiceProvider); CHECK_CALLED(QueryInterface_IHttpNegotiate);
todo_wine CHECK_CALLED(QueryInterface_IHttpNegotiate); CHECK_CALLED(BeginningTransaction);
todo_wine CHECK_CALLED(BeginningTransaction);
/* QueryInterface_IHttpNegotiate2 and GetRootSecurityId /* QueryInterface_IHttpNegotiate2 and GetRootSecurityId
* called on WinXP but not on Win98 */ * called on WinXP but not on Win98 */
CLEAR_CALLED(QueryInterface_IHttpNegotiate2); CLEAR_CALLED(QueryInterface_IHttpNegotiate2);
@ -918,12 +913,9 @@ static void test_BindToStorage(int protocol, BOOL emul)
CHECK_NOT_CALLED(OnProgress_CONNECTING); CHECK_NOT_CALLED(OnProgress_CONNECTING);
} }
CHECK_CALLED(OnProgress_SENDINGREQUEST); CHECK_CALLED(OnProgress_SENDINGREQUEST);
todo_wine CHECK_CALLED(OnResponse); CHECK_CALLED(OnResponse);
todo_wine { CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); }
}else {
todo_wine CHECK_NOT_CALLED(QueryInterface_IServiceProvider);
CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE);
} }
CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE);
CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA);
if(test_protocol == HTTP_TEST) if(test_protocol == HTTP_TEST)
CLEAR_CALLED(OnProgress_DOWNLOADINGDATA); CLEAR_CALLED(OnProgress_DOWNLOADINGDATA);

9
dlls/urlmon/umon.c
View File

@ -617,12 +617,6 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName,
dwService = INTERNET_SERVICE_GOPHER; dwService = INTERNET_SERVICE_GOPHER;
break; break;
case INTERNET_SCHEME_HTTP:
if (!url.nPort)
url.nPort = INTERNET_DEFAULT_HTTP_PORT;
dwService = INTERNET_SERVICE_HTTP;
break;
case INTERNET_SCHEME_HTTPS: case INTERNET_SCHEME_HTTPS:
if (!url.nPort) if (!url.nPort)
url.nPort = INTERNET_DEFAULT_HTTPS_PORT; url.nPort = INTERNET_DEFAULT_HTTPS_PORT;
@ -755,8 +749,7 @@ static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface,
return E_FAIL; return E_FAIL;
} }
if(url.nScheme == INTERNET_SCHEME_HTTP if(url.nScheme== INTERNET_SCHEME_HTTPS
|| url.nScheme== INTERNET_SCHEME_HTTPS
|| url.nScheme== INTERNET_SCHEME_FTP || url.nScheme== INTERNET_SCHEME_FTP
|| url.nScheme == INTERNET_SCHEME_GOPHER) || url.nScheme == INTERNET_SCHEME_GOPHER)
return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, pmkToLeft, riid, ppvObject); return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, pmkToLeft, riid, ppvObject);