wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Austin English : setupapi: Add SetupDiSetDeviceInstallParamsW stub.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: f820c0942854c14fcd063c83225af03e73286334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f820c0942854c14fcd063c832… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 21:32:38 2015 -0600 setupapi: Add SetupDiSetDeviceInstallParamsW stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 13 +++++++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 318dcdf..2669544 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3712,6 +3712,19 @@ BOOL WINAPI SetupDiSetDeviceInstallParamsA( return TRUE; } +/*********************************************************************** + * SetupDiSetDeviceInstallParamsW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetDeviceInstallParamsW( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +{ + FIXME("(%p, %p, %p) stub\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + + return TRUE; +} + static HKEY SETUPDI_OpenDevKey(struct DeviceInfo *devInfo, REGSAM samDesired) { HKEY enumKey, key = INVALID_HANDLE_VALUE; diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 4486994..9bfaadd 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -387,7 +387,7 @@ @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) @ stdcall SetupDiSetClassInstallParamsW(ptr ptr ptr long) @ stdcall SetupDiSetDeviceInstallParamsA(ptr ptr ptr) -@ stub SetupDiSetDeviceInstallParamsW +@ stdcall SetupDiSetDeviceInstallParamsW(ptr ptr ptr) @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr ptr) @ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr ptr) @ stub SetupDiSetDriverInstallParamsA

1 0

Jacek Caban : mshtml: Added HTMLHtmlElement object implementation.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: baf9db63ed8f248c5674e408438dc6f28d70102d URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf9db63ed8f248c5674e4084… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 31 14:51:08 2016 +0200 mshtml: Added HTMLHtmlElement object implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/htmlhead.c | 184 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 11 ++- 4 files changed, 198 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ce1ed8a..ac077f7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -46,6 +46,7 @@ static const WCHAR embedW[] = {'E','M','B','E','D',0}; static const WCHAR formW[] = {'F','O','R','M',0}; static const WCHAR frameW[] = {'F','R','A','M','E',0}; static const WCHAR headW[] = {'H','E','A','D',0}; +static const WCHAR htmlW[] = {'H','T','M','L',0}; static const WCHAR iframeW[] = {'I','F','R','A','M','E',0}; static const WCHAR imgW[] = {'I','M','G',0}; static const WCHAR inputW[] = {'I','N','P','U','T',0}; @@ -81,6 +82,7 @@ static const tag_desc_t tag_descs[] = { {formW, HTMLFormElement_Create}, {frameW, HTMLFrameElement_Create}, {headW, HTMLHeadElement_Create}, + {htmlW, HTMLHtmlElement_Create}, {iframeW, HTMLIFrame_Create}, {imgW, HTMLImgElement_Create}, {inputW, HTMLInputElement_Create}, diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index e64568c..fab6fa5 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "mshtmdid.h" #include "wine/debug.h" @@ -193,6 +194,189 @@ HRESULT HTMLTitleElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem typedef struct { HTMLElement element; + IHTMLHtmlElement IHTMLHtmlElement_iface; +} HTMLHtmlElement; + +static inline HTMLHtmlElement *impl_from_IHTMLHtmlElement(IHTMLHtmlElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLHtmlElement, IHTMLHtmlElement_iface); +} + +static HRESULT WINAPI HTMLHtmlElement_QueryInterface(IHTMLHtmlElement *iface, + REFIID riid, void **ppv) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLHtmlElement_AddRef(IHTMLHtmlElement *iface) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLHtmlElement_Release(IHTMLHtmlElement *iface) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLHtmlElement_GetTypeInfoCount(IHTMLHtmlElement *iface, UINT *pctinfo) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLHtmlElement_GetTypeInfo(IHTMLHtmlElement *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, + ppTInfo); +} + +static HRESULT WINAPI HTMLHtmlElement_GetIDsOfNames(IHTMLHtmlElement *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLHtmlElement_Invoke(IHTMLHtmlElement *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLHtmlElement_put_version(IHTMLHtmlElement *iface, BSTR v) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLHtmlElement_get_version(IHTMLHtmlElement *iface, BSTR *p) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLHtmlElementVtbl HTMLHtmlElementVtbl = { + HTMLHtmlElement_QueryInterface, + HTMLHtmlElement_AddRef, + HTMLHtmlElement_Release, + HTMLHtmlElement_GetTypeInfoCount, + HTMLHtmlElement_GetTypeInfo, + HTMLHtmlElement_GetIDsOfNames, + HTMLHtmlElement_Invoke, + HTMLHtmlElement_put_version, + HTMLHtmlElement_get_version +}; + +static inline HTMLHtmlElement *HTMLHtmlElement_from_HTMLDOMNode(HTMLDOMNode *iface) +{ + return CONTAINING_RECORD(iface, HTMLHtmlElement, element.node); +} + +static HRESULT HTMLHtmlElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) +{ + HTMLHtmlElement *This = HTMLHtmlElement_from_HTMLDOMNode(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IHTMLHtmlElement, riid)) + *ppv = &This->IHTMLHtmlElement_iface; + else + return HTMLElement_QI(&This->element.node, riid, ppv); + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static void HTMLHtmlElement_destructor(HTMLDOMNode *iface) +{ + HTMLHtmlElement *This = HTMLHtmlElement_from_HTMLDOMNode(iface); + + HTMLElement_destructor(&This->element.node); +} + +static BOOL HTMLHtmlElement_is_settable(HTMLDOMNode *iface, DISPID dispid) +{ + switch(dispid) { + case DISPID_IHTMLELEMENT_OUTERTEXT: + return FALSE; + default: + return TRUE; + } +} + +static const NodeImplVtbl HTMLHtmlElementImplVtbl = { + HTMLHtmlElement_QI, + HTMLHtmlElement_destructor, + HTMLElement_cpc, + HTMLElement_clone, + HTMLElement_handle_event, + HTMLElement_get_attr_col, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLHtmlElement_is_settable +}; + +static const tid_t HTMLHtmlElement_iface_tids[] = { + HTMLELEMENT_TIDS, + IHTMLHtmlElement_tid, + 0 +}; +static dispex_static_data_t HTMLHtmlElement_dispex = { + NULL, + DispHTMLHtmlElement_tid, + NULL, + HTMLHtmlElement_iface_tids +}; + +HRESULT HTMLHtmlElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) +{ + HTMLHtmlElement *ret; + + ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IHTMLHtmlElement_iface.lpVtbl = &HTMLHtmlElementVtbl; + ret->element.node.vtbl = &HTMLHtmlElementImplVtbl; + + HTMLElement_Init(&ret->element, doc, nselem, &HTMLHtmlElement_dispex); + + *elem = &ret->element; + return S_OK; +} + +typedef struct { + HTMLElement element; + IHTMLHeadElement IHTMLHeadElement_iface; } HTMLHeadElement; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index fe69487..9fe8a75 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -94,6 +94,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLGenericElement) \ XDIID(DispHTMLFrameElement) \ XDIID(DispHTMLHeadElement) \ + XDIID(DispHTMLHtmlElement) \ XDIID(DispHTMLHistory) \ XDIID(DispHTMLIFrame) \ XDIID(DispHTMLImg) \ @@ -162,6 +163,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLFrameElement3) \ XIID(IHTMLGenericElement) \ XIID(IHTMLHeadElement) \ + XIID(IHTMLHtmlElement) \ XIID(IHTMLIFrameElement) \ XIID(IHTMLIFrameElement2) \ XIID(IHTMLIFrameElement3) \ @@ -968,6 +970,7 @@ HRESULT HTMLEmbedElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement HRESULT HTMLFormElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLFrameElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLHeadElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; +HRESULT HTMLHtmlElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLIFrame_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLStyleElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLImgElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 81fbad9..9e8d8b5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -328,6 +328,13 @@ static const IID * const frame_iids[] = { NULL }; +static const IID * const html_iids[] = { + ELEM_IFACES, + &IID_IHTMLHtmlElement, + &IID_IConnectionPointContainer, + NULL +}; + static const IID * const head_iids[] = { ELEM_IFACES, &IID_IHTMLHeadElement, @@ -449,7 +456,7 @@ typedef struct { static const elem_type_info_t elem_type_infos[] = { {"", none_iids, NULL}, - {"HTML", elem_iids, NULL}, + {"HTML", html_iids, &DIID_DispHTMLHtmlElement}, {"HEAD", head_iids, &DIID_DispHTMLHeadElement}, {"TITLE", title_iids, &DIID_DispHTMLTitleElement}, {"BODY", body_iids, &DIID_DispHTMLBody}, @@ -6353,7 +6360,7 @@ static void test_doc_elem(IHTMLDocument2 *doc) test_node_name((IUnknown*)elem, "HTML"); test_elem_tag((IUnknown*)elem, "HTML"); - todo_wine test_elem_set_outertext_fail(elem); + test_elem_set_outertext_fail(elem); doc_node = get_doc_node(doc); owner_doc = get_owner_doc((IUnknown*)elem);

1 0

Jacek Caban : mshtml.idl: Added IHTMLHtmlElement declaration.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: a02edb12c3c1b297f1d5476282e4849748e71ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02edb12c3c1b297f1d547628… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 31 14:50:54 2016 +0200 mshtml.idl: Added IHTMLHtmlElement declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 3 +++ include/mshtml.idl | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 7e010c6..ac0a5e2 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2684,6 +2684,9 @@ /* IHTMLSelectElement4 */ #define DISPID_IHTMLSELECTELEMENT4_NAMEDITEM DISPID_COLLECTION+6 +/* IHTMLHtmlElement */ +#define DISPID_IHTMLHTMLELEMENT_VERSION DISPID_HEDELEMS+1 + /* IHTMLHeadElement */ #define DISPID_IHTMLHEADELEMENT_PROFILE DISPID_HEDELEMS+1 diff --git a/include/mshtml.idl b/include/mshtml.idl index 05f79ef..e068912 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -10724,6 +10724,24 @@ methods: } /***************************************************************************** + * IHTMLHtmlElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f81c-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLHtmlElement : IDispatch +{ + [propput, id(DISPID_IHTMLHTMLELEMENT_VERSION), displaybind, bindable] + HRESULT version([in] BSTR v); + + [propget, id(DISPID_IHTMLHTMLELEMENT_VERSION), displaybind, bindable] + HRESULT version([out, retval] BSTR *p); +} + +/***************************************************************************** * IHTMLHeadElement interface */ [ @@ -10856,6 +10874,26 @@ interface IHTMLMetaElement3 : IDispatch } /***************************************************************************** + * DispHTMLHtmlElement interface + */ +[ + hidden, + uuid(3050f560-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLHtmlElement +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLHTMLELEMENT_VERSION), displaybind, bindable] + void version(BSTR v); + + [propget, id(DISPID_IHTMLHTMLELEMENT_VERSION), displaybind, bindable] + BSTR version(); +} + +/***************************************************************************** * DispHTMLHeadElement interface */ [

