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

mshtml: Get rid of no longer needed is_doc_uri from nsWineURI.

Browse Source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2019-03-08 13:49:19 +01:00 committed by Alexandre Julliard
parent 24603b011a
commit 9c8162dba2
3 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/mshtml/binding.h
View File

@ -136,7 +136,6 @@ typedef struct {
HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN; HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN;
HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN; HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN;
nsresult on_start_uri_open(NSContainer*,nsIURI*,cpp_bool*) DECLSPEC_HIDDEN;
HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLSPEC_HIDDEN; HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLSPEC_HIDDEN;
HRESULT create_doc_uri(IUri*,nsWineURI**) DECLSPEC_HIDDEN; HRESULT create_doc_uri(IUri*,nsWineURI**) DECLSPEC_HIDDEN;
HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsIInputStream*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsIInputStream*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN;

7
dlls/mshtml/nsembed.c
View File

@ -1612,7 +1612,6 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener
NSContainer *This = impl_from_nsIURIContentListener(iface); NSContainer *This = impl_from_nsIURIContentListener(iface);
nsACString spec_str; nsACString spec_str;
const char *spec; const char *spec;
nsresult nsres;
nsACString_Init(&spec_str, NULL); nsACString_Init(&spec_str, NULL);
nsIURI_GetSpec(aURI, &spec_str); nsIURI_GetSpec(aURI, &spec_str);
@ -1622,11 +1621,7 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener
nsACString_Finish(&spec_str); nsACString_Finish(&spec_str);
nsres = on_start_uri_open(This, aURI, _retval); return This->content_listener
if(NS_FAILED(nsres))
return nsres;
return !*_retval && This->content_listener
? nsIURIContentListener_OnStartURIOpen(This->content_listener, aURI, _retval) ? nsIURIContentListener_OnStartURIOpen(This->content_listener, aURI, _retval)
: NS_OK; : NS_OK;
} }

31
dlls/mshtml/nsio.c
View File

@ -61,7 +61,6 @@ struct nsWineURI {
IUri *uri; IUri *uri;
IUriBuilder *uri_builder; IUriBuilder *uri_builder;
char *origin_charset; char *origin_charset;
BOOL is_doc_uri;
BOOL is_mutable; BOOL is_mutable;
DWORD scheme; DWORD scheme;
}; };
@ -3376,17 +3375,7 @@ static nsresult create_nsuri(IUri *iuri, const char *origin_charset, nsWineURI *
HRESULT create_doc_uri(IUri *iuri, nsWineURI **ret) HRESULT create_doc_uri(IUri *iuri, nsWineURI **ret)
{ {
nsWineURI *uri; return create_nsuri(iuri, NULL, ret);
nsresult nsres;
nsres = create_nsuri(iuri, NULL, &uri);
if(NS_FAILED(nsres))
return E_FAIL;
uri->is_doc_uri = TRUE;
*ret = uri;
return S_OK;
} }
static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret) static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret)
@ -3873,24 +3862,6 @@ static const nsIIOServiceHookVtbl nsIOServiceHookVtbl = {
static nsIIOServiceHook nsIOServiceHook = { &nsIOServiceHookVtbl }; static nsIIOServiceHook nsIOServiceHook = { &nsIOServiceHookVtbl };
nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, cpp_bool *_retval)
{
nsWineURI *wine_uri;
nsresult nsres;
*_retval = FALSE;
nsres = nsIURI_QueryInterface(uri, &IID_nsWineURI, (void**)&wine_uri);
if(NS_FAILED(nsres)) {
WARN("Could not get nsWineURI: %08x\n", nsres);
return NS_ERROR_NOT_IMPLEMENTED;
}
wine_uri->is_doc_uri = TRUE;
nsIFileURL_Release(&wine_uri->nsIFileURL_iface);
return NS_OK;
}
void init_nsio(nsIComponentManager *component_manager) void init_nsio(nsIComponentManager *component_manager)
{ {
nsIFactory *old_factory = NULL; nsIFactory *old_factory = NULL;