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

Alexandre Julliard : ntdll: Load wow64.dll in 64-bit Wow64 processes.
by Alexandre Julliard 21 Jul '21

21 Jul '21

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/tests: Silence noisy traces.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 317fe5bcb000b359f9820e57634d1374b438c247 URL: https://source.winehq.org/git/wine.git/?a=commit;h=317fe5bcb000b359f9820e57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:18:30 2021 +0200 gdi32/tests: Silence noisy traces. 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 | 112 +++++++++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=317fe5bcb000b359f982…

1 0

Jacek Caban : gdi32: Handle EMFs recording directly in LineTo implementation.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 340a445289ed5777bfc177336fb6e315dfda273c URL: https://source.winehq.org/git/wine.git/?a=commit;h=340a445289ed5777bfc17733… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:18:50 2021 +0200 gdi32: Handle EMFs recording directly in LineTo 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 | 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(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 9edd09a179e..79c3032daa6 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -734,17 +734,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_LineTo - */ -static BOOL CDECL emfpathdrv_LineTo( PHYSDEV dev, INT x, INT y ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pLineTo ); - - return (emfdev->funcs->pLineTo( emfdev, x, y ) && next->funcs->pLineTo( next, x, y )); -} - /*********************************************************************** * emfpathdrv_MoveTo */ @@ -953,7 +942,7 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pGradientFill */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ - emfpathdrv_LineTo, /* pLineTo */ + NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ emfpathdrv_MoveTo, /* pMoveTo */ NULL, /* pOffsetClipRgn */ diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index f504aee8e36..8d6445779b9 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -133,23 +133,29 @@ BOOL CDECL EMFDRV_MoveTo(PHYSDEV dev, INT x, INT y) } /*********************************************************************** - * EMFDRV_LineTo + * EMFDC_LineTo */ -BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) +BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) { - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - DC *dc = get_physdev_dc( dev ); - POINT pt; EMRLINETO emr; - RECTL bounds; emr.emr.iType = EMR_LINETO; emr.emr.nSize = sizeof(emr); emr.ptl.x = x; emr.ptl.y = y; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); +} - if(!EMFDRV_WriteRecord( dev, &emr.emr )) - return FALSE; + +/*********************************************************************** + * EMFDRV_LineTo + */ +BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) +{ + EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); + DC *dc = get_physdev_dc( dev ); + RECTL bounds; + POINT pt; pt = dc->attr->cur_pos; @@ -157,14 +163,10 @@ BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) bounds.top = min(y, pt.y); bounds.right = max(x, pt.x); bounds.bottom = max(y, pt.y); - - if(!physDev->path) - EMFDRV_UpdateBBox( dev, &bounds ); - + EMFDRV_UpdateBBox( &physDev->dev, &bounds ); return TRUE; } - /*********************************************************************** * EMFDRV_ArcChordPie */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 9a611e0f1bc..62e35fe4029 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -342,6 +342,7 @@ HDC WINAPI CreateEnhMetaFileW( free_dc_ptr( dc ); return 0; } + dc->attr->emf = physDev; if(description) { /* App name\0Title\0\0 */ length = lstrlenW(description); length += lstrlenW(description + length + 1); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 436846c5bd5..bb4504f4934 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -31,10 +31,15 @@ void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; void *get_gdi_client_ptr( HGDIOBJ handle, WORD type ) DECLSPEC_HIDDEN; +static inline WORD gdi_handle_type( HGDIOBJ obj ) +{ + unsigned int handle = HandleToULong( obj ); + return (handle & NTGDI_HANDLE_TYPE_MASK) >> NTGDI_HANDLE_TYPE_SHIFT; +} + static inline BOOL is_meta_dc( HDC hdc ) { - unsigned int handle = HandleToULong( hdc ); - return (handle & NTGDI_HANDLE_TYPE_MASK) >> NTGDI_HANDLE_TYPE_SHIFT == NTGDI_OBJ_METADC; + return gdi_handle_type( hdc ) == NTGDI_OBJ_METADC; } extern BOOL METADC_Arc( HDC hdc, INT left, INT top, INT right, INT bottom, @@ -46,4 +51,7 @@ 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; +/* enhanced metafiles */ +extern BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 01c9dfdf8c7..c011d66deb9 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -25,14 +25,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); +static DC_ATTR *get_dc_attr( HDC hdc ) +{ + WORD type = gdi_handle_type( hdc ); + DC_ATTR *dc_attr; + if ((type & 0x1f) != NTGDI_OBJ_DC || !(dc_attr = get_gdi_client_ptr( hdc, 0 ))) + { + SetLastError( ERROR_INVALID_HANDLE ); + return NULL; + } + return dc_attr; +} + /*********************************************************************** * LineTo (GDI32.@) */ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) { + DC_ATTR *dc_attr; + TRACE( "%p, (%d, %d)\n", hdc, x, y ); if (is_meta_dc( hdc )) return METADC_LineTo( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_LineTo( dc_attr, x, y )) return FALSE; return NtGdiLineTo( hdc, x, y ); } diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index e5aafc1fed4..e614a9d6a52 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -70,7 +70,7 @@ void set_gdi_client_ptr( HGDIOBJ obj, void *ptr ) void *get_gdi_client_ptr( HGDIOBJ obj, WORD type ) { GDI_HANDLE_ENTRY *entry = handle_entry( obj ); - if (!entry || entry->ExtType != type || !entry->UserPointer) + if (!entry || (type && entry->ExtType != type) || !entry->UserPointer) return NULL; return (void *)(UINT_PTR)entry->UserPointer; } diff --git a/include/ntgdi.h b/include/ntgdi.h index b03ffc0fea8..53915033c89 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -89,6 +89,7 @@ enum typedef struct DC_ATTR { POINT cur_pos; + void *emf; } DC_ATTR; #endif /* __WINESRC__ */

