July 2021 - Wine-commits - list.winehq.org

Jacek Caban : gdi32: Use NtGdiAngleArc for AngleArc implementation.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 3713901dffb3a795c1bb29219e83b4879ac82d36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3713901dffb3a795c1bb2921… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:20:02 2021 +0200 gdi32: Use NtGdiAngleArc for AngleArc implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 6 +++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/painting.c | 6 ++---- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index c19c9527dc2..7e09216cdea 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -600,18 +600,6 @@ static BOOL CDECL emfpathdrv_AbortPath( PHYSDEV dev ) return next->funcs->pAbortPath( next ); } -/*********************************************************************** - * emfpathdrv_AngleArc - */ -static BOOL CDECL emfpathdrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pAngleArc ); - - return (emfdev->funcs->pAngleArc( emfdev, x, y, radius, start, sweep ) && - next->funcs->pAngleArc( next, x, y, radius, start, sweep )); -} - /*********************************************************************** * emfpathdrv_BeginPath */ @@ -785,7 +773,7 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pAbortDoc */ emfpathdrv_AbortPath, /* pAbortPath */ NULL, /* pAlphaBlend */ - emfpathdrv_AngleArc, /* pAngleArc */ + NULL, /* pAngleArc */ NULL, /* pArc */ NULL, /* pArcTo */ emfpathdrv_BeginPath, /* pBeginPath */ diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 9f9799a54da..dd4ed6ad4d2 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -61,7 +61,6 @@ extern DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_H extern BOOL CDECL EMFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 82e6f894521..90d22e1f3ef 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -355,9 +355,9 @@ BOOL CDECL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, } /*********************************************************************** - * EMFDRV_AngleArc + * EMFDC_AngleArc */ -BOOL CDECL EMFDRV_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) +BOOL EMFDC_AngleArc( DC_ATTR *dc_attr, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) { EMRANGLEARC emr; @@ -369,7 +369,7 @@ BOOL CDECL EMFDRV_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start emr.eStartAngle = start; emr.eSweepAngle = sweep; - return EMFDRV_WriteRecord( dev, &emr.emr ); + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } /*********************************************************************** diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index c941e095752..82d1d31fb95 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -39,7 +39,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pAbortDoc */ EMFDRV_AbortPath, /* pAbortPath */ EMFDRV_AlphaBlend, /* pAlphaBlend */ - EMFDRV_AngleArc, /* pAngleArc */ + NULL, /* pAngleArc */ EMFDRV_Arc, /* pArc */ EMFDRV_ArcTo, /* pArcTo */ EMFDRV_BeginPath, /* pBeginPath */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8dd20c4bf11..1dfd3b2424c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -56,6 +56,8 @@ extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; /* enhanced metafiles */ +extern BOOL EMFDC_AngleArc( DC_ATTR *dc_attr, INT x, INT y, DWORD radius, FLOAT start, + FLOAT sweep ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ArcChordPie( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend, DWORD type ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index f642eef75c0..2e31297d7d9 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -170,6 +170,21 @@ BOOL WINAPI Pie( HDC hdc, INT left, INT top, INT right, INT bottom, xstart, ystart, xend, yend ); } +/*********************************************************************** + * AngleArc (GDI32.@) + */ +BOOL WINAPI AngleArc( HDC hdc, INT x, INT y, DWORD radius, FLOAT start_angle, FLOAT sweep_angle ) +{ + DC_ATTR *dc_attr; + + TRACE( "%p, (%d, %d), %u, %f, %f\n", hdc, x, y, radius, start_angle, sweep_angle ); + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_AngleArc( dc_attr, x, y, radius, start_angle, sweep_angle )) + return FALSE; + return NtGdiAngleArc( hdc, x, y, radius, start_angle, sweep_angle ); +} + /*********************************************************************** * Ellipse (GDI32.@) */ diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 637b9ccda3f..ba3f886519b 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -776,16 +776,14 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT* lppt, DWORD cPoints ) } /*********************************************************************** - * AngleArc (GDI32.@) + * NtGdiAngleArc (win32u.@) */ -BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAngle, FLOAT eSweepAngle) +BOOL WINAPI NtGdiAngleArc( HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAngle, FLOAT eSweepAngle ) { PHYSDEV physdev; BOOL result; DC *dc; - TRACE( "%p, (%d, %d), %u, %f, %f\n", hdc, x, y, dwRadius, eStartAngle, eSweepAngle ); - if( (signed int)dwRadius < 0 ) return FALSE;

1 0

Biswapriyo Nath : include: Add structure padding for aarch64 in dbghelp.h.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 8647f7baa2ad2a33446b17f59f141f218dd5cb16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8647f7baa2ad2a33446b17f5… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Jul 21 14:41:57 2021 +0530 include: Add structure padding for aarch64 in dbghelp.h. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbghelp.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/dbghelp.h b/include/dbghelp.h index 303c0109d1f..bf235c7f97a 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -587,6 +587,9 @@ typedef struct _MINIDUMP_THREAD_CALLBACK { ULONG ThreadId; HANDLE ThreadHandle; +#if defined(__aarch64__) + ULONG Pad; +#endif CONTEXT Context; ULONG SizeOfContext; ULONG64 StackBase; @@ -597,6 +600,9 @@ typedef struct _MINIDUMP_THREAD_EX_CALLBACK { ULONG ThreadId; HANDLE ThreadHandle; +#if defined(__aarch64__) + ULONG Pad; +#endif CONTEXT Context; ULONG SizeOfContext; ULONG64 StackBase;

1 0

Piotr Caban : msvcrt: Use _MCW_RC rounding mask in fesetround and fegetround.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: bf859348ade4ff7dde0f587cd6d5ee40115b63cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf859348ade4ff7dde0f587c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 21 13:21:12 2021 +0200 msvcrt: Use _MCW_RC rounding mask in fesetround and fegetround. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ecf5fdce4d8..e61c079f105 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5801,7 +5801,7 @@ int CDECL __fpe_flt_rounds(void) */ int CDECL fegetround(void) { - return _controlfp(0, 0) & _RC_CHOP; + return _controlfp(0, 0) & _MCW_RC; } /********************************************************************* @@ -5809,9 +5809,9 @@ int CDECL fegetround(void) */ int CDECL fesetround(int round_mode) { - if (round_mode & (~_RC_CHOP)) + if (round_mode & (~_MCW_RC)) return 1; - _controlfp(round_mode, _RC_CHOP); + _controlfp(round_mode, _MCW_RC); return 0; }

1 0

Piotr Caban : msvcrt: Introduce fenv_decode helper in all runtime versions.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 5189d73b54ffd65e4f3ff9b3c90a8c1a2aa91cc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5189d73b54ffd65e4f3ff9b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 21 13:21:18 2021 +0200 msvcrt: Introduce fenv_decode helper in all runtime versions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e61c079f105..2b7249c5451 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5651,6 +5651,14 @@ static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) return TRUE; } #endif +#elif _MSVCR_VER >= 120 +#if (defined(__i386__) || defined(__x86_64__)) +static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) +{ + *x = *y = enc; + return TRUE; +} +#endif #endif #if _MSVCR_VER>=120 @@ -5887,15 +5895,10 @@ int CDECL fesetenv(const fenv_t *env) return 0; } -#if _MSVCR_VER>=140 if (!fenv_decode(env->_Fe_ctl, &x87_cw, &sse_cw)) return 1; if (!fenv_decode(env->_Fe_stat, &x87_stat, &sse_stat)) return 1; -#else - x87_cw = sse_cw = env->_Fe_ctl; - x87_stat = sse_stat = env->_Fe_stat; -#endif __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) );

