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

Rémi Bernon : mf/tests: Release PROPVARIANT memory in check_attributes (Valgrind).
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: ac393df4b5729f3772fa79ff24a4e0bb44a3f46c URL: https://gitlab.winehq.org/wine/wine/-/commit/ac393df4b5729f3772fa79ff24a4e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 11 21:28:19 2023 +0200 mf/tests: Release PROPVARIANT memory in check_attributes (Valgrind). --- dlls/mf/tests/transform.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 34a00526eab..b7d8c088870 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -278,6 +278,7 @@ void check_attributes_(const char *file, int line, IMFAttributes *attributes, todo_wine_if(desc[i].todo_value) ok_(file, line)(ret == 0, "%s mismatch, type %u, value %s\n", debugstr_a(desc[i].name), value.vt, buffer); + PropVariantClear(&value); } }

1 0

Rémi Bernon : mf/tests: Avoid leaking media types in test_video_processor (Valgrind).
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: f85c5f1c3a21b071d866aa1aefdd855ca2c91795 URL: https://gitlab.winehq.org/wine/wine/-/commit/f85c5f1c3a21b071d866aa1aefdd85… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 11 21:32:33 2023 +0200 mf/tests: Avoid leaking media types in test_video_processor (Valgrind). --- dlls/mf/tests/transform.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index b7d8c088870..ec9be42d8c8 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -6504,7 +6504,10 @@ static void test_video_processor(void) || IsEqualGUID(&expect_available_inputs[i], &MFAudioFormat_MPEG) || IsEqualGUID(&expect_available_inputs[i], &MFVideoFormat_420O) || IsEqualGUID(&expect_available_inputs[i], &MFVideoFormat_A16B16G16R16F) /* w1064v1507 */) + { + IMFMediaType_Release(media_type); continue; + } winetest_push_context("in %lu", i); ok(hr == S_OK, "GetInputAvailableType returned %#lx\n", hr);

1 0

