wine-commits September 2014

2 participants
301 discussions

Francois Gouget : d2d1: Add a trailing '\n' to a FIXME().

by Alexandre Julliard

Module: wine Branch: master Commit: 9f9743364144a90631b71c7aaf5d54531524c2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9743364144a90631b71c7aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 28 23:51:59 2014 +0200 d2d1: Add a trailing '\n' to a FIXME(). --- dlls/d2d1/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 10c4296..43c4881 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -123,7 +123,7 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap *iface, static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap *iface, const D2D1_POINT_2U *dst_point, ID2D1RenderTarget *render_target, const D2D1_RECT_U *src_rect) { - FIXME("iface %p, dst_point %p, render_target %p, src_rect %p stub!", iface, dst_point, render_target, src_rect); + FIXME("iface %p, dst_point %p, render_target %p, src_rect %p stub!\n", iface, dst_point, render_target, src_rect); return E_NOTIMPL; }

9 years, 7 months

Francois Gouget : dpnet/tests: Add a trailing '\n' to some ok() calls.

by Alexandre Julliard

Module: wine Branch: master Commit: d83f2ac0eca3569c73fcdd13b546c36a55692225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83f2ac0eca3569c73fcdd13b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 28 23:52:03 2014 +0200 dpnet/tests: Add a trailing '\n' to some ok() calls. --- dlls/dpnet/tests/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 4d825bb..0f0b8ce 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -189,14 +189,14 @@ static void address_setsp(void) hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(components == 0, "components=%d", components); + ok(components == 0, "components=%d\n", components); hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(components == 1, "components=%d", components); + ok(components == 1, "components=%d\n", components); hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 0, NULL, &namelen, NULL, &bufflen, &type); todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr);

9 years, 7 months

Jacek Caban : mshtml: Use UTF-8 encoding in NewURI by default.

by Alexandre Julliard

Module: wine Branch: master Commit: 857a35e2a7628058d46489918dc2c4eb529ea61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=857a35e2a7628058d46489918… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 26 15:38:59 2014 +0200 mshtml: Use UTF-8 encoding in NewURI by default. --- dlls/mshtml/nsio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9335428..b5c766c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3343,7 +3343,10 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * } } - MultiByteToWideChar(CP_ACP, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); + if(aOriginCharset && strcasecmp(aOriginCharset, "utf-8")) + FIXME("Unsupported charset %s\n", debugstr_a(aOriginCharset)); + + MultiByteToWideChar(CP_UTF8, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); if(base_wine_uri) { hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri);

9 years, 7 months

Jacek Caban : mshtml: Don't share nsbutton reference with nsnode.

by Alexandre Julliard

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;

9 years, 7 months

Jacek Caban : mshtml: Don't share nsrow reference with nsnode.

by Alexandre Julliard

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;

9 years, 7 months

Jacek Caban : mshtml: Don't share nsscript reference with nsnode.

by Alexandre Julliard

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;

9 years, 7 months

Jacek Caban : mshtml: Don't share nsimg reference with nsnode.

by Alexandre Julliard

Module: wine Branch: master Commit: 23fc0dc8e854cbebc9e1b77eebf90974eb82739d URL: http://source.winehq.org/git/wine.git/?a=commit;h=23fc0dc8e854cbebc9e1b77ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 26 15:11:28 2014 +0200 mshtml: Don't share nsimg reference with nsnode. --- dlls/mshtml/htmlimg.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 8c1d324..57eaa7e 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -686,6 +686,26 @@ static HRESULT HTMLImgElement_get_readystate(HTMLDOMNode *iface, BSTR *p) return IHTMLImgElement_get_readyState(&This->IHTMLImgElement_iface, p); } +static void HTMLImgElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLImgElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsimg) + note_cc_edge((nsISupports*)This->nsimg, "This->nsimg", cb); +} + +static void HTMLImgElement_unlink(HTMLDOMNode *iface) +{ + HTMLImgElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsimg) { + nsIDOMHTMLImageElement *nsimg = This->nsimg; + + This->nsimg = NULL; + nsIDOMHTMLImageElement_Release(nsimg); + } +} + static const NodeImplVtbl HTMLImgElementImplVtbl = { HTMLImgElement_QI, HTMLElement_destructor, @@ -698,7 +718,12 @@ static const NodeImplVtbl HTMLImgElementImplVtbl = { NULL, NULL, NULL, - HTMLImgElement_get_readystate + HTMLImgElement_get_readystate, + NULL, + NULL, + NULL, + HTMLImgElement_traverse, + HTMLImgElement_unlink }; static const tid_t HTMLImgElement_iface_tids[] = { @@ -728,10 +753,7 @@ HRESULT HTMLImgElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement_Init(&ret->element, doc, nselem, &HTMLImgElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLImageElement, (void**)&ret->nsimg); - - /* Share nsimg reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsimg == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

9 years, 7 months

Hao Peng : mshtml: Add IHTMLAnchorElement::search propertyimplementation.

by Alexandre Julliard

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); }

9 years, 7 months

Nikolay Sivov : dwrite: Implement GetTextComplexity().

by Alexandre Julliard

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); }

9 years, 7 months

Nikolay Sivov : dwrite: Implement GetScriptProperties().

by Alexandre Julliard

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…

9 years, 7 months

← Newer
1
2
3
4
5
6
7
...
31
Older →

Jump to page:

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 September 2014