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

Jacek Caban : gdi32: Move background color to DC_ATTR.
by Alexandre Julliard 28 Jul '21

28 Jul '21

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: Use get_dc_attr in GetGraphicsMode.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 871d14f88b7ef588c9980bdb2f3889e54cdb8323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=871d14f88b7ef588c9980bdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:39:46 2021 +0200 gdi32: Use get_dc_attr in GetGraphicsMode. 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 | 16 ---------------- dlls/gdi32/gdidc.c | 9 +++++++++ 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3f7806735e2..3725bd1abf6 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -982,22 +982,6 @@ BOOL WINAPI GetDCOrgEx( HDC hDC, LPPOINT lpp ) } -/*********************************************************************** - * GetGraphicsMode (GDI32.@) - */ -INT WINAPI GetGraphicsMode( HDC hdc ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->attr->graphics_mode; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetGraphicsMode (GDI32.@) */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 10ba4d1eaac..d16d6c8d94a 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -106,6 +106,15 @@ INT WINAPI SetBkMode( HDC hdc, INT mode ) return ret; } +/*********************************************************************** + * GetGraphicsMode (GDI32.@) + */ +INT WINAPI GetGraphicsMode( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->graphics_mode : 0; +} + /*********************************************************************** * GetLayout (GDI32.@) */

1 0

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

28 Jul '21

Module: wine Branch: master Commit: e13e935be361f582ac64c49dd95699a32fabe1bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e13e935be361f582ac64c49d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:39:55 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 | 6 ------ dlls/gdi32/driver.c | 18 ------------------ dlls/gdi32/enhmfdrv/init.c | 3 --- dlls/gdi32/font.c | 3 --- dlls/gdi32/mfdrv/init.c | 3 --- dlls/gdi32/path.c | 3 --- dlls/wineandroid.drv/init.c | 3 --- dlls/winemac.drv/gdi.c | 3 --- dlls/wineps.drv/init.c | 3 --- dlls/winex11.drv/init.c | 3 --- dlls/winex11.drv/xrender.c | 3 --- include/wine/gdi_driver.h | 5 +---- 12 files changed, 1 insertion(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e13e935be361f582ac64…

1 0

Jacek Caban : gdi32: Store text color in DC_ATTR.
by Alexandre Julliard 28 Jul '21

28 Jul '21

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 28 Jul '21

28 Jul '21

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

Martin Storsjo : msvcrt: Make the coshf function NAN preserving.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 361143252bf23b6f29eead49a3715fdd6d552e8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=361143252bf23b6f29eead49… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:41:51 2021 +0200 msvcrt: Make the coshf function NAN preserving. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4e5dedd3576..92bf12b4d54 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1137,6 +1137,7 @@ static float __expo2f(float x, float sign) float CDECL coshf( float x ) { UINT32 ui = *(UINT32*)&x; + UINT32 sign = ui & 0x80000000; float t; /* |x| */ @@ -1160,7 +1161,10 @@ float CDECL coshf( float x ) } /* |x| > log(FLT_MAX) or nan */ - t = __expo2f(x, 1.0f); + if (ui > 0x7f800000) + *(UINT32*)&t = ui | sign | 0x400000; + else + t = __expo2f(x, 1.0f); return t; }

1 0

