June 2019 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_generate_rt_mask_no_fbo().
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 8b6b124e2bb0c27d0e6aa3ed257e5fc9b94a77e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6b124e2bb0c27d0e6aa3ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 18:28:19 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_generate_rt_mask_no_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7960305..c069740 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2747,10 +2747,9 @@ GLenum wined3d_context_gl_get_offscreen_gl_buffer(const struct wined3d_context_g } } -static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *context, struct wined3d_resource *rt) +static uint32_t wined3d_context_gl_generate_rt_mask_no_fbo(const struct wined3d_context_gl *context_gl, + struct wined3d_resource *rt) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - if (!rt || rt->format->id == WINED3DFMT_NULL) return 0; else if (rt->type != WINED3D_RTYPE_BUFFER && texture_from_resource(rt)->swapchain) @@ -2764,8 +2763,8 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, { struct wined3d_context *context = &context_gl->c; const struct wined3d_gl_info *gl_info; + uint32_t rt_mask, *cur_mask; struct wined3d_texture *rt; - DWORD rt_mask, *cur_mask; unsigned int sampler; SIZE rt_size; @@ -2796,7 +2795,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, } else { - rt_mask = context_generate_rt_mask_no_fbo(context, &rt->resource); + rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, &rt->resource); } cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; @@ -3029,7 +3028,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, struct wined3d_rendertarget_view * const *rts = fb->render_targets; const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; - DWORD rt_mask = 0, *cur_mask; + uint32_t rt_mask = 0, *cur_mask; unsigned int i; if (isStateDirty(&context_gl->c, STATE_FRAMEBUFFER) || fb != state->fb @@ -3088,7 +3087,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, } else { - rt_mask = context_generate_rt_mask_no_fbo(&context_gl->c, rt_count ? rts[0]->resource : NULL); + rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rt_count ? rts[0]->resource : NULL); } } else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO @@ -3102,7 +3101,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, } else { - rt_mask = context_generate_rt_mask_no_fbo(&context_gl->c, rt_count ? rts[0]->resource : NULL); + rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rt_count ? rts[0]->resource : NULL); } cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; @@ -3144,6 +3143,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, static unsigned int find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -3151,7 +3151,7 @@ static unsigned int find_draw_buffers_mask(const struct wined3d_context *context unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) - return context_generate_rt_mask_no_fbo(context, rts[0]->resource); + return wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rts[0]->resource); else if (!context->render_offscreen) return context_generate_rt_mask_from_resource(rts[0]->resource);

1 0

Nikolay Sivov : mf: Add rate support for presentation clock.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: d9cd07fd4ef77cb24b3faf1725a37edb7c95037e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9cd07fd4ef77cb24b3faf17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 3 13:11:33 2019 +0300 mf: Add rate support for presentation clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 107 +++++++++++++++++++++++++++++++++++++++-------------- dlls/mf/tests/mf.c | 52 ++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9cd07fd4ef77cb24b3f…

1 0

Owen Rudge : oledb32/tests: Add conversion tests to DBTYPE_I1.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: b4b5ad5980059d5608100cfb5379e13b70ebb5c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4b5ad5980059d5608100cfb… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu May 30 09:53:47 2019 +0100 oledb32/tests: Add conversion tests to DBTYPE_I1. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 312 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 312 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b4b5ad5980059d560810…

1 0

