- wine-devel - winehq.org

[PATCH] dpnhupnp: Build with msvcrt.
by Nikolay Sivov 29 Jul '21

29 Jul '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dpnhupnp/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in index 6aa9ef1dd80..369f1ba276a 100644 --- a/dlls/dpnhupnp/Makefile.in +++ b/dlls/dpnhupnp/Makefile.in @@ -1,6 +1,6 @@ MODULE = dpnhupnp.dll -EXTRADLLFLAGS = -Wb,--prefer-native +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c -- 2.30.2

1 0

[PATCH] winewrapper: Use early binding on FreeBSD
by Gerald Pfeifer 29 Jul '21

29 Jul '21

FreeBSD requires LD_BIND_NOW / LD_32_BIND_NOW to address the issue raised in https://bugs.winehq.org/show_bug.cgi?id=50257 . Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- tools/winewrapper | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/winewrapper b/tools/winewrapper index 2206d7c4446..85380423753 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -84,6 +84,13 @@ else export LD_LIBRARY_PATH fi +if [ "`uname -s`" = "FreeBSD" ] +then + # Workaround for https://bugs.winehq.org/show_bug.cgi?id=50257 + export LD_BIND_NOW=1 + export LD_32_BIND_NOW=1 +fi + if [ -x "$topdir/loader/$name" ] then WINELOADER="$topdir/loader/$name" elif [ -x "$topdir/loader/wine" ] -- 2.31.1

2 3

[PATCH 01/10] gdi32: Use get_dc_attr in SetArcDirection.
by Jacek Caban 29 Jul '21

29 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- 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(-)

2 1

