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

Jacek Caban : gdi32: Use NtGdiPolyPolyDraw for PolyPolyline implementation.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 62fc320c84ec517afa8ee3582243efbf1ab08253 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62fc320c84ec517afa8ee358… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:26:15 2021 +0200 gdi32: Use NtGdiPolyPolyDraw for PolyPolyline 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/graphics.c | 36 +++++++++++++++++++++--------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 14 ++++++++++++++ dlls/gdi32/painting.c | 26 ++++++-------------------- 5 files changed, 44 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index c4037e5fa99..313535de973 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -707,18 +707,6 @@ static BOOL CDECL emfpathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE next->funcs->pPolyDraw( next, pts, types, count )); } -/*********************************************************************** - * emfpathdrv_PolyPolyline - */ -static BOOL CDECL emfpathdrv_PolyPolyline( PHYSDEV dev, const POINT *pts, const DWORD *counts, DWORD polylines ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyPolyline ); - - return (emfdev->funcs->pPolyPolyline( emfdev, pts, counts, polylines ) && - next->funcs->pPolyPolyline( next, pts, counts, polylines )); -} - /*********************************************************************** * emfpathdrv_Polyline */ @@ -819,7 +807,7 @@ static const struct gdi_dc_funcs emfpath_driver = emfpathdrv_PolyBezierTo, /* pPolyBezierTo */ emfpathdrv_PolyDraw, /* pPolyDraw */ NULL, /* pPolyPolygon */ - emfpathdrv_PolyPolyline, /* pPolyPolyline */ + NULL, /* pPolyPolyline */ NULL, /* pPolygon */ emfpathdrv_Polyline, /* pPolyline */ emfpathdrv_PolylineTo, /* pPolylineTo */ diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 6d15946d2fb..852dd9de68f 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -626,15 +626,13 @@ BOOL CDECL EMFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) /********************************************************************** - * EMFDRV_PolyPolylinegon + * EMFDC_PolyPolylinegon * * Helper for EMFDRV_PolyPoly{line|gon} */ -static BOOL -EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polys, - DWORD iType) +static BOOL EMFDC_PolyPolylinegon( EMFDRV_PDEVICE *emf, const POINT *pt, const INT *counts, + UINT polys, DWORD type) { - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRPOLYPOLYLINE *emr; DWORD cptl = 0, poly, size; BOOL ret, use_small_emr, bounds_valid = TRUE; @@ -654,11 +652,11 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po emr = HeapAlloc( GetProcessHeap(), 0, size ); - emr->emr.iType = iType; + emr->emr.iType = type; if(use_small_emr) emr->emr.iType += EMR_POLYPOLYLINE16 - EMR_POLYPOLYLINE; emr->emr.nSize = size; - if(bounds_valid && !physDev->path) + if(bounds_valid && !emf->path) get_points_bounds( &emr->rclBounds, pt, cptl, 0 ); else emr->rclBounds = empty_bounds; @@ -671,25 +669,33 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po store_points( (POINTL *)(emr->aPolyCounts + polys), pt, cptl, use_small_emr ); } - ret = EMFDRV_WriteRecord( dev, &emr->emr ); + ret = EMFDRV_WriteRecord( &emf->dev, &emr->emr ); if(ret && !bounds_valid) { ret = FALSE; SetLastError( ERROR_INVALID_PARAMETER ); } - if(ret && !physDev->path) - EMFDRV_UpdateBBox( dev, &emr->rclBounds ); + if(ret && !emf->path) + EMFDRV_UpdateBBox( &emf->dev, &emr->rclBounds ); HeapFree( GetProcessHeap(), 0, emr ); return ret; } /********************************************************************** - * EMFDRV_PolyPolyline + * EMFDC_PolyPolyline + */ +BOOL EMFDC_PolyPolyline( DC_ATTR *dc_attr, const POINT *pt, const DWORD *counts, DWORD polys) +{ + return EMFDC_PolyPolylinegon( dc_attr->emf, pt, (const INT *)counts, polys, EMR_POLYPOLYLINE ); +} + +/********************************************************************** + * EMFDRV_PolyPoline */ -BOOL CDECL EMFDRV_PolyPolyline(PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polys) +BOOL CDECL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT *pt, const DWORD* counts, UINT polys ) { - return EMFDRV_PolyPolylinegon( dev, pt, (const INT *)counts, polys, - EMR_POLYPOLYLINE ); + /* FIXME: update bounding rect */ + return TRUE; } /********************************************************************** @@ -697,7 +703,7 @@ BOOL CDECL EMFDRV_PolyPolyline(PHYSDEV dev, const POINT* pt, const DWORD* counts */ BOOL EMFDC_PolyPolygon( DC_ATTR *dc_attr, const POINT *pt, const INT *counts, UINT polys ) { - return EMFDRV_PolyPolylinegon( dc_attr->emf, pt, counts, polys, EMR_POLYPOLYGON ); + return EMFDC_PolyPolylinegon( dc_attr->emf, pt, counts, polys, EMR_POLYPOLYGON ); } /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 645e78805fd..424d432f0d0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -68,6 +68,8 @@ extern BOOL EMFDC_Ellipse( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_PolyPolyline( DC_ATTR *dc_attr, const POINT *points, const DWORD *counts, + DWORD polys ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyPolygon( DC_ATTR *dc_attr, const POINT *points, const INT *counts, UINT polys ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Polygon( DC_ATTR *dc_attr, const POINT *points, INT count ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index d224a59941a..89405358194 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -266,3 +266,17 @@ BOOL WINAPI PolyPolygon( HDC hdc, const POINT *points, const INT *counts, UINT p if (dc_attr->emf && !EMFDC_PolyPolygon( dc_attr, points, counts, polygons )) return FALSE; return NtGdiPolyPolyDraw( hdc, points, (const UINT *)counts, polygons, NtGdiPolyPolygon ); } + +/********************************************************************** + * PolyPolyline (GDI32.@) + */ +BOOL WINAPI PolyPolyline( HDC hdc, const POINT *points, const DWORD *counts, DWORD polylines ) +{ + DC_ATTR *dc_attr; + + TRACE( "%p, %p, %p, %u\n", hdc, points, counts, polylines ); + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_PolyPolyline( dc_attr, points, counts, polylines )) return FALSE; + return NtGdiPolyPolyDraw( hdc, points, counts, polylines, NtGdiPolyPolyline ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index f8544b209d8..5be668cd282 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -632,6 +632,12 @@ ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts physdev = GET_DC_PHYSDEV( dc, pPolyPolygon ); ret = physdev->funcs->pPolyPolygon( physdev, points, (const INT *)counts, count ); break; + + case NtGdiPolyPolyline: + physdev = GET_DC_PHYSDEV( dc, pPolyPolyline ); + ret = physdev->funcs->pPolyPolyline( physdev, points, counts, count ); + break; + default: WARN( "invalid function %u\n", function ); ret = FALSE; @@ -642,26 +648,6 @@ ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts return ret; } -/********************************************************************** - * PolyPolyline (GDI32.@) - */ -BOOL WINAPI PolyPolyline( HDC hdc, const POINT* pt, const DWORD* counts, - DWORD polylines ) -{ - PHYSDEV physdev; - BOOL ret; - DC * dc = get_dc_ptr( hdc ); - - TRACE( "%p, %p, %p, %u\n", hdc, pt, counts, polylines ); - - if (!dc) return FALSE; - update_dc( dc ); - physdev = GET_DC_PHYSDEV( dc, pPolyPolyline ); - ret = physdev->funcs->pPolyPolyline( physdev, pt, counts, polylines ); - release_dc_ptr( dc ); - return ret; -} - /********************************************************************** * ExtFloodFill (GDI32.@) */

1 0

Jacek Caban : gdi32: Use NtGdiPolyPolyDraw for Polygon implementation.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: c64bfb5433e0405f1dc5a82ea012879c581f3b23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c64bfb5433e0405f1dc5a82e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:26:00 2021 +0200 gdi32: Use NtGdiPolyPolyDraw for Polygon 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/font.c | 6 ++++-- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 14 +++++++------- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/painting.c | 20 -------------------- 11 files changed, 34 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c64bfb5433e0405f1dc5…

1 0

Jacek Caban : gdi32: Use NtGdiPolyPolyDraw for PolyBezier implementation.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 5be1b7c75b298e3378d1627d08ce68853d016256 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5be1b7c75b298e3378d1627d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:27:07 2021 +0200 gdi32: Use NtGdiPolyPolyDraw for PolyBezier 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/graphics.c | 11 +++++++++- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 14 +++++++++++++ dlls/gdi32/painting.c | 46 ++++++++++-------------------------------- 5 files changed, 37 insertions(+), 49 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index e8b6c8e74ae..d387d4810ab 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -671,18 +671,6 @@ static BOOL CDECL emfpathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, next->funcs->pExtTextOut( next, x, y, flags, rect, str, count, dx )); } -/*********************************************************************** - * emfpathdrv_PolyBezier - */ -static BOOL CDECL emfpathdrv_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyBezier ); - - return (emfdev->funcs->pPolyBezier( emfdev, pts, count ) && - next->funcs->pPolyBezier( next, pts, count )); -} - /*********************************************************************** * emfpathdrv_PolyBezierTo */ @@ -791,7 +779,7 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pPaintRgn */ NULL, /* pPatBlt */ NULL, /* pPie */ - emfpathdrv_PolyBezier, /* pPolyBezier */ + NULL, /* pPolyBezier */ emfpathdrv_PolyBezierTo, /* pPolyBezierTo */ emfpathdrv_PolyDraw, /* pPolyDraw */ NULL, /* pPolyPolygon */ diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 0c6c581b490..082432fa079 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -608,12 +608,21 @@ BOOL EMFDC_Polygon( DC_ATTR *dc_attr, const POINT *pt, INT count ) return EMFDRV_Polylinegon( dc_attr->emf, pt, count, EMR_POLYGON ); } +/********************************************************************** + * EMFDC_PolyBezier + */ +BOOL EMFDC_PolyBezier( DC_ATTR *dc_attr, const POINT *pts, DWORD count ) +{ + return EMFDRV_Polylinegon( dc_attr->emf, pts, count, EMR_POLYBEZIER ); +} + /********************************************************************** * EMFDRV_PolyBezier */ BOOL CDECL EMFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) { - return EMFDRV_Polylinegon( dev, pts, count, EMR_POLYBEZIER ); + /* FIXME: update bounding rect */ + return TRUE; } /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 53df73f1717..fcb7195b302 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -69,6 +69,7 @@ extern BOOL EMFDC_Ellipse( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_PolyBezier( DC_ATTR *dc_attr, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyPolyline( DC_ATTR *dc_attr, const POINT *points, const DWORD *counts, DWORD polys ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolyPolygon( DC_ATTR *dc_attr, const POINT *points, const INT *counts, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 8486a7c5621..d7cd6a45f14 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -295,3 +295,17 @@ BOOL WINAPI PolyPolyline( HDC hdc, const POINT *points, const DWORD *counts, DWO if (dc_attr->emf && !EMFDC_PolyPolyline( dc_attr, points, counts, polylines )) return FALSE; return NtGdiPolyPolyDraw( hdc, points, counts, polylines, NtGdiPolyPolyline ); } + +/****************************************************************************** + * PolyBezier (GDI32.@) + */ +BOOL WINAPI PolyBezier( HDC hdc, const POINT *points, DWORD count ) +{ + DC_ATTR *dc_attr; + + TRACE( "%p, %p, %u\n", hdc, points, count ); + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_PolyBezier( dc_attr, points, count )) return FALSE; + return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolyBezier ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index e4adb4301e3..ea353aaca9e 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -625,6 +625,17 @@ ULONG WINAPI NtGdiPolyPolyDraw( HDC hdc, const POINT *points, const UINT *counts ret = physdev->funcs->pPolyPolyline( physdev, points, counts, count ); break; + case NtGdiPolyBezier: + /* *counts must be 3 * n + 1 (where n >= 1) */ + if (count == 1 && *counts != 1 && *counts % 3 == 1) + { + physdev = GET_DC_PHYSDEV( dc, pPolyBezier ); + ret = physdev->funcs->pPolyBezier( physdev, points, *counts ); + if (ret) dc->attr->cur_pos = points[*counts - 1]; + } + else ret = FALSE; + break; + default: WARN( "invalid function %u\n", function ); ret = FALSE; @@ -664,41 +675,6 @@ BOOL WINAPI FloodFill( HDC hdc, INT x, INT y, COLORREF color ) return ExtFloodFill( hdc, x, y, color, FLOODFILLBORDER ); } - -/****************************************************************************** - * PolyBezier [GDI32.@] - * Draws one or more Bezier curves - * - * PARAMS - * hDc [I] Handle to device context - * lppt [I] Pointer to endpoints and control points - * cPoints [I] Count of endpoints and control points - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI PolyBezier( HDC hdc, const POINT* lppt, DWORD cPoints ) -{ - PHYSDEV physdev; - BOOL ret; - DC * dc; - - TRACE( "%p, %p, %u\n", hdc, lppt, cPoints ); - - /* cPoints must be 3 * n + 1 (where n>=1) */ - if (cPoints == 1 || (cPoints % 3) != 1) return FALSE; - - dc = get_dc_ptr( hdc ); - if(!dc) return FALSE; - - update_dc( dc ); - physdev = GET_DC_PHYSDEV( dc, pPolyBezier ); - ret = physdev->funcs->pPolyBezier( physdev, lppt, cPoints ); - release_dc_ptr( dc ); - return ret; -} - /****************************************************************************** * PolyBezierTo [GDI32.@] * Draws one or more Bezier curves

1 0

Daniel Lehman : gdi32/tests: Add a test for double-free on repeated calls to Delete[Enh]MetaFile.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 323416920f4e9c07ba224237a6bd0539803d7709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=323416920f4e9c07ba224237… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Jul 22 11:24:15 2021 +0200 gdi32/tests: Add a test for double-free on repeated calls to Delete[Enh]MetaFile. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> 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/tests/metafile.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 921ac888247..4f72079a615 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3049,7 +3049,13 @@ static void test_metafile_file(void) EnumMetaFile(0, metafile, mf_enum_proc, 0); } - DeleteMetaFile(metafile); + ret = DeleteMetaFile(metafile); + ok(ret, "Could not delete metafile: %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DeleteMetaFile(metafile); + ok(!ret, "DeleteMetaFile succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); SetLastError(0xdeadbeef); metafile = CloseMetaFile(dc); @@ -3144,7 +3150,13 @@ static void test_enhmetafile_file(void) dump_emf_records(metafile, "emf_Bezier"); } - DeleteEnhMetaFile(metafile); + ret = DeleteEnhMetaFile(metafile); + ok(ret, "Could not delete emf: %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DeleteEnhMetaFile(metafile); + ok(!ret, "DeleteEnhMetaFile succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); SetLastError(0xdeadbeef); metafile = CloseEnhMetaFile(dc);

1 0

Jacek Caban : gdi32: Use free_gdi_handle directly for NtGdiDeleteClientObj.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 808d1818a1842a8db7090a4e5dcf71c20bec1fc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=808d1818a1842a8db7090a4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:23:54 2021 +0200 gdi32: Use free_gdi_handle directly for NtGdiDeleteClientObj. 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/gdiobj.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 9059f817636..16a7b897e30 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -971,9 +971,12 @@ HANDLE WINAPI NtGdiCreateClientObj( ULONG type ) /*********************************************************************** * NtGdiDeleteClientObj (win32u.@) */ -BOOL WINAPI NtGdiDeleteClientObj( HGDIOBJ obj ) +BOOL WINAPI NtGdiDeleteClientObj( HGDIOBJ handle ) { - return NtGdiDeleteObjectApp( obj ); + void *obj; + if (!(obj = free_gdi_handle( handle ))) return FALSE; + HeapFree( GetProcessHeap(), 0, obj ); + return TRUE; } /***********************************************************************

1 0

Zebediah Figura : cryptnet: Cache the result of revocation checks on disk.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: b49ffc574cd18db73d4271a4bdace3968d60b626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b49ffc574cd18db73d4271a4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 22 00:21:07 2021 -0500 cryptnet: Cache the result of revocation checks on disk. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/Makefile.in | 2 +- dlls/cryptnet/cryptnet_main.c | 127 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 1 deletion(-) diff --git a/dlls/cryptnet/Makefile.in b/dlls/cryptnet/Makefile.in index 8482882cdce..1e97f26d9df 100644 --- a/dlls/cryptnet/Makefile.in +++ b/dlls/cryptnet/Makefile.in @@ -1,6 +1,6 @@ MODULE = cryptnet.dll IMPORTLIB = cryptnet -IMPORTS = crypt32 +IMPORTS = crypt32 shell32 ole32 DELAYIMPORTS = wininet EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index b1e2829d881..2f4e2d895f7 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -21,6 +21,7 @@ #define NONAMELESSUNION #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS +#include <share.h> #include <stdio.h> #include <stdarg.h> @@ -31,6 +32,9 @@ #include "wininet.h" #include "objbase.h" #include "wincrypt.h" +#include "initguid.h" +#include "knownfolders.h" +#include "shlobj.h" #include "wine/debug.h" @@ -1514,6 +1518,124 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, return ret; } +/* Store successful revocation checks (whether the certificate was revoked or + * not) in an on-disk cache. This is not because of network latency—we already + * have a cache for that—but rather because parsing very large CRLs can take a + * long time (at the time of writing, 20 MB CRLs have been seen in the wild and + * can take several hundred milliseconds) and applications expect chain building + * to be much faster. + * + * The cache is treated as invalid once we pass the nextUpdate field of the CRL. + * This isn't quite what the field is meant for (it's rather meant to specify a + * later bound for the next time the CRL will be reissued, and doesn't prescribe + * a date by which the CRL is invalid; see RFC 5280 § 5.1.2.5) but it's the way + * it's used in practice. + * + * The location of the cache roughly matches Windows, but the file name and + * contents do not. + */ + +static const char revocation_cache_signature[] = "Wine cached revocation"; + +static FILE *open_cached_revocation_file(const CRYPT_INTEGER_BLOB *serial, const WCHAR *mode, int sharing) +{ + WCHAR path[MAX_PATH]; + WCHAR *appdata_path; + DWORD len, i; + HRESULT hr; + + if (FAILED(hr = SHGetKnownFolderPath(&FOLDERID_LocalAppDataLow, 0, NULL, &appdata_path))) + { + ERR("Failed to get LocalAppDataLow path, hr %#x.\n", hr); + return INVALID_HANDLE_VALUE; + } + + len = swprintf(path, ARRAY_SIZE(path), L"%s\\Microsoft\\CryptnetUrlCache\\Content\\", appdata_path); + CoTaskMemFree(appdata_path); + + if (len + serial->cbData * 2 * sizeof(WCHAR) > ARRAY_SIZE(path) - 1) + { + WARN("Serial length exceeds static buffer; not caching.\n"); + return INVALID_HANDLE_VALUE; + } + + SHCreateDirectoryExW(NULL, path, NULL); + + for (i = 0; i < serial->cbData; ++i) + { + swprintf(path + len, 3, L"%02x", serial->pbData[i]); + len += 2; + } + + return _wfsopen(path, mode, sharing); +} + +static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, + const FILETIME *time, CERT_REVOCATION_STATUS *status) +{ + char buffer[sizeof(revocation_cache_signature)]; + FILETIME update_time; + FILE *file; + int len; + + if (!(file = open_cached_revocation_file(serial, L"r", _SH_DENYWR))) + return FALSE; + + if ((len = fread(buffer, 1, sizeof(buffer), file)) != sizeof(buffer) + || memcmp(buffer, revocation_cache_signature, len)) + { + ERR("Invalid cache signature.\n"); + fclose(file); + return FALSE; + } + + if (fread(&update_time, sizeof(update_time), 1, file) != 1) + { + ERR("Failed to read update time.\n"); + fclose(file); + return FALSE; + } + + if (CompareFileTime(time, &update_time) > 0) + { + TRACE("Cached revocation status is potentially out of date.\n"); + fclose(file); + return FALSE; + } + + if (fread(&status->dwError, sizeof(status->dwError), 1, file) != 1) + { + ERR("Failed to read error code.\n"); + fclose(file); + return FALSE; + } + + if (status->dwError == CERT_E_REVOKED && fread(&status->dwReason, sizeof(status->dwReason), 1, file) != 1) + { + ERR("Failed to read revocation reason.\n"); + fclose(file); + return FALSE; + } + + TRACE("Using cached status %#x, reason %#x.\n", status->dwError, status->dwReason); + return TRUE; +} + +static void cache_revocation_status(const CRYPT_INTEGER_BLOB *serial, + const FILETIME *time, const CERT_REVOCATION_STATUS *status) +{ + FILE *file; + + if (!(file = open_cached_revocation_file(serial, L"w", _SH_DENYRW))) + return; + fwrite(revocation_cache_signature, 1, sizeof(revocation_cache_signature), file); + fwrite(time, sizeof(*time), 1, file); + fwrite(&status->dwError, sizeof(status->dwError), 1, file); + if (status->dwError == CERT_E_REVOKED) + fwrite(&status->dwReason, sizeof(status->dwReason), 1, file); + fclose(file); +} + static DWORD verify_cert_revocation_with_crl_online(const CERT_CONTEXT *cert, const CRL_CONTEXT *crl, FILETIME *pTime, CERT_REVOCATION_STATUS *pRevStatus) { @@ -1591,6 +1713,8 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * error = verify_cert_revocation_with_crl_online(cert, crl, time, status); + cache_revocation_status(&cert->pCertInfo->SerialNumber, &crl->pCrlInfo->NextUpdate, status); + CertFreeCRLContext(crl); CryptMemFree(url_array); return error; @@ -1663,6 +1787,9 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, DWORD error = ERROR_SUCCESS; PCERT_EXTENSION ext; + if (find_cached_revocation_status(&cert->pCertInfo->SerialNumber, pTime, pRevStatus)) + return pRevStatus->dwError; + if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) {

1 0

Zebediah Figura : cryptnet: Check only the first successfully retrieved CRL in verify_cert_revocation_from_dist_points_ext().
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 13a349540ae0230f83466c04e003209656a889c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13a349540ae0230f83466c04… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 22 00:21:06 2021 -0500 cryptnet: Check only the first successfully retrieved CRL in verify_cert_revocation_from_dist_points_ext(). >From RFC 5280 § 4.2.1.13: If the DistributionPointName contains multiple values, each name describes a different mechanism to obtain the same CRL. For example, the same CRL could be available for retrieval through both LDAP and HTTP. Steam attempts to validate a certificate containing what are apparently two different mirrored URLs to the same 20 MB CRL, which currently takes over 400ms to parse in Wine. According to my reading of the RFC, we should only need to parse one of them, cutting the time in half. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet_main.c | 111 ++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 53 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index f4088021a0e..b1e2829d881 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1528,66 +1528,71 @@ static DWORD verify_cert_revocation_with_crl_online(const CERT_CONTEXT *cert, return ERROR_SUCCESS; } +/* Try to retrieve a CRL from any one of the specified distribution points. */ +static const CRL_CONTEXT *retrieve_crl_from_dist_points(const CRYPT_URL_ARRAY *array, + DWORD verify_flags, DWORD timeout) +{ + DWORD retrieve_flags = 0; + const CRL_CONTEXT *crl; + DWORD i; + + if (verify_flags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) + retrieve_flags |= CRYPT_CACHE_ONLY_RETRIEVAL; + + /* Yes, this is a weird algorithm, but the documentation for + * CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT specifies this, and + * tests seem to bear it out for CertVerifyRevocation() as well. */ + if (verify_flags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) + timeout /= 2; + + for (i = 0; i < array->cUrl; ++i) + { + if (CryptRetrieveObjectByUrlW(array->rgwszUrl[i], CONTEXT_OID_CRL, retrieve_flags, + timeout, (void **)&crl, NULL, NULL, NULL, NULL)) + return crl; + + /* We don't check the current time here. This may result in less + * accurate timeouts, but this too seems to be true of Windows. */ + if ((verify_flags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && GetLastError() == ERROR_TIMEOUT) + timeout /= 2; + } + + return NULL; +} + static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB *value, const CERT_CONTEXT *cert, - FILETIME *pTime, DWORD dwFlags, const CERT_REVOCATION_PARA *pRevPara, CERT_REVOCATION_STATUS *pRevStatus) + FILETIME *time, DWORD flags, const CERT_REVOCATION_PARA *params, CERT_REVOCATION_STATUS *status) { - DWORD error = ERROR_SUCCESS, cbUrlArray; + DWORD url_array_size, error; + CRYPT_URL_ARRAY *url_array; + const CRL_CONTEXT *crl; + DWORD timeout = 0; + + if (!CRYPT_GetUrlFromCRLDistPointsExt(value, NULL, &url_array_size, NULL, NULL)) + return GetLastError(); + + if (!(url_array = CryptMemAlloc(url_array_size))) + return ERROR_OUTOFMEMORY; - if (CRYPT_GetUrlFromCRLDistPointsExt(value, NULL, &cbUrlArray, NULL, NULL)) + if (!CRYPT_GetUrlFromCRLDistPointsExt(value, url_array, &url_array_size, NULL, NULL)) { - CRYPT_URL_ARRAY *urlArray = CryptMemAlloc(cbUrlArray); + CryptMemFree(url_array); + return GetLastError(); + } - if (urlArray) - { - DWORD j, retrievalFlags = 0, timeout = 0; - BOOL ret; - - ret = CRYPT_GetUrlFromCRLDistPointsExt(value, urlArray, - &cbUrlArray, NULL, NULL); - if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) - retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; - - if (pRevPara && pRevPara->cbSize >= RTL_SIZEOF_THROUGH_FIELD(CERT_REVOCATION_PARA, dwUrlRetrievalTimeout)) - timeout = pRevPara->dwUrlRetrievalTimeout; - - /* Yes, this is a weird algorithm, but the documentation for - * CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT specifies this, and - * tests seem to bear it out for CertVerifyRevocation() as well. */ - if (dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) - timeout /= 2; - - if (!ret) - error = GetLastError(); - /* continue looping if one was offline; break if revoked or timed out */ - for (j = 0; (!error || error == CRYPT_E_REVOCATION_OFFLINE) && j < urlArray->cUrl; j++) - { - PCCRL_CONTEXT crl; + if (params && params->cbSize >= RTL_SIZEOF_THROUGH_FIELD(CERT_REVOCATION_PARA, dwUrlRetrievalTimeout)) + timeout = params->dwUrlRetrievalTimeout; - ret = CryptRetrieveObjectByUrlW(urlArray->rgwszUrl[j], - CONTEXT_OID_CRL, retrievalFlags, timeout, (void **)&crl, - NULL, NULL, NULL, NULL); - if (ret) - { - error = verify_cert_revocation_with_crl_online(cert, crl, pTime, pRevStatus); - CertFreeCRLContext(crl); - } - else - { - /* We don't check the current time here. This may result in - * less accurate timeouts, but this too seems to be true of - * Windows. */ - if ((dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && GetLastError() == ERROR_TIMEOUT) - timeout /= 2; - error = CRYPT_E_REVOCATION_OFFLINE; - } - } - CryptMemFree(urlArray); - } - else - error = ERROR_OUTOFMEMORY; + if (!(crl = retrieve_crl_from_dist_points(url_array, flags, timeout))) + { + CryptMemFree(url_array); + return CRYPT_E_REVOCATION_OFFLINE; } - else - error = GetLastError(); + + error = verify_cert_revocation_with_crl_online(cert, crl, time, status); + + CertFreeCRLContext(crl); + CryptMemFree(url_array); return error; }

1 0

Jacek Caban : winex11: Don't use pPolygon graphics driver entry point.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 3a7c1630ea8fedb2ff717762f42b2a4eda39c68a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a7c1630ea8fedb2ff717762… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:25:30 2021 +0200 winex11: Don't use pPolygon graphics driver entry point. 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/winex11.drv/graphics.c | 4 +++- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 77ca60ec44d..e2b8b9d3233 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1074,7 +1074,7 @@ BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) /********************************************************************** * X11DRV_Polygon */ -BOOL CDECL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) +static BOOL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); int i; @@ -1123,6 +1123,8 @@ BOOL CDECL X11DRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, POINT *points; BOOL ret = FALSE; + if (polygons == 1) return X11DRV_Polygon( dev, pt, *counts ); + for (i = 0; i < polygons; i++) { if (counts[i] < 2) return FALSE; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index ff3d5317697..66603d2a240 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -416,7 +416,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pPolyDraw */ X11DRV_PolyPolygon, /* pPolyPolygon */ X11DRV_PolyPolyline, /* pPolyPolyline */ - X11DRV_Polygon, /* pPolygon */ + NULL, /* pPolygon */ NULL, /* pPolyline */ NULL, /* pPolylineTo */ X11DRV_PutImage, /* pPutImage */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c23cd512eb9..e14e131d819 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -168,7 +168,6 @@ extern BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines) DECLSPEC_HIDDEN; extern DWORD CDECL X11DRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,

