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

mshtml: Store scheme in nsWineURI instead of nsChannel.

This commit is contained in:
Jacek Caban 2012-07-20 12:36:02 +02:00 committed by Alexandre Julliard
parent 4870355aa2
commit cc533ecc2f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/mshtml/binding.h
View File

@ -47,7 +47,6 @@ typedef struct {
REQUEST_METHOD request_method;
struct list response_headers;
struct list request_headers;
UINT url_scheme;
} nsChannel;
typedef struct BSCallbackVtbl BSCallbackVtbl;

13
dlls/mshtml/nsio.c
View File

@ -65,6 +65,7 @@ struct nsWineURI {
IUriBuilder *uri_builder;
BOOL is_doc_uri;
BOOL is_mutable;
DWORD scheme;
};
static BOOL ensure_uri(nsWineURI *This)
@ -321,7 +322,7 @@ static void set_uri_window(nsWineURI *This, HTMLOuterWindow *window)
static inline BOOL is_http_channel(nsChannel *This)
{
return This->url_scheme == URL_SCHEME_HTTP || This->url_scheme == URL_SCHEME_HTTPS;
return This->uri->scheme == URL_SCHEME_HTTP || This->uri->scheme == URL_SCHEME_HTTPS;
}
static http_header_t *find_http_header(struct list *headers, const WCHAR *name, int len)
@ -2814,6 +2815,7 @@ static const nsIStandardURLVtbl nsStandardURLVtbl = {
static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container, nsWineURI **_retval)
{
nsWineURI *ret = heap_alloc_zero(sizeof(nsWineURI));
HRESULT hres;
ret->nsIURL_iface.lpVtbl = &nsURLVtbl;
ret->nsIStandardURL_iface.lpVtbl = &nsStandardURLVtbl;
@ -2826,6 +2828,10 @@ static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *c
IUri_AddRef(iuri);
ret->uri = iuri;
hres = IUri_GetScheme(iuri, &ret->scheme);
if(FAILED(hres))
ret->scheme = URL_SCHEME_UNKNOWN;
TRACE("retval=%p\n", ret);
*_retval = ret;
return NS_OK;
@ -2856,7 +2862,6 @@ HRESULT create_doc_uri(HTMLOuterWindow *window, WCHAR *url, nsWineURI **ret)
static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret)
{
nsChannel *channel;
HRESULT hres;
if(!ensure_uri(uri))
return NS_ERROR_UNEXPECTED;
@ -2876,10 +2881,6 @@ static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret)
nsIURL_AddRef(&uri->nsIURL_iface);
channel->uri = uri;
hres = IUri_GetScheme(uri->uri, &channel->url_scheme);
if(FAILED(hres))
channel->url_scheme = URL_SCHEME_UNKNOWN;
*ret = channel;
return NS_OK;
}