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

Alexandre Julliard : wow64: Add support for file system redirection.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 90e1907ded822bbb4a1ad39b3e7dd62e66492118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90e1907ded822bbb4a1ad39b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 18:28:16 2021 +0200 wow64: Add support for file system redirection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 184 ++++++++++++++++++++++++++++++++++++++++++--- dlls/wow64/syscall.c | 2 + dlls/wow64/wow64_private.h | 12 +++ 3 files changed, 189 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90e1907ded822bbb4a1a…

1 0

Jacek Caban : gdi32: Move ROP mode to DC_ATTR.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: a0f40f2a3b77dd1c7130312a0dfb02fdf550fd82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0f40f2a3b77dd1c7130312a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:39:05 2021 +0200 gdi32: Move ROP mode to 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/dibdrv/graphics.c | 4 ++-- dlls/gdi32/dibdrv/objects.c | 4 ++-- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 6 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5f86bb524ba..0f793dd76cc 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -82,7 +82,7 @@ static void set_initial_dc_state( DC *dc ) dc->miterLimit = 10.0f; /* 10.0 is the default, from MSDN */ dc->layout = 0; dc->font_code_page = CP_ACP; - dc->ROPmode = R2_COPYPEN; + dc->attr->rop_mode = R2_COPYPEN; dc->polyFillMode = ALTERNATE; dc->stretchBltMode = BLACKONWHITE; dc->relAbsMode = ABSOLUTE; @@ -399,7 +399,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->hFont = dc->hFont; newdc->hBitmap = dc->hBitmap; newdc->hPalette = dc->hPalette; - newdc->ROPmode = dc->ROPmode; newdc->polyFillMode = dc->polyFillMode; newdc->stretchBltMode = dc->stretchBltMode; newdc->relAbsMode = dc->relAbsMode; @@ -472,7 +471,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) if (!PATH_RestorePath( dc, dcs )) return FALSE; dc->layout = dcs->layout; - dc->ROPmode = dcs->ROPmode; + dc->attr->rop_mode = dcs->attr->rop_mode; dc->polyFillMode = dcs->polyFillMode; dc->stretchBltMode = dcs->stretchBltMode; dc->relAbsMode = dcs->relAbsMode; @@ -1555,22 +1554,6 @@ INT WINAPI GetRelAbs( HDC hdc, DWORD dwIgnore ) } -/*********************************************************************** - * GetROP2 (GDI32.@) - */ -INT WINAPI GetROP2( HDC hdc ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->ROPmode; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetROP2 (GDI32.@) */ @@ -1590,8 +1573,8 @@ INT WINAPI SetROP2( HDC hdc, INT mode ) mode = physdev->funcs->pSetROP2( physdev, mode ); if (mode) { - ret = dc->ROPmode; - dc->ROPmode = mode; + ret = dc->attr->rop_mode; + dc->attr->rop_mode = mode; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 62384601c5a..6dc79e53b36 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -73,7 +73,7 @@ static BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, - &dc->brush_org, dc->ROPmode ); + &dc->brush_org, dc->attr->rop_mode ); free_clipped_rects( &clipped_rects ); return ret; } @@ -1590,7 +1590,7 @@ COLORREF CDECL dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) color = pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel ); if (!get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects )) return color; - fill_with_pixel( dc, &pdev->dib, pixel, clipped_rects.count, clipped_rects.rects, dc->ROPmode ); + fill_with_pixel( dc, &pdev->dib, pixel, clipped_rects.count, clipped_rects.rects, dc->attr->rop_mode ); free_clipped_rects( &clipped_rects ); return color; } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 504e3bc2438..489b2497ff2 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -819,7 +819,7 @@ static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL clos DWORD color, and, xor; color = get_pixel_color( dc, &pdev->dib, pdev->pen_brush.colorref, TRUE ); - calc_and_xor_masks( dc->ROPmode, color, &and, &xor ); + calc_and_xor_masks( dc->attr->rop_mode, color, &and, &xor ); for (i = 0; i < num - 1; i++) if (!solid_pen_line( pdev, pts + i, pts + i + 1, and, xor )) @@ -1229,7 +1229,7 @@ static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL clo } else { - get_color_masks( dc, &pdev->dib, dc->ROPmode, pdev->pen_brush.colorref, + get_color_masks( dc, &pdev->dib, dc->attr->rop_mode, pdev->pen_brush.colorref, pdev->pen_is_ext ? TRANSPARENT : dc->attr->background_mode, &pdev->dash_masks[1], &pdev->dash_masks[0] ); diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 1318533d100..df6bc75c32d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -108,6 +108,15 @@ BOOL WINAPI GetCurrentPositionEx( HDC hdc, POINT *point ) return TRUE; } +/*********************************************************************** + * GetROP2 (GDI32.@) + */ +INT WINAPI GetROP2( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->rop_mode : 0; +} + /*********************************************************************** * SetPixel (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 6efc3f2e7d1..812e435d664 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -117,7 +117,6 @@ typedef struct tagDC const struct font_gamma_ramp *font_gamma_ramp; UINT font_code_page; - WORD ROPmode; WORD polyFillMode; WORD stretchBltMode; WORD relAbsMode; diff --git a/include/ntgdi.h b/include/ntgdi.h index f1a3436437f..ec7e650d1b4 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -103,6 +103,7 @@ typedef struct DC_ATTR INT graphics_mode; WORD text_align; WORD background_mode; + WORD rop_mode; void *emf; } DC_ATTR;

1 0

Jacek Caban : gdi32: Use get_dc_attr in SetROP2.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: c00b231826d7d244f59a50610677960280823b9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c00b231826d7d244f59a5061… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:39:15 2021 +0200 gdi32: Use get_dc_attr in SetROP2. 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 0f793dd76cc..dc7d0b2655d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1554,34 +1554,6 @@ INT WINAPI GetRelAbs( HDC hdc, DWORD dwIgnore ) } -/*********************************************************************** - * SetROP2 (GDI32.@) - */ -INT WINAPI SetROP2( HDC hdc, INT mode ) -{ - INT ret = 0; - DC *dc; - - if ((mode < R2_BLACK) || (mode > R2_WHITE)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetROP2 ); - mode = physdev->funcs->pSetROP2( physdev, mode ); - if (mode) - { - ret = dc->attr->rop_mode; - dc->attr->rop_mode = mode; - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetRelAbs (GDI32.@) */ diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index c0a53045099..ff78ab4c774 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -116,13 +116,13 @@ COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? color : CLR_INVALID; } -INT CDECL EMFDRV_SetROP2( PHYSDEV dev, INT rop ) +BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) { EMRSETROP2 emr; emr.emr.iType = EMR_SETROP2; emr.emr.nSize = sizeof(emr); emr.iMode = rop; - return EMFDRV_WriteRecord( dev, &emr.emr ) ? rop : 0; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index b80e0ffafd2..a5d4a623b95 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -125,7 +125,6 @@ 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_SetROP2( PHYSDEV dev, INT rop ) 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 27856434d50..e9e8ae6eec0 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_SetMapperFlags, /* pSetMapperFlags */ EMFDRV_SetPixel, /* pSetPixel */ EMFDRV_SetPolyFillMode, /* pSetPolyFillMode */ - EMFDRV_SetROP2, /* pSetROP2 */ + NULL, /* pSetROP2 */ NULL, /* pSetRelAbs */ EMFDRV_SetStretchBltMode, /* pSetStretchBltMode */ NULL, /* pSetTextAlign */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 37cec4bfe78..7ffb92d83d1 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_SetROP2( HDC hdc, INT rop ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; /* enhanced metafiles */ @@ -112,6 +113,7 @@ extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT INT ell_width, INT ell_height ) 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; 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 df6bc75c32d..d3221610ed6 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -117,6 +117,29 @@ INT WINAPI GetROP2( HDC hdc ) return dc_attr ? dc_attr->rop_mode : 0; } +/*********************************************************************** + * SetROP2 (GDI32.@) + */ +INT WINAPI SetROP2( HDC hdc, INT mode ) +{ + DC_ATTR *dc_attr; + INT ret; + + if ((mode < R2_BLACK) || (mode > R2_WHITE)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (is_meta_dc( hdc )) return METADC_SetROP2( hdc, mode ); + if (!(dc_attr = get_dc_attr( hdc ))) return 0; + if (dc_attr->emf && !EMFDC_SetROP2( dc_attr, mode )) return 0; + + ret = dc_attr->rop_mode; + dc_attr->rop_mode = mode; + return ret; +} + /*********************************************************************** * SetPixel (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 0ebb9b660e7..e20dc5666c9 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -50,9 +50,9 @@ COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) return MFDRV_MetaParam2(dev, META_SETTEXTCOLOR, HIWORD(color), LOWORD(color)) ? color : CLR_INVALID; } -INT CDECL MFDRV_SetROP2( PHYSDEV dev, INT rop ) +BOOL METADC_SetROP2( HDC hdc, INT rop ) { - return MFDRV_MetaParam1( dev, META_SETROP2, (WORD)rop) ? rop : 0; + return metadc_param1( hdc, META_SETROP2, (WORD)rop ); } INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 3733d93e554..14c9abac379 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 = MFDRV_SetMapperFlags, /* pSetMapperFlags */ NULL, /* pSetPixel */ MFDRV_SetPolyFillMode, /* pSetPolyFillMode */ - MFDRV_SetROP2, /* pSetROP2 */ + NULL, /* pSetROP2 */ MFDRV_SetRelAbs, /* pSetRelAbs */ MFDRV_SetStretchBltMode, /* pSetStretchBltMode */ NULL, /* pSetTextAlign */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 5a9997209e7..70802a673d7 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_SetROP2( PHYSDEV dev, INT rop ) 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;

1 0

Jacek Caban : gdi32: Move layout to DC_ATTR.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 148a2b60a58ac7ab6295a79bd2d9a0a992bb55f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=148a2b60a58ac7ab6295a79b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:39:26 2021 +0200 gdi32: Move layout to 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 | 10 +++++----- dlls/gdi32/clipping.c | 12 ++++++------ dlls/gdi32/dc.c | 31 ++++--------------------------- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/dibdrv/graphics.c | 2 +- dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/mapping.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/tests/mapping.c | 2 ++ dlls/gdi32/tests/metafile.c | 2 +- include/ntgdi.h | 1 + 13 files changed, 35 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=148a2b60a58ac7ab6295…

1 0

Jacek Caban : gdi32: Store text color in DC_ATTR.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 454b0fcb1eb692a7a5754aefb10b6a4f0553f35e URL: https://source.winehq.org/git/wine.git/?a=commit;h=454b0fcb1eb692a7a5754aef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:40:07 2021 +0200 gdi32: Store text color 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 | 29 ++++++----------------------- dlls/gdi32/dib.c | 2 +- dlls/gdi32/dibdrv/graphics.c | 4 ++-- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 9 files changed, 23 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index b58419f1c78..39b28cba6df 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -262,7 +262,7 @@ static RGBQUAD get_dc_rgb_color( DC *dc, int color_table_size, COLORREF color ) void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, int count ) { info->bmiColors[count - 1] = get_dc_rgb_color( dc, color_table_size, dc->attr->background_color ); - if (count > 1) info->bmiColors[0] = get_dc_rgb_color( dc, color_table_size, dc->textColor ); + if (count > 1) info->bmiColors[0] = get_dc_rgb_color( dc, color_table_size, dc->attr->text_color ); info->bmiHeader.biClrUsed = count; } diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3725bd1abf6..71d27c03e4f 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -90,7 +90,7 @@ static void set_initial_dc_state( DC *dc ) dc->attr->background_color = RGB( 255, 255, 255 ); dc->dcBrushColor = RGB( 255, 255, 255 ); dc->dcPenColor = RGB( 0, 0, 0 ); - dc->textColor = RGB( 0, 0, 0 ); + dc->attr->text_color = RGB( 0, 0, 0 ); dc->brush_org.x = 0; dc->brush_org.y = 0; dc->mapperFlags = 0; @@ -275,7 +275,7 @@ void DC_InitDC( DC* dc ) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRealizeDefaultPalette ); physdev->funcs->pRealizeDefaultPalette( physdev ); - SetTextColor( dc->hSelf, dc->textColor ); + SetTextColor( dc->hSelf, dc->attr->text_color ); SetBkColor( dc->hSelf, dc->attr->background_color ); NtGdiSelectPen( dc->hSelf, dc->hPen ); NtGdiSelectBrush( dc->hSelf, dc->hBrush ); @@ -401,7 +401,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->polyFillMode = dc->polyFillMode; newdc->stretchBltMode = dc->stretchBltMode; newdc->relAbsMode = dc->relAbsMode; - newdc->textColor = dc->textColor; newdc->dcBrushColor = dc->dcBrushColor; newdc->dcPenColor = dc->dcPenColor; newdc->brush_org = dc->brush_org; @@ -475,7 +474,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->relAbsMode = dcs->relAbsMode; dc->attr->background_mode = dcs->attr->background_mode; dc->attr->background_color = dcs->attr->background_color; - dc->textColor = dcs->textColor; + dc->attr->text_color = dcs->attr->text_color; dc->dcBrushColor = dcs->dcBrushColor; dc->dcPenColor = dcs->dcPenColor; dc->brush_org = dcs->brush_org; @@ -527,7 +526,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) NtGdiSelectFont( dev->hdc, dcs->hFont ); NtGdiSelectPen( dev->hdc, dcs->hPen ); SetBkColor( dev->hdc, dcs->attr->background_color); - SetTextColor( dev->hdc, dcs->textColor); + SetTextColor( dev->hdc, dcs->attr->text_color); GDISelectPalette( dev->hdc, dcs->hPalette, FALSE ); dc->saved_dc = dcs->saved_dc; @@ -929,22 +928,6 @@ COLORREF WINAPI SetBkColor( HDC hdc, COLORREF color ) } -/*********************************************************************** - * GetTextColor (GDI32.@) - */ -COLORREF WINAPI GetTextColor( HDC hdc ) -{ - COLORREF ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->textColor; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetTextColor (GDI32.@) */ @@ -958,8 +941,8 @@ COLORREF WINAPI SetTextColor( HDC hdc, COLORREF color ) if (dc) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetTextColor ); - ret = dc->textColor; - dc->textColor = physdev->funcs->pSetTextColor( physdev, color ); + ret = dc->attr->text_color; + dc->attr->text_color = physdev->funcs->pSetTextColor( physdev, color ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 4c65b271661..22237b207a5 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -937,7 +937,7 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, const RGBQUA if (result) /* update colors of selected objects */ { - SetTextColor( hdc, dc->textColor ); + SetTextColor( hdc, dc->attr->text_color ); SetBkColor( hdc, dc->attr->background_color ); NtGdiSelectPen( hdc, dc->hPen ); NtGdiSelectBrush( hdc, dc->hBrush ); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 402b1b10323..3eb9c5184a4 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -674,7 +674,7 @@ static inline void get_text_bkgnd_masks( DC *dc, const dib_info *dib, rop_mask * mask->xor = get_pixel_color( dc, dib, bg, FALSE ); else { - COLORREF fg = dc->textColor; + COLORREF fg = dc->attr->text_color; mask->xor = get_pixel_color( dc, dib, fg, TRUE ); if (fg != bg) mask->xor = ~mask->xor; } @@ -823,7 +823,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT glyph_dib.bits.is_copy = FALSE; glyph_dib.bits.free = NULL; - text_color = get_pixel_color( dc, dib, dc->textColor, TRUE ); + text_color = get_pixel_color( dc, dib, dc->attr->text_color, TRUE ); if (glyph_dib.bit_count == 32) intensity.gamma_ramp = dc->font_gamma_ramp; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index e34e78550eb..3a0ea7465a6 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1981,7 +1981,7 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * BOOL got_pixel; COLORREF color; - color = make_rgb_colorref( dc, &pdev->dib, dc->textColor, &got_pixel, &pixel ); + color = make_rgb_colorref( dc, &pdev->dib, dc->attr->text_color, &got_pixel, &pixel ); color_table[0].rgbRed = GetRValue( color ); color_table[0].rgbGreen = GetGValue( color ); color_table[0].rgbBlue = GetBValue( color ); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e9595caa503..6e4a52fec02 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5783,7 +5783,7 @@ BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT } } - pen = CreatePen( PS_SOLID, 1, dc->textColor ); + pen = CreatePen( PS_SOLID, 1, dc->attr->text_color ); orig = NtGdiSelectPen( dev->hdc, pen ); for (i = 0; i < count; i++) @@ -6238,7 +6238,7 @@ done: OUTLINETEXTMETRICW* otm = NULL; POINT pts[5]; HPEN hpen = NtGdiSelectPen(hdc, GetStockObject(NULL_PEN)); - HBRUSH hbrush = CreateSolidBrush(dc->textColor); + HBRUSH hbrush = CreateSolidBrush( dc->attr->text_color ); hbrush = NtGdiSelectBrush(hdc, hbrush); diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index d16d6c8d94a..3a4e6e48899 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -74,6 +74,15 @@ COLORREF WINAPI GetBkColor( HDC hdc ) return dc_attr ? dc_attr->background_color : CLR_INVALID; } +/*********************************************************************** + * GetTextColor (GDI32.@) + */ +COLORREF WINAPI GetTextColor( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->text_color : 0; +} + /*********************************************************************** * GetBkMode (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 65a06db61e5..110fc622d03 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -119,7 +119,6 @@ typedef struct tagDC WORD polyFillMode; WORD stretchBltMode; WORD relAbsMode; - COLORREF textColor; COLORREF dcBrushColor; COLORREF dcPenColor; POINT brush_org; diff --git a/include/ntgdi.h b/include/ntgdi.h index cb238b6eda1..c1221d7995b 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -100,6 +100,7 @@ typedef struct DC_ATTR { LONG disabled; /* disabled flag, controled by DCHF_(DISABLE|ENABLE)DC */ COLORREF background_color; + COLORREF text_color; POINT cur_pos; INT graphics_mode; DWORD layout;

1 0

Jacek Caban : gdi32: Store arc direction in DC_ATTR.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 85e934e4b8f8578dc9486cc39a481e31418b4ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85e934e4b8f8578dc9486cc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:40:15 2021 +0200 gdi32: Store arc direction 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/dibdrv/graphics.c | 8 ++++---- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 14 +++++++------- include/ntgdi.h | 1 + 6 files changed, 25 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 71d27c03e4f..55b48b2be5f 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -102,7 +102,7 @@ static void set_initial_dc_state( DC *dc ) dc->attr->graphics_mode = GM_COMPATIBLE; dc->attr->cur_pos.x = 0; dc->attr->cur_pos.y = 0; - dc->ArcDirection = AD_COUNTERCLOCKWISE; + dc->attr->arc_direction = AD_COUNTERCLOCKWISE; dc->xformWorld2Wnd.eM11 = 1.0f; dc->xformWorld2Wnd.eM12 = 0.0f; dc->xformWorld2Wnd.eM21 = 0.0f; @@ -409,7 +409,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->breakExtra = dc->breakExtra; newdc->breakRem = dc->breakRem; newdc->MapMode = dc->MapMode; - newdc->ArcDirection = dc->ArcDirection; newdc->xformWorld2Wnd = dc->xformWorld2Wnd; newdc->xformWorld2Vport = dc->xformWorld2Vport; newdc->xformVport2World = dc->xformVport2World; @@ -486,7 +485,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->MapMode = dcs->MapMode; dc->attr->graphics_mode = dcs->attr->graphics_mode; dc->attr->cur_pos = dcs->attr->cur_pos; - dc->ArcDirection = dcs->ArcDirection; + dc->attr->arc_direction = dcs->attr->arc_direction; dc->xformWorld2Wnd = dcs->xformWorld2Wnd; dc->xformWorld2Vport = dcs->xformWorld2Vport; dc->xformVport2World = dcs->xformVport2World; @@ -991,22 +990,6 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) } -/*********************************************************************** - * GetArcDirection (GDI32.@) - */ -INT WINAPI GetArcDirection( HDC hdc ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->ArcDirection; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetArcDirection (GDI32.@) */ @@ -1027,8 +1010,8 @@ INT WINAPI SetArcDirection( HDC hdc, INT dir ) dir = physdev->funcs->pSetArcDirection( physdev, dir ); if (dir) { - ret = dc->ArcDirection; - dc->ArcDirection = dir; + ret = dc->attr->arc_direction; + dc->attr->arc_direction = dir; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 3eb9c5184a4..30ffad70b02 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -347,9 +347,9 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, { points[0] = dc->attr->cur_pos; lp_to_dp( dc, points, 1 ); - count = 1 + get_arc_points( dc->ArcDirection, &rect, pt[0], pt[1], points + 1 ); + count = 1 + get_arc_points( dc->attr->arc_direction, &rect, pt[0], pt[1], points + 1 ); } - else count = get_arc_points( dc->ArcDirection, &rect, pt[0], pt[1], points ); + else count = get_arc_points( dc->attr->arc_direction, &rect, pt[0], pt[1], points ); if (extra_lines == 2) { @@ -1396,7 +1396,7 @@ BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bott rect.bottom--; reset_dash_origin(pdev); - if (dc->ArcDirection == AD_CLOCKWISE) + if (dc->attr->arc_direction == AD_CLOCKWISE) { /* 4 pts going clockwise starting from bottom-right */ pts[0].x = pts[3].x = rect.right; @@ -1493,7 +1493,7 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott count = ellipse_first_quadrant( ellipse_width, ellipse_height, points ); - if (dc->ArcDirection == AD_CLOCKWISE) + if (dc->attr->arc_direction == AD_CLOCKWISE) { for (i = 0; i < count; i++) { diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 3a4e6e48899..7f8af0552bf 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -124,6 +124,15 @@ INT WINAPI GetGraphicsMode( HDC hdc ) return dc_attr ? dc_attr->graphics_mode : 0; } +/*********************************************************************** + * GetArcDirection (GDI32.@) + */ +INT WINAPI GetArcDirection( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->arc_direction : 0; +} + /*********************************************************************** * GetLayout (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 110fc622d03..0f01102ed9d 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -129,7 +129,6 @@ typedef struct tagDC INT breakRem; /* breakTotalExtra % breakCount */ INT MapMode; ABORTPROC pAbortProc; /* AbortProc for Printing */ - INT ArcDirection; XFORM xformWorld2Wnd; /* World-to-window transformation */ XFORM xformWorld2Vport; /* World-to-viewport transformation */ XFORM xformVport2World; /* Inverse of the above transformation */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index ff3ab04480c..8761723f62e 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -893,7 +893,7 @@ static BOOL CDECL pathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 points[2].x = corners[0].x; points[2].y = corners[1].y; points[3] = corners[1]; - if (dc->ArcDirection == AD_CLOCKWISE) reverse_points( points, 4 ); + if (dc->attr->arc_direction == AD_CLOCKWISE) reverse_points( points, 4 ); if (!(type = add_points( physdev->path, points, 4, PT_LINETO ))) return FALSE; type[0] = PT_MOVETO; @@ -968,7 +968,7 @@ static BOOL CDECL pathdrv_RoundRect( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 points[15].x = corners[1].x; points[15].y = corners[1].y - GDI_ROUND( height ); - if (dc->ArcDirection == AD_CLOCKWISE) reverse_points( points, 16 ); + if (dc->attr->arc_direction == AD_CLOCKWISE) reverse_points( points, 16 ); if (!(type = add_points( physdev->path, points, 16, PT_BEZIERTO ))) return FALSE; type[0] = PT_MOVETO; type[4] = type[8] = type[12] = PT_LINETO; @@ -1026,7 +1026,7 @@ static BOOL CDECL pathdrv_Ellipse( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) points[12].x = corners[1].x; points[12].y = corners[1].y - GDI_ROUND( height ); - if (dc->ArcDirection == AD_CLOCKWISE) reverse_points( points, 13 ); + if (dc->attr->arc_direction == AD_CLOCKWISE) reverse_points( points, 13 ); if (!(type = add_points( physdev->path, points, 13, PT_BEZIERTO ))) return FALSE; type[0] = PT_MOVETO; close_figure( physdev->path ); @@ -1206,7 +1206,7 @@ static BOOL CDECL pathdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bo { DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, - dc->ArcDirection, 0 ); + dc->attr->arc_direction, 0 ); } @@ -1218,7 +1218,7 @@ static BOOL CDECL pathdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT { DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, - dc->ArcDirection, -1 ); + dc->attr->arc_direction, -1 ); } @@ -1230,7 +1230,7 @@ static BOOL CDECL pathdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT { DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, - dc->ArcDirection, 1 ); + dc->attr->arc_direction, 1 ); } @@ -1242,7 +1242,7 @@ static BOOL CDECL pathdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bo { DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, - dc->ArcDirection, 2 ); + dc->attr->arc_direction, 2 ); } diff --git a/include/ntgdi.h b/include/ntgdi.h index c1221d7995b..ba9d1fe7a00 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -103,6 +103,7 @@ typedef struct DC_ATTR COLORREF text_color; POINT cur_pos; INT graphics_mode; + INT arc_direction; DWORD layout; WORD text_align; WORD background_mode;

