August 2013 - Wine-commits - list.winehq.org

Michael Stefaniuc : windowscodecs: Silence a warning due to an API change in libpng 1.5.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 4a5bc1375ee446a9aec04cc3f39ee6ac2ee7f39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5bc1375ee446a9aec04cc3f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 22 14:35:34 2013 +0200 windowscodecs: Silence a warning due to an API change in libpng 1.5. --- dlls/windowscodecs/pngformat.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 065b5b8..b79d839 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -866,7 +866,8 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - png_charp name, profile; + png_charp name; + BYTE *profile; png_uint_32 len; int compression_type; HRESULT hr; @@ -877,11 +878,11 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i EnterCriticalSection(&This->lock); - if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, &profile, &len)) + if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, (void *)&profile, &len)) { if (cCount && ppIColorContexts) { - hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, (const BYTE *)profile, len); + hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, len); if (FAILED(hr)) { LeaveCriticalSection(&This->lock);

1 0

Jacek Caban : mshtml: Added better IHTMLCurrentStyle2::get_hasLayout stub.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: b095b1f67e0d2f1729320e2b9d8e9c3d9bf0047c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b095b1f67e0d2f1729320e2b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 15:58:47 2013 +0200 mshtml: Added better IHTMLCurrentStyle2::get_hasLayout stub. --- dlls/mshtml/htmlcurstyle.c | 7 +++++-- dlls/mshtml/tests/style.c | 26 +++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index f773605..71d57a1 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -979,8 +979,11 @@ static HRESULT WINAPI HTMLCurrentStyle2_get_textUnderlinePosition(IHTMLCurrentSt static HRESULT WINAPI HTMLCurrentStyle2_get_hasLayout(IHTMLCurrentStyle2 *iface, VARIANT_BOOL *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + FIXME("(%p)->(%p) returning true\n", This, p); + + *p = VARIANT_TRUE; + return S_OK; } static HRESULT WINAPI HTMLCurrentStyle2_get_scrollbarBaseColor(IHTMLCurrentStyle2 *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 3e2ef89..a32991b 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -73,6 +73,17 @@ static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) return elem; } +#define get_current_style2_iface(u) _get_current_style2_iface(__LINE__,u) +static IHTMLCurrentStyle2 *_get_current_style2_iface(unsigned line, IUnknown *unk) +{ + IHTMLCurrentStyle2 *current_style2; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLCurrentStyle2, (void**)&current_style2); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2: %08x\n", hres); + return current_style2; +} + static IHTMLElement *get_element_by_id(IHTMLDocument2 *doc, const char *id) { HRESULT hres; @@ -2100,9 +2111,7 @@ static void test_style_filters(IHTMLElement *elem) hres = IHTMLElement2_get_currentStyle(elem2, &current_style); ok(hres == S_OK, "get_style failed: %08x\n", hres); - hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle2, (void**)&current_style2); - IHTMLCurrentStyle_Release(current_style); - ok(hres == S_OK, "Could not get IHTMLCurrentStyle2 iface: %08x\n", hres); + current_style2 = get_current_style2_iface((IUnknown*)current_style); test_style_filter(style, NULL); test_current_style_filter(current_style2, NULL); @@ -2131,6 +2140,8 @@ static void test_style_filters(IHTMLElement *elem) static void test_current_style(IHTMLCurrentStyle *current_style) { + IHTMLCurrentStyle2 *current_style2; + VARIANT_BOOL b; BSTR str; HRESULT hres; VARIANT v; @@ -2390,6 +2401,15 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_textIndent failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + current_style2 = get_current_style2_iface((IUnknown*)current_style); + + b = 100; + hres = IHTMLCurrentStyle2_get_hasLayout(current_style2, &b); + ok(hres == S_OK, "get_hasLayout failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "hasLayout = %x\n", b); + + IHTMLCurrentStyle2_Release(current_style2); } static const char basic_test_str[] = "<html><body><div id=\"divid\"></div/</body></html>";

1 0

Jacek Caban : mshtml: Added IHTMLLabelElement:: htmlFor property implementation.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 14a0e875cede6f972f955e96198e9ddadfc2120e URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a0e875cede6f972f955e961… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 17:13:56 2013 +0200 mshtml: Added IHTMLLabelElement::htmlFor property implementation. --- dlls/mshtml/htmlinput.c | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 4d304b2..e6fb184 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -43,6 +43,8 @@ typedef struct { nsIDOMHTMLInputElement *nsinput; } HTMLInputElement; +static const WCHAR forW[] = {'f','o','r',0}; + static inline HTMLInputElement *impl_from_IHTMLInputElement(IHTMLInputElement *iface) { return CONTAINING_RECORD(iface, HTMLInputElement, IHTMLInputElement_iface); @@ -1311,15 +1313,50 @@ static HRESULT WINAPI HTMLLabelElement_Invoke(IHTMLLabelElement *iface, DISPID d static HRESULT WINAPI HTMLLabelElement_put_htmlFor(IHTMLLabelElement *iface, BSTR v) { HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString for_str, val_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&for_str, forW); + nsAString_InitDepend(&val_str, v); + nsres = nsIDOMHTMLElement_SetAttribute(This->element.nselem, &for_str, &val_str); + nsAString_Finish(&for_str); + nsAString_Finish(&val_str); + if(NS_FAILED(nsres)) { + ERR("SetAttribute failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLLabelElement_get_htmlFor(IHTMLLabelElement *iface, BSTR *p) { HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString for_str, val_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_InitDepend(&for_str, forW); + nsAString_Init(&val_str, NULL); + nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &for_str, &val_str); + nsAString_Finish(&for_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *val; + + nsAString_GetData(&val_str, &val); + *p = SysAllocString(val); + hres = *p ? S_OK : E_OUTOFMEMORY; + }else { + ERR("GetAttribute failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&val_str); + return hres; } static HRESULT WINAPI HTMLLabelElement_put_accessKey(IHTMLLabelElement *iface, BSTR v)

1 0

Jacek Caban : mshtml/tests: Added IHTMLLabelElement::htmlFor property tests .
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: e5ba71ab7cb68fd193315128ca3ab9afa33fac9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ba71ab7cb68fd193315128c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 17:14:06 2013 +0200 mshtml/tests: Added IHTMLLabelElement::htmlFor property tests. --- dlls/mshtml/tests/dom.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7abd19b..f4d30579 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -935,6 +935,17 @@ static IHTMLButtonElement *_get_button_iface(unsigned line, IUnknown *unk) return ret; } +#define get_label_iface(u) _get_label_iface(__LINE__,u) +static IHTMLLabelElement *_get_label_iface(unsigned line, IUnknown *unk) +{ + IHTMLLabelElement *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLLabelElement, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLLabelElement: %08x\n", hres); + return ret; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -5513,6 +5524,44 @@ static void test_tr_elem(IHTMLElement *elem) IHTMLTableRow_Release(row); } +static void test_label_elem(IHTMLElement *elem) +{ + IHTMLLabelElement *label; + BSTR str; + HRESULT hres; + + label = get_label_iface((IUnknown*)elem); + + str = NULL; + hres = IHTMLLabelElement_get_htmlFor(label, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!strcmp_wa(str, "in"), "htmlFor = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr(""); + hres = IHTMLLabelElement_put_htmlFor(label, str); + ok(hres == S_OK, "put_htmlFor failed: %08x\n", hres); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hres = IHTMLLabelElement_get_htmlFor(label, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!strcmp_wa(str, ""), "htmlFor = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("abc"); + hres = IHTMLLabelElement_put_htmlFor(label, str); + ok(hres == S_OK, "put_htmlFor failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLLabelElement_get_htmlFor(label, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!strcmp_wa(str, "abc"), "htmlFor = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLLabelElement_Release(label); +} + #define test_table_cell_spacing(a,b) _test_table_cell_spacing(__LINE__,a,b) static void _test_table_cell_spacing(unsigned line, IHTMLTable *table, const char *exstr) { @@ -6268,6 +6317,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, "labelid"); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_label_elem(elem); + IHTMLElement_Release(elem); + } + elem = get_doc_elem_by_id(doc, "row2"); ok(elem != NULL, "elem == NULL\n"); if(elem) {

1 0

Nikolay Sivov : oleaut32/tests: Some tests for LoadRegTypeLib() with activated context.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 0473a072ddf5522b85eb46fc6d3279d58167a356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0473a072ddf5522b85eb46fc6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 16:50:34 2013 +0400 oleaut32/tests: Some tests for LoadRegTypeLib() with activated context. --- dlls/oleaut32/tests/tmarshal.c | 8 +- dlls/oleaut32/tests/tmarshal.idl | 2 +- dlls/oleaut32/tests/typelib.c | 199 +++++++++++++++++++++++++++++++++++++- 3 files changed, 199 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0473a072ddf5522b85eb4…

1 0

Stefan Dösinger : wined3d: Store the mipmap level in the volume.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: ac871305f8e646e0eacdae855396755e3a909637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac871305f8e646e0eacdae855… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 14:57:54 2013 +0200 wined3d: Store the mipmap level in the volume. --- dlls/d3d10core/device.c | 8 +++++--- dlls/d3d8/d3d8_private.h | 3 ++- dlls/d3d8/device.c | 6 +++--- dlls/d3d8/volume.c | 4 ++-- dlls/d3d9/d3d9_private.h | 3 ++- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/volume.c | 7 ++++--- dlls/ddraw/ddraw.c | 5 +++-- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/volume.c | 21 +++++++++++++-------- dlls/wined3d/wined3d_private.h | 3 ++- include/wine/wined3d.h | 6 +++--- 12 files changed, 45 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac871305f8e646e0eacda…

1 0

Henri Verbeet : wined3d: Read from stateBlock instead of updateStateBlock in wined3d_device_get_material ().
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 7638e550b9e6377204d7916822d4cc7526082dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7638e550b9e6377204d791682… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 22 09:48:39 2013 +0200 wined3d: Read from stateBlock instead of updateStateBlock in wined3d_device_get_material(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e16a4b8..c949a9c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2098,7 +2098,7 @@ void CDECL wined3d_device_get_material(const struct wined3d_device *device, stru { TRACE("device %p, material %p.\n", device, material); - *material = device->updateStateBlock->state.material; + *material = device->stateBlock->state.material; TRACE("diffuse {%.8e, %.8e, %.8e, %.8e}\n", material->diffuse.r, material->diffuse.g,

1 0

Henri Verbeet : wined3d: Read from stateBlock instead of updateStateBlock in wined3d_device_get_scissor_rect ().
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 9b721da9a504eaeb87d5eabcc8c184a8fdf63f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b721da9a504eaeb87d5eabcc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 22 09:48:40 2013 +0200 wined3d: Read from stateBlock instead of updateStateBlock in wined3d_device_get_scissor_rect(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c949a9c..7122006 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2340,7 +2340,7 @@ void CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, { TRACE("device %p, rect %p.\n", device, rect); - *rect = device->updateStateBlock->state.scissor_rect; + *rect = device->stateBlock->state.scissor_rect; TRACE("Returning rect %s.\n", wine_dbgstr_rect(rect)); }

1 0

Henri Verbeet : wined3d: Read from stateBlock instead of updateStateBlock in wined3d_device_get_texture_stage_state ().
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 6501f2e21522158a4e4908b41a1f20434509af57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6501f2e21522158a4e4908b41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 22 09:48:41 2013 +0200 wined3d: Read from stateBlock instead of updateStateBlock in wined3d_device_get_texture_stage_state(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7122006..a4a06a9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3665,7 +3665,7 @@ DWORD CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device * return 0; } - return device->updateStateBlock->state.texture_states[stage][state]; + return device->stateBlock->state.texture_states[stage][state]; } HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device,

1 0

Henri Verbeet : d3dx9: Get rid of some unused vtbl forward declarations.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: c2eabf9e684251a14f85d130d55d0f5629a37be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2eabf9e684251a14f85d130d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 22 09:48:42 2013 +0200 d3dx9: Get rid of some unused vtbl forward declarations. --- dlls/d3dx9_36/effect.c | 2 -- dlls/d3dx9_36/line.c | 2 -- dlls/d3dx9_36/shader.c | 2 -- 3 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7a64cb4..757833b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5423,8 +5423,6 @@ HRESULT WINAPI D3DXCreateEffectCompiler(const char *srcdata, UINT srcdatalen, co return D3D_OK; } -static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl; - struct ID3DXEffectPoolImpl { ID3DXEffectPool ID3DXEffectPool_iface; diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index e305eb9..a9f53a7 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -22,8 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -static const struct ID3DXLineVtbl ID3DXLine_Vtbl; - typedef struct ID3DXLineImpl { ID3DXLine ID3DXLine_iface; LONG ref; diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 16395e8..8e5236d 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -567,8 +567,6 @@ struct ctab_constant { struct ctab_constant *constants; }; -static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl; - struct ID3DXConstantTableImpl { ID3DXConstantTable ID3DXConstantTable_iface; LONG ref;

1 0