October 2012 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLLinkElement::rel property implementation.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: c11c695b11782b7940e1db433a6833bdc99ee2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11c695b11782b7940e1db433… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 11:17:10 2012 +0200 mshtml: Added IHTMLLinkElement::rel property implementation. --- dlls/mshtml/htmllink.c | 22 ++++++++++++++++++---- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index e23a808..383617a 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -119,15 +119,29 @@ static HRESULT WINAPI HTMLLinkElement_get_href(IHTMLLinkElement *iface, BSTR *p) static HRESULT WINAPI HTMLLinkElement_put_rel(IHTMLLinkElement *iface, BSTR v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString rel_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&rel_str, v); + nsres = nsIDOMHTMLLinkElement_SetRel(This->nslink, &rel_str); + nsAString_Finish(&rel_str); + + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLLinkElement_get_rel(IHTMLLinkElement *iface, BSTR *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString rel_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&rel_str, NULL); + nsres = nsIDOMHTMLLinkElement_GetRel(This->nslink, &rel_str); + return return_nsstr(nsres, &rel_str, p); } static HRESULT WINAPI HTMLLinkElement_put_rev(IHTMLLinkElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f6ce2f0..30a0f0f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3453,6 +3453,37 @@ static void _link_put_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL v _test_link_disabled(line, elem, v); } +#define test_link_rel(a,b) _test_link_rel(__LINE__,a,b) +static void _test_link_rel(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR rel; + HRESULT hres; + + hres = IHTMLLinkElement_get_rel(link, &rel); + ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08x\n", hres); + if(v) + ok_(__FILE__,line)(!strcmp_wa(rel, v), "rel = %s, expected %s\n", wine_dbgstr_w(rel), v); + else + ok_(__FILE__,line)(!rel, "rel = %s, expected NULL\n", wine_dbgstr_w(rel)); + + IHTMLLinkElement_Release(link); +} + +#define link_put_rel(a,b) _link_put_rel(__LINE__,a,b) +static void _link_put_rel(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR str = a2bstr(v); + HRESULT hres; + + hres = IHTMLLinkElement_put_rel(link, str); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + SysFreeString(str); + IHTMLLinkElement_Release(link); + _test_link_rel(line, elem, v); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -5954,7 +5985,9 @@ static void test_elems2(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, "linkid", TRUE); if(elem) { test_link_disabled(elem, VARIANT_FALSE); + test_link_rel(elem, "stylesheet"); link_put_disabled(elem, VARIANT_TRUE); + link_put_rel(elem, "prev"); IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Added IHTMLLinkElement::type property implementation.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 9277bf2e010388997f64445b3a2f1834167f71be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9277bf2e010388997f64445b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 11:17:24 2012 +0200 mshtml: Added IHTMLLinkElement::type property implementation. --- dlls/mshtml/htmllink.c | 22 ++++++++++++++++++---- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 383617a..a200b50 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -161,15 +161,29 @@ static HRESULT WINAPI HTMLLinkElement_get_rev(IHTMLLinkElement *iface, BSTR *p) static HRESULT WINAPI HTMLLinkElement_put_type(IHTMLLinkElement *iface, BSTR v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString type_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&type_str, v); + nsres = nsIDOMHTMLLinkElement_SetType(This->nslink, &type_str); + nsAString_Finish(&type_str); + + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLLinkElement_get_type(IHTMLLinkElement *iface, BSTR *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString type_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&type_str, NULL); + nsres = nsIDOMHTMLLinkElement_GetType(This->nslink, &type_str); + return return_nsstr(nsres, &type_str, p); } static HRESULT WINAPI HTMLLinkElement_get_readyState(IHTMLLinkElement *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 30a0f0f..cc6c836 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3484,6 +3484,37 @@ static void _link_put_rel(unsigned line, IHTMLElement *elem, const char *v) _test_link_rel(line, elem, v); } +#define test_link_type(a,b) _test_link_type(__LINE__,a,b) +static void _test_link_type(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR type; + HRESULT hres; + + hres = IHTMLLinkElement_get_type(link, &type); + ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); + if(v) + ok_(__FILE__,line)(!strcmp_wa(type, v), "type = %s, expected %s\n", wine_dbgstr_w(type), v); + else + ok_(__FILE__,line)(!type, "type = %s, expected NULL\n", wine_dbgstr_w(type)); + + IHTMLLinkElement_Release(link); +} + +#define link_put_type(a,b) _link_put_type(__LINE__,a,b) +static void _link_put_type(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR str = a2bstr(v); + HRESULT hres; + + hres = IHTMLLinkElement_put_type(link, str); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + SysFreeString(str); + IHTMLLinkElement_Release(link); + _test_link_type(line, elem, v); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -5986,8 +6017,10 @@ static void test_elems2(IHTMLDocument2 *doc) if(elem) { test_link_disabled(elem, VARIANT_FALSE); test_link_rel(elem, "stylesheet"); + test_link_type(elem, "text/css"); link_put_disabled(elem, VARIANT_TRUE); link_put_rel(elem, "prev"); + link_put_type(elem, "text/plain"); IHTMLElement_Release(elem); }

