X-Git-Url: https://sfsrealm.hopto.org/projects/gitweb.cgi?p=SFmpqapi.git;a=blobdiff_plain;f=SFmpqapi.cpp;fp=SFmpqapi.cpp;h=56cca21b1c4fe1d1567d60ab35b50e8eb5f1edf0;hp=faf2701904a1232e928bb361d115def454eb3811;hb=6d1c48f704d39efdcffdfc10665bdf95113e3477;hpb=a9570bb3ec72a45f97b433a43807de356120625a

diff --git a/SFmpqapi.cpp b/SFmpqapi.cpp
old mode 100644
new mode 100755
index faf2701..56cca21
--- 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;