March 2012 - Wine-commits - list.winehq.org

Thomas Faber : dbghelp: Fix uninitialized variable usage.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 9f0119a0c07cd52bbac31706f80db5f71524977c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f0119a0c07cd52bbac31706f… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Mar 28 13:30:08 2012 +0200 dbghelp: Fix uninitialized variable usage. --- dlls/dbghelp/cpu_x86_64.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 711c78c..29f4c6f 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -313,6 +313,7 @@ static BOOL is_inside_epilog(struct cpu_stack_walk* csw, DWORD64 pc, } return FALSE; case 0x83: /* add $n,%rsp */ + if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE; if (op0 == 0x48 && op2 == 0xc4) { pc += 4; @@ -320,6 +321,7 @@ static BOOL is_inside_epilog(struct cpu_stack_walk* csw, DWORD64 pc, } return FALSE; case 0x8d: /* lea n(reg),%rsp */ + if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE; if (op0 & 0x06) return FALSE; /* rex.RX must be cleared */ if (((op2 >> 3) & 7) != 4) return FALSE; /* dest reg mus be %rsp */ if ((op2 & 7) == 4) return FALSE; /* no SIB byte allowed */

1 0

Michael Mc Donnell : d3dx9: Do not weld self.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: f144626e81c3b60bbc9a9c028e4a8ec1f5d96c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f144626e81c3b60bbc9a9c028… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Mar 21 23:27:35 2012 +0100 d3dx9: Do not weld self. --- dlls/d3dx9_36/mesh.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 022e66d..84856b3 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -6640,6 +6640,13 @@ HRESULT WINAPI D3DXWeldVertices(LPD3DXMESH mesh, BYTE *from = &vertices[vertex_size*point_reps[index] + decl_ptr->Offset]; FLOAT epsilon = get_component_epsilon(decl_ptr, epsilons); + /* Don't weld self */ + if (index == point_reps[index]) + { + matches++; + continue; + } + if (weld_component(to, from, decl_ptr->Type, epsilon)) matches++; }

1 0

Alistair Leslie-Hughes : scrrun: Add DllCanUnloadNow, DllGetClassObject stubs.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: d7a00c533e392377984d7755223edad1cc76e629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a00c533e392377984d77552… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 25 15:55:54 2012 +1100 scrrun: Add DllCanUnloadNow, DllGetClassObject stubs. --- dlls/scrrun/scrrun.c | 21 +++++++++++++++++++++ dlls/scrrun/scrrun.spec | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 3284584..c74832b 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -65,3 +65,24 @@ HRESULT WINAPI DllUnregisterServer(void) TRACE("()\n"); return __wine_unregister_resources(scrrun_instance); } + +/*********************************************************************** + * DllGetClassObject (scrrun.@) + */ + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) +{ + FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + if(!ppv) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +/*********************************************************************** + * DllCanUnloadNow (scrrun.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} diff --git a/dlls/scrrun/scrrun.spec b/dlls/scrrun/scrrun.spec index 838e9ea..e71b683 100644 --- a/dlls/scrrun/scrrun.spec +++ b/dlls/scrrun/scrrun.spec @@ -1,6 +1,6 @@ @ stub DLLGetDocumentation -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub DoOpenPipeStream

1 0

Alistair Leslie-Hughes : scrrun: Register Scripting interfaces.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: e147d6714acb43bc72bb8cb7ea5ce5a67c092e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e147d6714acb43bc72bb8cb7e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 25 15:57:10 2012 +1100 scrrun: Register Scripting interfaces. --- dlls/scrrun/Makefile.in | 2 + dlls/scrrun/scrrun.idl | 691 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 693 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e147d6714acb43bc72bb8…

1 0

Jacek Caban : mshtml: Improved VARIANT debug traces in htmlstyle.c.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 852a0d386f9bc0251e4b169a90a32d58532c7dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=852a0d386f9bc0251e4b169a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:25:54 2012 +0200 mshtml: Improved VARIANT debug traces in htmlstyle.c. --- dlls/mshtml/htmlstyle.c | 67 ++++++++++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=852a0d386f9bc0251e4b1…

1 0

Jacek Caban : mshtml: Improved VARIANT debug traces in htmlwindow.c.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 42bb6cab783dbb53ab6ceb5e67be93c131d5bd72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42bb6cab783dbb53ab6ceb5e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 14:26:11 2012 +0200 mshtml: Improved VARIANT debug traces in htmlwindow.c. --- dlls/mshtml/htmlwindow.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 67cf3fb..2623520 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -696,7 +696,7 @@ static HRESULT WINAPI HTMLWindow2_close(IHTMLWindow2 *iface) static HRESULT WINAPI HTMLWindow2_put_opener(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -872,7 +872,7 @@ static HRESULT WINAPI HTMLWindow2_navigate(IHTMLWindow2 *iface, BSTR url) static HRESULT WINAPI HTMLWindow2_put_onfocus(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -886,7 +886,7 @@ static HRESULT WINAPI HTMLWindow2_get_onfocus(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onblur(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -919,7 +919,7 @@ static HRESULT WINAPI HTMLWindow2_put_onbeforeunload(IHTMLWindow2 *iface, VARIAN { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - TRACE("(%p)->(v(%d))\n", This, V_VT(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_window_event(This, EVENTID_BEFOREUNLOAD, &v); } @@ -936,7 +936,7 @@ static HRESULT WINAPI HTMLWindow2_get_onbeforeunload(IHTMLWindow2 *iface, VARIAN static HRESULT WINAPI HTMLWindow2_put_onunload(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -950,7 +950,7 @@ static HRESULT WINAPI HTMLWindow2_get_onunload(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onhelp(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -964,7 +964,7 @@ static HRESULT WINAPI HTMLWindow2_get_onhelp(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onerror(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -996,7 +996,7 @@ static HRESULT WINAPI HTMLWindow2_get_onresize(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onscroll(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1055,7 +1055,7 @@ static HRESULT WINAPI HTMLWindow2_showHelp(IHTMLWindow2 *iface, BSTR helpURL, VA BSTR features) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s v(%d) %s)\n", This, debugstr_w(helpURL), V_VT(&helpArg), debugstr_w(features)); + FIXME("(%p)->(%s %s %s)\n", This, debugstr_w(helpURL), debugstr_variant(&helpArg), debugstr_w(features)); return E_NOTIMPL; } @@ -1157,7 +1157,7 @@ static HRESULT WINAPI HTMLWindow2_clearInterval(IHTMLWindow2 *iface, LONG timerI static HRESULT WINAPI HTMLWindow2_put_offscreenBuffering(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1455,7 +1455,7 @@ static HRESULT window_set_timer(HTMLWindow *This, VARIANT *expr, LONG msec, VARI break; default: - FIXME("unimplemented vt=%d\n", V_VT(expr)); + FIXME("unimplemented expr %s\n", debugstr_variant(expr)); return E_NOTIMPL; } @@ -1473,7 +1473,7 @@ static HRESULT WINAPI HTMLWindow3_setTimeout(IHTMLWindow3 *iface, VARIANT *expre { HTMLWindow *This = impl_from_IHTMLWindow3(iface); - TRACE("(%p)->(%p(%d) %d %p %p)\n", This, expression, V_VT(expression), msec, language, timerID); + TRACE("(%p)->(%s %d %s %p)\n", This, debugstr_variant(expression), msec, debugstr_variant(language), timerID); return window_set_timer(This, expression, msec, language, FALSE, timerID); } @@ -1498,7 +1498,7 @@ static HRESULT WINAPI HTMLWindow3_print(IHTMLWindow3 *iface) static HRESULT WINAPI HTMLWindow3_put_onbeforeprint(IHTMLWindow3 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow3(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } @@ -1512,7 +1512,7 @@ static HRESULT WINAPI HTMLWindow3_get_onbeforeprint(IHTMLWindow3 *iface, VARIANT static HRESULT WINAPI HTMLWindow3_put_onafterprint(IHTMLWindow3 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow3(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml.idl: Added DispHTMLTableCell declaration.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 33742f1ed3c6657c4f9079a0a035cffdeab81f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33742f1ed3c6657c4f9079a0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 13:34:40 2012 +0200 mshtml.idl: Added DispHTMLTableCell declaration. --- include/mshtmdid.h | 27 ++++++++++ include/mshtml.idl | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 1628413..6190537 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2643,6 +2643,33 @@ #define DISPID_IHTMLTABLEROW3_CH DISPID_TABLEROW+9 #define DISPID_IHTMLTABLEROW3_CHOFF DISPID_TABLEROW+10 +/* IHTMLTableCell */ +#define DISPID_IHTMLTABLECELL_ROWSPAN DISPID_TABLECELL+1 +#define DISPID_IHTMLTABLECELL_COLSPAN DISPID_TABLECELL+2 +#define DISPID_IHTMLTABLECELL_ALIGN STDPROPID_XOBJ_BLOCKALIGN +#define DISPID_IHTMLTABLECELL_VALIGN DISPID_A_TABLEVALIGN +#define DISPID_IHTMLTABLECELL_BGCOLOR DISPID_BACKCOLOR +#define DISPID_IHTMLTABLECELL_NOWRAP DISPID_A_NOWRAP +#define DISPID_IHTMLTABLECELL_BACKGROUND DISPID_A_BACKGROUNDIMAGE +#define DISPID_IHTMLTABLECELL_BORDERCOLOR DISPID_A_TABLEBORDERCOLOR +#define DISPID_IHTMLTABLECELL_BORDERCOLORLIGHT DISPID_A_TABLEBORDERCOLORLIGHT +#define DISPID_IHTMLTABLECELL_BORDERCOLORDARK DISPID_A_TABLEBORDERCOLORDARK +#define DISPID_IHTMLTABLECELL_WIDTH STDPROPID_XOBJ_WIDTH +#define DISPID_IHTMLTABLECELL_HEIGHT STDPROPID_XOBJ_HEIGHT +#define DISPID_IHTMLTABLECELL_CELLINDEX DISPID_TABLECELL+3 + +/* IHTMLTableCell2 */ +#define DISPID_IHTMLTABLECELL2_ABBR DISPID_TABLECELL+4 +#define DISPID_IHTMLTABLECELL2_AXIS DISPID_TABLECELL+5 +#define DISPID_IHTMLTABLECELL2_CH DISPID_TABLECELL+6 +#define DISPID_IHTMLTABLECELL2_CHOFF DISPID_TABLECELL+7 +#define DISPID_IHTMLTABLECELL2_HEADERS DISPID_TABLECELL+8 +#define DISPID_IHTMLTABLECELL2_SCOPE DISPID_TABLECELL+9 + +/* IHTMLTableCell3 */ +#define DISPID_IHTMLTABLECELL3_IE9_CH DISPID_TABLECELL+10 +#define DISPID_IHTMLTABLECELL3_IE9_CHOFF DISPID_TABLECELL+11 + /* IHTMLScriptElement */ #define DISPID_IHTMLSCRIPTELEMENT_SRC DISPID_SCRIPT+1 #define DISPID_IHTMLSCRIPTELEMENT_HTMLFOR DISPID_SCRIPT+4 diff --git a/include/mshtml.idl b/include/mshtml.idl index 91e853b..65ae1ca 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -15594,6 +15594,143 @@ methods: } /***************************************************************************** + * DispHTMLTableCell dispinterface + */ +[ + hidden, + uuid(3050f536-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLTableCell +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLTABLECELL_ROWSPAN)] + void rowSpan(long v); + + [propget, id(DISPID_IHTMLTABLECELL_ROWSPAN)] + long rowSpan(); + + [propput, id(DISPID_IHTMLTABLECELL_COLSPAN)] + void colSpan(long v); + + [propget, id(DISPID_IHTMLTABLECELL_COLSPAN)] + long colSpan(); + + [propput, id(DISPID_IHTMLTABLECELL_ALIGN)] + void align(BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL_ALIGN)] + BSTR align(); + + [propput, id(DISPID_IHTMLTABLECELL_VALIGN)] + void vAlign(BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL_VALIGN)] + BSTR vAlign(); + + [propput, id(DISPID_IHTMLTABLECELL_BGCOLOR)] + void bgColor(VARIANT v); + + [propget, id(DISPID_IHTMLTABLECELL_BGCOLOR)] + VARIANT bgColor(); + + [propput, id(DISPID_IHTMLTABLECELL_NOWRAP)] + void noWrap(VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLTABLECELL_NOWRAP)] + VARIANT_BOOL noWrap(); + + [propput, id(DISPID_IHTMLTABLECELL_BACKGROUND)] + void background(BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL_BACKGROUND)] + BSTR background(); + + [propput, id(DISPID_IHTMLTABLECELL_BORDERCOLOR)] + void borderColor(VARIANT v); + + [propget, id(DISPID_IHTMLTABLECELL_BORDERCOLOR)] + VARIANT borderColor(); + + [propput, id(DISPID_IHTMLTABLECELL_BORDERCOLORLIGHT)] + void borderColorLight(VARIANT v); + + [propget, id(DISPID_IHTMLTABLECELL_BORDERCOLORLIGHT)] + VARIANT borderColorLight(); + + [propput, id(DISPID_IHTMLTABLECELL_BORDERCOLORDARK)] + void borderColorDark(VARIANT v); + + [propget, id(DISPID_IHTMLTABLECELL_BORDERCOLORDARK)] + VARIANT borderColorDark(); + + [propput, id(DISPID_IHTMLTABLECELL_WIDTH)] + void width(VARIANT v); + + [propget, id(DISPID_IHTMLTABLECELL_WIDTH)] + VARIANT width(); + + [propput, id(DISPID_IHTMLTABLECELL_HEIGHT)] + void height(VARIANT v); + + [propget, id(DISPID_IHTMLTABLECELL_HEIGHT)] + VARIANT height(); + + [propget, id(DISPID_IHTMLTABLECELL_CELLINDEX)] + long cellIndex(); + + [propput, id(DISPID_IHTMLTABLECELL2_ABBR), displaybind, bindable] + void abbr(BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL2_ABBR), displaybind, bindable] + BSTR abbr(); + + [propput, id(DISPID_IHTMLTABLECELL2_AXIS), displaybind, bindable] + void axis(BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL2_AXIS), displaybind, bindable] + BSTR axis(); + + [propput, id(DISPID_IHTMLTABLECELL2_CH), displaybind, bindable] + void ch(BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL2_CH), displaybind, bindable] + BSTR ch(); + + [propput, id(DISPID_IHTMLTABLECELL2_CHOFF), displaybind, bindable] + void chOff(BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL2_CHOFF), displaybind, bindable] + BSTR chOff(); + + [propput, id(DISPID_IHTMLTABLECELL2_HEADERS), displaybind, bindable] + void headers(BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL2_HEADERS), displaybind, bindable] + BSTR headers(); + + [propput, id(DISPID_IHTMLTABLECELL2_SCOPE), displaybind, bindable] + void scope(BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL2_SCOPE), displaybind, bindable] + BSTR scope(); + + [propput, id(DISPID_IHTMLTABLECELL3_IE9_CH), displaybind, bindable] + void ie9_ch(BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL3_IE9_CH), displaybind, bindable] + BSTR ie9_ch(); + + [propput, id(DISPID_IHTMLTABLECELL3_IE9_CHOFF), displaybind, bindable] + void ie9_chOff(BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL3_IE9_CHOFF), displaybind, bindable] + BSTR ie9_chOff(); +} + +/***************************************************************************** * IHTMLScriptElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added IHTMLTableCell declaration.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: fb1640fb4e5243687594dc3b7b2492f268757c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb1640fb4e5243687594dc3b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 13:34:54 2012 +0200 mshtml.idl: Added IHTMLTableCell declaration. --- include/mshtml.idl | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 88 insertions(+), 1 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 65ae1ca..fd4a509 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -15339,7 +15339,94 @@ interface IHTMLTableRow : IDispatch } /***************************************************************************** - * DispHTMLTable interface + * IHTMLTableCell interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f23d-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLTableCell : IDispatch +{ + [propput, id(DISPID_IHTMLTABLECELL_ROWSPAN)] + HRESULT rowSpan([in] long v); + + [propget, id(DISPID_IHTMLTABLECELL_ROWSPAN)] + HRESULT rowSpan([retval, out] long *p); + + [propput, id(DISPID_IHTMLTABLECELL_COLSPAN)] + HRESULT colSpan([in] long v); + + [propget, id(DISPID_IHTMLTABLECELL_COLSPAN)] + HRESULT colSpan([retval, out] long *p); + + [propput, id(DISPID_IHTMLTABLECELL_ALIGN)] + HRESULT align([in] BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL_ALIGN)] + HRESULT align([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLTABLECELL_VALIGN)] + HRESULT vAlign([in] BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL_VALIGN)] + HRESULT vAlign([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLTABLECELL_BGCOLOR)] + HRESULT bgColor([in] VARIANT v); + + [propget, id(DISPID_IHTMLTABLECELL_BGCOLOR)] + HRESULT bgColor([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLTABLECELL_NOWRAP)] + HRESULT noWrap([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLTABLECELL_NOWRAP)] + HRESULT noWrap([retval, out] VARIANT_BOOL *p); + + [propput, id(DISPID_IHTMLTABLECELL_BACKGROUND)] + HRESULT background([in] BSTR v); + + [propget, id(DISPID_IHTMLTABLECELL_BACKGROUND)] + HRESULT background([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLTABLECELL_BORDERCOLOR)] + HRESULT borderColor([in] VARIANT v); + + [propget, id(DISPID_IHTMLTABLECELL_BORDERCOLOR)] + HRESULT borderColor([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLTABLECELL_BORDERCOLORLIGHT)] + HRESULT borderColorLight([in] VARIANT v); + + [propget, id(DISPID_IHTMLTABLECELL_BORDERCOLORLIGHT)] + HRESULT borderColorLight([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLTABLECELL_BORDERCOLORDARK)] + HRESULT borderColorDark([in] VARIANT v); + + [propget, id(DISPID_IHTMLTABLECELL_BORDERCOLORDARK)] + HRESULT borderColorDark([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLTABLECELL_WIDTH)] + HRESULT width([in] VARIANT v); + + [propget, id(DISPID_IHTMLTABLECELL_WIDTH)] + HRESULT width([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLTABLECELL_HEIGHT)] + HRESULT height([in] VARIANT v); + + [propget, id(DISPID_IHTMLTABLECELL_HEIGHT)] + HRESULT height([retval, out] VARIANT *p); + + [propget, id(DISPID_IHTMLTABLECELL_CELLINDEX)] + HRESULT cellIndex([retval, out] long *p); +} + +/***************************************************************************** + * DispHTMLTable dispinterface */ [ hidden,

1 0

Jacek Caban : mshtml: Added IHTMLTableCell interface stub implementation.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 574becbf87889ae968815bc296c272a47f5f0088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574becbf87889ae968815bc29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 13:35:13 2012 +0200 mshtml: Added IHTMLTableCell interface stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/htmltablecell.c | 375 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 3 +- 5 files changed, 383 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=574becbf87889ae968815…

1 0

Christian Costa : amstream: Add stream to the media stream filter in IAMMultiMediaStreamImpl_AddMediaStream .
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 1349cf690248f21db30744b07f22eef3aeef8ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1349cf690248f21db30744b07… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Mar 27 23:46:03 2012 +0200 amstream: Add stream to the media stream filter in IAMMultiMediaStreamImpl_AddMediaStream. --- dlls/amstream/amstream.c | 8 +++++++- dlls/amstream/tests/amstream.c | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index b599bb6..89ea46b 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -333,7 +333,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream IMediaStream* pStream; IMediaStream** pNewStreams; - FIXME("(%p/%p)->(%p,%s,%x,%p) partial stub!\n", This, iface, pStreamObject, debugstr_guid(PurposeId), dwFlags, ppNewStream); + TRACE("(%p/%p)->(%p,%s,%x,%p)\n", This, iface, pStreamObject, debugstr_guid(PurposeId), dwFlags, ppNewStream); if (!IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && !IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) return MS_E_PURPOSEID; @@ -379,6 +379,12 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream *ppNewStream = pStream; } + if (SUCCEEDED(hr)) + { + /* Add stream to the media stream filter */ + IMediaStreamFilter_AddMediaStream((IMediaStreamFilter*)This->media_stream_filter, (IAMMediaStream*)pStream); + } + return hr; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 81a7565..dce8c7d 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -215,8 +215,8 @@ static void test_media_streams(void) if (media_stream_filter) { hr = IMediaStreamFilter_GetMediaStream(media_stream_filter, &MSPID_PrimaryVideo, &dummy_stream); - todo_wine ok(hr == S_OK, "IMediaStreamFilter_GetMediaStream returned: %x\n", hr); - todo_wine ok(dummy_stream == video_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, video_stream); + ok(hr == S_OK, "IMediaStreamFilter_GetMediaStream returned: %x\n", hr); + ok(dummy_stream == video_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, video_stream); if (SUCCEEDED(hr)) IMediaStream_Release(dummy_stream); } @@ -241,8 +241,8 @@ static void test_media_streams(void) if (media_stream_filter) { hr = IMediaStreamFilter_GetMediaStream(media_stream_filter, &MSPID_PrimaryAudio, &dummy_stream); - todo_wine ok(hr == S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); - todo_wine ok(dummy_stream == audio_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, audio_stream); + ok(hr == S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr); + ok(dummy_stream == audio_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, audio_stream); if (SUCCEEDED(hr)) IMediaStream_Release(dummy_stream); }

1 0