wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Chip Davis : tests: Include <stddef.h> from "d3d12_crosstest.h". (Clang).
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: vkd3d Branch: master Commit: 25d79204e3fd5b058a1d4b788f3b3facc955c329 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=25d79204e3fd5b058a1d4b7… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Aug 4 14:18:38 2021 -0500 tests: Include <stddef.h> from "d3d12_crosstest.h". (Clang). Neither MinGW's nor Microsoft's <windows.h> includes <stddef.h>, either directly or indirectly. Also, unlike GCC, Clang's <inttypes.h> does not include <stddef.h>, either. "vkd3d_windows.h" does include <stddef.h>, and this is why building for the host works, even with Clang. Fixes cross compilation errors with Clang related to using offsetof(3). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12_crosstest.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 43af375..0b77bde 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -52,6 +52,7 @@ typedef int HRESULT; #include <inttypes.h> #include <limits.h> #include <math.h> +#include <stddef.h> #include <time.h> #ifdef _WIN32

1 0

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

05 Aug '21

Module: wine Branch: master Commit: 3f2850aeaa159270384764843cdb1dc3cbe902c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f2850aeaa15927038476484… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:27:14 2021 +0200 gdi32: Remove no longer used driver entry points. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 10 ---------- dlls/gdi32/driver.c | 25 ------------------------- dlls/gdi32/enhmfdrv/init.c | 5 ----- dlls/gdi32/font.c | 5 ----- dlls/gdi32/mapping.c | 5 ----- dlls/gdi32/mfdrv/init.c | 5 ----- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 5 ----- dlls/wineandroid.drv/init.c | 5 ----- dlls/winemac.drv/gdi.c | 5 ----- dlls/wineps.drv/init.c | 5 ----- dlls/winex11.drv/init.c | 5 ----- dlls/winex11.drv/xrender.c | 5 ----- include/wine/gdi_driver.h | 7 +------ 14 files changed, 1 insertion(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f2850aeaa1592703847…

1 0

Jacek Caban : gdi32: Use ntgdi interface for SetLayout implementation.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 22df510eff3ee66bf02230b46eefef64a5bd8f74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22df510eff3ee66bf02230b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:26:55 2021 +0200 gdi32: Use ntgdi interface for SetLayout 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 | 24 ++++++++++++++---------- dlls/gdi32/driver.c | 13 +------------ dlls/gdi32/enhmfdrv/dc.c | 11 ++--------- 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 | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - include/ntgdi.h | 2 +- 11 files changed, 37 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=22df510eff3ee66bf022…

1 0

Jacek Caban : gdi32: Store mapper flags in DC_ATTR.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 6cb07a716cbf7581a2829940d514e4889ef2c551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb07a716cbf7581a2829940… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:26:43 2021 +0200 gdi32: Store mapper flags 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 | 7 +++---- dlls/gdi32/enhmfdrv/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 22 ---------------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 16 ++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 12 files changed, 28 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6cb07a716cbf7581a282…

1 0

Jacek Caban : gdi32: Use DC_ATTR for SetTextCharacterExtra implementation.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: f37e4ff931e96d8380d24e0afb55eeb4a8e08eb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f37e4ff931e96d8380d24e0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:26:28 2021 +0200 gdi32: Use DC_ATTR for SetTextCharacterExtra 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/font.c | 23 ----------------------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 6 files changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2590a30c10b..3cc965627b4 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4735,29 +4735,6 @@ INT WINAPI EnumFontsW( HDC hDC, LPCWSTR lpName, FONTENUMPROCW efproc, } -/*********************************************************************** - * SetTextCharacterExtra (GDI32.@) - */ -INT WINAPI SetTextCharacterExtra( HDC hdc, INT extra ) -{ - INT ret = 0x80000000; - DC * dc = get_dc_ptr( hdc ); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetTextCharacterExtra ); - extra = physdev->funcs->pSetTextCharacterExtra( physdev, extra ); - if (extra != 0x80000000) - { - ret = dc->attr->char_extra; - dc->attr->char_extra = extra; - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * NtGdiSetTextJustification (win32u.@) */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0ef6cc121d8..ef4541e2543 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -76,6 +76,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_SaveDC( HDC hdc ) DECLSPEC_HIDDEN; extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetTextCharacterExtra( HDC hdc, INT extra ) DECLSPEC_HIDDEN; extern BOOL METADC_SetMapMode( 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; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0c2d794a576..6372ac7d75d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -314,6 +314,21 @@ INT WINAPI GetTextCharacterExtra( HDC hdc ) return dc_attr ? dc_attr->char_extra : 0x80000000; } +/*********************************************************************** + * SetTextCharacterExtra (GDI32.@) + */ +INT WINAPI SetTextCharacterExtra( HDC hdc, INT extra ) +{ + DC_ATTR *dc_attr; + INT ret; + + if (is_meta_dc( hdc )) return METADC_SetTextCharacterExtra( hdc, extra ); + if (!(dc_attr = get_dc_attr( hdc ))) return 0x8000000; + ret = dc_attr->char_extra; + dc_attr->char_extra = extra; + return ret; +} + /*********************************************************************** * GetPolyFillMode (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 791d812a147..659c41396d1 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -140,9 +140,9 @@ BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) return metadc_param2( hdc, META_SETTEXTJUSTIFICATION, extra, breaks ); } -INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) +BOOL METADC_SetTextCharacterExtra( HDC hdc, INT extra ) { - return MFDRV_MetaParam1( dev, META_SETTEXTCHAREXTRA, extra ) ? extra : 0x80000000; + return metadc_param1( hdc, META_SETTEXTCHAREXTRA, extra ); } DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 6e847379563..30c16324c3b 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -198,7 +198,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pSetMapMode */ MFDRV_SetMapperFlags, /* pSetMapperFlags */ NULL, /* pSetPixel */ - MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */ + NULL, /* pSetTextCharacterExtra */ MFDRV_SetTextColor, /* pSetTextColor */ NULL, /* pSetTextJustification */ MFDRV_SetViewportExtEx, /* pSetViewportExtEx */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 264cece30ee..ed41b9fb67d 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -105,7 +105,6 @@ extern COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLS extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) 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_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Store char_extra in DC_ATTR.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: ca07de0ed5f6da42db9eda8df90721aaa4d51edb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca07de0ed5f6da42db9eda8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:26:13 2021 +0200 gdi32: Store char_extra 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 | 5 ++--- dlls/gdi32/font.c | 28 ++++++++-------------------- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index be3c2e741c4..5f2f129532c 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -95,7 +95,7 @@ static void set_initial_dc_state( DC *dc ) dc->attr->brush_org.y = 0; dc->mapperFlags = 0; dc->attr->text_align = TA_LEFT | TA_TOP | TA_NOUPDATECP; - dc->charExtra = 0; + dc->attr->char_extra = 0; dc->breakExtra = 0; dc->breakRem = 0; dc->attr->map_mode = MM_TEXT; @@ -413,7 +413,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->brush_org = dcs->attr->brush_org; dc->mapperFlags = dcs->mapperFlags; dc->attr->text_align = dcs->attr->text_align; - dc->charExtra = dcs->charExtra; + dc->attr->char_extra = dcs->attr->char_extra; dc->breakExtra = dcs->breakExtra; dc->breakRem = dcs->breakRem; dc->attr->map_mode = dcs->attr->map_mode; @@ -545,7 +545,6 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) newdc->hBitmap = dc->hBitmap; newdc->hPalette = dc->hPalette; newdc->mapperFlags = dc->mapperFlags; - newdc->charExtra = dc->charExtra; newdc->breakExtra = dc->breakExtra; newdc->breakRem = dc->breakRem; newdc->xformWorld2Wnd = dc->xformWorld2Wnd; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 039976dbc16..2590a30c10b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4735,20 +4735,6 @@ INT WINAPI EnumFontsW( HDC hDC, LPCWSTR lpName, FONTENUMPROCW efproc, } -/*********************************************************************** - * GetTextCharacterExtra (GDI32.@) - */ -INT WINAPI GetTextCharacterExtra( HDC hdc ) -{ - INT ret; - DC *dc = get_dc_ptr( hdc ); - if (!dc) return 0x80000000; - ret = dc->charExtra; - release_dc_ptr( dc ); - return ret; -} - - /*********************************************************************** * SetTextCharacterExtra (GDI32.@) */ @@ -4763,8 +4749,8 @@ INT WINAPI SetTextCharacterExtra( HDC hdc, INT extra ) extra = physdev->funcs->pSetTextCharacterExtra( physdev, extra ); if (extra != 0x80000000) { - ret = dc->charExtra; - dc->charExtra = extra; + ret = dc->attr->char_extra; + dc->attr->char_extra = extra; } release_dc_ptr( dc ); } @@ -4943,14 +4929,15 @@ BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT { for (i = 0; i < count; i++) { - unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + (i + 1) * dc->charExtra; + unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + + (i + 1) * dc->attr->char_extra; if (nfit && dx > (unsigned int)max_ext) break; if (dxs) dxs[i] = dx; } if (nfit) *nfit = i; } - size->cx = abs( INTERNAL_XDSTOWS( dc, size->cx )) + count * dc->charExtra; + size->cx = abs( INTERNAL_XDSTOWS( dc, size->cx )) + count * dc->attr->char_extra; size->cy = abs( INTERNAL_YDSTOWS( dc, size->cy )); } @@ -5080,14 +5067,15 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, INT max_ext, { for (i = 0; i < count; i++) { - unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + (i + 1) * dc->charExtra; + unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + + (i + 1) * dc->attr->char_extra; if (nfit && dx > (unsigned int)max_ext) break; if (dxs) dxs[i] = dx; } if (nfit) *nfit = i; } - size->cx = abs( INTERNAL_XDSTOWS( dc, size->cx )) + count * dc->charExtra; + size->cx = abs( INTERNAL_XDSTOWS( dc, size->cx )) + count * dc->attr->char_extra; size->cy = abs( INTERNAL_YDSTOWS( dc, size->cy )); } diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index adef8f45aeb..0c2d794a576 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -305,6 +305,15 @@ INT WINAPI SetMapMode( HDC hdc, INT mode ) return NtGdiGetAndSetDCDword( hdc, NtGdiSetMapMode, mode, &ret ) ? ret : 0; } +/*********************************************************************** + * GetTextCharacterExtra (GDI32.@) + */ +INT WINAPI GetTextCharacterExtra( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->char_extra : 0x80000000; +} + /*********************************************************************** * GetPolyFillMode (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 7270a158942..bf100ea4248 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -111,7 +111,6 @@ typedef struct tagDC UINT font_code_page; DWORD mapperFlags; /* Font mapper flags */ - INT charExtra; /* Spacing from SetTextCharacterExtra() */ INT breakExtra; /* breakTotalExtra / breakCount */ INT breakRem; /* breakTotalExtra % breakCount */ ABORTPROC pAbortProc; /* AbortProc for Printing */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 8eb5562db80..7c183caf99f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -125,6 +125,7 @@ typedef struct DC_ATTR WORD rel_abs_mode; WORD stretch_blt_mode; INT map_mode; + INT char_extra; RECT vis_rect; /* visible rectangle in screen coords */ FLOAT miter_limit; POINT brush_org; /* brush origin */

