luo980/miniz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #270 from J5lx/mingw32-unicode

Browse Source 
Fix Unicode paths on MinGW32
This commit is contained in:
Martin Raiber 2023-04-12 21:07:54 +02:00 committed by GitHub
commit d9d197c926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
miniz_zip.c
View File

@ -39,7 +39,7 @@ extern "C" {
#else #else
#include <sys/stat.h> #include <sys/stat.h>
#if defined(_MSC_VER) || defined(__MINGW64__) #if defined(_MSC_VER) || defined(__MINGW64__) || defined(__MINGW32__)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
@ -74,6 +74,15 @@ static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream)
return err ? NULL : pFile; return err ? NULL : pFile;
} }
#if defined(__MINGW32__)
static int mz_stat(const char *path, struct _stat *buffer)
{
WCHAR* wPath = mz_utf8z_to_widechar(path);
int res = _wstat(wPath, buffer);
free(wPath);
return res;
}
#else
static int mz_stat64(const char *path, struct __stat64 *buffer) static int mz_stat64(const char *path, struct __stat64 *buffer)
{ {
WCHAR* wPath = mz_utf8z_to_widechar(path); WCHAR* wPath = mz_utf8z_to_widechar(path);
@ -81,6 +90,7 @@ static int mz_stat64(const char *path, struct __stat64 *buffer)
free(wPath); free(wPath);
return res; return res;
} }
#endif
#ifndef MINIZ_NO_TIME #ifndef MINIZ_NO_TIME
#include <sys/utime.h> #include <sys/utime.h>
@ -91,13 +101,18 @@ static int mz_stat64(const char *path, struct __stat64 *buffer)
#define MZ_FWRITE fwrite #define MZ_FWRITE fwrite
#define MZ_FTELL64 _ftelli64 #define MZ_FTELL64 _ftelli64
#define MZ_FSEEK64 _fseeki64 #define MZ_FSEEK64 _fseeki64
#if defined(__MINGW32__)
#define MZ_FILE_STAT_STRUCT _stat
#define MZ_FILE_STAT mz_stat
#else
#define MZ_FILE_STAT_STRUCT _stat64 #define MZ_FILE_STAT_STRUCT _stat64
#define MZ_FILE_STAT mz_stat64 #define MZ_FILE_STAT mz_stat64
#endif
#define MZ_FFLUSH fflush #define MZ_FFLUSH fflush
#define MZ_FREOPEN mz_freopen #define MZ_FREOPEN mz_freopen
#define MZ_DELETE_FILE remove #define MZ_DELETE_FILE remove
#elif defined(__MINGW32__) || defined(__WATCOMC__) #elif defined(__WATCOMC__)
#ifndef MINIZ_NO_TIME #ifndef MINIZ_NO_TIME
#include <sys/utime.h> #include <sys/utime.h>
#endif #endif