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

Jacek Caban : mshtml: Rename init_dispex_with_compat_mode to init_dispatch.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 5590ea4a6e26aba1c6ec0fdb8f3b74ad6c14ca7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5590ea4a6e26aba1c6ec0fdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:57:45 2021 +0100 mshtml: Rename init_dispex_with_compat_mode to init_dispatch. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/htmlattr.c | 4 ++-- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 14 +++++++------- dlls/mshtml/htmlelemcol.c | 4 ++-- dlls/mshtml/htmlevent.c | 6 +++--- dlls/mshtml/htmlimg.c | 4 ++-- dlls/mshtml/htmllocation.c | 4 ++-- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmlstorage.c | 2 +- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmlstylesheet.c | 16 ++++++++-------- dlls/mshtml/mshtml_private.h | 7 +------ dlls/mshtml/omnavigator.c | 36 ++++++++++++++++++------------------ dlls/mshtml/range.c | 4 ++-- dlls/mshtml/selection.c | 4 ++-- dlls/mshtml/xmlhttprequest.c | 4 ++-- 18 files changed, 61 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5590ea4a6e26aba1c6ec…

1 0

Rémi Bernon : ntdll: Don't call possibly deadly DbgUiGetThreadDebugObject.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 4d5824112e13160e538013a25f1c13a124565180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d5824112e13160e538013a2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 16 20:28:09 2021 +0100 ntdll: Don't call possibly deadly DbgUiGetThreadDebugObject. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 83ae707ba3f..04bcdb18a2b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3215,7 +3215,8 @@ void WINAPI LdrShutdownThread(void) RtlReleasePebLock(); RtlLeaveCriticalSection( &loader_section ); - if (DbgUiGetThreadDebugObject()) NtClose( DbgUiGetThreadDebugObject() ); + /* don't call DbgUiGetThreadDebugObject as some apps hook it and terminate if called */ + if (NtCurrentTeb()->DbgSsReserved[1]) NtClose( NtCurrentTeb()->DbgSsReserved[1] ); RtlFreeThreadActivationContextStack(); }

1 0

