Merge branch 'master' into large_archive

[SFmpqapi.git] / SFmpqapi.cpp

diff --git a/SFmpqapi.cpp b/SFmpqapi.cpp
index e527cda..694d730 100644 (file)
--- a/SFmpqapi.cpp
+++ b/SFmpqapi.cpp
@@ -1114,21 +1114,18 @@ DWORD SFMPQAPI WINAPI SFileSetFilePointer(MPQHANDLE hFile, LONG lDistanceToMove,
                long fsz = mpqOpenFile->lpBlockEntry->dwFullSize;
                long cpos = mpqOpenFile->dwFilePointer;
                switch (dwMoveMethod) {
-               case FILE_BEGIN:
-                       if (lDistanceToMove<0 || lDistanceToMove>fsz) return (DWORD)-1;
-                       mpqOpenFile->dwFilePointer = lDistanceToMove;
-                       break;
                case FILE_CURRENT:
-                       if (lDistanceToMove<cpos || cpos+lDistanceToMove>fsz) return (DWORD)-1;
+                       if (cpos + lDistanceToMove < 0 || cpos + lDistanceToMove > fsz) return (DWORD)-1;
                        mpqOpenFile->dwFilePointer += lDistanceToMove;
                        break;
 
                case FILE_END:
-                       if (lDistanceToMove<fsz || lDistanceToMove>0) return (DWORD)-1;
-                       mpqOpenFile->dwFilePointer = fsz+lDistanceToMove;
+                       if (fsz + lDistanceToMove < 0 || lDistanceToMove > 0) return (DWORD)-1;
+                       mpqOpenFile->dwFilePointer = fsz + lDistanceToMove;
                        break;
+               case FILE_BEGIN:
                default:
-                       if (lDistanceToMove<0 || lDistanceToMove>fsz) return (DWORD)-1;
+                       if (lDistanceToMove < 0 || lDistanceToMove > fsz) return (DWORD)-1;
                        mpqOpenFile->dwFilePointer = lDistanceToMove;
                }
                if (lplDistanceToMoveHigh!=0) *lplDistanceToMoveHigh = 0;
@@ -2559,13 +2556,14 @@ BOOL SFMPQAPI WINAPI MpqCompactArchive(MPQHANDLE hMPQ)
        HANDLE hFile = CreateFile(lpFileName,GENERIC_READ|GENERIC_WRITE,0,0,CREATE_NEW,0,0);
        UInt64 i;
        if (hFile==INVALID_HANDLE_VALUE) {
-               for (i=0;i<10000;i++) {
-                       sprintf(lpFileName,"%s.compact.%04d",mpqOpenArc->lpFileName,i);
+               int filenum = 0;
+               for (filenum=0;filenum<10000;filenum++) {
+                       sprintf(lpFileName,"%s.compact.%04d",mpqOpenArc->lpFileName,filenum);
 
                        hFile = CreateFile(lpFileName,GENERIC_READ|GENERIC_WRITE,0,0,CREATE_NEW,0,0);
                        if (hFile!=INVALID_HANDLE_VALUE) break;
                }
-               if (i==10000) return FALSE;
+               if (filenum==10000) return FALSE;
        }
        UInt64 qwLastOffset = mpqOpenArc->dwHeaderSize;
        DWORD tsz;
@@ -3134,16 +3132,19 @@ MPQHANDLE GetFreeHashTableEntry(MPQHANDLE hMPQ, LPCSTR lpFileName, LCID FileLoca
        DWORD i=dwTablePos, nFirstFree = 0xFFFFFFFF;
        do
        {
-               if ((mpqOpenArc->lpHashTable[i].dwBlockTableIndex&0xFFFFFFFE)==0xFFFFFFFE && (nFirstFree == 0xFFFFFFFF || mpqOpenArc->lpHashTable[i].dwBlockTableIndex == 0xFFFFFFFF))
+               if ((mpqOpenArc->lpHashTable[i].dwBlockTableIndex&0xFFFFFFFE)==0xFFFFFFFE)
                {
-                       if (mpqOpenArc->lpHashTable[i].dwBlockTableIndex == 0xFFFFFFFF)
+                       if (nFirstFree == 0xFFFFFFFF || mpqOpenArc->lpHashTable[i].dwBlockTableIndex == 0xFFFFFFFF)
                        {
-                               if (nFirstFree == 0xFFFFFFFF)
-                                       return (MPQHANDLE)&mpqOpenArc->lpHashTable[i];
-                               else
-                                       return (MPQHANDLE)&mpqOpenArc->lpHashTable[nFirstFree];
+                               if (mpqOpenArc->lpHashTable[i].dwBlockTableIndex == 0xFFFFFFFF)
+                               {
+                                       if (nFirstFree == 0xFFFFFFFF)
+                                               return (MPQHANDLE)&mpqOpenArc->lpHashTable[i];
+                                       else
+                                               return (MPQHANDLE)&mpqOpenArc->lpHashTable[nFirstFree];
+                               }
+                               else nFirstFree = i;
                        }
-                       else nFirstFree = i;
                }
                else if (mpqOpenArc->lpHashTable[i].dwNameHashA==dwNameHashA && mpqOpenArc->lpHashTable[i].dwNameHashB==dwNameHashB && mpqOpenArc->lpHashTable[i].lcLocale==FileLocale)
                {
@@ -3156,6 +3157,8 @@ MPQHANDLE GetFreeHashTableEntry(MPQHANDLE hMPQ, LPCSTR lpFileName, LCID FileLoca
                }
                i = (i + 1) % mpqOpenArc->MpqHeader.dwHashTableSize;
        } while (i!=dwTablePos);
+       if (nFirstFree != 0xFFFFFFFF)
+               return (MPQHANDLE)&mpqOpenArc->lpHashTable[nFirstFree];
        SetLastError(MPQ_ERROR_HASH_TABLE_FULL);
        return 0;
 }