Fix mode for files in repository

[SFmpqapi.git] / SFmpqapi.cpp

diff --git a/SFmpqapi.cpp b/SFmpqapi.cpp
index db69b60..56cca21 100644 (file)
--- a/SFmpqapi.cpp
+++ b/SFmpqapi.cpp
@@ -1136,21 +1136,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;
@@ -2187,6 +2184,7 @@ BOOL SFMPQAPI WINAPI MpqAddFileFromBufferEx(MPQHANDLE hMPQ, LPVOID lpBuffer, DWO
                        if (i==TotalBlocks-1 && (ucfsz % blockSize)!=0) blockSize=ucfsz % blockSize;
                        DWORD outLength=blockSize;
                        BYTE *compdata = compbuffer;
+                       char *oldoutbuffer = outbuffer;
                        if (dwFlags & MAFA_COMPRESS)
                        {
                                memcpy(compdata,(char *)buffer+CurPos,blockSize);
@@ -2233,6 +2231,7 @@ BOOL SFMPQAPI WINAPI MpqAddFileFromBufferEx(MPQHANDLE hMPQ, LPVOID lpBuffer, DWO
                                memcpy((char *)newbuffer+LastOffset,outbuffer,outLength);
                                LastOffset+=outLength;
                        }
+                       outbuffer = oldoutbuffer;
                        CurPos += blockSize;
                }
                fsz = LastOffset;