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

Alexandre Julliard : ntdll: Load wow64.dll in 64-bit Wow64 processes.
by Alexandre Julliard July 21, 2021

July 21, 2021

Module: wine Branch: master Commit: c4b194f4d959da3d1103085e6421b9b1fdb494f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4b194f4d959da3d1103085e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 14:52:58 2021 +0200 ntdll: Load wow64.dll in 64-bit Wow64 processes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 54 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b5127327e3d..3339596944a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3681,7 +3681,41 @@ static void load_global_options(void) } -#ifndef _WIN64 + +#ifdef _WIN64 + +static void (WINAPI *pWow64LdrpInitialize)( CONTEXT *ctx ); + +static void init_wow64( CONTEXT *context ) +{ + if (!imports_fixup_done) + { + HMODULE wow64; + WINE_MODREF *wm; + NTSTATUS status; + static const WCHAR wow64_path[] = L"C:\\windows\\system32\\wow64.dll"; + + if ((status = load_dll( NULL, wow64_path, NULL, 0, &wm ))) + { + ERR( "could not load %s, status %x\n", debugstr_w(wow64_path), status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } + wow64 = wm->ldr.DllBase; +#define GET_PTR(name) \ + if (!(p ## name = RtlFindExportedRoutineByName( wow64, #name ))) ERR( "failed to load %s\n", #name ) + + GET_PTR( Wow64LdrpInitialize ); +#undef GET_PTR + imports_fixup_done = TRUE; + } + + RtlLeaveCriticalSection( &loader_section ); + pWow64LdrpInitialize( context ); +} + + +#else + void *Wow64Transition = NULL; static void map_wow64cpu(void) @@ -3712,13 +3746,13 @@ static void map_wow64cpu(void) NtClose( file ); } -static void init_wow64(void) +static void init_wow64( CONTEXT *context ) { PEB *peb = NtCurrentTeb()->Peb; - PEB64 *peb64; + PEB64 *peb64 = UlongToPtr( NtCurrentTeb64()->Peb ); + + if (Wow64Transition) return; /* already initialized */ - if (!NtCurrentTeb64()) return; - peb64 = UlongToPtr( NtCurrentTeb64()->Peb ); peb64->OSMajorVersion = peb->OSMajorVersion; peb64->OSMinorVersion = peb->OSMinorVersion; peb64->OSBuildNumber = peb->OSBuildNumber; @@ -3791,14 +3825,14 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR init_user_process_params(); load_global_options(); version_init(); -#ifndef _WIN64 - init_wow64(); -#endif + wm = build_main_module(); wm->ldr.LoadCount = -1; build_ntdll_module(); + if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); + if ((status = load_dll( NULL, L"kernel32.dll", NULL, 0, &kernel32 )) != STATUS_SUCCESS) { MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); @@ -3831,6 +3865,10 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR } else wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) init_wow64( context ); +#endif + RtlAcquirePebLock(); InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); RtlReleasePebLock();

1 0

Jacek Caban : gdi32: Use NtGdiAngleArc for AngleArc implementation.
by Alexandre Julliard July 21, 2021

July 21, 2021

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

Jacek Caban : gdi32: Use NtGdiRectangle for Rectangle implementation.
by Alexandre Julliard July 21, 2021

July 21, 2021