[PATCH v2 10/10] gdi32: Remove no longer used driver entry points.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dibdrv/dc.c | 8 -------- dlls/gdi32/driver.c | 24 ------------------------ dlls/gdi32/enhmfdrv/init.c | 4 ---- dlls/gdi32/font.c | 4 ---- dlls/gdi32/mfdrv/init.c | 4 ---- dlls/gdi32/path.c | 4 ---- dlls/wineandroid.drv/init.c | 4 ---- dlls/winemac.drv/gdi.c | 4 ---- dlls/wineps.drv/init.c | 4 ---- dlls/winex11.drv/init.c | 4 ---- dlls/winex11.drv/xrender.c | 4 ---- include/wine/gdi_driver.h | 6 +----- 12 files changed, 1 insertion(+), 73 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index b9332b32d58..d05c50aab7b 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -713,7 +713,6 @@ const struct gdi_dc_funcs dib_driver = dibdrv_SelectFont, /* pSelectFont */ NULL, /* pSelectPalette */ dibdrv_SelectPen, /* pSelectPen */ - NULL, /* pSetArcDirection */ NULL, /* pSetBkColor */ dibdrv_SetBoundsRect, /* pSetBoundsRect */ dibdrv_SetDCBrushColor, /* pSetDCBrushColor */ @@ -725,9 +724,6 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ dibdrv_SetPixel, /* pSetPixel */ - NULL, /* pSetPolyFillMode */ - NULL, /* pSetRelAbs */ - NULL, /* pSetStretchBltMode */ NULL, /* pSetTextCharacterExtra */ NULL, /* pSetTextColor */ NULL, /* pSetTextJustification */ @@ -1309,7 +1305,6 @@ static const struct gdi_dc_funcs window_driver = NULL, /* pSelectFont */ NULL, /* pSelectPalette */ NULL, /* pSelectPen */ - NULL, /* pSetArcDirection */ NULL, /* pSetBkColor */ windrv_SetBoundsRect, /* pSetBoundsRect */ NULL, /* pSetDCBrushColor */ @@ -1321,9 +1316,6 @@ static const struct gdi_dc_funcs window_driver = NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ windrv_SetPixel, /* pSetPixel */ - NULL, /* pSetPolyFillMode */ - NULL, /* pSetRelAbs */ - NULL, /* pSetStretchBltMode */ NULL, /* pSetTextCharacterExtra */ NULL, /* pSetTextColor */ NULL, /* pSetTextJustification */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index b5cb80dce65..ddc39bd1825 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -761,11 +761,6 @@ static HPEN CDECL nulldrv_SelectPen( PHYSDEV dev, HPEN pen, const struct brush_p return pen; } -static INT CDECL nulldrv_SetArcDirection( PHYSDEV dev, INT dir ) -{ - return dir; -} - static COLORREF CDECL nulldrv_SetBkColor( PHYSDEV dev, COLORREF color ) { return color; @@ -822,21 +817,6 @@ static COLORREF CDECL nulldrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF colo return color; } -static INT CDECL nulldrv_SetPolyFillMode( PHYSDEV dev, INT mode ) -{ - return mode; -} - -static INT CDECL nulldrv_SetRelAbs( PHYSDEV dev, INT mode ) -{ - return mode; -} - -static INT CDECL nulldrv_SetStretchBltMode( PHYSDEV dev, INT mode ) -{ - return mode; -} - static INT CDECL nulldrv_SetTextCharacterExtra( PHYSDEV dev, INT extra ) { return extra; @@ -980,7 +960,6 @@ const struct gdi_dc_funcs null_driver = nulldrv_SelectFont, /* pSelectFont */ nulldrv_SelectPalette, /* pSelectPalette */ nulldrv_SelectPen, /* pSelectPen */ - nulldrv_SetArcDirection, /* pSetArcDirection */ nulldrv_SetBkColor, /* pSetBkColor */ nulldrv_SetBoundsRect, /* pSetBoundsRect */ nulldrv_SetDCBrushColor, /* pSetDCBrushColor */ @@ -992,9 +971,6 @@ const struct gdi_dc_funcs null_driver = nulldrv_SetMapMode, /* pSetMapMode */ nulldrv_SetMapperFlags, /* pSetMapperFlags */ nulldrv_SetPixel, /* pSetPixel */ - nulldrv_SetPolyFillMode, /* pSetPolyFillMode */ - nulldrv_SetRelAbs, /* pSetRelAbs */ - nulldrv_SetStretchBltMode, /* pSetStretchBltMode */ nulldrv_SetTextCharacterExtra, /* pSetTextCharacterExtra */ nulldrv_SetTextColor, /* pSetTextColor */ nulldrv_SetTextJustification, /* pSetTextJustification */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 3eb01025e50..516c6c4e884 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -127,7 +127,6 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SelectFont, /* pSelectFont */ EMFDRV_SelectPalette, /* pSelectPalette */ EMFDRV_SelectPen, /* pSelectPen */ - NULL, /* pSetArcDirection */ EMFDRV_SetBkColor, /* pSetBkColor */ NULL, /* pSetBoundsRect */ EMFDRV_SetDCBrushColor, /* pSetDCBrushColor*/ @@ -139,9 +138,6 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SetMapMode, /* pSetMapMode */ EMFDRV_SetMapperFlags, /* pSetMapperFlags */ EMFDRV_SetPixel, /* pSetPixel */ - NULL, /* pSetPolyFillMode */ - NULL, /* pSetRelAbs */ - NULL, /* pSetStretchBltMode */ NULL, /* pSetTextCharacterExtra */ EMFDRV_SetTextColor, /* pSetTextColor */ EMFDRV_SetTextJustification, /* pSetTextJustification */ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index fd1f25025b6..bbf55724013 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3904,7 +3904,6 @@ const struct gdi_dc_funcs font_driver = font_SelectFont, /* pSelectFont */ NULL, /* pSelectPalette */ NULL, /* pSelectPen */ - NULL, /* pSetArcDirection */ NULL, /* pSetBkColor */ NULL, /* pSetBoundsRect */ NULL, /* pSetDCBrushColor */ @@ -3916,9 +3915,6 @@ const struct gdi_dc_funcs font_driver = NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ NULL, /* pSetPixel */ - NULL, /* pSetPolyFillMode */ - NULL, /* pSetRelAbs */ - NULL, /* pSetStretchBltMode */ NULL, /* pSetTextCharacterExtra */ NULL, /* pSetTextColor */ NULL, /* pSetTextJustification */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 12ea0f55948..31a0297c9e3 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -190,7 +190,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SelectFont, /* pSelectFont */ MFDRV_SelectPalette, /* pSelectPalette */ MFDRV_SelectPen, /* pSelectPen */ - NULL, /* pSetArcDirection */ MFDRV_SetBkColor, /* pSetBkColor */ MFDRV_SetBoundsRect, /* pSetBoundsRect */ MFDRV_SetDCBrushColor, /* pSetDCBrushColor*/ @@ -202,9 +201,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SetMapMode, /* pSetMapMode */ MFDRV_SetMapperFlags, /* pSetMapperFlags */ NULL, /* pSetPixel */ - NULL, /* pSetPolyFillMode */ - NULL, /* pSetRelAbs */ - NULL, /* pSetStretchBltMode */ MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */ MFDRV_SetTextColor, /* pSetTextColor */ MFDRV_SetTextJustification, /* pSetTextJustification */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index b9414967982..8a0369a82d0 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2165,7 +2165,6 @@ const struct gdi_dc_funcs path_driver = NULL, /* pSelectFont */ NULL, /* pSelectPalette */ NULL, /* pSelectPen */ - NULL, /* pSetArcDirection */ NULL, /* pSetBkColor */ NULL, /* pSetBoundsRect */ NULL, /* pSetDCBrushColor */ @@ -2177,9 +2176,6 @@ const struct gdi_dc_funcs path_driver = NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ NULL, /* pSetPixel */ - NULL, /* pSetPolyFillMode */ - NULL, /* pSetRelAbs */ - NULL, /* pSetStretchBltMode */ NULL, /* pSetTextCharacterExtra */ NULL, /* pSetTextColor */ NULL, /* pSetTextJustification */ diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index dd79e187670..94301a016c6 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -374,7 +374,6 @@ static const struct gdi_dc_funcs android_drv_funcs = NULL, /* pSelectFont */ NULL, /* pSelectPalette */ NULL, /* pSelectPen */ - NULL, /* pSetArcDirection */ NULL, /* pSetBkColor */ NULL, /* pSetBoundsRect */ NULL, /* pSetDCBrushColor */ @@ -386,9 +385,6 @@ static const struct gdi_dc_funcs android_drv_funcs = NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ NULL, /* pSetPixel */ - NULL, /* pSetPolyFillMode */ - NULL, /* pSetRelAbs */ - NULL, /* pSetStretchBltMode */ NULL, /* pSetTextCharacterExtra */ NULL, /* pSetTextColor */ NULL, /* pSetTextJustification */ diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 00f358f0985..7e03c96a256 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -354,7 +354,6 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pSelectFont */ NULL, /* pSelectPalette */ NULL, /* pSelectPen */ - NULL, /* pSetArcDirection */ NULL, /* pSetBkColor */ NULL, /* pSetBoundsRect */ NULL, /* pSetDCBrushColor */ @@ -366,9 +365,6 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ NULL, /* pSetPixel */ - NULL, /* pSetPolyFillMode */ - NULL, /* pSetRelAbs */ - NULL, /* pSetStretchBltMode */ NULL, /* pSetTextCharacterExtra */ NULL, /* pSetTextColor */ NULL, /* pSetTextJustification */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 3bfb085db6b..f18a56671cc 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -868,7 +868,6 @@ static const struct gdi_dc_funcs psdrv_funcs = PSDRV_SelectFont, /* pSelectFont */ NULL, /* pSelectPalette */ PSDRV_SelectPen, /* pSelectPen */ - NULL, /* pSetArcDirection */ PSDRV_SetBkColor, /* pSetBkColor */ NULL, /* pSetBoundsRect */ PSDRV_SetDCBrushColor, /* pSetDCBrushColor */ @@ -880,9 +879,6 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ PSDRV_SetPixel, /* pSetPixel */ - NULL, /* pSetPolyFillMode */ - NULL, /* pSetRelAbs */ - NULL, /* pSetStretchBltMode */ NULL, /* pSetTextCharacterExtra */ PSDRV_SetTextColor, /* pSetTextColor */ NULL, /* pSetTextJustification */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 51924afb9af..0f0e1849e17 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -433,7 +433,6 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_SelectFont, /* pSelectFont */ NULL, /* pSelectPalette */ X11DRV_SelectPen, /* pSelectPen */ - NULL, /* pSetArcDirection */ NULL, /* pSetBkColor */ X11DRV_SetBoundsRect, /* pSetBoundsRect */ X11DRV_SetDCBrushColor, /* pSetDCBrushColor */ @@ -445,9 +444,6 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ X11DRV_SetPixel, /* pSetPixel */ - NULL, /* pSetPolyFillMode */ - NULL, /* pSetRelAbs */ - NULL, /* pSetStretchBltMode */ NULL, /* pSetTextCharacterExtra */ NULL, /* pSetTextColor */ NULL, /* pSetTextJustification */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index c09c2403631..5949588cd24 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2245,7 +2245,6 @@ static const struct gdi_dc_funcs xrender_funcs = xrenderdrv_SelectFont, /* pSelectFont */ NULL, /* pSelectPalette */ NULL, /* pSelectPen */ - NULL, /* pSetArcDirection */ NULL, /* pSetBkColor */ NULL, /* pSetBoundsRect */ NULL, /* pSetDCBrushColor */ @@ -2257,9 +2256,6 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ NULL, /* pSetPixel */ - NULL, /* pSetPolyFillMode */ - NULL, /* pSetRelAbs */ - NULL, /* pSetStretchBltMode */ NULL, /* pSetTextCharacterExtra */ NULL, /* pSetTextColor */ NULL, /* pSetTextJustification */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 5492fa9d1e5..2d342903cf9 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -158,7 +158,6 @@ struct gdi_dc_funcs HFONT (CDECL *pSelectFont)(PHYSDEV,HFONT,UINT*); HPALETTE (CDECL *pSelectPalette)(PHYSDEV,HPALETTE,BOOL); HPEN (CDECL *pSelectPen)(PHYSDEV,HPEN,const struct brush_pattern*); - INT (CDECL *pSetArcDirection)(PHYSDEV,INT); COLORREF (CDECL *pSetBkColor)(PHYSDEV,COLORREF); UINT (CDECL *pSetBoundsRect)(PHYSDEV,RECT*,UINT); COLORREF (CDECL *pSetDCBrushColor)(PHYSDEV, COLORREF); @@ -170,9 +169,6 @@ struct gdi_dc_funcs INT (CDECL *pSetMapMode)(PHYSDEV,INT); DWORD (CDECL *pSetMapperFlags)(PHYSDEV,DWORD); COLORREF (CDECL *pSetPixel)(PHYSDEV,INT,INT,COLORREF); - INT (CDECL *pSetPolyFillMode)(PHYSDEV,INT); - INT (CDECL *pSetRelAbs)(PHYSDEV,INT); - INT (CDECL *pSetStretchBltMode)(PHYSDEV,INT); INT (CDECL *pSetTextCharacterExtra)(PHYSDEV,INT); COLORREF (CDECL *pSetTextColor)(PHYSDEV,COLORREF); BOOL (CDECL *pSetTextJustification)(PHYSDEV,INT,INT); @@ -199,7 +195,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 53 +#define WINE_GDI_DRIVER_VERSION 54 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ -- 2.25.1

1 0

[PATCH v2 09/10] gdi32: Store map mode in DC_ATTR.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dc.c | 25 ++++--------------------- dlls/gdi32/driver.c | 2 +- dlls/gdi32/font.c | 3 ++- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/mapping.c | 22 +++++++++++----------- dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 7 files changed, 28 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3c9dca8c512..bae1e9d21ab 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -98,7 +98,7 @@ static void set_initial_dc_state( DC *dc ) dc->charExtra = 0; dc->breakExtra = 0; dc->breakRem = 0; - dc->MapMode = MM_TEXT; + dc->attr->map_mode = MM_TEXT; dc->attr->graphics_mode = GM_COMPATIBLE; dc->attr->cur_pos.x = 0; dc->attr->cur_pos.y = 0; @@ -405,7 +405,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->charExtra = dc->charExtra; newdc->breakExtra = dc->breakExtra; newdc->breakRem = dc->breakRem; - newdc->MapMode = dc->MapMode; newdc->xformWorld2Wnd = dc->xformWorld2Wnd; newdc->xformWorld2Vport = dc->xformWorld2Vport; newdc->xformVport2World = dc->xformVport2World; @@ -479,9 +478,9 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->charExtra = dcs->charExtra; dc->breakExtra = dcs->breakExtra; dc->breakRem = dcs->breakRem; - dc->MapMode = dcs->MapMode; - dc->attr->graphics_mode = dcs->attr->graphics_mode; - dc->attr->cur_pos = dcs->attr->cur_pos; + dc->attr->map_mode = dcs->attr->map_mode; + dc->attr->graphics_mode = dcs->attr->graphics_mode; + dc->attr->cur_pos = dcs->attr->cur_pos; dc->attr->arc_direction = dcs->attr->arc_direction; dc->xformWorld2Wnd = dcs->xformWorld2Wnd; dc->xformWorld2Vport = dcs->xformWorld2Vport; @@ -1392,22 +1391,6 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } -/*********************************************************************** - * GetMapMode (GDI32.@) - */ -INT WINAPI GetMapMode( HDC hdc ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->MapMode; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * GetBrushOrgEx (GDI32.@) */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 851e80b1cd9..b5cb80dce65 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -799,7 +799,7 @@ static DWORD CDECL nulldrv_SetLayout( PHYSDEV dev, DWORD layout ) dc->attr->layout = layout; if (layout != old_layout) { - if (layout & LAYOUT_RTL) dc->MapMode = MM_ANISOTROPIC; + if (layout & LAYOUT_RTL) dc->attr->map_mode = MM_ANISOTROPIC; DC_UpdateXforms( dc ); } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6e4a52fec02..fd1f25025b6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5995,7 +5995,8 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr TRACE("%p, %d, %d, %08x, %s, %s, %d, %p)\n", hdc, x, y, flags, wine_dbgstr_rect(lprect), debugstr_wn(str, count), count, lpDx); - TRACE("align = %x bkmode = %x mapmode = %x\n", align, dc->attr->background_mode, dc->MapMode); + TRACE("align = %x bkmode = %x mapmode = %x\n", align, dc->attr->background_mode, + dc->attr->map_mode); if(align & TA_UPDATECP) { diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 35986dba37e..bbd172239cd 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; } +/*********************************************************************** + * GetMapMode (GDI32.@) + */ +INT WINAPI GetMapMode( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->map_mode : 0; +} + /*********************************************************************** * GetPolyFillMode (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index b2148fa3bae..b7a615cbf79 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -117,14 +117,14 @@ BOOL CDECL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT if (size) *size = dc->vport_ext; - if (dc->MapMode != MM_ISOTROPIC && dc->MapMode != MM_ANISOTROPIC) return TRUE; + if (dc->attr->map_mode != MM_ISOTROPIC && dc->attr->map_mode != MM_ANISOTROPIC) return TRUE; if (!x_num || !x_denom || !y_num || !y_denom) return FALSE; dc->vport_ext.cx = (dc->vport_ext.cx * x_num) / x_denom; dc->vport_ext.cy = (dc->vport_ext.cy * y_num) / y_denom; if (dc->vport_ext.cx == 0) dc->vport_ext.cx = 1; if (dc->vport_ext.cy == 0) dc->vport_ext.cy = 1; - if (dc->MapMode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); + if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); DC_UpdateXforms( dc ); return TRUE; } @@ -136,14 +136,14 @@ BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_ if (size) *size = dc->wnd_ext; - if (dc->MapMode != MM_ISOTROPIC && dc->MapMode != MM_ANISOTROPIC) return TRUE; + if (dc->attr->map_mode != MM_ISOTROPIC && dc->attr->map_mode != MM_ANISOTROPIC) return TRUE; if (!x_num || !x_denom || !y_num || !y_denom) return FALSE; dc->wnd_ext.cx = (dc->wnd_ext.cx * x_num) / x_denom; dc->wnd_ext.cy = (dc->wnd_ext.cy * y_num) / y_denom; if (dc->wnd_ext.cx == 0) dc->wnd_ext.cx = 1; if (dc->wnd_ext.cy == 0) dc->wnd_ext.cy = 1; - if (dc->MapMode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); + if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); DC_UpdateXforms( dc ); return TRUE; } @@ -151,10 +151,10 @@ BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_ INT CDECL nulldrv_SetMapMode( PHYSDEV dev, INT mode ) { DC *dc = get_nulldrv_dc( dev ); - INT ret = dc->MapMode; + INT ret = dc->attr->map_mode; SIZE virtual_size, virtual_res; - if (mode == dc->MapMode && (mode == MM_ISOTROPIC || mode == MM_ANISOTROPIC)) return ret; + if (mode == dc->attr->map_mode && (mode == MM_ISOTROPIC || mode == MM_ANISOTROPIC)) return ret; virtual_size = get_dc_virtual_size( dc ); virtual_res = get_dc_virtual_res( dc ); @@ -203,7 +203,7 @@ INT CDECL nulldrv_SetMapMode( PHYSDEV dev, INT mode ) return 0; } /* RTL layout is always MM_ANISOTROPIC */ - if (!(dc->attr->layout & LAYOUT_RTL)) dc->MapMode = mode; + if (!(dc->attr->layout & LAYOUT_RTL)) dc->attr->map_mode = mode; DC_UpdateXforms( dc ); return ret; } @@ -215,11 +215,11 @@ BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) if (size) *size = dc->vport_ext; - if (dc->MapMode != MM_ISOTROPIC && dc->MapMode != MM_ANISOTROPIC) return TRUE; + if (dc->attr->map_mode != MM_ISOTROPIC && dc->attr->map_mode != MM_ANISOTROPIC) return TRUE; if (!cx || !cy) return FALSE; dc->vport_ext.cx = cx; dc->vport_ext.cy = cy; - if (dc->MapMode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); + if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); DC_UpdateXforms( dc ); return TRUE; } @@ -244,14 +244,14 @@ BOOL CDECL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) if (size) *size = dc->wnd_ext; - if (dc->MapMode != MM_ISOTROPIC && dc->MapMode != MM_ANISOTROPIC) return TRUE; + if (dc->attr->map_mode != MM_ISOTROPIC && dc->attr->map_mode != MM_ANISOTROPIC) return TRUE; if (!cx || !cy) return FALSE; dc->wnd_ext.cx = cx; dc->wnd_ext.cy = cy; /* The API docs say that you should call SetWindowExtEx before SetViewportExtEx. This advice does not imply that Windows doesn't ensure the isotropic mapping after SetWindowExtEx! */ - if (dc->MapMode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); + if (dc->attr->map_mode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); DC_UpdateXforms( dc ); return TRUE; } diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index cb7a8e7f7c9..19a5819f031 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -124,7 +124,6 @@ typedef struct tagDC INT charExtra; /* Spacing from SetTextCharacterExtra() */ INT breakExtra; /* breakTotalExtra / breakCount */ INT breakRem; /* breakTotalExtra % breakCount */ - INT MapMode; ABORTPROC pAbortProc; /* AbortProc for Printing */ XFORM xformWorld2Wnd; /* World-to-window transformation */ XFORM xformWorld2Vport; /* World-to-viewport transformation */ diff --git a/include/ntgdi.h b/include/ntgdi.h index a4ed8b6aec9..08df860a5e6 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -111,6 +111,7 @@ typedef struct DC_ATTR WORD rop_mode; WORD rel_abs_mode; WORD stretch_blt_mode; + INT map_mode; void *emf; } DC_ATTR; -- 2.25.1

