From e1a7c1d0ca30c2c4a293ffbff6b9c51c881d23e3 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Mon, 29 Jan 2024 11:09:51 +0100 Subject: Updated PhysFS RWops helper to the latest version Fixes compatibility with SDL2. The old version compiled for whatever reason, but it would crash when the client tried to play a sound. --- src/utils/physfsrwops.c | 165 ++++++++++++++++++++++++++++++++---------------- src/utils/physfsrwops.h | 11 ++-- 2 files changed, 117 insertions(+), 59 deletions(-) diff --git a/src/utils/physfsrwops.c b/src/utils/physfsrwops.c index 1a5a7137..cb5f2b88 100644 --- a/src/utils/physfsrwops.c +++ b/src/utils/physfsrwops.c @@ -15,7 +15,8 @@ * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license. * Please see LICENSE.txt in the root of the source tree. * - * SDL falls under the LGPL license. You can get SDL at http://www.libsdl.org/ + * SDL 1.2 falls under the LGPL license. SDL 1.3+ is zlib, like PhysicsFS. + * You can get SDL at https://www.libsdl.org/ * * This file was written by Ryan C. Gordon. (icculus@icculus.org). */ @@ -23,102 +24,156 @@ #include /* used for SEEK_SET, SEEK_CUR, SEEK_END ... */ #include "physfsrwops.h" +/* SDL's RWOPS interface changed a little in SDL 2.0... */ +#if defined(SDL_VERSION_ATLEAST) +#if SDL_VERSION_ATLEAST(2, 0, 0) +#define TARGET_SDL2 1 +#endif +#endif + +#if !TARGET_SDL2 +#ifndef RW_SEEK_SET +#define RW_SEEK_SET SEEK_SET +#endif +#ifndef RW_SEEK_CUR +#define RW_SEEK_CUR SEEK_CUR +#endif +#ifndef RW_SEEK_END +#define RW_SEEK_END SEEK_END +#endif +#endif + +#if TARGET_SDL2 +static Sint64 SDLCALL physfsrwops_size(struct SDL_RWops *rw) +{ + PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; + return (Sint64) PHYSFS_fileLength(handle); +} /* physfsrwops_size */ +#endif + + +#if TARGET_SDL2 +static Sint64 SDLCALL physfsrwops_seek(struct SDL_RWops *rw, Sint64 offset, int whence) +#else static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence) +#endif { PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; - int pos = 0; + PHYSFS_sint64 pos = 0; - if (whence == SEEK_SET) - { - pos = offset; - } /* if */ + if (whence == RW_SEEK_SET) + pos = (PHYSFS_sint64) offset; - else if (whence == SEEK_CUR) + else if (whence == RW_SEEK_CUR) { - PHYSFS_sint64 current = PHYSFS_tell(handle); + const PHYSFS_sint64 current = PHYSFS_tell(handle); if (current == -1) { SDL_SetError("Can't find position in file: %s", - PHYSFS_getLastError()); - return(-1); + PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); + return -1; } /* if */ - pos = (int) current; - if ( ((PHYSFS_sint64) pos) != current ) + if (offset == 0) /* this is a "tell" call. We're done. */ { - SDL_SetError("Can't fit current file position in an int!"); - return(-1); + #if TARGET_SDL2 + return (Sint64) current; + #else + return (int) current; + #endif } /* if */ - if (offset == 0) /* this is a "tell" call. We're done. */ - return(pos); - - pos += offset; + pos = current + ((PHYSFS_sint64) offset); } /* else if */ - else if (whence == SEEK_END) + else if (whence == RW_SEEK_END) { - PHYSFS_sint64 len = PHYSFS_fileLength(handle); + const PHYSFS_sint64 len = PHYSFS_fileLength(handle); if (len == -1) { - SDL_SetError("Can't find end of file: %s", PHYSFS_getLastError()); - return(-1); + SDL_SetError("Can't find end of file: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); + return -1; } /* if */ - pos = (int) len; - if ( ((PHYSFS_sint64) pos) != len ) - { - SDL_SetError("Can't fit end-of-file position in an int!"); - return(-1); - } /* if */ - - pos += offset; + pos = len + ((PHYSFS_sint64) offset); } /* else if */ else { SDL_SetError("Invalid 'whence' parameter."); - return(-1); + return -1; } /* else */ if ( pos < 0 ) { SDL_SetError("Attempt to seek past start of file."); - return(-1); + return -1; } /* if */ if (!PHYSFS_seek(handle, (PHYSFS_uint64) pos)) { - SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); - return(-1); + SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); + return -1; } /* if */ - return(pos); + #if TARGET_SDL2 + return (Sint64) pos; + #else + return (int) pos; + #endif } /* physfsrwops_seek */ +#if TARGET_SDL2 +static size_t SDLCALL physfsrwops_read(struct SDL_RWops *rw, void *ptr, + size_t size, size_t maxnum) +#else static int physfsrwops_read(SDL_RWops *rw, void *ptr, int size, int maxnum) +#endif { PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; - PHYSFS_sint64 rc = PHYSFS_read(handle, ptr, size, maxnum); - if (rc != maxnum) + const PHYSFS_uint64 readlen = (PHYSFS_uint64) (maxnum * size); + const PHYSFS_sint64 rc = PHYSFS_readBytes(handle, ptr, readlen); + if (rc != ((PHYSFS_sint64) readlen)) { if (!PHYSFS_eof(handle)) /* not EOF? Must be an error. */ - SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); + { + SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); + + #if TARGET_SDL2 + return 0; + #else + return -1; + #endif + } /* if */ } /* if */ - return((int) rc); + #if TARGET_SDL2 + return (size_t) rc / size; + #else + return (int) rc / size; + #endif } /* physfsrwops_read */ +#if TARGET_SDL2 +static size_t SDLCALL physfsrwops_write(struct SDL_RWops *rw, const void *ptr, + size_t size, size_t num) +#else static int physfsrwops_write(SDL_RWops *rw, const void *ptr, int size, int num) +#endif { PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; - PHYSFS_sint64 rc = PHYSFS_write(handle, ptr, size, num); - if (rc != num) - SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); - - return((int) rc); + const PHYSFS_uint64 writelen = (PHYSFS_uint64) (num * size); + const PHYSFS_sint64 rc = PHYSFS_writeBytes(handle, ptr, writelen); + if (rc != ((PHYSFS_sint64) writelen)) + SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); + + #if TARGET_SDL2 + return (size_t) rc; + #else + return (int) rc; + #endif } /* physfsrwops_write */ @@ -127,12 +182,12 @@ static int physfsrwops_close(SDL_RWops *rw) PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; if (!PHYSFS_close(handle)) { - SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); - return(-1); + SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); + return -1; } /* if */ SDL_FreeRW(rw); - return(0); + return 0; } /* physfsrwops_close */ @@ -141,12 +196,15 @@ static SDL_RWops *create_rwops(PHYSFS_File *handle) SDL_RWops *retval = NULL; if (handle == NULL) - SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); + SDL_SetError("PhysicsFS error: %s", PHYSFS_getErrorByCode(PHYSFS_getLastErrorCode())); else { retval = SDL_AllocRW(); if (retval != NULL) { + #if TARGET_SDL2 + retval->size = physfsrwops_size; + #endif retval->seek = physfsrwops_seek; retval->read = physfsrwops_read; retval->write = physfsrwops_write; @@ -155,7 +213,7 @@ static SDL_RWops *create_rwops(PHYSFS_File *handle) } /* if */ } /* else */ - return(retval); + return retval; } /* create_rwops */ @@ -167,27 +225,26 @@ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_File *handle) else retval = create_rwops(handle); - return(retval); + return retval; } /* PHYSFSRWOPS_makeRWops */ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname) { - return(create_rwops(PHYSFS_openRead(fname))); + return create_rwops(PHYSFS_openRead(fname)); } /* PHYSFSRWOPS_openRead */ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname) { - return(create_rwops(PHYSFS_openWrite(fname))); + return create_rwops(PHYSFS_openWrite(fname)); } /* PHYSFSRWOPS_openWrite */ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname) { - return(create_rwops(PHYSFS_openAppend(fname))); + return create_rwops(PHYSFS_openAppend(fname)); } /* PHYSFSRWOPS_openAppend */ /* end of physfsrwops.c ... */ - diff --git a/src/utils/physfsrwops.h b/src/utils/physfsrwops.h index 8008b224..04ad255d 100644 --- a/src/utils/physfsrwops.h +++ b/src/utils/physfsrwops.h @@ -15,7 +15,8 @@ * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license. * Please see LICENSE.txt in the root of the source tree. * - * SDL falls under the LGPL license. You can get SDL at http://www.libsdl.org/ + * SDL 1.2 falls under the LGPL license. SDL 1.3+ is zlib, like PhysicsFS. + * You can get SDL at https://www.libsdl.org/ * * This file was written by Ryan C. Gordon. (icculus@icculus.org). */ @@ -40,7 +41,7 @@ extern "C" { * @return A valid SDL_RWops structure on success, NULL on error. Specifics * of the error can be gleaned from PHYSFS_getLastError(). */ -SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); +PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); /** * Open a platform-independent filename for writing, and make it accessible @@ -52,7 +53,7 @@ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); * @return A valid SDL_RWops structure on success, NULL on error. Specifics * of the error can be gleaned from PHYSFS_getLastError(). */ -SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); +PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); /** * Open a platform-independent filename for appending, and make it accessible @@ -64,7 +65,7 @@ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); * @return A valid SDL_RWops structure on success, NULL on error. Specifics * of the error can be gleaned from PHYSFS_getLastError(). */ -SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); +PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); /** * Make a SDL_RWops from an existing PhysicsFS file handle. You should @@ -76,7 +77,7 @@ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); * @return A valid SDL_RWops structure on success, NULL on error. Specifics * of the error can be gleaned from PHYSFS_getLastError(). */ -SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_File *handle); +PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_File *handle); #ifdef __cplusplus } -- cgit v1.2.3-60-g2f50