1 0

Jacek Caban : mshtml: Added IHTMLElement::outerText tests.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: e35a84360cad8a536877352a40b4be24284d7b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35a84360cad8a536877352a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 31 14:50:42 2016 +0200 mshtml: Added IHTMLElement::outerText tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index dcff793..81fbad9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2804,6 +2804,44 @@ static void _test_elem_set_innertext(unsigned line, IHTMLElement *elem, const ch } +#define test_elem_outertext(e,t) _test_elem_outertext(__LINE__,e,t) +static void _test_elem_outertext(unsigned line, IHTMLElement *elem, const char *extext) +{ + BSTR text = NULL; + HRESULT hres; + + hres = IHTMLElement_get_outerText(elem, &text); + ok_(__FILE__,line) (hres == S_OK, "get_outerText failed: %08x\n", hres); + if(extext) + ok_(__FILE__,line) (!strcmp_wa(text, extext), "get_outerText returned %s expected %s\n", + wine_dbgstr_w(text), extext); + else + ok_(__FILE__,line) (!text, "get_outerText returned %s expected NULL\n", wine_dbgstr_w(text)); + SysFreeString(text); +} + +#define test_elem_set_outertext(e,t) _test_elem_set_outertext(__LINE__,e,t) +static void _test_elem_set_outertext(unsigned line, IHTMLElement *elem, const char *text) +{ + BSTR str = a2bstr(text); + HRESULT hres; + + hres = IHTMLElement_put_outerText(elem, str); + ok_(__FILE__,line) (hres == S_OK, "put_outerText failed: %08x\n", hres); + SysFreeString(str); +} + +#define test_elem_set_outertext_fail(a) _test_elem_set_outertext_fail(__LINE__,a) +static void _test_elem_set_outertext_fail(unsigned line, IHTMLElement *elem) +{ + BSTR str = a2bstr("test"); + HRESULT hres; + + hres = IHTMLElement_put_outerText(elem, str); + ok_(__FILE__,line) (hres == 0x800a0258, "put_outerText failed: %08x\n", hres); + SysFreeString(str); +} + #define test_elem_innerhtml(e,t) _test_elem_innerhtml(__LINE__,e,t) static void _test_elem_innerhtml(unsigned line, IUnknown *unk, const char *inner_html) { @@ -6315,6 +6353,7 @@ static void test_doc_elem(IHTMLDocument2 *doc) test_node_name((IUnknown*)elem, "HTML"); test_elem_tag((IUnknown*)elem, "HTML"); + todo_wine test_elem_set_outertext_fail(elem); doc_node = get_doc_node(doc); owner_doc = get_owner_doc((IUnknown*)elem); @@ -6727,6 +6766,8 @@ static void test_defaults(IHTMLDocument2 *doc) test_body_funs(body); IHTMLBodyElement_Release(body); + test_elem_set_outertext_fail(elem); + test_elem_istextedit(elem, VARIANT_TRUE); hres = IHTMLElement_get_style(elem, &style); @@ -8911,6 +8952,18 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); } + test_elem_set_innerhtml((IUnknown*)div, "<div id=\"elemid\">test</div>"); + elem = get_elem_by_id(doc, "elemid", TRUE); + if(elem) { + test_elem_outertext(elem, "test"); + test_elem_set_outertext(elem, "outer text"); + test_elem_outertext(elem, NULL); + test_elem_all((IUnknown*)div, NULL, 0); + elem2 = test_elem_get_parent((IUnknown*)elem); + ok(!elem2, "parent != NULL\n"); + IHTMLElement_Release(elem); + } + test_attr(doc, div); test_blocked(doc, div); test_elem_names(doc);