1 0

Jacek Caban : gdi32: Use DC_ATTR for GetCurrentPositionEx implementation.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 531a599405786781fa385a4f56b2a26fec624321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=531a599405786781fa385a4f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:18:59 2021 +0200 gdi32: Use DC_ATTR for GetCurrentPositionEx 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/dc.c | 13 ------------- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/tests/metafile.c | 3 +++ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 65401fb8ccf..4441592f59f 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1833,19 +1833,6 @@ BOOL WINAPI GetBrushOrgEx( HDC hdc, LPPOINT pt ) } -/*********************************************************************** - * GetCurrentPositionEx (GDI32.@) - */ -BOOL WINAPI GetCurrentPositionEx( HDC hdc, LPPOINT pt ) -{ - DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; - *pt = dc->attr->cur_pos; - release_dc_ptr( dc ); - return TRUE; -} - - /*********************************************************************** * GetViewportExtEx (GDI32.@) */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index c011d66deb9..54526a0876c 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -37,6 +37,17 @@ static DC_ATTR *get_dc_attr( HDC hdc ) return dc_attr; } +/*********************************************************************** + * GetCurrentPositionEx (GDI32.@) + */ +BOOL WINAPI GetCurrentPositionEx( HDC hdc, POINT *point ) +{ + DC_ATTR *dc_attr; + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + *point = dc_attr->cur_pos; + return TRUE; +} + /*********************************************************************** * LineTo (GDI32.@) */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 8a8ad48a1c6..921ac888247 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3017,6 +3017,9 @@ static void test_metafile_file(void) ret = Ellipse(dc, 0, 0, 2, 2); ok( ret, "Ellipse error %d.\n", GetLastError()); + ret = GetCurrentPositionEx(dc, &oldpoint); + ok(!ret, "GetCurrentPositionEx succeeded\n"); + size = GetFileSize(file, NULL); ok(!size, "size = %u\n", size);

1 0