Alexandre Julliard : wow64: Implement Wow64AllocateTemp().
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 65caa0f2efc810993d76dcee7d7c94319905349f URL: https://source.winehq.org/git/wine.git/?a=commit;h=65caa0f2efc810993d76dcee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 15:59:06 2021 +0200 wow64: Implement Wow64AllocateTemp(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/sync.c | 9 +++------ dlls/wow64/syscall.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/virtual.c | 7 +++---- dlls/wow64/wow64.spec | 2 +- dlls/wow64/wow64_private.h | 3 ++- include/winternl.h | 1 + 6 files changed, 52 insertions(+), 12 deletions(-) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index ef7176bd199..afea4a5c531 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -757,7 +757,7 @@ NTSTATUS WINAPI wow64_NtQueryDirectoryObject( UINT *args ) ULONG size = size32 + sizeof(*info) - sizeof(*info32); if (!single_entry) FIXME( "not implemented\n" ); - info = RtlAllocateHeap( GetProcessHeap(), 0, size ); + info = Wow64AllocateTemp( size ); status = NtQueryDirectoryObject( handle, info, size, single_entry, restart, context, NULL ); if (!status) { @@ -771,7 +771,6 @@ NTSTATUS WINAPI wow64_NtQueryDirectoryObject( UINT *args ) memcpy( info32 + 1, info + 1, size ); if (retlen) *retlen = sizeof(*info32) + size; } - RtlFreeHeap( GetProcessHeap(), 0, info ); return status; } @@ -845,7 +844,7 @@ NTSTATUS WINAPI wow64_NtQueryObject( UINT *args ) { ULONG size = len + sizeof(OBJECT_NAME_INFORMATION) - sizeof(OBJECT_NAME_INFORMATION32); OBJECT_NAME_INFORMATION32 *info32 = ptr; - OBJECT_NAME_INFORMATION *info = RtlAllocateHeap( GetProcessHeap(), 0, size ); + OBJECT_NAME_INFORMATION *info = Wow64AllocateTemp( size ); if (!(status = NtQueryObject( handle, class, info, size, &ret_size ))) { @@ -867,7 +866,6 @@ NTSTATUS WINAPI wow64_NtQueryObject( UINT *args ) { if (retlen) *retlen = ret_size - sizeof(*info) + sizeof(*info32); } - RtlFreeHeap( GetProcessHeap(), 0, info ); return status; } @@ -894,7 +892,7 @@ NTSTATUS WINAPI wow64_NtQueryObject( UINT *args ) /* assume at most 32 types, with an average 16-char name */ ULONG ret_size, size = 32 * (sizeof(OBJECT_TYPE_INFORMATION) + 16 * sizeof(WCHAR)); - info = RtlAllocateHeap( GetProcessHeap(), 0, size ); + info = Wow64AllocateTemp( size ); if (!(status = NtQueryObject( handle, class, info, size, &ret_size ))) { OBJECT_TYPE_INFORMATION *type; @@ -915,7 +913,6 @@ NTSTATUS WINAPI wow64_NtQueryObject( UINT *args ) if (pos32 > len) status = STATUS_INFO_LENGTH_MISMATCH; if (retlen) *retlen = pos32; } - RtlFreeHeap( GetProcessHeap(), 0, info ); return status; } diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 2f165879195..0000db54c29 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -54,6 +54,14 @@ static const char *syscall_names[] = static unsigned short syscall_map[1024]; +/* header for Wow64AllocTemp blocks; probably not the right layout */ +struct mem_header +{ + struct mem_header *next; + void *__pad; + BYTE data[1]; +}; + static SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock; void *dummy = RtlUnwind; @@ -375,6 +383,22 @@ static void process_init(void) } +/********************************************************************** + * free_temp_data + */ +static void free_temp_data(void) +{ + struct mem_header *next, *mem; + + for (mem = NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST]; mem; mem = next) + { + next = mem->next; + RtlFreeHeap( GetProcessHeap(), 0, mem ); + } + NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = NULL; +} + + /********************************************************************** * Wow64SystemServiceEx (NTDLL.@) */ @@ -397,10 +421,28 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) status = GetExceptionCode(); } __ENDTRY; + free_temp_data(); return status; } +/********************************************************************** + * Wow64AllocateTemp + * + * FIXME: probably not 100% compatible. + */ +void * WINAPI Wow64AllocateTemp( SIZE_T size ) +{ + struct mem_header *mem; + + if (!(mem = RtlAllocateHeap( GetProcessHeap(), 0, offsetof( struct mem_header, data[size] )))) + return NULL; + mem->next = NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST]; + NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = mem; + return mem->data; +} + + /********************************************************************** * Wow64ApcRoutine (NTDLL.@) */ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 36bd91d9f8c..3cf2b934c93 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -198,13 +198,12 @@ NTSTATUS WINAPI wow64_NtGetWriteWatch( UINT *args ) if (flags & ~WRITE_WATCH_FLAG_RESET) return STATUS_INVALID_PARAMETER; if (!addr_ptr) return STATUS_ACCESS_VIOLATION; - addresses = RtlAllocateHeap( GetProcessHeap(), 0, count * sizeof(*addresses) ); + addresses = Wow64AllocateTemp( count * sizeof(*addresses) ); if (!(status = NtGetWriteWatch( handle, flags, base, size, addresses, &count, granularity ))) { for (i = 0; i < count; i++) addr_ptr[i] = PtrToUlong( addresses[i] ); *count_ptr = count; } - RtlFreeHeap( GetProcessHeap(), 0, addresses ); return status; } @@ -335,7 +334,7 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) MEMORY_SECTION_NAME32 *info32 = ptr; SIZE_T size = len + sizeof(*info) - sizeof(*info32); - info = RtlAllocateHeap( GetProcessHeap(), 0, size ); + info = Wow64AllocateTemp( size ); if (!(status = NtQueryVirtualMemory( handle, addr, class, info, size, &res_len ))) { info32->SectionFileName.Length = info->SectionFileName.Length; @@ -353,7 +352,7 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) MEMORY_WORKING_SET_EX_INFORMATION *info; ULONG i, count = len / sizeof(*info32); - info = RtlAllocateHeap( GetProcessHeap(), 0, count * sizeof(*info) ); + info = Wow64AllocateTemp( count * sizeof(*info) ); for (i = 0; i < count; i++) info[i].VirtualAddress = ULongToPtr( info32[i].VirtualAddress ); if (!(status = NtQueryVirtualMemory( handle, addr, class, info, count * sizeof(*info), &res_len ))) { diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index 8f188043556..4ed20af0f29 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -1,6 +1,6 @@ @ stub Wow64AllocThreadHeap @ stub Wow64AllocateHeap -@ stub Wow64AllocateTemp +@ stdcall Wow64AllocateTemp(long) @ stdcall Wow64ApcRoutine(long long long ptr) @ stub Wow64CheckIfNXEnabled @ stub Wow64EmulateAtlThunk diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 6ba77720263..e9935303cbb 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -28,7 +28,8 @@ ALL_SYSCALLS #undef SYSCALL_ENTRY -void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ) DECLSPEC_HIDDEN; +void * WINAPI Wow64AllocateTemp( SIZE_T size ) DECLSPEC_HIDDEN; +void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ) DECLSPEC_HIDDEN; extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN; diff --git a/include/winternl.h b/include/winternl.h index 7d732d895d9..10d6de1f9ed 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1081,6 +1081,7 @@ typedef struct _TEB64 /* reserved TEB64 TLS slots for Wow64 */ #define WOW64_TLS_CPURESERVED 1 +#define WOW64_TLS_TEMPLIST 3 #define WOW64_TLS_FILESYSREDIR 8

