port from perforce

aiwaz/Aiwaz/FileSystem/CFileLoader/CFileLoader.cpp

@@ -0,0 +1,89 @@
+#include "stdafx.h"
+#include "CFileLoader.h"
+
+#include "IFileSystem.h"
+
+
+CFileLoader::~CFileLoader()
+{
+	this->FreeFile();
+}
+
+
+bool CFileLoader::LoadFile(string16 argFilename)
+{
+	m_File = m_Engine->get_FileSystem().Open(argFilename);
+	if (m_File != NULL)
+	{
+		std::stringstream dataStream;
+		dataStream.write(m_File->get_Buffer(), m_File->get_BufferLength());
+
+		while (!dataStream.eof())
+		{
+			m_CurrentLineOfCode++;
+
+			std::string currentReadLine;
+			std::getline(dataStream, currentReadLine);
+			if (currentReadLine.empty())
+				continue;
+
+			std::vector<std::string> token = this->SplitString(currentReadLine);
+			if (token.empty())
+				continue;
+
+			m_CurrentSection = token[0];
+			if (!this->OnSectionBegin(m_CurrentSection, token))
+			{
+				this->FreeFile();
+				return false;
+			}
+
+			if (token[token.size() - 1] == "{{")
+				m_EndSectionMarker = "}}";
+			else
+				m_EndSectionMarker = "}";
+			
+			while (!dataStream.eof())
+			{
+				m_CurrentLineOfCode++;
+				std::getline(dataStream, currentReadLine);
+				if (currentReadLine.empty())
+					continue;
+
+				std::vector<std::string> token = this->SplitString(currentReadLine, ", \t()\r");
+				if (token.empty())
+					continue;
+
+				if (token[0] == m_EndSectionMarker)
+				{
+					if (!this->OnSectionEnd(m_CurrentSection))
+					{
+						this->FreeFile();
+						return false;
+					}
+					m_CurrentSection = "";
+					break;
+				}
+
+				if (!this->OnContentReceived(token, currentReadLine))
+				{
+					this->FreeFile();
+					return false;
+				}
+			}
+		}
+
+		this->FreeFile();
+		return true;
+	}
+	this->FreeFile();
+	return false;
+}
+
+
+void CFileLoader::FreeFile()
+{
+	if (m_File != NULL)
+		delete m_File;
+	m_File = NULL;
+}

aiwaz/Aiwaz/FileSystem/CFileLoader/CFileLoader.h

@@ -0,0 +1,73 @@
+#pragma once
+
+#include "IEngine.h"
+#include "IFileSystem.h"
+#include <iostream>
+#include <sstream> 
+#include <vector>
+#include <string>
+
+class CFileLoader
+{
+public:
+	CFileLoader(IEngine* ar_Engine_) : m_Engine(ar_Engine_),m_CurrentLineOfCode(0), m_File(NULL),m_EndSectionMarker("}") {}
+	virtual ~CFileLoader();
+
+	bool LoadFile(string16 argFilename);
+	const std::string& get_CurrentSection() const { return m_CurrentSection; }
+
+	virtual bool OnSectionBegin(const std::string& argContentName, const std::vector<std::string>& argContentToken) { return true; }
+	virtual bool OnContentReceived(const std::vector<std::string>& argContentToken, const std::string& argContentData) { return true; }
+	virtual bool OnSectionEnd(const std::string& argContentName) { return true; }
+
+	unsigned int get_CurrentLineNumber() const { return m_CurrentLineOfCode; }
+
+protected:
+	std::vector<std::string> SplitString(const std::string & argString, const std::string & argDelimiters=", \t\r")
+	{
+		// Skip delims at beginning, find start of first token
+		std::string::size_type lastPos = argString.find_first_not_of(argDelimiters, 0);
+		// Find next delimiter @ end of token
+		std::string::size_type pos     = argString.find_first_of(argDelimiters, lastPos);
+
+		// output vector
+		std::vector<std::string> tokens;
+		while (std::string::npos != pos || std::string::npos != lastPos)
+		{
+			// Found a token, add it to the vector.
+			tokens.push_back(argString.substr(lastPos, pos - lastPos));
+			// Skip delims.  Note the "not_of". this is beginning of token
+			lastPos = argString.find_first_not_of(argDelimiters, pos);
+			// Find next delimiter at end of token.
+			pos = argString.find_first_of(argDelimiters, lastPos);
+		}
+
+		return tokens;
+	}
+
+	std::wstring ConvertToString16(const std::string& argString) const
+	{
+		int codePage = 0;
+		if (argString.size() == 0)
+			return std::wstring();
+
+		int length = ::MultiByteToWideChar(codePage, 0, argString.c_str(), argString.size() + 1, NULL, 0);
+		if (length == 0)
+			return std::wstring();
+
+		wchar_t* newString = new wchar_t[length];
+		::MultiByteToWideChar(codePage, 0, argString.c_str(), argString.size() + 1, newString, length);
+		return std::wstring(newString);
+	}
+
+	IEngine* m_Engine;
+
+	void FreeFile();
+
+private:
+	std::string m_CurrentSection;
+	IFile* m_File;
+
+	std::string m_EndSectionMarker;
+	unsigned int m_CurrentLineOfCode;
+};

aiwaz/Aiwaz/FileSystem/File.cpp

@@ -0,0 +1,123 @@
+#include "stdafx.h"
+#include "File.h"
+
+
+File::File(IEngine* ar_Engine_, char* ac_Buffer_, unsigned int argBufferLength, const string16 argFileName)
+	: m_Engine(ar_Engine_)
+	, m_Buffer(ac_Buffer_)
+	, m_BufferPosition(m_Buffer)
+	, m_BufferLength(argBufferLength)
+	, m_FileName(argFileName)
+{
+}
+
+
+File::~File()
+{
+	delete [] m_Buffer;
+}
+
+
+char* File::get_Buffer()
+{
+	return m_Buffer;
+}
+
+
+unsigned int File::get_BufferLength()
+{
+	return m_BufferLength;
+}
+
+
+void File::SaveAs(string16 argFileName)
+{
+	FILE* file;
+	fopen_s(&file, std::to_string8(argFileName).c_str(), "wb");
+	fwrite(m_Buffer, 1, m_BufferLength, file);
+	fclose(file);
+}
+
+
+std::string File::ReadString()
+{
+	std::string result;
+	char readChar = 0;
+	do 
+	{
+		this->CheckIntegrity(sizeof(char));
+
+		readChar = *m_BufferPosition;
+		if (readChar != '\0')
+			result += readChar;
+		m_BufferPosition++;
+	}
+	while (readChar != '\0');
+
+	return result;
+}
+
+
+float File::ReadFloat()
+{
+	this->CheckIntegrity(sizeof(float));
+
+	float result = *(float*)m_BufferPosition;
+	m_BufferPosition += sizeof(float);
+	return result;
+}
+
+
+int File::ReadInt()
+{
+	this->CheckIntegrity(sizeof(int));
+
+	int result = *(int*)m_BufferPosition;
+	m_BufferPosition += sizeof(int);
+	return result;
+}
+
+
+void* File::ReadDataArray(unsigned int argBytes)
+{
+	this->CheckIntegrity(argBytes);
+
+	char* data = new char[argBytes];
+
+	memcpy(data, m_BufferPosition, argBytes);
+
+	m_BufferPosition += sizeof(char) * argBytes;
+	return data;
+}
+
+
+void File::RewindFilePointer()
+{
+	m_BufferPosition = m_Buffer;
+}
+
+
+char* File::get_FilePointer() const
+{
+	return m_BufferPosition;
+}
+
+
+void File::set_FilePointer(char* ac_Position_)
+{
+	m_BufferPosition = ac_Position_;
+	this->CheckIntegrity(0);
+}
+
+
+bool File::IsEof() const
+{
+	return m_BufferPosition == (m_Buffer + m_BufferLength);
+}
+
+
+void File::CheckIntegrity(unsigned int argBytes)
+{
+	if (m_BufferPosition + argBytes > m_Buffer + m_BufferLength || m_BufferPosition < m_Buffer)
+		throw _T("File integrity is broken.");
+}

aiwaz/Aiwaz/FileSystem/File.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include "IEngine.h"
+#include "IFileSystem.h"
+
+
+class File
+	: public IFile
+{
+public:
+	File(IEngine* ar_Engine_, char* ac_Buffer_, unsigned int argBufferLength, const string16 argFileName);
+	virtual ~File();
+
+	virtual char* get_Buffer();
+	virtual unsigned int get_BufferLength();
+	virtual void SaveAs(string16 argFileName);
+
+	virtual std::string ReadString();
+	virtual float ReadFloat();
+	virtual int ReadInt();
+	virtual void* ReadDataArray(unsigned int argBytes);
+
+	virtual void RewindFilePointer();
+	virtual char* get_FilePointer() const;
+	virtual void set_FilePointer(char* ac_Position_);
+	virtual bool IsEof() const;
+
+	virtual string16 get_FileName() const { return m_FileName; }
+
+protected:
+	void CheckIntegrity(unsigned int argBytes);
+
+private:
+	IEngine* m_Engine;
+	char* m_Buffer;
+	char* m_BufferPosition;
+	unsigned int m_BufferLength;
+	string16 m_FileName;
+};

aiwaz/Aiwaz/FileSystem/FileSystem.cpp

@@ -0,0 +1,81 @@
+#include "stdafx.h"
+#include "FileSystem.h"
+#include "File.h"
+
+
+FileSystem::FileSystem(IEngine* ar_Engine_)
+	: m_Engine(ar_Engine_)
+	, m_Zip(false)
+{
+	::GetModuleFileName(NULL, m_AppDirectory, MAX_PATH);
+	::PathRemoveFileSpec(m_AppDirectory);
+}
+
+
+FileSystem::~FileSystem()
+{
+	if (m_Zip)
+	{
+		::CloseZip(m_ZipHandle);
+	}
+}
+
+
+void FileSystem::InitializeFromDirectory(string16 argDirectory)
+{
+	m_Zip = false;
+	::PathCombine(m_Directory, m_AppDirectory, std::to_string8(argDirectory).c_str());
+}
+
+
+void FileSystem::InitializeFromZipFile(string16 argZipFile)
+{
+	std::cout << "Initializing file system with data file: ";
+	std::wcout << argZipFile << std::white << std::endl;
+	m_Zip = true;
+	char fullPath[MAX_PATH];
+	::PathCombine(fullPath, m_AppDirectory, std::to_string8(argZipFile).c_str());
+	m_ZipHandle = ::OpenZip(fullPath, 0);
+	if (m_ZipHandle == NULL)
+	{
+		std::cout << std::red << "FAILED!" << std::white << std::endl;
+	}
+}
+
+
+IFile* FileSystem::Open(string16 argFileName)
+{
+	if (m_Zip)
+	{
+		ZIPENTRY zipEntry; 
+		int index; 
+		::FindZipItem(m_ZipHandle, std::to_string8(argFileName).c_str(), true, &index, &zipEntry);
+		if (index == -1)
+			return NULL;
+
+		unsigned int bufferSize = zipEntry.unc_size;
+		char* buffer = new char[bufferSize];
+		::UnzipItem(m_ZipHandle, index, buffer, bufferSize);
+
+		return new File(m_Engine, buffer, bufferSize, argFileName);
+	}
+	else
+	{
+		char fullPath[MAX_PATH];
+		::PathCombine(fullPath, m_Directory, std::to_string8(argFileName).c_str());
+
+		FILE* file = NULL;
+		_tfopen_s(&file, fullPath, _T("rb"));
+		if (file == NULL)
+			return NULL;
+
+		fseek(file, 0, SEEK_END);
+		unsigned int bufferSize = ftell(file);
+		rewind(file);
+		char* buffer = new char[bufferSize];
+		fread_s(buffer, bufferSize, 1, bufferSize, file);
+		fclose(file);
+
+		return new File(m_Engine, buffer, bufferSize, argFileName);
+	}
+}

aiwaz/Aiwaz/FileSystem/FileSystem.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include "IEngine.h"
+#include "IFileSystem.h"
+#include "unzip.h"
+
+
+class FileSystem
+	: public IFileSystem
+{
+public:
+	FileSystem(IEngine* ar_Engine_);
+	virtual ~FileSystem();
+
+	virtual void InitializeFromDirectory(string16 argDirectory = L"data");
+	virtual void InitializeFromZipFile(string16 argZipFile = L"data.pak");
+	virtual IFile* Open(string16 argFileName);
+
+private:
+	IEngine* m_Engine;
+	bool m_Zip;
+	HZIP m_ZipHandle;
+	char m_Directory[MAX_PATH];
+	char m_AppDirectory[MAX_PATH];
+};

aiwaz/Aiwaz/FileSystem/unzip.h

@@ -0,0 +1,214 @@
+#ifndef _unzip_H
+#define _unzip_H
+
+// UNZIPPING functions -- for unzipping.
+// This file is a repackaged form of extracts from the zlib code available
+// at www.gzip.org/zlib, by Jean-Loup Gailly and Mark Adler. The original
+// copyright notice may be found in unzip.cpp. The repackaging was done
+// by Lucian Wischik to simplify and extend its use in Windows/C++. Also
+// encryption and unicode filenames have been added.
+
+
+#ifndef _zip_H
+DECLARE_HANDLE(HZIP);
+#endif
+// An HZIP identifies a zip file that has been opened
+
+typedef DWORD ZRESULT;
+// return codes from any of the zip functions. Listed later.
+
+typedef struct
+{ int index;                 // index of this file within the zip
+  TCHAR name[MAX_PATH];      // filename within the zip
+  DWORD attr;                // attributes, as in GetFileAttributes.
+  FILETIME atime,ctime,mtime;// access, create, modify filetimes
+  long comp_size;            // sizes of item, compressed and uncompressed. These
+  long unc_size;             // may be -1 if not yet known (e.g. being streamed in)
+} ZIPENTRY;
+
+
+HZIP OpenZip(const TCHAR *fn, const char *password);
+HZIP OpenZip(void *z,unsigned int len, const char *password);
+HZIP OpenZipHandle(HANDLE h, const char *password);
+// OpenZip - opens a zip file and returns a handle with which you can
+// subsequently examine its contents. You can open a zip file from:
+// from a pipe:             OpenZipHandle(hpipe_read,0);
+// from a file (by handle): OpenZipHandle(hfile,0);
+// from a file (by name):   OpenZip("c:\\test.zip","password");
+// from a memory block:     OpenZip(bufstart, buflen,0);
+// If the file is opened through a pipe, then items may only be
+// accessed in increasing order, and an item may only be unzipped once,
+// although GetZipItem can be called immediately before and after unzipping
+// it. If it's opened in any other way, then full random access is possible.
+// Note: pipe input is not yet implemented.
+// Note: zip passwords are ascii, not unicode.
+// Note: for windows-ce, you cannot close the handle until after CloseZip.
+// but for real windows, the zip makes its own copy of your handle, so you
+// can close yours anytime.
+
+ZRESULT GetZipItem(HZIP hz, int index, ZIPENTRY *ze);
+// GetZipItem - call this to get information about an item in the zip.
+// If index is -1 and the file wasn't opened through a pipe,
+// then it returns information about the whole zipfile
+// (and in particular ze.index returns the number of index items).
+// Note: the item might be a directory (ze.attr & FILE_ATTRIBUTE_DIRECTORY)
+// See below for notes on what happens when you unzip such an item.
+// Note: if you are opening the zip through a pipe, then random access
+// is not possible and GetZipItem(-1) fails and you can't discover the number
+// of items except by calling GetZipItem on each one of them in turn,
+// starting at 0, until eventually the call fails. Also, in the event that
+// you are opening through a pipe and the zip was itself created into a pipe,
+// then then comp_size and sometimes unc_size as well may not be known until
+// after the item has been unzipped.
+
+ZRESULT FindZipItem(HZIP hz, const TCHAR *name, bool ic, int *index, ZIPENTRY *ze);
+// FindZipItem - finds an item by name. ic means 'insensitive to case'.
+// It returns the index of the item, and returns information about it.
+// If nothing was found, then index is set to -1 and the function returns
+// an error code.
+
+ZRESULT UnzipItem(HZIP hz, int index, const TCHAR *fn);
+ZRESULT UnzipItem(HZIP hz, int index, void *z,unsigned int len);
+ZRESULT UnzipItemHandle(HZIP hz, int index, HANDLE h);
+// UnzipItem - given an index to an item, unzips it. You can unzip to:
+// to a pipe:             UnzipItemHandle(hz,i, hpipe_write);
+// to a file (by handle): UnzipItemHandle(hz,i, hfile);
+// to a file (by name):   UnzipItem(hz,i, ze.name);
+// to a memory block:     UnzipItem(hz,i, buf,buflen);
+// In the final case, if the buffer isn't large enough to hold it all,
+// then the return code indicates that more is yet to come. If it was
+// large enough, and you want to know precisely how big, GetZipItem.
+// Note: zip files are normally stored with relative pathnames. If you
+// unzip with ZIP_FILENAME a relative pathname then the item gets created
+// relative to the current directory - it first ensures that all necessary
+// subdirectories have been created. Also, the item may itself be a directory.
+// If you unzip a directory with ZIP_FILENAME, then the directory gets created.
+// If you unzip it to a handle or a memory block, then nothing gets created
+// and it emits 0 bytes.
+ZRESULT SetUnzipBaseDir(HZIP hz, const TCHAR *dir);
+// if unzipping to a filename, and it's a relative filename, then it will be relative to here.
+// (defaults to current-directory).
+
+
+ZRESULT CloseZip(HZIP hz);
+// CloseZip - the zip handle must be closed with this function.
+
+unsigned int FormatZipMessage(ZRESULT code, TCHAR *buf,unsigned int len);
+// FormatZipMessage - given an error code, formats it as a string.
+// It returns the length of the error message. If buf/len points
+// to a real buffer, then it also writes as much as possible into there.
+
+
+// These are the result codes:
+#define ZR_OK         0x00000000     // nb. the pseudo-code zr-recent is never returned,
+#define ZR_RECENT     0x00000001     // but can be passed to FormatZipMessage.
+// The following come from general system stuff (e.g. files not openable)
+#define ZR_GENMASK    0x0000FF00
+#define ZR_NODUPH     0x00000100     // couldn't duplicate the handle
+#define ZR_NOFILE     0x00000200     // couldn't create/open the file
+#define ZR_NOALLOC    0x00000300     // failed to allocate some resource
+#define ZR_WRITE      0x00000400     // a general error writing to the file
+#define ZR_NOTFOUND   0x00000500     // couldn't find that file in the zip
+#define ZR_MORE       0x00000600     // there's still more data to be unzipped
+#define ZR_CORRUPT    0x00000700     // the zipfile is corrupt or not a zipfile
+#define ZR_READ       0x00000800     // a general error reading the file
+#define ZR_PASSWORD   0x00001000     // we didn't get the right password to unzip the file
+// The following come from mistakes on the part of the caller
+#define ZR_CALLERMASK 0x00FF0000
+#define ZR_ARGS       0x00010000     // general mistake with the arguments
+#define ZR_NOTMMAP    0x00020000     // tried to ZipGetMemory, but that only works on mmap zipfiles, which yours wasn't
+#define ZR_MEMSIZE    0x00030000     // the memory size is too small
+#define ZR_FAILED     0x00040000     // the thing was already failed when you called this function
+#define ZR_ENDED      0x00050000     // the zip creation has already been closed
+#define ZR_MISSIZE    0x00060000     // the indicated input file size turned out mistaken
+#define ZR_PARTIALUNZ 0x00070000     // the file had already been partially unzipped
+#define ZR_ZMODE      0x00080000     // tried to mix creating/opening a zip 
+// The following come from bugs within the zip library itself
+#define ZR_BUGMASK    0xFF000000
+#define ZR_NOTINITED  0x01000000     // initialisation didn't work
+#define ZR_SEEK       0x02000000     // trying to seek in an unseekable file
+#define ZR_NOCHANGE   0x04000000     // changed its mind on storage, but not allowed
+#define ZR_FLATE      0x05000000     // an internal error in the de/inflation code
+
+
+
+
+
+// e.g.
+//
+// SetCurrentDirectory("c:\\docs\\stuff");
+// HZIP hz = OpenZip("c:\\stuff.zip",0);
+// ZIPENTRY ze; GetZipItem(hz,-1,&ze); int numitems=ze.index;
+// for (int i=0; i<numitems; i++)
+// { GetZipItem(hz,i,&ze);
+//   UnzipItem(hz,i,ze.name);
+// }
+// CloseZip(hz);
+//
+//
+// HRSRC hrsrc = FindResource(hInstance,MAKEINTRESOURCE(1),RT_RCDATA);
+// HANDLE hglob = LoadResource(hInstance,hrsrc);
+// void *zipbuf=LockResource(hglob);
+// unsigned int ziplen=SizeofResource(hInstance,hrsrc);
+// HZIP hz = OpenZip(zipbuf, ziplen, 0);
+//   - unzip to a membuffer -
+// ZIPENTRY ze; int i; FindZipItem(hz,"file.dat",true,&i,&ze);
+// char *ibuf = new char[ze.unc_size];
+// UnzipItem(hz,i, ibuf, ze.unc_size);
+// delete[] ibuf;
+//   - unzip to a fixed membuff -
+// ZIPENTRY ze; int i; FindZipItem(hz,"file.dat",true,&i,&ze);
+// char ibuf[1024]; ZRESULT zr=ZR_MORE; unsigned long totsize=0;
+// while (zr==ZR_MORE)
+// { zr = UnzipItem(hz,i, ibuf,1024);
+//   unsigned long bufsize=1024; if (zr==ZR_OK) bufsize=ze.unc_size-totsize;
+//   totsize+=bufsize;
+// }
+//   - unzip to a pipe -
+// HANDLE hwrite; HANDLE hthread=CreateWavReaderThread(&hwrite);
+// int i; ZIPENTRY ze; FindZipItem(hz,"sound.wav",true,&i,&ze);
+// UnzipItemHandle(hz,i, hwrite);
+// CloseHandle(hwrite);
+// WaitForSingleObject(hthread,INFINITE);
+// CloseHandle(hwrite); CloseHandle(hthread);
+//   - finished -
+// CloseZip(hz);
+// // note: no need to free resources obtained through Find/Load/LockResource
+//
+//
+// SetCurrentDirectory("c:\\docs\\pipedzipstuff");
+// HANDLE hread,hwrite; CreatePipe(&hread,&hwrite,0,0);
+// CreateZipWriterThread(hwrite);
+// HZIP hz = OpenZipHandle(hread,0);
+// for (int i=0; ; i++)
+// { ZIPENTRY ze;
+//   ZRESULT zr=GetZipItem(hz,i,&ze); if (zr!=ZR_OK) break; // no more
+//   UnzipItem(hz,i, ze.name);
+// }
+// CloseZip(hz);
+//
+//
+
+
+
+
+// Now we indulge in a little skullduggery so that the code works whether
+// the user has included just zip or both zip and unzip.
+// Idea: if header files for both zip and unzip are present, then presumably
+// the cpp files for zip and unzip are both present, so we will call
+// one or the other of them based on a dynamic choice. If the header file
+// for only one is present, then we will bind to that particular one.
+ZRESULT CloseZipU(HZIP hz);
+unsigned int FormatZipMessageU(ZRESULT code, TCHAR *buf,unsigned int len);
+bool IsZipHandleU(HZIP hz);
+#ifdef _zip_H
+#undef CloseZip
+#define CloseZip(hz) (IsZipHandleU(hz)?CloseZipU(hz):CloseZipZ(hz))
+#else
+#define CloseZip CloseZipU
+#define FormatZipMessage FormatZipMessageU
+#endif
+
+
+
+#endif // _unzip_H