wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Piotr Caban : msvcrt: Don't reset x87 in x86_64 fpreset.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: f53b2095f36f1753b9a50d4dcb2eeab6c8c796cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f53b2095f36f1753b9a50d4d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:04:56 2021 +0200 msvcrt: Don't reset x87 in x86_64 fpreset. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d45327b8f1f..c385dd036b7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5901,7 +5901,7 @@ int CDECL _finite(double num) */ void CDECL _fpreset(void) { -#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) const unsigned int x86_cw = 0x27f; __asm__ __volatile__( "fninit; fldcw %0" : : "m" (x86_cw) ); if (sse2_supported) @@ -5909,6 +5909,9 @@ void CDECL _fpreset(void) unsigned int cw = _MCW_EM, sw = 0; _setfp_sse(&cw, ~0, &sw, ~0); } +#elif defined(__x86_64__) + unsigned int cw = _MCW_EM, sw = 0; + _setfp_sse(&cw, ~0, &sw, ~0); #else FIXME( "not implemented\n" ); #endif

1 0

Piotr Caban : msvcrt: Don't clear x87 status word x86_64 _clearfp.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: f46ef017cd6bf47c69c122e206ef0f4872f566a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f46ef017cd6bf47c69c122e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:04:48 2021 +0200 msvcrt: Don't clear x87 status word x86_64 _clearfp. 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, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ce85cb0da43..d45327b8f1f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5315,7 +5315,7 @@ unsigned int CDECL _statusfp(void) unsigned int CDECL _clearfp(void) { unsigned int flags = 0; -#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) unsigned long fpword; __asm__ __volatile__( "fnstsw %0; fnclex" : "=m" (fpword) ); @@ -5333,6 +5333,8 @@ unsigned int CDECL _clearfp(void) _setfp_sse(NULL, 0, &sse_sw, _MCW_EM); flags |= sse_sw; } +#elif defined(__x86_64__) + _setfp_sse(NULL, 0, &flags, _MCW_EM); #elif defined(__aarch64__) ULONG_PTR fpsr;

1 0

Piotr Caban : msvcrt: Don't check x87 status word in x86_64 _statusfp.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: ab3afe8347d55e2f0fed39da9277ae29192260e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab3afe8347d55e2f0fed39da… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:04:46 2021 +0200 msvcrt: Don't check x87 status word in x86_64 _statusfp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index c8a666568de..ce85cb0da43 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5236,11 +5236,9 @@ static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask, #endif /********************************************************************** - * _statusfp2 (MSVCRT.@) - * - * Not exported by native msvcrt, added in msvcr80. + * _statusfp2 (MSVCR80.@) */ -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw ) { #if defined(__GNUC__) || defined(__clang__) @@ -5277,12 +5275,14 @@ void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw ) unsigned int CDECL _statusfp(void) { unsigned int flags = 0; -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) unsigned int x86_sw, sse2_sw; _statusfp2( &x86_sw, &sse2_sw ); /* FIXME: there's no definition for ambiguous status, just return all status bits for now */ flags = x86_sw | sse2_sw; +#elif defined(__x86_64__) + _setfp_sse(NULL, 0, &flags, 0); #elif defined(__aarch64__) ULONG_PTR fpsr;

1 0

Piotr Caban : msvcrt: Introduce _setfp_sse helper to access mxcsr register.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 24fb503e2f9d3c87c6bcaeb6e02043873c5a8294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24fb503e2f9d3c87c6bcaeb6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:04:42 2021 +0200 msvcrt: Introduce _setfp_sse helper to access mxcsr register. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 275 ++++++++++++++++++++++------------------------------- 1 file changed, 115 insertions(+), 160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24fb503e2f9d3c87c6bc…

1 0

Martin Storsjö : msvcrt: Implement fesetenv for arm.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 8c022396191b94472223b4f22f37dda14991a227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c022396191b94472223b4f2… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Aug 4 18:04:37 2021 +0200 msvcrt: Implement fesetenv for arm. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 64ca7197101..19c057cac1d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5731,7 +5731,7 @@ static __msvcrt_ulong fenv_encode(unsigned int x, unsigned int y) return x | y; } -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) { if (enc & 0x20) @@ -6069,6 +6069,32 @@ int CDECL fesetenv(const fenv_t *env) __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); _control87(fp_cw, 0xffffffff); return 0; +#elif defined(__arm__) && !defined(__SOFTFP__) + DWORD fpscr; + unsigned int tmp, fp_cw, fp_stat; + + if (!env->_Fe_ctl && !env->_Fe_stat) { + _fpreset(); + return 0; + } + + if (!fenv_decode(env->_Fe_ctl, &tmp, &fp_cw)) + return 1; + if (!fenv_decode(env->_Fe_stat, &tmp, &fp_stat)) + return 1; + + _control87(_MCW_EM, _MCW_EM); + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); + fpscr &= ~0x9f; + if (fp_stat & _SW_INVALID) fpscr |= 0x1; + if (fp_stat & _SW_ZERODIVIDE) fpscr |= 0x2; + if (fp_stat & _SW_OVERFLOW) fpscr |= 0x4; + if (fp_stat & _SW_UNDERFLOW) fpscr |= 0x8; + if (fp_stat & _SW_INEXACT) fpscr |= 0x10; + if (fp_stat & _SW_DENORMAL) fpscr |= 0x80; + __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); + _control87(fp_cw, 0xffffffff); + return 0; #else FIXME( "not implemented\n" ); #endif