1 0

[PATCH v2 08/10] gdi32: Use get_dc_attr in SetStretchBltMode.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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; -- 2.25.1

1 0

[PATCH v2 07/10] gdi32: Store stretch_blt_mode in DC_ATTR.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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; -- 2.25.1

1 0

[PATCH v2 06/10] gdi32: Use get_dc_attr in SetPolyFillMode.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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; -- 2.25.1

1 0

[PATCH v2 05/10] gdi32: Store poly fill mode in DC_ATTR.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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; -- 2.25.1

1 0

[PATCH v2 04/10] gdi32: Use get_dc_attr in SetRelAbs.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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; -- 2.25.1

1 0

[PATCH v2 03/10] gdi32: Store rel abs mode in DC_ATTR.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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; -- 2.25.1

1 0

[PATCH v2 02/10] gdi32: Move color space stubs to objects.c.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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; +} -- 2.25.1

1 0

[PATCH v2 01/10] gdi32: Use get_dc_attr in SetArcDirection.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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.@) */ -- 2.25.1

1 0

[PATCH vkd3d] tests: Do not use llabs(3) on an unsigned difference.
by Chip Davis 29 Jul '21

29 Jul '21

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- tests/d3d12.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index b10f24b..a43a7f2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -63,7 +63,9 @@ static bool compare_uint16(uint16_t a, uint16_t b, unsigned int max_diff) static bool compare_uint64(uint64_t a, uint64_t b, unsigned int max_diff) { - return llabs(a - b) <= max_diff; + uint64_t diff = a > b ? a - b : b - a; + + return diff <= max_diff; } static ULONG get_refcount(void *iface) -- 2.31.1

2 1

[PATCH vkd3d 1/6] vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_constants().
by Zebediah Figura 29 Jul '21

29 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0bb2287f..4fb26b89 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3041,22 +3041,12 @@ static void shader_write_descriptor_table1(struct root_signature_writer_context shader_write_descriptor_ranges1(buffer, table); } -static int shader_write_root_constants(struct root_signature_writer_context *context, +static void shader_write_root_constants(struct vkd3d_bytecode_buffer *buffer, const struct vkd3d_shader_root_constants *constants) { - if (!write_dword(context, constants->shader_register)) - goto fail; - if (!write_dword(context, constants->register_space)) - goto fail; - if (!write_dword(context, constants->value_count)) - goto fail; - - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature root constants."); - return VKD3D_ERROR_OUT_OF_MEMORY; + put_u32(buffer, constants->shader_register); + put_u32(buffer, constants->register_space); + put_u32(buffer, constants->value_count); } static int shader_write_root_descriptor(struct root_signature_writer_context *context, @@ -3128,7 +3118,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co shader_write_descriptor_table1(context, &desc->u.v_1_1.parameters[i].u.descriptor_table); break; case VKD3D_SHADER_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: - ret = shader_write_root_constants(context, versioned_root_signature_get_root_constants(desc, i)); + shader_write_root_constants(buffer, versioned_root_signature_get_root_constants(desc, i)); break; case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV: -- 2.32.0

2 11

[PATCH vkd3d v2 1/2] vkd3d-shader: Handle descriptor array dynamic indexing.
by Conor McCarthy 29 Jul '21

29 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 63 ++++++++++++++++++++++++++++++++++----- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6cdbaf1e..b0412d30 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -573,6 +573,7 @@ enum vkd3d_shader_spirv_extension { VKD3D_SHADER_SPIRV_EXTENSION_NONE, VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_EXTENSION), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4fa94826..b9f62408 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1822,6 +1822,13 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, vkd3d_spirv_build_op_extension(&stream, "SPV_KHR_shader_draw_parameters"); if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityDemoteToHelperInvocationEXT)) vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_demote_to_helper_invocation"); + if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityUniformBufferArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityUniformTexelBufferArrayDynamicIndexingEXT) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilitySampledImageArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageBufferArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageTexelBufferArrayDynamicIndexingEXT) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageImageArrayDynamicIndexing)) + vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_descriptor_indexing"); if (builder->ext_instr_set_glsl_450) vkd3d_spirv_build_op_ext_inst_import(&stream, builder->ext_instr_set_glsl_450, "GLSL.std.450"); @@ -3126,18 +3133,59 @@ static bool register_is_descriptor(const struct vkd3d_shader_register *reg) } } +static bool vkd3d_dxbc_compiler_enable_descriptor_indexing(struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_shader_register_type reg_type, enum vkd3d_shader_resource_type resource_type) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + if (!vkd3d_dxbc_compiler_is_target_extension_supported(compiler, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING)) + return false; + + switch (reg_type) + { + case VKD3DSPR_CONSTBUFFER: + vkd3d_spirv_enable_capability(builder, SpvCapabilityUniformBufferArrayDynamicIndexing); + break; + case VKD3DSPR_RESOURCE: + vkd3d_spirv_enable_capability(builder, resource_type == VKD3D_SHADER_RESOURCE_BUFFER + ? SpvCapabilityUniformTexelBufferArrayDynamicIndexingEXT + : SpvCapabilitySampledImageArrayDynamicIndexing); + break; + case VKD3DSPR_UAV: + if (resource_type == VKD3D_SHADER_RESOURCE_BUFFER) + vkd3d_spirv_enable_capability(builder, compiler->ssbo_uavs + ? SpvCapabilityStorageBufferArrayDynamicIndexing + : SpvCapabilityStorageTexelBufferArrayDynamicIndexingEXT); + else + vkd3d_spirv_enable_capability(builder, SpvCapabilityStorageImageArrayDynamicIndexing); + break; + case VKD3DSPR_SAMPLER: + break; + default: + ERR("Unhandled register type %#x.\n", reg_type); + break; + } + + return true; +} + static uint32_t vkd3d_dxbc_compiler_get_descriptor_index(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, unsigned int binding_base_idx) + const struct vkd3d_shader_register *reg, unsigned int binding_base_idx, + enum vkd3d_shader_resource_type resource_type) { struct vkd3d_shader_register_index index = reg->idx[1]; uint32_t index_id; if (index.rel_addr) { - FIXME("Descriptor dynamic indexing is not supported.\n"); - vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_IDX_UNSUPPORTED, - "Cannot dynamically index a descriptor array of type %#x, id %u. " - "Dynamic indexing is not supported.", reg->type, reg->idx[0].offset); + if (!vkd3d_dxbc_compiler_enable_descriptor_indexing(compiler, reg->type, resource_type)) + { + FIXME("The target environment does not support descriptor indexing.\n"); + vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_IDX_UNSUPPORTED, + "Cannot dynamically index a descriptor array of type %#x, id %u. " + "The target environment does not support descriptor indexing.", reg->type, reg->idx[0].offset); + } } index.offset -= binding_base_idx; @@ -3159,7 +3207,8 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp assert(!reg->idx[0].rel_addr); if (register_info->descriptor_array) indexes[index_count++] = vkd3d_dxbc_compiler_get_descriptor_index(compiler, reg, - register_info->descriptor_array->info.descriptor_array.binding_base_idx); + register_info->descriptor_array->info.descriptor_array.binding_base_idx, + VKD3D_SHADER_RESOURCE_BUFFER); indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[2]); } @@ -7818,7 +7867,7 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil uint32_t ptr_type_id, index_id; index_id = vkd3d_dxbc_compiler_get_descriptor_index(compiler, resource_reg, - array_data->binding_base_idx); + array_data->binding_base_idx, symbol->info.resource.resource_type_info->resource_type); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, array_data->storage_class, array_data->contained_type_id); -- 2.32.0

