January 2011 - Wine-commits

Alexandre Julliard : wrc: Add support for generating . po files from existing resources.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 10700bf6b2a6c883dd3fab4a6af94fdfade26c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10700bf6b2a6c883dd3fab4a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 4 11:18:10 2011 +0100 wrc: Add support for generating .po files from existing resources. --- tools/wrc/Makefile.in | 6 +- tools/wrc/po.c | 716 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/wrc/wrc.c | 41 ++- tools/wrc/wrc.h | 3 +- tools/wrc/wrc.man.in | 11 +- 5 files changed, 758 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10700bf6b2a6c883dd3fa…

1 0

Alexandre Julliard : wrc: Add support for loading translations from po files.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: d8c986e062cd13d851030880b2a0cdf15a4b6fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c986e062cd13d851030880b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 4 11:18:45 2011 +0100 wrc: Add support for loading translations from po files. --- tools/wrc/po.c | 268 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/wrc/wrc.c | 8 ++ tools/wrc/wrc.h | 1 + tools/wrc/wrc.man.in | 6 + 4 files changed, 283 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c986e062cd13d851030…

1 0

Alexandre Julliard : clock: Convert translations to po files.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: dcf5548bd62e6554f62d719f3102cfb2d7c18db4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf5548bd62e6554f62d719f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 4 11:20:30 2011 +0100 clock: Convert translations to po files. --- Make.rules.in | 2 +- Makefile.in | 1 + po/LINGUAS | 37 +++++++++++++++++ po/cs.po | 58 ++++++++++++++++++++++++++ po/da.po | 58 ++++++++++++++++++++++++++ po/de.po | 58 ++++++++++++++++++++++++++ po/en_US.po | 58 ++++++++++++++++++++++++++ po/eo.po | 58 ++++++++++++++++++++++++++ po/es.po | 58 ++++++++++++++++++++++++++ po/fi.po | 58 ++++++++++++++++++++++++++ po/fr.po | 58 ++++++++++++++++++++++++++ po/he.po | 58 ++++++++++++++++++++++++++ po/hi.po | 58 ++++++++++++++++++++++++++ po/hu.po | 58 ++++++++++++++++++++++++++ po/it.po | 58 ++++++++++++++++++++++++++ po/ja.po | 58 ++++++++++++++++++++++++++ po/ko.po | 58 ++++++++++++++++++++++++++ po/lt.po | 58 ++++++++++++++++++++++++++ po/ml.po | 58 ++++++++++++++++++++++++++ po/nb_NO.po | 58 ++++++++++++++++++++++++++ po/nl.po | 58 ++++++++++++++++++++++++++ po/or.po | 58 ++++++++++++++++++++++++++ po/pa.po | 58 ++++++++++++++++++++++++++ po/pl.po | 58 ++++++++++++++++++++++++++ po/pt_BR.po | 58 ++++++++++++++++++++++++++ po/pt_PT.po | 58 ++++++++++++++++++++++++++ po/ro.po | 58 ++++++++++++++++++++++++++ po/ru.po | 58 ++++++++++++++++++++++++++ po/sk.po | 58 ++++++++++++++++++++++++++ po/sl.po | 58 ++++++++++++++++++++++++++ po/sr_Latn_SP.po | 58 ++++++++++++++++++++++++++ po/sr_SP.po | 58 ++++++++++++++++++++++++++ po/sv.po | 58 ++++++++++++++++++++++++++ po/te.po | 58 ++++++++++++++++++++++++++ po/th.po | 58 ++++++++++++++++++++++++++ po/tr.po | 58 ++++++++++++++++++++++++++ po/uk.po | 58 ++++++++++++++++++++++++++ po/wa.po | 58 ++++++++++++++++++++++++++ po/wine.pot | 55 +++++++++++++++++++++++++ po/zh_CN.po | 58 ++++++++++++++++++++++++++ po/zh_TW.po | 58 ++++++++++++++++++++++++++ programs/clock/Cs.rc | 53 ------------------------ programs/clock/Da.rc | 50 ---------------------- programs/clock/De.rc | 51 ----------------------- programs/clock/Eo.rc | 48 ---------------------- programs/clock/Es.rc | 51 ----------------------- programs/clock/Fi.rc | 49 ---------------------- programs/clock/Fr.rc | 53 ------------------------ programs/clock/He.rc | 52 ----------------------- programs/clock/Hi.rc | 51 ----------------------- programs/clock/Hu.rc | 50 ---------------------- programs/clock/It.rc | 54 ------------------------ programs/clock/Ja.rc | 52 ----------------------- programs/clock/Ko.rc | 53 ------------------------ programs/clock/Lt.rc | 51 ----------------------- programs/clock/Makefile.in | 36 +---------------- programs/clock/Ml.rc | 51 ----------------------- programs/clock/Nl.rc | 48 ---------------------- programs/clock/No.rc | 48 ---------------------- programs/clock/Or.rc | 51 ----------------------- programs/clock/Pa.rc | 51 ----------------------- programs/clock/Pl.rc | 50 ---------------------- programs/clock/Pt.rc | 79 ------------------------------------ programs/clock/Ro.rc | 50 ---------------------- programs/clock/Ru.rc | 51 ----------------------- programs/clock/Si.rc | 50 ---------------------- programs/clock/Sk.rc | 50 ---------------------- programs/clock/Sr.rc | 79 ------------------------------------ programs/clock/Sv.rc | 50 ---------------------- programs/clock/Te.rc | 51 ----------------------- programs/clock/Th.rc | 48 ---------------------- programs/clock/Tr.rc | 48 ---------------------- programs/clock/Uk.rc | 53 ------------------------ programs/clock/Wa.rc | 57 -------------------------- programs/clock/Zh.rc | 79 ------------------------------------ programs/clock/{En.rc => clock.rc} | 4 +- 76 files changed, 2243 insertions(+), 1800 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dcf5548bd62e6554f62d7…

