August 2010 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Moved update_window_doc to on_start_nsrequest and update callback' s document if needed.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 43302910e4d7a7485c24d7abaf455be93047a682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43302910e4d7a7485c24d7aba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:38:48 2010 +0200 mshtml: Moved update_window_doc to on_start_nsrequest and update callback's document if needed. --- dlls/mshtml/navigate.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 64830c3..086154f 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -964,7 +964,7 @@ struct nsChannelBSC { nsProtocolStream *nsstream; }; -static void on_start_nsrequest(nsChannelBSC *This) +static HRESULT on_start_nsrequest(nsChannelBSC *This) { nsresult nsres; @@ -974,8 +974,20 @@ static void on_start_nsrequest(nsChannelBSC *This) nsres = nsIStreamListener_OnStartRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); - if(NS_FAILED(nsres)) + if(NS_FAILED(nsres)) { FIXME("OnStartRequest failed: %08x\n", nsres); + return E_FAIL; + } + + if(This->window) { + update_window_doc(This->window); + if(This->window->doc != This->bsc.doc) + This->bsc.doc = This->window->doc; + if(This->window->readystate != READYSTATE_LOADING) + set_ready_state(This->window, READYSTATE_LOADING); + } + + return S_OK; } static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) @@ -1054,12 +1066,6 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) } on_start_nsrequest(This); - - if(This->window) { - update_window_doc(This->window); - if(This->window->readystate != READYSTATE_LOADING) - set_ready_state(This->window, READYSTATE_LOADING); - } } This->bsc.readed += This->nsstream->buf_size;

1 0

