Skip to content

Commit b850169

Browse files
committed
Update miniz to 11.0.2
1 parent 444962d commit b850169

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

tools/thirdparty/miniz/miniz.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3068,7 +3068,7 @@ static WCHAR* mz_utf8z_to_widechar(const char* str)
30683068
{
30693069
int reqChars = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0);
30703070
WCHAR* wStr = (WCHAR*)malloc(reqChars * sizeof(WCHAR));
3071-
MultiByteToWideChar(CP_UTF8, 0, str, -1, wStr, sizeof(WCHAR) * reqChars);
3071+
MultiByteToWideChar(CP_UTF8, 0, str, -1, wStr, reqChars);
30723072
return wStr;
30733073
}
30743074

@@ -3112,7 +3112,7 @@ static int mz_stat64(const char *path, struct __stat64 *buffer)
31123112
#define MZ_FTELL64 _ftelli64
31133113
#define MZ_FSEEK64 _fseeki64
31143114
#define MZ_FILE_STAT_STRUCT _stat64
3115-
#define MZ_FILE_STAT mz_stat64
3115+
#define MZ_FILE_STAT mz_stat64
31163116
#define MZ_FFLUSH fflush
31173117
#define MZ_FREOPEN mz_freopen
31183118
#define MZ_DELETE_FILE remove
@@ -6802,7 +6802,7 @@ mz_bool mz_zip_writer_add_read_buf_callback(mz_zip_archive *pZip, const char *pA
68026802

68036803
if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header,
68046804
(mz_uint16)archive_name_size, (mz_uint16)(extra_size + user_extra_data_len),
6805-
(max_size >= MZ_UINT32_MAX) ? MZ_UINT32_MAX : uncomp_size,
6805+
(max_size >= MZ_UINT32_MAX) ? MZ_UINT32_MAX : uncomp_size,
68066806
(max_size >= MZ_UINT32_MAX) ? MZ_UINT32_MAX : comp_size,
68076807
uncomp_crc32, method, gen_flags, dos_time, dos_date))
68086808
return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);

tools/thirdparty/miniz/miniz.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117

118118

119119

120-
/* Defines to completely disable specific portions of miniz.c:
120+
/* Defines to completely disable specific portions of miniz.c:
121121
If all macros here are defined the only functionality remaining will be CRC-32 and adler-32. */
122122

123123
/* Define MINIZ_NO_STDIO to disable all usage and any functions which rely on stdio for file I/O. */
@@ -146,7 +146,7 @@
146146
/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent conflicts against stock zlib. */
147147
/*#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES */
148148

149-
/* Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc.
149+
/* Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc.
150150
Note if MINIZ_NO_MALLOC is defined then the user must always provide custom user alloc/free/realloc
151151
callbacks to the zlib and archive API's, and a few stand-alone helper API's which don't provide custom user
152152
functions (such as tdefl_compress_mem_to_heap() and tinfl_decompress_mem_to_heap()) won't work. */
@@ -275,10 +275,10 @@ enum
275275
MZ_DEFAULT_COMPRESSION = -1
276276
};
277277

278-
#define MZ_VERSION "11.0.1"
279-
#define MZ_VERNUM 0xB001
278+
#define MZ_VERSION "11.0.2"
279+
#define MZ_VERNUM 0xB002
280280
#define MZ_VER_MAJOR 11
281-
#define MZ_VER_MINOR 1
281+
#define MZ_VER_MINOR 2
282282
#define MZ_VER_REVISION 0
283283
#define MZ_VER_SUBREVISION 0
284284

@@ -971,7 +971,7 @@ struct tinfl_decompressor_tag
971971
#endif
972972

973973
#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
974-
974+
975975
#pragma once
976976

977977

0 commit comments

Comments
 (0)