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

Alexandre Julliard : msvcrt/tests: Don't link to _setmaxstdio.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 11632fdc69e606ceb9e6df6c3244652055587145 URL: https://gitlab.winehq.org/wine/wine/-/commit/11632fdc69e606ceb9e6df6c324465… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 09:45:12 2024 +0200 msvcrt/tests: Don't link to _setmaxstdio. It's missing on some ARM platforms. --- dlls/msvcrt/tests/file.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9f85e2def69..b81469009cd 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -67,6 +67,7 @@ static int (__cdecl *p_fopen_s)(FILE**, const char*, const char*); static int (__cdecl *p__wfopen_s)(FILE**, const wchar_t*, const wchar_t*); static errno_t (__cdecl *p__get_fmode)(int*); static errno_t (__cdecl *p__set_fmode)(int); +static int (__cdecl *p__setmaxstdio)(int); static const char* get_base_name(const char *path) { @@ -91,6 +92,7 @@ static void init(void) __pioinfo = (void*)GetProcAddress(hmod, "__pioinfo"); p__get_fmode = (void*)GetProcAddress(hmod, "_get_fmode"); p__set_fmode = (void*)GetProcAddress(hmod, "_set_fmode"); + p__setmaxstdio = (void*)GetProcAddress(hmod, "_setmaxstdio"); } static void test_filbuf( void ) @@ -2349,8 +2351,12 @@ static void test_get_osfhandle(void) static void test_setmaxstdio(void) { - ok(2048 == _setmaxstdio(2048),"_setmaxstdio returned %d instead of 2048\n",_setmaxstdio(2048)); - ok(-1 == _setmaxstdio(2049),"_setmaxstdio returned %d instead of -1\n",_setmaxstdio(2049)); + if (p__setmaxstdio) + { + ok(2048 == p__setmaxstdio(2048),"_setmaxstdio returned %d instead of 2048\n",p__setmaxstdio(2048)); + ok(-1 == p__setmaxstdio(2049),"_setmaxstdio returned %d instead of -1\n",p__setmaxstdio(2049)); + } + else win_skip( "_setmaxstdio not supported\n" ); } static void test_stat(void)

1 0

Elizabeth Figura : wined3d: Fix inversion in shader_get_position_fixup().
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: 5fa3e9b8298f89e636e1d167bae54aee6f7e0872 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fa3e9b8298f89e636e1d167bae54a… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue May 14 23:08:02 2024 -0500 wined3d: Fix inversion in shader_get_position_fixup(). Spotted by Matteo Bruni. Fixes: ba2f78922f84f0576694fef17be7bec2cc9da19b --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 510bc057d9f..757c6638645 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4340,7 +4340,7 @@ static inline void shader_get_position_fixup(const struct wined3d_context *conte for (i = 0; i < fixup_count; ++i) { position_fixup[4 * i ] = 1.0f; - position_fixup[4 * i + 1] = 1.0f; + position_fixup[4 * i + 1] = -1.0f; if (!context->d3d_info->subpixel_viewport) { double dummy; @@ -4348,7 +4348,7 @@ static inline void shader_get_position_fixup(const struct wined3d_context *conte y = modf(state->viewports[i].y, &dummy) * 2.0f; } position_fixup[4 * i + 2] = (center_offset + x) / state->viewports[i].width; - position_fixup[4 * i + 3] = -(center_offset + y) / state->viewports[i].height; + position_fixup[4 * i + 3] = (center_offset + y) / state->viewports[i].height; } }

1 0

Alistair Leslie-Hughes : include: Add some D3D12_FEATURE_DATA_D3D12_OPTIONS* types.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: 849baece66e326bce255dfea0d6fb10df888bc55 URL: https://gitlab.winehq.org/wine/wine/-/commit/849baece66e326bce255dfea0d6fb1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 15 20:52:06 2024 +1000 include: Add some D3D12_FEATURE_DATA_D3D12_OPTIONS* types. --- include/d3d12.idl | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 593a40a02a7..d7b283a2e02 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2446,6 +2446,36 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS13 BOOL AlphaBlendFactorSupported; } D3D12_FEATURE_DATA_D3D12_OPTIONS13; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS14 +{ + BOOL AdvancedTextureOpsSupported; + BOOL WriteableMSAATexturesSupported; + BOOL IndependentFrontAndBackStencilRefMaskSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS14; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS15 +{ + BOOL TriangleFanSupported; + BOOL DynamicIndexBufferStripCutSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS15; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS16 +{ + BOOL DynamicDepthBiasSupported; + BOOL GPUUploadHeapSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS16; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS17 +{ + BOOL NonNormalizedCoordinateSamplersSupported; + BOOL ManualWriteTrackingResourceSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS17; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS18 +{ + BOOL RenderPassesValid; +} D3D12_FEATURE_DATA_D3D12_OPTIONS18; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -2481,6 +2511,11 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS11 = 40, D3D12_FEATURE_D3D12_OPTIONS12 = 41, D3D12_FEATURE_D3D12_OPTIONS13 = 42, + D3D12_FEATURE_D3D12_OPTIONS14 = 43, + D3D12_FEATURE_D3D12_OPTIONS15 = 44, + D3D12_FEATURE_D3D12_OPTIONS16 = 45, + D3D12_FEATURE_D3D12_OPTIONS17 = 46, + D3D12_FEATURE_D3D12_OPTIONS18 = 47, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST

1 0

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

May 15, 2024

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

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