Jacek Caban : mshtml: Skip mutation notifications on documents that are being replaced.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 3c421a813a03788bf4b0c6240aa86eb54e01d39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c421a813a03788bf4b0c6240… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:39:04 2010 +0200 mshtml: Skip mutation notifications on documents that are being replaced. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 3 +++ dlls/mshtml/navigate.c | 5 +++++ dlls/mshtml/nsio.c | 6 +++++- 4 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e1193e3..e4e074a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -586,6 +586,7 @@ struct HTMLDocumentNode { nsDocumentEventListener *nsevent_listener; BOOL *event_vector; + BOOL skip_mutation_notif; mutation_queue_t *mutation_queue; mutation_queue_t *mutation_queue_tail; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 73a510f..8cf43fb 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -558,6 +558,9 @@ static void NSAPI nsDocumentObserver_EndLoad(nsIDocumentObserver *iface, nsIDocu TRACE("\n"); + if(This->skip_mutation_notif) + return; + This->content_ready = TRUE; push_mutation_queue(This, MUTATION_ENDLOAD, NULL); } diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 086154f..60e67d0 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1105,6 +1105,11 @@ static void nsChannelBSC_destroy(BSCallback *bsc) static HRESULT nsChannelBSC_start_binding(BSCallback *bsc) { + nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + + if(This->window) + This->window->doc->skip_mutation_notif = FALSE; + return S_OK; } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 758bac0..308f0e4 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -159,6 +159,7 @@ HRESULT load_nsuri(HTMLWindow *window, nsWineURI *uri, nsChannelBSC *channelbsc, { nsIWebNavigation *web_navigation; nsIDocShell *doc_shell; + HTMLDocumentNode *doc; nsresult nsres; nsres = get_nsinterface((nsISupports*)window->nswindow, &IID_nsIWebNavigation, (void**)&web_navigation); @@ -174,9 +175,12 @@ HRESULT load_nsuri(HTMLWindow *window, nsWineURI *uri, nsChannelBSC *channelbsc, return E_FAIL; } - uri->channel_bsc = channelbsc; + doc = window->doc; + doc->skip_mutation_notif = TRUE; nsres = nsIDocShell_LoadURI(doc_shell, NSURI(uri), NULL, flags, FALSE); + if(doc == window->doc) + doc->skip_mutation_notif = FALSE; uri->channel_bsc = NULL; nsIDocShell_Release(doc_shell); if(NS_FAILED(nsres)) {

1 0

Jacek Caban : mshtml: Call on_stop_nsrequest asynchronously.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: d607976a7446107528b2c68fc82272718547aa92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d607976a7446107528b2c68fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:39:15 2010 +0200 mshtml: Call on_stop_nsrequest asynchronously. --- dlls/mshtml/navigate.c | 55 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 41 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 60e67d0..2ddadae 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1142,23 +1142,46 @@ static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) return S_OK; } -static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) +typedef struct { + task_t header; + nsChannelBSC *bsc; +} stop_request_task_t; + +static void stop_request_proc(task_t *_task) { - nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + stop_request_task_t *task = (stop_request_task_t*)_task; - on_stop_nsrequest(This, result); + TRACE("(%p)\n", task->bsc); - if(This->nslistener) { - if(This->nschannel->load_group) { - nsresult nsres; + on_stop_nsrequest(task->bsc, S_OK); + IBindStatusCallback_Release(STATUSCLB(&task->bsc->bsc)); +} - nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group, - (nsIRequest*)NSCHANNEL(This->nschannel), NULL, NS_OK); - if(NS_FAILED(nsres)) - ERR("RemoveRequest failed: %08x\n", nsres); - } +static HRESULT async_stop_request(nsChannelBSC *This) +{ + stop_request_task_t *task; + + task = heap_alloc(sizeof(*task)); + if(!task) + return E_OUTOFMEMORY; + + IBindStatusCallback_AddRef(STATUSCLB(&This->bsc)); + task->bsc = This; + push_task(&task->header, stop_request_proc, This->bsc.doc->basedoc.doc_obj->basedoc.task_magic); + return S_OK; +} + +static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) +{ + nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + + if(This->window && SUCCEEDED(result)) { + result = async_stop_request(This); + if(SUCCEEDED(result)) + return S_OK; } + on_stop_nsrequest(This, result); return S_OK; } @@ -1382,7 +1405,7 @@ void abort_document_bindings(HTMLDocumentNode *doc) HRESULT channelbsc_load_stream(nsChannelBSC *bscallback, IStream *stream) { - HRESULT hres; + HRESULT hres = S_OK; if(!bscallback->nschannel) { ERR("NULL nschannel\n"); @@ -1393,8 +1416,12 @@ HRESULT channelbsc_load_stream(nsChannelBSC *bscallback, IStream *stream) if(!bscallback->nschannel->content_type) return E_OUTOFMEMORY; - hres = read_stream_data(bscallback, stream); - IBindStatusCallback_OnStopBinding(STATUSCLB(&bscallback->bsc), hres, ERROR_SUCCESS); + if(stream) + hres = read_stream_data(bscallback, stream); + if(SUCCEEDED(hres)) + hres = async_stop_request(bscallback); + if(FAILED(hres)) + IBindStatusCallback_OnStopBinding(STATUSCLB(&bscallback->bsc), hres, ERROR_SUCCESS); return hres; }

1 0

Jacek Caban : mshtml: Avoid asynchronous parse_complete call.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 8507db18a88a176a91ec6cc73f91a726de89e255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8507db18a88a176a91ec6cc73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:39:29 2010 +0200 mshtml: Avoid asynchronous parse_complete call. --- dlls/mshtml/mutation.c | 29 ++++++++--------------------- 1 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 8cf43fb..edcb2cc 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -312,10 +312,8 @@ static void call_explorer_69(HTMLDocumentObj *doc) FIXME("handle result\n"); } -static void parse_complete_proc(task_t *task) +static void parse_complete(HTMLDocumentObj *doc) { - HTMLDocumentObj *doc = ((docobj_task_t*)task)->doc; - TRACE("(%p)\n", doc); if(doc->usermode == EDITMODE) @@ -328,35 +326,24 @@ static void parse_complete_proc(task_t *task) call_explorer_69(doc); /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ - - set_ready_state(doc->basedoc.window, READYSTATE_INTERACTIVE); } static void handle_end_load(HTMLDocumentNode *This) { - docobj_task_t *task; - TRACE("\n"); if(!This->basedoc.doc_obj) return; - if(This != This->basedoc.doc_obj->basedoc.doc_node) { - set_ready_state(This->basedoc.window, READYSTATE_INTERACTIVE); - return; + if(This == This->basedoc.doc_obj->basedoc.doc_node) { + /* + * This should be done in the worker thread that parses HTML, + * but we don't have such thread (Gecko parses HTML for us). + */ + parse_complete(This->basedoc.doc_obj); } - task = heap_alloc(sizeof(docobj_task_t)); - if(!task) - return; - - task->doc = This->basedoc.doc_obj; - - /* - * This should be done in the worker thread that parses HTML, - * but we don't have such thread (Gecko parses HTML for us). - */ - push_task(&task->header, &parse_complete_proc, This->basedoc.doc_obj->basedoc.task_magic); + set_ready_state(This->basedoc.window, READYSTATE_INTERACTIVE); } static nsresult NSAPI nsRunnable_Run(nsIRunnable *iface)

1 0

Jacek Caban : mshtml: Use QueryCommandState to get align state.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 3d3f223a7112c425bbe6c6cab8ecbc19d2f97162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3f223a7112c425bbe6c6cab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:36:55 2010 +0200 mshtml: Use QueryCommandState to get align state. --- dlls/mshtml/editor.c | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 14e7ebb..20d7d8f 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -180,25 +180,33 @@ static void set_ns_align(HTMLDocument *This, const char *align_str) nsICommandParams_Release(nsparam); } -static DWORD query_align_status(HTMLDocument *This, const char *align_str) +static DWORD query_align_status(HTMLDocument *This, const WCHAR *align) { - nsICommandParams *nsparam; - char *align = NULL; + DWORD ret = OLECMDF_SUPPORTED | OLECMDF_ENABLED; + nsIDOMNSHTMLDocument *nsdoc; + nsAString justify_str; + PRBool b; + nsresult nsres; if(This->doc_obj->usermode != EDITMODE || This->window->readystate < READYSTATE_INTERACTIVE) return OLECMDF_SUPPORTED; - if(This->doc_obj->nscontainer) { - nsparam = create_nscommand_params(); - get_ns_command_state(This->doc_obj->nscontainer, NSCMD_ALIGN, nsparam); - - nsICommandParams_GetCStringValue(nsparam, NSSTATE_ATTRIBUTE, &align); - nsICommandParams_Release(nsparam); + nsres = nsIDOMHTMLDocument_QueryInterface(This->doc_node->nsdoc, &IID_nsIDOMNSHTMLDocument, + (void**)&nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSHTMLDocument iface: %08x\n", nsres); + return 0; } - return OLECMDF_SUPPORTED | OLECMDF_ENABLED - | (align && !strcmp(align_str, align) ? OLECMDF_LATCHED : 0); + nsAString_Init(&justify_str, align); + nsres = nsIDOMNSHTMLDocument_QueryCommandState(nsdoc, &justify_str, &b); + nsAString_Finish(&justify_str); + if(NS_SUCCEEDED(nsres) && b) + ret |= OLECMDF_LATCHED; + + nsIDOMNSHTMLDocument_Release(nsdoc); + return ret; } @@ -704,10 +712,13 @@ static HRESULT exec_italic(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VA static HRESULT query_justify(HTMLDocument *This, OLECMD *cmd) { + static const PRUnichar justifycenterW[] = {'j','u','s','t','i','f','y','c','e','n','t','e','r',0}; + static const PRUnichar justifyrightW[] = {'j','u','s','t','i','f','y','r','i','g','h','t',0}; + switch(cmd->cmdID) { case IDM_JUSTIFYCENTER: TRACE("(%p) IDM_JUSTIFYCENTER\n", This); - cmd->cmdf = query_align_status(This, NSALIGN_CENTER); + cmd->cmdf = query_align_status(This, justifycenterW); break; case IDM_JUSTIFYLEFT: TRACE("(%p) IDM_JUSTIFYLEFT\n", This); @@ -719,7 +730,7 @@ static HRESULT query_justify(HTMLDocument *This, OLECMD *cmd) break; case IDM_JUSTIFYRIGHT: TRACE("(%p) IDM_JUSTIFYRIGHT\n", This); - cmd->cmdf = query_align_status(This, NSALIGN_RIGHT); + cmd->cmdf = query_align_status(This, justifyrightW); break; }

1 0

Jacek Caban : mshtml: Added nsIHttpChannel::referrer implementation.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: eec86f64c4cbe2528c86b402fd32be2dccd3a1cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eec86f64c4cbe2528c86b402f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:37:08 2010 +0200 mshtml: Added nsIHttpChannel::referrer implementation. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsio.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ee92806..7d4d00a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -468,6 +468,7 @@ typedef struct { nsISupports *owner; nsLoadFlags load_flags; nsIURI *original_uri; + nsIURI *referrer; char *content_type; char *charset; PRUint32 response_status; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d288a6b..46988f6 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -491,6 +491,8 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) nsIInterfaceRequestor_Release(This->notif_callback); if(This->original_uri) nsIURI_Release(This->original_uri); + if(This->referrer) + nsIURI_Release(This->referrer); free_http_headers(&This->response_headers); free_http_headers(&This->request_headers); @@ -1072,17 +1074,25 @@ static nsresult NSAPI nsChannel_GetReferrer(nsIHttpChannel *iface, nsIURI **aRef { nsChannel *This = NSCHANNEL_THIS(iface); - FIXME("(%p)->(%p)\n", This, aReferrer); + TRACE("(%p)->(%p)\n", This, aReferrer); - return NS_ERROR_NOT_IMPLEMENTED; + if(This->referrer) + nsIURI_AddRef(This->referrer); + *aReferrer = This->referrer; + return NS_OK; } static nsresult NSAPI nsChannel_SetReferrer(nsIHttpChannel *iface, nsIURI *aReferrer) { nsChannel *This = NSCHANNEL_THIS(iface); - FIXME("(%p)->(%p)\n", This, aReferrer); + TRACE("(%p)->(%p)\n", This, aReferrer); + if(aReferrer) + nsIURI_AddRef(aReferrer); + if(This->referrer) + nsIURI_Release(This->referrer); + This->referrer = aReferrer; return NS_OK; }

1 0

Jacek Caban : mshtml: Treat file URLs pointing to Gecko installation directory as special URIs.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 5068249cbe6e100c64fb6e6a22d0163c2810fc56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5068249cbe6e100c64fb6e6a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:37:21 2010 +0200 mshtml: Treat file URLs pointing to Gecko installation directory as special URIs. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 30 ++++++++++++++++++++++++++++++ dlls/mshtml/nsio.c | 7 +++++++ 3 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7d4d00a..d501da3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -726,6 +726,7 @@ void register_nsservice(nsIComponentRegistrar*,nsIServiceManager*); void init_nsio(nsIComponentManager*,nsIComponentRegistrar*); void release_nsio(void); BOOL install_wine_gecko(BOOL); +BOOL is_gecko_path(const char*); HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*); HRESULT create_doc_uri(HTMLWindow*,WCHAR*,nsWineURI**); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index f0eb101..4b7cada 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -74,6 +74,8 @@ static nsIMemory *nsmem = NULL; static const WCHAR wszNsContainer[] = {'N','s','C','o','n','t','a','i','n','e','r',0}; static ATOM nscontainer_class; +static WCHAR gecko_path[MAX_PATH]; +static unsigned gecko_path_len; static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -411,6 +413,7 @@ static BOOL init_xpcom(const PRUnichar *gre_path) nsIComponentRegistrar *registrar = NULL; nsAString path; nsIFile *gre_dir; + WCHAR *ptr; nsAString_InitDepend(&path, gre_path); nsres = NS_NewLocalFile(&path, FALSE, &gre_dir); @@ -428,6 +431,13 @@ static BOOL init_xpcom(const PRUnichar *gre_path) return FALSE; } + strcpyW(gecko_path, gre_path); + for(ptr = gecko_path; *ptr; ptr++) { + if(*ptr == '\\') + *ptr = '/'; + } + gecko_path_len = ptr-gecko_path; + nsres = nsIServiceManager_QueryInterface(pServMgr, &IID_nsIComponentManager, (void**)&pCompMgr); if(NS_FAILED(nsres)) ERR("Could not get nsIComponentManager: %08x\n", nsres); @@ -788,6 +798,26 @@ void close_gecko(void) /* if (hXPCOM) FreeLibrary(hXPCOM); */ } +BOOL is_gecko_path(const char *path) +{ + WCHAR *buf, *ptr; + BOOL ret; + + buf = heap_strdupAtoW(path); + if(strlenW(buf) < gecko_path_len) + return FALSE; + + buf[gecko_path_len] = 0; + for(ptr = buf; *ptr; ptr++) { + if(*ptr == '\\') + *ptr = '/'; + } + + ret = !strcmpiW(buf, gecko_path); + heap_free(buf); + return ret; +} + /********************************************************** * nsIWebBrowserChrome interface */ diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 46988f6..cdd1e24 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2566,6 +2566,13 @@ static BOOL is_gecko_special_uri(const char *spec) return TRUE; } + if(!strncasecmp(spec, "file:", 5)) { + const char *ptr = spec+5; + while(*ptr == '/') + ptr++; + return is_gecko_path(ptr); + } + return FALSE; }

