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

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

March 16, 2021

Module: wine Branch: master Commit: 5f9dfee9860e4eb53780ab9f06067cd33140c3fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9dfee9860e4eb53780ab9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:57:22 2021 +0100 mshtml: Initialize HTMLDocumentObj 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 27ff9c00349..e945f148ad6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5979,7 +5979,7 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii doc->basedoc.doc_obj = doc; - init_dispex(&doc->dispex, (IUnknown*)&doc->ICustomDoc_iface, &HTMLDocumentObj_dispex); + init_dispex_with_compat_mode(&doc->dispex, (IUnknown*)&doc->ICustomDoc_iface, &HTMLDocumentObj_dispex, COMPAT_MODE_QUIRKS); init_doc(&doc->basedoc, outer ? outer : &doc->IUnknown_inner, &doc->dispex.IDispatchEx_iface); TargetContainer_Init(doc); doc->is_mhtml = is_mhtml;

1 0

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

March 16, 2021

Module: wine Branch: master Commit: 013accc3db1fb1ad73a5f0934243818ee104df5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=013accc3db1fb1ad73a5f093… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:57:28 2021 +0100 mshtml: Initialize function object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 626c3671f75..44e4813b39e 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -876,7 +876,7 @@ static func_disp_t *create_func_disp(DispatchEx *obj, func_info_t *info) return NULL; ret->IUnknown_iface.lpVtbl = &FunctionUnkVtbl; - init_dispex(&ret->dispex, &ret->IUnknown_iface, &function_dispex); + init_dispex_with_compat_mode(&ret->dispex, &ret->IUnknown_iface, &function_dispex, dispex_compat_mode(obj)); ret->ref = 1; ret->obj = obj; ret->info = info;

1 0

Henri Verbeet : wined3d: Add a missing barrier to wined3d_shader_resource_view_vk_generate_mipmap().
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 8c47318081de803a443bd688091c3295f690a519 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c47318081de803a443bd688… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 17:13:25 2021 +0100 wined3d: Add a missing barrier to wined3d_shader_resource_view_vk_generate_mipmap(). Specifically, the one for using the new destination as blit target. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 74a100405aa..fec7e950a64 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1369,14 +1369,20 @@ void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resou } else { + region.srcSubresource.mipLevel = ++vk_src_range.baseMipLevel; + region.dstSubresource.mipLevel = ++vk_dst_range.baseMipLevel; + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + texture_vk->vk_image, &vk_src_range); + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + vk_access_mask_from_bind_flags(texture_vk->t.resource.bind_flags), + VK_ACCESS_TRANSFER_WRITE_BIT, + texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, texture_vk->vk_image, &vk_dst_range); - - region.srcSubresource.mipLevel = ++vk_src_range.baseMipLevel; - region.dstSubresource.mipLevel = ++vk_dst_range.baseMipLevel; } }

1 0

Henri Verbeet : wined3d: Take the layer index into account in wined3d_shader_resource_view_gl_generate_mipmap().
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 65808926600673236b222127a106b206243bff88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65808926600673236b222127… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 17:13:26 2021 +0100 wined3d: Take the layer index into account in wined3d_shader_resource_view_gl_generate_mipmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index fec7e950a64..cd13da02078 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1197,7 +1197,7 @@ static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resou void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resource_view_gl *view_gl, struct wined3d_context_gl *context_gl) { - unsigned int i, j, layer_count, level_count, base_level, max_level; + unsigned int i, j, layer_count, level_count, base_level, base_layer; const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_texture_gl *texture_gl; struct gl_texture *gl_tex; @@ -1209,14 +1209,16 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou layer_count = view_gl->v.desc.u.texture.layer_count; level_count = view_gl->v.desc.u.texture.level_count; base_level = view_gl->v.desc.u.texture.level_idx; - max_level = base_level + level_count - 1; + base_layer = view_gl->v.desc.u.texture.layer_idx; texture_gl = wined3d_texture_gl(texture_from_resource(view_gl->v.resource)); srgb = !!(texture_gl->t.flags & WINED3D_TEXTURE_IS_SRGB); location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; for (i = 0; i < layer_count; ++i) { - wined3d_texture_load_location(&texture_gl->t, i * level_count + base_level, &context_gl->c, location); + if (!wined3d_texture_load_location(&texture_gl->t, + (base_layer + i) * level_count + base_level, &context_gl->c, location)) + ERR("Failed to load source layer %u.\n", base_layer + i); } if (view_gl->gl_view.name) @@ -1227,7 +1229,7 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou { wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, base_level); - gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, max_level); + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, base_level + level_count - 1); } if (gl_info->supported[ARB_SAMPLER_OBJECTS]) @@ -1245,10 +1247,12 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou for (i = 0; i < layer_count; ++i) { - for (j = base_level + 1; j <= max_level; ++j) + for (j = 1; j < level_count; ++j) { - wined3d_texture_validate_location(&texture_gl->t, i * level_count + j, location); - wined3d_texture_invalidate_location(&texture_gl->t, i * level_count + j, ~location); + wined3d_texture_validate_location(&texture_gl->t, + (base_layer + i) * level_count + base_level + j, location); + wined3d_texture_invalidate_location(&texture_gl->t, + (base_layer + i) * level_count + base_level + j, ~location); } }

1 0

Francois Gouget : dwrite: Fix the case of FreeType in a comment.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 9d5e17654db43d4dff9c32488d8f0c93877e2092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d5e17654db43d4dff9c3248… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 16 10:32:02 2021 +0100 dwrite: Fix the case of FreeType in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a74c9712b6a..6e5624c622a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -6484,7 +6484,7 @@ BOOL opentype_has_kerning_pairs(struct dwrite_fontface *fontface) count = GET_BE_WORD(header->table_count); offset = sizeof(*header); - /* Freetype limits table count this way. */ + /* FreeType limits table count this way. */ count = min(count, 32); /* Check for presence of format 0 subtable with horizontal coverage. */

1 0

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

March 16, 2021

Module: wine Branch: master Commit: bf1001e16cf3891f111af57f2b4ddb8df7913fba URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf1001e16cf3891f111af57f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 16 00:42:23 2021 -0500 d3d11: Use wined3d_device_context_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/d3d11/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 190e60be4b4..005698b2b6c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1189,7 +1189,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11Devic static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11DeviceContext1 *iface, UINT rect_count, const D3D11_RECT *rects) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); @@ -1197,7 +1197,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11De return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, rect_count, rects); + wined3d_device_context_set_scissor_rects(context->wined3d_context, rect_count, rects); wined3d_mutex_unlock(); }

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_scissor_rects().
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: 1ec669565010acf86ad21d38435894595a8456bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ec669565010acf86ad21d38… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 16 00:42:22 2021 -0500 wined3d: Introduce wined3d_device_context_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/device.c | 45 ++++++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0ba5215c076..3feabbe79f1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1835,7 +1835,6 @@ static void wined3d_device_set_sampler_state(struct wined3d_device *device, void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, const RECT *rects) { - struct wined3d_state *state = device->cs->c.state; unsigned int i; TRACE("device %p, rect_count %u, rects %p.\n", device, rect_count, rects); @@ -1845,20 +1844,7 @@ void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsig TRACE("%u: %s\n", i, wine_dbgstr_rect(&rects[i])); } - if (state->scissor_rect_count == rect_count - && !memcmp(state->scissor_rects, rects, rect_count * sizeof(*rects))) - { - TRACE("App is setting the old scissor rectangles over, nothing to do.\n"); - return; - } - - if (rect_count) - memcpy(state->scissor_rects, rects, rect_count * sizeof(*rects)); - else - memset(state->scissor_rects, 0, sizeof(state->scissor_rects)); - state->scissor_rect_count = rect_count; - - wined3d_device_context_emit_set_scissor_rects(&device->cs->c, rect_count, rects); + wined3d_device_context_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) @@ -2173,6 +2159,35 @@ void CDECL wined3d_device_context_set_viewports(struct wined3d_device_context *c wined3d_device_context_emit_set_viewports(context, viewport_count, viewports); } +void CDECL wined3d_device_context_set_scissor_rects(struct wined3d_device_context *context, unsigned int rect_count, + const RECT *rects) +{ + struct wined3d_state *state = context->state; + unsigned int i; + + TRACE("context %p, rect_count %u, rects %p.\n", context, rect_count, rects); + + for (i = 0; i < rect_count; ++i) + { + TRACE("%u: %s\n", i, wine_dbgstr_rect(&rects[i])); + } + + if (state->scissor_rect_count == rect_count + && !memcmp(state->scissor_rects, rects, rect_count * sizeof(*rects))) + { + TRACE("App is setting the old scissor rectangles over, nothing to do.\n"); + return; + } + + if (rect_count) + memcpy(state->scissor_rects, rects, rect_count * sizeof(*rects)); + else + memset(state->scissor_rects, 0, sizeof(state->scissor_rects)); + state->scissor_rect_count = rect_count; + + wined3d_device_context_emit_set_scissor_rects(context, rect_count, rects); +} + 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 8fc190b73ba..60d85a46290 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -170,6 +170,7 @@ @ 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_rasterizer_state(ptr ptr) +@ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_device_context_set_viewports(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f3de0098ef3..7b585b92cef 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2556,6 +2556,8 @@ void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_devic struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref); void __cdecl wined3d_device_context_set_rasterizer_state(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state); +void __cdecl wined3d_device_context_set_scissor_rects(struct wined3d_device_context *context, unsigned int rect_count, + const RECT *rects); void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader); void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count,

