Update ZLib support
parent
53232e153d
commit
4f79ff7dea
BIN
lib/zlib.lib
BIN
lib/zlib.lib
Binary file not shown.
Binary file not shown.
2
main.cpp
2
main.cpp
|
@ -7,7 +7,7 @@ int main()
|
||||||
cout<<"Program Start!"<<endl;
|
cout<<"Program Start!"<<endl;
|
||||||
|
|
||||||
Weather w=Weather::GetWeather("%E5%A4%A9%E6%B4%A5");
|
Weather w=Weather::GetWeather("%E5%A4%A9%E6%B4%A5");
|
||||||
cout<<w.isReady()<<endl;
|
cout<<"Weather Ready Status: "<<w.isReady()<<endl;
|
||||||
|
|
||||||
cout<<"Program Finished."<<endl;
|
cout<<"Program Finished."<<endl;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -19,6 +19,7 @@ bool Weather::isReady() const
|
||||||
return _status>=0;
|
return _status>=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// static
|
||||||
Weather Weather::GetWeather(const std::string& CityName)
|
Weather Weather::GetWeather(const std::string& CityName)
|
||||||
{
|
{
|
||||||
Weather w;
|
Weather w;
|
||||||
|
@ -74,8 +75,8 @@ Weather Weather::GetWeather(const std::string& CityName)
|
||||||
#undef WeatherReadTime
|
#undef WeatherReadTime
|
||||||
#undef WeatherReadFrom
|
#undef WeatherReadFrom
|
||||||
|
|
||||||
w.suggestion=string(environNode->first_node("suggest")->value());
|
w.suggestion=string(environNode->first_node("suggest")->value(),environNode->first_node("suggest")->value_size());
|
||||||
w.quality=string(environNode->first_node("quality")->value());
|
w.quality=string(environNode->first_node("quality")->value(),environNode->first_node("quality")->value_size());
|
||||||
|
|
||||||
w._status=1;
|
w._status=1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
#ifndef dprintf
|
#ifndef dprintf
|
||||||
/// Debug Output API
|
/// Debug Output API
|
||||||
#define dprintf(fmt,args...) printf(fmt,##args)
|
#define dprintf(fmt,args...) printf("%s: ",__PRETTY_FUNCTION__);printf(fmt,##args)
|
||||||
#endif /// End of dprintf
|
#endif /// End of dprintf
|
||||||
#else
|
#else
|
||||||
#ifndef dprintf
|
#ifndef dprintf
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/* zconf.h -- configuration of the zlib compression library
|
/* zconf.h -- configuration of the zlib compression library
|
||||||
* Copyright (C) 1995-2005 Jean-loup Gailly.
|
* Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
|
||||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -11,52 +11,158 @@
|
||||||
/*
|
/*
|
||||||
* If you *really* need a unique prefix for all types and library functions,
|
* If you *really* need a unique prefix for all types and library functions,
|
||||||
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
|
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
|
||||||
|
* Even better than compiling with -DZ_PREFIX would be to use configure to set
|
||||||
|
* this permanently in zconf.h using "./configure --zprefix".
|
||||||
*/
|
*/
|
||||||
#ifdef Z_PREFIX
|
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
|
||||||
# define deflateInit_ z_deflateInit_
|
# define Z_PREFIX_SET
|
||||||
|
|
||||||
|
/* all linked symbols and init macros */
|
||||||
|
# define _dist_code z__dist_code
|
||||||
|
# define _length_code z__length_code
|
||||||
|
# define _tr_align z__tr_align
|
||||||
|
# define _tr_flush_bits z__tr_flush_bits
|
||||||
|
# define _tr_flush_block z__tr_flush_block
|
||||||
|
# define _tr_init z__tr_init
|
||||||
|
# define _tr_stored_block z__tr_stored_block
|
||||||
|
# define _tr_tally z__tr_tally
|
||||||
|
# define adler32 z_adler32
|
||||||
|
# define adler32_combine z_adler32_combine
|
||||||
|
# define adler32_combine64 z_adler32_combine64
|
||||||
|
# define adler32_z z_adler32_z
|
||||||
|
# ifndef Z_SOLO
|
||||||
|
# define compress z_compress
|
||||||
|
# define compress2 z_compress2
|
||||||
|
# define compressBound z_compressBound
|
||||||
|
# endif
|
||||||
|
# define crc32 z_crc32
|
||||||
|
# define crc32_combine z_crc32_combine
|
||||||
|
# define crc32_combine64 z_crc32_combine64
|
||||||
|
# define crc32_z z_crc32_z
|
||||||
# define deflate z_deflate
|
# define deflate z_deflate
|
||||||
# define deflateEnd z_deflateEnd
|
|
||||||
# define inflateInit_ z_inflateInit_
|
|
||||||
# define inflate z_inflate
|
|
||||||
# define inflateEnd z_inflateEnd
|
|
||||||
# define deflateInit2_ z_deflateInit2_
|
|
||||||
# define deflateSetDictionary z_deflateSetDictionary
|
|
||||||
# define deflateCopy z_deflateCopy
|
|
||||||
# define deflateReset z_deflateReset
|
|
||||||
# define deflateParams z_deflateParams
|
|
||||||
# define deflateBound z_deflateBound
|
# define deflateBound z_deflateBound
|
||||||
|
# define deflateCopy z_deflateCopy
|
||||||
|
# define deflateEnd z_deflateEnd
|
||||||
|
# define deflateGetDictionary z_deflateGetDictionary
|
||||||
|
# define deflateInit z_deflateInit
|
||||||
|
# define deflateInit2 z_deflateInit2
|
||||||
|
# define deflateInit2_ z_deflateInit2_
|
||||||
|
# define deflateInit_ z_deflateInit_
|
||||||
|
# define deflateParams z_deflateParams
|
||||||
|
# define deflatePending z_deflatePending
|
||||||
# define deflatePrime z_deflatePrime
|
# define deflatePrime z_deflatePrime
|
||||||
|
# define deflateReset z_deflateReset
|
||||||
|
# define deflateResetKeep z_deflateResetKeep
|
||||||
|
# define deflateSetDictionary z_deflateSetDictionary
|
||||||
|
# define deflateSetHeader z_deflateSetHeader
|
||||||
|
# define deflateTune z_deflateTune
|
||||||
|
# define deflate_copyright z_deflate_copyright
|
||||||
|
# define get_crc_table z_get_crc_table
|
||||||
|
# ifndef Z_SOLO
|
||||||
|
# define gz_error z_gz_error
|
||||||
|
# define gz_intmax z_gz_intmax
|
||||||
|
# define gz_strwinerror z_gz_strwinerror
|
||||||
|
# define gzbuffer z_gzbuffer
|
||||||
|
# define gzclearerr z_gzclearerr
|
||||||
|
# define gzclose z_gzclose
|
||||||
|
# define gzclose_r z_gzclose_r
|
||||||
|
# define gzclose_w z_gzclose_w
|
||||||
|
# define gzdirect z_gzdirect
|
||||||
|
# define gzdopen z_gzdopen
|
||||||
|
# define gzeof z_gzeof
|
||||||
|
# define gzerror z_gzerror
|
||||||
|
# define gzflush z_gzflush
|
||||||
|
# define gzfread z_gzfread
|
||||||
|
# define gzfwrite z_gzfwrite
|
||||||
|
# define gzgetc z_gzgetc
|
||||||
|
# define gzgetc_ z_gzgetc_
|
||||||
|
# define gzgets z_gzgets
|
||||||
|
# define gzoffset z_gzoffset
|
||||||
|
# define gzoffset64 z_gzoffset64
|
||||||
|
# define gzopen z_gzopen
|
||||||
|
# define gzopen64 z_gzopen64
|
||||||
|
# ifdef _WIN32
|
||||||
|
# define gzopen_w z_gzopen_w
|
||||||
|
# endif
|
||||||
|
# define gzprintf z_gzprintf
|
||||||
|
# define gzputc z_gzputc
|
||||||
|
# define gzputs z_gzputs
|
||||||
|
# define gzread z_gzread
|
||||||
|
# define gzrewind z_gzrewind
|
||||||
|
# define gzseek z_gzseek
|
||||||
|
# define gzseek64 z_gzseek64
|
||||||
|
# define gzsetparams z_gzsetparams
|
||||||
|
# define gztell z_gztell
|
||||||
|
# define gztell64 z_gztell64
|
||||||
|
# define gzungetc z_gzungetc
|
||||||
|
# define gzvprintf z_gzvprintf
|
||||||
|
# define gzwrite z_gzwrite
|
||||||
|
# endif
|
||||||
|
# define inflate z_inflate
|
||||||
|
# define inflateBack z_inflateBack
|
||||||
|
# define inflateBackEnd z_inflateBackEnd
|
||||||
|
# define inflateBackInit z_inflateBackInit
|
||||||
|
# define inflateBackInit_ z_inflateBackInit_
|
||||||
|
# define inflateCodesUsed z_inflateCodesUsed
|
||||||
|
# define inflateCopy z_inflateCopy
|
||||||
|
# define inflateEnd z_inflateEnd
|
||||||
|
# define inflateGetDictionary z_inflateGetDictionary
|
||||||
|
# define inflateGetHeader z_inflateGetHeader
|
||||||
|
# define inflateInit z_inflateInit
|
||||||
|
# define inflateInit2 z_inflateInit2
|
||||||
# define inflateInit2_ z_inflateInit2_
|
# define inflateInit2_ z_inflateInit2_
|
||||||
|
# define inflateInit_ z_inflateInit_
|
||||||
|
# define inflateMark z_inflateMark
|
||||||
|
# define inflatePrime z_inflatePrime
|
||||||
|
# define inflateReset z_inflateReset
|
||||||
|
# define inflateReset2 z_inflateReset2
|
||||||
|
# define inflateResetKeep z_inflateResetKeep
|
||||||
# define inflateSetDictionary z_inflateSetDictionary
|
# define inflateSetDictionary z_inflateSetDictionary
|
||||||
# define inflateSync z_inflateSync
|
# define inflateSync z_inflateSync
|
||||||
# define inflateSyncPoint z_inflateSyncPoint
|
# define inflateSyncPoint z_inflateSyncPoint
|
||||||
# define inflateCopy z_inflateCopy
|
# define inflateUndermine z_inflateUndermine
|
||||||
# define inflateReset z_inflateReset
|
# define inflateValidate z_inflateValidate
|
||||||
# define inflateBack z_inflateBack
|
# define inflate_copyright z_inflate_copyright
|
||||||
# define inflateBackEnd z_inflateBackEnd
|
# define inflate_fast z_inflate_fast
|
||||||
# define compress z_compress
|
# define inflate_table z_inflate_table
|
||||||
# define compress2 z_compress2
|
# ifndef Z_SOLO
|
||||||
# define compressBound z_compressBound
|
# define uncompress z_uncompress
|
||||||
# define uncompress z_uncompress
|
# define uncompress2 z_uncompress2
|
||||||
# define adler32 z_adler32
|
# endif
|
||||||
# define crc32 z_crc32
|
|
||||||
# define get_crc_table z_get_crc_table
|
|
||||||
# define zError z_zError
|
# define zError z_zError
|
||||||
|
# ifndef Z_SOLO
|
||||||
|
# define zcalloc z_zcalloc
|
||||||
|
# define zcfree z_zcfree
|
||||||
|
# endif
|
||||||
|
# define zlibCompileFlags z_zlibCompileFlags
|
||||||
|
# define zlibVersion z_zlibVersion
|
||||||
|
|
||||||
# define alloc_func z_alloc_func
|
/* all zlib typedefs in zlib.h and zconf.h */
|
||||||
# define free_func z_free_func
|
|
||||||
# define in_func z_in_func
|
|
||||||
# define out_func z_out_func
|
|
||||||
# define Byte z_Byte
|
# define Byte z_Byte
|
||||||
# define uInt z_uInt
|
|
||||||
# define uLong z_uLong
|
|
||||||
# define Bytef z_Bytef
|
# define Bytef z_Bytef
|
||||||
|
# define alloc_func z_alloc_func
|
||||||
# define charf z_charf
|
# define charf z_charf
|
||||||
|
# define free_func z_free_func
|
||||||
|
# ifndef Z_SOLO
|
||||||
|
# define gzFile z_gzFile
|
||||||
|
# endif
|
||||||
|
# define gz_header z_gz_header
|
||||||
|
# define gz_headerp z_gz_headerp
|
||||||
|
# define in_func z_in_func
|
||||||
# define intf z_intf
|
# define intf z_intf
|
||||||
|
# define out_func z_out_func
|
||||||
|
# define uInt z_uInt
|
||||||
# define uIntf z_uIntf
|
# define uIntf z_uIntf
|
||||||
|
# define uLong z_uLong
|
||||||
# define uLongf z_uLongf
|
# define uLongf z_uLongf
|
||||||
# define voidpf z_voidpf
|
|
||||||
# define voidp z_voidp
|
# define voidp z_voidp
|
||||||
|
# define voidpc z_voidpc
|
||||||
|
# define voidpf z_voidpf
|
||||||
|
|
||||||
|
/* all zlib structs in zlib.h and zconf.h */
|
||||||
|
# define gz_header_s z_gz_header_s
|
||||||
|
# define internal_state z_internal_state
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__MSDOS__) && !defined(MSDOS)
|
#if defined(__MSDOS__) && !defined(MSDOS)
|
||||||
|
@ -125,9 +231,25 @@
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Some Mac compilers merge all .h files incorrectly: */
|
#if defined(ZLIB_CONST) && !defined(z_const)
|
||||||
#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
|
# define z_const const
|
||||||
# define NO_DUMMY_DECL
|
#else
|
||||||
|
# define z_const
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef Z_SOLO
|
||||||
|
typedef unsigned long z_size_t;
|
||||||
|
#else
|
||||||
|
# define z_longlong long long
|
||||||
|
# if defined(NO_SIZE_T)
|
||||||
|
typedef unsigned NO_SIZE_T z_size_t;
|
||||||
|
# elif defined(STDC)
|
||||||
|
# include <stddef.h>
|
||||||
|
typedef size_t z_size_t;
|
||||||
|
# else
|
||||||
|
typedef unsigned long z_size_t;
|
||||||
|
# endif
|
||||||
|
# undef z_longlong
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Maximum value for memLevel in deflateInit2 */
|
/* Maximum value for memLevel in deflateInit2 */
|
||||||
|
@ -157,7 +279,7 @@
|
||||||
Of course this will generally degrade compression (there's no free lunch).
|
Of course this will generally degrade compression (there's no free lunch).
|
||||||
|
|
||||||
The memory requirements for inflate are (in bytes) 1 << windowBits
|
The memory requirements for inflate are (in bytes) 1 << windowBits
|
||||||
that is, 32K for windowBits=15 (default value) plus a few kilobytes
|
that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
|
||||||
for small objects.
|
for small objects.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -171,6 +293,14 @@
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef Z_ARG /* function prototypes for stdarg */
|
||||||
|
# if defined(STDC) || defined(Z_HAVE_STDARG_H)
|
||||||
|
# define Z_ARG(args) args
|
||||||
|
# else
|
||||||
|
# define Z_ARG(args) ()
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/* The following definitions for FAR are needed only for MSDOS mixed
|
/* The following definitions for FAR are needed only for MSDOS mixed
|
||||||
* model programming (small or medium model with some far allocations).
|
* model programming (small or medium model with some far allocations).
|
||||||
* This was tested only with MSC; for other MSDOS compilers you may have
|
* This was tested only with MSC; for other MSDOS compilers you may have
|
||||||
|
@ -284,49 +414,121 @@ typedef uLong FAR uLongf;
|
||||||
typedef Byte *voidp;
|
typedef Byte *voidp;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if 1 /* HAVE_UNISTD_H -- this line is updated by ./configure */
|
#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
|
||||||
# include <sys/types.h> /* for off_t */
|
# include <limits.h>
|
||||||
# include <unistd.h> /* for SEEK_* and off_t */
|
# if (UINT_MAX == 0xffffffffUL)
|
||||||
# ifdef VMS
|
# define Z_U4 unsigned
|
||||||
# include <unixio.h> /* for off_t */
|
# elif (ULONG_MAX == 0xffffffffUL)
|
||||||
|
# define Z_U4 unsigned long
|
||||||
|
# elif (USHRT_MAX == 0xffffffffUL)
|
||||||
|
# define Z_U4 unsigned short
|
||||||
# endif
|
# endif
|
||||||
# define z_off_t off_t
|
|
||||||
#endif
|
#endif
|
||||||
#ifndef SEEK_SET
|
|
||||||
|
#ifdef Z_U4
|
||||||
|
typedef Z_U4 z_crc_t;
|
||||||
|
#else
|
||||||
|
typedef unsigned long z_crc_t;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
|
||||||
|
# define Z_HAVE_UNISTD_H
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
|
||||||
|
# define Z_HAVE_STDARG_H
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef STDC
|
||||||
|
# ifndef Z_SOLO
|
||||||
|
# include <sys/types.h> /* for off_t */
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(STDC) || defined(Z_HAVE_STDARG_H)
|
||||||
|
# ifndef Z_SOLO
|
||||||
|
# include <stdarg.h> /* for va_list */
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
# ifndef Z_SOLO
|
||||||
|
# include <stddef.h> /* for wchar_t */
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
|
||||||
|
* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
|
||||||
|
* though the former does not conform to the LFS document), but considering
|
||||||
|
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
|
||||||
|
* equivalently requesting no 64-bit operations
|
||||||
|
*/
|
||||||
|
#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
|
||||||
|
# undef _LARGEFILE64_SOURCE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
|
||||||
|
# define Z_HAVE_UNISTD_H
|
||||||
|
#endif
|
||||||
|
#ifndef Z_SOLO
|
||||||
|
# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
|
||||||
|
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
|
||||||
|
# ifdef VMS
|
||||||
|
# include <unixio.h> /* for off_t */
|
||||||
|
# endif
|
||||||
|
# ifndef z_off_t
|
||||||
|
# define z_off_t off_t
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
|
||||||
|
# define Z_LFS64
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
|
||||||
|
# define Z_LARGE64
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
|
||||||
|
# define Z_WANT64
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(SEEK_SET) && !defined(Z_SOLO)
|
||||||
# define SEEK_SET 0 /* Seek from beginning of file. */
|
# define SEEK_SET 0 /* Seek from beginning of file. */
|
||||||
# define SEEK_CUR 1 /* Seek from current position. */
|
# define SEEK_CUR 1 /* Seek from current position. */
|
||||||
# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
|
# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef z_off_t
|
#ifndef z_off_t
|
||||||
# define z_off_t long
|
# define z_off_t long
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__OS400__)
|
#if !defined(_WIN32) && defined(Z_LARGE64)
|
||||||
# define NO_vsnprintf
|
# define z_off64_t off64_t
|
||||||
#endif
|
#else
|
||||||
|
# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
|
||||||
#if defined(__MVS__)
|
# define z_off64_t __int64
|
||||||
# define NO_vsnprintf
|
# else
|
||||||
# ifdef FAR
|
# define z_off64_t z_off_t
|
||||||
# undef FAR
|
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* MVS linker does not support external names larger than 8 bytes */
|
/* MVS linker does not support external names larger than 8 bytes */
|
||||||
#if defined(__MVS__)
|
#if defined(__MVS__)
|
||||||
# pragma map(deflateInit_,"DEIN")
|
#pragma map(deflateInit_,"DEIN")
|
||||||
# pragma map(deflateInit2_,"DEIN2")
|
#pragma map(deflateInit2_,"DEIN2")
|
||||||
# pragma map(deflateEnd,"DEEND")
|
#pragma map(deflateEnd,"DEEND")
|
||||||
# pragma map(deflateBound,"DEBND")
|
#pragma map(deflateBound,"DEBND")
|
||||||
# pragma map(inflateInit_,"ININ")
|
#pragma map(inflateInit_,"ININ")
|
||||||
# pragma map(inflateInit2_,"ININ2")
|
#pragma map(inflateInit2_,"ININ2")
|
||||||
# pragma map(inflateEnd,"INEND")
|
#pragma map(inflateEnd,"INEND")
|
||||||
# pragma map(inflateSync,"INSY")
|
#pragma map(inflateSync,"INSY")
|
||||||
# pragma map(inflateSetDictionary,"INSEDI")
|
#pragma map(inflateSetDictionary,"INSEDI")
|
||||||
# pragma map(compressBound,"CMBND")
|
#pragma map(compressBound,"CMBND")
|
||||||
# pragma map(inflate_table,"INTABL")
|
#pragma map(inflate_table,"INTABL")
|
||||||
# pragma map(inflate_fast,"INFA")
|
#pragma map(inflate_fast,"INFA")
|
||||||
# pragma map(inflate_copyright,"INCOPY")
|
#pragma map(inflate_copyright,"INCOPY")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* ZCONF_H */
|
#endif /* ZCONF_H */
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
165
src/util.cpp
165
src/util.cpp
|
@ -8,9 +8,14 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <list>
|
||||||
|
#include <stack>
|
||||||
|
#include <algorithm>
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
#include <ws2tcpip.h>
|
#include <ws2tcpip.h>
|
||||||
|
|
||||||
|
#define ZLIB_WINAPI
|
||||||
#include "zlib/zlib.h"
|
#include "zlib/zlib.h"
|
||||||
|
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
@ -388,6 +393,7 @@ int HTTPRequest::send(HTTPResponse& _out_res)
|
||||||
res.content=response_str.substr(sidx);
|
res.content=response_str.substr(sidx);
|
||||||
|
|
||||||
std::string response_header=response_str.substr(0,sidx-4);
|
std::string response_header=response_str.substr(0,sidx-4);
|
||||||
|
dprintf("ResponseHeader:\n%s\n",response_header.c_str());
|
||||||
|
|
||||||
auto kidx=std::string::npos;
|
auto kidx=std::string::npos;
|
||||||
if((kidx=response_header.find("HTTP/1.1"))!=std::string::npos)
|
if((kidx=response_header.find("HTTP/1.1"))!=std::string::npos)
|
||||||
|
@ -441,6 +447,13 @@ int HTTPRequest::send(HTTPResponse& _out_res)
|
||||||
{
|
{
|
||||||
/// GZIP encoding method. Call GZDecompress!!!
|
/// GZIP encoding method. Call GZDecompress!!!
|
||||||
res.content=GZDecompress(res.content);
|
res.content=GZDecompress(res.content);
|
||||||
|
if(res.content.empty())
|
||||||
|
{
|
||||||
|
dprintf("Failed to decompress content.\n");
|
||||||
|
return -17;
|
||||||
|
}
|
||||||
|
|
||||||
|
res.content_length=res.content.size();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -455,47 +468,145 @@ int HTTPRequest::send(HTTPResponse& _out_res)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// TODO:
|
/// From CSDN
|
||||||
static int _gz_decompress_count(const char* input,int inputsz,int* poutputsz)
|
/* Uncompress gzip data */
|
||||||
|
int _gz_decompress_real(Byte *zdata, uLong nzdata,
|
||||||
|
Byte *data, uLong *ndata)
|
||||||
{
|
{
|
||||||
return 0;
|
int err = 0;
|
||||||
}
|
z_stream d_stream = {0}; /* decompression stream */
|
||||||
|
static char dummy_head[2] =
|
||||||
|
{
|
||||||
|
0x8 + 0x7 * 0x10,
|
||||||
|
(((0x8 + 0x7 * 0x10) * 0x100 + 30) / 31 * 31) & 0xFF,
|
||||||
|
};
|
||||||
|
d_stream.zalloc = (alloc_func)0;
|
||||||
|
d_stream.zfree = (free_func)0;
|
||||||
|
d_stream.opaque = (voidpf)0;
|
||||||
|
d_stream.next_in = zdata;
|
||||||
|
d_stream.avail_in = 0;
|
||||||
|
d_stream.next_out = data;
|
||||||
|
if(inflateInit2(&d_stream, MAX_WBITS+32) != Z_OK) return -1;
|
||||||
|
|
||||||
/// TODO:
|
/// Decompress Input Data by byte. (There must be some faster methods)
|
||||||
static int _gz_decompress_real(const char* input,int inputsz,char* output,int outputsz)
|
while (d_stream.total_out < *ndata && d_stream.total_in < nzdata) {
|
||||||
{
|
d_stream.avail_in = d_stream.avail_out = 1;
|
||||||
|
if((err = inflate(&d_stream, Z_NO_FLUSH)) == Z_STREAM_END) break;
|
||||||
|
if(err != Z_OK )
|
||||||
|
{
|
||||||
|
if(err == Z_DATA_ERROR)
|
||||||
|
{
|
||||||
|
d_stream.next_in = (Bytef*) dummy_head;
|
||||||
|
d_stream.avail_in = sizeof(dummy_head);
|
||||||
|
if((err = inflate(&d_stream, Z_NO_FLUSH)) != Z_OK)
|
||||||
|
{
|
||||||
|
/// Clean up.
|
||||||
|
if(inflateEnd(&d_stream)!=Z_OK)
|
||||||
|
return -2;
|
||||||
|
else
|
||||||
|
return -3;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(err==Z_BUF_ERROR)
|
||||||
|
{
|
||||||
|
/// Clean up.
|
||||||
|
if(inflateEnd(&d_stream)!=Z_OK)
|
||||||
|
return 1;
|
||||||
|
else
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/// Clean up.
|
||||||
|
if(inflateEnd(&d_stream)!=Z_OK)
|
||||||
|
return -4;
|
||||||
|
else
|
||||||
|
return -5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
err=inflate(&d_stream,Z_FINISH);
|
||||||
|
if(err==Z_BUF_ERROR)
|
||||||
|
{
|
||||||
|
/// Clean up.
|
||||||
|
if(inflateEnd(&d_stream) != Z_OK)
|
||||||
|
return 11;
|
||||||
|
else
|
||||||
|
return 12;
|
||||||
|
}
|
||||||
|
else if(err!=Z_OK&&err!=Z_STREAM_END)
|
||||||
|
{
|
||||||
|
/// Clean up.
|
||||||
|
if(inflateEnd(&d_stream) != Z_OK)
|
||||||
|
return -15;
|
||||||
|
else
|
||||||
|
return -16;
|
||||||
|
}
|
||||||
|
|
||||||
|
uLong total_out=d_stream.total_out;
|
||||||
|
|
||||||
|
/// Clean up.
|
||||||
|
if(inflateEnd(&d_stream) != Z_OK) return -10;
|
||||||
|
|
||||||
|
*ndata = total_out;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string GZDecompress(const std::string& InputStr)
|
std::string GZDecompress(const std::string& InputStr)
|
||||||
{
|
{
|
||||||
int outputsz;
|
int ret;
|
||||||
if(_gz_decompress_count(InputStr.data(),InputStr.size(),&outputsz)!=0)
|
int inputSz=InputStr.size();
|
||||||
|
|
||||||
|
char* holder=(char*)malloc(inputSz+32);
|
||||||
|
if(!holder)
|
||||||
{
|
{
|
||||||
/// Failed to evaluate decompressed content size.
|
dprintf("Failed to malloc holder.\n");
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
memset(holder,0,inputSz+32);
|
||||||
|
memcpy(holder,InputStr.data(),inputSz);
|
||||||
|
|
||||||
char* pData=(char*)malloc(outputsz+32);
|
std::shared_ptr<char> sp;
|
||||||
if(!pData)
|
sp.reset(holder,free);
|
||||||
|
|
||||||
|
int rate=2;
|
||||||
|
do
|
||||||
{
|
{
|
||||||
/// Failed to malloc data.
|
uLong outSz=inputSz*rate+32;
|
||||||
return "";
|
dprintf("Try decompress with BufferLength: %d\n",(int)outSz);
|
||||||
}
|
|
||||||
|
|
||||||
std::shared_ptr<char> up;
|
char* buffer=(char*)malloc(outSz);
|
||||||
up.reset(pData,free);
|
if(!buffer)
|
||||||
|
{
|
||||||
|
dprintf("Failed to malloc buffer with size=%d\n",(int)outSz);
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
memset(buffer,0,outSz);
|
||||||
|
|
||||||
memset(pData,0,outputsz+32);
|
std::shared_ptr<char> xp;
|
||||||
|
xp.reset(buffer,free);
|
||||||
|
|
||||||
int ret=-1;
|
if((ret=_gz_decompress_real((Byte*)holder,inputSz,(Byte*)buffer,&outSz))!=0)
|
||||||
|
{
|
||||||
|
if(ret>0)
|
||||||
|
{
|
||||||
|
dprintf("Decompress Failed. Continue with ret %d\n",ret);
|
||||||
|
rate++;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
dprintf("Decompress Failed: ret=%d\n",ret);
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return std::string(buffer,outSz);
|
||||||
|
}
|
||||||
|
|
||||||
if((ret=_gz_decompress_real(InputStr.data(),InputStr.size(),pData,outputsz+32))!=0)
|
}while(true);
|
||||||
{
|
|
||||||
return "";
|
dprintf("Warning: Program should never reaches here.\n");
|
||||||
}
|
return "";
|
||||||
else
|
|
||||||
{
|
|
||||||
return std::string(pData);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
Reference in New Issue