diff options
Diffstat (limited to 'contrib/minizip/iowin32.c')
-rw-r--r-- | contrib/minizip/iowin32.c | 65 |
1 files changed, 19 insertions, 46 deletions
diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c index 7df5251..08536e9 100644 --- a/contrib/minizip/iowin32.c +++ b/contrib/minizip/iowin32.c | |||
@@ -38,14 +38,6 @@ | |||
38 | #endif | 38 | #endif |
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | voidpf ZCALLBACK win32_open_file_func OF((voidpf opaque, const char* filename, int mode)); | ||
42 | uLong ZCALLBACK win32_read_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size)); | ||
43 | uLong ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); | ||
44 | ZPOS64_T ZCALLBACK win32_tell64_file_func OF((voidpf opaque, voidpf stream)); | ||
45 | long ZCALLBACK win32_seek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)); | ||
46 | int ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream)); | ||
47 | int ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream)); | ||
48 | |||
49 | typedef struct | 41 | typedef struct |
50 | { | 42 | { |
51 | HANDLE hf; | 43 | HANDLE hf; |
@@ -57,8 +49,7 @@ static void win32_translate_open_mode(int mode, | |||
57 | DWORD* lpdwDesiredAccess, | 49 | DWORD* lpdwDesiredAccess, |
58 | DWORD* lpdwCreationDisposition, | 50 | DWORD* lpdwCreationDisposition, |
59 | DWORD* lpdwShareMode, | 51 | DWORD* lpdwShareMode, |
60 | DWORD* lpdwFlagsAndAttributes) | 52 | DWORD* lpdwFlagsAndAttributes) { |
61 | { | ||
62 | *lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0; | 53 | *lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0; |
63 | 54 | ||
64 | if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) | 55 | if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) |
@@ -79,8 +70,7 @@ static void win32_translate_open_mode(int mode, | |||
79 | } | 70 | } |
80 | } | 71 | } |
81 | 72 | ||
82 | static voidpf win32_build_iowin(HANDLE hFile) | 73 | static voidpf win32_build_iowin(HANDLE hFile) { |
83 | { | ||
84 | voidpf ret=NULL; | 74 | voidpf ret=NULL; |
85 | 75 | ||
86 | if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE)) | 76 | if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE)) |
@@ -98,8 +88,7 @@ static voidpf win32_build_iowin(HANDLE hFile) | |||
98 | return ret; | 88 | return ret; |
99 | } | 89 | } |
100 | 90 | ||
101 | voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int mode) | 91 | voidpf ZCALLBACK win32_open64_file_func(voidpf opaque, const void* filename, int mode) { |
102 | { | ||
103 | const char* mode_fopen = NULL; | 92 | const char* mode_fopen = NULL; |
104 | DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; | 93 | DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; |
105 | HANDLE hFile = NULL; | 94 | HANDLE hFile = NULL; |
@@ -127,8 +116,7 @@ voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int | |||
127 | } | 116 | } |
128 | 117 | ||
129 | 118 | ||
130 | voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int mode) | 119 | voidpf ZCALLBACK win32_open64_file_funcA(voidpf opaque, const void* filename, int mode) { |
131 | { | ||
132 | const char* mode_fopen = NULL; | 120 | const char* mode_fopen = NULL; |
133 | DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; | 121 | DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; |
134 | HANDLE hFile = NULL; | 122 | HANDLE hFile = NULL; |
@@ -151,8 +139,7 @@ voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int | |||
151 | } | 139 | } |
152 | 140 | ||
153 | 141 | ||
154 | voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int mode) | 142 | voidpf ZCALLBACK win32_open64_file_funcW(voidpf opaque, const void* filename, int mode) { |
155 | { | ||
156 | const char* mode_fopen = NULL; | 143 | const char* mode_fopen = NULL; |
157 | DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; | 144 | DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; |
158 | HANDLE hFile = NULL; | 145 | HANDLE hFile = NULL; |
@@ -171,8 +158,7 @@ voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int | |||
171 | } | 158 | } |
172 | 159 | ||
173 | 160 | ||
174 | voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mode) | 161 | voidpf ZCALLBACK win32_open_file_func(voidpf opaque, const char* filename, int mode) { |
175 | { | ||
176 | const char* mode_fopen = NULL; | 162 | const char* mode_fopen = NULL; |
177 | DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; | 163 | DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; |
178 | HANDLE hFile = NULL; | 164 | HANDLE hFile = NULL; |
@@ -200,8 +186,7 @@ voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mo | |||
200 | } | 186 | } |
201 | 187 | ||
202 | 188 | ||
203 | uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uLong size) | 189 | uLong ZCALLBACK win32_read_file_func(voidpf opaque, voidpf stream, void* buf,uLong size) { |
204 | { | ||
205 | uLong ret=0; | 190 | uLong ret=0; |
206 | HANDLE hFile = NULL; | 191 | HANDLE hFile = NULL; |
207 | if (stream!=NULL) | 192 | if (stream!=NULL) |
@@ -222,8 +207,7 @@ uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uL | |||
222 | } | 207 | } |
223 | 208 | ||
224 | 209 | ||
225 | uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size) | 210 | uLong ZCALLBACK win32_write_file_func(voidpf opaque, voidpf stream, const void* buf, uLong size) { |
226 | { | ||
227 | uLong ret=0; | 211 | uLong ret=0; |
228 | HANDLE hFile = NULL; | 212 | HANDLE hFile = NULL; |
229 | if (stream!=NULL) | 213 | if (stream!=NULL) |
@@ -243,8 +227,7 @@ uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* b | |||
243 | return ret; | 227 | return ret; |
244 | } | 228 | } |
245 | 229 | ||
246 | static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *newPos, DWORD dwMoveMethod) | 230 | static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *newPos, DWORD dwMoveMethod) { |
247 | { | ||
248 | #ifdef IOWIN32_USING_WINRT_API | 231 | #ifdef IOWIN32_USING_WINRT_API |
249 | return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod); | 232 | return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod); |
250 | #else | 233 | #else |
@@ -263,8 +246,7 @@ static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *n | |||
263 | #endif | 246 | #endif |
264 | } | 247 | } |
265 | 248 | ||
266 | long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream) | 249 | long ZCALLBACK win32_tell_file_func(voidpf opaque, voidpf stream) { |
267 | { | ||
268 | long ret=-1; | 250 | long ret=-1; |
269 | HANDLE hFile = NULL; | 251 | HANDLE hFile = NULL; |
270 | if (stream!=NULL) | 252 | if (stream!=NULL) |
@@ -286,8 +268,7 @@ long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream) | |||
286 | return ret; | 268 | return ret; |
287 | } | 269 | } |
288 | 270 | ||
289 | ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream) | 271 | ZPOS64_T ZCALLBACK win32_tell64_file_func(voidpf opaque, voidpf stream) { |
290 | { | ||
291 | ZPOS64_T ret= (ZPOS64_T)-1; | 272 | ZPOS64_T ret= (ZPOS64_T)-1; |
292 | HANDLE hFile = NULL; | 273 | HANDLE hFile = NULL; |
293 | if (stream!=NULL) | 274 | if (stream!=NULL) |
@@ -311,8 +292,7 @@ ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream) | |||
311 | } | 292 | } |
312 | 293 | ||
313 | 294 | ||
314 | long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,int origin) | 295 | long ZCALLBACK win32_seek_file_func(voidpf opaque, voidpf stream, uLong offset, int origin) { |
315 | { | ||
316 | DWORD dwMoveMethod=0xFFFFFFFF; | 296 | DWORD dwMoveMethod=0xFFFFFFFF; |
317 | HANDLE hFile = NULL; | 297 | HANDLE hFile = NULL; |
318 | 298 | ||
@@ -349,8 +329,7 @@ long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,in | |||
349 | return ret; | 329 | return ret; |
350 | } | 330 | } |
351 | 331 | ||
352 | long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin) | 332 | long ZCALLBACK win32_seek64_file_func(voidpf opaque, voidpf stream, ZPOS64_T offset, int origin) { |
353 | { | ||
354 | DWORD dwMoveMethod=0xFFFFFFFF; | 333 | DWORD dwMoveMethod=0xFFFFFFFF; |
355 | HANDLE hFile = NULL; | 334 | HANDLE hFile = NULL; |
356 | long ret=-1; | 335 | long ret=-1; |
@@ -388,8 +367,7 @@ long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T off | |||
388 | return ret; | 367 | return ret; |
389 | } | 368 | } |
390 | 369 | ||
391 | int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream) | 370 | int ZCALLBACK win32_close_file_func(voidpf opaque, voidpf stream) { |
392 | { | ||
393 | int ret=-1; | 371 | int ret=-1; |
394 | 372 | ||
395 | if (stream!=NULL) | 373 | if (stream!=NULL) |
@@ -406,8 +384,7 @@ int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream) | |||
406 | return ret; | 384 | return ret; |
407 | } | 385 | } |
408 | 386 | ||
409 | int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream) | 387 | int ZCALLBACK win32_error_file_func(voidpf opaque, voidpf stream) { |
410 | { | ||
411 | int ret=-1; | 388 | int ret=-1; |
412 | if (stream!=NULL) | 389 | if (stream!=NULL) |
413 | { | 390 | { |
@@ -416,8 +393,7 @@ int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream) | |||
416 | return ret; | 393 | return ret; |
417 | } | 394 | } |
418 | 395 | ||
419 | void fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def) | 396 | void fill_win32_filefunc(zlib_filefunc_def* pzlib_filefunc_def) { |
420 | { | ||
421 | pzlib_filefunc_def->zopen_file = win32_open_file_func; | 397 | pzlib_filefunc_def->zopen_file = win32_open_file_func; |
422 | pzlib_filefunc_def->zread_file = win32_read_file_func; | 398 | pzlib_filefunc_def->zread_file = win32_read_file_func; |
423 | pzlib_filefunc_def->zwrite_file = win32_write_file_func; | 399 | pzlib_filefunc_def->zwrite_file = win32_write_file_func; |
@@ -428,8 +404,7 @@ void fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def) | |||
428 | pzlib_filefunc_def->opaque = NULL; | 404 | pzlib_filefunc_def->opaque = NULL; |
429 | } | 405 | } |
430 | 406 | ||
431 | void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def) | 407 | void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def) { |
432 | { | ||
433 | pzlib_filefunc_def->zopen64_file = win32_open64_file_func; | 408 | pzlib_filefunc_def->zopen64_file = win32_open64_file_func; |
434 | pzlib_filefunc_def->zread_file = win32_read_file_func; | 409 | pzlib_filefunc_def->zread_file = win32_read_file_func; |
435 | pzlib_filefunc_def->zwrite_file = win32_write_file_func; | 410 | pzlib_filefunc_def->zwrite_file = win32_write_file_func; |
@@ -441,8 +416,7 @@ void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def) | |||
441 | } | 416 | } |
442 | 417 | ||
443 | 418 | ||
444 | void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def) | 419 | void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def) { |
445 | { | ||
446 | pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA; | 420 | pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA; |
447 | pzlib_filefunc_def->zread_file = win32_read_file_func; | 421 | pzlib_filefunc_def->zread_file = win32_read_file_func; |
448 | pzlib_filefunc_def->zwrite_file = win32_write_file_func; | 422 | pzlib_filefunc_def->zwrite_file = win32_write_file_func; |
@@ -454,8 +428,7 @@ void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def) | |||
454 | } | 428 | } |
455 | 429 | ||
456 | 430 | ||
457 | void fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def) | 431 | void fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def) { |
458 | { | ||
459 | pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW; | 432 | pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW; |
460 | pzlib_filefunc_def->zread_file = win32_read_file_func; | 433 | pzlib_filefunc_def->zread_file = win32_read_file_func; |
461 | pzlib_filefunc_def->zwrite_file = win32_write_file_func; | 434 | pzlib_filefunc_def->zwrite_file = win32_write_file_func; |