Rémi Bernon : rtworkq: Release thread pool work object when work_item is destroyed (Valgrind).
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: cfff3306049af5f29a168489cf8fe791b1d493d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfff3306049af5f29a168489cf8fe7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 12 09:38:47 2023 +0200 rtworkq: Release thread pool work object when work_item is destroyed (Valgrind). --- dlls/rtworkq/queue.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index d6c28ca4566..baf648bf771 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -131,6 +131,7 @@ struct work_item RTWQWORKITEM_KEY key; LONG priority; DWORD flags; + TP_WORK *work_object; PTP_SIMPLE_CALLBACK finalization_callback; union { @@ -374,7 +375,6 @@ static void pool_queue_submit(struct queue *queue, struct work_item *item) { TP_CALLBACK_PRIORITY callback_priority; TP_CALLBACK_ENVIRON_V3 env; - TP_WORK *work_object; if (item->priority == 0) callback_priority = TP_CALLBACK_PRIORITY_NORMAL; @@ -389,8 +389,8 @@ static void pool_queue_submit(struct queue *queue, struct work_item *item) we need finalization callback. */ if (item->finalization_callback) IUnknown_AddRef(&item->IUnknown_iface); - work_object = CreateThreadpoolWork(standard_queue_worker, item, (TP_CALLBACK_ENVIRON *)&env); - SubmitThreadpoolWork(work_object); + item->work_object = CreateThreadpoolWork(standard_queue_worker, item, (TP_CALLBACK_ENVIRON *)&env); + SubmitThreadpoolWork(item->work_object); TRACE("dispatched %p.\n", item->result); } @@ -551,6 +551,8 @@ static ULONG WINAPI work_item_Release(IUnknown *iface) if (!refcount) { + if (item->work_object) + CloseThreadpoolWork(item->work_object); if (item->reply_result) IRtwqAsyncResult_Release(item->reply_result); IRtwqAsyncResult_Release(item->result);

1 0

Piotr Caban : wineps: Convert WCHAR to Adobe Glyph name on PE side.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: 82ef9166a71155d89a1dda2916a41083c18fcd06 URL: https://gitlab.winehq.org/wine/wine/-/commit/82ef9166a71155d89a1dda2916a410… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 14 14:28:33 2023 +0200 wineps: Convert WCHAR to Adobe Glyph name on PE side. --- dlls/wineps.drv/builtin.c | 26 ++++++++++++++++++++++++-- dlls/wineps.drv/unixlib.c | 7 ++++--- dlls/wineps.drv/unixlib.h | 2 +- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 2a2c9106f12..d62d4fc134f 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -50,14 +50,36 @@ BOOL PSDRV_WriteSetBuiltinFont(print_ctx *ctx) font_info.escapement, FALSE); } +static int __cdecl agl_by_uv(const void *a, const void *b) +{ + return (int)(((const UNICODEGLYPH *)a)->UV - ((const UNICODEGLYPH *)b)->UV); +} + +static const char *find_ag_name(WCHAR wch) +{ + UNICODEGLYPH key = { .UV = wch }; + UNICODEGLYPH *needle; + + needle = bsearch(&key, PSDRV_AGLbyUV, PSDRV_AGLbyUVSize, sizeof(key), agl_by_uv); + return needle ? needle->name->sz : NULL; +} + BOOL PSDRV_WriteBuiltinGlyphShow(print_ctx *ctx, LPCWSTR str, INT count) { - char name[32]; + const char *name; + WCHAR wch; int i; for (i = 0; i < count; ++i) { - ExtEscape(ctx->hdc, PSDRV_GET_GLYPH_NAME, sizeof(str[i]), (const char *)&str[i], sizeof(name), name); + ExtEscape(ctx->hdc, PSDRV_CHECK_WCHAR, sizeof(str[i]), + (const char *)&str[i], sizeof(wch), (char *)&wch); + name = find_ag_name(wch); + if (!name) + { + ERR("can't find glyph name for %x\n", wch); + continue; + } PSDRV_WriteGlyphShow(ctx, name); } diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 792a2ad69d3..b67a1848270 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -839,13 +839,14 @@ static int CDECL ext_escape(PHYSDEV dev, int escape, int input_size, const void case CLIP_TO_PATH: return 1; - case PSDRV_GET_GLYPH_NAME: + case PSDRV_CHECK_WCHAR: { PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); WCHAR *uv = (WCHAR *)input; - const char *name = uv_metrics(*uv, pdev->afm)->N->sz; + WCHAR out = uv_metrics(*uv, pdev->afm)->UV; - lstrcpynA(output, name, output_size); + if ((out & 0xff00) == 0xf000) out &= ~0xf000; + *(WCHAR *)output = out; return 1; } diff --git a/dlls/wineps.drv/unixlib.h b/dlls/wineps.drv/unixlib.h index 931bc14c152..a3b1a233a4e 100644 --- a/dlls/wineps.drv/unixlib.h +++ b/dlls/wineps.drv/unixlib.h @@ -20,7 +20,7 @@ #include "wine/unixlib.h" /* escapes */ -#define PSDRV_GET_GLYPH_NAME 0x10000 +#define PSDRV_CHECK_WCHAR 0x10000 #define PSDRV_GET_BUILTIN_FONT_INFO 0x10001 struct font_info

1 0

Piotr Caban : wineps: Store builtin fonts list in DEVMODE.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: b55576b6c37bbf4c566912069bd97d5f00e066fa URL: https://gitlab.winehq.org/wine/wine/-/commit/b55576b6c37bbf4c566912069bd97d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 14 14:45:28 2023 +0200 wineps: Store builtin fonts list in DEVMODE. --- dlls/wineps.drv/init.c | 16 ++++++++++++++-- dlls/wineps.drv/psdrv.h | 1 + dlls/wineps.drv/unixlib.h | 5 +++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 0da75ac60c9..7c2b71b46dd 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -503,11 +503,12 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) WCHAR *ppd_filename = NULL; char *nameA = NULL; BOOL using_default_devmode = FALSE; - int i, len, input_slots, resolutions, page_sizes, font_subs, size; + int i, len, input_slots, resolutions, page_sizes, font_subs, installed_fonts, size; struct input_slot *dm_slot; struct resolution *dm_res; struct page_size *dm_page; struct font_sub *dm_sub; + struct installed_font *dm_font; INPUTSLOT *slot; RESOLUTION *res; PAGESIZE *page; @@ -551,11 +552,13 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) resolutions = list_count( &pi->ppd->Resolutions ); page_sizes = list_count( &pi->ppd->PageSizes ); font_subs = pi->FontSubTableSize; + installed_fonts = list_count( &pi->ppd->InstalledFonts ); size = FIELD_OFFSET(PSDRV_DEVMODE, data[ input_slots * sizeof(struct input_slot) + resolutions * sizeof(struct resolution) + page_sizes * sizeof(struct page_size) + - font_subs * sizeof(struct font_sub)]); + font_subs * sizeof(struct font_sub) + + installed_fonts * sizeof(struct installed_font)]); pi->Devmode = get_devmode( hPrinter, name, &using_default_devmode, size ); if (!pi->Devmode) goto fail; @@ -590,6 +593,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->Devmode->input_slots = input_slots; pi->Devmode->resolutions = resolutions; pi->Devmode->page_sizes = page_sizes; + pi->Devmode->font_subs = font_subs; + pi->Devmode->installed_fonts = installed_fonts; dm_slot = (struct input_slot *)pi->Devmode->data; LIST_FOR_EACH_ENTRY( slot, &pi->ppd->InputSlots, INPUTSLOT, entry ) @@ -637,6 +642,13 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) lstrcpynW(dm_sub->sub, (WCHAR *)pi->FontSubTable[i].pData, ARRAY_SIZE(dm_sub->sub)); dm_sub++; } + + dm_font = (struct installed_font *)dm_sub; + LIST_FOR_EACH_ENTRY( font, &pi->ppd->InstalledFonts, FONTNAME, entry ) + { + lstrcpynA(dm_font->name, font->Name, ARRAY_SIZE(dm_font->name)); + dm_font++; + } } /* Duplex is indicated by the setting of the DM_DUPLEX bit in dmFields. diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 29ce1e80d9d..1d6ff1c69dc 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -228,6 +228,7 @@ typedef struct { int resolutions; int page_sizes; int font_subs; + int installed_fonts; BYTE data[1]; } PSDRV_DEVMODE; diff --git a/dlls/wineps.drv/unixlib.h b/dlls/wineps.drv/unixlib.h index a3b1a233a4e..9c56452585b 100644 --- a/dlls/wineps.drv/unixlib.h +++ b/dlls/wineps.drv/unixlib.h @@ -66,6 +66,11 @@ struct font_sub WCHAR sub[LF_FACESIZE]; }; +struct installed_font +{ + char name[LF_FACESIZE]; +}; + /* Unix calls */ enum wineps_funcs {

1 0

Piotr Caban : include: Add ddk/winddi.h header.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: 7a15c777b1f630ef15041ec3449cf4f5417d5630 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a15c777b1f630ef15041ec3449cf4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 14 18:55:37 2023 +0200 include: Add ddk/winddi.h header. --- include/Makefile.in | 1 + include/ddk/winddi.h | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 0dae4cab2bf..e9f0aa8d5fb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -213,6 +213,7 @@ SOURCES = \ ddk/usbioctl.h \ ddk/usbiodef.h \ ddk/wdm.h \ + ddk/winddi.h \ ddk/winddiui.h \ ddk/winsplp.h \ ddk/wsk.h \ diff --git a/include/ddk/winddi.h b/include/ddk/winddi.h new file mode 100644 index 00000000000..8f3a38e0b84 --- /dev/null +++ b/include/ddk/winddi.h @@ -0,0 +1,100 @@ +/* + * Definitions for Graphics Device Drivers interface + * + * Copyright 2023 Piotr Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINDDI_ +#define _WINDDI_ + +typedef LONG PTRDIFF; +typedef SHORT FWORD; + +#define FM_SEL_ITALIC 0x1 +#define FM_SEL_UNDERSCORE 0x2 +#define FM_SEL_NEGATIVE 0x4 +#define FM_SEL_OUTLINED 0x8 +#define FM_SEL_STRIKEOUT 0x10 +#define FM_SEL_BOLD 0x20 +#define FM_SEL_REGULAR 0x40 + +typedef struct _IFIMETRICS { + ULONG cjThis; + ULONG cjIfiExtra; + PTRDIFF dpwszFamilyName; + PTRDIFF dpwszStyleName; + PTRDIFF dpwszFaceName; + PTRDIFF dpwszUniqueName; + PTRDIFF dpFontSim; + LONG lEmbedId; + LONG lItalicAngle; + LONG lCharBias; + PTRDIFF dpCharSets; + BYTE jWinCharSet; + BYTE jWinPitchAndFamily; + USHORT usWinWeight; + ULONG flInfo; + USHORT fsSelection; + USHORT fsType; + FWORD fwdUnitsPerEm; + FWORD fwdLowestPPEm; + FWORD fwdWinAscender; + FWORD fwdWinDescender; + FWORD fwdMacAscender; + FWORD fwdMacDescender; + FWORD fwdMacLineGap; + FWORD fwdTypoAscender; + FWORD fwdTypoDescender; + FWORD fwdTypoLineGap; + FWORD fwdAveCharWidth; + FWORD fwdMaxCharInc; + FWORD fwdCapHeight; + FWORD fwdXHeight; + FWORD fwdSubscriptXSize; + FWORD fwdSubscriptYSize; + FWORD fwdSubscriptXOffset; + FWORD fwdSubscriptYOffset; + FWORD fwdSuperscriptXSize; + FWORD fwdSuperscriptYSize; + FWORD fwdSuperscriptXOffset; + FWORD fwdSuperscriptYOffset; + FWORD fwdUnderscoreSize; + FWORD fwdUnderscorePosition; + FWORD fwdStrikeoutSize; + FWORD fwdStrikeoutPosition; + BYTE chFirstChar; + BYTE chLastChar; + BYTE chDefaultChar; + BYTE chBreakChar; + WCHAR wcFirstChar; + WCHAR wcLastChar; + WCHAR wcDefaultChar; + WCHAR wcBreakChar; + POINTL ptlBaseline; + POINTL ptlAspect; + POINTL ptlCaret; + RECTL rclFontBox; + BYTE achVendId[4]; + ULONG cKerningPairs; + ULONG ulPanoseCulture; + PANOSE panose; +#ifdef _WIN64 + PVOID Align; +#endif +} IFIMETRICS, *PIFIMETRICS; + +#endif /* _WINDDI_ */

1 0

Piotr Caban : wineps: Add support for loading builtin fonts from NTF files.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: fbfb42f44f46e2c8b08cba293c5dab6fafe57dea URL: https://gitlab.winehq.org/wine/wine/-/commit/fbfb42f44f46e2c8b08cba293c5dab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 15 14:23:33 2023 +0200 wineps: Add support for loading builtin fonts from NTF files. --- dlls/wineps.drv/init.c | 52 +++++ dlls/wineps.drv/ntf.h | 87 ++++++++ dlls/wineps.drv/unixlib.c | 518 +++++++++++++++++++++++++++++++++++++++++++++- dlls/wineps.drv/unixlib.h | 7 + 4 files changed, 655 insertions(+), 9 deletions(-)

1 0

Piotr Caban : wineps: Enumerate NTF fonts in enum_fonts.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: 9a07269672b6d44d13d09e10f11a5634a8ee9982 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a07269672b6d44d13d09e10f11a56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 15 17:14:26 2023 +0200 wineps: Enumerate NTF fonts in enum_fonts. --- dlls/wineps.drv/unixlib.c | 70 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index ccef38fe5b6..766d5e8fe80 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -1391,6 +1391,30 @@ static HFONT CDECL select_font(PHYSDEV dev, HFONT hfont, UINT *aa_flags) return hfont; } +static UINT get_font_metric_ntf(const struct font_data *font, + NEWTEXTMETRICEXW *ntmx, ENUMLOGFONTEXW *elfx) +{ + /* ntmx->ntmTm is NEWTEXTMETRICW; compatible w/ TEXTMETRICW per Win32 doc */ + TEXTMETRICW *tm = (TEXTMETRICW *)&(ntmx->ntmTm); + LOGFONTW *lf = &(elfx->elfLogFont); + + memset(ntmx, 0, sizeof(*ntmx)); + memset(elfx, 0, sizeof(*elfx)); + + scale_font_ntf(NULL, font, -(LONG)font->metrics->fwdUnitsPerEm, tm); + + lf->lfHeight = tm->tmHeight; + lf->lfWidth = tm->tmAveCharWidth; + lf->lfWeight = tm->tmWeight; + lf->lfItalic = tm->tmItalic; + lf->lfCharSet = tm->tmCharSet; + + lf->lfPitchAndFamily = font->metrics->jWinPitchAndFamily & FIXED_PITCH ? FIXED_PITCH : VARIABLE_PITCH; + + lstrcpynW(lf->lfFaceName, (WCHAR *)((char *)font->metrics + font->metrics->dpwszFaceName), LF_FACESIZE); + return DEVICE_FONTTYPE; +} + static UINT get_font_metric(const AFM *afm, NEWTEXTMETRICEXW *ntmx, ENUMLOGFONTEXW *elfx) { /* ntmx->ntmTm is NEWTEXTMETRICW; compatible w/ TEXTMETRICW per Win32 doc */ @@ -1418,18 +1442,45 @@ static BOOL CDECL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LP { PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); PHYSDEV next = GET_NEXT_PHYSDEV(dev, pEnumFonts); + PSDRV_DEVMODE *devmode = pdev->devmode; + struct installed_font *installed_font; + struct font_data *cur; ENUMLOGFONTEXW lf; NEWTEXTMETRICEXW tm; - BOOL ret; AFMLISTENTRY *afmle; FONTFAMILY *family; + const WCHAR *name; + BOOL ret; + UINT fm; + int i; ret = next->funcs->pEnumFonts(next, plf, proc, lp); if (!ret) return FALSE; + installed_font = (struct installed_font *)(devmode->data + + devmode->input_slots * sizeof(struct input_slot) + + devmode->resolutions * sizeof(struct resolution) + + devmode->page_sizes * sizeof(struct page_size) + + devmode->font_subs * sizeof(struct font_sub)); if (plf && plf->lfFaceName[0]) { TRACE("lfFaceName = %s\n", debugstr_w(plf->lfFaceName)); + + for (i = 0; i < devmode->installed_fonts; i++) + { + cur = find_font_data(installed_font[i].name); + if (!cur) continue; + + name = (WCHAR *)((char *)cur->metrics + cur->metrics->dpwszFaceName); + if (wcsncmp(plf->lfFaceName, name, wcslen(name))) + continue; + + TRACE("Got '%s'\n", cur->name); + fm = get_font_metric_ntf(cur, &tm, &lf); + if (!(ret = (*proc)(&lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp))) + return ret; + } + for (family = pdev->pi->pi->Fonts; family; family = family->next) { if (!wcsncmp(plf->lfFaceName, family->FamilyName, @@ -1440,8 +1491,6 @@ static BOOL CDECL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LP { for (afmle = family->afmlist; afmle; afmle = afmle->next) { - UINT fm; - TRACE("Got '%s'\n", afmle->afm->FontName); fm = get_font_metric(afmle->afm, &tm, &lf); if (!(ret = (*proc)(&lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp))) @@ -1452,10 +1501,21 @@ static BOOL CDECL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LP else { TRACE("lfFaceName = NULL\n"); - for (family = pdev->pi->pi->Fonts; family; family = family->next) + + for (i = 0; i < devmode->installed_fonts; i++) { - UINT fm; + cur = find_font_data(installed_font[i].name); + if (!cur) continue; + name = (WCHAR *)((char *)cur->metrics + cur->metrics->dpwszFaceName); + TRACE("Got '%s'\n", cur->name); + fm = get_font_metric_ntf(cur, &tm, &lf); + if (!(ret = (*proc)(&lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp))) + return ret; + } + + for (family = pdev->pi->pi->Fonts; family; family = family->next) + { afmle = family->afmlist; TRACE("Got '%s'\n", afmle->afm->FontName); fm = get_font_metric(afmle->afm, &tm, &lf);

1 0

Piotr Caban : wineps: Pass font data in NTF format to unixlib.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: 351e58dc2d0aafe19294cbeaed9cd30ae965d591 URL: https://gitlab.winehq.org/wine/wine/-/commit/351e58dc2d0aafe19294cbeaed9cd3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 15 19:12:54 2023 +0200 wineps: Pass font data in NTF format to unixlib. --- dlls/wineps.drv/init.c | 146 +++++++++++++++++++++++++++++++++++++++++++++- dlls/wineps.drv/unixlib.c | 3 + 2 files changed, 148 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e1b6ffeb2cb..73e95b116ba 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -29,6 +29,8 @@ #include "winnls.h" #include "winuser.h" #include "psdrv.h" +#include "ddk/winddi.h" +#include "ntf.h" #include "unixlib.h" #include "winspool.h" #include "wine/debug.h" @@ -132,6 +134,148 @@ static BOOL import_ntf_from_reg(void) return ret; } +static BOOL convert_afm_to_ntf(void) +{ + int i, count, size, off, metrics_size; + struct import_ntf_params params; + struct width_range *width_range; + struct glyph_set *glyph_set; + struct ntf_header *header; + struct font_mtx *font_mtx; + struct list_entry *list; + struct code_page *cp; + char glyph_set_name[9]; + char *data, *new_data; + AFMLISTENTRY *afmle; + IFIMETRICS *metrics; + FONTFAMILY *family; + + count = 0; + for (family = PSDRV_AFMFontList; family; family = family->next) + { + for(afmle = family->afmlist; afmle; afmle = afmle->next) + count++; + } + size = sizeof(*header) + sizeof(*list) * count * 2; + data = calloc(size, 1); + + if (!data) + return FALSE; + header = (void *)data; + header->glyph_set_count = count; + header->glyph_set_off = sizeof(*header); + header->font_mtx_count = count; + header->font_mtx_off = header->glyph_set_off + sizeof(*list) * count; + + count = 0; + off = size; + for (family = PSDRV_AFMFontList; family; family = family->next) + { + for(afmle = family->afmlist; afmle; afmle = afmle->next) + { + sprintf(glyph_set_name, "%x", count); + + list = (void *)(data + header->glyph_set_off + sizeof(*list) * count); + list->name_off = off + sizeof(*glyph_set); + list->size = sizeof(*glyph_set) + strlen(glyph_set_name) + 1 + sizeof(*cp) + + sizeof(short) * afmle->afm->NumofMetrics; + list->off = off; + size += list->size; + new_data = realloc(data, size); + if (!new_data) + { + free(data); + return FALSE; + } + data = new_data; + header = (void *)data; + memset(data + off, 0, size - off); + + glyph_set = (void *)(data + off); + glyph_set->size = size - off; + glyph_set->flags = 1; + glyph_set->name_off = sizeof(*glyph_set); + glyph_set->glyph_count = afmle->afm->NumofMetrics; + glyph_set->cp_count = 1; + glyph_set->cp_off = glyph_set->name_off + strlen(glyph_set_name) + 1; + glyph_set->glyph_set_off = glyph_set->cp_off + sizeof(*cp); + strcpy(data + off + glyph_set->name_off, glyph_set_name); + cp = (void *)(data + off + glyph_set->cp_off); + cp->cp = 0xffff; + for (i = 0; i < afmle->afm->NumofMetrics; i++) + *(WCHAR*)(data + off + glyph_set->glyph_set_off + i * sizeof(short)) = afmle->afm->Metrics[i].UV; + off = size; + + metrics_size = sizeof(IFIMETRICS) + + (wcslen(afmle->afm->FullName) + 1) * sizeof(WCHAR); + list = (void *)(data + header->font_mtx_off + sizeof(*list) * count); + list->name_off = off + sizeof(*font_mtx); + list->size = sizeof(*font_mtx) + strlen(afmle->afm->FontName) + 1 + + strlen(glyph_set_name) + 1 + metrics_size + + (afmle->afm->IsFixedPitch ? 0 : sizeof(*width_range) * afmle->afm->NumofMetrics); + list->off = off; + size += list->size; + new_data = realloc(data, size); + if (!new_data) + { + free(data); + return FALSE; + } + data = new_data; + header = (void *)data; + memset(data + off, 0, size - off); + + font_mtx = (void *)(data + off); + font_mtx->size = size - off; + font_mtx->name_off = sizeof(*font_mtx); + font_mtx->glyph_set_name_off = font_mtx->name_off + strlen(afmle->afm->FontName) + 1; + font_mtx->glyph_count = afmle->afm->NumofMetrics; + font_mtx->metrics_off = font_mtx->glyph_set_name_off + strlen(glyph_set_name) + 1; + font_mtx->width_count = afmle->afm->IsFixedPitch ? 0 : afmle->afm->NumofMetrics; + font_mtx->width_off = font_mtx->metrics_off + metrics_size; + font_mtx->def_width = afmle->afm->Metrics[0].WX; + strcpy(data + off + font_mtx->name_off, afmle->afm->FontName); + strcpy(data + off + font_mtx->glyph_set_name_off, glyph_set_name); + metrics = (void *)(data + off + font_mtx->metrics_off); + metrics->cjThis = metrics_size; + metrics->dpwszFaceName = sizeof(*metrics); + if (afmle->afm->IsFixedPitch) + metrics->jWinPitchAndFamily |= FIXED_PITCH; + metrics->usWinWeight = afmle->afm->Weight; + if (afmle->afm->ItalicAngle != 0.0) + metrics->fsSelection |= FM_SEL_ITALIC; + if (afmle->afm->Weight == FW_BOLD) + metrics->fsSelection |= FM_SEL_BOLD; + metrics->fwdUnitsPerEm = afmle->afm->WinMetrics.usUnitsPerEm; + metrics->fwdWinAscender = afmle->afm->WinMetrics.usWinAscent; + metrics->fwdWinDescender = afmle->afm->WinMetrics.usWinDescent; + metrics->fwdMacAscender = afmle->afm->WinMetrics.sAscender; + metrics->fwdMacDescender = afmle->afm->WinMetrics.sDescender; + metrics->fwdMacLineGap = afmle->afm->WinMetrics.sLineGap; + metrics->fwdAveCharWidth = afmle->afm->WinMetrics.sAvgCharWidth; + metrics->rclFontBox.left = afmle->afm->FontBBox.llx; + metrics->rclFontBox.top = afmle->afm->FontBBox.ury; + metrics->rclFontBox.right = afmle->afm->FontBBox.urx; + metrics->rclFontBox.bottom = afmle->afm->FontBBox.lly; + wcscpy((WCHAR *)((char *)metrics + metrics->dpwszFaceName), afmle->afm->FullName); + width_range = (void *)(data + off + font_mtx->width_off); + for (i = 0; i < font_mtx->width_count; i++) + { + width_range[i].first = i; + width_range[i].count = 1; + width_range[i].width = afmle->afm->Metrics[i].WX; + } + off = size; + + count++; + } + } + + params.data = data; + params.size = size; + return WINE_UNIX_CALL(unix_import_ntf, &params); +} + /********************************************************************* * DllMain * @@ -161,7 +305,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return FALSE; } - if (!import_ntf_from_reg()) + if (!convert_afm_to_ntf() || !import_ntf_from_reg()) { WINE_UNIX_CALL(unix_free_printer_info, NULL); HeapDestroy(PSDRV_Heap); diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 766d5e8fe80..d7d545097f8 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -1764,6 +1764,9 @@ static WCHAR convert_ntf_cp(unsigned short c, unsigned short cp) case 0xfff1: ret = c < ARRAY_SIZE(map_fff1) ? map_fff1[c] : 0; break; + case 0xffff: /* Wine extension */ + ret = c; + break; } if (!ret && c)

1 0

Piotr Caban : wineps: Don't pass PRINTERINFO structure to unixlib.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: a6cb10bba2d05ceca6ba5b1411c450d38defdbb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6cb10bba2d05ceca6ba5b1411c450… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 15 17:34:23 2023 +0200 wineps: Don't pass PRINTERINFO structure to unixlib. --- dlls/wineps.drv/init.c | 5 +- dlls/wineps.drv/unixlib.c | 310 +++++----------------------------------------- dlls/wineps.drv/unixlib.h | 5 +- 3 files changed, 35 insertions(+), 285 deletions(-)

1 0