June 2016 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : d3dcompiler_39: Share source with d3dcompiler_43.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 27ab2cf439d260a08723ad8cb7fdbe1f944109fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ab2cf439d260a08723ad8cb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:02:34 2016 +0000 d3dcompiler_39: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_39/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_39/d3dcompiler_39.spec | 18 ++++++------- dlls/d3dcompiler_39/d3dcompiler_39_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index fdd4a67..22433d7 100644 --- a/dlls/d3dcompiler_39/Makefile.in +++ b/dlls/d3dcompiler_39/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_39.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=39 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_39_main.c + asmparser.c \ + blob.c \ + bytecodewriter.c \ + compiler.c \ + main.c \ + reflection.c \ + utils.c + +LEX_SRCS = \ + asmshader.l \ + hlsl.l + +BISON_SRCS = \ + asmshader.y \ + hlsl.y RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_39/d3dcompiler_39.spec b/dlls/d3dcompiler_39/d3dcompiler_39.spec index 9214bc1..66047b2 100644 --- a/dlls/d3dcompiler_39/d3dcompiler_39.spec +++ b/dlls/d3dcompiler_39/d3dcompiler_39.spec @@ -1,11 +1,11 @@ -@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DGetCodeDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo -@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob -@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob -@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob -@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) D3DDisassemble +@ stub D3DDisassembleEffect(ptr long ptr) +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) D3DReflect @ stub D3DReturnFailure1 @ stub DebugSetMute diff --git a/dlls/d3dcompiler_39/d3dcompiler_39_main.c b/dlls/d3dcompiler_39/d3dcompiler_39_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_39/d3dcompiler_39_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2010 Matteo Bruni for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index ab0289f..1a34be8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_39", "d3dcompiler_38", "d3dcompiler_37", "d3dcompiler_36",

1 0

