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

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

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

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

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: 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::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

Vincent Povirk : mscoree: Enable crash chaining in Mono.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: ccac8a455b6a3eb95cc637b3d30f320dab491249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccac8a455b6a3eb95cc637b3d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 30 12:17:34 2016 -0500 mscoree: Enable crash chaining in Mono. This allows winedbg to handle crashes and print native stack traces, after Mono has attempted to print a managed stack trace. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index ca6914e..252740d 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -100,6 +100,7 @@ MonoType* (CDECL *mono_reflection_type_from_name)(char *name, MonoImage *image); MonoObject* (CDECL *mono_runtime_invoke)(MonoMethod *method, void *obj, void **params, MonoObject **exc); void (CDECL *mono_runtime_object_init)(MonoObject *this_obj); void (CDECL *mono_runtime_quit)(void); +static void (CDECL *mono_set_crash_chaining)(BOOL chain_signals); static void (CDECL *mono_set_dirs)(const char *assembly_dir, const char *config_dir); static void (CDECL *mono_set_verbose_level)(DWORD level); MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); @@ -126,6 +127,10 @@ static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle, return mono_image_open(fname, status); } +static void CDECL set_crash_chaining_dummy(BOOL crash_chaining) +{ +} + static void CDECL set_print_handler_dummy(MonoPrintCallback callback) { } @@ -217,6 +222,7 @@ static HRESULT load_mono(LPCWSTR mono_path) } while (0); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); + LOAD_OPT_MONO_FUNCTION(mono_set_crash_chaining, set_crash_chaining_dummy); LOAD_OPT_MONO_FUNCTION(mono_trace_set_print_handler, set_print_handler_dummy); LOAD_OPT_MONO_FUNCTION(mono_trace_set_printerr_handler, set_print_handler_dummy); @@ -224,6 +230,8 @@ static HRESULT load_mono(LPCWSTR mono_path) mono_profiler_install(NULL, mono_shutdown_callback_fn); + mono_set_crash_chaining(TRUE); + mono_trace_set_print_handler(mono_print_handler_fn); mono_trace_set_printerr_handler(mono_print_handler_fn);

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in arbfp_blit_surface().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: a54c438e0d947c983f2d64bc2ad98e7d747a5bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54c438e0d947c983f2d64bc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 21:30:14 2016 +0200 wined3d: Use the texture dimension helpers in arbfp_blit_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d2c1d3d..d56123f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7903,8 +7903,8 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ * rectangle instead. */ surface_load_fb_texture(src_surface, FALSE, context); - src_rect.top = src_surface->resource.height - src_rect.top; - src_rect.bottom = src_surface->resource.height - src_rect.bottom; + src_rect.top = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - src_rect.top; + src_rect.bottom = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - src_rect.bottom; } else wined3d_texture_load(src_texture, context, FALSE);

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in context_find_fbo_entry().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 1c5d544380ab3687649ef703c0b91acc803352fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5d544380ab3687649ef703c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 21:30:15 2016 +0200 wined3d: Use the texture dimension helpers in context_find_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 124f9d9..169f460 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -480,8 +480,10 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, if (depth_stencil && render_targets[0]) { - if (depth_stencil->resource.width < render_targets[0]->resource.width || - depth_stencil->resource.height < render_targets[0]->resource.height) + if (wined3d_texture_get_level_width(depth_stencil->container, depth_stencil->texture_level) + < wined3d_texture_get_level_width(render_targets[0]->container, render_targets[0]->texture_level) + || wined3d_texture_get_level_height(depth_stencil->container, depth_stencil->texture_level) + < wined3d_texture_get_level_height(render_targets[0]->container, render_targets[0]->texture_level)) { WARN("Depth stencil is smaller than the primary color buffer, disabling\n"); depth_stencil = NULL;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in is_full_clear().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: ca26689b6e5fe3ccd720a84e0991ebd13c859946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca26689b6e5fe3ccd720a84e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 21:30:16 2016 +0200 wined3d: Use the texture dimension helpers in is_full_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a9b9f0d..033bb58 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -216,16 +216,16 @@ void device_switch_onscreen_ds(struct wined3d_device *device, static BOOL is_full_clear(const struct wined3d_surface *target, const RECT *draw_rect, const RECT *clear_rect) { + unsigned int height = wined3d_texture_get_level_height(target->container, target->texture_level); + unsigned int width = wined3d_texture_get_level_width(target->container, target->texture_level); + /* partial draw rect */ - if (draw_rect->left || draw_rect->top - || draw_rect->right < target->resource.width - || draw_rect->bottom < target->resource.height) + if (draw_rect->left || draw_rect->top || draw_rect->right < width || draw_rect->bottom < height) return FALSE; /* partial clear rect */ if (clear_rect && (clear_rect->left > 0 || clear_rect->top > 0 - || clear_rect->right < target->resource.width - || clear_rect->bottom < target->resource.height)) + || clear_rect->right < width || clear_rect->bottom < height)) return FALSE; return TRUE;

1 0