walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-Fixed a lot of the file functions error handling. Many were handling 

success as failure, etc...
-File position is 0 based, EOF was being tested as though position was
 1 based.
-All file i/o and archive i/o functions tested okay with physfs_test app.
This commit is contained in:
Gregory S. Read 2002-05-08 00:02:35 +00:00
parent c06e3ca30b
commit d3dfd7f464
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
platform/win32.c
View File

@ -471,9 +471,8 @@ int __PHYSFS_platformInit(void)
return 0; return 0;
} }
/* TODO - Probably want to change this to something like the basedir */ /* Default profile directory is the exe path */
/* Default profile directory */ ProfileDirectory = getExePath(NULL);
ProfileDirectory = "C:\\";
#ifndef DISABLE_NT_SUPPORT #ifndef DISABLE_NT_SUPPORT
/* If running an NT system (NT/Win2k/XP, etc...) */ /* If running an NT system (NT/Win2k/XP, etc...) */
@ -657,19 +656,19 @@ PHYSFS_sint64 __PHYSFS_platformTell(void *opaque)
/* Get current position */ /* Get current position */
if(((LowOrderPos = SetFilePointer(FileHandle, 0, &HighOrderPos, FILE_CURRENT)) if(((LowOrderPos = SetFilePointer(FileHandle, 0, &HighOrderPos, FILE_CURRENT))
== INVALID_SET_FILE_POINTER) && (GetLastError() != NO_ERROR)) == INVALID_SET_FILE_POINTER) && (GetLastError() != NO_ERROR))
{
/* Combine the high/low order to create the 64-bit position value */
retval = HighOrderPos;
retval = retval << 32;
retval |= LowOrderPos;
}
else
{ {
/* Set the error to GetLastError */ /* Set the error to GetLastError */
__PHYSFS_setError(win32strerror()); __PHYSFS_setError(win32strerror());
/* We errored out */ /* We errored out */
retval = 0; retval = 0;
} }
else
{
/* Combine the high/low order to create the 64-bit position value */
retval = HighOrderPos;
retval = retval << 32;
retval |= LowOrderPos;
}
/*!!! Can't find a file pointer routine?!?!?!!?!?*/ /*!!! Can't find a file pointer routine?!?!?!!?!?*/
return retval; return retval;
@ -684,22 +683,23 @@ PHYSFS_sint64 __PHYSFS_platformFileLength(void *handle)
/* Cast the generic handle to a Win32 handle */ /* Cast the generic handle to a Win32 handle */
FileHandle = (HANDLE)handle; FileHandle = (HANDLE)handle;
/* Get the file size. Condition evaluates to TRUE if an error occured */
if(((FileSizeLow = GetFileSize(FileHandle, &FileSizeHigh)) if(((FileSizeLow = GetFileSize(FileHandle, &FileSizeHigh))
== INVALID_SET_FILE_POINTER) && (GetLastError() != NO_ERROR)) == INVALID_SET_FILE_POINTER) && (GetLastError() != NO_ERROR))
{
/* Combine the high/low order to create the 64-bit position value */
retval = FileSizeHigh;
retval = retval << 32;
retval |= FileSizeLow;
}
else
{ {
/* Set the error to GetLastError */ /* Set the error to GetLastError */
__PHYSFS_setError(win32strerror()); __PHYSFS_setError(win32strerror());
retval = -1; retval = -1;
} }
else
{
/* Combine the high/low order to create the 64-bit position value */
retval = FileSizeHigh;
retval = retval << 32;
retval |= FileSizeLow;
}
return retval; return retval;
} }
@ -716,8 +716,8 @@ int __PHYSFS_platformEOF(void *opaque)
/* Get the current position in the file */ /* Get the current position in the file */
if((FilePosition = __PHYSFS_platformTell(opaque)) != 0) if((FilePosition = __PHYSFS_platformTell(opaque)) != 0)
{ {
/* Non-zero if EOF is equal to the file length - 1 */ /* Non-zero if EOF is equal to the file length */
retval = FilePosition == __PHYSFS_platformFileLength(opaque) - 1; retval = FilePosition == __PHYSFS_platformFileLength(opaque);
} }
return retval; return retval;