[PATCH 0/1] MR3032: wineps.drv: Use afm FamilyName instead of FullName

[Fabian Maurer (＠DarkShadow44)]

Fixes a regression introduced by a6cb10bba2d05ceca6ba5b1411c450d38defdbb4
The old logic also used FamilyName, and some applications depend on that

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54993
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54980
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3032

[PATCH 1/1] wineps.drv: Use afm FamilyName instead of FullName

[Fabian Maurer]

From: Fabian Maurer <dark.shadow4(a)web.de>

Fixes a regression introduced by a6cb10bba2d05ceca6ba5b1411c450d38defdbb4
The old logic also used FamilyName, and some applications depend on that

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54993
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54980
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 dlls/wineps.drv/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index 7119e9d4f2d..48cbbb016d1 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -256,7 +256,7 @@ static BOOL convert_afm_to_ntf(void)
             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);
+            wcscpy((WCHAR *)((char *)metrics + metrics->dpwszFaceName), afmle->afm->FamilyName);
             width_range = (void *)(data + off + font_mtx->width_off);
             for (i = 0; i < font_mtx->width_count; i++)
             {
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3032

[Piotr Caban (＠piotr)]

Piotr Caban (@piotr) commented about dlls/wineps.drv/init.c:
> 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);
> +            wcscpy((WCHAR *)((char *)metrics + metrics->dpwszFaceName), afmle->afm->FamilyName);

I'll need to take another look on that code tomorrow. Here are some thoughts after a quick look:
 - metrics_size calculation needs to be updated as well
 - family name should be stored in metrics->dpwszFamilyName

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3032#note_35390