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

Jacek Caban : mshtml: Initialize HTMLRectCollection object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 872ff6502d62ce9ee1b8f0d4c08a02215b0b024d URL: https://source.winehq.org/git/wine.git/?a=commit;h=872ff6502d62ce9ee1b8f0d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:06 2021 +0100 mshtml: Initialize HTMLRectCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 514212217e1..1a5ac7f5717 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2670,7 +2670,8 @@ static HRESULT WINAPI HTMLElement2_getClientRects(IHTMLElement2 *iface, IHTMLRec rects->IHTMLRectCollection_iface.lpVtbl = &HTMLRectCollectionVtbl; rects->ref = 1; rects->rect_list = rect_list; - init_dispex(&rects->dispex, (IUnknown*)&rects->IHTMLRectCollection_iface, &HTMLRectCollection_dispex); + init_dispex_with_compat_mode(&rects->dispex, (IUnknown*)&rects->IHTMLRectCollection_iface, + &HTMLRectCollection_dispex, dispex_compat_mode(&This->node.event_target.dispex)); *pRectCol = &rects->IHTMLRectCollection_iface; return S_OK;

1 0

Jacek Caban : mshtml: Initialize HTMLAttributeCollection object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 78be56291a566eaef9b5ad444d1638af29cca3bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=78be56291a566eaef9b5ad44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:12 2021 +0100 mshtml: Initialize HTMLAttributeCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1a5ac7f5717..04e59eafdae 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7196,8 +7196,8 @@ HRESULT HTMLElement_get_attr_col(HTMLDOMNode *iface, HTMLAttributeCollection **a This->attrs->elem = This; list_init(&This->attrs->attrs); - init_dispex(&This->attrs->dispex, (IUnknown*)&This->attrs->IHTMLAttributeCollection_iface, - &HTMLAttributeCollection_dispex); + init_dispex_with_compat_mode(&This->attrs->dispex, (IUnknown*)&This->attrs->IHTMLAttributeCollection_iface, + &HTMLAttributeCollection_dispex, dispex_compat_mode(&iface->event_target.dispex)); *ac = This->attrs; return S_OK;

1 0

Jacek Caban : mshtml: Initialize DOMEvent object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: c833238a21c384372e17e6dc413962e52cf0e8d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c833238a21c384372e17e6dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:19 2021 +0100 mshtml: Initialize DOMEvent object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 12 ++++++------ dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 4 ++-- dlls/mshtml/xmlhttprequest.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index da2d59bc894..9995f40a571 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2201,7 +2201,7 @@ static BOOL check_event_iface(nsIDOMEvent *event, REFIID riid) return TRUE; } -static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) +static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, eventid_t event_id) { dispex_static_data_t *dispex_data = &DOMEvent_dispex; DOMEvent *event = NULL; @@ -2266,11 +2266,11 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) else event->keyboard_event = NULL; - init_dispex(&event->dispex, (IUnknown*)&event->IDOMEvent_iface, dispex_data); + init_dispex_with_compat_mode(&event->dispex, (IUnknown*)&event->IDOMEvent_iface, dispex_data, compat_mode); return event; } -HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, DOMEvent **ret_event) +HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, compat_mode_t compat_mode, DOMEvent **ret_event) { eventid_t event_id = EVENTID_LAST; DOMEvent *event; @@ -2290,7 +2290,7 @@ HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, DOMEvent **ret_event) } nsAString_Finish(&nsstr); - event = alloc_event(nsevent, event_id); + event = alloc_event(nsevent, compat_mode, event_id); if(!event) return E_OUTOFMEMORY; @@ -2313,7 +2313,7 @@ HRESULT create_document_event_str(HTMLDocumentNode *doc, const WCHAR *type, IDOM return E_FAIL; } - event = alloc_event(nsevent, EVENTID_LAST); + event = alloc_event(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), EVENTID_LAST); nsIDOMEvent_Release(nsevent); if(!event) return E_OUTOFMEMORY; @@ -2337,7 +2337,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven return E_FAIL; } - event = alloc_event(nsevent, event_id); + event = alloc_event(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), event_id); if(!event) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 69655d2a4ee..fc581ee5398 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -110,7 +110,7 @@ void dispatch_event(EventTarget*,DOMEvent*) DECLSPEC_HIDDEN; HRESULT create_document_event(HTMLDocumentNode*,eventid_t,DOMEvent**) DECLSPEC_HIDDEN; HRESULT create_document_event_str(HTMLDocumentNode*,const WCHAR*,IDOMEvent**) DECLSPEC_HIDDEN; -HRESULT create_event_from_nsevent(nsIDOMEvent*,DOMEvent**) DECLSPEC_HIDDEN; +HRESULT create_event_from_nsevent(nsIDOMEvent*,compat_mode_t,DOMEvent**) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 750f5cfd5e0..700eee4d779 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1659,7 +1659,7 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList if(FAILED(hres)) return NS_ERROR_FAILURE; - hres = create_event_from_nsevent(aEvent, &event); + hres = create_event_from_nsevent(aEvent, dispex_compat_mode(&node->event_target.dispex), &event); if(SUCCEEDED(hres)) { dispatch_event(&node->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 21b59cf6e1d..b060ae521c5 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -270,7 +270,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event } if(doc->window) { - hres = create_event_from_nsevent(event, &load_event); + hres = create_event_from_nsevent(event, dispex_compat_mode(&doc->node.event_target.dispex), &load_event); if(SUCCEEDED(hres)) { dispatch_event(&doc->window->event_target, load_event); IDOMEvent_Release(&load_event->IDOMEvent_iface); @@ -319,7 +319,7 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * if(FAILED(hres)) return NS_OK; - hres = create_event_from_nsevent(nsevent, &event); + hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), &event); if(FAILED(hres)) { node_release(node); return NS_OK; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 8790807ce77..0ee05f04e40 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -205,7 +205,7 @@ static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *i if(!This->xhr) return NS_OK; - hres = create_event_from_nsevent(nsevent, &event); + hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&This->xhr->event_target.dispex), &event); if(SUCCEEDED(hres) ){ dispatch_event(&This->xhr->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface);

1 0

Jacek Caban : mshtml: Initialize HTMLImageElementFactory object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: f4ad57d4319e45c7305847cf5dce2f336ee58e2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ad57d4319e45c7305847cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:30 2021 +0100 mshtml: Initialize HTMLImageElementFactory object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlimg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index aa4129e760e..65fa9bbebcc 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -992,8 +992,8 @@ HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow *window, HTMLImageElement ret->ref = 1; ret->window = window; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLImageElementFactory_iface, - &HTMLImageElementFactory_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLImageElementFactory_iface, + &HTMLImageElementFactory_dispex, dispex_compat_mode(&window->event_target.dispex)); *ret_val = ret; return S_OK;