Module: wine Branch: master Commit: 0636b360130baf05025492eb59a806bbeffc3d33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0636b360130baf05025492eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:19:51 2021 +0200 gdi32: Use NtGdiRectangle for Rectangle 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 | 59 ++++++++++++++++++++++++++---------------- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdidc.c | 15 +++++++++++ dlls/gdi32/mfdrv/graphics.c | 6 ++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/painting.c | 7 ++--- 8 files changed, 62 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 80caa6cb9d3..c19c9527dc2 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -779,18 +779,6 @@ static BOOL CDECL emfpathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT coun next->funcs->pPolylineTo( next, pts, count )); } -/*********************************************************************** - * emfpathdrv_Rectangle - */ -static BOOL CDECL emfpathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pRectangle ); - - return (emfdev->funcs->pRectangle( emfdev, x1, y1, x2, y2 ) && - next->funcs->pRectangle( next, x1, y1, x2, y2 )); -} - static const struct gdi_dc_funcs emfpath_driver = { @@ -874,7 +862,7 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ - emfpathdrv_Rectangle, /* pRectangle */ + NULL, /* pRectangle */ NULL, /* pResetDC */ NULL, /* pRestoreDC */ NULL, /* pRoundRect */ diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index a3197276525..82e6f894521 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -422,37 +422,52 @@ BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom } /*********************************************************************** - * EMFDRV_Rectangle + * EMFDC_Rectangle */ -BOOL CDECL EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) +BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) { - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - DC *dc = get_physdev_dc( dev ); + EMFDRV_PDEVICE *emf = dc_attr->emf; EMRRECTANGLE emr; - INT temp; - - TRACE("%d,%d - %d,%d\n", left, top, right, bottom); if(left == right || top == bottom) return FALSE; - if(left > right) {temp = left; left = right; right = temp;} - if(top > bottom) {temp = top; top = bottom; bottom = temp;} - - if(dc->attr->graphics_mode == GM_COMPATIBLE) { - right--; - bottom--; - } - emr.emr.iType = EMR_RECTANGLE; emr.emr.nSize = sizeof(emr); - emr.rclBox.left = left; - emr.rclBox.top = top; - emr.rclBox.right = right; - emr.rclBox.bottom = bottom; + emr.rclBox.left = min( left, right ); + emr.rclBox.top = min( top, bottom ); + emr.rclBox.right = max( left, right ); + emr.rclBox.bottom = max( top, bottom ); + if (dc_attr->graphics_mode == GM_COMPATIBLE) + { + emr.rclBox.right--; + emr.rclBox.bottom--; + } - if(!physDev->path) - EMFDRV_UpdateBBox( dev, &emr.rclBox ); - return EMFDRV_WriteRecord( dev, &emr.emr ); + return EMFDRV_WriteRecord( &emf->dev, &emr.emr ); +} + +/*********************************************************************** + * EMFDC_Rectangle + */ +BOOL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +{ + DC *dc = get_physdev_dc( dev ); + RECTL bounds; + + if (left == right || top == bottom) return FALSE; + + bounds.left = min( left, right ); + bounds.top = min( top, bottom ); + bounds.right = max( left, right ); + bounds.bottom = max( top, bottom ); + if (dc->attr->graphics_mode == GM_COMPATIBLE) + { + bounds.right--; + bounds.bottom--; + } + + EMFDRV_UpdateBBox( dev, &bounds ); + return TRUE; } /*********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 52302fe4c23..8dd20c4bf11 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -51,6 +51,7 @@ extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_Pie( HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL METADC_Rectangle( HDC hdc, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; @@ -62,6 +63,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_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, + INT bottom) DECLSPEC_HIDDEN; extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index fbdfbed450c..f642eef75c0 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -185,6 +185,21 @@ BOOL WINAPI Ellipse( HDC hdc, INT left, INT top, INT right, INT bottom ) return NtGdiEllipse( hdc, left, top, right, bottom ); } +/*********************************************************************** + * Rectangle (GDI32.@) + */ +BOOL WINAPI Rectangle( HDC hdc, INT left, INT top, INT right, INT bottom ) +{ + DC_ATTR *dc_attr; + + TRACE( "%p, (%d, %d)-(%d, %d)\n", hdc, left, top, right, bottom ); + + if (is_meta_dc( hdc )) return METADC_Rectangle( hdc, left, top, right, bottom ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_Rectangle( dc_attr, left, top, right, bottom )) return FALSE; + return NtGdiRectangle( hdc, left, top, right, bottom ); +} + /*********************************************************************** * RoundRect (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 727065eac65..37da92185af 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -98,11 +98,11 @@ BOOL METADC_Ellipse( HDC hdc, INT left, INT top, INT right, INT bottom ) } /*********************************************************************** - * MFDRV_Rectangle + * METADC_Rectangle */ -BOOL CDECL MFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) +BOOL METADC_Rectangle( HDC hdc, INT left, INT top, INT right, INT bottom ) { - return MFDRV_MetaParam4(dev, META_RECTANGLE, left, top, right, bottom); + return metadc_param4( hdc, META_RECTANGLE, left, top, right, bottom ); } /*********************************************************************** diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index a90b5da35e7..df4d9dc9541 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -179,7 +179,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ MFDRV_RealizePalette, /* pRealizePalette */ - MFDRV_Rectangle, /* pRectangle */ + NULL, /* pRectangle */ NULL, /* pResetDC */ MFDRV_RestoreDC, /* pRestoreDC */ NULL, /* pRoundRect */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 5a2ad9958bd..66375295cd9 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -98,7 +98,6 @@ extern BOOL CDECL MFDRV_PolyBezierTo( PHYSDEV dev, const POINT* pt, DWORD count extern BOOL CDECL MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_Polyline( PHYSDEV dev, const POINT* pt,INT count) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index e31fb997b9a..637b9ccda3f 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -357,17 +357,14 @@ BOOL WINAPI NtGdiEllipse( HDC hdc, INT left, INT top, INT right, INT bottom ) /*********************************************************************** - * Rectangle (GDI32.@) + * NtGdiRectangle (win32u.@) */ -BOOL WINAPI Rectangle( HDC hdc, INT left, INT top, - INT right, INT bottom ) +BOOL WINAPI NtGdiRectangle( HDC hdc, INT left, INT top, INT right, INT bottom ) { PHYSDEV physdev; BOOL ret; DC * dc = get_dc_ptr( hdc ); - TRACE( "%p, (%d, %d)-(%d, %d)\n", hdc, left, top, right, bottom ); - if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pRectangle );

1 0

Jacek Caban : gdi32: Use NtGdiRoundRect for RoundRect implementation.
by Alexandre Julliard July 21, 2021

July 21, 2021

Module: wine Branch: master Commit: ffaf75a082123fb5a174a648d9b4f6fc5bbd66da URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffaf75a082123fb5a174a648… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:19:41 2021 +0200 gdi32: Use NtGdiRoundRect for RoundRect 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 | 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(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ffaf75a082123fb5a174…

1 0

Biswapriyo Nath : include: Add structure padding for aarch64 in dbghelp.h.
by Alexandre Julliard July 21, 2021

July 21, 2021

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 July 21, 2021

July 21, 2021

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

Alexandre Julliard : Wine release 6.13
by Alexandre Julliard July 20, 2021

July 20, 2021

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

Georg Lehmann : winevulkan: Update to VK spec version 1.2.185.
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: master Commit: bdc02621c1ae705e7bd1bf639832fba7f0d159ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdc02621c1ae705e7bd1bf63… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Jul 20 15:04:48 2021 +0200 winevulkan: Update to VK spec version 1.2.185. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 12 + dlls/winevulkan/loader_thunks.h | 2 + dlls/winevulkan/make_vulkan | 3 +- dlls/winevulkan/vulkan_thunks.c | 109 ++ dlls/winevulkan/vulkan_thunks.h | 4 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 2393 ++++++++++++++++++++------------------- 7 files changed, 1365 insertions(+), 1160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bdc02621c1ae705e7bd1…

1 0

Georg Lehmann : winevulkan: Fix pointer typedef base types.
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: master Commit: c2948c96d63694b1527c94dce7d33e8594b43b29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2948c96d63694b1527c94dc… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Jul 20 15:04:47 2021 +0200 winevulkan: Fix pointer typedef base types. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e8534cbd5f5..31164406cab 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3614,6 +3614,9 @@ class VkRegistry(object): _type = None if not t.find("type") is None: _type = t.find("type").text + tail = t.find("type").tail + if tail is not None: + _type += tail.strip() basetype = VkBaseType(name, _type) base_types.append(basetype) type_info["data"] = basetype

1 0

Ziqing Hui : d2d1: Implement d2d_effect_GetOutput().
by Alexandre Julliard July 20, 2021

July 20, 2021

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