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

Vincent Povirk : oleaut32: Add test for dibs vs. ddbs in IPicture.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 6799aaf34a0d599492ea7e8dabae1cb3c77a1f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6799aaf34a0d599492ea7e8da… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 16 14:19:28 2010 -0500 oleaut32: Add test for dibs vs. ddbs in IPicture. --- dlls/oleaut32/tests/olepicture.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index ab4fb48..2259437 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -216,6 +216,13 @@ test_pic_with_stream(LPSTREAM stream, unsigned int imgsize) ok(hres == S_OK,"IPicture_get_Handle does not return S_OK, but 0x%08x\n", hres); ok(handle != 0, "IPicture_get_Handle returns a NULL handle, but it should be non NULL\n"); + if (handle) + { + BITMAP bmp; + GetObject((HGDIOBJ)handle, sizeof(BITMAP), &bmp); + todo_wine ok(bmp.bmBits != 0, "not a dib\n"); + } + width = 0; hres = IPicture_get_Width (pic, &width); ok(hres == S_OK,"IPicture_get_Width does not return S_OK, but 0x%08x\n", hres);

1 0

Eric Pouech : wineoss.drv: Be consistent for aux devices about what we actually support.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 06b6e3bdc7eef6c05d46ac31104ecad35ed64be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b6e3bdc7eef6c05d46ac311… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Jul 16 21:12:34 2010 +0200 wineoss.drv: Be consistent for aux devices about what we actually support. --- dlls/wineoss.drv/mmaux.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 3554ffb..e48df5d 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -78,10 +78,11 @@ static LRESULT OSS_AuxExit(void) static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSW lpCaps, DWORD dwSize) { int mixer, volume; - static const WCHAR ini[] = {'O','S','S',' ','A','u','x',0}; + static const WCHAR ini[] = {'O','S','S',' ','A','u','x',' ','#','0',0}; TRACE("(%04X, %p, %u);\n", wDevID, lpCaps, dwSize); if (lpCaps == NULL) return MMSYSERR_NOTENABLED; + if (wDevID >= NumDev) return MMSYSERR_BADDEVICEID; if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { WARN("mixer device not available !\n"); return MMSYSERR_NOTENABLED; @@ -93,10 +94,11 @@ static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSW lpCaps, DWORD dwSize) } close(mixer); lpCaps->wMid = 0xAA; - lpCaps->wPid = 0x55; + lpCaps->wPid = 0x55 + wDevID; lpCaps->vDriverVersion = 0x0100; strcpyW(lpCaps->szPname, ini); - lpCaps->wTechnology = AUXCAPS_CDAUDIO; + lpCaps->szPname[9] = '0' + wDevID; /* 6 at max */ + lpCaps->wTechnology = wDevID == 2 ? AUXCAPS_CDAUDIO : AUXCAPS_AUXIN; lpCaps->dwSupport = AUXCAPS_VOLUME | AUXCAPS_LRVOLUME; return MMSYSERR_NOERROR;

1 0

Piotr Caban : msxml3: Correctly allocate namespaces stack in saxreader.
by Alexandre Julliard July 19, 2010

July 19, 2010

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

Jacek Caban : mshtml: Added IHTMLRect::get_top implementation.
by Alexandre Julliard July 19, 2010

July 19, 2010

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 IHTMLElement2:: getBoundingClientRect implementation.
by Alexandre Julliard July 19, 2010

July 19, 2010

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

Vincent Povirk : user32: Don' t dump structures of some ambiguous listview messages.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 1ebdd6b94506237f5f687e4b48f1e29df5916730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebdd6b94506237f5f687e4b4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 16 15:11:04 2010 -0500 user32: Don't dump structures of some ambiguous listview messages. --- dlls/user32/spy.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 1ed768f..26bd741 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2329,13 +2329,10 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) switch (sp_e->msgnum) { case LVM_INSERTITEMW: - case LVM_INSERTITEMA: case LVM_SETITEMW: - case LVM_SETITEMA: if (!enter) break; /* fall through */ case LVM_GETITEMW: - case LVM_GETITEMA: { LPLVITEMA item = (LPLVITEMA) sp_e->lParam; if (item) {

1 0

Marko Nikolic : advapi32/tests: Removed sign comparison warning in service. c.
by Alexandre Julliard July 19, 2010

July 19, 2010

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

Sven Baars : kernel32: Update the Dutch translation.
by Alexandre Julliard July 19, 2010

July 19, 2010

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

Vincent Povirk : windowscodecs: Ignore the length field of RLE compressed bitmaps.
by Alexandre Julliard July 19, 2010

July 19, 2010

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

André Hentschel : Fix German news
by Jeremy Newman July 19, 2010

July 19, 2010

Module: website Branch: master Commit: d67f4339c6145613cce23592d07688b45ddf2ce0 URL: http://source.winehq.org/git/website.git/?a=commit;h=d67f4339c6145613cce235… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jul 17 16:17:20 2010 +0200 Fix German news It seems i wanted to get fast to partying :) Thanks to Paul Vriens for spotting this. PS: i meanwhile recovered from hangover, as it is after four pm here ;) --- news/de/2010071601.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/de/2010071601.xml b/news/de/2010071601.xml index b521984..6416652 100644 --- a/news/de/2010071601.xml +++ b/news/de/2010071601.xml @@ -5,6 +5,6 @@ Das Wine Team ist stolz verkünden zu dürfen, dass die stabile Version Wine 1.2 freigegeben wurde. Dieses Release repräsentiert zwei Jahre Entwicklungsaufwand und über 23000 Änderungen. Die hauptsächlichen Highlights sind die Unterstützung für 64-Bit Programme und die neuen, auf dem Tango Standard basierten Grafiken. Weiterhin enthalten sind viele Verbesserungen quer durch die Bank und über 3000 Fehlerbehebungen. Siehe auch den <a href="{$root}/announce/1.2">Freigabevermerk</a> für eine Zusammenstellung größerer Änderungen. -Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc7.tar.bz2">verfügbar</a>. +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2.tar.bz2">verfügbar</a>. Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. </body></news>

1 0