Added hendu's constification patch for memory read/write files. Also slightly...

Added hendu's constification patch for memory read/write files. Also slightly changed the use of global C methods to class specific static methods, which seems more appropriate

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4471 dfc29bdd-3216-0410-991c-e03cc46cb475

include/IFileSystem.h

@@ -51,7 +51,7 @@ public:
 	The returned pointer should be dropped when no longer needed.
 	See IReferenceCounted::drop() for more information.
 	*/
-	virtual IReadFile* createMemoryReadFile(void* memory, s32 len, const path& fileName, bool deleteMemoryWhenDropped=false) =0;
+	virtual IReadFile* createMemoryReadFile(const void* memory, s32 len, const path& fileName, bool deleteMemoryWhenDropped=false) =0;
 
 	//! Creates an IReadFile interface for accessing files inside files.
 	/** This is useful e.g. for archives.

include/IReadFile.h

@@ -44,12 +44,8 @@ namespace io
 		virtual const io::path& getFileName() const = 0;
 	};
 
-	//! Internal function, please do not use.
-	IReadFile* createReadFile(const io::path& fileName);
 	//! Internal function, please do not use.
 	IReadFile* createLimitReadFile(const io::path& fileName, IReadFile* alreadyOpenedFile, long pos, long areaSize);
-	//! Internal function, please do not use.
-	IReadFile* createMemoryReadFile(void* memory, long size, const io::path& fileName, bool deleteMemoryWhenDropped);
 
 } // end namespace io
 } // end namespace irr

include/IWriteFile.h

@@ -40,9 +40,6 @@ namespace io
 		virtual const path& getFileName() const = 0;
 	};
 
-	//! Internal function, please do not use.
-	IWriteFile* createWriteFile(const io::path& fileName, bool append);
-
 } // end namespace io
 } // end namespace irr
 

source/Irrlicht/CFileSystem.cpp

@@ -19,8 +19,10 @@
 #include "stdio.h"
 #include "os.h"
 #include "CAttributes.h"
+#include "CReadFile.h"
 #include "CMemoryFile.h"
 #include "CLimitReadFile.h"
+#include "CWriteFile.h"
 #include "irrList.h"
 
 #if defined (_IRR_WINDOWS_API_)
@@ -117,19 +119,19 @@ IReadFile* CFileSystem::createAndOpenFile(const io::path& filename)
 
 	// Create the file using an absolute path so that it matches
 	// the scheme used by CNullDriver::getTexture().
-	return createReadFile(getAbsolutePath(filename));
+	return CReadFile::createReadFile(getAbsolutePath(filename));
 }
 
 
 //! Creates an IReadFile interface for treating memory like a file.
-IReadFile* CFileSystem::createMemoryReadFile(void* memory, s32 len,
+IReadFile* CFileSystem::createMemoryReadFile(const void* memory, s32 len,
 		const io::path& fileName, bool deleteMemoryWhenDropped)
 {
 	if (!memory)
 		return 0;
 	else
-		return new CMemoryFile(memory, len, fileName, deleteMemoryWhenDropped);
-			}
+		return new CMemoryReadFile(memory, len, fileName, deleteMemoryWhenDropped);
+}
 
 
 //! Creates an IReadFile interface for reading files inside files
@@ -150,14 +152,14 @@ IWriteFile* CFileSystem::createMemoryWriteFile(void* memory, s32 len,
 	if (!memory)
 		return 0;
 	else
-		return new CMemoryFile(memory, len, fileName, deleteMemoryWhenDropped);
+		return new CMemoryWriteFile(memory, len, fileName, deleteMemoryWhenDropped);
 }
 
 
 //! Opens a file for write access.
 IWriteFile* CFileSystem::createAndWriteFile(const io::path& filename, bool append)
 {
-	return createWriteFile(filename, append);
+	return CWriteFile::createWriteFile(filename, append);
 }
 
 

source/Irrlicht/CFileSystem.h

@@ -34,7 +34,7 @@ public:
 	virtual IReadFile* createAndOpenFile(const io::path& filename);
 
 	//! Creates an IReadFile interface for accessing memory like a file.
-	virtual IReadFile* createMemoryReadFile(void* memory, s32 len, const io::path& fileName, bool deleteMemoryWhenDropped = false);
+	virtual IReadFile* createMemoryReadFile(const void* memory, s32 len, const io::path& fileName, bool deleteMemoryWhenDropped = false);
 
 	//! Creates an IReadFile interface for accessing files inside files
 	virtual IReadFile* createLimitReadFile(const io::path& fileName, IReadFile* alreadyOpenedFile, long pos, long areaSize);

source/Irrlicht/CGUIEnvironment.cpp

@@ -168,7 +168,7 @@ CGUIEnvironment::~CGUIEnvironment()
 
 void CGUIEnvironment::loadBuiltInFont()
 {
-	io::IReadFile* file = io::createMemoryReadFile((void *) BuiltInFontData,
+	io::IReadFile* file = FileSystem->createMemoryReadFile(BuiltInFontData,
 				BuiltInFontDataSize, DefaultFontName, false);
 
 	CGUIFont* font = new CGUIFont(this, DefaultFontName );

source/Irrlicht/CMemoryFile.cpp

@@ -11,16 +11,16 @@ namespace io
 {
 
 
-CMemoryFile::CMemoryFile(void* memory, long len, const io::path& fileName, bool d)
+CMemoryReadFile::CMemoryReadFile(const void* memory, long len, const io::path& fileName, bool d)
 : Buffer(memory), Len(len), Pos(0), Filename(fileName), deleteMemoryWhenDropped(d)
 {
 	#ifdef _DEBUG
-	setDebugName("CMemoryFile");
+	setDebugName("CMemoryReadFile");
 	#endif
 }
 
 
-CMemoryFile::~CMemoryFile()
+CMemoryReadFile::~CMemoryReadFile()
 {
 	if (deleteMemoryWhenDropped)
 		delete [] (c8*)Buffer;
@@ -28,7 +28,7 @@ CMemoryFile::~CMemoryFile()
 
 
 //! returns how much was read
-s32 CMemoryFile::read(void* buffer, u32 sizeToRead)
+s32 CMemoryReadFile::read(void* buffer, u32 sizeToRead)
 {
 	s32 amount = static_cast<s32>(sizeToRead);
 	if (Pos + amount > Len)
@@ -45,8 +45,88 @@ s32 CMemoryFile::read(void* buffer, u32 sizeToRead)
 	return amount;
 }
 
-//! returns how much was written
-s32 CMemoryFile::write(const void* buffer, u32 sizeToWrite)
+//! changes position in file, returns true if successful
+//! if relativeMovement==true, the pos is changed relative to current pos,
+//! otherwise from begin of file
+bool CMemoryReadFile::seek(long finalPos, bool relativeMovement)
+{
+	if (relativeMovement)
+	{
+		if (Pos + finalPos > Len)
+			return false;
+
+		Pos += finalPos;
+	}
+	else
+	{
+		if (finalPos > Len)
+			return false;
+
+		Pos = finalPos;
+	}
+
+	return true;
+}
+
+
+//! returns size of file
+long CMemoryReadFile::getSize() const
+{
+	return Len;
+}
+
+
+//! returns where in the file we are.
+long CMemoryReadFile::getPos() const
+{
+	return Pos;
+}
+
+
+//! returns name of file
+const io::path& CMemoryReadFile::getFileName() const
+{
+	return Filename;
+}
+
+
+CMemoryWriteFile::CMemoryWriteFile(void* memory, long len, const io::path& fileName, bool d)
+: Buffer(memory), Len(len), Pos(0), Filename(fileName), deleteMemoryWhenDropped(d)
+{
+	#ifdef _DEBUG
+	setDebugName("CMemoryWriteFile");
+	#endif
+}
+
+
+CMemoryWriteFile::~CMemoryWriteFile()
+{
+	if (deleteMemoryWhenDropped)
+		delete [] (c8*)Buffer;
+}
+
+
+//! returns how much was read
+s32 CMemoryWriteFile::read(void* buffer, u32 sizeToRead)
+{
+	s32 amount = static_cast<s32>(sizeToRead);
+	if (Pos + amount > Len)
+		amount -= Pos + amount - Len;
+
+	if (amount <= 0)
+		return 0;
+
+	c8* p = (c8*)Buffer;
+	memcpy(buffer, p + Pos, amount);
+
+	Pos += amount;
+
+	return amount;
+}
+
+
+	//! returns how much was written
+s32 CMemoryWriteFile::write(const void* buffer, u32 sizeToWrite)
 {
 	s32 amount = static_cast<s32>(sizeToWrite);
 	if (Pos + amount > Len)
@@ -68,7 +148,7 @@ s32 CMemoryFile::write(const void* buffer, u32 sizeToWrite)
 //! changes position in file, returns true if successful
 //! if relativeMovement==true, the pos is changed relative to current pos,
 //! otherwise from begin of file
-bool CMemoryFile::seek(long finalPos, bool relativeMovement)
+bool CMemoryWriteFile::seek(long finalPos, bool relativeMovement)
 {
 	if (relativeMovement)
 	{
@@ -90,29 +170,35 @@ bool CMemoryFile::seek(long finalPos, bool relativeMovement)
 
 
 //! returns size of file
-long CMemoryFile::getSize() const
+long CMemoryWriteFile::getSize() const
 {
 	return Len;
 }
 
 
 //! returns where in the file we are.
-long CMemoryFile::getPos() const
+long CMemoryWriteFile::getPos() const
 {
 	return Pos;
 }
 
 
 //! returns name of file
-const io::path& CMemoryFile::getFileName() const
+const io::path& CMemoryWriteFile::getFileName() const
 {
 	return Filename;
 }
 
 
-IReadFile* createMemoryReadFile(void* memory, long size, const io::path& fileName, bool deleteMemoryWhenDropped)
+IReadFile* createMemoryReadFile(const void* memory, long size, const io::path& fileName, bool deleteMemoryWhenDropped)
+{
+	CMemoryReadFile* file = new CMemoryReadFile(memory, size, fileName, deleteMemoryWhenDropped);
+	return file;
+}
+
+IWriteFile* createMemoryWriteFile(void* memory, long size, const io::path& fileName, bool deleteMemoryWhenDropped)
 {
-	CMemoryFile* file = new CMemoryFile(memory, size, fileName, deleteMemoryWhenDropped);
+	CMemoryWriteFile* file = new CMemoryWriteFile(memory, size, fileName, deleteMemoryWhenDropped);
 	return file;
 }
 

source/Irrlicht/CMemoryFile.h

@@ -15,18 +15,55 @@ namespace irr
 namespace io
 {
 
+ 	/*!
+		Class for reading from memory.
+	*/
+	class CMemoryReadFile : public IReadFile
+	{
+	public:
+
+		//! Constructor
+		CMemoryReadFile(const void* memory, long len, const io::path& fileName, bool deleteMemoryWhenDropped);
+
+		//! Destructor
+		virtual ~CMemoryReadFile();
+
+		//! returns how much was read
+		virtual s32 read(void* buffer, u32 sizeToRead);
+
+		//! changes position in file, returns true if successful
+		virtual bool seek(long finalPos, bool relativeMovement = false);
+
+		//! returns size of file
+		virtual long getSize() const;
+
+		//! returns where in the file we are.
+		virtual long getPos() const;
+
+		//! returns name of file
+		virtual const io::path& getFileName() const;
+
+	private:
+
+		const void *Buffer;
+		long Len;
+		long Pos;
+		io::path Filename;
+		bool deleteMemoryWhenDropped;
+	};
+
 	/*!
-		Class for reading and writing from memory.
+		Class for writing to memory.
 	*/