1 0

Jacek Caban : mshtml: Added nsIURL::Resolve implementation.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: ceab38175077a28772ec591680153b08383090f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceab38175077a28772ec59168… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:37:32 2010 +0200 mshtml: Added nsIURL::Resolve implementation. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsio.c | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d501da3..e1193e3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -36,6 +36,7 @@ #define NS_OK ((nsresult)0x00000000L) #define NS_ERROR_FAILURE ((nsresult)0x80004005L) +#define NS_ERROR_OUT_OF_MEMORY ((nsresult)0x8007000EL) #define NS_NOINTERFACE ((nsresult)0x80004002L) #define NS_ERROR_NOT_IMPLEMENTED ((nsresult)0x80004001L) #define NS_ERROR_NOT_AVAILABLE ((nsresult)0x80040111L) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index cdd1e24..986cc76 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1925,18 +1925,44 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) return NS_OK; } -static nsresult NSAPI nsURI_Resolve(nsIURL *iface, const nsACString *arelativePath, +static nsresult NSAPI nsURI_Resolve(nsIURL *iface, const nsACString *aRelativePath, nsACString *_retval) { nsWineURI *This = NSURI_THIS(iface); + WCHAR url[INTERNET_MAX_URL_LENGTH]; + const char *patha; + WCHAR *path; + char *urla; + DWORD len; + HRESULT hres; - TRACE("(%p)->(%s %p)\n", This, debugstr_nsacstr(arelativePath), _retval); + TRACE("(%p)->(%s %p)\n", This, debugstr_nsacstr(aRelativePath), _retval); if(This->uri) - return nsIURI_Resolve(This->uri, arelativePath, _retval); + return nsIURI_Resolve(This->uri, aRelativePath, _retval); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + nsACString_GetData(aRelativePath, &patha); + path = heap_strdupAtoW(patha); + if(!path) + return NS_ERROR_OUT_OF_MEMORY; + + hres = CoInternetCombineUrl(This->wine_url, path, + URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, + url, sizeof(url)/sizeof(WCHAR), &len, 0); + heap_free(path); + if(FAILED(hres)) { + ERR("CoIntenetCombineUrl failed: %08x\n", hres); + return NS_ERROR_FAILURE; + } + + urla = heap_strdupWtoA(url); + if(!urla) + return NS_ERROR_OUT_OF_MEMORY; + + TRACE("returning %s\n", debugstr_a(urla)); + nsACString_SetData(_retval, urla); + heap_free(urla); + return NS_OK; } static nsresult NSAPI nsURI_GetAsciiSpec(nsIURL *iface, nsACString *aAsciiSpec)

