September 2014 - Wine-Commits

Andreas Fuchs : kernel32: Ignore flags on FindFirstFileExW.
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: ddeab7e564fc302cffa5a3b17134a1fb2f3f26b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddeab7e564fc302cffa5a3b17… Author: Andreas Fuchs <anduchs(a)gmail.com> Date: Mon Sep 29 16:37:41 2014 +0200 kernel32: Ignore flags on FindFirstFileExW. --- dlls/kernel32/file.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index cf683df..512b63e 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1865,10 +1865,13 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, TRACE("%s %d %p %d %p %x\n", debugstr_w(filename), level, data, search_op, filter, flags); - if ((search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories) - || flags != 0) + if (flags != 0) { - FIXME("options not implemented 0x%08x 0x%08x\n", search_op, flags ); + FIXME("flags not implemented 0x%08x\n", flags ); + } + if (search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories) + { + FIXME("search_op not implemented 0x%08x\n", search_op); return INVALID_HANDLE_VALUE; } if (level != FindExInfoStandard)

1 0

Henri Verbeet : d3d8: Get rid of the format switching code in d3d8_device_CopyRects().
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: d5365aae28255c8cc55f12d39cc7fec8428a8889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5365aae28255c8cc55f12d39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 29 09:11:51 2014 +0200 d3d8: Get rid of the format switching code in d3d8_device_CopyRects(). This can't possibly do anything, since we fail texture creation for WINED3DFMT_UNKNOWN. If texture creation with D3DFMT_UNKNOWN is actually supposed to work, we should probably pick an appropriate format at creation, instead of during CopyRects(). This code has existed in some form or another since the initial version in commit 850a9429dbc07c0b38e9f9f60aaec43759326d24. No tests, of course. --- dlls/d3d8/device.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8ddb0cb..dd0b9ee 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -988,7 +988,6 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; UINT src_w, src_h; - HRESULT hr; TRACE("iface %p, src_surface %p, src_rects %p, rect_count %u, dst_surface %p, dst_points %p.\n", iface, src_surface, src_rects, rect_count, dst_surface, dst_points); @@ -1020,24 +1019,13 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, dst_format = wined3d_desc.format; /* Check that the source and destination formats match */ - if (src_format != dst_format && WINED3DFMT_UNKNOWN != dst_format) + if (src_format != dst_format) { WARN("Source %p format must match the destination %p format, returning D3DERR_INVALIDCALL.\n", src_surface, dst_surface); wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - else if (WINED3DFMT_UNKNOWN == dst_format) - { - TRACE("Converting destination surface from WINED3DFMT_UNKNOWN to the source format.\n"); - if (FAILED(hr = wined3d_surface_update_desc(dst->wined3d_surface, wined3d_desc.width, wined3d_desc.height, - src_format, wined3d_desc.multisample_type, wined3d_desc.multisample_quality, NULL, 0))) - { - WARN("Failed to update surface desc, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - } /* Quick if complete copy ... */ if (!rect_count && !src_rects && !dst_points)

1 0

Jacek Caban : mshtml: Don't share nsscript reference with nsnode.
by Alexandre Julliard Sept. 26, 2014

Sept. 26, 2014

Module: wine Branch: master Commit: e391dfc8aeaf8629e3f70f773778acfd96d4fe72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e391dfc8aeaf8629e3f70f773… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 26 15:11:33 2014 +0200 mshtml: Don't share nsscript reference with nsnode. --- dlls/mshtml/htmlscript.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 5dc3138..dcab32f 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -391,6 +391,26 @@ static HRESULT HTMLScriptElement_get_readystate(HTMLDOMNode *iface, BSTR *p) return IHTMLScriptElement_get_readyState(&This->IHTMLScriptElement_iface, p); } +static void HTMLScriptElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsscript) + note_cc_edge((nsISupports*)This->nsscript, "This->nsscript", cb); +} + +static void HTMLScriptElement_unlink(HTMLDOMNode *iface) +{ + HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsscript) { + nsIDOMHTMLScriptElement *nsscript = This->nsscript; + + This->nsscript = NULL; + nsIDOMHTMLScriptElement_Release(nsscript); + } +} + static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_QI, HTMLElement_destructor, @@ -403,7 +423,12 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { NULL, NULL, NULL, - HTMLScriptElement_get_readystate + HTMLScriptElement_get_readystate, + NULL, + NULL, + NULL, + HTMLScriptElement_traverse, + HTMLScriptElement_unlink }; HRESULT script_elem_from_nsscript(HTMLDocumentNode *doc, nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) @@ -448,10 +473,7 @@ HRESULT HTMLScriptElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele HTMLElement_Init(&ret->element, doc, nselem, &HTMLScriptElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLScriptElement, (void**)&ret->nsscript); - - /* Share nsscript reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsscript == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Nikolay Sivov : dwrite: Implement GetScriptProperties().
by Alexandre Julliard Sept. 26, 2014