1 0

Alexandre Julliard : wow64: Add support for setting up the syscall table.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 1b63875c66c79a337f65c6c66882c8a55430d2c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b63875c66c79a337f65c6c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 13:42:56 2021 +0200 wow64: Add support for setting up the syscall table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 126 ++++++++++++++++++++++++++++++++++++++++++++- dlls/wow64/wow64_private.h | 5 ++ 2 files changed, 129 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 504580e8717..12e13b17574 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -35,6 +35,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); USHORT native_machine = 0; USHORT current_machine = 0; +typedef NTSTATUS (WINAPI *syscall_thunk)( UINT *args ); + +static const syscall_thunk syscall_thunks[] = +{ + NULL +}; + +static const char *syscall_names[] = +{ + "" +}; + +static unsigned short syscall_map[1024]; + +static SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock; + void *dummy = RtlUnwind; BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) @@ -58,6 +74,82 @@ void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *fun } +/********************************************************************** + * get_syscall_num + */ +static DWORD get_syscall_num( const BYTE *syscall ) +{ + DWORD id = ~0u; + + if (!syscall) return id; + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + if (syscall[0] == 0xb8 && syscall[5] == 0xba && syscall[10] == 0xff && syscall[11] == 0xd2) + id = *(DWORD *)(syscall + 1); + break; + + case IMAGE_FILE_MACHINE_ARM: + if (*(WORD *)syscall == 0xb40f) + { + DWORD inst = *(DWORD *)((WORD *)syscall + 1); + id = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); + } + break; + } + return id; +} + + +/********************************************************************** + * init_syscall_table + */ +static void init_syscall_table( HMODULE ntdll ) +{ + const IMAGE_EXPORT_DIRECTORY *exports; + const ULONG *functions, *names; + const USHORT *ordinals; + ULONG id, exp_size, exp_pos, wrap_pos; + + exports = RtlImageDirectoryEntryToData( ntdll, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); + ordinals = get_rva( ntdll, exports->AddressOfNameOrdinals ); + functions = get_rva( ntdll, exports->AddressOfFunctions ); + names = get_rva( ntdll, exports->AddressOfNames ); + + for (exp_pos = wrap_pos = 0; exp_pos < exports->NumberOfNames; exp_pos++) + { + char *name = get_rva( ntdll, names[exp_pos] ); + int res = -1; + + if (strncmp( name, "Nt", 2 ) && strncmp( name, "wine", 4 ) && strncmp( name, "__wine", 6 )) + continue; /* not a syscall */ + + if ((id = get_syscall_num( get_rva( ntdll, functions[ordinals[exp_pos]] ))) == ~0u) + continue; /* not a syscall */ + + if (wrap_pos < ARRAY_SIZE(syscall_names)) + res = strcmp( name, syscall_names[wrap_pos] ); + + if (!res) /* got a match */ + { + if (id < ARRAY_SIZE(syscall_map)) syscall_map[id] = wrap_pos++; + else ERR( "invalid syscall id %04x for %s\n", id, name ); + } + else if (res > 0) + { + FIXME( "no ntdll export for syscall %s\n", syscall_names[wrap_pos] ); + wrap_pos++; + exp_pos--; /* try again */ + } + else FIXME( "missing wrapper for syscall %04x %s\n", id, name ); + } + + for ( ; wrap_pos < ARRAY_SIZE(syscall_thunks); wrap_pos++) + FIXME( "no ntdll export for syscall %s\n", syscall_names[wrap_pos] ); +} + + /********************************************************************** * load_cpu_dll */ @@ -100,10 +192,24 @@ static HMODULE load_cpu_dll(void) */ static void process_init(void) { + HMODULE module; + UNICODE_STRING str; + RtlWow64GetProcessMachines( GetCurrentProcess(), &current_machine, &native_machine ); if (!current_machine) current_machine = native_machine; +#define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) + + RtlInitUnicodeString( &str, L"ntdll.dll" ); + LdrGetDllHandle( NULL, 0, &str, &module ); + GET_PTR( LdrSystemDllInitBlock ); + + module = (HMODULE)(ULONG_PTR)pLdrSystemDllInitBlock->ntdll_handle; + init_syscall_table( module ); + load_cpu_dll(); + +#undef GET_PTR } @@ -112,8 +218,24 @@ static void process_init(void) */ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) { - FIXME( "stub\n" ); - return STATUS_INVALID_SYSTEM_SERVICE; + NTSTATUS status; + + if (num >= ARRAY_SIZE( syscall_map ) || !syscall_map[num]) + { + ERR( "unsupported syscall %04x\n", num ); + return STATUS_INVALID_SYSTEM_SERVICE; + } + __TRY + { + syscall_thunk thunk = syscall_thunks[syscall_map[num]]; + status = thunk( args ); + } + __EXCEPT_ALL + { + status = GetExceptionCode(); + } + __ENDTRY; + return status; } diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 52cc40566b1..2c8f6f313fc 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -24,6 +24,11 @@ extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN; +static inline void *get_rva( HMODULE module, DWORD va ) +{ + return (void *)((char *)module + va); +} + /* cf. GetSystemWow64Directory2 */ static inline const WCHAR *get_machine_wow64_dir( USHORT machine ) {

1 0

Jacek Caban : gdi32: Use NtGdiPolyPolyDraw for PolyPolygon implementation.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 1b7a15e4cc96f85078c031d8e7ba0aa2d2b482b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b7a15e4cc96f85078c031d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 11:25:17 2021 +0200 gdi32: Use NtGdiPolyPolyDraw for PolyPolygon 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 | 12 ++++++++++-- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 10 +++++++++- dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/painting.c | 29 +++++++++++++++++++---------- include/ntgdi.h | 10 ++++++++++ 10 files changed, 73 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b7a15e4cc96f85078c0…

1 0