1 0

Jacek Caban : mshtml: Use fake scheme only for about protocol in nsIURI:: GetScheme.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 793b021fd0133dda8d77d16def9e185054492500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=793b021fd0133dda8d77d16de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:37:56 2010 +0200 mshtml: Use fake scheme only for about protocol in nsIURI::GetScheme. --- dlls/mshtml/nsio.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 986cc76..d7b0989 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1623,11 +1623,20 @@ static nsresult NSAPI nsURI_GetScheme(nsIURL *iface, nsACString *aScheme) TRACE("(%p)->(%p)\n", This, aScheme); if(This->use_wine_url) { - /* - * For Gecko we set scheme to unknown so it won't be handled - * as any special case. - */ - nsACString_SetData(aScheme, "wine"); + char scheme[INTERNET_MAX_SCHEME_LENGTH+1]; + WCHAR *ptr; + int len; + + ptr = strchrW(This->wine_url, ':'); + if(!ptr) { + nsACString_SetData(aScheme, "wine"); + return NS_OK; + } + + len = WideCharToMultiByte(CP_ACP, 0, This->wine_url, ptr-This->wine_url, scheme, + sizeof(scheme), NULL, NULL); + scheme[min(len,sizeof(scheme)-1)] = 0; + nsACString_SetData(aScheme, strcmp(scheme, "about") ? scheme : "wine"); return NS_OK; }

1 0

Jacek Caban : mshtml: Return true spec in nsIURI::GetSpec.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: e83402122d87fb3b075fe4f83bf3cabe8d9daa3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e83402122d87fb3b075fe4f83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:38:07 2010 +0200 mshtml: Return true spec in nsIURI::GetSpec. --- dlls/mshtml/nsio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d7b0989..5332a02 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1575,8 +1575,8 @@ static nsresult NSAPI nsURI_GetSpec(nsIURL *iface, nsACString *aSpec) TRACE("(%p)->(%p)\n", This, aSpec); if(This->use_wine_url) { - char speca[INTERNET_MAX_URL_LENGTH] = "wine:"; - WideCharToMultiByte(CP_ACP, 0, This->wine_url, -1, speca+5, sizeof(speca)-5, NULL, NULL); + char speca[INTERNET_MAX_URL_LENGTH]; + WideCharToMultiByte(CP_ACP, 0, This->wine_url, -1, speca, sizeof(speca), NULL, NULL); nsACString_SetData(aSpec, speca); return NS_OK;

1 0