February 2018 - Wine-Commits

Nikolay Sivov : comctl32/combo: Merge theming logic.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 694602eab1dc2236dc91d93f6d7328699f0cede7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=694602eab1dc2236dc91d93f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 13 10:56:37 2018 +0300 comctl32/combo: Merge theming logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 - dlls/comctl32/combo.c | 173 +++++++++++++++++------- dlls/comctl32/theme_combo.c | 319 -------------------------------------------- dlls/comctl32/theming.c | 5 - 4 files changed, 126 insertions(+), 372 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=694602eab1dc2236dc91…

1 0

Jacek Caban : mshtml: Handle non-HTML element in IHTMLSelectElement: add implementation.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: a4ad2cf82505c1458419103b66cfd02d41f7ccf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ad2cf82505c1458419103b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:28:26 2018 +0100 mshtml: Handle non-HTML element in IHTMLSelectElement:add implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlselect.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 5a116a7..8f33941 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -425,6 +425,11 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem return E_INVALIDARG; } + if(!element_obj->html_element) { + FIXME("Not HTML element\n"); + return E_NOTIMPL; + } + nsvariant = create_nsvariant(); if(!nsvariant) return E_FAIL; @@ -444,7 +449,7 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem } if(NS_SUCCEEDED(nsres)) - nsres = nsIDOMHTMLSelectElement_Add(This->nsselect, element_obj->nselem, (nsIVariant*)nsvariant); + nsres = nsIDOMHTMLSelectElement_Add(This->nsselect, element_obj->html_element, (nsIVariant*)nsvariant); nsIWritableVariant_Release(nsvariant); if(NS_FAILED(nsres)) { ERR("Add failed: %08x\n", nsres);

1 0

Jacek Caban : mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: fba6da7982c3ef21fe6c717b9f2963829c4f9f7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fba6da7982c3ef21fe6c717b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:28:15 2018 +0100 mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 4 ++-- dlls/mshtml/htmlcurstyle.c | 2 +- dlls/mshtml/htmlelemcol.c | 6 +++--- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmloption.c | 6 +++--- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlstyle.c | 6 +++--- dlls/mshtml/script.c | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index e3a16df..61c6455 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -183,7 +183,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V TRACE("(%p)->(%p)\n", This, p); - if(!This->elem || !This->elem->nselem) { + if(!This->elem || !This->elem->dom_element) { FIXME("NULL This->elem\n"); return E_UNEXPECTED; } @@ -199,7 +199,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V /* FIXME: This is not exactly right, we have some attributes that don't map directly to Gecko attributes. */ nsAString_InitDepend(&nsname, name); - nsres = nsIDOMHTMLElement_GetAttributeNode(This->elem->nselem, &nsname, &nsattr); + nsres = nsIDOMElement_GetAttributeNode(This->elem->dom_element, &nsname, &nsattr); nsAString_Finish(&nsname); SysFreeString(name); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index a7daf4b..898fdd8 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1345,7 +1345,7 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) assert(nsres == NS_OK); nsAString_Init(&nsempty_str, NULL); - nsres = nsIDOMWindow_GetComputedStyle(nswindow, (nsIDOMElement*)elem->nselem, &nsempty_str, &nsstyle); + nsres = nsIDOMWindow_GetComputedStyle(nswindow, elem->dom_element, &nsempty_str, &nsstyle); nsAString_Finish(&nsempty_str); nsIDOMWindow_Release(nswindow); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index a851220..226cfe4 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -377,7 +377,7 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) static const PRUnichar nameW[] = {'n','a','m','e',0}; - if(!elem->nselem) + if(!elem->dom_element) return FALSE; nsAString_Init(&nsstr, NULL); @@ -507,10 +507,10 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, nsAString_Init(&tag_str, NULL); for(i=0; i<This->len; i++) { - if(!This->elems[i]->nselem) + if(!This->elems[i]->dom_element) continue; - nsIDOMHTMLElement_GetTagName(This->elems[i]->nselem, &tag_str); + nsIDOMElement_GetTagName(This->elems[i]->dom_element, &tag_str); nsAString_GetData(&tag_str, &tag); if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, tag, -1, diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 03b0aae..ad8663c 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1590,7 +1590,7 @@ static HRESULT WINAPI HTMLLabelElement_put_htmlFor(IHTMLLabelElement *iface, BST nsAString_InitDepend(&for_str, forW); nsAString_InitDepend(&val_str, v); - nsres = nsIDOMHTMLElement_SetAttribute(This->element.nselem, &for_str, &val_str); + nsres = nsIDOMElement_SetAttribute(This->element.dom_element, &for_str, &val_str); nsAString_Finish(&for_str); nsAString_Finish(&val_str); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 43661b7..8210969 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -260,11 +260,11 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR while(1) { nsIDOMNode *child; - nsres = nsIDOMHTMLElement_GetFirstChild(This->element.nselem, &child); + nsres = nsIDOMElement_GetFirstChild(This->element.dom_element, &child); if(NS_FAILED(nsres) || !child) break; - nsres = nsIDOMHTMLElement_RemoveChild(This->element.nselem, child, &tmp); + nsres = nsIDOMElement_RemoveChild(This->element.dom_element, child, &tmp); nsIDOMNode_Release(child); if(NS_SUCCEEDED(nsres)) { nsIDOMNode_Release(tmp); @@ -282,7 +282,7 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR return E_FAIL; } - nsres = nsIDOMHTMLElement_AppendChild(This->element.nselem, (nsIDOMNode*)text_node, &tmp); + nsres = nsIDOMElement_AppendChild(This->element.dom_element, (nsIDOMNode*)text_node, &tmp); if(NS_SUCCEEDED(nsres)) nsIDOMNode_Release(tmp); else diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index c755add..c449d3f 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -200,7 +200,7 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR return E_FAIL; } - nsres = nsIDOMHTMLElement_GetParentNode(This->element.nselem, &parent); + nsres = nsIDOMElement_GetParentNode(This->element.dom_element, &parent); if(NS_FAILED(nsres) || !parent) { TRACE("No parent, not executing\n"); This->parse_on_bind = TRUE; diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index fcec264..b99ea08 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -4701,12 +4701,12 @@ static HRESULT get_style_from_elem(HTMLElement *elem, nsIDOMCSSStyleDeclaration nsIDOMElementCSSInlineStyle *nselemstyle; nsresult nsres; - if(!elem->nselem) { - FIXME("NULL nselem\n"); + if(!elem->dom_element) { + FIXME("comment element\n"); return E_NOTIMPL; } - nsres = nsIDOMHTMLElement_QueryInterface(elem->nselem, &IID_nsIDOMElementCSSInlineStyle, + nsres = nsIDOMElement_QueryInterface(elem->dom_element, &IID_nsIDOMElementCSSInlineStyle, (void**)&nselemstyle); assert(nsres == NS_OK); diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 72747af..0cd3162 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -905,7 +905,7 @@ static void script_file_available(ScriptBSC *bsc) return; } - nsres = nsIDOMHTMLElement_GetParentNode(script_elem->element.nselem, &parent); + nsres = nsIDOMElement_GetParentNode(script_elem->element.dom_element, &parent); if(NS_FAILED(nsres) || !parent) { TRACE("No parent, not executing\n"); script_elem->parse_on_bind = TRUE;

1 0

Jacek Caban : mshtml: Handle non-HTML elements in HTMLElement implementation.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: a219fd31d665b28e2472c3c0d8bcc0f55b0fcbd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a219fd31d665b28e2472c3c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:27:56 2018 +0100 mshtml: Handle non-HTML elements in HTMLElement implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 133 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 95 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a219fd31d665b28e2472…

1 0

Jacek Caban : mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible in HTMLElement implementation.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 240fd267d9e139bbbd76781b96abc4d498ea6783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=240fd267d9e139bbbd76781b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:27:34 2018 +0100 mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible in HTMLElement implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 140 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 93 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=240fd267d9e139bbbd76…

1 0

Jacek Caban : mshtml: Added support for non-HTML elements.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: b947229fa92e53aa7fa2f6c9b57cdfdd868164cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b947229fa92e53aa7fa2f6c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 23:29:04 2018 +0100 mshtml: Added support for non-HTML elements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 27 ++++++++++++++------------- dlls/mshtml/mshtml_private.h | 5 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cc6f542..06e91bc 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5570,7 +5570,6 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n assert((nsIDOMNode*)html_element == This->node.nsnode); nsIDOMHTMLElement_Release(html_element); } - This->nselem = This->html_element; } ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)&This->IHTMLElement_iface, This->node.vtbl->cpc_entries); @@ -5578,24 +5577,26 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_generic, HTMLElement **ret) { - nsIDOMHTMLElement *nselem; - nsAString class_name_str; - const PRUnichar *class_name; + nsIDOMElement *nselem; + nsAString tag_name_str; + const PRUnichar *tag_name; const tag_desc_t *tag; HTMLElement *elem; nsresult nsres; HRESULT hres; - nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMHTMLElement, (void**)&nselem); - if(NS_FAILED(nsres)) + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("no nsIDOMElement iface\n"); return E_FAIL; + } - nsAString_Init(&class_name_str, NULL); - nsIDOMHTMLElement_GetTagName(nselem, &class_name_str); + nsAString_Init(&tag_name_str, NULL); + nsIDOMElement_GetTagName(nselem, &tag_name_str); - nsAString_GetData(&class_name_str, &class_name); + nsAString_GetData(&tag_name_str, &tag_name); - tag = get_tag_desc(class_name); + tag = get_tag_desc(tag_name); if(tag) { hres = tag->constructor(doc, (nsIDOMElement*)nselem, &elem); }else if(use_generic) { @@ -5611,10 +5612,10 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g } } - TRACE("%s ret %p\n", debugstr_w(class_name), elem); + TRACE("%s ret %p\n", debugstr_w(tag_name), elem); - nsIDOMHTMLElement_Release(nselem); - nsAString_Finish(&class_name_str); + nsIDOMElement_Release(nselem); + nsAString_Finish(&tag_name_str); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a0d9221..de200cf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -779,9 +779,8 @@ typedef struct { IElementTraversal IElementTraversal_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; - nsIDOMHTMLElement *nselem; - nsIDOMElement *dom_element; - nsIDOMHTMLElement *html_element; + nsIDOMElement *dom_element; /* NULL for legacy comments represented as HTML elements */ + nsIDOMHTMLElement *html_element; /* NULL for non-HTML elements (like SVG elements) */ HTMLStyle *style; HTMLStyle *runtime_style; HTMLAttributeCollection *attrs;

1 0

Daniel Lehman : include: Add some math function declarations.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: fbfcb57c17d2a49beb9d4cf0523d01cb826cf60e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbfcb57c17d2a49beb9d4cf0… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Aug 30 13:48:42 2016 -0700 include: Add some math function declarations. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 5b42b4d..c2e61b7 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -55,6 +55,9 @@ double __cdecl asin(double); double __cdecl acos(double); double __cdecl atan(double); double __cdecl atan2(double, double); +double __cdecl asinh(double); +double __cdecl acosh(double); +double __cdecl atanh(double); double __cdecl exp(double); double __cdecl log(double); double __cdecl log10(double); @@ -107,6 +110,9 @@ float __cdecl asinf(float); float __cdecl acosf(float); float __cdecl atanf(float); float __cdecl atan2f(float, float); +float __cdecl asinhf(float); +float __cdecl acoshf(float); +float __cdecl atanhf(float); float __cdecl expf(float); float __cdecl logf(float); float __cdecl log10f(float); @@ -132,6 +138,9 @@ float __cdecl fmodf(float, float); #define acosf(x) ((float)acos((double)(x))) #define atanf(x) ((float)atan((double)(x))) #define atan2f(x,y) ((float)atan2((double)(x), (double)(y))) +#define asinhf(x) ((float)asinh((double)(x))) +#define acoshf(x) ((float)acosh((double)(x))) +#define atanhf(x) ((float)atanh((double)(x))) #define expf(x) ((float)exp((double)(x))) #define logf(x) ((float)log((double)(x))) #define log10f(x) ((float)log10((double)(x))) @@ -174,6 +183,12 @@ static const union { #define FP_SUBNORMAL -2 #define FP_ZERO 0 +short __cdecl _dclass(double); +#define isfinite(x) (_dclass((double)(x)) <= FP_ZERO) +#define isinf(x) (_dclass((double)(x)) == FP_INFINITE) +#define isnan(x) (_dclass((double)(x)) == FP_NAN) +#define isnormal(x) (_dclass((double)(x)) == FP_NORMAL) + #ifdef __cplusplus } #endif @@ -206,7 +221,7 @@ static inline double jn( int n, double x ) { return _jn( n, x ); } static inline double y0( double x ) { return _y0( x ); } static inline double y1( double x ) { return _y1( x ); } static inline double yn( int n, double x ) { return _yn( n, x ); } -static inline double cabs(struct _complex z) { return _cabs( z ); } +static inline double cabs( struct _complex z ) { return _cabs( z ); } static inline float hypotf( float x, float y ) { return _hypotf( x, y ); }

1 0

Henri Verbeet : d3d9: Set WINED3D_RESOURCE_ACCESS_MAP on buffers.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 29d824d151723c76eb381aef4e5855c6fa936c8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d824d151723c76eb381aef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 13 13:20:43 2018 +0330 d3d9: Set WINED3D_RESOURCE_ACCESS_MAP on buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 30e86f8..b6897d0 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -290,7 +290,7 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -576,7 +576,7 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Józef Kucia : wined3d: Query supported sample counts for multisample textures.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: ae5d802bda0edc9b1cc1f3410f8d376c4dd072e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae5d802bda0edc9b1cc1f341… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 12 18:46:22 2018 +0100 wined3d: Query supported sample counts for multisample textures. 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/utils.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c4d6e65..6f7740d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2805,6 +2805,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, { GLint count, multisample_types[MAX_MULTISAMPLE_TYPES]; unsigned int i, max_log2; + GLenum target; if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) { @@ -2877,17 +2878,17 @@ static void query_internal_format(struct wined3d_adapter *adapter, { if (gl_info->supported[ARB_INTERNALFORMAT_QUERY]) { + target = gl_info->supported[ARB_TEXTURE_MULTISAMPLE] ? GL_TEXTURE_2D_MULTISAMPLE : GL_RENDERBUFFER; count = 0; - GL_EXTCALL(glGetInternalformativ(GL_RENDERBUFFER, format->glInternal, + GL_EXTCALL(glGetInternalformativ(target, format->glInternal, GL_NUM_SAMPLE_COUNTS, 1, &count)); - checkGLcall("glGetInternalformativ(GL_NUM_SAMPLE_COUNTS)"); count = min(count, MAX_MULTISAMPLE_TYPES); - GL_EXTCALL(glGetInternalformativ(GL_RENDERBUFFER, format->glInternal, + GL_EXTCALL(glGetInternalformativ(target, format->glInternal, GL_SAMPLES, count, multisample_types)); - checkGLcall("glGetInternalformativ(GL_SAMPLES)"); + checkGLcall("query sample counts"); for (i = 0; i < count; ++i) { - if (multisample_types[i] > sizeof(format->multisample_types) * 8) + if (multisample_types[i] > sizeof(format->multisample_types) * CHAR_BIT) continue; format->multisample_types |= 1u << (multisample_types[i] - 1); } @@ -2895,7 +2896,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, else { max_log2 = wined3d_log2i(min(gl_info->limits.samples, - sizeof(format->multisample_types) * 8)); + sizeof(format->multisample_types) * CHAR_BIT)); for (i = 1; i <= max_log2; ++i) format->multisample_types |= 1u << ((1u << i) - 1); }

1 0

Józef Kucia : wined3d: Implement multisample resolve for typed resources.
by Alexandre Julliard Feb. 13, 2018

Feb. 13, 2018

Module: wine Branch: master Commit: 2f42f5c911a0dff865a41af4ad78d2fc5244d1ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f42f5c911a0dff865a41af4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 12 18:46:19 2018 +0100 wined3d: Implement multisample resolve for typed resources. 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/device.c | 72 +++++++++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 4 +++ 3 files changed, 62 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7881bca..3961f55 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1926,27 +1926,23 @@ void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, stru *viewport = device->state.viewport; } -static void resolve_depth_buffer(struct wined3d_state *state) +static void resolve_depth_buffer(struct wined3d_device *device) { - struct wined3d_texture *dst_texture = state->textures[0]; + const struct wined3d_state *state = &device->state; struct wined3d_rendertarget_view *src_view; - RECT src_rect, dst_rect; + struct wined3d_resource *dst_resource; + struct wined3d_texture *dst_texture; - if (!dst_texture || !(dst_texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) + if (!(dst_texture = state->textures[0])) return; - - if (!(src_view = state->fb->depth_stencil)) + dst_resource = &dst_texture->resource; + if (!(dst_resource->format_flags & WINED3DFMT_FLAG_DEPTH)) return; - if (src_view->resource->type == WINED3D_RTYPE_BUFFER) - { - FIXME("Not supported on buffer resources.\n"); + if (!(src_view = state->fb->depth_stencil)) return; - } - SetRect(&dst_rect, 0, 0, dst_texture->resource.width, dst_texture->resource.height); - SetRect(&src_rect, 0, 0, src_view->width, src_view->height); - wined3d_texture_blt(dst_texture, 0, &dst_rect, texture_from_resource(src_view->resource), - src_view->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT); + wined3d_device_resolve_sub_resource(device, dst_resource, 0, + src_view->resource, src_view->sub_resource_idx, dst_resource->format->id); } void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state) @@ -2033,7 +2029,7 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, if (state == WINED3D_RS_POINTSIZE && value == WINED3D_RESZ_CODE) { TRACE("RESZ multisampled depth buffer resolve triggered.\n"); - resolve_depth_buffer(&device->state); + resolve_depth_buffer(device); } } @@ -4305,6 +4301,52 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str wined3d_cs_emit_update_sub_resource(device->cs, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); } +void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, + struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, + struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, + enum wined3d_format_id format_id) +{ + struct wined3d_texture *dst_texture, *src_texture; + unsigned int dst_level, src_level; + RECT dst_rect, src_rect; + + TRACE("device %p, dst_resource %p, dst_sub_resource_idx %u, " + "src_resource %p, src_sub_resource_idx %u, format %s.\n", + device, dst_resource, dst_sub_resource_idx, + src_resource, src_sub_resource_idx, debug_d3dformat(format_id)); + + if (wined3d_format_is_typeless(dst_resource->format) + || wined3d_format_is_typeless(src_resource->format)) + { + FIXME("Unhandled multisample resolve, dst_format %s, src_format %s, format %s.\n", + debug_d3dformat(dst_resource->format->id), debug_d3dformat(src_resource->format->id), + debug_d3dformat(format_id)); + return; + } + if (dst_resource->type != WINED3D_RTYPE_TEXTURE_2D) + { + WARN("Invalid destination resource type %s.\n", debug_d3dresourcetype(dst_resource->type)); + return; + } + if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) + { + WARN("Invalid source resource type %s.\n", debug_d3dresourcetype(src_resource->type)); + return; + } + + dst_texture = texture_from_resource(dst_resource); + src_texture = texture_from_resource(src_resource); + + dst_level = dst_sub_resource_idx % dst_texture->level_count; + SetRect(&dst_rect, 0, 0, wined3d_texture_get_level_width(dst_texture, dst_level), + wined3d_texture_get_level_height(dst_texture, dst_level)); + src_level = src_sub_resource_idx % src_texture->level_count; + SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(src_texture, src_level), + wined3d_texture_get_level_height(src_texture, src_level)); + wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect, + src_texture, src_sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT); +} + HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view, const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7c1b5e3..035746d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -129,6 +129,7 @@ @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) @ cdecl wined3d_device_reset(ptr ptr ptr ptr long) +@ cdecl wined3d_device_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_restore_fullscreen_window(ptr ptr ptr) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_blend_state(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9d551d8..ed7445e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2342,6 +2342,10 @@ void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state); +void __cdecl wined3d_device_resolve_sub_resource(struct wined3d_device *device, + struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, + struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, + enum wined3d_format_id format_id); void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, const RECT *window_rect); void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index);

1 0