mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-03-26 02:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added SDL_IOFromDynamicMem()

Browse Source
This commit is contained in:
Sam Lantinga
2024-03-17 17:11:20 -07:00
committed by Ryan C. Gordon
parent 12245e4c75
commit df0f5deddf
6 changed files with 192 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/dynapi/SDL_dynapi.sym
View File

@@ -1000,6 +1000,7 @@ SDL3_0.0.0 {
SDL_RenameStoragePath;
SDL_GetStoragePathInfo;
SDL_FileTimeFromWindows;
SDL_IOFromDynamicMem;
# extra symbols go here (don't modify this line)
local: *;
};

1
src/dynapi/SDL_dynapi_overrides.h
View File

@@ -1025,3 +1025,4 @@
#define SDL_RenameStoragePath SDL_RenameStoragePath_REAL
#define SDL_GetStoragePathInfo SDL_GetStoragePathInfo_REAL
#define SDL_FileTimeFromWindows SDL_FileTimeFromWindows_REAL
#define SDL_IOFromDynamicMem SDL_IOFromDynamicMem_REAL

1
src/dynapi/SDL_dynapi_procs.h
View File

@@ -1050,3 +1050,4 @@ SDL_DYNAPI_PROC(int,SDL_RemoveStoragePath,(SDL_Storage *a, const char *b),(a,b),
SDL_DYNAPI_PROC(int,SDL_RenameStoragePath,(SDL_Storage *a, const char *b, const char *c),(a,b,c),return)
SDL_DYNAPI_PROC(int,SDL_GetStoragePathInfo,(SDL_Storage *a, const char *b, SDL_PathInfo *c),(a,b,c),return)
SDL_DYNAPI_PROC(SDL_FileTime,SDL_FileTimeFromWindows,(Uint32 a, Uint32 b),(a,b),return)
SDL_DYNAPI_PROC(SDL_IOStream*,SDL_IOFromDynamicMem,(void),(),return)

111
src/file/SDL_iostream.c
View File

@@ -495,17 +495,18 @@ static size_t mem_io(void *userdata, void *dst, const void *src, size_t size)
static size_t SDLCALL mem_read(void *userdata, void *ptr, size_t size, SDL_IOStatus *status)
{
const IOStreamMemData *iodata = (IOStreamMemData *) userdata;
IOStreamMemData *iodata = (IOStreamMemData *) userdata;
return mem_io(userdata, ptr, iodata->here, size);
}
static size_t SDLCALL mem_write(void *userdata, const void *ptr, size_t size, SDL_IOStatus *status)
{
const IOStreamMemData *iodata = (IOStreamMemData *) userdata;
IOStreamMemData *iodata = (IOStreamMemData *) userdata;
return mem_io(userdata, iodata->here, ptr, size);
}
static int SDLCALL mem_close(void *userdata) {
static int SDLCALL mem_close(void *userdata)
{
SDL_free(userdata);
return 0;
}
@@ -731,6 +732,109 @@ SDL_IOStream *SDL_IOFromConstMem(const void *mem, size_t size)
return iostr;
}
typedef struct IOStreamDynamicMemData
{
SDL_IOStream *stream;
IOStreamMemData data;
Uint8 *end;
} IOStreamDynamicMemData;
static Sint64 SDLCALL dynamic_mem_size(void *userdata)
{
IOStreamDynamicMemData *iodata = (IOStreamDynamicMemData *) userdata;
return mem_size(&iodata->data);
}
static Sint64 SDLCALL dynamic_mem_seek(void *userdata, Sint64 offset, int whence)
{
IOStreamDynamicMemData *iodata = (IOStreamDynamicMemData *) userdata;
return mem_seek(&iodata->data, offset, whence);
}
static size_t SDLCALL dynamic_mem_read(void *userdata, void *ptr, size_t size, SDL_IOStatus *status)
{
IOStreamDynamicMemData *iodata = (IOStreamDynamicMemData *) userdata;
return mem_io(&iodata->data, ptr, iodata->data.here, size);
}
static int dynamic_mem_realloc(IOStreamDynamicMemData *iodata, size_t size)
{
size_t chunksize = (size_t)SDL_GetNumberProperty(SDL_GetIOProperties(iodata->stream), SDL_PROP_IOSTREAM_DYNAMIC_CHUNKSIZE_NUMBER, 0);
if (!chunksize) {
chunksize = 1024;
}
// We're intentionally allocating more memory than needed so it can be null terminated
size_t chunks = (((iodata->end - iodata->data.base) + size) / chunksize) + 1;
size_t length = (chunks * chunksize);
Uint8 *base = (Uint8 *)SDL_realloc(iodata->data.base, length);
if (!base) {
return -1;
}
size_t here_offset = (iodata->data.here - iodata->data.base);
size_t stop_offset = (iodata->data.stop - iodata->data.base);
iodata->data.base = base;
iodata->data.here = base + here_offset;
iodata->data.stop = base + stop_offset;
iodata->end = base + length;
return SDL_SetProperty(SDL_GetIOProperties(iodata->stream), SDL_PROP_IOSTREAM_DYNAMIC_MEMORY_POINTER, base);
}
static size_t SDLCALL dynamic_mem_write(void *userdata, const void *ptr, size_t size, SDL_IOStatus *status)
{
IOStreamDynamicMemData *iodata = (IOStreamDynamicMemData *) userdata;
if (size > (iodata->data.stop - iodata->data.here)) {
if (size > (iodata->end - iodata->data.here)) {
if (dynamic_mem_realloc(iodata, size) < 0) {
return 0;
}
}
iodata->data.stop = iodata->data.here + size;
}
return mem_io(&iodata->data, iodata->data.here, ptr, size);
}
static int SDLCALL dynamic_mem_close(void *userdata)
{
const IOStreamDynamicMemData *iodata = (IOStreamDynamicMemData *) userdata;
void *mem = SDL_GetProperty(SDL_GetIOProperties(iodata->stream), SDL_PROP_IOSTREAM_DYNAMIC_MEMORY_POINTER, NULL);
if (mem) {
SDL_free(mem);
}
SDL_free(userdata);
return 0;
}
SDL_IOStream *SDL_IOFromDynamicMem(void)
{
IOStreamDynamicMemData *iodata = (IOStreamDynamicMemData *) SDL_malloc(sizeof (*iodata));
if (!iodata) {
return NULL;
}
SDL_IOStreamInterface iface;
SDL_zero(iface);
iface.size = dynamic_mem_size;
iface.seek = dynamic_mem_seek;
iface.read = dynamic_mem_read;
iface.write = dynamic_mem_write;
iface.close = dynamic_mem_close;
iodata->data.base = NULL;
iodata->data.here = NULL;
iodata->data.stop = NULL;
iodata->end = NULL;
SDL_IOStream *iostr = SDL_OpenIO(&iface, iodata);
if (iostr) {
iodata->stream = iostr;
} else {
SDL_free(iodata);
}
return iostr;
}
SDL_IOStatus SDL_GetIOStatus(SDL_IOStream *context)
{
if (!context) {
@@ -740,7 +844,6 @@ SDL_IOStatus SDL_GetIOStatus(SDL_IOStream *context)
return context->status;
}
SDL_IOStream *SDL_OpenIO(const SDL_IOStreamInterface *iface, void *userdata)
{
if (!iface) {