April 2014 - Wine-Devel - list.winehq.org

Re: mshtml: Added IHTMLTable::width property implementation. (try 4)
by Jacek Caban April 26, 2014

April 26, 2014

Hi Zhenbo, This is better, but: On 04/26/14 05:12, Zhenbo Li wrote: > + hres = var2str(&v, &val); > + > + if (hres != S_OK){ > + ERR("Set Width(%s) failed when initializing a nsAString!\n", > + debugstr_variant(&v)); > + nsAString_Finish(&val); Again, this is not initialized in the error case. > + return hres; > + } > + > + nsres = nsIDOMHTMLTableElement_SetWidth(This->nstable, &val); > + nsAString_Finish(&val); > + > + if (NS_FAILED(nsres)){ > + ERR("Set Width(%s) failed!\n", debugstr_variant(&v)); > + return E_FAIL; > + } > + > + return S_OK; > } > > static HRESULT WINAPI HTMLTable_get_width(IHTMLTable *iface, VARIANT *p) > { > HTMLTable *This = impl_from_IHTMLTable(iface); > - FIXME("(%p)->(%p)\n", This, p); > - return E_NOTIMPL; > + nsAString val; > + BSTR bstr; > + nsresult nsres; > + HRESULT hres; > + > + TRACE("(%p)->(%p)\n", This, p); > + nsAString_Init(&val, NULL); > + nsres = nsIDOMHTMLTableElement_GetWidth(This->nstable, &val); > + if (NS_FAILED(nsres)){ > + ERR("Get Width(%s) failed!\n", debugstr_variant(p)); > + nsAString_Finish(&val); > + return E_FAIL; > + } > + > + hres = nsstr_to_truncated_bstr(&val, &bstr); > + if (FAILED(hres)) { > + SysFreeString(bstr); And bstr is not initialized in error case. Also, as Dmitry pointed, you don't check for some errors in var2str. Jacek

2 4

Microsoft make MS-DOS codes avalable to public
by Akira Nakagawa April 26, 2014

April 26, 2014

http://www.computerhistory.org/atchm/microsoft-ms-dos-early-source-code/ I think it does not something for wine☺

2 1

Re: mshtml: Added IHTMLTable::width property implementation. (try 4)
by Dmitry Timoshkov April 25, 2014

April 25, 2014

Zhenbo Li <litimetal(a)gmail.com> wrote: > + case VT_R8: > + VarBstrFromR8(V_R8(p), 0, 0, &str); > + break; > + case VT_R4: > + VarBstrFromR4(V_R4(p), 0, 0, &str); > + break; > + case VT_I4: > + VarBstrFromI4(V_I4(p), 0, 0, &str); > + break; All these APIs can fail and return appropriate error code. -- Dmitry.

1 0

Re: [PATCH 3/3] ddraw/tests: Test P8 to RGB blits (try 2).
by Henri Verbeet April 25, 2014

April 25, 2014

On 24 April 2014 14:36, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &dst, NULL); > + You should probably check the results of this call, like in the other versions.

1 0

Re: [PATCH] gdiplus: Simplify GdipResetImageAttributes(), fix remap table leak (Valgrind)
by Vincent Povirk April 25, 2014

April 25, 2014

Looks good to me, thanks.

1 0

Some visual testing of my latest ForceFeedback patched Wine in combination with the new Linux ff-memless-next kernel driver
by Elias Vanderstuyft April 25, 2014

April 25, 2014

Hi guys, Here is a video of some real-time Force-Feedback testing of the game NeedForSpeed Carbon using my latest patched Wine on Linux: http://www.youtube.com/watch?v=mV-yh72GO30 All periodic force magnitudes are displayed in real-time by gnuplot. Enjoy watching, Elias

2 1

Re: mshtml: Added IHTMLTable::width property implementation. (try 3)
by Jacek Caban April 25, 2014

April 25, 2014

On 04/22/14 17:30, Zhenbo Li wrote: > diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c > index d711ed7..e16aee2 100644 > --- a/dlls/mshtml/htmltable.c > +++ b/dlls/mshtml/htmltable.c > @@ -57,6 +57,33 @@ static inline HTMLTable *impl_from_IHTMLTable3(IHTMLTable3 *iface) > return CONTAINING_RECORD(iface, HTMLTable, IHTMLTable3_iface); > } > > +static HRESULT var2str(nsAString *nsstr, const VARIANT *p) > +{ Nit: please swap arguments order. > + BSTR str; > + BOOL ret; > + > + switch(V_VT(p)) { > + case VT_BSTR: > + return nsAString_Init(nsstr, V_BSTR(p))? > + S_OK : E_FAIL; E_OUTOFMEMORY would be more appropriate here. > + case VT_R8: > + VarBstrFromR8(V_R8(p), 0, 0, &str); > + break; > + case VT_R4: > + VarBstrFromR4(V_R4(p), 0, 0, &str); > + break; > + case VT_I4: > + VarBstrFromI4(V_I4(p), 0, 0, &str); > + break; > + default: > + FIXME("unsupported arg %s\n", debugstr_variant(p)); > + return E_NOTIMPL; > + } > + ret = nsAString_Init(nsstr, str); > + SysFreeString(str); > + return ret ? S_OK : E_FAIL; > +} Same here. > + > static HRESULT WINAPI HTMLTable_QueryInterface(IHTMLTable *iface, > REFIID riid, void **ppv) > { > @@ -395,15 +422,79 @@ static HRESULT WINAPI HTMLTable_get_rows(IHTMLTable *iface, IHTMLElementCollecti > static HRESULT WINAPI HTMLTable_put_width(IHTMLTable *iface, VARIANT v) > { > HTMLTable *This = impl_from_IHTMLTable(iface); > - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); > - return E_NOTIMPL; > + nsAString val; > + HRESULT hres; > + nsresult nsres; > + > + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); > + hres = var2str(&val, &v); > + > + if (hres != S_OK){ > + ERR("Set Width(%s) failed when initializing a nsAString!\n", > + debugstr_variant(&v)); > + nsAString_Finish(&val); val is not initialized here, you can't call nsAString_Finish on it. > + return hres; > + } > + > + nsres = nsIDOMHTMLTableElement_SetWidth(This->nstable, &val); > + nsAString_Finish(&val); > + > + if (NS_FAILED(nsres)){ > + ERR("Set Width(%s) failed!\n", debugstr_variant(&v)); > + return E_FAIL; > + } > + > + return S_OK; > } > > static HRESULT WINAPI HTMLTable_get_width(IHTMLTable *iface, VARIANT *p) > { > HTMLTable *This = impl_from_IHTMLTable(iface); > - FIXME("(%p)->(%p)\n", This, p); > - return E_NOTIMPL; > + nsAString val; > + const PRUnichar *str; > + BSTR bstr; > + DOUBLE width; > + nsresult nsres; > + HRESULT hres; > + > + TRACE("(%p)->(%p)\n", This, p); > + nsAString_Init(&val, NULL); > + nsres = nsIDOMHTMLTableElement_GetWidth(This->nstable, &val); > + if (NS_FAILED(nsres)){ > + ERR("Get Width(%s) failed!\n", debugstr_variant(p)); > + nsAString_Finish(&val); > + return E_FAIL; > + } > + > + nsAString_GetData(&val, &str); > + hres = VarR8FromStr(str, 0, 0, &width); > + > + /* WinAPI would return VT_BSTR, not VT_I4 */ > + switch(hres) { > + case S_OK: /* Truncate that number */ > + hres = VarBstrFromI4((LONG)width, 0, 0, &bstr); There may be overflow here. > + if (hres != S_OK) { > + ERR("VarBstrFromI4 failed, err = %d\n", hres); > + return E_FAIL; > + } > + V_VT(p) = VT_BSTR; > + V_BSTR(p) = bstr; > + break; > + case DISP_E_TYPEMISMATCH: /* Has symbols */ > + V_VT(p) = VT_BSTR; > + V_BSTR(p) = SysAllocString(str); > + if (!V_BSTR(p)) { > + ERR("SysAllocString(%s) failed!\n", debugstr_w(str)); > + return E_FAIL; > + } > + break; > + default: > + ERR("VarR8FromStr(%s) failed, err = %d\n", debugstr_w(str), hres); > + return E_FAIL; I find it more complicated than it needs to be. You don't really need full conversion here, just a simple string parsing. How about using such helper: static HRESULT nsstr_to_rounded_bstr(const nsAString *nsstr, BSTR *ret_ptr) { const PRUnichar *str, *ptr, *end = NULL; BSTR ret; nsAString_GetData(nsstr, &str); for(ptr = str; isdigitW(*ptr); ptr++); if(*ptr == '.') { for(end = ptr++; isdigitW(*ptr); ptr++); if(*ptr) end = NULL; } ret = end ? SysAllocStringLen(str, end-str) : SysAllocString(str); if(!ret) return E_OUTOFMEMORY; *ret_ptr = ret; return S_OK; } Cheers, Jacek

2 2

Re: [PATCH 3/4] oleacc: Add ObjectFromLresult implementation
by Qian Hong April 25, 2014

April 25, 2014

Hi Piotr, thanks for your work, I'm really exciting with the oleacc works because Selenium IE Driver depends on oleacc and with oleacc implemented we can run Selenium IE test case on Wine builtin / native IE to make a more compatible IE! + atom = result; + if(atom != result) + return E_FAIL; I can't understand these few lines, are they typo or did I miss anything? Also I cc'ed you on http://bugs.winehq.org/show_bug.cgi?id=30353 which is related to Selenium IE Driver and oleacc, hopefully you don't mind have a look :) Thank you again!

4 7

Re: msvcp90: Added complex_float_pow impletation and tests
by YongHao Hu April 25, 2014

April 25, 2014

1 reply to应该没有问题吧？我也是设置成wine-devel，你是说发到wine-zh要相应换成wine-zh？ 2补丁我昨晚是不是用thunderbird发的，所以是gmail的名称。现在看看如何？ On Saturday, April 12, 2014 03:59 PM, YongHaoWu wrote: > --- > dlls/msvcp70/msvcp70.spec | 12 ++++----- > dlls/msvcp71/msvcp71.spec | 12 ++++----- > dlls/msvcp80/msvcp80.spec | 12 ++++----- > dlls/msvcp90/math.c | 18 ++++++++++++++ > dlls/msvcp90/msvcp90.spec | 12 ++++----- > dlls/msvcp90/tests/misc.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ > 6 files changed, 102 insertions(+), 24 deletions(-) >

2 1

Re: [PATCH] advapi32/tests: Fix some leaks in tests (Valgrind)
by Marvin April 25, 2014

April 25, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=6551 Your paranoid android. === w7u (32 bit service) === service.c:1412: Test failed: Active services mismatch 1 service.c:1413: Test failed: Inactive services mismatch 4294967295 The test timed out

1 0