July 2010 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Fixed sort_cmp for non-string arguments.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: adb4e83eb286c085454f3d7e83016c10ca22b2b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb4e83eb286c085454f3d7e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 18 12:39:29 2010 +0200 jscript: Fixed sort_cmp for non-string arguments. --- dlls/jscript/array.c | 44 +++++++++++++++++++++++--------------------- dlls/jscript/tests/api.js | 21 +++++++++++++++++++++ 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 1268d59..5c1bf12 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -677,29 +677,31 @@ static HRESULT sort_cmp(script_ctx_t *ctx, DispatchEx *cmp_func, VARIANT *v1, VA *cmp = V_I4(&tmp); else *cmp = V_R8(&tmp) > 0.0 ? 1 : -1; - }else if(is_num_vt(V_VT(v1))) { - if(is_num_vt(V_VT(v2))) { - DOUBLE d = num_val(v1)-num_val(v2); - if(d > 0.0) - *cmp = 1; - else if(d < -0.0) - *cmp = -1; - else - *cmp = 0; - }else { - *cmp = -1; - } - }else if(is_num_vt(V_VT(v2))) { - *cmp = 1; - }else if(V_VT(v1) == VT_BSTR) { - if(V_VT(v2) == VT_BSTR) - *cmp = strcmpW(V_BSTR(v1), V_BSTR(v2)); + }else if(V_VT(v1) == VT_EMPTY) { + *cmp = V_VT(v2) == VT_EMPTY ? 0 : 1; + }else if(V_VT(v2) == VT_EMPTY) { + *cmp = -1; + }else if(is_num_vt(V_VT(v1)) && is_num_vt(V_VT(v2))) { + DOUBLE d = num_val(v1)-num_val(v2); + if(d > 0.0) + *cmp = 1; else - *cmp = -1; - }else if(V_VT(v2) == VT_BSTR) { - *cmp = 1; + *cmp = d < -0.0 ? -1 : 0; }else { - *cmp = 0; + BSTR x, y; + + hres = to_string(ctx, v1, ei, &x); + if(FAILED(hres)) + return hres; + + hres = to_string(ctx, v2, ei, &y); + if(SUCCEEDED(hres)) { + *cmp = strcmpW(x, y); + SysFreeString(y); + } + SysFreeString(x); + if(FAILED(hres)) + return hres; } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2ccad3d..e05e5bb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -704,6 +704,27 @@ tmp = arr.sort(); ok(arr === tmp, "tmp !== arr"); ok(arr[0]===1 && arr[1]==="aa" && arr[2]===undefined, "arr is sorted incorectly"); +tmp = [["bb","aa"],["ab","aa"]].sort().toString(); +ok(tmp === "ab,aa,bb,aa", "sort() = " + tmp); + +tmp = [["bb","aa"],"ab"].sort().toString(); +ok(tmp === "ab,bb,aa", "sort() = " + tmp); + +tmp = [["bb","aa"],"cc"].sort().toString(); +ok(tmp === "bb,aa,cc", "sort() = " + tmp); + +tmp = [2,"1"].sort().toString(); +ok(tmp === "1,2", "sort() = " + tmp); + +tmp = ["2",1].sort().toString(); +ok(tmp === "1,2", "sort() = " + tmp); + +tmp = [,,0,"z"].sort().toString(); +ok(tmp === "0,z,,", "sort() = " + tmp); + +tmp = ["a,b",["a","a"],["a","c"]].sort().toString(); +ok(tmp === "a,a,a,b,a,c", "sort() = " + tmp); + arr = ["1", "2", "3"]; arr.length = 1; ok(arr.length === 1, "arr.length = " + arr.length);

1 0

