December 2009 - Wine-Commits

Jacek Caban : mshtml: Don't change nsIWineURI in OnStartBinding if it' s already marked as document URI.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: ec13e51087b66a29683ff3ae387046458dd57538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec13e51087b66a29683ff3ae3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:01:09 2009 +0100 mshtml: Don't change nsIWineURI in OnStartBinding if it's already marked as document URI. --- dlls/mshtml/nsembed.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2150a0f..a33f88d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1149,6 +1149,7 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener nsIWineURI *wine_uri; nsACString spec_str; const char *spec; + BOOL is_doc_uri; nsresult nsres; nsACString_Init(&spec_str, NULL); @@ -1165,30 +1166,34 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener return NS_ERROR_NOT_IMPLEMENTED; } - nsIWineURI_SetNSContainer(wine_uri, This); - nsIWineURI_SetIsDocumentURI(wine_uri, TRUE); + nsIWineURI_GetIsDocumentURI(wine_uri, &is_doc_uri); - if(This->bscallback) { - IMoniker *mon = get_channelbsc_mon(This->bscallback); + if(!is_doc_uri) { + nsIWineURI_SetNSContainer(wine_uri, This); + nsIWineURI_SetIsDocumentURI(wine_uri, TRUE); - if(mon) { - LPWSTR wine_url; - HRESULT hres; + if(This->bscallback) { + IMoniker *mon = get_channelbsc_mon(This->bscallback); - hres = IMoniker_GetDisplayName(mon, NULL, 0, &wine_url); - if(SUCCEEDED(hres)) { - nsIWineURI_SetWineURL(wine_uri, wine_url); - CoTaskMemFree(wine_url); - }else { - WARN("GetDisplayName failed: %08x\n", hres); + if(mon) { + LPWSTR wine_url; + HRESULT hres; + + hres = IMoniker_GetDisplayName(mon, NULL, 0, &wine_url); + if(SUCCEEDED(hres)) { + nsIWineURI_SetWineURL(wine_uri, wine_url); + CoTaskMemFree(wine_url); + }else { + WARN("GetDisplayName failed: %08x\n", hres); + } + + IMoniker_Release(mon); } - IMoniker_Release(mon); + *_retval = FALSE; + }else if(This->doc) { + *_retval = translate_url(This->doc->basedoc.doc_obj, wine_uri); } - - *_retval = FALSE; - }else if(This->doc) { - *_retval = translate_url(This->doc->basedoc.doc_obj, wine_uri); } nsIWineURI_Release(wine_uri);

1 0

Jacek Caban : mshtml: Added IHTMLScreen::get_colorDepth implementation.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: f8d8fbba46854243d23f83109e801a389eb75b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d8fbba46854243d23f83109… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 17:58:16 2009 +0100 mshtml: Added IHTMLScreen::get_colorDepth implementation. --- dlls/mshtml/htmlscreen.c | 7 +++++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscreen.c b/dlls/mshtml/htmlscreen.c index c1d1f92..cc3f4b2 100644 --- a/dlls/mshtml/htmlscreen.c +++ b/dlls/mshtml/htmlscreen.c @@ -127,8 +127,11 @@ static HRESULT WINAPI HTMLScreen_Invoke(IHTMLScreen *iface, DISPID dispIdMember, static HRESULT WINAPI HTMLScreen_get_colorDepth(IHTMLScreen *iface, LONG *p) { HTMLScreen *This = HTMLSCREEN_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = GetDeviceCaps(get_display_dc(), BITSPIXEL); + return S_OK; } static HRESULT WINAPI HTMLScreen_put_bufferDepth(IHTMLScreen *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a29a4c3..f370fe5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3069,6 +3069,12 @@ static void test_screen(IHTMLWindow2 *window) ok(hres == S_OK, "get_height failed: %08x\n", hres); ok(l == exl, "height = %d, expected %d\n", l, exl); + exl = GetDeviceCaps(hdc, BITSPIXEL); + l = 0xdeadbeef; + hres = IHTMLScreen_get_colorDepth(screen, &l); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(l == exl, "height = %d, expected %d\n", l, exl); + DeleteObject(hdc); IHTMLScreen_Release(screen);

1 0

Jacek Caban : mshtml: Added IHTMLScreen::get_height implementation.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: fd24068c8f35faf22d8b6ae46103888ff422508e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd24068c8f35faf22d8b6ae46… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 17:57:56 2009 +0100 mshtml: Added IHTMLScreen::get_height implementation. --- dlls/mshtml/htmlscreen.c | 7 +++++-- dlls/mshtml/tests/dom.c | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlscreen.c b/dlls/mshtml/htmlscreen.c index 3ed403f..c1d1f92 100644 --- a/dlls/mshtml/htmlscreen.c +++ b/dlls/mshtml/htmlscreen.c @@ -158,8 +158,11 @@ static HRESULT WINAPI HTMLScreen_get_width(IHTMLScreen *iface, LONG *p) static HRESULT WINAPI HTMLScreen_get_height(IHTMLScreen *iface, LONG *p) { HTMLScreen *This = HTMLSCREEN_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = GetDeviceCaps(get_display_dc(), VERTRES); + return S_OK; } static HRESULT WINAPI HTMLScreen_put_updateInterval(IHTMLScreen *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ff58013..a29a4c3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3058,12 +3058,17 @@ static void test_screen(IHTMLWindow2 *window) hdc = CreateICW(displayW, NULL, NULL, NULL); exl = GetDeviceCaps(hdc, HORZRES); - l = 0xdeadbeef; hres = IHTMLScreen_get_width(screen, &l); ok(hres == S_OK, "get_width failed: %08x\n", hres); ok(l == exl, "width = %d, expected %d\n", l, exl); + exl = GetDeviceCaps(hdc, VERTRES); + l = 0xdeadbeef; + hres = IHTMLScreen_get_height(screen, &l); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(l == exl, "height = %d, expected %d\n", l, exl); + DeleteObject(hdc); IHTMLScreen_Release(screen);

1 0

Jacek Caban : mshtml: Forward setting window.location to window.location. href.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 2c6c00a84fc96a70ce838a448ea38d88a8b6538e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6c00a84fc96a70ce838a448… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 17:58:37 2009 +0100 mshtml: Forward setting window.location to window.location.href. --- dlls/mshtml/htmlwindow.c | 55 +++++++++++++++++++++++++++++++++++++-------- dlls/mshtml/navigate.c | 5 ++++ 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f8a6938..cdbddb8 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "mshtmdid.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -100,6 +101,22 @@ static void release_children(HTMLWindow *This) } } +static HRESULT get_location(HTMLWindow *This, HTMLLocation **ret) +{ + if(This->location) { + IHTMLLocation_AddRef(HTMLLOCATION(This->location)); + }else { + HRESULT hres; + + hres = HTMLLocation_Create(This, &This->location); + if(FAILED(hres)) + return hres; + } + + *ret = This->location; + return S_OK; +} + #define HTMLWINDOW2_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow2, iface) static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) @@ -183,6 +200,9 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) IHTMLLocation_Release(HTMLLOCATION(This->location)); } + if(This->screen) + IHTMLScreen_Release(This->screen); + if(This->event_target) release_event_target(This->event_target); for(i=0; i < This->global_prop_cnt; i++) @@ -193,6 +213,10 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) heap_free(This->global_props); release_script_hosts(This); + + if(This->nswindow) + nsIDOMWindow_Release(This->nswindow); + list_remove(&This->entry); release_dispex(&This->dispex); heap_free(This); @@ -590,20 +614,16 @@ static HRESULT WINAPI HTMLWindow2_get_Image(IHTMLWindow2 *iface, IHTMLImageEleme static HRESULT WINAPI HTMLWindow2_get_location(IHTMLWindow2 *iface, IHTMLLocation **p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); + HTMLLocation *location; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - if(This->location) { - IHTMLLocation_AddRef(HTMLLOCATION(This->location)); - }else { - HRESULT hres; - - hres = HTMLLocation_Create(This, &This->location); - if(FAILED(hres)) - return hres; - } + hres = get_location(This, &location); + if(FAILED(hres)) + return hres; - *p = HTMLLOCATION(This->location); + *p = HTMLLOCATION(location); return S_OK; } @@ -1757,6 +1777,21 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if(id == DISPID_IHTMLWINDOW2_LOCATION && (wFlags & DISPATCH_PROPERTYPUT)) { + HTMLLocation *location; + HRESULT hres; + + TRACE("forwarding to location.href\n"); + + hres = get_location(This, &location); + if(FAILED(hres)) + return hres; + + hres = IDispatchEx_InvokeEx(DISPATCHEX(&location->dispex), DISPID_VALUE, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + IHTMLLocation_Release(HTMLLOCATION(location)); + return hres; + } + return IDispatchEx_InvokeEx(DISPATCHEX(&This->dispex), id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 727eaef..c6d398e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1246,6 +1246,11 @@ HRESULT navigate_url(HTMLDocumentNode *doc, OLECHAR *url) url = translated_url; } + if(doc != doc->basedoc.doc_obj->basedoc.doc_node) { + FIXME("navigation in frame\n"); + return E_NOTIMPL; + } + hres = hlink_frame_navigate(&doc->basedoc, url, NULL, 0); if(FAILED(hres)) FIXME("hlink_frame_navigate failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLElement2::get_readyState implementation.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 9881ec35eba98a4f8515fffadadf00eeeb682e38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9881ec35eba98a4f8515fffad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 17:58:59 2009 +0100 mshtml: Added IHTMLElement2::get_readyState implementation. --- dlls/mshtml/htmlelem2.c | 23 +++++++++++++++++++++-- dlls/mshtml/htmliframe.c | 10 +++++++++- dlls/mshtml/htmlimg.c | 17 +++++++++++++++-- dlls/mshtml/htmlscript.c | 17 +++++++++++++++-- dlls/mshtml/mshtml_private.h | 1 + 5 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index d001eaa..a42b73a 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -662,8 +662,27 @@ static HRESULT WINAPI HTMLElement2_detachEvent(IHTMLElement2 *iface, BSTR event, static HRESULT WINAPI HTMLElement2_get_readyState(IHTMLElement2 *iface, VARIANT *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + BSTR str; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->node.vtbl->get_readystate) { + HRESULT hres; + + hres = This->node.vtbl->get_readystate(&This->node, &str); + if(FAILED(hres)) + return hres; + }else { + static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0}; + + str = SysAllocString(completeW); + if(!str) + return E_OUTOFMEMORY; + } + + V_VT(p) = VT_BSTR; + V_BSTR(p) = str; + return S_OK; } static HRESULT WINAPI HTMLElement2_put_onreadystatechange(IHTMLElement2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 8c3c520..382e049 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -72,6 +72,13 @@ static HRESULT HTMLIFrame_get_document(HTMLDOMNode *iface, IDispatch **p) return S_OK; } +static HRESULT HTMLIFrame_get_readystate(HTMLDOMNode *iface, BSTR *p) +{ + HTMLIFrame *This = HTMLIFRAME_NODE_THIS(iface); + + return IHTMLFrameBase2_get_readyState(HTMLFRAMEBASE2(&This->framebase), p); +} + #undef HTMLIFRAME_NODE_THIS static const NodeImplVtbl HTMLIFrameImplVtbl = { @@ -81,7 +88,8 @@ static const NodeImplVtbl HTMLIFrameImplVtbl = { NULL, NULL, NULL, - HTMLIFrame_get_document + HTMLIFrame_get_document, + HTMLIFrame_get_readystate }; static const tid_t HTMLIFrame_iface_tids[] = { diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index bfccdd5..60333c6 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -39,7 +39,7 @@ typedef struct { nsIDOMHTMLImageElement *nsimg; } HTMLImgElement; -#define HTMLIMG(x) (&(x)->lpHTMLImgElementVtbl) +#define HTMLIMG(x) ((IHTMLImgElement*) &(x)->lpHTMLImgElementVtbl) #define HTMLIMG_THIS(iface) DEFINE_THIS(HTMLImgElement, HTMLImgElement, iface) @@ -572,11 +572,24 @@ static void HTMLImgElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } +static HRESULT HTMLImgElement_get_readystate(HTMLDOMNode *iface, BSTR *p) +{ + HTMLImgElement *This = HTMLIMG_NODE_THIS(iface); + + return IHTMLImgElement_get_readyState(HTMLIMG(This), p); +} + #undef HTMLIMG_NODE_THIS static const NodeImplVtbl HTMLImgElementImplVtbl = { HTMLImgElement_QI, - HTMLImgElement_destructor + HTMLImgElement_destructor, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLImgElement_get_readystate }; static const tid_t HTMLImgElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index a038c55..d86f398 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -39,7 +39,7 @@ typedef struct { nsIDOMHTMLScriptElement *nsscript; } HTMLScriptElement; -#define HTMLSCRIPT(x) (&(x)->lpHTMLScriptElementVtbl) +#define HTMLSCRIPT(x) ((IHTMLScriptElement*) &(x)->lpHTMLScriptElementVtbl) #define HTMLSCRIPT_THIS(iface) DEFINE_THIS(HTMLScriptElement, HTMLScriptElement, iface) @@ -299,11 +299,24 @@ static void HTMLScriptElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } +static HRESULT HTMLScriptElement_get_readystate(HTMLDOMNode *iface, BSTR *p) +{ + HTMLScriptElement *This = HTMLSCRIPT_NODE_THIS(iface); + + return IHTMLScriptElement_get_readyState(HTMLSCRIPT(This), p); +} + #undef HTMLSCRIPT_NODE_THIS static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_QI, - HTMLScriptElement_destructor + HTMLScriptElement_destructor, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLScriptElement_get_readystate }; HTMLElement *HTMLScriptElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d99fb54..cee256e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -449,6 +449,7 @@ typedef struct { HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); HRESULT (*get_document)(HTMLDOMNode*,IDispatch**); + HRESULT (*get_readystate)(HTMLDOMNode*,BSTR*); } NodeImplVtbl; struct HTMLDOMNode {

1 0

Jacek Caban : mshtml: Added support for relative URLs in navigate_url.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 679591ff87d2874aa94dad1194de01ac44cafaf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=679591ff87d2874aa94dad119… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:00:38 2009 +0100 mshtml: Added support for relative URLs in navigate_url. --- dlls/mshtml/htmllocation.c | 6 +++--- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/navigate.c | 42 ++++++++++++++++++++++++++---------------- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 3b91429..93df9e0 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -154,12 +154,12 @@ static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->window || !This->window->doc) { - FIXME("No document available\n"); + if(!This->window) { + FIXME("No window available\n"); return E_FAIL; } - return navigate_url(This->window->doc, v); + return navigate_url(This->window, v, This->window->url); } static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cee256e..5fed4af 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -668,7 +668,7 @@ BOOL install_wine_gecko(BOOL); HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*); HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD); -HRESULT navigate_url(HTMLDocumentNode*,OLECHAR*); +HRESULT navigate_url(HTMLWindow*,const WCHAR*,const WCHAR*); void call_property_onchanged(ConnectionPoint*,DISPID); HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index c6d398e..66be2fc 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -27,9 +27,12 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winreg.h" #include "ole2.h" #include "hlguids.h" #include "shlguid.h" +#include "wininet.h" +#include "shlwapi.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -41,8 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define CONTENT_LENGTH "Content-Length" #define UTF16_STR "utf-16" -static WCHAR emptyW[] = {0}; - typedef struct { const nsIInputStreamVtbl *lpInputStreamVtbl; @@ -1231,30 +1232,39 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, return hres; } -HRESULT navigate_url(HTMLDocumentNode *doc, OLECHAR *url) + +HRESULT navigate_url(HTMLWindow *window, const WCHAR *new_url, const WCHAR *base_url) { - OLECHAR *translated_url = NULL; + WCHAR url[INTERNET_MAX_URL_LENGTH]; HRESULT hres; - if(!url) - url = emptyW; + if(!new_url) { + *url = 0; + }else if(base_url) { + DWORD len = 0; - if(doc->basedoc.doc_obj->hostui) { - hres = IDocHostUIHandler_TranslateUrl(doc->basedoc.doc_obj->hostui, 0, url, - &translated_url); - if(hres == S_OK) - url = translated_url; + hres = CoInternetCombineUrl(base_url, new_url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, + url, sizeof(url)/sizeof(WCHAR), &len, 0); + if(FAILED(hres)) + return hres; + }else { + strcpyW(url, new_url); } - if(doc != doc->basedoc.doc_obj->basedoc.doc_node) { - FIXME("navigation in frame\n"); - return E_NOTIMPL; + if(window->doc_obj && window->doc_obj->hostui) { + OLECHAR *translated_url = NULL; + + hres = IDocHostUIHandler_TranslateUrl(window->doc_obj->hostui, 0, url, + &translated_url); + if(hres == S_OK) { + strcpyW(url, translated_url); + CoTaskMemFree(translated_url); + } } - hres = hlink_frame_navigate(&doc->basedoc, url, NULL, 0); + hres = hlink_frame_navigate(&window->doc->basedoc, url, NULL, 0); if(FAILED(hres)) FIXME("hlink_frame_navigate failed: %08x\n", hres); - CoTaskMemFree(translated_url); return hres; }

1 0

Jacek Caban : mshtml: Added IHTMLScreen::get_width implementation.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: ca54be2cc64fab230d2d199a8cb827928d28c2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca54be2cc64fab230d2d199a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 17:57:39 2009 +0100 mshtml: Added IHTMLScreen::get_width implementation. --- dlls/mshtml/htmlscreen.c | 7 +++++-- dlls/mshtml/main.c | 18 ++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/Makefile.in | 2 +- dlls/mshtml/tests/dom.c | 15 +++++++++++++++ 5 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlscreen.c b/dlls/mshtml/htmlscreen.c index b504b20..3ed403f 100644 --- a/dlls/mshtml/htmlscreen.c +++ b/dlls/mshtml/htmlscreen.c @@ -148,8 +148,11 @@ static HRESULT WINAPI HTMLScreen_get_bufferDepth(IHTMLScreen *iface, LONG *p) static HRESULT WINAPI HTMLScreen_get_width(IHTMLScreen *iface, LONG *p) { HTMLScreen *This = HTMLSCREEN_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = GetDeviceCaps(get_display_dc(), HORZRES); + return S_OK; } static HRESULT WINAPI HTMLScreen_get_height(IHTMLScreen *iface, LONG *p) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 6a358e5..1e30066 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -47,6 +47,7 @@ HINSTANCE hInst; DWORD mshtml_tls = TLS_OUT_OF_INDEXES; static HINSTANCE shdoclc = NULL; +static HDC display_dc; static void thread_detach(void) { @@ -71,6 +72,8 @@ static void process_detach(void) FreeLibrary(shdoclc); if(mshtml_tls != TLS_OUT_OF_INDEXES) TlsFree(mshtml_tls); + if(display_dc) + DeleteObject(display_dc); } HINSTANCE get_shdoclc(void) @@ -84,6 +87,21 @@ HINSTANCE get_shdoclc(void) return shdoclc = LoadLibraryExW(wszShdoclc, NULL, LOAD_LIBRARY_AS_DATAFILE); } +HDC get_display_dc(void) +{ + static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; + + if(!display_dc) { + HDC hdc; + + hdc = CreateICW(displayW, NULL, NULL, NULL); + if(InterlockedCompareExchangePointer((void**)&display_dc, hdc, NULL)) + DeleteObject(hdc); + } + + return display_dc; +} + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 33f9c96..d99fb54 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -940,6 +940,7 @@ static inline void windowref_release(windowref_t *ref) heap_free(ref); } +HDC get_display_dc(void); HINSTANCE get_shdoclc(void); extern HINSTANCE hInst; diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in index dc86c18..d2815ae 100644 --- a/dlls/mshtml/tests/Makefile.in +++ b/dlls/mshtml/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = mshtml.dll -IMPORTS = ole32 oleaut32 user32 urlmon advapi32 kernel32 +IMPORTS = ole32 oleaut32 user32 urlmon gdi32 advapi32 kernel32 CTESTS = \ dom.c \ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bc012f5..ff58013 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3035,8 +3035,12 @@ static void test_navigator(IHTMLDocument2 *doc) static void test_screen(IHTMLWindow2 *window) { IHTMLScreen *screen, *screen2; + LONG l, exl; + HDC hdc; HRESULT hres; + static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; + screen = NULL; hres = IHTMLWindow2_get_screen(window, &screen); ok(hres == S_OK, "get_screen failed: %08x\n", hres); @@ -3051,6 +3055,17 @@ static void test_screen(IHTMLWindow2 *window) test_disp((IUnknown*)screen, &DIID_DispHTMLScreen, "[object]"); + hdc = CreateICW(displayW, NULL, NULL, NULL); + + exl = GetDeviceCaps(hdc, HORZRES); + + l = 0xdeadbeef; + hres = IHTMLScreen_get_width(screen, &l); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(l == exl, "width = %d, expected %d\n", l, exl); + + DeleteObject(hdc); + IHTMLScreen_Release(screen); }

