May 2024 - Wine-commits - list.winehq.org

Elizabeth Figura : wined3d: Remove the last vestiges of ARB_texture_rectangle support.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: 65cc641719eac5eff54446ee692fe0df7f14b4fa URL: https://gitlab.winehq.org/wine/wine/-/commit/65cc641719eac5eff54446ee692fe0… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 15:56:57 2024 -0500 wined3d: Remove the last vestiges of ARB_texture_rectangle support. --- dlls/wined3d/adapter_gl.c | 22 ++-------------------- dlls/wined3d/context_gl.c | 11 ----------- dlls/wined3d/device.c | 12 ------------ dlls/wined3d/glsl_shader.c | 7 ------- dlls/wined3d/texture.c | 28 ++++------------------------ dlls/wined3d/view.c | 1 - dlls/wined3d/wined3d_gl.h | 1 - 7 files changed, 6 insertions(+), 76 deletions(-)

1 0

Elizabeth Figura : wined3d: Collapse together NPOT d3d_info flags.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: dcb0136cc064af3f0d09862da42707bf09031d3c URL: https://gitlab.winehq.org/wine/wine/-/commit/dcb0136cc064af3f0d09862da42707… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 16:00:47 2024 -0500 wined3d: Collapse together NPOT d3d_info flags. --- dlls/wined3d/adapter_gl.c | 8 +++----- dlls/wined3d/adapter_vk.c | 4 +--- dlls/wined3d/directx.c | 10 +++------- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 6 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2ff75eb0788..59c85df5a9a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4298,7 +4298,7 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s { caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP | WINED3DPTEXTURECAPS_MIPVOLUMEMAP; - if (!d3d_info->texture_npot) + if (!d3d_info->unconditional_npot) caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; caps->VolumeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR @@ -4338,7 +4338,7 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s { caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP | WINED3DPTEXTURECAPS_MIPCUBEMAP; - if (!d3d_info->texture_npot) + if (!d3d_info->unconditional_npot) caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2; caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR @@ -5045,9 +5045,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); d3d_info->viewport_array_index_any_shader = !!gl_info->supported[ARB_SHADER_VIEWPORT_LAYER_ARRAY]; d3d_info->stencil_export = !!gl_info->supported[ARB_SHADER_STENCIL_EXPORT]; - d3d_info->texture_npot = !!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]; - d3d_info->texture_npot_conditional = gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]; - d3d_info->normalized_texrect = gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]; + d3d_info->unconditional_npot = !!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]; d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 39b263872ed..10c62c3b7ca 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2356,9 +2356,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); d3d_info->viewport_array_index_any_shader = false; /* VK_EXT_shader_viewport_index_layer */ d3d_info->stencil_export = vk_info->supported[WINED3D_VK_EXT_SHADER_STENCIL_EXPORT]; - d3d_info->texture_npot = true; - d3d_info->texture_npot_conditional = true; - d3d_info->normalized_texrect = false; + d3d_info->unconditional_npot = true; d3d_info->draw_base_vertex_offset = true; d3d_info->vertex_bgra = true; d3d_info->texture_swizzle = true; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 97e1880f3f1..b11d284c10b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2437,12 +2437,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, WINED3DPTEXTURECAPS_PROJECTED | WINED3DPTEXTURECAPS_PERSPECTIVE; - if (!d3d_info->texture_npot) - { - caps->TextureCaps |= WINED3DPTEXTURECAPS_POW2; - if (d3d_info->texture_npot_conditional) - caps->TextureCaps |= WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; - } + if (!d3d_info->unconditional_npot) + caps->TextureCaps |= WINED3DPTEXTURECAPS_POW2 | WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; caps->TextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | WINED3DPTFILTERCAPS_MAGFPOINT | @@ -3323,7 +3319,7 @@ static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; d3d_info->wined3d_creation_flags = wined3d_creation_flags; - d3d_info->texture_npot = TRUE; + d3d_info->unconditional_npot = true; d3d_info->feature_level = WINED3D_FEATURE_LEVEL_5; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1dcc3e3be49..ad5753e5d99 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -2667,7 +2667,7 @@ static void sampler_desc_from_sampler_states(struct wined3d_sampler_desc *desc, if (texture->flags & WINED3D_TEXTURE_COND_NP2) { desc->mip_filter = WINED3D_TEXF_NONE; - if (d3d_info->normalized_texrect) + if (!d3d_info->unconditional_npot) desc->min_filter = WINED3D_TEXF_POINT; } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b3defb1f2fe..94429628035 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3713,7 +3713,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc pow2_width = desc->width; pow2_height = desc->height; if (((desc->width & (desc->width - 1)) || (desc->height & (desc->height - 1)) || (desc->depth & (desc->depth - 1))) - && !d3d_info->texture_npot) + && !d3d_info->unconditional_npot) { /* level_count == 0 returns an error as well. */ if (level_count != 1 || layer_count != 1 || desc->resource_type == WINED3D_RTYPE_TEXTURE_3D) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb97a2587ba..8ecac000379 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -232,9 +232,9 @@ struct wined3d_d3d_info uint32_t shader_output_interpolation : 1; uint32_t viewport_array_index_any_shader : 1; uint32_t stencil_export : 1; - uint32_t texture_npot : 1; - uint32_t texture_npot_conditional : 1; - uint32_t normalized_texrect : 1; + /* If zero, only conditional NPOT textures are supported, via + * WINED3D_GL_NORMALIZED_TEXRECT. */ + uint32_t unconditional_npot : 1; uint32_t draw_base_vertex_offset : 1; uint32_t vertex_bgra : 1; uint32_t texture_swizzle : 1;

