diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-01-01 19:15:39 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-01-01 19:15:39 (GMT) |
| commit | ed907130be8d1febd42f6634573c9148a6a9969d (patch) | |
| tree | aea51eef2ca75a53cf572e338777dde86557b64d /compat/zlib/contrib/minizip/iowin32.c | |
| parent | 0da419c1878651e189021c9f6e13cd5824fac68d (diff) | |
| download | tcl-ed907130be8d1febd42f6634573c9148a6a9969d.zip tcl-ed907130be8d1febd42f6634573c9148a6a9969d.tar.gz tcl-ed907130be8d1febd42f6634573c9148a6a9969d.tar.bz2 | |
(cherry-pick): Update zlib to version 1.2.9. Dll's and *.lib files not updated yet
Diffstat (limited to 'compat/zlib/contrib/minizip/iowin32.c')
| -rw-r--r-- | compat/zlib/contrib/minizip/iowin32.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compat/zlib/contrib/minizip/iowin32.c b/compat/zlib/contrib/minizip/iowin32.c index a46d96c..274f39e 100644 --- a/compat/zlib/contrib/minizip/iowin32.c +++ b/compat/zlib/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; |