1 0

André Hentschel : ntdll: Respect multiple CPUs when faking values.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 40294182c1554a97dcfa8414b609b6f8de8f5239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40294182c1554a97dcfa8414b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 3 20:27:00 2011 +0100 ntdll: Respect multiple CPUs when faking values. --- dlls/ntdll/nt.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 7ad56e4..ee78aec 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1647,17 +1647,18 @@ NTSTATUS WINAPI NtQuerySystemInformation( if (cpus == 0) { static int i = 1; - - sppi = RtlAllocateHeap(GetProcessHeap(),0,sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); - - memset(sppi, 0 , sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); + int n; + cpus = min(NtCurrentTeb()->Peb->NumberOfProcessors, out_cpus); + len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; + sppi = RtlAllocateHeap(GetProcessHeap(), 0, len); FIXME("stub info_class SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION\n"); - /* many programs expect these values to change so fake change */ - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); - sppi->KernelTime.QuadPart = 1 * i; - sppi->UserTime.QuadPart = 2 * i; - sppi->IdleTime.QuadPart = 3 * i; + for (n = 0; n < cpus; n++) + { + sppi[n].KernelTime.QuadPart = 1 * i; + sppi[n].UserTime.QuadPart = 2 * i; + sppi[n].IdleTime.QuadPart = 3 * i; + } i++; }

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLDOMTextNode iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 868a3e660e0e48098b133722574c17ff8d11f31b URL: http://source.winehq.org/git/wine.git/?a=commit;h=868a3e660e0e48098b1337225… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:53:03 2011 +0100 mshtml: COM cleanup for the IHTMLDOMTextNode iface. --- dlls/mshtml/htmltextnode.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index d75e447..58422de 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -34,47 +34,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLDOMTextNode { HTMLDOMNode node; - const IHTMLDOMTextNodeVtbl *lpIHTMLDOMTextNodeVtbl; + IHTMLDOMTextNode IHTMLDOMTextNode_iface; nsIDOMText *nstext; }; -#define HTMLTEXT(x) (&(x)->lpIHTMLDOMTextNodeVtbl) - -#define HTMLTEXT_THIS(iface) DEFINE_THIS(HTMLDOMTextNode, IHTMLDOMTextNode, iface) +static inline HTMLDOMTextNode *impl_from_IHTMLDOMTextNode(IHTMLDOMTextNode *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMTextNode, IHTMLDOMTextNode_iface); +} static HRESULT WINAPI HTMLDOMTextNode_QueryInterface(IHTMLDOMTextNode *iface, REFIID riid, void **ppv) { - HTMLDOMTextNode *This = HTMLTEXT_THIS(iface); + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); return IHTMLDOMNode_QueryInterface(&This->node.IHTMLDOMNode_iface, riid, ppv); } static ULONG WINAPI HTMLDOMTextNode_AddRef(IHTMLDOMTextNode *iface) { - HTMLDOMTextNode *This = HTMLTEXT_THIS(iface); + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); return IHTMLDOMNode_AddRef(&This->node.IHTMLDOMNode_iface); } static ULONG WINAPI HTMLDOMTextNode_Release(IHTMLDOMTextNode *iface) { - HTMLDOMTextNode *This = HTMLTEXT_THIS(iface); + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); return IHTMLDOMNode_Release(&This->node.IHTMLDOMNode_iface); } static HRESULT WINAPI HTMLDOMTextNode_GetTypeInfoCount(IHTMLDOMTextNode *iface, UINT *pctinfo) { - HTMLDOMTextNode *This = HTMLTEXT_THIS(iface); + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); return IDispatchEx_GetTypeInfoCount(&This->node.dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLDOMTextNode_GetTypeInfo(IHTMLDOMTextNode *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLDOMTextNode *This = HTMLTEXT_THIS(iface); + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); return IDispatchEx_GetTypeInfo(&This->node.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -82,7 +83,7 @@ static HRESULT WINAPI HTMLDOMTextNode_GetIDsOfNames(IHTMLDOMTextNode *iface, REF LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLDOMTextNode *This = HTMLTEXT_THIS(iface); + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); return IDispatchEx_GetIDsOfNames(&This->node.dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -91,35 +92,35 @@ static HRESULT WINAPI HTMLDOMTextNode_Invoke(IHTMLDOMTextNode *iface, DISPID dis REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLDOMTextNode *This = HTMLTEXT_THIS(iface); + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); return IDispatchEx_Invoke(&This->node.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLDOMTextNode_put_data(IHTMLDOMTextNode *iface, BSTR v) { - HTMLDOMTextNode *This = HTMLTEXT_THIS(iface); + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLDOMTextNode_get_data(IHTMLDOMTextNode *iface, BSTR *p) { - HTMLDOMTextNode *This = HTMLTEXT_THIS(iface); + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLDOMTextNode_toString(IHTMLDOMTextNode *iface, BSTR *String) { - HTMLDOMTextNode *This = HTMLTEXT_THIS(iface); + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); FIXME("(%p)->(%p)\n", This, String); return E_NOTIMPL; } static HRESULT WINAPI HTMLDOMTextNode_get_length(IHTMLDOMTextNode *iface, LONG *p) { - HTMLDOMTextNode *This = HTMLTEXT_THIS(iface); + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); PRUint32 length = 0; nsresult nsres; @@ -135,13 +136,11 @@ static HRESULT WINAPI HTMLDOMTextNode_get_length(IHTMLDOMTextNode *iface, LONG * static HRESULT WINAPI HTMLDOMTextNode_splitText(IHTMLDOMTextNode *iface, LONG offset, IHTMLDOMNode **pRetNode) { - HTMLDOMTextNode *This = HTMLTEXT_THIS(iface); + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); FIXME("(%p)->(%d %p)\n", This, offset, pRetNode); return E_NOTIMPL; } -#undef HTMLTEXT_THIS - static const IHTMLDOMTextNodeVtbl HTMLDOMTextNodeVtbl = { HTMLDOMTextNode_QueryInterface, HTMLDOMTextNode_AddRef, @@ -170,7 +169,7 @@ static HRESULT HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IHTMLDOMTextNode, riid)) { TRACE("(%p)->(IID_IHTMLDOMTextNode %p)\n", This, ppv); - *ppv = HTMLTEXT(This); + *ppv = &This->IHTMLDOMTextNode_iface; }else { return HTMLDOMNode_QI(&This->node, riid, ppv); } @@ -231,7 +230,7 @@ HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDO return E_OUTOFMEMORY; ret->node.vtbl = &HTMLDOMTextNodeImplVtbl; - ret->lpIHTMLDOMTextNodeVtbl = &HTMLDOMTextNodeVtbl; + ret->IHTMLDOMTextNode_iface.lpVtbl = &HTMLDOMTextNodeVtbl; nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMText, (void**)&ret->nstext); if(NS_FAILED(nsres)) { @@ -240,7 +239,8 @@ HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDO return E_FAIL; } - init_dispex(&ret->node.dispex, (IUnknown*)HTMLTEXT(ret), &HTMLDOMTextNode_dispex); + init_dispex(&ret->node.dispex, (IUnknown*)&ret->IHTMLDOMTextNode_iface, + &HTMLDOMTextNode_dispex); HTMLDOMNode_Init(doc, &ret->node, nsnode); *node = &ret->node;

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLCurrentStyle iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 7021fd321b66800451a759960ff478c833cd8ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=7021fd321b66800451a759960… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:55:10 2011 +0100 mshtml: COM cleanup for the IHTMLCurrentStyle iface. --- dlls/mshtml/htmlcurstyle.c | 217 ++++++++++++++++++++++---------------------- 1 files changed, 108 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7021fd321b66800451a75…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IActiveScriptSite* ifaces.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: f341ed11e26941e8a96e86b9b7e5d7e8b0feb66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f341ed11e26941e8a96e86b9b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:56:46 2011 +0100 mshtml: COM cleanup for the IActiveScriptSite* ifaces. --- dlls/mshtml/script.c | 143 +++++++++++++++++++++++++------------------------- 1 files changed, 71 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f341ed11e26941e8a96e8…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLStyleElement iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 5ffd1510d2d6f16579f3a6491fc8570fe54a0d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffd1510d2d6f16579f3a6491… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:59:26 2011 +0100 mshtml: COM cleanup for the IHTMLStyleElement iface. --- dlls/mshtml/htmlstyleelem.c | 61 +++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 1702d26..942f422 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -35,47 +35,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; - const IHTMLStyleElementVtbl *lpIHTMLStyleElementVtbl; + IHTMLStyleElement IHTMLStyleElement_iface; nsIDOMHTMLStyleElement *nsstyle; } HTMLStyleElement; -#define HTMLSTYLE(x) (&(x)->lpIHTMLStyleElementVtbl) - -#define HTMLSTYLE_THIS(iface) DEFINE_THIS(HTMLStyleElement, IHTMLStyleElement, iface) +static inline HTMLStyleElement *impl_from_IHTMLStyleElement(IHTMLStyleElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLStyleElement, IHTMLStyleElement_iface); +} static HRESULT WINAPI HTMLStyleElement_QueryInterface(IHTMLStyleElement *iface, REFIID riid, void **ppv) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); } static ULONG WINAPI HTMLStyleElement_AddRef(IHTMLStyleElement *iface) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); } static ULONG WINAPI HTMLStyleElement_Release(IHTMLStyleElement *iface) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); } static HRESULT WINAPI HTMLStyleElement_GetTypeInfoCount(IHTMLStyleElement *iface, UINT *pctinfo) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IDispatchEx_GetTypeInfoCount(&This->element.node.dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLStyleElement_GetTypeInfo(IHTMLStyleElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IDispatchEx_GetTypeInfo(&This->element.node.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -83,7 +84,7 @@ static HRESULT WINAPI HTMLStyleElement_GetTypeInfo(IHTMLStyleElement *iface, UIN static HRESULT WINAPI HTMLStyleElement_GetIDsOfNames(IHTMLStyleElement *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IDispatchEx_GetIDsOfNames(&This->element.node.dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -92,14 +93,14 @@ static HRESULT WINAPI HTMLStyleElement_Invoke(IHTMLStyleElement *iface, DISPID d REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IDispatchEx_Invoke(&This->element.node.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLStyleElement_put_type(IHTMLStyleElement *iface, BSTR v) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); nsAString type_str; nsresult nsres; @@ -118,7 +119,7 @@ static HRESULT WINAPI HTMLStyleElement_put_type(IHTMLStyleElement *iface, BSTR v static HRESULT WINAPI HTMLStyleElement_get_type(IHTMLStyleElement *iface, BSTR *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); nsAString nsstr; nsresult nsres; @@ -131,77 +132,77 @@ static HRESULT WINAPI HTMLStyleElement_get_type(IHTMLStyleElement *iface, BSTR * static HRESULT WINAPI HTMLStyleElement_get_readyState(IHTMLStyleElement *iface, BSTR *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_put_onreadystatechange(IHTMLStyleElement *iface, VARIANT v) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_get_onreadystatechange(IHTMLStyleElement *iface, VARIANT *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_put_onload(IHTMLStyleElement *iface, VARIANT v) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_get_onload(IHTMLStyleElement *iface, VARIANT *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_put_onerror(IHTMLStyleElement *iface, VARIANT v) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_get_onerror(IHTMLStyleElement *iface, VARIANT *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_get_styleSheet(IHTMLStyleElement *iface, IHTMLStyleSheet **p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_put_disabled(IHTMLStyleElement *iface, VARIANT_BOOL v) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%x)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_get_disabled(IHTMLStyleElement *iface, VARIANT_BOOL *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_put_media(IHTMLStyleElement *iface, BSTR v) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); nsAString media_str; nsresult nsres; @@ -220,7 +221,7 @@ static HRESULT WINAPI HTMLStyleElement_put_media(IHTMLStyleElement *iface, BSTR static HRESULT WINAPI HTMLStyleElement_get_media(IHTMLStyleElement *iface, BSTR *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); nsAString nsstr; nsresult nsres; @@ -231,8 +232,6 @@ static HRESULT WINAPI HTMLStyleElement_get_media(IHTMLStyleElement *iface, BSTR return return_nsstr(nsres, &nsstr, p); } -#undef HTMLSTYLE_THIS - static const IHTMLStyleElementVtbl HTMLStyleElementVtbl = { HTMLStyleElement_QueryInterface, HTMLStyleElement_AddRef, @@ -268,13 +267,13 @@ static HRESULT HTMLStyleElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLSTYLE(This); + *ppv = &This->IHTMLStyleElement_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLSTYLE(This); + *ppv = &This->IHTMLStyleElement_iface; }else if(IsEqualGUID(&IID_IHTMLStyleElement, riid)) { TRACE("(%p)->(IID_IHTMLStyleElement %p)\n", This, ppv); - *ppv = HTMLSTYLE(This); + *ppv = &This->IHTMLStyleElement_iface; }else { return HTMLElement_QI(&This->element.node, riid, ppv); } @@ -320,7 +319,7 @@ HRESULT HTMLStyleElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem if(!ret) return E_OUTOFMEMORY; - ret->lpIHTMLStyleElementVtbl = &HTMLStyleElementVtbl; + ret->IHTMLStyleElement_iface.lpVtbl = &HTMLStyleElementVtbl; ret->element.node.vtbl = &HTMLStyleElementImplVtbl; nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLStyleElement, (void**)&ret->nsstyle);

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLStyle iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: e7f5cc27bfafa4961c58de5bceea34a4dce1a8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f5cc27bfafa4961c58de5bc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 02:00:53 2011 +0100 mshtml: COM cleanup for the IHTMLStyle iface. --- dlls/mshtml/htmlstyle.c | 387 +++++++++++++++++++++++----------------------- dlls/mshtml/htmlstyle.h | 3 +- dlls/mshtml/htmlstyle2.c | 6 +- dlls/mshtml/htmlstyle3.c | 12 +- 4 files changed, 205 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7f5cc27bfafa4961c58d…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLStyle2 iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 6dcff905e64aba44af06037fee788d3732dda9f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dcff905e64aba44af06037fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 02:02:40 2011 +0100 mshtml: COM cleanup for the IHTMLStyle2 iface. --- dlls/mshtml/htmlstyle.c | 4 +- dlls/mshtml/htmlstyle.h | 3 +- dlls/mshtml/htmlstyle2.c | 147 +++++++++++++++++++++++---------------------- 3 files changed, 78 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dcff905e64aba44af060…

1 0