1 0

Piotr Caban : msvcrt: Don't set x87 control word in x86_64 fesetenv.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 67c7c40351741ce3ceecddc22eb1e298af170eb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67c7c40351741ce3ceecddc2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 21 13:21:23 2021 +0200 msvcrt: Don't set x87 control word in x86_64 fesetenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2b7249c5451..922fd7818a5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5873,6 +5873,7 @@ int CDECL fesetenv(const fenv_t *env) { #if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) unsigned int x87_cw, sse_cw, x87_stat, sse_stat; +#ifdef __i386__ struct { WORD control_word; WORD unused1; @@ -5887,6 +5888,7 @@ int CDECL fesetenv(const fenv_t *env) WORD data_segment; WORD unused5; } fenv; +#endif TRACE( "(%p)\n", env ); @@ -5900,6 +5902,7 @@ int CDECL fesetenv(const fenv_t *env) if (!fenv_decode(env->_Fe_stat, &x87_stat, &sse_stat)) return 1; +#ifdef __i386__ __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) ); fenv.control_word &= ~0xc3d; @@ -5938,6 +5941,7 @@ int CDECL fesetenv(const fenv_t *env) __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" ); +#endif if (sse2_supported) {

1 0

Piotr Caban : msvcrt: Introduce fenv_encode helper in all runtime versions.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 2f9312fe5f923d048db0ef77666ef641deb868ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f9312fe5f923d048db0ef77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 21 13:21:33 2021 +0200 msvcrt: Introduce fenv_encode helper in all runtime versions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 922fd7818a5..4e5dedd3576 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5586,6 +5586,7 @@ static __msvcrt_ulong fenv_encode(unsigned int x, unsigned int y) { __msvcrt_ulong ret = 0; +#ifdef __i386__ if (x & _EM_INVALID) ret |= FENV_X_INVALID; if (x & _EM_DENORMAL) ret |= FENV_X_DENORMAL; if (x & _EM_ZERODIVIDE) ret |= FENV_X_ZERODIVIDE; @@ -5597,6 +5598,7 @@ static __msvcrt_ulong fenv_encode(unsigned int x, unsigned int y) if (x & _RC_DOWN) ret |= FENV_X_DOWN; if (x & _PC_24) ret |= FENV_X_24; if (x & _PC_53) ret |= FENV_X_53; +#endif x &= ~(_MCW_EM | _MCW_IC | _MCW_RC | _MCW_PC); if (y & _EM_INVALID) ret |= FENV_Y_INVALID; @@ -5652,6 +5654,11 @@ static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) } #endif #elif _MSVCR_VER >= 120 +static __msvcrt_ulong fenv_encode(unsigned int x, unsigned int y) +{ + return x | y; +} + #if (defined(__i386__) || defined(__x86_64__)) static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) { @@ -5716,16 +5723,8 @@ int CDECL fesetexceptflag(const fexcept_t *status, int excepts) return 0; fegetenv(&env); -#if _MSVCR_VER>=140 && (defined(__i386__) || defined(__x86_64__)) env._Fe_stat &= ~fenv_encode(excepts, excepts); env._Fe_stat |= *status & fenv_encode(excepts, excepts); -#elif _MSVCR_VER>=140 - env._Fe_stat &= ~fenv_encode(0, excepts); - env._Fe_stat |= *status & fenv_encode(0, excepts); -#else - env._Fe_stat &= ~excepts; - env._Fe_stat |= *status & excepts; -#endif return fesetenv(&env); } @@ -5738,13 +5737,7 @@ int CDECL feraiseexcept(int flags) flags &= FE_ALL_EXCEPT; fegetenv(&env); -#if _MSVCR_VER>=140 && defined(__i386__) env._Fe_stat |= fenv_encode(flags, flags); -#elif _MSVCR_VER>=140 - env._Fe_stat |= fenv_encode(0, flags); -#else - env._Fe_stat |= flags; -#endif return fesetenv(&env); } @@ -5757,11 +5750,7 @@ int CDECL feclearexcept(int flags) fegetenv(&env); flags &= FE_ALL_EXCEPT; -#if _MSVCR_VER>=140 env._Fe_stat &= ~fenv_encode(flags, flags); -#else - env._Fe_stat &= ~flags; -#endif return fesetenv(&env); } @@ -5774,10 +5763,8 @@ int CDECL fegetexceptflag(fexcept_t *status, int excepts) unsigned int x87, sse; _statusfp2(&x87, &sse); *status = fenv_encode(x87 & excepts, sse & excepts); -#elif _MSVCR_VER>=140 - *status = fenv_encode(0, _statusfp() & excepts); #else - *status = _statusfp() & excepts; + *status = fenv_encode(0, _statusfp() & excepts); #endif return 0; }

1 0

Alexandre Julliard : Wine release 6.13
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: website Branch: master Commit: 6e586cc6aa5c4c9405f9d2af20767ddc2d6f5a9b URL: https://source.winehq.org/git/website.git/?a=commit;h=6e586cc6aa5c4c9405f9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 22:11:20 2021 +0200 Wine release 6.13 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021072001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021072001.xml b/news/en/2021072001.xml new file mode 100644 index 00000000..3b5a11b5 --- /dev/null +++ b/news/en/2021072001.xml @@ -0,0 +1,17 @@ +<news> +<date>July 20, 2021</date> +<title>Wine 6.13 Released</title> +<body> + The Wine development release 6.13 is now available. + <a href="{$root}/announce/6.13">What's new</a> in this release: +<ul> + <li>Proper scrollbar theming.</li> + <li>More work towards WinSock PE conversion.</li> + <li>Preparation work for the GDI syscall interface.</li> + <li>Some progress on the IPHLPAPI PE conversion.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.13.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Ziqing Hui : d2d1/tests: Add an effects test.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: f41d2d7b44c9d717fbe5a0bd19967b733f31f58c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f41d2d7b44c9d717fbe5a0bd… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 20 16:16:07 2021 +0200 d2d1/tests: Add an effects test. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index e60128b38f2..41203f85019 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9678,6 +9678,47 @@ static void test_mt_factory(BOOL d3d11) ID2D1Factory_Release(factory); } +static void test_effect(BOOL d3d11) +{ + ID2D1Image *image_a, *image_b = NULL; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + ID2D1Factory1 *factory; + ID2D1Effect *effect; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D12DAffineTransform, &effect); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (hr != S_OK) + goto done; + ID2D1Effect_GetOutput(effect, &image_b); + todo_wine ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); + if (image_b) + ID2D1Image_Release(image_b); + ID2D1Image_Release(image_a); + +done: + ID2D1Effect_Release(effect); + ID2D1DeviceContext_Release(context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9739,6 +9780,7 @@ START_TEST(d2d1) queue_d3d10_test(test_colour_space); queue_test(test_geometry_group); queue_test(test_mt_factory); + queue_test(test_effect); run_queued_tests(); }

1 0

Ziqing Hui : d2d1: Add a ID2D1Image interface for effects.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: 0408225fd6377bc4458238512f5059c09cf9b6cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0408225fd6377bc445823851… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 20 16:16:08 2021 +0200 d2d1: Add a ID2D1Image interface for effects. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 5 +++- dlls/d2d1/device.c | 3 ++- dlls/d2d1/effect.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 5 +--- 4 files changed, 71 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index f25a7809b17..ce99e7c3432 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -568,10 +568,13 @@ void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDev struct d2d_effect { ID2D1Effect ID2D1Effect_iface; + ID2D1Image ID2D1Image_iface; LONG refcount; + + ID2D1Factory *factory; }; -void d2d_effect_init(struct d2d_effect *effect) DECLSPEC_HIDDEN; +void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 44840f0010f..0647bc57fc3 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1885,6 +1885,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface( static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceContext *iface, REFCLSID effect_id, ID2D1Effect **effect) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_effect *object; FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); @@ -1892,7 +1893,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - d2d_effect_init(object); + d2d_effect_init(object, context->factory); TRACE("Created effect %p.\n", object); *effect = &object->ID2D1Effect_iface; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index fb1e66a3d9b..7487c4c4539 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -27,6 +27,7 @@ static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, REFIID iid, void **out) { + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_ID2D1Effect) @@ -38,6 +39,14 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, R return S_OK; } + if (IsEqualGUID(iid, &IID_ID2D1Image) + || IsEqualGUID(iid, &IID_ID2D1Resource)) + { + ID2D1Image_AddRef(&effect->ID2D1Image_iface); + *out = &effect->ID2D1Image_iface; + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; @@ -62,7 +71,10 @@ static ULONG STDMETHODCALLTYPE d2d_effect_Release(ID2D1Effect *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + ID2D1Factory_Release(effect->factory); heap_free(effect); + } return refcount; } @@ -204,8 +216,59 @@ static const ID2D1EffectVtbl d2d_effect_vtbl = d2d_effect_GetOutput, }; -void d2d_effect_init(struct d2d_effect *effect) +static inline struct d2d_effect *impl_from_ID2D1Image(ID2D1Image *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Image_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_image_QueryInterface(ID2D1Image *iface, REFIID iid, void **out) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + return d2d_effect_QueryInterface(&effect->ID2D1Effect_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE d2d_effect_image_AddRef(ID2D1Image *iface) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p.\n", iface); + + return d2d_effect_AddRef(&effect->ID2D1Effect_iface); +} + +static ULONG STDMETHODCALLTYPE d2d_effect_image_Release(ID2D1Image *iface) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p.\n", iface); + + return d2d_effect_Release(&effect->ID2D1Effect_iface); +} + +static void STDMETHODCALLTYPE d2d_effect_image_GetFactory(ID2D1Image *iface, ID2D1Factory **factory) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = effect->factory); +} + +static const ID2D1ImageVtbl d2d_effect_image_vtbl = +{ + d2d_effect_image_QueryInterface, + d2d_effect_image_AddRef, + d2d_effect_image_Release, + d2d_effect_image_GetFactory, +}; + +void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) { effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; + effect->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; effect->refcount = 1; + ID2D1Factory_AddRef(effect->factory = factory); } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 41203f85019..5ac4aed7c4c 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9703,16 +9703,13 @@ static void test_effect(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - if (hr != S_OK) - goto done; + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID2D1Effect_GetOutput(effect, &image_b); todo_wine ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); if (image_b) ID2D1Image_Release(image_b); ID2D1Image_Release(image_a); -done: ID2D1Effect_Release(effect); ID2D1DeviceContext_Release(context); ID2D1Factory1_Release(factory);

