Merge branch 'master' into mm

Conflicts:
	engines/access/access.cpp
	engines/access/asurface.h
	engines/access/bubble_box.cpp
	engines/access/bubble_box.h
	engines/access/martian/martian_game.cpp
	engines/access/player.cpp
	engines/access/player.h
	engines/access/resources.cpp
	engines/access/screen.cpp
	engines/access/screen.h
	engines/access/sound.cpp
	engines/access/sound.h

5 files changed, 56 insertions, 19 deletions

diff --git a/test/audio/timestamp.h b/test/audio/timestamp.h
index ca56e34a4d..ec42a55ec4 100644
--- a/test/audio/timestamp.h
+++ b/test/audio/timestamp.h
@@ -2,6 +2,8 @@
 
 #include "audio/timestamp.h"
 
+#include <limits.h>
+
 class TimestampTestSuite : public CxxTest::TestSuite
 {
 	public:
@@ -238,4 +240,15 @@ class TimestampTestSuite : public CxxTest::TestSuite
 		TS_ASSERT_EQUALS(c.numberOfFrames(), 11025);
 		TS_ASSERT_EQUALS(c.totalNumberOfFrames(), 33075);
 	}
+
+	void test_no_overflow() {
+		// The constructor should not overflow and give incoherent values
+		const Audio::Timestamp a = Audio::Timestamp(0, UINT_MAX, 1000);
+
+		int secs = UINT_MAX / 1000;
+		int frames = UINT_MAX % 1000;
+
+		TS_ASSERT_EQUALS(a.secs(), secs);
+		TS_ASSERT_EQUALS(a.numberOfFrames(), frames);
+	}
 };
diff --git a/test/common/endian.h b/test/common/endian.h
index cba7618c43..065b6997fc 100644
--- a/test/common/endian.h
+++ b/test/common/endian.h
@@ -10,6 +10,18 @@ class EndianTestSuite : public CxxTest::TestSuite
 		TS_ASSERT_EQUALS(MKTAG('A','B','C','D'), tag);
 	}
 
