Merge branch 'master' into large_archive large_archive

diff --cc SFUtil.cpp
index 4a97b31,c5af68e..e9fffcd
--- 1/SFUtil.cpp
--- 2/SFUtil.cpp
+++ b/SFUtil.cpp
@@@ -58,14 -58,18 +58,18 @@@ UInt64 SFSetFilePointer(HANDLE hFile, I
  
        FilePos.i64 = nDistance;
  
 -      FilePos.i32[0] = ::SetFilePointer(hFile, FilePos.i32[0], &FilePos.i32[1], dwMoveMethod);
 +      FilePos.ui32[0] = ::SetFilePointer(hFile, FilePos.i32[0], &FilePos.i32[1], dwMoveMethod);
  
+ #ifdef INVALID_SET_FILE_POINTER
        if (FilePos.ui32[0] == INVALID_SET_FILE_POINTER) {
+ #else
+       if (FilePos.ui32[0] == INVALID_FILE_SIZE) {
+ #endif
                if (::GetLastError() != NO_ERROR)
 -                      return -1;
 +                      return (UInt64)-1;
        }
  
 -      return FilePos.i64;
 +      return FilePos.ui64;
  }
  
  size_t strlnlen(const char *strline)

diff --cc SFmpqapi.cpp
Simple merge