1 0

Elizabeth Figura : wined3d: Remove the redundant "pow2_width" and "pow2_height" fields.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: 5160533b42fe57b14c941bb46c684c216442a399 URL: https://gitlab.winehq.org/wine/wine/-/commit/5160533b42fe57b14c941bb46c684c… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 16:05:50 2024 -0500 wined3d: Remove the redundant "pow2_width" and "pow2_height" fields. --- dlls/wined3d/context_gl.c | 8 ++++---- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/texture.c | 44 ++++++++++++++++++------------------------ dlls/wined3d/view.c | 4 ++-- dlls/wined3d/wined3d_private.h | 14 -------------- 5 files changed, 27 insertions(+), 47 deletions(-)

1 0

Connor McAdams : d3dx9/tests: Add a test for negative values in the source rectangle passed to D3DXLoadSurfaceFromMemory.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: c04d5622accc3f0f30e9255e297a95a743c49e18 URL: https://gitlab.winehq.org/wine/wine/-/commit/c04d5622accc3f0f30e9255e297a95… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Apr 25 11:36:10 2024 -0400 d3dx9/tests: Add a test for negative values in the source rectangle passed to D3DXLoadSurfaceFromMemory. This behavior is mentioned in the wine code documentation comment for this function as being allowed, but the behavior is not tested. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/surface.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 036326c56cf..feabd0f465b 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1173,6 +1173,24 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); check_pixel_4bpp(&lockrect, 0, 0, 0x8dc32bf6); IDirect3DSurface9_UnlockRect(surf); + + /* + * Test negative offsets in the source rectangle. Causes an access + * violation when run on 64-bit Windows. + */ + if (sizeof(void *) != 8) + { + SetRect(&rect, 0, -1, 1, 0); + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, &pixdata_a8b8g8r8[2], + D3DFMT_A8R8G8B8, 8, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + check_pixel_4bpp(&lockrect, 0, 0, pixdata_a8b8g8r8[0]); + IDirect3DSurface9_UnlockRect(surf); + } + else + skip("Skipping test for negative source rectangle values on 64-bit.\n"); + check_release((IUnknown *)surf, 0); /* test color conversion */