1 0

Jacek Caban : gdi32: Use ntgdi interface for SetMapMode implementation.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: f7824d43829b2ca6ae496074057e2e2766ec328b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7824d43829b2ca6ae496074… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:25:57 2021 +0200 gdi32: Use ntgdi interface for SetMapMode 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 | 28 ++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/dc.c | 12 ++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 16 ++++++++++++++++ dlls/gdi32/mapping.c | 33 +++++++++------------------------ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/ntgdi_private.h | 1 + include/ntgdi.h | 5 +++++ 12 files changed, 67 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7824d43829b2ca6ae49…

1 0

Jacek Caban : gdi32: Use NtGdiTransformPoints for LPtoDP.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 32317fb1e5de9126446bd154744da4b9f0223b34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32317fb1e5de9126446bd154… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:25:45 2021 +0200 gdi32: Use NtGdiTransformPoints for LPtoDP. 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/gdidc.c | 9 +++++++++ dlls/gdi32/mapping.c | 30 +++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 79d5133b30c..3d1fb9049a6 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1155,6 +1155,15 @@ BOOL WINAPI DPtoLP( HDC hdc, POINT *points, INT count ) return NtGdiTransformPoints( hdc, points, points, count, NtGdiDPtoLP ); } +/*********************************************************************** + * LPtoDP (GDI32.@) + */ +BOOL WINAPI LPtoDP( HDC hdc, POINT *points, INT count ) +{ + return NtGdiTransformPoints( hdc, points, points, count, NtGdiLPtoDP ); +} + + /*********************************************************************** * GdiSetPixelFormat (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 8ab0b3b3ef3..3dea94efc68 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -345,6 +345,21 @@ BOOL WINAPI NtGdiTransformPoints( HDC hdc, const POINT *points_in, POINT *points switch (mode) { + case NtGdiLPtoDP: + for (i = 0; i < count; i++) + { + double x = points_in[i].x; + double y = points_in[i].y; + points_out[i].x = floor( x * dc->xformWorld2Vport.eM11 + + y * dc->xformWorld2Vport.eM21 + + dc->xformWorld2Vport.eDx + 0.5 ); + points_out[i].y = floor( x * dc->xformWorld2Vport.eM12 + + y * dc->xformWorld2Vport.eM22 + + dc->xformWorld2Vport.eDy + 0.5 ); + } + ret = TRUE; + break; + case NtGdiDPtoLP: if (!dc->vport2WorldValid) break; for (i = 0; i < count; i++) @@ -392,21 +407,6 @@ void lp_to_dp( DC *dc, POINT *points, INT count ) } } -/*********************************************************************** - * LPtoDP (GDI32.@) - */ -BOOL WINAPI LPtoDP( HDC hdc, POINT *points, INT count ) -{ - DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; - - lp_to_dp( dc, points, count ); - - release_dc_ptr( dc ); - return TRUE; -} - - /*********************************************************************** * SetMapMode (GDI32.@) */

