Piotr Caban : wineps: Store builtin fonts list in DEVMODE.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b55576b6c37bbf4c566912069bd97d5f00e066fa
URL:    https://gitlab.winehq.org/wine/wine/-/commit/b55576b6c37bbf4c566912069bd97d5...

Author: Piotr Caban 
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
 {