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

Haoyang Chen : winhttp: Handle headers with '\r' line breaks.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 8147ccde1378b8adec160910a6523c6fb42aa9c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8147ccde1378b8adec160910… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Thu Jul 29 15:57:17 2021 +0800 winhttp: Handle headers with '\r' line breaks. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 7 +++++-- dlls/winhttp/tests/winhttp.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 946168786ae..a6c16d7b653 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -378,14 +378,17 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD q[0] = '\r'; q[1] = '\n'; } - if (q[0] == '\r' && q[1] == '\n') break; + if (q[0] == '\r') break; q++; } if (!*p) break; if (*q == '\r') { *q = 0; - q += 2; /* jump over \r\n */ + if (q[1] == '\n') + q += 2; /* jump over \r\n */ + else + q++; /* jump over \r */ } if ((header = parse_header( p ))) { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 56f35252615..60204f6536f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3480,7 +3480,7 @@ static void test_bad_header( int port ) req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); ok( req != NULL, "failed to open a request %u\n", GetLastError() ); - ret = WinHttpAddRequestHeaders( req, L"Content-Type: text/html\n\r", ~0u, WINHTTP_ADDREQ_FLAG_ADD ); + ret = WinHttpAddRequestHeaders( req, L"Content-Type: text/html\n\rContent-Length:6\rCookie:111", ~0u, WINHTTP_ADDREQ_FLAG_ADD ); ok( ret, "failed to add header %u\n", GetLastError() ); index = 0; @@ -3492,6 +3492,15 @@ static void test_bad_header( int port ) ok( !lstrcmpW( buffer, L"text/html" ), "got %s\n", wine_dbgstr_w(buffer) ); ok( index == 1, "index = %u\n", index ); + index = 0; + buffer[0] = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM|WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + L"Cookie", buffer, &len, &index ); + ok( ret, "failed to query headers %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, L"111" ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( index == 1, "index = %u\n", index ); + WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses );

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: ec8ce8c535cbf42eab7cdf3de172f31b5d88b3c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec8ce8c535cbf42eab7cdf3d… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jul 29 12:57:00 2021 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 202 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 100 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec8ce8c535cbf42eab7c…

1 0

Jacek Caban : gdi32: Use get_dc_attr in SetArcDirection.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 18ce9d5efc1488216709912ecb255650f265a3a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18ce9d5efc1488216709912e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 29 13:21:56 2021 +0100 gdi32: Use get_dc_attr in SetArcDirection. 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 | 29 ----------------------------- dlls/gdi32/enhmfdrv/dc.c | 6 +++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 22 ++++++++++++++++++++++ 6 files changed, 27 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 55b48b2be5f..a76c7b79a0b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -990,35 +990,6 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) } -/*********************************************************************** - * SetArcDirection (GDI32.@) - */ -INT WINAPI SetArcDirection( HDC hdc, INT dir ) -{ - DC * dc; - INT ret = 0; - - if (dir != AD_COUNTERCLOCKWISE && dir != AD_CLOCKWISE) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetArcDirection ); - dir = physdev->funcs->pSetArcDirection( physdev, dir ); - if (dir) - { - ret = dc->attr->arc_direction; - dc->attr->arc_direction = dir; - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * GetWorldTransform (GDI32.@) */ diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index ff78ab4c774..69e4a89af97 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -143,14 +143,14 @@ INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? mode : 0; } -INT CDECL EMFDRV_SetArcDirection(PHYSDEV dev, INT arcDirection) +BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) { EMRSETARCDIRECTION emr; emr.emr.iType = EMR_SETARCDIRECTION; emr.emr.nSize = sizeof(emr); - emr.iArcDirection = arcDirection; - return EMFDRV_WriteRecord(dev, &emr.emr) ? arcDirection : 0; + emr.iArcDirection = dir; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index a5d4a623b95..def005cefbd 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -113,7 +113,6 @@ extern BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_H extern HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, UINT *aa_flags ) DECLSPEC_HIDDEN; extern HPEN CDECL EMFDRV_SelectPen( PHYSDEV dev, HPEN handle, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern HPALETTE CDECL EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetArcDirection( PHYSDEV dev, INT arcDirection ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) 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 33f075673cf..929d7a2dd51 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -127,7 +127,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SelectFont, /* pSelectFont */ EMFDRV_SelectPalette, /* pSelectPalette */ EMFDRV_SelectPen, /* pSelectPen */ - EMFDRV_SetArcDirection, /* pSetArcDirection */ + NULL, /* pSetArcDirection */ EMFDRV_SetBkColor, /* pSetBkColor */ NULL, /* pSetBoundsRect */ EMFDRV_SetDCBrushColor, /* pSetDCBrushColor*/ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7ffb92d83d1..01a451576c1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -111,6 +111,7 @@ 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; +extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 7f8af0552bf..f8ec6083ccf 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -133,6 +133,28 @@ INT WINAPI GetArcDirection( HDC hdc ) return dc_attr ? dc_attr->arc_direction : 0; } +/*********************************************************************** + * SetArcDirection (GDI32.@) + */ +INT WINAPI SetArcDirection( HDC hdc, INT dir ) +{ + DC_ATTR *dc_attr; + INT ret; + + if (dir != AD_COUNTERCLOCKWISE && dir != AD_CLOCKWISE) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!(dc_attr = get_dc_attr( hdc ))) return 0; + if (dc_attr->emf && !EMFDC_SetArcDirection( dc_attr, dir )) return 0; + + ret = dc_attr->arc_direction; + dc_attr->arc_direction = dir; + return ret; +} + /*********************************************************************** * GetLayout (GDI32.@) */

