wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

André Hentschel : comctl32/tests: Add ARM and ARM64 arch strings.
by Alexandre Julliard 12 Aug '15

12 Aug '15

Module: wine Branch: master Commit: 80f887a064c4ccce11eda206562039daa65c6d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f887a064c4ccce11eda2065… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 14:03:33 2015 +0200 comctl32/tests: Add ARM and ARM64 arch strings. --- dlls/comctl32/tests/v6util.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/comctl32/tests/v6util.h b/dlls/comctl32/tests/v6util.h index 1300598..9f5a9c4 100644 --- a/dlls/comctl32/tests/v6util.h +++ b/dlls/comctl32/tests/v6util.h @@ -26,6 +26,10 @@ #define ARCH "x86" #elif defined __x86_64__ #define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" #else #define ARCH "none" #endif

1 0

Henri Verbeet : iphlpapi: Simplify the calculation of "ptr" in CreateSortedAddressPairs().
by Alexandre Julliard 12 Aug '15

12 Aug '15

Module: wine Branch: master Commit: 0b69c27c4150c02aa6a9bd0da439f506c45291c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b69c27c4150c02aa6a9bd0da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 9 13:13:52 2015 +0200 iphlpapi: Simplify the calculation of "ptr" in CreateSortedAddressPairs(). --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b6ab612..4b1261a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -387,7 +387,7 @@ DWORD WINAPI CreateSortedAddressPairs( const PSOCKADDR_IN6 src_list, DWORD src_c size = dst_count * sizeof(*pairs); size += dst_count * sizeof(SOCKADDR_IN6) * 2; /* source address + destination address */ if (!(pairs = HeapAlloc( GetProcessHeap(), 0, size ))) return ERROR_NOT_ENOUGH_MEMORY; - ptr = (SOCKADDR_IN6 *)(char *)pairs + dst_count * sizeof(*pairs); + ptr = (SOCKADDR_IN6 *)&pairs[dst_count]; if ((ret = getIPAddrTable( &table, GetProcessHeap(), 0 ))) {

1 0

Alexandre Julliard : Wine release 1.7.49
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: website Branch: master Commit: e0ff313ab0f8cfe2cdaffaea429a9b72aca3264c URL: http://source.winehq.org/git/website.git/?a=commit;h=e0ff313ab0f8cfe2cdaffa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 8 00:57:58 2015 +0900 Wine release 1.7.49 --- news/en/2015080801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2015080801.xml b/news/en/2015080801.xml new file mode 100644 index 0000000..66ee89f --- /dev/null +++ b/news/en/2015080801.xml @@ -0,0 +1,16 @@ +<news> +<date>August 8, 2015</date> +<title>Wine 1.7.49 Released</title> +<body> + The Wine development release 1.7.49 is now available. + <a href="{$root}/announce/1.7.49">What's new</a> in this release: +<ul> + <li>DirectWrite is now good enough for rendering text in Steam.</li> + <li>A number of Direct2D improvements.</li> + <li>Some more OpenMP functions.</li> + <li>Support for namespaces in the IDL compiler.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.49.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.49 : Alexandre Julliard : Release 1.7.49
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: refs/tags/wine-1.7.49 Tag: 2b80c468354931217a88a01cc638fcaab06181fd URL: http://source.winehq.org/git/wine.git/?a=tag;h=2b80c468354931217a88a01cc638… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 8 00:56:08 2015 +0900 Release 1.7.49

1 0

Alexandre Julliard : Release 1.7.49.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 06e68ff6613042e78a5dd4b9066713d9beab0c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e68ff6613042e78a5dd4b90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 8 00:56:07 2015 +0900 Release 1.7.49. --- ANNOUNCE | 641 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 309 insertions(+), 353 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06e68ff6613042e78a5dd…

1 0

Zhenbo Li : mshtml: Fix error handler in IHTMLSelectElement::remove().
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: b0dd7c79d3b764b8fd019679a9aeaf8263396848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0dd7c79d3b764b8fd019679a… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Aug 7 18:12:58 2015 +0800 mshtml: Fix error handler in IHTMLSelectElement::remove(). --- dlls/mshtml/htmlselect.c | 3 +++ dlls/mshtml/tests/dom.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 152d855..e55d7ea 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -432,6 +432,9 @@ static HRESULT WINAPI HTMLSelectElement_remove(IHTMLSelectElement *iface, LONG i HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); nsresult nsres; TRACE("(%p)->(%d)\n", This, index); + if(index < 0) + return E_INVALIDARG; + nsres = nsIDOMHTMLSelectElement_select_Remove(This->nsselect, index); if(NS_FAILED(nsres)) { ERR("Remove failed: %08x\n", nsres); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 02eeb78..7088c52 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2872,7 +2872,6 @@ static void test_select_remove(IHTMLSelectElement *select) test_select_length(select, 2); hres = IHTMLSelectElement_remove(select, -1); - todo_wine ok(hres == E_INVALIDARG, "remove failed: %08x, expected E_INVALIDARG\n", hres); test_select_length(select, 2);

1 0

Zhenbo Li : mshtml: Add IHTMLSelectElement::size property implementation.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 6419ac0f139c2a3d9cbcd71e5b43e3f89d6336cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6419ac0f139c2a3d9cbcd71e5… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Aug 7 18:12:27 2015 +0800 mshtml: Add IHTMLSelectElement::size property implementation. --- dlls/mshtml/htmlselect.c | 30 ++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index ebac427..152d855 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -142,15 +142,37 @@ static HRESULT WINAPI HTMLSelectElement_Invoke(IHTMLSelectElement *iface, DISPID static HRESULT WINAPI HTMLSelectElement_put_size(IHTMLSelectElement *iface, LONG v) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + if(v < 0) + return CTL_E_INVALIDPROPERTYVALUE; + + nsres = nsIDOMHTMLSelectElement_SetSize(This->nsselect, v); + if(NS_FAILED(nsres)) { + ERR("SetSize failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_size(IHTMLSelectElement *iface, LONG *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + DWORD val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + if(!p) + return E_INVALIDARG; + + nsres = nsIDOMHTMLSelectElement_GetSize(This->nsselect, &val); + if(NS_FAILED(nsres)) { + ERR("GetSize failed: %08x\n", nsres); + return E_FAIL; + } + *p = val; + return S_OK; } static HRESULT WINAPI HTMLSelectElement_put_multiple(IHTMLSelectElement *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f5dee76..02eeb78 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2193,6 +2193,30 @@ static void _test_select_set_multiple(unsigned line, IHTMLSelectElement *select, _test_select_multiple(line, select, val); } +#define test_select_size(s,v) _test_select_size(__LINE__,s,v) +static void _test_select_size(unsigned line, IHTMLSelectElement *select, LONG exval) +{ + HRESULT hres; + LONG val; + + hres = IHTMLSelectElement_get_size(select, NULL); + ok_(__FILE__,line) (hres == E_INVALIDARG, "got %08x, expected E_INVALIDARG\n", hres); + + val = 0xdeadbeef; + hres = IHTMLSelectElement_get_size(select, &val); + ok_(__FILE__,line) (hres == S_OK, "get_size failed: %08x\n", hres); + ok_(__FILE__,line) (val == exval, "size = %d, expected %d\n", val, exval); +} + +#define test_select_set_size(s,v,e) _test_select_set_size(__LINE__,s,v,e) +static void _test_select_set_size(unsigned line, IHTMLSelectElement *select, LONG val, HRESULT exhres) +{ + HRESULT hres; + + hres = IHTMLSelectElement_put_size(select, val); + ok_(__FILE__,line) (hres == exhres, "put_size(%d) got %08x, expect %08x\n", val, hres, exhres); +} + #define test_range_text(r,t) _test_range_text(__LINE__,r,t) static void _test_range_text(unsigned line, IHTMLTxtRange *range, const char *extext) { @@ -4882,6 +4906,15 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_set_value(select, "val1"); test_select_value(select, "val1"); + test_select_size(select, 0); + test_select_set_size(select, 1, S_OK); + test_select_size(select, 1); + + test_select_set_size(select, -1, CTL_E_INVALIDPROPERTYVALUE); + test_select_size(select, 1); + test_select_set_size(select, 3, S_OK); + test_select_size(select, 3); + test_select_get_disabled(select, VARIANT_FALSE); test_select_set_disabled(select, VARIANT_TRUE); test_select_set_disabled(select, VARIANT_FALSE);

1 0

Zhenbo Li : mshtml: Add IHTMLOpinionElement::index property' s getter implementation.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 312534f26f79dc11ed984fdb2a8cd29f025d740b URL: http://source.winehq.org/git/wine.git/?a=commit;h=312534f26f79dc11ed984fdb2… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Aug 7 18:12:07 2015 +0800 mshtml: Add IHTMLOpinionElement::index property's getter implementation. --- dlls/mshtml/htmloption.c | 17 +++++++++++++++-- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 896f812..54d872c 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -187,8 +187,21 @@ static HRESULT WINAPI HTMLOptionElement_put_index(IHTMLOptionElement *iface, LON static HRESULT WINAPI HTMLOptionElement_get_index(IHTMLOptionElement *iface, LONG *p) { HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + LONG val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_INVALIDARG; + + nsres = nsIDOMHTMLOptionElement_GetIndex(This->nsoption, &val); + if(NS_FAILED(nsres)) { + ERR("GetIndex failed: %08x\n", nsres); + return E_FAIL; + } + *p = val; + return S_OK; } static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 51f1f50..f5dee76 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1676,6 +1676,22 @@ static void _test_option_put_selected(unsigned line, IHTMLOptionElement *option, _test_option_selected(line, option, b); } +#define test_option_get_index(o,s) _test_option_get_index(__LINE__,o,s) +static void _test_option_get_index(unsigned line, IHTMLOptionElement *option, LONG exval) +{ + HRESULT hres; + LONG val; + + hres = IHTMLOptionElement_get_index(option, NULL); + ok_(__FILE__,line)(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08x\n", hres); + + val = 12345678; + hres = IHTMLOptionElement_get_index(option, &val); + ok_(__FILE__,line)(hres == S_OK, "get_index failed: %08x\n", hres); + ok_(__FILE__,line)(val == exval || broken(val == 12345678), /* Win2k doesn't touch it*/ + "value = %d, expected = %d\n", val, exval); +} + #define test_textarea_value(t,v) _test_textarea_value(__LINE__,t,v) static void _test_textarea_value(unsigned line, IUnknown *unk, const char *exval) { @@ -4966,6 +4982,7 @@ static void test_create_option_elem(IHTMLDocument2 *doc) test_option_put_text(option, "new text"); test_option_put_value(option, "new value"); + test_option_get_index(option, 0); test_option_put_selected(option, VARIANT_TRUE); test_option_put_selected(option, VARIANT_FALSE);

1 0

Józef Kucia : d3dx9/tests: Fix HFONT leaks.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: a0a8556fd11f779860d87878e3e2955c4c855101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a8556fd11f779860d87878e… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Wed Aug 5 20:51:01 2015 +0200 d3dx9/tests: Fix HFONT leaks. --- dlls/d3dx9_36/tests/mesh.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 16c79ea..4186e19 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4186,6 +4186,7 @@ error: free_mesh(&mesh); if (d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); + if (font) DeleteObject(font); HeapFree(GetProcessHeap(), 0, glyphmetrics_float); if (glyphs) @@ -4295,6 +4296,7 @@ if (0) test_createtext(device, hdc, "wi ne", 1.0f, 0.0f); DeleteDC(hdc); + DeleteObject(hFont); free_test_context(test_context); }

1 0

Józef Kucia : d3dx9: Correctly handle whitespace character in D3DXCreateText.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 567ab59c79704f9903118d990800998455064c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567ab59c79704f9903118d990… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Wed Aug 5 20:51:00 2015 +0200 d3dx9: Correctly handle whitespace character in D3DXCreateText. --- dlls/d3dx9_36/mesh.c | 4 ++ dlls/d3dx9_36/tests/mesh.c | 168 ++++++++++++++++++++++++--------------------- 2 files changed, 94 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=567ab59c79704f9903118…

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2015