Sept. 26, 2014

Module: wine Branch: master Commit: 59bdda006bc06cb6f3bc707eaec31a4b46f7e3a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59bdda006bc06cb6f3bc707ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 26 10:21:27 2014 +0400 dwrite: Implement GetScriptProperties(). --- dlls/dwrite/analyzer.c | 151 +++++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/scripts.h | 3 +- dlls/dwrite/tests/analyzer.c | 33 ++++++++++ tools/make_unicode | 12 ++-- 4 files changed, 186 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59bdda006bc06cb6f3bc7…

1 0

Johannes Brandstätter : d3d10core: Add support for map_type flags D3D10_MAP_READ, D3D10_MAP_WRITE_NO_OVERWRITE and D3D10_MAP_DISCARD.
by Alexandre Julliard Sept. 26, 2014

Sept. 26, 2014

Module: wine Branch: master Commit: db2e44a9bc428f82391629e7084816e43784f8cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=db2e44a9bc428f82391629e70… Author: Johannes Brandstätter <jbrandst(a)2ds.eu> Date: Thu Sep 25 17:18:40 2014 +0200 d3d10core: Add support for map_type flags D3D10_MAP_READ, D3D10_MAP_WRITE_NO_OVERWRITE and D3D10_MAP_DISCARD. --- dlls/d3d10core/buffer.c | 5 ++--- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/texture.c | 8 ++------ dlls/d3d10core/utils.c | 22 ++++++++++++++++++++++ 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index b9ac6e1..c5d851e 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -154,12 +154,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP TRACE("iface %p, map_type %u, map_flags %#x, data %p.\n", iface, map_type, map_flags, data); - if (map_type != D3D10_MAP_READ_WRITE) - FIXME("Ignoring map_type %#x.\n", map_type); if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); - return wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, 0); + return wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, + wined3d_map_flags_from_d3d10_map_type(map_type)); } static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 71c4dc0..30ae928 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -63,6 +63,7 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSP enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; +DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; static inline void read_dword(const char **ptr, DWORD *d) { diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index b488f91..5e112dd 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -176,15 +176,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UIN TRACE("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, mapped_texture %p.\n", iface, sub_resource_idx, map_type, map_flags, mapped_texture); - if (map_type != D3D10_MAP_READ_WRITE) - FIXME("Ignoring map_type %#x.\n", map_type); if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) hr = E_INVALIDARG; else if (SUCCEEDED(hr = wined3d_surface_map(wined3d_surface_from_resource(sub_resource), - &wined3d_map_desc, NULL, 0))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; @@ -451,15 +449,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN TRACE("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, mapped_texture %p.\n", iface, sub_resource_idx, map_type, map_flags, mapped_texture); - if (map_type != D3D10_MAP_READ_WRITE) - FIXME("Ignoring map_type %#x.\n", map_type); if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) hr = E_INVALIDARG; else if (SUCCEEDED(hr = wined3d_volume_map(wined3d_volume_from_resource(sub_resource), - &wined3d_map_desc, NULL, 0))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index d955fbb..91eda6d 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -389,6 +389,28 @@ struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource } } +DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) +{ + switch (map_type) + { + case D3D10_MAP_READ_WRITE: + return 0; + + case D3D10_MAP_READ: + return WINED3D_MAP_READONLY; + + case D3D10_MAP_WRITE_DISCARD: + return WINED3D_MAP_DISCARD; + + case D3D10_MAP_WRITE_NO_OVERWRITE: + return WINED3D_MAP_NOOVERWRITE; + + default: + FIXME("Unhandled map_type %#x.\n", map_type); + return 0; + } +} + void skip_dword_unknown(const char **ptr, unsigned int count) { unsigned int i;

1 0

Jacek Caban : mshtml: Don't share nsrow reference with nsnode.
by Alexandre Julliard Sept. 26, 2014

Sept. 26, 2014

Module: wine Branch: master Commit: 1e9f33924b3b7c10a02871e522126caca2de3e04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e9f33924b3b7c10a02871e52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 26 15:11:40 2014 +0200 mshtml: Don't share nsrow reference with nsnode. --- dlls/mshtml/htmltablerow.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 589a38f..a5da29f 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -402,13 +402,44 @@ static HRESULT HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } +static void HTMLTableRow_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLTableRow *This = impl_from_HTMLDOMNode(iface); + + if(This->nsrow) + note_cc_edge((nsISupports*)This->nsrow, "This->nstablerow", cb); +} + +static void HTMLTableRow_unlink(HTMLDOMNode *iface) +{ + HTMLTableRow *This = impl_from_HTMLDOMNode(iface); + + if(This->nsrow) { + nsIDOMHTMLTableRowElement *nsrow = This->nsrow; + + This->nsrow = NULL; + nsIDOMHTMLTableRowElement_Release(nsrow); + } +} + static const NodeImplVtbl HTMLTableRowImplVtbl = { HTMLTableRow_QI, HTMLElement_destructor, HTMLElement_cpc, HTMLElement_clone, HTMLElement_handle_event, - HTMLElement_get_attr_col + HTMLElement_get_attr_col, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLTableRow_traverse, + HTMLTableRow_unlink }; static const tid_t HTMLTableRow_iface_tids[] = { @@ -439,10 +470,7 @@ HRESULT HTMLTableRow_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HT HTMLElement_Init(&ret->element, doc, nselem, &HTMLTableRow_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableRowElement, (void**)&ret->nsrow); - - /* Share nsrow reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsrow == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Hao Peng : mshtml: Add IHTMLAnchorElement::search propertyimplementation.
by Alexandre Julliard Sept. 26, 2014

Sept. 26, 2014

Module: wine Branch: master Commit: 268b22e5e8b801ddefe3d1fae9e175fa166099c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=268b22e5e8b801ddefe3d1fae… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Sep 25 15:51:39 2014 +0800 mshtml: Add IHTMLAnchorElement::search propertyimplementation. --- dlls/mshtml/htmlanchor.c | 24 +++++++++++++++++++---- dlls/mshtml/tests/dom.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 3057f35..84f4098 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -479,15 +479,31 @@ static HRESULT WINAPI HTMLAnchorElement_get_protocol(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_put_search(IHTMLAnchorElement *iface, BSTR v) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLAnchorElement_SetSearch(This->nsanchor, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) + return E_FAIL; + + return S_OK; } static HRESULT WINAPI HTMLAnchorElement_get_search(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString search_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&search_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetSearch(This->nsanchor, &search_str); + return return_nsstr(nsres, &search_str, p); } static HRESULT WINAPI HTMLAnchorElement_put_hash(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4dc89e0..4f69e7a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1479,6 +1479,37 @@ static void _test_anchor_hostname(unsigned line, IUnknown *unk, const char *host SysFreeString(str); } +#define test_anchor_search(a,h,n) _test_anchor_search(__LINE__,a,h,n) +static void _test_anchor_search(unsigned line, IUnknown *elem, const char *search, BOOL allowbroken) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, elem); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_search(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_search failed: %08x\n", hres); + if ( ! str && allowbroken) + win_skip("skip ie6 incorrect behavior\n"); + else if(search) + ok_(__FILE__,line)(!strcmp_wa(str, search), "search = %s, expected %s\n", wine_dbgstr_w(str), search); + else + ok_(__FILE__,line)(!str, "search = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + +#define test_anchor_put_search(a,h) _test_anchor_put_search(__LINE__,a,h) +static void _test_anchor_put_search(unsigned line, IUnknown *unk, const char *search) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + str = search ? a2bstr(search) : NULL; + hres = IHTMLAnchorElement_put_search(anchor, str); + ok_(__FILE__,line)(hres == S_OK, "put_search failed: %08x\n", hres); + SysFreeString(str); +} + #define test_anchor_hash(a,h) _test_anchor_hash(__LINE__,a,h) static void _test_anchor_hash(unsigned line, IHTMLElement *elem, const char *exhash) { @@ -7331,8 +7362,25 @@ static void test_elems(IHTMLDocument2 *doc) test_anchor_put_name((IUnknown*)elem, NULL); test_anchor_put_name((IUnknown*)elem, "x"); - test_anchor_put_href((IUnknown*)elem, "http://test/#hash"); + test_anchor_put_href((IUnknown*)elem, "http://test/?how#hash"); test_anchor_hash(elem, "#hash"); + test_anchor_search((IUnknown*)elem, "?how", FALSE); + + test_anchor_put_search((IUnknown*)elem, "?word=press"); + test_anchor_search((IUnknown*)elem, "?word=press", FALSE); + test_anchor_put_search((IUnknown*)elem, "?????word???press"); + test_anchor_search((IUnknown*)elem, "?????word???press", FALSE); + + test_anchor_put_search((IUnknown*)elem, "?q=\%E4\%BD\%A0\%E5\%A5\%BD"); /* encoded cjk characters */ + test_anchor_search((IUnknown*)elem, "?q=\%E4\%BD\%A0\%E5\%A5\%BD", FALSE); + + test_anchor_put_search((IUnknown*)elem, "?how?old=are"); + test_anchor_search((IUnknown*)elem, "?how?old=are", FALSE); + + /* due to incorrect behavior of ie6, search string without leading "?" is interpreted + as part of the pathname, and can not be accessed by get_search. */ + test_anchor_put_search((IUnknown*)elem, "word=abc"); + test_anchor_search((IUnknown*)elem, "?word=abc", TRUE); IHTMLElement_Release(elem); }

1 0

Nikolay Sivov : dwrite: Implement GetTextComplexity().
by Alexandre Julliard Sept. 26, 2014

Sept. 26, 2014

Module: wine Branch: master Commit: 7eac1f71568855f1d627410a27dd5a96804a04ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eac1f71568855f1d627410a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 26 12:54:02 2014 +0400 dwrite: Implement GetTextComplexity(). --- dlls/dwrite/analyzer.c | 54 +++++++++++++++++++- dlls/dwrite/tests/analyzer.c | 114 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 165 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index f9e3c11..46e3769 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -830,11 +830,61 @@ static HRESULT WINAPI dwritetextanalyzer1_GetScriptProperties(IDWriteTextAnalyze return S_OK; } +static inline BOOL is_char_from_simple_script(WCHAR c) +{ + if (IS_HIGH_SURROGATE(c) || IS_LOW_SURROGATE(c)) + return FALSE; + else { + UINT16 script = get_char_script(c); + return !dwritescripts_properties[script].is_complex; + } +} + static HRESULT WINAPI dwritetextanalyzer1_GetTextComplexity(IDWriteTextAnalyzer2 *iface, const WCHAR *text, UINT32 len, IDWriteFontFace *face, BOOL *is_simple, UINT32 *len_read, UINT16 *indices) { - FIXME("(%s:%u %p %p %p %p): stub\n", debugstr_wn(text, len), len, face, is_simple, len_read, indices); - return E_NOTIMPL; + HRESULT hr = S_OK; + int i; + + TRACE("(%s:%u %p %p %p %p)\n", debugstr_wn(text, len), len, face, is_simple, len_read, indices); + + *is_simple = FALSE; + *len_read = 0; + + if (!face) + return E_INVALIDARG; + + if (len == 0) { + *is_simple = TRUE; + return S_OK; + } + + *is_simple = text[0] && is_char_from_simple_script(text[0]); + for (i = 1; i < len && text[i]; i++) { + if (is_char_from_simple_script(text[i])) { + if (!*is_simple) + break; + } + else + *is_simple = FALSE; + } + + *len_read = i; + + /* fetch indices */ + if (*is_simple && indices) { + UINT32 *codepoints = heap_alloc(*len_read*sizeof(UINT32)); + if (!codepoints) + return E_OUTOFMEMORY; + + for (i = 0; i < *len_read; i++) + codepoints[i] = text[i]; + + hr = IDWriteFontFace_GetGlyphIndices(face, codepoints, *len_read, indices); + heap_free(codepoints); + } + + return hr; } static HRESULT WINAPI dwritetextanalyzer1_GetJustificationOpportunities(IDWriteTextAnalyzer2 *iface, diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 490165f..45e2e07 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -922,7 +922,7 @@ static void test_GetScriptProperties(void) hr = IDWriteTextAnalyzer_QueryInterface(analyzer, &IID_IDWriteTextAnalyzer1, (void**)&analyzer1); IDWriteTextAnalyzer_Release(analyzer); if (hr != S_OK) { - win_skip("IDWriteTextAnalyzer1 is not supported.\n"); + win_skip("GetScriptProperties() is not supported.\n"); return; } @@ -940,6 +940,117 @@ if (0) /* crashes on native */ IDWriteTextAnalyzer1_Release(analyzer1); } +struct textcomplexity_test { + const WCHAR text[5]; + UINT32 length; + BOOL simple; + UINT32 len_read; +}; + +static const struct textcomplexity_test textcomplexity_tests[] = { + { {0}, 1, FALSE, 1 }, + { {0}, 0, TRUE, 0 }, + { {0x610,0}, 0, TRUE, 0 }, + { {'A','B','C','D',0}, 3, TRUE, 3 }, + { {'A','B','C','D',0}, 5, TRUE, 4 }, + { {'A','B','C','D',0}, 10, TRUE, 4 }, + { {'A',0x610,'C','D',0}, 1, TRUE, 1 }, + { {'A',0x610,'C','D',0}, 2, FALSE, 2 }, + { {0x610,'A','C','D',0}, 1, FALSE, 1 }, + { {0x610,'A','C','D',0}, 2, FALSE, 1 }, + { {0x610,0x610,'C','D',0}, 2, FALSE, 2 }, + { {0xd800,'A','B',0}, 1, FALSE, 1 }, + { {0xd800,'A','B',0}, 2, FALSE, 1 }, + { {0xdc00,'A','B',0}, 2, FALSE, 1 } +}; + +static void test_GetTextComplexity(void) +{ + static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; + static const WCHAR textW[] = {'A','B','C',0}; + IDWriteTextAnalyzer1 *analyzer1; + IDWriteTextAnalyzer *analyzer; + IDWriteGdiInterop *interop; + IDWriteFontFace *fontface; + UINT16 indices[10]; + IDWriteFont *font; + LOGFONTW logfont; + BOOL simple; + HRESULT hr; + UINT32 len; + int i; + + hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextAnalyzer_QueryInterface(analyzer, &IID_IDWriteTextAnalyzer1, (void**)&analyzer1); + IDWriteTextAnalyzer_Release(analyzer); + if (hr != S_OK) { + win_skip("GetTextComplexity() is not supported.\n"); + return; + } + +if (0) { /* crashes on native */ + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, NULL, 0, NULL, NULL, NULL, NULL); + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, NULL, 0, NULL, NULL, &len, NULL); + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, textW, 3, NULL, NULL, NULL, NULL); + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, textW, 3, NULL, NULL, &len, NULL); + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, textW, 3, NULL, &simple, NULL, NULL); +} + + len = 1; + simple = TRUE; + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, NULL, 0, NULL, &simple, &len, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(len == 0, "got %d\n", len); + ok(simple == FALSE, "got %d\n", simple); + + len = 1; + simple = TRUE; + indices[0] = 1; + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, textW, 3, NULL, &simple, &len, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(len == 0, "got %d\n", len); + ok(simple == FALSE, "got %d\n", simple); + ok(indices[0] == 1, "got %d\n", indices[0]); + + /* so font face is required, create one */ + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, tahomaW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + for (i = 0; i < sizeof(textcomplexity_tests)/sizeof(struct textcomplexity_test); i++) { + const struct textcomplexity_test *ptr = &textcomplexity_tests[i]; + len = 1; + simple = !ptr->simple; + indices[0] = 0; + hr = IDWriteTextAnalyzer1_GetTextComplexity(analyzer1, ptr->text, ptr->length, fontface, &simple, &len, indices); + ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + ok(len == ptr->len_read, "%d: read length: got %d, expected %d\n", i, len, ptr->len_read); + ok(simple == ptr->simple, "%d: simple: got %d, expected %d\n", i, simple, ptr->simple); + if (simple && ptr->length) + ok(indices[0] > 0, "%d: got %d\n", i, indices[0]); + else + ok(indices[0] == 0, "%d: got %d\n", i, indices[0]); + } + + IDWriteFontFace_Release(fontface); + IDWriteGdiInterop_Release(interop); + IDWriteTextAnalyzer1_Release(analyzer1); +} + START_TEST(analyzer) { HRESULT hr; @@ -958,6 +1069,7 @@ START_TEST(analyzer) test_AnalyzeScript(); test_AnalyzeLineBreakpoints(); test_GetScriptProperties(); + test_GetTextComplexity(); IDWriteFactory_Release(factory); }

