ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Minizip) Don't go through ioapi's function pointers - negates 

dependency on ioapi.c
(driver.c) ifdef start/stop() calls with RARCH_CONSOLE for now
This commit is contained in:
twinaphex 2013-03-13 05:06:26 +01:00
parent c28bb3a3fd
commit 24a4618f88
5 changed files with 176 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
console/griffin/griffin.c
View File

@ -452,7 +452,6 @@ RZLIB
============================================================ */ ============================================================ */
#ifdef WANT_MINIZ #ifdef WANT_MINIZ
#include "../../deps/miniz/miniz.c" #include "../../deps/miniz/miniz.c"
#include "../../deps/minizip/ioapi.c"
#include "../../deps/minizip/unzip.c" #include "../../deps/minizip/unzip.c"
#endif #endif

131
deps/minizip/ioapi.c vendored
View File

@ -1,131 +0,0 @@
/* ioapi.c -- IO base function header for compress/uncompress .zip
files using zlib + zip or unzip API
Version 1.01e, February 12th, 2005
Copyright (C) 1998-2005 Gilles Vollant
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "../miniz/zlib.h"
#include "ioapi.h"
/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
#ifndef SEEK_CUR
#define SEEK_CUR 1
#endif
#ifndef SEEK_END
#define SEEK_END 2
#endif
#ifndef SEEK_SET
#define SEEK_SET 0
#endif
voidpf fopen_file_func (
voidpf opaque,
const char* filename,
int mode);
uLong fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size);
uLong fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size);
long ftell_file_func (voidpf opaque, voidpf stream);
long fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin);
int fclose_file_func (voidpf opaque, voidpf stream);
int ferror_file_func (voidpf opaque, voidpf stream);
voidpf fopen_file_func (voidpf opaque, const char *filename, int mode)
{
FILE* file = NULL;
const char* mode_fopen = NULL;
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
mode_fopen = "rb";
else
if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
mode_fopen = "r+b";
else
if (mode & ZLIB_FILEFUNC_MODE_CREATE)
mode_fopen = "wb";
if ((filename!=NULL) && (mode_fopen != NULL))
file = fopen(filename, mode_fopen);
return file;
}
uLong fread_file_func (voidpf opaque, voidpf stream, void *buf, uLong size)
{
uLong ret;
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
return ret;
}
uLong fwrite_file_func (voidpf opaque, voidpf stream, const void *buf, uLong size)
{
uLong ret;
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
return ret;
}
long ftell_file_func (voidpf opaque, voidpf stream)
{
long ret;
ret = ftell((FILE *)stream);
return ret;
}
long fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin)
{
int fseek_origin=0;
long ret;
switch (origin)
{
case ZLIB_FILEFUNC_SEEK_CUR :
fseek_origin = SEEK_CUR;
break;
case ZLIB_FILEFUNC_SEEK_END :
fseek_origin = SEEK_END;
break;
case ZLIB_FILEFUNC_SEEK_SET :
fseek_origin = SEEK_SET;
break;
default: return -1;
}
ret = 0;
fseek((FILE *)stream, offset, fseek_origin);
return ret;
}
int fclose_file_func (voidpf opaque, voidpf stream)
{
int ret;
ret = fclose((FILE *)stream);
return ret;
}
int ferror_file_func (voidpf opaque, voidpf stream)
{
int ret;
ret = ferror((FILE *)stream);
return ret;
}
void fill_fopen_filefunc (zlib_filefunc_def*pzlib_filefunc_def)
{
pzlib_filefunc_def->zopen_file = fopen_file_func;
pzlib_filefunc_def->zread_file = fread_file_func;
pzlib_filefunc_def->zwrite_file = fwrite_file_func;
pzlib_filefunc_def->ztell_file = ftell_file_func;
pzlib_filefunc_def->zseek_file = fseek_file_func;
pzlib_filefunc_def->zclose_file = fclose_file_func;
pzlib_filefunc_def->zerror_file = ferror_file_func;
pzlib_filefunc_def->opaque = NULL;
}

64
deps/minizip/ioapi.h vendored
View File

@ -1,64 +0,0 @@
/* ioapi.h -- IO base function header for compress/uncompress .zip
files using zlib + zip or unzip API
Version 1.01e, February 12th, 2005
Copyright (C) 1998-2005 Gilles Vollant
*/
#ifndef _ZLIBIOAPI_H
#define _ZLIBIOAPI_H
#define ZLIB_FILEFUNC_SEEK_CUR (1)
#define ZLIB_FILEFUNC_SEEK_END (2)
#define ZLIB_FILEFUNC_SEEK_SET (0)
#define ZLIB_FILEFUNC_MODE_READ (1)
#define ZLIB_FILEFUNC_MODE_WRITE (2)
#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
#define ZLIB_FILEFUNC_MODE_EXISTING (4)
#define ZLIB_FILEFUNC_MODE_CREATE (8)
#ifdef __cplusplus
extern "C" {
#endif
typedef voidpf (*open_file_func) (voidpf opaque, const char* filename, int mode);
typedef uLong (*read_file_func) (voidpf opaque, voidpf stream, void* buf, uLong size);
typedef uLong (*write_file_func) (voidpf opaque, voidpf stream, const void* buf, uLong size);
typedef long (*tell_file_func) (voidpf opaque, voidpf stream);
typedef long (*seek_file_func) (voidpf opaque, voidpf stream, uLong offset, int origin);
typedef int (*close_file_func) (voidpf opaque, voidpf stream);
typedef int (*testerror_file_func) (voidpf opaque, voidpf stream);
typedef struct zlib_filefunc_def_s
{
open_file_func zopen_file;
read_file_func zread_file;
write_file_func zwrite_file;
tell_file_func ztell_file;
seek_file_func zseek_file;
close_file_func zclose_file;
testerror_file_func zerror_file;
voidpf opaque;
} zlib_filefunc_def;
void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def);
#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
#ifdef __cplusplus
}
#endif
#endif