1 0

Connor McAdams : d3dx9/tests: Add a new compressed surface loading test.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: 7ebd102886aaa423e4a10cb2d9694e122eb06f4a URL: https://gitlab.winehq.org/wine/wine/-/commit/7ebd102886aaa423e4a10cb2d9694e… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Apr 25 12:19:14 2024 -0400 d3dx9/tests: Add a new compressed surface loading test. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/surface.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index feabd0f465b..2a4bc5c1652 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1680,6 +1680,27 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) release_surface_readback(&surface_rb); + /* + * Our source and destination rectangles start on aligned + * boundaries, but the size is not the entire block. + */ + SetRect(&rect, 4, 0, 6, 2); + SetRect(&destrect, 4, 0, 6, 2); + hr = D3DXLoadSurfaceFromMemory(newsurf, NULL, &destrect, dxt5_8_8, + D3DFMT_DXT5, 16 * 2, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + get_surface_decompressed_readback(device, newsurf, &surface_rb); + + check_readback_pixel_4bpp(&surface_rb, 4, 0, 0xff00ff00, FALSE); /* Green block, top left. */ + /* + * Bottom left of green block, should still be black from prior + * operation. + */ + check_readback_pixel_4bpp(&surface_rb, 4, 3, 0xff000000, TRUE); + + release_surface_readback(&surface_rb); + check_release((IUnknown *)newsurf, 1); check_release((IUnknown *)tex, 0); }

1 0

Connor McAdams : d3dx9: Only do direct copies of full blocks for compressed formats.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: e6f79a8059400cd92ec58cee03d6b89865a056ff URL: https://gitlab.winehq.org/wine/wine/-/commit/e6f79a8059400cd92ec58cee03d6b8… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Apr 25 12:22:00 2024 -0400 d3dx9: Only do direct copies of full blocks for compressed formats. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index bbeba9c8b23..c3d341e216d 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1969,8 +1969,8 @@ static HRESULT d3dx_load_image_from_memory(void *dst_memory, uint32_t dst_row_pi /* Everything matches, simply copy the pixels. */ if (src_desc->format == dst_desc->format - && dst_size.width == src_size.width - && dst_size.height == src_size.height + && (dst_size.width == src_size.width && !(dst_size.width % dst_desc->block_width)) + && (dst_size.height == src_size.height && !(dst_size.height % dst_desc->block_height)) && color_key == 0 && !(src_rect->left & (src_desc->block_width - 1)) && !(src_rect->top & (src_desc->block_height - 1))

1 0