1 0

Jacek Caban : mshtml: Always set use_wine_url if there is no necko nsIURI available.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: d0dbf57c36a0eb2ecc6e02d7bb62dcd481083859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0dbf57c36a0eb2ecc6e02d7b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 17:59:29 2009 +0100 mshtml: Always set use_wine_url if there is no necko nsIURI available. --- dlls/mshtml/nsio.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9792747..9e5b2e2 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2267,11 +2267,15 @@ static nsresult NSAPI nsURI_SetWineURL(nsIWineURI *iface, LPCWSTR aURL) This->wine_url = heap_alloc(len*sizeof(WCHAR)); memcpy(This->wine_url, aURL, len*sizeof(WCHAR)); - /* FIXME: Always use wine url */ - This->use_wine_url = - strncmpW(aURL, wszFtp, sizeof(wszFtp)/sizeof(WCHAR)) - && strncmpW(aURL, wszHttp, sizeof(wszHttp)/sizeof(WCHAR)) - && strncmpW(aURL, wszHttps, sizeof(wszHttps)/sizeof(WCHAR)); + if(This->uri) { + /* FIXME: Always use wine url */ + This->use_wine_url = + strncmpW(aURL, wszFtp, sizeof(wszFtp)/sizeof(WCHAR)) + && strncmpW(aURL, wszHttp, sizeof(wszHttp)/sizeof(WCHAR)) + && strncmpW(aURL, wszHttps, sizeof(wszHttps)/sizeof(WCHAR)); + }else { + This->use_wine_url = TRUE; + } }else { This->wine_url = NULL; This->use_wine_url = FALSE;

1 0

Jacek Caban : mshtml: Don' t fail in NewChannelFromURI if necko failed to create a channel.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: fc2306d58caa4a57e8c840a59361f93b21974bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2306d58caa4a57e8c840a59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 17:59:53 2009 +0100 mshtml: Don't fail in NewChannelFromURI if necko failed to create a channel. --- dlls/mshtml/nsio.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9e5b2e2..80a32b5 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2693,20 +2693,14 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI TRACE("(%p %p)\n", aURI, _retval); - nsres = nsIIOService_NewChannelFromURI(nsio, aURI, &channel); - if(NS_FAILED(nsres) && nsres != NS_ERROR_UNKNOWN_PROTOCOL) { - WARN("NewChannelFromURI failed: %08x\n", nsres); - *_retval = channel; - return nsres; - } - nsres = nsIURI_QueryInterface(aURI, &IID_nsIWineURI, (void**)&wine_uri); if(NS_FAILED(nsres)) { - WARN("Could not get nsIWineURI: %08x\n", nsres); - *_retval = channel; - return channel ? NS_OK : NS_ERROR_UNEXPECTED; + TRACE("Could not get nsIWineURI: %08x\n", nsres); + return nsIIOService_NewChannelFromURI(nsio, aURI, _retval); } + nsIIOService_NewChannelFromURI(nsio, aURI, &channel); + ret = heap_alloc_zero(sizeof(nsChannel)); ret->lpHttpChannelVtbl = &nsChannelVtbl;

1 0

Jacek Caban : mshtml: Use special handling only for main documents in AsyncOpen.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 7cb41811b14c9d0c6baf0a73de3fd796bc6e9a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb41811b14c9d0c6baf0a73d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:00:12 2009 +0100 mshtml: Use special handling only for main documents in AsyncOpen. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 80a32b5..3772e61 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -850,7 +850,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen : NS_ERROR_UNEXPECTED; } - if(is_doc_uri && (This->load_flags & LOAD_INITIAL_DOCUMENT_URI)) { + if(is_doc_uri && (This->load_flags & LOAD_INITIAL_DOCUMENT_URI) && window == window->doc_obj->basedoc.window) { if(window->doc_obj->nscontainer->bscallback) { NSContainer *nscontainer = window->doc_obj->nscontainer;

1 0