1 0

Jacek Caban : mshtml: Initialize DOMEventObj object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: e61e1968437e82fa19f821c2f6ca4b7e86d1b305 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e61e1968437e82fa19f821c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:35 2021 +0100 mshtml: Initialize DOMEventObj object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlevent.c | 12 ++++++------ dlls/mshtml/htmlevent.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 344079ba36e..4e56d548f47 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2681,7 +2681,7 @@ static HRESULT WINAPI HTMLDocument4_createEventObject(IHTMLDocument4 *iface, return E_NOTIMPL; } - return create_event_obj(ppEventObj); + return create_event_obj(dispex_compat_mode(&This->doc_node->node.event_target.dispex), ppEventObj); } static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEventName, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9995f40a571..17584669c3b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -756,7 +756,7 @@ static dispex_static_data_t HTMLEventObj_dispex = { HTMLEventObj_iface_tids }; -static HTMLEventObj *alloc_event_obj(DOMEvent *event) +static HTMLEventObj *alloc_event_obj(DOMEvent *event, compat_mode_t compat_mode) { HTMLEventObj *event_obj; @@ -770,15 +770,15 @@ static HTMLEventObj *alloc_event_obj(DOMEvent *event) if(event) IDOMEvent_AddRef(&event->IDOMEvent_iface); - init_dispex(&event_obj->dispex, (IUnknown*)&event_obj->IHTMLEventObj_iface, &HTMLEventObj_dispex); + init_dispex_with_compat_mode(&event_obj->dispex, (IUnknown*)&event_obj->IHTMLEventObj_iface, &HTMLEventObj_dispex, compat_mode); return event_obj; } -HRESULT create_event_obj(IHTMLEventObj **ret) +HRESULT create_event_obj(compat_mode_t compat_mode, IHTMLEventObj **ret) { HTMLEventObj *event_obj; - event_obj = alloc_event_obj(NULL); + event_obj = alloc_event_obj(NULL, compat_mode); if(!event_obj) return E_OUTOFMEMORY; @@ -2682,7 +2682,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, } while(iter); if(!event->event_obj && !event->no_event_obj) { - event_obj_ref = alloc_event_obj(event); + event_obj_ref = alloc_event_obj(event, dispex_compat_mode(&event->dispex)); if(event_obj_ref) event->event_obj = &event_obj_ref->IHTMLEventObj_iface; } @@ -2800,7 +2800,7 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va } if(!event_obj) { - event_obj = alloc_event_obj(NULL); + event_obj = alloc_event_obj(NULL, dispex_compat_mode(&node->event_target.dispex)); if(!event_obj) return E_OUTOFMEMORY; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index fc581ee5398..617b15b6c49 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -102,7 +102,7 @@ HRESULT fire_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HI void update_doc_cp_events(HTMLDocumentNode*,cp_static_data_t*) DECLSPEC_HIDDEN; HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; -HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; +HRESULT create_event_obj(compat_mode_t,IHTMLEventObj**) DECLSPEC_HIDDEN; void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,nsIDOMNode*,eventid_t) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Initialize HTMLLocation object with compat mode.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: d1c51350f0dbf664defe4ebb4e1b0b5d44abb586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1c51350f0dbf664defe4ebb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 11 20:40:41 2021 +0100 mshtml: Initialize HTMLLocation object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmllocation.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 4e15fb45242..9355acd2622 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -649,7 +649,8 @@ HRESULT HTMLLocation_Create(HTMLInnerWindow *window, HTMLLocation **ret) location->ref = 1; location->window = window; - init_dispex(&location->dispex, (IUnknown*)&location->IHTMLLocation_iface, &HTMLLocation_dispex); + init_dispex_with_compat_mode(&location->dispex, (IUnknown*)&location->IHTMLLocation_iface, &HTMLLocation_dispex, + dispex_compat_mode(&window->event_target.dispex)); *ret = location; return S_OK;

