September 2007 - Wine-commits

Jacek Caban : mshtml: Added HTMLStyle::get_textDecoration* implementation.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 5071f124ab25ab15efc9b48ee1b0260f55e6aaef URL: http://source.winehq.org/git/wine.git/?a=commit;h=5071f124ab25ab15efc9b48ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 12:42:10 2007 +0200 mshtml: Added HTMLStyle::get_textDecoration* implementation. --- dlls/mshtml/htmlstyle.c | 68 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 6b4cf7d..756f772 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -58,6 +58,13 @@ static const WCHAR attrFontStyle[] = {'f','o','n','t','-','s','t','y','l','e',0}; 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 valLineThrough[] = + {'l','i','n','e','-','t','h','r','o','u','g','h',0}; +static const WCHAR valUnderline[] = + {'u','n','d','e','r','l','i','n','e',0}; static HRESULT set_style_attr(HTMLStyle *This, LPCWSTR name, LPCWSTR value) { @@ -83,27 +90,56 @@ static HRESULT set_style_attr(HTMLStyle *This, LPCWSTR name, LPCWSTR value) return S_OK; } -static HRESULT get_style_attr(HTMLStyle *This, LPCWSTR name, BSTR *p) +static HRESULT get_style_attr_nsval(HTMLStyle *This, LPCWSTR name, nsAString *value) { - nsAString str_name, str_value; - const PRUnichar *value; + nsAString str_name; nsresult nsres; nsAString_Init(&str_name, name); - nsAString_Init(&str_value, NULL); - nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(This->nsstyle, &str_name, &str_value); - if(NS_FAILED(nsres)) + nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(This->nsstyle, &str_name, value); + if(NS_FAILED(nsres)) { ERR("SetProperty failed: %08x\n", nsres); + return E_FAIL; + } + + nsAString_Finish(&str_name); + + return NS_OK; +} + +static HRESULT get_style_attr(HTMLStyle *This, LPCWSTR name, BSTR *p) +{ + nsAString str_value; + const PRUnichar *value; + + nsAString_Init(&str_value, NULL); + + get_style_attr_nsval(This, name, &str_value); nsAString_GetData(&str_value, &value, NULL); *p = *value ? SysAllocString(value) : NULL; - nsAString_Finish(&str_name); nsAString_Finish(&str_value); TRACE("%s -> %s\n", debugstr_w(name), debugstr_w(*p)); + return S_OK; +} + +static HRESULT check_style_attr_value(HTMLStyle *This, LPCWSTR name, LPCWSTR exval, VARIANT_BOOL *p) +{ + nsAString str_value; + const PRUnichar *value; + + nsAString_Init(&str_value, NULL); + get_style_attr_nsval(This, name, &str_value); + + nsAString_GetData(&str_value, &value, NULL); + *p = strcmpW(value, exval) ? VARIANT_FALSE : VARIANT_TRUE; + nsAString_Finish(&str_value); + + TRACE("%s -> %x\n", debugstr_w(name), *p); return S_OK; } @@ -480,8 +516,10 @@ static HRESULT WINAPI HTMLStyle_put_textDecoration(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_get_textDecoration(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, attrTextDecoration, p); } static HRESULT WINAPI HTMLStyle_put_textDecorationNone(IHTMLStyle *iface, VARIANT_BOOL v) @@ -508,8 +546,10 @@ static HRESULT WINAPI HTMLStyle_put_textDecorationUnderline(IHTMLStyle *iface, V static HRESULT WINAPI HTMLStyle_get_textDecorationUnderline(IHTMLStyle *iface, VARIANT_BOOL *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return check_style_attr_value(This, attrTextDecoration, valUnderline, p); } static HRESULT WINAPI HTMLStyle_put_textDecorationOverline(IHTMLStyle *iface, VARIANT_BOOL v) @@ -536,8 +576,10 @@ static HRESULT WINAPI HTMLStyle_put_textDecorationLineThrough(IHTMLStyle *iface, static HRESULT WINAPI HTMLStyle_get_textDecorationLineThrough(IHTMLStyle *iface, VARIANT_BOOL *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return check_style_attr_value(This, attrTextDecoration, valLineThrough, p); } static HRESULT WINAPI HTMLStyle_put_textDecorationBlink(IHTMLStyle *iface, VARIANT_BOOL v)

1 0

