October 2007 - Wine-commits

Jacek Caban : mshtml: Added IHTMLOptionElement::put_value implementation.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 108bb7af2fb0ef9db76d44479b97e87826cfb421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108bb7af2fb0ef9db76d44479… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 14 00:10:15 2007 +0200 mshtml: Added IHTMLOptionElement::put_value implementation. --- dlls/mshtml/htmloption.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index a356531..c21a4bb 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -121,8 +121,18 @@ static HRESULT WINAPI HTMLOptionElement_get_selected(IHTMLOptionElement *iface, static HRESULT WINAPI HTMLOptionElement_put_value(IHTMLOptionElement *iface, BSTR v) { HTMLOptionElement *This = HTMLOPTION_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString value_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_Init(&value_str, v); + nsres = nsIDOMHTMLOptionElement_SetValue(This->nsoption, &value_str); + nsAString_Finish(&value_str); + if(NS_FAILED(nsres)) + ERR("SetValue failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLOptionElement_get_value(IHTMLOptionElement *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Added IHTMLOptionElement::get_value implementation.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: b1fca21f5eebd1cf5e84db2d307b7f7c4c9d073a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1fca21f5eebd1cf5e84db2d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 13 04:00:26 2007 +0200 mshtml: Added IHTMLOptionElement::get_value implementation. --- dlls/mshtml/htmloption.c | 31 +++++++++++++++++++++++++++++-- dlls/mshtml/nsiface.idl | 22 ++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 5a0293b..a356531 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -39,6 +39,8 @@ typedef struct { HTMLElement element; const IHTMLOptionElementVtbl *lpHTMLOptionElementVtbl; + + nsIDOMHTMLOptionElement *nsoption; } HTMLOptionElement; #define HTMLOPTION(x) ((IHTMLOptionElement*) &(x)->lpHTMLOptionElementVtbl) @@ -126,8 +128,24 @@ static HRESULT WINAPI HTMLOptionElement_put_value(IHTMLOptionElement *iface, BST static HRESULT WINAPI HTMLOptionElement_get_value(IHTMLOptionElement *iface, BSTR *p) { HTMLOptionElement *This = HTMLOPTION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString value_str; + const PRUnichar *value; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&value_str, NULL); + nsres = nsIDOMHTMLOptionElement_GetValue(This->nsoption, &value_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&value_str, &value, NULL); + *p = SysAllocString(value); + }else { + ERR("GetValue failed: %08x\n", nsres); + *p = NULL; + } + nsAString_Finish(&value_str); + + return S_OK; } static HRESULT WINAPI HTMLOptionElement_put_defaultSelected(IHTMLOptionElement *iface, VARIANT_BOOL v) @@ -232,6 +250,10 @@ static HRESULT HTMLOptionElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) static void HTMLOptionElement_destructor(HTMLDOMNode *iface) { HTMLOptionElement *This = HTMLOPTION_NODE_THIS(iface); + + if(This->nsoption) + nsIDOMHTMLOptionElement_Release(This->nsoption); + HTMLElement_destructor(&This->element.node); } @@ -245,10 +267,15 @@ static const NodeImplVtbl HTMLOptionElementImplVtbl = { HTMLElement *HTMLOptionElement_Create(nsIDOMHTMLElement *nselem) { HTMLOptionElement *ret = mshtml_alloc(sizeof(HTMLOptionElement)); + nsresult nsres; ret->lpHTMLOptionElementVtbl = &HTMLOptionElementVtbl; ret->element.node.vtbl = &HTMLOptionElementImplVtbl; + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLOptionElement, (void**)&ret->nsoption); + if(NS_FAILED(nsres)) + ERR("Could not get nsIDOMHTMLOptionElement interface: %08x\n", nsres); + return &ret->element; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 1d36197..8b00fbd 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1078,6 +1078,28 @@ interface nsIDOMHTMLInputElement : nsIDOMHTMLElement [ object, + uuid(a6cf9092-15b3-11d2-932e-00805f8add32) + /* FROZEN */ +] +interface nsIDOMHTMLOptionElement : nsIDOMHTMLElement +{ + nsresult GetForm(nsIDOMHTMLFormElement **aForm); + nsresult GetDefaultSelected(PRBool *aDefaultSelected); + nsresult SetDefaultSelected(PRBool aDefaultSelected); + nsresult GetText(nsAString *aText); + nsresult GetIndex(PRInt32 *aIndex); + nsresult GetDisabled(PRBool *aDisabled); + nsresult SetDisabled(PRBool aDisabled); + nsresult GetLabel(nsAString *aLabel); + nsresult SetLabel(const nsAString *aLabel); + nsresult GetSelected(PRBool *aSelected); + nsresult SetSelected(PRBool aSelected); + nsresult GetValue(nsAString *aValue); + nsresult SetValue(const nsAString *aValue); +} + +[ + object, uuid(a6cf9090-15b3-11d2-932e-00805f8add32) /* FROZEN */ ]

1 0

Jacek Caban : mshtml: Added IHTMLStyle display and visibility properties implementation.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: b14ba8aac6e358dde2bc9653309c557dbc296ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14ba8aac6e358dde2bc96533… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 13 04:00:02 2007 +0200 mshtml: Added IHTMLStyle display and visibility properties implementation. --- dlls/mshtml/htmlstyle.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 756f772..b5ffbf6 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -50,6 +50,8 @@ static const WCHAR attrBackgroundColor[] = {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; static const WCHAR attrColor[] = {'c','o','l','o','r',0}; +static const WCHAR attrDisplay[] = + {'d','i','s','p','l','a','y',0}; static const WCHAR attrFontFamily[] = {'f','o','n','t','-','f','a','m','i','l','y',0}; static const WCHAR attrFontSize[] = @@ -60,6 +62,8 @@ static const WCHAR attrFontWeight[] = {'f','o','n','t','-','w','e','i','g','h','t',0}; static const WCHAR attrTextDecoration[] = {'t','e','x','t','-','d','e','c','o','r','a','t','i','o','n',0}; +static const WCHAR attrVisibility[] = + {'v','i','s','i','b','i','l','i','t','y',0}; static const WCHAR valLineThrough[] = {'l','i','n','e','-','t','h','r','o','u','g','h',0}; @@ -1145,29 +1149,37 @@ static HRESULT WINAPI HTMLStyle_get_clear(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_display(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, attrDisplay, v); } static HRESULT WINAPI HTMLStyle_get_display(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, attrDisplay, p); } static HRESULT WINAPI HTMLStyle_put_visibility(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, attrVisibility, v); } static HRESULT WINAPI HTMLStyle_get_visibility(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, attrVisibility, p); } static HRESULT WINAPI HTMLStyle_put_listStyleType(IHTMLStyle *iface, BSTR v)

1 0

Jacek Caban : mshtml: Use wine scheme mechanism in do_load_from_moniker_hack.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 41c35a1ce2e28ec5f53a66d87a0c8ab1110771dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c35a1ce2e28ec5f53a66d87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 13 03:59:19 2007 +0200 mshtml: Use wine scheme mechanism in do_load_from_moniker_hack. --- dlls/mshtml/nsio.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7bccce1..7768b2b 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -568,7 +568,9 @@ static nsresult NSAPI nsChannel_Open(nsIHttpChannel *iface, nsIInputStream **_re static BOOL do_load_from_moniker_hack(nsChannel *This) { - PRBool b = FALSE; + nsACString scheme_str; + nsresult nsres; + BOOL ret = TRUE; /* * We should always load the page from IMoniker, but Wine is not yet @@ -581,12 +583,18 @@ static BOOL do_load_from_moniker_hack(nsChannel *This) if(!This->channel) return TRUE; - /* Load about protocol from moniker */ - nsIWineURI_SchemeIs(This->uri, "about", &b); - if(b) - return TRUE; + nsACString_Init(&scheme_str, NULL); + nsres = nsIWineURI_GetScheme(This->uri, &scheme_str); + + if(NS_SUCCEEDED(nsres)) { + const char *scheme; + + nsACString_GetData(&scheme_str, &scheme, NULL); + ret = !strcmp(scheme, "wine"); + } - return FALSE; + nsACString_Finish(&scheme_str); + return ret; } static HRESULT create_mon_for_nschannel(nsChannel *channel, IMoniker **mon)

1 0

Jacek Caban : mshtml: Added IHTMLDocument4 stub implementation.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 141dfab1a1b713d81e2a3271537dfe6bc67918ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=141dfab1a1b713d81e2a32715… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 13 03:59:38 2007 +0200 mshtml: Added IHTMLDocument4 stub implementation. --- dlls/mshtml/htmldoc.c | 3 + dlls/mshtml/htmldoc3.c | 187 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + 3 files changed, 192 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e6c16a7..4ea2912 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -56,6 +56,9 @@ static HRESULT WINAPI HTMLDocument_QueryInterface(IHTMLDocument2 *iface, REFIID }else if(IsEqualGUID(&IID_IHTMLDocument3, riid)) { TRACE("(%p)->(IID_IHTMLDocument3, %p)\n", This, ppvObject); *ppvObject = HTMLDOC3(This); + }else if(IsEqualGUID(&IID_IHTMLDocument4, riid)) { + TRACE("(%p)->(IID_IHTMLDocument4, %p)\n", This, ppvObject); + *ppvObject = HTMLDOC4(This); }else if(IsEqualGUID(&IID_IHTMLDocument5, riid)) { TRACE("(%p)->(IID_IHTMLDocument5, %p)\n", This, ppvObject); *ppvObject = HTMLDOC5(This); diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 75c089d..4388000 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -420,6 +420,8 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, return E_NOTIMPL; } +#undef HTMLDOC3_THIS + static const IHTMLDocument3Vtbl HTMLDocument3Vtbl = { HTMLDocument3_QueryInterface, HTMLDocument3_AddRef, @@ -471,7 +473,192 @@ static const IHTMLDocument3Vtbl HTMLDocument3Vtbl = { HTMLDocument3_getElementsByTagName }; +#define HTMLDOC4_THIS(iface) DEFINE_THIS(HTMLDocument, HTMLDocument4, iface) + +static HRESULT WINAPI HTMLDocument4_QueryInterface(IHTMLDocument4 *iface, + REFIID riid, void **ppv) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppv); +} + +static ULONG WINAPI HTMLDocument4_AddRef(IHTMLDocument4 *iface) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI HTMLDocument4_Release(IHTMLDocument4 *iface) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + return IHTMLDocument2_Release(HTMLDOC(This)); +} + +static HRESULT WINAPI HTMLDocument4_GetTypeInfoCount(IHTMLDocument4 *iface, UINT *pctinfo) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_GetTypeInfo(IHTMLDocument4 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_GetIDsOfNames(IHTMLDocument4 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_Invoke(IHTMLDocument4 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_focus(IHTMLDocument4 *iface) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_hasFocus(IHTMLDocument4 *iface, VARIANT_BOOL *pfFocus) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%p)\n", This, pfFocus); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_put_onselectionchange(IHTMLDocument4 *iface, VARIANT v) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(v)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_get_onselectionchange(IHTMLDocument4 *iface, VARIANT *p) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_get_namespace(IHTMLDocument4 *iface, IDispatch **p) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_createDocumentFromUrl(IHTMLDocument4 *iface, BSTR bstrUrl, + BSTR bstrOptions, IHTMLDocument2 **newDoc) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(bstrUrl), debugstr_w(bstrOptions), newDoc); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_put_media(IHTMLDocument4 *iface, BSTR v) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_get_media(IHTMLDocument4 *iface, BSTR *p) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_createEventObject(IHTMLDocument4 *iface, + VARIANT *pvarEventObject, IHTMLEventObj **ppEventObj) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%p %p)\n", This, pvarEventObject, ppEventObj); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEventName, + VARIANT *pvarEventObject, VARIANT_BOOL *pfCanceled) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(bstrEventName), pvarEventObject, pfCanceled); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_createRenderStyle(IHTMLDocument4 *iface, BSTR v, + IHTMLRenderStyle **ppIHTMLRenderStyle) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), ppIHTMLRenderStyle); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_put_oncontrolselect(IHTMLDocument4 *iface, VARIANT v) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(v)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_get_oncontrolselect(IHTMLDocument4 *iface, VARIANT *p) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDocument4_get_URLEncoded(IHTMLDocument4 *iface, BSTR *p) +{ + HTMLDocument *This = HTMLDOC4_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +#undef HTMLDOC4_THIS + +static const IHTMLDocument4Vtbl HTMLDocument4Vtbl = { + HTMLDocument4_QueryInterface, + HTMLDocument4_AddRef, + HTMLDocument4_Release, + HTMLDocument4_GetTypeInfoCount, + HTMLDocument4_GetTypeInfo, + HTMLDocument4_GetIDsOfNames, + HTMLDocument4_Invoke, + HTMLDocument4_focus, + HTMLDocument4_hasFocus, + HTMLDocument4_put_onselectionchange, + HTMLDocument4_get_onselectionchange, + HTMLDocument4_get_namespace, + HTMLDocument4_createDocumentFromUrl, + HTMLDocument4_put_media, + HTMLDocument4_get_media, + HTMLDocument4_createEventObject, + HTMLDocument4_fireEvent, + HTMLDocument4_createRenderStyle, + HTMLDocument4_put_oncontrolselect, + HTMLDocument4_get_oncontrolselect, + HTMLDocument4_get_URLEncoded +}; + void HTMLDocument_HTMLDocument3_Init(HTMLDocument *This) { This->lpHTMLDocument3Vtbl = &HTMLDocument3Vtbl; + This->lpHTMLDocument4Vtbl = &HTMLDocument4Vtbl; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 48e0d4c..8ae5f1d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -105,6 +105,7 @@ typedef struct { struct HTMLDocument { const IHTMLDocument2Vtbl *lpHTMLDocument2Vtbl; const IHTMLDocument3Vtbl *lpHTMLDocument3Vtbl; + const IHTMLDocument4Vtbl *lpHTMLDocument4Vtbl; const IHTMLDocument5Vtbl *lpHTMLDocument5Vtbl; const IPersistMonikerVtbl *lpPersistMonikerVtbl; const IPersistFileVtbl *lpPersistFileVtbl; @@ -294,6 +295,7 @@ typedef struct { #define HTMLDOC(x) ((IHTMLDocument2*) &(x)->lpHTMLDocument2Vtbl) #define HTMLDOC3(x) ((IHTMLDocument3*) &(x)->lpHTMLDocument3Vtbl) +#define HTMLDOC4(x) ((IHTMLDocument4*) &(x)->lpHTMLDocument4Vtbl) #define HTMLDOC5(x) ((IHTMLDocument5*) &(x)->lpHTMLDocument5Vtbl) #define PERSIST(x) ((IPersist*) &(x)->lpPersistFileVtbl) #define PERSISTMON(x) ((IPersistMoniker*) &(x)->lpPersistMonikerVtbl)

1 0

Jacek Caban : mshtml: Fix range pos after put_text call.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 512d09245d2b548db289084437c5293998c9d949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=512d09245d2b548db28908443… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 12 11:11:24 2007 +0200 mshtml: Fix range pos after put_text call. --- dlls/mshtml/tests/dom.c | 3 +++ dlls/mshtml/txtrange.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 966831e..93d134a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -361,6 +361,9 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_expand(range, wordW, VARIANT_TRUE, "test "); test_range_put_text(range, wordW); test_range_text(body_range, "wordabc 123\r\nit's text"); + test_range_text(range, NULL); + test_range_moveend(range, characterW, 3, 3); + test_range_text(range, "abc"); IHTMLTxtRange_Release(range); IHTMLTxtRange_Release(body_range); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 4e67af9..1323540 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -893,7 +893,11 @@ static HRESULT WINAPI HTMLTxtRange_put_text(IHTMLTxtRange *iface, BSTR v) if(NS_FAILED(nsres)) ERR("InsertNode failed: %08x\n", nsres); - return S_OK; + nsres = nsIDOMRange_SetEndAfter(This->nsrange, (nsIDOMNode*)text_node); + if(NS_FAILED(nsres)) + ERR("SetEndAfter failed: %08x\n", nsres); + + return IHTMLTxtRange_collapse(HTMLTXTRANGE(This), VARIANT_FALSE); } static HRESULT WINAPI HTMLTxtRange_get_text(IHTMLTxtRange *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Fixed ref count leak.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 697d65305b39f143fbbb3cfe72dfbf0c67c5bed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=697d65305b39f143fbbb3cfe7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 13 03:58:06 2007 +0200 mshtml: Fixed ref count leak. --- dlls/mshtml/txtrange.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 1323540..faea069 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -880,6 +880,7 @@ static HRESULT WINAPI HTMLTxtRange_put_text(IHTMLTxtRange *iface, BSTR v) nsAString_Init(&text_str, v); nsres = nsIDOMDocument_CreateTextNode(nsdoc, &text_str, &text_node); + nsIDOMDocument_Release(nsdoc); nsAString_Finish(&text_str); if(NS_FAILED(nsres)) { ERR("CreateTextNode failed: %08x\n", nsres);

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::get_option implementation.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 954d4477b5054498282c039dcdcc7f3b205165e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=954d4477b5054498282c039dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 13 03:58:55 2007 +0200 mshtml: Added IHTMLWindow2::get_option implementation. --- dlls/mshtml/htmldoc.c | 8 +++- dlls/mshtml/htmloption.c | 121 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlwindow.c | 12 ++++- dlls/mshtml/mshtml_private.h | 13 +++++ 4 files changed, 151 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4faeb6e..e6c16a7 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -174,6 +174,11 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) if(This->hwnd) DestroyWindow(This->hwnd); + if(This->option_factory) { + This->option_factory->doc = NULL; + IHTMLOptionElementFactory_Release(HTMLOPTFACTORY(This->option_factory)); + } + if(This->window) IHTMLWindow2_Release(HTMLWINDOW2(This->window)); @@ -736,7 +741,7 @@ static HRESULT WINAPI HTMLDocument_execCommandShowHelp(IHTMLDocument2 *iface, BS } static HRESULT WINAPI HTMLDocument_createElement(IHTMLDocument2 *iface, BSTR eTag, - IHTMLElement **newElem) + IHTMLElement **newElem) { FIXME("(%p)->(%s %p)\n", iface, debugstr_w(eTag), newElem); return E_NOTIMPL; @@ -1175,6 +1180,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) ret->nodes = NULL; ret->readystate = READYSTATE_UNINITIALIZED; ret->window = NULL; + ret->option_factory = NULL; list_init(&ret->selection_list); list_init(&ret->range_list); diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 5e707ad..5a0293b 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -251,3 +251,124 @@ HTMLElement *HTMLOptionElement_Create(nsIDOMHTMLElement *nselem) return &ret->element; } + +#define HTMLOPTFACTORY_THIS(iface) DEFINE_THIS(HTMLOptionElementFactory, HTMLOptionElementFactory, iface) + +static HRESULT WINAPI HTMLOptionElementFactory_QueryInterface(IHTMLOptionElementFactory *iface, + REFIID riid, void **ppv) +{ + HTMLOptionElementFactory *This = HTMLOPTFACTORY_THIS(iface); + + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = HTMLOPTFACTORY(This); + }else if(IsEqualGUID(&IID_IDispatch, riid)) { + TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + *ppv = HTMLOPTFACTORY(This); + }else if(IsEqualGUID(&IID_IHTMLOptionElementFactory, riid)) { + TRACE("(%p)->(IID_IHTMLOptionElementFactory %p)\n", This, ppv); + *ppv = HTMLOPTFACTORY(This); + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI HTMLOptionElementFactory_AddRef(IHTMLOptionElementFactory *iface) +{ + HTMLOptionElementFactory *This = HTMLOPTFACTORY_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLOptionElementFactory_Release(IHTMLOptionElementFactory *iface) +{ + HTMLOptionElementFactory *This = HTMLOPTFACTORY_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + mshtml_free(This); + + return ref; +} + +static HRESULT WINAPI HTMLOptionElementFactory_GetTypeInfoCount(IHTMLOptionElementFactory *iface, UINT *pctinfo) +{ + HTMLOptionElementFactory *This = HTMLOPTFACTORY_THIS(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLOptionElementFactory_GetTypeInfo(IHTMLOptionElementFactory *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLOptionElementFactory *This = HTMLOPTFACTORY_THIS(iface); + FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLOptionElementFactory_GetIDsOfNames(IHTMLOptionElementFactory *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLOptionElementFactory *This = HTMLOPTFACTORY_THIS(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLOptionElementFactory_Invoke(IHTMLOptionElementFactory *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLOptionElementFactory *This = HTMLOPTFACTORY_THIS(iface); + FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory *iface, + VARIANT text, VARIANT value, VARIANT defaultselected, VARIANT selected, + IHTMLOptionElement **optelem) +{ + HTMLOptionElementFactory *This = HTMLOPTFACTORY_THIS(iface); + FIXME("(%p)->(v v v v %p)\n", This, optelem); + return E_NOTIMPL; +} + +#undef HTMLOPTFACTORY_THIS + +static const IHTMLOptionElementFactoryVtbl HTMLOptionElementFactoryVtbl = { + HTMLOptionElementFactory_QueryInterface, + HTMLOptionElementFactory_AddRef, + HTMLOptionElementFactory_Release, + HTMLOptionElementFactory_GetTypeInfoCount, + HTMLOptionElementFactory_GetTypeInfo, + HTMLOptionElementFactory_GetIDsOfNames, + HTMLOptionElementFactory_Invoke, + HTMLOptionElementFactory_create +}; + +HTMLOptionElementFactory *HTMLOptionElementFactory_Create(HTMLDocument *doc) +{ + HTMLOptionElementFactory *ret; + + ret = mshtml_alloc(sizeof(HTMLOptionElementFactory)); + ret->lpHTMLOptionElementFactoryVtbl = &HTMLOptionElementFactoryVtbl; + ret->ref = 1; + ret->doc = doc; + + return ret; +} diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 369a09c..fee2297 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -534,8 +534,16 @@ static HRESULT WINAPI HTMLWindow2_get_screen(IHTMLWindow2 *iface, IHTMLScreen ** static HRESULT WINAPI HTMLWindow2_get_Option(IHTMLWindow2 *iface, IHTMLOptionElementFactory **p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc->option_factory) + This->doc->option_factory = HTMLOptionElementFactory_Create(This->doc); + + *p = HTMLOPTFACTORY(This->doc->option_factory); + IHTMLOptionElementFactory_AddRef(*p); + + return S_OK; } static HRESULT WINAPI HTMLWindow2_focus(IHTMLWindow2 *iface) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 68e7e14..48e0d4c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -94,6 +94,14 @@ struct ConnectionPoint { ConnectionPoint *next; }; +typedef struct { + const IHTMLOptionElementFactoryVtbl *lpHTMLOptionElementFactoryVtbl; + + LONG ref; + + HTMLDocument *doc; +} HTMLOptionElementFactory; + struct HTMLDocument { const IHTMLDocument2Vtbl *lpHTMLDocument2Vtbl; const IHTMLDocument3Vtbl *lpHTMLDocument3Vtbl; @@ -152,6 +160,8 @@ struct HTMLDocument { ConnectionPoint cp_htmldocevents2; ConnectionPoint cp_propnotif; + HTMLOptionElementFactory *option_factory; + struct list selection_list; struct list range_list; @@ -330,6 +340,8 @@ typedef struct { #define HTMLTEXTCONT(x) ((IHTMLTextContainer*) &(x)->lpHTMLTextContainerVtbl) +#define HTMLOPTFACTORY(x) ((IHTMLOptionElementFactory*) &(x)->lpHTMLOptionElementFactoryVtbl) + #define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc))) #define DEFINE_THIS(cls,ifc,iface) DEFINE_THIS2(cls,lp ## ifc ## Vtbl,iface) @@ -338,6 +350,7 @@ HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**); HTMLWindow *HTMLWindow_Create(HTMLDocument*); HTMLWindow *nswindow_to_window(const nsIDOMWindow*); +HTMLOptionElementFactory *HTMLOptionElementFactory_Create(HTMLDocument*); void setup_nswindow(HTMLWindow*); void HTMLDocument_HTMLDocument3_Init(HTMLDocument*);

