Jacek Caban : urlmon: Use pluggable protocol handler for https binding.
Alexandre Julliard
julliard at winehq.org
Tue Jan 13 10:56:37 CST 2009
Module: wine
Branch: master
Commit: 1876f46bcf4aaa9c66878f0694df7030895d19ed
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1876f46bcf4aaa9c66878f0694df7030895d19ed
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Jan 12 18:20:21 2009 +0100
urlmon: Use pluggable protocol handler for https binding.
---
dlls/urlmon/umon.c | 32 +-------------------------------
1 files changed, 1 insertions(+), 31 deletions(-)
diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c
index 01266dd..b5ffa2a 100644
--- a/dlls/urlmon/umon.c
+++ b/dlls/urlmon/umon.c
@@ -532,7 +532,6 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc,
if(SUCCEEDED(hres)) {
URL_COMPONENTSW url;
WCHAR *host, *path, *user, *pass;
- DWORD lensz = sizeof(bind->expected_size);
DWORD dwService = 0;
BOOL bSuccess;
@@ -597,12 +596,6 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc,
url.nPort = INTERNET_DEFAULT_GOPHER_PORT;
dwService = INTERNET_SERVICE_GOPHER;
break;
-
- case INTERNET_SCHEME_HTTPS:
- if (!url.nPort)
- url.nPort = INTERNET_DEFAULT_HTTPS_PORT;
- dwService = INTERNET_SERVICE_HTTP;
- break;
}
bind->hconnect = InternetConnectW(bind->hinternet, host, url.nPort, user, pass,
@@ -648,28 +641,6 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc,
else
hres = HRESULT_FROM_WIN32(GetLastError());
break;
-
- case INTERNET_SERVICE_HTTP:
- bind->hrequest = HttpOpenRequestW(bind->hconnect, NULL, path, NULL, NULL, NULL, 0, (DWORD_PTR)bind);
- if (!bind->hrequest)
- {
- hres = HRESULT_FROM_WIN32(GetLastError());
- }
- else if (!HttpSendRequestW(bind->hrequest, NULL, 0, NULL, 0))
- {
- hres = HRESULT_FROM_WIN32(GetLastError());
- InternetCloseHandle(bind->hrequest);
- }
- else
- {
- HttpQueryInfoW(bind->hrequest,
- HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER,
- &bind->expected_size,
- &lensz,
- NULL);
- bSuccess = TRUE;
- }
- break;
}
if(bSuccess)
{
@@ -734,8 +705,7 @@ static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface,
}
if(IsEqualGUID(&IID_IStream, riid) &&
- ( url.nScheme == INTERNET_SCHEME_HTTPS
- || url.nScheme == INTERNET_SCHEME_FTP
+ ( url.nScheme == INTERNET_SCHEME_FTP
|| url.nScheme == INTERNET_SCHEME_GOPHER))
return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, ppvObject);
More information about the wine-cvs
mailing list