Jacek Caban : gdi32: Handle EMFs directly in MoveToEx.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 4fc7a1df1bfb8c43dc07e264e23c37cedd169e55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fc7a1df1bfb8c43dc07e264… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:19:05 2021 +0200 gdi32: Handle EMFs directly in MoveToEx. 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 | 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(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 79c3032daa6..d0d9d2f14fe 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -734,17 +734,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_MoveTo - */ -static BOOL CDECL emfpathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pMoveTo ); - - return (emfdev->funcs->pMoveTo( emfdev, x, y ) && next->funcs->pMoveTo( next, x, y )); -} - /*********************************************************************** * emfpathdrv_Pie */ @@ -944,7 +933,7 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pInvertRgn */ NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ - emfpathdrv_MoveTo, /* pMoveTo */ + NULL, /* pMoveTo */ NULL, /* pOffsetClipRgn */ NULL, /* pOffsetViewportOrg */ NULL, /* pOffsetWindowOrg */ diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 1a90f70604f..9f9799a54da 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -92,7 +92,6 @@ extern INT CDECL EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, extern BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_MoveTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 8d6445779b9..3c8c8b3bd07 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -118,10 +118,11 @@ static BOOL emfdrv_stroke_and_fill_path( PHYSDEV dev, INT type ) } /********************************************************************** - * EMFDRV_MoveTo + * EMFDC_MoveTo */ -BOOL CDECL EMFDRV_MoveTo(PHYSDEV dev, INT x, INT y) +BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) { + EMFDRV_PDEVICE *emf = dc_attr->emf; EMRMOVETOEX emr; emr.emr.iType = EMR_MOVETOEX; @@ -129,7 +130,7 @@ BOOL CDECL EMFDRV_MoveTo(PHYSDEV dev, INT x, INT y) emr.ptl.x = x; emr.ptl.y = y; - return EMFDRV_WriteRecord( dev, &emr.emr ); + return EMFDRV_WriteRecord( &emf->dev, &emr.emr ); } /*********************************************************************** diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 62e35fe4029..c941e095752 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -98,7 +98,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_InvertRgn, /* pInvertRgn */ EMFDRV_LineTo, /* pLineTo */ EMFDRV_ModifyWorldTransform, /* pModifyWorldTransform */ - EMFDRV_MoveTo, /* pMoveTo */ + NULL, /* pMoveTo */ EMFDRV_OffsetClipRgn, /* pOffsetClipRgn */ EMFDRV_OffsetViewportOrgEx, /* pOffsetViewportOrgEx */ EMFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index bb4504f4934..7f3eeff566c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -53,5 +53,6 @@ extern BOOL METADC_Pie( HDC hdc, INT left, INT top, INT right, INT bottom, /* enhanced metafiles */ 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; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 54526a0876c..57163423e13 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -68,9 +68,13 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) */ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, POINT *pt ) { + DC_ATTR *dc_attr; + TRACE( "%p, (%d, %d), %p\n", hdc, x, y, pt ); if (is_meta_dc( hdc )) return METADC_MoveTo( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_MoveTo( dc_attr, x, y )) return FALSE; return NtGdiMoveTo( hdc, x, y, pt ); }

1 0