Jacek Caban : mshtml: Added IHTMLElement2:: getBoundingClientRect implementation.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 489320b9ab4ba5e183cab0c6b3ea00ccbcaac08a URL: http://source.winehq.org/git/wine.git/?a=commit;h=489320b9ab4ba5e183cab0c6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 13:29:24 2010 +0200 mshtml: Added IHTMLElement2::getBoundingClientRect implementation. --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmlelem2.c | 200 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 18 ++++ 4 files changed, 217 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index de0c948..64356f5 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -146,6 +146,7 @@ static REFIID tid_ids[] = { &IID_IHTMLInputElement, &IID_IHTMLLocation, &IID_IHTMLOptionElement, + &IID_IHTMLRect, &IID_IHTMLScreen, &IID_IHTMLScriptElement, &IID_IHTMLSelectElement, diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 548bab8..b6030b8 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -1,5 +1,5 @@ /* - * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2006-2010 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,6 +33,198 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +typedef struct { + DispatchEx dispex; + const IHTMLRectVtbl *lpIHTMLRectVtbl; + LONG ref; +} HTMLRect; + +#define HTMLRECT(x) ((IHTMLRect*) &(x)->lpIHTMLRectVtbl) + +#define HTMLRECT_THIS(iface) DEFINE_THIS(HTMLRect, IHTMLRect, iface) + +static HRESULT WINAPI HTMLRect_QueryInterface(IHTMLRect *iface, REFIID riid, void **ppv) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = HTMLRECT(This); + }else if(IsEqualGUID(&IID_IHTMLRect, riid)) { + TRACE("(%p)->(IID_IHTMLRect %p)\n", This, ppv); + *ppv = HTMLRECT(This); + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLRect_AddRef(IHTMLRect *iface) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLRect_Release(IHTMLRect *iface) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI HTMLRect_GetTypeInfoCount(IHTMLRect *iface, UINT *pctinfo) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRect_GetTypeInfo(IHTMLRect *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLRect_GetIDsOfNames(IHTMLRect *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLRect_Invoke(IHTMLRect *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLRect_put_left(IHTMLRect *iface, LONG v) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + FIXME("(%p)->(%d)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRect_get_left(IHTMLRect *iface, LONG *p) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRect_put_top(IHTMLRect *iface, LONG v) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + FIXME("(%p)->(%d)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRect_get_top(IHTMLRect *iface, LONG *p) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRect_put_right(IHTMLRect *iface, LONG v) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + FIXME("(%p)->(%d)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRect_get_right(IHTMLRect *iface, LONG *p) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRect_put_bottom(IHTMLRect *iface, LONG v) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + FIXME("(%p)->(%d)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRect_get_bottom(IHTMLRect *iface, LONG *p) +{ + HTMLRect *This = HTMLRECT_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +#undef HTMLRECT_THIS + +static const IHTMLRectVtbl HTMLRectVtbl = { + HTMLRect_QueryInterface, + HTMLRect_AddRef, + HTMLRect_Release, + HTMLRect_GetTypeInfoCount, + HTMLRect_GetTypeInfo, + HTMLRect_GetIDsOfNames, + HTMLRect_Invoke, + HTMLRect_put_left, + HTMLRect_get_left, + HTMLRect_put_top, + HTMLRect_get_top, + HTMLRect_put_right, + HTMLRect_get_right, + HTMLRect_put_bottom, + HTMLRect_get_bottom +}; + +static const tid_t HTMLRect_iface_tids[] = { + IHTMLRect_tid, + 0 +}; +static dispex_static_data_t HTMLRect_dispex = { + NULL, + IHTMLRect_tid, + NULL, + HTMLRect_iface_tids +}; + +static HRESULT create_html_rect(IHTMLRect **ret) +{ + HTMLRect *rect; + + rect = heap_alloc_zero(sizeof(HTMLRect)); + if(!rect) + return E_OUTOFMEMORY; + + rect->lpIHTMLRectVtbl = &HTMLRectVtbl; + rect->ref = 1; + + init_dispex(&rect->dispex, (IUnknown*)HTMLRECT(rect), &HTMLRect_dispex); + + *ret = HTMLRECT(rect); + return S_OK; +} + #define HTMLELEM2_THIS(iface) DEFINE_THIS(HTMLElement, HTMLElement2, iface) static HRESULT WINAPI HTMLElement2_QueryInterface(IHTMLElement2 *iface, @@ -364,8 +556,10 @@ static HRESULT WINAPI HTMLElement2_getClientRects(IHTMLElement2 *iface, IHTMLRec static HRESULT WINAPI HTMLElement2_getBoundingClientRect(IHTMLElement2 *iface, IHTMLRect **pRect) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, pRect); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pRect); + + return create_html_rect(pRect); } static HRESULT WINAPI HTMLElement2_setExpression(IHTMLElement2 *iface, BSTR propname, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4deb4d6..46886d8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -120,6 +120,7 @@ typedef enum { IHTMLInputElement_tid, IHTMLLocation_tid, IHTMLOptionElement_tid, + IHTMLRect_tid, IHTMLScreen_tid, IHTMLScriptElement_tid, IHTMLSelectElement_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4f954a8..c877b96 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2852,6 +2852,23 @@ static void _test_style_set_csstext(unsigned line, IHTMLStyle *style, const char SysFreeString(tmp); } +static void test_elem_bounding_client_rect(IUnknown *unk) +{ + IHTMLElement2 *elem2; + IHTMLRect *rect; + HRESULT hres; + + elem2 = get_elem2_iface(unk); + hres = IHTMLElement2_getBoundingClientRect(elem2, &rect); + IHTMLElement2_Release(elem2); + ok(hres == S_OK, "getBoundingClientRect failed: %08x\n", hres); + ok(rect != NULL, "rect == NULL\n"); + + test_disp((IUnknown*)rect, &IID_IHTMLRect, "[object]"); + + IHTMLRect_Release(rect); +} + static void test_elem_col_item(IHTMLElementCollection *col, const char *n, const elem_type_t *elem_types, LONG len) { @@ -5862,6 +5879,7 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_set_title((IUnknown*)select, "Title"); test_elem_title((IUnknown*)select, "Title"); test_elem_offset((IUnknown*)select); + test_elem_bounding_client_rect((IUnknown*)select); node = get_first_child((IUnknown*)select); ok(node != NULL, "node == NULL\n");

