May 2023 - Wine-Commits - list.winehq.org

Piotr Caban : wineps: Use printer DC in print processor.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: d98cd8d28bc40c808a4058e8af4afac75fe63390 URL: https://gitlab.winehq.org/wine/wine/-/commit/d98cd8d28bc40c808a4058e8af4afa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 6 11:17:02 2023 +0200 wineps: Use printer DC in print processor. --- dlls/wineps.drv/builtin.c | 43 --------------- dlls/wineps.drv/printproc.c | 131 ++------------------------------------------ dlls/wineps.drv/psdrv.h | 2 - 3 files changed, 4 insertions(+), 172 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 270ce1bef8a..74ffda36f92 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -258,24 +258,6 @@ BOOL PSDRV_WriteBuiltinGlyphShow(PHYSDEV dev, LPCWSTR str, INT count) return TRUE; } -/*********************************************************************** - * PSDRV_GetTextMetrics - */ -BOOL CDECL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) -{ - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - - if (physDev->font.fontloc == Download) - { - dev = GET_NEXT_PHYSDEV( dev, pGetTextMetrics ); - return dev->funcs->pGetTextMetrics( dev, metrics ); - } - - memcpy(metrics, &(physDev->font.fontinfo.Builtin.tm), - sizeof(physDev->font.fontinfo.Builtin.tm)); - return TRUE; -} - /****************************************************************************** * PSDRV_UVMetrics * @@ -314,28 +296,3 @@ const AFMMETRICS *PSDRV_UVMetrics(LONG UV, const AFM *afm) return needle; } - -/*********************************************************************** - * PSDRV_GetTextExtentExPoint - */ -BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT alpDx) -{ - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - int i; - float width = 0.0; - - if (physDev->font.fontloc == Download) - { - dev = GET_NEXT_PHYSDEV( dev, pGetTextExtentExPoint ); - return dev->funcs->pGetTextExtentExPoint( dev, str, count, alpDx ); - } - - TRACE("%s %i\n", debugstr_wn(str, count), count); - - for (i = 0; i < count; ++i) - { - width += PSDRV_UVMetrics(str[i], physDev->font.fontinfo.Builtin.afm)->WX; - alpDx[i] = width * physDev->font.fontinfo.Builtin.scale; - } - return TRUE; -} diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 417766d4093..a58a23a281b 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -155,17 +155,6 @@ static struct pp_data* get_handle_data(HANDLE pp) return ret; } -static BOOL CDECL font_GetTextExtentExPoint(PHYSDEV dev, const WCHAR *str, INT count, INT *dxs) -{ - SIZE size; - return GetTextExtentExPointW(dev->hdc, str, count, -1, NULL, dxs, &size); -} - -static BOOL CDECL font_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) -{ - return GetTextMetricsW(dev->hdc, metrics); -} - static HFONT CDECL font_SelectFont(PHYSDEV dev, HFONT hfont, UINT *aa_flags) { HFONT tt_font, old_font; @@ -187,8 +176,6 @@ static HFONT CDECL font_SelectFont(PHYSDEV dev, HFONT hfont, UINT *aa_flags) static const struct gdi_dc_funcs font_funcs = { - .pGetTextExtentExPoint = font_GetTextExtentExPoint, - .pGetTextMetrics = font_GetTextMetrics, .pSelectFont = font_SelectFont, .priority = GDI_PRIORITY_FONT_DRV }; @@ -1151,38 +1138,9 @@ static BOOL select_hbrush(struct pp_data *data, HANDLETABLE *htable, int handle_ return PSDRV_SelectBrush(&data->pdev->dev, brush, pattern) != NULL; } -/* Performs a device to world transformation on the specified width (which - * is in integer format). - */ -static inline INT INTERNAL_XDSTOWS(HDC hdc, INT width) -{ - double floatWidth; - XFORM xform; - - GetWorldTransform(hdc, &xform); - - /* Perform operation with floating point */ - floatWidth = (double)width * xform.eM11; - /* Round to integers */ - return GDI_ROUND(floatWidth); -} - /* Performs a device to world transformation on the specified size (which * is in integer format). */ -static inline INT INTERNAL_YDSTOWS(HDC hdc, INT height) -{ - double floatHeight; - XFORM xform; - - GetWorldTransform(hdc, &xform); - - /* Perform operation with floating point */ - floatHeight = (double)height * xform.eM22; - /* Round to integers */ - return GDI_ROUND(floatHeight); -} - static inline INT INTERNAL_YWSTODS(HDC hdc, INT height) { POINT pt[2]; @@ -1193,87 +1151,6 @@ static inline INT INTERNAL_YWSTODS(HDC hdc, INT height) return pt[1].y - pt[0].y; } -/* compute positions for text rendering, in device coords */ -static BOOL get_char_positions(struct pp_data *data, const WCHAR *str, - INT count, INT *dx, SIZE *size) -{ - TEXTMETRICW tm; - - size->cx = size->cy = 0; - if (!count) return TRUE; - - PSDRV_GetTextMetrics(&data->pdev->dev, &tm); - if (!PSDRV_GetTextExtentExPoint(&data->pdev->dev, str, count, dx)) return FALSE; - - if (data->break_extra || data->break_rem) - { - int i, space = 0, rem = data->break_rem; - - for (i = 0; i < count; i++) - { - if (str[i] == tm.tmBreakChar) - { - space += data->break_extra; - if (rem > 0) - { - space++; - rem--; - } - } - dx[i] += space; - } - } - size->cx = dx[count - 1]; - size->cy = tm.tmHeight; - return TRUE; -} - -static BOOL get_text_extent(struct pp_data *data, const WCHAR *str, INT count, - INT max_ext, INT *nfit, INT *dxs, SIZE *size, UINT flags) -{ - INT buffer[256], *pos = dxs; - int i, char_extra; - BOOL ret; - - if (flags) - return GetTextExtentExPointI(data->pdev->dev.hdc, str, count, max_ext, nfit, dxs, size); - else if (data->pdev->font.fontloc == Download) - return GetTextExtentExPointW(data->pdev->dev.hdc, str, count, max_ext, nfit, dxs, size); - - if (!dxs) - { - pos = buffer; - if (count > 256 && !(pos = malloc(count * sizeof(*pos)))) - return FALSE; - } - - if ((ret = get_char_positions(data, str, count, pos, size))) - { - char_extra = GetTextCharacterExtra(data->pdev->dev.hdc); - if (dxs || nfit) - { - for (i = 0; i < count; i++) - { - unsigned int dx = abs(INTERNAL_XDSTOWS(data->pdev->dev.hdc, pos[i])) - + (i + 1) * char_extra; - if (nfit && dx > (unsigned int)max_ext) break; - if (dxs) dxs[i] = dx; - } - if (nfit) *nfit = i; - } - - size->cx = abs(INTERNAL_XDSTOWS(data->pdev->dev.hdc, size->cx)) - + count * char_extra; - size->cy = abs(INTERNAL_YDSTOWS(data->pdev->dev.hdc, size->cy)); - } - - if (pos != buffer && pos != dxs) free(pos); - - TRACE("(%s, %d) returning %dx%d\n", debugstr_wn(str,count), - max_ext, (int)size->cx, (int)size->cy); - return ret; -} - extern const unsigned short bidi_direction_table[] DECLSPEC_HIDDEN; /*------------------------------------------------------------------------ @@ -1938,7 +1815,7 @@ static BOOL ext_text_out(struct pp_data *data, HANDLETABLE *htable, y = pt.y; } - PSDRV_GetTextMetrics(&data->pdev->dev, &tm); + GetTextMetricsW(hdc, &tm); GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), &lf); if(!(tm.tmPitchAndFamily & TMPF_VECTOR)) /* Non-scalable fonts shouldn't be rotated */ @@ -2017,7 +1894,7 @@ static BOOL ext_text_out(struct pp_data *data, HANDLETABLE *htable, { INT *dx = malloc(count * sizeof(*dx)); - get_text_extent(data, str, count, -1, NULL, dx, &sz, !!(flags & ETO_GLYPH_INDEX)); + NtGdiGetTextExtentExW(hdc, str, count, -1, NULL, dx, &sz, !!(flags & ETO_GLYPH_INDEX)); deltas[0].x = dx[0]; deltas[0].y = 0; @@ -2062,7 +1939,7 @@ static BOOL ext_text_out(struct pp_data *data, HANDLETABLE *htable, { POINT desired[2]; - get_text_extent(data, str, count, 0, NULL, NULL, &sz, !!(flags & ETO_GLYPH_INDEX)); + NtGdiGetTextExtentExW(hdc, str, count, 0, NULL, NULL, &sz, !!(flags & ETO_GLYPH_INDEX)); desired[0].x = desired[0].y = 0; desired[1].x = sz.cx; desired[1].y = 0; @@ -3122,7 +2999,7 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) data->doc_name = wcsdup(open_data->pDocumentName); data->out_file = wcsdup(open_data->pOutputFile); - hdc = CreateCompatibleDC(NULL); + hdc = CreateDCW(L"winspool", open_data->pPrinterName, NULL, open_data->pDevMode); if (!hdc) { LocalFree(data); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index a1eb444ad14..40f590d0afd 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -434,8 +434,6 @@ extern INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID extern BOOL CDECL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT alpDx) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_LineTo(PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_PatBlt(PHYSDEV dev, struct bitblt_coords *dst, DWORD dwRop) DECLSPEC_HIDDEN;