1 0

Jacek Caban : mshtml: Added IHTMLElement::put_outerText implementation.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 7c1fa88ced928070c09c16c00d7a9099f7a7d823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1fa88ced928070c09c16c00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 31 14:50:33 2016 +0200 mshtml: Added IHTMLElement::put_outerText implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 14 ++++++++++++- dlls/mshtml/htmlelem.c | 47 ++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 39b1faf..a04e7c3 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "mshtmdid.h" #include "wine/debug.h" @@ -838,6 +839,16 @@ static BOOL HTMLBodyElement_is_text_edit(HTMLDOMNode *iface) return TRUE; } +static BOOL HTMLBodyElement_is_settable(HTMLDOMNode *iface, DISPID dispid) +{ + switch(dispid) { + case DISPID_IHTMLELEMENT_OUTERTEXT: + return FALSE; + default: + return TRUE; + } +} + static const cpc_entry_t HTMLBodyElement_cpc[] = { {&DIID_HTMLTextContainerEvents}, {&IID_IPropertyNotifySink}, @@ -863,7 +874,8 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { NULL, HTMLBodyElement_traverse, HTMLBodyElement_unlink, - HTMLBodyElement_is_text_edit + HTMLBodyElement_is_text_edit, + HTMLBodyElement_is_settable }; static const tid_t HTMLBodyElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6d00063..ce1ed8a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1552,8 +1552,51 @@ static HRESULT WINAPI HTMLElement_get_outerHTML(IHTMLElement *iface, BSTR *p) static HRESULT WINAPI HTMLElement_put_outerText(IHTMLElement *iface, BSTR v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsIDOMText *text_node; + nsIDOMRange *range; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(This->node.vtbl->is_settable && !This->node.vtbl->is_settable(&This->node, DISPID_IHTMLELEMENT_OUTERTEXT)) { + WARN("Called on element that does not support setting the property.\n"); + return 0x800a0258; /* undocumented error code */ + } + + if(!This->node.doc->nsdoc) { + FIXME("NULL nsdoc\n"); + return E_FAIL; + } + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLDocument_CreateTextNode(This->node.doc->nsdoc, &nsstr, &text_node); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("CreateTextNode failed\n"); + return E_FAIL; + } + + nsres = nsIDOMHTMLDocument_CreateRange(This->node.doc->nsdoc, &range); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMRange_SelectNode(range, This->node.nsnode); + if(NS_SUCCEEDED(nsres)) + nsres = nsIDOMRange_DeleteContents(range); + if(NS_SUCCEEDED(nsres)) + nsres = nsIDOMRange_InsertNode(range, (nsIDOMNode*)text_node); + if(NS_SUCCEEDED(nsres)) + nsres = nsIDOMRange_SelectNodeContents(range, This->node.nsnode); + if(NS_SUCCEEDED(nsres)) + nsres = nsIDOMRange_DeleteContents(range); + nsIDOMRange_Release(range); + } + nsIDOMText_Release(text_node); + if(NS_FAILED(nsres)) { + ERR("failed to set text: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLElement_get_outerText(IHTMLElement *iface, BSTR *p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 37c33d5..fe69487 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -677,6 +677,7 @@ typedef struct { void (*traverse)(HTMLDOMNode*,nsCycleCollectionTraversalCallback*); void (*unlink)(HTMLDOMNode*); BOOL (*is_text_edit)(HTMLDOMNode*); + BOOL (*is_settable)(HTMLDOMNode*,DISPID); } NodeImplVtbl; struct HTMLDOMNode {

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_outerText implementation.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: ca3178d0c51a24456473775c05c509e97bdb229f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3178d0c51a24456473775c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 31 14:50:11 2016 +0200 mshtml: Added IHTMLElement::get_outerText implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 0329f1b..6d00063 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1559,8 +1559,11 @@ static HRESULT WINAPI HTMLElement_put_outerText(IHTMLElement *iface, BSTR v) static HRESULT WINAPI HTMLElement_get_outerText(IHTMLElement *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + /* getter is the same as innerText */ + return IHTMLElement_get_innerText(&This->IHTMLElement_iface, p); } static HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDOMNode *nsnode, HTMLDOMNode **ret_node)