Jacek Caban : mshtml: Added IElementSelector:: querySelectorAll implementation.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 2e4fa65d0982a955fcb5b9b2a5726d9a65982990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4fa65d0982a955fcb5b9b2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 19:29:56 2016 +0200 mshtml: Added IElementSelector::querySelectorAll implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 19 +++++++++++++++++-- dlls/mshtml/tests/dom.c | 26 ++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8aac47b..76434c8 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4081,8 +4081,23 @@ static HRESULT WINAPI ElementSelector_querySelector(IElementSelector *iface, BST static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) { HTMLElement *This = impl_from_IElementSelector(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - return E_NOTIMPL; + nsIDOMNodeList *node_list; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLElement_QuerySelectorAll(This->nselem, &nsstr, &node_list); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("QuerySelectorAll failed: %08x\n", nsres); + return E_FAIL; + } + + *pel = create_child_collection(This->node.doc, node_list); + nsIDOMNodeList_Release(node_list); + return *pel ? S_OK : E_OUTOFMEMORY; } static const IElementSelectorVtbl ElementSelectorVtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 47c8827..52227d3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7906,10 +7906,11 @@ static void test_enum_children(IUnknown *unk, unsigned len) IEnumVARIANT_Release(enum_var); } -static void test_doc_selector(IHTMLDocument2 *doc, IHTMLElement *div) +static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) { IHTMLDOMChildrenCollection *collection; IDocumentSelector *doc_selector; + IElementSelector *elem_selector; BSTR str; HRESULT hres; @@ -7939,6 +7940,27 @@ static void test_doc_selector(IHTMLDocument2 *doc, IHTMLElement *div) IHTMLDOMChildrenCollection_Release(collection); IDocumentSelector_Release(doc_selector); + + hres = IHTMLElement_QueryInterface(div, &IID_IElementSelector, (void**)&elem_selector); + ok(hres == S_OK, "Could not get IElementSelector iface: %08x\n", hres); + + collection = NULL; + str = a2bstr("nomatch"); + hres = IElementSelector_querySelectorAll(elem_selector, str, &collection); + ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); + ok(collection != NULL, "collection == NULL\n"); + test_children_collection_length(collection, 0); + IHTMLDOMChildrenCollection_Release(collection); + + collection = NULL; + str = a2bstr(".cl1"); + hres = IElementSelector_querySelectorAll(elem_selector, str, &collection); + ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); + ok(collection != NULL, "collection == NULL\n"); + test_children_collection_length(collection, 2); + IHTMLDOMChildrenCollection_Release(collection); + + IElementSelector_Release(elem_selector); } static void test_elems(IHTMLDocument2 *doc) @@ -9005,7 +9027,7 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); } - test_doc_selector(doc, div); + test_selectors(doc, div); test_elem_set_innerhtml((IUnknown*)div, "<div id=\"elemid\">test</div>"); elem = get_elem_by_id(doc, "elemid", TRUE);

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement::get_type implementation.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 5f7a55f85ee243fbdc6ae973c46c25668a48e690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7a55f85ee243fbdc6ae973c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 19:32:34 2016 +0200 mshtml: Added IHTMLButtonElement::get_type implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 18 +++++++++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e83cbc1..0b6eb33 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1621,8 +1621,14 @@ static HRESULT WINAPI HTMLButtonElement_Invoke(IHTMLButtonElement *iface, DISPID static HRESULT WINAPI HTMLButtonElement_get_type(IHTMLButtonElement *iface, BSTR *p) { HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString type_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&type_str, NULL); + nsres = nsIDOMHTMLButtonElement_GetType(This->nsbutton, &type_str); + return return_nsstr(nsres, &type_str, p); } static HRESULT WINAPI HTMLButtonElement_put_value(IHTMLButtonElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 52227d3..9788e56 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -54,7 +54,7 @@ static const char elem_test_str[] = "<a id=\"a\" href=\"http://test\" name=\"x\">link</a>" "<label for=\"in\" id=\"labelid\">Label:</label>" "<input id=\"in\" class=\"testclass\" tabIndex=\"2\" title=\"test title\" />" - "<button id=\"btnid\"></button>" + "<button id=\"btnid\" type=\"submit\"></button>" "<select id=\"s\"><option id=\"x\" value=\"val1\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td id=\"td1\">td1 text</td><td id=\"td2\">td2 text</td></tr></tbody></table>" @@ -6929,10 +6929,26 @@ static void _test_button_set_disabled(unsigned line, IHTMLElement *elem, VARIANT _test_button_get_disabled(line, elem, b); } +#define test_button_type(a,b) _test_button_type(__LINE__,a,b) +static void _test_button_type(unsigned line, IHTMLElement *elem, const char *extype) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + hres = IHTMLButtonElement_get_type(button, &str); + ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(str, extype), "type = %s, expected %s\n", wine_dbgstr_w(str), extype); + SysFreeString(str); + + IHTMLButtonElement_Release(button); +} + static void test_button_elem(IHTMLElement *elem) { test_button_name(elem, NULL); set_button_name(elem, "button name"); + test_button_type(elem, "submit"); test_elem_istextedit(elem, VARIANT_TRUE); }

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement:: value property implementation.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 5a07f80ebeef3aa164e6172eea79348589de17b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a07f80ebeef3aa164e6172ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 19:30:18 2016 +0200 mshtml: Added IHTMLButtonElement::value property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 26 ++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 0b6eb33..5e0d53b 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1634,15 +1634,33 @@ static HRESULT WINAPI HTMLButtonElement_get_type(IHTMLButtonElement *iface, BSTR static HRESULT WINAPI HTMLButtonElement_put_value(IHTMLButtonElement *iface, BSTR v) { HTMLButtonElement *This = impl_from_IHTMLButtonElement(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 = nsIDOMHTMLButtonElement_SetValue(This->nsbutton, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetValue failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLButtonElement_get_value(IHTMLButtonElement *iface, BSTR *p) { HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString value_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&value_str, NULL); + nsres = nsIDOMHTMLButtonElement_GetValue(This->nsbutton, &value_str); + return return_nsstr(nsres, &value_str, p); } static HRESULT WINAPI HTMLButtonElement_put_name(IHTMLButtonElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9788e56..27af54d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6944,11 +6944,45 @@ static void _test_button_type(unsigned line, IHTMLElement *elem, const char *ext IHTMLButtonElement_Release(button); } +#define test_button_value(a,b) _test_button_value(__LINE__,a,b) +static void _test_button_value(unsigned line, IHTMLElement *elem, const char *exvalue) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + hres = IHTMLButtonElement_get_value(button, &str); + ok_(__FILE__,line)(hres == S_OK, "get_value failed: %08x\n", hres); + if(exvalue) + ok_(__FILE__,line)(!strcmp_wa(str, exvalue), "value = %s, expected %s\n", wine_dbgstr_w(str), exvalue); + else + ok_(__FILE__,line)(!str, "value = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLButtonElement_Release(button); +} + +#define set_button_value(a,b) _set_button_value(__LINE__,a,b) +static void _set_button_value(unsigned line, IHTMLElement *elem, const char *value) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + BSTR str = a2bstr(value); + HRESULT hres; + + hres = IHTMLButtonElement_put_value(button, str); + ok_(__FILE__,line)(hres == S_OK, "put_value failed: %08x\n", hres); + IHTMLButtonElement_Release(button); + + _test_button_value(line, elem, value); +} + static void test_button_elem(IHTMLElement *elem) { test_button_name(elem, NULL); set_button_name(elem, "button name"); test_button_type(elem, "submit"); + test_button_value(elem, NULL); + set_button_value(elem, "val"); test_elem_istextedit(elem, VARIANT_TRUE); }

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement:: form property implementation.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: a963b6c8c82f8384459a623418c156a70236164f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a963b6c8c82f8384459a62341… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 19:30:27 2016 +0200 mshtml: Added IHTMLButtonElement::form property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 60 ++++++++++++++++++++++++++++++++----------------- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++-- 2 files changed, 71 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 5e0d53b..e92b3d8 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -45,6 +45,32 @@ typedef struct { static const WCHAR forW[] = {'f','o','r',0}; +static HRESULT return_nsform(HTMLElement *elem, nsIDOMHTMLFormElement *nsform, IHTMLFormElement **p) +{ + nsIDOMNode *form_node; + HTMLDOMNode *node; + nsresult nsres; + HRESULT hres; + + if(!nsform) { + *p = NULL; + return S_OK; + } + + nsres = nsIDOMHTMLFormElement_QueryInterface(nsform, &IID_nsIDOMNode, (void**)&form_node); + nsIDOMHTMLFormElement_Release(nsform); + assert(nsres == NS_OK); + + hres = get_node(elem->node.doc, form_node, TRUE, &node); + nsIDOMNode_Release(form_node); + if (FAILED(hres)) + return hres; + + hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); + node_release(node); + return hres; +} + static inline HTMLInputElement *impl_from_IHTMLInputElement(IHTMLInputElement *iface) { return CONTAINING_RECORD(iface, HTMLInputElement, IHTMLInputElement_iface); @@ -256,33 +282,17 @@ static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLF { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); nsIDOMHTMLFormElement *nsform; - nsIDOMNode *form_node; - HTMLDOMNode *node; - HRESULT hres; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); nsres = nsIDOMHTMLInputElement_GetForm(This->nsinput, &nsform); - if (NS_FAILED(nsres) || nsform == NULL) { + if (NS_FAILED(nsres)) { ERR("GetForm failed: %08x, nsform: %p\n", nsres, nsform); - *p = NULL; return E_FAIL; } - nsres = nsIDOMHTMLFormElement_QueryInterface(nsform, &IID_nsIDOMNode, (void**)&form_node); - nsIDOMHTMLFormElement_Release(nsform); - assert(nsres == NS_OK); - - hres = get_node(This->element.node.doc, form_node, TRUE, &node); - nsIDOMNode_Release(form_node); - if (FAILED(hres)) - return hres; - - hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); - - node_release(node); - return hres; + return return_nsform(&This->element, nsform, p); } static HRESULT WINAPI HTMLInputElement_put_size(IHTMLInputElement *iface, LONG v) @@ -1746,8 +1756,18 @@ static HRESULT WINAPI HTMLButtonElement_get_disabled(IHTMLButtonElement *iface, static HRESULT WINAPI HTMLButtonElement_get_form(IHTMLButtonElement *iface, IHTMLFormElement **p) { HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLFormElement *nsform; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLButtonElement_GetForm(This->nsbutton, &nsform); + if (NS_FAILED(nsres)) { + ERR("GetForm failed: %08x, nsform: %p\n", nsres, nsform); + return E_FAIL; + } + + return return_nsform(&This->element, nsform, p); } static HRESULT WINAPI HTMLButtonElement_createTextRange(IHTMLButtonElement *iface, IHTMLTxtRange **range) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 27af54d..e5275e8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4550,7 +4550,7 @@ static void test_select_form(IUnknown *uselect, IUnknown *uform) ok(hres == S_OK, "get_form failed: %08x\n", hres); ok(form != NULL, "form == NULL\n"); - test_form_length((IUnknown*)form, 1); + test_form_length((IUnknown*)form, 2); test_form_elements((IUnknown*)form); test_form_name((IUnknown*)form, "form_name"); @@ -6976,14 +6976,33 @@ static void _set_button_value(unsigned line, IHTMLElement *elem, const char *val _test_button_value(line, elem, value); } +#define get_button_form(a) _get_button_form(__LINE__,a) +static IHTMLFormElement *_get_button_form(unsigned line, IHTMLElement *elem) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + IHTMLFormElement *form; + HRESULT hres; + + hres = IHTMLButtonElement_get_form(button, &form); + ok_(__FILE__,line)(hres == S_OK, "get_form failed: %08x\n", hres); + IHTMLButtonElement_Release(button); + + return form; +} + static void test_button_elem(IHTMLElement *elem) { + IHTMLFormElement *form; + test_button_name(elem, NULL); set_button_name(elem, "button name"); test_button_type(elem, "submit"); test_button_value(elem, NULL); set_button_value(elem, "val"); + form = get_button_form(elem); + ok(!form, "form != NULL\n"); + test_elem_istextedit(elem, VARIANT_TRUE); } @@ -9062,10 +9081,12 @@ static void test_elems2(IHTMLDocument2 *doc) } test_elem_set_innerhtml((IUnknown*)div, - "<form id=\"form\" name=\"form_name\"><select id=\"sform\"><option id=\"oform\"></option></select></form>"); + "<form id=\"form\" name=\"form_name\"><select id=\"sform\"><option id=\"oform\"></option></select><button id=\"btnid\"></button></form>"); elem = get_elem_by_id(doc, "sform", TRUE); elem2 = get_elem_by_id(doc, "form", TRUE); if(elem && elem2) { + IHTMLFormElement *form; + test_select_form((IUnknown*)elem, (IUnknown*)elem2); IHTMLElement_Release(elem); @@ -9074,6 +9095,14 @@ static void test_elems2(IHTMLDocument2 *doc) test_option_form((IUnknown*)elem, (IUnknown*)elem2); IHTMLElement_Release(elem); } + + elem = get_elem_by_id(doc, "btnid", TRUE); + + form = get_button_form(elem); + ok(iface_cmp((IUnknown*)form, (IUnknown*)elem2), "form != elem2\n"); + IHTMLFormElement_Release(form); + + IHTMLElement_Release(elem); IHTMLElement_Release(elem2); }

1 0

Nikolay Sivov : dwrite: Don' t bother going through fallback for non-visual runs.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: bee56c33c5d08af860ed52038cd4e3705bba780f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee56c33c5d08af860ed52038… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 16 20:47:10 2016 +0300 dwrite: Don't bother going through fallback for non-visual runs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 3fcf07a..926a2cf 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -789,17 +789,48 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) /* resolve run fonts */ LIST_FOR_EACH_ENTRY(r, &layout->runs, struct layout_run, entry) { struct regular_layout_run *run = &r->u.regular; + IDWriteFont *font; UINT32 length; if (r->kind == LAYOUT_RUN_INLINE) continue; range = get_layout_range_by_pos(layout, run->descr.textPosition); + + if (run->sa.shapes == DWRITE_SCRIPT_SHAPES_NO_VISUAL) { + IDWriteFontCollection *collection; + + if (range->collection) { + collection = range->collection; + IDWriteFontCollection_AddRef(collection); + } + else + IDWriteFactory_GetSystemFontCollection((IDWriteFactory*)layout->factory, &collection, FALSE); + + hr = create_matching_font(range->collection, range->fontfamily, range->weight, + range->style, range->stretch, &font); + + IDWriteFontCollection_Release(collection); + + if (FAILED(hr)) { + WARN("%s: failed to create a font for non visual run, %s, collection %p\n", debugstr_rundescr(&run->descr), + debugstr_w(range->fontfamily), range->collection); + return hr; + } + + hr = IDWriteFont_CreateFontFace(font, &run->run.fontFace); + IDWriteFont_Release(font); + if (FAILED(hr)) + return hr; + + run->run.fontEmSize = range->fontsize; + continue; + } + length = run->descr.stringLength; while (length) { UINT32 mapped_length; - IDWriteFont *font; FLOAT scale; run = &r->u.regular;

1 0

Alexandre Julliard : gdi32: Implement ArcTo in enhanced metafiles.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: e92e5ec376e21c0c52b62ea8588b477d76b5be8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e92e5ec376e21c0c52b62ea85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 17 13:51:05 2016 +0900 gdi32: Implement ArcTo in enhanced metafiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 ++ dlls/gdi32/enhmfdrv/graphics.c | 19 +++++++++++++++++++ dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/tests/metafile.c | 16 +++++++++++----- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 8aa1b2d..aa24913 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -56,6 +56,8 @@ extern DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_H extern BOOL EMFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, + INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height, PHYSDEV devSrc, INT xSrc, INT ySrc, DWORD rop ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index b139305..6724c10 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -177,6 +177,15 @@ EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, if(bounds.top > yCentre) bounds.top = yCentre; else if(bounds.bottom < yCentre) bounds.bottom = yCentre; } + if (iType == EMR_ARCTO) + { + POINT pt; + GetCurrentPositionEx( dev->hdc, &pt ); + bounds.left = min( bounds.left, pt.x ); + bounds.top = min( bounds.top, pt.y ); + bounds.right = max( bounds.right, pt.x ); + bounds.bottom = max( bounds.bottom, pt.y ); + } if(!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; if(!physDev->path) @@ -196,6 +205,16 @@ BOOL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, } /*********************************************************************** + * EMFDRV_ArcTo + */ +BOOL EMFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, + xend, yend, EMR_ARCTO ); +} + +/*********************************************************************** * EMFDRV_Pie */ BOOL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index f618e85..4d13c2b 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -41,7 +41,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = NULL, /* pAlphaBlend */ NULL, /* pAngleArc */ EMFDRV_Arc, /* pArc */ - NULL, /* pArcTo */ + EMFDRV_ArcTo, /* pArcTo */ EMFDRV_BeginPath, /* pBeginPath */ NULL, /* pBlendImage */ EMFDRV_Chord, /* pChord */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 79f072b..4cf61a2 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3599,12 +3599,12 @@ static const unsigned char EMF_PATH_BITS[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xef, 0xff, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff, + 0xd8, 0xff, 0xff, 0xff, 0xd8, 0xff, 0xff, 0xff, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0x0c, 0x02, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, + 0x34, 0x02, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x80, 0x07, 0x00, 0x00, 0x3e, 0x04, 0x00, 0x00, + 0x20, 0x03, 0x00, 0x00, 0x58, 0x02, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x04, 0x00, @@ -3627,7 +3627,12 @@ static const unsigned char EMF_PATH_BITS[] = 0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, - 0x15, 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x37, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, + 0x17, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, + 0x1a, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, + 0x1b, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, + 0x17, 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, @@ -3689,6 +3694,7 @@ static void test_emf_GetPath(void) ok( ret, "LineTo error %d.\n", GetLastError()); Rectangle(hdcMetafile, 10, 10, 20, 20); Arc(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); + ArcTo(hdcMetafile, 23, 23, 37, 27, 37, 27, 23, 23); Chord(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); Pie(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); Ellipse(hdcMetafile, 10, 10, 20, 20); @@ -3698,7 +3704,7 @@ static void test_emf_GetPath(void) EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 77, "GetPath returned %d.\n", size); + todo_wine ok( size == 88, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Alexandre Julliard : gdi32: Implement PolylineTo in enhanced metafiles.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 91ef88a9e3272bdb2ad602c3d6c20e5808cb9da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ef88a9e3272bdb2ad602c3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 17 14:00:17 2016 +0900 gdi32: Implement PolylineTo in enhanced metafiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/graphics.c | 14 ++++++++++++-- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/tests/metafile.c | 28 +++++++++++++++++----------- 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index aa24913..f4ed165 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -98,6 +98,7 @@ extern BOOL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* cou extern BOOL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polys) DECLSPEC_HIDDEN; extern BOOL EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_Polyline( PHYSDEV dev, const POINT* pt,INT count) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_PolylineTo( PHYSDEV dev, const POINT* pt,INT count) DECLSPEC_HIDDEN; extern BOOL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 6724c10..98be711 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -389,7 +389,7 @@ EMFDRV_Polylinegon( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) return ret; } - if(iType == EMR_POLYBEZIERTO) { + if(iType == EMR_POLYBEZIERTO || iType == EMR_POLYLINETO) { POINT cur_pt; GetCurrentPositionEx( dev->hdc, &cur_pt ); @@ -467,7 +467,7 @@ EMFDRV_Polylinegon16( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) return ret; } - if(iType == EMR_POLYBEZIERTO16) { + if(iType == EMR_POLYBEZIERTO16 || iType == EMR_POLYLINETO16) { POINT cur_pt; GetCurrentPositionEx( dev->hdc, &cur_pt ); @@ -512,6 +512,16 @@ BOOL EMFDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) } /********************************************************************** + * EMFDRV_PolylineTo + */ +BOOL EMFDRV_PolylineTo( PHYSDEV dev, const POINT* pt, INT count ) +{ + if( EMFDRV_Polylinegon16( dev, pt, count, EMR_POLYLINETO16 ) ) + return TRUE; + return EMFDRV_Polylinegon( dev, pt, count, EMR_POLYLINETO ); +} + +/********************************************************************** * EMFDRV_Polygon */ BOOL EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 4d13c2b..8d6acf2 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -111,7 +111,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = EMFDRV_PolyPolyline, /* pPolyPolyline */ EMFDRV_Polygon, /* pPolygon */ EMFDRV_Polyline, /* pPolyline */ - NULL, /* pPolylineTo */ + EMFDRV_PolylineTo, /* pPolylineTo */ NULL, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 4cf61a2..f90a747 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3601,7 +3601,7 @@ static const unsigned char EMF_PATH_BITS[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xff, 0xff, 0xff, 0xd8, 0xff, 0xff, 0xff, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0x34, 0x02, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, + 0x60, 0x02, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x03, 0x00, 0x00, 0x58, 0x02, 0x00, 0x00, @@ -3655,17 +3655,22 @@ static const unsigned char EMF_PATH_BITS[] = 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00, - 0x5a, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, + 0x59, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x0a, 0x00, - 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00, - 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, - 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00 + 0x04, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, + 0x14, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, + 0x14, 0x00, 0x14, 0x00, 0x5a, 0x00, 0x00, 0x00, + 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, + 0x14, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, + 0x14, 0x00, 0x14, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 }; static void test_emf_GetPath(void) @@ -3700,11 +3705,12 @@ static void test_emf_GetPath(void) Ellipse(hdcMetafile, 10, 10, 20, 20); RoundRect(hdcMetafile, 10, 10, 20, 20, 3, 5); Polyline(hdcMetafile, pts, 4); + PolylineTo(hdcMetafile, pts, 4); PolyPolyline(hdcMetafile, pts, counts, 2); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 88, "GetPath returned %d.\n", size); + todo_wine ok( size == 93, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Alexandre Julliard : gdi32: Add a few helper functions to manipulate point arrays in enhanced metafiles.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 1f004c42bf53db4cb7c6369332f0f7471b0d7e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f004c42bf53db4cb7c636933… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 17 15:08:22 2016 +0900 gdi32: Add a few helper functions to manipulate point arrays in enhanced metafiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 245 +++++++++++++---------------------------- 1 file changed, 79 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f004c42bf53db4cb7c63…

1 0

Alexandre Julliard : gdi32: Implement PolyDraw in enhanced metafiles.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: b06e6147d1ba42e164cc183c8ebdf1c3987363a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06e6147d1ba42e164cc183c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 17 15:08:57 2016 +0900 gdi32: Implement PolyDraw in enhanced metafiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/graphics.c | 37 ++++++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/tests/metafile.c | 27 +++++++++++++++++++------- 4 files changed, 59 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index f4ed165..c7e4489 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -94,6 +94,7 @@ extern BOOL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT botto INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polys) DECLSPEC_HIDDEN; extern BOOL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polys) DECLSPEC_HIDDEN; extern BOOL EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 7c0aadb..80cca1f 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -576,6 +576,43 @@ BOOL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT p /********************************************************************** + * EMFDRV_PolyDraw + */ +BOOL EMFDRV_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, DWORD count ) +{ + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; + EMRPOLYDRAW *emr; + BOOL ret; + BYTE *types_dest; + BOOL use_small_emr = can_use_short_points( pts, count ); + DWORD size; + + size = use_small_emr ? offsetof( EMRPOLYDRAW16, apts[count] ) : offsetof( EMRPOLYDRAW, aptl[count] ); + size += (count + 3) & ~3; + + if (!(emr = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; + + emr->emr.iType = use_small_emr ? EMR_POLYDRAW16 : EMR_POLYDRAW; + emr->emr.nSize = size; + emr->cptl = count; + + types_dest = store_points( emr->aptl, pts, count, use_small_emr ); + memcpy( types_dest, types, count ); + if (count & 3) memset( types_dest + count, 0, 4 - (count & 3) ); + + if (!physDev->path) + get_points_bounds( &emr->rclBounds, pts, count, 0 ); + else + emr->rclBounds = empty_bounds; + + ret = EMFDRV_WriteRecord( dev, &emr->emr ); + if (ret && !physDev->path) EMFDRV_UpdateBBox( dev, &emr->rclBounds ); + HeapFree( GetProcessHeap(), 0, emr ); + return ret; +} + + +/********************************************************************** * EMFDRV_ExtFloodFill */ BOOL EMFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 8d6acf2..1678f41 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -106,7 +106,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = EMFDRV_Pie, /* pPie */ EMFDRV_PolyBezier, /* pPolyBezier */ EMFDRV_PolyBezierTo, /* pPolyBezierTo */ - NULL, /* pPolyDraw */ + EMFDRV_PolyDraw, /* pPolyDraw */ EMFDRV_PolyPolygon, /* pPolyPolygon */ EMFDRV_PolyPolyline, /* pPolyPolyline */ EMFDRV_Polygon, /* pPolygon */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index f90a747..2ad7206 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3601,7 +3601,7 @@ static const unsigned char EMF_PATH_BITS[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xff, 0xff, 0xff, 0xd8, 0xff, 0xff, 0xff, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0x60, 0x02, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, + 0xac, 0x02, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x03, 0x00, 0x00, 0x58, 0x02, 0x00, 0x00, @@ -3667,16 +3667,28 @@ static const unsigned char EMF_PATH_BITS[] = 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, - 0x14, 0x00, 0x14, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + 0x14, 0x00, 0x14, 0x00, 0x5c, 0x00, 0x00, 0x00, + 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x09, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x0a, 0x00, + 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00, + 0x1e, 0x00, 0x1e, 0x00, 0x28, 0x00, 0x14, 0x00, + 0x14, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x14, 0x00, + 0x14, 0x00, 0x0a, 0x00, 0x06, 0x02, 0x04, 0x04, + 0x04, 0x02, 0x03, 0x06, 0x02, 0x00, 0x00, 0x00, + 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 }; static void test_emf_GetPath(void) { - POINT pts[4] = {{10, 10}, {20, 10}, {10, 20}, {20, 20}}; + POINT pts[9] = {{10, 10}, {20, 10}, {10, 20}, {20, 20}, {30, 30}, {40, 20}, {20, 30}, {20, 20}, {20, 10}}; DWORD counts[2] = {2, 2}; + BYTE types[9] = { PT_MOVETO, PT_LINETO, PT_BEZIERTO, PT_BEZIERTO, PT_BEZIERTO, PT_LINETO, + PT_LINETO | PT_CLOSEFIGURE, PT_MOVETO, PT_LINETO }; HDC hdcMetafile; HENHMETAFILE hemf; BOOL ret; @@ -3707,10 +3719,11 @@ static void test_emf_GetPath(void) Polyline(hdcMetafile, pts, 4); PolylineTo(hdcMetafile, pts, 4); PolyPolyline(hdcMetafile, pts, counts, 2); + PolyDraw(hdcMetafile, pts, types, 9); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 93, "GetPath returned %d.\n", size); + todo_wine ok( size == 102, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0