1 0

Piotr Caban : wineps: Copy GetTextExtentExPoint implementation to unixlib.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 18bcec0d257f6d0b8e2c063b5dfc0c2302763835 URL: https://gitlab.winehq.org/wine/wine/-/commit/18bcec0d257f6d0b8e2c063b5dfc0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 5 20:58:59 2023 +0200 wineps: Copy GetTextExtentExPoint implementation to unixlib. --- dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/unixlib.c | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 66c052db27c..b08f02ddb11 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -693,7 +693,6 @@ static struct gdi_dc_funcs psdrv_funcs = .pCreateCompatibleDC = PSDRV_CreateCompatibleDC, .pCreateDC = PSDRV_CreateDC, .pDeleteDC = PSDRV_DeleteDC, - .pGetTextExtentExPoint = PSDRV_GetTextExtentExPoint, .priority = GDI_PRIORITY_GRAPHICS_DRV }; diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index d7f8eb7e9a9..72f63c81300 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -1206,6 +1206,28 @@ static BOOL CDECL get_text_metrics(PHYSDEV dev, TEXTMETRICW *metrics) return TRUE; } +static BOOL CDECL get_text_extent_ex_point(PHYSDEV dev, const WCHAR *str, int count, int *dx) +{ + PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); + int i; + float width = 0.0; + + if (pdev->font.fontloc == Download) + { + dev = GET_NEXT_PHYSDEV(dev, pGetTextExtentExPoint); + return dev->funcs->pGetTextExtentExPoint(dev, str, count, dx); + } + + TRACE("%s %i\n", debugstr_wn(str, count), count); + + for (i = 0; i < count; ++i) + { + width += uv_metrics(str[i], pdev->font.fontinfo.Builtin.afm)->WX; + dx[i] = width * pdev->font.fontinfo.Builtin.scale; + } + return TRUE; +} + static NTSTATUS init_dc(void *arg) { struct init_dc_params *params = arg; @@ -1217,6 +1239,7 @@ static NTSTATUS init_dc(void *arg) params->funcs->pEnumFonts = enum_fonts; params->funcs->pGetCharWidth = get_char_width; params->funcs->pGetTextMetrics = get_text_metrics; + params->funcs->pGetTextExtentExPoint = get_text_extent_ex_point; return TRUE; }