1 0

Gabriel Ivăncescu : jscript: Store the object prototype in the script context.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: eb43d59e8e007924f472a2382955b8df7c6e8f27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb43d59e8e007924f472a238… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Mar 11 18:01:08 2021 +0200 jscript: Store the object prototype in the script context. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/global.c | 7 +++---- dlls/jscript/jscript.c | 5 +++++ dlls/jscript/jscript.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 735e188e1bd..33869cd5fc6 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -1055,7 +1055,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) HRESULT init_global(script_ctx_t *ctx) { unsigned const_flags = ctx->version >= SCRIPTLANGUAGEVERSION_ES5 ? 0 : PROPF_WRITABLE; - jsdisp_t *math, *object_prototype, *constr; + jsdisp_t *math, *constr; HRESULT hres; if(ctx->global) @@ -1065,12 +1065,11 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = create_object_prototype(ctx, &object_prototype); + hres = create_object_prototype(ctx, &ctx->object_prototype); if(FAILED(hres)) return hres; - hres = init_constructors(ctx, object_prototype); - jsdisp_release(object_prototype); + hres = init_constructors(ctx, ctx->object_prototype); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index c5c23889f04..67a25d1714b 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -483,6 +483,11 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) This->ctx->site = NULL; } + if(This->ctx->object_prototype) { + jsdisp_release(This->ctx->object_prototype); + This->ctx->object_prototype = NULL; + } + if(This->ctx->global) { jsdisp_release(This->ctx->global); This->ctx->global = NULL; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index b590e1a7441..d7d9dd7a4e3 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -451,6 +451,7 @@ struct _script_ctx_t { jsdisp_t *uri_error_constr; jsdisp_t *number_constr; jsdisp_t *object_constr; + jsdisp_t *object_prototype; jsdisp_t *regexp_constr; jsdisp_t *string_constr; jsdisp_t *vbarray_constr;

1 0

Matteo Bruni : wined3d: Remove dead statement.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 86a06f7e9726acedd9f6e7e75e1befbdf159078f URL: https://source.winehq.org/git/wine.git/?a=commit;h=86a06f7e9726acedd9f6e7e7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 10 20:50:18 2021 +0100 wined3d: Remove dead statement. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9ea62a81d0b..8fca81ec19c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -193,7 +193,6 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf return FALSE; } - list_init(&buffer_gl->bo_user.entry); list_add_head(&buffer_gl->bo.users, &buffer_gl->bo_user.entry); buffer_gl->b.buffer_object = (uintptr_t)bo; buffer_invalidate_bo_range(&buffer_gl->b, 0, 0);

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_depth_stencil_state().
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: a3102c7b392270ecf9f05a208b3b0d1c188238f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3102c7b392270ecf9f05a20… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 10 19:25:15 2021 -0600 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_depth_stencil_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4d50ecba23b..4efbe61b3fb 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1679,17 +1679,17 @@ static void wined3d_cs_exec_set_depth_stencil_state(struct wined3d_cs *cs, const device_invalidate_state(cs->c.device, STATE_STENCIL_REF); } -void wined3d_cs_emit_set_depth_stencil_state(struct wined3d_cs *cs, +void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) { struct wined3d_cs_set_depth_stencil_state *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_DEPTH_STENCIL_STATE; op->state = state; op->stencil_ref = stencil_ref; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_rasterizer_state(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d5179f68cd6..0b24342d2f3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1774,7 +1774,7 @@ void CDECL wined3d_device_set_depth_stencil_state(struct wined3d_device *device, wined3d_depth_stencil_state_incref(depth_stencil_state); state->depth_stencil_state = depth_stencil_state; state->stencil_ref = stencil_ref; - wined3d_cs_emit_set_depth_stencil_state(device->cs, depth_stencil_state, stencil_ref); + wined3d_device_context_emit_set_depth_stencil_state(&device->cs->c, depth_stencil_state, stencil_ref); if (prev) wined3d_depth_stencil_state_decref(prev); } @@ -2027,7 +2027,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 } wined3d_device_context_emit_set_blend_state(context, state->blend_state, &state->blend_factor, state->sample_mask); - wined3d_cs_emit_set_depth_stencil_state(device->cs, state->depth_stencil_state, state->stencil_ref); + wined3d_device_context_emit_set_depth_stencil_state(context, state->depth_stencil_state, state->stencil_ref); wined3d_cs_emit_set_rasterizer_state(device->cs, state->rasterizer_state); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7dfa7d2211b..fa8a425334f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4745,8 +4745,6 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_depth_stencil_state(struct wined3d_cs *cs, - struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, @@ -4813,6 +4811,8 @@ void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context * unsigned int sample_mask) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_context *context, enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_depth_stencil_state().
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 41f521b59be289978a5b2b42338b81f666376210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41f521b59be289978a5b2b42… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 10 19:25:16 2021 -0600 wined3d: Introduce wined3d_device_context_set_depth_stencil_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 36 ++++++++++++++++++++++-------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0b24342d2f3..3864bcfbb81 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1761,22 +1761,9 @@ struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct w void CDECL wined3d_device_set_depth_stencil_state(struct wined3d_device *device, struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref) { - struct wined3d_state *state = device->cs->c.state; - struct wined3d_depth_stencil_state *prev; - TRACE("device %p, depth_stencil_state %p, stencil_ref %u.\n", device, depth_stencil_state, stencil_ref); - prev = state->depth_stencil_state; - if (prev == depth_stencil_state && state->stencil_ref == stencil_ref) - return; - - if (depth_stencil_state) - wined3d_depth_stencil_state_incref(depth_stencil_state); - state->depth_stencil_state = depth_stencil_state; - state->stencil_ref = stencil_ref; - wined3d_device_context_emit_set_depth_stencil_state(&device->cs->c, depth_stencil_state, stencil_ref); - if (prev) - wined3d_depth_stencil_state_decref(prev); + wined3d_device_context_set_depth_stencil_state(&device->cs->c, depth_stencil_state, stencil_ref); } struct wined3d_depth_stencil_state * CDECL wined3d_device_get_depth_stencil_state(const struct wined3d_device *device, @@ -2142,6 +2129,27 @@ void CDECL wined3d_device_context_set_blend_state(struct wined3d_device_context wined3d_blend_state_decref(prev); } +void CDECL wined3d_device_context_set_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref) +{ + struct wined3d_state *state = context->state; + struct wined3d_depth_stencil_state *prev; + + TRACE("context %p, depth_stencil_state %p, stencil_ref %u.\n", context, depth_stencil_state, stencil_ref); + + prev = state->depth_stencil_state; + if (prev == depth_stencil_state && state->stencil_ref == stencil_ref) + return; + + if (depth_stencil_state) + wined3d_depth_stencil_state_incref(depth_stencil_state); + state->depth_stencil_state = depth_stencil_state; + state->stencil_ref = stencil_ref; + wined3d_device_context_emit_set_depth_stencil_state(context, depth_stencil_state, stencil_ref); + if (prev) + wined3d_depth_stencil_state_decref(prev); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 17cff7ffb9f..04bb975da73 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -169,6 +169,7 @@ @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) +@ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ead427a13f6..c52f328c277 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2553,6 +2553,8 @@ void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_contex struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer); +void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref); void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader);

1 0