Owen Rudge : oledb32: Implement support for converting to DBTYPE_I1.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 8ece2fa15538f8afc5d3e680bf178e91e3cffb33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ece2fa15538f8afc5d3e680… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu May 30 09:53:40 2019 +0100 oledb32: Implement support for converting to DBTYPE_I1. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f18c756..a53d926 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -249,6 +249,37 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, switch(dst_type) { + case DBTYPE_I1: + { + signed char *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I1: *d = *(signed char*)src; hr = S_OK; break; + case DBTYPE_I2: hr = VarI1FromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarI1FromI4(*(signed int*)src, d); break; + case DBTYPE_R4: hr = VarI1FromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarI1FromR8(*(double*)src, d); break; + case DBTYPE_CY: hr = VarI1FromCy(*(CY*)src, d); break; + case DBTYPE_DATE: hr = VarI1FromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarI1FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarI1FromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarI1FromDec((DECIMAL*)src, d); break; + case DBTYPE_UI1: hr = VarI1FromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarI1FromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarI1FromUI4(*(DWORD*)src, d); break; + case DBTYPE_I8: hr = VarI1FromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI8: hr = VarI1FromUI8(*(ULONGLONG*)src, d); break; + case DBTYPE_VARIANT: + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_I1)) == S_OK) + *d = V_I1(&tmp); + break; + default: FIXME("Unimplemented conversion %04x -> I1\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_I2: { signed short *d = dst;

1 0

Zebediah Figura : ntoskrnl.exe: Move PNP code to a separate file.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 3b2592a2bcc6fe510eda99a05a08ef05e9ed7ca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b2592a2bcc6fe510eda99a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 30 20:49:03 2019 -0500 ntoskrnl.exe: Move PNP code to a separate file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/Makefile.in | 1 + dlls/ntoskrnl.exe/ntoskrnl.c | 705 +--------------------------------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 14 + dlls/ntoskrnl.exe/pnp.c | 718 +++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 5 files changed, 735 insertions(+), 704 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b2592a2bcc6fe510eda…

1 0

Henri Verbeet : wined3d: Properly check whether a context was created in swapchain_init().
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: d88c403e548cfe2171ac22603197ffbc0e70b4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d88c403e548cfe2171ac2260… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 18:28:23 2019 +0430 wined3d: Properly check whether a context was created in swapchain_init(). This fixes commit db201072655946662c041a66ee434c30c245e5b0, but the underlying issue was of course present before that commit. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4cefd80..481b3b7 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -904,7 +904,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 wined3d_cs_init_object(device->cs, wined3d_swapchain_cs_init, swapchain); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - if (!swapchain->context[0]) + if (!swapchain->num_contexts) { hr = WINED3DERR_NOTAVAILABLE; goto err;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl strcuture to find_draw_buffers_mask().
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 4a9d8fedee6f38108f7e684c73c210cdb472f15d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a9d8fedee6f38108f7e684c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 18:28:20 2019 +0430 wined3d: Pass a wined3d_context_gl strcuture to find_draw_buffers_mask(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c069740..ba3ac80 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3141,18 +3141,17 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, return TRUE; } -static unsigned int find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) +static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int rt_mask, mask; unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rts[0]->resource); - else if (!context->render_offscreen) + else if (!context_gl->c.render_offscreen) return context_generate_rt_mask_from_resource(rts[0]->resource); rt_mask = ps ? ps->reg_maps.rt_mask : 1; @@ -3173,7 +3172,7 @@ static unsigned int find_draw_buffers_mask(const struct wined3d_context *context void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - unsigned int rt_mask = find_draw_buffers_mask(context, state); + uint32_t rt_mask = find_draw_buffers_mask(context_gl, state); const struct wined3d_fb_state *fb = state->fb; DWORD color_location = 0; DWORD *cur_mask; @@ -3473,12 +3472,12 @@ static void wined3d_context_gl_update_tex_unit_map(struct wined3d_context_gl *co void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - DWORD rt_mask, *cur_mask; + uint32_t rt_mask, *cur_mask; if (isStateDirty(context, STATE_FRAMEBUFFER)) return; cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; - rt_mask = find_draw_buffers_mask(context, state); + rt_mask = find_draw_buffers_mask(context_gl, state); if (rt_mask != *cur_mask) { context_apply_draw_buffers(context, rt_mask);

1 0

Nikolay Sivov : mf/tests: Add some tests for video processor MFT.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 9175a5f9932c36339c2e024fc69df25db263f810 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9175a5f9932c36339c2e024f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 3 13:11:34 2019 +0300 mf/tests: Add some tests for video processor MFT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 155 ++++++++++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 2 + include/mferror.h | 28 +++++++++ include/mfidl.idl | 2 + include/mftransform.idl | 7 ++- 5 files changed, 193 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9175a5f9932c36339c2e…

1 0

Dmitry Timoshkov : mshtml: Add IDisplayServices interface stub.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: e1844f5b53d4dc19b3a264252a90587556c385c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1844f5b53d4dc19b3a26425… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 3 11:54:32 2019 +0800 mshtml: Add IDisplayServices interface stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 96 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 2 + 3 files changed, 99 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9dec890..3d82dd4 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5014,6 +5014,99 @@ static const IMarkupContainerVtbl MarkupContainerVtbl = { MarkupContainer_OwningDoc }; +/********************************************************** + * IDisplayServices implementation + */ +static inline HTMLDocument *impl_from_IDisplayServices(IDisplayServices *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IDisplayServices_iface); +} + +static HRESULT WINAPI DisplayServices_QueryInterface(IDisplayServices *iface, REFIID riid, void **ppvObject) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + return htmldoc_query_interface(This, riid, ppvObject); +} + +static ULONG WINAPI DisplayServices_AddRef(IDisplayServices *iface) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI DisplayServices_Release(IDisplayServices *iface) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI DisplayServices_CreateDisplayPointer(IDisplayServices *iface, IDisplayPointer **ppDispPointer) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p)\n", This, ppDispPointer); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_TransformRect(IDisplayServices *iface, + RECT *pRect, COORD_SYSTEM eSource, COORD_SYSTEM eDestination, IHTMLElement *pIElement) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%s,%d,%d,%p)\n", This, wine_dbgstr_rect(pRect), eSource, eDestination, pIElement); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_TransformPoint(IDisplayServices *iface, + POINT *pPoint, COORD_SYSTEM eSource, COORD_SYSTEM eDestination, IHTMLElement *pIElement) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%s,%d,%d,%p)\n", This, wine_dbgstr_point(pPoint), eSource, eDestination, pIElement); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_GetCaret(IDisplayServices *iface, IHTMLCaret **ppCaret) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p)\n", This, ppCaret); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_GetComputedStyle(IDisplayServices *iface, + IMarkupPointer *pPointer, IHTMLComputedStyle **ppComputedStyle) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pPointer, ppComputedStyle); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_ScrollRectIntoView(IDisplayServices *iface, + IHTMLElement *pIElement, RECT rect) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p,%s)\n", This, pIElement, wine_dbgstr_rect(&rect)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_HasFlowLayout(IDisplayServices *iface, + IHTMLElement *pIElement, BOOL *pfHasFlowLayout) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pIElement, pfHasFlowLayout); + return E_NOTIMPL; +} + +static const IDisplayServicesVtbl DisplayServicesVtbl = { + DisplayServices_QueryInterface, + DisplayServices_AddRef, + DisplayServices_Release, + DisplayServices_CreateDisplayPointer, + DisplayServices_TransformRect, + DisplayServices_TransformPoint, + DisplayServices_GetCaret, + DisplayServices_GetComputedStyle, + DisplayServices_ScrollRectIntoView, + DisplayServices_HasFlowLayout +}; + static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -5096,6 +5189,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IMarkupServices_iface; else if(IsEqualGUID(&IID_IMarkupContainer, riid)) *ppv = &This->IMarkupContainer_iface; + else if(IsEqualGUID(&IID_IDisplayServices, riid)) + *ppv = &This->IDisplayServices_iface; else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); *ppv = NULL; @@ -5145,6 +5240,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; doc->IMarkupServices_iface.lpVtbl = &MarkupServicesVtbl; doc->IMarkupContainer_iface.lpVtbl = &MarkupContainerVtbl; + doc->IDisplayServices_iface.lpVtbl = &DisplayServicesVtbl; doc->outer_unk = outer; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7dc9367..8beea34 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -625,6 +625,7 @@ struct HTMLDocument { IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; IMarkupServices IMarkupServices_iface; IMarkupContainer IMarkupContainer_iface; + IDisplayServices IDisplayServices_iface; IUnknown *outer_unk; IDispatchEx *dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8a08282..01c6191 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -173,6 +173,7 @@ static const IID * const doc_node_iids[] = { &IID_IHTMLDocument5, &IID_IDocumentSelector, &IID_IDispatchEx, + &IID_IDisplayServices, &IID_IConnectionPointContainer, &IID_IInternetHostSecurityManager, &IID_IMarkupContainer, @@ -191,6 +192,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLDocument5, &IID_IDocumentSelector, &IID_IDispatchEx, + &IID_IDisplayServices, &IID_IConnectionPointContainer, &IID_ICustomDoc, &IID_IMarkupContainer,

1 0

Dmitry Timoshkov : mshtml.idl: Add forward declaration for IHTMLWindow flavours.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: c92fddae8661233e7699e1914987f0cc4caa8217 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c92fddae8661233e7699e191… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 4 00:03:04 2019 +0800 mshtml.idl: Add forward declaration for IHTMLWindow flavours. This helps to make sure that getComputedStyle() gets picked up before GetComputedStyle(), and correct tlb is generated as a result. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index de15c6c..f7ebd9e 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -407,6 +407,12 @@ interface IHTMLFrameBase; interface IHTMLStorage; interface IHTMLStyleSheetsCollection; interface IHTMLTableSection; +interface IHTMLWindow2; +interface IHTMLWindow3; +interface IHTMLWindow4; +interface IHTMLWindow5; +interface IHTMLWindow6; +interface IHTMLWindow7; interface IDOMEvent; interface IDisplayPointer; interface IDisplayServices;

1 0