1 0

Jason Edmeades : cmd: Fix regression around prompting during copy.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 270163f38086c231926f96516b9dca31097a90f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=270163f38086c231926f96516… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 4 09:57:33 2012 +0100 cmd: Fix regression around prompting during copy. --- programs/cmd/wcmdmain.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 3c18356..5109ecf 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1162,7 +1162,10 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Special case BAT and CMD */ if (ext && (!strcmpiW(ext, batExt) || !strcmpiW(ext, cmdExt))) { + BOOL oldinteractive = interactive; + interactive = FALSE; WCMD_batch (thisDir, command, called, NULL, INVALID_HANDLE_VALUE); + interactive = oldinteractive; return; } else {

1 0

Alexandre Julliard : gdi32: Always return the full DIB surface in GetImage and adjust coordinates accordingly .
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 36f2b09632261d6f5467e4c4cc20e561f5baec4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f2b09632261d6f5467e4c4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 14:16:28 2012 +0200 gdi32: Always return the full DIB surface in GetImage and adjust coordinates accordingly. Based on a patch by Ken Thomases. --- dlls/gdi32/dibdrv/bitblt.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index ccddac9..e65dcbc 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -816,7 +816,7 @@ static DWORD get_image_dib_info( dib_info *dib, BITMAPINFO *info, info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrImportant = 0; info->bmiHeader.biWidth = dib->width; - info->bmiHeader.biHeight = dib->height - dib->rect.top; + info->bmiHeader.biHeight = dib->height; info->bmiHeader.biBitCount = dib->bit_count; info->bmiHeader.biSizeImage = info->bmiHeader.biHeight * abs( dib->stride ); if (dib->stride > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; @@ -825,14 +825,13 @@ static DWORD get_image_dib_info( dib_info *dib, BITMAPINFO *info, if (bits) { - if (dib->stride < 0) - bits->ptr = (char *)dib->bits.ptr + (dib->rect.bottom - 1) * dib->stride; - else - bits->ptr = (char *)dib->bits.ptr + dib->rect.top * dib->stride; + bits->ptr = dib->bits.ptr; bits->is_copy = FALSE; bits->free = NULL; + if (dib->stride < 0) bits->ptr = (char *)bits->ptr + (dib->height - 1) * dib->stride; src->x += dib->rect.left; - offset_rect( &src->visrect, dib->rect.left, 0 ); + src->y += dib->rect.top; + offset_rect( &src->visrect, dib->rect.left, dib->rect.top ); } return ERROR_SUCCESS; }

1 0

Jason Edmeades : cmd: Add suite of tests for the copy command.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: a65314c8fa9bcfaad380261fd94e3ad35b7e955d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65314c8fa9bcfaad380261fd… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 11 23:40:21 2012 +0100 cmd: Add suite of tests for the copy command. --- programs/cmd/tests/test_builtins.cmd | 297 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 57 ++++++ 2 files changed, 354 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a65314c8fa9bcfaad3802…

1 0

Jason Edmeades : cmd: Rework the body of WCMD_copy based on new parameter parsing.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 7b9971abf908409bd75e06b2efdb40f6f84e940d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9971abf908409bd75e06b2e… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 9 20:11:50 2012 +0100 cmd: Rework the body of WCMD_copy based on new parameter parsing. --- programs/cmd/builtins.c | 363 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 251 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b9971abf908409bd75e0…

1 0

Michael Stefaniuc : jscript: Move 'inline' to the beginning of the declaration.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: f3d15811b434eeb1a6275e4c8677a7a58dd9242b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d15811b434eeb1a6275e4c8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 15 11:26:48 2012 +0200 jscript: Move 'inline' to the beginning of the declaration. --- dlls/jscript/jsstr.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 48a1d8d..ca3b5d9 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -28,7 +28,7 @@ struct _jsstr_t { #define JSSTR_FLAG_NULLBSTR 1 -static unsigned inline jsstr_length(jsstr_t *str) +static inline unsigned jsstr_length(jsstr_t *str) { return str->length_flags >> JSSTR_LENGTH_SHIFT; }

1 0

Christian Costa : amstream: Cleanup MediaStreamFilterImpl_QueryInterface.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 5d5da39ddc1094e563e7bb81070f821cdb722cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5da39ddc1094e563e7bb810… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Oct 12 23:07:15 2012 +0200 amstream: Cleanup MediaStreamFilterImpl_QueryInterface. --- dlls/amstream/mediastreamfilter.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 194914e..8423cfa 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -102,29 +102,22 @@ static const BaseInputPinFuncTable input_BaseInputFuncTable = { /*** IUnknown methods ***/ -static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid, - void **ppv) +static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid, void **ret_iface) { - IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); - *ppv = NULL; + *ret_iface = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaStreamFilter)) - *ppv = This; + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IPersist) || + IsEqualIID(riid, &IID_IMediaFilter) || + IsEqualIID(riid, &IID_IBaseFilter) || + IsEqualIID(riid, &IID_IMediaStreamFilter)) + *ret_iface = iface; - if (*ppv) + if (*ret_iface) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IMediaStreamFilter_AddRef(*ret_iface); return S_OK; }