Connor McAdams : d3dx9: Fix destination rectangles passed from D3DXLoadSurfaceFromMemory() to d3dx_load_image_from_memory().
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: f9676836d672903b0ec07ec5d9d98e4f9fe047fa URL: https://gitlab.winehq.org/wine/wine/-/commit/f9676836d672903b0ec07ec5d9d98e… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Apr 25 12:27:16 2024 -0400 d3dx9: Fix destination rectangles passed from D3DXLoadSurfaceFromMemory() to d3dx_load_image_from_memory(). d3dx_load_image_from_memory() expects the address of the dst_memory argument to represent the top left corner of the surface. If a surface is locked using a rectangle that doesn't start at the top left corner of the surface, the rectangle we pass to d3dx_load_image_from_memory() needs to be adjusted so that it properly represents the locked area. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 10 +++++++--- dlls/d3dx9_36/tests/surface.c | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index c3d341e216d..ef6cd57c7da 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -2116,8 +2116,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, D3DFORMAT src_format, UINT src_pitch, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key) { + RECT dst_rect_temp, dst_rect_aligned, dst_locked_rect, dst_locked_rect_aligned; const struct pixel_format_desc *srcformatdesc, *destformatdesc; - RECT dst_rect_temp, dst_rect_aligned; IDirect3DSurface9 *surface; D3DSURFACE_DESC surfdesc; D3DLOCKED_RECT lockrect; @@ -2192,8 +2192,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, if (FAILED(hr = lock_surface(dst_surface, &dst_rect_aligned, &lockrect, &surface, TRUE))) return hr; - hr = d3dx_load_image_from_memory(lockrect.pBits, lockrect.Pitch, destformatdesc, dst_palette, dst_rect, - &dst_rect_aligned, src_memory, src_pitch, srcformatdesc, src_palette, src_rect, filter, color_key); + dst_locked_rect_aligned = dst_rect_aligned; + dst_locked_rect = *dst_rect; + OffsetRect(&dst_locked_rect_aligned, -dst_rect_aligned.left, -dst_rect_aligned.top); + OffsetRect(&dst_locked_rect, -dst_rect_aligned.left, -dst_rect_aligned.top); + hr = d3dx_load_image_from_memory(lockrect.pBits, lockrect.Pitch, destformatdesc, dst_palette, &dst_locked_rect, + &dst_locked_rect_aligned, src_memory, src_pitch, srcformatdesc, src_palette, src_rect, filter, color_key); if (FAILED(hr)) WARN("d3dx_load_image_from_memory failed with hr %#lx\n", hr); diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 2a4bc5c1652..3c88eec5dcb 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1697,7 +1697,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) * Bottom left of green block, should still be black from prior * operation. */ - check_readback_pixel_4bpp(&surface_rb, 4, 3, 0xff000000, TRUE); + check_readback_pixel_4bpp(&surface_rb, 4, 3, 0xff000000, FALSE); release_surface_readback(&surface_rb);

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL for HTMLElement object implementation.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: c2fd84c69db913e2518171a40e0be44493808cca URL: https://gitlab.winehq.org/wine/wine/-/commit/c2fd84c69db913e2518171a40e0be4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 14:04:30 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL for HTMLElement object implementation. --- dlls/mshtml/htmlelem.c | 448 ++----------------------------------------------- 1 file changed, 18 insertions(+), 430 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlelem.c.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: ef81a54543da1ff95cc93fef78bf83d55da036fc URL: https://gitlab.winehq.org/wine/wine/-/commit/ef81a54543da1ff95cc93fef78bf83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 14:08:36 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlelem.c. --- dlls/mshtml/htmlelem.c | 299 ++----------------------------------------------- 1 file changed, 10 insertions(+), 289 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlelemcol.c.
by Alexandre Julliard 15 May '24

15 May '24

Module: wine Branch: master Commit: 35dcdcf63ec89a409ec9870cd7e40e5fe1050fbb URL: https://gitlab.winehq.org/wine/wine/-/commit/35dcdcf63ec89a409ec9870cd7e40e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 14:09:44 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlelemcol.c. --- dlls/mshtml/htmlelemcol.c | 51 ++--------------------------------------------- 1 file changed, 2 insertions(+), 49 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 8ebe741c309..8b69de72a17 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -210,55 +210,8 @@ static inline HTMLElementCollection *impl_from_IHTMLElementCollection(IHTMLEleme return CONTAINING_RECORD(iface, HTMLElementCollection, IHTMLElementCollection_iface); } -static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollection *iface, - REFIID riid, void **ppv) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLElementCollection_AddRef(IHTMLElementCollection *iface) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLElementCollection_Release(IHTMLElementCollection *iface) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLElementCollection_GetTypeInfoCount(IHTMLElementCollection *iface, - UINT *pctinfo) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLElementCollection_GetTypeInfo(IHTMLElementCollection *iface, - UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLElementCollection_GetIDsOfNames(IHTMLElementCollection *iface, - REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLElementCollection_Invoke(IHTMLElementCollection *iface, - DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLElementCollection, IHTMLElementCollection, + impl_from_IHTMLElementCollection(iface)->dispex) static HRESULT WINAPI HTMLElementCollection_toString(IHTMLElementCollection *iface, BSTR *String)

1 0