- Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL for HTMLEventObj object implementation.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: 14e4316fbae9c414c333d841c6cdbd6df3f09e94 URL: https://gitlab.winehq.org/wine/wine/-/commit/14e4316fbae9c414c333d841c6cdbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 14:12:16 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL for HTMLEventObj object implementation. --- dlls/mshtml/htmlevent.c | 274 ++---------------------------------------------- 1 file changed, 6 insertions(+), 268 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlform.c.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: ef066c3017c4a79a39a8219646c0b3a86f55e122 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef066c3017c4a79a39a8219646c0b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 14:22:34 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlform.c. --- dlls/mshtml/htmlform.c | 55 ++------------------------------------------------ 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 648e1efa6b5..7be9c1c95d7 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -251,59 +251,8 @@ static inline HTMLFormElement *impl_from_IHTMLFormElement(IHTMLFormElement *ifac return CONTAINING_RECORD(iface, HTMLFormElement, IHTMLFormElement_iface); } -static HRESULT WINAPI HTMLFormElement_QueryInterface(IHTMLFormElement *iface, - REFIID riid, void **ppv) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLFormElement_AddRef(IHTMLFormElement *iface) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLFormElement_Release(IHTMLFormElement *iface) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLFormElement_GetTypeInfoCount(IHTMLFormElement *iface, UINT *pctinfo) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLFormElement_GetTypeInfo(IHTMLFormElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLFormElement_GetIDsOfNames(IHTMLFormElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLFormElement_Invoke(IHTMLFormElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLFormElement, IHTMLFormElement, + impl_from_IHTMLFormElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLFormElement_put_action(IHTMLFormElement *iface, BSTR v) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlevent.c.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: cd7b9a6f9c75969e5e88b98d70291f52743cd3ac URL: https://gitlab.winehq.org/wine/wine/-/commit/cd7b9a6f9c75969e5e88b98d70291f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 14:20:57 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlevent.c. --- dlls/mshtml/htmlevent.c | 482 ++---------------------------------------------- 1 file changed, 12 insertions(+), 470 deletions(-)

1 0

Tim Clem : Revert "winemac.drv: Hide app's dock icon when it wouldn't have a taskbar item on Windows.".
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: d042b3b138a44683e7dd524c1bcfe7de23f875fd URL: https://gitlab.winehq.org/wine/wine/-/commit/d042b3b138a44683e7dd524c1bcfe7… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed May 15 08:36:56 2024 -0700 Revert "winemac.drv: Hide app's dock icon when it wouldn't have a taskbar item on Windows.". This hits some intractable OS-level bugs, and it seems best to just revert it for now. This reverts commit f0efb2e46a7fb2a00f85196a4a06bd50eda560b2. --- dlls/winemac.drv/cocoa_app.h | 1 - dlls/winemac.drv/cocoa_app.m | 74 ----------------------------------------- dlls/winemac.drv/cocoa_window.h | 2 -- dlls/winemac.drv/cocoa_window.m | 23 ++----------- dlls/winemac.drv/macdrv_cocoa.h | 2 -- dlls/winemac.drv/macdrv_main.c | 4 --- dlls/winemac.drv/window.c | 8 ----- 7 files changed, 2 insertions(+), 112 deletions(-)

1 0

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

May 15, 2024

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

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

May 15, 2024

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 May 15, 2024

May 15, 2024

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: Fix destination rectangles passed from D3DXLoadSurfaceFromMemory() to d3dx_load_image_from_memory().
by Alexandre Julliard May 15, 2024

May 15, 2024

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 May 15, 2024

May 15, 2024

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

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

May 15, 2024

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