1 0

Hans Leidekker : webservices: Implement WS_CHANNEL_PROPERTY_NO_DELAY.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: a613bee2764cf0bd2f84146d1a862513f02e426e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a613bee2764cf0bd2f84146d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 16 17:07:35 2021 +0100 webservices: Implement WS_CHANNEL_PROPERTY_NO_DELAY. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index f2906c86733..fd7c8d6029d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -971,6 +971,7 @@ static HRESULT connect_channel_tcp( struct channel *channel ) { struct sockaddr_storage storage; struct sockaddr *addr = (struct sockaddr *)&storage; + BOOL nodelay = FALSE; int addr_len; WS_URL_SCHEME_TYPE scheme; WCHAR *host; @@ -1002,6 +1003,8 @@ static HRESULT connect_channel_tcp( struct channel *channel ) return HRESULT_FROM_WIN32( WSAGetLastError() ); } + prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_NO_DELAY, &nodelay, sizeof(nodelay) ); + setsockopt( channel->u.tcp.socket, IPPROTO_TCP, TCP_NODELAY, (const char *)&nodelay, sizeof(nodelay) ); return S_OK; } @@ -2410,7 +2413,12 @@ HRESULT channel_accept_tcp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE return E_INVALIDARG; } - hr = sock_accept( socket, wait, cancel, &channel->u.tcp.socket ); + if ((hr = sock_accept( socket, wait, cancel, &channel->u.tcp.socket )) == S_OK) + { + BOOL nodelay = FALSE; + prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_NO_DELAY, &nodelay, sizeof(nodelay) ); + setsockopt( channel->u.tcp.socket, IPPROTO_TCP, TCP_NODELAY, (const char *)&nodelay, sizeof(nodelay) ); + } LeaveCriticalSection( &channel->cs ); return hr;

1 0

Henri Verbeet : d3d11: Replace the FIXME in d3d11_immediate_context_SwapDeviceContextState() with a TRACE.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: wine Branch: master Commit: e07e0453d326302221d1705cb585e993b32b5a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e07e0453d326302221d1705c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 17:13:29 2021 +0100 d3d11: Replace the FIXME in d3d11_immediate_context_SwapDeviceContextState() with a TRACE. This is implemented. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 63d1e9dfb8c..941e61f4b5a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2844,7 +2844,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SwapDeviceContextState(ID3 struct d3d_device_context_state *state_impl, *prev_impl; struct wined3d_state *wined3d_state; - FIXME("iface %p, state %p, prev %p semi-stub!\n", iface, state, prev); + TRACE("iface %p, state %p, prev %p.\n", iface, state, prev); if (!state) {

1 0

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

March 16, 2021

Module: wine Branch: master Commit: c4fe86dabd6c60a81b04ec0154d43c3fae5c9395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4fe86dabd6c60a81b04ec01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:57:01 2021 +0100 mshtml: Initialize HTMLStorage object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstorage.c | 4 ++-- dlls/mshtml/htmlwindow.c | 6 ++++-- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index bc4b59b7f05..705c6248802 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -197,7 +197,7 @@ static dispex_static_data_t HTMLStorage_dispex = { HTMLStorage_iface_tids }; -HRESULT create_storage(IHTMLStorage **p) +HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) { HTMLStorage *storage; @@ -207,7 +207,7 @@ HRESULT create_storage(IHTMLStorage **p) storage->IHTMLStorage_iface.lpVtbl = &HTMLStorageVtbl; storage->ref = 1; - init_dispex(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex); + init_dispex_with_compat_mode(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex, compat_mode); *p = &storage->IHTMLStorage_iface; return S_OK; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index bc12d0decbc..9da2f7ccbae 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2137,7 +2137,8 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS if(!This->inner_window->session_storage) { HRESULT hres; - hres = create_storage(&This->inner_window->session_storage); + hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), + &This->inner_window->session_storage); if(FAILED(hres)) return hres; } @@ -2156,7 +2157,8 @@ static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLSto if(!This->inner_window->local_storage) { HRESULT hres; - hres = create_storage(&This->inner_window->local_storage); + hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), + &This->inner_window->local_storage); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e213cd698ba..c58a6a563df 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -919,7 +919,7 @@ HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**) DE HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**) DECLSPEC_HIDDEN; void detach_dom_implementation(IHTMLDOMImplementation*) DECLSPEC_HIDDEN; -HRESULT create_storage(IHTMLStorage**) DECLSPEC_HIDDEN; +HRESULT create_html_storage(compat_mode_t,IHTMLStorage**) DECLSPEC_HIDDEN; void HTMLDocument_Persist_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_OleCmd_Init(HTMLDocument*) DECLSPEC_HIDDEN;

1 0