1 0

Martin Storsjö : msvcrt: Implement fesetenv for arm64.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 6391a9f8978b42b71b37c27b673a0a13c21ea577 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6391a9f8978b42b71b37c27b… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Aug 4 18:04:32 2021 +0200 msvcrt: Implement fesetenv for arm64. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2ba810a9903..64ca7197101 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5626,7 +5626,7 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask return 0; } -#if _MSVCR_VER >= 140 +#if _MSVCR_VER >= 140 && (defined(__i386__) || defined(__x86_64__)) enum fenv_masks { FENV_X_INVALID = 0x00100010, @@ -5689,7 +5689,6 @@ static __msvcrt_ulong fenv_encode(unsigned int x, unsigned int y) } /* decodes x87/sse control/status word, returns FALSE on error */ -#if (defined(__i386__) || defined(__x86_64__)) static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) { *x = *y = 0; @@ -5723,16 +5722,21 @@ static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) } return TRUE; } -#endif #elif _MSVCR_VER >= 120 static __msvcrt_ulong fenv_encode(unsigned int x, unsigned int y) { + if (y & _EM_DENORMAL) + y = (y & ~_EM_DENORMAL) | 0x20; + return x | y; } -#if (defined(__i386__) || defined(__x86_64__)) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) { + if (enc & 0x20) + enc = (enc & ~0x20) | _EM_DENORMAL; + *x = *y = enc; return TRUE; } @@ -6038,6 +6042,32 @@ int CDECL fesetenv(const fenv_t *env) __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); } + return 0; +#elif defined(__aarch64__) + ULONG_PTR fpsr; + unsigned int tmp, fp_cw, fp_stat; + + if (!env->_Fe_ctl && !env->_Fe_stat) { + _fpreset(); + return 0; + } + + if (!fenv_decode(env->_Fe_ctl, &tmp, &fp_cw)) + return 1; + if (!fenv_decode(env->_Fe_stat, &tmp, &fp_stat)) + return 1; + + _control87(_MCW_EM, _MCW_EM); + __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); + fpsr &= ~0x9f; + if (fp_stat & _SW_INVALID) fpsr |= 0x1; + if (fp_stat & _SW_ZERODIVIDE) fpsr |= 0x2; + if (fp_stat & _SW_OVERFLOW) fpsr |= 0x4; + if (fp_stat & _SW_UNDERFLOW) fpsr |= 0x8; + if (fp_stat & _SW_INEXACT) fpsr |= 0x10; + if (fp_stat & _SW_DENORMAL) fpsr |= 0x80; + __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); + _control87(fp_cw, 0xffffffff); return 0; #else FIXME( "not implemented\n" );

1 0

Martin Storsjö : ucrtbase: Update the fenv test for non-x86 architectures.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: d13bf70a8ef213191dba454d3ed62e0cae1affdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d13bf70a8ef213191dba454d… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Aug 4 18:04:28 2021 +0200 ucrtbase: Update the fenv test for non-x86 architectures. The x86 style x87/sse split of status bits isn't present on arm64. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 96dd1acfe54..c2b6dc18d28 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1377,14 +1377,15 @@ static unsigned long fenv_encode(unsigned int e) #if defined(__i386__) return e<<24 | e<<16 | e; -#else +#elif defined(__x86_64__) return e<<24 | e; +#else + return e; #endif } static void test_fenv(void) { -#if defined(__i386__) || defined(__x86_64__) static const int tests[] = { 0, FE_INEXACT, @@ -1425,11 +1426,13 @@ static void test_fenv(void) ret = fegetenv(&env); ok(!ret, "fegetenv returned %x\n", ret); +#if defined(__i386__) || defined(__x86_64__) if (env._Fe_ctl >> 24 != (env._Fe_ctl & 0xff)) { win_skip("fenv_t format not supported (too old ucrtbase)\n"); return; } +#endif fesetround(FE_UPWARD); ok(!env._Fe_stat, "env._Fe_stat = %lx\n", env._Fe_stat); ret = fegetenv(&env2); @@ -1485,13 +1488,13 @@ static void test_fenv(void) ret = fegetexceptflag(&except, ~0); ok(!ret, "Test %d: fegetexceptflag returned %x.\n", i, ret); ok(except == fenv_encode(flags), - "Test %d: expected %x, got %lx\n", i, flags, except); + "Test %d: expected %lx, got %lx\n", i, fenv_encode(flags), except); except = ~0; ret = fegetexceptflag(&except, tests[i]); ok(!ret, "Test %d: fegetexceptflag returned %x.\n", i, ret); ok(except == fenv_encode(tests[i]), - "Test %d: expected %x, got %lx\n", i, tests[i], except); + "Test %d: expected %lx, got %lx\n", i, fenv_encode(tests[i]), except); } for(i=0; i<ARRAY_SIZE(tests); i++) { @@ -1534,7 +1537,6 @@ static void test_fenv(void) ok(!ret, "feclearexceptflag returned %x\n", ret); except = fetestexcept(FE_ALL_EXCEPT); ok(!except, "expected 0, got %lx\n", except); -#endif } START_TEST(misc)