2 3

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 29 Jul '21

29 Jul '21

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 202 +++++++++++++++++++++++++++---------------------------- 1 file changed, 100 insertions(+), 102 deletions(-) diff --git a/po/fi.po b/po/fi.po index 1279131a41c..3df52155cc9 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6962,10 +6962,8 @@ msgid "Resource is not currently available.\n" msgstr "Resurssi ei ole nyt saatavilla.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Luokan nimi:" +msgstr "Klassinen sininen" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -6974,31 +6972,31 @@ msgstr "Normaali" #: dlls/localspl/localspl.rc:37 msgid "Letter" -msgstr "" +msgstr "Letter" #: dlls/localspl/localspl.rc:38 msgid "Letter Small" -msgstr "" +msgstr "Letter Small" #: dlls/localspl/localspl.rc:39 msgid "Tabloid" -msgstr "" +msgstr "Tabloid" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "Legal" #: dlls/localspl/localspl.rc:42 msgid "Statement" -msgstr "" +msgstr "Statement" #: dlls/localspl/localspl.rc:43 msgid "Executive" -msgstr "" +msgstr "Executive" #: dlls/localspl/localspl.rc:44 msgid "A3" @@ -7010,7 +7008,7 @@ msgstr "A4" #: dlls/localspl/localspl.rc:46 msgid "A4 Small" -msgstr "" +msgstr "A4 (pieni)" #: dlls/localspl/localspl.rc:47 msgid "A5" @@ -7026,59 +7024,59 @@ msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Folio" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quarto" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14 tuumaa" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17 tuumaa" #: dlls/localspl/localspl.rc:54 msgid "Note" -msgstr "" +msgstr "Note" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "Envelope #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "Envelope #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "Envelope #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "Envelope #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "Envelope #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C-paperi (ANSI)" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D-paperi (ANSI)" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E-paperi (ANSI)" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "Envelope DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" @@ -7114,31 +7112,31 @@ msgstr "B6-kirjekuori" #: dlls/localspl/localspl.rc:72 msgid "Envelope" -msgstr "" +msgstr "Envelope" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "Monarch-kirjekuori" +msgstr "Envelope Monarch" #: dlls/localspl/localspl.rc:74 msgid "6 3/4 Envelope" -msgstr "" +msgstr "6 3/4 Envelope" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "US Std Fanfold" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "German Std Fanfold" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "German Legal Fanfold" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "B4 (ISO)" +msgstr "B4" #: dlls/localspl/localspl.rc:79 msgid "Japanese Postcard" @@ -7146,83 +7144,83 @@ msgstr "Japanilainen postikortti" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11 tuumaa" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11 tuumaa" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11 tuumaa" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "Envelope Invite" #: dlls/localspl/localspl.rc:84 msgid "Letter Extra" -msgstr "" +msgstr "Letter Extra" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "Legal Extra" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "Tabloid Extra" #: dlls/localspl/localspl.rc:87 msgid "A4 Extra" -msgstr "" +msgstr "A4 Extra" #: dlls/localspl/localspl.rc:88 msgid "Letter Transverse" -msgstr "" +msgstr "Letter (pysty)" #: dlls/localspl/localspl.rc:89 msgid "A4 Transverse" -msgstr "" +msgstr "A4 (pysty)" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "Letter Extra (pysty)" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "Super A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "Super B" #: dlls/localspl/localspl.rc:93 msgid "Letter Plus" -msgstr "" +msgstr "Letter Plus" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 Plus" #: dlls/localspl/localspl.rc:95 msgid "A5 Transverse" -msgstr "" +msgstr "A5 (pysty)" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) (pysty)" #: dlls/localspl/localspl.rc:97 msgid "A3 Extra" -msgstr "" +msgstr "A3 Extra" #: dlls/localspl/localspl.rc:98 msgid "A5 Extra" -msgstr "" +msgstr "A5 Extra" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 Extra" #: dlls/localspl/localspl.rc:100 msgid "A2" @@ -7230,15 +7228,15 @@ msgstr "A2" #: dlls/localspl/localspl.rc:101 msgid "A3 Transverse" -msgstr "" +msgstr "A3 (pysty)" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "A3 Extra (pysty)" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "Japanilainen tuplapostikortti" #: dlls/localspl/localspl.rc:104 msgid "A6" @@ -7246,71 +7244,71 @@ msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "Japanin kirjekuori Kaku #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "Japanin kirjekuori Kaku #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "Japanin kirjekuori Chou #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "Japanin kirjekuori Chou #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "Letter (vaaka)" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 (vaaka)" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 (vaaka)" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 (vaaka)" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) (vaaka)" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) (vaaka)" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "Japanilainen postikortti (vaaka)" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "Japanilainen tuplapostikortti (vaaka)" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 (vaaka)" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "Japanin kirjekuori Kaku #2 (vaaka)" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "Japanin kirjekuori Kaku #3 (vaaka)" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "Japanin kirjekuori Chou #3 (vaaka)" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "Japanin kirjekuori Chou #4 (vaaka)" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" @@ -7318,123 +7316,123 @@ msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) (vaaka)" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11 tuumaa" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "Japanin kirjekuori You #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "Japanin kirjekuori You #4 (vaaka)" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "PRC 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "PRC 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "PRC 32K(Big)" #: dlls/localspl/localspl.rc:130 msgid "PRC Envelope #1" -msgstr "" +msgstr "PRC Envelope #1" #: dlls/localspl/localspl.rc:131 msgid "PRC Envelope #2" -msgstr "" +msgstr "PRC Envelope #2" #: dlls/localspl/localspl.rc:132 msgid "PRC Envelope #3" -msgstr "" +msgstr "PRC Envelope #3" #: dlls/localspl/localspl.rc:133 msgid "PRC Envelope #4" -msgstr "" +msgstr "PRC Envelope #4" #: dlls/localspl/localspl.rc:134 msgid "PRC Envelope #5" -msgstr "" +msgstr "PRC Envelope #5" #: dlls/localspl/localspl.rc:135 msgid "PRC Envelope #6" -msgstr "" +msgstr "PRC Envelope #6" #: dlls/localspl/localspl.rc:136 msgid "PRC Envelope #7" -msgstr "" +msgstr "PRC Envelope #7" #: dlls/localspl/localspl.rc:137 msgid "PRC Envelope #8" -msgstr "" +msgstr "PRC Envelope #8" #: dlls/localspl/localspl.rc:138 msgid "PRC Envelope #9" -msgstr "" +msgstr "PRC Envelope #9" #: dlls/localspl/localspl.rc:139 msgid "PRC Envelope #10" -msgstr "" +msgstr "PRC Envelope #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "PRC 16K (vaaka)" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "PRC 32K (vaaka)" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "PRC 32K(Big) (vaaka)" #: dlls/localspl/localspl.rc:143 msgid "PRC Envelope #1 Rotated" -msgstr "" +msgstr "PRC Envelope #1 (vaaka)" #: dlls/localspl/localspl.rc:144 msgid "PRC Envelope #2 Rotated" -msgstr "" +msgstr "PRC Envelope #2 (vaaka)" #: dlls/localspl/localspl.rc:145 msgid "PRC Envelope #3 Rotated" -msgstr "" +msgstr "PRC Envelope #3 (vaaka)" #: dlls/localspl/localspl.rc:146 msgid "PRC Envelope #4 Rotated" -msgstr "" +msgstr "PRC Envelope #4 (vaaka)" #: dlls/localspl/localspl.rc:147 msgid "PRC Envelope #5 Rotated" -msgstr "" +msgstr "PRC Envelope #5 (vaaka)" #: dlls/localspl/localspl.rc:148 msgid "PRC Envelope #6 Rotated" -msgstr "" +msgstr "PRC Envelope #6 (vaaka)" #: dlls/localspl/localspl.rc:149 msgid "PRC Envelope #7 Rotated" -msgstr "" +msgstr "PRC Envelope #7 (vaaka)" #: dlls/localspl/localspl.rc:150 msgid "PRC Envelope #8 Rotated" -msgstr "" +msgstr "PRC Envelope #8 (vaaka)" #: dlls/localspl/localspl.rc:151 msgid "PRC Envelope #9 Rotated" -msgstr "" +msgstr "PRC Envelope #9 (vaaka)" #: dlls/localspl/localspl.rc:152 msgid "PRC Envelope #10 Rotated" -msgstr "" +msgstr "PRC Envelope #10 (vaaka)" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 -- 2.32.0

1 0

[PATCH] winhttp: Handle headers with '\r' line breaks.
by Haoyang Chen 29 Jul '21

29 Jul '21

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- 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 ); -- 2.20.1

3 2

[PATCH 10/10] gdi32: Remove no longer used driver entry points.
by Jacek Caban 29 Jul '21

29 Jul '21

1 0

[PATCH 09/10] gdi32: Store map mode in DC_ATTR.
by Jacek Caban 29 Jul '21

29 Jul '21

1 0

[PATCH 08/10] gdi32: Use get_dc_attr in SetStretchBltMode.
by Jacek Caban 29 Jul '21

29 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- 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(-)

1 0

[PATCH 07/10] gdi32: Store stretch_blt_mode in DC_ATTR.
by Jacek Caban 29 Jul '21

29 Jul '21

1 0

[PATCH 06/10] gdi32: Use get_dc_attr in SetPolyFillMode.
by Jacek Caban 29 Jul '21

29 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- 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(-)

1 0

[PATCH 05/10] gdi32: Store poly fill mode in DC_ATTR.
by Jacek Caban 29 Jul '21