261
deps/minizip/unzip.c vendored
View File

@ -96,6 +96,51 @@ typedef struct unz_file_info_internal_s
uLong offset_curfile;/* relative offset of local header 4 bytes */ uLong offset_curfile;/* relative offset of local header 4 bytes */
} unz_file_info_internal; } unz_file_info_internal;
/* IOAPI START - stub funtion pointers */
typedef voidpf (*open_file_func) (voidpf opaque, const char* filename, int mode);
typedef uLong (*read_file_func) (voidpf opaque, voidpf stream, void* buf, uLong size);
typedef uLong (*write_file_func) (voidpf opaque, voidpf stream, const void* buf, uLong size);
typedef long (*tell_file_func) (voidpf opaque, voidpf stream);
typedef long (*seek_file_func) (voidpf opaque, voidpf stream, uLong offset, int origin);
typedef int (*close_file_func) (voidpf opaque, voidpf stream);
typedef int (*testerror_file_func) (voidpf opaque, voidpf stream);
#define ZLIB_FILEFUNC_SEEK_CUR (1)
#define ZLIB_FILEFUNC_SEEK_END (2)
#define ZLIB_FILEFUNC_SEEK_SET (0)
#define ZLIB_FILEFUNC_MODE_READ (1)
#define ZLIB_FILEFUNC_MODE_WRITE (2)
#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
#define ZLIB_FILEFUNC_MODE_EXISTING (4)
#define ZLIB_FILEFUNC_MODE_CREATE (8)
#ifndef SEEK_CUR
#define SEEK_CUR 1
#endif
#ifndef SEEK_END
#define SEEK_END 2
#endif
#ifndef SEEK_SET
#define SEEK_SET 0
#endif
typedef struct zlib_filefunc_def_s
{
open_file_func zopen_file;
read_file_func zread_file;
write_file_func zwrite_file;
tell_file_func ztell_file;
seek_file_func zseek_file;
close_file_func zclose_file;
testerror_file_func zerror_file;
voidpf opaque;
} zlib_filefunc_def;
/* IOAPI END */
/* file_in_zip_read_info_s contain internal information about a file in zipfile, /* file_in_zip_read_info_s contain internal information about a file in zipfile,
when reading and decompress it */ when reading and decompress it */
@ -147,6 +192,55 @@ typedef struct
int encrypted; int encrypted;
} unz_s; } unz_s;
/* IOAPI START - functions */
static void *miniz_fopen(const char *filename, int mode)
{
FILE* file = NULL;
const char* mode_fopen = NULL;
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
mode_fopen = "rb";
else
if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
mode_fopen = "r+b";
else
if (mode & ZLIB_FILEFUNC_MODE_CREATE)
mode_fopen = "wb";
if ((filename!=NULL) && (mode_fopen != NULL))
file = fopen(filename, mode_fopen);
return file;
}
static inline uLong miniz_fread (voidpf stream, void *buf, uLong size)
{
return (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
}
static long miniz_fseek(voidpf stream, uLong offset, int origin)
{
int fseek_origin=0;
long ret;
switch (origin)
{
case ZLIB_FILEFUNC_SEEK_CUR :
fseek_origin = SEEK_CUR;
break;
case ZLIB_FILEFUNC_SEEK_END :
fseek_origin = SEEK_END;
break;
case ZLIB_FILEFUNC_SEEK_SET :
fseek_origin = SEEK_SET;
break;
default: return -1;
}
ret = 0;
fseek((FILE *)stream, offset, fseek_origin);
return ret;
}
/* IOAPI END - functions */
/* =========================================================================== /* ===========================================================================
Read a byte from a gz_stream; update next_in and avail_in. Return EOF Read a byte from a gz_stream; update next_in and avail_in. Return EOF
@ -155,13 +249,10 @@ typedef struct
*/ */
static int unzlocal_getByte ( static int unzlocal_getByte (voidpf filestream, int *pi)
const zlib_filefunc_def* pzlib_filefunc_def,
voidpf filestream,
int *pi)
{ {
unsigned char c; unsigned char c;
int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); int err = (int)miniz_fread(filestream,&c,1);
if (err==1) if (err==1)
{ {
*pi = (int)c; *pi = (int)c;
@ -169,7 +260,7 @@ static int unzlocal_getByte (
} }
else else
{ {
if (ZERROR(*pzlib_filefunc_def,filestream)) if (ferror((FILE *)filestream))
return UNZ_ERRNO; return UNZ_ERRNO;
else else
return UNZ_EOF; return UNZ_EOF;
@ -180,18 +271,17 @@ static int unzlocal_getByte (
/* =========================================================================== /* ===========================================================================
Reads a long in LSB order from the given gz_stream. Sets Reads a long in LSB order from the given gz_stream. Sets
*/ */
static int unzlocal_getShort (const zlib_filefunc_def *pzlib_filefunc_def, static int unzlocal_getShort (voidpf filestream, uLong *pX)
voidpf filestream, uLong *pX)
{ {
uLong x ; uLong x ;
int i = 0; int i = 0;
int err; int err;
err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); err = unzlocal_getByte(filestream,&i);
x = (uLong)i; x = (uLong)i;
if (err==UNZ_OK) if (err==UNZ_OK)
err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); err = unzlocal_getByte(filestream,&i);
x += ((uLong)i)<<8; x += ((uLong)i)<<8;
if (err==UNZ_OK) if (err==UNZ_OK)
@ -201,26 +291,25 @@ voidpf filestream, uLong *pX)
return err; return err;
} }
static int unzlocal_getLong (const zlib_filefunc_def *pzlib_filefunc_def, static int unzlocal_getLong (voidpf filestream, uLong *pX)
voidpf filestream, uLong *pX)
{ {
uLong x ; uLong x ;
int i = 0; int i = 0;
int err; int err;
err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); err = unzlocal_getByte(filestream,&i);
x = (uLong)i; x = (uLong)i;
if (err==UNZ_OK) if (err==UNZ_OK)
err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); err = unzlocal_getByte(filestream,&i);
x += ((uLong)i)<<8; x += ((uLong)i)<<8;
if (err==UNZ_OK) if (err==UNZ_OK)
err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); err = unzlocal_getByte(filestream,&i);
x += ((uLong)i)<<16; x += ((uLong)i)<<16;
if (err==UNZ_OK) if (err==UNZ_OK)
err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); err = unzlocal_getByte(filestream,&i);
x += ((uLong)i)<<24; x += ((uLong)i)<<24;
if (err==UNZ_OK) if (err==UNZ_OK)
@ -292,8 +381,7 @@ int unzStringFileNameCompare (const char *fileName1, const char *fileName2, int
Locate the Central directory of a zipfile (at the end, just before Locate the Central directory of a zipfile (at the end, just before
the global comment) the global comment)
*/ */
static uLong unzlocal_SearchCentralDir(const zlib_filefunc_def *pzlib_filefunc_def, static uLong unzlocal_SearchCentralDir(voidpf filestream)
voidpf filestream)
{ {
unsigned char* buf; unsigned char* buf;
uLong uSizeFile; uLong uSizeFile;
@ -301,11 +389,11 @@ voidpf filestream)
uLong uMaxBack=0xffff; /* maximum size of global comment */ uLong uMaxBack=0xffff; /* maximum size of global comment */
uLong uPosFound=0; uLong uPosFound=0;
if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0) if (miniz_fseek(filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
return 0; return 0;
uSizeFile = ZTELL(*pzlib_filefunc_def,filestream); uSizeFile = ftell((FILE*)filestream);
if (uMaxBack>uSizeFile) if (uMaxBack>uSizeFile)
uMaxBack = uSizeFile; uMaxBack = uSizeFile;
@ -327,10 +415,10 @@ voidpf filestream)
uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ? uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
(BUFREADCOMMENT+4) : (uSizeFile-uReadPos); (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0) if (miniz_fseek(filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET) != 0)
break; break;
if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize) if (miniz_fread(filestream,buf,uReadSize) != uReadSize)
break; break;
for (i=(int)uReadSize-3; (i--)>0;) for (i=(int)uReadSize-3; (i--)>0;)
@ -387,65 +475,65 @@ static int unzlocal_GetCurrentFileInfoInternal (unzFile file,
if (file==NULL) if (file==NULL)
return UNZ_PARAMERROR; return UNZ_PARAMERROR;
s=(unz_s*)file; s=(unz_s*)file;
if (ZSEEK(s->z_filefunc, s->filestream, if (miniz_fseek(s->filestream,
s->pos_in_central_dir+s->byte_before_the_zipfile, s->pos_in_central_dir+s->byte_before_the_zipfile,
ZLIB_FILEFUNC_SEEK_SET)!=0) ZLIB_FILEFUNC_SEEK_SET) != 0)
err=UNZ_ERRNO; err=UNZ_ERRNO;
/* we check the magic */ /* we check the magic */
if (err==UNZ_OK) { if (err==UNZ_OK) {
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK) if (unzlocal_getLong(s->filestream,&uMagic) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
else if (uMagic!=0x02014b50) else if (uMagic!=0x02014b50)
err=UNZ_BADZIPFILE; err=UNZ_BADZIPFILE;
} }
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK) if (unzlocal_getShort(s->filestream,&file_info.version) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK) if (unzlocal_getShort(s->filestream,&file_info.version_needed) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK) if (unzlocal_getShort(s->filestream,&file_info.flag) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK) if (unzlocal_getShort(s->filestream,&file_info.compression_method) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK) if (unzlocal_getLong(s->filestream,&file_info.dosDate) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date); unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK) if (unzlocal_getLong(s->filestream,&file_info.crc) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK) if (unzlocal_getLong(s->filestream,&file_info.compressed_size) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK) if (unzlocal_getLong(s->filestream,&file_info.uncompressed_size) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK) if (unzlocal_getShort(s->filestream,&file_info.size_filename) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK) if (unzlocal_getShort(s->filestream,&file_info.size_file_extra) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK) if (unzlocal_getShort(s->filestream,&file_info.size_file_comment) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK) if (unzlocal_getShort(s->filestream,&file_info.disk_num_start) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK) if (unzlocal_getShort(s->filestream,&file_info.internal_fa) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK) if (unzlocal_getLong(s->filestream,&file_info.external_fa) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK) if (unzlocal_getLong(s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
lSeek+=file_info.size_filename; lSeek+=file_info.size_filename;
@ -461,7 +549,7 @@ static int unzlocal_GetCurrentFileInfoInternal (unzFile file,
uSizeRead = fileNameBufferSize; uSizeRead = fileNameBufferSize;
if ((file_info.size_filename>0) && (fileNameBufferSize>0)) if ((file_info.size_filename>0) && (fileNameBufferSize>0))
if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead) if (miniz_fread(s->filestream,szFileName,uSizeRead) != uSizeRead)
err=UNZ_ERRNO; err=UNZ_ERRNO;
lSeek -= uSizeRead; lSeek -= uSizeRead;
} }
@ -476,14 +564,14 @@ static int unzlocal_GetCurrentFileInfoInternal (unzFile file,
uSizeRead = extraFieldBufferSize; uSizeRead = extraFieldBufferSize;
if (lSeek!=0) { if (lSeek!=0) {
if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0) if (miniz_fseek(s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR) == 0)
lSeek=0; lSeek=0;
else else
err=UNZ_ERRNO; err=UNZ_ERRNO;
} }
if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0)) if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead) if (miniz_fread(s->filestream,extraField,uSizeRead) != uSizeRead)
err=UNZ_ERRNO; err=UNZ_ERRNO;
lSeek += file_info.size_file_extra - uSizeRead; lSeek += file_info.size_file_extra - uSizeRead;
} }
@ -503,13 +591,13 @@ static int unzlocal_GetCurrentFileInfoInternal (unzFile file,
uSizeRead = commentBufferSize; uSizeRead = commentBufferSize;
if (lSeek!=0) { if (lSeek!=0) {
if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0) if (miniz_fseek(s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
lSeek=0; lSeek=0;
else else
err=UNZ_ERRNO; err=UNZ_ERRNO;
} }
if ((file_info.size_file_comment>0) && (commentBufferSize>0)) if ((file_info.size_file_comment>0) && (commentBufferSize>0))
if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead) if (miniz_fread(s->filestream,szComment,uSizeRead) != uSizeRead)
err=UNZ_ERRNO; err=UNZ_ERRNO;
lSeek+=file_info.size_file_comment - uSizeRead; lSeek+=file_info.size_file_comment - uSizeRead;
} }
@ -545,6 +633,7 @@ int unzGoToFirstFile (unzFile file)
return err; return err;
} }
/* /*
Open a Zip file. path contain the full pathname (by example, Open a Zip file. path contain the full pathname (by example,
on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
@ -573,44 +662,36 @@ unzFile unzOpen2 (const char *path, zlib_filefunc_def *pzlib_filefunc_def)
if (unz_copyright[0]!=' ') if (unz_copyright[0]!=' ')
return NULL; return NULL;
if (pzlib_filefunc_def==NULL) us.filestream= miniz_fopen(path, ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_EXISTING);
fill_fopen_filefunc(&us.z_filefunc);
else
us.z_filefunc = *pzlib_filefunc_def;
us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
path,
ZLIB_FILEFUNC_MODE_READ |
ZLIB_FILEFUNC_MODE_EXISTING);
if (us.filestream==NULL) if (us.filestream==NULL)
return NULL; return NULL;
central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream); central_pos = unzlocal_SearchCentralDir(us.filestream);
if (central_pos==0) if (central_pos==0)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (ZSEEK(us.z_filefunc, us.filestream, if (miniz_fseek(us.filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET) != 0)
central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
err=UNZ_ERRNO; err=UNZ_ERRNO;
/* the signature, already checked */ /* the signature, already checked */
if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK) if (unzlocal_getLong(us.filestream,&uL)!=UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
/* number of this disk */ /* number of this disk */
if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK) if (unzlocal_getShort(us.filestream,&number_disk)!=UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
/* number of the disk with the start of the central directory */ /* number of the disk with the start of the central directory */
if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK) if (unzlocal_getShort(us.filestream,&number_disk_with_CD)!=UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
/* total number of entries in the central dir on this disk */ /* total number of entries in the central dir on this disk */
if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK) if (unzlocal_getShort(us.filestream,&us.gi.number_entry)!=UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
/* total number of entries in the central dir */ /* total number of entries in the central dir */
if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK) if (unzlocal_getShort(us.filestream,&number_entry_CD)!=UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if ((number_entry_CD!=us.gi.number_entry) || if ((number_entry_CD!=us.gi.number_entry) ||
@ -619,16 +700,16 @@ unzFile unzOpen2 (const char *path, zlib_filefunc_def *pzlib_filefunc_def)
err=UNZ_BADZIPFILE; err=UNZ_BADZIPFILE;
/* size of the central directory */ /* size of the central directory */
if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK) if (unzlocal_getLong(us.filestream,&us.size_central_dir)!=UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
/* offset of start of central directory with respect to the /* offset of start of central directory with respect to the
starting disk number */ starting disk number */
if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK) if (unzlocal_getLong(us.filestream,&us.offset_central_dir)!=UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
/* zipfile comment length */ /* zipfile comment length */
if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK) if (unzlocal_getShort(us.filestream,&us.gi.size_comment)!=UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if ((central_pos<us.offset_central_dir+us.size_central_dir) && if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
@ -637,7 +718,7 @@ unzFile unzOpen2 (const char *path, zlib_filefunc_def *pzlib_filefunc_def)
if (err!=UNZ_OK) if (err!=UNZ_OK)
{ {
ZCLOSE(us.z_filefunc, us.filestream); fclose((FILE*)us.filestream);
return NULL; return NULL;
} }
@ -675,7 +756,7 @@ int unzClose (unzFile file)
if (s->pfile_in_zip_read!=NULL) if (s->pfile_in_zip_read!=NULL)
unzCloseCurrentFile(file); unzCloseCurrentFile(file);
ZCLOSE(s->z_filefunc, s->filestream); fclose((FILE*)s->filestream);
TRYFREE(s); TRYFREE(s);
return UNZ_OK; return UNZ_OK;
} }
@ -888,28 +969,28 @@ uInt *piSizeVar, uLong *poffset_local_extrafield, uInt *psize_local_extrafield)
*poffset_local_extrafield = 0; *poffset_local_extrafield = 0;
*psize_local_extrafield = 0; *psize_local_extrafield = 0;
if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile + if (miniz_fseek(s->filestream,s->cur_file_info_internal.offset_curfile +
s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0) s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
return UNZ_ERRNO; return UNZ_ERRNO;
if (err==UNZ_OK) { if (err==UNZ_OK) {
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK) if (unzlocal_getLong(s->filestream,&uMagic) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
else if (uMagic!=0x04034b50) else if (uMagic!=0x04034b50)
err=UNZ_BADZIPFILE; err=UNZ_BADZIPFILE;
} }
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) if (unzlocal_getShort(s->filestream,&uData) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
/* /*
else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion)) else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
err=UNZ_BADZIPFILE; err=UNZ_BADZIPFILE;
*/ */
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK) if (unzlocal_getShort(s->filestream,&uFlags) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) if (unzlocal_getShort(s->filestream,&uData) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method)) else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
err=UNZ_BADZIPFILE; err=UNZ_BADZIPFILE;
@ -918,36 +999,36 @@ uInt *piSizeVar, uLong *poffset_local_extrafield, uInt *psize_local_extrafield)
(s->cur_file_info.compression_method!=Z_DEFLATED)) (s->cur_file_info.compression_method!=Z_DEFLATED))
err=UNZ_BADZIPFILE; err=UNZ_BADZIPFILE;
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */ if (unzlocal_getLong(s->filestream,&uData) != UNZ_OK) /* date/time */
err=UNZ_ERRNO; err=UNZ_ERRNO;
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */ if (unzlocal_getLong(s->filestream,&uData) != UNZ_OK) /* crc */
err=UNZ_ERRNO; err=UNZ_ERRNO;
else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
((uFlags & 8)==0)) ((uFlags & 8)==0))
err=UNZ_BADZIPFILE; err=UNZ_BADZIPFILE;
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */ if (unzlocal_getLong(s->filestream,&uData) != UNZ_OK) /* size compr */
err=UNZ_ERRNO; err=UNZ_ERRNO;
else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
((uFlags & 8)==0)) ((uFlags & 8)==0))
err=UNZ_BADZIPFILE; err=UNZ_BADZIPFILE;
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */ if (unzlocal_getLong(s->filestream,&uData) != UNZ_OK) /* size uncompr */
err=UNZ_ERRNO; err=UNZ_ERRNO;
else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
((uFlags & 8)==0)) ((uFlags & 8)==0))
err=UNZ_BADZIPFILE; err=UNZ_BADZIPFILE;
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK) if (unzlocal_getShort(s->filestream,&size_filename) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename)) else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
err=UNZ_BADZIPFILE; err=UNZ_BADZIPFILE;
*piSizeVar += (uInt)size_filename; *piSizeVar += (uInt)size_filename;
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK) if (unzlocal_getShort(s->filestream,&size_extra_field) != UNZ_OK)
err=UNZ_ERRNO; err=UNZ_ERRNO;
*poffset_local_extrafield= s->cur_file_info_internal.offset_curfile + *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
SIZEZIPLOCALHEADER + size_filename; SIZEZIPLOCALHEADER + size_filename;
@ -1146,16 +1227,14 @@ int unzReadCurrentFile (unzFile file, voidpf buf, unsigned len)
uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed; uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
if (uReadThis == 0) if (uReadThis == 0)
return UNZ_EOF; return UNZ_EOF;
if (ZSEEK(pfile_in_zip_read_info->z_filefunc, if (miniz_fseek(pfile_in_zip_read_info->filestream,
pfile_in_zip_read_info->filestream,
pfile_in_zip_read_info->pos_in_zipfile + pfile_in_zip_read_info->pos_in_zipfile +
pfile_in_zip_read_info->byte_before_the_zipfile, pfile_in_zip_read_info->byte_before_the_zipfile,
ZLIB_FILEFUNC_SEEK_SET)!=0) ZLIB_FILEFUNC_SEEK_SET) != 0)
return UNZ_ERRNO; return UNZ_ERRNO;
if (ZREAD(pfile_in_zip_read_info->z_filefunc, if (miniz_fread(pfile_in_zip_read_info->filestream,
pfile_in_zip_read_info->filestream,
pfile_in_zip_read_info->read_buffer, pfile_in_zip_read_info->read_buffer,
uReadThis)!=uReadThis) uReadThis) != uReadThis)
return UNZ_ERRNO; return UNZ_ERRNO;
@ -1326,16 +1405,14 @@ int unzGetLocalExtrafield (unzFile file, voidpf buf, unsigned len)
if (read_now==0) if (read_now==0)
return 0; return 0;
if (ZSEEK(pfile_in_zip_read_info->z_filefunc, if (miniz_fseek(pfile_in_zip_read_info->filestream,
pfile_in_zip_read_info->filestream,
pfile_in_zip_read_info->offset_local_extrafield + pfile_in_zip_read_info->offset_local_extrafield +
pfile_in_zip_read_info->pos_local_extrafield, pfile_in_zip_read_info->pos_local_extrafield,
ZLIB_FILEFUNC_SEEK_SET)!=0) ZLIB_FILEFUNC_SEEK_SET) != 0)
return UNZ_ERRNO; return UNZ_ERRNO;
if (ZREAD(pfile_in_zip_read_info->z_filefunc, if (miniz_fread(pfile_in_zip_read_info->filestream,
pfile_in_zip_read_info->filestream, buf,read_now) != read_now)
buf,read_now)!=read_now)
return UNZ_ERRNO; return UNZ_ERRNO;
return (int)read_now; return (int)read_now;
@ -1399,13 +1476,13 @@ int unzGetGlobalComment (unzFile file, char *szComment, uLong uSizeBuf)
if (uReadThis>s->gi.size_comment) if (uReadThis>s->gi.size_comment)
uReadThis = s->gi.size_comment; uReadThis = s->gi.size_comment;
if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0) if (miniz_fseek(s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
return UNZ_ERRNO; return UNZ_ERRNO;
if (uReadThis>0) if (uReadThis>0)
{ {
*szComment='\0'; *szComment='\0';
if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis) if (miniz_fread(s->filestream,szComment,uReadThis) != uReadThis)
return UNZ_ERRNO; return UNZ_ERRNO;
} }

7
driver.c
View File

@ -269,10 +269,15 @@ void driver_set_monitor_refresh_rate(float hz)
// before retroarch core starts. // before retroarch core starts.
// Core handles audio. // Core handles audio.
// FIXME - start() and stop() can't be ifdeffable with
// RARCH_CONSOLE since more systems now need similar functionality
void global_init_drivers(void) void global_init_drivers(void)
{ {
init_drivers_pre(); // Set driver.* function callbacks. init_drivers_pre(); // Set driver.* function callbacks.
#ifdef RARCH_CONSOLE
driver.video->start(); // Statically starts video driver. Sets driver.video_data. driver.video->start(); // Statically starts video driver. Sets driver.video_data.
#endif
driver.input_data = driver.input->init(); driver.input_data = driver.input->init();
} }
@ -280,7 +285,9 @@ void global_uninit_drivers(void)
{ {
if (driver.video_data) if (driver.video_data)
{ {
#ifdef RARCH_CONSOLE
driver.video->stop(); driver.video->stop();
#endif
driver.video_data = NULL; driver.video_data = NULL;
} }