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

Jacek Caban : gdi32: Use NtGdiSaveDC for SaveDC implementation.
by Alexandre Julliard July 30, 2021

July 30, 2021

Module: wine Branch: master Commit: d423244c1befbe41073d19e77032505a0acade31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d423244c1befbe41073d19e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:01:56 2021 +0200 gdi32: Use NtGdiSaveDC for SaveDC implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/dc.c | 17 +++++------------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 13 +++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 10 +++++++++- dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/tests/dc.c | 5 +++++ 10 files changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 130a1ac99e1..6118e443a6f 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -577,9 +577,9 @@ static BOOL reset_dc_state( HDC hdc ) /*********************************************************************** - * SaveDC (GDI32.@) + * NtGdiSaveDC (win32u.@) */ -INT WINAPI SaveDC( HDC hdc ) +INT WINAPI NtGdiSaveDC( HDC hdc ) { DC * dc; INT ret = 0; diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 1faf777c47e..5148e03a231 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -22,19 +22,12 @@ #include <assert.h> #include "enhmfdrv/enhmetafiledrv.h" -INT CDECL EMFDRV_SaveDC( PHYSDEV dev ) +BOOL EMFDC_SaveDC( DC_ATTR *dc_attr ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSaveDC ); - INT ret = next->funcs->pSaveDC( next ); - - if (ret) - { - EMRSAVEDC emr; - emr.emr.iType = EMR_SAVEDC; - emr.emr.nSize = sizeof(emr); - EMFDRV_WriteRecord( dev, &emr.emr ); - } - return ret; + EMRSAVEDC emr; + emr.emr.iType = EMR_SAVEDC; + emr.emr.nSize = sizeof(emr); + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 981cdea7887..35ff9af0e90 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -102,7 +102,6 @@ extern BOOL CDECL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT righ extern BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 516c6c4e884..2291e22348f 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -118,7 +118,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pResetDC */ EMFDRV_RestoreDC, /* pRestoreDC */ EMFDRV_RoundRect, /* pRoundRect */ - EMFDRV_SaveDC, /* pSaveDC */ + NULL, /* pSaveDC */ EMFDRV_ScaleViewportExtEx, /* pScaleViewportExtEx */ EMFDRV_ScaleWindowExtEx, /* pScaleWindowExtEx */ EMFDRV_SelectBitmap, /* pSelectBitmap */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 105d72b23f0..197ee8942c5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -66,6 +66,7 @@ extern BOOL METADC_Polyline( HDC hdc, const POINT *points,INT count) DECLSPEC_HI extern BOOL METADC_Rectangle( HDC hdc, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; 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_SaveDC( HDC hdc ) 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; @@ -114,6 +115,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_SaveDC( DC_ATTR *dc_attr ) 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; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 42df880f718..6dd5940d45a 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -112,6 +112,19 @@ HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode ) return ret; } +/*********************************************************************** + * SaveDC (GDI32.@) + */ +INT WINAPI SaveDC( HDC hdc ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_SaveDC( hdc ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SaveDC( dc_attr )) return FALSE; + return NtGdiSaveDC( hdc ); +} + /*********************************************************************** * GetTextAlign (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 044e228b2bf..9513da7160c 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -20,9 +20,9 @@ #include "mfdrv/metafiledrv.h" -INT CDECL MFDRV_SaveDC( PHYSDEV dev ) +BOOL METADC_SaveDC( HDC hdc ) { - return MFDRV_MetaParam0( dev, META_SAVEDC ); + return metadc_param0( hdc, META_SAVEDC ); } BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 31a0297c9e3..70442fac20f 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -181,7 +181,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pResetDC */ MFDRV_RestoreDC, /* pRestoreDC */ NULL, /* pRoundRect */ - MFDRV_SaveDC, /* pSaveDC */ + NULL, /* pSaveDC */ MFDRV_ScaleViewportExtEx, /* pScaleViewportExtEx */ MFDRV_ScaleWindowExtEx, /* pScaleWindowExtEx */ MFDRV_SelectBitmap, /* pSelectBitmap */ @@ -613,6 +613,14 @@ BOOL metadc_param1( HDC hdc, short func, short param ) return MFDRV_MetaParam1( &dev->dev, func, param ); } +BOOL metadc_param0( HDC hdc, short func ) +{ + METAFILEDRV_PDEVICE *dev; + + if (!(dev = get_metadc_ptr( hdc ))) return FALSE; + return MFDRV_MetaParam0( &dev->dev, func ); +} + BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) { METAFILEDRV_PDEVICE *dev; diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 567b60158b2..b3104318223 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -60,6 +60,7 @@ extern BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index ) DECLSPEC_HIDDEN; extern INT16 MFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_HIDDEN; extern METAFILEDRV_PDEVICE *get_metadc_ptr( HDC hdc ) DECLSPEC_HIDDEN; +extern BOOL metadc_param0( HDC hdc, short func ) DECLSPEC_HIDDEN; extern BOOL metadc_param1( HDC hdc, short func, short param ) DECLSPEC_HIDDEN; extern BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) DECLSPEC_HIDDEN; extern BOOL metadc_param4( HDC hdc, short func, short param1, short param2, @@ -95,7 +96,6 @@ extern BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD ro extern BOOL CDECL MFDRV_PolyBezier( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezierTo( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern HBITMAP CDECL MFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 054279bf46c..bdc8186bf76 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -234,6 +234,11 @@ static void test_savedc(void) "ret = %d\n", ret); DeleteDC(hdc); + + SetLastError(0xdeadbeef); + ret = SaveDC(ULongToHandle(0xdeadbeef)); + ok(!ret, "SaveDC returned %u\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %u\n", GetLastError()); } static void test_GdiConvertToDevmodeW(void)

1 0

Jacek Caban : gdi32: Use ntgdi name for CreateCompatibleDC.
by Alexandre Julliard July 30, 2021

July 30, 2021

Module: wine Branch: master Commit: 2a6adcdc0f805bedc7574f3dcf66d956cb304a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6adcdc0f805bedc7574f3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:02:47 2021 +0200 gdi32: Use ntgdi name for CreateCompatibleDC. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/dc.c | 4 ++-- dlls/gdi32/dib.c | 3 ++- dlls/gdi32/enhmetafile.c | 10 +++++----- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/metafile.c | 4 ++-- include/ntgdi.h | 1 + 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 4c80f1af611..7298be9e6e0 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -788,7 +788,7 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, hbrDst = NtGdiSelectBrush(hdcDest, GetStockObject(NULL_BRUSH)); /* make bitmap */ - hDC1 = CreateCompatibleDC(hdcDest); + hDC1 = NtGdiCreateCompatibleDC( hdcDest ); hBitmap1 = CreateCompatibleBitmap(hdcDest, nWidth, nHeight); hOldBitmap1 = NtGdiSelectBitmap(hDC1, hBitmap1); @@ -799,7 +799,7 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, NtGdiSelectBrush(hDC1, hbrTmp); /* make bitmap */ - hDC2 = CreateCompatibleDC(hdcDest); + hDC2 = NtGdiCreateCompatibleDC( hdcDest ); hBitmap2 = CreateCompatibleBitmap(hdcDest, nWidth, nHeight); hOldBitmap2 = NtGdiSelectBitmap(hDC2, hBitmap2); @@ -864,7 +864,7 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, oldStretchMode = GetStretchBltMode(hdcSrc); if(oldStretchMode == BLACKONWHITE || oldStretchMode == WHITEONBLACK) SetStretchBltMode(hdcSrc, COLORONCOLOR); - hdcWork = CreateCompatibleDC(hdcDest); + hdcWork = NtGdiCreateCompatibleDC( hdcDest ); if ((GetObjectType( hdcDest ) != OBJ_MEMDC || GetObjectW( GetCurrentObject( hdcDest, OBJ_BITMAP ), sizeof(dib), &dib ) == sizeof(BITMAP)) && GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) @@ -888,7 +888,7 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, SetBkColor(hdcWork, crTransparent); /* Create mask */ - hdcMask = CreateCompatibleDC(hdcDest); + hdcMask = NtGdiCreateCompatibleDC( hdcDest ); bmpMask = CreateCompatibleBitmap(hdcMask, widthDest, heightDest); oldMask = NtGdiSelectBitmap(hdcMask, bmpMask); if(!BitBlt(hdcMask, 0, 0, widthDest, heightDest, hdcWork, 0, 0, SRCCOPY)) { diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1d89d48d9c6..a51fac027d7 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -684,9 +684,9 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, /*********************************************************************** - * CreateCompatibleDC (GDI32.@) + * NtGdiCreateCompatibleDC (win32u.@) */ -HDC WINAPI CreateCompatibleDC( HDC hdc ) +HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ) { DC *dc, *origDC; HDC ret; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 432f33151d9..cf822440490 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1636,7 +1636,8 @@ NTSTATUS WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) !desc->Pitch || desc->Pitch < get_dib_stride( desc->Width, format->bit_count ) || !desc->Height || desc->Height > UINT_MAX / desc->Pitch) return STATUS_INVALID_PARAMETER; - if (!desc->hDeviceDc || !(dc = CreateCompatibleDC( desc->hDeviceDc ))) return STATUS_INVALID_PARAMETER; + if (!desc->hDeviceDc || !(dc = NtGdiCreateCompatibleDC( desc->hDeviceDc ))) + return STATUS_INVALID_PARAMETER; if (!(bmp = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*bmp) ))) goto error; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 1053a2ea104..99f692adb98 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1916,7 +1916,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( PatBlt(hdc, pBitBlt->xDest, pBitBlt->yDest, pBitBlt->cxDest, pBitBlt->cyDest, pBitBlt->dwRop); } else { /* BitBlt */ - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBRUSH hBrush, hBrushOld; HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pBitBlt->offBmiSrc); @@ -1959,7 +1959,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( PatBlt(hdc, pStretchBlt->xDest, pStretchBlt->yDest, pStretchBlt->cxDest, pStretchBlt->cyDest, pStretchBlt->dwRop); } else { /* StretchBlt */ - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBRUSH hBrush, hBrushOld; HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pStretchBlt->offBmiSrc); @@ -2002,7 +2002,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( if(pAlphaBlend->offBmiSrc == 0) { FIXME("EMR_ALPHABLEND: offBmiSrc == 0\n"); } else { - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBITMAP hBmp = 0, hBmpOld = 0; const BITMAPINFO *pbi = (const BITMAPINFO *)((const BYTE *)mr + pAlphaBlend->offBmiSrc); void *bits; @@ -2028,7 +2028,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_MASKBLT: { const EMRMASKBLT *pMaskBlt = (const EMRMASKBLT *)mr; - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBRUSH hBrush, hBrushOld; HBITMAP hBmp, hBmpOld, hBmpMask; const BITMAPINFO *pbi; @@ -2076,7 +2076,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_PLGBLT: { const EMRPLGBLT *pPlgBlt = (const EMRPLGBLT *)mr; - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBRUSH hBrush, hBrushOld; HBITMAP hBmp, hBmpOld, hBmpMask; const BITMAPINFO *pbi; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index aef85c88d7d..6b1d0952bf2 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -44,7 +44,7 @@ @ stdcall CreateColorSpaceA(ptr) @ stdcall CreateColorSpaceW(ptr) @ stdcall CreateCompatibleBitmap(long long long) -@ stdcall CreateCompatibleDC(long) +@ stdcall CreateCompatibleDC(long) NtGdiCreateCompatibleDC @ stdcall CreateDCA(str str str ptr) @ stdcall CreateDCW(wstr wstr wstr ptr) @ stdcall CreateDIBPatternBrush(long long) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 1b31e40bc14..b0428960b50 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -841,7 +841,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT case META_STRETCHBLT: { - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBITMAP hbitmap = CreateBitmap(mr->rdParm[10], /*Width */ mr->rdParm[11], /*Height*/ mr->rdParm[13], /*Planes*/ @@ -859,7 +859,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT case META_BITBLT: { - HDC hdcSrc = CreateCompatibleDC(hdc); + HDC hdcSrc = NtGdiCreateCompatibleDC( hdc ); HBITMAP hbitmap = CreateBitmap(mr->rdParm[7]/*Width */, mr->rdParm[8]/*Height*/, mr->rdParm[10]/*Planes*/, diff --git a/include/ntgdi.h b/include/ntgdi.h index 22d1f9da187..94b180041c8 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -139,6 +139,7 @@ BOOL WINAPI NtGdiEndPath( HDC hdc ); HANDLE WINAPI NtGdiCreateClientObj( ULONG type ); HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *enumex, ULONG unk2, ULONG unk3, ULONG unk4, void *data ); +HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ); HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ); HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen );

1 0

Alexandre Julliard : wow64: Add thunks for the token query/set information syscalls.
by Alexandre Julliard July 30, 2021

July 30, 2021

Module: wine Branch: master Commit: 1aa5d8c9b809bc3632bca7121f859259b44e6c7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aa5d8c9b809bc3632bca712… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 12:56:32 2021 +0200 wow64: Add thunks for the token query/set information syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/security.c | 219 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/wow64/struct32.h | 27 +++++++ dlls/wow64/syscall.h | 3 + 3 files changed, 247 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1aa5d8c9b809bc3632bc…

1 0

Alexandre Julliard : server: Store the entry point as image-relative in pe_image_info_t.
by Alexandre Julliard July 30, 2021

July 30, 2021

Module: wine Branch: master Commit: b08b4b8213949ecfc8eb449b5676552669ec3211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b08b4b8213949ecfc8eb449b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 12:14:30 2021 +0200 server: Store the entry point as image-relative in pe_image_info_t. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51539 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/virtual.c | 2 +- include/wine/server_protocol.h | 6 +++--- server/debugger.c | 2 +- server/mapping.c | 4 ++-- server/process.c | 4 ++-- server/protocol.def | 4 ++-- server/trace.c | 10 ++++------ 8 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bbbdb90116f..0e580cd7556 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1017,7 +1017,7 @@ static void fill_builtin_image_info( void *module, pe_image_info_t *info ) const IMAGE_NT_HEADERS *nt = (IMAGE_NT_HEADERS *)((const BYTE *)dos + dos->e_lfanew); info->base = nt->OptionalHeader.ImageBase; - info->entry_point = info->base + nt->OptionalHeader.AddressOfEntryPoint; + info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; info->map_size = nt->OptionalHeader.SizeOfImage; info->stack_size = nt->OptionalHeader.SizeOfStackReserve; info->stack_commit = nt->OptionalHeader.SizeOfStackCommit; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 8976cb88f90..fbdbf79d9d5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4512,7 +4512,7 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) */ void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) { - info->TransferAddress = wine_server_get_ptr( pe_info->entry_point ); + info->TransferAddress = wine_server_get_ptr( pe_info->base + pe_info->entry_point ); info->ZeroBits = pe_info->zerobits; info->MaximumStackSize = pe_info->stack_size; info->CommittedStackSize = pe_info->stack_commit; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 4611f38c5c4..bb4862c9669 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -767,10 +767,10 @@ typedef union typedef struct { client_ptr_t base; - client_ptr_t entry_point; - mem_size_t map_size; mem_size_t stack_size; mem_size_t stack_commit; + unsigned int entry_point; + unsigned int map_size; unsigned int zerobits; unsigned int subsystem; unsigned short subsystem_minor; @@ -6252,7 +6252,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 725 +#define SERVER_PROTOCOL_VERSION 726 /* ### protocol_version end ### */ diff --git a/server/debugger.c b/server/debugger.c index b718c7c283f..ca84a88258f 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -160,7 +160,7 @@ static void fill_create_process_event( struct debug_event *event, const void *ar const struct memory_view *view = arg; const pe_image_info_t *image_info = get_view_image_info( view, &event->data.create_process.base ); - event->data.create_process.start = image_info->entry_point; + event->data.create_process.start = event->data.create_process.base + image_info->entry_point; event->data.create_process.dbg_offset = image_info->dbg_offset; event->data.create_process.dbg_size = image_info->dbg_size; /* the doc says write access too, but this doesn't seem a good idea */ diff --git a/server/mapping.c b/server/mapping.c index a4bb000268a..a814fe8090f 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -705,7 +705,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s clr_size = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; mapping->image.base = nt.opt.hdr32.ImageBase; - mapping->image.entry_point = nt.opt.hdr32.ImageBase + nt.opt.hdr32.AddressOfEntryPoint; + mapping->image.entry_point = nt.opt.hdr32.AddressOfEntryPoint; mapping->image.map_size = ROUND_SIZE( nt.opt.hdr32.SizeOfImage ); mapping->image.stack_size = nt.opt.hdr32.SizeOfStackReserve; mapping->image.stack_commit = nt.opt.hdr32.SizeOfStackCommit; @@ -737,7 +737,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s clr_size = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; mapping->image.base = nt.opt.hdr64.ImageBase; - mapping->image.entry_point = nt.opt.hdr64.ImageBase + nt.opt.hdr64.AddressOfEntryPoint; + mapping->image.entry_point = nt.opt.hdr64.AddressOfEntryPoint; mapping->image.map_size = ROUND_SIZE( nt.opt.hdr64.SizeOfImage ); mapping->image.stack_size = nt.opt.hdr64.SizeOfStackReserve; mapping->image.stack_commit = nt.opt.hdr64.SizeOfStackCommit; diff --git a/server/process.c b/server/process.c index 15387a2affa..0870de5bb26 100644 --- a/server/process.c +++ b/server/process.c @@ -1399,7 +1399,7 @@ DECL_HANDLER(init_process_done) process->ldt_copy = req->ldt_copy; process->start_time = current_time; - current->entry_point = image_info->entry_point; + current->entry_point = base + image_info->entry_point; init_process_tracing( process ); generate_startup_debug_events( process ); @@ -1408,7 +1408,7 @@ DECL_HANDLER(init_process_done) if (image_info->subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI) process->idle_event = create_event( NULL, NULL, 0, 1, 0, NULL ); if (process->debug_obj) set_process_debug_flag( process, 1 ); - reply->entry = image_info->entry_point; + reply->entry = current->entry_point; reply->suspend = (current->suspend || process->suspend); } diff --git a/server/protocol.def b/server/protocol.def index b4049eb90e7..133d6ad0552 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -783,10 +783,10 @@ typedef union typedef struct { client_ptr_t base; - client_ptr_t entry_point; - mem_size_t map_size; mem_size_t stack_size; mem_size_t stack_commit; + unsigned int entry_point; + unsigned int map_size; unsigned int zerobits; unsigned int subsystem; unsigned short subsystem_minor; diff --git a/server/trace.c b/server/trace.c index 447710e8f80..4110b740621 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1354,17 +1354,15 @@ static void dump_varargs_pe_image_info( const char *prefix, data_size_t size ) fprintf( stderr, "%s{", prefix ); dump_uint64( "base=", &info.base ); - dump_uint64( ",entry_point=", &info.entry_point ); - dump_uint64( ",map_size=", &info.map_size ); dump_uint64( ",stack_size=", &info.stack_size ); dump_uint64( ",stack_commit=", &info.stack_commit ); - fprintf( stderr, ",zerobits=%08x,subsystem=%08x,subsystem_minor=%04x,subsystem_major=%04x" + fprintf( stderr, ",entry_point=%08x,map_size=%08x,zerobits=%08x,subsystem=%08x,subsystem_minor=%04x,subsystem_major=%04x" ",osversion_major=%04x,osversion_minor=%04x,image_charact=%04x,dll_charact=%04x,machine=%04x" ",contains_code=%u,image_flags=%02x" ",loader_flags=%08x,header_size=%08x,file_size=%08x,checksum=%08x}", - info.zerobits, info.subsystem, info.subsystem_minor, info.subsystem_major, - info.osversion_major, info.osversion_minor, info.image_charact, info.dll_charact, - info.machine, info.contains_code, info.image_flags, info.loader_flags, + info.entry_point, info.map_size, info.zerobits, info.subsystem, info.subsystem_minor, + info.subsystem_major, info.osversion_major, info.osversion_minor, info.image_charact, + info.dll_charact, info.machine, info.contains_code, info.image_flags, info.loader_flags, info.header_size, info.file_size, info.checksum ); remove_data( min( size, sizeof(info) )); }

1 0

Alexandre Julliard : wow64: Add thunks for the job object query/set information syscalls.
by Alexandre Julliard July 30, 2021

July 30, 2021

Module: wine Branch: master Commit: 595039be05050448e1c9b529281416e48670a388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=595039be05050448e1c9b529… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 13:05:53 2021 +0200 wow64: Add thunks for the job object query/set information syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/struct32.h | 36 ++++++++++ dlls/wow64/sync.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 2 + 3 files changed, 216 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=595039be05050448e1c9…

1 0

Nikolay Sivov : dpnhupnp: Build with msvcrt.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: 10fb33026f2a55209dea0fb00caa279610027a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=10fb33026f2a55209dea0fb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 29 16:08:25 2021 +0300 dpnhupnp: Build with msvcrt. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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

1 0

Jan Sikorski : wined3d: Do not request device local memory if we also want it to be host visible.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: wine Branch: master Commit: ad0b459ebe601e5e9f4de5ca0964cf9d4e94244a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad0b459ebe601e5e9f4de5ca… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Jul 29 13:52:26 2021 +0200 wined3d: Do not request device local memory if we also want it to be host visible. Some implementations do not support this combination. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4c5e2054fe0..4420885b15f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1410,12 +1410,12 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf FIXME("Ignoring some bind flags %#x.\n", bind_flags); memory_type = 0; - if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) - memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; else if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_W) memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + else if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) {

1 0

Jacek Caban : gdi32: Store rel abs mode in DC_ATTR.
by Alexandre Julliard July 29, 2021

July 29, 2021

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

1 0

Jacek Caban : gdi32: Use get_dc_attr in SetRelAbs.
by Alexandre Julliard July 29, 2021

July 29, 2021

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

1 0

Jacek Caban : gdi32: Store poly fill mode in DC_ATTR.
by Alexandre Julliard July 29, 2021

July 29, 2021

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

1 0