From 136a86f6aa01aebf31f698bb288492576653a6bf Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 28 Jun 2020 03:58:40 +0200 Subject: [PATCH] (deps/7zip) Use libretro-common file_stream functions --- deps/7zip/7zFile.c | 191 ++++++--------------------------------------- deps/7zip/7zFile.h | 21 +---- 2 files changed, 27 insertions(+), 185 deletions(-) diff --git a/deps/7zip/7zFile.c b/deps/7zip/7zFile.c index 6dc10da40c..6e60fcf4fa 100644 --- a/deps/7zip/7zFile.c +++ b/deps/7zip/7zFile.c @@ -4,130 +4,51 @@ #include #include "7zFile.h" -#ifndef USE_WINDOWS_FILE - #ifndef UNDER_CE #include #endif -#else - -/* - ReadFile and WriteFile functions in Windows have BUG: - If you Read or Write 64MB or more (probably min_failure_size = 64MB - 32KB + 1) - from/to Network file, it returns ERROR_NO_SYSTEM_RESOURCES - (Insufficient system resources exist to complete the requested service). - Probably in some version of Windows there are problems with other sizes: - for 32 MB (maybe also for 16 MB). - And message can be "Network connection was lost" - */ - -#define kChunkSizeMax (1 << 22) - -#endif - void File_Construct(CSzFile *p) { -#ifdef USE_WINDOWS_FILE - p->handle = INVALID_HANDLE_VALUE; -#else p->file = NULL; -#endif } -#if !defined(UNDER_CE) || !defined(USE_WINDOWS_FILE) static WRes File_Open(CSzFile *p, const char *name, int writeMode) { -#ifdef USE_WINDOWS_FILE - p->handle = CreateFileA(name, - writeMode ? GENERIC_WRITE : GENERIC_READ, - FILE_SHARE_READ, NULL, - writeMode ? CREATE_ALWAYS : OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, NULL); - return (p->handle != INVALID_HANDLE_VALUE) ? 0 : GetLastError(); -#else - p->file = fopen(name, writeMode ? "wb+" : "rb"); + p->file = rfopen(name, writeMode ? "wb+" : "rb"); return (p->file != 0) ? 0 : #ifdef UNDER_CE 2; /* ENOENT */ #else errno; #endif -#endif } WRes InFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 0); } WRes OutFile_Open(CSzFile *p, const char *name) { return File_Open(p, name, 1); } -#endif - -#ifdef USE_WINDOWS_FILE -static WRes File_OpenW(CSzFile *p, const WCHAR *name, int writeMode) -{ - p->handle = CreateFileW(name, - writeMode ? GENERIC_WRITE : GENERIC_READ, - FILE_SHARE_READ, NULL, - writeMode ? CREATE_ALWAYS : OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, NULL); - return (p->handle != INVALID_HANDLE_VALUE) ? 0 : GetLastError(); -} -WRes InFile_OpenW(CSzFile *p, const WCHAR *name) { return File_OpenW(p, name, 0); } -WRes OutFile_OpenW(CSzFile *p, const WCHAR *name) { return File_OpenW(p, name, 1); } -#endif WRes File_Close(CSzFile *p) { -#ifdef USE_WINDOWS_FILE - if (p->handle != INVALID_HANDLE_VALUE) + if (p->file) { - if (!CloseHandle(p->handle)) - return GetLastError(); - p->handle = INVALID_HANDLE_VALUE; - } -#else - if (p->file != NULL) - { - int res = fclose(p->file); + int res = rfclose(p->file); if (res != 0) return res; p->file = NULL; } -#endif return 0; } WRes File_Read(CSzFile *p, void *data, size_t *size) { - size_t originalSize = *size; + int64_t originalSize = *size; if (originalSize == 0) return 0; -#ifdef USE_WINDOWS_FILE - - *size = 0; - do - { - DWORD curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : (DWORD)originalSize; - DWORD processed = 0; - BOOL res = ReadFile(p->handle, data, curSize, &processed, NULL); - data = (void *)((uint8_t*)data + processed); - originalSize -= processed; - *size += processed; - if (!res) - return GetLastError(); - if (processed == 0) - break; - } - while (originalSize > 0); - return 0; - -#else - - *size = fread(data, 1, originalSize, p->file); + *size = rfread(data, 1, originalSize, p->file); if (*size == originalSize) return 0; - return ferror(p->file); - -#endif + return rferror(p->file); } WRes File_Write(CSzFile *p, const void *data, size_t *size) @@ -136,102 +57,41 @@ WRes File_Write(CSzFile *p, const void *data, size_t *size) if (originalSize == 0) return 0; -#ifdef USE_WINDOWS_FILE - - *size = 0; - do - { - DWORD curSize = (originalSize > kChunkSizeMax) ? kChunkSizeMax : (DWORD)originalSize; - DWORD processed = 0; - BOOL res = WriteFile(p->handle, data, curSize, &processed, NULL); - data = (void *)((uint8_t*)data + processed); - originalSize -= processed; - *size += processed; - if (!res) - return GetLastError(); - if (processed == 0) - break; - } - while (originalSize > 0); - return 0; - -#else - - *size = fwrite(data, 1, originalSize, p->file); + *size = rfwrite(data, 1, originalSize, p->file); if (*size == originalSize) return 0; return ferror(p->file); - -#endif } WRes File_Seek(CSzFile *p, int64_t *pos, ESzSeek origin) { -#ifdef USE_WINDOWS_FILE - - LARGE_INTEGER value; - DWORD moveMethod; - value.LowPart = (DWORD)*pos; - value.HighPart = (LONG)((uint64_t)*pos >> 16 >> 16); /* for case when uint64_t is 32-bit only */ + int whence, res; switch (origin) { - case SZ_SEEK_SET: moveMethod = FILE_BEGIN; break; - case SZ_SEEK_CUR: moveMethod = FILE_CURRENT; break; - case SZ_SEEK_END: moveMethod = FILE_END; break; - default: return ERROR_INVALID_PARAMETER; + case SZ_SEEK_SET: + whence = SEEK_SET; + break; + case SZ_SEEK_CUR: + whence = SEEK_CUR; + break; + case SZ_SEEK_END: + whence = SEEK_END; + break; + default: + return 1; } - value.LowPart = SetFilePointer(p->handle, value.LowPart, &value.HighPart, moveMethod); - if (value.LowPart == 0xFFFFFFFF) - { - WRes res = GetLastError(); - if (res != NO_ERROR) - return res; - } - *pos = ((int64_t)value.HighPart << 32) | value.LowPart; - return 0; - -#else - - int moveMethod; - int res; - switch (origin) - { - case SZ_SEEK_SET: moveMethod = SEEK_SET; break; - case SZ_SEEK_CUR: moveMethod = SEEK_CUR; break; - case SZ_SEEK_END: moveMethod = SEEK_END; break; - default: return 1; - } - res = fseek(p->file, (long)*pos, moveMethod); - *pos = ftell(p->file); + res = rfseek(p->file, (int64_t)*pos, whence); + *pos = rftell(p->file); return res; - -#endif } WRes File_GetLength(CSzFile *p, uint64_t *length) { -#ifdef USE_WINDOWS_FILE - - DWORD sizeHigh; - DWORD sizeLow = GetFileSize(p->handle, &sizeHigh); - if (sizeLow == 0xFFFFFFFF) - { - DWORD res = GetLastError(); - if (res != NO_ERROR) - return res; - } - *length = (((uint64_t)sizeHigh) << 32) + sizeLow; - return 0; - -#else - - long pos = ftell(p->file); - int res = fseek(p->file, 0, SEEK_END); - *length = ftell(p->file); - fseek(p->file, pos, SEEK_SET); + int64_t pos = rftell(p->file); + int64_t res = rfseek(p->file, 0, SEEK_END); + *length = rftell(p->file); + rfseek(p->file, pos, SEEK_SET); return res; - -#endif } @@ -248,7 +108,6 @@ void FileSeqInStream_CreateVTable(CFileSeqInStream *p) p->s.Read = FileSeqInStream_Read; } - /* ---------- FileInStream ---------- */ static SRes FileInStream_Read(void *pp, void *buf, size_t *size) diff --git a/deps/7zip/7zFile.h b/deps/7zip/7zFile.h index 33910ec420..a980480382 100644 --- a/deps/7zip/7zFile.h +++ b/deps/7zip/7zFile.h @@ -4,15 +4,8 @@ #ifndef __7Z_FILE_H #define __7Z_FILE_H -#ifdef _WIN32 -#define USE_WINDOWS_FILE -#endif - -#ifdef USE_WINDOWS_FILE -#include -#else #include -#endif +#include #include "7zTypes.h" @@ -24,22 +17,12 @@ extern "C" { typedef struct { - #ifdef USE_WINDOWS_FILE - HANDLE handle; - #else - FILE *file; - #endif + RFILE *file; } CSzFile; void File_Construct(CSzFile *p); -#if !defined(UNDER_CE) || !defined(USE_WINDOWS_FILE) WRes InFile_Open(CSzFile *p, const char *name); WRes OutFile_Open(CSzFile *p, const char *name); -#endif -#ifdef USE_WINDOWS_FILE -WRes InFile_OpenW(CSzFile *p, const WCHAR *name); -WRes OutFile_OpenW(CSzFile *p, const WCHAR *name); -#endif WRes File_Close(CSzFile *p); /* reads max(*size, remain file's size) bytes */