-	class CMemoryFile : public IReadFile, public IWriteFile
+	class CMemoryWriteFile : public IWriteFile
 	{
 	public:
 
 		//! Constructor
-		CMemoryFile(void* memory, long len, const io::path& fileName, bool deleteMemoryWhenDropped);
+		CMemoryWriteFile(void* memory, long len, const io::path& fileName, bool deleteMemoryWhenDropped);
 
 		//! Destructor
-		virtual ~CMemoryFile();
+		virtual ~CMemoryWriteFile();
 
 		//! returns how much was read
 		virtual s32 read(void* buffer, u32 sizeToRead);

source/Irrlicht/CMountPointReader.cpp

@@ -155,7 +155,7 @@ IReadFile* CMountPointReader::createAndOpenFile(u32 index)
 	if (index >= Files.size())
 		return 0;
 
-	return createReadFile(RealFileNames[Files[index].ID]);
+	return CReadFile::createReadFile(RealFileNames[Files[index].ID]);
 }
 
 //! opens a file by file name

source/Irrlicht/CReadFile.cpp

@@ -97,8 +97,7 @@ const io::path& CReadFile::getFileName() const
 }
 
 
-
-IReadFile* createReadFile(const io::path& fileName)
+IReadFile* CReadFile::createReadFile(const io::path& fileName)
 {
 	CReadFile* file = new CReadFile(fileName);
 	if (file->isOpen())

source/Irrlicht/CReadFile.h

@@ -47,6 +47,9 @@ namespace io
 		//! returns name of file
 		virtual const io::path& getFileName() const;
 
+		//! create read file on disk.
+		static IReadFile* createReadFile(const io::path& fileName);
+
 	private:
 
 		//! opens the file

source/Irrlicht/CWriteFile.cpp

@@ -107,7 +107,7 @@ const io::path& CWriteFile::getFileName() const
 
 
 
-IWriteFile* createWriteFile(const io::path& fileName, bool append)
+IWriteFile* CWriteFile::createWriteFile(const io::path& fileName, bool append)
 {
 	CWriteFile* file = new CWriteFile(fileName, append);
 	if (file->isOpen())

source/Irrlicht/CWriteFile.h

@@ -41,6 +41,9 @@ namespace io
 		//! returns if file is open
 		bool isOpen() const;
 
+		//! creator method	
+		static IWriteFile* createWriteFile(const io::path& fileName, bool append);
+
 	private:
 
 		//! opens the file

source/Irrlicht/CZipReader.cpp

@@ -111,7 +111,7 @@ IFileArchive* CArchiveLoaderZIP::createArchive(io::IReadFile* file, bool ignoreC
 
 		bool isGZip = (sig == 0x8b1f);
 
-		archive = new CZipReader(file, ignoreCase, ignorePaths, isGZip);
+		archive = new CZipReader(FileSystem, file, ignoreCase, ignorePaths, isGZip);
 	}
 	return archive;
 }
@@ -137,8 +137,8 @@ bool CArchiveLoaderZIP::isALoadableFileFormat(io::IReadFile* file) const
 // zip archive
 // -----------------------------------------------------------------------------
 
-CZipReader::CZipReader(IReadFile* file, bool ignoreCase, bool ignorePaths, bool isGZip)
- : CFileList((file ? file->getFileName() : io::path("")), ignoreCase, ignorePaths), File(file), IsGZip(isGZip)
+CZipReader::CZipReader(IFileSystem* fs, IReadFile* file, bool ignoreCase, bool ignorePaths, bool isGZip)
+ : CFileList((file ? file->getFileName() : io::path("")), ignoreCase, ignorePaths), FileSystem(fs), File(file), IsGZip(isGZip)
 {
 	#ifdef _DEBUG
 	setDebugName("CZipReader");
@@ -586,7 +586,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
 			delete [] decryptedBuf;
 			return 0;
 		}
-		decrypted = io::createMemoryReadFile(decryptedBuf, decryptedSize, Files[index].FullName, true);
+		decrypted = FileSystem->createMemoryReadFile(decryptedBuf, decryptedSize, Files[index].FullName, true);
 		actualCompressionMethod = (e.header.Sig & 0xffff);
 #if 0
 		if ((e.header.Sig & 0xff000000)==0x01000000)
@@ -680,7 +680,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
 				return 0;
 			}
 			else
