/[svn]/libgig/trunk/src/RIFF.cpp
ViewVC logotype

Diff of /libgig/trunk/src/RIFF.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 798 by schoenebeck, Thu Nov 3 23:49:11 2005 UTC revision 1050 by schoenebeck, Fri Mar 2 01:04:45 2007 UTC
# Line 1  Line 1 
1  /***************************************************************************  /***************************************************************************
2   *                                                                         *   *                                                                         *
3   *   libgig - C++ cross-platform Gigasampler format file loader library    *   *   libgig - C++ cross-platform Gigasampler format file access library    *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003-2005 by Christian Schoenebeck                      *   *   Copyright (C) 2003-2007 by Christian Schoenebeck                      *
6   *                              <cuse@users.sourceforge.net>               *   *                              <cuse@users.sourceforge.net>               *
7   *                                                                         *   *                                                                         *
8   *   This library is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
# Line 22  Line 22 
22   ***************************************************************************/   ***************************************************************************/
23    
24  #include <string.h>  #include <string.h>
 #include <sstream>  
25    
26  #include "RIFF.h"  #include "RIFF.h"
27    
28  namespace RIFF {  #include "helper.h"
   
 // *************** Helper Functions **************  
 // *  
   
     template<class T> inline String ToString(T o) {  
         std::stringstream ss;  
         ss << o;  
         return ss.str();  
     }  
   
29    
30    namespace RIFF {
31    
32  // *************** Chunk **************  // *************** Chunk **************
33  // *  // *
# Line 49  namespace RIFF { Line 39  namespace RIFF {
39          ulPos      = 0;          ulPos      = 0;
40          pParent    = NULL;          pParent    = NULL;
41          pChunkData = NULL;          pChunkData = NULL;
42            ulChunkDataSize = 0;
43          ChunkID    = CHUNK_ID_RIFF;          ChunkID    = CHUNK_ID_RIFF;
44          this->pFile = pFile;          this->pFile = pFile;
45      }      }
# Line 62  namespace RIFF { Line 53  namespace RIFF {
53          pParent       = Parent;          pParent       = Parent;
54          ulPos         = 0;          ulPos         = 0;
55          pChunkData    = NULL;          pChunkData    = NULL;
56            ulChunkDataSize = 0;
57          ReadHeader(StartPos);          ReadHeader(StartPos);
58      }      }
59    
# Line 71  namespace RIFF { Line 63  namespace RIFF {
63          this->pParent    = pParent;          this->pParent    = pParent;
64          ulPos            = 0;          ulPos            = 0;
65          pChunkData       = NULL;          pChunkData       = NULL;
66            ulChunkDataSize  = 0;
67          ChunkID          = uiChunkID;          ChunkID          = uiChunkID;
68          CurrentChunkSize = 0;          CurrentChunkSize = 0;
69          NewChunkSize     = uiBodySize;          NewChunkSize     = uiBodySize;
# Line 88  namespace RIFF { Line 81  namespace RIFF {
81          if (lseek(pFile->hFileRead, fPos, SEEK_SET) != -1) {          if (lseek(pFile->hFileRead, fPos, SEEK_SET) != -1) {
82              read(pFile->hFileRead, &ChunkID, 4);              read(pFile->hFileRead, &ChunkID, 4);
83              read(pFile->hFileRead, &CurrentChunkSize, 4);              read(pFile->hFileRead, &CurrentChunkSize, 4);
84            #elif defined(WIN32)
85            if (SetFilePointer(pFile->hFileRead, fPos, NULL/*32 bit*/, FILE_BEGIN) != INVALID_SET_FILE_POINTER) {
86                DWORD dwBytesRead;
87                ReadFile(pFile->hFileRead, &ChunkID, 4, &dwBytesRead, NULL);
88                ReadFile(pFile->hFileRead, &CurrentChunkSize, 4, &dwBytesRead, NULL);
89          #else          #else
90          if (!fseek(pFile->hFileRead, fPos, SEEK_SET)) {          if (!fseek(pFile->hFileRead, fPos, SEEK_SET)) {
91              fread(&ChunkID, 4, 1, pFile->hFileRead);              fread(&ChunkID, 4, 1, pFile->hFileRead);
# Line 95  namespace RIFF { Line 93  namespace RIFF {
93          #endif // POSIX          #endif // POSIX
94              #if WORDS_BIGENDIAN              #if WORDS_BIGENDIAN
95              if (ChunkID == CHUNK_ID_RIFF) {              if (ChunkID == CHUNK_ID_RIFF) {
96                  bEndianNative = false;                  pFile->bEndianNative = false;
97              }              }
98              #else // little endian              #else // little endian
99              if (ChunkID == CHUNK_ID_RIFX) {              if (ChunkID == CHUNK_ID_RIFX) {
# Line 136  namespace RIFF { Line 134  namespace RIFF {
134              write(pFile->hFileWrite, &uiNewChunkID, 4);              write(pFile->hFileWrite, &uiNewChunkID, 4);
135              write(pFile->hFileWrite, &uiNewChunkSize, 4);              write(pFile->hFileWrite, &uiNewChunkSize, 4);
136          }          }
137            #elif defined(WIN32)
138            if (SetFilePointer(pFile->hFileWrite, fPos, NULL/*32 bit*/, FILE_BEGIN) != INVALID_SET_FILE_POINTER) {
139                DWORD dwBytesWritten;
140                WriteFile(pFile->hFileWrite, &uiNewChunkID, 4, &dwBytesWritten, NULL);
141                WriteFile(pFile->hFileWrite, &uiNewChunkSize, 4, &dwBytesWritten, NULL);
142            }
143          #else          #else
144          if (!fseek(pFile->hFileWrite, fPos, SEEK_SET)) {          if (!fseek(pFile->hFileWrite, fPos, SEEK_SET)) {
145              fwrite(&uiNewChunkID, 4, 1, pFile->hFileWrite);              fwrite(&uiNewChunkID, 4, 1, pFile->hFileWrite);
# Line 219  namespace RIFF { Line 223  namespace RIFF {
223        std::cout << "Chunk::GetState()" << std::endl;        std::cout << "Chunk::GetState()" << std::endl;
224        #endif // DEBUG        #endif // DEBUG
225          #if POSIX          #if POSIX
226          if (pFile->hFileRead == 0)    return stream_closed;          if (pFile->hFileRead == 0) return stream_closed;
227            #elif defined (WIN32)
228            if (pFile->hFileRead == INVALID_HANDLE_VALUE)
229                return stream_closed;
230          #else          #else
231          if (pFile->hFileRead == NULL) return stream_closed;          if (pFile->hFileRead == NULL) return stream_closed;
232          #endif // POSIX          #endif // POSIX
# Line 253  namespace RIFF { Line 260  namespace RIFF {
260          unsigned long readWords = read(pFile->hFileRead, pData, WordCount * WordSize);          unsigned long readWords = read(pFile->hFileRead, pData, WordCount * WordSize);
261          if (readWords < 1) return 0;          if (readWords < 1) return 0;
262          readWords /= WordSize;          readWords /= WordSize;
263            #elif defined(WIN32)
264            if (SetFilePointer(pFile->hFileRead, ulStartPos + ulPos, NULL/*32 bit*/, FILE_BEGIN) == INVALID_SET_FILE_POINTER) return 0;
265            DWORD readWords;
266            ReadFile(pFile->hFileRead, pData, WordCount * WordSize, &readWords, NULL);
267            if (readWords < 1) return 0;
268            readWords /= WordSize;
269          #else // standard C functions          #else // standard C functions
270          if (fseek(pFile->hFileRead, ulStartPos + ulPos, SEEK_SET)) return 0;          if (fseek(pFile->hFileRead, ulStartPos + ulPos, SEEK_SET)) return 0;
271          unsigned long readWords = fread(pData, WordSize, WordCount, pFile->hFileRead);          unsigned long readWords = fread(pData, WordSize, WordCount, pFile->hFileRead);
# Line 322  namespace RIFF { Line 335  namespace RIFF {
335          unsigned long writtenWords = write(pFile->hFileWrite, pData, WordCount * WordSize);          unsigned long writtenWords = write(pFile->hFileWrite, pData, WordCount * WordSize);
336          if (writtenWords < 1) throw Exception("POSIX IO Error while trying to write chunk data");          if (writtenWords < 1) throw Exception("POSIX IO Error while trying to write chunk data");
337          writtenWords /= WordSize;          writtenWords /= WordSize;
338            #elif defined(WIN32)
339            if (SetFilePointer(pFile->hFileWrite, ulStartPos + ulPos, NULL/*32 bit*/, FILE_BEGIN) == INVALID_SET_FILE_POINTER) {
340                throw Exception("Could not seek to position " + ToString(ulPos) +
341                                " in chunk (" + ToString(ulStartPos + ulPos) + " in file)");            
342            }
343            DWORD writtenWords;
344            WriteFile(pFile->hFileWrite, pData, WordCount * WordSize, &writtenWords, NULL);
345            if (writtenWords < 1) throw Exception("Windows IO Error while trying to write chunk data");
346            writtenWords /= WordSize;
347          #else // standard C functions          #else // standard C functions
348          if (fseek(pFile->hFileWrite, ulStartPos + ulPos, SEEK_SET)) {          if (fseek(pFile->hFileWrite, ulStartPos + ulPos, SEEK_SET)) {
349              throw Exception("Could not seek to position " + ToString(ulPos) +              throw Exception("Could not seek to position " + ToString(ulPos) +
# Line 668  namespace RIFF { Line 690  namespace RIFF {
690       *       *
691       * <b>Caution:</b> the buffer pointer will be invalidated once       * <b>Caution:</b> the buffer pointer will be invalidated once
692       * File::Save() was called. You have to call LoadChunkData() again to       * File::Save() was called. You have to call LoadChunkData() again to
693       * get a new pointer whenever File::Save() was called.       * get a new, valid pointer whenever File::Save() was called.
694         *
695         * You can call LoadChunkData() again if you previously scheduled to
696         * enlarge this chunk with a Resize() call. In that case the buffer will
697         * be enlarged to the new, scheduled chunk size and you can already
698         * place the new chunk data to the buffer and finally call File::Save()
699         * to enlarge the chunk physically and write the new data in one rush.
700         * This approach is definitely recommended if you have to enlarge and
701         * write new data to a lot of chunks.
702       *       *
703       * @returns a pointer to the data in RAM on success, NULL otherwise       * @returns a pointer to the data in RAM on success, NULL otherwise
704         * @throws Exception if data buffer could not be enlarged
705       * @see ReleaseChunkData()       * @see ReleaseChunkData()
706       */       */
707      void* Chunk::LoadChunkData() {      void* Chunk::LoadChunkData() {
708          if (!pChunkData) {          if (!pChunkData && pFile->Filename != "") {
709              #if POSIX              #if POSIX
710              if (lseek(pFile->hFileRead, ulStartPos, SEEK_SET) == -1) return NULL;              if (lseek(pFile->hFileRead, ulStartPos, SEEK_SET) == -1) return NULL;
711              pChunkData = new uint8_t[GetSize()];              #elif defined(WIN32)
712              if (!pChunkData) return NULL;              if (SetFilePointer(pFile->hFileRead, ulStartPos, NULL/*32 bit*/, FILE_BEGIN) == INVALID_SET_FILE_POINTER) return NULL;
             unsigned long readWords = read(pFile->hFileRead, pChunkData, GetSize());  
713              #else              #else
714              if (fseek(pFile->hFileRead, ulStartPos, SEEK_SET)) return NULL;              if (fseek(pFile->hFileRead, ulStartPos, SEEK_SET)) return NULL;
715              pChunkData = new uint8_t[GetSize()];              #endif // POSIX
716                unsigned long ulBufferSize = (CurrentChunkSize > NewChunkSize) ? CurrentChunkSize : NewChunkSize;
717                pChunkData = new uint8_t[ulBufferSize];
718              if (!pChunkData) return NULL;              if (!pChunkData) return NULL;
719                memset(pChunkData, 0, ulBufferSize);
720                #if POSIX
721                unsigned long readWords = read(pFile->hFileRead, pChunkData, GetSize());
722                #elif defined(WIN32)
723                DWORD readWords;
724                ReadFile(pFile->hFileRead, pChunkData, GetSize(), &readWords, NULL);
725                #else
726              unsigned long readWords = fread(pChunkData, 1, GetSize(), pFile->hFileRead);              unsigned long readWords = fread(pChunkData, 1, GetSize(), pFile->hFileRead);
727              #endif // POSIX              #endif // POSIX
728              if (readWords != GetSize()) {              if (readWords != GetSize()) {
729                  delete[] pChunkData;                  delete[] pChunkData;
730                  return (pChunkData = NULL);                  return (pChunkData = NULL);
731              }              }
732                ulChunkDataSize = ulBufferSize;
733            } else if (NewChunkSize > ulChunkDataSize) {
734                uint8_t* pNewBuffer = new uint8_t[NewChunkSize];
735                if (!pNewBuffer) throw Exception("Could not enlarge chunk data buffer to " + ToString(NewChunkSize) + " bytes");
736                memset(pNewBuffer, 0 , NewChunkSize);
737                memcpy(pNewBuffer, pChunkData, ulChunkDataSize);
738                delete[] pChunkData;
739                pChunkData      = pNewBuffer;
740                ulChunkDataSize = NewChunkSize;
741          }          }
742          return pChunkData;          return pChunkData;
743      }      }
# Line 719  namespace RIFF { Line 767  namespace RIFF {
767       *       *
768       * <b>Caution:</b> You cannot directly write to enlarged chunks before       * <b>Caution:</b> You cannot directly write to enlarged chunks before
769       * calling File::Save() as this might exceed the current chunk's body       * calling File::Save() as this might exceed the current chunk's body
770       * boundary.       * boundary!
771       *       *
772       * @param iNewSize - new chunk body size in bytes (must be greater than zero)       * @param iNewSize - new chunk body size in bytes (must be greater than zero)
773       * @throws RIFF::Exception  if \a iNewSize is less than 1       * @throws RIFF::Exception  if \a iNewSize is less than 1
# Line 727  namespace RIFF { Line 775  namespace RIFF {
775       */       */
776      void Chunk::Resize(int iNewSize) {      void Chunk::Resize(int iNewSize) {
777          if (iNewSize <= 0) throw Exception("Chunk size must be at least one byte");          if (iNewSize <= 0) throw Exception("Chunk size must be at least one byte");
778            if (NewChunkSize == iNewSize) return;
779          NewChunkSize = iNewSize;          NewChunkSize = iNewSize;
780          pFile->LogAsResized(this);          pFile->LogAsResized(this);
781      }      }
# Line 752  namespace RIFF { Line 801  namespace RIFF {
801    
802          // if the whole chunk body was loaded into RAM          // if the whole chunk body was loaded into RAM
803          if (pChunkData) {          if (pChunkData) {
804              // in case the chunk size was changed, reallocate the data in RAM with the chunk's new size              // make sure chunk data buffer in RAM is at least as large as the new chunk size
805              if (NewChunkSize != CurrentChunkSize) {              LoadChunkData();
                 uint8_t* pNewBuffer = new uint8_t[NewChunkSize];  
                 if (NewChunkSize > CurrentChunkSize) {  
                     memcpy(pNewBuffer, pChunkData, CurrentChunkSize);  
                     memset(pNewBuffer + CurrentChunkSize, 0, NewChunkSize - CurrentChunkSize);  
                 } else {  
                     memcpy(pNewBuffer, pChunkData, NewChunkSize);  
                 }  
                 delete[] pChunkData;  
                 pChunkData = pNewBuffer;  
             }  
   
806              // write chunk data from RAM persistently to the file              // write chunk data from RAM persistently to the file
807              #if POSIX              #if POSIX
808              lseek(pFile->hFileWrite, ulWritePos, SEEK_SET);              lseek(pFile->hFileWrite, ulWritePos, SEEK_SET);
809              if (write(pFile->hFileWrite, pChunkData, NewChunkSize) != NewChunkSize) {              if (write(pFile->hFileWrite, pChunkData, NewChunkSize) != NewChunkSize) {
810                  throw Exception("Writing Chunk data (from RAM) failed");                  throw Exception("Writing Chunk data (from RAM) failed");
811              }              }
812                #elif defined(WIN32)
813                SetFilePointer(pFile->hFileWrite, ulWritePos, NULL/*32 bit*/, FILE_BEGIN);
814                DWORD dwBytesWritten;
815                WriteFile(pFile->hFileWrite, pChunkData, NewChunkSize, &dwBytesWritten, NULL);
816                if (dwBytesWritten != NewChunkSize) {
817                    throw Exception("Writing Chunk data (from RAM) failed");
818                }
819              #else              #else
820              fseek(pFile->hFileWrite, ulWritePos, SEEK_SET);              fseek(pFile->hFileWrite, ulWritePos, SEEK_SET);
821              if (fwrite(pChunkData, 1, NewChunkSize, pFile->hFileWrite) != NewChunkSize) {              if (fwrite(pChunkData, 1, NewChunkSize, pFile->hFileWrite) != NewChunkSize) {
# Line 781  namespace RIFF { Line 826  namespace RIFF {
826              // move chunk data from the end of the file to the appropriate position              // move chunk data from the end of the file to the appropriate position
827              int8_t* pCopyBuffer = new int8_t[4096];              int8_t* pCopyBuffer = new int8_t[4096];
828              unsigned long ulToMove = (NewChunkSize < CurrentChunkSize) ? NewChunkSize : CurrentChunkSize;              unsigned long ulToMove = (NewChunkSize < CurrentChunkSize) ? NewChunkSize : CurrentChunkSize;
829                #if defined(WIN32)
830                DWORD iBytesMoved = 1; // we have to pass it via pointer to the Windows API, thus the correct size must be ensured
831                #else
832              int iBytesMoved = 1;              int iBytesMoved = 1;
833                #endif
834              for (unsigned long ulOffset = 0; iBytesMoved > 0; ulOffset += iBytesMoved, ulToMove -= iBytesMoved) {              for (unsigned long ulOffset = 0; iBytesMoved > 0; ulOffset += iBytesMoved, ulToMove -= iBytesMoved) {
835                  iBytesMoved = (ulToMove < 4096) ? ulToMove : 4096;                  iBytesMoved = (ulToMove < 4096) ? ulToMove : 4096;
836                  #if POSIX                  #if POSIX
# Line 789  namespace RIFF { Line 838  namespace RIFF {
838                  iBytesMoved = read(pFile->hFileRead, pCopyBuffer, iBytesMoved);                  iBytesMoved = read(pFile->hFileRead, pCopyBuffer, iBytesMoved);
839                  lseek(pFile->hFileWrite, ulWritePos + ulOffset, SEEK_SET);                  lseek(pFile->hFileWrite, ulWritePos + ulOffset, SEEK_SET);
840                  iBytesMoved = write(pFile->hFileWrite, pCopyBuffer, iBytesMoved);                  iBytesMoved = write(pFile->hFileWrite, pCopyBuffer, iBytesMoved);
841                    #elif defined(WIN32)
842                    SetFilePointer(pFile->hFileRead, ulStartPos + ulCurrentDataOffset + ulOffset, NULL/*32 bit*/, FILE_BEGIN);
843                    ReadFile(pFile->hFileRead, pCopyBuffer, iBytesMoved, &iBytesMoved, NULL);
844                    SetFilePointer(pFile->hFileWrite, ulWritePos + ulOffset, NULL/*32 bit*/, FILE_BEGIN);
845                    WriteFile(pFile->hFileWrite, pCopyBuffer, iBytesMoved, &iBytesMoved, NULL);
846                  #else                  #else
847                  fseek(pFile->hFileRead, ulStartPos + ulCurrentDataOffset + ulOffset, SEEK_SET);                  fseek(pFile->hFileRead, ulStartPos + ulCurrentDataOffset + ulOffset, SEEK_SET);
848                  iBytesMoved = fread(pCopyBuffer, 1, iBytesMoved, pFile->hFileRead);                  iBytesMoved = fread(pCopyBuffer, 1, iBytesMoved, pFile->hFileRead);
# Line 814  namespace RIFF { Line 868  namespace RIFF {
868              #if POSIX              #if POSIX
869              lseek(pFile->hFileWrite, ulStartPos + NewChunkSize, SEEK_SET);              lseek(pFile->hFileWrite, ulStartPos + NewChunkSize, SEEK_SET);
870              write(pFile->hFileWrite, &cPadByte, 1);              write(pFile->hFileWrite, &cPadByte, 1);
871                #elif defined(WIN32)
872                SetFilePointer(pFile->hFileWrite, ulStartPos + NewChunkSize, NULL/*32 bit*/, FILE_BEGIN);
873                DWORD dwBytesWritten;
874                WriteFile(pFile->hFileWrite, &cPadByte, 1, &dwBytesWritten, NULL);
875              #else              #else
876              fseek(pFile->hFileWrite, ulStartPos + NewChunkSize, SEEK_SET);              fseek(pFile->hFileWrite, ulStartPos + NewChunkSize, SEEK_SET);
877              fwrite(&cPadByte, 1, 1, pFile->hFileWrite);              fwrite(&cPadByte, 1, 1, pFile->hFileWrite);
# Line 1129  namespace RIFF { Line 1187  namespace RIFF {
1187          #if POSIX          #if POSIX
1188          lseek(pFile->hFileRead, fPos + CHUNK_HEADER_SIZE, SEEK_SET);          lseek(pFile->hFileRead, fPos + CHUNK_HEADER_SIZE, SEEK_SET);
1189          read(pFile->hFileRead, &ListType, 4);          read(pFile->hFileRead, &ListType, 4);
1190            #elif defined(WIN32)
1191            SetFilePointer(pFile->hFileRead, fPos + CHUNK_HEADER_SIZE, NULL/*32 bit*/, FILE_BEGIN);
1192            DWORD dwBytesRead;
1193            ReadFile(pFile->hFileRead, &ListType, 4, &dwBytesRead, NULL);
1194          #else          #else
1195          fseek(pFile->hFileRead, fPos + CHUNK_HEADER_SIZE, SEEK_SET);          fseek(pFile->hFileRead, fPos + CHUNK_HEADER_SIZE, SEEK_SET);
1196          fread(&ListType, 4, 1, pFile->hFileRead);          fread(&ListType, 4, 1, pFile->hFileRead);
# Line 1149  namespace RIFF { Line 1211  namespace RIFF {
1211          #if POSIX          #if POSIX
1212          lseek(pFile->hFileWrite, fPos + CHUNK_HEADER_SIZE, SEEK_SET);          lseek(pFile->hFileWrite, fPos + CHUNK_HEADER_SIZE, SEEK_SET);
1213          write(pFile->hFileWrite, &ListType, 4);          write(pFile->hFileWrite, &ListType, 4);
1214            #elif defined(WIN32)
1215            SetFilePointer(pFile->hFileWrite, fPos + CHUNK_HEADER_SIZE, NULL/*32 bit*/, FILE_BEGIN);
1216            DWORD dwBytesWritten;
1217            WriteFile(pFile->hFileWrite, &ListType, 4, &dwBytesWritten, NULL);
1218          #else          #else
1219          fseek(pFile->hFileWrite, fPos + CHUNK_HEADER_SIZE, SEEK_SET);          fseek(pFile->hFileWrite, fPos + CHUNK_HEADER_SIZE, SEEK_SET);
1220          fwrite(&ListType, 4, 1, pFile->hFileWrite);          fwrite(&ListType, 4, 1, pFile->hFileWrite);
# Line 1188  namespace RIFF { Line 1254  namespace RIFF {
1254          }          }
1255      }      }
1256    
1257        void List::LoadSubChunksRecursively() {
1258            for (List* pList = GetFirstSubList(); pList; pList = GetNextSubList())
1259                pList->LoadSubChunksRecursively();
1260        }
1261    
1262      /** @brief Write list chunk persistently e.g. to disk.      /** @brief Write list chunk persistently e.g. to disk.
1263       *       *
1264       * Stores the list chunk persistently to its actual "physical" file. All       * Stores the list chunk persistently to its actual "physical" file. All
# Line 1257  namespace RIFF { Line 1328  namespace RIFF {
1328       * @see AddSubChunk(), AddSubList()       * @see AddSubChunk(), AddSubList()
1329       */       */
1330      File::File(uint32_t FileType) : List(this) {      File::File(uint32_t FileType) : List(this) {
1331            #if defined(WIN32)
1332            hFileRead = hFileWrite = INVALID_HANDLE_VALUE;
1333            #else
1334          hFileRead = hFileWrite = 0;          hFileRead = hFileWrite = 0;
1335            #endif
1336          Mode = stream_mode_closed;          Mode = stream_mode_closed;
1337          bEndianNative = true;          bEndianNative = true;
1338          ulStartPos = RIFF_HEADER_SIZE;          ulStartPos = RIFF_HEADER_SIZE;
# Line 1283  namespace RIFF { Line 1358  namespace RIFF {
1358              hFileRead = hFileWrite = 0;              hFileRead = hFileWrite = 0;
1359              throw RIFF::Exception("Can't open \"" + path + "\"");              throw RIFF::Exception("Can't open \"" + path + "\"");
1360          }          }
1361            #elif defined(WIN32)
1362            hFileRead = hFileWrite = CreateFile(
1363                                         path.c_str(), GENERIC_READ,
1364                                         FILE_SHARE_READ | FILE_SHARE_WRITE,
1365                                         NULL, OPEN_EXISTING,
1366                                         FILE_ATTRIBUTE_NORMAL, NULL
1367                                     );
1368            if (hFileRead == INVALID_HANDLE_VALUE) {
1369                hFileRead = hFileWrite = INVALID_HANDLE_VALUE;
1370                throw RIFF::Exception("Can't open \"" + path + "\"");
1371            }
1372          #else          #else
1373          hFileRead = hFileWrite = fopen(path.c_str(), "rb");          hFileRead = hFileWrite = fopen(path.c_str(), "rb");
1374          if (!hFile) throw RIFF::Exception("Can't open \"" + path + "\"");          if (!hFileRead) throw RIFF::Exception("Can't open \"" + path + "\"");
1375          #endif // POSIX          #endif // POSIX
1376          Mode = stream_mode_read;          Mode = stream_mode_read;
1377          ulStartPos = RIFF_HEADER_SIZE;          ulStartPos = RIFF_HEADER_SIZE;
# Line 1324  namespace RIFF { Line 1410  namespace RIFF {
1410                          hFileRead = hFileWrite = 0;                          hFileRead = hFileWrite = 0;
1411                          throw Exception("Could not (re)open file \"" + Filename + "\" in read mode");                          throw Exception("Could not (re)open file \"" + Filename + "\" in read mode");
1412                      }                      }
1413                        #elif defined(WIN32)
1414                        if (hFileRead != INVALID_HANDLE_VALUE) CloseHandle(hFileRead);
1415                        hFileRead = hFileWrite = CreateFile(
1416                                                     Filename.c_str(), GENERIC_READ,
1417                                                     FILE_SHARE_READ | FILE_SHARE_WRITE,
1418                                                     NULL, OPEN_EXISTING,
1419                                                     FILE_ATTRIBUTE_NORMAL, NULL
1420                                                 );
1421                        if (hFileRead == INVALID_HANDLE_VALUE) {
1422                            hFileRead = hFileWrite = INVALID_HANDLE_VALUE;
1423                            throw Exception("Could not (re)open file \"" + Filename + "\" in read mode");
1424                        }
1425                      #else                      #else
1426                      if (hFileRead) fclose(hFileRead);                      if (hFileRead) fclose(hFileRead);
1427                      hFileRead = hFileWrite = fopen(path.c_str(), "rb");                      hFileRead = hFileWrite = fopen(Filename.c_str(), "rb");
1428                      if (!hFileRead) throw Exception("Could not (re)open file \"" + Filename + "\" in read mode");                      if (!hFileRead) throw Exception("Could not (re)open file \"" + Filename + "\" in read mode");
1429                      #endif                      #endif
1430                      __resetPos(); // reset read/write position of ALL 'Chunk' objects                      __resetPos(); // reset read/write position of ALL 'Chunk' objects
# Line 1339  namespace RIFF { Line 1437  namespace RIFF {
1437                          hFileRead = hFileWrite = open(Filename.c_str(), O_RDONLY | O_NONBLOCK);                          hFileRead = hFileWrite = open(Filename.c_str(), O_RDONLY | O_NONBLOCK);
1438                          throw Exception("Could not open file \"" + Filename + "\" in read+write mode");                          throw Exception("Could not open file \"" + Filename + "\" in read+write mode");
1439                      }                      }
1440                        #elif defined(WIN32)
1441                        if (hFileRead != INVALID_HANDLE_VALUE) CloseHandle(hFileRead);
1442                        hFileRead = hFileWrite = CreateFile(
1443                                                     Filename.c_str(),
1444                                                     GENERIC_READ | GENERIC_WRITE,
1445                                                     FILE_SHARE_READ,
1446                                                     NULL, OPEN_ALWAYS,
1447                                                     FILE_ATTRIBUTE_NORMAL, NULL
1448                                                 );
1449                        if (hFileRead == INVALID_HANDLE_VALUE) {
1450                            hFileRead = hFileWrite = CreateFile(
1451                                                         Filename.c_str(), GENERIC_READ,
1452                                                         FILE_SHARE_READ | FILE_SHARE_WRITE,
1453                                                         NULL, OPEN_EXISTING,
1454                                                         FILE_ATTRIBUTE_NORMAL, NULL
1455                                                     );
1456                            throw Exception("Could not (re)open file \"" + Filename + "\" in read mode");
1457                        }
1458                      #else                      #else
1459                      if (hFileRead) fclose(hFileRead);                      if (hFileRead) fclose(hFileRead);
1460                      hFileRead = hFileWrite = fopen(path.c_str(), "r+b");                      hFileRead = hFileWrite = fopen(Filename.c_str(), "r+b");
1461                      if (!hFileRead) {                      if (!hFileRead) {
1462                          hFileRead = hFileWrite = fopen(path.c_str(), "rb");                          hFileRead = hFileWrite = fopen(Filename.c_str(), "rb");
1463                          throw Exception("Could not open file \"" + Filename + "\" in read+write mode");                          throw Exception("Could not open file \"" + Filename + "\" in read+write mode");
1464                      }                      }
1465                      #endif                      #endif
# Line 1353  namespace RIFF { Line 1469  namespace RIFF {
1469                      #if POSIX                      #if POSIX
1470                      if (hFileRead)  close(hFileRead);                      if (hFileRead)  close(hFileRead);
1471                      if (hFileWrite) close(hFileWrite);                      if (hFileWrite) close(hFileWrite);
1472                        #elif defined(WIN32)
1473                        if (hFileRead  != INVALID_HANDLE_VALUE) CloseHandle(hFileRead);
1474                        if (hFileWrite != INVALID_HANDLE_VALUE) CloseHandle(hFileWrite);
1475                      #else                      #else
1476                      if (hFileRead)  fclose(hFileRead);                      if (hFileRead)  fclose(hFileRead);
1477                      if (hFileWrite) fclose(hFileWrite);                      if (hFileWrite) fclose(hFileWrite);
# Line 1379  namespace RIFF { Line 1498  namespace RIFF {
1498       *                         chunk or any kind of IO error occured       *                         chunk or any kind of IO error occured
1499       */       */
1500      void File::Save() {      void File::Save() {
1501            // make sure the RIFF tree is built (from the original file)
1502            LoadSubChunksRecursively();
1503    
1504          // reopen file in write mode          // reopen file in write mode
1505          SetMode(stream_mode_read_write);          SetMode(stream_mode_read_write);
1506    
# Line 1409  namespace RIFF { Line 1531  namespace RIFF {
1531              // ... and move current data by the same amount towards end of file.              // ... and move current data by the same amount towards end of file.
1532              int8_t* pCopyBuffer = new int8_t[4096];              int8_t* pCopyBuffer = new int8_t[4096];
1533              const unsigned long ulFileSize = GetSize() + RIFF_HEADER_SIZE;              const unsigned long ulFileSize = GetSize() + RIFF_HEADER_SIZE;
1534              int iBytesMoved = 1;              #if defined(WIN32)
1535                DWORD iBytesMoved = 1; // we have to pass it via pointer to the Windows API, thus the correct size must be ensured
1536                #else
1537                int iBytesMoved = 1;
1538                #endif
1539              for (unsigned long ulPos = 0; iBytesMoved > 0; ulPos += iBytesMoved) {              for (unsigned long ulPos = 0; iBytesMoved > 0; ulPos += iBytesMoved) {
1540                  const unsigned long ulToMove = ulFileSize - ulPos;                  const unsigned long ulToMove = ulFileSize - ulPos;
1541                  iBytesMoved = (ulToMove < 4096) ? ulToMove : 4096;                  iBytesMoved = (ulToMove < 4096) ? ulToMove : 4096;
# Line 1418  namespace RIFF { Line 1544  namespace RIFF {
1544                  iBytesMoved = read(hFileRead, pCopyBuffer, iBytesMoved);                  iBytesMoved = read(hFileRead, pCopyBuffer, iBytesMoved);
1545                  lseek(hFileWrite, ulPos + ulPositiveSizeDiff, SEEK_SET);                  lseek(hFileWrite, ulPos + ulPositiveSizeDiff, SEEK_SET);
1546                  iBytesMoved = write(hFileWrite, pCopyBuffer, iBytesMoved);                  iBytesMoved = write(hFileWrite, pCopyBuffer, iBytesMoved);
1547                    #elif defined(WIN32)
1548                    SetFilePointer(hFileRead, ulPos, NULL/*32 bit*/, FILE_BEGIN);
1549                    ReadFile(hFileRead, pCopyBuffer, iBytesMoved, &iBytesMoved, NULL);
1550                    SetFilePointer(hFileWrite, ulPos + ulPositiveSizeDiff, NULL/*32 bit*/, FILE_BEGIN);
1551                    WriteFile(hFileWrite, pCopyBuffer, iBytesMoved, &iBytesMoved, NULL);
1552                  #else                  #else
1553                  fseek(hFileRead, ulPos, SEEK_SET);                  fseek(hFileRead, ulPos, SEEK_SET);
1554                  iBytesMoved = fread(pCopyBuffer, 1, iBytesMoved, hFileRead);                  iBytesMoved = fread(pCopyBuffer, 1, iBytesMoved, hFileRead);
# Line 1456  namespace RIFF { Line 1587  namespace RIFF {
1587      void File::Save(const String& path) {      void File::Save(const String& path) {
1588          //TODO: we should make a check here if somebody tries to write to the same file and automatically call the other Save() method in that case          //TODO: we should make a check here if somebody tries to write to the same file and automatically call the other Save() method in that case
1589    
1590            // make sure the RIFF tree is built (from the original file)
1591            LoadSubChunksRecursively();
1592    
1593          if (Filename.length() > 0) SetMode(stream_mode_read);          if (Filename.length() > 0) SetMode(stream_mode_read);
1594          // open the other (new) file for writing and truncate it to zero size          // open the other (new) file for writing and truncate it to zero size
1595          #if POSIX          #if POSIX
# Line 1464  namespace RIFF { Line 1598  namespace RIFF {
1598              hFileWrite = hFileRead;              hFileWrite = hFileRead;
1599              throw Exception("Could not open file \"" + path + "\" for writing");              throw Exception("Could not open file \"" + path + "\" for writing");
1600          }          }
1601            #elif defined(WIN32)
1602            hFileWrite = CreateFile(
1603                             path.c_str(), GENERIC_WRITE, FILE_SHARE_READ,
1604                             NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL
1605                         );
1606            if (hFileWrite == INVALID_HANDLE_VALUE) {
1607                hFileWrite = hFileRead;
1608                throw Exception("Could not open file \"" + path + "\" for writing");
1609            }
1610          #else          #else
1611          hFileWrite = fopen(path.c_str(), "w+b");          hFileWrite = fopen(path.c_str(), "w+b");
1612          if (!hFileWrite) {          if (!hFileWrite) {
# Line 1486  namespace RIFF { Line 1629  namespace RIFF {
1629          if (Filename.length() > 0) {          if (Filename.length() > 0) {
1630              #if POSIX              #if POSIX
1631              close(hFileWrite);              close(hFileWrite);
1632                #elif defined(WIN32)
1633                CloseHandle(hFileWrite);
1634              #else              #else
1635              fclose(hFileWrite);              fclose(hFileWrite);
1636              #endif              #endif
# Line 1502  namespace RIFF { Line 1647  namespace RIFF {
1647          #if POSIX          #if POSIX
1648          if (ftruncate(hFileWrite, ulNewSize) < 0)          if (ftruncate(hFileWrite, ulNewSize) < 0)
1649              throw Exception("Could not resize file \"" + Filename + "\"");              throw Exception("Could not resize file \"" + Filename + "\"");
1650            #elif defined(WIN32)
1651            if (
1652                SetFilePointer(hFileWrite, ulNewSize, NULL/*32 bit*/, FILE_BEGIN) == INVALID_SET_FILE_POINTER ||
1653                !SetEndOfFile(hFileWrite)
1654            ) throw Exception("Could not resize file \"" + Filename + "\"");
1655          #else          #else
1656          # error Sorry, this version of libgig only supports POSIX systems yet.          # error Sorry, this version of libgig only supports POSIX and Windows systems yet.
1657          # error Reason: portable implementation of RIFF::File::ResizeFile() is missing (yet)!          # error Reason: portable implementation of RIFF::File::ResizeFile() is missing (yet)!
1658          #endif          #endif
1659      }      }
# Line 1514  namespace RIFF { Line 1664  namespace RIFF {
1664         #endif // DEBUG         #endif // DEBUG
1665          #if POSIX          #if POSIX
1666          if (hFileRead) close(hFileRead);          if (hFileRead) close(hFileRead);
1667            #elif defined(WIN32)
1668            if (hFileRead != INVALID_HANDLE_VALUE) CloseHandle(hFileRead);
1669          #else          #else
1670          if (hFileRead) fclose(hFileRead);          if (hFileRead) fclose(hFileRead);
1671          #endif // POSIX          #endif // POSIX
# Line 1534  namespace RIFF { Line 1686  namespace RIFF {
1686          long size = filestat.st_size;          long size = filestat.st_size;
1687          return size;          return size;
1688      }      }
1689        #elif defined(WIN32)
1690        unsigned long File::__GetFileSize(HANDLE hFile) {
1691            LARGE_INTEGER size;
1692            GetFileSizeEx(hFile, &size);
1693            return size.LowPart;
1694        }
1695      #else // standard C functions      #else // standard C functions
1696      unsigned long File::__GetFileSize(FILE* hFile) {      unsigned long File::__GetFileSize(FILE* hFile) {
1697          long curpos = ftell(hFile);          long curpos = ftell(hFile);
Legend:
Removed from v.798  
changed lines
  Added in v.1050
  ViewVC Help
Powered by ViewVC