1 0

Jacek Caban : gdi32: Move color space stubs to objects.c.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 6502ce7addd744944bf808506471c5ec176f1a70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6502ce7addd744944bf80850… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 29 13:21:57 2021 +0100 gdi32: Move color space stubs to objects.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/dc.c | 46 ---------------------------------------------- dlls/gdi32/objects.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index a76c7b79a0b..efc3231ae27 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1306,52 +1306,6 @@ BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr) return ret; } -/*********************************************************************** - * GetColorSpace (GDI32.@) - */ -HCOLORSPACE WINAPI GetColorSpace(HDC hdc) -{ -/*FIXME Need to do whatever GetColorSpace actually does */ - return 0; -} - -/*********************************************************************** - * CreateColorSpaceA (GDI32.@) - */ -HCOLORSPACE WINAPI CreateColorSpaceA( LPLOGCOLORSPACEA lpLogColorSpace ) -{ - FIXME( "stub\n" ); - return 0; -} - -/*********************************************************************** - * CreateColorSpaceW (GDI32.@) - */ -HCOLORSPACE WINAPI CreateColorSpaceW( LPLOGCOLORSPACEW lpLogColorSpace ) -{ - FIXME( "stub\n" ); - return 0; -} - -/*********************************************************************** - * DeleteColorSpace (GDI32.@) - */ -BOOL WINAPI DeleteColorSpace( HCOLORSPACE hColorSpace ) -{ - FIXME( "stub\n" ); - - return TRUE; -} - -/*********************************************************************** - * SetColorSpace (GDI32.@) - */ -HCOLORSPACE WINAPI SetColorSpace( HDC hDC, HCOLORSPACE hColorSpace ) -{ - FIXME( "stub\n" ); - - return hColorSpace; -} /*********************************************************************** * GetBoundsRect (GDI32.@) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 84ed2377954..2468499973f 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -318,3 +318,48 @@ HRGN WINAPI CreatePolygonRgn( const POINT *points, INT count, INT mode ) { return CreatePolyPolygonRgn( points, &count, 1, mode ); } + +/*********************************************************************** + * CreateColorSpaceA (GDI32.@) + */ +HCOLORSPACE WINAPI CreateColorSpaceA( LOGCOLORSPACEA *cs ) +{ + FIXME( "stub\n" ); + return 0; +} + +/*********************************************************************** + * CreateColorSpaceW (GDI32.@) + */ +HCOLORSPACE WINAPI CreateColorSpaceW( LOGCOLORSPACEW *cs ) +{ + FIXME( "stub\n" ); + return 0; +} + +/*********************************************************************** + * DeleteColorSpace (GDI32.@) + */ +BOOL WINAPI DeleteColorSpace( HCOLORSPACE cs ) +{ + FIXME( "stub\n" ); + return TRUE; +} + +/*********************************************************************** + * GetColorSpace (GDI32.@) + */ +HCOLORSPACE WINAPI GetColorSpace( HDC hdc ) +{ + FIXME( "stub\n" ); + return 0; +} + +/*********************************************************************** + * SetColorSpace (GDI32.@) + */ +HCOLORSPACE WINAPI SetColorSpace( HDC hdc, HCOLORSPACE cs ) +{ + FIXME( "stub\n" ); + return cs; +}