1 0

Jacek Caban : mshtml: Added IHTMLRect::get_top implementation.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: bbaefeb3b5154d1646820527728169e8fd291cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbaefeb3b5154d16468205277… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 13:30:43 2010 +0200 mshtml: Added IHTMLRect::get_top implementation. --- dlls/mshtml/htmlelem2.c | 52 ++++++++++++++++++++++++++++++++++++++++++---- dlls/mshtml/nsiface.idl | 17 ++++++++++++++- dlls/mshtml/tests/dom.c | 11 +++++++++- 3 files changed, 73 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index b6030b8..251763f 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <math.h> #define COBJMACROS @@ -36,7 +37,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { DispatchEx dispex; const IHTMLRectVtbl *lpIHTMLRectVtbl; + LONG ref; + + nsIDOMClientRect *nsrect; } HTMLRect; #define HTMLRECT(x) ((IHTMLRect*) &(x)->lpIHTMLRectVtbl) @@ -82,8 +86,11 @@ static ULONG WINAPI HTMLRect_Release(IHTMLRect *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + if(This->nsrect) + nsIDOMClientRect_Release(This->nsrect); heap_free(This); + } return ref; } @@ -145,8 +152,19 @@ static HRESULT WINAPI HTMLRect_put_top(IHTMLRect *iface, LONG v) static HRESULT WINAPI HTMLRect_get_top(IHTMLRect *iface, LONG *p) { HTMLRect *This = HTMLRECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + float top; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMClientRect_GetTop(This->nsrect, &top); + if(NS_FAILED(nsres)) { + ERR("GetTop failed: %08x\n", nsres); + return E_FAIL; + } + + *p = floor(top+0.5); + return S_OK; } static HRESULT WINAPI HTMLRect_put_right(IHTMLRect *iface, LONG v) @@ -208,7 +226,7 @@ static dispex_static_data_t HTMLRect_dispex = { HTMLRect_iface_tids }; -static HRESULT create_html_rect(IHTMLRect **ret) +static HRESULT create_html_rect(nsIDOMClientRect *nsrect, IHTMLRect **ret) { HTMLRect *rect; @@ -221,6 +239,9 @@ static HRESULT create_html_rect(IHTMLRect **ret) init_dispex(&rect->dispex, (IUnknown*)HTMLRECT(rect), &HTMLRect_dispex); + nsIDOMClientRect_AddRef(nsrect); + rect->nsrect = nsrect; + *ret = HTMLRECT(rect); return S_OK; } @@ -556,10 +577,31 @@ static HRESULT WINAPI HTMLElement2_getClientRects(IHTMLElement2 *iface, IHTMLRec static HRESULT WINAPI HTMLElement2_getBoundingClientRect(IHTMLElement2 *iface, IHTMLRect **pRect) { HTMLElement *This = HTMLELEM2_THIS(iface); + nsIDOMNSElement *nselem; + nsIDOMClientRect *nsrect; + nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", This, pRect); - return create_html_rect(pRect); + nsres = nsIDOMHTMLElement_QueryInterface(This->node.nsnode, &IID_nsIDOMNSElement, + (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSElement iface: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMNSElement_GetBoundingClientRect(nselem, &nsrect); + nsIDOMNSElement_Release(nselem); + if(NS_FAILED(nsres) || !nsrect) { + ERR("GetBoindingClientRect failed: %08x\n", nsres); + return E_FAIL; + } + + hres = create_html_rect(nsrect, pRect); + + nsIDOMClientRect_Release(nsrect); + return hres; } static HRESULT WINAPI HTMLElement2_setExpression(IHTMLElement2 *iface, BSTR propname, diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 4ccc64a..b62c7b2 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -131,7 +131,6 @@ typedef nsISupports nsIDOMMediaList; typedef nsISupports nsIDOMHTMLTableCaptionElement; typedef nsISupports nsIDOMHTMLTableSectionElement; typedef nsISupports nsIDOMClientRectList; -typedef nsISupports nsIDOMClientRect; typedef nsISupports nsIDOMLocation; typedef nsISupports nsIDocument; typedef nsISupports nsIContent; @@ -734,6 +733,22 @@ interface nsIDOMElementCSSInlineStyle : nsISupports [ object, + uuid(b2f824c4-d9d3-499b-8d3b-45c8245497c6), + local + /* NOT_FROZEN */ +] +interface nsIDOMClientRect : nsISupports +{ + nsresult GetLeft(float *aLeft); + nsresult GetTop(float *aTop); + nsresult GetRight(float *aRight); + nsresult GetBottom(float *aBottom); + nsresult GetWidth(float *aWidth); + nsresult GetHeight(float *aHeight); +} + +[ + object, uuid(f0aef489-18c5-4de6-99d5-58b3758b098c), local /* NOT_FROZEN */ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c877b96..fa3763c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2854,18 +2854,27 @@ static void _test_style_set_csstext(unsigned line, IHTMLStyle *style, const char static void test_elem_bounding_client_rect(IUnknown *unk) { + IHTMLRect *rect, *rect2; IHTMLElement2 *elem2; - IHTMLRect *rect; + LONG l; HRESULT hres; elem2 = get_elem2_iface(unk); hres = IHTMLElement2_getBoundingClientRect(elem2, &rect); + hres = IHTMLElement2_getBoundingClientRect(elem2, &rect2); IHTMLElement2_Release(elem2); ok(hres == S_OK, "getBoundingClientRect failed: %08x\n", hres); ok(rect != NULL, "rect == NULL\n"); + ok(rect != rect2, "rect == rect2\n"); + IHTMLRect_Release(rect2); test_disp((IUnknown*)rect, &IID_IHTMLRect, "[object]"); + l = 0xdeadbeef; + hres = IHTMLRect_get_top(rect, &l); + ok(hres == S_OK, "get_top failed: %08x\n", hres); + ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); + IHTMLRect_Release(rect); }