1 0

Jacek Caban : gdi32: Use NtGdiTransformPoints for DPtoLP.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: d57865a032990a43f4f06f003a923e1792df9bb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d57865a032990a43f4f06f00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:25:32 2021 +0200 gdi32: Use NtGdiTransformPoints for DPtoLP. 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/gdidc.c | 8 ++++++++ dlls/gdi32/mapping.c | 33 ++++++++++++++++++++++++++++----- include/ntgdi.h | 9 ++++++++- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 45314781b37..79d5133b30c 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1147,6 +1147,14 @@ INT WINAPI SetMetaRgn( HDC hdc ) return NtGdiSetMetaRgn( hdc ); } +/*********************************************************************** + * DPtoLP (GDI32.@) + */ +BOOL WINAPI DPtoLP( HDC hdc, POINT *points, INT count ) +{ + return NtGdiTransformPoints( hdc, points, points, count, NtGdiDPtoLP ); +} + /*********************************************************************** * GdiSetPixelFormat (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 6eafc4a362c..8ab0b3b3ef3 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -332,16 +332,39 @@ BOOL dp_to_lp( DC *dc, POINT *points, INT count ) } /*********************************************************************** - * DPtoLP (GDI32.@) + * NtGdiTransformPoints (win32u.@) */ -BOOL WINAPI DPtoLP( HDC hdc, POINT *points, INT count ) +BOOL WINAPI NtGdiTransformPoints( HDC hdc, const POINT *points_in, POINT *points_out, + INT count, UINT mode ) { - DC * dc = get_dc_ptr( hdc ); - BOOL ret; + DC *dc = get_dc_ptr( hdc ); + int i = 0; + BOOL ret = FALSE; if (!dc) return FALSE; - ret = dp_to_lp( dc, points, count ); + switch (mode) + { + case NtGdiDPtoLP: + if (!dc->vport2WorldValid) break; + for (i = 0; i < count; i++) + { + double x = points_in[i].x; + double y = points_in[i].y; + points_out[i].x = floor( x * dc->xformVport2World.eM11 + + y * dc->xformVport2World.eM21 + + dc->xformVport2World.eDx + 0.5 ); + points_out[i].y = floor( x * dc->xformVport2World.eM12 + + y * dc->xformVport2World.eM22 + + dc->xformVport2World.eDy + 0.5 ); + } + ret = TRUE; + break; + + default: + WARN( "invalid mode %x\n", mode ); + break; + } release_dc_ptr( dc ); return ret; diff --git a/include/ntgdi.h b/include/ntgdi.h index c2f61fca6df..9be37414dce 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -93,6 +93,12 @@ enum NtGdiPolyPolygonRgn, }; +enum +{ + NtGdiLPtoDP, + NtGdiDPtoLP, +}; + /* structs not compatible with native Windows */ #ifdef __WINESRC__ @@ -251,7 +257,8 @@ INT WINAPI NtGdiStartDoc( HDC hdc, const DOCINFOW *doc ); INT WINAPI NtGdiStartPage( HDC hdc ); BOOL WINAPI NtGdiStrokePath( HDC hdc ); BOOL WINAPI NtGdiStrokeAndFillPath( HDC hdc ); -BOOL WINAPI NtGdiTransformPoints( HDC hdc, POINT *points, INT count, UINT mode ); +BOOL WINAPI NtGdiTransformPoints( HDC hdc, const POINT *points_in, POINT *points_out, + INT count, UINT mode ); BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ); BOOL WINAPI NtGdiWidenPath( HDC hdc );