1 0

Jacek Caban : mshtml: Return NULL instead of empty string in get_node_text.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 386042fbdf9fd85468634669e1e53b09f724440d URL: http://source.winehq.org/git/wine.git/?a=commit;h=386042fbdf9fd85468634669e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 31 14:50:03 2016 +0200 mshtml: Return NULL instead of empty string in get_node_text. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/txtrange.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index b8103ce..4757215 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -535,7 +535,7 @@ HRESULT get_node_text(HTMLDOMNode *node, BSTR *ret) if (!wstrbuf_init(&buf)) return E_OUTOFMEMORY; wstrbuf_append_node_rec(&buf, node->nsnode); - if(buf.buf) { + if(buf.buf && *buf.buf) { *ret = SysAllocString(buf.buf); if(!*ret) hres = E_OUTOFMEMORY;

1 0

Huw Davies : wineqtdecoder: Use thread-safe initialization.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: ea7825edfa0c863849065f6c0001ab58eee17b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7825edfa0c863849065f6c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 31 13:16:04 2016 +0100 wineqtdecoder: Use thread-safe initialization. Since commit 46d5973961fe2266074ac2855368c3fcf987c1b5 QuickTime can be called from background threads, so use the thread-safe initialization / destruction routines. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 2aafdb4..4e12242 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -250,7 +250,7 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) QTSplitter *This; static const WCHAR wcsInputPinName[] = {'I','n','p','u','t',' ','P','i','n',0}; - EnterMovies(); + EnterMoviesOnThread(0); RegisterWineDataHandler(); @@ -324,7 +324,7 @@ static void QT_Destroy(QTSplitter *This) if (This->aSession) MovieAudioExtractionEnd(This->aSession); - ExitMovies(); + ExitMoviesOnThread(); LeaveCriticalSection(&This->csReceive); if (This->loaderThread)