+	void test_READ_BE_UINT64() {
+		const byte data[8] = {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF};
+		uint64 value = READ_BE_UINT64(data);
+		TS_ASSERT_EQUALS(value, 0x123456789ABCDEFFULL);
+	}
+
+	void test_READ_LE_UINT64() {
+		const byte data[8] = {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF};
+		uint64 value = READ_LE_UINT64(data);
+		TS_ASSERT_EQUALS(value, 0xFFDEBC9A78563412ULL);
+	}
+
 	void test_READ_BE_UINT32() {
 		const char data[4] = { 0x12, 0x34, 0x56, 0x78 };
 		uint32 value = READ_BE_UINT32(data);
diff --git a/test/common/memoryreadstream.h b/test/common/memoryreadstream.h
index adef861a5e..3e1472f408 100644
--- a/test/common/memoryreadstream.h
+++ b/test/common/memoryreadstream.h
@@ -60,28 +60,32 @@ class MemoryReadStreamTestSuite : public CxxTest::TestSuite {
 	}
 
 	void test_seek_read_le() {
-		byte contents[] = { 1, 2, 3, 4, 5, 6, 7 };
+		byte contents[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 		Common::MemoryReadStream ms(contents, sizeof(contents));
 
 		TS_ASSERT_EQUALS(ms.readUint16LE(), 0x0201UL);
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32LE(), 0x06050403UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readByte(), 0x07);
-		TS_ASSERT_EQUALS(ms.pos(), 7);
+		TS_ASSERT_EQUALS(ms.readUint64LE(), 0x0E0D0C0B0A090807ULL);
+		TS_ASSERT_EQUALS(ms.pos(), 14);
+		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
+		TS_ASSERT_EQUALS(ms.pos(), 15);
 		TS_ASSERT(!ms.eos());
 	}
 
 	void test_seek_read_be() {
-		byte contents[] = { 1, 2, 3, 4, 5, 6, 7 };
+		byte contents[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 		Common::MemoryReadStream ms(contents, sizeof(contents));
 
 		TS_ASSERT_EQUALS(ms.readUint16BE(), 0x0102UL);
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32BE(), 0x03040506UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readByte(), 0x07);
-		TS_ASSERT_EQUALS(ms.pos(), 7);
+		TS_ASSERT_EQUALS(ms.readUint64BE(), 0x0708090A0B0C0D0EULL);
+		TS_ASSERT_EQUALS(ms.pos(), 14);
+		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
+		TS_ASSERT_EQUALS(ms.pos(), 15);
 		TS_ASSERT(!ms.eos());
 	}
 
diff --git a/test/common/memoryreadstreamendian.h b/test/common/memoryreadstreamendian.h
index 35e804c70b..c25ec29e1a 100644
--- a/test/common/memoryreadstreamendian.h
+++ b/test/common/memoryreadstreamendian.h
@@ -60,54 +60,62 @@ class MemoryReadStreamEndianTestSuite : public CxxTest::TestSuite {
 	}
 
 	void test_seek_read_le() {
-		byte contents[] = { 1, 2, 3, 4, 5, 6, 7 };
+		byte contents[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 		Common::MemoryReadStreamEndian ms(contents, sizeof(contents), false);
 
 		TS_ASSERT_EQUALS(ms.readUint16LE(), 0x0201UL);
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32LE(), 0x06050403UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readByte(), 0x07);
-		TS_ASSERT_EQUALS(ms.pos(), 7);
+		TS_ASSERT_EQUALS(ms.readUint64LE(), 0x0E0D0C0B0A090807ULL);
+		TS_ASSERT_EQUALS(ms.pos(), 14);
+		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
+		TS_ASSERT_EQUALS(ms.pos(), 15);
 		TS_ASSERT(!ms.eos());
 	}
 
 	void test_seek_read_be() {
-		byte contents[] = { 1, 2, 3, 4, 5, 6, 7 };
+		byte contents[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 		Common::MemoryReadStreamEndian ms(contents, sizeof(contents), false);
 
 		TS_ASSERT_EQUALS(ms.readUint16BE(), 0x0102UL);
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32BE(), 0x03040506UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readByte(), 0x07);
-		TS_ASSERT_EQUALS(ms.pos(), 7);
+		TS_ASSERT_EQUALS(ms.readUint64BE(), 0x0708090A0B0C0D0EULL);
+		TS_ASSERT_EQUALS(ms.pos(), 14);
+		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
+		TS_ASSERT_EQUALS(ms.pos(), 15);
 		TS_ASSERT(!ms.eos());
 	}
 
 	void test_seek_read_le2() {
-		byte contents[] = { 1, 2, 3, 4, 5, 6, 7 };
+		byte contents[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 		Common::MemoryReadStreamEndian ms(contents, sizeof(contents), false);
 
 		TS_ASSERT_EQUALS(ms.readUint16(), 0x0201UL);
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32(), 0x06050403UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readByte(), 0x07);
-		TS_ASSERT_EQUALS(ms.pos(), 7);
+		TS_ASSERT_EQUALS(ms.readUint64(), 0x0E0D0C0B0A090807ULL);
+		TS_ASSERT_EQUALS(ms.pos(), 14);
+		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
+		TS_ASSERT_EQUALS(ms.pos(), 15);
 		TS_ASSERT(!ms.eos());
 	}
 
 	void test_seek_read_be2() {
-		byte contents[] = { 1, 2, 3, 4, 5, 6, 7 };
+		byte contents[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 		Common::MemoryReadStreamEndian ms(contents, sizeof(contents), true);
 
 		TS_ASSERT_EQUALS(ms.readUint16(), 0x0102UL);
 		TS_ASSERT_EQUALS(ms.pos(), 2);
 		TS_ASSERT_EQUALS(ms.readUint32(), 0x03040506UL);
 		TS_ASSERT_EQUALS(ms.pos(), 6);
-		TS_ASSERT_EQUALS(ms.readByte(), 0x07);
-		TS_ASSERT_EQUALS(ms.pos(), 7);
+		TS_ASSERT_EQUALS(ms.readUint64(), 0x0708090A0B0C0D0EULL);
+		TS_ASSERT_EQUALS(ms.pos(), 14);
+		TS_ASSERT_EQUALS(ms.readByte(), 0x0F);
+		TS_ASSERT_EQUALS(ms.pos(), 15);
 		TS_ASSERT(!ms.eos());
 	}
 };
diff --git a/test/cxxtest/cxxtestgen.py b/test/cxxtest/cxxtestgen.py
index 4145c3ca3e..46267ac3e3 100755
--- a/test/cxxtest/cxxtestgen.py
+++ b/test/cxxtest/cxxtestgen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 '''Usage: %s [OPTIONS] <input file(s)>
 Generate test source file for CxxTest.