1 0

Jacek Caban : gdi32: Use NtGdiSetTextJustification for SetTextJustification.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: c4f038ec21e6526b4409225ef418e69a6ff60f48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4f038ec21e6526b4409225e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:25:19 2021 +0200 gdi32: Use NtGdiSetTextJustification for SetTextJustification. 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/enhmfdrv/dc.c | 8 ++++---- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 40 +++++++++++++++--------------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 14 +++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 41 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index a0eb0c33344..f4c8ff709a6 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -63,14 +63,14 @@ BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -BOOL CDECL EMFDRV_SetTextJustification(PHYSDEV dev, INT nBreakExtra, INT nBreakCount) +BOOL EMFDC_SetTextJustification( DC_ATTR *dc_attr, INT extra, INT breaks ) { EMRSETTEXTJUSTIFICATION emr; emr.emr.iType = EMR_SETTEXTJUSTIFICATION; emr.emr.nSize = sizeof(emr); - emr.nBreakExtra = nBreakExtra; - emr.nBreakCount = nBreakCount; - return EMFDRV_WriteRecord(dev, &emr.emr); + emr.nBreakExtra = extra; + emr.nBreakCount = breaks; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 89b1cd6abfd..6e9cb2ad046 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -119,7 +119,6 @@ extern INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN extern DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern 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; extern BOOL CDECL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWindowExtEx( 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 7969029151a..260de37ec5a 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -135,7 +135,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SetPixel, /* pSetPixel */ NULL, /* pSetTextCharacterExtra */ EMFDRV_SetTextColor, /* pSetTextColor */ - EMFDRV_SetTextJustification, /* pSetTextJustification */ + NULL, /* pSetTextJustification */ EMFDRV_SetViewportExtEx, /* pSetViewportExtEx */ EMFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ EMFDRV_SetWindowExtEx, /* pSetWindowExtEx */ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7eccc982bbe..039976dbc16 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4773,36 +4773,30 @@ INT WINAPI SetTextCharacterExtra( HDC hdc, INT extra ) /*********************************************************************** - * SetTextJustification (GDI32.@) + * NtGdiSetTextJustification (win32u.@) */ -BOOL WINAPI SetTextJustification( HDC hdc, INT extra, INT breaks ) +BOOL WINAPI NtGdiSetTextJustification( HDC hdc, INT extra, INT breaks ) { - BOOL ret; - PHYSDEV physdev; - DC * dc = get_dc_ptr( hdc ); + DC *dc; - if (!dc) return FALSE; + if (!(dc = get_dc_ptr( hdc ))) return FALSE; - physdev = GET_DC_PHYSDEV( dc, pSetTextJustification ); - ret = physdev->funcs->pSetTextJustification( physdev, extra, breaks ); - if (ret) + extra = abs( (extra * dc->attr->vport_ext.cx + dc->attr->wnd_ext.cx / 2) / + dc->attr->wnd_ext.cx ); + if (!extra) breaks = 0; + if (breaks) { - extra = abs( (extra * dc->attr->vport_ext.cx + dc->attr->wnd_ext.cx / 2) / - dc->attr->wnd_ext.cx ); - if (!extra) breaks = 0; - if (breaks) - { - dc->breakExtra = extra / breaks; - dc->breakRem = extra - (breaks * dc->breakExtra); - } - else - { - dc->breakExtra = 0; - dc->breakRem = 0; - } + dc->breakExtra = extra / breaks; + dc->breakRem = extra - (breaks * dc->breakExtra); + } + else + { + dc->breakExtra = 0; + dc->breakRem = 0; } + release_dc_ptr( dc ); - return ret; + return TRUE; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e183c40aec5..3a043f37966 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -82,6 +82,7 @@ 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; +extern BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) DECLSPEC_HIDDEN; /* enhanced metafiles */ extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; @@ -138,5 +139,6 @@ 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; +extern BOOL EMFDC_SetTextJustification( DC_ATTR *dc_attr, INT extra, INT breaks ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index baa6c199b87..45314781b37 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -992,6 +992,20 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, return NtGdiExtTextOutW( hdc, x, y, flags, rect, str, count, dx, 0 ); } +/*********************************************************************** + * SetTextJustification (GDI32.@) + */ +BOOL WINAPI SetTextJustification( HDC hdc, INT extra, INT breaks ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_SetTextJustification( hdc, extra, breaks ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SetTextJustification( dc_attr, extra, breaks )) + return FALSE; + return NtGdiSetTextJustification( hdc, extra, breaks ); +} + /*********************************************************************** * PatBlt (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 363274a40b0..013a2c98d4d 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -135,9 +135,9 @@ BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, return MFDRV_MetaParam4( dev, META_SCALEWINDOWEXT, xNum, xDenom, yNum, yDenom ); } -BOOL CDECL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) +BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) { - return MFDRV_MetaParam2( dev, META_SETTEXTJUSTIFICATION, extra, breaks ); + return metadc_param2( hdc, META_SETTEXTJUSTIFICATION, extra, breaks ); } INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index f49b03cd127..48fdbe5ebe9 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -200,7 +200,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pSetPixel */ MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */ MFDRV_SetTextColor, /* pSetTextColor */ - MFDRV_SetTextJustification, /* pSetTextJustification */ + NULL, /* pSetTextJustification */ MFDRV_SetViewportExtEx, /* pSetViewportExtEx */ MFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ MFDRV_SetWindowExtEx, /* pSetWindowExtEx */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 52768e641bc..dab24768a53 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -108,7 +108,6 @@ 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_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; extern BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN;

1 0

Jump to page:

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-commits August 2021