wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Hiroki Awata : msgsm32.acm: Msgsm32 should not perform PCM-to-PCM conversion.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: d05dd4460c69cb749918a61dbaea35285a5cb8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=d05dd4460c69cb749918a61d… Author: Hiroki Awata <castaneai(a)by.black> Date: Sat Aug 14 23:56:14 2021 +0900 msgsm32.acm: Msgsm32 should not perform PCM-to-PCM conversion. If the source and destination are both in a specific PCM format (1 channel, 16bit), acmStreamOpen will select the GSM 6.10 driver in preference to the built-in, causing incorrect conversion. Signed-off-by: Hiroki Awata <castaneai(a)by.black> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 1 + dlls/msgsm32.acm/msgsm32.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 04b4e090820..82ddb430cd7 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1056,6 +1056,7 @@ struct stream_output static const struct stream_output expected_output[] = { /* #0: Identical conversion */ {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63}, 64, FALSE}, + {{WAVE_FORMAT_PCM, 1, 44100, 88200, 2, 16}, {WAVE_FORMAT_PCM, 1, 44100, 88200, 2, 16}, {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63}, 64, FALSE}, /* #1: 1 -> 2 channels */ {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 2, 8000, 16000, 2, 8}, {0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,30,30,31,31,32,32,33,33,34,34,35,35,36,36,37,37,38,38,39,39,40,40,41,41,42,42,43,43,44,44,45,45,46,46,47,47,48,48,49,49,50,50,51,51,52,52,53,53,54,54,55,55,56,56,57,57,58,58,59,59,60,60,61,61,62,62,63,63}, 128, FALSE}, diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index bd54aa4fb36..d1d4c01d0e7 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -364,6 +364,9 @@ static LRESULT GSM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) { int used = 1; gsm r; + if (adsi->pwfxSrc->wFormatTag != WAVE_FORMAT_GSM610 && adsi->pwfxDst->wFormatTag != WAVE_FORMAT_GSM610) + return MMSYSERR_NOTSUPPORTED; + if (!GSM_FormatValidate(adsi->pwfxSrc) || !GSM_FormatValidate(adsi->pwfxDst)) return MMSYSERR_NOTSUPPORTED;

1 0

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

18 Aug '21

Module: wine Branch: master Commit: 817f116e9522d5f0cb333010cfe9fd783aca025e URL: https://source.winehq.org/git/wine.git/?a=commit;h=817f116e9522d5f0cb333010… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:59:24 2021 +0200 gdi32: Remove no longer used driver entry points. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 4 ---- dlls/gdi32/driver.c | 2 -- dlls/gdi32/enhmfdrv/init.c | 2 -- dlls/gdi32/font.c | 2 -- dlls/gdi32/ntgdi_private.h | 2 -- dlls/gdi32/path.c | 12 ------------ dlls/wineandroid.drv/init.c | 2 -- dlls/winemac.drv/gdi.c | 2 -- dlls/wineps.drv/init.c | 2 -- dlls/winex11.drv/init.c | 2 -- dlls/winex11.drv/xrender.c | 2 -- include/wine/gdi_driver.h | 4 +--- 12 files changed, 1 insertion(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=817f116e9522d5f0cb33…

1 0

Jacek Caban : gdi32: Use NtGdiFlattenPath for FlattenPath.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: b39d4cbe36708d791a4c45f7a27cfa75e93db56c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b39d4cbe36708d791a4c45f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:59:15 2021 +0200 gdi32: Use NtGdiFlattenPath for FlattenPath. 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 | 5 ++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 33 +++++++++++++-------------------- 6 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index bf8f1a85ad9..5b88e6e9c13 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -376,14 +376,13 @@ BOOL EMFDC_EndPath( DC_ATTR *dc_attr ) return EMFDRV_WriteRecord( &emf->dev, &emr.emr ); } -BOOL CDECL EMFDRV_FlattenPath( PHYSDEV dev ) +BOOL EMFDC_FlattenPath( DC_ATTR *dc_attr ) { EMRFLATTENPATH emr; emr.emr.iType = EMR_FLATTENPATH; emr.emr.nSize = sizeof(emr); - - return EMFDRV_WriteRecord( dev, &emr.emr ); + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_SelectClipPath( DC_ATTR *dc_attr, INT mode ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index ea60aa6cf29..6e0a89495e6 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -71,7 +71,6 @@ extern BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 57d538f3597..7cbe6efb96d 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -63,7 +63,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_ExtTextOut, /* pExtTextOut */ EMFDRV_FillPath, /* pFillPath */ EMFDRV_FillRgn, /* pFillRgn */ - EMFDRV_FlattenPath, /* pFlattenPath */ + NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ EMFDRV_FrameRgn, /* pFrameRgn */ NULL, /* pGetBoundsRect */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 1e0e4d2dd0a..bb90ee471f1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -149,6 +149,7 @@ extern BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const const WCHAR *str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; extern BOOL EMFDC_FillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_FillRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_FlattenPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_FrameRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) DECLSPEC_HIDDEN; extern BOOL EMFDC_GradientFill( DC_ATTR *dc_attr, TRIVERTEX *vert_array, ULONG nvert, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 067a7e7f588..c5e8d29837a 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1531,6 +1531,18 @@ BOOL WINAPI FillPath( HDC hdc ) return NtGdiFillPath( hdc ); } +/*********************************************************************** + * FlattenPath (GDI32.@) + */ +BOOL WINAPI FlattenPath( HDC hdc ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_FlattenPath( dc_attr )) return FALSE; + return NtGdiFlattenPath( hdc ); +} + /*********************************************************************** * SelectClipPath (GDI32.@) */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 2badf2874f2..a47682a6eda 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1588,21 +1588,25 @@ static BOOL CDECL pathdrv_CloseFigure( PHYSDEV dev ) /******************************************************************* - * FlattenPath [GDI32.@] - * - * + * NtGdiFlattenPath (win32u.@) */ -BOOL WINAPI FlattenPath(HDC hdc) +BOOL WINAPI NtGdiFlattenPath( HDC hdc ) { + struct gdi_path *path; BOOL ret = FALSE; - DC *dc = get_dc_ptr( hdc ); + DC *dc; - if (dc) + if (!(dc = get_dc_ptr( hdc ))) return FALSE; + + if (!dc->path) SetLastError( ERROR_CAN_NOT_COMPLETE ); + else if ((path = PATH_FlattenPath( dc->path ))) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pFlattenPath ); - ret = physdev->funcs->pFlattenPath( physdev ); - release_dc_ptr( dc ); + free_gdi_path( dc->path ); + dc->path = path; + ret = TRUE; } + + release_dc_ptr( dc ); return ret; } @@ -2030,17 +2034,6 @@ BOOL CDECL nulldrv_StrokePath( PHYSDEV dev ) BOOL CDECL nulldrv_FlattenPath( PHYSDEV dev ) { - DC *dc = get_nulldrv_dc( dev ); - struct gdi_path *path; - - if (!dc->path) - { - SetLastError( ERROR_CAN_NOT_COMPLETE ); - return FALSE; - } - if (!(path = PATH_FlattenPath( dc->path ))) return FALSE; - free_gdi_path( dc->path ); - dc->path = path; return TRUE; }