1 0

Jacek Caban : gdi32: Store rel abs mode in DC_ATTR.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 90a7e79c1168e0a4b9f072ff958d7d9768af5ee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a7e79c1168e0a4b9f072ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 29 13:21:58 2021 +0100 gdi32: Store rel abs 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 | 25 ++++--------------------- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index efc3231ae27..db1c63ec62c 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -85,7 +85,7 @@ static void set_initial_dc_state( DC *dc ) dc->attr->rop_mode = R2_COPYPEN; dc->polyFillMode = ALTERNATE; dc->stretchBltMode = BLACKONWHITE; - dc->relAbsMode = ABSOLUTE; + dc->attr->rel_abs_mode = ABSOLUTE; dc->attr->background_mode = OPAQUE; dc->attr->background_color = RGB( 255, 255, 255 ); dc->dcBrushColor = RGB( 255, 255, 255 ); @@ -400,7 +400,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->hPalette = dc->hPalette; newdc->polyFillMode = dc->polyFillMode; newdc->stretchBltMode = dc->stretchBltMode; - newdc->relAbsMode = dc->relAbsMode; newdc->dcBrushColor = dc->dcBrushColor; newdc->dcPenColor = dc->dcPenColor; newdc->brush_org = dc->brush_org; @@ -470,7 +469,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->rop_mode = dcs->attr->rop_mode; dc->polyFillMode = dcs->polyFillMode; dc->stretchBltMode = dcs->stretchBltMode; - dc->relAbsMode = dcs->relAbsMode; + dc->attr->rel_abs_mode = dcs->attr->rel_abs_mode; dc->attr->background_mode = dcs->attr->background_mode; dc->attr->background_color = dcs->attr->background_color; dc->attr->text_color = dcs->attr->text_color; @@ -1395,22 +1394,6 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } -/*********************************************************************** - * GetRelAbs (GDI32.@) - */ -INT WINAPI GetRelAbs( HDC hdc, DWORD dwIgnore ) -{ - INT ret = 0; - DC *dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->relAbsMode; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetRelAbs (GDI32.@) */ @@ -1430,8 +1413,8 @@ INT WINAPI SetRelAbs( HDC hdc, INT mode ) mode = physdev->funcs->pSetRelAbs( physdev, mode ); if (mode) { - ret = dc->relAbsMode; - dc->relAbsMode = mode; + ret = dc->attr->rel_abs_mode; + dc->attr->rel_abs_mode = mode; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index f8ec6083ccf..1523cb5e929 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -184,6 +184,15 @@ INT WINAPI GetROP2( HDC hdc ) return dc_attr ? dc_attr->rop_mode : 0; } +/*********************************************************************** + * GetRelAbs (GDI32.@) + */ +INT WINAPI GetRelAbs( HDC hdc, DWORD ignore ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->rel_abs_mode : 0; +} + /*********************************************************************** * SetROP2 (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 0f01102ed9d..21a6f6bbc01 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -118,7 +118,6 @@ typedef struct tagDC UINT font_code_page; WORD polyFillMode; WORD stretchBltMode; - WORD relAbsMode; COLORREF dcBrushColor; COLORREF dcPenColor; POINT brush_org; diff --git a/include/ntgdi.h b/include/ntgdi.h index ba9d1fe7a00..19c31cd3190 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -108,6 +108,7 @@ typedef struct DC_ATTR WORD text_align; WORD background_mode; WORD rop_mode; + WORD rel_abs_mode; void *emf; } DC_ATTR;

1 0

Jacek Caban : gdi32: Use get_dc_attr in SetRelAbs.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 9e8a308f681cf95aeb1521993052665309e37cd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e8a308f681cf95aeb152199… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 29 13:21:59 2021 +0100 gdi32: Use get_dc_attr in SetRelAbs. 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 | 28 ---------------------------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 21 +++++++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 6 files changed, 25 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index db1c63ec62c..c8124b25960 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1394,34 +1394,6 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } -/*********************************************************************** - * SetRelAbs (GDI32.@) - */ -INT WINAPI SetRelAbs( HDC hdc, INT mode ) -{ - INT ret = 0; - DC *dc; - - if ((mode != ABSOLUTE) && (mode != RELATIVE)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetRelAbs ); - mode = physdev->funcs->pSetRelAbs( physdev, mode ); - if (mode) - { - ret = dc->attr->rel_abs_mode; - dc->attr->rel_abs_mode = mode; - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * GetPolyFillMode (GDI32.@) */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 01a451576c1..e57524d0a29 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -68,6 +68,7 @@ extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetRelAbs( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetROP2( HDC hdc, INT rop ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 1523cb5e929..7aaa7a24b9f 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -193,6 +193,27 @@ INT WINAPI GetRelAbs( HDC hdc, DWORD ignore ) return dc_attr ? dc_attr->rel_abs_mode : 0; } +/*********************************************************************** + * SetRelAbs (GDI32.@) + */ +INT WINAPI SetRelAbs( HDC hdc, INT mode ) +{ + DC_ATTR *dc_attr; + INT ret; + + if (mode != ABSOLUTE && mode != RELATIVE) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (is_meta_dc( hdc )) return METADC_SetRelAbs( hdc, mode ); + if (!(dc_attr = get_dc_attr( hdc ))) return 0; + ret = dc_attr->rel_abs_mode; + dc_attr->rel_abs_mode = mode; + return ret; +} + /*********************************************************************** * SetROP2 (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index e20dc5666c9..661d2e49db4 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -55,9 +55,9 @@ BOOL METADC_SetROP2( HDC hdc, INT rop ) return metadc_param1( hdc, META_SETROP2, (WORD)rop ); } -INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) +BOOL METADC_SetRelAbs( HDC hdc, INT mode ) { - return MFDRV_MetaParam1( dev, META_SETRELABS, (WORD)mode) ? mode : 0; + return metadc_param1( hdc, META_SETRELABS, (WORD)mode ); } INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 0a95de9a527..729140da700 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -203,7 +203,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SetMapperFlags, /* pSetMapperFlags */ NULL, /* pSetPixel */ MFDRV_SetPolyFillMode, /* pSetPolyFillMode */ - MFDRV_SetRelAbs, /* pSetRelAbs */ + NULL, /* pSetRelAbs */ MFDRV_SetStretchBltMode, /* pSetStretchBltMode */ MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */ MFDRV_SetTextColor, /* pSetTextColor */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 70802a673d7..a4c0f4b3e25 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -112,7 +112,6 @@ extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDD extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Store poly fill mode in DC_ATTR.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 22f7e39fb773dc3e8801432acbf96fca3b86cb88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22f7e39fb773dc3e8801432a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 29 13:22:00 2021 +0100 gdi32: Store poly fill 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 | 28 +++++----------------------- dlls/gdi32/dibdrv/graphics.c | 3 ++- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 4 ++-- dlls/gdi32/tests/metafile.c | 2 +- include/ntgdi.h | 1 + 7 files changed, 20 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c8124b25960..7af91e3bcdb 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -83,8 +83,8 @@ static void set_initial_dc_state( DC *dc ) dc->attr->layout = 0; dc->font_code_page = CP_ACP; dc->attr->rop_mode = R2_COPYPEN; - dc->polyFillMode = ALTERNATE; - dc->stretchBltMode = BLACKONWHITE; + dc->attr->poly_fill_mode = ALTERNATE; + dc->stretchBltMode = BLACKONWHITE; dc->attr->rel_abs_mode = ABSOLUTE; dc->attr->background_mode = OPAQUE; dc->attr->background_color = RGB( 255, 255, 255 ); @@ -398,8 +398,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->hFont = dc->hFont; newdc->hBitmap = dc->hBitmap; newdc->hPalette = dc->hPalette; - newdc->polyFillMode = dc->polyFillMode; - newdc->stretchBltMode = dc->stretchBltMode; newdc->dcBrushColor = dc->dcBrushColor; newdc->dcPenColor = dc->dcPenColor; newdc->brush_org = dc->brush_org; @@ -467,7 +465,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->layout = dcs->attr->layout; dc->attr->rop_mode = dcs->attr->rop_mode; - dc->polyFillMode = dcs->polyFillMode; + dc->attr->poly_fill_mode = dcs->attr->poly_fill_mode; dc->stretchBltMode = dcs->stretchBltMode; dc->attr->rel_abs_mode = dcs->attr->rel_abs_mode; dc->attr->background_mode = dcs->attr->background_mode; @@ -1394,22 +1392,6 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } -/*********************************************************************** - * GetPolyFillMode (GDI32.@) - */ -INT WINAPI GetPolyFillMode( HDC hdc ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->polyFillMode; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetPolyFillMode (GDI32.@) */ @@ -1429,8 +1411,8 @@ INT WINAPI SetPolyFillMode( HDC hdc, INT mode ) mode = physdev->funcs->pSetPolyFillMode( physdev, mode ); if (mode) { - ret = dc->polyFillMode; - dc->polyFillMode = mode; + ret = dc->attr->poly_fill_mode; + dc->attr->poly_fill_mode = mode; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 30ffad70b02..e4e2de8f99f 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -1271,7 +1271,8 @@ BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, if (pdev->brush.style != BS_NULL && get_dib_rect( &pdev->dib, &rc ) && - !(interior = create_polypolygon_region( points, counts, polygons, dc->polyFillMode, &rc ))) + !(interior = create_polypolygon_region( points, counts, polygons, + dc->attr->poly_fill_mode, &rc ))) { ret = FALSE; goto done; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 7aaa7a24b9f..b3ec0cf5587 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -164,6 +164,15 @@ DWORD WINAPI GetLayout( HDC hdc ) return dc_attr ? dc_attr->layout : GDI_ERROR; } +/*********************************************************************** + * GetPolyFillMode (GDI32.@) + */ +INT WINAPI GetPolyFillMode( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->poly_fill_mode : 0; +} + /*********************************************************************** * GetCurrentPositionEx (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 21a6f6bbc01..262971f2a8a 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -116,7 +116,6 @@ typedef struct tagDC const struct font_gamma_ramp *font_gamma_ramp; UINT font_code_page; - WORD polyFillMode; WORD stretchBltMode; COLORREF dcBrushColor; COLORREF dcPenColor; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 8761723f62e..b9414967982 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -537,7 +537,7 @@ struct gdi_path *get_gdi_flat_path( DC *dc, HRGN *rgn ) free_gdi_path( dc->path ); dc->path = NULL; - if (ret && rgn) *rgn = path_to_region( ret, dc->polyFillMode ); + if (ret && rgn) *rgn = path_to_region( ret, dc->attr->poly_fill_mode ); } else SetLastError( ERROR_CAN_NOT_COMPLETE ); @@ -684,7 +684,7 @@ HRGN WINAPI PathToRegion(HDC hdc) dc->path = NULL; if (path) { - ret = path_to_region( path, dc->polyFillMode ); + ret = path_to_region( path, dc->attr->poly_fill_mode ); free_gdi_path( path ); } } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 1a38735f044..35a3d2ab82b 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -900,7 +900,7 @@ static void test_mf_SaveDC(void) SetPolyFillMode( hdcMetafile, WINDING ); SetBkColor( hdcMetafile, 0x123456 ); - todo_wine ok( !GetPolyFillMode( hdcMetafile ), "GetPolyFillMode succeeded\n" ); + ok( !GetPolyFillMode( hdcMetafile ), "GetPolyFillMode succeeded\n" ); ok( GetBkColor( hdcMetafile ) == CLR_INVALID, "GetBkColor succeeded\n" ); /* Force Win9x to update DC state */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 19c31cd3190..38798213f88 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -107,6 +107,7 @@ typedef struct DC_ATTR DWORD layout; WORD text_align; WORD background_mode; + WORD poly_fill_mode; WORD rop_mode; WORD rel_abs_mode; void *emf;

1 0

Jacek Caban : gdi32: Use get_dc_attr in SetPolyFillMode.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 84383245bb4c35cd137e17a54ee993b1e7aef424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84383245bb4c35cd137e17a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 29 13:22:01 2021 +0100 gdi32: Use get_dc_attr in SetPolyFillMode. 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 | 28 ---------------------------- dlls/gdi32/enhmfdrv/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 23 +++++++++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 31 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 7af91e3bcdb..d14593652b8 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1392,34 +1392,6 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } -/*********************************************************************** - * SetPolyFillMode (GDI32.@) - */ -INT WINAPI SetPolyFillMode( HDC hdc, INT mode ) -{ - INT ret = 0; - DC *dc; - - if ((mode <= 0) || (mode > POLYFILL_LAST)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetPolyFillMode ); - mode = physdev->funcs->pSetPolyFillMode( physdev, mode ); - if (mode) - { - ret = dc->attr->poly_fill_mode; - dc->attr->poly_fill_mode = mode; - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * GetStretchBltMode (GDI32.@) */ diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 69e4a89af97..78969c69783 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -125,13 +125,13 @@ BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) +BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode ) { EMRSETPOLYFILLMODE emr; emr.emr.iType = EMR_SETPOLYFILLMODE; emr.emr.nSize = sizeof(emr); emr.iMode = mode; - return EMFDRV_WriteRecord( dev, &emr.emr ) ? mode : 0; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index def005cefbd..12b39067b2b 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -123,7 +123,6 @@ extern DWORD CDECL EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HID extern INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetTextJustification( PHYSDEV dev, INT nBreakExtra, INT nBreakCount ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 929d7a2dd51..8f210cb71a3 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -139,7 +139,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SetMapMode, /* pSetMapMode */ EMFDRV_SetMapperFlags, /* pSetMapperFlags */ EMFDRV_SetPixel, /* pSetPixel */ - EMFDRV_SetPolyFillMode, /* pSetPolyFillMode */ + NULL, /* pSetPolyFillMode */ NULL, /* pSetRelAbs */ EMFDRV_SetStretchBltMode, /* pSetStretchBltMode */ NULL, /* pSetTextCharacterExtra */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e57524d0a29..dec66f69dbc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -68,6 +68,7 @@ extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetRelAbs( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetROP2( HDC hdc, INT rop ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; @@ -115,6 +116,7 @@ extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index b3ec0cf5587..90c70f9d976 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -173,6 +173,29 @@ INT WINAPI GetPolyFillMode( HDC hdc ) return dc_attr ? dc_attr->poly_fill_mode : 0; } +/*********************************************************************** + * SetPolyFillMode (GDI32.@) + */ +INT WINAPI SetPolyFillMode( HDC hdc, INT mode ) +{ + DC_ATTR *dc_attr; + INT ret; + + if (mode <= 0 || mode > POLYFILL_LAST) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (is_meta_dc( hdc )) return METADC_SetPolyFillMode( hdc, mode ); + if (!(dc_attr = get_dc_attr( hdc ))) return 0; + if (dc_attr->emf && !EMFDC_SetPolyFillMode( dc_attr, mode )) return 0; + + ret = dc_attr->poly_fill_mode; + dc_attr->poly_fill_mode = mode; + return ret; +} + /*********************************************************************** * GetCurrentPositionEx (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 661d2e49db4..4b886aaba6d 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -60,9 +60,9 @@ BOOL METADC_SetRelAbs( HDC hdc, INT mode ) return metadc_param1( hdc, META_SETRELABS, (WORD)mode ); } -INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) +BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) { - return MFDRV_MetaParam1( dev, META_SETPOLYFILLMODE, (WORD)mode) ? mode : 0; + return metadc_param1( hdc, META_SETPOLYFILLMODE, mode ); } INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 729140da700..f8c4153c410 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -202,7 +202,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SetMapMode, /* pSetMapMode */ MFDRV_SetMapperFlags, /* pSetMapperFlags */ NULL, /* pSetPixel */ - MFDRV_SetPolyFillMode, /* pSetPolyFillMode */ + NULL, /* pSetPolyFillMode */ NULL, /* pSetRelAbs */ MFDRV_SetStretchBltMode, /* pSetStretchBltMode */ MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index a4c0f4b3e25..889cdfbb6a2 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -111,7 +111,6 @@ extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPE extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Store stretch_blt_mode in DC_ATTR.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 4198e0760b400d55525fb77f895b6cee31075543 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4198e0760b400d55525fb77f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 29 13:22:02 2021 +0100 gdi32: Store stretch_blt_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/bitblt.c | 2 +- dlls/gdi32/dc.c | 24 ++++-------------------- dlls/gdi32/dib.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 6 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 39b28cba6df..4c80f1af611 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -313,7 +313,7 @@ BOOL CDECL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, ((src->width != dst->width) || (src->height != dst->height))) { copy_bitmapinfo( src_info, dst_info ); - err = stretch_bits( src_info, src, dst_info, dst, &bits, dc_dst->stretchBltMode ); + err = stretch_bits( src_info, src, dst_info, dst, &bits, dc_dst->attr->stretch_blt_mode ); if (!err) err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &bits, src, dst, rop ); } diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index d14593652b8..70e7132d0c5 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -84,7 +84,7 @@ static void set_initial_dc_state( DC *dc ) dc->font_code_page = CP_ACP; dc->attr->rop_mode = R2_COPYPEN; dc->attr->poly_fill_mode = ALTERNATE; - dc->stretchBltMode = BLACKONWHITE; + dc->attr->stretch_blt_mode = BLACKONWHITE; dc->attr->rel_abs_mode = ABSOLUTE; dc->attr->background_mode = OPAQUE; dc->attr->background_color = RGB( 255, 255, 255 ); @@ -466,7 +466,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->layout = dcs->attr->layout; dc->attr->rop_mode = dcs->attr->rop_mode; dc->attr->poly_fill_mode = dcs->attr->poly_fill_mode; - dc->stretchBltMode = dcs->stretchBltMode; + dc->attr->stretch_blt_mode = dcs->attr->stretch_blt_mode; dc->attr->rel_abs_mode = dcs->attr->rel_abs_mode; dc->attr->background_mode = dcs->attr->background_mode; dc->attr->background_color = dcs->attr->background_color; @@ -1392,22 +1392,6 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } -/*********************************************************************** - * GetStretchBltMode (GDI32.@) - */ -INT WINAPI GetStretchBltMode( HDC hdc ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->stretchBltMode; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetStretchBltMode (GDI32.@) */ @@ -1427,8 +1411,8 @@ INT WINAPI SetStretchBltMode( HDC hdc, INT mode ) mode = physdev->funcs->pSetStretchBltMode( physdev, mode ); if (mode) { - ret = dc->stretchBltMode; - dc->stretchBltMode = mode; + ret = dc->attr->stretch_blt_mode; + dc->attr->stretch_blt_mode = mode; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 22237b207a5..432f33151d9 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -592,7 +592,7 @@ INT CDECL nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, if (err == ERROR_TRANSFORM_NOT_SUPPORTED) { copy_bitmapinfo( src_info, dst_info ); - err = stretch_bits( src_info, &src, dst_info, &dst, &src_bits, dc->stretchBltMode ); + err = stretch_bits( src_info, &src, dst_info, &dst, &src_bits, dc->attr->stretch_blt_mode ); if (!err) err = dev->funcs->pPutImage( dev, NULL, dst_info, &src_bits, &src, &dst, rop ); } if (err) ret = 0; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 90c70f9d976..f8a6eea6de5 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -196,6 +196,15 @@ INT WINAPI SetPolyFillMode( HDC hdc, INT mode ) return ret; } +/*********************************************************************** + * GetStretchBltMode (GDI32.@) + */ +INT WINAPI GetStretchBltMode( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->stretch_blt_mode : 0; +} + /*********************************************************************** * GetCurrentPositionEx (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 262971f2a8a..cb7a8e7f7c9 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -116,7 +116,6 @@ typedef struct tagDC const struct font_gamma_ramp *font_gamma_ramp; UINT font_code_page; - WORD stretchBltMode; COLORREF dcBrushColor; COLORREF dcPenColor; POINT brush_org; diff --git a/include/ntgdi.h b/include/ntgdi.h index 38798213f88..a4ed8b6aec9 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -110,6 +110,7 @@ typedef struct DC_ATTR WORD poly_fill_mode; WORD rop_mode; WORD rel_abs_mode; + WORD stretch_blt_mode; void *emf; } DC_ATTR;

1 0

Jacek Caban : gdi32: Use get_dc_attr in SetStretchBltMode.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 7517fdf229e0a5d8786559745a41f22d76cfda2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7517fdf229e0a5d878655974… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 29 13:22:03 2021 +0100 gdi32: Use get_dc_attr in SetStretchBltMode. 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 | 28 ---------------------------- dlls/gdi32/enhmfdrv/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 23 +++++++++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 31 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 70e7132d0c5..3c9dca8c512 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1392,34 +1392,6 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } -/*********************************************************************** - * SetStretchBltMode (GDI32.@) - */ -INT WINAPI SetStretchBltMode( HDC hdc, INT mode ) -{ - INT ret = 0; - DC *dc; - - if ((mode <= 0) || (mode > MAXSTRETCHBLTMODE)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetStretchBltMode ); - mode = physdev->funcs->pSetStretchBltMode( physdev, mode ); - if (mode) - { - ret = dc->attr->stretch_blt_mode; - dc->attr->stretch_blt_mode = mode; - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * GetMapMode (GDI32.@) */ diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 78969c69783..1faf777c47e 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -134,13 +134,13 @@ BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) +BOOL EMFDC_SetStretchBltMode( DC_ATTR *dc_attr, INT mode ) { EMRSETSTRETCHBLTMODE emr; emr.emr.iType = EMR_SETSTRETCHBLTMODE; emr.emr.nSize = sizeof(emr); emr.iMode = mode; - return EMFDRV_WriteRecord( dev, &emr.emr ) ? mode : 0; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 12b39067b2b..981cdea7887 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -123,7 +123,6 @@ extern DWORD CDECL EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HID extern INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetTextJustification( PHYSDEV dev, INT nBreakExtra, INT nBreakCount ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 8f210cb71a3..3eb01025e50 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -141,7 +141,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SetPixel, /* pSetPixel */ NULL, /* pSetPolyFillMode */ NULL, /* pSetRelAbs */ - EMFDRV_SetStretchBltMode, /* pSetStretchBltMode */ + NULL, /* pSetStretchBltMode */ NULL, /* pSetTextCharacterExtra */ EMFDRV_SetTextColor, /* pSetTextColor */ EMFDRV_SetTextJustification, /* pSetTextJustification */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index dec66f69dbc..105d72b23f0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -71,6 +71,7 @@ extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HI extern BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetRelAbs( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetROP2( HDC hdc, INT rop ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetStretchBltMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; /* enhanced metafiles */ @@ -118,6 +119,7 @@ extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetStretchBltMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index f8a6eea6de5..35986dba37e 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -205,6 +205,29 @@ INT WINAPI GetStretchBltMode( HDC hdc ) return dc_attr ? dc_attr->stretch_blt_mode : 0; } +/*********************************************************************** + * SetStretchBltMode (GDI32.@) + */ +INT WINAPI SetStretchBltMode( HDC hdc, INT mode ) +{ + DC_ATTR *dc_attr; + INT ret; + + if (mode <= 0 || mode > MAXSTRETCHBLTMODE) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (is_meta_dc( hdc )) return METADC_SetStretchBltMode( hdc, mode ); + if (!(dc_attr = get_dc_attr( hdc ))) return 0; + if (dc_attr->emf && !EMFDC_SetStretchBltMode( dc_attr, mode )) return 0; + + ret = dc_attr->stretch_blt_mode; + dc_attr->stretch_blt_mode = mode; + return ret; +} + /*********************************************************************** * GetCurrentPositionEx (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 4b886aaba6d..044e228b2bf 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -65,9 +65,9 @@ BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) return metadc_param1( hdc, META_SETPOLYFILLMODE, mode ); } -INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) +BOOL METADC_SetStretchBltMode( HDC hdc, INT mode ) { - return MFDRV_MetaParam1( dev, META_SETSTRETCHBLTMODE, (WORD)mode) ? mode : 0; + return metadc_param1( hdc, META_SETSTRETCHBLTMODE, mode ); } INT CDECL MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index f8c4153c410..12ea0f55948 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -204,7 +204,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pSetPixel */ NULL, /* pSetPolyFillMode */ NULL, /* pSetRelAbs */ - MFDRV_SetStretchBltMode, /* pSetStretchBltMode */ + NULL, /* pSetStretchBltMode */ MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */ MFDRV_SetTextColor, /* pSetTextColor */ MFDRV_SetTextJustification, /* pSetTextJustification */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 889cdfbb6a2..567b60158b2 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -111,7 +111,6 @@ extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPE extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) DECLSPEC_HIDDEN;

1 0