Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get the portable installer building on 64bits

Browse Source
This commit is contained in:
Kovid Goyal 2021-12-24 11:29:00 +05:30
parent 2d0429ebce
commit ecf9f103d6
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 372 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bypy/windows/XUnzip.cpp
View File

@ -91,9 +91,6 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define _USE_32BIT_TIME_T //+++1.2
#define STRICT #define STRICT
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
@ -3839,9 +3836,9 @@ int unzReadCurrentFile (unzFile file, void *buf, unsigned len);
int unzCloseCurrentFile (unzFile file); int unzCloseCurrentFile (unzFile file);
FILETIME timet2filetime(time_t timer) FILETIME timet2filetime(__time32_t timer)
{ {
struct tm *tm = gmtime(&timer); struct tm *tm = _gmtime32(&timer);
SYSTEMTIME st; SYSTEMTIME st;
st.wYear = (WORD)(tm->tm_year+1900); st.wYear = (WORD)(tm->tm_year+1900);
st.wMonth = (WORD)(tm->tm_mon+1); st.wMonth = (WORD)(tm->tm_mon+1);
@ -3969,15 +3966,15 @@ ZRESULT TUnzip::Get(int index,ZIPENTRY *ze)
bool hasctime = (flags&4)!=0; bool hasctime = (flags&4)!=0;
epos+=5; epos+=5;
if (hasmtime) if (hasmtime)
{ time_t mtime = *(time_t*)(extra+epos); epos+=4; { __time32_t mtime = *(__time32_t*)(extra+epos); epos+=4;
ze->mtime = timet2filetime(mtime); ze->mtime = timet2filetime(mtime);
} }
if (hasatime) if (hasatime)
{ time_t atime = *(time_t*)(extra+epos); epos+=4; { __time32_t atime = *(__time32_t*)(extra+epos); epos+=4;
ze->atime = timet2filetime(atime); ze->atime = timet2filetime(atime);
} }
if (hasctime) if (hasctime)
{ time_t ctime = *(time_t*)(extra+epos); { __time32_t ctime = *(__time32_t*)(extra+epos);
ze->ctime = timet2filetime(ctime); ze->ctime = timet2filetime(ctime);
} }
break; break;
@ -4375,5 +4372,3 @@ bool IsZipHandleU(HZIP hz)
TUnzipHandleData *han = (TUnzipHandleData*)hz; TUnzipHandleData *han = (TUnzipHandleData*)hz;
return (han->flag==1); return (han->flag==1);
} }