Merge branch 'master' of github.com:scummvm/scummvm

5 files changed, 494 insertions, 24 deletions

diff --git a/graphics/fonts/winfont.cpp b/graphics/fonts/winfont.cpp
index fb37c8ddef..12509fd9e1 100644
--- a/graphics/fonts/winfont.cpp
+++ b/graphics/fonts/winfont.cpp
@@ -23,8 +23,9 @@
  */
 
 #include "common/file.h"
-#include "common/ne_exe.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 0xffffffff;
+}
+
 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;
diff --git a/graphics/module.mk b/graphics/module.mk
index c962f0617d..cb3a07e691 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -23,7 +23,8 @@ MODULE_OBJS := \
 	surface.o \
 	thumbnail.o \
 	VectorRenderer.o \
-	VectorRendererSpec.o
+	VectorRendererSpec.o \
+	wincursor.o
 
 ifdef USE_SCALERS
 MODULE_OBJS += \
diff --git a/graphics/wincursor.cpp b/graphics/wincursor.cpp
new file mode 100644
index 0000000000..d3c9414e03
--- /dev/null
+++ b/graphics/wincursor.cpp
@@ -0,0 +1,317 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/debug.h"
+#include "common/file.h"
+#include "common/memstream.h"
+#include "common/ptr.h"
+#include "common/str.h"
+#include "common/stream.h"
+#include "common/winexe_ne.h"
+#include "common/winexe_pe.h"
+
+#include "graphics/wincursor.h"
+
+namespace Graphics {
+
+WinCursor::WinCursor() {
+	_width    = 0;
+	_height   = 0;
+	_hotspotX = 0;
+	_hotspotY = 0;
+	_surface  = 0;
+	_keyColor = 0;
+	memset(_palette, 0, 256 * 3);
+}
+
+WinCursor::~WinCursor() {
+	clear();
+}
+
+uint16 WinCursor::getWidth() const {
+	return _width;
+}
+
+uint16 WinCursor::getHeight() const {
+	return _height;
+}
+
+uint16 WinCursor::getHotspotX() const {
+	return _hotspotX;
+}
+
+uint16 WinCursor::getHotspotY() const {
+	return _hotspotY;
+}
+
+byte WinCursor::getKeyColor() const {
+	return _keyColor;
+}
+
+bool WinCursor::readFromStream(Common::SeekableReadStream &stream) {
+	clear();
+
+	_hotspotX = stream.readUint16LE();
+	_hotspotY = stream.readUint16LE();
+
+	// Check header size
+	if (stream.readUint32LE() != 40)
+		return false;
+
+	// Check dimensions
+	_width = stream.readUint32LE();
+	_height = stream.readUint32LE() / 2;
+
+	if (_width & 3) {
+		// Cursors should always be a power of 2
+		// Of course, it wouldn't be hard to handle but if we have no examples...
+		warning("Non-divisible-by-4 width cursor found");
+		return false;
+	}
+
+	// Color planes
+	if (stream.readUint16LE() != 1)
+		return false;
+
+	// Only 1bpp and 8bpp supported
+	uint16 bitsPerPixel = stream.readUint16LE();
+	if (bitsPerPixel != 1 && bitsPerPixel != 8)
+		return false;
+
+	// Compression
+	if (stream.readUint32LE() != 0)
+		return false;
+
+	// Image size + X resolution + Y resolution
+	stream.skip(12);
+
+	uint32 numColors = stream.readUint32LE();
+
+	// If the color count is 0, then it uses up the maximum amount
+	if (numColors == 0)
+		numColors = 1 << bitsPerPixel;
+
+	// Reading the palette
+	stream.seek(40 + 4);
+	for (uint32 i = 0 ; i < numColors; i++) {
+		_palette[i * 3 + 2] = stream.readByte();
+		_palette[i * 3 + 1] = stream.readByte();
+		_palette[i * 3    ] = stream.readByte();
+		stream.readByte();
+	}
+
+	// Reading the bitmap data
+	uint32 dataSize = stream.size() - stream.pos();
+	byte *initialSource = new byte[dataSize];
+	stream.read(initialSource, dataSize);
+
+	// Parse the XOR map
+	const byte *src = initialSource;
+	_surface = new byte[_width * _height];
+	byte *dest = _surface + _width * (_height - 1);
+	uint32 imagePitch = _width * bitsPerPixel / 8;
+
+	for (uint32 i = 0; i < _height; i++) {
+		byte *rowDest = dest;
+
+		if (bitsPerPixel == 1) {
+			// 1bpp
+			for (uint32 j = 0; j < (_width / 8); j++) {
+				byte p = src[j];
+
+				for (int k = 0; k < 8; k++, rowDest++, p <<= 1) {
+					if ((p & 0x80) == 0x80)
+						*rowDest = 1;
+					else
+						*rowDest = 0;
+				}
+			}
+		} else {
+			// 8bpp
+			memcpy(rowDest, src, _width);
+		}
+
+		dest -= _width;
+		src += imagePitch;
+	}
+
+	// Calculate our key color
+	if (numColors < 256) {
+		// If we're not using the maximum colors in a byte, we can fit it in
+		_keyColor = numColors;
+	} else {
+		// HACK: Try to find a color that's not being used so it can become
+		// our keycolor. It's quite impossible to fit 257 entries into 256...
+		for (uint32 i = 0; i < 256; i++) {
+			for (int j = 0; j < _width * _height; j++) {
+				// TODO: Also check to see if the space is transparent
+
+				if (_surface[j] == i)
+					break;
+
+				if (j == _width * _height - 1) {
+					_keyColor = i;
+					i = 256;
+					break;
+				}
+			}
+		}
+	}
+
+	// Now go through and apply the AND map to get the transparency
+	uint32 andWidth = (_width + 7) / 8;
+	src += andWidth * (_height - 1);
+
+	for (uint32 y = 0; y < _height; y++) {
+		for (uint32 x = 0; x < _width; x++)
+			if (src[x / 8] & (1 << (7 - x % 8)))
+				_surface[y * _width + x] = _keyColor;
+
+		src -= andWidth;
+	}
+
+	delete[] initialSource;
+	return true;
+}
+
+void WinCursor::clear() {
+	delete[] _surface; _surface = 0;
+}
+
+WinCursorGroup::WinCursorGroup() {
+}
+
+WinCursorGroup::~WinCursorGroup() {
+	for (uint32 i = 0; i < cursors.size(); i++)
+		delete cursors[i].cursor;
+}
+
+WinCursorGroup *WinCursorGroup::createCursorGroup(Common::NEResources &exe, const Common::WinResourceID &id) {
+	Common::ScopedPtr<Common::SeekableReadStream> stream(exe.getResource(Common::kNEGroupCursor, id));
+
+	if (!stream || stream->size() <= 6)
+		return 0;
+
+	stream->skip(4);
+	uint32 cursorCount = stream->readUint16LE();
+	if ((uint32)stream->size() < (6 + cursorCount * 16))
+		return 0;
+
+	WinCursorGroup *group = new WinCursorGroup();
+	group->cursors.reserve(cursorCount);
+
+	for (uint32 i = 0; i < cursorCount; i++) {
+		stream->readUint16LE(); // width
+		stream->readUint16LE(); // height
+
+		// Plane count
+		if (stream->readUint16LE() != 1) {
+			delete group;
+			return 0;
+		}
+
+		// Bits per pixel
+		// NE cursors can only be 1bpp
+		if (stream->readUint16LE() != 1) {
+			delete group;
+			return 0;
+		}
+
+		stream->readUint32LE(); // data size
+		uint32 cursorId = stream->readUint32LE();
+
+		Common::ScopedPtr<Common::SeekableReadStream> cursorStream(exe.getResource(Common::kNECursor, cursorId));
+		if (!cursorStream) {
+			delete group;
+			return 0;
+		}
+
+		WinCursor *cursor = new WinCursor();
+		if (!cursor->readFromStream(*cursorStream)) {
+			delete cursor;
+			delete group;
+			return 0;
+		}
+
+		CursorItem item;
+		item.id = cursorId;
+		item.cursor = cursor;
+		group->cursors.push_back(item);
+	}
+
+	return group;
+}
+
+WinCursorGroup *WinCursorGroup::createCursorGroup(Common::PEResources &exe, const Common::WinResourceID &id) {
+	Common::ScopedPtr<Common::SeekableReadStream> stream(exe.getResource(Common::kPEGroupCursor, id));
+
+	if (!stream || stream->size() <= 6)
+		return 0;
+
+	stream->skip(4);
+	uint32 cursorCount = stream->readUint16LE();
+	if ((uint32)stream->size() < (6 + cursorCount * 14))
+		return 0;
+
+	WinCursorGroup *group = new WinCursorGroup();
+	group->cursors.reserve(cursorCount);
+
+	for (uint32 i = 0; i < cursorCount; i++) {
+		stream->readUint16LE(); // width
+		stream->readUint16LE(); // height
+
+		// Plane count
+		if (stream->readUint16LE() != 1) {
+			delete group;
+			return 0;
+		}
+
+		stream->readUint16LE(); // bits per pixel
+		stream->readUint32LE(); // data size
+		uint32 cursorId = stream->readUint16LE();
+
+		Common::ScopedPtr<Common::SeekableReadStream> cursorStream(exe.getResource(Common::kPECursor, cursorId));
+		if (!cursorStream) {
+			delete group;
+			return 0;
+		}
+
+		WinCursor *cursor = new WinCursor();
+		if (!cursor->readFromStream(*cursorStream)) {
+			delete cursor;
+			delete group;
+			return 0;
+		}
+
+		CursorItem item;
+		item.id = cursorId;
+		item.cursor = cursor;
+		group->cursors.push_back(item);
+	}
+
+	return group;
+}
+
+} // End of namespace Graphics
diff --git a/graphics/wincursor.h b/graphics/wincursor.h
new file mode 100644
index 0000000000..ca0abf6fe1
--- /dev/null
+++ b/graphics/wincursor.h
@@ -0,0 +1,105 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef GRAPHICS_WINCURSOR_H
+#define GRAPHICS_WINCURSOR_H
+
+#include "common/array.h"
+#include "common/winexe.h"
+
+namespace Common {
+	class NEResources;
+	class PEResources;
+	class SeekableReadStream;
+}
+
+namespace Graphics {
+
+/** A Windows cursor. */
+class WinCursor {
+public:
+	WinCursor();
+	~WinCursor();
+
+	/** Return the cursor's width. */
+	uint16 getWidth() const;
+	/** Return the cursor's height. */
+	uint16 getHeight() const;
+	/** Return the cursor's hotspot's x coordinate. */
+	uint16 getHotspotX() const;
+	/** Return the cursor's hotspot's y coordinate. */
+	uint16 getHotspotY() const;
+	/** Return the cursor's transparent key. */
+	byte getKeyColor() const;
+
+	const byte *getSurface() const { return _surface; }
+	const byte *getPalette() const { return _palette; }
+
+	/** Read the cursor's data out of a stream. */
+	bool readFromStream(Common::SeekableReadStream &stream);
+
+private:
+	byte *_surface;
+	byte _palette[256 * 3];
+
+	uint16 _width;    ///< The cursor's width.
+	uint16 _height;   ///< The cursor's height.
+	uint16 _hotspotX; ///< The cursor's hotspot's x coordinate.
+	uint16 _hotspotY; ///< The cursor's hotspot's y coordinate.
+	byte   _keyColor; ///< The cursor's transparent key
+
+	/** Clear the cursor. */
+	void clear();
+};
+
+/**
+ * A structure holding an array of cursors from a single Windows Executable cursor group.
+ *
+ * Windows lumps different versions of the same cursors/icons together and decides which one
+ * to use based on the screen's color depth and resolution. For instance, one cursor group
+ * could hold a 1bpp 16x16 cursorand a 8bpp 16x16 cursor. This will hold all cursors in the
+ * group. This class should be used to actually parse the cursors, whereas WinCursor is just
+ * the representation used by this struct to store the cursors.
+ */
+struct WinCursorGroup {
+	WinCursorGroup();
+	~WinCursorGroup();
+
+	struct CursorItem {
+		Common::WinResourceID id;
+		WinCursor *cursor;
+	};
+
+	Common::Array<CursorItem> cursors;
+
+	/** Create a cursor group from an NE EXE, returns 0 on failure */
+	static WinCursorGroup *createCursorGroup(Common::NEResources &exe, const Common::WinResourceID &id);
+	/** Create a cursor group from an PE EXE, returns 0 on failure */
+	static WinCursorGroup *createCursorGroup(Common::PEResources &exe, const Common::WinResourceID &id);
+};
+
+} // End of namespace Graphics
+
+#endif