winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2014
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
301 discussions
Start a n
N
ew thread
Jacek Caban : wininet: Properly clean up in InternetGetCookieExW if no cookies were found.
by Alexandre Julliard
18 Sep '14
18 Sep '14
Module: wine Branch: master Commit: 1f12306144aad4c550be9a6d700dd605c88b56fd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1f12306144aad4c550be9a6d7…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 18 13:01:36 2014 +0200 wininet: Properly clean up in InternetGetCookieExW if no cookies were found. --- dlls/wininet/cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index aec3edd..d2fbec3 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -794,7 +794,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, }else { TRACE("no cookies found for %s\n", debugstr_w(host)); SetLastError(ERROR_NO_MORE_ITEMS); - return FALSE; + ret = FALSE; } heap_free(cookie_set.cookies);
1
0
0
0
Henri Verbeet : d3d10core: Set the initial sample mask to D3D10_DEFAULT_SAMPLE_MASK.
by Alexandre Julliard
18 Sep '14
18 Sep '14
Module: wine Branch: master Commit: f50e543c7adc5b6ed5cd84a5e854bb46446639b2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f50e543c7adc5b6ed5cd84a5e…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 10:56:29 2014 +0200 d3d10core: Set the initial sample mask to D3D10_DEFAULT_SAMPLE_MASK. --- dlls/d3d10core/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index a1ecd5c..5bdb8af 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -2328,6 +2328,7 @@ HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) device->blend_factor[1] = 1.0f; device->blend_factor[2] = 1.0f; device->blend_factor[3] = 1.0f; + device->sample_mask = D3D10_DEFAULT_SAMPLE_MASK; if (wine_rb_init(&device->depthstencil_states, &d3d10_depthstencil_state_rb_ops) == -1) {
1
0
0
0
Henri Verbeet : d3d10core: Set the initial blend factors to 1.0f.
by Alexandre Julliard
18 Sep '14
18 Sep '14
Module: wine Branch: master Commit: 0ed857fdcc6d1f7b1f32464113603e4ab6e02482 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0ed857fdcc6d1f7b1f3246411…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 10:56:28 2014 +0200 d3d10core: Set the initial blend factors to 1.0f. --- dlls/d3d10core/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index f8c9d37..a1ecd5c 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -2324,6 +2324,10 @@ HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) WARN("Failed to initialize blend state rbtree.\n"); return E_FAIL; } + device->blend_factor[0] = 1.0f; + device->blend_factor[1] = 1.0f; + device->blend_factor[2] = 1.0f; + device->blend_factor[3] = 1.0f; if (wine_rb_init(&device->depthstencil_states, &d3d10_depthstencil_state_rb_ops) == -1) {
1
0
0
0
Henri Verbeet : wined3d: Set the initial primitive type to WINED3D_PT_UNDEFINED.
by Alexandre Julliard
18 Sep '14
18 Sep '14
Module: wine Branch: master Commit: 2f67b139189096e02ab73608b4418269089f771b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2f67b139189096e02ab73608b…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 10:56:27 2014 +0200 wined3d: Set the initial primitive type to WINED3D_PT_UNDEFINED. --- dlls/wined3d/device.c | 4 +++- dlls/wined3d/stateblock.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cbdf509..44fa206 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -90,7 +90,8 @@ GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) default: FIXME("Unhandled primitive type %s\n", debug_d3dprimitivetype(primitive_type)); - return GL_NONE; + case WINED3D_PT_UNDEFINED: + return ~0u; } } @@ -130,6 +131,7 @@ static enum wined3d_primitive_type d3d_primitive_type_from_gl(GLenum primitive_t default: FIXME("Unhandled primitive type %s\n", debug_d3dprimitivetype(primitive_type)); + case ~0u: return WINED3D_PT_UNDEFINED; } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e98ee2a..7e8c782 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1121,6 +1121,8 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d TRACE("state %p, gl_info %p.\n", state, gl_info); + state->gl_primitive_type = ~0u; + /* Set some of the defaults for lights, transforms etc */ state->transforms[WINED3D_TS_PROJECTION] = identity; state->transforms[WINED3D_TS_VIEW] = identity;
1
0
0
0
Henri Verbeet : wined3d: Do not increment the reference count of the returned buffer in wined3d_device_get_stream_source ().
by Alexandre Julliard
18 Sep '14
18 Sep '14
Module: wine Branch: master Commit: 74ab8e8ce919f1e88f7e26870c89aa08dadbac7a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=74ab8e8ce919f1e88f7e26870…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 10:56:26 2014 +0200 wined3d: Do not increment the reference count of the returned buffer in wined3d_device_get_stream_source(). None of the other getters increment the reference count either. --- dlls/d3d8/device.c | 1 - dlls/d3d9/device.c | 1 - dlls/ddraw/vertexbuffer.c | 2 -- dlls/wined3d/device.c | 2 -- 4 files changed, 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 429b30c..2e74a41 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2798,7 +2798,6 @@ static HRESULT WINAPI d3d8_device_GetStreamSource(IDirect3DDevice8 *iface, buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DVertexBuffer8_iface; IDirect3DVertexBuffer8_AddRef(*buffer); - wined3d_buffer_decref(wined3d_buffer); } else { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7b9b635..a40a6a1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2769,7 +2769,6 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DVertexBuffer9_iface; IDirect3DVertexBuffer9_AddRef(*buffer); - wined3d_buffer_decref(wined3d_buffer); } else { diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 5d77790..0f06fe5 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -159,8 +159,6 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) 0, &curVB, &offset, &stride); if (curVB == buffer->wineD3DVertexBuffer) wined3d_device_set_stream_source(buffer->ddraw->wined3d_device, 0, NULL, 0, 0); - if (curVB) - wined3d_buffer_decref(curVB); /* For the GetStreamSource */ wined3d_vertex_declaration_decref(buffer->wineD3DVertexDeclaration); wined3d_buffer_decref(buffer->wineD3DVertexBuffer); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b9a0954..cbdf509 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1276,8 +1276,6 @@ HRESULT CDECL wined3d_device_get_stream_source(const struct wined3d_device *devi stream = &device->state.streams[stream_idx]; *buffer = stream->buffer; - if (*buffer) - wined3d_buffer_incref(*buffer); if (offset) *offset = stream->offset; *stride = stream->stride;
1
0
0
0
Henri Verbeet : d3d10: Also store the depth/ stencil state in the stateblock.
by Alexandre Julliard
18 Sep '14
18 Sep '14
Module: wine Branch: master Commit: b5a91d1246bd6cc1ed85c5e22208595d9f4d6b97 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b5a91d1246bd6cc1ed85c5e22…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 10:56:25 2014 +0200 d3d10: Also store the depth/stencil state in the stateblock. --- dlls/d3d10/stateblock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index 73d4b1b..72466a1 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -55,6 +55,7 @@ struct d3d10_stateblock ID3D10RenderTargetView *rtvs[D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT]; ID3D10DepthStencilView *dsv; ID3D10DepthStencilState *dss; + UINT stencil_ref; ID3D10BlendState *bs; float blend_factor[4]; UINT sample_mask; @@ -198,6 +199,11 @@ static void stateblock_cleanup(struct d3d10_stateblock *stateblock) ID3D10DepthStencilView_Release(stateblock->dsv); stateblock->dsv = NULL; } + if (stateblock->dss) + { + ID3D10DepthStencilState_Release(stateblock->dss); + stateblock->dss = NULL; + } if (stateblock->bs) { ID3D10BlendState_Release(stateblock->bs); @@ -355,6 +361,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_stateblock_Capture(ID3D10StateBlock *ifac if (stateblock->mask.OMRenderTargets) ID3D10Device_OMGetRenderTargets(stateblock->device, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT, stateblock->rtvs, &stateblock->dsv); + if (stateblock->mask.OMDepthStencilState) + ID3D10Device_OMGetDepthStencilState(stateblock->device, &stateblock->dss, &stateblock->stencil_ref); if (stateblock->mask.OMBlendState) ID3D10Device_OMGetBlendState(stateblock->device, &stateblock->bs, stateblock->blend_factor, &stateblock->sample_mask); @@ -454,6 +462,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_stateblock_Apply(ID3D10StateBlock *iface) if (stateblock->mask.OMRenderTargets) ID3D10Device_OMSetRenderTargets(stateblock->device, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT, stateblock->rtvs, stateblock->dsv); + if (stateblock->mask.OMDepthStencilState) + ID3D10Device_OMSetDepthStencilState(stateblock->device, stateblock->dss, stateblock->stencil_ref); if (stateblock->mask.OMBlendState) ID3D10Device_OMSetBlendState(stateblock->device, stateblock->bs, stateblock->blend_factor, stateblock->sample_mask);
1
0
0
0
Qian Hong : mshtml: Added IHTMLDOMAttribute::put_nodeValue implementation.
by Alexandre Julliard
18 Sep '14
18 Sep '14
Module: wine Branch: master Commit: e2b7354ac146b62f0c2bd515e28a85d27a5dd6b6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e2b7354ac146b62f0c2bd515e…
Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Sep 18 13:11:38 2014 +0800 mshtml: Added IHTMLDOMAttribute::put_nodeValue implementation. --- dlls/mshtml/htmlattr.c | 22 ++++++++++++++++++---- dlls/mshtml/tests/dom.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 420a275..ae9bbfe 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -138,11 +138,25 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BS return IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, p); } -static HRESULT WINAPI HTMLDOMAttribute_put_nodeName(IHTMLDOMAttribute *iface, VARIANT v) +static HRESULT WINAPI HTMLDOMAttribute_put_nodeValue(IHTMLDOMAttribute *iface, VARIANT v) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + DISPID dispidNamed = DISPID_PROPERTYPUT; + DISPPARAMS dp = {&v, &dispidNamed, 1, 1}; + EXCEPINFO ei; + VARIANT ret; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(!This->elem) { + FIXME("NULL This->elem\n"); + return E_UNEXPECTED; + } + + memset(&ei, 0, sizeof(ei)); + + return IDispatchEx_InvokeEx(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &dp, &ret, &ei, NULL); } static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, VARIANT *p) @@ -216,7 +230,7 @@ static const IHTMLDOMAttributeVtbl HTMLDOMAttributeVtbl = { HTMLDOMAttribute_GetIDsOfNames, HTMLDOMAttribute_Invoke, HTMLDOMAttribute_get_nodeName, - HTMLDOMAttribute_put_nodeName, + HTMLDOMAttribute_put_nodeValue, HTMLDOMAttribute_get_nodeValue, HTMLDOMAttribute_get_specified }; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9f352f6..4dc89e0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4236,10 +4236,19 @@ static void _get_attr_node_value(unsigned line, IHTMLDOMAttribute *attr, VARIANT HRESULT hres; hres = IHTMLDOMAttribute_get_nodeValue(attr, v); - ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08x, expected VT_BSTR\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08x\n", hres); ok_(__FILE__,line) (V_VT(v) == vt, "vt=%d, expected %d\n", V_VT(v), vt); } +#define put_attr_node_value(a,b) _put_attr_node_value(__LINE__,a,b) +static void _put_attr_node_value(unsigned line, IHTMLDOMAttribute *attr, VARIANT v) +{ + HRESULT hres; + + hres = IHTMLDOMAttribute_put_nodeValue(attr, v); + ok_(__FILE__,line) (hres == S_OK, "put_nodeValue failed: %08x\n", hres); +} + #define get_window_doc(e) _get_window_doc(__LINE__,e) static IHTMLDocument2 *_get_window_doc(unsigned line, IHTMLWindow2 *window) { @@ -7548,12 +7557,31 @@ static void test_attr(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&v), "divid"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("divid2"); + put_attr_node_value(attr, v); + + get_attr_node_value(attr, &v, VT_BSTR); + ok(!strcmp_wa(V_BSTR(&v), "divid2"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLDOMAttribute_Release(attr); attr = get_elem_attr_node((IUnknown*)elem, "emptyattr", TRUE); get_attr_node_value(attr, &v, VT_BSTR); ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("newvalue"); + put_attr_node_value(attr, v); + VariantClear(&v); + + attr = get_elem_attr_node((IUnknown*)elem, "emptyattr", TRUE); + get_attr_node_value(attr, &v, VT_BSTR); + ok(!strcmp_wa(V_BSTR(&v), "newvalue"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + test_attr_specified(attr, VARIANT_TRUE); IHTMLDOMAttribute_Release(attr); @@ -7564,6 +7592,14 @@ static void test_attr(IHTMLElement *elem) get_attr_node_value(attr, &v, VT_I4); ok(V_I4(&v) == 100, "V_I4(v) = %d\n", V_I4(&v)); test_attr_specified(attr, VARIANT_TRUE); + + V_VT(&v) = VT_I4; + V_I4(&v) = 150; + put_attr_node_value(attr, v); + + get_attr_node_value(attr, &v, VT_I4); + ok(V_I4(&v) == 150, "V_I4(v) = %d\n", V_I4(&v)); + IHTMLDOMAttribute_Release(attr); attr = get_elem_attr_node((IUnknown*)elem, "tabIndex", TRUE);
1
0
0
0
Qian Hong : mshtml: Handle DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYPUTREF in invoke_builtin_prop.
by Alexandre Julliard
18 Sep '14
18 Sep '14
Module: wine Branch: master Commit: cdd28b0aca0647324abfb4493844d27e7471bd2c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cdd28b0aca0647324abfb4493…
Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Sep 18 00:33:47 2014 +0800 mshtml: Handle DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYPUTREF in invoke_builtin_prop. --- dlls/mshtml/dispex.c | 3 ++- dlls/mshtml/tests/script.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index a81bf7c..4a872a8 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1230,6 +1230,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD switch(flags) { case DISPATCH_PROPERTYPUT: + case DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYPUTREF: if(res) V_VT(res) = VT_EMPTY; hres = builtin_propput(This, func, dp, caller); @@ -1249,7 +1250,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD) || dp->cArgs) { if(V_VT(&v) != VT_DISPATCH) { - FIXME("Not a function %s\n", debugstr_variant(&v)); + FIXME("Not a function %s flags %08x\n", debugstr_variant(&v), flags); VariantClear(&v); return E_FAIL; } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 031c0ac..c9b9eb5 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2091,6 +2091,13 @@ static void test_default_arg_conv(IHTMLWindow2 *window) test_elem_disabled(elem, VARIANT_FALSE); + V_VT(&v) = VT_I4; + V_I4(&v) = 1; + hres = dispex_propput(dispex, DISPID_IHTMLELEMENT3_DISABLED, DISPATCH_PROPERTYPUTREF, &v, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + test_elem_disabled(elem, VARIANT_TRUE); + IHTMLElement_Release(elem); IDispatchEx_Release(dispex); }
1
0
0
0
Qian Hong : mshtml/tests: Fixed typo.
by Alexandre Julliard
18 Sep '14
18 Sep '14
Module: wine Branch: master Commit: a9d347cb248978a919630fa08255851c746dc369 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a9d347cb248978a919630fa08…
Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Sep 18 00:31:12 2014 +0800 mshtml/tests: Fixed typo. --- dlls/mshtml/tests/script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 5e9ca60..031c0ac 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2085,7 +2085,7 @@ static void test_default_arg_conv(IHTMLWindow2 *window) test_elem_disabled(elem, VARIANT_TRUE); V_VT(&v) = VT_I4; - V_BSTR(&v) = 0; + V_I4(&v) = 0; hres = dispex_propput(dispex, DISPID_IHTMLELEMENT3_DISABLED, 0, &v, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres);
1
0
0
0
YongHao Hu : msvcp90: Fix comment typo.
by Alexandre Julliard
18 Sep '14
18 Sep '14
Module: wine Branch: master Commit: 3e356df597eea10dde11475cb9a8531af09989e3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3e356df597eea10dde11475cb…
Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Thu Sep 18 08:19:52 2014 +0800 msvcp90: Fix comment typo. --- dlls/msvcp90/ios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index fbba957..4ad9586 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -6497,7 +6497,7 @@ basic_ostream_char* __cdecl basic_ostream_char_endl(basic_ostream_char *ostr) return ostr; } -/* $?6DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ +/* ??$?6DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ /* ??$?6DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ basic_ostream_char* __cdecl basic_ostream_char_print_bstr(basic_ostream_char *ostr, const basic_string_char *str) {
1
0
0
0
← Newer
1
...
9
10
11
12
13
14
15
...
31
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
Results per page:
10
25
50
100
200