-				return io::createMemoryReadFile(pBuf, uncompressedSize, Files[index].FullName, true);
+				return FileSystem->createMemoryReadFile(pBuf, uncompressedSize, Files[index].FullName, true);
 
 			#else
 			return 0; // zlib not compiled, we cannot decompress the data.
@@ -751,7 +751,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
 				return 0;
 			}
 			else
-				return io::createMemoryReadFile(pBuf, uncompressedSize, Files[index].FullName, true);
+				return FileSystem->createMemoryReadFile(pBuf, uncompressedSize, Files[index].FullName, true);
 
 			#else
 			os::Printer::log("bzip2 decompression not supported. File cannot be read.", ELL_ERROR);
@@ -814,7 +814,7 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
 				return 0;
 			}
 			else
-				return io::createMemoryReadFile(pBuf, uncompressedSize, Files[index].FullName, true);
+				return FileSystem->createMemoryReadFile(pBuf, uncompressedSize, Files[index].FullName, true);
 
 			#else
 			os::Printer::log("lzma decompression not supported. File cannot be read.", ELL_ERROR);

source/Irrlicht/CZipReader.h

@@ -180,7 +180,7 @@ namespace io
 	public:
 
 		//! constructor
-		CZipReader(IReadFile* file, bool ignoreCase, bool ignorePaths, bool isGZip=false);
+		CZipReader(IFileSystem* fs, IReadFile* file, bool ignoreCase, bool ignorePaths, bool isGZip=false);
 
 		//! destructor
 		virtual ~CZipReader();
@@ -210,6 +210,7 @@ namespace io
 
 		bool scanCentralDirectoryHeader();
 
+		io::IFileSystem* FileSystem;
 		IReadFile* File;
 
 		// holds extended info about files