Jacek Caban : mshtml: Added get_styleSheets implementation.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: ebd918eb485d98f962276cfe75f765275a34cb6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd918eb485d98f962276cfe7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 13:09:35 2007 +0200 mshtml: Added get_styleSheets implementation. --- dlls/mshtml/htmldoc.c | 36 +++++++++- dlls/mshtml/htmlstylesheet.c | 152 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsiface.idl | 22 ++++++ 4 files changed, 207 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5e9f0ff..5ef1e13 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -951,10 +951,40 @@ static HRESULT WINAPI HTMLDocument_get_parentWindow(IHTMLDocument2 *iface, IHTML } static HRESULT WINAPI HTMLDocument_get_styleSheets(IHTMLDocument2 *iface, - IHTMLStyleSheetsCollection **p) + IHTMLStyleSheetsCollection **p) { - FIXME("(%p)->(%p)\n", iface, p); - return E_NOTIMPL; + HTMLDocument *This = HTMLDOC_THIS(iface); + nsIDOMStyleSheetList *nsstylelist; + nsIDOMDocumentStyle *nsdocstyle; + nsIDOMDocument *nsdoc; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + *p = NULL; + + if(!This->nscontainer) + return S_OK; + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres)) { + ERR("GetDocument failed: %08x\n", nsres); + return S_OK; + } + + if(NS_FAILED(nsres) || !nsdoc) + return S_OK; + + nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentStyle, (void**)&nsdocstyle); + nsIDOMDocument_Release(nsdoc); + + nsIDOMDocumentStyle_GetStyleSheets(nsdocstyle, &nsstylelist); + nsIDOMDocumentStyle_Release(nsdocstyle); + + *p = HTMLStyleSheetsCollection_Create(nsstylelist); + nsIDOMDocumentStyle_Release(nsstylelist); + + return S_OK; } static HRESULT WINAPI HTMLDocument_put_onbeforeupdate(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 0f0ef12..00a71f6 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -41,7 +41,157 @@ typedef struct { LONG ref; } HTMLStyleSheet; -#define HTMLSTYLESHEET(x) ((IHTMLStyleSheet*) &(x)->lpHTMLStyleSheetVtbl); +typedef struct { + const IHTMLStyleSheetsCollectionVtbl *lpHTMLStyleSheetsCollectionVtbl; + + LONG ref; + + nsIDOMStyleSheetList *nslist; +} HTMLStyleSheetsCollection; + +#define HTMLSTYLESHEET(x) ((IHTMLStyleSheet*) &(x)->lpHTMLStyleSheetVtbl); +#define HTMLSTYLESHEETSCOL(x) ((IHTMLStyleSheetsCollection*) &(x)->lpHTMLStyleSheetsCollectionVtbl); + +#define HTMLSTYLESHEETSCOL_THIS(iface) \ + DEFINE_THIS(HTMLStyleSheetsCollection, HTMLStyleSheetsCollection, iface) + +static HRESULT WINAPI HTMLStyleSheetsCollection_QueryInterface(IHTMLStyleSheetsCollection *iface, + REFIID riid, void **ppv) +{ + HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); + + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = HTMLSTYLESHEETSCOL(This); + }else if(IsEqualGUID(&IID_IDispatch, riid)) { + TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + *ppv = HTMLSTYLESHEETSCOL(This); + }else if(IsEqualGUID(&IID_IHTMLStyleSheetsCollection, riid)) { + TRACE("(%p)->(IID_IHTMLStyleSheetsCollection %p)\n", This, ppv); + *ppv = HTMLSTYLESHEETSCOL(This); + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("unsupported %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI HTMLStyleSheetsCollection_AddRef(IHTMLStyleSheetsCollection *iface) +{ + HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLStyleSheetsCollection_Release(IHTMLStyleSheetsCollection *iface) +{ + HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + mshtml_free(This); + + return ref; +} + +static HRESULT WINAPI HTMLStyleSheetsCollection_GetTypeInfoCount(IHTMLStyleSheetsCollection *iface, + UINT *pctinfo) +{ + HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyleSheetsCollection_GetTypeInfo(IHTMLStyleSheetsCollection *iface, + UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); + FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyleSheetsCollection_GetIDsOfNames(IHTMLStyleSheetsCollection *iface, + REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyleSheetsCollection_Invoke(IHTMLStyleSheetsCollection *iface, + DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_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 HTMLStyleSheetsCollection_get_length(IHTMLStyleSheetsCollection *iface, + long *p) +{ + HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyleSheetsCollection_get__newEnum(IHTMLStyleSheetsCollection *iface, + IUnknown **p) +{ + HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyleSheetsCollection_item(IHTMLStyleSheetsCollection *iface, + VARIANT *pvarIndex, VARIANT *pvarResult) +{ + HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); + FIXME("(%p)->(%p %p)\n", This, pvarIndex, pvarResult); + return E_NOTIMPL; +} + +#undef HTMLSTYLESHEETSCOL_THIS + +static const IHTMLStyleSheetsCollectionVtbl HTMLStyleSheetsCollectionVtbl = { + HTMLStyleSheetsCollection_QueryInterface, + HTMLStyleSheetsCollection_AddRef, + HTMLStyleSheetsCollection_Release, + HTMLStyleSheetsCollection_GetTypeInfoCount, + HTMLStyleSheetsCollection_GetTypeInfo, + HTMLStyleSheetsCollection_GetIDsOfNames, + HTMLStyleSheetsCollection_Invoke, + HTMLStyleSheetsCollection_get_length, + HTMLStyleSheetsCollection_get__newEnum, + HTMLStyleSheetsCollection_item +}; + +IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList *nslist) +{ + HTMLStyleSheetsCollection *ret = mshtml_alloc(sizeof(HTMLStyleSheetsCollection)); + + ret->lpHTMLStyleSheetsCollectionVtbl = &HTMLStyleSheetsCollectionVtbl; + ret->ref = 1; + + if(nslist) + nsIDOMStyleSheetList_AddRef(nslist); + ret->nslist = nslist; + + return HTMLSTYLESHEETSCOL(ret); +} #define HTMLSTYLESHEET_THIS(iface) DEFINE_THIS(HTMLStyleSheet, HTMLStyleSheet, iface) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e560ef1..b07476f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -406,6 +406,7 @@ IHTMLSelectionObject *HTMLSelectionObject_Create(HTMLDocument*,nsISelection*); IHTMLTxtRange *HTMLTxtRange_Create(HTMLDocument*,nsIDOMRange*); IHTMLStyle *HTMLStyle_Create(nsIDOMCSSStyleDeclaration*); IHTMLStyleSheet *HTMLStyleSheet_Create(void); +IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*); void detach_selection(HTMLDocument*); void detach_ranges(HTMLDocument*); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 4a3347d..c79b17e 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -123,6 +123,7 @@ typedef nsISupports nsIPrincipal; typedef nsISupports nsIAtom; typedef nsISupports nsISupportsArray; typedef nsISupports nsIContentFilter; +typedef nsISupports nsIDOMStyleSheet; [ object, @@ -571,6 +572,17 @@ interface nsIDOMCSSStyleDeclaration : nsISupports [ object, + uuid(a6cf9081-15b3-11d2-932e-00805f8add32) + /* FROZEN */ +] +interface nsIDOMStyleSheetList : nsISupports +{ + nsresult GetLength(PRUint32 *aLength); + nsresult Item(PRUint32 index, nsIDOMStyleSheet **_retval); +} + +[ + object, uuid(a6cf907d-15b3-11d2-932e-00805f8add32) /* FROZEN */ ] @@ -824,6 +836,16 @@ interface nsIDOMHTMLDocument : nsIDOMDocument [ object, + uuid(3d9f4973-dd2e-48f5-b5f7-2634e09eadd9) + /* FROZEN */ +] +interface nsIDOMDocumentStyle : nsISupports +{ + nsresult GetStyleSheets(nsIDOMStyleSheetList **aStyleSheets); +} + +[ + object, uuid(a6cf90ce-15b3-11d2-932e-00805f8add32) /* FROZEN */ ]

1 0

Jacek Caban : mshtml: Return NULL for empty results in get_style_attr.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 13bb3dd8eead2069fcac56225f4ab1f672acbe38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13bb3dd8eead2069fcac56225… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 12:41:27 2007 +0200 mshtml: Return NULL for empty results in get_style_attr. --- dlls/mshtml/htmlstyle.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3657033..a9ad88d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -91,7 +91,7 @@ static HRESULT get_style_attr(HTMLStyle *This, LPCWSTR name, BSTR *p) ERR("SetProperty failed: %08x\n", nsres); nsAString_GetData(&str_value, &value, NULL); - *p = SysAllocString(value); + *p = *value ? SysAllocString(value) : NULL; nsAString_Finish(&str_name); nsAString_Finish(&str_value);

1 0

Jacek Caban : mshtml: Added more IHTMLStyle getters implementation.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: b5dadf955e57f8c1b2bf95df95d14bc8354e5f0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5dadf955e57f8c1b2bf95df9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 12:41:46 2007 +0200 mshtml: Added more IHTMLStyle getters implementation. --- dlls/mshtml/htmlstyle.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a9ad88d..6b4cf7d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -48,10 +48,16 @@ typedef struct { 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 attrFontFamily[] = {'f','o','n','t','-','f','a','m','i','l','y',0}; static const WCHAR attrFontSize[] = {'f','o','n','t','-','s','i','z','e',0}; +static const WCHAR attrFontStyle[] = + {'f','o','n','t','-','s','t','y','l','e',0}; +static const WCHAR attrFontWeight[] = + {'f','o','n','t','-','w','e','i','g','h','t',0}; static HRESULT set_style_attr(HTMLStyle *This, LPCWSTR name, LPCWSTR value) { @@ -215,8 +221,10 @@ static HRESULT WINAPI HTMLStyle_put_fontStyle(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_get_fontStyle(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, attrFontStyle, p); } static HRESULT WINAPI HTMLStyle_put_fontVariant(IHTMLStyle *iface, BSTR v) @@ -243,8 +251,10 @@ static HRESULT WINAPI HTMLStyle_put_fontWeight(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_get_fontWeight(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, attrFontWeight, p); } static HRESULT WINAPI HTMLStyle_put_fontSize(IHTMLStyle *iface, VARIANT v) @@ -266,8 +276,11 @@ static HRESULT WINAPI HTMLStyle_put_fontSize(IHTMLStyle *iface, VARIANT v) static HRESULT WINAPI HTMLStyle_get_fontSize(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + V_VT(p) = VT_BSTR; + return get_style_attr(This, attrFontSize, &V_BSTR(p)); } static HRESULT WINAPI HTMLStyle_put_font(IHTMLStyle *iface, BSTR v) @@ -294,8 +307,11 @@ static HRESULT WINAPI HTMLStyle_put_color(IHTMLStyle *iface, VARIANT v) static HRESULT WINAPI HTMLStyle_get_color(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + V_VT(p) = VT_BSTR; + return get_style_attr(This, attrColor, &V_BSTR(p)); } static HRESULT WINAPI HTMLStyle_put_background(IHTMLStyle *iface, BSTR v)

1 0

Jacek Caban : mshtml: Get rid of node_type variable in HTMLNode object.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 4b2b441e5b0c5df26353ac4a673d4c7c4fe44e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b2b441e5b0c5df26353ac4a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 12:40:15 2007 +0200 mshtml: Get rid of node_type variable in HTMLNode object. --- dlls/mshtml/htmlelem.c | 1 - dlls/mshtml/htmlnode.c | 1 - dlls/mshtml/mshtml_private.h | 5 ----- 3 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 0e77b9f..3334763 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1318,7 +1318,6 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) HTMLElement2_Init(ret); - ret->node.node_type = NT_HTMLELEM; ret->node.impl.elem = HTMLELEM(ret); ret->node.destructor = HTMLElement_destructor; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index de7a4ee..62f650b 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -348,7 +348,6 @@ static HTMLDOMNode *create_node(HTMLDocument *doc, nsIDOMNode *nsnode) break; default: ret = mshtml_alloc(sizeof(HTMLDOMNode)); - ret->node_type = NT_UNKNOWN; ret->impl.unk = NULL; ret->destructor = NULL; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 408dc52..e560ef1 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -254,11 +254,6 @@ struct HTMLDOMNode { void (*destructor)(IUnknown*); - enum { - NT_UNKNOWN, - NT_HTMLELEM - } node_type; - union { IUnknown *unk; IHTMLElement *elem;

1 0

Jacek Caban : mshtml: Forward node ref calls to IHTMLDOMNode interface.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: a95bfede8a1573715275f94685bbf390dc3c10ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a95bfede8a1573715275f9468… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 12:40:41 2007 +0200 mshtml: Forward node ref calls to IHTMLDOMNode interface. --- dlls/mshtml/htmlanchor.c | 8 ++------ dlls/mshtml/htmlbody.c | 8 ++------ dlls/mshtml/htmlelem.c | 12 ++---------- dlls/mshtml/htmlinput.c | 8 ++------ dlls/mshtml/htmlnode.c | 8 ++------ dlls/mshtml/htmlselect.c | 8 ++------ dlls/mshtml/htmltextarea.c | 8 ++------ 7 files changed, 14 insertions(+), 46 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 3bd08fc..71390e9 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -80,18 +80,14 @@ static ULONG WINAPI HTMLAnchorElement_AddRef(IHTMLAnchorElement *iface) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - TRACE("(%p)\n", This); - - return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); } static ULONG WINAPI HTMLAnchorElement_Release(IHTMLAnchorElement *iface) { HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - TRACE("(%p)\n", This); - - return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); } static HRESULT WINAPI HTMLAnchorElement_GetTypeInfoCount(IHTMLAnchorElement *iface, UINT *pctinfo) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 35be04f..b8c153a 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -94,18 +94,14 @@ static ULONG WINAPI HTMLBodyElement_AddRef(IHTMLBodyElement *iface) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)\n", This); - - return IHTMLDocument2_AddRef(HTMLDOC(This->textcont.element.node.doc)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->textcont.element.node)); } static ULONG WINAPI HTMLBodyElement_Release(IHTMLBodyElement *iface) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - TRACE("(%p)\n", This); - - return IHTMLDocument2_Release(HTMLDOC(This->textcont.element.node.doc)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->textcont.element.node)); } static HRESULT WINAPI HTMLBodyElement_GetTypeInfoCount(IHTMLBodyElement *iface, UINT *pctinfo) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 3334763..05071d8 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -80,22 +80,14 @@ static ULONG WINAPI HTMLElement_AddRef(IHTMLElement *iface) { HTMLElement *This = HTMLELEM_THIS(iface); - if(This->impl) - return IUnknown_AddRef(This->impl); - - TRACE("(%p)\n", This); - return IHTMLDocument2_AddRef(HTMLDOC(This->node.doc)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->node)); } static ULONG WINAPI HTMLElement_Release(IHTMLElement *iface) { HTMLElement *This = HTMLELEM_THIS(iface); - if(This->impl) - return IUnknown_Release(This->impl); - - TRACE("(%p)\n", This); - return IHTMLDocument2_Release(HTMLDOC(This->node.doc)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->node)); } static HRESULT WINAPI HTMLElement_GetTypeInfoCount(IHTMLElement *iface, UINT *pctinfo) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 7cef2bd..dc3ec8a 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -82,18 +82,14 @@ static ULONG WINAPI HTMLInputElement_AddRef(IHTMLInputElement *iface) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - TRACE("(%p)\n", This); - - return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); } static ULONG WINAPI HTMLInputElement_Release(IHTMLInputElement *iface) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - TRACE("(%p)\n", This); - - return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); } static HRESULT WINAPI HTMLInputElement_GetTypeInfoCount(IHTMLInputElement *iface, UINT *pctinfo) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 62f650b..51837ce 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -59,10 +59,8 @@ static ULONG WINAPI HTMLDOMNode_AddRef(IHTMLDOMNode *iface) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - if(This->impl.unk) - return IUnknown_AddRef(This->impl.unk); - TRACE("(%p)\n", This); + return IHTMLDocument2_AddRef(HTMLDOC(This->doc)); } @@ -70,10 +68,8 @@ static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - if(This->impl.unk) - return IUnknown_Release(This->impl.unk); - TRACE("(%p)\n", This); + return IHTMLDocument2_Release(HTMLDOC(This->doc)); } diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index d0be23d..c50b431 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -82,18 +82,14 @@ static ULONG WINAPI HTMLSelectElement_AddRef(IHTMLSelectElement *iface) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - TRACE("(%p)\n", This); - - return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); } static ULONG WINAPI HTMLSelectElement_Release(IHTMLSelectElement *iface) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - TRACE("(%p)\n", This); - - return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); } static HRESULT WINAPI HTMLSelectElement_GetTypeInfoCount(IHTMLSelectElement *iface, UINT *pctinfo) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 6266284..c9b0c3e 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -82,18 +82,14 @@ static ULONG WINAPI HTMLTextAreaElement_AddRef(IHTMLTextAreaElement *iface) { HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); - TRACE("(%p)\n", This); - - return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); } static ULONG WINAPI HTMLTextAreaElement_Release(IHTMLTextAreaElement *iface) { HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); - TRACE("(%p)\n", This); - - return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); } static HRESULT WINAPI HTMLTextAreaElement_GetTypeInfoCount(IHTMLTextAreaElement *iface, UINT *pctinfo)