1 0

Piotr Caban : wineps: Move GetCharWidth implementation to unixlib.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: b1f7b0da98b16e37473424b5162805873546cdc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1f7b0da98b16e37473424b5162805… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 5 20:48:50 2023 +0200 wineps: Move GetCharWidth implementation to unixlib. --- dlls/wineps.drv/Makefile.in | 2 +- dlls/wineps.drv/builtin.c | 35 --------------------------- dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/printproc.c | 13 ---------- dlls/wineps.drv/psdrv.h | 1 - dlls/wineps.drv/unixlib.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 60 insertions(+), 51 deletions(-) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index aa6bdf60996..97e75bf02b8 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -1,7 +1,7 @@ MODULE = wineps.drv UNIXLIB = wineps.so IMPORTS = user32 gdi32 winspool advapi32 win32u -UNIX_LIBS = -lwin32u +UNIX_LIBS = -lwin32u -lm C_SRCS = \ afm.c \ diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index f661aeaa591..270ce1bef8a 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -339,38 +339,3 @@ BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT } return TRUE; } - -/*********************************************************************** - * PSDRV_GetCharWidth - */ -BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) -{ - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - UINT i, c; - - if (physDev->font.fontloc == Download) - { - dev = GET_NEXT_PHYSDEV( dev, pGetCharWidth ); - return dev->funcs->pGetCharWidth( dev, first, count, chars, buffer ); - } - - TRACE("U+%.4X +%u\n", first, count); - - for (i = 0; i < count; ++i) - { - c = chars ? chars[i] : first + i; - - if (c > 0xffff) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - *buffer = floor( PSDRV_UVMetrics(c, physDev->font.fontinfo.Builtin.afm)->WX - * physDev->font.fontinfo.Builtin.scale + 0.5 ); - TRACE("U+%.4X: %i\n", i, *buffer); - ++buffer; - } - - return TRUE; -} diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 576021c6b1e..8c2c6d4af4b 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -693,7 +693,6 @@ static struct gdi_dc_funcs psdrv_funcs = .pCreateCompatibleDC = PSDRV_CreateCompatibleDC, .pCreateDC = PSDRV_CreateDC, .pDeleteDC = PSDRV_DeleteDC, - .pGetCharWidth = PSDRV_GetCharWidth, .pGetTextExtentExPoint = PSDRV_GetTextExtentExPoint, .pGetTextMetrics = PSDRV_GetTextMetrics, .priority = GDI_PRIORITY_GRAPHICS_DRV diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index bd4e79bb96f..417766d4093 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -155,18 +155,6 @@ static struct pp_data* get_handle_data(HANDLE pp) return ret; } -static BOOL CDECL font_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) -{ - XFORM old, xform = { .eM11 = 1.0f }; - BOOL ret; - - GetWorldTransform(dev->hdc, &old); - SetWorldTransform(dev->hdc, &xform); - ret = NtGdiGetCharWidthW(dev->hdc, first, count, (WCHAR *)chars, NTGDI_GETCHARWIDTH_INT, buffer); - SetWorldTransform(dev->hdc, &old); - return ret; -} - static BOOL CDECL font_GetTextExtentExPoint(PHYSDEV dev, const WCHAR *str, INT count, INT *dxs) { SIZE size; @@ -199,7 +187,6 @@ static HFONT CDECL font_SelectFont(PHYSDEV dev, HFONT hfont, UINT *aa_flags) static const struct gdi_dc_funcs font_funcs = { - .pGetCharWidth = font_GetCharWidth, .pGetTextExtentExPoint = font_GetTextExtentExPoint, .pGetTextMetrics = font_GetTextMetrics, .pSelectFont = font_SelectFont, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index add30651043..a1eb444ad14 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -434,7 +434,6 @@ extern INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID extern BOOL CDECL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT alpDx) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_LineTo(PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 1dd9aafadb0..283c5b8d4a7 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -25,6 +25,8 @@ #endif #include <stdarg.h> +#include <stdlib.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -1133,6 +1135,62 @@ static BOOL CDECL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LP return ret; } +static int metrics_by_uv(const void *a, const void *b) +{ + return (int)(((const AFMMETRICS *)a)->UV - ((const AFMMETRICS *)b)->UV); +} + +const AFMMETRICS *uv_metrics(LONG uv, const AFM *afm) +{ + const AFMMETRICS *needle; + AFMMETRICS key; + + /* + * Ugly work-around for symbol fonts. Wine is sending characters which + * belong in the Unicode private use range (U+F020 - U+F0FF) as ASCII + * characters (U+0020 - U+00FF). + */ + if ((afm->Metrics->UV & 0xff00) == 0xf000 && uv < 0x100) + uv |= 0xf000; + + key.UV = uv; + needle = bsearch(&key, afm->Metrics, afm->NumofMetrics, sizeof(AFMMETRICS), metrics_by_uv); + if (!needle) + { + WARN("No glyph for U+%.4X in '%s'\n", (int)uv, afm->FontName); + needle = afm->Metrics; + } + return needle; +} + +static BOOL CDECL get_char_width(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) +{ + PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); + UINT i, c; + + if (pdev->font.fontloc == Download) + { + dev = GET_NEXT_PHYSDEV(dev, pGetCharWidth); + return dev->funcs->pGetCharWidth(dev, first, count, chars, buffer); + } + + TRACE("U+%.4X +%u\n", first, count); + + for (i = 0; i < count; ++i) + { + c = chars ? chars[i] : first + i; + + if (c > 0xffff) + return FALSE; + + *buffer = floor(uv_metrics(c, pdev->font.fontinfo.Builtin.afm)->WX + * pdev->font.fontinfo.Builtin.scale + 0.5); + TRACE("U+%.4X: %i\n", i, *buffer); + ++buffer; + } + return TRUE; +} + static NTSTATUS init_dc(void *arg) { struct init_dc_params *params = arg; @@ -1142,6 +1200,7 @@ static NTSTATUS init_dc(void *arg) params->funcs->pExtEscape = ext_escape; params->funcs->pSelectFont = select_font; params->funcs->pEnumFonts = enum_fonts; + params->funcs->pGetCharWidth = get_char_width; return TRUE; }

1 0

Piotr Caban : wineps: Move EnumFonts implementation to unixlib.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: a52167e76241cc6719255e1b4454a8bf0f17649c URL: https://gitlab.winehq.org/wine/wine/-/commit/a52167e76241cc6719255e1b4454a8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 5 20:35:14 2023 +0200 wineps: Move EnumFonts implementation to unixlib. --- dlls/wineps.drv/builtin.c | 80 --------------------------------------------- dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/printproc.c | 6 ---- dlls/wineps.drv/psdrv.h | 1 - dlls/wineps.drv/unixlib.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 78 insertions(+), 88 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 5100539764d..f661aeaa591 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -374,83 +374,3 @@ BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR * return TRUE; } - - -/*********************************************************************** - * PSDRV_GetFontMetric - */ -static UINT PSDRV_GetFontMetric(HDC hdc, const AFM *afm, - NEWTEXTMETRICEXW *ntmx, ENUMLOGFONTEXW *elfx) -{ - /* ntmx->ntmTm is NEWTEXTMETRICW; compatible w/ TEXTMETRICW per Win32 doc */ - - TEXTMETRICW *tm = (TEXTMETRICW *)&(ntmx->ntmTm); - LOGFONTW *lf = &(elfx->elfLogFont); - PSFONT font; - - memset(ntmx, 0, sizeof(*ntmx)); - memset(elfx, 0, sizeof(*elfx)); - - ScaleFont(afm, -(LONG)(afm->WinMetrics.usUnitsPerEm), &font, tm); - - lf->lfHeight = tm->tmHeight; - lf->lfWidth = tm->tmAveCharWidth; - lf->lfWeight = tm->tmWeight; - lf->lfItalic = tm->tmItalic; - lf->lfCharSet = tm->tmCharSet; - - lf->lfPitchAndFamily = (afm->IsFixedPitch) ? FIXED_PITCH : VARIABLE_PITCH; - - lstrcpynW(lf->lfFaceName, afm->FamilyName, LF_FACESIZE); - - return DEVICE_FONTTYPE; -} - -/*********************************************************************** - * PSDRV_EnumFonts - */ -BOOL CDECL PSDRV_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp ) -{ - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pEnumFonts ); - ENUMLOGFONTEXW lf; - NEWTEXTMETRICEXW tm; - BOOL ret; - AFMLISTENTRY *afmle; - FONTFAMILY *family; - - ret = next->funcs->pEnumFonts( next, plf, proc, lp ); - if (!ret) return FALSE; - - if( plf && plf->lfFaceName[0] ) { - TRACE("lfFaceName = %s\n", debugstr_w(plf->lfFaceName)); - for(family = physDev->pi->Fonts; family; family = family->next) { - if(!wcsncmp(plf->lfFaceName, family->FamilyName, - wcslen(family->FamilyName))) - break; - } - if(family) { - for(afmle = family->afmlist; afmle; afmle = afmle->next) { - UINT fm; - - TRACE("Got '%s'\n", afmle->afm->FontName); - fm = PSDRV_GetFontMetric( dev->hdc, afmle->afm, &tm, &lf ); - if (!(ret = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp ))) - break; - } - } - } else { - - TRACE("lfFaceName = NULL\n"); - for(family = physDev->pi->Fonts; family; family = family->next) { - UINT fm; - - afmle = family->afmlist; - TRACE("Got '%s'\n", afmle->afm->FontName); - fm = PSDRV_GetFontMetric( dev->hdc, afmle->afm, &tm, &lf ); - if (!(ret = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp ))) - break; - } - } - return ret; -} diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index a33ec19e741..576021c6b1e 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -693,7 +693,6 @@ static struct gdi_dc_funcs psdrv_funcs = .pCreateCompatibleDC = PSDRV_CreateCompatibleDC, .pCreateDC = PSDRV_CreateDC, .pDeleteDC = PSDRV_DeleteDC, - .pEnumFonts = PSDRV_EnumFonts, .pGetCharWidth = PSDRV_GetCharWidth, .pGetTextExtentExPoint = PSDRV_GetTextExtentExPoint, .pGetTextMetrics = PSDRV_GetTextMetrics, diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index d7f9ab65369..bd4e79bb96f 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -155,11 +155,6 @@ static struct pp_data* get_handle_data(HANDLE pp) return ret; } -static BOOL CDECL font_EnumFonts(PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lp) -{ - return EnumFontFamiliesExW(dev->hdc, lf, proc, lp, 0); -} - static BOOL CDECL font_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) { XFORM old, xform = { .eM11 = 1.0f }; @@ -204,7 +199,6 @@ static HFONT CDECL font_SelectFont(PHYSDEV dev, HFONT hfont, UINT *aa_flags) static const struct gdi_dc_funcs font_funcs = { - .pEnumFonts = font_EnumFonts, .pGetCharWidth = font_GetCharWidth, .pGetTextExtentExPoint = font_GetTextExtentExPoint, .pGetTextMetrics = font_GetTextMetrics, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 038798df9eb..add30651043 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -429,7 +429,6 @@ extern BOOL CDECL PSDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bo extern BOOL CDECL PSDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern INT CDECL PSDRV_EndDoc( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT CDECL PSDRV_EndPage( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp ) DECLSPEC_HIDDEN; extern INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, INT cbOutput, LPVOID out_data ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 859d612320c..1dd9aafadb0 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -1056,6 +1056,83 @@ static HFONT CDECL select_font(PHYSDEV dev, HFONT hfont, UINT *aa_flags) return hfont; } +static UINT get_font_metric(HDC hdc, const AFM *afm, + NEWTEXTMETRICEXW *ntmx, ENUMLOGFONTEXW *elfx) +{ + /* ntmx->ntmTm is NEWTEXTMETRICW; compatible w/ TEXTMETRICW per Win32 doc */ + TEXTMETRICW *tm = (TEXTMETRICW *)&(ntmx->ntmTm); + LOGFONTW *lf = &(elfx->elfLogFont); + PSFONT font; + + memset(ntmx, 0, sizeof(*ntmx)); + memset(elfx, 0, sizeof(*elfx)); + + scale_font(afm, -(LONG)afm->WinMetrics.usUnitsPerEm, &font, tm); + + lf->lfHeight = tm->tmHeight; + lf->lfWidth = tm->tmAveCharWidth; + lf->lfWeight = tm->tmWeight; + lf->lfItalic = tm->tmItalic; + lf->lfCharSet = tm->tmCharSet; + + lf->lfPitchAndFamily = afm->IsFixedPitch ? FIXED_PITCH : VARIABLE_PITCH; + + lstrcpynW(lf->lfFaceName, afm->FamilyName, LF_FACESIZE); + return DEVICE_FONTTYPE; +} + +static BOOL CDECL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp) +{ + PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); + PHYSDEV next = GET_NEXT_PHYSDEV(dev, pEnumFonts); + ENUMLOGFONTEXW lf; + NEWTEXTMETRICEXW tm; + BOOL ret; + AFMLISTENTRY *afmle; + FONTFAMILY *family; + + ret = next->funcs->pEnumFonts(next, plf, proc, lp); + if (!ret) return FALSE; + + if (plf && plf->lfFaceName[0]) + { + TRACE("lfFaceName = %s\n", debugstr_w(plf->lfFaceName)); + for (family = pdev->pi->Fonts; family; family = family->next) + { + if (!wcsncmp(plf->lfFaceName, family->FamilyName, + wcslen(family->FamilyName))) + break; + } + if (family) + { + for (afmle = family->afmlist; afmle; afmle = afmle->next) + { + UINT fm; + + TRACE("Got '%s'\n", afmle->afm->FontName); + fm = get_font_metric(dev->hdc, afmle->afm, &tm, &lf); + if (!(ret = (*proc)(&lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp))) + break; + } + } + } + else + { + TRACE("lfFaceName = NULL\n"); + for (family = pdev->pi->Fonts; family; family = family->next) + { + UINT fm; + + afmle = family->afmlist; + TRACE("Got '%s'\n", afmle->afm->FontName); + fm = get_font_metric(dev->hdc, afmle->afm, &tm, &lf); + if (!(ret = (*proc)(&lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp))) + break; + } + } + return ret; +} + static NTSTATUS init_dc(void *arg) { struct init_dc_params *params = arg; @@ -1064,6 +1141,7 @@ static NTSTATUS init_dc(void *arg) params->funcs->pResetDC = reset_dc; params->funcs->pExtEscape = ext_escape; params->funcs->pSelectFont = select_font; + params->funcs->pEnumFonts = enum_fonts; return TRUE; }

1 0

Piotr Caban : wineps: Copy SelectFont implementation to unixlib.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: fb8daf332a2f3016a28a362ca955bea141cbbeec URL: https://gitlab.winehq.org/wine/wine/-/commit/fb8daf332a2f3016a28a362ca955be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 5 20:11:18 2023 +0200 wineps: Copy SelectFont implementation to unixlib. --- dlls/wineps.drv/Makefile.in | 1 + dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/unixlib.c | 294 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 295 insertions(+), 1 deletion(-)

1 0

Piotr Caban : wineps: Store font related strings in unicode.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 11ab927ae20bb0b29a105562845ed7821d993d02 URL: https://gitlab.winehq.org/wine/wine/-/commit/11ab927ae20bb0b29a105562845ed7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 5 15:20:42 2023 +0200 wineps: Store font related strings in unicode. --- dlls/wineps.drv/afm.c | 14 ++++---- dlls/wineps.drv/afm2c.c | 8 ++--- dlls/wineps.drv/builtin.c | 38 ++++++++++----------- dlls/wineps.drv/data/AvantGarde_Book.c | 6 ++-- dlls/wineps.drv/data/AvantGarde_BookOblique.c | 6 ++-- dlls/wineps.drv/data/AvantGarde_Demi.c | 6 ++-- dlls/wineps.drv/data/AvantGarde_DemiOblique.c | 6 ++-- dlls/wineps.drv/data/Bookman_Demi.c | 6 ++-- dlls/wineps.drv/data/Bookman_DemiItalic.c | 6 ++-- dlls/wineps.drv/data/Bookman_Light.c | 6 ++-- dlls/wineps.drv/data/Bookman_LightItalic.c | 6 ++-- dlls/wineps.drv/data/Courier.c | 6 ++-- dlls/wineps.drv/data/Courier_Bold.c | 6 ++-- dlls/wineps.drv/data/Courier_BoldOblique.c | 6 ++-- dlls/wineps.drv/data/Courier_Oblique.c | 6 ++-- dlls/wineps.drv/data/Helvetica.c | 6 ++-- dlls/wineps.drv/data/Helvetica_Bold.c | 6 ++-- dlls/wineps.drv/data/Helvetica_BoldOblique.c | 6 ++-- dlls/wineps.drv/data/Helvetica_Narrow.c | 6 ++-- dlls/wineps.drv/data/Helvetica_Narrow_Bold.c | 6 ++-- .../wineps.drv/data/Helvetica_Narrow_BoldOblique.c | 6 ++-- dlls/wineps.drv/data/Helvetica_Narrow_Oblique.c | 6 ++-- dlls/wineps.drv/data/Helvetica_Oblique.c | 6 ++-- dlls/wineps.drv/data/NewCenturySchlbk_Bold.c | 6 ++-- dlls/wineps.drv/data/NewCenturySchlbk_BoldItalic.c | 6 ++-- dlls/wineps.drv/data/NewCenturySchlbk_Italic.c | 6 ++-- dlls/wineps.drv/data/NewCenturySchlbk_Roman.c | 6 ++-- dlls/wineps.drv/data/Palatino_Bold.c | 6 ++-- dlls/wineps.drv/data/Palatino_BoldItalic.c | 6 ++-- dlls/wineps.drv/data/Palatino_Italic.c | 6 ++-- dlls/wineps.drv/data/Palatino_Roman.c | 6 ++-- dlls/wineps.drv/data/Symbol.c | 6 ++-- dlls/wineps.drv/data/Times_Bold.c | 6 ++-- dlls/wineps.drv/data/Times_BoldItalic.c | 6 ++-- dlls/wineps.drv/data/Times_Italic.c | 6 ++-- dlls/wineps.drv/data/Times_Roman.c | 6 ++-- dlls/wineps.drv/data/ZapfChancery_MediumItalic.c | 6 ++-- dlls/wineps.drv/data/ZapfDingbats.c | 6 ++-- dlls/wineps.drv/font.c | 38 +++++++++------------ dlls/wineps.drv/init.c | 14 ++++---- dlls/wineps.drv/ppd.c | 2 +- dlls/wineps.drv/psdrv.h | 14 ++++---- dlls/wineps.drv/type1afm.c | 39 ++++++++++++++++++---- 43 files changed, 197 insertions(+), 180 deletions(-)

1 0

Piotr Caban : wineps: Move ExtEscape implementation to unixlib.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 8cfa8c15ee619b1b2549e931ffcfdd7f8fc94661 URL: https://gitlab.winehq.org/wine/wine/-/commit/8cfa8c15ee619b1b2549e931ffcfdd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 4 19:56:34 2023 +0200 wineps: Move ExtEscape implementation to unixlib. --- dlls/wineps.drv/escape.c | 358 +++++++++------------------------------------- dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/unixlib.c | 260 +++++++++++++++++++++++++++++++++ 3 files changed, 329 insertions(+), 290 deletions(-)

1 0

Piotr Caban : wineps: Copy ResetDC implementation to unixlib.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: ab38530e816eb10a251c0e20fbf79f166941760b URL: https://gitlab.winehq.org/wine/wine/-/commit/ab38530e816eb10a251c0e20fbf79f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 3 19:40:47 2023 +0200 wineps: Copy ResetDC implementation to unixlib. --- dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/unixlib.c | 364 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 364 insertions(+), 1 deletion(-)

1 0

Piotr Caban : wineps: Copy GetDeviceCaps implementation to unixlib.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 75e0072cc2088d2e07717eec0a22315d31603825 URL: https://gitlab.winehq.org/wine/wine/-/commit/75e0072cc2088d2e07717eec0a2231… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 3 18:02:54 2023 +0200 wineps: Copy GetDeviceCaps implementation to unixlib. --- dlls/wineps.drv/Makefile.in | 2 + dlls/wineps.drv/init.c | 98 ++++----------------------- dlls/wineps.drv/psdrv.h | 2 + dlls/wineps.drv/unixlib.c | 157 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wineps.drv/unixlib.h | 31 +++++++++ 5 files changed, 205 insertions(+), 85 deletions(-)

1 0

Brendan Shanks : include: Implement C_ASSERT() using the C11 _Static_assert() if available.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: wine Branch: master Commit: 820a9d0d6ca3e406c7adb522773feb50d374ae1a URL: https://gitlab.winehq.org/wine/wine/-/commit/820a9d0d6ca3e406c7adb522773feb… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 8 12:58:07 2023 -0700 include: Implement C_ASSERT() using the C11 _Static_assert() if available. --- include/winnt.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 01a14de972b..64408126cba 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -417,7 +417,11 @@ extern "C" { /* Compile time assertion */ +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) +#define C_ASSERT(e) _Static_assert(e, #e) +#else #define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1]) +#endif /* Eliminate Microsoft C/C++ compiler warning 4715 */ #if defined(_MSC_VER) && (_MSC_VER > 1200)

1 0