3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Patch miniz bundled version to support unicode on Windows."

Browse Source 
This reverts commit 8fc1eba652.
This commit is contained in:
tamasmeszaros 2019-05-31 16:54:42 +02:00
parent 34663a3514
commit f275cdafa9
1 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/miniz/miniz.c
View File

@ -2987,43 +2987,17 @@ extern "C" {
#include <sys/stat.h> #include <sys/stat.h>
#if defined(_MSC_VER) || defined(__MINGW64__) #if defined(_MSC_VER) || defined(__MINGW64__)
#include <windows.h>
struct WArgs { const wchar_t *fname, *mode; };
static struct WArgs utf8towide(const char* fname_utf8, const char * modestr)
{
static wchar_t buff[4096];
static wchar_t mode[50];
struct WArgs ret = { .fname = NULL, .mode = NULL };
if(MultiByteToWideChar(CP_UTF8, 0, fname_utf8, -1, buff, 4096) == 0)
return ret;
if(MultiByteToWideChar(CP_UTF8, 0, modestr, -1, mode, 50) == 0)
return ret;
ret.fname = buff, ret.mode = mode;
return ret;
}
static FILE *mz_fopen(const char *pFilename, const char *pMode) static FILE *mz_fopen(const char *pFilename, const char *pMode)
{ {
FILE *pFile = NULL; FILE *pFile = NULL;
fopen_s(&pFile, pFilename, pMode);
struct WArgs args = utf8towide(pFilename, pMode);
if(args.fname != NULL && args.mode != NULL)
if(_wfopen_s(&pFile, args.fname, args.mode)) return NULL;
return pFile; return pFile;
} }
static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream) static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream)
{ {
FILE *pFile = NULL; FILE *pFile = NULL;
if (freopen_s(&pFile, pPath, pMode, pStream))
struct WArgs args = utf8towide(pPath, pMode); return NULL;
if(args.fname != NULL && args.mode != NULL)
if(_wfreopen_s(&pFile, args.fname, args.mode, pStream)) return NULL;
return pFile; return pFile;
} }
#ifndef MINIZ_NO_TIME #ifndef MINIZ_NO_TIME