1 0

Jacek Caban : mshtml: Don't share nsbutton reference with nsnode.
by Alexandre Julliard Sept. 26, 2014

Sept. 26, 2014

Module: wine Branch: master Commit: cf8eacf1c137f2b51f008da253b98b538f7df04c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8eacf1c137f2b51f008da25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 26 15:11:48 2014 +0200 mshtml: Don't share nsbutton reference with nsnode. --- dlls/mshtml/htmlinput.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 62eff21..e568f4b 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1759,6 +1759,26 @@ static HRESULT HTMLButtonElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BO return IHTMLButtonElement_get_disabled(&This->IHTMLButtonElement_iface, p); } +static void HTMLButtonElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLButtonElement *This = button_from_HTMLDOMNode(iface); + + if(This->nsbutton) + note_cc_edge((nsISupports*)This->nsbutton, "This->nsbutton", cb); +} + +static void HTMLButtonElement_unlink(HTMLDOMNode *iface) +{ + HTMLButtonElement *This = button_from_HTMLDOMNode(iface); + + if(This->nsbutton) { + nsIDOMHTMLButtonElement *nsbutton = This->nsbutton; + + This->nsbutton = NULL; + nsIDOMHTMLButtonElement_Release(nsbutton); + } +} + static const NodeImplVtbl HTMLButtonElementImplVtbl = { HTMLButtonElement_QI, HTMLElement_destructor, @@ -1769,7 +1789,14 @@ static const NodeImplVtbl HTMLButtonElementImplVtbl = { NULL, NULL, HTMLButtonElementImpl_put_disabled, - HTMLButtonElementImpl_get_disabled + HTMLButtonElementImpl_get_disabled, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLButtonElement_traverse, + HTMLButtonElement_unlink }; static const tid_t HTMLButtonElement_iface_tids[] = { @@ -1800,10 +1827,7 @@ HRESULT HTMLButtonElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele HTMLElement_Init(&ret->element, doc, nselem, &HTMLButtonElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLButtonElement, (void**)&ret->nsbutton); - - /* Share nsbutton reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsbutton == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Address AddComponent.
by Alexandre Julliard Sept. 26, 2014

Sept. 26, 2014

Module: wine Branch: master Commit: 9a5a5a365e589434241ad17e200397bea5deff96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5a5a365e589434241ad17e2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 11 09:02:56 2014 +1000 dpnet: Implement IDirectPlay8Address AddComponent. --- dlls/dpnet/address.c | 165 ++++++++++++++++++++++++++++++++++++++------- dlls/dpnet/dpnet_private.h | 30 +++++++-- dlls/dpnet/tests/address.c | 105 +++++++++++++++++++++++++++++ 3 files changed, 269 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a5a5a365e589434241ad…

1 0