1 0

Jacek Caban : gdi32: Use NtGdiSelectClipPath for SelectClipPath.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 617cab35686c3254ce02821e3be54f9df6275fbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=617cab35686c3254ce02821e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:58:54 2021 +0200 gdi32: Use NtGdiSelectClipPath for SelectClipPath. 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 | 16 +++------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 23 +++++++---------------- 6 files changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index f424b459fb3..bf8f1a85ad9 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -386,24 +386,14 @@ BOOL CDECL EMFDRV_FlattenPath( PHYSDEV dev ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) +BOOL EMFDC_SelectClipPath( DC_ATTR *dc_attr, INT mode ) { EMRSELECTCLIPPATH emr; - BOOL ret = FALSE; - HRGN hrgn; emr.emr.iType = EMR_SELECTCLIPPATH; emr.emr.nSize = sizeof(emr); - emr.iMode = iMode; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - hrgn = PathToRegion( dev->hdc ); - if (hrgn) - { - ret = NtGdiExtSelectClipRgn( dev->hdc, hrgn, iMode ); - DeleteObject( hrgn ); - } - return ret; + emr.iMode = mode; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL CDECL EMFDRV_WidenPath( PHYSDEV dev ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index fb108c15be5..ea60aa6cf29 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -93,7 +93,6 @@ extern BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT righ extern BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern HBITMAP CDECL EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_HIDDEN; extern HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, UINT *aa_flags ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 5421f6009ce..57d538f3597 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -111,7 +111,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_RoundRect, /* pRoundRect */ EMFDRV_SelectBitmap, /* pSelectBitmap */ NULL, /* pSelectBrush */ - EMFDRV_SelectClipPath, /* pSelectClipPath */ + NULL, /* pSelectClipPath */ EMFDRV_SelectFont, /* pSelectFont */ NULL, /* pSelectPen */ NULL, /* pSetBkColor */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0a894e9ec3d..1e0e4d2dd0a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -184,6 +184,7 @@ extern BOOL EMFDC_ScaleViewportExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_denom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ScaleWindowExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_num, INT y_denom ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SelectClipPath( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SelectObject( DC_ATTR *dc_attr, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SelectPalette( DC_ATTR *dc_attr, HPALETTE palette ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 85744cc5c11..067a7e7f588 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1531,6 +1531,18 @@ BOOL WINAPI FillPath( HDC hdc ) return NtGdiFillPath( hdc ); } +/*********************************************************************** + * SelectClipPath (GDI32.@) + */ +BOOL WINAPI SelectClipPath( HDC hdc, INT mode ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SelectClipPath( dc_attr, mode )) return FALSE; + return NtGdiSelectClipPath( hdc, mode ); +} + /*********************************************************************** * IntersectClipRect (GDI32.@) */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 54e93ca74db..2badf2874f2 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -714,18 +714,17 @@ BOOL WINAPI NtGdiFillPath( HDC hdc ) /*********************************************************************** - * SelectClipPath (GDI32.@) + * NtGdiSelectClipPath (win32u.@) */ -BOOL WINAPI SelectClipPath(HDC hdc, INT iMode) +BOOL WINAPI NtGdiSelectClipPath( HDC hdc, INT mode ) { BOOL ret = FALSE; - DC *dc = get_dc_ptr( hdc ); + HRGN rgn; - if (dc) + if ((rgn = PathToRegion( hdc ))) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectClipPath ); - ret = physdev->funcs->pSelectClipPath( physdev, iMode ); - release_dc_ptr( dc ); + ret = NtGdiExtSelectClipRgn( hdc, rgn, mode ) != ERROR; + DeleteObject( rgn ); } return ret; } @@ -2005,15 +2004,7 @@ BOOL CDECL nulldrv_CloseFigure( PHYSDEV dev ) BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) { - BOOL ret = FALSE; - HRGN hrgn = PathToRegion( dev->hdc ); - - if (hrgn) - { - ret = ExtSelectClipRgn( dev->hdc, hrgn, mode ) != ERROR; - DeleteObject( hrgn ); - } - return ret; + return TRUE; } BOOL CDECL nulldrv_FillPath( PHYSDEV dev )