1 0

Alexandre Julliard : wow64: Add thunks for the file creation syscalls.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 01ad0993cb6c74fd0efd960ecad9d1af54375a90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01ad0993cb6c74fd0efd960e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 16:15:56 2021 +0200 wow64: Add thunks for the file creation syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/Makefile.in | 1 + dlls/wow64/file.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/struct32.h | 10 +++++ dlls/wow64/syscall.h | 3 ++ dlls/wow64/wow64_private.h | 18 ++++++++ 5 files changed, 132 insertions(+) diff --git a/dlls/wow64/Makefile.in b/dlls/wow64/Makefile.in index 693fdefaae4..f56d1f0aad9 100644 --- a/dlls/wow64/Makefile.in +++ b/dlls/wow64/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = ntdll winecrt0 EXTRADLLFLAGS = -nodefaultlibs -mno-cygwin -Wl,--image-base,0x6f000000 C_SRCS = \ + file.c \ registry.c \ sync.c \ syscall.c \ diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c new file mode 100644 index 00000000000..361aa1905ee --- /dev/null +++ b/dlls/wow64/file.c @@ -0,0 +1,100 @@ +/* + * WoW64 file functions + * + * Copyright 2021 Alexandre Julliard + * + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winternl.h" +#include "wow64_private.h" + + +/********************************************************************** + * wow64_NtCreateFile + */ +NTSTATUS WINAPI wow64_NtCreateFile( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + LARGE_INTEGER *alloc_size = get_ptr( &args ); + ULONG attributes = get_ulong( &args ); + ULONG sharing = get_ulong( &args ); + ULONG disposition = get_ulong( &args ); + ULONG options = get_ulong( &args ); + void *ea_buffer = get_ptr( &args ); + ULONG ea_length = get_ulong( &args ); + + struct object_attr64 attr; + IO_STATUS_BLOCK io; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateFile( &handle, access, objattr_32to64( &attr, attr32 ), + iosb_32to64( &io, io32 ), alloc_size, attributes, + sharing, disposition, options, ea_buffer, ea_length ); + put_handle( handle_ptr, handle ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtDeleteFile + */ +NTSTATUS WINAPI wow64_NtDeleteFile( UINT *args ) +{ + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + + struct object_attr64 attr; + + return NtDeleteFile( objattr_32to64( &attr, attr32 )); +} + + +/********************************************************************** + * wow64_NtOpenFile + */ +NTSTATUS WINAPI wow64_NtOpenFile( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + ULONG sharing = get_ulong( &args ); + ULONG options = get_ulong( &args ); + + struct object_attr64 attr; + IO_STATUS_BLOCK io; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtOpenFile( &handle, access, objattr_32to64( &attr, attr32 ), + iosb_32to64( &io, io32 ), sharing, options ); + put_handle( handle_ptr, handle ); + put_iosb( io32, &io ); + return status; +} diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 069564948d0..76055115b08 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -31,6 +31,16 @@ typedef struct ULONG SecurityQualityOfService; } OBJECT_ATTRIBUTES32; +typedef struct +{ + union + { + NTSTATUS Status; + ULONG Pointer; + }; + ULONG Information; +} IO_STATUS_BLOCK32; + typedef struct { UNICODE_STRING32 Name; diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index ab25bcb501d..2b542658f9e 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -38,6 +38,7 @@ SYSCALL_ENTRY( NtCreateDebugObject ) \ SYSCALL_ENTRY( NtCreateDirectoryObject ) \ SYSCALL_ENTRY( NtCreateEvent ) \ + SYSCALL_ENTRY( NtCreateFile ) \ SYSCALL_ENTRY( NtCreateIoCompletion ) \ SYSCALL_ENTRY( NtCreateJobObject ) \ SYSCALL_ENTRY( NtCreateKey ) \ @@ -53,6 +54,7 @@ SYSCALL_ENTRY( NtDebugContinue ) \ SYSCALL_ENTRY( NtDelayExecution ) \ SYSCALL_ENTRY( NtDeleteAtom ) \ + SYSCALL_ENTRY( NtDeleteFile ) \ SYSCALL_ENTRY( NtDeleteKey ) \ SYSCALL_ENTRY( NtDeleteValueKey ) \ SYSCALL_ENTRY( NtDuplicateObject ) \ @@ -73,6 +75,7 @@ SYSCALL_ENTRY( NtMapViewOfSection ) \ SYSCALL_ENTRY( NtOpenDirectoryObject ) \ SYSCALL_ENTRY( NtOpenEvent ) \ + SYSCALL_ENTRY( NtOpenFile ) \ SYSCALL_ENTRY( NtOpenIoCompletion ) \ SYSCALL_ENTRY( NtOpenJobObject ) \ SYSCALL_ENTRY( NtOpenKey ) \ diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index e9935303cbb..303914c540e 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -105,6 +105,13 @@ static inline void *apc_param_32to64( ULONG func, ULONG context ) return (void *)(ULONG_PTR)(((ULONG64)func << 32) | context); } +static inline IO_STATUS_BLOCK *iosb_32to64( IO_STATUS_BLOCK *io, IO_STATUS_BLOCK32 *io32 ) +{ + if (!io32) return NULL; + io->Pointer = io32; + return io; +} + static inline UNICODE_STRING *unicode_str_32to64( UNICODE_STRING *str, const UNICODE_STRING32 *str32 ) { if (!str32) return NULL; @@ -178,6 +185,17 @@ static inline void put_size( ULONG *size32, SIZE_T size ) if (size32) *size32 = min( size, MAXDWORD ); } +static inline void put_iosb( IO_STATUS_BLOCK32 *io32, const IO_STATUS_BLOCK *io ) +{ + /* sync I/O modifies the 64-bit iosb right away, so in that case we update the 32-bit one */ + /* async I/O leaves the 64-bit one untouched and updates the 32-bit one directly later on */ + if (io32 && io->Pointer != io32) + { + io32->Status = io->Status; + io32->Information = io->Information; + } +} + extern void put_section_image_info( SECTION_IMAGE_INFORMATION32 *info32, const SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : wow64: Add thunks for the file I/O syscalls.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 668b1829200fdbfa91845d089cc37683476e4aa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=668b1829200fdbfa91845d08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 16:20:48 2021 +0200 wow64: Add thunks for the file I/O syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 7 +++ 2 files changed, 170 insertions(+) diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index 361aa1905ee..b1081735ea5 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -74,6 +74,49 @@ NTSTATUS WINAPI wow64_NtDeleteFile( UINT *args ) } +/********************************************************************** + * wow64_NtFlushBuffersFile + */ +NTSTATUS WINAPI wow64_NtFlushBuffersFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtFlushBuffersFile( handle, iosb_32to64( &io, io32 )); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtLockFile + */ +NTSTATUS WINAPI wow64_NtLockFile( 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 ); + LARGE_INTEGER *offset = get_ptr( &args ); + LARGE_INTEGER *count = get_ptr( &args ); + ULONG *key = get_ptr( &args ); + BOOLEAN dont_wait = get_ulong( &args ); + BOOLEAN exclusive = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtLockFile( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), offset, count, key, dont_wait, exclusive ); + put_iosb( io32, &io ); + return status; +} + + /********************************************************************** * wow64_NtOpenFile */ @@ -98,3 +141,123 @@ NTSTATUS WINAPI wow64_NtOpenFile( UINT *args ) put_iosb( io32, &io ); return status; } + + +/********************************************************************** + * wow64_NtReadFile + */ +NTSTATUS WINAPI wow64_NtReadFile( 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 ); + LARGE_INTEGER *offset = get_ptr( &args ); + ULONG *key = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtReadFile( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), buffer, len, offset, key ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtReadFileScatter + */ +NTSTATUS WINAPI wow64_NtReadFileScatter( 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 ); + FILE_SEGMENT_ELEMENT *segments = get_ptr( &args ); + ULONG len = get_ulong( &args ); + LARGE_INTEGER *offset = get_ptr( &args ); + ULONG *key = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtReadFileScatter( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), segments, len, offset, key ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtUnlockFile + */ +NTSTATUS WINAPI wow64_NtUnlockFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + LARGE_INTEGER *offset = get_ptr( &args ); + LARGE_INTEGER *count = get_ptr( &args ); + ULONG *key = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtUnlockFile( handle, iosb_32to64( &io, io32 ), offset, count, key ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtWriteFile + */ +NTSTATUS WINAPI wow64_NtWriteFile( 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 ); + LARGE_INTEGER *offset = get_ptr( &args ); + ULONG *key = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtWriteFile( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), buffer, len, offset, key ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtWriteFileGather + */ +NTSTATUS WINAPI wow64_NtWriteFileGather( 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 ); + FILE_SEGMENT_ELEMENT *segments = get_ptr( &args ); + ULONG len = get_ulong( &args ); + LARGE_INTEGER *offset = get_ptr( &args ); + ULONG *key = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtWriteFileGather( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), segments, len, offset, key ); + put_iosb( io32, &io ); + return status; +} diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 2b542658f9e..870cb3b77b8 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -61,6 +61,7 @@ SYSCALL_ENTRY( NtEnumerateKey ) \ SYSCALL_ENTRY( NtEnumerateValueKey ) \ SYSCALL_ENTRY( NtFindAtom ) \ + SYSCALL_ENTRY( NtFlushBuffersFile ) \ SYSCALL_ENTRY( NtFlushKey ) \ SYSCALL_ENTRY( NtFlushVirtualMemory ) \ SYSCALL_ENTRY( NtFreeVirtualMemory ) \ @@ -70,6 +71,7 @@ SYSCALL_ENTRY( NtListenPort ) \ SYSCALL_ENTRY( NtLoadKey ) \ SYSCALL_ENTRY( NtLoadKey2 ) \ + SYSCALL_ENTRY( NtLockFile ) \ SYSCALL_ENTRY( NtLockVirtualMemory ) \ SYSCALL_ENTRY( NtMakeTemporaryObject ) \ SYSCALL_ENTRY( NtMapViewOfSection ) \ @@ -109,6 +111,8 @@ SYSCALL_ENTRY( NtQueryTimerResolution ) \ SYSCALL_ENTRY( NtQueryValueKey ) \ SYSCALL_ENTRY( NtQueryVirtualMemory ) \ + SYSCALL_ENTRY( NtReadFile ) \ + SYSCALL_ENTRY( NtReadFileScatter ) \ SYSCALL_ENTRY( NtReadVirtualMemory ) \ SYSCALL_ENTRY( NtReleaseKeyedEvent ) \ SYSCALL_ENTRY( NtReleaseMutant ) \ @@ -136,6 +140,7 @@ SYSCALL_ENTRY( NtSignalAndWaitForSingleObject ) \ SYSCALL_ENTRY( NtTerminateJobObject ) \ SYSCALL_ENTRY( NtUnloadKey ) \ + SYSCALL_ENTRY( NtUnlockFile ) \ SYSCALL_ENTRY( NtUnlockVirtualMemory ) \ SYSCALL_ENTRY( NtUnmapViewOfSection ) \ SYSCALL_ENTRY( NtWaitForDebugEvent ) \ @@ -145,6 +150,8 @@ SYSCALL_ENTRY( NtWow64AllocateVirtualMemory64 ) \ SYSCALL_ENTRY( NtWow64ReadVirtualMemory64 ) \ SYSCALL_ENTRY( NtWow64WriteVirtualMemory64 ) \ + SYSCALL_ENTRY( NtWriteFile ) \ + SYSCALL_ENTRY( NtWriteFileGather ) \ SYSCALL_ENTRY( NtWriteVirtualMemory ) \ SYSCALL_ENTRY( NtYieldExecution )

1 0

Chip Davis : vkd3d: Pass vkd3d_pipeline_bind_point values to set_root_signature() calls.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: vkd3d Branch: master Commit: 829c861af43f7849467515abf123fade8dcfbcb4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=829c861af43f7849467515a… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Jul 27 22:45:55 2021 -0500 vkd3d: Pass vkd3d_pipeline_bind_point values to set_root_signature() calls. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index bc502c0..fb93068 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4088,7 +4088,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12G TRACE("iface %p, root_signature %p.\n", iface, root_signature); - d3d12_command_list_set_root_signature(list, VK_PIPELINE_BIND_POINT_COMPUTE, + d3d12_command_list_set_root_signature(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE, unsafe_impl_from_ID3D12RootSignature(root_signature)); } @@ -4099,7 +4099,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootSignature(ID3D12 TRACE("iface %p, root_signature %p.\n", iface, root_signature); - d3d12_command_list_set_root_signature(list, VK_PIPELINE_BIND_POINT_GRAPHICS, + d3d12_command_list_set_root_signature(list, VKD3D_PIPELINE_BIND_POINT_GRAPHICS, unsafe_impl_from_ID3D12RootSignature(root_signature)); }

1 0