1 0

Marcus Meissner : kernel32: Buffer size is in characters (Coverity).
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 0a8df5ef2684243f2f6d19ab0d590b08f6b7ab54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8df5ef2684243f2f6d19ab0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 13 16:52:57 2012 +0200 kernel32: Buffer size is in characters (Coverity). --- dlls/kernel32/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 11e0044..5e607fe 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3360,7 +3360,7 @@ static void test_OpenFileById(void) ok(GetFileAttributesA(tempFileName) != INVALID_FILE_ATTRIBUTES, "OpenFileById: GetFileAttributesA failed to find the temp file, got error %u\n", GetLastError()); - ret2 = MultiByteToWideChar(CP_ACP, 0, tempFileName + strlen(tempPath), -1, tempFileNameW, sizeof(tempFileNameW)); + ret2 = MultiByteToWideChar(CP_ACP, 0, tempFileName + strlen(tempPath), -1, tempFileNameW, sizeof(tempFileNameW)/sizeof(tempFileNameW[0])); ok(ret2, "OpenFileById: MultiByteToWideChar failed to convert tempFileName, got error %u.\n", GetLastError()); tempFileNameLen = ret2 - 1;

1 0

Marcus Meissner : winex11.drv: Free bitmap info after being done (Coverity) .
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: c9bd05d89e7c851af350f1172c074e17c32fc24a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9bd05d89e7c851af350f1172… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 13 17:13:37 2012 +0200 winex11.drv: Free bitmap info after being done (Coverity). --- dlls/winex11.drv/systray.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index ed09376..5f0791e 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -432,6 +432,7 @@ static void repaint_tray_icon( struct tray_icon *icon ) UpdateLayeredWindow( icon->window, 0, NULL, NULL, hdc, NULL, 0, &blend, ULW_ALPHA ); done: + HeapFree (GetProcessHeap(), 0, info); if (hdc) DeleteDC( hdc ); if (dib) DeleteObject( dib ); }

1 0