Henri Verbeet : d3d11: Store the feature level in the d3d_device_context_state structure.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 7894edc48a1ad09e1945586a5d5be4ac5a3e3b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7894edc48a1ad09e1945586a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 17:13:27 2021 +0100 d3d11: Store the feature level in the d3d_device_context_state structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 36 ++++++++++++++++++++---------------- dlls/d3d11/shader.c | 8 ++++---- dlls/d3d11/texture.c | 2 +- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index b33be57d439..09d495c3f61 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -443,7 +443,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev buffer->refcount = 1; buffer->desc = *desc; - if (!validate_buffer_desc(&buffer->desc, device->feature_level)) + if (!validate_buffer_desc(&buffer->desc, device->state->feature_level)) return E_INVALIDARG; wined3d_desc.byte_width = buffer->desc.ByteWidth; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 5a812e1b254..7f050f5af6f 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -529,6 +529,7 @@ struct d3d_device_context_state LONG refcount, private_refcount; struct wined3d_private_store private_store; + D3D_FEATURE_LEVEL feature_level; GUID emulated_interface; struct d3d_device_context_state_entry *entries; @@ -562,7 +563,6 @@ struct d3d_device IUnknown *outer_unk; LONG refcount; - D3D_FEATURE_LEVEL feature_level; BOOL d3d11_only; struct d3d_device_context_state *state; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 005698b2b6c..d2a3931b724 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -62,6 +62,11 @@ static inline BOOL d3d_device_is_d3d10_active(struct d3d_device *device) || IsEqualGUID(&device->state->emulated_interface, &IID_ID3D10Device1); } +static D3D_FEATURE_LEVEL d3d_feature_level_from_wined3d(enum wined3d_feature_level level) +{ + return (D3D_FEATURE_LEVEL)level; +} + /* ID3DDeviceContextState methods */ static inline struct d3d_device_context_state *impl_from_ID3DDeviceContextState(ID3DDeviceContextState *iface) @@ -296,7 +301,7 @@ static struct wined3d_state *d3d_device_context_state_get_wined3d_state(struct d return entry->wined3d_state; if (FAILED(wined3d_state_create(device->wined3d_device, - (enum wined3d_feature_level *)&device->feature_level, 1, &wined3d_state))) + (enum wined3d_feature_level *)&state->feature_level, 1, &wined3d_state))) return NULL; if (!d3d_device_context_state_add_entry(state, device, wined3d_state)) @@ -308,14 +313,15 @@ static struct wined3d_state *d3d_device_context_state_get_wined3d_state(struct d return wined3d_state; } -static void d3d_device_context_state_init(struct d3d_device_context_state *state, struct d3d_device *device, - REFIID emulated_interface) +static void d3d_device_context_state_init(struct d3d_device_context_state *state, + struct d3d_device *device, D3D_FEATURE_LEVEL feature_level, REFIID emulated_interface) { state->ID3DDeviceContextState_iface.lpVtbl = &d3d_device_context_state_vtbl; state->refcount = state->private_refcount = 0; wined3d_private_store_init(&state->private_store); + state->feature_level = feature_level; state->emulated_interface = *emulated_interface; wined3d_device_incref(state->wined3d_device = device->wined3d_device); state->device = &device->ID3D11Device2_iface; @@ -3651,7 +3657,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * *format_support = 0; wined3d_mutex_lock(); - feature_level = device->feature_level; + feature_level = device->state->feature_level; wined3d = wined3d_device_get_wined3d(device->wined3d_device); wined3d_device_get_creation_parameters(device->wined3d_device, &params); wined3d_adapter = wined3d_get_adapter(wined3d, params.adapter_idx); @@ -3984,7 +3990,7 @@ static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11De TRACE("iface %p.\n", iface); - return device->feature_level; + return device->state->feature_level; } static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device2 *iface) @@ -4067,6 +4073,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev { struct d3d_device *device = impl_from_ID3D11Device2(iface); struct d3d_device_context_state *state_impl; + D3D_FEATURE_LEVEL feature_level; HRESULT hr = E_INVALIDARG; FIXME("iface %p, flags %#x, feature_levels %p, feature_level_count %u, sdk_version %u, " @@ -4088,7 +4095,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev goto fail; } - d3d_device_context_state_init(state_impl, device, emulated_interface); + feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level( + wined3d_device_get_state(device->wined3d_device))); + d3d_device_context_state_init(state_impl, device, feature_level, emulated_interface); *state = &state_impl->ID3DDeviceContextState_iface; } @@ -6218,7 +6227,7 @@ static D3D10_FEATURE_LEVEL1 STDMETHODCALLTYPE d3d10_device_GetFeatureLevel(ID3D1 TRACE("iface %p.\n", iface); - return d3d10_feature_level1_from_d3d_feature_level(device->feature_level); + return d3d10_feature_level1_from_d3d_feature_level(device->state->feature_level); } static const struct ID3D10Device1Vtbl d3d10_device1_vtbl = @@ -6457,16 +6466,12 @@ static inline struct d3d_device *device_from_wined3d_device_parent(struct wined3 return CONTAINING_RECORD(device_parent, struct d3d_device, device_parent); } -static D3D_FEATURE_LEVEL d3d_feature_level_from_wined3d(enum wined3d_feature_level level) -{ - return (D3D_FEATURE_LEVEL)level; -} - static void CDECL device_parent_wined3d_device_created(struct wined3d_device_parent *device_parent, struct wined3d_device *wined3d_device) { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); struct wined3d_state *wined3d_state; + D3D_FEATURE_LEVEL feature_level; ID3DDeviceContextState *state; HRESULT hr; @@ -6477,11 +6482,10 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par device->immediate_context.wined3d_context = wined3d_device_get_immediate_context(wined3d_device); wined3d_state = wined3d_device_get_state(device->wined3d_device); - device->feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); + feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); - if (FAILED(hr = d3d11_device_CreateDeviceContextState(&device->ID3D11Device2_iface, 0, &device->feature_level, - 1, D3D11_SDK_VERSION, device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1, NULL, - &state))) + if (FAILED(hr = d3d11_device_CreateDeviceContextState(&device->ID3D11Device2_iface, 0, &feature_level, 1, + D3D11_SDK_VERSION, device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1, NULL, &state))) { ERR("Failed to create the initial device context state, hr %#x.\n", hr); return; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index d51d8e4e60b..0d19b74ff0b 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1120,24 +1120,24 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, WARN("Invalid rasterizer stream %u.\n", rasterizer_stream); return E_INVALIDARG; } - if (device->feature_level < D3D_FEATURE_LEVEL_11_0) + if (device->state->feature_level < D3D_FEATURE_LEVEL_11_0) { if (rasterizer_stream) { WARN("Invalid rasterizer stream %u for feature level %#x.\n", - rasterizer_stream, device->feature_level); + rasterizer_stream, device->state->feature_level); return E_INVALIDARG; } if (buffer_stride_count && buffer_stride_count != 1) { WARN("Invalid buffer stride count %u for feature level %#x.\n", - buffer_stride_count, device->feature_level); + buffer_stride_count, device->state->feature_level); return E_INVALIDARG; } } if (FAILED(hr = validate_stream_output_entries(so_entries, so_entry_count, - buffer_strides, buffer_stride_count, device->feature_level))) + buffer_strides, buffer_stride_count, device->state->feature_level))) return hr; desc.byte_code = byte_code; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 1682aa05d99..061bbb09795 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -987,7 +987,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE DWORD flags = 0; HRESULT hr; - if (!validate_texture2d_desc(desc, device->feature_level)) + if (!validate_texture2d_desc(desc, device->state->feature_level)) { WARN("Failed to validate texture desc.\n"); return E_INVALIDARG;

1 0

Henri Verbeet : d3d11: Use the supplied feature levels in d3d11_device_CreateDeviceContextState().
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 071d5597c46749c2934f8996905e807ec8faebc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=071d5597c46749c2934f8996… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 17:13:28 2021 +0100 d3d11: Use the supplied feature levels in d3d11_device_CreateDeviceContextState(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 76 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 26 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d2a3931b724..63d1e9dfb8c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4073,39 +4073,62 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev { struct d3d_device *device = impl_from_ID3D11Device2(iface); struct d3d_device_context_state *state_impl; + struct wined3d_state *wined3d_state; D3D_FEATURE_LEVEL feature_level; HRESULT hr = E_INVALIDARG; - FIXME("iface %p, flags %#x, feature_levels %p, feature_level_count %u, sdk_version %u, " - "emulated_interface %s, chosen_feature_level %p, state %p semi-stub!\n", - iface, flags, feature_levels, feature_level_count, sdk_version, - debugstr_guid(emulated_interface), chosen_feature_level, state); + TRACE("iface %p, flags %#x, feature_levels %p, feature_level_count %u, " + "sdk_version %u, emulated_interface %s, chosen_feature_level %p, state %p.\n", + iface, flags, feature_levels, feature_level_count, + sdk_version, debugstr_guid(emulated_interface), chosen_feature_level, state); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + wined3d_mutex_lock(); if (!feature_level_count) goto fail; + if (FAILED(hr = wined3d_state_create(device->wined3d_device, + (const enum wined3d_feature_level *)feature_levels, feature_level_count, &wined3d_state))) + goto fail; + feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); + if (chosen_feature_level) - FIXME("Device context state feature level not implemented yet.\n"); + *chosen_feature_level = feature_level; - if (state) + if (!state) { - if (!(state_impl = heap_alloc_zero(sizeof(*state_impl)))) - { - hr = E_OUTOFMEMORY; - goto fail; - } + wined3d_state_destroy(wined3d_state); + wined3d_mutex_unlock(); + return S_FALSE; + } - feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level( - wined3d_device_get_state(device->wined3d_device))); - d3d_device_context_state_init(state_impl, device, feature_level, emulated_interface); - *state = &state_impl->ID3DDeviceContextState_iface; + if (!(state_impl = heap_alloc_zero(sizeof(*state_impl)))) + { + wined3d_state_destroy(wined3d_state); + hr = E_OUTOFMEMORY; + goto fail; + } + + d3d_device_context_state_init(state_impl, device, feature_level, emulated_interface); + if (!d3d_device_context_state_add_entry(state_impl, device, wined3d_state)) + { + wined3d_state_destroy(wined3d_state); + ID3DDeviceContextState_Release(&state_impl->ID3DDeviceContextState_iface); + hr = E_FAIL; + goto fail; } + *state = &state_impl->ID3DDeviceContextState_iface; device->d3d11_only = FALSE; - if (chosen_feature_level) *chosen_feature_level = ID3D11Device2_GetFeatureLevel(iface); - return state ? S_OK : S_FALSE; + wined3d_mutex_unlock(); + + return S_OK; fail: + wined3d_mutex_unlock(); if (chosen_feature_level) *chosen_feature_level = 0; if (state) @@ -6470,10 +6493,9 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par struct wined3d_device *wined3d_device) { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); + struct d3d_device_context_state *state; struct wined3d_state *wined3d_state; D3D_FEATURE_LEVEL feature_level; - ID3DDeviceContextState *state; - HRESULT hr; TRACE("device_parent %p, wined3d_device %p.\n", device_parent, wined3d_device); @@ -6484,19 +6506,21 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par wined3d_state = wined3d_device_get_state(device->wined3d_device); feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); - if (FAILED(hr = d3d11_device_CreateDeviceContextState(&device->ID3D11Device2_iface, 0, &feature_level, 1, - D3D11_SDK_VERSION, device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1, NULL, &state))) + if (!(state = heap_alloc_zero(sizeof(*state)))) { - ERR("Failed to create the initial device context state, hr %#x.\n", hr); + ERR("Failed to create the initial device context state.\n"); return; } - device->state = impl_from_ID3DDeviceContextState(state); - if (!d3d_device_context_state_add_entry(device->state, device, wined3d_state)) + d3d_device_context_state_init(state, device, feature_level, + device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1); + + device->state = state; + if (!d3d_device_context_state_add_entry(state, device, wined3d_state)) ERR("Failed to add entry for wined3d state %p, device %p.\n", wined3d_state, device); - d3d_device_context_state_private_addref(device->state); - ID3DDeviceContextState_Release(state); + d3d_device_context_state_private_addref(state); + ID3DDeviceContextState_Release(&state->ID3DDeviceContextState_iface); } static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent)