1 0

Jacek Caban : mshtml: Added implementation of remaining IHTMLRect getters.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: f2361112bad88e8807815c4755fffe35d3e8e71d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2361112bad88e8807815c475… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 13:31:15 2010 +0200 mshtml: Added implementation of remaining IHTMLRect getters. --- dlls/mshtml/htmlelem2.c | 45 +++++++++++++++++++++++++++++++++++++++------ dlls/mshtml/tests/dom.c | 15 +++++++++++++++ 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 251763f..0c20723 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -138,8 +138,19 @@ static HRESULT WINAPI HTMLRect_put_left(IHTMLRect *iface, LONG v) static HRESULT WINAPI HTMLRect_get_left(IHTMLRect *iface, LONG *p) { HTMLRect *This = HTMLRECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + float left; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMClientRect_GetLeft(This->nsrect, &left); + if(NS_FAILED(nsres)) { + ERR("GetLeft failed: %08x\n", nsres); + return E_FAIL; + } + + *p = floor(left+0.5); + return S_OK; } static HRESULT WINAPI HTMLRect_put_top(IHTMLRect *iface, LONG v) @@ -177,8 +188,19 @@ static HRESULT WINAPI HTMLRect_put_right(IHTMLRect *iface, LONG v) static HRESULT WINAPI HTMLRect_get_right(IHTMLRect *iface, LONG *p) { HTMLRect *This = HTMLRECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + float right; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMClientRect_GetRight(This->nsrect, &right); + if(NS_FAILED(nsres)) { + ERR("GetRight failed: %08x\n", nsres); + return E_FAIL; + } + + *p = floor(right+0.5); + return S_OK; } static HRESULT WINAPI HTMLRect_put_bottom(IHTMLRect *iface, LONG v) @@ -191,8 +213,19 @@ static HRESULT WINAPI HTMLRect_put_bottom(IHTMLRect *iface, LONG v) static HRESULT WINAPI HTMLRect_get_bottom(IHTMLRect *iface, LONG *p) { HTMLRect *This = HTMLRECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + float bottom; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMClientRect_GetBottom(This->nsrect, &bottom); + if(NS_FAILED(nsres)) { + ERR("GetBottom failed: %08x\n", nsres); + return E_FAIL; + } + + *p = floor(bottom+0.5); + return S_OK; } #undef HTMLRECT_THIS diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fa3763c..b19822e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2875,6 +2875,21 @@ static void test_elem_bounding_client_rect(IUnknown *unk) ok(hres == S_OK, "get_top failed: %08x\n", hres); ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); + l = 0xdeadbeef; + hres = IHTMLRect_get_left(rect, &l); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); + + l = 0xdeadbeef; + hres = IHTMLRect_get_bottom(rect, &l); + ok(hres == S_OK, "get_bottom failed: %08x\n", hres); + ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); + + l = 0xdeadbeef; + hres = IHTMLRect_get_right(rect, &l); + ok(hres == S_OK, "get_right failed: %08x\n", hres); + ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); + IHTMLRect_Release(rect); }

