GRAPHICS: Add support for PE FON files

This hopefully will work out of the box, but requires testing

2 files changed, 69 insertions, 22 deletions

diff --git a/graphics/fonts/winfont.cpp b/graphics/fonts/winfont.cpp
index 449a1de83e..bdb6133695 100644
--- a/graphics/fonts/winfont.cpp
+++ b/graphics/fonts/winfont.cpp
@@ -25,6 +25,7 @@
 #include "common/file.h"
 #include "common/str.h"
 #include "common/winexe_ne.h"
+#include "common/winexe_pe.h"
 #include "graphics/fonts/winfont.h"
 
 namespace Graphics {
@@ -75,8 +76,15 @@ static WinFontDirEntry readDirEntry(Common::SeekableReadStream &stream) {
 }
 
 bool WinFont::loadFromFON(const Common::String &fileName, const WinFontDirEntry &dirEntry) {
-	// TODO: PE libraries (If it's used anywhere by a ScummVM game)
+	// First try loading via the NE code
+	if (loadFromNE(fileName, dirEntry))
+		return true;
 
+	// Then try loading via the PE code
+	return loadFromPE(fileName, dirEntry);	
+}
+
+bool WinFont::loadFromNE(const Common::String &fileName, const WinFontDirEntry &dirEntry) {
 	Common::NEResources exe;
 
 	if (!exe.loadFromEXE(fileName))
@@ -89,44 +97,53 @@ bool WinFont::loadFromFON(const Common::String &fileName, const WinFontDirEntry
 		return false;
 	}
 
-	uint16 numFonts = fontDirectory->readUint16LE();
+	uint32 fontId = getFontIndex(*fontDirectory, dirEntry);
+	
+	delete fontDirectory;
 
-	// Probably not possible, so this is really a sanity check
-	if (numFonts == 0) {
-		warning("No fonts in '%s'", fileName.c_str());
+	// Couldn't match the face name
+	if (fontId == 0xffffffff) {
+		warning("Could not find face '%s' in '%s'", dirEntry.faceName.c_str(), fileName.c_str());
 		return false;
 	}
 
-	// Scour the directory for our matching name
-	int fontId = -1;
-	for (uint16 i = 0; i < numFonts; i++) {
-		uint16 id = fontDirectory->readUint16LE();
+	// Actually go get our font now...
+	Common::SeekableReadStream *fontStream = exe.getResource(Common::kNEFont, fontId);
+	if (!fontStream) {
+		warning("Could not find font %d in %s", fontId, fileName.c_str());
+		return false;
+	}
 
-		if (dirEntry.faceName.empty()) {
-			// Use the first name when empty
-			fontId = id;
-			break;
-		}
+	bool ok = loadFromFNT(*fontStream);
+	delete fontStream;
+	return ok;
+}
 
-		WinFontDirEntry entry = readDirEntry(*fontDirectory);
+bool WinFont::loadFromPE(const Common::String &fileName, const WinFontDirEntry &dirEntry) {
+	Common::PEResources exe;
 
-		if (dirEntry.faceName.equalsIgnoreCase(entry.faceName) && dirEntry.points == entry.points) {
-			// Match!
-			fontId = id;
-			break;
-		}
+	if (!exe.loadFromEXE(fileName))
+		return false;
+
+	// Let's pull out the font directory
+	Common::SeekableReadStream *fontDirectory = exe.getResource(Common::kPEFontDir, Common::String("FONTDIR"));
+	if (!fontDirectory) {
+		warning("No font directory in '%s'", fileName.c_str());
+		return false;
 	}
 
+	uint32 fontId = getFontIndex(*fontDirectory, dirEntry);
+	
 	delete fontDirectory;
 
 	// Couldn't match the face name
-	if (fontId < 0) {
+	if (fontId == 0xffffffff) {
 		warning("Could not find face '%s' in '%s'", dirEntry.faceName.c_str(), fileName.c_str());
 		return false;
 	}
 
 	// Actually go get our font now...
-	Common::SeekableReadStream *fontStream = exe.getResource(Common::kNEFont, fontId);
+	Common::SeekableReadStream *fontStream = exe.getResource(Common::kPEFont, fontId);
 	if (!fontStream) {
 		warning("Could not find font %d in %s", fontId, fileName.c_str());
 		return false;
@@ -137,6 +154,32 @@ bool WinFont::loadFromFON(const Common::String &fileName, const WinFontDirEntry
 	return ok;
 }
 
+uint32 WinFont::getFontIndex(Common::SeekableReadStream &stream, const WinFontDirEntry &dirEntry) {
+	uint16 numFonts = stream.readUint16LE();
+
+	// Probably not possible, so this is really a sanity check
+	if (numFonts == 0) {
+		warning("No fonts in exe");
+		return 0xffffffff;
+	}
+
+	// Scour the directory for our matching name
+	for (uint16 i = 0; i < numFonts; i++) {
+		uint16 id = stream.readUint16LE();
+
+		// Use the first name when empty
+		if (dirEntry.faceName.empty())
+			return id;
+
+		WinFontDirEntry entry = readDirEntry(stream);
+
+		if (dirEntry.faceName.equalsIgnoreCase(entry.faceName) && dirEntry.points == entry.points) // Match!
+			return id;
+	}
+
+	return 0xfffffff;
+}
+
 bool WinFont::loadFromFNT(const Common::String &fileName) {
 	Common::File file;
 
diff --git a/graphics/fonts/winfont.h b/graphics/fonts/winfont.h
index b23455e2d5..fbe4a778e2 100644
--- a/graphics/fonts/winfont.h
+++ b/graphics/fonts/winfont.h
@@ -69,6 +69,10 @@ public:
 	void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const;
 
 private:
+	bool loadFromPE(const Common::String &fileName, const WinFontDirEntry &dirEntry);
+	bool loadFromNE(const Common::String &fileName, const WinFontDirEntry &dirEntry);
+
+	uint32 getFontIndex(Common::SeekableReadStream &stream, const WinFontDirEntry &dirEntry);
 	bool loadFromFNT(Common::SeekableReadStream &stream);
 	char indexToCharacter(uint16 index) const;
 	uint16 characterToIndex(byte character) const;