1 0

Jacek Caban : gdi32: Use NtGdiFillPath for FillPath.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 6ce4ad23eb46e0492a28a85fdfc2f8ca8b925ecc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ce4ad23eb46e0492a28a85f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:58:26 2021 +0200 gdi32: Use NtGdiFillPath for FillPath. 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/graphics.c | 11 ++++++++++- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 7 ++----- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index eacf596c92b..0f48d6876dd 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -1180,7 +1180,16 @@ BOOL EMFDC_GradientFill( DC_ATTR *dc_attr, TRIVERTEX *vert_array, ULONG nvert, */ BOOL CDECL EMFDRV_FillPath( PHYSDEV dev ) { - return emfdrv_stroke_and_fill_path( dev, EMR_FILLPATH ); + /* FIXME: update bound rect */ + return TRUE; +} + +/********************************************************************** + * EMFDC_FillPath + */ +BOOL EMFDC_FillPath( DC_ATTR *dc_attr ) +{ + return emfdrv_stroke_and_fill_path( dc_attr->emf, EMR_FILLPATH ); } /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b32bae5449d..0a894e9ec3d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -147,6 +147,7 @@ extern BOOL EMFDC_ExtFloodFill( DC_ATTR *dc_attr, INT x, INT y, COLORREF color, extern BOOL EMFDC_ExtSelectClipRgn( DC_ATTR *dc_attr, HRGN hrgn, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *rect, const WCHAR *str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_FillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_FillRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern BOOL EMFDC_FrameRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 041cba83581..85744cc5c11 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1519,6 +1519,18 @@ BOOL WINAPI CloseFigure( HDC hdc ) return NtGdiCloseFigure( hdc ); } +/*********************************************************************** + * FillPath (GDI32.@) + */ +BOOL WINAPI FillPath( HDC hdc ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_FillPath( dc_attr )) return FALSE; + return NtGdiFillPath( hdc ); +} + /*********************************************************************** * IntersectClipRect (GDI32.@) */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index fd8970f2929..54e93ca74db 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -696,12 +696,9 @@ HRGN WINAPI PathToRegion(HDC hdc) /*********************************************************************** - * FillPath (GDI32.@) - * - * FIXME - * Check that SetLastError is being called correctly + * NtGdiFillPath (win32u.@) */ -BOOL WINAPI FillPath(HDC hdc) +BOOL WINAPI NtGdiFillPath( HDC hdc ) { BOOL ret = FALSE; DC *dc = get_dc_ptr( hdc );

1 0

Jacek Caban : gdi32: Merge mfdrv/text.c into metadc.c.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: b47fb9081d4cf2802d64b29b06ed1a377191dbf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b47fb9081d4cf2802d64b29b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:58:05 2021 +0200 gdi32: Merge mfdrv/text.c into metadc.c. 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/Makefile.in | 1 - dlls/gdi32/metadc.c | 159 ++++++++++++++++++++++++++++++++++++----- dlls/gdi32/mfdrv/metafiledrv.h | 65 ----------------- dlls/gdi32/mfdrv/text.c | 153 --------------------------------------- 4 files changed, 143 insertions(+), 235 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b47fb9081d4cf2802d64…

1 0

Jacek Caban : gdi32: Merge mfdrv/bitblt.c into metadc.c.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 61084e0bdc9fdf8326338eb1c00669ba69db8be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61084e0bdc9fdf8326338eb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:57:52 2021 +0200 gdi32: Merge mfdrv/bitblt.c into metadc.c. 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/Makefile.in | 1 - dlls/gdi32/metadc.c | 138 ++++++++++++++++++++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 177 ---------------------------------------------- 3 files changed, 138 insertions(+), 178 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61084e0bdc9fdf832633…

1 0

Jacek Caban : gdi32: Merge mfdrv/objects.c into metadc.c.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: fa1320f466f76fb61ef6264cf321dac865388984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa1320f466f76fb61ef6264c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:57:32 2021 +0200 gdi32: Merge mfdrv/objects.c into metadc.c. 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/Makefile.in | 1 - dlls/gdi32/metadc.c | 379 +++++++++++++++++++++++++++++++++ dlls/gdi32/mfdrv/metafiledrv.h | 4 - dlls/gdi32/mfdrv/objects.c | 467 ----------------------------------------- 4 files changed, 379 insertions(+), 472 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fa1320f466f76fb61ef6…

1 0

Jacek Caban : gdi32: Merge mfdrv/graphics.c into metadc.c.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 2f71b42f07f9960f103d176cd44aa8a106c5dada URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f71b42f07f9960f103d176c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:57:06 2021 +0200 gdi32: Merge mfdrv/graphics.c into metadc.c. 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/Makefile.in | 1 - dlls/gdi32/metadc.c | 322 +++++++++++++++++++++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 430 -------------------------------------------- 3 files changed, 322 insertions(+), 431 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f71b42f07f9960f103d…

1 0

Jacek Caban : gdi32: Merge mfdrv/dc.c into metadc.c.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 1b86e52ec465942602997eb0410f2f6931487f9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b86e52ec465942602997eb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:56:51 2021 +0200 gdi32: Merge mfdrv/dc.c into metadc.c. 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/Makefile.in | 1 - dlls/gdi32/metadc.c | 130 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 151 ------------------------------------------------- 3 files changed, 130 insertions(+), 152 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 633def9c6c2..cab0623a56c 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -38,7 +38,6 @@ C_SRCS = \ metadc.c \ metafile.c \ mfdrv/bitblt.c \ - mfdrv/dc.c \ mfdrv/graphics.c \ mfdrv/objects.c \ mfdrv/text.c \ diff --git a/dlls/gdi32/metadc.c b/dlls/gdi32/metadc.c index 324fe7e2535..903b80854c4 100644 --- a/dlls/gdi32/metadc.c +++ b/dlls/gdi32/metadc.c @@ -167,6 +167,136 @@ BOOL metadc_param8( HDC hdc, short func, short param1, short param2, return metadc_record( hdc, mr, sizeof(buffer) ); } +BOOL METADC_SaveDC( HDC hdc ) +{ + return metadc_param0( hdc, META_SAVEDC ); +} + +BOOL METADC_RestoreDC( HDC hdc, INT level ) +{ + return metadc_param1( hdc, META_RESTOREDC, level ); +} + +BOOL METADC_SetTextAlign( HDC hdc, UINT align ) +{ + return metadc_param2( hdc, META_SETTEXTALIGN, HIWORD(align), LOWORD(align) ); +} + +BOOL METADC_SetBkMode( HDC hdc, INT mode ) +{ + return metadc_param1( hdc, META_SETBKMODE, (WORD)mode ); +} + +BOOL METADC_SetBkColor( HDC hdc, COLORREF color ) +{ + return metadc_param2( hdc, META_SETBKCOLOR, HIWORD(color), LOWORD(color) ); +} + +BOOL METADC_SetTextColor( HDC hdc, COLORREF color ) +{ + return metadc_param2( hdc, META_SETTEXTCOLOR, HIWORD(color), LOWORD(color) ); +} + +BOOL METADC_SetROP2( HDC hdc, INT rop ) +{ + return metadc_param1( hdc, META_SETROP2, (WORD)rop ); +} + +BOOL METADC_SetRelAbs( HDC hdc, INT mode ) +{ + return metadc_param1( hdc, META_SETRELABS, (WORD)mode ); +} + +BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) +{ + return metadc_param1( hdc, META_SETPOLYFILLMODE, mode ); +} + +BOOL METADC_SetStretchBltMode( HDC hdc, INT mode ) +{ + return metadc_param1( hdc, META_SETSTRETCHBLTMODE, mode ); +} + +BOOL METADC_IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) +{ + return metadc_param4( hdc, META_INTERSECTCLIPRECT, left, top, right, bottom ); +} + +BOOL METADC_ExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) +{ + return metadc_param4( hdc, META_EXCLUDECLIPRECT, left, top, right, bottom ); +} + +BOOL METADC_OffsetClipRgn( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_OFFSETCLIPRGN, x, y ); +} + +BOOL METADC_SetLayout( HDC hdc, DWORD layout ) +{ + return metadc_param2( hdc, META_SETLAYOUT, HIWORD(layout), LOWORD(layout) ); +} + +BOOL METADC_SetMapMode( HDC hdc, INT mode ) +{ + return metadc_param1( hdc, META_SETMAPMODE, mode ); +} + +BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_SETVIEWPORTEXT, x, y ); +} + +BOOL METADC_SetViewportOrgEx( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_SETVIEWPORTORG, x, y ); +} + +BOOL METADC_SetWindowExtEx( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_SETWINDOWEXT, x, y ); +} + +BOOL METADC_SetWindowOrgEx( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_SETWINDOWORG, x, y ); +} + +BOOL METADC_OffsetViewportOrgEx( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_OFFSETVIEWPORTORG, x, y ); +} + +BOOL METADC_OffsetWindowOrgEx( HDC hdc, INT x, INT y ) +{ + return metadc_param2( hdc, META_OFFSETWINDOWORG, x, y ); +} + +BOOL METADC_ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) +{ + return metadc_param4( hdc, META_SCALEVIEWPORTEXT, x_num, x_denom, y_num, y_denom ); +} + +BOOL METADC_ScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) +{ + return metadc_param4( hdc, META_SCALEWINDOWEXT, x_num, x_denom, y_num, y_denom ); +} + +BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) +{ + return metadc_param2( hdc, META_SETTEXTJUSTIFICATION, extra, breaks ); +} + +BOOL METADC_SetTextCharacterExtra( HDC hdc, INT extra ) +{ + return metadc_param1( hdc, META_SETTEXTCHAREXTRA, extra ); +} + +BOOL METADC_SetMapperFlags( HDC hdc, DWORD flags ) +{ + return metadc_param2( hdc, META_SETMAPPERFLAGS, HIWORD(flags), LOWORD(flags) ); +} + BOOL METADC_ExtEscape( HDC hdc, INT escape, INT input_size, const void *input, INT output_size, void *output ) { diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c deleted file mode 100644 index 1fe36127676..00000000000 --- a/dlls/gdi32/mfdrv/dc.c +++ /dev/null @@ -1,151 +0,0 @@ -/* - * MetaFile driver DC value functions - * - * Copyright 1999 Huw D M Davies - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "mfdrv/metafiledrv.h" - -BOOL METADC_SaveDC( HDC hdc ) -{ - return metadc_param0( hdc, META_SAVEDC ); -} - -BOOL METADC_RestoreDC( HDC hdc, INT level ) -{ - return metadc_param1( hdc, META_RESTOREDC, level ); -} - -BOOL METADC_SetTextAlign( HDC hdc, UINT align ) -{ - return metadc_param2( hdc, META_SETTEXTALIGN, HIWORD(align), LOWORD(align) ); -} - -BOOL METADC_SetBkMode( HDC hdc, INT mode ) -{ - return metadc_param1( hdc, META_SETBKMODE, (WORD)mode ); -} - -BOOL METADC_SetBkColor( HDC hdc, COLORREF color ) -{ - return metadc_param2( hdc, META_SETBKCOLOR, HIWORD(color), LOWORD(color) ); -} - -BOOL METADC_SetTextColor( HDC hdc, COLORREF color ) -{ - return metadc_param2( hdc, META_SETTEXTCOLOR, HIWORD(color), LOWORD(color) ); -} - -BOOL METADC_SetROP2( HDC hdc, INT rop ) -{ - return metadc_param1( hdc, META_SETROP2, (WORD)rop ); -} - -BOOL METADC_SetRelAbs( HDC hdc, INT mode ) -{ - return metadc_param1( hdc, META_SETRELABS, (WORD)mode ); -} - -BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) -{ - return metadc_param1( hdc, META_SETPOLYFILLMODE, mode ); -} - -BOOL METADC_SetStretchBltMode( HDC hdc, INT mode ) -{ - return metadc_param1( hdc, META_SETSTRETCHBLTMODE, mode ); -} - -BOOL METADC_IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) -{ - return metadc_param4( hdc, META_INTERSECTCLIPRECT, left, top, right, bottom ); -} - -BOOL METADC_ExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) -{ - return metadc_param4( hdc, META_EXCLUDECLIPRECT, left, top, right, bottom ); -} - -BOOL METADC_OffsetClipRgn( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_OFFSETCLIPRGN, x, y ); -} - -BOOL METADC_SetLayout( HDC hdc, DWORD layout ) -{ - return metadc_param2( hdc, META_SETLAYOUT, HIWORD(layout), LOWORD(layout) ); -} - -BOOL METADC_SetMapMode( HDC hdc, INT mode ) -{ - return metadc_param1( hdc, META_SETMAPMODE, mode ); -} - -BOOL METADC_SetViewportExtEx( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_SETVIEWPORTEXT, x, y ); -} - -BOOL METADC_SetViewportOrgEx( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_SETVIEWPORTORG, x, y ); -} - -BOOL METADC_SetWindowExtEx( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_SETWINDOWEXT, x, y ); -} - -BOOL METADC_SetWindowOrgEx( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_SETWINDOWORG, x, y ); -} - -BOOL METADC_OffsetViewportOrgEx( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_OFFSETVIEWPORTORG, x, y ); -} - -BOOL METADC_OffsetWindowOrgEx( HDC hdc, INT x, INT y ) -{ - return metadc_param2( hdc, META_OFFSETWINDOWORG, x, y ); -} - -BOOL METADC_ScaleViewportExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) -{ - return metadc_param4( hdc, META_SCALEVIEWPORTEXT, x_num, x_denom, y_num, y_denom ); -} - -BOOL METADC_ScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, INT y_num, INT y_denom ) -{ - return metadc_param4( hdc, META_SCALEWINDOWEXT, x_num, x_denom, y_num, y_denom ); -} - -BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) -{ - return metadc_param2( hdc, META_SETTEXTJUSTIFICATION, extra, breaks ); -} - -BOOL METADC_SetTextCharacterExtra( HDC hdc, INT extra ) -{ - return metadc_param1( hdc, META_SETTEXTCHAREXTRA, extra ); -} - -BOOL METADC_SetMapperFlags( HDC hdc, DWORD flags ) -{ - return metadc_param2( hdc, META_SETMAPPERFLAGS, HIWORD(flags), LOWORD(flags) ); -}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021