29 Jul '21

1 0

[PATCH 04/10] gdi32: Use get_dc_attr in SetRelAbs.
by Jacek Caban 29 Jul '21

29 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- 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(-)

1 0

[PATCH 03/10] gdi32: Store rel abs mode in DC_ATTR.
by Jacek Caban 29 Jul '21

29 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- 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(-)

1 0

[PATCH 02/10] gdi32: Move color space stubs to objects.c.
by Jacek Caban 29 Jul '21

29 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 46 -------------------------------------------- dlls/gdi32/objects.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 46 deletions(-)

1 0

[PATCH] kernelbase: Don't allow converting thread to fiber more than once.
by Paul Gofman 29 Jul '21

29 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/fiber.c | 14 ++++++++++++++ dlls/kernelbase/thread.c | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 3c54351fa7b..9ae45c2091b 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -128,10 +128,17 @@ static VOID WINAPI FiberMainProc(LPVOID lpFiberParameter) static void test_ConvertThreadToFiber(void) { + void *ret; + if (pConvertThreadToFiber) { fibers[0] = pConvertThreadToFiber(&testparam); ok(fibers[0] != NULL, "ConvertThreadToFiber failed with error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pConvertThreadToFiber(&testparam); + ok(!ret, "Got non NULL ret.\n"); + ok(GetLastError() == ERROR_ALREADY_FIBER, "Got unexpected error %u.\n", GetLastError()); } else { @@ -141,10 +148,17 @@ static void test_ConvertThreadToFiber(void) static void test_ConvertThreadToFiberEx(void) { + void *ret; + if (pConvertThreadToFiberEx) { fibers[0] = pConvertThreadToFiberEx(&testparam, 0); ok(fibers[0] != NULL, "ConvertThreadToFiberEx failed with error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pConvertThreadToFiberEx(&testparam, 0); + ok(!ret, "Got non NULL ret.\n"); + ok(GetLastError() == ERROR_ALREADY_FIBER, "Got unexpected error %u.\n", GetLastError()); } else { diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 61cb74c6222..9b97c4a8914 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -990,6 +990,12 @@ LPVOID WINAPI DECLSPEC_HOTPATCH ConvertThreadToFiberEx( LPVOID param, DWORD flag { struct fiber_data *fiber; + if (NtCurrentTeb()->Tib.u.FiberData) + { + SetLastError( ERROR_ALREADY_FIBER ); + return NULL; + } + if (!(fiber = HeapAlloc( GetProcessHeap(), 0, sizeof(*fiber) ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); -- 2.31.1

1 0

[PATCH 1/5] ws2_32: Move the setsockopt(IPV6_MULTICAST_HOPS) implementation to ntdll.
by Zebediah Figura 28 Jul '21

28 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 85763d032ed..12a6ef418ba 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1867,6 +1867,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9c2d58827ba..902f9e07b48 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3627,8 +3627,10 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_DROP_MEMBERSHIP: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP, optval, optlen ); - case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, optval, optlen ); + + case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: #ifdef IPV6_UNICAST_IF diff --git a/include/wine/afd.h b/include/wine/afd.h index 0f04cc824a8..2c0f1a1e23c 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -212,6 +212,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_DONTFRAG WINE_AFD_IOC(267) #define IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP WINE_AFD_IOC(268) #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(269) +#define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(270) struct afd_create_params { -- 2.30.2

2 7

RFC: Disabling MinGW support in Wine packages (e.g. Debian)
by Francois Gouget 28 Jul '21

28 Jul '21

Debian's Wine packages build with --without-mingw. See debian/rules in: http://deb.debian.org/debian/pool/main/w/wine/wine_5.0.3-3.debian.tar.xz If I remember correctly this increases the chance of not being able to run applications that expect specific binary layouts for Windows function prologues, i.e. mostly those with copy-prevention / anti-cheat schemes. If so packages that needlessly disable MinGW are doing their users a disservice and are not presenting Wine in its best light. Do I remember correctly? Should packagers be advised not to compile without MinGW? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Good judgment comes from experience, and experience comes from bad judgment -- Barry LePatner

3 2

[PATCH 2/2] combase: Add CoDecodeProxy stub.
by Jacek Caban 28 Jul '21

28 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/combase/combase.spec | 2 +- dlls/combase/rpc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[PATCH 1/2] include: Introduce combaseapi.h.
by Jacek Caban 28 Jul '21

28 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/combaseapi.h | 53 ++++++++++++++++++++++++++++++++++++++++++++ include/objbase.h | 11 +-------- 2 files changed, 54 insertions(+), 10 deletions(-) create mode 100644 include/combaseapi.h

1 0

[PATCH] combase: Check all apartment types when looking for an apartment belonging to a thread.
by Dmitry Timoshkov 28 Jul '21

28 Jul '21

When an application has both apartment-threaded and multi-threaded apartments then apartment_findfromtid() might return just the first one, and later stub manager assiciated with that apartment may not have an appropriate connection. In order to find the appropriate connection it's needed to check all apartment types belonging to a thread. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/combase/apartment.c | 4 ++-- dlls/combase/combase_private.h | 2 +- dlls/combase/stubmanager.c | 34 +++++++++++++++++++++++++++++----- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 108d6a71c5c..23dfaa5da2c 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -656,14 +656,14 @@ struct apartment * apartment_findfromoxid(OXID oxid) /* gets the apartment which has a given creator thread ID. The caller must * release the reference from the apartment as soon as the apartment pointer * is no longer required. */ -struct apartment * apartment_findfromtid(DWORD tid) +struct apartment * apartment_findfromtid(DWORD tid, BOOL multi_threaded) { struct apartment *result = NULL, *apt; EnterCriticalSection(&apt_cs); LIST_FOR_EACH_ENTRY(apt, &apts, struct apartment, entry) { - if (apt->tid == tid) + if (apt->tid == tid && apt->multi_threaded == multi_threaded) { result = apt; apartment_addref(result); diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 9247af4ebb6..7d67e6f439a 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -170,7 +170,7 @@ IUnknown *com_get_registered_class_object(const struct apartment *apartment, REF DWORD clscontext) DECLSPEC_HIDDEN; void apartment_revoke_all_classes(const struct apartment *apt) DECLSPEC_HIDDEN; struct apartment * apartment_findfromoxid(OXID oxid) DECLSPEC_HIDDEN; -struct apartment * apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN; +struct apartment * apartment_findfromtid(DWORD tid, BOOL multi_threaded) DECLSPEC_HIDDEN; HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) DECLSPEC_HIDDEN; diff --git a/dlls/combase/stubmanager.c b/dlls/combase/stubmanager.c index e9f20962e3b..8a910f63190 100644 --- a/dlls/combase/stubmanager.c +++ b/dlls/combase/stubmanager.c @@ -499,21 +499,45 @@ static HRESULT ipid_to_ifstub(const IPID *ipid, struct apartment **stub_apt, /* FIXME: hack for IRemUnknown */ if (ipid->Data2 == 0xffff) *stub_apt = apartment_findfromoxid(*(const OXID *)ipid->Data4); - else - *stub_apt = apartment_findfromtid(ipid->Data2); + else /* Look for multi-threaded apartment */ + *stub_apt = apartment_findfromtid(ipid->Data2, TRUE); + + TRACE("ipid %s (tid %08x) => stub_apt %p\n", debugstr_guid(ipid), ipid->Data2, *stub_apt); + if (!*stub_apt) { TRACE("Couldn't find apartment corresponding to TID 0x%04x\n", ipid->Data2); return RPC_E_INVALID_OBJECT; } *stubmgr_ret = get_stub_manager_from_ipid(*stub_apt, ipid, ifstub); - if (!*stubmgr_ret) + TRACE("stub_apt %p, ipid %s (tid %08x) => stubmgr_ret %p\n", *stub_apt, debugstr_guid(ipid), ipid->Data2, *stubmgr_ret); + + if (*stubmgr_ret) return S_OK; + + apartment_release(*stub_apt); + + if (ipid->Data2 == 0xffff) /* IRemUnknown */ { - apartment_release(*stub_apt); *stub_apt = NULL; return RPC_E_INVALID_OBJECT; } - return S_OK; + + /* Look for apartment-threaded apartment */ + *stub_apt = apartment_findfromtid(ipid->Data2, FALSE); + if (!*stub_apt) + { + TRACE("Couldn't find apartment corresponding to TID 0x%04x\n", ipid->Data2); + return RPC_E_INVALID_OBJECT; + } + + *stubmgr_ret = get_stub_manager_from_ipid(*stub_apt, ipid, ifstub); + TRACE("stub_apt %p, ipid %s (tid %08x) => stubmgr_ret %p\n", *stub_apt, debugstr_guid(ipid), ipid->Data2, *stubmgr_ret); + + if (*stubmgr_ret) return S_OK; + + apartment_release(*stub_apt); + *stub_apt = NULL; + return RPC_E_INVALID_OBJECT; } static HRESULT ipid_to_stub_manager(const IPID *ipid, struct apartment **stub_apt, struct stub_manager **stub) -- 2.31.1

3 4

[PATCH 1/5] ws2_32: Move the setsockopt(IPV6_ADD_MEMBERSHIP) implementation to ntdll.
by Zebediah Figura 28 Jul '21

28 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/socket.c | 5 +++++ dlls/ws2_32/socket.c | 4 ++-- include/wine/afd.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f33fc014f3b..f0dc00a9651 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1802,6 +1802,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IP, IP_UNICAST_IF, in_buffer, in_size ); #endif +#ifdef IPV6_ADD_MEMBERSHIP + case IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, in_buffer, in_size ); +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d5de709e991..f02d668ece4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3717,9 +3717,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPPROTO_IPV6: switch(optname) { -#ifdef IPV6_ADD_MEMBERSHIP case WS_IPV6_ADD_MEMBERSHIP: -#endif + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP, optval, optlen ); + #ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: #endif diff --git a/include/wine/afd.h b/include/wine/afd.h index c150e2ce474..dda07695f75 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -207,6 +207,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE WINE_AFD_IOC(262) #define IOCTL_AFD_WINE_GET_IP_UNICAST_IF WINE_AFD_IOC(263) #define IOCTL_AFD_WINE_SET_IP_UNICAST_IF WINE_AFD_IOC(264) +#define IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP WINE_AFD_IOC(265) struct afd_create_params { -- 2.30.2

2 5

[PATCH v2] msvcrt: Fix strtof() error reporting for values out of float range
by Martin Storsjo 28 Jul '21

28 Jul '21

If the values weren't out of range for the internal strtod() call, we still must mark them as out of range when returning as float. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Mimicing UCRT exactly for float denormals too. --- dlls/msvcrt/string.c | 8 +++++++- dlls/msvcrt/wcs.c | 8 +++++++- dlls/ucrtbase/tests/string.c | 37 ++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 27e3284326a..4d09405094d 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1065,7 +1065,13 @@ double CDECL strtod( const char *str, char **end ) */ float CDECL _strtof_l( const char *str, char **end, _locale_t locale ) { - return _strtod_l(str, end, locale); + double ret = _strtod_l(str, end, locale); + if (ret && isfinite(ret)) { + float f = ret; + if (!f || !isfinite(f)) + *_errno() = ERANGE; + } + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 615b4f36a33..aeab5527db4 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -798,7 +798,13 @@ double CDECL _wtof_l(const wchar_t *str, _locale_t locale) */ float CDECL _wcstof_l( const wchar_t *str, wchar_t **end, _locale_t locale ) { - return _wcstod_l(str, end, locale); + double ret = _wcstod_l(str, end, locale); + if (ret && isfinite(ret)) { + float f = ret; + if (!f || !isfinite(f)) + *_errno() = ERANGE; + } + return ret; } /********************************************************************* diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 9b1d21b801c..734dd68db76 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -152,6 +152,42 @@ static void test_strtod(void) test_strtod_str_errno("2.47e-324", 0, 9, ERANGE); } +static void test_strtof(void) +{ + static const struct { + const char *str; + int len; + float ret; + int err; + } tests[] = { + { "12.1", 4, 12.1f }, + { "-13.721", 7, -13.721f }, + { "1.e40", 5, INFINITY, ERANGE }, + { "-1.e40", 6, -INFINITY, ERANGE }, + { "0.0", 3, 0.0f }, + { "-0.0", 4, 0.0f }, + { "1.4e-45", 7, 1.4e-45f }, + { "-1.4e-45", 8, -1.4e-45f }, + { "1.e-60", 6, 0, ERANGE }, + { "-1.e-60", 7, 0, ERANGE }, + }; + + char *end; + float f; + int i; + + for (i=0; i<ARRAY_SIZE(tests); i++) + { + errno = 0xdeadbeef; + f = strtof(tests[i].str, &end); + ok(f == tests[i].ret, "%d) f = %.16e\n", i, f); + ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", + i, (int)(end - tests[i].str)); + ok(errno == tests[i].err || (!tests[i].err && errno == 0xdeadbeef), + "%d) errno = %d\n", i, errno); + } +} + static void test__memicmp(void) { static const char *s1 = "abc"; @@ -558,6 +594,7 @@ START_TEST(string) "Invalid parameter handler was already set\n"); test_strtod(); + test_strtof(); test__memicmp(); test__memicmp_l(); test___strncnt(); -- 2.25.1

2 1

[PATCH 1/7 v2] msvcrt: Make the coshf function NAN preserving
by Piotr Caban 28 Jul '21

28 Jul '21

From: Martin Storsjo <martin(a)martin.st> Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - style changes - fixed NAN recognition in if statements - test signaling bit - split the patch dlls/msvcrt/math.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

2 1

[PATCH] msvcrt: Fix strtof() error reporting for values out of float range
by Martin Storsjo 28 Jul '21

28 Jul '21

If the values weren't out of range for the internal strtod() call, we still must mark them as out of range when returning as float. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/msvcrt/string.c | 15 ++++++++++++++- dlls/msvcrt/wcs.c | 16 +++++++++++++++- dlls/ucrtbase/tests/string.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 27e3284326a..823e1e77b9a 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1065,7 +1065,20 @@ double CDECL strtod( const char *str, char **end ) */ float CDECL _strtof_l( const char *str, char **end, _locale_t locale ) { - return _strtod_l(str, end, locale); + double ret = _strtod_l(str, end, locale); + if (isfinite(ret)) { + /* Check for cases that aren't out of range for doubles, but that are + * for floats. */ + if (ret > FLT_MAX) + *_errno() = ERANGE; + else if (ret < -FLT_MAX) + *_errno() = ERANGE; + else if (ret > 0 && ret < FLT_MIN) + *_errno() = ERANGE; + else if (ret < 0 && ret > -FLT_MIN) + *_errno() = ERANGE; + } + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 615b4f36a33..1baed5d1458 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -23,6 +23,7 @@ #include <limits.h> #include <locale.h> #include <math.h> +#include <float.h> #include <assert.h> #include <wchar.h> #include <wctype.h> @@ -798,7 +799,20 @@ double CDECL _wtof_l(const wchar_t *str, _locale_t locale) */ float CDECL _wcstof_l( const wchar_t *str, wchar_t **end, _locale_t locale ) { - return _wcstod_l(str, end, locale); + double ret = _wcstod_l(str, end, locale); + if (isfinite(ret)) { + /* Check for cases that aren't out of range for doubles, but that are + * for floats. */ + if (ret > FLT_MAX) + *_errno() = ERANGE; + else if (ret < -FLT_MAX) + *_errno() = ERANGE; + else if (ret > 0 && ret < FLT_MIN) + *_errno() = ERANGE; + else if (ret < 0 && ret > -FLT_MIN) + *_errno() = ERANGE; + } + return ret; } /********************************************************************* diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 9b1d21b801c..92626048410 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -152,6 +152,38 @@ static void test_strtod(void) test_strtod_str_errno("2.47e-324", 0, 9, ERANGE); } +static void test_strtof(void) +{ + static const struct { + const char *str; + int len; + float ret; + int err; + } tests[] = { + { "12.1", 4, 12.1f }, + { "-13.721", 7, -13.721f }, + { "1.e40", 5, INFINITY, ERANGE }, + { "-1.e40", 6, -INFINITY, ERANGE }, + { "1.e-60", 6, 0, ERANGE }, + { "-1.e-60", 7, 0, ERANGE }, + }; + + char *end; + float f; + int i; + + for (i=0; i<ARRAY_SIZE(tests); i++) + { + errno = 0xdeadbeef; + f = strtof(tests[i].str, &end); + ok(f == tests[i].ret, "%d) f = %.16e\n", i, f); + ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", + i, (int)(end - tests[i].str)); + ok(errno == tests[i].err || (!tests[i].err && errno == 0xdeadbeef), + "%d) errno = %d\n", i, errno); + } +} + static void test__memicmp(void) { static const char *s1 = "abc"; @@ -558,6 +590,7 @@ START_TEST(string) "Invalid parameter handler was already set\n"); test_strtod(); + test_strtof(); test__memicmp(); test__memicmp_l(); test___strncnt(); -- 2.25.1

2 2

[PATCH v13] ntdll: Allow renaming a file/directory to a different case of itself.
by Gabriel Ivăncescu 28 Jul '21

28 Jul '21

Renaming a file or directory from e.g. foobar to FooBar (or any other case change) should work, like on Windows, instead of being a no-op. Clobbering an existing file must also respect the new case. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/file.c | 4 +- dlls/ntdll/tests/file.c | 4 +- dlls/ntdll/unix/file.c | 58 ++++++++++++++++++++- server/fd.c | 100 +++++++++++++++++++++++++------------ server/protocol.def | 2 + 5 files changed, 130 insertions(+), 38 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ea0a32f..15bfc13 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2040,7 +2040,7 @@ static void test_MoveFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); if (hfile != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), "MoveFile failed to change casing on same file: got %s\n", find_data.cFileName); } CloseHandle(hfile); @@ -2085,7 +2085,7 @@ static void test_MoveFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); if (hfile != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), "MoveFile failed to change casing on same directory: got %s\n", find_data.cFileName); } CloseHandle(hfile); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 19ae5f2..c6178d3 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2315,7 +2315,7 @@ static void test_file_link_information(void) ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), + ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), "Link did not change casing on existing target file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } @@ -2900,7 +2900,7 @@ static void test_file_link_information(void) ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), + ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), "Link did not change casing on same file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 10cbd64..cf61e06 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3595,6 +3595,52 @@ NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_ } +/*********************************************************************** + * get_filename_case + * + * Get the unix filename, with the case from NT name's last component. + */ +static char *get_filename_case( const OBJECT_ATTRIBUTES *attr ) +{ + const WCHAR *p, *nt_filename = attr->ObjectName->Buffer; + int len = attr->ObjectName->Length / sizeof(WCHAR); + char *file_case; + + /* skip the device and prefix (allow slashes for unix namespace) */ + if (!attr->RootDirectory) + { + int pos = get_dos_prefix_len( attr->ObjectName ); + while (pos < len) + { + WCHAR c = nt_filename[pos++]; + if (c == '\\' || c == '/') break; + } + nt_filename += pos; + len -= pos; + } + + /* strip off trailing backslashes */ + for (; len; len--) + if (nt_filename[len - 1] != '\\' && nt_filename[len - 1] != '/') + break; + + /* get the last component */ + for (p = nt_filename + len; p != nt_filename; p--) + if (p[-1] == '\\' || p[-1] == '/') + break; + len -= p - nt_filename; + nt_filename = p; + + if ((file_case = malloc( len * 3 + 1 ))) + { + len = ntdll_wcstoumbs( nt_filename, len, file_case, len * 3, TRUE ); + if (len < 0 || len > MAX_DIR_ENTRY_LEN) len = 0; + file_case[len] = 0; + } + return file_case; +} + + /*********************************************************************** * get_full_path * @@ -4533,8 +4579,8 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { FILE_RENAME_INFORMATION *info = ptr; UNICODE_STRING name_str, redir; + char *unix_name, *file_case; OBJECT_ATTRIBUTES attr; - char *unix_name; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4545,20 +4591,24 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, io->u.Status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF ); if (io->u.Status == STATUS_SUCCESS || io->u.Status == STATUS_NO_SUCH_FILE) { + file_case = get_filename_case( &attr ); SERVER_START_REQ( set_fd_name_info ) { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->namelen = attr.ObjectName->Length; + req->caselen = file_case ? strlen( file_case ) : 0; req->link = FALSE; req->replace = info->ReplaceIfExists; wine_server_add_data( req, attr.ObjectName->Buffer, attr.ObjectName->Length ); + wine_server_add_data( req, file_case, req->caselen ); wine_server_add_data( req, unix_name, strlen(unix_name) ); io->u.Status = wine_server_call( req ); } SERVER_END_REQ; free( unix_name ); + free( file_case ); } free( redir.Buffer ); } @@ -4570,8 +4620,8 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { FILE_LINK_INFORMATION *info = ptr; UNICODE_STRING name_str, redir; + char *unix_name, *file_case; OBJECT_ATTRIBUTES attr; - char *unix_name; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4582,20 +4632,24 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, io->u.Status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF ); if (io->u.Status == STATUS_SUCCESS || io->u.Status == STATUS_NO_SUCH_FILE) { + file_case = get_filename_case( &attr ); SERVER_START_REQ( set_fd_name_info ) { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->namelen = attr.ObjectName->Length; + req->caselen = file_case ? strlen( file_case ) : 0; req->link = TRUE; req->replace = info->ReplaceIfExists; wine_server_add_data( req, attr.ObjectName->Buffer, attr.ObjectName->Length ); + wine_server_add_data( req, file_case, req->caselen ); wine_server_add_data( req, unix_name, strlen(unix_name) ); io->u.Status = wine_server_call( req ); } SERVER_END_REQ; free( unix_name ); + free( file_case ); } free( redir.Buffer ); } diff --git a/server/fd.c b/server/fd.c index b953da2..0cb7729 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2502,11 +2502,14 @@ static void set_fd_disposition( struct fd *fd, int unlink ) /* set new name for the fd */ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, data_size_t len, - struct unicode_str nt_name, int create_link, int replace ) + const char *file_case, data_size_t caselen, struct unicode_str nt_name, + int create_link, int replace ) { + size_t pathlen = 0, filenamelen; struct inode *inode; struct stat st, st2; - char *name; + int different_case; + char *name, *p; if (!fd->inode || !fd->unix_name) { @@ -2540,6 +2543,22 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da name = combined_name; } + for (p = name; *p;) if (*p++ == '/' && *p) pathlen = p - name; + filenamelen = p - name - pathlen; + for (p = name + pathlen; filenamelen && p[filenamelen - 1] == '/'; filenamelen--) { } + different_case = caselen && (filenamelen != caselen || memcmp( p, file_case, caselen )); + + if (filenamelen < caselen) + { + p = realloc( name, pathlen + caselen + 1 ); + if (!p) + { + set_error( STATUS_NO_MEMORY ); + goto failed; + } + name = p; + } + /* when creating a hard link, source cannot be a dir */ if (create_link && !fstat( fd->unix_fd, &st ) && S_ISDIR( st.st_mode )) { @@ -2552,47 +2571,61 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da if (!fstat( fd->unix_fd, &st2 ) && st.st_ino == st2.st_ino && st.st_dev == st2.st_dev) { if (create_link && !replace) set_error( STATUS_OBJECT_NAME_COLLISION ); - free( name ); - return; - } + if (!different_case) + { + free( name ); + return; + } - if (!replace) - { - set_error( STATUS_OBJECT_NAME_COLLISION ); - goto failed; + /* creating a link with a different case on itself renames the file */ + create_link = 0; } - - /* can't replace directories or special files */ - if (!S_ISREG( st.st_mode )) + else { - set_error( STATUS_ACCESS_DENIED ); - goto failed; - } + if (!replace) + { + set_error( STATUS_OBJECT_NAME_COLLISION ); + goto failed; + } - /* can't replace an opened file */ - if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) - { - int is_empty = list_empty( &inode->open ); - release_object( inode ); - if (!is_empty) + /* can't replace directories or special files */ + if (!S_ISREG( st.st_mode )) { set_error( STATUS_ACCESS_DENIED ); goto failed; } - } - /* link() expects that the target doesn't exist */ - /* rename() cannot replace files with directories */ - if (create_link || S_ISDIR( st2.st_mode )) - { - if (unlink( name )) + /* can't replace an opened file */ + if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) { - file_set_error(); - goto failed; + int is_empty = list_empty( &inode->open ); + release_object( inode ); + if (!is_empty) + { + set_error( STATUS_ACCESS_DENIED ); + goto failed; + } + } + + /* link() expects that the target doesn't exist */ + /* rename() cannot replace files with directories */ + if (create_link || S_ISDIR( st2.st_mode ) || different_case) + { + if (unlink( name )) + { + file_set_error(); + goto failed; + } } } } + if (different_case) + { + memcpy( name + pathlen, file_case, caselen ); + name[pathlen + caselen] = 0; + } + if (create_link) { if (link( fd->unix_name, name )) @@ -2929,16 +2962,19 @@ DECL_HANDLER(set_fd_disp_info) /* set fd name information */ DECL_HANDLER(set_fd_name_info) { + const char *fullname, *file_case; struct fd *fd, *root_fd = NULL; struct unicode_str nt_name; - if (req->namelen > get_req_data_size()) + if (req->namelen > get_req_data_size() || get_req_data_size() - req->namelen < req->caselen) { set_error( STATUS_INVALID_PARAMETER ); return; } nt_name.str = get_req_data(); nt_name.len = (req->namelen / sizeof(WCHAR)) * sizeof(WCHAR); + file_case = (const char *)get_req_data() + req->namelen; + fullname = file_case + req->caselen; if (req->rootdir) { @@ -2952,8 +2988,8 @@ DECL_HANDLER(set_fd_name_info) if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) { - set_fd_name( fd, root_fd, (const char *)get_req_data() + req->namelen, - get_req_data_size() - req->namelen, nt_name, req->link, req->replace ); + set_fd_name( fd, root_fd, fullname, (const char *)get_req_data() + get_req_data_size() - fullname, + file_case, req->caselen, nt_name, req->link, req->replace ); release_object( fd ); } if (root_fd) release_object( root_fd ); diff --git a/server/protocol.def b/server/protocol.def index b4049eb..d546226 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3537,9 +3537,11 @@ struct handle_info obj_handle_t handle; /* handle to a file or directory */ obj_handle_t rootdir; /* root directory */ data_size_t namelen; /* length of NT name in bytes */ + data_size_t caselen; /* length of the actual case filename */ int link; /* link instead of renaming */ int replace; /* replace an existing file? */ VARARG(name,unicode_str,namelen); /* NT name */ + VARARG(actual_case,string,caselen); /* new file name's actual case (without path) */ VARARG(filename,string); /* new file name */ @END -- 2.31.1

2 1

[PATCH resend] ntdll: Allow renaming a file/directory to a different case of itself.
by Gabriel Ivăncescu 28 Jul '21

28 Jul '21

Renaming a file or directory from e.g. foobar to FooBar (or any other case change) should work, like on Windows, instead of being a no-op. Clobbering an existing file must also respect the new case. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- To simplify the code and avoid another trailing slash quirk, the case is not sent if the conversion fails (which keeps current behavior), because it should be very rare in practice so it's not worth the extra complication that doesn't really bring any benefit to begin with. Note that the server has to check for caselen == 0; it's not due to errors, it's due to the path mapping to a device or unix root directory. In this case, there is no such thing as "last component" because there are no components at all, so obviously there's no case to replace with. Handling the rare error above with the same code is just an implicit side effect without adding any extra code, so I see it as a bonus. dlls/kernel32/tests/file.c | 4 +- dlls/ntdll/tests/file.c | 4 +- dlls/ntdll/unix/file.c | 72 ++++++++++++++++++++++++-- server/fd.c | 100 +++++++++++++++++++++++++------------ server/protocol.def | 2 + 5 files changed, 142 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ea0a32f..15bfc13 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2040,7 +2040,7 @@ static void test_MoveFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); if (hfile != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), "MoveFile failed to change casing on same file: got %s\n", find_data.cFileName); } CloseHandle(hfile); @@ -2085,7 +2085,7 @@ static void test_MoveFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); if (hfile != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), "MoveFile failed to change casing on same directory: got %s\n", find_data.cFileName); } CloseHandle(hfile); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 19ae5f2..c6178d3 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2315,7 +2315,7 @@ static void test_file_link_information(void) ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), + ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), "Link did not change casing on existing target file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } @@ -2900,7 +2900,7 @@ static void test_file_link_information(void) ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), + ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), "Link did not change casing on same file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 977b0df..c033ffd 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3426,6 +3426,64 @@ NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, U } +/*********************************************************************** + * nt_to_unix_file_name_with_case + * + * Same as nt_to_unix_file_name, but additionally return unix file name + * without path, with the actual case from the NT name's last component. + */ +static NTSTATUS nt_to_unix_file_name_with_case( const OBJECT_ATTRIBUTES *attr, char **name_ret, + char **case_ret, UINT disposition ) +{ + const WCHAR *p, *nt_filename = attr->ObjectName->Buffer; + int len = attr->ObjectName->Length / sizeof(WCHAR); + NTSTATUS status; + char *file_case; + + status = nt_to_unix_file_name( attr, name_ret, disposition ); + if (status != STATUS_SUCCESS && status != STATUS_NO_SUCH_FILE) + return status; + + /* skip the device and prefix (allow slashes for unix namespace) */ + if (!attr->RootDirectory) + { + int pos = get_dos_prefix_len( attr->ObjectName ); + while (pos < len) + { + WCHAR c = nt_filename[pos++]; + if (c == '\\' || c == '/') break; + } + nt_filename += pos; + len -= pos; + } + + /* strip off trailing backslashes */ + for (; len; len--) + if (nt_filename[len - 1] != '\\' && nt_filename[len - 1] != '/') + break; + + /* get the last component */ + for (p = nt_filename + len; p != nt_filename; p--) + if (p[-1] == '\\' || p[-1] == '/') + break; + len -= p - nt_filename; + nt_filename = p; + + if (!(file_case = malloc( len * 3 + 1 ))) + { + free( *name_ret ); + return STATUS_NO_MEMORY; + } + + len = ntdll_wcstoumbs( nt_filename, len, file_case, len * 3, TRUE ); + if (len < 0 || len > MAX_DIR_ENTRY_LEN) len = 0; + file_case[len] = 0; + + *case_ret = file_case; + return status; +} + + /****************************************************************************** * wine_nt_to_unix_file_name * @@ -4532,8 +4590,8 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { FILE_RENAME_INFORMATION *info = ptr; UNICODE_STRING name_str, redir; + char *unix_name, *file_case; OBJECT_ATTRIBUTES attr; - char *unix_name; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4541,7 +4599,7 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, InitializeObjectAttributes( &attr, &name_str, OBJ_CASE_INSENSITIVE, info->RootDirectory, NULL ); get_redirect( &attr, &redir ); - io->u.Status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF ); + io->u.Status = nt_to_unix_file_name_with_case( &attr, &unix_name, &file_case, FILE_OPEN_IF ); if (io->u.Status == STATUS_SUCCESS || io->u.Status == STATUS_NO_SUCH_FILE) { SERVER_START_REQ( set_fd_name_info ) @@ -4549,15 +4607,18 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->namelen = attr.ObjectName->Length; + req->caselen = strlen( file_case ); req->link = FALSE; req->replace = info->ReplaceIfExists; wine_server_add_data( req, attr.ObjectName->Buffer, attr.ObjectName->Length ); + wine_server_add_data( req, file_case, req->caselen ); wine_server_add_data( req, unix_name, strlen(unix_name) ); io->u.Status = wine_server_call( req ); } SERVER_END_REQ; free( unix_name ); + free( file_case ); } free( redir.Buffer ); } @@ -4569,8 +4630,8 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { FILE_LINK_INFORMATION *info = ptr; UNICODE_STRING name_str, redir; + char *unix_name, *file_case; OBJECT_ATTRIBUTES attr; - char *unix_name; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4578,7 +4639,7 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, InitializeObjectAttributes( &attr, &name_str, OBJ_CASE_INSENSITIVE, info->RootDirectory, NULL ); get_redirect( &attr, &redir ); - io->u.Status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF ); + io->u.Status = nt_to_unix_file_name_with_case( &attr, &unix_name, &file_case, FILE_OPEN_IF ); if (io->u.Status == STATUS_SUCCESS || io->u.Status == STATUS_NO_SUCH_FILE) { SERVER_START_REQ( set_fd_name_info ) @@ -4586,15 +4647,18 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->namelen = attr.ObjectName->Length; + req->caselen = strlen( file_case ); req->link = TRUE; req->replace = info->ReplaceIfExists; wine_server_add_data( req, attr.ObjectName->Buffer, attr.ObjectName->Length ); + wine_server_add_data( req, file_case, req->caselen ); wine_server_add_data( req, unix_name, strlen(unix_name) ); io->u.Status = wine_server_call( req ); } SERVER_END_REQ; free( unix_name ); + free( file_case ); } free( redir.Buffer ); } diff --git a/server/fd.c b/server/fd.c index b953da2..0cb7729 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2502,11 +2502,14 @@ static void set_fd_disposition( struct fd *fd, int unlink ) /* set new name for the fd */ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, data_size_t len, - struct unicode_str nt_name, int create_link, int replace ) + const char *file_case, data_size_t caselen, struct unicode_str nt_name, + int create_link, int replace ) { + size_t pathlen = 0, filenamelen; struct inode *inode; struct stat st, st2; - char *name; + int different_case; + char *name, *p; if (!fd->inode || !fd->unix_name) { @@ -2540,6 +2543,22 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da name = combined_name; } + for (p = name; *p;) if (*p++ == '/' && *p) pathlen = p - name; + filenamelen = p - name - pathlen; + for (p = name + pathlen; filenamelen && p[filenamelen - 1] == '/'; filenamelen--) { } + different_case = caselen && (filenamelen != caselen || memcmp( p, file_case, caselen )); + + if (filenamelen < caselen) + { + p = realloc( name, pathlen + caselen + 1 ); + if (!p) + { + set_error( STATUS_NO_MEMORY ); + goto failed; + } + name = p; + } + /* when creating a hard link, source cannot be a dir */ if (create_link && !fstat( fd->unix_fd, &st ) && S_ISDIR( st.st_mode )) { @@ -2552,47 +2571,61 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da if (!fstat( fd->unix_fd, &st2 ) && st.st_ino == st2.st_ino && st.st_dev == st2.st_dev) { if (create_link && !replace) set_error( STATUS_OBJECT_NAME_COLLISION ); - free( name ); - return; - } + if (!different_case) + { + free( name ); + return; + } - if (!replace) - { - set_error( STATUS_OBJECT_NAME_COLLISION ); - goto failed; + /* creating a link with a different case on itself renames the file */ + create_link = 0; } - - /* can't replace directories or special files */ - if (!S_ISREG( st.st_mode )) + else { - set_error( STATUS_ACCESS_DENIED ); - goto failed; - } + if (!replace) + { + set_error( STATUS_OBJECT_NAME_COLLISION ); + goto failed; + } - /* can't replace an opened file */ - if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) - { - int is_empty = list_empty( &inode->open ); - release_object( inode ); - if (!is_empty) + /* can't replace directories or special files */ + if (!S_ISREG( st.st_mode )) { set_error( STATUS_ACCESS_DENIED ); goto failed; } - } - /* link() expects that the target doesn't exist */ - /* rename() cannot replace files with directories */ - if (create_link || S_ISDIR( st2.st_mode )) - { - if (unlink( name )) + /* can't replace an opened file */ + if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) { - file_set_error(); - goto failed; + int is_empty = list_empty( &inode->open ); + release_object( inode ); + if (!is_empty) + { + set_error( STATUS_ACCESS_DENIED ); + goto failed; + } + } + + /* link() expects that the target doesn't exist */ + /* rename() cannot replace files with directories */ + if (create_link || S_ISDIR( st2.st_mode ) || different_case) + { + if (unlink( name )) + { + file_set_error(); + goto failed; + } } } } + if (different_case) + { + memcpy( name + pathlen, file_case, caselen ); + name[pathlen + caselen] = 0; + } + if (create_link) { if (link( fd->unix_name, name )) @@ -2929,16 +2962,19 @@ DECL_HANDLER(set_fd_disp_info) /* set fd name information */ DECL_HANDLER(set_fd_name_info) { + const char *fullname, *file_case; struct fd *fd, *root_fd = NULL; struct unicode_str nt_name; - if (req->namelen > get_req_data_size()) + if (req->namelen > get_req_data_size() || get_req_data_size() - req->namelen < req->caselen) { set_error( STATUS_INVALID_PARAMETER ); return; } nt_name.str = get_req_data(); nt_name.len = (req->namelen / sizeof(WCHAR)) * sizeof(WCHAR); + file_case = (const char *)get_req_data() + req->namelen; + fullname = file_case + req->caselen; if (req->rootdir) { @@ -2952,8 +2988,8 @@ DECL_HANDLER(set_fd_name_info) if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) { - set_fd_name( fd, root_fd, (const char *)get_req_data() + req->namelen, - get_req_data_size() - req->namelen, nt_name, req->link, req->replace ); + set_fd_name( fd, root_fd, fullname, (const char *)get_req_data() + get_req_data_size() - fullname, + file_case, req->caselen, nt_name, req->link, req->replace ); release_object( fd ); } if (root_fd) release_object( root_fd ); diff --git a/server/protocol.def b/server/protocol.def index b4049eb..d546226 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3537,9 +3537,11 @@ struct handle_info obj_handle_t handle; /* handle to a file or directory */ obj_handle_t rootdir; /* root directory */ data_size_t namelen; /* length of NT name in bytes */ + data_size_t caselen; /* length of the actual case filename */ int link; /* link instead of renaming */ int replace; /* replace an existing file? */ VARARG(name,unicode_str,namelen); /* NT name */ + VARARG(actual_case,string,caselen); /* new file name's actual case (without path) */ VARARG(filename,string); /* new file name */ @END -- 2.31.1

2 3

[PATCH 7/7 v2] msvcrt: Add hyperbolic functions NAN tests.
by Piotr Caban 28 Jul '21

28 Jul '21

From: Martin Storsjo <martin(a)martin.st> Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/misc.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)

1 0

[PATCH 6/7 v2] msvcrt: Make the tanh function NAN preserving
by Piotr Caban 28 Jul '21

28 Jul '21

From: Martin Storsjo <martin(a)martin.st> Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

1 0

[PATCH 5/7 v2] msvcrt: Make the sinh function NAN preserving
by Piotr Caban 28 Jul '21

28 Jul '21

From: Martin Storsjo <martin(a)martin.st> Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

1 0

[PATCH 4/7 v2] msvcrt: Make the cosh function NAN preserving
by Piotr Caban 28 Jul '21

28 Jul '21

From: Martin Storsjo <martin(a)martin.st> Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

1 0

[PATCH 3/7 v2] msvcrt: Make the tanhf function NAN preserving
by Piotr Caban 28 Jul '21

28 Jul '21

From: Martin Storsjo <martin(a)martin.st> Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

1 0

[PATCH 2/7 v2] msvcrt: Make the sinhf function NAN preserving
by Piotr Caban 28 Jul '21

28 Jul '21

From: Martin Storsjo <martin(a)martin.st> Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 9/9] gdi32: Store arc direction in DC_ATTR.
by Jacek Caban 28 Jul '21

28 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- 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(-)

2 1

[PATCH 8/9] gdi32: Store text color in DC_ATTR.
by Jacek Caban 28 Jul '21

28 Jul '21

2 1

[PATCH 7/9] gdi32: Remove no longer used driver entry points.
by Jacek Caban 28 Jul '21

28 Jul '21

2 1

[PATCH 6/9] gdi32: Use get_dc_attr in GetGraphicsMode.
by Jacek Caban 28 Jul '21

28 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 16 ---------------- dlls/gdi32/gdidc.c | 9 +++++++++ 2 files changed, 9 insertions(+), 16 deletions(-)

2 1

[PATCH 5/9] gdi32: Move background color to DC_ATTR.
by Jacek Caban 28 Jul '21

28 Jul '21

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel