diff --git a/CClmReader.cpp b/CClmReader.cpp index f8072d9..9c72e97 100644 --- a/CClmReader.cpp +++ b/CClmReader.cpp @@ -26,18 +26,18 @@ ULONG __stdcall CClmReader::Release() HRESULT __stdcall CClmReader::QueryInterface(REFIID riid, void** ppv) { - if(riid == IID_IUnknown) - *ppv = (IUnknown*)this; - else if(riid == IID_ArchiveReader) - *ppv = (ArchiveReader*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - - return S_OK; + if(riid == IID_IUnknown) + *ppv = (IUnknown*)this; + else if(riid == IID_ArchiveReader) + *ppv = (ArchiveReader*)this; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + + return S_OK; } @@ -114,7 +114,7 @@ HRESULT CClmReader::OpenStreamRead(BSTR fileName, StreamReader **stream) // CLM file much less memory intensive. // Create a memory stream reading with the file contents - memStream = new CMemoryStreamReader(indexTable[fileIndex].size, + memStream = new CMemoryStreamReader(indexTable[fileIndex].size, (char*)(dataBuffer[fileIndex]), bAttachToBuffer); if (memStream == NULL) @@ -162,7 +162,7 @@ CClmReader::CClmReader(SeekableStreamReader *inStream, int bAttachToStream) : m_ inStream->AddRef(); } - + // Load the Clm info from the stream if (LoadClm(inStream, bAttachToStream) != 0) { diff --git a/CClmReader.h b/CClmReader.h index 84e2615..7fb2d92 100644 --- a/CClmReader.h +++ b/CClmReader.h @@ -7,25 +7,25 @@ class CClmReader : public ArchiveReader public: // IUnknown // ******** - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); // ArchiveReader // ************* - // [propget] - HRESULT STDMETHODCALLTYPE get_NumFiles( - /* [retval][out] */ int __RPC_FAR *numFiles); - // [propget] - HRESULT STDMETHODCALLTYPE get_FileName( - /* [in] */ int index, - /* [retval][out] */ BSTR __RPC_FAR *fileName); - - HRESULT STDMETHODCALLTYPE OpenStreamRead( - /* [in] */ BSTR filename, - /* [retval][out] */ StreamReader __RPC_FAR *__RPC_FAR *stream); + // [propget] + HRESULT STDMETHODCALLTYPE get_NumFiles( + /* [retval][out] */ int __RPC_FAR *numFiles); + // [propget] + HRESULT STDMETHODCALLTYPE get_FileName( + /* [in] */ int index, + /* [retval][out] */ BSTR __RPC_FAR *fileName); + + HRESULT STDMETHODCALLTYPE OpenStreamRead( + /* [in] */ BSTR filename, + /* [retval][out] */ StreamReader __RPC_FAR *__RPC_FAR *stream); // Class specific diff --git a/CClmWriter.cpp b/CClmWriter.cpp index 0549feb..7e23a66 100644 --- a/CClmWriter.cpp +++ b/CClmWriter.cpp @@ -24,18 +24,18 @@ ULONG __stdcall CClmWriter::Release() HRESULT __stdcall CClmWriter::QueryInterface(REFIID riid, void** ppv) { - if(riid == IID_IUnknown) - *ppv = (IUnknown*)this; - else if(riid == IID_ArchiveWriter) - *ppv = (ArchiveWriter*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - - return S_OK; + if(riid == IID_IUnknown) + *ppv = (IUnknown*)this; + else if(riid == IID_ArchiveWriter) + *ppv = (ArchiveWriter*)this; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + + return S_OK; } @@ -269,7 +269,7 @@ CClmWriter::LinkedListNode* CClmWriter::SortIndex(LinkedListNode *list) // Check for proper sorted order else if (strcmp(tape[0].head->indexEntry.fileName, tape[1].head->indexEntry.fileName) < 0) sourceTape = 0; // Node on tape[0] comes before - else + else sourceTape = 1; // Node on tape[1] comes before // Move the node from the source tape to the dest tape diff --git a/CClmWriter.h b/CClmWriter.h index 4c706bf..659438d 100644 --- a/CClmWriter.h +++ b/CClmWriter.h @@ -7,20 +7,20 @@ class CClmWriter : public ArchiveWriter public: // IUnknown // ******** - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); // ArchiveWriter // ************* - HRESULT STDMETHODCALLTYPE AddToArchive( - /* [in] */ BSTR fileName, - /* [in] */ SeekableStreamReader __RPC_FAR *inStream, - /* [in] */ int reserved); - HRESULT STDMETHODCALLTYPE WriteArchive( - /* [in] */ StreamWriter __RPC_FAR *outStream); + HRESULT STDMETHODCALLTYPE AddToArchive( + /* [in] */ BSTR fileName, + /* [in] */ SeekableStreamReader __RPC_FAR *inStream, + /* [in] */ int reserved); + HRESULT STDMETHODCALLTYPE WriteArchive( + /* [in] */ StreamWriter __RPC_FAR *outStream); // Class specific diff --git a/CFileStreamReader.cpp b/CFileStreamReader.cpp index 20b40da..c9f956d 100644 --- a/CFileStreamReader.cpp +++ b/CFileStreamReader.cpp @@ -24,20 +24,20 @@ ULONG __stdcall CFileStreamReader::Release() HRESULT __stdcall CFileStreamReader::QueryInterface(REFIID riid, void** ppv) { - if(riid == IID_IUnknown) - *ppv = (IUnknown*)this; - else if(riid == IID_StreamReader) - *ppv = (StreamReader*)this; - else if(riid == IID_SeekableStreamReader) - *ppv = (SeekableStreamReader*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - - return S_OK; + if(riid == IID_IUnknown) + *ppv = (IUnknown*)this; + else if(riid == IID_StreamReader) + *ppv = (StreamReader*)this; + else if(riid == IID_SeekableStreamReader) + *ppv = (SeekableStreamReader*)this; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + + return S_OK; } @@ -116,14 +116,14 @@ CFileStreamReader::CFileStreamReader(BSTR fileName) : m_cRef(1) // Initialize class variables status = 0; - // Open the file + // Open the file hFile = CreateFileW(fileName, // lpFileName GENERIC_READ, // dwDesired access FILE_SHARE_READ,// dwShareMode NULL, // lpSecurityAttributes OPEN_EXISTING, // dwCreationDisposition - FILE_ATTRIBUTE_NORMAL | - FILE_FLAG_SEQUENTIAL_SCAN, + FILE_ATTRIBUTE_NORMAL | + FILE_FLAG_SEQUENTIAL_SCAN, // dwFlagsAndAttributes NULL // hTemplate ); @@ -136,7 +136,7 @@ CFileStreamReader::CFileStreamReader(BSTR fileName) : m_cRef(1) if (hFile == 0) { // Try to open the file using ANSI version of CreateFile - + // Allocate space for a temporary ASCII fileName string int stringLength = SysStringLen(fileName); char *tempString = new char[stringLength+1]; @@ -150,8 +150,8 @@ CFileStreamReader::CFileStreamReader(BSTR fileName) : m_cRef(1) FILE_SHARE_READ,// dwShareMode NULL, // lpSecurityAttributes OPEN_EXISTING, // dwCreationDisposition - FILE_ATTRIBUTE_NORMAL | - FILE_FLAG_SEQUENTIAL_SCAN, + FILE_ATTRIBUTE_NORMAL | + FILE_FLAG_SEQUENTIAL_SCAN, // dwFlagsAndAttributes NULL // hTemplate ); diff --git a/CFileStreamReader.h b/CFileStreamReader.h index a9771c4..9048125 100644 --- a/CFileStreamReader.h +++ b/CFileStreamReader.h @@ -6,38 +6,38 @@ class CFileStreamReader : public SeekableStreamReader { public: - // IUnknown + // IUnknown // ******** - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); // StreamReader // ************ - + // [local] - HRESULT STDMETHODCALLTYPE Read( - /* [in] */ int numBytes, - /* [in] */ int pBuffer, - /* [retval][out] */ int __RPC_FAR *numBytesRead); + HRESULT STDMETHODCALLTYPE Read( + /* [in] */ int numBytes, + /* [in] */ int pBuffer, + /* [retval][out] */ int __RPC_FAR *numBytesRead); // [propget] - HRESULT STDMETHODCALLTYPE get_Status( - /* [retval][out] */ int __RPC_FAR *status); + HRESULT STDMETHODCALLTYPE get_Status( + /* [retval][out] */ int __RPC_FAR *status); // SeekableStreamReader // ******************** - // [propget] - HRESULT STDMETHODCALLTYPE get_ReadOffset( - /* [retval][out] */ int __RPC_FAR *readOffset); - // [propget] - HRESULT STDMETHODCALLTYPE get_StreamSize( - /* [retval][out] */ int __RPC_FAR *streamSize); - HRESULT STDMETHODCALLTYPE Seek( - /* [in] */ int offset); + // [propget] + HRESULT STDMETHODCALLTYPE get_ReadOffset( + /* [retval][out] */ int __RPC_FAR *readOffset); + // [propget] + HRESULT STDMETHODCALLTYPE get_StreamSize( + /* [retval][out] */ int __RPC_FAR *streamSize); + HRESULT STDMETHODCALLTYPE Seek( + /* [in] */ int offset); // Class specific diff --git a/CFileStreamWriter.cpp b/CFileStreamWriter.cpp index 5878e70..81ca6bc 100644 --- a/CFileStreamWriter.cpp +++ b/CFileStreamWriter.cpp @@ -24,18 +24,18 @@ ULONG __stdcall CFileStreamWriter::Release() HRESULT __stdcall CFileStreamWriter::QueryInterface(REFIID riid, void** ppv) { - if(riid == IID_IUnknown) - *ppv = (IUnknown*)this; - else if(riid == IID_StreamWriter) - *ppv = (StreamWriter*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - - return S_OK; + if(riid == IID_IUnknown) + *ppv = (IUnknown*)this; + else if(riid == IID_StreamWriter) + *ppv = (StreamWriter*)this; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + + return S_OK; } @@ -46,14 +46,14 @@ CFileStreamWriter::CFileStreamWriter(BSTR fileName) : m_cRef(1) // Initialize class variables status = 0; - // Open the file + // Open the file hFile = CreateFileW(fileName, // lpFileName GENERIC_WRITE, // dwDesired access 0, // dwShareMode NULL, // lpSecurityAttributes CREATE_ALWAYS, // dwCreationDisposition - FILE_ATTRIBUTE_NORMAL | - FILE_FLAG_SEQUENTIAL_SCAN, + FILE_ATTRIBUTE_NORMAL | + FILE_FLAG_SEQUENTIAL_SCAN, // dwFlagsAndAttributes NULL // hTemplate ); @@ -66,7 +66,7 @@ CFileStreamWriter::CFileStreamWriter(BSTR fileName) : m_cRef(1) if (hFile == 0) { // Try to open the file using ANSI version of CreateFile - + // Allocate space for a temporary ASCII fileName string int stringLength = SysStringLen(fileName); char *tempString = new char[stringLength+1]; @@ -80,8 +80,8 @@ CFileStreamWriter::CFileStreamWriter(BSTR fileName) : m_cRef(1) 0, // dwShareMode NULL, // lpSecurityAttributes CREATE_ALWAYS, // dwCreationDisposition - FILE_ATTRIBUTE_NORMAL | - FILE_FLAG_SEQUENTIAL_SCAN, + FILE_ATTRIBUTE_NORMAL | + FILE_FLAG_SEQUENTIAL_SCAN, // dwFlagsAndAttributes NULL // hTemplate ); diff --git a/CFileStreamWriter.h b/CFileStreamWriter.h index 0506f3b..43ef54c 100644 --- a/CFileStreamWriter.h +++ b/CFileStreamWriter.h @@ -6,20 +6,20 @@ class CFileStreamWriter : public StreamWriter { public: // IUnknown - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); // IFileStreamWriter - // [local] - HRESULT STDMETHODCALLTYPE Write( - /* [in] */ int numBytes, - /* [in] */ int pBuffer, - /* [retval][out] */ int __RPC_FAR *numBytesWritten); - - // [propget] - HRESULT STDMETHODCALLTYPE get_Status( - /* [retval][out] */ int __RPC_FAR *status); + // [local] + HRESULT STDMETHODCALLTYPE Write( + /* [in] */ int numBytes, + /* [in] */ int pBuffer, + /* [retval][out] */ int __RPC_FAR *numBytesWritten); + + // [propget] + HRESULT STDMETHODCALLTYPE get_Status( + /* [retval][out] */ int __RPC_FAR *status); // Class specific CFileStreamWriter(BSTR fileName); diff --git a/CMapFile.cpp b/CMapFile.cpp index 276ce7b..7e39559 100644 --- a/CMapFile.cpp +++ b/CMapFile.cpp @@ -26,20 +26,20 @@ ULONG __stdcall CMapFile::Release() HRESULT __stdcall CMapFile::QueryInterface(REFIID riid, void** ppv) { - if (riid == IID_IUnknown) - *ppv = (IUnknown*)(MapFile*)this; - else if (riid == IID_MapFile) - *ppv = (MapFile*)this; + if (riid == IID_IUnknown) + *ppv = (IUnknown*)(MapFile*)this; + else if (riid == IID_MapFile) + *ppv = (MapFile*)this; else if (riid == IID_ISupportErrorInfo) *ppv = (ISupportErrorInfo*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - - return S_OK; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + + return S_OK; } @@ -180,10 +180,10 @@ HRESULT CMapFile::get_AroundTheWorld(int *bAroundTheWorld) -HRESULT CMapFile::get_TileData( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [retval][out] */ int __RPC_FAR *tile) +HRESULT CMapFile::get_TileData( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [retval][out] */ int __RPC_FAR *tile) { // Error check array indicies if ((tileX < 0) || (tileX >= tileWidth) || (tileY < 0) || (tileY >= mapHeadInfo.tileHeight)) @@ -812,7 +812,7 @@ HRESULT CMapFile::get_TileGroupName(int tileGroupIndex, BSTR *tileGroupName) int nameLen = tileGroupInfo[tileGroupIndex].nameLen; SysReAllocStringLen(tileGroupName, NULL, nameLen); // Convert the name to unicode - MultiByteToWideChar(CP_ACP, 0, tileGroupInfo[tileGroupIndex].name, nameLen, + MultiByteToWideChar(CP_ACP, 0, tileGroupInfo[tileGroupIndex].name, nameLen, *tileGroupName, nameLen); return S_OK; @@ -871,7 +871,7 @@ HRESULT CMapFile::AddTileGroup(TileGroup *newTileGroup) tileGroupInfo[numTileGroups].name = NULL; tileGroupInfo[numTileGroups].tileGroup = newTileGroup; newTileGroup->AddRef(); - + // Update number of tile groups numTileGroups++; @@ -990,7 +990,7 @@ int CMapFile::LoadMap(StreamReader *stream, TileSetSource *tileSetSource, int lo stream->Read(4, (int)&height, &numBytesRead); // Create a new TileGroup tileGroupInfo[i].tileGroup = new CTileGroup(width, height, tileSetManager); - + // Read in the tile data for (y = 0; y < height; y++) { @@ -1093,7 +1093,7 @@ HRESULT CMapFile::SaveMap(StreamWriter *stream, enum MapLoadSaveFormat saveFlags // Write the tile group's dimensions stream->Write(4, (int)&width, &numBytesWritten); stream->Write(4, (int)&height, &numBytesWritten); - + // Write the tile group data for (y = 0; y < height; y++) { @@ -1105,7 +1105,7 @@ HRESULT CMapFile::SaveMap(StreamWriter *stream, enum MapLoadSaveFormat saveFlags stream->Write(4, (int)&temp, &numBytesWritten); } } - + // Write the tile group's name temp = tileGroupInfo[i].nameLen; stream->Write(4, (int)&temp, &numBytesWritten); @@ -1138,7 +1138,7 @@ HRESULT CMapFile::InterfaceSupportsErrorInfo(REFIID riid) // *********************** -CMapFile::CMapFile(TileSetSource *tileSetSource, int width, int height) : +CMapFile::CMapFile(TileSetSource *tileSetSource, int width, int height) : m_cRef(1) { // Round width up to the next power of 2 @@ -1197,7 +1197,7 @@ CMapFile::CMapFile(TileSetSource *tileSetSource, int width, int height) : g_cLocks++; } -CMapFile::CMapFile(TileSetSource *tileSetSource, StreamReader *stream, +CMapFile::CMapFile(TileSetSource *tileSetSource, StreamReader *stream, enum MapLoadSaveFormat loadFlags) : m_cRef(1) { // Initialize variables diff --git a/CMapFile.h b/CMapFile.h index 7b7fa8a..ca9f2e5 100644 --- a/CMapFile.h +++ b/CMapFile.h @@ -7,177 +7,177 @@ class CMapFile : public MapFile, public ISupportErrorInfo { public: - // IUnknown + // IUnknown // ******** - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); // TileGroup // ********* // [propget] - HRESULT STDMETHODCALLTYPE get_TileWidth( - /* [retval][out] */ int __RPC_FAR *tileWidth); - // [propget] - HRESULT STDMETHODCALLTYPE get_TileHeight( - /* [retval][out] */ int __RPC_FAR *tileHeight); - - // [propget] - HRESULT STDMETHODCALLTYPE get_TileSetManager( - /* [retval][out] */ TileSetManager __RPC_FAR *__RPC_FAR *tileSetManager); + HRESULT STDMETHODCALLTYPE get_TileWidth( + /* [retval][out] */ int __RPC_FAR *tileWidth); + // [propget] + HRESULT STDMETHODCALLTYPE get_TileHeight( + /* [retval][out] */ int __RPC_FAR *tileHeight); + + // [propget] + HRESULT STDMETHODCALLTYPE get_TileSetManager( + /* [retval][out] */ TileSetManager __RPC_FAR *__RPC_FAR *tileSetManager); // [propget] - HRESULT STDMETHODCALLTYPE get_MappingIndex( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [retval][out] */ int __RPC_FAR *tileMappingIndex); + HRESULT STDMETHODCALLTYPE get_MappingIndex( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [retval][out] */ int __RPC_FAR *tileMappingIndex); // [propput] - HRESULT STDMETHODCALLTYPE put_MappingIndex( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [in] */ int tileMappingIndex); - - HRESULT STDMETHODCALLTYPE Draw( - /* [in] */ int destDC, - /* [in] */ int sourcePixelX, - /* [in] */ int sourcePixelY, - /* [in] */ int pixelWidth, - /* [in] */ int pixelHeight); - + HRESULT STDMETHODCALLTYPE put_MappingIndex( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [in] */ int tileMappingIndex); + + HRESULT STDMETHODCALLTYPE Draw( + /* [in] */ int destDC, + /* [in] */ int sourcePixelX, + /* [in] */ int sourcePixelY, + /* [in] */ int pixelWidth, + /* [in] */ int pixelHeight); + // MapFile // ******** - // [propget] - HRESULT STDMETHODCALLTYPE get_AroundTheWorld( - /* [retval][out] */ int __RPC_FAR *bAroundTheWorld); + // [propget] + HRESULT STDMETHODCALLTYPE get_AroundTheWorld( + /* [retval][out] */ int __RPC_FAR *bAroundTheWorld); + + // [propget] + HRESULT STDMETHODCALLTYPE get_TileData( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [retval][out] */ int __RPC_FAR *tile); + // [propput] + HRESULT STDMETHODCALLTYPE put_TileData( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [in] */ int newTile); + + // [propget] + HRESULT STDMETHODCALLTYPE get_CellType( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [retval][out] */ int __RPC_FAR *cellType); + // [propput] + HRESULT STDMETHODCALLTYPE put_CellType( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [in] */ int newCellType); + // [propget] + HRESULT STDMETHODCALLTYPE get_UnitIndex( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [retval][out] */ int __RPC_FAR *unitIndex); + // [propput] + HRESULT STDMETHODCALLTYPE put_UnitIndex( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [in] */ int newUnitIndex); + + + //[propget] + HRESULT STDMETHODCALLTYPE get_Lava( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [retval][out] */ int __RPC_FAR *lava); + // [propput] + HRESULT STDMETHODCALLTYPE put_Lava( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [in] */ int lava); + + // [propget] + HRESULT STDMETHODCALLTYPE get_LavaPossible( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [retval][out] */ int __RPC_FAR *lavaPossible); + // [propput] + HRESULT STDMETHODCALLTYPE put_LavaPossible( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [in] */ int lavaPossible); + + // [propget] + HRESULT STDMETHODCALLTYPE get_Expand( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [retval][out] */ int __RPC_FAR *expand); + // [propput] + HRESULT STDMETHODCALLTYPE put_Expand( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [in] */ int expand); // [propget] - HRESULT STDMETHODCALLTYPE get_TileData( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [retval][out] */ int __RPC_FAR *tile); + HRESULT STDMETHODCALLTYPE get_Microbe( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [retval][out] */ int __RPC_FAR *microbe); // [propput] - HRESULT STDMETHODCALLTYPE put_TileData( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [in] */ int newTile); + HRESULT STDMETHODCALLTYPE put_Microbe( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [in] */ int microbe); // [propget] - HRESULT STDMETHODCALLTYPE get_CellType( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [retval][out] */ int __RPC_FAR *cellType); - // [propput] - HRESULT STDMETHODCALLTYPE put_CellType( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [in] */ int newCellType); + HRESULT STDMETHODCALLTYPE get_WallOrBuilding( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [retval][out] */ int __RPC_FAR *wallOrBuilding); + // [propput] + HRESULT STDMETHODCALLTYPE put_WallOrBuilding( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [in] */ int wallOrBuilding); + + + HRESULT STDMETHODCALLTYPE Copy( + /* [in] */ int tileX1, + /* [in] */ int tileY1, + /* [in] */ int tileX2, + /* [in] */ int tileY2, + /* [retval][out] */ TileGroup __RPC_FAR *__RPC_FAR *tileGroup); + HRESULT STDMETHODCALLTYPE Paste( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [in] */ TileGroup __RPC_FAR *tileGroup); + // [propget] - HRESULT STDMETHODCALLTYPE get_UnitIndex( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [retval][out] */ int __RPC_FAR *unitIndex); - // [propput] - HRESULT STDMETHODCALLTYPE put_UnitIndex( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [in] */ int newUnitIndex); - - - //[propget] - HRESULT STDMETHODCALLTYPE get_Lava( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [retval][out] */ int __RPC_FAR *lava); - // [propput] - HRESULT STDMETHODCALLTYPE put_Lava( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [in] */ int lava); - - // [propget] - HRESULT STDMETHODCALLTYPE get_LavaPossible( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [retval][out] */ int __RPC_FAR *lavaPossible); - // [propput] - HRESULT STDMETHODCALLTYPE put_LavaPossible( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [in] */ int lavaPossible); - - // [propget] - HRESULT STDMETHODCALLTYPE get_Expand( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [retval][out] */ int __RPC_FAR *expand); - // [propput] - HRESULT STDMETHODCALLTYPE put_Expand( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [in] */ int expand); - - // [propget] - HRESULT STDMETHODCALLTYPE get_Microbe( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [retval][out] */ int __RPC_FAR *microbe); - // [propput] - HRESULT STDMETHODCALLTYPE put_Microbe( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [in] */ int microbe); - - // [propget] - HRESULT STDMETHODCALLTYPE get_WallOrBuilding( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [retval][out] */ int __RPC_FAR *wallOrBuilding); - // [propput] - HRESULT STDMETHODCALLTYPE put_WallOrBuilding( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [in] */ int wallOrBuilding); - - - HRESULT STDMETHODCALLTYPE Copy( - /* [in] */ int tileX1, - /* [in] */ int tileY1, - /* [in] */ int tileX2, - /* [in] */ int tileY2, - /* [retval][out] */ TileGroup __RPC_FAR *__RPC_FAR *tileGroup); - HRESULT STDMETHODCALLTYPE Paste( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [in] */ TileGroup __RPC_FAR *tileGroup); - - // [propget] - HRESULT STDMETHODCALLTYPE get_NumTileGroups( - /* [retval][out] */ int __RPC_FAR *numTileGroups); - // [propget] - HRESULT STDMETHODCALLTYPE get_TileGroup( - /* [in] */ int tileGroupIndex, - /* [retval][out] */ TileGroup __RPC_FAR *__RPC_FAR *tileGroup); - // [propget] - HRESULT STDMETHODCALLTYPE get_TileGroupName( - /* [in] */ int tileGroupIndex, - /* [retval][out] */ BSTR __RPC_FAR *tileGroupName); - // [propput] - HRESULT STDMETHODCALLTYPE put_TileGroupName( - /* [in] */ int tileGroupIndex, - /* [in] */ BSTR tileGroupName); - HRESULT STDMETHODCALLTYPE AddTileGroup( - /* [in] */ TileGroup __RPC_FAR *newTileGroup); - HRESULT STDMETHODCALLTYPE RemoveTileGroup( - /* [in] */ int tileGroupIndex); - - HRESULT STDMETHODCALLTYPE SaveMap( - /* [in] */ StreamWriter __RPC_FAR *stream, - /* [in] */ enum MapLoadSaveFormat saveFlags, - /* [retval][out] */ int __RPC_FAR *status); + HRESULT STDMETHODCALLTYPE get_NumTileGroups( + /* [retval][out] */ int __RPC_FAR *numTileGroups); + // [propget] + HRESULT STDMETHODCALLTYPE get_TileGroup( + /* [in] */ int tileGroupIndex, + /* [retval][out] */ TileGroup __RPC_FAR *__RPC_FAR *tileGroup); + // [propget] + HRESULT STDMETHODCALLTYPE get_TileGroupName( + /* [in] */ int tileGroupIndex, + /* [retval][out] */ BSTR __RPC_FAR *tileGroupName); + // [propput] + HRESULT STDMETHODCALLTYPE put_TileGroupName( + /* [in] */ int tileGroupIndex, + /* [in] */ BSTR tileGroupName); + HRESULT STDMETHODCALLTYPE AddTileGroup( + /* [in] */ TileGroup __RPC_FAR *newTileGroup); + HRESULT STDMETHODCALLTYPE RemoveTileGroup( + /* [in] */ int tileGroupIndex); + + HRESULT STDMETHODCALLTYPE SaveMap( + /* [in] */ StreamWriter __RPC_FAR *stream, + /* [in] */ enum MapLoadSaveFormat saveFlags, + /* [retval][out] */ int __RPC_FAR *status); // ISupportErrorInfo diff --git a/CMemoryStreamReader.cpp b/CMemoryStreamReader.cpp index 885c12c..d3b21ae 100644 --- a/CMemoryStreamReader.cpp +++ b/CMemoryStreamReader.cpp @@ -24,20 +24,20 @@ ULONG __stdcall CMemoryStreamReader::Release() HRESULT __stdcall CMemoryStreamReader::QueryInterface(REFIID riid, void** ppv) { - if(riid == IID_IUnknown) - *ppv = (IUnknown*)this; - else if(riid == IID_StreamReader) - *ppv = (StreamReader*)this; - else if(riid == IID_SeekableStreamReader) - *ppv = (SeekableStreamReader*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - - return S_OK; + if(riid == IID_IUnknown) + *ppv = (IUnknown*)this; + else if(riid == IID_StreamReader) + *ppv = (StreamReader*)this; + else if(riid == IID_SeekableStreamReader) + *ppv = (SeekableStreamReader*)this; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + + return S_OK; } @@ -113,7 +113,7 @@ HRESULT CMemoryStreamReader::Seek(int offset) // Class specific // ************** -CMemoryStreamReader::CMemoryStreamReader(int streamLength, char *buffer, int bAttachToBuffer) +CMemoryStreamReader::CMemoryStreamReader(int streamLength, char *buffer, int bAttachToBuffer) : m_cRef(1) { // Initialize variables diff --git a/CMemoryStreamReader.h b/CMemoryStreamReader.h index a93afc0..c849405 100644 --- a/CMemoryStreamReader.h +++ b/CMemoryStreamReader.h @@ -6,38 +6,38 @@ class CMemoryStreamReader : public SeekableStreamReader { public: - // IUnknown + // IUnknown // ******** - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); // StreamReader // ************ - + // [local] - HRESULT STDMETHODCALLTYPE Read( - /* [in] */ int numBytes, - /* [in] */ int pBuffer, - /* [retval][out] */ int __RPC_FAR *numBytesRead); + HRESULT STDMETHODCALLTYPE Read( + /* [in] */ int numBytes, + /* [in] */ int pBuffer, + /* [retval][out] */ int __RPC_FAR *numBytesRead); // [propget] - HRESULT STDMETHODCALLTYPE get_Status( - /* [retval][out] */ int __RPC_FAR *status); + HRESULT STDMETHODCALLTYPE get_Status( + /* [retval][out] */ int __RPC_FAR *status); // SeekableStreamReader // ******************** - // [propget] - HRESULT STDMETHODCALLTYPE get_ReadOffset( - /* [retval][out] */ int __RPC_FAR *readOffset); - // [propget] - HRESULT STDMETHODCALLTYPE get_StreamSize( - /* [retval][out] */ int __RPC_FAR *streamSize); - HRESULT STDMETHODCALLTYPE Seek( - /* [in] */ int offset); + // [propget] + HRESULT STDMETHODCALLTYPE get_ReadOffset( + /* [retval][out] */ int __RPC_FAR *readOffset); + // [propget] + HRESULT STDMETHODCALLTYPE get_StreamSize( + /* [retval][out] */ int __RPC_FAR *streamSize); + HRESULT STDMETHODCALLTYPE Seek( + /* [in] */ int offset); // Class specific diff --git a/CResourceManager.cpp b/CResourceManager.cpp index 843c4ab..d9980ed 100644 --- a/CResourceManager.cpp +++ b/CResourceManager.cpp @@ -29,20 +29,20 @@ ULONG __stdcall CResourceManager::Release() HRESULT __stdcall CResourceManager::QueryInterface(REFIID riid, void** ppv) { - if (riid == IID_IUnknown) - *ppv = (IUnknown*)(ResourceManager*)this; - else if (riid == IID_IResourceManager) - *ppv = (IResourceManager*)this; + if (riid == IID_IUnknown) + *ppv = (IUnknown*)(ResourceManager*)this; + else if (riid == IID_IResourceManager) + *ppv = (IResourceManager*)this; else if (riid == IID_ISupportErrorInfo) *ppv = (ISupportErrorInfo*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - - return S_OK; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + + return S_OK; } @@ -144,9 +144,9 @@ HRESULT CResourceManager::put_RootPath(BSTR newPath) -HRESULT CResourceManager::OpenStreamRead( - /* [in] */ BSTR fileName, - /* [retval][out] */ StreamReader **stream) +HRESULT CResourceManager::OpenStreamRead( + /* [in] */ BSTR fileName, + /* [retval][out] */ StreamReader **stream) { int lenFileName = SysStringLen(fileName); int lenPath = SysStringLen(path); @@ -207,9 +207,9 @@ HRESULT CResourceManager::OpenStreamRead( return E_FAIL; } -HRESULT CResourceManager::OpenStreamWrite( - /* [in] */ BSTR fileName, - /* [retval][out] */ StreamWriter **stream) +HRESULT CResourceManager::OpenStreamWrite( + /* [in] */ BSTR fileName, + /* [retval][out] */ StreamWriter **stream) { int lenFileName = SysStringLen(fileName); int lenPath = SysStringLen(path); diff --git a/CResourceManager.h b/CResourceManager.h index 1eae307..30dfe8f 100644 --- a/CResourceManager.h +++ b/CResourceManager.h @@ -7,80 +7,80 @@ class CResourceManager : public IResourceManager, public ISupportErrorInfo { public: - // IUnknown + // IUnknown // ******** - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); // IResource Manager // ***************** - // [propget] - HRESULT STDMETHODCALLTYPE get_RootPath( - /* [retval][out] */ BSTR __RPC_FAR *path); - // [propput] - HRESULT STDMETHODCALLTYPE put_RootPath( - /* [in] */ BSTR path); - - HRESULT STDMETHODCALLTYPE OpenStreamRead( - /* [in] */ BSTR fileName, - /* [retval][out] */ StreamReader __RPC_FAR *__RPC_FAR *stream); - HRESULT STDMETHODCALLTYPE OpenStreamWrite( - /* [in] */ BSTR fileName, - /* [retval][out] */ StreamWriter __RPC_FAR *__RPC_FAR *stream); - - HRESULT STDMETHODCALLTYPE LoadMapFile( - /* [in] */ BSTR fileName, - /* [in] */ enum MapLoadSaveFormat loadFlags, - /* [retval][out] */ MapFile __RPC_FAR *__RPC_FAR *mapFile); - HRESULT STDMETHODCALLTYPE LoadMap( - /* [in] */ StreamReader __RPC_FAR *inStream, - /* [in] */ enum MapLoadSaveFormat loadFlags, - /* [retval][out] */ MapFile __RPC_FAR *__RPC_FAR *mapFile); - HRESULT STDMETHODCALLTYPE CreateNewMap( - /* [in] */ int width, - /* [in] */ int height, - /* [retval][out] */ MapFile __RPC_FAR *__RPC_FAR *newMap); - - HRESULT STDMETHODCALLTYPE LoadTileSetFile( - /* [in] */ BSTR fileName, - /* [retval][out] */ TileSet __RPC_FAR *__RPC_FAR *tileSet); - HRESULT STDMETHODCALLTYPE LoadTileSet( - /* [in] */ StreamReader __RPC_FAR *inStream, - /* [retval][out] */ TileSet __RPC_FAR *__RPC_FAR *tileSet); - HRESULT STDMETHODCALLTYPE CreateTileSet( - /* [in] */ int numTiles, - /* [in] */ int bitDepth, - /* [in] */ int width, - /* [retval][out] */ TileSet __RPC_FAR *__RPC_FAR *newTileSet); - - HRESULT STDMETHODCALLTYPE LoadVolFile( - /* [in] */ BSTR fileName, - /* [in] */ int bAttachToStream, - /* [retval][out] */ ArchiveReader __RPC_FAR *__RPC_FAR *volReader); - HRESULT STDMETHODCALLTYPE LoadVol( - /* [in] */ SeekableStreamReader __RPC_FAR *inStream, - /* [in] */ int bAttachToStream, - /* [retval][out] */ ArchiveReader __RPC_FAR *__RPC_FAR *volReader); - HRESULT STDMETHODCALLTYPE CreateVolFile( - /* [retval][out] */ ArchiveWriter __RPC_FAR *__RPC_FAR *volWriter); - - HRESULT STDMETHODCALLTYPE LoadClmFile( - /* [in] */ BSTR fileName, - /* [in] */ int bAttachToStream, - /* [retval][out] */ ArchiveReader __RPC_FAR *__RPC_FAR *clmReader); - HRESULT STDMETHODCALLTYPE LoadClm( - /* [in] */ SeekableStreamReader __RPC_FAR *inStream, - /* [in] */ int bAttachToStream, - /* [retval][out] */ ArchiveReader __RPC_FAR *__RPC_FAR *clmReader); - HRESULT STDMETHODCALLTYPE CreateClmFile( - /* [retval][out] */ ArchiveWriter __RPC_FAR *__RPC_FAR *clmWriter); - - HRESULT STDMETHODCALLTYPE AddArchiveToSearch( - /* [in] */ ArchiveReader __RPC_FAR *volReader); - HRESULT STDMETHODCALLTYPE ClearSearchPath(void); + // [propget] + HRESULT STDMETHODCALLTYPE get_RootPath( + /* [retval][out] */ BSTR __RPC_FAR *path); + // [propput] + HRESULT STDMETHODCALLTYPE put_RootPath( + /* [in] */ BSTR path); + + HRESULT STDMETHODCALLTYPE OpenStreamRead( + /* [in] */ BSTR fileName, + /* [retval][out] */ StreamReader __RPC_FAR *__RPC_FAR *stream); + HRESULT STDMETHODCALLTYPE OpenStreamWrite( + /* [in] */ BSTR fileName, + /* [retval][out] */ StreamWriter __RPC_FAR *__RPC_FAR *stream); + + HRESULT STDMETHODCALLTYPE LoadMapFile( + /* [in] */ BSTR fileName, + /* [in] */ enum MapLoadSaveFormat loadFlags, + /* [retval][out] */ MapFile __RPC_FAR *__RPC_FAR *mapFile); + HRESULT STDMETHODCALLTYPE LoadMap( + /* [in] */ StreamReader __RPC_FAR *inStream, + /* [in] */ enum MapLoadSaveFormat loadFlags, + /* [retval][out] */ MapFile __RPC_FAR *__RPC_FAR *mapFile); + HRESULT STDMETHODCALLTYPE CreateNewMap( + /* [in] */ int width, + /* [in] */ int height, + /* [retval][out] */ MapFile __RPC_FAR *__RPC_FAR *newMap); + + HRESULT STDMETHODCALLTYPE LoadTileSetFile( + /* [in] */ BSTR fileName, + /* [retval][out] */ TileSet __RPC_FAR *__RPC_FAR *tileSet); + HRESULT STDMETHODCALLTYPE LoadTileSet( + /* [in] */ StreamReader __RPC_FAR *inStream, + /* [retval][out] */ TileSet __RPC_FAR *__RPC_FAR *tileSet); + HRESULT STDMETHODCALLTYPE CreateTileSet( + /* [in] */ int numTiles, + /* [in] */ int bitDepth, + /* [in] */ int width, + /* [retval][out] */ TileSet __RPC_FAR *__RPC_FAR *newTileSet); + + HRESULT STDMETHODCALLTYPE LoadVolFile( + /* [in] */ BSTR fileName, + /* [in] */ int bAttachToStream, + /* [retval][out] */ ArchiveReader __RPC_FAR *__RPC_FAR *volReader); + HRESULT STDMETHODCALLTYPE LoadVol( + /* [in] */ SeekableStreamReader __RPC_FAR *inStream, + /* [in] */ int bAttachToStream, + /* [retval][out] */ ArchiveReader __RPC_FAR *__RPC_FAR *volReader); + HRESULT STDMETHODCALLTYPE CreateVolFile( + /* [retval][out] */ ArchiveWriter __RPC_FAR *__RPC_FAR *volWriter); + + HRESULT STDMETHODCALLTYPE LoadClmFile( + /* [in] */ BSTR fileName, + /* [in] */ int bAttachToStream, + /* [retval][out] */ ArchiveReader __RPC_FAR *__RPC_FAR *clmReader); + HRESULT STDMETHODCALLTYPE LoadClm( + /* [in] */ SeekableStreamReader __RPC_FAR *inStream, + /* [in] */ int bAttachToStream, + /* [retval][out] */ ArchiveReader __RPC_FAR *__RPC_FAR *clmReader); + HRESULT STDMETHODCALLTYPE CreateClmFile( + /* [retval][out] */ ArchiveWriter __RPC_FAR *__RPC_FAR *clmWriter); + + HRESULT STDMETHODCALLTYPE AddArchiveToSearch( + /* [in] */ ArchiveReader __RPC_FAR *volReader); + HRESULT STDMETHODCALLTYPE ClearSearchPath(void); // ISupportErrorInfo diff --git a/CResourceManagerFactory.cpp b/CResourceManagerFactory.cpp index 7d50338..f06c686 100644 --- a/CResourceManagerFactory.cpp +++ b/CResourceManagerFactory.cpp @@ -7,57 +7,57 @@ ULONG CResourceManagerFactory::AddRef() { - return ++m_cRef; + return ++m_cRef; } ULONG CResourceManagerFactory::Release() { - if(--m_cRef != 0) - return m_cRef; - delete this; - return 0; + if(--m_cRef != 0) + return m_cRef; + delete this; + return 0; } HRESULT CResourceManagerFactory::QueryInterface(REFIID riid, void** ppv) { - if(riid == IID_IUnknown) - *ppv = (IUnknown*)this; - else if(riid == IID_IClassFactory) - *ppv = (IClassFactory*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - return S_OK; + if(riid == IID_IUnknown) + *ppv = (IUnknown*)this; + else if(riid == IID_IClassFactory) + *ppv = (IClassFactory*)this; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + return S_OK; } -HRESULT CResourceManagerFactory::CreateInstance(IUnknown *pUnknownOuter, - REFIID riid, void** ppv) +HRESULT CResourceManagerFactory::CreateInstance(IUnknown *pUnknownOuter, + REFIID riid, void** ppv) { - if(pUnknownOuter != NULL) - return CLASS_E_NOAGGREGATION; + if(pUnknownOuter != NULL) + return CLASS_E_NOAGGREGATION; // Initialize returned object pointer to NULL *ppv = NULL; - CResourceManager *pResManager = new CResourceManager(NULL); - if(pResManager == NULL) - return E_OUTOFMEMORY; + CResourceManager *pResManager = new CResourceManager(NULL); + if(pResManager == NULL) + return E_OUTOFMEMORY; - HRESULT hr = pResManager->QueryInterface(riid, ppv); - pResManager->Release(); - return hr; + HRESULT hr = pResManager->QueryInterface(riid, ppv); + pResManager->Release(); + return hr; } HRESULT CResourceManagerFactory::LockServer(BOOL bLock) { - if(bLock) - g_cLocks++; - else - g_cLocks--; - return S_OK; + if(bLock) + g_cLocks++; + else + g_cLocks--; + return S_OK; } diff --git a/CResourceManagerFactory.h b/CResourceManagerFactory.h index d16280b..43e659a 100644 --- a/CResourceManagerFactory.h +++ b/CResourceManagerFactory.h @@ -5,19 +5,19 @@ extern int g_cLocks; class CResourceManagerFactory : public IClassFactory { public: - // IUnknown - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + // IUnknown + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); - // IClassFactory - HRESULT __stdcall CreateInstance(IUnknown* pUnknownOuter, - REFIID riid, void** ppv); - HRESULT __stdcall LockServer(BOOL bLock); + // IClassFactory + HRESULT __stdcall CreateInstance(IUnknown* pUnknownOuter, + REFIID riid, void** ppv); + HRESULT __stdcall LockServer(BOOL bLock); - CResourceManagerFactory() : m_cRef(1) { g_cLocks++; } - ~CResourceManagerFactory() { g_cLocks--; } + CResourceManagerFactory() : m_cRef(1) { g_cLocks++; } + ~CResourceManagerFactory() { g_cLocks--; } private: - ULONG m_cRef; + ULONG m_cRef; }; diff --git a/CTileGroup.cpp b/CTileGroup.cpp index 8bff593..f1480b6 100644 --- a/CTileGroup.cpp +++ b/CTileGroup.cpp @@ -25,18 +25,18 @@ ULONG __stdcall CTileGroup::Release() HRESULT __stdcall CTileGroup::QueryInterface(REFIID riid, void** ppv) { - if (riid == IID_IUnknown) - *ppv = (IUnknown*)this; - else if (riid == IID_TileGroup) - *ppv = (TileGroup*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - - return S_OK; + if (riid == IID_IUnknown) + *ppv = (IUnknown*)this; + else if (riid == IID_TileGroup) + *ppv = (TileGroup*)this; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + + return S_OK; } diff --git a/CTileGroup.h b/CTileGroup.h index a8fcf5c..555fbd2 100644 --- a/CTileGroup.h +++ b/CTileGroup.h @@ -7,46 +7,46 @@ class CTileGroup : public TileGroup { public: - // IUnknown + // IUnknown // ******** - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); // TileGroup // ********* // [propget] - HRESULT STDMETHODCALLTYPE get_TileWidth( - /* [retval][out] */ int __RPC_FAR *tileWidth); - // [propget] - HRESULT STDMETHODCALLTYPE get_TileHeight( - /* [retval][out] */ int __RPC_FAR *tileHeight); - - // [propget] - HRESULT STDMETHODCALLTYPE get_TileSetManager( - /* [retval][out] */ TileSetManager __RPC_FAR *__RPC_FAR *tileSetManager); + HRESULT STDMETHODCALLTYPE get_TileWidth( + /* [retval][out] */ int __RPC_FAR *tileWidth); + // [propget] + HRESULT STDMETHODCALLTYPE get_TileHeight( + /* [retval][out] */ int __RPC_FAR *tileHeight); + + // [propget] + HRESULT STDMETHODCALLTYPE get_TileSetManager( + /* [retval][out] */ TileSetManager __RPC_FAR *__RPC_FAR *tileSetManager); // [propget] - HRESULT STDMETHODCALLTYPE get_MappingIndex( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [retval][out] */ int __RPC_FAR *tileMappingIndex); + HRESULT STDMETHODCALLTYPE get_MappingIndex( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [retval][out] */ int __RPC_FAR *tileMappingIndex); // [propput] - HRESULT STDMETHODCALLTYPE put_MappingIndex( - /* [in] */ int tileX, - /* [in] */ int tileY, - /* [in] */ int tileMappingIndex); - - HRESULT STDMETHODCALLTYPE Draw( - /* [in] */ int destDC, - /* [in] */ int sourcePixelX, - /* [in] */ int sourcePixelY, - /* [in] */ int pixelWidth, - /* [in] */ int pixelHeight); - - + HRESULT STDMETHODCALLTYPE put_MappingIndex( + /* [in] */ int tileX, + /* [in] */ int tileY, + /* [in] */ int tileMappingIndex); + + HRESULT STDMETHODCALLTYPE Draw( + /* [in] */ int destDC, + /* [in] */ int sourcePixelX, + /* [in] */ int sourcePixelY, + /* [in] */ int pixelWidth, + /* [in] */ int pixelHeight); + + // ISupportErrorInfo // ***************** HRESULT STDMETHODCALLTYPE InterfaceSupportsErrorInfo(REFIID riid); diff --git a/CTileSet.cpp b/CTileSet.cpp index 95168ec..21e5400 100644 --- a/CTileSet.cpp +++ b/CTileSet.cpp @@ -24,18 +24,18 @@ ULONG __stdcall CTileSet::Release() HRESULT __stdcall CTileSet::QueryInterface(REFIID riid, void** ppv) { - if(riid == IID_IUnknown) - *ppv = (IUnknown*)this; - else if(riid == IID_TileSet) - *ppv = (TileSet*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - - return S_OK; + if(riid == IID_IUnknown) + *ppv = (IUnknown*)this; + else if(riid == IID_TileSet) + *ppv = (TileSet*)this; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + + return S_OK; } @@ -187,7 +187,7 @@ HRESULT CTileSet::get_MiniMapColors(int tileIndex, int *color) // Pastes the specified tile to the destination Device Context at the given coordinates HRESULT CTileSet::PasteTile(int destDC, int pixelX, int pixelY, int tileNum) { - // Paste the tile to the destDC at given coordinates. Note: Tile are assumed + // Paste the tile to the destDC at given coordinates. Note: Tile are assumed // to be square, and stored in the bitmap as a column of tiles. BitBlt((HDC)destDC, pixelX, pixelY, headInfo.width, headInfo.width, memDC, 0, tileNum*headInfo.width, SRCCOPY); @@ -423,7 +423,7 @@ int CTileSet::LoadTileSet(StreamReader *stream) break; case 'atad': // data - // Check for format errors + // Check for format errors // Check if palette data section already read if (bmInfo->bmiHeader.biClrUsed != 0) { @@ -595,7 +595,7 @@ int CTileSet::SaveTileSet(StreamWriter *stream) { // Write the Palette section sectHead.tag = 'LAPP'; // PPAL tag - sectHead.size = bmInfo->bmiHeader.biClrUsed*sizeof(RGBQUAD) + + sectHead.size = bmInfo->bmiHeader.biClrUsed*sizeof(RGBQUAD) + sizeof(sectHead)*2 + 8; stream->Write(sizeof(sectHead), (int)§Head, &numBytesWritten); // Write the "head" section of the "PPAL" section @@ -618,7 +618,7 @@ int CTileSet::SaveTileSet(StreamWriter *stream) destPal->rgbBlue = srcPal->rgbRed; destPal->rgbReserved = srcPal->rgbReserved; } - stream->Write(bmInfo->bmiHeader.biClrUsed*sizeof(RGBQUAD), + stream->Write(bmInfo->bmiHeader.biClrUsed*sizeof(RGBQUAD), (int)&tempPal, &numBytesWritten); } @@ -731,8 +731,8 @@ void CTileSet::CalcMiniMapColors(int startTile, int endTile) for (x = 0; x < headInfo.width; x++) { // Add the color components of this pixel - pixelDataOffset = tileNum*tileByteSize + - y*scanlineByteWidth + + pixelDataOffset = tileNum*tileByteSize + + y*scanlineByteWidth + ((x*headInfo.bitDepth) >> 3); switch(headInfo.bitDepth) { diff --git a/CTileSet.h b/CTileSet.h index 7307d92..91a3211 100644 --- a/CTileSet.h +++ b/CTileSet.h @@ -5,65 +5,65 @@ class CTileSet : public TileSet { public: - // IUnknown - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + // IUnknown + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); // ITileSet - // [propget] - HRESULT STDMETHODCALLTYPE get_NumTiles( - /* [retval][out] */ int __RPC_FAR *numTiles); - // [propget] - HRESULT STDMETHODCALLTYPE get_TileSize( - /* [retval][out] */ int __RPC_FAR *tileSize); - // [propget] - HRESULT STDMETHODCALLTYPE get_BitDepth( - /* [retval][out] */ int __RPC_FAR *bitDepth); - // [propget] - HRESULT STDMETHODCALLTYPE get_NumPaletteEntries( - /* [retval][out] */ int __RPC_FAR *numPaletteEntries); - // [propget] - HRESULT STDMETHODCALLTYPE get_PaletteEntry( - /* [in] */ int index, - /* [retval][out] */ int __RPC_FAR *palEntry); - // [propput] - HRESULT STDMETHODCALLTYPE put_PaletteEntry( - /* [in] */ int index, - /* [in] */ int palEntry); - - HRESULT STDMETHODCALLTYPE SetNumTiles( - /* [in] */ int numTiles); - + // [propget] + HRESULT STDMETHODCALLTYPE get_NumTiles( + /* [retval][out] */ int __RPC_FAR *numTiles); + // [propget] + HRESULT STDMETHODCALLTYPE get_TileSize( + /* [retval][out] */ int __RPC_FAR *tileSize); + // [propget] + HRESULT STDMETHODCALLTYPE get_BitDepth( + /* [retval][out] */ int __RPC_FAR *bitDepth); + // [propget] + HRESULT STDMETHODCALLTYPE get_NumPaletteEntries( + /* [retval][out] */ int __RPC_FAR *numPaletteEntries); + // [propget] + HRESULT STDMETHODCALLTYPE get_PaletteEntry( + /* [in] */ int index, + /* [retval][out] */ int __RPC_FAR *palEntry); + // [propput] + HRESULT STDMETHODCALLTYPE put_PaletteEntry( + /* [in] */ int index, + /* [in] */ int palEntry); + + HRESULT STDMETHODCALLTYPE SetNumTiles( + /* [in] */ int numTiles); + // Returns pixel data in native format (as stored in file) - // [local] - HRESULT STDMETHODCALLTYPE GetPixelData( - /* [in] */ int pBuffer, - /* [in] */ int startOffset, - /* [in] */ int numBytes); + // [local] + HRESULT STDMETHODCALLTYPE GetPixelData( + /* [in] */ int pBuffer, + /* [in] */ int startOffset, + /* [in] */ int numBytes); // Sets pixel data in native format (as stored in file) - // [local] - HRESULT STDMETHODCALLTYPE SetPixelData( - /* [in] */ int pBuffer, - /* [in] */ int startOffset, - /* [in] */ int numBytes); - - - // [propget] // **TODO** Remove - HRESULT STDMETHODCALLTYPE get_MiniMapColors( - /* [in] */ int tileIndex, - /* [retval][out] */ int __RPC_FAR *color); - - HRESULT STDMETHODCALLTYPE PasteTile( - /* [in] */ int destDC, - /* [in] */ int pixelX, - /* [in] */ int pixelY, - /* [in] */ int tileNum); - - HRESULT STDMETHODCALLTYPE SaveTileSet( - /* [in] */ StreamWriter __RPC_FAR *stream, - /* [in] */ enum TileSetSaveFormat saveFormat); + // [local] + HRESULT STDMETHODCALLTYPE SetPixelData( + /* [in] */ int pBuffer, + /* [in] */ int startOffset, + /* [in] */ int numBytes); + + + // [propget] // **TODO** Remove + HRESULT STDMETHODCALLTYPE get_MiniMapColors( + /* [in] */ int tileIndex, + /* [retval][out] */ int __RPC_FAR *color); + + HRESULT STDMETHODCALLTYPE PasteTile( + /* [in] */ int destDC, + /* [in] */ int pixelX, + /* [in] */ int pixelY, + /* [in] */ int tileNum); + + HRESULT STDMETHODCALLTYPE SaveTileSet( + /* [in] */ StreamWriter __RPC_FAR *stream, + /* [in] */ enum TileSetSaveFormat saveFormat); // Class specific diff --git a/CTileSetManager.cpp b/CTileSetManager.cpp index 7f93bca..9e18b3d 100644 --- a/CTileSetManager.cpp +++ b/CTileSetManager.cpp @@ -28,20 +28,20 @@ ULONG __stdcall CTileSetManager::Release() HRESULT __stdcall CTileSetManager::QueryInterface(REFIID riid, void** ppv) { - if (riid == IID_IUnknown) - *ppv = (IUnknown*)(TileSetManager*)this; - else if (riid == IID_TileSetManager) - *ppv = (TileSetManager*)this; + if (riid == IID_IUnknown) + *ppv = (IUnknown*)(TileSetManager*)this; + else if (riid == IID_TileSetManager) + *ppv = (TileSetManager*)this; else if (riid == IID_ISupportErrorInfo) *ppv = (ISupportErrorInfo*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - - return S_OK; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + + return S_OK; } @@ -505,7 +505,7 @@ HRESULT STDMETHODCALLTYPE CTileSetManager::SetNumTerrains(int numTerrains) PostErrorMsg(L"There must be at least one terrain type in a map."); return E_INVALIDARG; } - + // Allocate space for new terrain array TerrainType *newTerrain = new TerrainType[numTerrains]; // Check for allocation error @@ -516,13 +516,13 @@ HRESULT STDMETHODCALLTYPE CTileSetManager::SetNumTerrains(int numTerrains) } // Zero it memset(newTerrain, 0, sizeof(terrain[0])*numTerrains); - + // Copy the old array into the new one if (numTerrains < this->numTerrains) memcpy(newTerrain, terrain, sizeof(terrain[0])*numTerrains); else memcpy(newTerrain, terrain, sizeof(terrain[0])*this->numTerrains); - + // Release the old memory delete [] terrain; // Update the array pointer & numTerrains var @@ -1023,7 +1023,7 @@ HRESULT STDMETHODCALLTYPE CTileSetManager::put_TerrainUnknown(int terrainIndex, // Constructor/Destructor // ********************** -CTileSetManager::CTileSetManager(TileSetSource *tileSetSource) : +CTileSetManager::CTileSetManager(TileSetSource *tileSetSource) : m_cRef(1), tileSource(tileSetSource) { // Initialize variables @@ -1193,7 +1193,7 @@ int CTileSetManager::Load(StreamReader *stream) // Allocate space for a BSTR to hold the name tileSetInfo[i].wideTileSetName = SysAllocStringLen(NULL, temp); // Convert the name to unicode - MultiByteToWideChar(CP_ACP, 0, tileSetInfo[i].tileSetName, temp, + MultiByteToWideChar(CP_ACP, 0, tileSetInfo[i].tileSetName, temp, tileSetInfo[i].wideTileSetName, temp); // Load the associated tile set tileSource->LoadTileSet(tileSetInfo[i].wideTileSetName, &tileSet->tileSet); @@ -1206,7 +1206,7 @@ int CTileSetManager::Load(StreamReader *stream) } } - + // Load Tile Set mapping info // Read the string "TILE SET", 0x1A, 0 stream->Read(0xA, (int)buff, &numBytesRead); diff --git a/CTileSetManager.h b/CTileSetManager.h index 27f113b..d28cbb9 100644 --- a/CTileSetManager.h +++ b/CTileSetManager.h @@ -3,11 +3,11 @@ class CTileSetManager : public TileSetManager, public ISupportErrorInfo { public: - // IUnknown + // IUnknown // ******** - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); // ISupportErrorInfo @@ -18,252 +18,252 @@ class CTileSetManager : public TileSetManager, public ISupportErrorInfo // TileSetManager // ************** - // [propget] - HRESULT STDMETHODCALLTYPE get_NumTileSets( - /* [retval][out] */ int __RPC_FAR *numTileSets); - - // [propget] - HRESULT STDMETHODCALLTYPE get_TileSetName( - /* [in] */ int index, - /* [retval][out] */ BSTR __RPC_FAR *tileSetName); - - // [propget] - HRESULT STDMETHODCALLTYPE get_TileSet( - /* [in] */ int index, - /* [retval][out] */ TileSet __RPC_FAR *__RPC_FAR *tileSet); - - HRESULT STDMETHODCALLTYPE AddTileSet( - /* [in] */ BSTR tileSetName, - /* [retval][out] */ int __RPC_FAR *index); - - HRESULT STDMETHODCALLTYPE RemoveTileSet( - /* [in] */ BSTR tileSetName, - /* [retval][out] */ int __RPC_FAR *index); - - HRESULT STDMETHODCALLTYPE ReplaceTileSet( - /* [in] */ int index, - /* [in] */ BSTR tileSetName); - - HRESULT STDMETHODCALLTYPE MapInTiles( - /* [in] */ int tileSetIndex, - /* [in] */ int startTile, - /* [in] */ int numTiles, - /* [retval][out] */ int __RPC_FAR *mappingIndex); - - HRESULT STDMETHODCALLTYPE GetMappingIndex( - /* [in] */ int tileSetIndex, - /* [in] */ int tileIndex, - /* [in] */ int numTileReplacements, - /* [in] */ int cycleDelay, - /* [retval][out] */ int __RPC_FAR *mappingIndex); - - // [propget] - HRESULT STDMETHODCALLTYPE get_NumMappings( - /* [retval][out] */ int __RPC_FAR *numMappings); - - // [propget] - HRESULT STDMETHODCALLTYPE get_TileSetIndex( - /* [in] */ int mappingIndex, - /* [retval][out] */ int __RPC_FAR *tileSetIndex); - // [propput] - HRESULT STDMETHODCALLTYPE put_TileSetIndex( - /* [in] */ int mappingIndex, - /* [in] */ int tileSetIndex); - - // [propget] - HRESULT STDMETHODCALLTYPE get_TileSetTileIndex( - /* [in] */ int mappingIndex, - /* [retval][out] */ int __RPC_FAR *tileSetTileIndex); - // [propput] - HRESULT STDMETHODCALLTYPE put_TileSetTileIndex( - /* [in] */ int mappingIndex, - /* [in] */ int tileSetTileIndex); - - // [propget] - HRESULT STDMETHODCALLTYPE get_NumTileReplacements( - /* [in] */ int mappingIndex, - /* [retval][out] */ int __RPC_FAR *numTileReplacements); - // [propput] - HRESULT STDMETHODCALLTYPE put_NumTileReplacements( - /* [in] */ int mappingIndex, - /* [in] */ int numTileReplacements); - - // [propget] - HRESULT STDMETHODCALLTYPE get_CycleDelay( - /* [in] */ int mappingIndex, - /* [retval][out] */ int __RPC_FAR *cycleDelay); - // [propput] - HRESULT STDMETHODCALLTYPE put_CycleDelay( - /* [in] */ int mappingIndex, - /* [in] */ int cycleDelay); - - // [propget] - HRESULT STDMETHODCALLTYPE get_NumTerrains( - /* [retval][out] */ int __RPC_FAR *numTerrains); - HRESULT STDMETHODCALLTYPE SetNumTerrains( - /* [in] */ int numTerrains); - - // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainStartTile( - /* [in] */ int terrainIndex, - /* [retval][out] */ int __RPC_FAR *startMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainStartTile( - /* [in] */ int terrainIndex, - /* [in] */ int startMapping); - // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainEndTile( - /* [in] */ int terrainIndex, - /* [retval][out] */ int __RPC_FAR *endMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainEndTile( - /* [in] */ int terrainIndex, - /* [in] */ int endMapping); + // [propget] + HRESULT STDMETHODCALLTYPE get_NumTileSets( + /* [retval][out] */ int __RPC_FAR *numTileSets); + + // [propget] + HRESULT STDMETHODCALLTYPE get_TileSetName( + /* [in] */ int index, + /* [retval][out] */ BSTR __RPC_FAR *tileSetName); + + // [propget] + HRESULT STDMETHODCALLTYPE get_TileSet( + /* [in] */ int index, + /* [retval][out] */ TileSet __RPC_FAR *__RPC_FAR *tileSet); + + HRESULT STDMETHODCALLTYPE AddTileSet( + /* [in] */ BSTR tileSetName, + /* [retval][out] */ int __RPC_FAR *index); + + HRESULT STDMETHODCALLTYPE RemoveTileSet( + /* [in] */ BSTR tileSetName, + /* [retval][out] */ int __RPC_FAR *index); + + HRESULT STDMETHODCALLTYPE ReplaceTileSet( + /* [in] */ int index, + /* [in] */ BSTR tileSetName); + + HRESULT STDMETHODCALLTYPE MapInTiles( + /* [in] */ int tileSetIndex, + /* [in] */ int startTile, + /* [in] */ int numTiles, + /* [retval][out] */ int __RPC_FAR *mappingIndex); + + HRESULT STDMETHODCALLTYPE GetMappingIndex( + /* [in] */ int tileSetIndex, + /* [in] */ int tileIndex, + /* [in] */ int numTileReplacements, + /* [in] */ int cycleDelay, + /* [retval][out] */ int __RPC_FAR *mappingIndex); + + // [propget] + HRESULT STDMETHODCALLTYPE get_NumMappings( + /* [retval][out] */ int __RPC_FAR *numMappings); + + // [propget] + HRESULT STDMETHODCALLTYPE get_TileSetIndex( + /* [in] */ int mappingIndex, + /* [retval][out] */ int __RPC_FAR *tileSetIndex); + // [propput] + HRESULT STDMETHODCALLTYPE put_TileSetIndex( + /* [in] */ int mappingIndex, + /* [in] */ int tileSetIndex); + + // [propget] + HRESULT STDMETHODCALLTYPE get_TileSetTileIndex( + /* [in] */ int mappingIndex, + /* [retval][out] */ int __RPC_FAR *tileSetTileIndex); + // [propput] + HRESULT STDMETHODCALLTYPE put_TileSetTileIndex( + /* [in] */ int mappingIndex, + /* [in] */ int tileSetTileIndex); + + // [propget] + HRESULT STDMETHODCALLTYPE get_NumTileReplacements( + /* [in] */ int mappingIndex, + /* [retval][out] */ int __RPC_FAR *numTileReplacements); + // [propput] + HRESULT STDMETHODCALLTYPE put_NumTileReplacements( + /* [in] */ int mappingIndex, + /* [in] */ int numTileReplacements); + + // [propget] + HRESULT STDMETHODCALLTYPE get_CycleDelay( + /* [in] */ int mappingIndex, + /* [retval][out] */ int __RPC_FAR *cycleDelay); + // [propput] + HRESULT STDMETHODCALLTYPE put_CycleDelay( + /* [in] */ int mappingIndex, + /* [in] */ int cycleDelay); + + // [propget] + HRESULT STDMETHODCALLTYPE get_NumTerrains( + /* [retval][out] */ int __RPC_FAR *numTerrains); + HRESULT STDMETHODCALLTYPE SetNumTerrains( + /* [in] */ int numTerrains); + + // [propget] + HRESULT STDMETHODCALLTYPE get_TerrainStartTile( + /* [in] */ int terrainIndex, + /* [retval][out] */ int __RPC_FAR *startMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainStartTile( + /* [in] */ int terrainIndex, + /* [in] */ int startMapping); + // [propget] + HRESULT STDMETHODCALLTYPE get_TerrainEndTile( + /* [in] */ int terrainIndex, + /* [retval][out] */ int __RPC_FAR *endMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainEndTile( + /* [in] */ int terrainIndex, + /* [in] */ int endMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainDozed( - /* [in] */ int terrainIndex, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainDozed( - /* [in] */ int terrainIndex, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainDozed( + /* [in] */ int terrainIndex, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainDozed( + /* [in] */ int terrainIndex, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainRubble( - /* [in] */ int terrainIndex, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainRubble( - /* [in] */ int terrainIndex, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainRubble( + /* [in] */ int terrainIndex, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainRubble( + /* [in] */ int terrainIndex, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainTubeUnk( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainTubeUnk( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainTubeUnk( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainTubeUnk( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainLavaWall( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainLavaWall( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainLavaWall( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainLavaWall( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainMicrobeWall( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainMicrobeWall( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainMicrobeWall( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainMicrobeWall( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainNormalWall( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainNormalWall( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainNormalWall( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainNormalWall( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainDamagedWall( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainDamagedWall( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainDamagedWall( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainDamagedWall( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainRuinedWall( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainRuinedWall( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainRuinedWall( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainRuinedWall( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainLava( - /* [in] */ int terrainIndex, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainLava( - /* [in] */ int terrainIndex, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainLava( + /* [in] */ int terrainIndex, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainLava( + /* [in] */ int terrainIndex, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainFlat1( - /* [in] */ int terrainIndex, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainFlat1( - /* [in] */ int terrainIndex, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainFlat1( + /* [in] */ int terrainIndex, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainFlat1( + /* [in] */ int terrainIndex, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainFlat2( - /* [in] */ int terrainIndex, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainFlat2( - /* [in] */ int terrainIndex, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainFlat2( + /* [in] */ int terrainIndex, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainFlat2( + /* [in] */ int terrainIndex, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainFlat3( - /* [in] */ int terrainIndex, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainFlat3( - /* [in] */ int terrainIndex, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainFlat3( + /* [in] */ int terrainIndex, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainFlat3( + /* [in] */ int terrainIndex, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainTube( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainTube( - /* [in] */ int terrainIndex, - /* [in] */ enum TerrainTubeDirection direction, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainTube( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainTube( + /* [in] */ int terrainIndex, + /* [in] */ enum TerrainTubeDirection direction, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainScorched( - /* [in] */ int terrainIndex, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainScorched( - /* [in] */ int terrainIndex, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainScorched( + /* [in] */ int terrainIndex, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainScorched( + /* [in] */ int terrainIndex, + /* [in] */ int dataMapping); // [propget] - HRESULT STDMETHODCALLTYPE get_TerrainUnknown( - /* [in] */ int terrainIndex, - /* [in] */ int unkIndex, - /* [retval][out] */ int __RPC_FAR *dataMapping); - // [propput] - HRESULT STDMETHODCALLTYPE put_TerrainUnknown( - /* [in] */ int terrainIndex, - /* [in] */ int unkIndex, - /* [in] */ int dataMapping); + HRESULT STDMETHODCALLTYPE get_TerrainUnknown( + /* [in] */ int terrainIndex, + /* [in] */ int unkIndex, + /* [retval][out] */ int __RPC_FAR *dataMapping); + // [propput] + HRESULT STDMETHODCALLTYPE put_TerrainUnknown( + /* [in] */ int terrainIndex, + /* [in] */ int unkIndex, + /* [in] */ int dataMapping); // Class specific // ************** @@ -294,7 +294,7 @@ class CTileSetManager : public TileSetManager, public ISupportErrorInfo short numTileReplacements; short cycleDelay; }; - struct TerrainTypeItemTable // Holds sets of related tiles + struct TerrainTypeItemTable // Holds sets of related tiles // LavaWalls/MicrobeWalls/NormalWalls/DamagedWalls/ReallyDamagedWalls/Tubes { short tile[0x10]; // tile for each direction facing diff --git a/CTileSetSource.cpp b/CTileSetSource.cpp index 6ff154e..8a70efa 100644 --- a/CTileSetSource.cpp +++ b/CTileSetSource.cpp @@ -21,18 +21,18 @@ ULONG __stdcall CTileSetSource::Release() HRESULT __stdcall CTileSetSource::QueryInterface(REFIID riid, void** ppv) { - if(riid == IID_IUnknown) - *ppv = (IUnknown*)this; - else if(riid == IID_TileSetSource) - *ppv = (TileSetSource*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - - return S_OK; + if(riid == IID_IUnknown) + *ppv = (IUnknown*)this; + else if(riid == IID_TileSetSource) + *ppv = (TileSetSource*)this; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + + return S_OK; } @@ -184,7 +184,7 @@ HRESULT CTileSetSource::UnloadTileSet(BSTR tileSetName) // Decrement the count current->loadedCount--; - // Note: Don't free the tile set here since it may likely be loaded again soon + // Note: Don't free the tile set here since it may likely be loaded again soon // **TODO** Handle this possible optimization if (current->loadedCount == 0) { diff --git a/CTileSetSource.h b/CTileSetSource.h index c4c39a3..a63fc27 100644 --- a/CTileSetSource.h +++ b/CTileSetSource.h @@ -6,17 +6,17 @@ class CTileSetSource : public TileSetSource { public: // IUnknown - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); // TileSetSource - HRESULT STDMETHODCALLTYPE LoadTileSet( - /* [in] */ BSTR tileSetName, - /* [retval][out] */ TileSet __RPC_FAR *__RPC_FAR *tileSet); - - HRESULT STDMETHODCALLTYPE UnloadTileSet( - /* [in] */ BSTR __RPC_FAR tileSetName); + HRESULT STDMETHODCALLTYPE LoadTileSet( + /* [in] */ BSTR tileSetName, + /* [retval][out] */ TileSet __RPC_FAR *__RPC_FAR *tileSet); + + HRESULT STDMETHODCALLTYPE UnloadTileSet( + /* [in] */ BSTR __RPC_FAR tileSetName); // Class specific functions diff --git a/CVolReader.cpp b/CVolReader.cpp index ec090db..c75cf67 100644 --- a/CVolReader.cpp +++ b/CVolReader.cpp @@ -23,18 +23,18 @@ ULONG __stdcall CVolReader::Release() HRESULT __stdcall CVolReader::QueryInterface(REFIID riid, void** ppv) { - if(riid == IID_IUnknown) - *ppv = (IUnknown*)this; - else if(riid == IID_ArchiveReader) - *ppv = (ArchiveReader*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - - return S_OK; + if(riid == IID_IUnknown) + *ppv = (IUnknown*)this; + else if(riid == IID_ArchiveReader) + *ppv = (ArchiveReader*)this; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + + return S_OK; } @@ -91,7 +91,7 @@ HRESULT CVolReader::OpenStreamRead(BSTR fileName, StreamReader **stream) // Check if data is loaded into memory if (buffer == NULL) { - // Data is not loaded into memory. + // Data is not loaded into memory. // Check if attached stream does not exist if (attachedStream == NULL) { @@ -135,7 +135,7 @@ HRESULT CVolReader::OpenStreamRead(BSTR fileName, StreamReader **stream) // Copy the data into a memory stream CMemoryStreamReader *rawStream; - rawStream = new CMemoryStreamReader(indexTable[fileIndex].fileSize, + rawStream = new CMemoryStreamReader(indexTable[fileIndex].fileSize, (char*)buffer, bAttachToBuffer); if (rawStream == NULL) @@ -401,8 +401,8 @@ int CVolReader::GetFileIndex(BSTR fileName) // Get the midpoint middleIndex = (startIndex + endIndex) >> 1; // Check if strings match - result = strncmp((char*)stringBuffer + indexTable[middleIndex].fileNameOffset, - tempString, + result = strncmp((char*)stringBuffer + indexTable[middleIndex].fileNameOffset, + tempString, stringLength); if (result == 0) { diff --git a/CVolReader.h b/CVolReader.h index a49d261..dbc09a8 100644 --- a/CVolReader.h +++ b/CVolReader.h @@ -7,25 +7,25 @@ class CVolReader : public ArchiveReader public: // IUnknown // ******** - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); // ArchiveReader // ************* - // [propget] - HRESULT STDMETHODCALLTYPE get_NumFiles( - /* [retval][out] */ int __RPC_FAR *numFiles); - // [propget] - HRESULT STDMETHODCALLTYPE get_FileName( - /* [in] */ int index, - /* [retval][out] */ BSTR __RPC_FAR *fileName); - - HRESULT STDMETHODCALLTYPE OpenStreamRead( - /* [in] */ BSTR filename, - /* [retval][out] */ StreamReader __RPC_FAR *__RPC_FAR *stream); + // [propget] + HRESULT STDMETHODCALLTYPE get_NumFiles( + /* [retval][out] */ int __RPC_FAR *numFiles); + // [propget] + HRESULT STDMETHODCALLTYPE get_FileName( + /* [in] */ int index, + /* [retval][out] */ BSTR __RPC_FAR *fileName); + + HRESULT STDMETHODCALLTYPE OpenStreamRead( + /* [in] */ BSTR filename, + /* [retval][out] */ StreamReader __RPC_FAR *__RPC_FAR *stream); // Class specific diff --git a/CVolWriter.cpp b/CVolWriter.cpp index 66ffaa7..12c8568 100644 --- a/CVolWriter.cpp +++ b/CVolWriter.cpp @@ -21,18 +21,18 @@ ULONG __stdcall CVolWriter::Release() HRESULT __stdcall CVolWriter::QueryInterface(REFIID riid, void** ppv) { - if(riid == IID_IUnknown) - *ppv = (IUnknown*)this; - else if(riid == IID_ArchiveWriter) - *ppv = (ArchiveWriter*)this; - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - AddRef(); - - return S_OK; + if(riid == IID_IUnknown) + *ppv = (IUnknown*)this; + else if(riid == IID_ArchiveWriter) + *ppv = (ArchiveWriter*)this; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + AddRef(); + + return S_OK; } @@ -304,7 +304,7 @@ CVolWriter::LinkedListNode* CVolWriter::SortIndex(LinkedListNode *list) // Check for proper sorted order else if (strcmp(tape[0].head->fileName, tape[1].head->fileName) < 0) sourceTape = 0; // Node on tape[0] comes before - else + else sourceTape = 1; // Node on tape[1] comes before // Move the node from the source tape to the dest tape diff --git a/CVolWriter.h b/CVolWriter.h index affc038..97aab65 100644 --- a/CVolWriter.h +++ b/CVolWriter.h @@ -7,20 +7,20 @@ class CVolWriter : public ArchiveWriter public: // IUnknown // ******** - ULONG __stdcall AddRef(); - ULONG __stdcall Release(); - HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); + ULONG __stdcall AddRef(); + ULONG __stdcall Release(); + HRESULT __stdcall QueryInterface(REFIID riid, void** ppv); // ArchiveWriter // ************* - HRESULT STDMETHODCALLTYPE AddToArchive( - /* [in] */ BSTR fileName, - /* [in] */ SeekableStreamReader __RPC_FAR *inStream, - /* [in] */ int reserved); - HRESULT STDMETHODCALLTYPE WriteArchive( - /* [in] */ StreamWriter __RPC_FAR *outStream); + HRESULT STDMETHODCALLTYPE AddToArchive( + /* [in] */ BSTR fileName, + /* [in] */ SeekableStreamReader __RPC_FAR *inStream, + /* [in] */ int reserved); + HRESULT STDMETHODCALLTYPE WriteArchive( + /* [in] */ StreamWriter __RPC_FAR *outStream); // Class specific diff --git a/GlobalFunctions.cpp b/GlobalFunctions.cpp index ba6da83..6507bad 100644 --- a/GlobalFunctions.cpp +++ b/GlobalFunctions.cpp @@ -7,26 +7,26 @@ void PostErrorMsg(WCHAR *errorMsg) { // Provide rich error information - // Create generic error object. - ICreateErrorInfo* pCreateErrorInfo; - if (FAILED(CreateErrorInfo(&pCreateErrorInfo))) + // Create generic error object. + ICreateErrorInfo* pCreateErrorInfo; + if (FAILED(CreateErrorInfo(&pCreateErrorInfo))) return; - // Set rich error information. + // Set rich error information. pCreateErrorInfo->SetDescription(errorMsg); - //pCreateErrorInfo->SetGUID(IID_MapFile); + //pCreateErrorInfo->SetGUID(IID_MapFile); - // Exchange ICreateErrorInfo for IErrorInfo. - IErrorInfo* pErrorInfo; - pCreateErrorInfo->QueryInterface(IID_IErrorInfo, - (void**)&pErrorInfo); + // Exchange ICreateErrorInfo for IErrorInfo. + IErrorInfo* pErrorInfo; + pCreateErrorInfo->QueryInterface(IID_IErrorInfo, + (void**)&pErrorInfo); - // Make the error information available to the client. - SetErrorInfo(NULL, pErrorInfo); + // Make the error information available to the client. + SetErrorInfo(NULL, pErrorInfo); - // Release the interface pointers. - pErrorInfo->Release(); - pCreateErrorInfo->Release(); + // Release the interface pointers. + pErrorInfo->Release(); + pCreateErrorInfo->Release(); } diff --git a/OP2Editor.cpp b/OP2Editor.cpp index 16c9d34..0a9df29 100644 --- a/OP2Editor.cpp +++ b/OP2Editor.cpp @@ -2,7 +2,7 @@ // Note: Proxy/Stub Information -// To build a separate proxy/stub DLL, +// To build a separate proxy/stub DLL, // run nmake -f OP2Editorps.mk in the project directory. #include "stdafx.h" @@ -26,13 +26,13 @@ HINSTANCE g_hInstance = NULL; extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) { - if (dwReason == DLL_PROCESS_ATTACH) - { + if (dwReason == DLL_PROCESS_ATTACH) + { g_hInstance = hInstance; - DisableThreadLibraryCalls(hInstance); - } + DisableThreadLibraryCalls(hInstance); + } - return TRUE; // ok + return TRUE; // ok } // Used to determine whether the DLL can be unloaded by OLE @@ -47,17 +47,17 @@ STDAPI DllCanUnloadNow(void) // Returns a class factory to create an object of the requested type STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { - if(rclsid != CLSID_ResourceManager) - return CLASS_E_CLASSNOTAVAILABLE; + if(rclsid != CLSID_ResourceManager) + return CLASS_E_CLASSNOTAVAILABLE; - CResourceManagerFactory *pFactory = new CResourceManagerFactory(); - if(pFactory == NULL) - return E_OUTOFMEMORY; + CResourceManagerFactory *pFactory = new CResourceManagerFactory(); + if(pFactory == NULL) + return E_OUTOFMEMORY; - // riid is probably IID_IClassFactory. - HRESULT hr = pFactory->QueryInterface(riid, ppv); - pFactory->Release(); // Just in case QueryInterface fails - return hr; + // riid is probably IID_IClassFactory. + HRESULT hr = pFactory->QueryInterface(riid, ppv); + pFactory->Release(); // Just in case QueryInterface fails + return hr; } // DllRegisterServer - Adds entries to the system registry @@ -70,7 +70,7 @@ STDAPI DllRegisterServer(void) int retVal; pathLen = GetModuleFileName(g_hInstance, path, MAX_PATH); - retVal = RegCreateKeyEx(HKEY_CLASSES_ROOT, + retVal = RegCreateKeyEx(HKEY_CLASSES_ROOT, TEXT("CLSID\\{C8DE4CDE-4554-4fe9-8688-A90D91EBCA0B}\\InprocServer32"), 0, TEXT(""), diff --git a/OP2Editor.idl b/OP2Editor.idl index 57d0c1b..fd447fc 100644 --- a/OP2Editor.idl +++ b/OP2Editor.idl @@ -209,7 +209,7 @@ interface TileSetManager : IUnknown [ helpstring("Expands or contracts the internal buffer to hold the specified number of terrains. Previous terrains are copied into the new buffer.") ] HRESULT SetNumTerrains([in] int numTerrains); - + // Terrain sets [ v1_enum, helpstring("Enum used to control the direction for tube/wall terrain data.") ] enum TerrainTubeDirection @@ -240,7 +240,7 @@ interface TileSetManager : IUnknown HRESULT TerrainEndTile([in] int terrainIndex, [out, retval] int *endMapping); [ propput, helpstring("Sets the ending mapping index for a given terrain set.") ] HRESULT TerrainEndTile([in] int terrainIndex, [in] int endMapping); - + [ propget, helpstring("Bulldozed tile index for a given terrain set.") ] HRESULT TerrainDozed([in] int terrainIndex, [out, retval] int *dataMapping); [ propput, helpstring("Sets the bulldozed tile index for a given terrain set.") ] @@ -341,8 +341,8 @@ interface TileGroup : IUnknown HRESULT MappingIndex([in] int tileX, [in] int tileY, [in] int tileMappingIndex); // Display - // **TODO** Include more parameters: - // Zoom, + // **TODO** Include more parameters: + // Zoom, // flags (Normal, Passable/CellType display, LavaPossible, Lava, Blight, Wall or Building, Expand, Display Units/Map only) [ helpstring("Draws a section of the tile group to the given device context at the desired location.") ] HRESULT Draw([in] int destDC, [in] int sourcePixelX, [in] int sourcePixelY, [in] int pixelWidth, [in] int pixelHeight); diff --git a/OP2Editor.vcxproj b/OP2Editor.vcxproj index c334958..36fd633 100644 --- a/OP2Editor.vcxproj +++ b/OP2Editor.vcxproj @@ -90,7 +90,7 @@ .\OP2Editor.def - regsvr32 /s /c "$(TargetPath)" + regsvr32 /s /c "$(TargetPath)" echo regsvr32 exec. time > "$(OutDir)regsvr32.trg" Performing registration $(OutDir)\regsvr32.trg;%(Outputs) @@ -137,7 +137,7 @@ echo regsvr32 exec. time > "$(OutDir)regsvr32.trg" .\OP2Editor.def - regsvr32 /s /c "$(TargetPath)" + regsvr32 /s /c "$(TargetPath)" echo regsvr32 exec. time > "$(OutDir)regsvr32.trg" Performing registration $(OutDir)\regsvr32.trg;%(Outputs) diff --git a/OP2Editorps.def b/OP2Editorps.def index 03f990b..ac12e20 100644 --- a/OP2Editorps.def +++ b/OP2Editorps.def @@ -7,5 +7,5 @@ EXPORTS DllGetClassObject @1 PRIVATE DllCanUnloadNow @2 PRIVATE GetProxyDllInfo @3 PRIVATE - DllRegisterServer @4 PRIVATE - DllUnregisterServer @5 PRIVATE + DllRegisterServer @4 PRIVATE + DllUnregisterServer @5 PRIVATE