diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2013-08-03 18:13:23 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2013-08-03 18:13:23 -0700 |
| commit | 89e335abb49cd5c7d29d94e8f506d3f8ed71315a (patch) | |
| tree | 5b5f86a856eb4cb89b9af032ff2b261bfd6fc114 /contrib | |
| parent | 303d92cfee8ffccaf446ba0ca442ef905dc059e3 (diff) | |
| download | zlib-89e335abb49cd5c7d29d94e8f506d3f8ed71315a.tar.gz | |
Fix contrib/minizip to permit unzipping with desktop API [Zouzou].
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/minizip/iowin32.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c index a46d96c..274f39e 100644 --- a/contrib/minizip/iowin32.c +++ b/contrib/minizip/iowin32.c @@ -26,8 +26,9 @@ #endif +// see Include/shared/winapifamily.h in the Windows Kit #if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API))) -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) +#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP) #define IOWIN32_USING_WINRT_API 1 #endif #endif @@ -243,7 +244,7 @@ static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *n return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod); #else LONG lHigh = pos.HighPart; - DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, FILE_CURRENT); + DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, dwMoveMethod); BOOL fOk = TRUE; if (dwNewPos == 0xFFFFFFFF) if (GetLastError() != NO_ERROR) @@ -370,7 +371,7 @@ long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T off { LARGE_INTEGER pos; pos.QuadPart = offset; - if (!MySetFilePointerEx(hFile, pos, NULL, FILE_CURRENT)) + if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod)) { DWORD dwErr = GetLastError(); ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; |