1 0

Jacek Caban : gdi32: Move background color to DC_ATTR.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 6a2decc2595c4d2afdcccc34f93f6308f0590b5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a2decc2595c4d2afdcccc34… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:39:37 2021 +0200 gdi32: Move background color to 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 | 33 ++++++++------------------------- dlls/gdi32/dib.c | 2 +- dlls/gdi32/dibdrv/graphics.c | 2 +- dlls/gdi32/dibdrv/objects.c | 12 ++++++------ dlls/gdi32/font.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/tests/dc.c | 3 +++ dlls/gdi32/tests/metafile.c | 2 +- include/ntgdi.h | 1 + 11 files changed, 32 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a2decc2595c4d2afdcc…

1 0

Jacek Caban : gdi32: Move disabled flag to DC_ATTR.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: ed1fbcf75bb35de9d9836bed6b8615bae3b1eb84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed1fbcf75bb35de9d9836bed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:38:58 2021 +0200 gdi32: Move disabled flag to DC_ATTR. And honour it in get_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 | 6 +++--- dlls/gdi32/gdidc.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index cba97c1231a..5f86bb524ba 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -206,7 +206,7 @@ DC *get_dc_ptr( HDC hdc ) { DC *dc = get_dc_obj( hdc ); if (!dc) return NULL; - if (dc->disabled) + if (dc->attr->disabled) { GDI_ReleaseObj( hdc ); return NULL; @@ -1258,9 +1258,9 @@ WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) ret = InterlockedExchange( &dc->dirty, 0 ); if (flags & DCHF_DISABLEDC) - ret = InterlockedExchange( &dc->disabled, 1 ); + ret = InterlockedExchange( &dc->attr->disabled, 1 ); else if (flags & DCHF_ENABLEDC) - ret = InterlockedExchange( &dc->disabled, 0 ); + ret = InterlockedExchange( &dc->attr->disabled, 0 ); GDI_ReleaseObj( hdc ); diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 3b477f920f9..1318533d100 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -34,7 +34,7 @@ static DC_ATTR *get_dc_attr( HDC hdc ) SetLastError( ERROR_INVALID_HANDLE ); return NULL; } - return dc_attr; + return dc_attr->disabled ? NULL : dc_attr; } /*********************************************************************** diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 674c5085a7f..6efc3f2e7d1 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -79,7 +79,6 @@ typedef struct tagDC DWORD thread; /* thread owning the DC */ LONG refcount; /* thread refcount */ LONG dirty; /* dirty flag */ - LONG disabled; /* get_dc_ptr() will return NULL. Controlled by DCHF_(DISABLE|ENABLE)DC */ INT saveLevel; DC_ATTR *attr; /* DC attributes accessible by client */ struct tagDC *saved_dc; diff --git a/include/ntgdi.h b/include/ntgdi.h index f71c993e67c..f1a3436437f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -98,6 +98,7 @@ enum typedef struct DC_ATTR { + LONG disabled; /* disabled flag, controled by DCHF_(DISABLE|ENABLE)DC */ POINT cur_pos; INT graphics_mode; WORD text_align;

1 0

Paul Gofman : ntdll: Decrement IO pending count in ioqueue_thread_proc().
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 217ae19d03f67836cfc0add2f9aeeeaeb34cdb77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=217ae19d03f67836cfc0add2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 28 01:06:59 2021 +0300 ntdll: Decrement IO pending count in ioqueue_thread_proc(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 9e99398bdee..b82d06e5e42 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1536,6 +1536,8 @@ static void CALLBACK ioqueue_thread_proc( void *param ) { RtlEnterCriticalSection( &io->pool->cs ); + --io->u.io.pending_count; + if (!array_reserve((void **)&io->u.io.completions, &io->u.io.completion_max, io->u.io.completion_count + 1, sizeof(*io->u.io.completions))) { @@ -2138,7 +2140,6 @@ static void tp_object_execute( struct threadpool_object *object, BOOL wait_threa { assert( object->u.io.completion_count ); completion = object->u.io.completions[--object->u.io.completion_count]; - object->u.io.pending_count--; } /* Leave critical section and do the actual callback. */

1 0

Alexandre Julliard : wow64: Add thunks for the file query information syscalls.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: f1d888413fb8bb71253f4a5cf72bf88edc01d47d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1d888413fb8bb71253f4a5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 16:27:10 2021 +0200 wow64: Add thunks for the file query information syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 6 +++ 2 files changed, 128 insertions(+) diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index b1081735ea5..18c65de05d0 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -143,6 +143,128 @@ NTSTATUS WINAPI wow64_NtOpenFile( UINT *args ) } +/********************************************************************** + * wow64_NtQueryAttributesFile + */ +NTSTATUS WINAPI wow64_NtQueryAttributesFile( UINT *args ) +{ + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + FILE_BASIC_INFORMATION *info = get_ptr( &args ); + + struct object_attr64 attr; + + return NtQueryAttributesFile( objattr_32to64( &attr, attr32 ), info ); +} + + +/********************************************************************** + * wow64_NtQueryDirectoryFile + */ +NTSTATUS WINAPI wow64_NtQueryDirectoryFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *buffer = get_ptr( &args ); + ULONG len = get_ulong( &args ); + FILE_INFORMATION_CLASS class = get_ulong( &args ); + BOOLEAN single_entry = get_ulong( &args ); + UNICODE_STRING32 *mask32 = get_ptr( &args ); + BOOLEAN restart_scan = get_ulong( &args ); + + UNICODE_STRING mask; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryDirectoryFile( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), buffer, len, class, single_entry, + unicode_str_32to64( &mask, mask32 ), restart_scan ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtQueryEaFile + */ +NTSTATUS WINAPI wow64_NtQueryEaFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *buffer = get_ptr( &args ); + ULONG len = get_ulong( &args ); + BOOLEAN single_entry = get_ulong( &args ); + void *list = get_ptr( &args ); + ULONG list_len = get_ulong( &args ); + ULONG *index = get_ptr( &args ); + BOOLEAN restart = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryEaFile( handle, iosb_32to64( &io, io32 ), buffer, len, + single_entry, list, list_len, index, restart ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtQueryFullAttributesFile + */ +NTSTATUS WINAPI wow64_NtQueryFullAttributesFile( UINT *args ) +{ + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + FILE_NETWORK_OPEN_INFORMATION *info = get_ptr( &args ); + + struct object_attr64 attr; + + return NtQueryFullAttributesFile( objattr_32to64( &attr, attr32 ), info ); +} + + +/********************************************************************** + * wow64_NtQueryInformationFile + */ +NTSTATUS WINAPI wow64_NtQueryInformationFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *info = get_ptr( &args ); + ULONG len = get_ulong( &args ); + FILE_INFORMATION_CLASS class = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryInformationFile( handle, iosb_32to64( &io, io32 ), info, len, class ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtQueryVolumeInformationFile + */ +NTSTATUS WINAPI wow64_NtQueryVolumeInformationFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *buffer = get_ptr( &args ); + ULONG len = get_ulong( &args ); + FS_INFORMATION_CLASS class = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryVolumeInformationFile( handle, iosb_32to64( &io, io32 ), buffer, len, class ); + put_iosb( io32, &io ); + return status; +} + + /********************************************************************** * wow64_NtReadFile */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 870cb3b77b8..d147014c3be 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -92,11 +92,16 @@ SYSCALL_ENTRY( NtOpenTimer ) \ SYSCALL_ENTRY( NtProtectVirtualMemory ) \ SYSCALL_ENTRY( NtPulseEvent ) \ + SYSCALL_ENTRY( NtQueryAttributesFile ) \ SYSCALL_ENTRY( NtQueryDefaultLocale ) \ SYSCALL_ENTRY( NtQueryDefaultUILanguage ) \ + SYSCALL_ENTRY( NtQueryDirectoryFile ) \ SYSCALL_ENTRY( NtQueryDirectoryObject ) \ + SYSCALL_ENTRY( NtQueryEaFile ) \ SYSCALL_ENTRY( NtQueryEvent ) \ + SYSCALL_ENTRY( NtQueryFullAttributesFile ) \ SYSCALL_ENTRY( NtQueryInformationAtom ) \ + SYSCALL_ENTRY( NtQueryInformationFile ) \ SYSCALL_ENTRY( NtQueryInstallUILanguage ) \ SYSCALL_ENTRY( NtQueryIoCompletion ) \ SYSCALL_ENTRY( NtQueryKey ) \ @@ -111,6 +116,7 @@ SYSCALL_ENTRY( NtQueryTimerResolution ) \ SYSCALL_ENTRY( NtQueryValueKey ) \ SYSCALL_ENTRY( NtQueryVirtualMemory ) \ + SYSCALL_ENTRY( NtQueryVolumeInformationFile ) \ SYSCALL_ENTRY( NtReadFile ) \ SYSCALL_ENTRY( NtReadFileScatter ) \ SYSCALL_ENTRY( NtReadVirtualMemory ) \

1 0