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

[PATCH v2 08/10] gdi32: Use NtGdiRoundRect for RoundRect implementation.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 15 +------- dlls/gdi32/enhmfdrv/graphics.c | 62 ++++++++++++++++++++++------------ dlls/gdi32/gdi_private.h | 4 +++ dlls/gdi32/gdidc.c | 22 ++++++++++++ dlls/gdi32/mfdrv/graphics.c | 10 +++--- dlls/gdi32/mfdrv/init.c | 13 ++++++- dlls/gdi32/mfdrv/metafiledrv.h | 4 +-- dlls/gdi32/painting.c | 8 ++--- 8 files changed, 89 insertions(+), 49 deletions(-)

2 1

[PATCH v2 07/10] gdi32: Use NtGdiEllipse for Ellipse implementation.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------- dlls/gdi32/enhmfdrv/graphics.c | 59 +++++++++++++++++++++------------- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 15 +++++++++ dlls/gdi32/mfdrv/graphics.c | 6 ++-- dlls/gdi32/mfdrv/init.c | 11 ++++++- dlls/gdi32/mfdrv/metafiledrv.h | 3 +- dlls/gdi32/painting.c | 7 ++-- 8 files changed, 73 insertions(+), 45 deletions(-)

2 1

[PATCH v2 06/10] gdi32: Handle EMFs directly in arc functions.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 60 +++---------------------------- dlls/gdi32/enhmfdrv/graphics.c | 66 ++++++++++++++++++++++++---------- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 28 +++++++++++++++ 4 files changed, 83 insertions(+), 74 deletions(-)

2 1

[PATCH v2 05/10] gdi32: Store graphics mode in DC_ATTR.
by Jacek Caban 21 Jul '21

21 Jul '21

2 1

[PATCH v2 04/10] gdi32: Handle EMFs directly in MoveToEx.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 13 +------------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 7 ++++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 4 ++++ 6 files changed, 11 insertions(+), 17 deletions(-)

2 1

[PATCH v2 03/10] gdi32: Use DC_ATTR for GetCurrentPositionEx implementation.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 13 ------------- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/tests/metafile.c | 3 +++ 3 files changed, 14 insertions(+), 13 deletions(-)

2 1

[PATCH v2 02/10] gdi32: Handle EMFs recording directly in LineTo implementation.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 13 +------------ dlls/gdi32/enhmfdrv/graphics.c | 28 +++++++++++++++------------- dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/gdi_private.h | 12 ++++++++++-- dlls/gdi32/gdidc.c | 16 ++++++++++++++++ dlls/gdi32/objects.c | 2 +- include/ntgdi.h | 1 + 7 files changed, 45 insertions(+), 28 deletions(-)

2 1

[PATCH v2 01/10] gdi32/tests: Silence noisy traces.
by Jacek Caban 21 Jul '21

21 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 112 +++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 47 deletions(-)

2 1

[PATCH] oleaut32/tests: Remove unneeded casts in vartest.
by Francois Gouget 21 Jul '21

21 Jul '21

The error codes are already defined with an HRESULT cast so there is no need to cast them again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index df018c007d4..3822bb62dec 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1288,8 +1288,8 @@ static HRESULT convert_str( const char *str, INT dig, ULONG flags, static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULONG b, ULONG c, INT d, INT e, INT f ) { - ok_(__FILE__,line)(hres == (HRESULT)S_OK, "returned %08x\n", hres); - if (hres == (HRESULT)S_OK) + ok_(__FILE__,line)(hres == S_OK, "returned %08x\n", hres); + if (hres == S_OK) { ok_(__FILE__,line)(np->cDig == a, "Expected cDig = %d, got %d\n", a, np->cDig); ok_(__FILE__,line)(np->dwInFlags == b, "Expected dwInFlags = 0x%x, got 0x%x\n", b, np->dwInFlags); @@ -1306,7 +1306,7 @@ static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULON #define CONVERT(str,flags) CONVERTN(str,sizeof(rgb),flags) #define EXPECT(a,b,c,d,e,f) expect_NumFromStr( __LINE__, hres, &np, a, b, c, d, e, f ) #define EXPECTRGB(a,b) ok(rgb[a] == b, "Digit[%d], expected %d, got %d\n", a, b, rgb[a]) -#define EXPECTFAIL ok(hres == (HRESULT)DISP_E_TYPEMISMATCH, "Call succeeded, hres = %08x\n", hres) +#define EXPECTFAIL ok(hres == DISP_E_TYPEMISMATCH, "Call succeeded, hres = %08x\n", hres) #define EXPECT2(a,b) EXPECTRGB(0,a); EXPECTRGB(1,b) static void test_VarParseNumFromStrEn(void) @@ -2202,10 +2202,10 @@ static HRESULT (WINAPI *pVarNumFromParseNum)(NUMPARSE*,BYTE*,ULONG,VARIANT*); np.cDig = (a); np.dwInFlags = (b); np.dwOutFlags = (c); np.cchUsed = (d); \ np.nBaseShift = (e); np.nPwr10 = (f); hres = pVarNumFromParseNum(&np, rgb, bits, &vOut) static const char *szFailOverflow = "Expected overflow, hres = %08x\n"; -#define EXPECT_OVERFLOW ok(hres == (HRESULT)DISP_E_OVERFLOW, szFailOverflow, hres) +#define EXPECT_OVERFLOW ok(hres == DISP_E_OVERFLOW, szFailOverflow, hres) static const char *szFailOk = "Call failed, hres = %08x\n"; -#define EXPECT_OK ok(hres == (HRESULT)S_OK, szFailOk, hres); \ - if (hres == (HRESULT)S_OK) +#define EXPECT_OK ok(hres == S_OK, szFailOk, hres); \ + if (hres == S_OK) #define EXPECT_TYPE(typ) ok(V_VT(&vOut) == typ,"Expected Type = " #typ ", got %d\n", V_VT(&vOut)) #define EXPECT_I1(val) EXPECT_OK { EXPECT_TYPE(VT_I1); \ ok(V_I1(&vOut) == val, "Expected i1 = %d, got %d\n", (signed char)val, V_I1(&vOut)); } -- 2.20.1

1 0

[PATCH 4/4 v2] msvcrt: Introduce fenv_encode helper in all runtime versions.
by Piotr Caban 21 Jul '21

21 Jul '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-)

1 0