1 0

Juan Lang : setupapi: Add missing prototypes and definitions, and change function prototypes to match.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 9fc7973727e9140f92188d5624e8e44600cb9065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc7973727e9140f92188d562… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 18 13:33:15 2007 -0700 setupapi: Add missing prototypes and definitions, and change function prototypes to match. --- dlls/setupapi/stubs.c | 4 +- include/setupapi.h | 869 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 868 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9fc7973727e9140f92188…

1 0

Jacek Caban : mshtml: Don't use node_type from HTMLNode object.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 6aa3834ffdb4db53717c2e0e8f7a61f12d243148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa3834ffdb4db53717c2e0e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 12:39:50 2007 +0200 mshtml: Don't use node_type from HTMLNode object. --- dlls/mshtml/htmlelem.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5f93aa7..0e77b9f 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1033,7 +1033,7 @@ static void create_child_list(HTMLDocument *doc, HTMLElement *elem, elem_vector nsIDOMNodeList *nsnode_list; nsIDOMNode *iter; PRUint32 list_len = 0, i; - HTMLDOMNode *node; + PRUint16 node_type; nsresult nsres; nsres = nsIDOMNode_GetChildNodes(elem->node.nsnode, &nsnode_list); @@ -1056,11 +1056,9 @@ static void create_child_list(HTMLDocument *doc, HTMLElement *elem, elem_vector continue; } - node = get_node(doc, iter); - if(node->node_type != NT_HTMLELEM) - continue; - - elem_vector_add(buf, HTMLELEM_NODE_THIS(node)); + nsres = nsIDOMNode_GetNodeType(iter, &node_type); + if(NS_SUCCEEDED(nsres) && node_type == ELEMENT_NODE) + elem_vector_add(buf, HTMLELEM_NODE_THIS(get_node(doc, iter))); } } @@ -1081,7 +1079,7 @@ static void create_all_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *b nsIDOMNodeList *nsnode_list; nsIDOMNode *iter; PRUint32 list_len = 0, i; - HTMLDOMNode *node; + PRUint16 node_type; nsresult nsres; nsres = nsIDOMNode_GetChildNodes(elem->node.nsnode, &nsnode_list); @@ -1101,12 +1099,13 @@ static void create_all_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *b continue; } - node = get_node(doc, iter); - if(node->node_type != NT_HTMLELEM) - continue; + nsres = nsIDOMNode_GetNodeType(iter, &node_type); + if(NS_SUCCEEDED(nsres) && node_type == ELEMENT_NODE) { + HTMLDOMNode *node = get_node(doc, iter); - elem_vector_add(buf, HTMLELEM_NODE_THIS(node)); - create_all_list(doc, HTMLELEM_NODE_THIS(node), buf); + elem_vector_add(buf, HTMLELEM_NODE_THIS(node)); + create_all_list(doc, HTMLELEM_NODE_THIS(node), buf); + } } }

