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

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

Parent Directory | Revision Log | View Patch Patch

-revision 2155 by persson,
Thu Jan  6 11:33:40 2011 UTC
+revision 3478 by schoenebeck,
Thu Feb 21 20:10:08 2019 UTC
 Line 2
   *                                                                         *
   *   libgig - C++ cross-platform Gigasampler format file access library    *
   *                                                                         *
-  *   Copyright (C) 2003-2011 by Christian Schoenebeck                      *
+  *   Copyright (C) 2003-2019 by Christian Schoenebeck                      *
   *                              <cuse@users.sourceforge.net>               *
   *                                                                         *
   *   This library is free software; you can redistribute it and/or modify  *
 Line 29
  #include "helper.h"
+ #if POSIX
+ # include <errno.h>
+ #endif
  namespace RIFF {
  // *************** Internal functions **************
-Line 50 
 namespace RIFF {
+Line 54 
 namespace RIFF {
+ // *************** progress_t ***************
+ // *
+     progress_t::progress_t() {
+         callback    = NULL;
+         custom      = NULL;
+         __range_min = 0.0f;
+         __range_max = 1.0f;
+     }
+     /**
+      * Divides this progress task into the requested amount of sub-progress
+      * tasks and returns a vector with those subprogress tasks.
+      *
+      * @param iSubtasks - total amount sub tasks this task should be subdivided
+      * @returns subtasks
+      */
+     std::vector<progress_t> progress_t::subdivide(int iSubtasks) {
+         std::vector<progress_t> v;
+         for (int i = 0; i < iSubtasks; ++i) {
+             progress_t p;
+             __divide_progress(this, &p, iSubtasks, i);
+             v.push_back(p);
+         }
+         return v;
+     }
  // *************** Chunk **************
  // *
      Chunk::Chunk(File* pFile) {
-         #if DEBUG
+         #if DEBUG_RIFF
          std::cout << "Chunk::Chunk(File* pFile)" << std::endl;
-         #endif // DEBUG
+         #endif // DEBUG_RIFF
-         ulPos      = 0;
+         ullPos     = 0;
          pParent    = NULL;
          pChunkData = NULL;
-         CurrentChunkSize = 0;
+         ullCurrentChunkSize = 0;
-         NewChunkSize = 0;
+         ullNewChunkSize = 0;
-         ulChunkDataSize = 0;
+         ullChunkDataSize = 0;
          ChunkID    = CHUNK_ID_RIFF;
          this->pFile = pFile;
      }
-     Chunk::Chunk(File* pFile, unsigned long StartPos, List* Parent) {
+     Chunk::Chunk(File* pFile, file_offset_t StartPos, List* Parent) {
-         #if DEBUG
+         #if DEBUG_RIFF
-         std::cout << "Chunk::Chunk(File*,ulong,bool,List*),StartPos=" << StartPos << std::endl;
+         std::cout << "Chunk::Chunk(File*,file_offset_t,List*),StartPos=" << StartPos << std::endl;
-         #endif // DEBUG
+         #endif // DEBUG_RIFF
          this->pFile   = pFile;
-         ulStartPos    = StartPos + CHUNK_HEADER_SIZE;
+         ullStartPos   = StartPos + CHUNK_HEADER_SIZE(pFile->FileOffsetSize);
          pParent       = Parent;
-         ulPos         = 0;
+         ullPos        = 0;
          pChunkData    = NULL;
-         CurrentChunkSize = 0;
+         ullCurrentChunkSize = 0;
-         NewChunkSize = 0;
+         ullNewChunkSize = 0;
-         ulChunkDataSize = 0;
+         ullChunkDataSize = 0;
          ReadHeader(StartPos);
      }
-     Chunk::Chunk(File* pFile, List* pParent, uint32_t uiChunkID, uint uiBodySize) {
+     Chunk::Chunk(File* pFile, List* pParent, uint32_t uiChunkID, file_offset_t ullBodySize) {
          this->pFile      = pFile;
-         ulStartPos       = 0; // arbitrary usually, since it will be updated when we write the chunk
+         ullStartPos      = 0; // arbitrary usually, since it will be updated when we write the chunk
          this->pParent    = pParent;
-         ulPos            = 0;
+         ullPos           = 0;
          pChunkData       = NULL;
          ChunkID          = uiChunkID;
-         ulChunkDataSize  = 0;
+         ullChunkDataSize = 0;
-         CurrentChunkSize = 0;
+         ullCurrentChunkSize = 0;
-         NewChunkSize     = uiBodySize;
+         ullNewChunkSize  = ullBodySize;
      }
      Chunk::~Chunk() {
-         if (pFile) pFile->UnlogResized(this);
          if (pChunkData) delete[] pChunkData;
      }
-     void Chunk::ReadHeader(unsigned long fPos) {
+     void Chunk::ReadHeader(file_offset_t filePos) {
-         #if DEBUG
+         #if DEBUG_RIFF
-         std::cout << "Chunk::Readheader(" << fPos << ") ";
+         std::cout << "Chunk::Readheader(" << filePos << ") ";
-         #endif // DEBUG
+         #endif // DEBUG_RIFF
          ChunkID = 0;
-         NewChunkSize = CurrentChunkSize = 0;
+         ullNewChunkSize = ullCurrentChunkSize = 0;
          #if POSIX
-         if (lseek(pFile->hFileRead, fPos, SEEK_SET) != -1) {
+         if (lseek(pFile->hFileRead, filePos, SEEK_SET) != -1) {
              read(pFile->hFileRead, &ChunkID, 4);
-             read(pFile->hFileRead, &CurrentChunkSize, 4);
+             read(pFile->hFileRead, &ullCurrentChunkSize, pFile->FileOffsetSize);
          #elif defined(WIN32)
-         if (SetFilePointer(pFile->hFileRead, fPos, NULL/*32 bit*/, FILE_BEGIN) != INVALID_SET_FILE_POINTER) {
+         LARGE_INTEGER liFilePos;
+         liFilePos.QuadPart = filePos;
+         if (SetFilePointerEx(pFile->hFileRead, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN)) {
              DWORD dwBytesRead;
              ReadFile(pFile->hFileRead, &ChunkID, 4, &dwBytesRead, NULL);
-             ReadFile(pFile->hFileRead, &CurrentChunkSize, 4, &dwBytesRead, NULL);
+             ReadFile(pFile->hFileRead, &ullCurrentChunkSize, pFile->FileOffsetSize, &dwBytesRead, NULL);
          #else
-         if (!fseek(pFile->hFileRead, fPos, SEEK_SET)) {
+         if (!fseeko(pFile->hFileRead, filePos, SEEK_SET)) {
              fread(&ChunkID, 4, 1, pFile->hFileRead);
-             fread(&CurrentChunkSize, 4, 1, pFile->hFileRead);
+             fread(&ullCurrentChunkSize, pFile->FileOffsetSize, 1, pFile->hFileRead);
          #endif // POSIX
              #if WORDS_BIGENDIAN
              if (ChunkID == CHUNK_ID_RIFF) {
-Line 131 
 namespace RIFF {
+Line 165 
 namespace RIFF {
              #endif // WORDS_BIGENDIAN
              if (!pFile->bEndianNative) {
                  //swapBytes_32(&ChunkID);
-                 swapBytes_32(&CurrentChunkSize);
+                 if (pFile->FileOffsetSize == 4)
+                     swapBytes_32(&ullCurrentChunkSize);
+                 else
+                     swapBytes_64(&ullCurrentChunkSize);
              }
-             #if DEBUG
+             #if DEBUG_RIFF
              std::cout << "ckID=" << convertToString(ChunkID) << " ";
-             std::cout << "ckSize=" << CurrentChunkSize << " ";
+             std::cout << "ckSize=" << ullCurrentChunkSize << " ";
              std::cout << "bEndianNative=" << pFile->bEndianNative << std::endl;
-             #endif // DEBUG
+             #endif // DEBUG_RIFF
-             NewChunkSize = CurrentChunkSize;
+             ullNewChunkSize = ullCurrentChunkSize;
          }
      }
-     void Chunk::WriteHeader(unsigned long fPos) {
+     void Chunk::WriteHeader(file_offset_t filePos) {
          uint32_t uiNewChunkID = ChunkID;
          if (ChunkID == CHUNK_ID_RIFF) {
              #if WORDS_BIGENDIAN
-Line 152 
 namespace RIFF {
+Line 189 
 namespace RIFF {
              #endif // WORDS_BIGENDIAN
          }
-         uint32_t uiNewChunkSize = NewChunkSize;
+         uint64_t ullNewChunkSize = this->ullNewChunkSize;
          if (!pFile->bEndianNative) {
-             swapBytes_32(&uiNewChunkSize);
+             if (pFile->FileOffsetSize == 4)
+                 swapBytes_32(&ullNewChunkSize);
+             else
+                 swapBytes_64(&ullNewChunkSize);
          }
          #if POSIX
-         if (lseek(pFile->hFileWrite, fPos, SEEK_SET) != -1) {
+         if (lseek(pFile->hFileWrite, filePos, SEEK_SET) != -1) {
              write(pFile->hFileWrite, &uiNewChunkID, 4);
-             write(pFile->hFileWrite, &uiNewChunkSize, 4);
+             write(pFile->hFileWrite, &ullNewChunkSize, pFile->FileOffsetSize);
          }
          #elif defined(WIN32)
-         if (SetFilePointer(pFile->hFileWrite, fPos, NULL/*32 bit*/, FILE_BEGIN) != INVALID_SET_FILE_POINTER) {
+         LARGE_INTEGER liFilePos;
+         liFilePos.QuadPart = filePos;
+         if (SetFilePointerEx(pFile->hFileWrite, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN)) {
              DWORD dwBytesWritten;
              WriteFile(pFile->hFileWrite, &uiNewChunkID, 4, &dwBytesWritten, NULL);
-             WriteFile(pFile->hFileWrite, &uiNewChunkSize, 4, &dwBytesWritten, NULL);
+             WriteFile(pFile->hFileWrite, &ullNewChunkSize, pFile->FileOffsetSize, &dwBytesWritten, NULL);
          }
          #else
-         if (!fseek(pFile->hFileWrite, fPos, SEEK_SET)) {
+         if (!fseeko(pFile->hFileWrite, filePos, SEEK_SET)) {
              fwrite(&uiNewChunkID, 4, 1, pFile->hFileWrite);
-             fwrite(&uiNewChunkSize, 4, 1, pFile->hFileWrite);
+             fwrite(&ullNewChunkSize, pFile->FileOffsetSize, 1, pFile->hFileWrite);
          }
          #endif // POSIX
      }
-Line 180 
 namespace RIFF {
+Line 222 
 namespace RIFF {
       *  Returns the String representation of the chunk's ID (e.g. "RIFF",
       *  "LIST").
       */
-     String Chunk::GetChunkIDString() {
+     String Chunk::GetChunkIDString() const {
          return convertToString(ChunkID);
      }
-Line 196 
 namespace RIFF {
+Line 238 
 namespace RIFF {
       *                  if omitted \a Where relates to beginning of the chunk
       *                  data
       */
-     unsigned long Chunk::SetPos(unsigned long Where, stream_whence_t Whence) {
+     file_offset_t Chunk::SetPos(file_offset_t Where, stream_whence_t Whence) {
-      #if DEBUG
+         #if DEBUG_RIFF
-      std::cout << "Chunk::SetPos(ulong)" << std::endl;
+         std::cout << "Chunk::SetPos(file_offset_t,stream_whence_t)" << std::endl;
-      #endif // DEBUG
+         #endif // DEBUG_RIFF
          switch (Whence) {
              case stream_curpos:
-                 ulPos += Where;
+                 ullPos += Where;
                  break;
              case stream_end:
-                 ulPos = CurrentChunkSize - 1 - Where;
+                 ullPos = ullCurrentChunkSize - 1 - Where;
                  break;
              case stream_backward:
-                 ulPos -= Where;
+                 ullPos -= Where;
                  break;
              case stream_start: default:
-                 ulPos = Where;
+                 ullPos = Where;
                  break;
          }
-         if (ulPos > CurrentChunkSize) ulPos = CurrentChunkSize;
+         if (ullPos > ullCurrentChunkSize) ullPos = ullCurrentChunkSize;
-         return ulPos;
+         return ullPos;
      }
      /**
-Line 228 
 namespace RIFF {
+Line 270 
 namespace RIFF {
       *
       *  @returns  number of bytes left to read
       */
-     unsigned long Chunk::RemainingBytes() {
+     file_offset_t Chunk::RemainingBytes() const {
-        #if DEBUG
+         #if DEBUG_RIFF
-        std::cout << "Chunk::Remainingbytes()=" << CurrentChunkSize - ulPos << std::endl;
+         std::cout << "Chunk::Remainingbytes()=" << ullCurrentChunkSize - ullPos << std::endl;
-        #endif // DEBUG
+         #endif // DEBUG_RIFF
-         return (CurrentChunkSize > ulPos) ? CurrentChunkSize - ulPos : 0;
+         return (ullCurrentChunkSize > ullPos) ? ullCurrentChunkSize - ullPos : 0;
+     }
+     /**
+      *  Returns the actual total size in bytes (including header) of this Chunk
+      *  if being stored to a file.
+      *
+      *  @param fileOffsetSize - RIFF file offset size (in bytes) assumed when
+      *                          being saved to a file
+      */
+     file_offset_t Chunk::RequiredPhysicalSize(int fileOffsetSize) {
+         return CHUNK_HEADER_SIZE(fileOffsetSize) + // RIFF chunk header
+                ullNewChunkSize + // chunks's actual data body
+                ullNewChunkSize % 2; // optional pad byte
      }
      /**
-Line 246 
 namespace RIFF {
+Line 301 
 namespace RIFF {
       *    already reached the end of the chunk data, no more reading
       *    possible without SetPos()
       */
-     stream_state_t Chunk::GetState() {
+     stream_state_t Chunk::GetState() const {
-       #if DEBUG
+         #if DEBUG_RIFF
-       std::cout << "Chunk::GetState()" << std::endl;
+         std::cout << "Chunk::GetState()" << std::endl;
-       #endif // DEBUG
+         #endif // DEBUG_RIFF
          #if POSIX
          if (pFile->hFileRead == 0) return stream_closed;
          #elif defined (WIN32)
-Line 258 
 namespace RIFF {
+Line 313 
 namespace RIFF {
          #else
          if (pFile->hFileRead == NULL) return stream_closed;
          #endif // POSIX
-         if (ulPos < CurrentChunkSize) return stream_ready;
+         if (ullPos < ullCurrentChunkSize) return stream_ready;
-         else                          return stream_end_reached;
+         else                              return stream_end_reached;
      }
      /**
-Line 275 
 namespace RIFF {
+Line 330 
 namespace RIFF {
       *  @param WordCount  number of data words to read
       *  @param WordSize   size of each data word to read
       *  @returns          number of successfully read data words or 0 if end
-      *                    of file reached or error occured
+      *                    of file reached or error occurred
       */
-     unsigned long Chunk::Read(void* pData, unsigned long WordCount, unsigned long WordSize) {
+     file_offset_t Chunk::Read(void* pData, file_offset_t WordCount, file_offset_t WordSize) {
-        #if DEBUG
+         #if DEBUG_RIFF
-        std::cout << "Chunk::Read(void*,ulong,ulong)" << std::endl;
+         std::cout << "Chunk::Read(void*,file_offset_t,file_offset_t)" << std::endl;
-        #endif // DEBUG
+         #endif // DEBUG_RIFF
-         if (ulStartPos == 0) return 0; // is only 0 if this is a new chunk, so nothing to read (yet)
+         //if (ulStartPos == 0) return 0; // is only 0 if this is a new chunk, so nothing to read (yet)
-         if (ulPos >= CurrentChunkSize) return 0;
+         if (ullPos >= ullCurrentChunkSize) return 0;
-         if (ulPos + WordCount * WordSize >= CurrentChunkSize) WordCount = (CurrentChunkSize - ulPos) / WordSize;
+         if (ullPos + WordCount * WordSize >= ullCurrentChunkSize) WordCount = (ullCurrentChunkSize - ullPos) / WordSize;
          #if POSIX
-         if (lseek(pFile->hFileRead, ulStartPos + ulPos, SEEK_SET) < 0) return 0;
+         if (lseek(pFile->hFileRead, ullStartPos + ullPos, SEEK_SET) < 0) return 0;
-         unsigned long readWords = read(pFile->hFileRead, pData, WordCount * WordSize);
+         ssize_t readWords = read(pFile->hFileRead, pData, WordCount * WordSize);
-         if (readWords < 1) return 0;
+         if (readWords < 1) {
+             #if DEBUG_RIFF
+             std::cerr << "POSIX read() failed: " << strerror(errno) << std::endl << std::flush;
+             #endif // DEBUG_RIFF
+             return 0;
+         }
          readWords /= WordSize;
          #elif defined(WIN32)
-         if (SetFilePointer(pFile->hFileRead, ulStartPos + ulPos, NULL/*32 bit*/, FILE_BEGIN) == INVALID_SET_FILE_POINTER) return 0;
+         LARGE_INTEGER liFilePos;
+         liFilePos.QuadPart = ullStartPos + ullPos;
+         if (!SetFilePointerEx(pFile->hFileRead, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN))
+             return 0;
          DWORD readWords;
-         ReadFile(pFile->hFileRead, pData, WordCount * WordSize, &readWords, NULL);
+         ReadFile(pFile->hFileRead, pData, WordCount * WordSize, &readWords, NULL); //FIXME: does not work for reading buffers larger than 2GB (even though this should rarely be the case in practice)
          if (readWords < 1) return 0;
          readWords /= WordSize;
          #else // standard C functions
-         if (fseek(pFile->hFileRead, ulStartPos + ulPos, SEEK_SET)) return 0;
+         if (fseeko(pFile->hFileRead, ullStartPos + ullPos, SEEK_SET)) return 0;
-         unsigned long readWords = fread(pData, WordSize, WordCount, pFile->hFileRead);
+         file_offset_t readWords = fread(pData, WordSize, WordCount, pFile->hFileRead);
          #endif // POSIX
          if (!pFile->bEndianNative && WordSize != 1) {
              switch (WordSize) {
                  case 2:
-                     for (unsigned long iWord = 0; iWord < readWords; iWord++)
+                     for (file_offset_t iWord = 0; iWord < readWords; iWord++)
                          swapBytes_16((uint16_t*) pData + iWord);
                      break;
                  case 4:
-                     for (unsigned long iWord = 0; iWord < readWords; iWord++)
+                     for (file_offset_t iWord = 0; iWord < readWords; iWord++)
                          swapBytes_32((uint32_t*) pData + iWord);
                      break;
+                 case 8:
+                     for (file_offset_t iWord = 0; iWord < readWords; iWord++)
+                         swapBytes_64((uint64_t*) pData + iWord);
+                     break;
                  default:
-                     for (unsigned long iWord = 0; iWord < readWords; iWord++)
+                     for (file_offset_t iWord = 0; iWord < readWords; iWord++)
                          swapBytes((uint8_t*) pData + iWord * WordSize, WordSize);
                      break;
              }
-Line 332 
 namespace RIFF {
+Line 399 
 namespace RIFF {
       *  @param WordSize   size of each data word to write
       *  @returns          number of successfully written data words
       *  @throws RIFF::Exception  if write operation would exceed current
-      *                           chunk size or any IO error occured
+      *                           chunk size or any IO error occurred
       *  @see Resize()
       */
-     unsigned long Chunk::Write(void* pData, unsigned long WordCount, unsigned long WordSize) {
+     file_offset_t Chunk::Write(void* pData, file_offset_t WordCount, file_offset_t WordSize) {
          if (pFile->Mode != stream_mode_read_write)
              throw Exception("Cannot write data to chunk, file has to be opened in read+write mode first");
-         if (ulPos >= CurrentChunkSize || ulPos + WordCount * WordSize > CurrentChunkSize)
+         if (ullPos >= ullCurrentChunkSize || ullPos + WordCount * WordSize > ullCurrentChunkSize)
              throw Exception("End of chunk reached while trying to write data");
          if (!pFile->bEndianNative && WordSize != 1) {
              switch (WordSize) {
                  case 2:
-                     for (unsigned long iWord = 0; iWord < WordCount; iWord++)
+                     for (file_offset_t iWord = 0; iWord < WordCount; iWord++)
                          swapBytes_16((uint16_t*) pData + iWord);
                      break;
                  case 4:
-                     for (unsigned long iWord = 0; iWord < WordCount; iWord++)
+                     for (file_offset_t iWord = 0; iWord < WordCount; iWord++)
                          swapBytes_32((uint32_t*) pData + iWord);
                      break;
+                 case 8:
+                     for (file_offset_t iWord = 0; iWord < WordCount; iWord++)
+                         swapBytes_64((uint64_t*) pData + iWord);
+                     break;
                  default:
-                     for (unsigned long iWord = 0; iWord < WordCount; iWord++)
+                     for (file_offset_t iWord = 0; iWord < WordCount; iWord++)
                          swapBytes((uint8_t*) pData + iWord * WordSize, WordSize);
                      break;
              }
          }
          #if POSIX
-         if (lseek(pFile->hFileWrite, ulStartPos + ulPos, SEEK_SET) < 0) {
+         if (lseek(pFile->hFileWrite, ullStartPos + ullPos, SEEK_SET) < 0) {
-             throw Exception("Could not seek to position " + ToString(ulPos) +
+             throw Exception("Could not seek to position " + ToString(ullPos) +
-                             " in chunk (" + ToString(ulStartPos + ulPos) + " in file)");
+                             " in chunk (" + ToString(ullStartPos + ullPos) + " in file)");
          }
-         unsigned long writtenWords = write(pFile->hFileWrite, pData, WordCount * WordSize);
+         ssize_t writtenWords = write(pFile->hFileWrite, pData, WordCount * WordSize);
          if (writtenWords < 1) throw Exception("POSIX IO Error while trying to write chunk data");
          writtenWords /= WordSize;
          #elif defined(WIN32)
-         if (SetFilePointer(pFile->hFileWrite, ulStartPos + ulPos, NULL/*32 bit*/, FILE_BEGIN) == INVALID_SET_FILE_POINTER) {
+         LARGE_INTEGER liFilePos;
-             throw Exception("Could not seek to position " + ToString(ulPos) +
+         liFilePos.QuadPart = ullStartPos + ullPos;
-                             " in chunk (" + ToString(ulStartPos + ulPos) + " in file)");
+         if (!SetFilePointerEx(pFile->hFileWrite, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN)) {
+             throw Exception("Could not seek to position " + ToString(ullPos) +
+                             " in chunk (" + ToString(ullStartPos + ullPos) + " in file)");
          }
          DWORD writtenWords;
-         WriteFile(pFile->hFileWrite, pData, WordCount * WordSize, &writtenWords, NULL);
+         WriteFile(pFile->hFileWrite, pData, WordCount * WordSize, &writtenWords, NULL); //FIXME: does not work for writing buffers larger than 2GB (even though this should rarely be the case in practice)
          if (writtenWords < 1) throw Exception("Windows IO Error while trying to write chunk data");
          writtenWords /= WordSize;
          #else // standard C functions
-         if (fseek(pFile->hFileWrite, ulStartPos + ulPos, SEEK_SET)) {
+         if (fseeko(pFile->hFileWrite, ullStartPos + ullPos, SEEK_SET)) {
-             throw Exception("Could not seek to position " + ToString(ulPos) +
+             throw Exception("Could not seek to position " + ToString(ullPos) +
-                             " in chunk (" + ToString(ulStartPos + ulPos) + " in file)");
+                             " in chunk (" + ToString(ullStartPos + ullPos) + " in file)");
          }
-         unsigned long writtenWords = fwrite(pData, WordSize, WordCount, pFile->hFileWrite);
+         file_offset_t writtenWords = fwrite(pData, WordSize, WordCount, pFile->hFileWrite);
          #endif // POSIX
          SetPos(writtenWords * WordSize, stream_curpos);
          return writtenWords;
      }
      /** Just an internal wrapper for the main <i>Read()</i> method with additional Exception throwing on errors. */
-     unsigned long Chunk::ReadSceptical(void* pData, unsigned long WordCount, unsigned long WordSize) {
+     file_offset_t Chunk::ReadSceptical(void* pData, file_offset_t WordCount, file_offset_t WordSize) {
-         unsigned long readWords = Read(pData, WordCount, WordSize);
+         file_offset_t readWords = Read(pData, WordCount, WordSize);
          if (readWords != WordCount) throw RIFF::Exception("End of chunk data reached.");
          return readWords;
      }
-Line 399 
 namespace RIFF {
+Line 472 
 namespace RIFF {
       * @param pData             destination buffer
       * @param WordCount         number of 8 Bit signed integers to read
       * @returns                 number of read integers
-      * @throws RIFF::Exception  if an error occured or less than
+      * @throws RIFF::Exception  if an error occurred or less than
       *                          \a WordCount integers could be read!
       */
-     unsigned long Chunk::ReadInt8(int8_t* pData, unsigned long WordCount) {
+     file_offset_t Chunk::ReadInt8(int8_t* pData, file_offset_t WordCount) {
-        #if DEBUG
+         #if DEBUG_RIFF
-        std::cout << "Chunk::ReadInt8(int8_t*,ulong)" << std::endl;
+         std::cout << "Chunk::ReadInt8(int8_t*,file_offset_t)" << std::endl;
-        #endif // DEBUG
+         #endif // DEBUG_RIFF
          return ReadSceptical(pData, WordCount, 1);
      }
-Line 420 
 namespace RIFF {
+Line 493 
 namespace RIFF {
       * @param pData             source buffer (containing the data)
       * @param WordCount         number of 8 Bit signed integers to write
       * @returns                 number of written integers
-      * @throws RIFF::Exception  if an IO error occured
+      * @throws RIFF::Exception  if an IO error occurred
       * @see Resize()
       */
-     unsigned long Chunk::WriteInt8(int8_t* pData, unsigned long WordCount) {
+     file_offset_t Chunk::WriteInt8(int8_t* pData, file_offset_t WordCount) {
          return Write(pData, WordCount, 1);
      }
-Line 436 
 namespace RIFF {
+Line 509 
 namespace RIFF {
       * @param pData             destination buffer
       * @param WordCount         number of 8 Bit unsigned integers to read
       * @returns                 number of read integers
-      * @throws RIFF::Exception  if an error occured or less than
+      * @throws RIFF::Exception  if an error occurred or less than
       *                          \a WordCount integers could be read!
       */
-     unsigned long Chunk::ReadUint8(uint8_t* pData, unsigned long WordCount) {
+     file_offset_t Chunk::ReadUint8(uint8_t* pData, file_offset_t WordCount) {
-        #if DEBUG
+         #if DEBUG_RIFF
-        std::cout << "Chunk::ReadUint8(uint8_t*,ulong)" << std::endl;
+         std::cout << "Chunk::ReadUint8(uint8_t*,file_offset_t)" << std::endl;
-        #endif // DEBUG
+         #endif // DEBUG_RIFF
          return ReadSceptical(pData, WordCount, 1);
      }
-Line 457 
 namespace RIFF {
+Line 530 
 namespace RIFF {
       * @param pData             source buffer (containing the data)
       * @param WordCount         number of 8 Bit unsigned integers to write
       * @returns                 number of written integers
-      * @throws RIFF::Exception  if an IO error occured
+      * @throws RIFF::Exception  if an IO error occurred
       * @see Resize()
       */
-     unsigned long Chunk::WriteUint8(uint8_t* pData, unsigned long WordCount) {
+     file_offset_t Chunk::WriteUint8(uint8_t* pData, file_offset_t WordCount) {
          return Write(pData, WordCount, 1);
      }
-Line 473 
 namespace RIFF {
+Line 546 
 namespace RIFF {
       * @param pData             destination buffer
       * @param WordCount         number of 16 Bit signed integers to read
       * @returns                 number of read integers
-      * @throws RIFF::Exception  if an error occured or less than
+      * @throws RIFF::Exception  if an error occurred or less than
       *                          \a WordCount integers could be read!
       */
-     unsigned long Chunk::ReadInt16(int16_t* pData, unsigned long WordCount) {
+     file_offset_t Chunk::ReadInt16(int16_t* pData, file_offset_t WordCount) {
-       #if DEBUG
+         #if DEBUG_RIFF
-       std::cout << "Chunk::ReadInt16(int16_t*,ulong)" << std::endl;
+         std::cout << "Chunk::ReadInt16(int16_t*,file_offset_t)" << std::endl;
-       #endif // DEBUG
+         #endif // DEBUG_RIFF
          return ReadSceptical(pData, WordCount, 2);
      }
-Line 494 
 namespace RIFF {
+Line 567 
 namespace RIFF {
       * @param pData             source buffer (containing the data)
       * @param WordCount         number of 16 Bit signed integers to write
       * @returns                 number of written integers
-      * @throws RIFF::Exception  if an IO error occured
+      * @throws RIFF::Exception  if an IO error occurred
       * @see Resize()
       */
-     unsigned long Chunk::WriteInt16(int16_t* pData, unsigned long WordCount) {
+     file_offset_t Chunk::WriteInt16(int16_t* pData, file_offset_t WordCount) {
          return Write(pData, WordCount, 2);
      }
-Line 510 
 namespace RIFF {
+Line 583 
 namespace RIFF {
       * @param pData             destination buffer
       * @param WordCount         number of 8 Bit unsigned integers to read
       * @returns                 number of read integers
-      * @throws RIFF::Exception  if an error occured or less than
+      * @throws RIFF::Exception  if an error occurred or less than
       *                          \a WordCount integers could be read!
       */
-     unsigned long Chunk::ReadUint16(uint16_t* pData, unsigned long WordCount) {
+     file_offset_t Chunk::ReadUint16(uint16_t* pData, file_offset_t WordCount) {
-       #if DEBUG
+         #if DEBUG_RIFF
-       std::cout << "Chunk::ReadUint16(uint16_t*,ulong)" << std::endl;
+         std::cout << "Chunk::ReadUint16(uint16_t*,file_offset_t)" << std::endl;
-       #endif // DEBUG
+         #endif // DEBUG_RIFF
          return ReadSceptical(pData, WordCount, 2);
      }
-Line 531 
 namespace RIFF {
+Line 604 
 namespace RIFF {
       * @param pData             source buffer (containing the data)
       * @param WordCount         number of 16 Bit unsigned integers to write
       * @returns                 number of written integers
-      * @throws RIFF::Exception  if an IO error occured
+      * @throws RIFF::Exception  if an IO error occurred
       * @see Resize()
       */
-     unsigned long Chunk::WriteUint16(uint16_t* pData, unsigned long WordCount) {
+     file_offset_t Chunk::WriteUint16(uint16_t* pData, file_offset_t WordCount) {
          return Write(pData, WordCount, 2);
      }
-Line 547 
 namespace RIFF {
+Line 620 
 namespace RIFF {
       * @param pData             destination buffer
       * @param WordCount         number of 32 Bit signed integers to read
       * @returns                 number of read integers
-      * @throws RIFF::Exception  if an error occured or less than
+      * @throws RIFF::Exception  if an error occurred or less than
       *                          \a WordCount integers could be read!
       */
-     unsigned long Chunk::ReadInt32(int32_t* pData, unsigned long WordCount) {
+     file_offset_t Chunk::ReadInt32(int32_t* pData, file_offset_t WordCount) {
-        #if DEBUG
+         #if DEBUG_RIFF
-        std::cout << "Chunk::ReadInt32(int32_t*,ulong)" << std::endl;
+         std::cout << "Chunk::ReadInt32(int32_t*,file_offset_t)" << std::endl;
-        #endif // DEBUG
+         #endif // DEBUG_RIFF
          return ReadSceptical(pData, WordCount, 4);
      }
-Line 568 
 namespace RIFF {
+Line 641 
 namespace RIFF {
       * @param pData             source buffer (containing the data)
       * @param WordCount         number of 32 Bit signed integers to write
       * @returns                 number of written integers
-      * @throws RIFF::Exception  if an IO error occured
+      * @throws RIFF::Exception  if an IO error occurred
       * @see Resize()
       */
-     unsigned long Chunk::WriteInt32(int32_t* pData, unsigned long WordCount) {
+     file_offset_t Chunk::WriteInt32(int32_t* pData, file_offset_t WordCount) {
          return Write(pData, WordCount, 4);
      }
-Line 584 
 namespace RIFF {
+Line 657 
 namespace RIFF {
       * @param pData             destination buffer
       * @param WordCount         number of 32 Bit unsigned integers to read
       * @returns                 number of read integers
-      * @throws RIFF::Exception  if an error occured or less than
+      * @throws RIFF::Exception  if an error occurred or less than
       *                          \a WordCount integers could be read!
       */
-     unsigned long Chunk::ReadUint32(uint32_t* pData, unsigned long WordCount) {
+     file_offset_t Chunk::ReadUint32(uint32_t* pData, file_offset_t WordCount) {
-        #if DEBUG
+         #if DEBUG_RIFF
-        std::cout << "Chunk::ReadUint32(uint32_t*,ulong)" << std::endl;
+         std::cout << "Chunk::ReadUint32(uint32_t*,file_offset_t)" << std::endl;
-        #endif // DEBUG
+         #endif // DEBUG_RIFF
          return ReadSceptical(pData, WordCount, 4);
      }
      /**
+      * Reads a null-padded string of size characters and copies it
+      * into the string \a s. The position within the chunk will
+      * automatically be incremented.
+      *
+      * @param s                 destination string
+      * @param size              number of characters to read
+      * @throws RIFF::Exception  if an error occurred or less than
+      *                          \a size characters could be read!
+      */
+     void Chunk::ReadString(String& s, int size) {
+         char* buf = new char[size];
+         ReadSceptical(buf, 1, size);
+         s.assign(buf, std::find(buf, buf + size, '\0'));
+         delete[] buf;
+     }
+     /**
       * Writes \a WordCount number of 32 Bit unsigned integer words from the
       * buffer pointed by \a pData to the chunk's body, directly to the
       * actual "physical" file. The position within the chunk will
-Line 605 
 namespace RIFF {
+Line 695 
 namespace RIFF {
       * @param pData             source buffer (containing the data)
       * @param WordCount         number of 32 Bit unsigned integers to write
       * @returns                 number of written integers
-      * @throws RIFF::Exception  if an IO error occured
+      * @throws RIFF::Exception  if an IO error occurred
       * @see Resize()
       */
-     unsigned long Chunk::WriteUint32(uint32_t* pData, unsigned long WordCount) {
+     file_offset_t Chunk::WriteUint32(uint32_t* pData, file_offset_t WordCount) {
          return Write(pData, WordCount, 4);
      }
-Line 617 
 namespace RIFF {
+Line 707 
 namespace RIFF {
       * the chunk.
       *
       * @returns                 read integer word
-      * @throws RIFF::Exception  if an error occured
+      * @throws RIFF::Exception  if an error occurred
       */
      int8_t Chunk::ReadInt8() {
-       #if DEBUG
+         #if DEBUG_RIFF
-       std::cout << "Chunk::ReadInt8()" << std::endl;
+         std::cout << "Chunk::ReadInt8()" << std::endl;
-       #endif // DEBUG
+         #endif // DEBUG_RIFF
          int8_t word;
          ReadSceptical(&word,1,1);
          return word;
-Line 633 
 namespace RIFF {
+Line 723 
 namespace RIFF {
       * within the chunk.
       *
       * @returns                 read integer word
-      * @throws RIFF::Exception  if an error occured
+      * @throws RIFF::Exception  if an error occurred
       */
      uint8_t Chunk::ReadUint8() {
-       #if DEBUG
+         #if DEBUG_RIFF
-       std::cout << "Chunk::ReadUint8()" << std::endl;
+         std::cout << "Chunk::ReadUint8()" << std::endl;
-       #endif // DEBUG
+         #endif // DEBUG_RIFF
          uint8_t word;
          ReadSceptical(&word,1,1);
          return word;
-Line 650 
 namespace RIFF {
+Line 740 
 namespace RIFF {
       * needed.
       *
       * @returns                 read integer word
-      * @throws RIFF::Exception  if an error occured
+      * @throws RIFF::Exception  if an error occurred
       */
      int16_t Chunk::ReadInt16() {
-       #if DEBUG
+         #if DEBUG_RIFF
-       std::cout << "Chunk::ReadInt16()" << std::endl;
+         std::cout << "Chunk::ReadInt16()" << std::endl;
-       #endif // DEBUG
+         #endif // DEBUG_RIFF
          int16_t word;
          ReadSceptical(&word,1,2);
          return word;
-Line 667 
 namespace RIFF {
+Line 757 
 namespace RIFF {
       * needed.
       *
       * @returns                 read integer word
-      * @throws RIFF::Exception  if an error occured
+      * @throws RIFF::Exception  if an error occurred
       */
      uint16_t Chunk::ReadUint16() {
-       #if DEBUG
+         #if DEBUG_RIFF
-       std::cout << "Chunk::ReadUint16()" << std::endl;
+         std::cout << "Chunk::ReadUint16()" << std::endl;
-       #endif // DEBUG
+         #endif // DEBUG_RIFF
          uint16_t word;
          ReadSceptical(&word,1,2);
          return word;
-Line 684 
 namespace RIFF {
+Line 774 
 namespace RIFF {
       * needed.
       *
       * @returns                 read integer word
-      * @throws RIFF::Exception  if an error occured
+      * @throws RIFF::Exception  if an error occurred
       */
      int32_t Chunk::ReadInt32() {
-       #if DEBUG
+         #if DEBUG_RIFF
-       std::cout << "Chunk::ReadInt32()" << std::endl;
+         std::cout << "Chunk::ReadInt32()" << std::endl;
-       #endif // DEBUG
+         #endif // DEBUG_RIFF
          int32_t word;
          ReadSceptical(&word,1,4);
          return word;
-Line 701 
 namespace RIFF {
+Line 791 
 namespace RIFF {
       * needed.
       *
       * @returns                 read integer word
-      * @throws RIFF::Exception  if an error occured
+      * @throws RIFF::Exception  if an error occurred
       */
      uint32_t Chunk::ReadUint32() {
-       #if DEBUG
+         #if DEBUG_RIFF
-       std::cout << "Chunk::ReadUint32()" << std::endl;
+         std::cout << "Chunk::ReadUint32()" << std::endl;
-       #endif // DEBUG
+         #endif // DEBUG_RIFF
          uint32_t word;
          ReadSceptical(&word,1,4);
          return word;
-Line 734 
 namespace RIFF {
+Line 824 
 namespace RIFF {
       * @see ReleaseChunkData()
       */
      void* Chunk::LoadChunkData() {
-         if (!pChunkData && pFile->Filename != "" && ulStartPos != 0) {
+         if (!pChunkData && pFile->Filename != "" /*&& ulStartPos != 0*/) {
              #if POSIX
-             if (lseek(pFile->hFileRead, ulStartPos, SEEK_SET) == -1) return NULL;
+             if (lseek(pFile->hFileRead, ullStartPos, SEEK_SET) == -1) return NULL;
              #elif defined(WIN32)
-             if (SetFilePointer(pFile->hFileRead, ulStartPos, NULL/*32 bit*/, FILE_BEGIN) == INVALID_SET_FILE_POINTER) return NULL;
+             LARGE_INTEGER liFilePos;
+             liFilePos.QuadPart = ullStartPos;
+             if (!SetFilePointerEx(pFile->hFileRead, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN)) return NULL;
              #else
-             if (fseek(pFile->hFileRead, ulStartPos, SEEK_SET)) return NULL;
+             if (fseeko(pFile->hFileRead, ullStartPos, SEEK_SET)) return NULL;
              #endif // POSIX
-             unsigned long ulBufferSize = (CurrentChunkSize > NewChunkSize) ? CurrentChunkSize : NewChunkSize;
+             file_offset_t ullBufferSize = (ullCurrentChunkSize > ullNewChunkSize) ? ullCurrentChunkSize : ullNewChunkSize;
-             pChunkData = new uint8_t[ulBufferSize];
+             pChunkData = new uint8_t[ullBufferSize];
              if (!pChunkData) return NULL;
-             memset(pChunkData, 0, ulBufferSize);
+             memset(pChunkData, 0, ullBufferSize);
              #if POSIX
-             unsigned long readWords = read(pFile->hFileRead, pChunkData, GetSize());
+             file_offset_t readWords = read(pFile->hFileRead, pChunkData, GetSize());
              #elif defined(WIN32)
              DWORD readWords;
-             ReadFile(pFile->hFileRead, pChunkData, GetSize(), &readWords, NULL);
+             ReadFile(pFile->hFileRead, pChunkData, GetSize(), &readWords, NULL); //FIXME: won't load chunks larger than 2GB !
              #else
-             unsigned long readWords = fread(pChunkData, 1, GetSize(), pFile->hFileRead);
+             file_offset_t readWords = fread(pChunkData, 1, GetSize(), pFile->hFileRead);
              #endif // POSIX
              if (readWords != GetSize()) {
                  delete[] pChunkData;
                  return (pChunkData = NULL);
              }
-             ulChunkDataSize = ulBufferSize;
+             ullChunkDataSize = ullBufferSize;
-         } else if (NewChunkSize > ulChunkDataSize) {
+         } else if (ullNewChunkSize > ullChunkDataSize) {
-             uint8_t* pNewBuffer = new uint8_t[NewChunkSize];
+             uint8_t* pNewBuffer = new uint8_t[ullNewChunkSize];
-             if (!pNewBuffer) throw Exception("Could not enlarge chunk data buffer to " + ToString(NewChunkSize) + " bytes");
+             if (!pNewBuffer) throw Exception("Could not enlarge chunk data buffer to " + ToString(ullNewChunkSize) + " bytes");
-             memset(pNewBuffer, 0 , NewChunkSize);
+             memset(pNewBuffer, 0 , ullNewChunkSize);
-             memcpy(pNewBuffer, pChunkData, ulChunkDataSize);
+             memcpy(pNewBuffer, pChunkData, ullChunkDataSize);
              delete[] pChunkData;
-             pChunkData      = pNewBuffer;
+             pChunkData       = pNewBuffer;
-             ulChunkDataSize = NewChunkSize;
+             ullChunkDataSize = ullNewChunkSize;
          }
          return pChunkData;
      }
-Line 798 
 namespace RIFF {
+Line 890 
 namespace RIFF {
       * calling File::Save() as this might exceed the current chunk's body
       * boundary!
       *
-      * @param iNewSize - new chunk body size in bytes (must be greater than zero)
+      * @param NewSize - new chunk body size in bytes (must be greater than zero)
-      * @throws RIFF::Exception  if \a iNewSize is less than 1
+      * @throws RIFF::Exception  if \a NewSize is less than 1 or unrealistic large
       * @see File::Save()
       */
-     void Chunk::Resize(int iNewSize) {
+     void Chunk::Resize(file_offset_t NewSize) {
-         if (iNewSize <= 0)
+         if (NewSize == 0)
              throw Exception("There is at least one empty chunk (zero size): " + __resolveChunkPath(this));
-         if (NewChunkSize == iNewSize) return;
+         if ((NewSize >> 48) != 0)
-         NewChunkSize = iNewSize;
+             throw Exception("Unrealistic high chunk size detected: " + __resolveChunkPath(this));
-         pFile->LogAsResized(this);
+         if (ullNewChunkSize == NewSize) return;
+         ullNewChunkSize = NewSize;
      }
      /** @brief Write chunk persistently e.g. to disk.
       *
       * Stores the chunk persistently to its actual "physical" file.
       *
-      * @param ulWritePos - position within the "physical" file where this
+      * @param ullWritePos - position within the "physical" file where this
       *                     chunk should be written to
-      * @param ulCurrentDataOffset - offset of current (old) data within
+      * @param ullCurrentDataOffset - offset of current (old) data within
       *                              the file
+      * @param pProgress - optional: callback function for progress notification
       * @returns new write position in the "physical" file, that is
-      *          \a ulWritePos incremented by this chunk's new size
+      *          \a ullWritePos incremented by this chunk's new size
       *          (including its header size of course)
       */
-     unsigned long Chunk::WriteChunk(unsigned long ulWritePos, unsigned long ulCurrentDataOffset) {
+     file_offset_t Chunk::WriteChunk(file_offset_t ullWritePos, file_offset_t ullCurrentDataOffset, progress_t* pProgress) {
-         const unsigned long ulOriginalPos = ulWritePos;
+         const file_offset_t ullOriginalPos = ullWritePos;
-         ulWritePos += CHUNK_HEADER_SIZE;
+         ullWritePos += CHUNK_HEADER_SIZE(pFile->FileOffsetSize);
          if (pFile->Mode != stream_mode_read_write)
              throw Exception("Cannot write list chunk, file has to be opened in read+write mode");
-Line 835 
 namespace RIFF {
+Line 929 
 namespace RIFF {
              LoadChunkData();
              // write chunk data from RAM persistently to the file
              #if POSIX
-             lseek(pFile->hFileWrite, ulWritePos, SEEK_SET);
+             lseek(pFile->hFileWrite, ullWritePos, SEEK_SET);
-             if (write(pFile->hFileWrite, pChunkData, NewChunkSize) != NewChunkSize) {
+             if (write(pFile->hFileWrite, pChunkData, ullNewChunkSize) != ullNewChunkSize) {
                  throw Exception("Writing Chunk data (from RAM) failed");
              }
              #elif defined(WIN32)
-             SetFilePointer(pFile->hFileWrite, ulWritePos, NULL/*32 bit*/, FILE_BEGIN);
+             LARGE_INTEGER liFilePos;
+             liFilePos.QuadPart = ullWritePos;
+             SetFilePointerEx(pFile->hFileWrite, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN);
              DWORD dwBytesWritten;
-             WriteFile(pFile->hFileWrite, pChunkData, NewChunkSize, &dwBytesWritten, NULL);
+             WriteFile(pFile->hFileWrite, pChunkData, ullNewChunkSize, &dwBytesWritten, NULL); //FIXME: won't save chunks larger than 2GB !
-             if (dwBytesWritten != NewChunkSize) {
+             if (dwBytesWritten != ullNewChunkSize) {
                  throw Exception("Writing Chunk data (from RAM) failed");
              }
              #else
-             fseek(pFile->hFileWrite, ulWritePos, SEEK_SET);
+             fseeko(pFile->hFileWrite, ullWritePos, SEEK_SET);
-             if (fwrite(pChunkData, 1, NewChunkSize, pFile->hFileWrite) != NewChunkSize) {
+             if (fwrite(pChunkData, 1, ullNewChunkSize, pFile->hFileWrite) != ullNewChunkSize) {
                  throw Exception("Writing Chunk data (from RAM) failed");
              }
              #endif // POSIX
          } else {
              // move chunk data from the end of the file to the appropriate position
              int8_t* pCopyBuffer = new int8_t[4096];
-             unsigned long ulToMove = (NewChunkSize < CurrentChunkSize) ? NewChunkSize : CurrentChunkSize;
+             file_offset_t ullToMove = (ullNewChunkSize < ullCurrentChunkSize) ? ullNewChunkSize : ullCurrentChunkSize;
              #if defined(WIN32)
              DWORD iBytesMoved = 1; // we have to pass it via pointer to the Windows API, thus the correct size must be ensured
              #else
              int iBytesMoved = 1;
              #endif
-             for (unsigned long ulOffset = 0; ulToMove > 0 && iBytesMoved > 0; ulOffset += iBytesMoved, ulToMove -= iBytesMoved) {
+             for (file_offset_t ullOffset = 0; ullToMove > 0 && iBytesMoved > 0; ullOffset += iBytesMoved, ullToMove -= iBytesMoved) {
-                 iBytesMoved = (ulToMove < 4096) ? ulToMove : 4096;
+                 iBytesMoved = (ullToMove < 4096) ? int(ullToMove) : 4096;
                  #if POSIX
-                 lseek(pFile->hFileRead, ulStartPos + ulCurrentDataOffset + ulOffset, SEEK_SET);
+                 lseek(pFile->hFileRead, ullStartPos + ullCurrentDataOffset + ullOffset, SEEK_SET);
-                 iBytesMoved = read(pFile->hFileRead, pCopyBuffer, iBytesMoved);
+                 iBytesMoved = (int) read(pFile->hFileRead, pCopyBuffer, (size_t) iBytesMoved);
-                 lseek(pFile->hFileWrite, ulWritePos + ulOffset, SEEK_SET);
+                 lseek(pFile->hFileWrite, ullWritePos + ullOffset, SEEK_SET);
-                 iBytesMoved = write(pFile->hFileWrite, pCopyBuffer, iBytesMoved);
+                 iBytesMoved = (int) write(pFile->hFileWrite, pCopyBuffer, (size_t) iBytesMoved);
                  #elif defined(WIN32)
-                 SetFilePointer(pFile->hFileRead, ulStartPos + ulCurrentDataOffset + ulOffset, NULL/*32 bit*/, FILE_BEGIN);
+                 LARGE_INTEGER liFilePos;
+                 liFilePos.QuadPart = ullStartPos + ullCurrentDataOffset + ullOffset;
+                 SetFilePointerEx(pFile->hFileRead, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN);
                  ReadFile(pFile->hFileRead, pCopyBuffer, iBytesMoved, &iBytesMoved, NULL);
-                 SetFilePointer(pFile->hFileWrite, ulWritePos + ulOffset, NULL/*32 bit*/, FILE_BEGIN);
+                 liFilePos.QuadPart = ullWritePos + ullOffset;
+                 SetFilePointerEx(pFile->hFileWrite, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN);
                  WriteFile(pFile->hFileWrite, pCopyBuffer, iBytesMoved, &iBytesMoved, NULL);
                  #else
-                 fseek(pFile->hFileRead, ulStartPos + ulCurrentDataOffset + ulOffset, SEEK_SET);
+                 fseeko(pFile->hFileRead, ullStartPos + ullCurrentDataOffset + ullOffset, SEEK_SET);
                  iBytesMoved = fread(pCopyBuffer, 1, iBytesMoved, pFile->hFileRead);
-                 fseek(pFile->hFileWrite, ulWritePos + ulOffset, SEEK_SET);
+                 fseeko(pFile->hFileWrite, ullWritePos + ullOffset, SEEK_SET);
                  iBytesMoved = fwrite(pCopyBuffer, 1, iBytesMoved, pFile->hFileWrite);
                  #endif
              }
-Line 885 
 namespace RIFF {
+Line 984 
 namespace RIFF {
          }
          // update this chunk's header
-         CurrentChunkSize = NewChunkSize;
+         ullCurrentChunkSize = ullNewChunkSize;
-         WriteHeader(ulOriginalPos);
+         WriteHeader(ullOriginalPos);
+         __notify_progress(pProgress, 1.0); // notify done
          // update chunk's position pointers
-         ulStartPos = ulOriginalPos + CHUNK_HEADER_SIZE;
+         ullStartPos = ullOriginalPos + CHUNK_HEADER_SIZE(pFile->FileOffsetSize);
-         ulPos      = 0;
+         ullPos      = 0;
          // add pad byte if needed
-         if ((ulStartPos + NewChunkSize) % 2 != 0) {
+         if ((ullStartPos + ullNewChunkSize) % 2 != 0) {
              const char cPadByte = 0;
              #if POSIX
-             lseek(pFile->hFileWrite, ulStartPos + NewChunkSize, SEEK_SET);
+             lseek(pFile->hFileWrite, ullStartPos + ullNewChunkSize, SEEK_SET);
              write(pFile->hFileWrite, &cPadByte, 1);
              #elif defined(WIN32)
-             SetFilePointer(pFile->hFileWrite, ulStartPos + NewChunkSize, NULL/*32 bit*/, FILE_BEGIN);
+             LARGE_INTEGER liFilePos;
+             liFilePos.QuadPart = ullStartPos + ullNewChunkSize;
+             SetFilePointerEx(pFile->hFileWrite, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN);
              DWORD dwBytesWritten;
              WriteFile(pFile->hFileWrite, &cPadByte, 1, &dwBytesWritten, NULL);
              #else
-             fseek(pFile->hFileWrite, ulStartPos + NewChunkSize, SEEK_SET);
+             fseeko(pFile->hFileWrite, ullStartPos + ullNewChunkSize, SEEK_SET);
              fwrite(&cPadByte, 1, 1, pFile->hFileWrite);
              #endif
-             return ulStartPos + NewChunkSize + 1;
+             return ullStartPos + ullNewChunkSize + 1;
          }
-         return ulStartPos + NewChunkSize;
+         return ullStartPos + ullNewChunkSize;
      }
      void Chunk::__resetPos() {
-         ulPos = 0;
+         ullPos = 0;
      }
-Line 922 
 namespace RIFF {
+Line 1025 
 namespace RIFF {
  // *
      List::List(File* pFile) : Chunk(pFile) {
-       #if DEBUG
+         #if DEBUG_RIFF
-       std::cout << "List::List(File* pFile)" << std::endl;
+         std::cout << "List::List(File* pFile)" << std::endl;
-       #endif // DEBUG
+         #endif // DEBUG_RIFF
          pSubChunks    = NULL;
          pSubChunksMap = NULL;
      }
-     List::List(File* pFile, unsigned long StartPos, List* Parent)
+     List::List(File* pFile, file_offset_t StartPos, List* Parent)
        : Chunk(pFile, StartPos, Parent) {
-         #if DEBUG
+         #if DEBUG_RIFF
-         std::cout << "List::List(File*,ulong,bool,List*)" << std::endl;
+         std::cout << "List::List(File*,file_offset_t,List*)" << std::endl;
-         #endif // DEBUG
+         #endif // DEBUG_RIFF
          pSubChunks    = NULL;
          pSubChunksMap = NULL;
          ReadHeader(StartPos);
-         ulStartPos    = StartPos + LIST_HEADER_SIZE;
+         ullStartPos = StartPos + LIST_HEADER_SIZE(pFile->FileOffsetSize);
      }
      List::List(File* pFile, List* pParent, uint32_t uiListID)
-Line 948 
 namespace RIFF {
+Line 1051 
 namespace RIFF {
      }
      List::~List() {
-       #if DEBUG
+         #if DEBUG_RIFF
-       std::cout << "List::~List()" << std::endl;
+         std::cout << "List::~List()" << std::endl;
-       #endif // DEBUG
+         #endif // DEBUG_RIFF
          DeleteChunkList();
      }
-Line 983 
 namespace RIFF {
+Line 1086 
 namespace RIFF {
       *                   that ID
       */
      Chunk* List::GetSubChunk(uint32_t ChunkID) {
-       #if DEBUG
+         #if DEBUG_RIFF
-       std::cout << "List::GetSubChunk(uint32_t)" << std::endl;
+         std::cout << "List::GetSubChunk(uint32_t)" << std::endl;
-       #endif // DEBUG
+         #endif // DEBUG_RIFF
          if (!pSubChunksMap) LoadSubChunks();
          return (*pSubChunksMap)[ChunkID];
      }
-Line 993 
 namespace RIFF {
+Line 1096 
 namespace RIFF {
      /**
       *  Returns sublist chunk with list type <i>\a ListType</i> within this
       *  chunk list. Use this method if you expect only one sublist chunk of
-      *  that type in the list. It there are more than one, it's undetermined
+      *  that type in the list. If there are more than one, it's undetermined
       *  which one of them will be returned! If there are no sublists with
       *  that desired list type, NULL will be returned.
       *
-Line 1002 
 namespace RIFF {
+Line 1105 
 namespace RIFF {
       *                    that type
       */
      List* List::GetSubList(uint32_t ListType) {
-         #if DEBUG
+         #if DEBUG_RIFF
          std::cout << "List::GetSubList(uint32_t)" << std::endl;
-         #endif // DEBUG
+         #endif // DEBUG_RIFF
          if (!pSubChunks) LoadSubChunks();
          ChunkList::iterator iter = pSubChunks->begin();
          ChunkList::iterator end  = pSubChunks->end();
-Line 1019 
 namespace RIFF {
+Line 1122 
 namespace RIFF {
      }
      /**
-      *  Returns the first subchunk within the list. You have to call this
+      *  Returns the first subchunk within the list (which may be an ordinary
+      *  chunk as well as a list chunk). You have to call this
       *  method before you can call GetNextSubChunk(). Recall it when you want
       *  to start from the beginning of the list again.
       *
-Line 1027 
 namespace RIFF {
+Line 1131 
 namespace RIFF {
       *            otherwise
       */
      Chunk* List::GetFirstSubChunk() {
-         #if DEBUG
+         #if DEBUG_RIFF
          std::cout << "List::GetFirstSubChunk()" << std::endl;
-         #endif // DEBUG
+         #endif // DEBUG_RIFF
          if (!pSubChunks) LoadSubChunks();
          ChunksIterator = pSubChunks->begin();
          return (ChunksIterator != pSubChunks->end()) ? *ChunksIterator : NULL;
      }
      /**
-      *  Returns the next subchunk within the list. You have to call
+      *  Returns the next subchunk within the list (which may be an ordinary
+      *  chunk as well as a list chunk). You have to call
       *  GetFirstSubChunk() before you can use this method!
       *
       *  @returns  pointer to the next subchunk within the list or NULL if
       *            end of list is reached
       */
      Chunk* List::GetNextSubChunk() {
-         #if DEBUG
+         #if DEBUG_RIFF
          std::cout << "List::GetNextSubChunk()" << std::endl;
-         #endif // DEBUG
+         #endif // DEBUG_RIFF
          if (!pSubChunks) return NULL;
          ChunksIterator++;
          return (ChunksIterator != pSubChunks->end()) ? *ChunksIterator : NULL;
-Line 1061 
 namespace RIFF {
+Line 1166 
 namespace RIFF {
       *            otherwise
       */
      List* List::GetFirstSubList() {
-         #if DEBUG
+         #if DEBUG_RIFF
          std::cout << "List::GetFirstSubList()" << std::endl;
-         #endif // DEBUG
+         #endif // DEBUG_RIFF
          if (!pSubChunks) LoadSubChunks();
          ListIterator            = pSubChunks->begin();
          ChunkList::iterator end = pSubChunks->end();
-Line 1083 
 namespace RIFF {
+Line 1188 
 namespace RIFF {
       *            end of list is reached
       */
      List* List::GetNextSubList() {
-         #if DEBUG
+         #if DEBUG_RIFF
          std::cout << "List::GetNextSubList()" << std::endl;
-         #endif // DEBUG
+         #endif // DEBUG_RIFF
          if (!pSubChunks) return NULL;
          if (ListIterator == pSubChunks->end()) return NULL;
          ListIterator++;
-Line 1098 
 namespace RIFF {
+Line 1203 
 namespace RIFF {
      }
      /**
-      *  Returns number of subchunks within the list.
+      *  Returns number of subchunks within the list (including list chunks).
       */
-     unsigned int List::CountSubChunks() {
+     size_t List::CountSubChunks() {
          if (!pSubChunks) LoadSubChunks();
          return pSubChunks->size();
      }
-Line 1109 
 namespace RIFF {
+Line 1214 
 namespace RIFF {
       *  Returns number of subchunks within the list with chunk ID
       *  <i>\a ChunkId</i>.
       */
-     unsigned int List::CountSubChunks(uint32_t ChunkID) {
+     size_t List::CountSubChunks(uint32_t ChunkID) {
-         unsigned int result = 0;
+         size_t result = 0;
          if (!pSubChunks) LoadSubChunks();
          ChunkList::iterator iter = pSubChunks->begin();
          ChunkList::iterator end  = pSubChunks->end();
-Line 1126 
 namespace RIFF {
+Line 1231 
 namespace RIFF {
      /**
       *  Returns number of sublists within the list.
       */
-     unsigned int List::CountSubLists() {
+     size_t List::CountSubLists() {
          return CountSubChunks(CHUNK_ID_LIST);
      }
-Line 1134 
 namespace RIFF {
+Line 1239 
 namespace RIFF {
       *  Returns number of sublists within the list with list type
       *  <i>\a ListType</i>
       */
-     unsigned int List::CountSubLists(uint32_t ListType) {
+     size_t List::CountSubLists(uint32_t ListType) {
-         unsigned int result = 0;
+         size_t result = 0;
          if (!pSubChunks) LoadSubChunks();
          ChunkList::iterator iter = pSubChunks->begin();
          ChunkList::iterator end  = pSubChunks->end();
-Line 1152 
 namespace RIFF {
+Line 1257 
 namespace RIFF {
      /** @brief Creates a new sub chunk.
       *
       * Creates and adds a new sub chunk to this list chunk. Note that the
-      * chunk's body size given by \a uiBodySize must be greater than zero.
+      * chunk's body size given by \a ullBodySize must be greater than zero.
       * You have to call File::Save() to make this change persistent to the
       * actual file and <b>before</b> performing any data write operations
       * on the new chunk!
       *
       * @param uiChunkID  - chunk ID of the new chunk
-      * @param uiBodySize - size of the new chunk's body, that is its actual
+      * @param ullBodySize - size of the new chunk's body, that is its actual
-      *                     data size (without header)
+      *                      data size (without header)
-      * @throws RIFF::Exception if \a uiBodySize equals zero
+      * @throws RIFF::Exception if \a ullBodySize equals zero
       */
-     Chunk* List::AddSubChunk(uint32_t uiChunkID, uint uiBodySize) {
+     Chunk* List::AddSubChunk(uint32_t uiChunkID, file_offset_t ullBodySize) {
-         if (uiBodySize == 0) throw Exception("Chunk body size must be at least 1 byte");
+         if (ullBodySize == 0) throw Exception("Chunk body size must be at least 1 byte");
          if (!pSubChunks) LoadSubChunks();
          Chunk* pNewChunk = new Chunk(pFile, this, uiChunkID, 0);
          pSubChunks->push_back(pNewChunk);
          (*pSubChunksMap)[uiChunkID] = pNewChunk;
-         pNewChunk->Resize(uiBodySize);
+         pNewChunk->Resize(ullBodySize);
-         NewChunkSize += CHUNK_HEADER_SIZE;
+         ullNewChunkSize += CHUNK_HEADER_SIZE(pFile->FileOffsetSize);
-         pFile->LogAsResized(this);
          return pNewChunk;
      }
-     /** @brief Moves a sub chunk.
+     /** @brief Moves a sub chunk witin this list.
       *
-      * Moves a sub chunk from one position in a list to another
+      * Moves a sub chunk from one position in this list to another
       * position in the same list. The pSrc chunk is placed before the
       * pDst chunk.
       *
-Line 1192 
 namespace RIFF {
+Line 1296 
 namespace RIFF {
          pSubChunks->insert(iter, pSrc);
      }
+     /** @brief Moves a sub chunk from this list to another list.
+      *
+      * Moves a sub chunk from this list list to the end of another
+      * list.
+      *
+      * @param pSrc - sub chunk to be moved
+      * @param pDst - destination list where the chunk shall be moved to
+      */
+     void List::MoveSubChunk(Chunk* pSrc, List* pNewParent) {
+         if (pNewParent == this || !pNewParent) return;
+         if (!pSubChunks) LoadSubChunks();
+         if (!pNewParent->pSubChunks) pNewParent->LoadSubChunks();
+         pSubChunks->remove(pSrc);
+         pNewParent->pSubChunks->push_back(pSrc);
+         // update chunk id map of this List
+         if ((*pSubChunksMap)[pSrc->GetChunkID()] == pSrc) {
+             pSubChunksMap->erase(pSrc->GetChunkID());
+             // try to find another chunk of the same chunk ID
+             ChunkList::iterator iter = pSubChunks->begin();
+             ChunkList::iterator end  = pSubChunks->end();
+             for (; iter != end; ++iter) {
+                 if ((*iter)->GetChunkID() == pSrc->GetChunkID()) {
+                     (*pSubChunksMap)[pSrc->GetChunkID()] = *iter;
+                     break; // we're done, stop search
+                 }
+             }
+         }
+         // update chunk id map of other list
+         if (!(*pNewParent->pSubChunksMap)[pSrc->GetChunkID()])
+             (*pNewParent->pSubChunksMap)[pSrc->GetChunkID()] = pSrc;
+     }
      /** @brief Creates a new list sub chunk.
       *
       * Creates and adds a new list sub chunk to this list chunk. Note that
-Line 1206 
 namespace RIFF {
+Line 1342 
 namespace RIFF {
          List* pNewListChunk = new List(pFile, this, uiListType);
          pSubChunks->push_back(pNewListChunk);
          (*pSubChunksMap)[CHUNK_ID_LIST] = pNewListChunk;
-         NewChunkSize += LIST_HEADER_SIZE;
+         ullNewChunkSize += LIST_HEADER_SIZE(pFile->FileOffsetSize);
-         pFile->LogAsResized(this);
          return pNewListChunk;
      }
-Line 1239 
 namespace RIFF {
+Line 1374 
 namespace RIFF {
          delete pSubChunk;
      }
-     void List::ReadHeader(unsigned long fPos) {
+     /**
-       #if DEBUG
+      *  Returns the actual total size in bytes (including List chunk header and
-       std::cout << "List::Readheader(ulong) ";
+      *  all subchunks) of this List Chunk if being stored to a file.
-       #endif // DEBUG
+      *
-         Chunk::ReadHeader(fPos);
+      *  @param fileOffsetSize - RIFF file offset size (in bytes) assumed when
-         if (CurrentChunkSize < 4) return;
+      *                          being saved to a file
-         NewChunkSize = CurrentChunkSize -= 4;
+      */
+     file_offset_t List::RequiredPhysicalSize(int fileOffsetSize) {
+         if (!pSubChunks) LoadSubChunks();
+         file_offset_t size = LIST_HEADER_SIZE(fileOffsetSize);
+         ChunkList::iterator iter = pSubChunks->begin();
+         ChunkList::iterator end  = pSubChunks->end();
+         for (; iter != end; ++iter)
+             size += (*iter)->RequiredPhysicalSize(fileOffsetSize);
+         return size;
+     }
+     void List::ReadHeader(file_offset_t filePos) {
+         #if DEBUG_RIFF
+         std::cout << "List::Readheader(file_offset_t) ";
+         #endif // DEBUG_RIFF
+         Chunk::ReadHeader(filePos);
+         if (ullCurrentChunkSize < 4) return;
+         ullNewChunkSize = ullCurrentChunkSize -= 4;
          #if POSIX
-         lseek(pFile->hFileRead, fPos + CHUNK_HEADER_SIZE, SEEK_SET);
+         lseek(pFile->hFileRead, filePos + CHUNK_HEADER_SIZE(pFile->FileOffsetSize), SEEK_SET);
          read(pFile->hFileRead, &ListType, 4);
          #elif defined(WIN32)
-         SetFilePointer(pFile->hFileRead, fPos + CHUNK_HEADER_SIZE, NULL/*32 bit*/, FILE_BEGIN);
+         LARGE_INTEGER liFilePos;
+         liFilePos.QuadPart = filePos + CHUNK_HEADER_SIZE(pFile->FileOffsetSize);
+         SetFilePointerEx(pFile->hFileRead, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN);
          DWORD dwBytesRead;
          ReadFile(pFile->hFileRead, &ListType, 4, &dwBytesRead, NULL);
          #else
-         fseek(pFile->hFileRead, fPos + CHUNK_HEADER_SIZE, SEEK_SET);
+         fseeko(pFile->hFileRead, filePos + CHUNK_HEADER_SIZE(pFile->FileOffsetSize), SEEK_SET);
          fread(&ListType, 4, 1, pFile->hFileRead);
          #endif // POSIX
-       #if DEBUG
+         #if DEBUG_RIFF
-       std::cout << "listType=" << convertToString(ListType) << std::endl;
+         std::cout << "listType=" << convertToString(ListType) << std::endl;
-       #endif // DEBUG
+         #endif // DEBUG_RIFF
          if (!pFile->bEndianNative) {
              //swapBytes_32(&ListType);
          }
      }
-     void List::WriteHeader(unsigned long fPos) {
+     void List::WriteHeader(file_offset_t filePos) {
          // the four list type bytes officially belong the chunk's body in the RIFF format
-         NewChunkSize += 4;
+         ullNewChunkSize += 4;
-         Chunk::WriteHeader(fPos);
+         Chunk::WriteHeader(filePos);
-         NewChunkSize -= 4; // just revert the +4 incrementation
+         ullNewChunkSize -= 4; // just revert the +4 incrementation
          #if POSIX
-         lseek(pFile->hFileWrite, fPos + CHUNK_HEADER_SIZE, SEEK_SET);
+         lseek(pFile->hFileWrite, filePos + CHUNK_HEADER_SIZE(pFile->FileOffsetSize), SEEK_SET);
          write(pFile->hFileWrite, &ListType, 4);
          #elif defined(WIN32)
-         SetFilePointer(pFile->hFileWrite, fPos + CHUNK_HEADER_SIZE, NULL/*32 bit*/, FILE_BEGIN);
+         LARGE_INTEGER liFilePos;
+         liFilePos.QuadPart = filePos + CHUNK_HEADER_SIZE(pFile->FileOffsetSize);
+         SetFilePointerEx(pFile->hFileWrite, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN);
          DWORD dwBytesWritten;
          WriteFile(pFile->hFileWrite, &ListType, 4, &dwBytesWritten, NULL);
          #else
-         fseek(pFile->hFileWrite, fPos + CHUNK_HEADER_SIZE, SEEK_SET);
+         fseeko(pFile->hFileWrite, filePos + CHUNK_HEADER_SIZE(pFile->FileOffsetSize), SEEK_SET);
          fwrite(&ListType, 4, 1, pFile->hFileWrite);
          #endif // POSIX
      }
-     void List::LoadSubChunks() {
+     void List::LoadSubChunks(progress_t* pProgress) {
-        #if DEBUG
+         #if DEBUG_RIFF
-        std::cout << "List::LoadSubChunks()";
+         std::cout << "List::LoadSubChunks()";
-        #endif // DEBUG
+         #endif // DEBUG_RIFF
          if (!pSubChunks) {
              pSubChunks    = new ChunkList();
              pSubChunksMap = new ChunkMap();
-Line 1295 
 namespace RIFF {
+Line 1451 
 namespace RIFF {
              #else
              if (!pFile->hFileRead) return;
              #endif
-             unsigned long uiOriginalPos = GetPos();
+             file_offset_t ullOriginalPos = GetPos();
              SetPos(0); // jump to beginning of list chunk body
-             while (RemainingBytes() >= CHUNK_HEADER_SIZE) {
+             while (RemainingBytes() >= CHUNK_HEADER_SIZE(pFile->FileOffsetSize)) {
                  Chunk* ck;
                  uint32_t ckid;
                  Read(&ckid, 4, 1);
-        #if DEBUG
+                 #if DEBUG_RIFF
-        std::cout << " ckid=" << convertToString(ckid) << std::endl;
+                 std::cout << " ckid=" << convertToString(ckid) << std::endl;
-        #endif // DEBUG
+                 #endif // DEBUG_RIFF
                  if (ckid == CHUNK_ID_LIST) {
-                     ck = new RIFF::List(pFile, ulStartPos + ulPos - 4, this);
+                     ck = new RIFF::List(pFile, ullStartPos + ullPos - 4, this);
-                     SetPos(ck->GetSize() + LIST_HEADER_SIZE - 4, RIFF::stream_curpos);
+                     SetPos(ck->GetSize() + LIST_HEADER_SIZE(pFile->FileOffsetSize) - 4, RIFF::stream_curpos);
                  }
                  else { // simple chunk
-                     ck = new RIFF::Chunk(pFile, ulStartPos + ulPos - 4, this);
+                     ck = new RIFF::Chunk(pFile, ullStartPos + ullPos - 4, this);
-                     SetPos(ck->GetSize() + CHUNK_HEADER_SIZE - 4, RIFF::stream_curpos);
+                     SetPos(ck->GetSize() + CHUNK_HEADER_SIZE(pFile->FileOffsetSize) - 4, RIFF::stream_curpos);
                  }
                  pSubChunks->push_back(ck);
                  (*pSubChunksMap)[ckid] = ck;
                  if (GetPos() % 2 != 0) SetPos(1, RIFF::stream_curpos); // jump over pad byte
              }
-             SetPos(uiOriginalPos); // restore position before this call
+             SetPos(ullOriginalPos); // restore position before this call
          }
+         __notify_progress(pProgress, 1.0); // notify done
      }
-     void List::LoadSubChunksRecursively() {
+     void List::LoadSubChunksRecursively(progress_t* pProgress) {
-         for (List* pList = GetFirstSubList(); pList; pList = GetNextSubList())
+         const int n = (int) CountSubLists();
-             pList->LoadSubChunksRecursively();
+         int i = 0;
+         for (List* pList = GetFirstSubList(); pList; pList = GetNextSubList(), ++i) {
+             // divide local progress into subprogress
+             progress_t subprogress;
+             __divide_progress(pProgress, &subprogress, n, i);
+             // do the actual work
+             pList->LoadSubChunksRecursively(&subprogress);
+         }
+         __notify_progress(pProgress, 1.0); // notify done
      }
      /** @brief Write list chunk persistently e.g. to disk.
-Line 1331 
 namespace RIFF {
+Line 1496 
 namespace RIFF {
       * subchunks (including sub list chunks) will be stored recursively as
       * well.
       *
-      * @param ulWritePos - position within the "physical" file where this
+      * @param ullWritePos - position within the "physical" file where this
       *                     list chunk should be written to
-      * @param ulCurrentDataOffset - offset of current (old) data within
+      * @param ullCurrentDataOffset - offset of current (old) data within
       *                              the file
+      * @param pProgress - optional: callback function for progress notification
       * @returns new write position in the "physical" file, that is
-      *          \a ulWritePos incremented by this list chunk's new size
+      *          \a ullWritePos incremented by this list chunk's new size
       *          (including its header size of course)
       */
-     unsigned long List::WriteChunk(unsigned long ulWritePos, unsigned long ulCurrentDataOffset) {
+     file_offset_t List::WriteChunk(file_offset_t ullWritePos, file_offset_t ullCurrentDataOffset, progress_t* pProgress) {
-         const unsigned long ulOriginalPos = ulWritePos;
+         const file_offset_t ullOriginalPos = ullWritePos;
-         ulWritePos += LIST_HEADER_SIZE;
+         ullWritePos += LIST_HEADER_SIZE(pFile->FileOffsetSize);
          if (pFile->Mode != stream_mode_read_write)
              throw Exception("Cannot write list chunk, file has to be opened in read+write mode");
          // write all subchunks (including sub list chunks) recursively
          if (pSubChunks) {
-             for (ChunkList::iterator iter = pSubChunks->begin(), end = pSubChunks->end(); iter != end; ++iter) {
+             size_t i = 0;
-                 ulWritePos = (*iter)->WriteChunk(ulWritePos, ulCurrentDataOffset);
+             const size_t n = pSubChunks->size();
+             for (ChunkList::iterator iter = pSubChunks->begin(), end = pSubChunks->end(); iter != end; ++iter, ++i) {
+                 // divide local progress into subprogress for loading current Instrument
+                 progress_t subprogress;
+                 __divide_progress(pProgress, &subprogress, n, i);
+                 // do the actual work
+                 ullWritePos = (*iter)->WriteChunk(ullWritePos, ullCurrentDataOffset, &subprogress);
              }
          }
          // update this list chunk's header
-         CurrentChunkSize = NewChunkSize = ulWritePos - ulOriginalPos - LIST_HEADER_SIZE;
+         ullCurrentChunkSize = ullNewChunkSize = ullWritePos - ullOriginalPos - LIST_HEADER_SIZE(pFile->FileOffsetSize);
-         WriteHeader(ulOriginalPos);
+         WriteHeader(ullOriginalPos);
          // offset of this list chunk in new written file may have changed
-         ulStartPos = ulOriginalPos + LIST_HEADER_SIZE;
+         ullStartPos = ullOriginalPos + LIST_HEADER_SIZE(pFile->FileOffsetSize);
+          __notify_progress(pProgress, 1.0); // notify done
-         return ulWritePos;
+         return ullWritePos;
      }
      void List::__resetPos() {
-Line 1375 
 namespace RIFF {
+Line 1549 
 namespace RIFF {
      /**
       *  Returns string representation of the lists's id
       */
-     String List::GetListTypeString() {
+     String List::GetListTypeString() const {
          return convertToString(ListType);
      }
-Line 1384 
 namespace RIFF {
+Line 1558 
 namespace RIFF {
  // *************** File ***************
  // *
- //HACK: to avoid breaking DLL compatibility to older versions of libgig we roll the new std::set<Chunk*> into the old std::list<Chunk*> container, should be replaced on member variable level soon though
- #define _GET_RESIZED_CHUNKS() \
-         (reinterpret_cast<std::set<Chunk*>*>(ResizedChunks.front()))
      /** @brief Create new RIFF file.
       *
       * Use this constructor if you want to create a new RIFF file completely
-Line 1402 
 namespace RIFF {
+Line 1572 
 namespace RIFF {
       * @param FileType - four-byte identifier of the RIFF file type
       * @see AddSubChunk(), AddSubList(), SetByteOrder()
       */
-     File::File(uint32_t FileType) : List(this) {
+     File::File(uint32_t FileType)
-         //HACK: see _GET_RESIZED_CHUNKS() comment
+         : List(this), bIsNewFile(true), Layout(layout_standard),
-         ResizedChunks.push_back(reinterpret_cast<Chunk*>(new std::set<Chunk*>));
+           FileOffsetPreference(offset_size_auto)
+     {
          #if defined(WIN32)
          hFileRead = hFileWrite = INVALID_HANDLE_VALUE;
          #else
-Line 1412 
 namespace RIFF {
+Line 1583 
 namespace RIFF {
          #endif
          Mode = stream_mode_closed;
          bEndianNative = true;
-         ulStartPos = RIFF_HEADER_SIZE;
          ListType = FileType;
+         FileOffsetSize = 4;
+         ullStartPos = RIFF_HEADER_SIZE(FileOffsetSize);
      }
      /** @brief Load existing RIFF file.
-Line 1421 
 namespace RIFF {
+Line 1593 
 namespace RIFF {
       * Loads an existing RIFF file with all its chunks.
       *
       * @param path - path and file name of the RIFF file to open
-      * @throws RIFF::Exception if error occured while trying to load the
+      * @throws RIFF::Exception if error occurred while trying to load the
       *                         given RIFF file
       */
-     File::File(const String& path) : List(this), Filename(path) {
+     File::File(const String& path)
-        #if DEBUG
+         : List(this), Filename(path), bIsNewFile(false), Layout(layout_standard),
-        std::cout << "File::File("<<path<<")" << std::endl;
+           FileOffsetPreference(offset_size_auto)
-        #endif // DEBUG
+     {
+         #if DEBUG_RIFF
+         std::cout << "File::File("<<path<<")" << std::endl;
+         #endif // DEBUG_RIFF
+         bEndianNative = true;
+         FileOffsetSize = 4;
          try {
-             bEndianNative = true;
+             __openExistingFile(path);
-             //HACK: see _GET_RESIZED_CHUNKS() comment
-             ResizedChunks.push_back(reinterpret_cast<Chunk*>(new std::set<Chunk*>));
-             #if POSIX
-             hFileRead = hFileWrite = open(path.c_str(), O_RDONLY | O_NONBLOCK);
-             if (hFileRead <= 0) {
-                 hFileRead = hFileWrite = 0;
-                 throw RIFF::Exception("Can't open \"" + path + "\"");
-             }
-             #elif defined(WIN32)
-             hFileRead = hFileWrite = CreateFile(
-                                          path.c_str(), GENERIC_READ,
-                                          FILE_SHARE_READ | FILE_SHARE_WRITE,
-                                          NULL, OPEN_EXISTING,
-                                          FILE_ATTRIBUTE_NORMAL |
-                                          FILE_FLAG_RANDOM_ACCESS, NULL
-                                      );
-             if (hFileRead == INVALID_HANDLE_VALUE) {
-                 hFileRead = hFileWrite = INVALID_HANDLE_VALUE;
-                 throw RIFF::Exception("Can't open \"" + path + "\"");
-             }
-             #else
-             hFileRead = hFileWrite = fopen(path.c_str(), "rb");
-             if (!hFileRead) throw RIFF::Exception("Can't open \"" + path + "\"");
-             #endif // POSIX
-             Mode = stream_mode_read;
-             ulStartPos = RIFF_HEADER_SIZE;
-             ReadHeader(0);
              if (ChunkID != CHUNK_ID_RIFF && ChunkID != CHUNK_ID_RIFX) {
                  throw RIFF::Exception("Not a RIFF file");
              }
-Line 1467 
 namespace RIFF {
+Line 1617 
 namespace RIFF {
          }
      }
-     String File::GetFileName() {
+     /** @brief Load existing RIFF-like file.
+      *
+      * Loads an existing file, which is not a "real" RIFF file, but similar to
+      * an ordinary RIFF file.
+      *
+      * A "real" RIFF file contains at top level a List chunk either with chunk
+      * ID "RIFF" or "RIFX". The simple constructor above expects this to be
+      * case, and if it finds the toplevel List chunk to have another chunk ID
+      * than one of those two expected ones, it would throw an Exception and
+      * would refuse to load the file accordingly.
+      *
+      * Since there are however a lot of file formats which use the same simple
+      * principles of the RIFF format, with another toplevel List chunk ID
+      * though, you can use this alternative constructor here to be able to load
+      * and handle those files in the same way as you would do with "real" RIFF
+      * files.
+      *
+      * @param path - path and file name of the RIFF-alike file to be opened
+      * @param FileType - expected toplevel List chunk ID (this is the very
+      *                   first chunk found in the file)
+      * @param Endian - whether the file uses little endian or big endian layout
+      * @param layout - general file structure type
+      * @param fileOffsetSize - (optional) preference how to deal with large files
+      * @throws RIFF::Exception if error occurred while trying to load the
+      *                         given RIFF-alike file
+      */
+     File::File(const String& path, uint32_t FileType, endian_t Endian, layout_t layout, offset_size_t fileOffsetSize)
+         : List(this), Filename(path), bIsNewFile(false), Layout(layout),
+           FileOffsetPreference(fileOffsetSize)
+     {
+         SetByteOrder(Endian);
+         if (fileOffsetSize < offset_size_auto || fileOffsetSize > offset_size_64bit)
+             throw Exception("Invalid RIFF::offset_size_t");
+         FileOffsetSize = 4;
+         try {
+             __openExistingFile(path, &FileType);
+         }
+         catch (...) {
+             Cleanup();
+             throw;
+         }
+     }
+     /**
+      * Opens an already existing RIFF file or RIFF-alike file. This method
+      * shall only be called once (in a File class constructor).
+      *
+      * @param path - path and file name of the RIFF file or RIFF-alike file to
+      *               be opened
+      * @param FileType - (optional) expected chunk ID of first chunk in file
+      * @throws RIFF::Exception if error occurred while trying to load the
+      *                         given RIFF file or RIFF-alike file
+      */
+     void File::__openExistingFile(const String& path, uint32_t* FileType) {
+         #if POSIX
+         hFileRead = hFileWrite = open(path.c_str(), O_RDONLY | O_NONBLOCK);
+         if (hFileRead == -1) {
+             hFileRead = hFileWrite = 0;
+             String sError = strerror(errno);
+             throw RIFF::Exception("Can't open \"" + path + "\": " + sError);
+         }
+         #elif defined(WIN32)
+         hFileRead = hFileWrite = CreateFile(
+                                      path.c_str(), GENERIC_READ,
+                                      FILE_SHARE_READ | FILE_SHARE_WRITE,
+                                      NULL, OPEN_EXISTING,
+                                      FILE_ATTRIBUTE_NORMAL |
+                                      FILE_FLAG_RANDOM_ACCESS, NULL
+                                  );
+         if (hFileRead == INVALID_HANDLE_VALUE) {
+             hFileRead = hFileWrite = INVALID_HANDLE_VALUE;
+             throw RIFF::Exception("Can't open \"" + path + "\"");
+         }
+         #else
+         hFileRead = hFileWrite = fopen(path.c_str(), "rb");
+         if (!hFileRead) throw RIFF::Exception("Can't open \"" + path + "\"");
+         #endif // POSIX
+         Mode = stream_mode_read;
+         // determine RIFF file offset size to be used (in RIFF chunk headers)
+         // according to the current file offset preference
+         FileOffsetSize = FileOffsetSizeFor(GetCurrentFileSize());
+         switch (Layout) {
+             case layout_standard: // this is a normal RIFF file
+                 ullStartPos = RIFF_HEADER_SIZE(FileOffsetSize);
+                 ReadHeader(0);
+                 if (FileType && ChunkID != *FileType)
+                     throw RIFF::Exception("Invalid file container ID");
+                 break;
+             case layout_flat: // non-standard RIFF-alike file
+                 ullStartPos = 0;
+                 ullNewChunkSize = ullCurrentChunkSize = GetCurrentFileSize();
+                 if (FileType) {
+                     uint32_t ckid;
+                     if (Read(&ckid, 4, 1) != 4) {
+                         throw RIFF::Exception("Invalid file header ID (premature end of header)");
+                     } else if (ckid != *FileType) {
+                         String s = " (expected '" + convertToString(*FileType) + "' but got '" + convertToString(ckid) + "')";
+                         throw RIFF::Exception("Invalid file header ID" + s);
+                     }
+                     SetPos(0); // reset to first byte of file
+                 }
+                 LoadSubChunks();
+                 break;
+         }
+     }
+     String File::GetFileName() const {
          return Filename;
      }
+     void File::SetFileName(const String& path) {
+         Filename = path;
+     }
-     stream_mode_t File::GetMode() {
+     stream_mode_t File::GetMode() const {
          return Mode;
      }
+     layout_t File::GetLayout() const {
+         return Layout;
+     }
      /** @brief Change file access mode.
       *
       * Changes files access mode either to read-only mode or to read/write
-Line 1492 
 namespace RIFF {
+Line 1758 
 namespace RIFF {
                      #if POSIX
                      if (hFileRead) close(hFileRead);
                      hFileRead = hFileWrite = open(Filename.c_str(), O_RDONLY | O_NONBLOCK);
-                     if (hFileRead < 0) {
+                     if (hFileRead == -1) {
                          hFileRead = hFileWrite = 0;
-                         throw Exception("Could not (re)open file \"" + Filename + "\" in read mode");
+                         String sError = strerror(errno);
+                         throw Exception("Could not (re)open file \"" + Filename + "\" in read mode: " + sError);
                      }
                      #elif defined(WIN32)
                      if (hFileRead != INVALID_HANDLE_VALUE) CloseHandle(hFileRead);
-Line 1521 
 namespace RIFF {
+Line 1788 
 namespace RIFF {
                      #if POSIX
                      if (hFileRead) close(hFileRead);
                      hFileRead = hFileWrite = open(Filename.c_str(), O_RDWR | O_NONBLOCK);
-                     if (hFileRead < 0) {
+                     if (hFileRead == -1) {
                          hFileRead = hFileWrite = open(Filename.c_str(), O_RDONLY | O_NONBLOCK);
-                         throw Exception("Could not open file \"" + Filename + "\" in read+write mode");
+                         String sError = strerror(errno);
+                         throw Exception("Could not open file \"" + Filename + "\" in read+write mode: " + sError);
                      }
                      #elif defined(WIN32)
                      if (hFileRead != INVALID_HANDLE_VALUE) CloseHandle(hFileRead);
-Line 1561 
 namespace RIFF {
+Line 1829 
 namespace RIFF {
                      #if POSIX
                      if (hFileRead)  close(hFileRead);
                      if (hFileWrite) close(hFileWrite);
+                     hFileRead = hFileWrite = 0;
                      #elif defined(WIN32)
                      if (hFileRead  != INVALID_HANDLE_VALUE) CloseHandle(hFileRead);
                      if (hFileWrite != INVALID_HANDLE_VALUE) CloseHandle(hFileWrite);
+                     hFileRead = hFileWrite = INVALID_HANDLE_VALUE;
                      #else
                      if (hFileRead)  fclose(hFileRead);
                      if (hFileWrite) fclose(hFileWrite);
+                     hFileRead = hFileWrite = NULL;
                      #endif
-                     hFileRead = hFileWrite = 0;
                      break;
                  default:
                      throw Exception("Unknown file access mode");
-Line 1599 
 namespace RIFF {
+Line 1869 
 namespace RIFF {
      /** @brief Save changes to same file.
       *
       * Make all changes of all chunks persistent by writing them to the
-      * actual (same) file. The file might temporarily grow to a higher size
+      * actual (same) file.
-      * than it will have at the end of the saving process, in case chunks
-      * were grown.
       *
+      * @param pProgress - optional: callback function for progress notification
       * @throws RIFF::Exception if there is an empty chunk or empty list
-      *                         chunk or any kind of IO error occured
+      *                         chunk or any kind of IO error occurred
       */
-     void File::Save() {
+     void File::Save(progress_t* pProgress) {
+         //TODO: implementation for the case where first chunk is not a global container (List chunk) is not implemented yet (i.e. Korg files)
+         if (Layout == layout_flat)
+             throw Exception("Saving a RIFF file with layout_flat is not implemented yet");
          // make sure the RIFF tree is built (from the original file)
-         LoadSubChunksRecursively();
+         {
+             // divide progress into subprogress
+             progress_t subprogress;
+             __divide_progress(pProgress, &subprogress, 3.f, 0.f); // arbitrarily subdivided into 1/3 of total progress
+             // do the actual work
+             LoadSubChunksRecursively(&subprogress);
+             // notify subprogress done
+             __notify_progress(&subprogress, 1.f);
+         }
          // reopen file in write mode
          SetMode(stream_mode_read_write);
+         // get the current file size as it is now still physically stored on disk
+         const file_offset_t workingFileSize = GetCurrentFileSize();
+         // get the overall file size required to save this file
+         const file_offset_t newFileSize = GetRequiredFileSize(FileOffsetPreference);
+         // determine whether this file will yield in a large file (>=4GB) and
+         // the RIFF file offset size to be used accordingly for all chunks
+         FileOffsetSize = FileOffsetSizeFor(newFileSize);
          // to be able to save the whole file without loading everything into
          // RAM and without having to store the data in a temporary file, we
-         // enlarge the file with the sum of all _positive_ chunk size
+         // enlarge the file with the overall positive file size change,
-         // changes, move current data towards the end of the file with the
+         // then move current data towards the end of the file by the calculated
-         // calculated sum and finally update / rewrite the file by copying
+         // positive file size difference and finally update / rewrite the file
-         // the old data back to the right position at the beginning of the file
+         // by copying the old data back to the right position at the beginning
+         // of the file
-         // first we sum up all positive chunk size changes (and skip all negative ones)
-         unsigned long ulPositiveSizeDiff = 0;
-         std::set<Chunk*>* resizedChunks = _GET_RESIZED_CHUNKS();
-         for (std::set<Chunk*>::const_iterator iter = resizedChunks->begin(), end = resizedChunks->end(); iter != end; ++iter) {
-             if ((*iter)->GetNewSize() == 0) {
-                 throw Exception("There is at least one empty chunk (zero size): " + __resolveChunkPath(*iter));
-             }
-             unsigned long newSizePadded = (*iter)->GetNewSize() + (*iter)->GetNewSize() % 2;
-             unsigned long oldSizePadded = (*iter)->GetSize() + (*iter)->GetSize() % 2;
-             if (newSizePadded > oldSizePadded) ulPositiveSizeDiff += newSizePadded - oldSizePadded;
-         }
-         unsigned long ulWorkingFileSize = GetFileSize();
          // if there are positive size changes...
-         if (ulPositiveSizeDiff > 0) {
+         file_offset_t positiveSizeDiff = 0;
+         if (newFileSize > workingFileSize) {
+             positiveSizeDiff = newFileSize - workingFileSize;
+             // divide progress into subprogress
+             progress_t subprogress;
+             __divide_progress(pProgress, &subprogress, 3.f, 1.f); // arbitrarily subdivided into 1/3 of total progress
              // ... we enlarge this file first ...
-             ulWorkingFileSize += ulPositiveSizeDiff;
+             ResizeFile(newFileSize);
-             ResizeFile(ulWorkingFileSize);
              // ... and move current data by the same amount towards end of file.
              int8_t* pCopyBuffer = new int8_t[4096];
-             const unsigned long ulFileSize = GetSize() + RIFF_HEADER_SIZE;
              #if defined(WIN32)
              DWORD iBytesMoved = 1; // we have to pass it via pointer to the Windows API, thus the correct size must be ensured
              #else
-             int iBytesMoved = 1;
+             ssize_t iBytesMoved = 1;
              #endif
-             for (unsigned long ulPos = ulFileSize; iBytesMoved > 0; ) {
+             for (file_offset_t ullPos = workingFileSize, iNotif = 0; iBytesMoved > 0; ++iNotif) {
-                 iBytesMoved = (ulPos < 4096) ? ulPos : 4096;
+                 iBytesMoved = (ullPos < 4096) ? ullPos : 4096;
-                 ulPos -= iBytesMoved;
+                 ullPos -= iBytesMoved;
                  #if POSIX
-                 lseek(hFileRead, ulPos, SEEK_SET);
+                 lseek(hFileRead, ullPos, SEEK_SET);
                  iBytesMoved = read(hFileRead, pCopyBuffer, iBytesMoved);
-                 lseek(hFileWrite, ulPos + ulPositiveSizeDiff, SEEK_SET);
+                 lseek(hFileWrite, ullPos + positiveSizeDiff, SEEK_SET);
                  iBytesMoved = write(hFileWrite, pCopyBuffer, iBytesMoved);
                  #elif defined(WIN32)
-                 SetFilePointer(hFileRead, ulPos, NULL/*32 bit*/, FILE_BEGIN);
+                 LARGE_INTEGER liFilePos;
+                 liFilePos.QuadPart = ullPos;
+                 SetFilePointerEx(hFileRead, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN);
                  ReadFile(hFileRead, pCopyBuffer, iBytesMoved, &iBytesMoved, NULL);
-                 SetFilePointer(hFileWrite, ulPos + ulPositiveSizeDiff, NULL/*32 bit*/, FILE_BEGIN);
+                 liFilePos.QuadPart = ullPos + positiveSizeDiff;
+                 SetFilePointerEx(hFileWrite, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN);
                  WriteFile(hFileWrite, pCopyBuffer, iBytesMoved, &iBytesMoved, NULL);
                  #else
-                 fseek(hFileRead, ulPos, SEEK_SET);
+                 fseeko(hFileRead, ullPos, SEEK_SET);
                  iBytesMoved = fread(pCopyBuffer, 1, iBytesMoved, hFileRead);
-                 fseek(hFileWrite, ulPos + ulPositiveSizeDiff, SEEK_SET);
+                 fseeko(hFileWrite, ullPos + positiveSizeDiff, SEEK_SET);
                  iBytesMoved = fwrite(pCopyBuffer, 1, iBytesMoved, hFileWrite);
                  #endif
+                 if (!(iNotif % 8) && iBytesMoved > 0)
+                     __notify_progress(&subprogress, float(workingFileSize - ullPos) / float(workingFileSize));
              }
              delete[] pCopyBuffer;
              if (iBytesMoved < 0) throw Exception("Could not modify file while trying to enlarge it");
+             __notify_progress(&subprogress, 1.f); // notify subprogress done
          }
-         // rebuild / rewrite complete RIFF tree
+         // rebuild / rewrite complete RIFF tree ...
-         unsigned long ulTotalSize  = WriteChunk(0, ulPositiveSizeDiff);
-         unsigned long ulActualSize = __GetFileSize(hFileWrite);
+         // divide progress into subprogress
+         progress_t subprogress;
+         __divide_progress(pProgress, &subprogress, 3.f, 2.f); // arbitrarily subdivided into 1/3 of total progress
+         // do the actual work
+         const file_offset_t finalSize = WriteChunk(0, positiveSizeDiff, &subprogress);
+         const file_offset_t finalActualSize = __GetFileSize(hFileWrite);
+         // notify subprogress done
+         __notify_progress(&subprogress, 1.f);
          // resize file to the final size
-         if (ulTotalSize < ulActualSize) ResizeFile(ulTotalSize);
+         if (finalSize < finalActualSize) ResizeFile(finalSize);
-         // forget all resized chunks
+         __notify_progress(pProgress, 1.0); // notify done
-         resizedChunks->clear();
      }
      /** @brief Save changes to another file.
-Line 1694 
 namespace RIFF {
+Line 1991 
 namespace RIFF {
       * the new file (given by \a path) afterwards.
       *
       * @param path - path and file name where everything should be written to
+      * @param pProgress - optional: callback function for progress notification
       */
-     void File::Save(const String& path) {
+     void File::Save(const String& path, progress_t* pProgress) {
          //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: implementation for the case where first chunk is not a global container (List chunk) is not implemented yet (i.e. Korg files)
+         if (Layout == layout_flat)
+             throw Exception("Saving a RIFF file with layout_flat is not implemented yet");
          // make sure the RIFF tree is built (from the original file)
-         LoadSubChunksRecursively();
+         {
+             // divide progress into subprogress
+             progress_t subprogress;
+             __divide_progress(pProgress, &subprogress, 2.f, 0.f); // arbitrarily subdivided into 1/2 of total progress
+             // do the actual work
+             LoadSubChunksRecursively(&subprogress);
+             // notify subprogress done
+             __notify_progress(&subprogress, 1.f);
+         }
-         if (Filename.length() > 0) SetMode(stream_mode_read);
+         if (!bIsNewFile) SetMode(stream_mode_read);
          // open the other (new) file for writing and truncate it to zero size
          #if POSIX
          hFileWrite = open(path.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP);
-         if (hFileWrite < 0) {
+         if (hFileWrite == -1) {
              hFileWrite = hFileRead;
-             throw Exception("Could not open file \"" + path + "\" for writing");
+             String sError = strerror(errno);
+             throw Exception("Could not open file \"" + path + "\" for writing: " + sError);
          }
          #elif defined(WIN32)
          hFileWrite = CreateFile(
-Line 1728 
 namespace RIFF {
+Line 2039 
 namespace RIFF {
          #endif // POSIX
          Mode = stream_mode_read_write;
+         // get the overall file size required to save this file
+         const file_offset_t newFileSize = GetRequiredFileSize(FileOffsetPreference);
+         // determine whether this file will yield in a large file (>=4GB) and
+         // the RIFF file offset size to be used accordingly for all chunks
+         FileOffsetSize = FileOffsetSizeFor(newFileSize);
          // write complete RIFF tree to the other (new) file
-         unsigned long ulTotalSize  = WriteChunk(0, 0);
+         file_offset_t ullTotalSize;
-         unsigned long ulActualSize = __GetFileSize(hFileWrite);
+         {
+             // divide progress into subprogress
+             progress_t subprogress;
+             __divide_progress(pProgress, &subprogress, 2.f, 1.f); // arbitrarily subdivided into 1/2 of total progress
+             // do the actual work
+             ullTotalSize = WriteChunk(0, 0, &subprogress);
+             // notify subprogress done
+             __notify_progress(&subprogress, 1.f);
+         }
+         file_offset_t ullActualSize = __GetFileSize(hFileWrite);
          // resize file to the final size (if the file was originally larger)
-         if (ulTotalSize < ulActualSize) ResizeFile(ulTotalSize);
+         if (ullActualSize > ullTotalSize) ResizeFile(ullTotalSize);
-         // forget all resized chunks
-         _GET_RESIZED_CHUNKS()->clear();
          #if POSIX
          if (hFileWrite) close(hFileWrite);
-Line 1749 
 namespace RIFF {
+Line 2073 
 namespace RIFF {
          // associate new file with this File object from now on
          Filename = path;
+         bIsNewFile = false;
          Mode = (stream_mode_t) -1;       // Just set it to an undefined mode ...
          SetMode(stream_mode_read_write); // ... so SetMode() has to reopen the file handles.
+         __notify_progress(pProgress, 1.0); // notify done
      }
-     void File::ResizeFile(unsigned long ulNewSize) {
+     void File::ResizeFile(file_offset_t ullNewSize) {
          #if POSIX
-         if (ftruncate(hFileWrite, ulNewSize) < 0)
+         if (ftruncate(hFileWrite, ullNewSize) < 0)
              throw Exception("Could not resize file \"" + Filename + "\"");
          #elif defined(WIN32)
+         LARGE_INTEGER liFilePos;
+         liFilePos.QuadPart = ullNewSize;
          if (
-             SetFilePointer(hFileWrite, ulNewSize, NULL/*32 bit*/, FILE_BEGIN) == INVALID_SET_FILE_POINTER ||
+             !SetFilePointerEx(hFileWrite, liFilePos, NULL/*new pos pointer*/, FILE_BEGIN) ||
              !SetEndOfFile(hFileWrite)
          ) throw Exception("Could not resize file \"" + Filename + "\"");
          #else
-Line 1769 
 namespace RIFF {
+Line 2098 
 namespace RIFF {
      }
      File::~File() {
-        #if DEBUG
+         #if DEBUG_RIFF
-        std::cout << "File::~File()" << std::endl;
+         std::cout << "File::~File()" << std::endl;
-        #endif // DEBUG
+         #endif // DEBUG_RIFF
          Cleanup();
      }
+     /**
+      * Returns @c true if this file has been created new from scratch and
+      * has not been stored to disk yet.
+      */
+     bool File::IsNew() const {
+         return bIsNewFile;
+     }
      void File::Cleanup() {
          #if POSIX
          if (hFileRead) close(hFileRead);
-Line 1785 
 namespace RIFF {
+Line 2122 
 namespace RIFF {
          #endif // POSIX
          DeleteChunkList();
          pFile = NULL;
-         //HACK: see _GET_RESIZED_CHUNKS() comment
-         delete _GET_RESIZED_CHUNKS();
      }
-     void File::LogAsResized(Chunk* pResizedChunk) {
+     /**
-         _GET_RESIZED_CHUNKS()->insert(pResizedChunk);
+      * Returns the current size of this file (in bytes) as it is currently
+      * yet stored on disk. If this file does not yet exist on disk (i.e. when
+      * this RIFF File has just been created from scratch and Save() has not
+      * been called yet) then this method returns 0.
+      */
+     file_offset_t File::GetCurrentFileSize() const {
+         file_offset_t size = 0;
+         try {
+             size = __GetFileSize(hFileRead);
+         } catch (...) {
+             size = 0;
+         }
+         return size;
+     }
+     /**
+      * Returns the required size (in bytes) for this RIFF File to be saved to
+      * disk. The precise size of the final file on disk depends on the RIFF
+      * file offset size actually used internally in all headers of the RIFF
+      * chunks. By default libgig handles the required file offset size
+      * automatically for you; that means it is using 32 bit offsets for files
+      * smaller than 4 GB and 64 bit offsets for files equal or larger than
+      * 4 GB. You may however also override this default behavior by passing the
+      * respective option to the RIFF File constructor to force one particular
+      * offset size. In the latter case this method will return the file size
+      * for the requested forced file offset size that will be used when calling
+      * Save() later on.
+      *
+      * You may also use the overridden method below to get the file size for
+      * an arbitrary other file offset size instead.
+      *
+      * @see offset_size_t
+      * @see GetFileOffsetSize()
+      */
+     file_offset_t File::GetRequiredFileSize() {
+         return GetRequiredFileSize(FileOffsetPreference);
+     }
+     /**
+      * Returns the rquired size (in bytes) for this RIFF file to be saved to
+      * disk, assuming the passed @a fileOffsestSize would be used for the
+      * Save() operation.
+      *
+      * This overridden method essentialy behaves like the above method, with
+      * the difference that you must provide a specific RIFF @a fileOffsetSize
+      * for calculating the theoretical final file size.
+      *
+      * @see GetFileOffsetSize()
+      */
+     file_offset_t File::GetRequiredFileSize(offset_size_t fileOffsetSize) {
+         switch (fileOffsetSize) {
+             case offset_size_auto: {
+                 file_offset_t fileSize = GetRequiredFileSize(offset_size_32bit);
+                 if (fileSize >> 32)
+                     return GetRequiredFileSize(offset_size_64bit);
+                 else
+                     return fileSize;
+             }
+             case offset_size_32bit: break;
+             case offset_size_64bit: break;
+             default: throw Exception("Internal error: Invalid RIFF::offset_size_t");
+         }
+         return RequiredPhysicalSize(FileOffsetSize);
+     }
+     int File::FileOffsetSizeFor(file_offset_t fileSize) const {
+         switch (FileOffsetPreference) {
+             case offset_size_auto:
+                 return (fileSize >> 32) ? 8 : 4;
+             case offset_size_32bit:
+                 return 4;
+             case offset_size_64bit:
+                 return 8;
+             default:
+                 throw Exception("Internal error: Invalid RIFF::offset_size_t");
+         }
      }
-     void File::UnlogResized(Chunk* pResizedChunk) {
+     /**
-         _GET_RESIZED_CHUNKS()->erase(pResizedChunk);
+      * Returns the current size (in bytes) of file offsets stored in the
+      * headers of all chunks of this file.
+      *
+      * Most RIFF files are using 32 bit file offsets internally, which limits
+      * them to a maximum file size of less than 4 GB though. In contrast to the
+      * common standard, this RIFF File class implementation supports handling of
+      * RIFF files equal or larger than 4 GB. In such cases 64 bit file offsets
+      * have to be used in all headers of all RIFF Chunks when being stored to a
+      * physical file. libgig by default automatically selects the correct file
+      * offset size for you. You may however also force one particular file
+      * offset size by supplying the respective option to the RIFF::File
+      * constructor.
+      *
+      * This method can be used to check which RIFF file offset size is currently
+      * being used for this RIFF File.
+      *
+      * @returns current RIFF file offset size used (in bytes)
+      * @see offset_size_t
+      */
+     int File::GetFileOffsetSize() const {
+         return FileOffsetSize;
      }
-     unsigned long File::GetFileSize() {
+     /**
-         return __GetFileSize(hFileRead);
+      * Returns the required size (in bytes) of file offsets stored in the
+      * headers of all chunks of this file if the current RIFF tree would be
+      * saved to disk by calling Save().
+      *
+      * See GetFileOffsetSize() for mor details about RIFF file offsets.
+      *
+      * @returns RIFF file offset size required (in bytes) if being saved
+      * @see offset_size_t
+      */
+     int File::GetRequiredFileOffsetSize() {
+         return FileOffsetSizeFor(GetCurrentFileSize());
      }
      #if POSIX
-     unsigned long File::__GetFileSize(int hFile) {
+     file_offset_t File::__GetFileSize(int hFile) const {
          struct stat filestat;
-         fstat(hFile, &filestat);
+         if (fstat(hFile, &filestat) == -1)
-         long size = filestat.st_size;
+             throw Exception("POSIX FS error: could not determine file size");
-         return size;
+         return filestat.st_size;
      }
      #elif defined(WIN32)
-     unsigned long File::__GetFileSize(HANDLE hFile) {
+     file_offset_t File::__GetFileSize(HANDLE hFile) const {
-         DWORD dwSize = ::GetFileSize(hFile, NULL /*32bit*/);
+         LARGE_INTEGER size;
-         if (dwSize == INVALID_FILE_SIZE)
+         if (!GetFileSizeEx(hFile, &size))
              throw Exception("Windows FS error: could not determine file size");
-         return dwSize;
+         return size.QuadPart;
      }
      #else // standard C functions
-     unsigned long File::__GetFileSize(FILE* hFile) {
+     file_offset_t File::__GetFileSize(FILE* hFile) const {
-         long curpos = ftell(hFile);
+         off_t curpos = ftello(hFile);
-         fseek(hFile, 0, SEEK_END);
+         if (fseeko(hFile, 0, SEEK_END) == -1)
-         long size = ftell(hFile);
+             throw Exception("FS error: could not determine file size");
-         fseek(hFile, curpos, SEEK_SET);
+         off_t size = ftello(hFile);
+         fseeko(hFile, curpos, SEEK_SET);
          return size;
      }
      #endif
-Line 1829 
 namespace RIFF {
+Line 2270 
 namespace RIFF {
  // *************** Exception ***************
  // *
+     Exception::Exception() {
+     }
+     Exception::Exception(String format, ...) {
+         va_list arg;
+         va_start(arg, format);
+         Message = assemble(format, arg);
+         va_end(arg);
+     }
+     Exception::Exception(String format, va_list arg) {
+         Message = assemble(format, arg);
+     }
      void Exception::PrintMessage() {
          std::cout << "RIFF::Exception: " << Message << std::endl;
      }
+     String Exception::assemble(String format, va_list arg) {
+         char* buf = NULL;
+         vasprintf(&buf, format.c_str(), arg);
+         String s = buf;
+         free(buf);
+         return s;
+     }
  // *************** functions ***************
  // *

 Legend:



Removed from v.2155
 


changed lines


 
Added in v.3478
 Legend:



Removed from v.2155
 


changed lines


 
Added in v.3478
-Removed from v.2155
+Added in v.3478

	ViewVC Help
Powered by ViewVC