From 56e486b699a632d6dbff6db37e4450033562746c Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Thu, 18 Jun 2020 21:31:56 -0300
Subject: [PATCH] Improve printer library dependency errors

---
 src/include/86box/language.h |  4 +++-
 src/printer/prt_escp.c       |  4 ++--
 src/printer/prt_ps.c         |  2 +-
 src/win/86Box.rc             | 22 +++++++++++++++++-----
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/include/86box/language.h b/src/include/86box/language.h
index 9bb707c6b..bdd043eb7 100644
--- a/src/include/86box/language.h
+++ b/src/include/86box/language.h
@@ -102,8 +102,10 @@
 #define IDS_2126	2126		// "An emulator of old computers..."
 #define IDS_2127	2127		// "OK"
 #define IDS_2128	2128		// "Hardware not available"
-#define IDS_2129	2129		// "Make sure " PCAP " is installed..."
+#define IDS_2129	2129		// "Make sure " LIB_NAME_PCAP "..."
 #define IDS_2130	2130		// "Invalid configuration"
+#define IDS_2131	2131		// LIB_NAME_FREETYPE " is required..."
+#define IDS_2132	2132		// LIB_NAME_GS " is required for...
 
 #define IDS_4096	4096		// "Hard disk (%s)"
 #define IDS_4097	4097		// "%01i:%01i"
diff --git a/src/printer/prt_escp.c b/src/printer/prt_escp.c
index 9cfc2a762..b30d955ef 100644
--- a/src/printer/prt_escp.c
+++ b/src/printer/prt_escp.c
@@ -2036,7 +2036,7 @@ escp_init(void *lpt)
     if (ft_handle == NULL) {
 	ft_handle = dynld_module(fn, ft_imports);
 	if (ft_handle == NULL) {
-		ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2110);
+		ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2110, (wchar_t *) IDS_2131);
 		return(NULL);
 	}
     }
@@ -2044,7 +2044,7 @@ escp_init(void *lpt)
     /* Initialize FreeType. */
     if (ft_lib == NULL) {
 	if (ft_Init_FreeType(&ft_lib)) {
-		ui_msgbox(MBX_ERROR, (wchar_t *)IDS_2110);
+		ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2110, (wchar_t *) IDS_2131);
 		dynld_close(ft_lib);
 		ft_lib = NULL;
 		return(NULL);
diff --git a/src/printer/prt_ps.c b/src/printer/prt_ps.c
index b822ff17a..b3d7500d4 100644
--- a/src/printer/prt_ps.c
+++ b/src/printer/prt_ps.c
@@ -352,7 +352,7 @@ ps_init(void *lpt)
     /* Try loading the DLL. */
     ghostscript_handle = dynld_module(PATH_GHOSTSCRIPT_DLL, ghostscript_imports);
     if (ghostscript_handle == NULL) {
-	ui_msgbox(MBX_ERROR, (wchar_t *) IDS_2114);
+	ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2114, (wchar_t *) IDS_2132);
     } else {
 	if (gsapi_revision(&rev, sizeof(rev)) == 0) {
 		pclog("Loaded %s, rev %ld (%ld)\n", rev.product, rev.revision, rev.revisiondate);
diff --git a/src/win/86Box.rc b/src/win/86Box.rc
index ce9747a67..4e01a43b1 100644
--- a/src/win/86Box.rc
+++ b/src/win/86Box.rc
@@ -947,11 +947,11 @@ BEGIN
     IDS_2107	"%u MB (CHS: %i, %i, %i)"
     IDS_2108	"Floppy %i (%s): %ls"
     IDS_2109	"All images (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Advanced sector images (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Basic sector images (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Flux images (*.FDI)\0*.FDI\0Surface images (*.86F;*.MFM)\0*.86F;*.MFM\0All files (*.*)\0*.*\0"
-    IDS_2110	"Unable to initialize FreeType, freetype.dll is required"
+    IDS_2110	"Unable to initialize FreeType"
     IDS_2111	"Unable to initialize SDL, SDL2.dll is required"
     IDS_2112	"Are you sure you want to hard reset the emulated machine?"
     IDS_2113	"Are you sure you want to quit 86Box?"
-    IDS_2114	"Unable to initialize Ghostscript, gsdll32.dll is required for automatic convertion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript files (.ps)."
+    IDS_2114	"Unable to initialize Ghostscript"
     IDS_2115	"MO %i (%03i): %ls"
     IDS_2116	"MO images (*.IM?)\0*.IM?\0All files (*.*)\0*.*\0"
     IDS_2117	"Welcome to 86Box!"
@@ -967,12 +967,24 @@ BEGIN
     IDS_2127	"OK"
     IDS_2128	"Hardware not available"
 #ifdef _WIN32
-#define PCAP "WinPcap"
+#define LIB_NAME_PCAP "WinPcap"
 #else
-#define PCAP "libpcap"
+#define LIB_NAME_PCAP "libpcap"
 #endif
-    IDS_2129	"Make sure " PCAP " is installed and that you are on a " PCAP "-compatible network connection."
+    IDS_2129	"Make sure " LIB_NAME_PCAP " is installed and that you are on a " LIB_NAME_PCAP "-compatible network connection."
     IDS_2130	"Invalid configuration"
+#ifdef _WIN32
+#define LIB_NAME_FREETYPE "freetype.dll"
+#else
+#define LIB_NAME_FREETYPE "libfreetype"
+#endif
+    IDS_2131	LIB_NAME_FREETYPE " is required for ESC/P printer emulation."
+#ifdef _WIN32
+#define LIB_NAME_GS "gsdll32.dll"
+#else
+#define LIB_NAME_GS "libgs"
+#endif
+    IDS_2132	LIB_NAME_GS " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
 END
 
 STRINGTABLE DISCARDABLE