1 0

Jacek Caban : mshtml: Initialize HTMLDOMChildrenCollection object with compat mode.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: fe5860e42b13181b1ec7a3b664c0498da028ae93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe5860e42b13181b1ec7a3b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:57:08 2021 +0100 mshtml: Initialize HTMLDOMChildrenCollection 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 | 14 +++++++------- dlls/mshtml/htmlelem.c | 14 +++++++------- dlls/mshtml/htmlnode.c | 38 +++++++++++++++++++------------------- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6eb6fcc1f49..27ff9c00349 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4349,21 +4349,21 @@ static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface HTMLDocument *This = impl_from_IDocumentSelector(iface); nsIDOMNodeList *node_list; nsAString nsstr; - nsresult nsres; + HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); nsAString_InitDepend(&nsstr, v); - nsres = nsIDOMHTMLDocument_QuerySelectorAll(This->doc_node->nsdoc, &nsstr, &node_list); + hres = map_nsresult(nsIDOMHTMLDocument_QuerySelectorAll(This->doc_node->nsdoc, &nsstr, &node_list)); nsAString_Finish(&nsstr); - if(NS_FAILED(nsres)) { - ERR("QuerySelectorAll failed: %08x\n", nsres); - return E_FAIL; + if(FAILED(hres)) { + ERR("QuerySelectorAll failed: %08x\n", hres); + return hres; } - *pel = create_child_collection(node_list); + hres = create_child_collection(node_list, dispex_compat_mode(&This->doc_node->node.event_target.dispex), pel); nsIDOMNodeList_Release(node_list); - return *pel ? S_OK : E_OUTOFMEMORY; + return hres; } static const IDocumentSelectorVtbl DocumentSelectorVtbl = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 04e59eafdae..8e79da70571 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5740,7 +5740,7 @@ static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, HTMLElement *This = impl_from_IElementSelector(iface); nsIDOMNodeList *node_list; nsAString nsstr; - nsresult nsres; + HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); @@ -5750,16 +5750,16 @@ static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, } nsAString_InitDepend(&nsstr, v); - nsres = nsIDOMElement_QuerySelectorAll(This->dom_element, &nsstr, &node_list); + hres = map_nsresult(nsIDOMElement_QuerySelectorAll(This->dom_element, &nsstr, &node_list)); nsAString_Finish(&nsstr); - if(NS_FAILED(nsres)) { - ERR("QuerySelectorAll failed: %08x\n", nsres); - return E_FAIL; + if(FAILED(hres)) { + ERR("QuerySelectorAll failed: %08x\n", hres); + return hres; } - *pel = create_child_collection(node_list); + hres = create_child_collection(node_list, dispex_compat_mode(&This->node.event_target.dispex), pel); nsIDOMNodeList_Release(node_list); - return *pel ? S_OK : E_OUTOFMEMORY; + return hres; } static const IElementSelectorVtbl ElementSelectorVtbl = { diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index b2d35f46601..89160aaa0b1 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -436,24 +436,24 @@ static dispex_static_data_t HTMLDOMChildrenCollection_dispex = { HTMLDOMNode_init_dispex_info }; -IHTMLDOMChildrenCollection *create_child_collection(nsIDOMNodeList *nslist) +HRESULT create_child_collection(nsIDOMNodeList *nslist, compat_mode_t compat_mode, IHTMLDOMChildrenCollection **ret) { - HTMLDOMChildrenCollection *ret; + HTMLDOMChildrenCollection *collection; - ret = heap_alloc_zero(sizeof(*ret)); - if(!ret) - return NULL; + if(!(collection = heap_alloc_zero(sizeof(*collection)))) + return E_OUTOFMEMORY; - ret->IHTMLDOMChildrenCollection_iface.lpVtbl = &HTMLDOMChildrenCollectionVtbl; - ret->ref = 1; + collection->IHTMLDOMChildrenCollection_iface.lpVtbl = &HTMLDOMChildrenCollectionVtbl; + collection->ref = 1; nsIDOMNodeList_AddRef(nslist); - ret->nslist = nslist; + collection->nslist = nslist; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMChildrenCollection_iface, - &HTMLDOMChildrenCollection_dispex); + init_dispex_with_compat_mode(&collection->dispex, (IUnknown*)&collection->IHTMLDOMChildrenCollection_iface, + &HTMLDOMChildrenCollection_dispex, compat_mode); - return &ret->IHTMLDOMChildrenCollection_iface; + *ret = &collection->IHTMLDOMChildrenCollection_iface; + return S_OK; } static inline HTMLDOMNode *impl_from_IHTMLDOMNode(IHTMLDOMNode *iface) @@ -611,20 +611,20 @@ static HRESULT WINAPI HTMLDOMNode_get_childNodes(IHTMLDOMNode *iface, IDispatch { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); nsIDOMNodeList *nslist; - nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMNode_GetChildNodes(This->nsnode, &nslist); - if(NS_FAILED(nsres)) { - ERR("GetChildNodes failed: %08x\n", nsres); - return E_FAIL; + hres = map_nsresult(nsIDOMNode_GetChildNodes(This->nsnode, &nslist)); + if(FAILED(hres)) { + ERR("GetChildNodes failed: %08x\n", hres); + return hres; } - *p = (IDispatch*)create_child_collection(nslist); + hres = create_child_collection(nslist, dispex_compat_mode(&This->event_target.dispex), + (IHTMLDOMChildrenCollection**)p); nsIDOMNodeList_Release(nslist); - - return *p ? S_OK : E_OUTOFMEMORY; + return hres; } static HRESULT WINAPI HTMLDOMNode_get_attributes(IHTMLDOMNode *iface, IDispatch **p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c58a6a563df..5e52eb3d7ad 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1143,7 +1143,7 @@ HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_nodelist(nsIDOMNodeList*,compat_mode_t) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(nsIDOMHTMLCollection*,compat_mode_t) DECLSPEC_HIDDEN; -IHTMLDOMChildrenCollection *create_child_collection(nsIDOMNodeList*) DECLSPEC_HIDDEN; +HRESULT create_child_collection(nsIDOMNodeList*,compat_mode_t,IHTMLDOMChildrenCollection**) DECLSPEC_HIDDEN; HRESULT attr_value_to_string(VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,VARIANT*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Initialize HTMLFiltersCollection object with compat mode.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 51479d560ca53856f8b20dcb334ea61161fafdb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51479d560ca53856f8b20dcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:57:17 2021 +0100 mshtml: Initialize HTMLFiltersCollection 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 | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8e79da70571..8d2d8626047 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -230,7 +230,7 @@ static inline HTMLFiltersCollection *impl_from_IHTMLFiltersCollection(IHTMLFilte return CONTAINING_RECORD(iface, HTMLFiltersCollection, IHTMLFiltersCollection_iface); } -static IHTMLFiltersCollection *HTMLFiltersCollection_Create(void); +static HRESULT create_filters_collection(compat_mode_t compat_mode, IHTMLFiltersCollection **ret); static inline HTMLElement *impl_from_IHTMLElement(IHTMLElement *iface) { @@ -2011,18 +2011,16 @@ static HRESULT WINAPI HTMLElement_click(IHTMLElement *iface) return S_OK; } -static HRESULT WINAPI HTMLElement_get_filters(IHTMLElement *iface, - IHTMLFiltersCollection **p) +static HRESULT WINAPI HTMLElement_get_filters(IHTMLElement *iface, IHTMLFiltersCollection **p) { HTMLElement *This = impl_from_IHTMLElement(iface); + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - *p = HTMLFiltersCollection_Create(); - - return S_OK; + return create_filters_collection(dispex_compat_mode(&This->node.event_target.dispex), p); } static HRESULT WINAPI HTMLElement_put_ondragstart(IHTMLElement *iface, VARIANT v) @@ -6606,17 +6604,21 @@ static dispex_static_data_t HTMLFiltersCollection_dispex = { HTMLFiltersCollection_iface_tids }; -static IHTMLFiltersCollection *HTMLFiltersCollection_Create(void) +static HRESULT create_filters_collection(compat_mode_t compat_mode, IHTMLFiltersCollection **ret) { - HTMLFiltersCollection *ret = heap_alloc(sizeof(HTMLFiltersCollection)); + HTMLFiltersCollection *collection; - ret->IHTMLFiltersCollection_iface.lpVtbl = &HTMLFiltersCollectionVtbl; - ret->ref = 1; + if(!(collection = heap_alloc(sizeof(HTMLFiltersCollection)))) + return E_OUTOFMEMORY; + + collection->IHTMLFiltersCollection_iface.lpVtbl = &HTMLFiltersCollectionVtbl; + collection->ref = 1; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLFiltersCollection_iface, - &HTMLFiltersCollection_dispex); + init_dispex_with_compat_mode(&collection->dispex, (IUnknown*)&collection->IHTMLFiltersCollection_iface, + &HTMLFiltersCollection_dispex, compat_mode); - return &ret->IHTMLFiltersCollection_iface; + *ret = &collection->IHTMLFiltersCollection_iface; + return S_OK; } /* interface IHTMLAttributeCollection */

1 0

Jacek Caban : mshtml: Initialize DOMRange object with compat mode.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 9e1d876d84d9e7a84cce468c91f4fb88bfcde03f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e1d876d84d9e7a84cce468c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:56:55 2021 +0100 mshtml: Initialize DOMRange 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/mshtml_private.h | 2 +- dlls/mshtml/range.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ad326f858ee..6eb6fcc1f49 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5200,7 +5200,7 @@ static HRESULT WINAPI DocumentRange_createRange(IDocumentRange *iface, IHTMLDOMR if(NS_FAILED(nsIDOMHTMLDocument_CreateRange(This->doc_node->nsdoc, &nsrange))) return E_FAIL; - hres = HTMLDOMRange_Create(nsrange, p); + hres = create_dom_range(nsrange, dispex_compat_mode(&This->doc_node->node.event_target.dispex), p); nsIDOMRange_Release(nsrange); return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5fc049cf80f..e213cd698ba 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1022,7 +1022,7 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECL HRESULT create_style_sheet(nsIDOMStyleSheet*,compat_mode_t,IHTMLStyleSheet**) DECLSPEC_HIDDEN; HRESULT create_style_sheet_collection(nsIDOMStyleSheetList*,compat_mode_t, IHTMLStyleSheetsCollection**) DECLSPEC_HIDDEN; -HRESULT HTMLDOMRange_Create(nsIDOMRange*,IHTMLDOMRange**) DECLSPEC_HIDDEN; +HRESULT create_dom_range(nsIDOMRange*,compat_mode_t,IHTMLDOMRange**) DECLSPEC_HIDDEN; HRESULT create_markup_pointer(IMarkupPointer**) DECLSPEC_HIDDEN; void detach_document_node(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index d739c18d13e..cc9cd70cb74 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -2066,7 +2066,7 @@ static dispex_static_data_t HTMLDOMRange_dispex = { HTMLDOMRange_iface_tids }; -HRESULT HTMLDOMRange_Create(nsIDOMRange *nsrange, IHTMLDOMRange **p) +HRESULT create_dom_range(nsIDOMRange *nsrange, compat_mode_t compat_mode, IHTMLDOMRange **p) { HTMLDOMRange *ret; @@ -2074,7 +2074,7 @@ HRESULT HTMLDOMRange_Create(nsIDOMRange *nsrange, IHTMLDOMRange **p) if(!ret) return E_OUTOFMEMORY; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMRange_iface, &HTMLDOMRange_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLDOMRange_iface, &HTMLDOMRange_dispex, compat_mode); ret->IHTMLDOMRange_iface.lpVtbl = &HTMLDOMRangeVtbl; ret->ref = 1;

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_scissor_rects().
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: e00ce29a5e78eb529467001fd3ea2f64ec472aa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e00ce29a5e78eb529467001f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 16 00:42:21 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_scissor_rects(). 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 | 7 ++++--- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d7a413057c9..d8635bba8d7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1173,17 +1173,18 @@ static void wined3d_cs_exec_set_scissor_rects(struct wined3d_cs *cs, const void device_invalidate_state(cs->c.device, STATE_SCISSORRECT); } -void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) +void wined3d_device_context_emit_set_scissor_rects(struct wined3d_device_context *context, + unsigned int rect_count, const RECT *rects) { struct wined3d_cs_set_scissor_rects *op; - op = wined3d_device_context_require_space(&cs->c, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), + op = wined3d_device_context_require_space(context, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECTS; memcpy(op->rects, rects, rect_count * sizeof(*rects)); op->rect_count = rect_count; - 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_rendertarget_view(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e9afb8468d..0ba5215c076 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1858,7 +1858,7 @@ void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsig memset(state->scissor_rects, 0, sizeof(state->scissor_rects)); state->scissor_rect_count = rect_count; - wined3d_cs_emit_set_scissor_rects(device->cs, rect_count, rects); + wined3d_device_context_emit_set_scissor_rects(&device->cs->c, rect_count, rects); } void CDECL wined3d_device_get_scissor_rects(const struct wined3d_device *device, unsigned int *rect_count, RECT *rects) @@ -1977,7 +1977,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_cs_emit_set_material(device->cs, &state->material); wined3d_device_context_emit_set_viewports(context, state->viewport_count, state->viewports); - wined3d_cs_emit_set_scissor_rects(device->cs, state->scissor_rect_count, state->scissor_rects); + wined3d_device_context_emit_set_scissor_rects(context, state->scissor_rect_count, state->scissor_rects); for (i = 0; i < LIGHTMAP_SIZE; ++i) { @@ -5211,7 +5211,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); state->scissor_rect_count = 1; - wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); + wined3d_device_context_emit_set_scissor_rects(&device->cs->c, 1, state->scissor_rects); } prev = state->fb.render_targets[view_idx]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 524b6ae7ce3..4ad0c05d34a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4776,7 +4776,6 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type UINT sampler_idx, struct wined3d_sampler *sampler) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, @@ -4824,6 +4823,8 @@ void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_c struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_scissor_rects(struct wined3d_device_context *context, + unsigned int rect_count, const RECT *rects) 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; void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_viewports().
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 06d2430679f8544cdab60e1c4358b988a6bad485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06d2430679f8544cdab60e1c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 16 00:42:20 2021 -0500 d3d11: Use wined3d_device_context_set_viewports(). 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/d3d11/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 16a1027beb9..190e60be4b4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1162,7 +1162,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11DeviceContext1 *iface, UINT viewport_count, const D3D11_VIEWPORT *viewports) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_viewport wined3d_vp[WINED3D_MAX_VIEWPORTS]; unsigned int i; @@ -1182,7 +1182,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11Devic } wined3d_mutex_lock(); - wined3d_device_set_viewports(device->wined3d_device, viewport_count, wined3d_vp); + wined3d_device_context_set_viewports(context->wined3d_context, viewport_count, wined3d_vp); wined3d_mutex_unlock(); }