1 0

Juan Lang : setupapi: Fix return type.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 2e2fe9b9f786479e5285504b6a98d6cdf96c00ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2fe9b9f786479e5285504b6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 18 09:48:29 2007 -0700 setupapi: Fix return type. --- dlls/setupapi/devinst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 0ec10dc..8b75866 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1029,7 +1029,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW( PVOID reserved) { FIXME("stub\n"); - return FALSE; + return NULL; } /***********************************************************************

1 0

Juan Lang : setupapi: Fix typo.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: d62285d006389c2a17e1d1b33f2ffcb6bd0f3ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62285d006389c2a17e1d1b33… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 18 09:50:50 2007 -0700 setupapi: Fix typo. --- dlls/setupapi/devinst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 8b75866..3ac0c7d 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -50,7 +50,7 @@ static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0}; static const WCHAR Class[] = {'C','l','a','s','s',0}; static const WCHAR ClassInstall32[] = {'C','l','a','s','s','I','n','s','t','a','l','l','3','2',0}; static const WCHAR NoDisplayClass[] = {'N','o','D','i','s','p','l','a','y','C','l','a','s','s',0}; -static const WCHAR NoInstallClass[] = {'N','o','I','s','t','a','l','l','C','l','a','s','s',0}; +static const WCHAR NoInstallClass[] = {'N','o','I','n','s','t','a','l','l','C','l','a','s','s',0}; static const WCHAR NoUseClass[] = {'N','o','U','s','e','C','l','a','s','s',0}; static const WCHAR NtExtension[] = {'.','N','T',0}; static const WCHAR NtPlatformExtension[] = {'.','N','T','x','8','6',0};

1 0