1 0

Jacek Caban : gdi32: Use ntgdi name for SetVirtualResolution.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: f3d01ecdd145bbe029aa1059403736ac8808c5fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3d01ecdd145bbe029aa1059… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:23:26 2021 +0200 gdi32: Use ntgdi name for SetVirtualResolution. 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/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/mapping.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 70dbade998a..773023f63f9 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -281,7 +281,7 @@ void DC_InitDC( DC* dc ) NtGdiSelectBrush( dc->hSelf, dc->hBrush ); NtGdiSelectFont( dc->hSelf, dc->hFont ); update_dc_clipping( dc ); - SetVirtualResolution( dc->hSelf, 0, 0, 0, 0 ); + NtGdiSetVirtualResolution( dc->hSelf, 0, 0, 0, 0 ); physdev = GET_DC_PHYSDEV( dc, pSetBoundsRect ); physdev->funcs->pSetBoundsRect( physdev, &dc->bounds, dc->bounds_enabled ? DCB_ENABLE : DCB_DISABLE ); } @@ -493,7 +493,7 @@ static BOOL reset_dc_state( HDC hdc ) NtGdiSelectBrush( hdc, GetStockObject( WHITE_BRUSH )); NtGdiSelectFont( hdc, GetStockObject( SYSTEM_FONT )); NtGdiSelectPen( hdc, GetStockObject( BLACK_PEN )); - SetVirtualResolution( hdc, 0, 0, 0, 0 ); + NtGdiSetVirtualResolution( hdc, 0, 0, 0, 0 ); GDISelectPalette( hdc, GetStockObject( DEFAULT_PALETTE ), FALSE ); NtGdiSetBoundsRect( hdc, NULL, DCB_DISABLE ); AbortPath( hdc ); diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 6aa15b49c02..7969029151a 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -367,7 +367,7 @@ HDC WINAPI CreateEnhMetaFileW( if (!hdc) DeleteDC( ref_dc ); - SetVirtualResolution(physDev->dev.hdc, 0, 0, 0, 0); + NtGdiSetVirtualResolution(physDev->dev.hdc, 0, 0, 0, 0); physDev->emh->iType = EMR_HEADER; physDev->emh->nSize = size; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 049a61d4ab2..7ff32c58c26 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -520,7 +520,7 @@ @ stdcall SetTextJustification(long long long) @ stdcall SetViewportExtEx(long long long ptr) @ stdcall SetViewportOrgEx(long long long ptr) -@ stdcall SetVirtualResolution(long long long long long) +@ stdcall SetVirtualResolution(long long long long long) NtGdiSetVirtualResolution @ stdcall SetWinMetaFileBits(long ptr long ptr) @ stdcall SetWindowExtEx(long long long ptr) @ stdcall SetWindowOrgEx(long long long ptr) diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index f3d97570c72..6eafc4a362c 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -597,7 +597,7 @@ BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform ) /*********************************************************************** - * SetVirtualResolution (GDI32.@) + * NtGdiSetVirtualResolution (win32u.@) * * Undocumented on msdn. * @@ -622,8 +622,8 @@ BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform ) * Calling with the last four params equal to zero sets the values * back to their defaults obtained by calls to GetDeviceCaps. */ -BOOL WINAPI SetVirtualResolution(HDC hdc, DWORD horz_res, DWORD vert_res, - DWORD horz_size, DWORD vert_size) +BOOL WINAPI NtGdiSetVirtualResolution( HDC hdc, DWORD horz_res, DWORD vert_res, + DWORD horz_size, DWORD vert_size ) { DC * dc; TRACE("(%p %d %d %d %d)\n", hdc, horz_res, vert_res, horz_size, vert_size); diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 53e9e3843fe..f49b03cd127 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -262,7 +262,7 @@ static DC *MFDRV_AllocMetaFile(void) physDev->mh->mtMaxRecord = 0; physDev->mh->mtNoParameters = 0; - SetVirtualResolution( physDev->dev.hdc, 0, 0, 0, 0); + NtGdiSetVirtualResolution( physDev->dev.hdc, 0, 0, 0, 0); return dc; }

