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

Francois Gouget : taskschd/tests: Fix the spelling of a test string.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: 1017f0ae1b4da0f141a4d111666d695240db6ea2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1017f0ae1b4da0f141a4d111666d69… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 16 03:06:08 2023 +0200 taskschd/tests: Fix the spelling of a test string. --- dlls/taskschd/tests/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 6db3a86ba8a..bf6e13be98b 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1380,7 +1380,7 @@ static void create_action(ITaskDefinition *taskdef) { static WCHAR task1_exe[] = L"task1.exe"; static WCHAR workdir[] = L"workdir"; - static WCHAR args[] = L"argumens"; + static WCHAR args[] = L"arguments"; static WCHAR comment[] = L"comment"; HRESULT hr; IActionCollection *actions;

1 0

Francois Gouget : ndtll: Fix the spelling of a comment.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: decb572d1af1896f4d61032d74b587fa257795f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/decb572d1af1896f4d61032d74b587… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 15 20:52:50 2023 +0200 ndtll: Fix the spelling of a comment. --- dlls/ntdll/unix/sync.c | 2 +- dlls/wow64/sync.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 831c16130b9..c164539d214 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1022,7 +1022,7 @@ static NTSTATUS event_data_to_state_change( const debug_event_t *data, DBGUI_WAI } #ifndef _WIN64 -/* helper to NtWaitForDebugEvent; retrive machine from PE image */ +/* helper to NtWaitForDebugEvent; retrieve machine from PE image */ static NTSTATUS get_image_machine( HANDLE handle, USHORT *machine ) { IMAGE_DOS_HEADER dos_hdr; diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 385477ef5fa..a1a1968ecd5 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -1490,7 +1490,7 @@ NTSTATUS WINAPI wow64_NtWaitForAlertByThreadId( UINT *args ) } -/* helper to wow64_NtWaitForDebugEvent; retrive machine from PE image */ +/* helper to wow64_NtWaitForDebugEvent; retrieve machine from PE image */ static NTSTATUS get_image_machine( HANDLE handle, USHORT *machine ) { IMAGE_DOS_HEADER dos_hdr;

1 0

Francois Gouget : msado15: Fix the spelling of a comment.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: 8caae7de4fb2789630f937d4a11a7e4b4c85cce5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8caae7de4fb2789630f937d4a11a7e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 16 03:07:14 2023 +0200 msado15: Fix the spelling of a comment. --- dlls/msado15/recordset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 5522a3c9e61..84db7fc581d 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -2087,7 +2087,7 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT return hr; /* We want to create the field member variable without mapping the rowset fields, this will - * save quering the fields twice. Fields will be added while we create the bindings + * save querying the fields twice. Fields will be added while we create the bindings. */ hr = fields_create( recordset, &recordset->fields ); if (FAILED(hr))

1 0

Francois Gouget : mf/tests: Fix the spelling of a win_skip() message.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: decc90187ecd2136be9c3b8cd73c05295be9ed2e URL: https://gitlab.winehq.org/wine/wine/-/commit/decc90187ecd2136be9c3b8cd73c05… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 15 20:57:52 2023 +0200 mf/tests: Fix the spelling of a win_skip() message. --- dlls/mf/tests/transform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index ec9be42d8c8..def0170e106 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -7081,7 +7081,7 @@ static void test_h264_with_dxgi_manager(void) if (!pMFCreateDXGIDeviceManager) { - win_skip("MFCreateDXGIDeviceManager() is not avaliable, skipping tests.\n"); + win_skip("MFCreateDXGIDeviceManager() is not available, skipping tests.\n"); return; }

1 0

Francois Gouget : imm32/tests: Fix the spelling of a comment.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: a109a7048fb09f35ca24aaa2fbb4cafa5d9bee88 URL: https://gitlab.winehq.org/wine/wine/-/commit/a109a7048fb09f35ca24aaa2fbb4ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 16 03:55:37 2023 +0200 imm32/tests: Fix the spelling of a comment. --- dlls/imm32/tests/imm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 4bdb6be4a31..95f832b97e4 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -3924,7 +3924,7 @@ static void test_ImmGetProperty(void) else if (hkl == (HKL)0x08040804) expect = &expect_ime_info_0804; else expect = &expect_ime_info; - /* IME_PROP_COMPLETE_ON_UNSELECT seems to be somtimes set on CJK locales IMEs, sometimes not */ + /* IME_PROP_COMPLETE_ON_UNSELECT seems to be sometimes set on CJK locales IMEs, sometimes not */ ok_ret( expect->fdwProperty, ImmGetProperty( hkl, IGP_PROPERTY ) & ~IME_PROP_COMPLETE_ON_UNSELECT ); todo_wine ok_ret( expect->fdwConversionCaps, ImmGetProperty( hkl, IGP_CONVERSION ) );

1 0

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

May 16, 2023

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

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

May 16, 2023

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: Enumerate NTF fonts in enum_fonts.
by Alexandre Julliard May 16, 2023

May 16, 2023

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: Convert WCHAR to Adobe Glyph name on PE side.
by Alexandre Julliard May 16, 2023

May 16, 2023

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: Add support for loading builtin fonts from NTF files.
by Alexandre Julliard May 16, 2023

May 16, 2023

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