1 0

Jacek Caban : mshtml: Added IHTMLDocument3::detachEvent implementation.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 4890eb5775b388d31ab00393f8707d98749a3144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4890eb5775b388d31ab00393f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 13:31:43 2010 +0200 mshtml: Added IHTMLDocument3::detachEvent implementation. --- dlls/mshtml/htmldoc3.c | 6 +++- dlls/mshtml/tests/events.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index f4ea096..8d135ff 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -189,8 +189,10 @@ static HRESULT WINAPI HTMLDocument3_detachEvent(IHTMLDocument3 *iface, BSTR even IDispatch *pDisp) { HTMLDocument *This = HTMLDOC3_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(event), pDisp); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(event), pDisp); + + return detach_event(This->doc_node->node.event_target, This, event, pDisp); } static HRESULT WINAPI HTMLDocument3_put_onrowsdelete(IHTMLDocument3 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index deafd54..7d69dd5 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -59,6 +59,7 @@ DEFINE_EXPECT(document_onclick); DEFINE_EXPECT(body_onclick); +DEFINE_EXPECT(doc_onclick_attached); DEFINE_EXPECT(div_onclick); DEFINE_EXPECT(div_onclick_attached); DEFINE_EXPECT(timeout); @@ -662,6 +663,36 @@ static void _elem_detach_event(unsigned line, IUnknown *unk, const char *namea, ok_(__FILE__,line)(hres == S_OK, "detachEvent failed: %08x\n", hres); } +#define doc_attach_event(a,b,c) _doc_attach_event(__LINE__,a,b,c) +static void _doc_attach_event(unsigned line, IHTMLDocument2 *doc, const char *namea, IDispatch *disp) +{ + IHTMLDocument3 *doc3 = _get_doc3_iface(line, (IUnknown*)doc); + VARIANT_BOOL res; + BSTR name; + HRESULT hres; + + name = a2bstr(namea); + hres = IHTMLDocument3_attachEvent(doc3, name, disp, &res); + IHTMLDocument3_Release(doc3); + SysFreeString(name); + ok_(__FILE__,line)(hres == S_OK, "attachEvent failed: %08x\n", hres); + ok_(__FILE__,line)(res == VARIANT_TRUE, "attachEvent returned %x\n", res); +} + +#define doc_detach_event(a,b,c) _doc_detach_event(__LINE__,a,b,c) +static void _doc_detach_event(unsigned line, IHTMLDocument2 *doc, const char *namea, IDispatch *disp) +{ + IHTMLDocument3 *doc3 = _get_doc3_iface(line, (IUnknown*)doc); + BSTR name; + HRESULT hres; + + name = a2bstr(namea); + hres = IHTMLDocument3_detachEvent(doc3, name, disp); + IHTMLDocument3_Release(doc3); + SysFreeString(name); + ok_(__FILE__,line)(hres == S_OK, "detachEvent failed: %08x\n", hres); +} + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -841,6 +872,18 @@ static HRESULT WINAPI div_onclick_attached(IDispatchEx *iface, DISPID id, LCID l EVENT_HANDLER_FUNC_OBJ(div_onclick_attached); +static HRESULT WINAPI doc_onclick_attached(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(doc_onclick_attached); + + test_attached_event_args(id, wFlags, pdp, pvarRes, pei); + test_event_src("DIV"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(doc_onclick_attached); + static HRESULT WINAPI body_onclick(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1249,12 +1292,14 @@ static void test_onclick(IHTMLDocument2 *doc) cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); elem_attach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); + doc_attach_event(doc, "onclick", (IDispatch*)&doc_onclick_attached_obj); SET_EXPECT(div_onclick); SET_EXPECT(div_onclick_disp); SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); SET_EXPECT(document_onclick); + SET_EXPECT(doc_onclick_attached); SET_EXPECT(doccp_onclick); hres = IHTMLElement_click(div); @@ -1265,6 +1310,7 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(div_onclick_attached); CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); + CHECK_CALLED(doc_onclick_attached); CHECK_CALLED(doccp_onclick); unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); @@ -1280,6 +1326,7 @@ static void test_onclick(IHTMLDocument2 *doc) elem_detach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); elem_detach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); elem_detach_event((IUnknown*)div, "test", (IDispatch*)&div_onclick_disp); + doc_detach_event(doc, "onclick", (IDispatch*)&doc_onclick_attached_obj); SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick);

1 0

Piotr Caban : msxml3: Correctly allocate namespaces stack in saxreader.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 3bf94bed3fe976ed7465552dfce790f0597d49a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bf94bed3fe976ed7465552df… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 17 14:05:56 2010 +0200 msxml3: Correctly allocate namespaces stack in saxreader. --- dlls/msxml3/saxreader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index eca9f1d..b81a47e 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -139,7 +139,7 @@ static HRESULT namespacePush(saxlocator *locator, int ns) int *new_stack; new_stack = HeapReAlloc(GetProcessHeap(), 0, - locator->nsStack, locator->nsStackSize*2); + locator->nsStack, sizeof(int)*locator->nsStackSize*2); if(!new_stack) return E_OUTOFMEMORY; locator->nsStack = new_stack; locator->nsStackSize *= 2; @@ -1752,7 +1752,7 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, B locator->ret = S_OK; locator->nsStackSize = 8; locator->nsStackLast = 0; - locator->nsStack = heap_alloc(locator->nsStackSize); + locator->nsStack = heap_alloc(sizeof(int)*locator->nsStackSize); if(!locator->nsStack) { ISAXXMLReader_Release((ISAXXMLReader*)&reader->lpSAXXMLReaderVtbl);

1 0

Sven Baars : kernel32: Update the Dutch translation.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 7fe8c7202345ba04425e3dfefb534bcad8fe76fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe8c7202345ba04425e3dfef… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Jul 16 15:19:19 2010 +0200 kernel32: Update the Dutch translation. --- dlls/kernel32/nls/winerr_nld.mc | 662 +++++++++++++++++++------------------- 1 files changed, 331 insertions(+), 331 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fe8c7202345ba04425e3…

1 0

Marko Nikolic : advapi32/tests: Removed sign comparison warning in service. c.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 5fe2fc20fdfd4ab69b4ad6ac5814c1ff3c285898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe2fc20fdfd4ab69b4ad6ac5… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Fri Jul 16 15:36:41 2010 +0200 advapi32/tests: Removed sign comparison warning in service.c. --- dlls/advapi32/tests/service.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 605f384..eba1884 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -601,7 +601,7 @@ static void test_get_displayname(void) ok(ret, "Expected success, got error %u\n", GetLastError()); /* Test that shows that if the buffersize is enough, it's not changed */ ok(displaysize == tempsize * 2, "Expected no change for the needed buffer size\n"); - ok(lstrlen(displayname) == tempsize/2, + ok(strlen(displayname) == tempsize/2, "Expected the buffer to be twice the length of the string\n") ; /* Do the buffer(size) tests also for GetServiceDisplayNameW */ @@ -671,7 +671,7 @@ static void test_get_displayname(void) displaysize = -1; ret = GetServiceDisplayNameA(scm_handle, servicename, NULL, &displaysize); ok(!ret, "Expected failure\n"); - ok(displaysize == lstrlen(servicename) * 2, + ok(displaysize == strlen(servicename) * 2, "Expected the displaysize to be twice the size of the servicename\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); @@ -856,7 +856,7 @@ static void test_get_servicekeyname(void) ok(ret, "Expected success, got error %u\n", GetLastError()); if (ret) { - ok(lstrlen(servicename) == tempsize/2, + ok(strlen(servicename) == tempsize/2, "Expected the buffer to be twice the length of the string\n") ; ok(!lstrcmpi(servicename, spooler), "Expected %s, got %s\n", spooler, servicename); ok(servicesize == (tempsize * 2), @@ -870,7 +870,7 @@ static void test_get_servicekeyname(void) ok(ret, "Expected success, got error %u\n", GetLastError()); if (ret) { - ok(lstrlen(servicename) == tempsize/2, + ok(strlen(servicename) == tempsize/2, "Expected the buffer to be twice the length of the string\n") ; ok(servicesize == lstrlenW(servicenameW), "Expected servicesize not to change if buffer not insufficient\n") ; @@ -1039,7 +1039,7 @@ static void test_enum_svc(void) DWORD servicecountactive, servicecountinactive; ENUM_SERVICE_STATUS *services; ENUM_SERVICE_STATUS_PROCESS *exservices; - INT i; + UINT i; /* All NULL or wrong */ SetLastError(0xdeadbeef);

1 0

Vincent Povirk : windowscodecs: Ignore the length field of RLE compressed bitmaps.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 4dfcf843aa9a3057622d384cf905dbd13967b707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dfcf843aa9a3057622d384cf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 16 12:31:49 2010 -0500 windowscodecs: Ignore the length field of RLE compressed bitmaps. --- dlls/windowscodecs/bmpdecode.c | 171 +++++++++++++++++++++++++++------------- 1 files changed, 115 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4dfcf843aa9a3057622d3…

1 0

Frédéric Delanoy : French translation for release 1.2
by Jeremy Newman 19 Jul '10

19 Jul '10

Module: website Branch: master Commit: 6e8f83ac0b9f8e6eeb979db552db6d8610203dcc URL: http://source.winehq.org/git/website.git/?a=commit;h=6e8f83ac0b9f8e6eeb979d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 17 15:15:18 2010 +0200 French translation for release 1.2 >From 478c75bd5db05d448c7b8989abe656e7335116cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= <frederic.delanoy(a)gmail.com> Date: Sat, 17 Jul 2010 15:13:55 +0200 Subject: French translation for release 1.2 --- news/fr/2010071601.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/news/fr/2010071601.xml b/news/fr/2010071601.xml new file mode 100644 index 0000000..e7672c7 --- /dev/null +++ b/news/fr/2010071601.xml @@ -0,0 +1,10 @@ +<news> +<date>16 juillet 2010</date> +<title>Sortie de Wine 1.2</title> +<body> + L'équipe de Wine est fière d'annoncer la disponibilité de la version stable 1.2 de Wine. + Cette version représente deux années d'effort de développement et plus de 23 000 changements. Les points forts principaux sont la prise en charge des applications 64 bits, ainsi que le nouveau graphisme basé sur le standard Tango. + Elle comprend également beaucoup d'améliorations dans tous les domaines, et plus de 3000 corrections de bogues. Voyez les <a href="{$root}/announce/1.2">notes de version</a> ci-après pour un résumé des changements principaux. +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.2.tar.bz2">code source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront bientôt dans leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0