1 0

Jacek Caban : gdi32: Use ntgdi interface for GetTransform and GetWorldTransform.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: b5780cbc5b0dd557b35cbdc982cdda91e0b13ba3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5780cbc5b0dd557b35cbdc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:23:17 2021 +0200 gdi32: Use ntgdi interface for GetTransform and GetWorldTransform. 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/dc.c | 18 ++---------------- dlls/gdi32/enhmfdrv/bitblt.c | 2 +- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/gdidc.c | 8 ++++++++ 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 8c03392c513..70dbade998a 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -881,21 +881,7 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) /*********************************************************************** - * GetWorldTransform (GDI32.@) - */ -BOOL WINAPI GetWorldTransform( HDC hdc, LPXFORM xform ) -{ - DC * dc; - if (!xform) return FALSE; - if (!(dc = get_dc_ptr( hdc ))) return FALSE; - *xform = dc->xformWorld2Wnd; - release_dc_ptr( dc ); - return TRUE; -} - - -/*********************************************************************** - * GetTransform (GDI32.@) + * NtGdiGetTransform (win32u.@) * * Undocumented * @@ -911,7 +897,7 @@ BOOL WINAPI GetWorldTransform( HDC hdc, LPXFORM xform ) * xform [O] The xform. * */ -BOOL WINAPI GetTransform( HDC hdc, DWORD which, XFORM *xform ) +BOOL WINAPI NtGdiGetTransform( HDC hdc, DWORD which, XFORM *xform ) { BOOL ret = TRUE; DC *dc = get_dc_ptr( hdc ); diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 2ef2081be71..ca3455459e5 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -85,7 +85,7 @@ static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, struct bitblt_coords *dst, PHYSD emr_stretchblt->cySrc = src->log_height; } emr->dwRop = rop; - GetTransform(dev_src->hdc, 0x204, &emr->xformSrc); + NtGdiGetTransform( dev_src->hdc, 0x204, &emr->xformSrc ); emr->crBkColorSrc = GetBkColor(dev_src->hdc); emr->iUsageSrc = DIB_RGB_COLORS; emr->offBmiSrc = emr_size; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 41f27fe7f57..049a61d4ab2 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -361,7 +361,7 @@ @ stdcall GetTextFaceW(long long ptr) @ stdcall GetTextMetricsA(long ptr) @ stdcall GetTextMetricsW(long ptr) -@ stdcall GetTransform(long long ptr) +@ stdcall GetTransform(long long ptr) NtGdiGetTransform @ stdcall GetViewportExtEx(long ptr) @ stdcall GetViewportOrgEx(long ptr) @ stdcall GetWinMetaFileBits(long long ptr long long) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 1b9057b33e0..baa6c199b87 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -418,6 +418,14 @@ BOOL WINAPI GetViewportOrgEx( HDC hdc, POINT *point ) return TRUE; } +/*********************************************************************** + * GetWorldTransform (GDI32.@) + */ +BOOL WINAPI GetWorldTransform( HDC hdc, XFORM *xform ) +{ + return NtGdiGetTransform( hdc, 0x203, xform ); +} + /*********************************************************************** * SetStretchBltMode (GDI32.@) */

1 0

Jacek Caban : gdi32: Remove no longer used clipping driver entry points.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 48cd631413bb9a647f5237590653ba81fe4daf27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48cd631413bb9a647f523759… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:22:53 2021 +0200 gdi32: Remove no longer used clipping driver entry points. 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/clipping.c | 24 ------------------------ dlls/gdi32/dibdrv/dc.c | 8 -------- dlls/gdi32/driver.c | 4 ---- dlls/gdi32/enhmfdrv/init.c | 4 ---- dlls/gdi32/font.c | 4 ---- dlls/gdi32/mfdrv/init.c | 4 ---- dlls/gdi32/ntgdi_private.h | 4 ---- dlls/gdi32/path.c | 4 ---- dlls/wineandroid.drv/init.c | 4 ---- dlls/winemac.drv/gdi.c | 4 ---- dlls/wineps.drv/init.c | 4 ---- dlls/winex11.drv/init.c | 4 ---- dlls/winex11.drv/xrender.c | 4 ---- include/wine/gdi_driver.h | 6 +----- 14 files changed, 1 insertion(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=48cd631413bb9a647f52…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021