1 0

Juan Lang : setupapi: Correct device enumeration.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: a10a8eb134d275a97b403a40c03dc850c7b73c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a10a8eb134d275a97b403a40c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 12 08:30:10 2007 -0700 setupapi: Correct device enumeration. --- dlls/setupapi/devinst.c | 82 +++++++++++++++++++++++++++++++++------------- 1 files changed, 59 insertions(+), 23 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 8abd2e7..bd58791 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2137,25 +2137,26 @@ static void SETUPDI_EnumerateInterfaces(HDEVINFO DeviceInfoSet, } } -static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet, - LPCWSTR parent, HKEY key, const GUID *class, DWORD flags) +static void SETUPDI_EnumerateMatchingDeviceInstances(struct DeviceInfoSet *set, + LPCWSTR enumerator, LPCWSTR deviceName, HKEY deviceKey, + const GUID *class, DWORD flags) { - struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; DWORD i, len; - WCHAR subKeyName[MAX_PATH]; + WCHAR deviceInstance[MAX_PATH]; LONG l = ERROR_SUCCESS; - TRACE("%s\n", debugstr_w(parent)); + TRACE("%s %s\n", debugstr_w(enumerator), debugstr_w(deviceName)); for (i = 0; !l; i++) { - len = sizeof(subKeyName) / sizeof(subKeyName[0]); - l = RegEnumKeyExW(key, i, subKeyName, &len, NULL, NULL, NULL, NULL); + len = sizeof(deviceInstance) / sizeof(deviceInstance[0]); + l = RegEnumKeyExW(deviceKey, i, deviceInstance, &len, NULL, NULL, NULL, + NULL); if (!l) { HKEY subKey; - l = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey); + l = RegOpenKeyExW(deviceKey, deviceInstance, 0, KEY_READ, &subKey); if (!l) { WCHAR classGuid[40]; @@ -2179,11 +2180,12 @@ static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet, LPWSTR instanceId; instanceId = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(parent) + lstrlenW(subKeyName) + 2) - * sizeof(WCHAR)); + (lstrlenW(deviceName) + + lstrlenW(deviceInstance) + 2) * sizeof(WCHAR)); if (instanceId) { - sprintfW(instanceId, fmt, parent, subKeyName); + sprintfW(instanceId, fmt, deviceName, + deviceInstance); SETUPDI_AddDeviceToSet(set, &deviceClass, 0 /* FIXME: DevInst */, instanceId, FALSE, NULL); @@ -2200,46 +2202,80 @@ static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet, } } +static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet, + LPCWSTR parent, HKEY key, const GUID *class, DWORD flags) +{ + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + DWORD i, len; + WCHAR subKeyName[MAX_PATH]; + LONG l = ERROR_SUCCESS; + + TRACE("%s\n", debugstr_w(parent)); + + for (i = 0; !l; i++) + { + len = sizeof(subKeyName) / sizeof(subKeyName[0]); + l = RegEnumKeyExW(key, i, subKeyName, &len, NULL, NULL, NULL, NULL); + if (!l) + { + HKEY subKey; + + l = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey); + if (!l) + { + TRACE("%s\n", debugstr_w(subKeyName)); + SETUPDI_EnumerateMatchingDeviceInstances(set, parent, + subKeyName, subKey, class, flags); + RegCloseKey(subKey); + } + /* Allow enumeration to continue */ + l = ERROR_SUCCESS; + } + } +} + static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class, LPCWSTR enumstr, DWORD flags) { - HKEY classesKey = SetupDiOpenClassRegKeyExW(class, KEY_READ, - DIOCR_INSTALLER, NULL, NULL); + HKEY enumKey; + LONG l; TRACE("%p, %s, %s, %08x\n", DeviceInfoSet, debugstr_guid(class), debugstr_w(enumstr), flags); - if (classesKey != INVALID_HANDLE_VALUE) + l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_READ, NULL, + &enumKey, NULL); + if (enumKey != INVALID_HANDLE_VALUE) { if (enumstr) { - HKEY enumKey; - LONG l = RegOpenKeyExW(classesKey, enumstr, 0, KEY_READ, - &enumKey); + HKEY enumStrKey; + l = RegOpenKeyExW(enumKey, enumstr, 0, KEY_READ, + &enumStrKey); if (!l) { SETUPDI_EnumerateMatchingDevices(DeviceInfoSet, enumstr, - enumKey, class, flags); - RegCloseKey(enumKey); + enumStrKey, class, flags); + RegCloseKey(enumStrKey); } } else { DWORD i, len; WCHAR subKeyName[MAX_PATH]; - LONG l = ERROR_SUCCESS; + l = ERROR_SUCCESS; for (i = 0; !l; i++) { len = sizeof(subKeyName) / sizeof(subKeyName[0]); - l = RegEnumKeyExW(classesKey, i, subKeyName, &len, NULL, + l = RegEnumKeyExW(enumKey, i, subKeyName, &len, NULL, NULL, NULL, NULL); if (!l) { HKEY subKey; - l = RegOpenKeyExW(classesKey, subKeyName, 0, KEY_READ, + l = RegOpenKeyExW(enumKey, subKeyName, 0, KEY_READ, &subKey); if (!l) { @@ -2252,7 +2288,7 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class, } } } - RegCloseKey(classesKey); + RegCloseKey(enumKey); } }

1 0

Juan Lang : ws2_32: Fix broadcast address calculation.
by Alexandre Julliard 15 Oct '07

15 Oct '07

Module: wine Branch: master Commit: 17248108d4bcb2b37d1a4d613c2dcf3507366cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=17248108d4bcb2b37d1a4d613… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 12 16:15:29 2007 -0700 ws2_32: Fix broadcast address calculation. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2e5e558..24a4a76 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2164,7 +2164,7 @@ INT WINAPI WSAIoctl(SOCKET s, addr = inet_addr(ptr->IpAddressList.IpAddress.String); mask = inet_addr(ptr->IpAddressList.IpMask.String); - bcast = addr | (addr & !mask); + bcast = addr | ~mask; intArray->iiAddress.AddressIn.sin_family = AF_INET; intArray->iiAddress.AddressIn.sin_port = 0; intArray->iiAddress.AddressIn.sin_addr.WS_s_addr =

1 0