Jacek Caban : gdi32: Store graphics mode in DC_ATTR.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: b825727d1d7c0987bf3938570639d85d586ce97b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b825727d1d7c0987bf393857… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:19:14 2021 +0200 gdi32: Store graphics mode in DC_ATTR. 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 | 12 ++++++------ dlls/gdi32/dibdrv/graphics.c | 4 ++-- dlls/gdi32/enhmfdrv/graphics.c | 10 +++++----- dlls/gdi32/font.c | 8 ++++---- dlls/gdi32/mapping.c | 4 ++-- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 4 ++-- include/ntgdi.h | 1 + 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 4441592f59f..2573390c6f2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -99,7 +99,7 @@ static void set_initial_dc_state( DC *dc ) dc->breakExtra = 0; dc->breakRem = 0; dc->MapMode = MM_TEXT; - dc->GraphicsMode = GM_COMPATIBLE; + dc->attr->graphics_mode = GM_COMPATIBLE; dc->attr->cur_pos.x = 0; dc->attr->cur_pos.y = 0; dc->ArcDirection = AD_COUNTERCLOCKWISE; @@ -414,7 +414,7 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->breakExtra = dc->breakExtra; newdc->breakRem = dc->breakRem; newdc->MapMode = dc->MapMode; - newdc->GraphicsMode = dc->GraphicsMode; + newdc->attr->graphics_mode = dc->attr->graphics_mode; newdc->attr->cur_pos = dc->attr->cur_pos; newdc->ArcDirection = dc->ArcDirection; newdc->xformWorld2Wnd = dc->xformWorld2Wnd; @@ -491,7 +491,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->breakExtra = dcs->breakExtra; dc->breakRem = dcs->breakRem; dc->MapMode = dcs->MapMode; - dc->GraphicsMode = dcs->GraphicsMode; + dc->attr->graphics_mode = dcs->attr->graphics_mode; dc->attr->cur_pos = dcs->attr->cur_pos; dc->ArcDirection = dcs->ArcDirection; dc->xformWorld2Wnd = dcs->xformWorld2Wnd; @@ -1053,7 +1053,7 @@ INT WINAPI GetGraphicsMode( HDC hdc ) DC * dc = get_dc_ptr( hdc ); if (dc) { - ret = dc->GraphicsMode; + ret = dc->attr->graphics_mode; release_dc_ptr( dc ); } return ret; @@ -1076,8 +1076,8 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) if (!dc) return 0; if ((mode > 0) && (mode <= GM_LAST)) { - ret = dc->GraphicsMode; - dc->GraphicsMode = mode; + ret = dc->attr->graphics_mode; + dc->attr->graphics_mode = mode; } /* font metrics depend on the graphics mode */ if (ret != mode) NtGdiSelectFont(dc->hSelf, dc->hFont); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index a875ae113cd..b6ae4ab10e2 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -561,7 +561,7 @@ static struct cached_font *add_cached_font( DC *dc, HFONT hfont, UINT aa_flags ) GetObjectW( hfont, sizeof(font.lf), &font.lf ); font.xform = dc->xformWorld2Vport; font.xform.eDx = font.xform.eDy = 0; /* unused, would break hashing */ - if (dc->GraphicsMode == GM_COMPATIBLE) + if (dc->attr->graphics_mode == GM_COMPATIBLE) { font.lf.lfOrientation = font.lf.lfEscapement; if (font.xform.eM11 * font.xform.eM22 < 0) @@ -1399,7 +1399,7 @@ BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bott TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); - if (dc->GraphicsMode == GM_ADVANCED) + if (dc->attr->graphics_mode == GM_ADVANCED) { pts[0].x = pts[3].x = left; pts[0].y = pts[1].y = top; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 3c8c8b3bd07..2c23d0f9ae7 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -188,7 +188,7 @@ EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, if(left > right) {temp = left; left = right; right = temp;} if(top > bottom) {temp = top; top = bottom; bottom = temp;} - if(dc->GraphicsMode == GM_COMPATIBLE) { + if(dc->attr->graphics_mode == GM_COMPATIBLE) { right--; bottom--; } @@ -359,7 +359,7 @@ BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom if(left > right) {temp = left; left = right; right = temp;} if(top > bottom) {temp = top; top = bottom; bottom = temp;} - if(dc->GraphicsMode == GM_COMPATIBLE) { + if(dc->attr->graphics_mode == GM_COMPATIBLE) { right--; bottom--; } @@ -393,7 +393,7 @@ BOOL CDECL EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT botto if(left > right) {temp = left; left = right; right = temp;} if(top > bottom) {temp = top; top = bottom; bottom = temp;} - if(dc->GraphicsMode == GM_COMPATIBLE) { + if(dc->attr->graphics_mode == GM_COMPATIBLE) { right--; bottom--; } @@ -426,7 +426,7 @@ BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, if(left > right) {temp = left; left = right; right = temp;} if(top > bottom) {temp = top; top = bottom; bottom = temp;} - if(dc->GraphicsMode == GM_COMPATIBLE) { + if(dc->attr->graphics_mode == GM_COMPATIBLE) { right--; bottom--; } @@ -810,7 +810,7 @@ BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT int textHeight = 0; int textWidth = 0; const UINT textAlign = dc->textAlign; - const INT graphicsMode = dc->GraphicsMode; + const INT graphicsMode = dc->attr->graphics_mode; FLOAT exScale, eyScale; nSize = sizeof(*pemr) + ((count+1) & ~1) * sizeof(WCHAR) + count * sizeof(INT); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 066b7a3648e..c3cbe18f0c8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3759,7 +3759,7 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) lf.lfWeight, lf.lfPitchAndFamily, lf.lfCharSet, lf.lfOrientation, lf.lfEscapement ); - if (dc->GraphicsMode == GM_ADVANCED) + if (dc->attr->graphics_mode == GM_ADVANCED) { memcpy( &dcmat, &dc->xformWorld2Vport, sizeof(FMAT2) ); /* try to avoid not necessary glyph transformations */ @@ -6015,7 +6015,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if(!(tm.tmPitchAndFamily & TMPF_VECTOR)) /* Non-scalable fonts shouldn't be rotated */ lf.lfEscapement = 0; - if ((dc->GraphicsMode == GM_COMPATIBLE) && + if ((dc->attr->graphics_mode == GM_COMPATIBLE) && (dc->vport2WorldValid && dc->xformWorld2Vport.eM11 * dc->xformWorld2Vport.eM22 < 0)) { lf.lfEscapement = -lf.lfEscapement; @@ -6116,7 +6116,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, desired[1].x -= desired[0].x; desired[1].y -= desired[0].y; - if (dc->GraphicsMode == GM_COMPATIBLE) + if (dc->attr->graphics_mode == GM_COMPATIBLE) { if (dc->vport2WorldValid && dc->xformWorld2Vport.eM11 < 0) desired[1].x = -desired[1].x; @@ -6146,7 +6146,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, desired[1].x -= desired[0].x; desired[1].y -= desired[0].y; - if (dc->GraphicsMode == GM_COMPATIBLE) + if (dc->attr->graphics_mode == GM_COMPATIBLE) { if (dc->vport2WorldValid && dc->xformWorld2Vport.eM11 < 0) desired[1].x = -desired[1].x; diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 5eb06555831..46a7973644e 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -561,7 +561,7 @@ BOOL WINAPI ModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ) if ((dc = get_dc_ptr( hdc ))) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pModifyWorldTransform ); - if (dc->GraphicsMode == GM_ADVANCED) + if (dc->attr->graphics_mode == GM_ADVANCED) ret = physdev->funcs->pModifyWorldTransform( physdev, xform, mode ); release_dc_ptr( dc ); } @@ -587,7 +587,7 @@ BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform ) if ((dc = get_dc_ptr( hdc ))) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetWorldTransform ); - if (dc->GraphicsMode == GM_ADVANCED) + if (dc->attr->graphics_mode == GM_ADVANCED) ret = physdev->funcs->pSetWorldTransform( physdev, xform ); release_dc_ptr( dc ); } diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index ba065c2439f..4527651bb33 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -135,7 +135,6 @@ typedef struct tagDC INT breakExtra; /* breakTotalExtra / breakCount */ INT breakRem; /* breakTotalExtra % breakCount */ INT MapMode; - INT GraphicsMode; /* Graphics mode */ ABORTPROC pAbortProc; /* AbortProc for Printing */ INT ArcDirection; XFORM xformWorld2Wnd; /* World-to-window transformation */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 4bca32c2e30..3a1da23df30 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -383,7 +383,7 @@ static BOOL PATH_CheckCorners( DC *dc, POINT corners[], INT x1, INT y1, INT x2, } /* In GM_COMPATIBLE, don't include bottom and right edges */ - if (dc->GraphicsMode == GM_COMPATIBLE) + if (dc->attr->graphics_mode == GM_COMPATIBLE) { if (corners[0].x == corners[1].x) return FALSE; if (corners[0].y == corners[1].y) return FALSE; @@ -1129,7 +1129,7 @@ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, } /* In GM_COMPATIBLE, don't include bottom and right edges */ - if (dc->GraphicsMode == GM_COMPATIBLE) + if (dc->attr->graphics_mode == GM_COMPATIBLE) { corners[1].x--; corners[1].y--; diff --git a/include/ntgdi.h b/include/ntgdi.h index 53915033c89..4d1d6a48c4f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -89,6 +89,7 @@ enum typedef struct DC_ATTR { POINT cur_pos; + INT graphics_mode; void *emf; } DC_ATTR;

1 0

Jacek Caban : gdi32: Handle EMFs directly in arc functions.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: b9f773ded1f1f8b7c988f4388ca13bd59f7546c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9f773ded1f1f8b7c988f438… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:19:24 2021 +0200 gdi32: Handle EMFs directly in arc functions. 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 | 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(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9f773ded1f1f8b7c988…

1 0

Jacek Caban : gdi32: Use NtGdiEllipse for Ellipse implementation.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 680220c565410354fa3256ef187848c4eb260ac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=680220c565410354fa3256ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:19:33 2021 +0200 gdi32: Use NtGdiEllipse for Ellipse 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 | 11 +++++++- dlls/gdi32/mfdrv/metafiledrv.h | 3 ++- dlls/gdi32/painting.c | 7 ++--- 8 files changed, 73 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=680220c565410354fa32…

1 0

Jacek Caban : gdi32: Use NtGdiRoundRect for RoundRect implementation.
by Alexandre Julliard 21 Jul '21

21 Jul '21

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

Jacek Caban : gdi32: Use NtGdiRectangle for Rectangle implementation.
by Alexandre Julliard 21 Jul '21

21 Jul '21

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