1 0

Rémi Bernon : include: Include x86intrin.h in msvcrt/intrin.h.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: b18a48eb703c06ea4152d797c18c66c5094ced4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b18a48eb703c06ea4152d797… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 15 16:07:38 2021 +0100 include: Include x86intrin.h in msvcrt/intrin.h. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/intrin.h | 4 ++++ include/msvcrt/stdlib.h | 8 ++++++++ tools/makedep.c | 1 + 3 files changed, 13 insertions(+) diff --git a/include/msvcrt/intrin.h b/include/msvcrt/intrin.h index 781c6fac823..8b84929bc02 100644 --- a/include/msvcrt/intrin.h +++ b/include/msvcrt/intrin.h @@ -7,6 +7,10 @@ #ifndef _INC_INTRIN #define _INC_INTRIN +#if defined(__i386__) || defined(__x86_64__) +# include <x86intrin.h> +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index ed6560bc318..287e4030669 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -164,15 +164,23 @@ _ACRTIMP char* __cdecl _itoa(int,char*,int); _ACRTIMP errno_t __cdecl _itoa_s(int,char*,size_t,int); _ACRTIMP char* __cdecl _ltoa(__msvcrt_long,char*,int); _ACRTIMP errno_t __cdecl _ltoa_s(__msvcrt_long, char*, size_t, int); +#ifndef _lrotl _ACRTIMP __msvcrt_ulong __cdecl _lrotl(__msvcrt_ulong,int); +#endif +#ifndef _lrotr _ACRTIMP __msvcrt_ulong __cdecl _lrotr(__msvcrt_ulong,int); +#endif _ACRTIMP void __cdecl _makepath(char*,const char*,const char*,const char*,const char*); _ACRTIMP int __cdecl _makepath_s(char*,size_t,const char*,const char*,const char*,const char*); _ACRTIMP size_t __cdecl _mbstrlen(const char*); _ACRTIMP _onexit_t __cdecl _onexit(_onexit_t); _ACRTIMP int __cdecl _putenv(const char*); +#ifndef _rotl _ACRTIMP unsigned int __cdecl _rotl(unsigned int,int); +#endif +#ifndef _rotr _ACRTIMP unsigned int __cdecl _rotr(unsigned int,int); +#endif _ACRTIMP void __cdecl _searchenv(const char*,const char*,char*); _ACRTIMP int __cdecl _set_error_mode(int); _ACRTIMP void __cdecl _seterrormode(int); diff --git a/tools/makedep.c b/tools/makedep.c index 913854c7f05..8245a324279 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1570,6 +1570,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if (pFile->type == INCL_SYSTEM && pFile->use_msvcrt) { if (!strcmp( pFile->name, "stdarg.h" )) return NULL; + if (!strcmp( pFile->name, "x86intrin.h" )) return NULL; fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", pFile->included_by->file->name, pFile->included_line, pFile->name ); exit(1);

1 0