1 0

Ziqing Hui : d2d1: Implement d2d_effect_GetOutput().
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: c6a40ff64ff910a613c40ce1e7ab02f24be2ca3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6a40ff64ff910a613c40ce1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 20 16:16:09 2021 +0200 d2d1: Implement d2d_effect_GetOutput(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 6 +++++- dlls/d2d1/tests/d2d1.c | 7 +++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 7487c4c4539..40dd2187953 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -190,7 +190,11 @@ static UINT32 STDMETHODCALLTYPE d2d_effect_GetInputCount(ID2D1Effect *iface) static void STDMETHODCALLTYPE d2d_effect_GetOutput(ID2D1Effect *iface, ID2D1Image **output) { - FIXME("iface %p, output %p stub!\n", iface, output); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); + + TRACE("iface %p, output %p.\n", iface, output); + + ID2D1Image_AddRef(*output = &effect->ID2D1Image_iface); } static const ID2D1EffectVtbl d2d_effect_vtbl = diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5ac4aed7c4c..1ee4941da99 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9680,7 +9680,7 @@ static void test_mt_factory(BOOL d3d11) static void test_effect(BOOL d3d11) { - ID2D1Image *image_a, *image_b = NULL; + ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; ID2D1Factory1 *factory; @@ -9705,9 +9705,8 @@ static void test_effect(BOOL d3d11) hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID2D1Effect_GetOutput(effect, &image_b); - todo_wine ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); - if (image_b) - ID2D1Image_Release(image_b); + ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); + ID2D1Image_Release(image_b); ID2D1Image_Release(image_a); ID2D1Effect_Release(effect);

1 0