1 0

Józef Kucia : wined3d: Recognize SM5 vForkInstanceId register.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 49cd3aef7b98c911485f7c25337ad4c19e95ee62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49cd3aef7b98c911485f7c253… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 31 10:54:43 2016 +0200 wined3d: Recognize SM5 vForkInstanceId register. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 4 +++ dlls/wined3d/shader_sm4.c | 73 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 50 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index dbaf33f..0aa77b0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1608,6 +1608,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "u"); break; + case WINED3DSPR_FORKINSTID: + shader_addline(buffer, "vForkInstanceId"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 0e12fce..26bd353 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -78,7 +78,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_REGISTER_ORDER_MASK (0x3u << WINED3D_SM4_REGISTER_ORDER_SHIFT) #define WINED3D_SM4_REGISTER_TYPE_SHIFT 12 -#define WINED3D_SM4_REGISTER_TYPE_MASK (0xfu << WINED3D_SM4_REGISTER_TYPE_SHIFT) +#define WINED3D_SM4_REGISTER_TYPE_MASK (0xffu << WINED3D_SM4_REGISTER_TYPE_SHIFT) #define WINED3D_SM4_SWIZZLE_TYPE_SHIFT 2 #define WINED3D_SM4_SWIZZLE_TYPE_MASK (0x3u << WINED3D_SM4_SWIZZLE_TYPE_SHIFT) @@ -205,18 +205,19 @@ enum wined3d_sm4_opcode enum wined3d_sm4_register_type { - WINED3D_SM4_RT_TEMP = 0x0, - WINED3D_SM4_RT_INPUT = 0x1, - WINED3D_SM4_RT_OUTPUT = 0x2, - WINED3D_SM4_RT_IMMCONST = 0x4, - WINED3D_SM4_RT_SAMPLER = 0x6, - WINED3D_SM4_RT_RESOURCE = 0x7, - WINED3D_SM4_RT_CONSTBUFFER = 0x8, - WINED3D_SM4_RT_IMMCONSTBUFFER = 0x9, - WINED3D_SM4_RT_PRIMID = 0xb, - WINED3D_SM4_RT_DEPTHOUT = 0xc, - WINED3D_SM4_RT_NULL = 0xd, - WINED3D_SM5_RT_UAV = 0xe, + WINED3D_SM4_RT_TEMP = 0x0, + WINED3D_SM4_RT_INPUT = 0x1, + WINED3D_SM4_RT_OUTPUT = 0x2, + WINED3D_SM4_RT_IMMCONST = 0x4, + WINED3D_SM4_RT_SAMPLER = 0x6, + WINED3D_SM4_RT_RESOURCE = 0x7, + WINED3D_SM4_RT_CONSTBUFFER = 0x8, + WINED3D_SM4_RT_IMMCONSTBUFFER = 0x9, + WINED3D_SM4_RT_PRIMID = 0xb, + WINED3D_SM4_RT_DEPTHOUT = 0xc, + WINED3D_SM4_RT_NULL = 0xd, + WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, + WINED3D_SM5_RT_UAV = 0x1e, }; enum wined3d_sm4_output_primitive_type @@ -423,21 +424,37 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = static const enum wined3d_shader_register_type register_type_table[] = { - /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, - /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, - /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, - /* UNKNOWN */ 0, - /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, - /* UNKNOWN */ 0, - /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, - /* WINED3D_SM4_RT_RESOURCE */ WINED3DSPR_RESOURCE, - /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, - /* WINED3D_SM4_RT_IMMCONSTBUFFER */ WINED3DSPR_IMMCONSTBUFFER, - /* UNKNOWN */ 0, - /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, - /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, - /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, - /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, + /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, + /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, + /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, + /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, + /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, + /* WINED3D_SM4_RT_RESOURCE */ WINED3DSPR_RESOURCE, + /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, + /* WINED3D_SM4_RT_IMMCONSTBUFFER */ WINED3DSPR_IMMCONSTBUFFER, + /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, + /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, + /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* WINED3D_SM5_RT_FORK_INSTANCE_ID */ WINED3DSPR_FORKINSTID, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, }; static const enum wined3d_primitive_type output_primitive_type_table[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7502cb..b86c460 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -367,6 +367,7 @@ enum wined3d_shader_register_type WINED3DSPR_NULL, WINED3DSPR_RESOURCE, WINED3DSPR_UAV, + WINED3DSPR_FORKINSTID, }; enum wined3d_data_type

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_hs_max_tessfactor opcode.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: f21d1b19b5a10a0a1927bc79c5ef96a1d7775959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21d1b19b5a10a0a1927bc79c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 31 10:54:42 2016 +0200 wined3d: Recognize SM5 dcl_hs_max_tessfactor opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 6 ++++++ dlls/wined3d/shader_sm4.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 16 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 51c2512..1800f94 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5231,6 +5231,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_hw_nop, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ NULL, /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, + /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, /* WINED3DSIH_DCL_INPUT */ NULL, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 45e3a76..3041eef 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8125,6 +8125,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_glsl_nop, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop, /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, + /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b5a3e84..dbaf33f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -57,6 +57,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_CONSTANT_BUFFER */ "dcl_constantBuffer", /* WINED3DSIH_DCL_GLOBAL_FLAGS */ "dcl_globalFlags", /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ "dcl_hs_fork_phase_instance_count", + /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ "dcl_hs_max_tessfactor", /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ "dcl_immediateConstantBuffer", /* WINED3DSIH_DCL_INPUT */ "dcl_input", /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ "dcl_input_control_point_count", @@ -2011,6 +2012,11 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); shader_dump_global_flags(&buffer, ins.flags); } + else if (ins.handler_idx == WINED3DSIH_DCL_HS_MAX_TESSFACTOR) + { + shader_addline(&buffer, "%s %.8e", shader_opcode_names[ins.handler_idx], + ins.declaration.max_tessellation_factor); + } else if (ins.handler_idx == WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER) { shader_addline(&buffer, "%s {\n", shader_opcode_names[ins.handler_idx]); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 7804016..0e12fce 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -195,6 +195,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, + WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR = 0x98, WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, @@ -412,6 +413,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT, "", ""}, + {WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR, WINED3DSIH_DCL_HS_MAX_TESSFACTOR, "", ""}, {WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", ""}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", ""}, @@ -1009,6 +1011,10 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi if (opcode_token & WINED3D_SM4_INDEX_TYPE_MASK) ins->flags |= WINED3DSI_INDEXED_DYNAMIC; } + else if (opcode == WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR) + { + ins->declaration.max_tessellation_factor = *(float *)p++; + } else if (opcode == WINED3D_SM4_OP_DCL_SAMPLER) { ins->flags = (opcode_token & WINED3D_SM4_SAMPLER_MODE_MASK) >> WINED3D_SM4_SAMPLER_MODE_SHIFT; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b011ccf..d7502cb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -513,6 +513,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_CONSTANT_BUFFER, WINED3DSIH_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, + WINED3DSIH_DCL_HS_MAX_TESSFACTOR, WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER, WINED3DSIH_DCL_INPUT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, @@ -855,6 +856,7 @@ struct wined3d_shader_instruction UINT count; const struct wined3d_shader_immediate_constant_buffer *icb; struct wined3d_shader_structured_resource structured_resource; + float max_tessellation_factor; } declaration; };

1 0

Jump to page:

2025

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 March 2016