diff options
| author | montellese <montellese@xbmc.org> | 2014-05-10 10:00:18 +0200 |
|---|---|---|
| committer | montellese <montellese@xbmc.org> | 2014-05-17 09:53:05 +0200 |
| commit | 8bc105b8f24add68d5e5c0456ba79c7999e30f58 (patch) | |
| tree | 65eab7bc50fde87d9ddebdd4816345b9f0d5abb6 /lib/libUPnP/Neptune | |
| parent | 45e2cb145358ae870ac712693862fa4ed93c4d81 (diff) | |
platinum update from 0.6.9.1 to 1.0.5.13
Diffstat (limited to 'lib/libUPnP/Neptune')
125 files changed, 18144 insertions, 862 deletions
diff --git a/lib/libUPnP/Neptune/Build/Boot.scons b/lib/libUPnP/Neptune/Build/Boot.scons index b3c52f3ee6..67e858ea2f 100644 --- a/lib/libUPnP/Neptune/Build/Boot.scons +++ b/lib/libUPnP/Neptune/Build/Boot.scons @@ -10,50 +10,45 @@ EnsureSConsVersion(0,98,1) # Platform to Target Map (specifies which default target to build on a platform) PLATFORM_TO_TARGET_MAP = { - 'linux-i386' : 'x86-unknown-linux', - 'linux-x86_64' : 'x86_64-unknown-linux', - 'linux2' : 'x86-unknown-linux', - 'linux-arm' : 'arm-unknown-linux', - 'win32' : 'x86-microsoft-win32', - 'cygwin' : 'x86-unknown-cygwin', - 'darwin' : 'universal-apple-macosx' + 'linux-i386' : 'x86-unknown-linux', + 'linux-x86_64': 'x86_64-unknown-linux', + 'linux-arm' : 'arm-unknown-linux', + 'linux2' : 'x86-unknown-linux', + 'win32' : 'x86-microsoft-win32', + 'cygwin' : 'x86-unknown-cygwin', + 'darwin' : 'universal-apple-macosx' } -CROSS_PLATFORMS = ['ppu-sony-ps3', - 'arm-unknown-linux', - 'mips-unknown-linux', - 'powerpc-unknown-linux', - 'arm-gp2x-linux', - 'mipsel-sigma-linux', - 'x86-unknown-mingw', - 'mipsel-broadcom-linux', - 'arm-android-linux', - 'sh4-st-linux'] +# list all target dirs +scons_root = Environment().GetBuildPath('#') +targets_dir = scons_root+'/Build/Targets' +targets_dirs = os.listdir(targets_dir) +TARGET_PLATFORMS = [x for x in targets_dirs if os.path.exists(targets_dir +'/'+x+'/Config.scons')] def DefaultTarget(): platform_id = sys.platform if platform.system() == 'Linux': if (platform.machine() == 'i386' or platform.machine() == 'i486' or - platform.machine() == 'i586' or + platform.machine() == 'i586'or platform.machine() == 'i686'): platform_id = 'linux-i386' if (platform.machine() == 'x86_64'): platform_id = 'linux-x86_64' - if (platform.machine() == 'arm'): + if (platform.machine().startswith('arm')): platform_id = 'linux-arm' - + if PLATFORM_TO_TARGET_MAP.has_key(platform_id): return PLATFORM_TO_TARGET_MAP[platform_id] - else: - return None + else: + return None ####################################################### # Main Build ####################################################### options = Variables() options.AddVariables( - EnumVariable('target', 'build target', DefaultTarget(), allowed_values=PLATFORM_TO_TARGET_MAP.values()+CROSS_PLATFORMS), + EnumVariable('target', 'Build Target', DefaultTarget(), allowed_values=TARGET_PLATFORMS), BoolVariable('stop_on_warning', 'Stop the build on warnings', False), ListVariable('build_config', 'build configurations', 'Debug', names=['Debug', 'Release']) ) diff --git a/lib/libUPnP/Neptune/Build/Build.scons b/lib/libUPnP/Neptune/Build/Build.scons index 20c5472a3b..9996e3d41a 100644 --- a/lib/libUPnP/Neptune/Build/Build.scons +++ b/lib/libUPnP/Neptune/Build/Build.scons @@ -176,10 +176,10 @@ LibraryModule(name = 'axTLS', extra_cpp_flags = [] if not env.has_key('NPT_CONFIG_NO_ZIP'): - extra_cpp_flags = ['NPT_CONFIG_ENABLE_ZIP'] + env.AppendUnique(CPPDEFINES=['NPT_CONFIG_ENABLE_ZIP']) if not env.has_key('NPT_CONFIG_NO_SSL'): - extra_cpp_flags += ['NPT_CONFIG_ENABLE_TLS'] + env.AppendUnique(CPPDEFINES=['NPT_CONFIG_ENABLE_TLS']) tls_data_dirs = ['Data/TLS'] tls_tests = ['Tls1'] else: @@ -189,10 +189,9 @@ else: LibraryModule(name = 'Neptune', build_source_dirs = ['Core']+tls_data_dirs, build_source_files = env['NPT_SYSTEM_SOURCES'], - extra_cpp_defines = extra_cpp_flags, linked_modules = env['NPT_EXTRA_LIBS']+['Zlib']+['axTLS']) -for app in ['NetPump', 'NetConfig', 'NetPing', 'NetEcho', 'NetGet', 'NetResolve', 'MiniHttpServer']: +for app in ['NetPump', 'NetConfig', 'NetPing', 'NetEcho', 'NetGet', 'NetResolve', 'NetBench', 'MiniHttpServer', 'ZipHttpServer']: Application(app, 'Source/Apps/'+app) tests = ['Arrays1', @@ -214,6 +213,7 @@ tests = ['Arrays1', 'Messages2', 'Url1', 'Zip1', + 'Zip2', 'Time1', 'Sockets1', 'FileTest1', diff --git a/lib/libUPnP/Neptune/Build/Targets/any-blackberry-qnx/Config.scons b/lib/libUPnP/Neptune/Build/Targets/any-blackberry-qnx/Config.scons new file mode 100644 index 0000000000..38675af353 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/any-blackberry-qnx/Config.scons @@ -0,0 +1,23 @@ +### compiler flags +env.AppendUnique(CCFLAGS = ['-w9']) +env.AppendUnique(CFLAGS = []) +env.AppendUnique(CPPFLAGS = []) + +if env['build_config'] == 'Debug': + env.AppendUnique(CCFLAGS = '-g') +else: + env.AppendUnique(CCFLAGS = '-O') + +env['ARCOM'] = 'qcc -A $TARGET $SOURCES' +env['RANLIB'] = 'echo' +env['CC'] = 'qcc -lang-c' +env['CXX'] = 'qcc -lang-c++' +env['LINK'] = 'qcc -lang-c++' + +env['ENV']['PATH'] = os.environ['PATH'] + ':' + env['ENV']['PATH'] +env['ENV']['QNX_HOST'] = os.environ['QNX_HOST'] +env['ENV']['QNX_TARGET'] = os.environ['QNX_TARGET'] + +### Neptune System Files +env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullSerialPort.cpp'} +env['NPT_EXTRA_LIBS']=['m', 'socket'] diff --git a/lib/libUPnP/Neptune/Build/Targets/any-google-pnacl/Config.scons b/lib/libUPnP/Neptune/Build/Targets/any-google-pnacl/Config.scons new file mode 100644 index 0000000000..574ef35906 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/any-google-pnacl/Config.scons @@ -0,0 +1,13 @@ +### Compiler settings +#LoadTool('gcc-generic', env, gcc_cross_prefix='pnacl', gcc_strict=False) +env['ENV']['PATH'] = os.environ['PATH'] + ':' + env['ENV']['PATH'] + +env['CC'] = 'pnacl-clang' +env['CXX'] = 'pnacl-clang++' +env['LINK'] = 'pnacl-clang++' +env['RANLIB'] = 'pnacl-ranlib' +env['AR'] = 'pnacl-ar' + +### Neptune System Files +env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Posix':'NptPosixThreads.cpp NptPosixSystem.cpp', 'System/Nacl':'*.cpp', 'System/Null':'NptNullSerialPort.cpp'} +env['NPT_EXTRA_LIBS']=['m', 'pthread'] diff --git a/lib/libUPnP/Neptune/Build/Targets/arm-android-linux/Config.scons b/lib/libUPnP/Neptune/Build/Targets/arm-android-linux/Config.scons index 5ef8f6c36b..5abdeedb4f 100644 --- a/lib/libUPnP/Neptune/Build/Targets/arm-android-linux/Config.scons +++ b/lib/libUPnP/Neptune/Build/Targets/arm-android-linux/Config.scons @@ -1,124 +1,110 @@ +################################################################# +# Important: this build file has been tested with Android NDK r6, r7 and r8 +# It may or may not work with other releases of the NDK. Please notify +# us if you find a newer NDK for which this does not work. +################################################################# + import os import re import sys import platform +# we need to know when the NDK is ANDROID_NDK_ROOT=os.getenv('ANDROID_NDK_ROOT') if not ANDROID_NDK_ROOT: raise Exception('ANDROID_NDK_ROOT environment variable not set') -ANRDOID_NDK_OUT=ANDROID_NDK_ROOT+'/out' -ANDROID_TOOLCHAIN='arm-linux-androideabi-4.4.3' -if env.has_key('target_variant') and env['target_variant']: - ANDROID_PLATFORM=env['target_variant'] +# detect the host system on which we're running +if env.has_key('android_host_system') and env['android_host_system']: + ANDROID_HOST_SYSTEM = env['android_host_system'] else: - ANDROID_PLATFORM='android-9' -print 'Building for: ', ANDROID_PLATFORM, ANDROID_TOOLCHAIN - -### figure out the host config -try: - host_config = open(ANRDOID_NDK_OUT+'/host/config.mk') - HOST_CONFIG={} - for line in host_config.readlines(): - pair = re.split('\s+:=\s+', line); - if len(pair) == 2: - HOST_CONFIG[pair[0]] = pair[1].rstrip() - - host_config.close() -except: - platform_map = {'linux2':'linux-x86', 'darwin':'darwin-x86', 'cygwin':'windows'} - if sys.platform not in platform_map: - raise Exception('Unrecognized host platform') - HOST_CONFIG={'HOST_TAG':platform_map[sys.platform]} - -### check the android toolchain -ANDROID_TOOLCHAIN_ROOT = ANDROID_NDK_ROOT+'/toolchains/'+ANDROID_TOOLCHAIN+'/prebuilt/'+HOST_CONFIG['HOST_TAG'] -ANDROID_TOOLCHAIN_BIN = ANDROID_TOOLCHAIN_ROOT+'/bin' -if not os.path.exists(ANDROID_TOOLCHAIN_BIN): - raise Exception('ANDROID toolchain not found: '+ANDROID_TOOLCHAIN_BIN) - -ANDROID_PLATFORM_ROOT = ANDROID_NDK_ROOT+'/platforms/'+ANDROID_PLATFORM -ANDROID_PLATFORM_ARM = ANDROID_PLATFORM_ROOT+'/arch-arm' + PLATFORM_TO_TARGET_MAP = { + 'linux-i386' : 'linux-x86', + 'linux2' : 'linux-x86', + 'win32' : 'windows', + 'cygwin' : 'windows', + 'darwin' : 'darwin-x86' + } + if sys.platform in PLATFORM_TO_TARGET_MAP: + ANDROID_HOST_SYSTEM = PLATFORM_TO_TARGET_MAP[sys.platform] + else: + raise Exception('Android Host Platform cannot be determined') + +# set defaults +ANDROID_ARCH = 'arm' +ANDROID_PLATFORM = 'android-9' +ANDROID_TOOLCHAIN = 'arm-linux-androideabi-4.6' +ANDROID_CROSS_PREFIX = 'arm-linux-androideabi' + +if not os.path.exists(os.path.join(ANDROID_NDK_ROOT, 'toolchains', ANDROID_TOOLCHAIN)): + toolchain_dirs = os.listdir(ANDROID_NDK_ROOT+'/toolchains') + for toolchain_dir in toolchain_dirs: + if os.path.exists(os.path.join(ANDROID_NDK_ROOT, 'toolchains', toolchain_dir, 'prebuilt', ANDROID_HOST_SYSTEM)): + ANDROID_TOOLCHAIN=toolchain_dir + suffix_pos = toolchain_dir.rfind('-') + if (suffix_pos >= 0): + ANDROID_CROSS_PREFIX = ANDROID_TOOLCHAIN[:suffix_pos] + print "Auto-selecting toolchain:", ANDROID_TOOLCHAIN + break + +# override defaults from command line args +if ARGUMENTS.get('android_toolchain'): + ANDROID_TOOLCHAIN=ARGUMENTS.get('android_toolchain') + +if ARGUMENTS.get('android_cross_prefix'): + ANDROID_CROSS_PREFIX=ARGUMENTS.get('android_cross_prefix') + +if ARGUMENTS.get('android_platform'): + ANDROID_PLATFORM=ARGUMENTS.get('android_platform') + +if ARGUMENTS.get('android_arch'): + ANDROID_ARCH=ARGUMENTS.get('android_arch') + +print 'Building for Android: ' +print 'ANDROID_HOST_SYSTEM =', ANDROID_HOST_SYSTEM +print 'ANDROID_TOOLCHAIN =', ANDROID_TOOLCHAIN +print 'ANDROID_PLATFORM =', ANDROID_PLATFORM +print 'ANDROID_ARCH =', ANDROID_ARCH + +ANDROID_TOOLCHAIN_BIN = ANDROID_NDK_ROOT+'/toolchains/'+ANDROID_TOOLCHAIN+'/prebuilt/'+ANDROID_HOST_SYSTEM+'/bin' +if not os.path.exists(ANDROID_TOOLCHAIN_BIN) and ANDROID_HOST_SYSTEM is 'darwin-x86': + ANDROID_HOST_SYSTEM = 'darwin-x86_64' + ANDROID_TOOLCHAIN_BIN = ANDROID_NDK_ROOT+'/toolchains/'+ANDROID_TOOLCHAIN+'/prebuilt/'+ANDROID_HOST_SYSTEM+'/bin' +ANDROID_SYSROOT = ANDROID_NDK_ROOT+'/platforms/'+ANDROID_PLATFORM+'/arch-'+ANDROID_ARCH ### add the tools to the path env.PrependENVPath('PATH', ANDROID_TOOLCHAIN_BIN) -### figure out the path of libgcc.a for the selected toolchain -subproc = os.popen(ANDROID_TOOLCHAIN_BIN+'/arm-linux-androideabi-gcc -mthumb-interwork -print-libgcc-file-name', 'r') -libgcc_path = subproc.readlines()[0].rstrip() -subproc.close() - -### setup compiler options -android_includes = [ANDROID_PLATFORM_ARM+'/'+'usr/include', - ANDROID_NDK_ROOT+'/sources/cxx-stl/system/include'] - -android_extras = ['--sysroot', ANDROID_PLATFORM_ARM, - '-MMD', - '-MP', - '-Os', - '-march=armv5te', - '-mtune=xscale', - '-msoft-float', - '-fpic', - '-mthumb', - '-Wno-psabi', - '-ffunction-sections', - '-funwind-tables', - '-fstack-protector', - '-fno-short-enums', - '-Wa,--noexecstack'] - -android_extras_cpp = ['-fno-exceptions', - '-fno-rtti'] - -android_defines = ['-DANDROID', - '-DANDROID_NDK', - '-D__ARM_ARCH_5__', - '-D__ARM_ARCH_5T__', - '-D__ARM_ARCH_5E__', - '-D__ARM_ARCH_5TE__'] - - -if env['build_config'] == 'Release': - android_optimize = ['-finline-functions', - '-finline-limit=64', - '-fno-inline-functions-called-once', - '-fgcse-after-reload', - '-frerun-cse-after-loop', - '-frename-registers', - '-fomit-frame-pointer', - '-fno-strict-aliasing', - '-funswitch-loops'] -else: - android_optimize = [] - -android_link = ['-Bdynamic', - '-Wl,--no-undefined', - '-Wl,-rpath=/system/lib', - '-Wl,--dynamic-linker=/system/bin/linker', - '-Wl,-rpath-link=' + ANDROID_PLATFORM_ARM+'/usr/lib', - '-L' + ANDROID_PLATFORM_ARM+'/usr/lib', - '-nostdlib', - libgcc_path, - ANDROID_PLATFORM_ARM+'/usr/lib/libc.so', - ANDROID_PLATFORM_ARM+'/usr/lib/libstdc++.so', - ANDROID_PLATFORM_ARM+'/usr/lib/libm.so', - '-ldl', - '-llog'] - -env['NPT_EXTRA_EXECUTABLE_OBJECTS'] = [ANDROID_PLATFORM_ARM+'/usr/lib/crtbegin_static.o', - ANDROID_PLATFORM_ARM+'/usr/lib/crtend_android.o'] - +### special C Runtime startup for executables +env['NPT_EXTRA_EXECUTABLE_OBJECTS'] = [] +env['NPT_EXTRA_LIBS'] = ['gcc'] ### Load the tools -LoadTool('gcc-generic', env, gcc_cross_prefix='arm-linux-androideabi', gcc_strict=False) -env.AppendUnique(CCFLAGS = ['-I'+x for x in android_includes] + android_extras + android_defines + android_optimize ) -env.AppendUnique(CXXFLAGS = android_extras_cpp) -env.AppendUnique(LINKFLAGS = android_link) -env.AppendUnique(CPPDEFINES = ['NPT_CONFIG_HAVE_SYSTEM_LOG_CONFIG']) - +LoadTool('gcc-generic', env, gcc_cross_prefix=ANDROID_CROSS_PREFIX, gcc_strict=False) +env.AppendUnique(CCFLAGS = ['-I'+ANDROID_NDK_ROOT+'/sources/cxx-stl/system/include' , + '--sysroot', ANDROID_SYSROOT, + '-msoft-float', + '-fpic', + '-mthumb-interwork', + '-ffunction-sections', + '-funwind-tables', + '-fstack-protector', + '-fno-short-enums']) +env.AppendUnique(CXXFLAGS = ['-fno-exceptions', '-fno-rtti']) +env.AppendUnique(CPPDEFINES = ['ANDROID', 'NPT_CONFIG_HAVE_SYSTEM_LOG_CONFIG']) +env.AppendUnique(LINKFLAGS = ['--sysroot', ANDROID_SYSROOT, + '-Wl,--no-undefined', + '-Wl,-z,noexecstack', + '-L'+ANDROID_SYSROOT+'/usr/lib', + '-lc', + '-lstdc++', + '-lm', + '-llog', + '-ldl']) + +### Specific System choices env['NPT_SYSTEM_SOURCES']={'System/StdC':'NptStdc[!D]*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullSerialPort.cpp', - 'System/Android':'*.cpp'}
\ No newline at end of file + 'System/Android':'*.cpp'} diff --git a/lib/libUPnP/Neptune/Build/Targets/arm-apple-darwin/Config.scons b/lib/libUPnP/Neptune/Build/Targets/arm-apple-darwin/Config.scons index 4a9a0c2ac3..0a19eeeac7 100644 --- a/lib/libUPnP/Neptune/Build/Targets/arm-apple-darwin/Config.scons +++ b/lib/libUPnP/Neptune/Build/Targets/arm-apple-darwin/Config.scons @@ -1,11 +1,11 @@ -env['ENV']['PATH'] = ['/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin', '/Developer/usr/bin', '/usr/bin', '/bin', '/usr/sbin', '/sbin'] +LoadTool('gcc-generic', env, gcc_cross_prefix='llvm') -### Load the tools -LoadTool('gcc-generic', env) - -universal_flags = [('-arch', 'armv6'), ('-isysroot', '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.0.sdk'), '-miphoneos-version-min=2.0'] -env.AppendUnique(CCFLAGS = universal_flags) +env.AppendUnique(CPPFLAGS = ['-emit-llvm', '-E', '-D__arm__', '-isystem', '/Developer/SDKs/iPhone/include']) +#env['CXX'] = 'llvm-gcc' +#env['LD'] = 'llc' +#env['LINK'] = 'llc' +#env['LDFLAGS'] = '-syslibroot,/Developer/SDKs/iPhone/heavenly,-lSystem,-lgcc_s_v6.1,-L/Developer/SDKs/iPhone/heavenly/usr/lib/dynamic-no-pic/crt1.o' ### Neptune System Files -env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullSerialPort.cpp'} +env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp'} diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2008/Neptune/Neptune.vcproj b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2008/Neptune/Neptune.vcproj index df71a67be3..6f575d8f22 100644 --- a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2008/Neptune/Neptune.vcproj +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2008/Neptune/Neptune.vcproj @@ -43,8 +43,8 @@ Name="VCCLCompilerTool" Optimization="0" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\..\..\Source\Core;..\..\..\..\Source\System\Win32;"..\..\..\..\ThirdParty\zlib-1.2.3"" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NPT_CONFIG_ENABLE_LOGGING" + AdditionalIncludeDirectories="..\..\..\..\Source\Core;..\..\..\..\Source\System\Win32;"..\..\..\..\ThirdParty\zlib-1.2.3";..\..\..\..\ThirdParty\axTLS\ssl;..\..\..\..\ThirdParty\axTLS\crypto;..\..\..\..\ThirdParty\axTLS\Config\Win32" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NPT_CONFIG_ENABLE_LOGGING;NPT_CONFIG_ENABLE_TLS" MinimalRebuild="true" ExceptionHandling="0" BasicRuntimeChecks="3" @@ -115,8 +115,8 @@ Optimization="3" OmitFramePointers="true" WholeProgramOptimization="false" - AdditionalIncludeDirectories="..\..\..\..\Source\Core;..\..\..\..\Source\System\Win32;"..\..\..\..\ThirdParty\zlib-1.2.3"" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NPT_CONFIG_ENABLE_LOGGING" + AdditionalIncludeDirectories="..\..\..\..\Source\Core;..\..\..\..\Source\System\Win32;"..\..\..\..\ThirdParty\zlib-1.2.3";..\..\..\..\ThirdParty\axTLS\ssl;..\..\..\..\ThirdParty\axTLS\crypto;..\..\..\..\ThirdParty\axTLS\Config\Win32" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NPT_CONFIG_ENABLE_LOGGING;NPT_CONFIG_ENABLE_TLS" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="0" @@ -168,6 +168,10 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File + RelativePath="..\..\..\..\Source\Core\NptAutomaticCleaner.cpp" + > + </File> + <File RelativePath="..\..\..\..\Source\Core\NptBase64.cpp" > </File> @@ -200,15 +204,15 @@ > </File> <File - RelativePath="..\..\..\..\Source\Core\NptFile.cpp" + RelativePath="..\..\..\..\Source\Core\NptDigest.cpp" > </File> <File - RelativePath="..\..\..\..\Source\Core\NptHash.cpp" + RelativePath="..\..\..\..\Source\Core\NptFile.cpp" > </File> <File - RelativePath="..\..\..\..\Source\Core\NptHash.h" + RelativePath="..\..\..\..\Source\Core\NptHash.cpp" > </File> <File @@ -354,6 +358,10 @@ > </File> <File + RelativePath="..\..\..\..\Source\Core\NptAutomaticCleaner.h" + > + </File> + <File RelativePath="..\..\..\..\Source\Core\NptBase64.h" > </File> @@ -390,10 +398,18 @@ > </File> <File + RelativePath="..\..\..\..\Source\Core\NptDigest.h" + > + </File> + <File RelativePath="..\..\..\..\Source\Core\NptFile.h" > </File> <File + RelativePath="..\..\..\..\Source\Core\NptHash.h" + > + </File> + <File RelativePath="..\..\..\..\Source\Core\NptHttp.h" > </File> @@ -524,6 +540,18 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > </Filter> + <Filter + Name="Data" + > + <File + RelativePath="..\..\..\..\Source\Data\TLS\NptTlsDefaultTrustAnchorsBase.cpp" + > + </File> + <File + RelativePath="..\..\..\..\Source\Data\TLS\NptTlsDefaultTrustAnchorsExtended.cpp" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2008/axTLS/axTLS.vcproj b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2008/axTLS/axTLS.vcproj index feb9e0ef3a..d2d4a28efb 100644 --- a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2008/axTLS/axTLS.vcproj +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2008/axTLS/axTLS.vcproj @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../../../ThirdParty/axTLS/config;../../../../ThirdParty/axTLS/crypto;../../../../ThirdParty/axTLS/ssl" + AdditionalIncludeDirectories="../../../../ThirdParty/axTLS/config/Win32;../../../../ThirdParty/axTLS/crypto;../../../../ThirdParty/axTLS/ssl" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -105,7 +105,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="../../../../ThirdParty/axTLS/config;../../../../ThirdParty/axTLS/crypto;../../../../ThirdParty/axTLS/ssl" + AdditionalIncludeDirectories="../../../../ThirdParty/axTLS/config/Win32;../../../../ThirdParty/axTLS/crypto;../../../../ThirdParty/axTLS/ssl" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -167,6 +167,10 @@ > </File> <File + RelativePath="..\..\..\..\ThirdParty\axTLS\ssl\gen_cert.c" + > + </File> + <File RelativePath="..\..\..\..\ThirdParty\axTLS\crypto\hmac.c" > </File> @@ -183,10 +187,6 @@ > </File> <File - RelativePath="..\..\..\..\ThirdParty\axTLS\ssl\os_port.c" - > - </File> - <File RelativePath="..\..\..\..\ThirdParty\axTLS\ssl\p12.c" > </File> diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/Neptune.sln b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/Neptune.sln index 625cc19b4d..3ff0f34446 100644 --- a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/Neptune.sln +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/Neptune.sln @@ -60,6 +60,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetGet", "NetGet\NetGet.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetResolve", "NetResolve\NetResolve.vcxproj", "{62F20819-2CD5-463E-85E5-23C0466F05C2}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SharedVariables1", "SharedVariables1\SharedVariables1.vcxproj", "{8029AE79-A145-4A5C-8F0B-297B56BA9ACD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -186,6 +188,10 @@ Global {62F20819-2CD5-463E-85E5-23C0466F05C2}.Debug|Win32.Build.0 = Debug|Win32 {62F20819-2CD5-463E-85E5-23C0466F05C2}.Release|Win32.ActiveCfg = Release|Win32 {62F20819-2CD5-463E-85E5-23C0466F05C2}.Release|Win32.Build.0 = Release|Win32 + {8029AE79-A145-4A5C-8F0B-297B56BA9ACD}.Debug|Win32.ActiveCfg = Debug|Win32 + {8029AE79-A145-4A5C-8F0B-297B56BA9ACD}.Debug|Win32.Build.0 = Debug|Win32 + {8029AE79-A145-4A5C-8F0B-297B56BA9ACD}.Release|Win32.ActiveCfg = Release|Win32 + {8029AE79-A145-4A5C-8F0B-297B56BA9ACD}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/Neptune/Neptune.vcxproj b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/Neptune/Neptune.vcxproj index efa9774d2d..a1e6df3a8d 100644 --- a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/Neptune/Neptune.vcxproj +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/Neptune/Neptune.vcxproj @@ -93,6 +93,7 @@ </Lib> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\..\..\Source\Core\NptAutomaticCleaner.cpp" /> <ClCompile Include="..\..\..\..\Source\Core\NptBase64.cpp" /> <ClCompile Include="..\..\..\..\Source\Core\NptHash.cpp" /> <ClCompile Include="..\..\..\..\Source\System\Bsd\NptBsdResolver.cpp" /> @@ -171,6 +172,7 @@ <ClCompile Include="..\..\..\..\Source\Data\TLS\NptTlsDefaultTrustAnchorsExtended.cpp" /> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\..\..\Source\Core\NptAutomaticCleaner.h" /> <ClInclude Include="..\..\..\..\Source\Core\NptHash.h" /> <ClInclude Include="..\..\..\..\ThirdParty\axTLS\crypto\bigint.h" /> <ClInclude Include="..\..\..\..\ThirdParty\axTLS\crypto\bigint_impl.h" /> diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/NetResolve/NetResolve.vcxproj b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/NetResolve/NetResolve.vcxproj new file mode 100644 index 0000000000..9b3ed44efe --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/NetResolve/NetResolve.vcxproj @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{62F20819-2CD5-463E-85E5-23C0466F05C2}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>NetResolve</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\..\Source\Config;..\..\..\..\Source\Core;..\..\..\..\Source\Neptune;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\..\Source\Config;..\..\..\..\Source\Core;..\..\..\..\Source\Neptune;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\Source\Apps\NetResolve\NetResolve.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Neptune\Neptune.vcxproj"> + <Project>{12aff2e5-6d95-4809-9728-9551677c078a}</Project> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/SharedVariables1/SharedVariables1.vcxproj b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/SharedVariables1/SharedVariables1.vcxproj new file mode 100644 index 0000000000..7ac2d4fd24 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/SharedVariables1/SharedVariables1.vcxproj @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{8029AE79-A145-4A5C-8F0B-297B56BA9ACD}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>SharedVariables1</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\..\Source\Core</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\..\..\Source\Core</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\Source\Tests\SharedVariables1\SharedVariablesTest1.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Neptune\Neptune.vcxproj"> + <Project>{12aff2e5-6d95-4809-9728-9551677c078a}</Project> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/Neptune.sln b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/Neptune.sln new file mode 100644 index 0000000000..c5f09c0c37 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/Neptune.sln @@ -0,0 +1,52 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 11 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Neptune", "Neptune\Neptune.vcxproj", "{4D304D49-41F5-48C2-BC88-898AF70F421C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestShell", "TestShell\TestShell.vcxproj", "{1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|ARM = Release|ARM + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Debug|ARM.ActiveCfg = Debug|ARM + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Debug|ARM.Build.0 = Debug|ARM + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Debug|ARM.Deploy.0 = Debug|ARM + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Debug|Win32.ActiveCfg = Debug|Win32 + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Debug|Win32.Build.0 = Debug|Win32 + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Debug|Win32.Deploy.0 = Debug|Win32 + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Debug|x64.ActiveCfg = Debug|x64 + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Debug|x64.Build.0 = Debug|x64 + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Debug|x64.Deploy.0 = Debug|x64 + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Release|ARM.ActiveCfg = Release|ARM + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Release|ARM.Build.0 = Release|ARM + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Release|ARM.Deploy.0 = Release|ARM + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Release|Win32.ActiveCfg = Release|Win32 + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Release|Win32.Build.0 = Release|Win32 + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Release|Win32.Deploy.0 = Release|Win32 + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Release|x64.ActiveCfg = Release|x64 + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Release|x64.Build.0 = Release|x64 + {1F30AD3F-A41D-4580-B7CB-BD7A7C92DE5E}.Release|x64.Deploy.0 = Release|x64 + {4D304D49-41F5-48C2-BC88-898AF70F421C}.Debug|ARM.ActiveCfg = Debug|ARM + {4D304D49-41F5-48C2-BC88-898AF70F421C}.Debug|ARM.Build.0 = Debug|ARM + {4D304D49-41F5-48C2-BC88-898AF70F421C}.Debug|Win32.ActiveCfg = Debug|Win32 + {4D304D49-41F5-48C2-BC88-898AF70F421C}.Debug|Win32.Build.0 = Debug|Win32 + {4D304D49-41F5-48C2-BC88-898AF70F421C}.Debug|x64.ActiveCfg = Debug|x64 + {4D304D49-41F5-48C2-BC88-898AF70F421C}.Debug|x64.Build.0 = Debug|x64 + {4D304D49-41F5-48C2-BC88-898AF70F421C}.Release|ARM.ActiveCfg = Release|ARM + {4D304D49-41F5-48C2-BC88-898AF70F421C}.Release|ARM.Build.0 = Release|ARM + {4D304D49-41F5-48C2-BC88-898AF70F421C}.Release|Win32.ActiveCfg = Release|Win32 + {4D304D49-41F5-48C2-BC88-898AF70F421C}.Release|Win32.Build.0 = Release|Win32 + {4D304D49-41F5-48C2-BC88-898AF70F421C}.Release|x64.ActiveCfg = Release|x64 + {4D304D49-41F5-48C2-BC88-898AF70F421C}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/Neptune/Neptune.vcxproj b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/Neptune/Neptune.vcxproj new file mode 100644 index 0000000000..13be54de4d --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/Neptune/Neptune.vcxproj @@ -0,0 +1,292 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|ARM"> + <Configuration>Debug</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM"> + <Configuration>Release</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\Source\Core\Neptune.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptBase64.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptBufferedStreams.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptCommon.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptConsole.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptCrypto.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptDataBuffer.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptDebug.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptDigest.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptDynamicLibraries.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptFile.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptHash.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptHttp.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptJson.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptList.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptLogging.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptMessaging.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptNetwork.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptQueue.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptResults.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptRingBuffer.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptSimpleMessageQueue.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptSockets.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptStreams.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptStrings.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptSystem.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptThreads.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptTime.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptTls.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptUri.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptUtils.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptXml.cpp" /> + <ClCompile Include="..\..\..\..\Source\Core\NptZip.cpp" /> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtConsole.cpp" /> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtDebug.cpp" /> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtEnvironment.cpp" /> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtFile.cpp" /> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtNetwork.cpp" /> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtPch.cpp" /> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtSockets.cpp" /> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtSystem.cpp" /> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtThreads.cpp" /> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtTime.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\..\Source\Core\Neptune.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptArray.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptAutoreleasePool.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptBase64.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptBufferedStreams.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptCommon.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptConfig.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptConsole.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptConstants.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptCrypto.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptDataBuffer.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptDebug.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptDefs.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptDigest.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptDynamicCast.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptDynamicLibraries.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptFile.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptHash.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptHttp.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptInterfaces.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptJson.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptList.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptLogging.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptMap.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptMessaging.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptNetwork.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptQueue.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptReferences.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptResults.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptRingBuffer.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptSelectableMessageQueue.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptSerialPort.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptSimpleMessageQueue.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptSockets.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptStack.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptStreams.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptStrings.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptSystem.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptThreads.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptTime.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptTls.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptTlsDefaultTrustAnchorsBase.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptTlsDefaultTrustAnchorsExtended.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptTypes.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptUri.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptUtils.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptVersion.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptXml.h" /> + <ClInclude Include="..\..\..\..\Source\Core\NptZip.h" /> + <ClInclude Include="..\..\..\..\Source\System\WinRT\NptWinRtThreads.h" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath> + <ProjectGuid>{4d304d49-41f5-48c2-bc88-898af70f421c}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <ProjectName>Neptune</ProjectName> + <RootNamespace>Neptune</RootNamespace> + <DefaultLanguage>en-US</DefaultLanguage> + <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> + <AppContainerApplication>true</AppContainerApplication> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <CompileAsWinRT>true</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <PrecompiledHeaderFile /> + <PrecompiledHeaderOutputFile /> + <AdditionalIncludeDirectories>$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories);..\..\..\..\Source\Core</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_UNICODE;UNICODE;NPT_CONFIG_ENABLE_LOGGING;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <CompileAsWinRT>true</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <PrecompiledHeaderFile /> + <PrecompiledHeaderOutputFile /> + <AdditionalIncludeDirectories>$(ProjectDir);$(IntDir);%(AdditionalIncludeDirectories);..\..\..\..\Source\Core</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_UNICODE;UNICODE;NPT_CONFIG_ENABLE_LOGGING;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/Neptune/Neptune.vcxproj.filters b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/Neptune/Neptune.vcxproj.filters new file mode 100644 index 0000000000..93614e97a1 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/Neptune/Neptune.vcxproj.filters @@ -0,0 +1,296 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source"> + <UniqueIdentifier>{65ac2d3a-344a-46d6-9bea-4714722d8eed}</UniqueIdentifier> + <Extensions>cpp</Extensions> + </Filter> + <Filter Include="Headers"> + <UniqueIdentifier>{9c12afd5-cd4a-4ea7-a966-4313de5fa803}</UniqueIdentifier> + <Extensions>h</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\Source\Core\Neptune.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptBase64.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptBufferedStreams.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptCommon.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptConsole.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptCrypto.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptDataBuffer.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptDebug.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptDigest.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptDynamicLibraries.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptFile.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptHash.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptHttp.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptJson.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptList.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptLogging.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptMessaging.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptNetwork.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptQueue.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptResults.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptRingBuffer.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptSimpleMessageQueue.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptSockets.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptStreams.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptStrings.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptSystem.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptThreads.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptTime.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptTls.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptUri.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptUtils.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptXml.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Core\NptZip.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtConsole.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtDebug.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtEnvironment.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtFile.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtNetwork.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtPch.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtSockets.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtSystem.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtThreads.cpp"> + <Filter>Source</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\System\WinRT\NptWinRtTime.cpp"> + <Filter>Source</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\..\Source\Core\Neptune.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptArray.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptAutoreleasePool.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptBase64.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptBufferedStreams.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptCommon.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptConfig.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptConsole.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptConstants.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptCrypto.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptDataBuffer.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptDebug.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptDefs.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptDigest.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptDynamicCast.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptDynamicLibraries.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptFile.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptHash.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptHttp.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptInterfaces.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptJson.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptList.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptLogging.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptMap.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptMessaging.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptNetwork.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptQueue.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptReferences.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptResults.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptRingBuffer.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptSelectableMessageQueue.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptSerialPort.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptSimpleMessageQueue.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptSockets.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptStack.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptStreams.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptStrings.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptSystem.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptThreads.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptTime.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptTls.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptTlsDefaultTrustAnchorsBase.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptTlsDefaultTrustAnchorsExtended.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptTypes.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptUri.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptUtils.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptVersion.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptXml.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\Core\NptZip.h"> + <Filter>Headers</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\Source\System\WinRT\NptWinRtThreads.h"> + <Filter>Headers</Filter> + </ClInclude> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/App.xaml b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/App.xaml new file mode 100644 index 0000000000..9a9f7c1159 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/App.xaml @@ -0,0 +1,20 @@ +<Application + x:Class="TestShell.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:TestShell"> + + <Application.Resources> + <ResourceDictionary> + <ResourceDictionary.MergedDictionaries> + + <!-- + Styles that define common aspects of the platform look and feel + Required by Visual Studio project and item templates + --> + <ResourceDictionary Source="Common/StandardStyles.xaml"/> + </ResourceDictionary.MergedDictionaries> + + </ResourceDictionary> + </Application.Resources> +</Application> diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/App.xaml.cpp b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/App.xaml.cpp new file mode 100644 index 0000000000..3cca6d8ee7 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/App.xaml.cpp @@ -0,0 +1,83 @@ +// +// App.xaml.cpp +// Implementation of the App class. +// + +#include "pch.h" +#include "MainPage.xaml.h" + +using namespace TestShell; + +using namespace Platform; +using namespace Windows::ApplicationModel; +using namespace Windows::ApplicationModel::Activation; +using namespace Windows::Foundation; +using namespace Windows::Foundation::Collections; +using namespace Windows::UI::Xaml; +using namespace Windows::UI::Xaml::Controls; +using namespace Windows::UI::Xaml::Controls::Primitives; +using namespace Windows::UI::Xaml::Data; +using namespace Windows::UI::Xaml::Input; +using namespace Windows::UI::Xaml::Interop; +using namespace Windows::UI::Xaml::Media; +using namespace Windows::UI::Xaml::Navigation; + +// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227 + +/// <summary> +/// Initializes the singleton application object. This is the first line of authored code +/// executed, and as such is the logical equivalent of main() or WinMain(). +/// </summary> +App::App() +{ + InitializeComponent(); + Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending); +} + +/// <summary> +/// Invoked when the application is launched normally by the end user. Other entry points +/// will be used when the application is launched to open a specific file, to display +/// search results, and so forth. +/// </summary> +/// <param name="pArgs">Details about the launch request and process.</param> +void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ pArgs) +{ + // Do not repeat app initialization when already running, just ensure that + // the window is active + if (pArgs->PreviousExecutionState == ApplicationExecutionState::Running) + { + Window::Current->Activate(); + return; + } + + if (pArgs->PreviousExecutionState == ApplicationExecutionState::Terminated) + { + //TODO: Load state from previously suspended application + } + + // Create a Frame to act navigation context and navigate to the first page + auto rootFrame = ref new Frame(); + if (!rootFrame->Navigate(TypeName(MainPage::typeid))) + { + throw ref new FailureException("Failed to create initial page"); + } + + // Place the frame in the current Window and ensure that it is active + Window::Current->Content = rootFrame; + Window::Current->Activate(); +} + +/// <summary> +/// Invoked when application execution is being suspended. Application state is saved +/// without knowing whether the application will be terminated or resumed with the contents +/// of memory still intact. +/// </summary> +/// <param name="sender">The source of the suspend request.</param> +/// <param name="e">Details about the suspend request.</param> +void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e) +{ + (void) sender; // Unused parameter + (void) e; // Unused parameter + + //TODO: Save application state and stop any background activity +} diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/App.xaml.h b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/App.xaml.h new file mode 100644 index 0000000000..2c5da813b7 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/App.xaml.h @@ -0,0 +1,24 @@ +// +// App.xaml.h +// Declaration of the App class. +// + +#pragma once + +#include "App.g.h" + +namespace TestShell +{ + /// <summary> + /// Provides application-specific behavior to supplement the default Application class. + /// </summary> + ref class App sealed + { + public: + App(); + virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ pArgs) override; + + private: + void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e); + }; +} diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Assets/Logo.png b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Assets/Logo.png Binary files differnew file mode 100644 index 0000000000..e26771cb33 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Assets/Logo.png diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Assets/SmallLogo.png b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Assets/SmallLogo.png Binary files differnew file mode 100644 index 0000000000..1eb0d9d528 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Assets/SmallLogo.png diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Assets/SplashScreen.png b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Assets/SplashScreen.png Binary files differnew file mode 100644 index 0000000000..c951e031bd --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Assets/SplashScreen.png diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Assets/StoreLogo.png b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Assets/StoreLogo.png Binary files differnew file mode 100644 index 0000000000..dcb672712c --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Assets/StoreLogo.png diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Common/StandardStyles.xaml b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Common/StandardStyles.xaml new file mode 100644 index 0000000000..81fb398ea2 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Common/StandardStyles.xaml @@ -0,0 +1,1007 @@ +<!-- + This file contains XAML styles that simplify application development. + + These are not merely convenient, but are required by most Visual Studio project and item templates. + Removing, renaming, or otherwise modifying the content of these files may result in a project that + does not build, or that will not build once additional pages are added. If variations on these + styles are desired it is recommended that you copy the content under a new name and modify your + private copy. +--> + +<ResourceDictionary + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + + <!-- Non-brush values that vary across themes --> + + <ResourceDictionary.ThemeDictionaries> + <ResourceDictionary x:Key="Default"> + <x:String x:Key="BackButtonGlyph"></x:String> + <x:String x:Key="BackButtonSnappedGlyph"></x:String> + </ResourceDictionary> + + <ResourceDictionary x:Key="HighContrast"> + <x:String x:Key="BackButtonGlyph"></x:String> + <x:String x:Key="BackButtonSnappedGlyph"></x:String> + </ResourceDictionary> + </ResourceDictionary.ThemeDictionaries> + + <!-- RichTextBlock styles --> + + <Style x:Key="BasicRichTextStyle" TargetType="RichTextBlock"> + <Setter Property="Foreground" Value="{StaticResource ApplicationForegroundThemeBrush}"/> + <Setter Property="FontSize" Value="{StaticResource ControlContentThemeFontSize}"/> + <Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}"/> + <Setter Property="TextTrimming" Value="WordEllipsis"/> + <Setter Property="TextWrapping" Value="Wrap"/> + <Setter Property="Typography.StylisticSet20" Value="True"/> + <Setter Property="Typography.DiscretionaryLigatures" Value="True"/> + <Setter Property="Typography.CaseSensitiveForms" Value="True"/> + </Style> + + <Style x:Key="BaselineRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BasicRichTextStyle}"> + <Setter Property="LineHeight" Value="20"/> + <Setter Property="LineStackingStrategy" Value="BlockLineHeight"/> + <!-- Properly align text along its baseline --> + <Setter Property="RenderTransform"> + <Setter.Value> + <TranslateTransform X="-1" Y="4"/> + </Setter.Value> + </Setter> + </Style> + + <Style x:Key="ItemRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BaselineRichTextStyle}"/> + + <Style x:Key="BodyRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BaselineRichTextStyle}"> + <Setter Property="FontWeight" Value="SemiLight"/> + </Style> + + <!-- TextBlock styles --> + + <Style x:Key="BasicTextStyle" TargetType="TextBlock"> + <Setter Property="Foreground" Value="{StaticResource ApplicationForegroundThemeBrush}"/> + <Setter Property="FontSize" Value="{StaticResource ControlContentThemeFontSize}"/> + <Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}"/> + <Setter Property="TextTrimming" Value="WordEllipsis"/> + <Setter Property="TextWrapping" Value="Wrap"/> + <Setter Property="Typography.StylisticSet20" Value="True"/> + <Setter Property="Typography.DiscretionaryLigatures" Value="True"/> + <Setter Property="Typography.CaseSensitiveForms" Value="True"/> + </Style> + + <Style x:Key="BaselineTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BasicTextStyle}"> + <Setter Property="LineHeight" Value="20"/> + <Setter Property="LineStackingStrategy" Value="BlockLineHeight"/> + <!-- Properly align text along its baseline --> + <Setter Property="RenderTransform"> + <Setter.Value> + <TranslateTransform X="-1" Y="4"/> + </Setter.Value> + </Setter> + </Style> + + <Style x:Key="HeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}"> + <Setter Property="FontSize" Value="56"/> + <Setter Property="FontWeight" Value="Light"/> + <Setter Property="LineHeight" Value="40"/> + <Setter Property="RenderTransform"> + <Setter.Value> + <TranslateTransform X="-2" Y="8"/> + </Setter.Value> + </Setter> + </Style> + + <Style x:Key="SubheaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}"> + <Setter Property="FontSize" Value="26.667"/> + <Setter Property="FontWeight" Value="Light"/> + <Setter Property="LineHeight" Value="30"/> + <Setter Property="RenderTransform"> + <Setter.Value> + <TranslateTransform X="-1" Y="6"/> + </Setter.Value> + </Setter> + </Style> + + <Style x:Key="TitleTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}"> + <Setter Property="FontWeight" Value="SemiBold"/> + </Style> + + <Style x:Key="ItemTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}"/> + + <Style x:Key="BodyTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}"> + <Setter Property="FontWeight" Value="SemiLight"/> + </Style> + + <Style x:Key="CaptionTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}"> + <Setter Property="FontSize" Value="12"/> + <Setter Property="Foreground" Value="{StaticResource ApplicationSecondaryForegroundThemeBrush}"/> + </Style> + + <!-- Button styles --> + + <!-- + TextButtonStyle is used to style a Button using subheader-styled text with no other adornment. This + style is used in the GroupedItemsPage as a group header and in the FileOpenPickerPage for triggering + commands. + --> + <Style x:Key="TextButtonStyle" TargetType="Button"> + <Setter Property="MinWidth" Value="0"/> + <Setter Property="MinHeight" Value="0"/> + <Setter Property="Template"> + <Setter.Value> + <ControlTemplate TargetType="Button"> + <Grid Background="Transparent"> + <TextBlock + x:Name="Text" + Text="{TemplateBinding Content}" + Margin="3,-7,3,10" + TextWrapping="NoWrap" + Style="{StaticResource SubheaderTextStyle}"/> + <Rectangle + x:Name="FocusVisualWhite" + IsHitTestVisible="False" + Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}" + StrokeEndLineCap="Square" + StrokeDashArray="1,1" + Opacity="0" + StrokeDashOffset="1.5"/> + <Rectangle + x:Name="FocusVisualBlack" + IsHitTestVisible="False" + Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}" + StrokeEndLineCap="Square" + StrokeDashArray="1,1" + Opacity="0" + StrokeDashOffset="0.5"/> + + <VisualStateManager.VisualStateGroups> + <VisualStateGroup x:Name="CommonStates"> + <VisualState x:Name="Normal"/> + <VisualState x:Name="PointerOver"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPointerOverForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + <VisualState x:Name="Pressed"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPressedForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + <VisualState x:Name="Disabled"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonDisabledForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + </VisualStateGroup> + <VisualStateGroup x:Name="FocusStates"> + <VisualState x:Name="Focused"> + <Storyboard> + <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualWhite" Storyboard.TargetProperty="Opacity"/> + <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualBlack" Storyboard.TargetProperty="Opacity"/> + </Storyboard> + </VisualState> + <VisualState x:Name="Unfocused"/> + </VisualStateGroup> + </VisualStateManager.VisualStateGroups> + </Grid> + </ControlTemplate> + </Setter.Value> + </Setter> + </Style> + + <!-- + TextRadioButtonStyle is used to style a RadioButton using subheader-styled text with no other adornment. + This style is used in the SearchResultsPage to allow selection among filters. + --> + <Style x:Key="TextRadioButtonStyle" TargetType="RadioButton"> + <Setter Property="MinWidth" Value="0"/> + <Setter Property="MinHeight" Value="0"/> + <Setter Property="Margin" Value="0,0,30,0"/> + <Setter Property="Template"> + <Setter.Value> + <ControlTemplate TargetType="RadioButton"> + <Grid Background="Transparent"> + <TextBlock + x:Name="Text" + Text="{TemplateBinding Content}" + Margin="3,-7,3,10" + TextWrapping="NoWrap" + Style="{StaticResource SubheaderTextStyle}"/> + <Rectangle + x:Name="FocusVisualWhite" + IsHitTestVisible="False" + Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}" + StrokeEndLineCap="Square" + StrokeDashArray="1,1" + Opacity="0" + StrokeDashOffset="1.5"/> + <Rectangle + x:Name="FocusVisualBlack" + IsHitTestVisible="False" + Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}" + StrokeEndLineCap="Square" + StrokeDashArray="1,1" + Opacity="0" + StrokeDashOffset="0.5"/> + + <VisualStateManager.VisualStateGroups> + <VisualStateGroup x:Name="CommonStates"> + <VisualState x:Name="Normal"/> + <VisualState x:Name="PointerOver"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPointerOverForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + <VisualState x:Name="Pressed"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPressedForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + <VisualState x:Name="Disabled"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonDisabledForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + </VisualStateGroup> + <VisualStateGroup x:Name="FocusStates"> + <VisualState x:Name="Focused"> + <Storyboard> + <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualWhite" Storyboard.TargetProperty="Opacity"/> + <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualBlack" Storyboard.TargetProperty="Opacity"/> + </Storyboard> + </VisualState> + <VisualState x:Name="Unfocused"/> + </VisualStateGroup> + <VisualStateGroup x:Name="CheckStates"> + <VisualState x:Name="Checked"/> + <VisualState x:Name="Unchecked"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationSecondaryForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + <VisualState x:Name="Indeterminate"/> + </VisualStateGroup> + </VisualStateManager.VisualStateGroups> + </Grid> + </ControlTemplate> + </Setter.Value> + </Setter> + </Style> + + <!-- + AppBarButtonStyle is used to style a Button for use in an App Bar. Content will be centered and should fit within + the 40-pixel radius glyph provided. 16-point Segoe UI Symbol is used for content text to simplify the use of glyphs + from that font. AutomationProperties.Name is used for the text below the glyph. + --> + <Style x:Key="AppBarButtonStyle" TargetType="Button"> + <Setter Property="Foreground" Value="{StaticResource AppBarItemForegroundThemeBrush}"/> + <Setter Property="VerticalAlignment" Value="Stretch"/> + <Setter Property="FontFamily" Value="Segoe UI Symbol"/> + <Setter Property="FontWeight" Value="Normal"/> + <Setter Property="FontSize" Value="20"/> + <Setter Property="AutomationProperties.ItemType" Value="App Bar Button"/> + <Setter Property="Template"> + <Setter.Value> + <ControlTemplate TargetType="Button"> + <Grid x:Name="RootGrid" Width="100" Background="Transparent"> + <StackPanel VerticalAlignment="Top" Margin="0,12,0,11"> + <Grid Width="40" Height="40" Margin="0,0,0,5" HorizontalAlignment="Center"> + <TextBlock x:Name="BackgroundGlyph" Text="" FontFamily="Segoe UI Symbol" FontSize="53.333" Margin="-4,-19,0,0" Foreground="{StaticResource AppBarItemBackgroundThemeBrush}"/> + <TextBlock x:Name="OutlineGlyph" Text="" FontFamily="Segoe UI Symbol" FontSize="53.333" Margin="-4,-19,0,0"/> + <ContentPresenter x:Name="Content" HorizontalAlignment="Center" Margin="-1,-1,0,0" VerticalAlignment="Center"/> + </Grid> + <TextBlock + x:Name="TextLabel" + Text="{TemplateBinding AutomationProperties.Name}" + Foreground="{StaticResource AppBarItemForegroundThemeBrush}" + Margin="0,0,2,0" + FontSize="12" + TextAlignment="Center" + Width="88" + MaxHeight="32" + TextTrimming="WordEllipsis" + Style="{StaticResource BasicTextStyle}"/> + </StackPanel> + <Rectangle + x:Name="FocusVisualWhite" + IsHitTestVisible="False" + Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}" + StrokeEndLineCap="Square" + StrokeDashArray="1,1" + Opacity="0" + StrokeDashOffset="1.5"/> + <Rectangle + x:Name="FocusVisualBlack" + IsHitTestVisible="False" + Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}" + StrokeEndLineCap="Square" + StrokeDashArray="1,1" + Opacity="0" + StrokeDashOffset="0.5"/> + + <VisualStateManager.VisualStateGroups> + <VisualStateGroup x:Name="ApplicationViewStates"> + <VisualState x:Name="FullScreenLandscape"/> + <VisualState x:Name="Filled"/> + <VisualState x:Name="FullScreenPortrait"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Visibility"> + <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/> + </ObjectAnimationUsingKeyFrames> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Width"> + <DiscreteObjectKeyFrame KeyTime="0" Value="60"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + <VisualState x:Name="Snapped"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Visibility"> + <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/> + </ObjectAnimationUsingKeyFrames> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Width"> + <DiscreteObjectKeyFrame KeyTime="0" Value="60"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + </VisualStateGroup> + <VisualStateGroup x:Name="CommonStates"> + <VisualState x:Name="Normal"/> + <VisualState x:Name="PointerOver"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPointerOverBackgroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPointerOverForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + <VisualState x:Name="Pressed"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OutlineGlyph" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPressedForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + <VisualState x:Name="Disabled"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OutlineGlyph" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + </VisualStateGroup> + <VisualStateGroup x:Name="FocusStates"> + <VisualState x:Name="Focused"> + <Storyboard> + <DoubleAnimation + Storyboard.TargetName="FocusVisualWhite" + Storyboard.TargetProperty="Opacity" + To="1" + Duration="0"/> + <DoubleAnimation + Storyboard.TargetName="FocusVisualBlack" + Storyboard.TargetProperty="Opacity" + To="1" + Duration="0"/> + </Storyboard> + </VisualState> + <VisualState x:Name="Unfocused" /> + <VisualState x:Name="PointerFocused" /> + </VisualStateGroup> + </VisualStateManager.VisualStateGroups> + </Grid> + </ControlTemplate> + </Setter.Value> + </Setter> + </Style> + + <!-- Standard App Bar buttons --> + + <Style x:Key="SkipBackAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="SkipBackAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Skip Back"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="SkipAheadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="SkipAheadAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Skip Ahead"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="PlayAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="PlayAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Play"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="PauseAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="PauseAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Pause"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="EditAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="EditAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Edit"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="SaveAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="SaveAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Save"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="DeleteAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="DeleteAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Delete"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="DiscardAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="DiscardAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Discard"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="RemoveAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="RemoveAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Remove"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="AddAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="AddAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Add"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="NoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="NoAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="No"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="YesAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="YesAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Yes"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="MoreAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="MoreAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="More"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="RedoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="RedoAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Redo"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="UndoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="UndoAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Undo"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="HomeAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="HomeAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Home"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="OutAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="OutAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Out"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="NextAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="NextAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Next"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="PreviousAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="PreviousAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Previous"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="FavoriteAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="FavoriteAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Favorite"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="PhotoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="PhotoAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Photo"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="SettingsAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="SettingsAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Settings"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="VideoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="VideoAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Video"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="RefreshAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="RefreshAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Refresh"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="DownloadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="DownloadAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Download"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="MailAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="MailAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Mail"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="SearchAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="SearchAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Search"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="HelpAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="HelpAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Help"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="UploadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="UploadAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Upload"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="PinAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="PinAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Pin"/> + <Setter Property="Content" Value=""/> + </Style> + <Style x:Key="UnpinAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}"> + <Setter Property="AutomationProperties.AutomationId" Value="UnpinAppBarButton"/> + <Setter Property="AutomationProperties.Name" Value="Unpin"/> + <Setter Property="Content" Value=""/> + </Style> + + <!-- Title area styles --> + + <Style x:Key="PageHeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource HeaderTextStyle}"> + <Setter Property="TextWrapping" Value="NoWrap"/> + <Setter Property="VerticalAlignment" Value="Bottom"/> + <Setter Property="Margin" Value="0,0,30,40"/> + </Style> + + <Style x:Key="PageSubheaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource SubheaderTextStyle}"> + <Setter Property="TextWrapping" Value="NoWrap"/> + <Setter Property="VerticalAlignment" Value="Bottom"/> + <Setter Property="Margin" Value="0,0,0,40"/> + </Style> + + <Style x:Key="SnappedPageHeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource PageSubheaderTextStyle}"> + <Setter Property="Margin" Value="0,0,18,40"/> + </Style> + + <!-- + BackButtonStyle is used to style a Button for use in the title area of a page. Margins appropriate for + the conventional page layout are included as part of the style. + --> + <Style x:Key="BackButtonStyle" TargetType="Button"> + <Setter Property="MinWidth" Value="0"/> + <Setter Property="Width" Value="48"/> + <Setter Property="Height" Value="48"/> + <Setter Property="Margin" Value="36,0,36,36"/> + <Setter Property="VerticalAlignment" Value="Bottom"/> + <Setter Property="FontFamily" Value="Segoe UI Symbol"/> + <Setter Property="FontWeight" Value="Normal"/> + <Setter Property="FontSize" Value="56"/> + <Setter Property="AutomationProperties.AutomationId" Value="BackButton"/> + <Setter Property="AutomationProperties.Name" Value="Back"/> + <Setter Property="AutomationProperties.ItemType" Value="Navigation Button"/> + <Setter Property="Template"> + <Setter.Value> + <ControlTemplate TargetType="Button"> + <Grid x:Name="RootGrid"> + <Grid Margin="-1,-16,0,0"> + <TextBlock x:Name="BackgroundGlyph" Text="" Foreground="{StaticResource BackButtonBackgroundThemeBrush}"/> + <TextBlock x:Name="NormalGlyph" Text="{StaticResource BackButtonGlyph}" Foreground="{StaticResource BackButtonForegroundThemeBrush}"/> + <TextBlock x:Name="ArrowGlyph" Text="" Foreground="{StaticResource BackButtonPressedForegroundThemeBrush}" Opacity="0"/> + </Grid> + <Rectangle + x:Name="FocusVisualWhite" + IsHitTestVisible="False" + Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}" + StrokeEndLineCap="Square" + StrokeDashArray="1,1" + Opacity="0" + StrokeDashOffset="1.5"/> + <Rectangle + x:Name="FocusVisualBlack" + IsHitTestVisible="False" + Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}" + StrokeEndLineCap="Square" + StrokeDashArray="1,1" + Opacity="0" + StrokeDashOffset="0.5"/> + + <VisualStateManager.VisualStateGroups> + <VisualStateGroup x:Name="CommonStates"> + <VisualState x:Name="Normal" /> + <VisualState x:Name="PointerOver"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverBackgroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalGlyph" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + <VisualState x:Name="Pressed"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + <DoubleAnimation + Storyboard.TargetName="ArrowGlyph" + Storyboard.TargetProperty="Opacity" + To="1" + Duration="0"/> + <DoubleAnimation + Storyboard.TargetName="NormalGlyph" + Storyboard.TargetProperty="Opacity" + To="0" + Duration="0"/> + </Storyboard> + </VisualState> + <VisualState x:Name="Disabled"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility"> + <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + </VisualStateGroup> + <VisualStateGroup x:Name="FocusStates"> + <VisualState x:Name="Focused"> + <Storyboard> + <DoubleAnimation + Storyboard.TargetName="FocusVisualWhite" + Storyboard.TargetProperty="Opacity" + To="1" + Duration="0"/> + <DoubleAnimation + Storyboard.TargetName="FocusVisualBlack" + Storyboard.TargetProperty="Opacity" + To="1" + Duration="0"/> + </Storyboard> + </VisualState> + <VisualState x:Name="Unfocused" /> + <VisualState x:Name="PointerFocused" /> + </VisualStateGroup> + </VisualStateManager.VisualStateGroups> + </Grid> + </ControlTemplate> + </Setter.Value> + </Setter> + </Style> + + <!-- + PortraitBackButtonStyle is used to style a Button for use in the title area of a portrait page. Margins appropriate + for the conventional page layout are included as part of the style. + --> + <Style x:Key="PortraitBackButtonStyle" TargetType="Button" BasedOn="{StaticResource BackButtonStyle}"> + <Setter Property="Margin" Value="26,0,26,36"/> + </Style> + + <!-- + SnappedBackButtonStyle is used to style a Button for use in the title area of a snapped page. Margins appropriate + for the conventional page layout are included as part of the style. + + The obvious duplication here is necessary as the glyphs used in snapped are not merely smaller versions of the same + glyph but are actually distinct. + --> + <Style x:Key="SnappedBackButtonStyle" TargetType="Button"> + <Setter Property="MinWidth" Value="0"/> + <Setter Property="Margin" Value="20,0,0,0"/> + <Setter Property="VerticalAlignment" Value="Bottom"/> + <Setter Property="FontFamily" Value="Segoe UI Symbol"/> + <Setter Property="FontWeight" Value="Normal"/> + <Setter Property="FontSize" Value="26.66667"/> + <Setter Property="AutomationProperties.AutomationId" Value="BackButton"/> + <Setter Property="AutomationProperties.Name" Value="Back"/> + <Setter Property="AutomationProperties.ItemType" Value="Navigation Button"/> + <Setter Property="Template"> + <Setter.Value> + <ControlTemplate TargetType="Button"> + <Grid x:Name="RootGrid" Width="36" Height="36" Margin="-3,0,7,33"> + <Grid Margin="-1,-1,0,0"> + <TextBlock x:Name="BackgroundGlyph" Text="" Foreground="{StaticResource BackButtonBackgroundThemeBrush}"/> + <TextBlock x:Name="NormalGlyph" Text="{StaticResource BackButtonSnappedGlyph}" Foreground="{StaticResource BackButtonForegroundThemeBrush}"/> + <TextBlock x:Name="ArrowGlyph" Text="" Foreground="{StaticResource BackButtonPressedForegroundThemeBrush}" Opacity="0"/> + </Grid> + <Rectangle + x:Name="FocusVisualWhite" + IsHitTestVisible="False" + Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}" + StrokeEndLineCap="Square" + StrokeDashArray="1,1" + Opacity="0" + StrokeDashOffset="1.5"/> + <Rectangle + x:Name="FocusVisualBlack" + IsHitTestVisible="False" + Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}" + StrokeEndLineCap="Square" + StrokeDashArray="1,1" + Opacity="0" + StrokeDashOffset="0.5"/> + + <VisualStateManager.VisualStateGroups> + <VisualStateGroup x:Name="CommonStates"> + <VisualState x:Name="Normal" /> + <VisualState x:Name="PointerOver"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverBackgroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalGlyph" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + <VisualState x:Name="Pressed"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground"> + <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonForegroundThemeBrush}"/> + </ObjectAnimationUsingKeyFrames> + <DoubleAnimation + Storyboard.TargetName="ArrowGlyph" + Storyboard.TargetProperty="Opacity" + To="1" + Duration="0"/> + <DoubleAnimation + Storyboard.TargetName="NormalGlyph" + Storyboard.TargetProperty="Opacity" + To="0" + Duration="0"/> + </Storyboard> + </VisualState> + <VisualState x:Name="Disabled"> + <Storyboard> + <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility"> + <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/> + </ObjectAnimationUsingKeyFrames> + </Storyboard> + </VisualState> + </VisualStateGroup> + <VisualStateGroup x:Name="FocusStates"> + <VisualState x:Name="Focused"> + <Storyboard> + <DoubleAnimation + Storyboard.TargetName="FocusVisualWhite" + Storyboard.TargetProperty="Opacity" + To="1" + Duration="0"/> + <DoubleAnimation + Storyboard.TargetName="FocusVisualBlack" + Storyboard.TargetProperty="Opacity" + To="1" + Duration="0"/> + </Storyboard> + </VisualState> + <VisualState x:Name="Unfocused" /> + <VisualState x:Name="PointerFocused" /> + </VisualStateGroup> + </VisualStateManager.VisualStateGroups> + </Grid> + </ControlTemplate> + </Setter.Value> + </Setter> + </Style> + + <!-- Item templates --> + + <!-- Grid-appropriate 250 pixel square item template as seen in the GroupedItemsPage and ItemsPage --> + <DataTemplate x:Key="Standard250x250ItemTemplate"> + <Grid HorizontalAlignment="Left" Width="250" Height="250"> + <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}"> + <Image Source="{Binding Image}" Stretch="UniformToFill"/> + </Border> + <StackPanel VerticalAlignment="Bottom" Background="{StaticResource ListViewItemOverlayBackgroundThemeBrush}"> + <TextBlock Text="{Binding Title}" Foreground="{StaticResource ListViewItemOverlayForegroundThemeBrush}" Style="{StaticResource TitleTextStyle}" Height="60" Margin="15,0,15,0"/> + <TextBlock Text="{Binding Subtitle}" Foreground="{StaticResource ListViewItemOverlaySecondaryForegroundThemeBrush}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap" Margin="15,0,15,10"/> + </StackPanel> + </Grid> + </DataTemplate> + + <!-- Grid-appropriate 500 by 130 pixel item template as seen in the GroupDetailPage --> + <DataTemplate x:Key="Standard500x130ItemTemplate"> + <Grid Height="110" Width="480" Margin="10"> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="Auto"/> + <ColumnDefinition Width="*"/> + </Grid.ColumnDefinitions> + <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="110" Height="110"> + <Image Source="{Binding Image}" Stretch="UniformToFill"/> + </Border> + <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0"> + <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextStyle}" TextWrapping="NoWrap"/> + <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/> + <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" MaxHeight="60"/> + </StackPanel> + </Grid> + </DataTemplate> + + <!-- List-appropriate 130 pixel high item template as seen in the SplitPage --> + <DataTemplate x:Key="Standard130ItemTemplate"> + <Grid Height="110" Margin="6"> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="Auto"/> + <ColumnDefinition Width="*"/> + </Grid.ColumnDefinitions> + <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="110" Height="110"> + <Image Source="{Binding Image}" Stretch="UniformToFill"/> + </Border> + <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0"> + <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextStyle}" TextWrapping="NoWrap"/> + <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/> + <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" MaxHeight="60"/> + </StackPanel> + </Grid> + </DataTemplate> + + <!-- + List-appropriate 80 pixel high item template as seen in the SplitPage when Filled, and + the following pages when snapped: GroupedItemsPage, GroupDetailPage, and ItemsPage + --> + <DataTemplate x:Key="Standard80ItemTemplate"> + <Grid Margin="6"> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="Auto"/> + <ColumnDefinition Width="*"/> + </Grid.ColumnDefinitions> + <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="60" Height="60"> + <Image Source="{Binding Image}" Stretch="UniformToFill"/> + </Border> + <StackPanel Grid.Column="1" Margin="10,0,0,0"> + <TextBlock Text="{Binding Title}" Style="{StaticResource ItemTextStyle}" MaxHeight="40"/> + <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/> + </StackPanel> + </Grid> + </DataTemplate> + + <!-- Grid-appropriate 300 by 70 pixel item template as seen in the SearchResultsPage --> + <DataTemplate x:Key="StandardSmallIcon300x70ItemTemplate"> + <Grid Width="294" Margin="6"> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="Auto"/> + <ColumnDefinition Width="*"/> + </Grid.ColumnDefinitions> + <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="0,0,0,10" Width="40" Height="40"> + <Image Source="{Binding Image}" Stretch="UniformToFill"/> + </Border> + <StackPanel Grid.Column="1" Margin="10,-10,0,0"> + <TextBlock Text="{Binding Title}" Style="{StaticResource BodyTextStyle}" TextWrapping="NoWrap"/> + <TextBlock Text="{Binding Subtitle}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/> + <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/> + </StackPanel> + </Grid> + </DataTemplate> + + <!-- List-appropriate 70 pixel high item template as seen in the SearchResultsPage when Snapped --> + <DataTemplate x:Key="StandardSmallIcon70ItemTemplate"> + <Grid Margin="6"> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="Auto"/> + <ColumnDefinition Width="*"/> + </Grid.ColumnDefinitions> + <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="0,0,0,10" Width="40" Height="40"> + <Image Source="{Binding Image}" Stretch="UniformToFill"/> + </Border> + <StackPanel Grid.Column="1" Margin="10,-10,0,0"> + <TextBlock Text="{Binding Title}" Style="{StaticResource BodyTextStyle}" TextWrapping="NoWrap"/> + <TextBlock Text="{Binding Subtitle}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/> + <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/> + </StackPanel> + </Grid> + </DataTemplate> + + <!-- + 190x130 pixel item template for displaying file previews as seen in the FileOpenPickerPage + Includes an elaborate tooltip to display title and description text + --> + <DataTemplate x:Key="StandardFileWithTooltip190x130ItemTemplate"> + <Grid> + <Grid Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}"> + <Image + Source="{Binding Image}" + Width="190" + Height="130" + HorizontalAlignment="Center" + VerticalAlignment="Center" + Stretch="Uniform"/> + </Grid> + <ToolTipService.Placement>Mouse</ToolTipService.Placement> + <ToolTipService.ToolTip> + <ToolTip> + <ToolTip.Style> + <Style TargetType="ToolTip"> + <Setter Property="BorderBrush" Value="{StaticResource ToolTipBackgroundThemeBrush}" /> + <Setter Property="Padding" Value="0" /> + </Style> + </ToolTip.Style> + + <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}"> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="Auto"/> + <ColumnDefinition Width="*"/> + </Grid.ColumnDefinitions> + + <Grid Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="20"> + <Image + Source="{Binding Image}" + Width="160" + Height="160" + HorizontalAlignment="Center" + VerticalAlignment="Center" + Stretch="Uniform"/> + </Grid> + <StackPanel Width="200" Grid.Column="1" Margin="0,20,20,20"> + <TextBlock Text="{Binding Title}" TextWrapping="NoWrap" Style="{StaticResource BodyTextStyle}"/> + <TextBlock Text="{Binding Description}" MaxHeight="140" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" Style="{StaticResource BodyTextStyle}"/> + </StackPanel> + </Grid> + </ToolTip> + </ToolTipService.ToolTip> + </Grid> + </DataTemplate> + + <!-- ScrollViewer styles --> + + <Style x:Key="HorizontalScrollViewerStyle" TargetType="ScrollViewer"> + <Setter Property="HorizontalScrollBarVisibility" Value="Auto"/> + <Setter Property="VerticalScrollBarVisibility" Value="Disabled"/> + <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Enabled" /> + <Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" /> + <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" /> + </Style> + + <Style x:Key="VerticalScrollViewerStyle" TargetType="ScrollViewer"> + <Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/> + <Setter Property="VerticalScrollBarVisibility" Value="Auto"/> + <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" /> + <Setter Property="ScrollViewer.VerticalScrollMode" Value="Enabled" /> + <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" /> + </Style> + + <!-- Page layout roots typically use entrance animations and a theme-appropriate background color --> + + <Style x:Key="LayoutRootStyle" TargetType="Panel"> + <Setter Property="Background" Value="{StaticResource ApplicationPageBackgroundThemeBrush}"/> + <Setter Property="ChildrenTransitions"> + <Setter.Value> + <TransitionCollection> + <EntranceThemeTransition/> + </TransitionCollection> + </Setter.Value> + </Setter> + </Style> +</ResourceDictionary> diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/MainPage.xaml b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/MainPage.xaml new file mode 100644 index 0000000000..5f712b917d --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/MainPage.xaml @@ -0,0 +1,16 @@ +<Page + x:Class="TestShell.MainPage" + IsTabStop="false" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:TestShell" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + mc:Ignorable="d"> + + <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}"> + <Button x:Name="GoButton" Content="GO!" HorizontalAlignment="Left" Margin="36,30,0,0" VerticalAlignment="Top" Width="125" Click="GoButton_Click"/> + <TextBlock x:Name="OutputText" HorizontalAlignment="Left" Height="667" Margin="36,73,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="1296"/> + + </Grid> +</Page> diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/MainPage.xaml.cpp b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/MainPage.xaml.cpp new file mode 100644 index 0000000000..d5cf83f654 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/MainPage.xaml.cpp @@ -0,0 +1,46 @@ +// +// MainPage.xaml.cpp +// Implementation of the MainPage class. +// + +#include "pch.h" +#include "MainPage.xaml.h" + +using namespace TestShell; + +using namespace Platform; +using namespace Windows::Foundation; +using namespace Windows::Foundation::Collections; +using namespace Windows::UI::Xaml; +using namespace Windows::UI::Xaml::Controls; +using namespace Windows::UI::Xaml::Controls::Primitives; +using namespace Windows::UI::Xaml::Data; +using namespace Windows::UI::Xaml::Input; +using namespace Windows::UI::Xaml::Media; +using namespace Windows::UI::Xaml::Navigation; + +// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238 + +MainPage::MainPage() +{ + InitializeComponent(); +} + +/// <summary> +/// Invoked when this page is about to be displayed in a Frame. +/// </summary> +/// <param name="e">Event data that describes how this page was reached. The Parameter +/// property is typically used to configure the page.</param> +void MainPage::OnNavigatedTo(NavigationEventArgs^ e) +{ + (void) e; // Unused parameter +} + +extern int TimeTest1_main(int argc, char**argv); +extern int ThreadsTest1_main(int argc, char**argv); + +void TestShell::MainPage::GoButton_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) +{ + ThreadsTest1_main(0, NULL); + TimeTest1_main(0, NULL); +} diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/MainPage.xaml.h b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/MainPage.xaml.h new file mode 100644 index 0000000000..82ff1b6237 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/MainPage.xaml.h @@ -0,0 +1,25 @@ +// +// MainPage.xaml.h +// Declaration of the MainPage class. +// + +#pragma once + +#include "MainPage.g.h" + +namespace TestShell +{ + /// <summary> + /// An empty page that can be used on its own or navigated to within a Frame. + /// </summary> + public ref class MainPage sealed + { + public: + MainPage(); + + protected: + virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs^ e) override; + private: + void GoButton_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e); + }; +} diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Package.appxmanifest b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Package.appxmanifest new file mode 100644 index 0000000000..1c6445f446 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/Package.appxmanifest @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest"> + + <Identity Name="4e6bff6d-d58b-4901-bc85-70b2c8f5905a" + Publisher="CN=Gilles" + Version="1.0.0.0" /> + + <Properties> + <DisplayName>TestShell</DisplayName> + <PublisherDisplayName>Gilles</PublisherDisplayName> + <Logo>Assets\StoreLogo.png</Logo> + </Properties> + + <Prerequisites> + <OSMinVersion>6.2.0</OSMinVersion> + <OSMaxVersionTested>6.2.0</OSMaxVersionTested> + </Prerequisites> + + <Resources> + <Resource Language="x-generate"/> + </Resources> + + <Applications> + <Application Id="App" + Executable="$targetnametoken$.exe" + EntryPoint="TestShell.App"> + <VisualElements + DisplayName="TestShell" + Logo="Assets\Logo.png" + SmallLogo="Assets\SmallLogo.png" + Description="TestShell" + ForegroundText="light" + BackgroundColor="#464646"> + <DefaultTile ShowName="allLogos" /> + <SplashScreen Image="Assets\SplashScreen.png" /> + </VisualElements> + </Application> + </Applications> + <Capabilities> + <Capability Name="internetClient" /> + </Capabilities> +</Package>
\ No newline at end of file diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/TestShell.vcxproj b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/TestShell.vcxproj new file mode 100644 index 0000000000..fe8b9d5400 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/TestShell.vcxproj @@ -0,0 +1,212 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|ARM"> + <Configuration>Debug</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM"> + <Configuration>Release</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{1f30ad3f-a41d-4580-b7cb-bd7a7c92de5e}</ProjectGuid> + <RootNamespace>TestShell</RootNamespace> + <DefaultLanguage>en-US</DefaultLanguage> + <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath> + <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> + <AppContainerApplication>true</AppContainerApplication> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <PackageCertificateKeyFile>TestShell_TemporaryKey.pfx</PackageCertificateKeyFile> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>..\..\..\..\Source\Core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>..\..\..\..\Source\Core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + </ClCompile> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="pch.h" /> + <ClInclude Include="App.xaml.h"> + <DependentUpon>App.xaml</DependentUpon> + </ClInclude> + <ClInclude Include="MainPage.xaml.h"> + <DependentUpon>MainPage.xaml</DependentUpon> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml"> + <SubType>Designer</SubType> + </ApplicationDefinition> + <Page Include="Common\StandardStyles.xaml"> + <SubType>Designer</SubType> + </Page> + <Page Include="MainPage.xaml"> + <SubType>Designer</SubType> + </Page> + </ItemGroup> + <ItemGroup> + <AppxManifest Include="Package.appxmanifest"> + <SubType>Designer</SubType> + </AppxManifest> + <None Include="TestShell_TemporaryKey.pfx" /> + </ItemGroup> + <ItemGroup> + <Image Include="Assets\Logo.png" /> + <Image Include="Assets\SmallLogo.png" /> + <Image Include="Assets\StoreLogo.png" /> + <Image Include="Assets\SplashScreen.png" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\Source\Tests\Threads1\ThreadsTest1.cpp"> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">main=ThreadsTest1_main;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">main=ThreadsTest1_main;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + </PrecompiledHeaderOutputFile> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + </PrecompiledHeaderOutputFile> + </ClCompile> + <ClCompile Include="..\..\..\..\Source\Tests\Time1\TimeTest1.cpp"> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">main=TimeTest1_main;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">main=TimeTest1_main;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + </PrecompiledHeaderOutputFile> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + </PrecompiledHeaderOutputFile> + </ClCompile> + <ClCompile Include="App.xaml.cpp"> + <DependentUpon>App.xaml</DependentUpon> + </ClCompile> + <ClCompile Include="MainPage.xaml.cpp"> + <DependentUpon>MainPage.xaml</DependentUpon> + </ClCompile> + <ClCompile Include="pch.cpp"> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Neptune\Neptune.vcxproj"> + <Project>{4d304d49-41f5-48c2-bc88-898af70f421c}</Project> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/TestShell.vcxproj.filters b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/TestShell.vcxproj.filters new file mode 100644 index 0000000000..fc9afe83da --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/TestShell.vcxproj.filters @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Common"> + <UniqueIdentifier>1f30ad3f-a41d-4580-b7cb-bd7a7c92de5e</UniqueIdentifier> + </Filter> + <Filter Include="Assets"> + <UniqueIdentifier>d7d56dd8-9345-432d-9151-c660ff9b2ed1</UniqueIdentifier> + </Filter> + <Page Include="Common\StandardStyles.xaml"> + <Filter>Common</Filter> + </Page> + <Image Include="Assets\Logo.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\SmallLogo.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\StoreLogo.png"> + <Filter>Assets</Filter> + </Image> + <Image Include="Assets\SplashScreen.png"> + <Filter>Assets</Filter> + </Image> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="App.xaml.cpp" /> + <ClCompile Include="MainPage.xaml.cpp" /> + <ClCompile Include="pch.cpp" /> + <ClCompile Include="..\..\..\..\Source\Tests\Time1\TimeTest1.cpp" /> + <ClCompile Include="..\..\..\..\Source\Tests\Threads1\ThreadsTest1.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="pch.h" /> + <ClInclude Include="App.xaml.h" /> + <ClInclude Include="MainPage.xaml.h" /> + </ItemGroup> + <ItemGroup> + <AppxManifest Include="Package.appxmanifest" /> + </ItemGroup> + <ItemGroup> + <None Include="TestShell_TemporaryKey.pfx" /> + </ItemGroup> + <ItemGroup> + <Page Include="MainPage.xaml" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/TestShell_TemporaryKey.pfx b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/TestShell_TemporaryKey.pfx Binary files differnew file mode 100644 index 0000000000..4d2fcb48c2 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/TestShell_TemporaryKey.pfx diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/pch.cpp b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/pch.cpp new file mode 100644 index 0000000000..01484ff5aa --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/pch.cpp @@ -0,0 +1,6 @@ +// +// pch.cpp +// Include the standard header and generate the precompiled header. +// + +#include "pch.h" diff --git a/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/pch.h b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/pch.h new file mode 100644 index 0000000000..fadf910de3 --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86-microsoft-winrt-vs2011/TestShell/pch.h @@ -0,0 +1,9 @@ +// +// pch.h +// Header for standard system include files. +// + +#pragma once + +#include <collection.h> +#include "App.xaml.h" diff --git a/lib/libUPnP/Neptune/Build/Targets/x86_64-unknown-linux/Config.scons b/lib/libUPnP/Neptune/Build/Targets/x86_64-unknown-linux/Config.scons new file mode 100644 index 0000000000..8d40de25eb --- /dev/null +++ b/lib/libUPnP/Neptune/Build/Targets/x86_64-unknown-linux/Config.scons @@ -0,0 +1,5 @@ +LoadTool('gcc-generic', env) + +### Neptune System Files +env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullSerialPort.cpp'} +env['NPT_EXTRA_LIBS']=['pthread'] diff --git a/lib/libUPnP/Neptune/Scripts/subtree-pull.sh b/lib/libUPnP/Neptune/Scripts/subtree-pull.sh new file mode 100644 index 0000000000..f886f72280 --- /dev/null +++ b/lib/libUPnP/Neptune/Scripts/subtree-pull.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +#git remote add neptune gitplut@plutinosoft.com:Neptune +#git subtree add -P ThirdParty/Neptune -m "added Neptune as subproject" neptune/master +git fetch neptune +git subtree merge -P ThirdParty/Neptune -m "merged Neptune changes" neptune/master + diff --git a/lib/libUPnP/Neptune/Scripts/subtree-push.sh b/lib/libUPnP/Neptune/Scripts/subtree-push.sh new file mode 100644 index 0000000000..5cedbd18c0 --- /dev/null +++ b/lib/libUPnP/Neptune/Scripts/subtree-push.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +#git remote add neptune gitplut@plutinosoft.com:Neptune +#git subtree add -P ThirdParty/Neptune -m "added Neptune as subproject" neptune/master +git subtree split -P ThirdParty/Neptune -b backport_neptune +git push neptune backport_neptune:master diff --git a/lib/libUPnP/Neptune/Source/Apps/NetBench/NetBench.cpp b/lib/libUPnP/Neptune/Source/Apps/NetBench/NetBench.cpp new file mode 100644 index 0000000000..2bc413299c --- /dev/null +++ b/lib/libUPnP/Neptune/Source/Apps/NetBench/NetBench.cpp @@ -0,0 +1,250 @@ +/***************************************************************** +| +| Neptune Utilities - Network Benchmark utility +| +| (c) 2001-2013 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| + ****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "Neptune.h" +#include <stdio.h> + +/*---------------------------------------------------------------------- +| Config ++---------------------------------------------------------------------*/ +const unsigned int STATS_WINDOW_SIZE = 100; + +/*---------------------------------------------------------------------- +| PrintUsageAndExit ++---------------------------------------------------------------------*/ +static void +PrintUsageAndExit(void) +{ + fprintf(stderr, + "NetBench [options] <url>\n" + "\n" + " Options:\n" + " --threads <n> : use <n> independent threads for requests\n" + " --max-requests <n> : stop after <n> requests\n" + " --max-time <n> : stop after <n> seconds\n" + " --ssl-client-cert <filename> : load client TLS certificate from <filename> (PKCS12)\n" + " --ssl-client-cert-password <password> : optional password for the client cert\n" + ); +} + +/*---------------------------------------------------------------------- +| Worker ++---------------------------------------------------------------------*/ +class Worker : public NPT_Thread +{ +public: + Worker(const char* url, + NPT_TlsContext* tls_context, + unsigned int tls_options) : + m_Url(url), + m_Connector(NULL), + m_Iterations(0), + m_Failures(0), + m_Done(false), + m_ShouldStop(false) + { + if (tls_context) { + m_Connector = new NPT_HttpTlsConnector(*tls_context, tls_options); + m_Client.SetConnector(m_Connector); + } + } + + ~Worker() { + delete m_Connector; + } + + void Run() { + // get the document + NPT_HttpRequest request(m_Url, NPT_HTTP_METHOD_GET); + + while (!m_ShouldStop) { + NPT_HttpResponse* response = NULL; + + NPT_Result result = m_Client.SendRequest(request, response); + if (NPT_FAILED(result)) { + ++m_Failures; + continue; + } + + // load body + NPT_HttpEntity* entity = response->GetEntity(); + if (entity != NULL) { + NPT_DataBuffer body; + result = entity->Load(body); + if (NPT_FAILED(result)) { + ++m_Failures; + continue; + } + } + + ++m_Iterations; + delete response; + } + } + + NPT_HttpUrl m_Url; + NPT_HttpClient m_Client; + NPT_HttpClient::Connector* m_Connector; + NPT_UInt32 m_Iterations; + NPT_UInt32 m_Failures; + volatile bool m_Done; + volatile bool m_ShouldStop; +}; + +/*---------------------------------------------------------------------- +| main ++---------------------------------------------------------------------*/ +int +main(int argc, char** argv) +{ + // check command line + if (argc < 2) { + PrintUsageAndExit(); + return 1; + } + + // init options + const char* tls_cert_filename = NULL; + const char* tls_cert_password = NULL; + unsigned int tls_options = NPT_HttpTlsConnector::OPTION_ACCEPT_SELF_SIGNED_CERTS | NPT_HttpTlsConnector::OPTION_ACCEPT_HOSTNAME_MISMATCH; + const char* url = NULL; + unsigned int threads = 1; + unsigned int max_requests = 0; + unsigned int max_time = 0; + + // parse command line + ++argv; + const char* arg; + while ((arg = *argv++)) { + if (NPT_StringsEqual(arg, "--threads")) { + NPT_ParseInteger(*argv++, threads); + if (threads < 1) threads = 1; + } else if (NPT_StringsEqual(arg, "--max-requests")) { + NPT_ParseInteger(*argv++, max_requests); + } else if (NPT_StringsEqual(arg, "--max-time")) { + NPT_ParseInteger(*argv++, max_time); + } else if (NPT_StringsEqual(arg, "--ssl-client-cert")) { + tls_cert_filename = *argv++; + if (tls_cert_filename == NULL) { + fprintf(stderr, "ERROR: missing argument after --ssl-client-cert option\n"); + return 1; + } + } else if (NPT_StringsEqual(arg, "--ssl-client-cert-password")) { + tls_cert_password = *argv++; + if (tls_cert_password == NULL) { + fprintf(stderr, "ERROR: missing argument after --ssl-client-cert-password option\n"); + return 1; + } + } else if (url == NULL) { + url = arg; + } else { + fprintf(stderr, "ERROR: unexpected argument '%s'\n", arg); + return 1; + } + } + + // load a client cert if needed + NPT_TlsContext* tls_context = NULL; + if (tls_options || tls_cert_filename) { + tls_context = new NPT_TlsContext(NPT_TlsContext::OPTION_VERIFY_LATER | NPT_TlsContext::OPTION_ADD_DEFAULT_TRUST_ANCHORS/* | NPT_TlsContext::OPTION_NO_SESSION_CACHE*/); + if (tls_cert_filename) { + NPT_DataBuffer cert; + NPT_Result result = NPT_File::Load(tls_cert_filename, cert); + if (NPT_FAILED(result)) { + fprintf(stderr, "ERROR: failed to load client cert from file %s (%d)\n", tls_cert_filename, result); + return 1; + } + result = tls_context->LoadKey(NPT_TLS_KEY_FORMAT_PKCS12, cert.GetData(), cert.GetDataSize(), tls_cert_password); + if (NPT_FAILED(result)) { + fprintf(stderr, "ERROR: failed to parse client cert (%d)\n", result); + return 1; + } + } + } + + NPT_Array<Worker*> workers; + for (unsigned int i=0; i<threads; i++) { + Worker* worker = new Worker(url, tls_context, tls_options); + workers.Add(worker); + worker->Start(); + } + + NPT_TimeStamp start_time; + NPT_System::GetCurrentTimeStamp(start_time); + + struct { + unsigned int request_count; + unsigned int failure_count; + NPT_TimeStamp timestamp; + } stats[STATS_WINDOW_SIZE]; + unsigned int cursor = 0; + for (unsigned int loop = 0; true; loop++) { + unsigned int total_requests = 0; + unsigned int total_failures = 0; + bool all_done = true; + for (unsigned int i=0; i<threads; i++) { + total_requests += workers[i]->m_Iterations; + total_failures += workers[i]->m_Failures; + if (!workers[i]->m_Done) all_done = false; + } + NPT_TimeStamp now; + NPT_System::GetCurrentTimeStamp(now); + stats[cursor].timestamp = now; + stats[cursor].request_count = total_requests; + stats[cursor].failure_count = total_failures; + + int newest = cursor; + int oldest = (cursor+1)%STATS_WINDOW_SIZE; + if (loop < STATS_WINDOW_SIZE) { + oldest = 0; + } + unsigned int reqs_in_window = stats[newest].request_count - stats[oldest].request_count; + NPT_TimeStamp window_duration = stats[newest].timestamp - stats[oldest].timestamp; + double rate = 0.0; + if (window_duration.ToMillis()) { + rate = 1000.0*(double)reqs_in_window/(double)window_duration.ToMillis(); + } + printf("\rReqs: %d - Fail: %d - Rate: %.2f tps", total_requests, total_failures, (float)rate); + fflush(stdout); + + cursor = (cursor+1)%STATS_WINDOW_SIZE; + + if (max_time && (now-start_time).ToSeconds() >= max_time) { + break; + } + if (max_requests && total_requests >= max_requests) { + break; + } + if (all_done) { + break; + } + NPT_System::Sleep(0.1); + } + printf("\n"); + + for (unsigned int i=0; i<threads; i++) { + workers[i]->m_ShouldStop = true; + } + + for (unsigned int i=0; i<threads; i++) { + workers[i]->Wait(); + delete workers[i]; + } + + delete tls_context; + + return 0; +} + + + + diff --git a/lib/libUPnP/Neptune/Source/Apps/NetGet/NetGet.cpp b/lib/libUPnP/Neptune/Source/Apps/NetGet/NetGet.cpp index 935a113ac5..dd755830f0 100644 --- a/lib/libUPnP/Neptune/Source/Apps/NetGet/NetGet.cpp +++ b/lib/libUPnP/Neptune/Source/Apps/NetGet/NetGet.cpp @@ -23,8 +23,15 @@ PrintUsageAndExit(void) "NetGet [options] <url>\n" "\n" " Options:\n" - " --verbose : print verbose information\n" - " --http-1-1 : use HTTP 1.1\n" + " --verbose : print verbose information\n" + " --no-body-output : do not output the response body\n" + " --http-1-1 : use HTTP 1.1\n" +#if defined(NPT_CONFIG_ENABLE_TLS) + " --ssl-client-cert <filename> : load client TLS certificate from <filename> (PKCS12)\n" + " --ssl-client-cert-password <password> : optional password for the client cert\n" + " --ssl-accept-self-signed-certs : accept self-signed server certificates\n" + " --ssl-accept-hostname-mismatch : accept server certificates that don't match\n" +#endif " --show-proxy : show the proxy that will be used for the connection\n"); } @@ -41,12 +48,20 @@ main(int argc, char** argv) } // init options - bool verbose = false; - bool show_proxy = false; - bool url_set = false; - bool http_1_1 = false; + bool verbose = false; + bool no_body_output = false; + bool show_proxy = false; + bool url_set = false; + bool http_1_1 = false; NPT_HttpUrl url; - + NPT_HttpClient::Connector* connector = NULL; +#if defined(NPT_CONFIG_ENABLE_TLS) + NPT_TlsContext* tls_context = NULL; + const char* tls_cert_filename = NULL; + const char* tls_cert_password = NULL; + unsigned int tls_options = 0; +#endif + // parse command line ++argv; const char* arg; @@ -55,8 +70,28 @@ main(int argc, char** argv) verbose = true; } else if (NPT_StringsEqual(arg, "--show-proxy")) { show_proxy = true; + } else if (NPT_StringsEqual(arg, "--no-body-output")) { + no_body_output = true; } else if (NPT_StringsEqual(arg, "--http-1-1")) { http_1_1 = true; +#if defined(NPT_CONFIG_ENABLE_TLS) + } else if (NPT_StringsEqual(arg, "--ssl-client-cert")) { + tls_cert_filename = *argv++; + if (tls_cert_filename == NULL) { + fprintf(stderr, "ERROR: missing argument after --ssl-client-cert option\n"); + return 1; + } + } else if (NPT_StringsEqual(arg, "--ssl-client-cert-password")) { + tls_cert_password = *argv++; + if (tls_cert_password == NULL) { + fprintf(stderr, "ERROR: missing argument after --ssl-client-cert-password option\n"); + return 1; + } + } else if (NPT_StringsEqual(arg, "--ssl-accept-self-signed-certs")) { + tls_options |= NPT_HttpTlsConnector::OPTION_ACCEPT_SELF_SIGNED_CERTS; + } else if (NPT_StringsEqual(arg, "--ssl-accept-hostname-mismatch")) { + tls_options |= NPT_HttpTlsConnector::OPTION_ACCEPT_HOSTNAME_MISMATCH; +#endif } else if (!url_set) { NPT_Result result = url.Parse(arg); if (NPT_FAILED(result)) { @@ -87,6 +122,29 @@ main(int argc, char** argv) } } +#if defined(NPT_CONFIG_ENABLE_TLS) + // load a client cert if needed + if (tls_options || tls_cert_filename) { + tls_context = new NPT_TlsContext(NPT_TlsContext::OPTION_VERIFY_LATER | NPT_TlsContext::OPTION_ADD_DEFAULT_TRUST_ANCHORS); + + if (tls_cert_filename) { + NPT_DataBuffer cert; + NPT_Result result = NPT_File::Load(tls_cert_filename, cert); + if (NPT_FAILED(result)) { + fprintf(stderr, "ERROR: failed to load client cert from file %s (%d)\n", tls_cert_filename, result); + return 1; + } + result = tls_context->LoadKey(NPT_TLS_KEY_FORMAT_PKCS12, cert.GetData(), cert.GetDataSize(), tls_cert_password); + if (NPT_FAILED(result)) { + fprintf(stderr, "ERROR: failed to parse client cert (%d)\n", result); + return 1; + } + } + + connector = new NPT_HttpTlsConnector(*tls_context, tls_options); + } +#endif + // get the document NPT_HttpRequest request(url, NPT_HTTP_METHOD_GET); NPT_HttpClient client; @@ -94,12 +152,22 @@ main(int argc, char** argv) if (http_1_1) { request.SetProtocol(NPT_HTTP_PROTOCOL_1_1); } + if (connector) { + client.SetConnector(connector); + } + + NPT_TimeStamp before_request; + NPT_System::GetCurrentTimeStamp(before_request); + NPT_Result result = client.SendRequest(request, response); if (NPT_FAILED(result)) { fprintf(stderr, "ERROR: SendRequest failed (%d:%s)\n", result, NPT_ResultText(result)); return 1; } + NPT_TimeStamp before_body; + NPT_System::GetCurrentTimeStamp(before_body); + // show the request info if (verbose) { printf("#REQUEST: protocol=%s\n", request.GetProtocol().GetChars()); @@ -134,6 +202,7 @@ main(int argc, char** argv) } // show entity + NPT_Size body_size = 0; NPT_HttpEntity* entity = response->GetEntity(); if (entity != NULL) { if (verbose) { @@ -157,19 +226,51 @@ main(int argc, char** argv) if (NPT_FAILED(result)) { fprintf(stderr, "ERROR: failed to load entity (%d)\n", result); } else { - if (verbose) printf("\n#BODY: loaded %d bytes\n", (int)body.GetDataSize()); + body_size = body.GetDataSize(); + if (verbose) printf("\n#BODY: loaded %d bytes\n", (int)body_size); // dump the body - NPT_OutputStreamReference output; - NPT_File standard_out(NPT_FILE_STANDARD_OUTPUT); - standard_out.Open(NPT_FILE_OPEN_MODE_WRITE); - standard_out.GetOutputStream(output); - output->Write(body.GetData(), body.GetDataSize()); + if (!no_body_output) { + NPT_OutputStreamReference output; + NPT_File standard_out(NPT_FILE_STANDARD_OUTPUT); + standard_out.Open(NPT_FILE_OPEN_MODE_WRITE); + standard_out.GetOutputStream(output); + output->Write(body.GetData(), body.GetDataSize()); + } } } - delete response; + NPT_TimeStamp after_body; + NPT_System::GetCurrentTimeStamp(after_body); + + if (verbose) { + unsigned int request_latency = (unsigned int)(before_body-before_request).ToMillis(); + unsigned int body_load_time = (unsigned int)(after_body-before_body).ToMillis(); + unsigned int total_load_time = (unsigned int)(after_body-before_request).ToMillis(); + unsigned int body_throughput = 0; + if (body_size && body_load_time) { + body_throughput = (unsigned int)((8.0 * (double)body_size)/1000.0)/((double)body_load_time/1000.0); + } + unsigned int total_throughput = 0; + if (body_size && total_load_time) { + total_throughput = (unsigned int)((8.0*(double)body_size)/1000.0)/((double)total_load_time/1000.0); + } + + printf("\n-----------------------------------------------------------\n"); + printf("TIMING:\n"); + printf(" Request Latency = %d ms\n", request_latency); + printf(" Body Load Time = %d ms\n", body_load_time); + printf(" Total Load Time = %d ms\n", total_load_time); + printf(" Body Throughput = %d kbps\n", body_throughput); + printf(" Total Throughput = %d kbps\n", total_throughput); + } + delete response; + delete connector; +#if defined(NPT_CONFIG_ENABLE_TLS) + delete tls_context; +#endif + return 0; } diff --git a/lib/libUPnP/Neptune/Source/Apps/ZipHttpServer/ZipHttpServer.cpp b/lib/libUPnP/Neptune/Source/Apps/ZipHttpServer/ZipHttpServer.cpp new file mode 100644 index 0000000000..a154c978a2 --- /dev/null +++ b/lib/libUPnP/Neptune/Source/Apps/ZipHttpServer/ZipHttpServer.cpp @@ -0,0 +1,533 @@ +/***************************************************************** +| +| Virtual ZIP file HTTP Server +| +| (c) 2001-2014 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| + ****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "Neptune.h" + +/*---------------------------------------------------------------------- +| logging ++---------------------------------------------------------------------*/ +NPT_SET_LOCAL_LOGGER("neptune.ziphttpserver") + +/*---------------------------------------------------------------------- +| GetContentType ++---------------------------------------------------------------------*/ +struct FileTypeMapEntry { + const char* extension; + const char* mime_type; +}; +static const FileTypeMapEntry +DefaultFileTypeMap[] = { + {"xml", "text/xml" }, + {"htm", "text/html" }, + {"html", "text/html" }, + {"c", "text/plain"}, + {"h", "text/plain"}, + {"txt", "text/plain"}, + {"css", "text/css" }, + {"gif", "image/gif" }, + {"thm", "image/jpeg"}, + {"png", "image/png"}, + {"tif", "image/tiff"}, + {"tiff", "image/tiff"}, + {"jpg", "image/jpeg"}, + {"jpeg", "image/jpeg"}, + {"jpe", "image/jpeg"}, + {"jp2", "image/jp2" }, + {"png", "image/png" }, + {"bmp", "image/bmp" }, + {"aif", "audio/x-aiff"}, + {"aifc", "audio/x-aiff"}, + {"aiff", "audio/x-aiff"}, + {"mpa", "audio/mpeg"}, + {"mp2", "audio/mpeg"}, + {"mp3", "audio/mpeg"}, + {"m4a", "audio/mp4"}, + {"wma", "audio/x-ms-wma"}, + {"wav", "audio/x-wav"}, + {"mpeg", "video/mpeg"}, + {"mpg", "video/mpeg"}, + {"mp4", "video/mp4"}, + {"m4v", "video/mp4"}, + {"m4f", "video/mp4"}, + {"m4s", "video/mp4"}, + {"ts", "video/MP2T"}, // RFC 3555 + {"mov", "video/quicktime"}, + {"wmv", "video/x-ms-wmv"}, + {"asf", "video/x-ms-asf"}, + {"avi", "video/x-msvideo"}, + {"divx", "video/x-msvideo"}, + {"xvid", "video/x-msvideo"}, + {"doc", "application/msword"}, + {"js", "application/javascript"}, + {"m3u8", "application/x-mpegURL"}, + {"pdf", "application/pdf"}, + {"ps", "application/postscript"}, + {"eps", "application/postscript"}, + {"zip", "application/zip"}, + {"mpd", "application/dash+xml"} +}; + +NPT_Map<NPT_String, NPT_String> FileTypeMap; + +static const char* +GetContentType(const NPT_String& filename) +{ + int last_dot = filename.ReverseFind('.'); + if (last_dot > 0) { + NPT_String extension = filename.GetChars()+last_dot+1; + extension.MakeLowercase(); + + NPT_String* mime_type; + if (NPT_SUCCEEDED(FileTypeMap.Get(extension, mime_type))) { + return mime_type->GetChars(); + } + } + + return "application/octet-stream"; +} + +/*---------------------------------------------------------------------- +| ZipRequestHandler ++---------------------------------------------------------------------*/ +class ZipRequestHandler : public NPT_HttpRequestHandler +{ +public: + // constructors + ZipRequestHandler(const char* url_root, + const char* file_root) : + m_UrlRoot(url_root), + m_FileRoot(file_root) {} + + // NPT_HttpRequestHandler methods + virtual NPT_Result SetupResponse(NPT_HttpRequest& request, + const NPT_HttpRequestContext& context, + NPT_HttpResponse& response); + +private: + NPT_String m_UrlRoot; + NPT_String m_FileRoot; +}; + +/*---------------------------------------------------------------------- +| ZipRequestHandler::SetupResponse ++---------------------------------------------------------------------*/ +NPT_Result +ZipRequestHandler::SetupResponse(NPT_HttpRequest& request, + const NPT_HttpRequestContext& /*context*/, + NPT_HttpResponse& response) +{ + NPT_HttpEntity* entity = response.GetEntity(); + if (entity == NULL) return NPT_ERROR_INVALID_STATE; + + // check the method + if (request.GetMethod() != NPT_HTTP_METHOD_GET && + request.GetMethod() != NPT_HTTP_METHOD_HEAD) { + response.SetStatus(405, "Method Not Allowed"); + return NPT_SUCCESS; + } + + // set some default headers + response.GetHeaders().SetHeader(NPT_HTTP_HEADER_ACCEPT_RANGES, "bytes"); + + // declare HTTP/1.1 if the client asked for it + if (request.GetProtocol() == NPT_HTTP_PROTOCOL_1_1) { + response.SetProtocol(NPT_HTTP_PROTOCOL_1_1); + } + + // default status + response.SetStatus(404, "Not Found"); + + // check that the request's path is an entry under the url root + if (!request.GetUrl().GetPath().StartsWith(m_UrlRoot)) { + return NPT_ERROR_INVALID_PARAMETERS; + } + + // compute the path relative to the URL root + NPT_String relative_path = NPT_Url::PercentDecode(request.GetUrl().GetPath().GetChars()+m_UrlRoot.GetLength()); + + // check that there is no '..' in the path, for security reasons + if (relative_path.Find("..") >= 0) { + NPT_LOG_INFO(".. in path is not supported"); + return NPT_SUCCESS; + } + // check that the path does not end with a / + if (relative_path.EndsWith("/")) { + NPT_LOG_INFO("skipping paths that end in /"); + return NPT_SUCCESS; + } + NPT_List<NPT_String> path_parts = relative_path.Split("/"); + + // walk down the path until we find a file + NPT_String path = m_FileRoot; + NPT_String subpath; + NPT_List<NPT_String>::Iterator fragment = path_parts.GetFirstItem(); + bool anchor_found = false; + bool is_zip = false; + for (; fragment; ++fragment) { + if (!anchor_found) { + path += '/'; + path += *fragment; + + // get info about the file + NPT_FileInfo info; + NPT_File::GetInfo(path, &info); + if (info.m_Type == NPT_FileInfo::FILE_TYPE_DIRECTORY) { + continue; + } else if (info.m_Type == NPT_FileInfo::FILE_TYPE_REGULAR) { + anchor_found = true; + if (path.EndsWith(".zip", true)) { + // this is a zip file + is_zip = true; + } + } else { + return NPT_SUCCESS; + } + } else { + if (!subpath.IsEmpty()) { + subpath += '/'; + } + subpath += *fragment; + } + } + NPT_LOG_FINE_3("is_zip=%d, path=%s, subpath=%s", (int)is_zip, path.GetChars(), subpath.GetChars()); + + // return now if no anchor was found + if (!anchor_found) { + return NPT_SUCCESS; + } + + // deal with regular files + if (!is_zip) { + if (subpath.IsEmpty()) { + // open the file + NPT_File file(path); + NPT_Result result = file.Open(NPT_FILE_OPEN_MODE_READ); + if (NPT_FAILED(result)) { + NPT_LOG_FINE("file not found"); + return NPT_SUCCESS; + } + NPT_InputStreamReference file_stream; + file.GetInputStream(file_stream); + entity->SetInputStream(file_stream, true); + entity->SetContentType(GetContentType(path)); + response.SetStatus(200, "OK"); + } + return NPT_SUCCESS; + } + + // load the zip file + NPT_File file(path); + NPT_Result result = file.Open(NPT_FILE_OPEN_MODE_READ); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("failed to open file (%d)", result); + return result; + } + NPT_InputStreamReference zip_stream; + file.GetInputStream(zip_stream); + NPT_ZipFile* zip_file = NULL; + result = NPT_ZipFile::Parse(*zip_stream, zip_file); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("failed to parse zip file (%d)", result); + return result; + } + + // look for the entry in the zip file + for (unsigned int i=0; i<zip_file->GetEntries().GetItemCount(); i++) { + NPT_ZipFile::Entry& entry = zip_file->GetEntries()[i]; + if (subpath == entry.m_Name) { + // send the file + NPT_InputStream* file_stream = NULL; + result = NPT_ZipFile::GetInputStream(entry, zip_stream, file_stream); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("failed to get the file stream (%d)", result); + delete zip_file; + return result; + } + NPT_InputStreamReference file_stream_ref(file_stream); + entity->SetInputStream(file_stream_ref, true); + entity->SetContentType(GetContentType(subpath)); + response.SetStatus(200, "OK"); + break; + } + } + + delete zip_file; + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| ZipHttpWorker ++---------------------------------------------------------------------*/ +class ZipHttpServer; +class ZipHttpWorker : public NPT_Thread { +public: + // types + enum { + IDLE, + RUNNING, + DEAD + } State; + + // constructor + ZipHttpWorker(unsigned int id, ZipHttpServer* server) : + m_Id(id), + m_Server(server), + m_State(IDLE) {} + + // NPT_Runnable methods + virtual void Run(); + NPT_Result Respond(); + + // members + unsigned int m_Id; + ZipHttpServer* m_Server; + NPT_SharedVariable m_State; + NPT_InputStreamReference m_InputStream; + NPT_OutputStreamReference m_OutputStream; + NPT_HttpRequestContext m_Context; + bool m_Verbose; +}; + +/*---------------------------------------------------------------------- +| ZipHttpServer ++---------------------------------------------------------------------*/ +class ZipHttpServer : public NPT_HttpServer { +public: + ZipHttpServer(const char* file_root, + const char* url_root, + unsigned int port, + unsigned int threads); + + void Loop(); + void OnWorkerDone(ZipHttpWorker* worker); + +private: + NPT_Mutex m_Lock; + unsigned int m_Threads; + ZipRequestHandler* m_Handler; + NPT_List<ZipHttpWorker*> m_Workers; + NPT_List<ZipHttpWorker*> m_ReadyWorkers; + NPT_SharedVariable m_AllWorkersBusy; +}; + +/*---------------------------------------------------------------------- +| ZipHttpServer::ZipHttpServer ++---------------------------------------------------------------------*/ +ZipHttpServer::ZipHttpServer(const char* file_root, + const char* url_root, + unsigned int port, + unsigned int threads) : + NPT_HttpServer(port), + m_Threads(threads), + m_AllWorkersBusy(0) +{ + m_Handler = new ZipRequestHandler(url_root, file_root); + AddRequestHandler(m_Handler, url_root, true); + + for (unsigned int i=0; i<threads; i++) { + ZipHttpWorker* worker = new ZipHttpWorker(i, this); + m_Workers.Add(worker); + m_ReadyWorkers.Add(worker); + + // start threads unless we're single threaded + if (threads > 1) { + worker->Start(); + } + } +} + +/*---------------------------------------------------------------------- +| ZipHttpServer::Loop ++---------------------------------------------------------------------*/ +void +ZipHttpServer::Loop() +{ + for (;;) { + // wait until at least one worker is ready + if (m_AllWorkersBusy.GetValue() == 1) { + NPT_LOG_FINEST("all workers busy"); + } + NPT_LOG_FINEST("waiting for a worker"); + m_AllWorkersBusy.WaitUntilEquals(0); + NPT_LOG_FINEST("got a worker"); + + // pick a worker + m_Lock.Lock(); + ZipHttpWorker* worker = NULL; + m_ReadyWorkers.PopHead(worker); + if (m_ReadyWorkers.GetItemCount() == 0) { + m_AllWorkersBusy.SetValue(1); + } + m_Lock.Unlock(); + + NPT_Result result = WaitForNewClient(worker->m_InputStream, worker->m_OutputStream, &worker->m_Context); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("WaitForNewClient returned %d", result); + + // wait a bit before continuing + NPT_System::Sleep(NPT_TimeInterval(1.0)); + } + + if (m_Threads == 1) { + // single threaded + worker->Respond(); + OnWorkerDone(worker); + } else { + worker->m_State.SetValue(ZipHttpWorker::RUNNING); + } + worker = NULL; + } + +} + +/*---------------------------------------------------------------------- +| ZipHttpWorker::OnWorkerDone ++---------------------------------------------------------------------*/ +void +ZipHttpServer::OnWorkerDone(ZipHttpWorker* worker) +{ + NPT_LOG_FINEST_1("worker %d done", worker->m_Id); + m_Lock.Lock(); + m_ReadyWorkers.Add(worker); + m_AllWorkersBusy.SetValue(0); + m_Lock.Unlock(); +} + +/*---------------------------------------------------------------------- +| ZipHttpWorker::Run ++---------------------------------------------------------------------*/ +void +ZipHttpWorker::Run(void) +{ + NPT_LOG_FINE_1("worker %d started", m_Id); + for (;;) { + // wait while we're idle + NPT_LOG_FINER_1("worker %d waiting for work", m_Id); + m_State.WaitWhileEquals(IDLE); + + NPT_LOG_FINER_1("worker %d woke up", m_Id); + + if (m_State.GetValue() == DEAD) { + NPT_LOG_FINE_1("worker %d exiting", m_Id); + return; + } + + // respond to the client + Respond(); + + // update our state + m_State.SetValue(IDLE); + + // notify the server + m_Server->OnWorkerDone(this); + } +} + +/*---------------------------------------------------------------------- +| ZipHttpWorker::Respond ++---------------------------------------------------------------------*/ +NPT_Result +ZipHttpWorker::Respond() +{ + NPT_LOG_FINER_1("worker %d responding to request", m_Id); + + NPT_Result result = m_Server->RespondToClient(m_InputStream, m_OutputStream, m_Context); + + NPT_LOG_FINER_2("worker %d responded to request (%d)", m_Id, result); + + m_InputStream = NULL; + m_OutputStream = NULL; + + return result; +} + +/*---------------------------------------------------------------------- +| main ++---------------------------------------------------------------------*/ +int +main(int /*argc*/, char** argv) +{ + NPT_String file_root; + NPT_String url_root = "/"; + unsigned int port = 8000; + unsigned int threads = 5; + bool verbose = false; + + while (const char* arg = *++argv) { + if (NPT_StringsEqual(arg, "--help") || + NPT_StringsEqual(arg, "-h")) { + NPT_Console::Output("usage: ziphttpserver [--file-root <dir>] [--url-root <path>] [--port <port>] [--threads <n>] [--verbose]\n"); + return 0; + } else if (NPT_StringsEqual(arg, "--file-root")) { + arg = *++argv; + if (arg == NULL) { + NPT_Console::Output("ERROR: missing argument for --file-root option\n"); + return 1; + } + file_root = arg; + } else if (NPT_StringsEqual(arg, "--url-root")) { + arg = *++argv; + if (arg == NULL) { + NPT_Console::Output("ERROR: missing argument for --url-root option\n"); + return 1; + } + url_root = arg; + } else if (NPT_StringsEqual(arg, "--port")) { + arg = *++argv; + if (arg == NULL) { + NPT_Console::Output("ERROR: missing argument for --port option\n"); + return 1; + } + NPT_ParseInteger(arg, port, true); + } else if (NPT_StringsEqual(arg, "--threads")) { + arg = *++argv; + if (arg == NULL) { + NPT_Console::Output("ERROR: missing argument for --threads option\n"); + return 1; + } + NPT_ParseInteger(arg, threads, true); + } else if (NPT_StringsEqual(arg, "--verbose")) { + verbose = true; + } + } + + // sanity check on some parameters + if (threads == 0 || threads > 20) { + fprintf(stderr, "ERROR: --threads must be between 1 and 20"); + return 1; + } + + // ensure the URL root start with a / + if (!url_root.StartsWith("/")) { + url_root = "/"+url_root; + } + + // initialize the file type map + for (unsigned int i=0; i<NPT_ARRAY_SIZE(DefaultFileTypeMap); i++) { + FileTypeMap[DefaultFileTypeMap[i].extension] =DefaultFileTypeMap[i].mime_type; + } + + if (file_root.GetLength() == 0) { + NPT_File::GetWorkingDir(file_root); + } + + if (verbose) { + NPT_Console::OutputF("Starting server on port %d, file-root=%s, url-root=%s, threads=%d\n", + port, file_root.GetChars(), url_root.GetChars(), threads); + } + + ZipHttpServer* server = new ZipHttpServer(file_root, url_root, port, threads); + server->Loop(); + delete server; + + return 0; +} diff --git a/lib/libUPnP/Neptune/Source/Core/NptAutomaticCleaner.cpp b/lib/libUPnP/Neptune/Source/Core/NptAutomaticCleaner.cpp new file mode 100644 index 0000000000..4a5e165ab8 --- /dev/null +++ b/lib/libUPnP/Neptune/Source/Core/NptAutomaticCleaner.cpp @@ -0,0 +1,111 @@ +/***************************************************************** +| +| Neptune - Automatic Cleaner +| +| Copyright (c) 2002-2008, Axiomatic Systems, LLC. +| All rights reserved. +| +| Redistribution and use in source and binary forms, with or without +| modification, are permitted provided that the following conditions are met: +| * Redistributions of source code must retain the above copyright +| notice, this list of conditions and the following disclaimer. +| * Redistributions in binary form must reproduce the above copyright +| notice, this list of conditions and the following disclaimer in the +| documentation and/or other materials provided with the distribution. +| * Neither the name of Axiomatic Systems nor the +| names of its contributors may be used to endorse or promote products +| derived from this software without specific prior written permission. +| +| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY +| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY +| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +| +****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptAutomaticCleaner.h" +#include "NptThreads.h" + +/*---------------------------------------------------------------------- +| NPT_AutomaticCleaner::NPT_AutomaticCleaner ++---------------------------------------------------------------------*/ +NPT_AutomaticCleaner::NPT_AutomaticCleaner() : + m_TlsContext(NULL), + m_HttpConnectionManager(NULL) +{ +} + +/*---------------------------------------------------------------------- +| NPT_AutomaticCleaner::~NPT_AutomaticCleaner ++---------------------------------------------------------------------*/ +NPT_AutomaticCleaner::~NPT_AutomaticCleaner() +{ + // When using TLS, the order to destroy singletons is important as + // connections may still need the TLS context up until they're + // cleaned up + delete m_HttpConnectionManager; + delete m_TlsContext; + + // Finally we can destroy the rest such as the NPT_HttpClient::ConnectionCanceller + m_Singletons.Apply(NPT_ObjectDeleter<Singleton>()); +} + +/*---------------------------------------------------------------------- +| NPT_AutomaticCleaner::GetInstance ++---------------------------------------------------------------------*/ +NPT_AutomaticCleaner* +NPT_AutomaticCleaner::GetInstance() +{ + if (Instance) return Instance; + + NPT_SingletonLock::GetInstance().Lock(); + if (Instance == NULL) { + // create the shared instance + Instance = new NPT_AutomaticCleaner(); + } + NPT_SingletonLock::GetInstance().Unlock(); + + return Instance; +} +NPT_AutomaticCleaner* NPT_AutomaticCleaner::Instance = NULL; +NPT_AutomaticCleaner::Cleaner NPT_AutomaticCleaner::Cleaner::AutomaticCleaner; + +/*---------------------------------------------------------------------- +| NPT_AutomaticCleaner::RegisterTlsContext ++---------------------------------------------------------------------*/ +NPT_Result +NPT_AutomaticCleaner::RegisterTlsContext(Singleton* singleton) +{ + m_TlsContext = singleton; + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_AutomaticCleaner::RegisterHttpConnectionManager ++---------------------------------------------------------------------*/ +NPT_Result +NPT_AutomaticCleaner::RegisterHttpConnectionManager(Singleton* singleton) +{ + m_HttpConnectionManager = singleton; + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_AutomaticCleaner::Register ++---------------------------------------------------------------------*/ +NPT_Result +NPT_AutomaticCleaner::Register(Singleton *singleton) +{ + // Prevent double insertion + m_Singletons.Remove(singleton); + return m_Singletons.Insert(m_Singletons.GetFirstItem(), singleton); +} diff --git a/lib/libUPnP/Neptune/Source/Core/NptAutomaticCleaner.h b/lib/libUPnP/Neptune/Source/Core/NptAutomaticCleaner.h new file mode 100644 index 0000000000..19b699b8f5 --- /dev/null +++ b/lib/libUPnP/Neptune/Source/Core/NptAutomaticCleaner.h @@ -0,0 +1,84 @@ +/***************************************************************** +| +| Neptune - Automatic Cleaner +| +| Copyright (c) 2002-2008, Axiomatic Systems, LLC. +| All rights reserved. +| +| Redistribution and use in source and binary forms, with or without +| modification, are permitted provided that the following conditions are met: +| * Redistributions of source code must retain the above copyright +| notice, this list of conditions and the following disclaimer. +| * Redistributions in binary form must reproduce the above copyright +| notice, this list of conditions and the following disclaimer in the +| documentation and/or other materials provided with the distribution. +| * Neither the name of Axiomatic Systems nor the +| names of its contributors may be used to endorse or promote products +| derived from this software without specific prior written permission. +| +| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY +| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY +| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +| +****************************************************************/ + +#ifndef _NPT_AUTOMATIC_CLEANER_H_ +#define _NPT_AUTOMATIC_CLEANER_H_ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptList.h" + +/*---------------------------------------------------------------------- +| NPT_AutomaticCleaner ++---------------------------------------------------------------------*/ +class NPT_AutomaticCleaner +{ +public: + class Singleton { + public: + virtual ~Singleton() {} + }; + + // singleton management + class Cleaner { + static Cleaner AutomaticCleaner; + ~Cleaner() { + if (Instance) { + delete Instance; + Instance = NULL; + } + } + }; + static NPT_AutomaticCleaner* GetInstance(); + + // destructor + ~NPT_AutomaticCleaner(); + + // methods + NPT_Result Register(Singleton* singleton); + NPT_Result RegisterTlsContext(Singleton* singleton); + NPT_Result RegisterHttpConnectionManager(Singleton* singleton); + +private: + // class members + static NPT_AutomaticCleaner* Instance; + + // constructor + NPT_AutomaticCleaner(); + + // members + NPT_List<Singleton*> m_Singletons; + Singleton* m_TlsContext; + Singleton* m_HttpConnectionManager; +}; + +#endif // _NPT_AUTOMATIC_CLEANER_H_ diff --git a/lib/libUPnP/Neptune/Source/Core/NptBufferedStreams.cpp b/lib/libUPnP/Neptune/Source/Core/NptBufferedStreams.cpp index 41801515a7..ade852ee01 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptBufferedStreams.cpp +++ b/lib/libUPnP/Neptune/Source/Core/NptBufferedStreams.cpp @@ -37,13 +37,19 @@ #include "NptConstants.h" #include "NptBufferedStreams.h" #include "NptUtils.h" +#include "NptLogging.h" + +/*---------------------------------------------------------------------- +| logging ++---------------------------------------------------------------------*/ +NPT_SET_LOCAL_LOGGER("neptune.bufferedstreams") #define NPT_CHECK_NOLOGTIMEOUT(_x) \ do { \ NPT_Result __result = (_x); \ if (__result != NPT_SUCCESS) { \ if (__result != NPT_ERROR_TIMEOUT && __result != NPT_ERROR_EOS) { \ - NPT_CHECK(__result); \ + NPT_CHECK_WARNING(__result); \ } \ return __result; \ } \ @@ -54,6 +60,7 @@ do { \ +---------------------------------------------------------------------*/ NPT_BufferedInputStream::NPT_BufferedInputStream(NPT_InputStreamReference& source, NPT_Size buffer_size) : m_Source(source), + m_Position(0), m_SkipNewline(false), m_Eos(false) { @@ -229,6 +236,7 @@ done: *buffer = '\0'; // return what we have + m_Position += (NPT_Size)(buffer-buffer_start); if (chars_read) *chars_read = (NPT_Size)(buffer-buffer_start); if (result == NPT_ERROR_EOS) { m_Eos = true; @@ -301,9 +309,7 @@ NPT_BufferedInputStream::Read(void* buffer, NPT_CopyMemory(buffer, m_Buffer.data + m_Buffer.offset, buffered); - //buffer = (void*)((NPT_Byte*)buffer+buffered); m_Buffer.offset += buffered; - //bytes_to_read -= buffered; total_read += buffered; goto done; } @@ -337,6 +343,7 @@ NPT_BufferedInputStream::Read(void* buffer, } done: + m_Position += total_read; if (bytes_read) *bytes_read = total_read; if (result == NPT_ERROR_EOS) { m_Eos = true; @@ -401,10 +408,26 @@ NPT_BufferedInputStream::Peek(void* buffer, | NPT_BufferedInputStream::Seek +---------------------------------------------------------------------*/ NPT_Result -NPT_BufferedInputStream::Seek(NPT_Position /*offset*/) +NPT_BufferedInputStream::Seek(NPT_Position offset) { - // not implemented yet - return NPT_ERROR_NOT_IMPLEMENTED; + NPT_Result result; + + if (offset >= m_Position && + offset - m_Position < m_Buffer.valid - m_Buffer.offset) { + m_Buffer.offset += offset - m_Position; + m_Position = offset; + return NPT_SUCCESS; + } + + result = m_Source->Seek(offset); + if (NPT_FAILED(result)) return result; + + m_Buffer.offset = 0; + m_Buffer.valid = 0; + m_Eos = false; + m_Position = offset; + + return NPT_SUCCESS; } /*---------------------------------------------------------------------- @@ -413,9 +436,8 @@ NPT_BufferedInputStream::Seek(NPT_Position /*offset*/) NPT_Result NPT_BufferedInputStream::Tell(NPT_Position& offset) { - // not implemented yet - offset = 0; - return NPT_ERROR_NOT_IMPLEMENTED; + offset = m_Position; + return NPT_SUCCESS; } /*---------------------------------------------------------------------- diff --git a/lib/libUPnP/Neptune/Source/Core/NptBufferedStreams.h b/lib/libUPnP/Neptune/Source/Core/NptBufferedStreams.h index a03f57224a..1c0e0d6839 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptBufferedStreams.h +++ b/lib/libUPnP/Neptune/Source/Core/NptBufferedStreams.h @@ -82,6 +82,7 @@ public: protected: // members NPT_InputStreamReference m_Source; + NPT_Position m_Position; bool m_SkipNewline; bool m_Eos; struct { diff --git a/lib/libUPnP/Neptune/Source/Core/NptConfig.h b/lib/libUPnP/Neptune/Source/Core/NptConfig.h index eb61cff3fc..d51f67f94e 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptConfig.h +++ b/lib/libUPnP/Neptune/Source/Core/NptConfig.h @@ -122,6 +122,7 @@ /* QNX */ #if defined(__QNX__) +#define NPT_CONFIG_HAVE_GETADDRINFO #endif /* cygwin */ @@ -151,7 +152,7 @@ #if defined(__APPLE__) #define NPT_CONFIG_HAVE_GETADDRINFO #define NPT_CONFIG_HAVE_AUTORELEASE_POOL -//#define NPT_CONFIG_HAVE_SYSTEM_LOG_CONFIG +#define NPT_CONFIG_HAVE_SYSTEM_LOG_CONFIG #endif /*---------------------------------------------------------------------- @@ -259,8 +260,10 @@ typedef long NPT_PointerLong; /* Android */ #if defined(ANDROID) +#if !defined(NPT_CONFIG_NO_RTTI) #define NPT_CONFIG_NO_RTTI #endif +#endif /* OSX and iOS */ #if defined(__APPLE__) @@ -273,6 +276,7 @@ typedef long NPT_PointerLong; #if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6) #define NPT_CONFIG_HAVE_STAT_ST_BIRTHTIME #endif +#define NPT_CONFIG_HAVE_DEV_URANDOM #endif #endif diff --git a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp index d2e36b1c8c..132746a6d0 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp +++ b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp @@ -949,11 +949,11 @@ NPT_HttpResponse::Parse(NPT_BufferedInputStream& stream, // read the response line NPT_String line; - NPT_CHECK_FINE(stream.ReadLine(line, NPT_HTTP_PROTOCOL_MAX_LINE_LENGTH)); - /*if (NPT_FAILED(res)) { + NPT_Result res = stream.ReadLine(line, NPT_HTTP_PROTOCOL_MAX_LINE_LENGTH); + if (NPT_FAILED(res)) { if (res != NPT_ERROR_TIMEOUT && res != NPT_ERROR_EOS) NPT_CHECK_WARNING(res); return res; - }*/ + } NPT_LOG_FINER_1("http response: %s", line.GetChars()); @@ -998,110 +998,12 @@ NPT_HttpResponse::Parse(NPT_BufferedInputStream& stream, } /*---------------------------------------------------------------------- -| NPT_HttpSimpleConnection -+---------------------------------------------------------------------*/ -class NPT_HttpSimpleConnection : public NPT_HttpClient::Connection -{ -public: - virtual ~NPT_HttpSimpleConnection() { - NPT_HttpClient::ConnectionCanceller::Untrack(this); - } - virtual NPT_InputStreamReference& GetInputStream() { - return m_InputStream; - } - virtual NPT_OutputStreamReference& GetOutputStream() { - return m_OutputStream; - } - virtual NPT_Result GetInfo(NPT_SocketInfo& info) { - return m_Socket->GetInfo(info); - } - virtual NPT_Result Abort() { - return m_Socket->Cancel(); - } - - // members - NPT_SocketReference m_Socket; - NPT_InputStreamReference m_InputStream; - NPT_OutputStreamReference m_OutputStream; -}; - -/*---------------------------------------------------------------------- -| NPT_HttpTcpConnector -+---------------------------------------------------------------------*/ -class NPT_HttpTcpConnector : public NPT_HttpClient::Connector -{ - virtual NPT_Result Connect(const NPT_HttpUrl& url, - NPT_HttpClient& client, - const NPT_HttpProxyAddress* proxy, - bool reuse, - NPT_HttpClient::Connection*& connection); -}; - -/*---------------------------------------------------------------------- -| NPT_HttpTcpConnector::Connect -+---------------------------------------------------------------------*/ -NPT_Result -NPT_HttpTcpConnector::Connect(const NPT_HttpUrl& url, - NPT_HttpClient& client, - const NPT_HttpProxyAddress* proxy, - bool /* reuse */, - NPT_HttpClient::Connection*& connection) -{ - // default values - connection = NULL; - - // decide which host we need to connect to - const char* server_hostname; - NPT_UInt16 server_port; - if (proxy) { - // the proxy is set - server_hostname = (const char*)proxy->GetHostName(); - server_port = proxy->GetPort(); - } else { - // no proxy: connect directly - server_hostname = (const char*)url.GetHost(); - server_port = url.GetPort(); - } - - // get the address and port to which we need to connect - NPT_IpAddress address; - NPT_CHECK_FINE(address.ResolveName(server_hostname, client.GetConfig().m_NameResolverTimeout)); - - // connect to the server - NPT_LOG_FINE_2("TCP connector will connect to %s:%d", server_hostname, server_port); - NPT_TcpClientSocket* tcp_socket = new NPT_TcpClientSocket(); - NPT_SocketReference socket(tcp_socket, true); - tcp_socket->SetReadTimeout(client.GetConfig().m_IoTimeout); - tcp_socket->SetWriteTimeout(client.GetConfig().m_IoTimeout); - NPT_SocketAddress socket_address(address, server_port); - NPT_CHECK_FINE(tcp_socket->Connect(socket_address, client.GetConfig().m_ConnectionTimeout)); - - // get the streams - NPT_HttpSimpleConnection* _connection = new NPT_HttpSimpleConnection(); - _connection->m_Socket = socket; - connection = _connection; - tcp_socket->GetInputStream(_connection->m_InputStream); - tcp_socket->GetOutputStream(_connection->m_OutputStream); - - return NPT_SUCCESS; -} - -/*---------------------------------------------------------------------- | NPT_HttpEnvProxySelector +---------------------------------------------------------------------*/ -class NPT_HttpEnvProxySelector : public NPT_HttpProxySelector +class NPT_HttpEnvProxySelector : public NPT_HttpProxySelector, + public NPT_AutomaticCleaner::Singleton { public: - // singleton management - class Cleaner { - static Cleaner AutomaticCleaner; - ~Cleaner() { - if (Instance) { - delete Instance; - Instance = NULL; - } - } - }; static NPT_HttpEnvProxySelector* GetInstance(); // NPT_HttpProxySelector methods @@ -1121,7 +1023,6 @@ private: NPT_HttpProxyAddress m_AllProxy; }; NPT_HttpEnvProxySelector* NPT_HttpEnvProxySelector::Instance = NULL; -NPT_HttpEnvProxySelector::Cleaner NPT_HttpEnvProxySelector::Cleaner::AutomaticCleaner; /*---------------------------------------------------------------------- | NPT_HttpEnvProxySelector::GetInstance @@ -1136,6 +1037,9 @@ NPT_HttpEnvProxySelector::GetInstance() // create the shared instance Instance = new NPT_HttpEnvProxySelector(); + // prepare for recycling + NPT_AutomaticCleaner::GetInstance()->Register(Instance); + // parse the http proxy settings NPT_String http_proxy; NPT_Environment::Get("http_proxy", http_proxy); @@ -1376,7 +1280,7 @@ NPT_HttpConnectionManager::~NPT_HttpConnectionManager() // set abort flag and wait for thread to finish m_Aborted.SetValue(1); Wait(); - + m_Connections.Apply(NPT_ObjectDeleter<Connection>()); } @@ -1392,6 +1296,11 @@ NPT_HttpConnectionManager::GetInstance() if (Instance == NULL) { // create the shared instance Instance = new NPT_HttpConnectionManager(); + + // register to for automatic cleanup + NPT_AutomaticCleaner::GetInstance()->RegisterHttpConnectionManager(Instance); + + // Start shared instance Instance->Start(); } NPT_SingletonLock::GetInstance().Unlock(); @@ -1399,7 +1308,6 @@ NPT_HttpConnectionManager::GetInstance() return Instance; } NPT_HttpConnectionManager* NPT_HttpConnectionManager::Instance = NULL; -NPT_HttpConnectionManager::Cleaner NPT_HttpConnectionManager::Cleaner::AutomaticCleaner; /*---------------------------------------------------------------------- | NPT_HttpConnectionManager::Run @@ -1463,172 +1371,166 @@ NPT_HttpConnectionManager::FindConnection(NPT_SocketAddress& address) } /*---------------------------------------------------------------------- -| NPT_HttpConnectionManager::Recycle +| NPT_HttpConnectionManager::Track +---------------------------------------------------------------------*/ NPT_Result -NPT_HttpConnectionManager::Recycle(NPT_HttpConnectionManager::Connection* connection) +NPT_HttpConnectionManager::Track(NPT_HttpClient* client, NPT_HttpClient::Connection* connection) { NPT_AutoLock lock(m_Lock); - Cleanup(); - // remove older connections to make room - while (m_Connections.GetItemCount() >= m_MaxConnections) { - NPT_List<Connection*>::Iterator head = m_Connections.GetFirstItem(); - delete *head; - m_Connections.Erase(head); - NPT_LOG_FINER("removing connection from pool to make some room"); + // look if already tracking client connections + ConnectionList* connections = NULL; + if (NPT_SUCCEEDED(m_ClientConnections.Get(client, connections))) { + // return immediately if connection is already associated with client + if (connections->Find(NPT_ObjectComparator<NPT_HttpClient::Connection*>(connection))) { + NPT_LOG_WARNING("Connection already associated to client."); + return NPT_SUCCESS; + } + connections->Add(connection); + return NPT_SUCCESS; } - if (connection) { - // label this connection with the current timestamp and flag - NPT_System::GetCurrentTimeStamp(connection->m_TimeStamp); - connection->m_IsRecycled = true; + // new client connections + ConnectionList new_connections; - // add the connection to the pool - m_Connections.Add(connection); - } + // add connection to new client connection list + new_connections.Add(connection); + // track new client connections + m_ClientConnections.Put(client, new_connections); return NPT_SUCCESS; } /*---------------------------------------------------------------------- -| NPT_HttpConnectionManager::Connection::Connection +| NPT_HttpConnectionManager::UntrackConnection +---------------------------------------------------------------------*/ -NPT_HttpConnectionManager::Connection::Connection(NPT_HttpConnectionManager& manager, - NPT_SocketReference& socket, - NPT_InputStreamReference input_stream, - NPT_OutputStreamReference output_stream) : - m_Manager(manager), - m_IsRecycled(false), - m_Socket(socket), - m_InputStream(input_stream), - m_OutputStream(output_stream) +NPT_Result +NPT_HttpConnectionManager::UntrackConnection(NPT_HttpClient::Connection* connection) { + NPT_AutoLock lock(m_Lock); + + // look for connection by enumerating all client connections + NPT_List<NPT_Map<NPT_HttpClient*, ConnectionList>::Entry*>::Iterator entry = + m_ClientConnections.GetEntries().GetFirstItem(); + while (entry) { + NPT_HttpClient*& client = (NPT_HttpClient*&)(*entry)->GetKey(); + ConnectionList& connections = (ConnectionList&)(*entry)->GetValue(); + + // look for connection in client connection list + NPT_List<NPT_HttpClient::Connection*>::Iterator i = + connections.Find(NPT_ObjectComparator<NPT_HttpClient::Connection*>(connection)); + if (i) { + // remove it + connections.Erase(i); + + // untrack client if no more active connections for it + if (connections.GetItemCount() == 0) { + m_ClientConnections.Erase(client); } -/*---------------------------------------------------------------------- -| NPT_HttpConnectionManager::Connection::Recycle -+---------------------------------------------------------------------*/ -NPT_Result -NPT_HttpConnectionManager::Connection::Recycle() -{ - NPT_HttpClient::ConnectionCanceller::GetInstance()->Untrack(this); - return m_Manager.Recycle(this); + return NPT_SUCCESS; + } + ++entry; + } + + return NPT_ERROR_NO_SUCH_ITEM; } /*---------------------------------------------------------------------- -| NPT_HttpClient::ConnectionCanceller::GetInstance +| NPT_HttpConnectionManager::Untrack +---------------------------------------------------------------------*/ -NPT_HttpClient::ConnectionCanceller* -NPT_HttpClient::ConnectionCanceller::GetInstance() +NPT_Result +NPT_HttpConnectionManager::Untrack(NPT_HttpClient::Connection* connection) { - if (Instance) return Instance; + // check first if ConnectionCanceller Instance has not been released already + // with static finalizers + if (Instance == NULL) return NPT_FAILURE; - NPT_SingletonLock::GetInstance().Lock(); - if (Instance == NULL) { - // create the shared instance - Instance = new ConnectionCanceller(); + return GetInstance()->UntrackConnection(connection); } - NPT_SingletonLock::GetInstance().Unlock(); - return Instance; -} -NPT_HttpClient::ConnectionCanceller* NPT_HttpClient::ConnectionCanceller::Instance = NULL; -NPT_HttpClient::ConnectionCanceller::Cleaner NPT_HttpClient::ConnectionCanceller::Cleaner::AutomaticCleaner; - /*---------------------------------------------------------------------- -| NPT_HttpClient::ConnectionCanceller::Track +| NPT_HttpConnectionManager::Recycle +---------------------------------------------------------------------*/ NPT_Result -NPT_HttpClient::ConnectionCanceller::Track(NPT_HttpClient* client, Connection* connection) +NPT_HttpConnectionManager::Recycle(NPT_HttpConnectionManager::Connection* connection) { NPT_AutoLock lock(m_Lock); + Cleanup(); - ConnectionList* connections = NULL; - if (NPT_SUCCEEDED(m_Connections.Get(client, connections))) { - for (NPT_List<NPT_HttpClient::Connection*>::Iterator i = connections->GetFirstItem(); - i; - ++i) { - if (*i == connection) return NPT_SUCCESS; + // remove older connections to make room + while (m_Connections.GetItemCount() >= m_MaxConnections) { + NPT_List<Connection*>::Iterator head = m_Connections.GetFirstItem(); + if (!head) break; + delete *head; + m_Connections.Erase(head); + NPT_LOG_FINER("removing connection from pool to make some room"); } - connections->Add(connection); - m_Clients.Put(connection, client); - return NPT_SUCCESS; + + if (connection) { + // Untrack connection + UntrackConnection(connection); + + // label this connection with the current timestamp and flag + NPT_System::GetCurrentTimeStamp(connection->m_TimeStamp); + connection->m_IsRecycled = true; + + // add the connection to the pool + m_Connections.Add(connection); } - ConnectionList new_connections; - new_connections.Add(connection); - m_Connections.Put(client, new_connections); - m_Clients.Put(connection, client); return NPT_SUCCESS; } /*---------------------------------------------------------------------- -| NPT_HttpClient::ConnectionCanceller::UntrackConnection +| NPT_HttpConnectionManager::AbortConnections +---------------------------------------------------------------------*/ NPT_Result -NPT_HttpClient::ConnectionCanceller::UntrackConnection(Connection* connection) +NPT_HttpConnectionManager::AbortConnections(NPT_HttpClient* client) { NPT_AutoLock lock(m_Lock); - // look for client from connection - NPT_HttpClient** client = NULL; - if (NPT_SUCCEEDED(m_Clients.Get(connection, client))) { - // enumerate connections for this client ConnectionList* connections = NULL; - NPT_CHECK(m_Connections.Get(*client, connections)); - + if (NPT_SUCCEEDED(m_ClientConnections.Get(client, connections))) { for (NPT_List<NPT_HttpClient::Connection*>::Iterator i = connections->GetFirstItem(); i; ++i) { - if (*i == connection) { - connections->Erase(i); - break; - } - } - - // remove client entry if last associated connection was removed - if (connections->GetItemCount() == 0) { - m_Connections.Erase(*client); + (*i)->Abort(); } - - // remove connection - m_Clients.Erase(connection); } - - return NPT_ERROR_NO_SUCH_ITEM; + return NPT_SUCCESS; } /*---------------------------------------------------------------------- -| NPT_HttpClient::ConnectionCanceller::Untrack +| NPT_HttpConnectionManager::Connection::Connection +---------------------------------------------------------------------*/ -NPT_Result -NPT_HttpClient::ConnectionCanceller::Untrack(Connection* connection) +NPT_HttpConnectionManager::Connection::Connection(NPT_HttpConnectionManager& manager, + NPT_SocketReference& socket, + NPT_InputStreamReference input_stream, + NPT_OutputStreamReference output_stream) : + m_Manager(manager), + m_IsRecycled(false), + m_Socket(socket), + m_InputStream(input_stream), + m_OutputStream(output_stream) { - // check first if ConnectionCanceller Instance has not been released already - // with static finalizers - if (Instance == NULL) return NPT_FAILURE; - - return GetInstance()->UntrackConnection(connection); } /*---------------------------------------------------------------------- -| NPT_HttpClient::ConnectionCanceller::AbortConnections +| NPT_HttpConnectionManager::Connection::~Connection ++---------------------------------------------------------------------*/ +NPT_HttpConnectionManager::Connection::~Connection() +{ + NPT_HttpConnectionManager::Untrack(this); +} + +/*---------------------------------------------------------------------- +| NPT_HttpConnectionManager::Connection::Recycle +---------------------------------------------------------------------*/ NPT_Result -NPT_HttpClient::ConnectionCanceller::AbortConnections(NPT_HttpClient* client) +NPT_HttpConnectionManager::Connection::Recycle() { - NPT_AutoLock lock(m_Lock); - - ConnectionList* connections = NULL; - if (NPT_SUCCEEDED(m_Connections.Get(client, connections))) { - for (NPT_List<NPT_HttpClient::Connection*>::Iterator i = connections->GetFirstItem(); - i; - ++i) { - (*i)->Abort(); - } - } - return NPT_SUCCESS; + return m_Manager.Recycle(this); } /*---------------------------------------------------------------------- @@ -1642,11 +1544,7 @@ NPT_HttpClient::NPT_HttpClient(Connector* connector, bool transfer_ownership) : m_Aborted(false) { if (connector == NULL) { -#if defined(NPT_CONFIG_ENABLE_TLS) m_Connector = new NPT_HttpTlsConnector(); -#else - m_Connector = new NPT_HttpTcpConnector(); -#endif m_ConnectorIsOwned = true; } } @@ -1756,10 +1654,21 @@ NPT_HttpClient::SetUserAgent(const char* user_agent) } /*---------------------------------------------------------------------- +| NPT_HttpClient::TrackConnection ++---------------------------------------------------------------------*/ +NPT_Result +NPT_HttpClient::TrackConnection(Connection* connection) +{ + NPT_AutoLock lock(m_AbortLock); + if (m_Aborted) return NPT_ERROR_CANCELLED; + return NPT_HttpConnectionManager::GetInstance()->Track(this, connection); +} + +/*---------------------------------------------------------------------- | NPT_HttpClient::SendRequestOnce +---------------------------------------------------------------------*/ NPT_Result -NPT_HttpClient::SendRequestOnce(NPT_HttpRequest& request, +NPT_HttpClient::SendRequestOnce(NPT_HttpRequest& request, NPT_HttpResponse*& response, NPT_HttpRequestContext* context /* = NULL */) { @@ -1816,20 +1725,10 @@ NPT_HttpClient::SendRequestOnce(NPT_HttpRequest& request, context->SetRemoteAddress(info.remote_address); } - // track connection so it can be aborted - { - NPT_AutoLock lock(m_AbortLock); - if (m_Aborted) continue; - ConnectionCanceller::GetInstance()->Track(this, connection); - } - - NPT_HttpEntity* entity; + NPT_HttpEntity* entity = request.GetEntity(); NPT_InputStreamReference body_stream; - if (reconnect && - (entity = request.GetEntity()) && - NPT_SUCCEEDED(entity->GetInputStream(body_stream)) && - NPT_FAILED(body_stream->Seek(0))) { + if (reconnect && entity && NPT_SUCCEEDED(entity->GetInputStream(body_stream)) && NPT_FAILED(body_stream->Seek(0))) { // if body is not seekable, we can't afford to reuse a connection // that could fail, so we reconnect a new one instead NPT_LOG_FINE("rewinding body stream would fail ... create new connection"); @@ -1856,13 +1755,13 @@ NPT_HttpClient::SendRequestOnce(NPT_HttpRequest& request, result = WriteRequest(*output_stream.AsPointer(), request, should_persist, use_proxy); if (NPT_FAILED(result)) { NPT_LOG_FINE_1("failed to write request headers (%d)", result); - if (reconnect) { + if (reconnect && !m_Aborted) { if (!body_stream.IsNull()) { // go back to the start of the body so that we can resend NPT_LOG_FINE("rewinding body stream in order to resend"); result = body_stream->Seek(0); if (NPT_FAILED(result)) { - return NPT_ERROR_HTTP_CANNOT_RESEND_BODY; + NPT_CHECK_FINE(NPT_ERROR_HTTP_CANNOT_RESEND_BODY); } } continue; @@ -1877,18 +1776,19 @@ NPT_HttpClient::SendRequestOnce(NPT_HttpRequest& request, response, &cref); if (NPT_FAILED(result)) { - if (reconnect && + NPT_LOG_FINE_1("failed to parse the response (%d)", result); + if (reconnect && !m_Aborted /*&& (result == NPT_ERROR_EOS || result == NPT_ERROR_CONNECTION_ABORTED || result == NPT_ERROR_CONNECTION_RESET || - result == NPT_ERROR_READ_FAILED)) { + result == NPT_ERROR_READ_FAILED) GBG: don't look for specific error codes */) { NPT_LOG_FINE("error is not fatal, retrying"); if (!body_stream.IsNull()) { // go back to the start of the body so that we can resend NPT_LOG_FINE("rewinding body stream in order to resend"); result = body_stream->Seek(0); if (NPT_FAILED(result)) { - return NPT_ERROR_HTTP_CANNOT_RESEND_BODY; + NPT_CHECK_FINE(NPT_ERROR_HTTP_CANNOT_RESEND_BODY); } } continue; @@ -1982,7 +1882,7 @@ NPT_HttpClient::WriteRequest(NPT_OutputStream& output_stream, NPT_CHECK_WARNING(output_stream.WriteFully(header_stream.GetData(), header_stream.GetDataSize())); // send request body - if (!body_stream.IsNull()) { + if (entity && !body_stream.IsNull()) { // check for chunked transfer encoding NPT_OutputStream* dest = &output_stream; if (entity->GetTransferEncoding() == NPT_HTTP_TRANSFER_ENCODING_CHUNKED) { @@ -2208,9 +2108,8 @@ NPT_HttpClient::Abort() { NPT_AutoLock lock(m_AbortLock); m_Aborted = true; - m_Connector->Abort(); - NPT_HttpClient::ConnectionCanceller::GetInstance()->AbortConnections(this); + NPT_HttpConnectionManager::GetInstance()->AbortConnections(this); return NPT_SUCCESS; } @@ -2880,15 +2779,12 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = { {"aif", "audio/x-aiff"}, {"aifc", "audio/x-aiff"}, {"aiff", "audio/x-aiff"}, - {"flac", "audio/x-flac"}, - {"mka", "audio/x-matroska"}, {"mpa", "audio/mpeg"}, {"mp2", "audio/mpeg"}, {"mp3", "audio/mpeg"}, {"m4a", "audio/mp4"}, {"wma", "audio/x-ms-wma"}, {"wav", "audio/x-wav"}, - {"mkv", "video/x-matroska"}, {"mpeg", "video/mpeg"}, {"mpg", "video/mpeg"}, {"mp4", "video/mp4"}, @@ -2901,7 +2797,6 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = { {"wtv", "video/x-ms-wmv"}, {"asf", "video/x-ms-asf"}, {"mkv", "video/x-matroska"}, - {"mk3d", "video/x-matroska-3d"}, {"flv", "video/x-flv"}, {"avi", "video/x-msvideo"}, {"divx", "video/x-msvideo"}, diff --git a/lib/libUPnP/Neptune/Source/Core/NptHttp.h b/lib/libUPnP/Neptune/Source/Core/NptHttp.h index 7bc8a8886c..402d515e0e 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptHttp.h +++ b/lib/libUPnP/Neptune/Source/Core/NptHttp.h @@ -45,6 +45,7 @@ #include "NptVersion.h" #include "NptTime.h" #include "NptThreads.h" +#include "NptAutomaticCleaner.h" /*---------------------------------------------------------------------- | constants @@ -407,46 +408,7 @@ public: virtual bool SupportsPersistence() { return false; } virtual bool IsRecycled() { return false; } virtual NPT_Result Recycle() { delete this; return NPT_SUCCESS; } - virtual NPT_Result Abort() { return NPT_SUCCESS; } - }; - - class ConnectionCanceller - { - public: - typedef NPT_List<Connection*> ConnectionList; - - // singleton management - class Cleaner { - static Cleaner AutomaticCleaner; - ~Cleaner() { - if (Instance) { - delete Instance; - Instance = NULL; - } - } - }; - static ConnectionCanceller* GetInstance(); - static NPT_Result Untrack(Connection* connection); - - // destructor - ~ConnectionCanceller() {} - - // methods - NPT_Result Track(NPT_HttpClient* client, Connection* connection); - NPT_Result UntrackConnection(Connection* connection); - NPT_Result AbortConnections(NPT_HttpClient* client); - - private: - // class members - static ConnectionCanceller* Instance; - - // constructor - ConnectionCanceller() {} - - // members - NPT_Mutex m_Lock; - NPT_Map<NPT_HttpClient*, ConnectionList> m_Connections; - NPT_Map<Connection*, NPT_HttpClient*> m_Clients; + virtual NPT_Result Abort() { return NPT_ERROR_NOT_IMPLEMENTED; } }; class Connector { @@ -456,11 +418,12 @@ public: virtual NPT_Result Connect(const NPT_HttpUrl& url, NPT_HttpClient& client, const NPT_HttpProxyAddress* proxy, - bool reuse, // wether we can reuse a connection or not + bool reuse, // whether we can reuse a connection or not Connection*& connection) = 0; - virtual NPT_Result Abort() { return NPT_SUCCESS; } protected: + NPT_Result TrackConnection(NPT_HttpClient& client, + Connection* connection) { return client.TrackConnection(connection); } Connector() {} // don't instantiate directly }; @@ -508,6 +471,7 @@ public: protected: // methods + NPT_Result TrackConnection(Connection* connection); NPT_Result SendRequestOnce(NPT_HttpRequest& request, NPT_HttpResponse*& response, NPT_HttpRequestContext* context = NULL); @@ -518,7 +482,6 @@ protected: bool m_ProxySelectorIsOwned; Connector* m_Connector; bool m_ConnectorIsOwned; - NPT_Mutex m_AbortLock; bool m_Aborted; }; @@ -526,19 +489,11 @@ protected: /*---------------------------------------------------------------------- | NPT_HttpConnectionManager +---------------------------------------------------------------------*/ -class NPT_HttpConnectionManager : public NPT_Thread +class NPT_HttpConnectionManager : public NPT_Thread, + public NPT_AutomaticCleaner::Singleton { public: // singleton management - class Cleaner { - static Cleaner AutomaticCleaner; - ~Cleaner() { - if (Instance) { - delete Instance; - Instance = NULL; - } - } - }; static NPT_HttpConnectionManager* GetInstance(); class Connection : public NPT_HttpClient::Connection @@ -548,7 +503,7 @@ public: NPT_SocketReference& socket, NPT_InputStreamReference input_stream, NPT_OutputStreamReference output_stream); - virtual ~Connection() { NPT_HttpClient::ConnectionCanceller::Untrack(this); } + virtual ~Connection(); // NPT_HttpClient::Connection methods virtual NPT_InputStreamReference& GetInputStream() { return m_InputStream; } @@ -574,8 +529,15 @@ public: // methods Connection* FindConnection(NPT_SocketAddress& address); NPT_Result Recycle(Connection* connection); + NPT_Result Track(NPT_HttpClient* client, NPT_HttpClient::Connection* connection); + NPT_Result AbortConnections(NPT_HttpClient* client); + + // class methods + static NPT_Result Untrack(NPT_HttpClient::Connection* connection); private: + typedef NPT_List<NPT_HttpClient::Connection*> ConnectionList; + // class members static NPT_HttpConnectionManager* Instance; @@ -586,14 +548,16 @@ private: void Run(); // methods - NPT_Result Cleanup(); + NPT_Result UntrackConnection(NPT_HttpClient::Connection* connection); + NPT_Result Cleanup(); // members NPT_Mutex m_Lock; NPT_Cardinal m_MaxConnections; NPT_Cardinal m_MaxConnectionAge; - NPT_List<Connection*> m_Connections; NPT_SharedVariable m_Aborted; + NPT_List<Connection*> m_Connections; + NPT_Map<NPT_HttpClient*, ConnectionList> m_ClientConnections; }; /*---------------------------------------------------------------------- diff --git a/lib/libUPnP/Neptune/Source/Core/NptJson.cpp b/lib/libUPnP/Neptune/Source/Core/NptJson.cpp new file mode 100644 index 0000000000..300e2105bf --- /dev/null +++ b/lib/libUPnP/Neptune/Source/Core/NptJson.cpp @@ -0,0 +1,37 @@ +/***************************************************************** +| +| Neptune - JSON +| +| Copyright (c) 2002-2012, Axiomatic Systems, LLC. +| All rights reserved. +| +| Redistribution and use in source and binary forms, with or without +| modification, are permitted provided that the following conditions are met: +| * Redistributions of source code must retain the above copyright +| notice, this list of conditions and the following disclaimer. +| * Redistributions in binary form must reproduce the above copyright +| notice, this list of conditions and the following disclaimer in the +| documentation and/or other materials provided with the distribution. +| * Neither the name of Axiomatic Systems nor the +| names of its contributors may be used to endorse or promote products +| derived from this software without specific prior written permission. +| +| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY +| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY +| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +| + ****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptJson.h" +#include "NptUtils.h" + diff --git a/lib/libUPnP/Neptune/Source/Core/NptJson.h b/lib/libUPnP/Neptune/Source/Core/NptJson.h new file mode 100644 index 0000000000..699feef73a --- /dev/null +++ b/lib/libUPnP/Neptune/Source/Core/NptJson.h @@ -0,0 +1,42 @@ +/***************************************************************** +| +| Neptune - JSON +| +| Copyright (c) 2002-2012, Axiomatic Systems, LLC. +| All rights reserved. +| +| Redistribution and use in source and binary forms, with or without +| modification, are permitted provided that the following conditions are met: +| * Redistributions of source code must retain the above copyright +| notice, this list of conditions and the following disclaimer. +| * Redistributions in binary form must reproduce the above copyright +| notice, this list of conditions and the following disclaimer in the +| documentation and/or other materials provided with the distribution. +| * Neither the name of Axiomatic Systems nor the +| names of its contributors may be used to endorse or promote products +| derived from this software without specific prior written permission. +| +| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY +| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY +| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +| + ****************************************************************/ + +#ifndef _NPT_JSON_H_ +#define _NPT_JSON_H_ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptTypes.h" +#include "NptStrings.h" + + +#endif // _NPT_JSON_H_ diff --git a/lib/libUPnP/Neptune/Source/Core/NptLogging.cpp b/lib/libUPnP/Neptune/Source/Core/NptLogging.cpp index 08cb449aa4..08037427ab 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptLogging.cpp +++ b/lib/libUPnP/Neptune/Source/Core/NptLogging.cpp @@ -489,6 +489,8 @@ NPT_LogManager::Unlock() NPT_Result NPT_LogManager::Configure(const char* config_sources) { + //NPT_AutoLock lock(LogManager.m_Lock); + // exit if we're already initialized if (m_Configured) return NPT_SUCCESS; @@ -960,6 +962,7 @@ NPT_Logger::Log(int level, /* call all handlers for this logger and parents */ m_Manager.Lock(); + //m_Manager.SetEnabled(false); // prevent recursion while (logger) { /* call all handlers for the current logger */ for (NPT_List<NPT_LogHandler*>::Iterator i = logger->m_Handlers.GetFirstItem(); @@ -976,6 +979,7 @@ NPT_Logger::Log(int level, break; } } + //m_Manager.SetEnabled(true); m_Manager.Unlock(); /* free anything we may have allocated */ diff --git a/lib/libUPnP/Neptune/Source/Core/NptMap.h b/lib/libUPnP/Neptune/Source/Core/NptMap.h index 3953022410..fc12b8797b 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptMap.h +++ b/lib/libUPnP/Neptune/Source/Core/NptMap.h @@ -422,7 +422,7 @@ public: template <typename X> NPT_Result Apply(const X& function) const { - for (unsigned int i=0; i<(m_BucketCountLog<<1); i++) { + for (int i=0; i<(1<<m_BucketCountLog); i++) { if (m_Buckets[i]) { function(m_Buckets[i]); } diff --git a/lib/libUPnP/Neptune/Source/Core/NptNetwork.h b/lib/libUPnP/Neptune/Source/Core/NptNetwork.h index 0a2a7c758e..6486f0353a 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptNetwork.h +++ b/lib/libUPnP/Neptune/Source/Core/NptNetwork.h @@ -95,6 +95,9 @@ public: // operators bool operator==(const NPT_IpAddress& other) const; + // FIXME: temporary + NPT_String m_HostName; + private: // members unsigned char m_Address[4]; diff --git a/lib/libUPnP/Neptune/Source/Core/NptReferences.h b/lib/libUPnP/Neptune/Source/Core/NptReferences.h index c516d6516c..c8e1f5ad42 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptReferences.h +++ b/lib/libUPnP/Neptune/Source/Core/NptReferences.h @@ -46,14 +46,15 @@ class NPT_Reference { public: // constructors and destructor - NPT_Reference() : m_Object(NULL), m_Counter(NULL), m_Mutex(NULL) {} - explicit NPT_Reference(T* object, bool thread_safe = true) : - m_Object(object), + NPT_Reference() : m_Object(NULL), m_Counter(NULL), m_Mutex(NULL), m_ThreadSafe(true) {} + explicit NPT_Reference(T* object, bool thread_safe = true) : + m_Object(object), m_Counter(object?new NPT_Cardinal(1):NULL), - m_Mutex(thread_safe?new NPT_Mutex():NULL) {} - + m_Mutex((object && thread_safe)?new NPT_Mutex():NULL), + m_ThreadSafe(thread_safe) {} + NPT_Reference(const NPT_Reference<T>& ref) : - m_Object(ref.m_Object), m_Counter(ref.m_Counter), m_Mutex(ref.m_Mutex) { + m_Object(ref.m_Object), m_Counter(ref.m_Counter), m_Mutex(ref.m_Mutex), m_ThreadSafe(ref.m_ThreadSafe) { if (m_Mutex) m_Mutex->Lock(); if (m_Counter) ++(*m_Counter); if (m_Mutex) m_Mutex->Unlock(); @@ -64,8 +65,8 @@ public: // the cast operator operator NPT_Reference<U>() below, which would // have to be marked as a friend, and friend declarations with the // same class name confuses some compilers - NPT_Reference(T* object, NPT_Cardinal* counter, NPT_Mutex* mutex) : - m_Object(object), m_Counter(counter), m_Mutex(mutex) { + NPT_Reference(T* object, NPT_Cardinal* counter, NPT_Mutex* mutex, bool thread_safe) : + m_Object(object), m_Counter(counter), m_Mutex(mutex), m_ThreadSafe(thread_safe) { if (m_Mutex) m_Mutex->Lock(); if (m_Counter) ++(*m_Counter); if (m_Mutex) m_Mutex->Unlock(); @@ -82,6 +83,7 @@ public: m_Object = ref.m_Object; m_Counter = ref.m_Counter; m_Mutex = ref.m_Mutex; + m_ThreadSafe = ref.m_ThreadSafe; if (m_Mutex) m_Mutex->Lock(); if (m_Counter) ++(*m_Counter); @@ -93,7 +95,7 @@ public: Release(); m_Object = object; m_Counter = object?new NPT_Cardinal(1):NULL; - m_Mutex = NULL; + m_Mutex = (object && m_ThreadSafe)?new NPT_Mutex():NULL; return *this; } T& operator*() const { return *m_Object; } @@ -108,7 +110,7 @@ public: // overloaded cast operators template <typename U> operator NPT_Reference<U>() { - return NPT_Reference<U>(m_Object, m_Counter, m_Mutex); + return NPT_Reference<U>(m_Object, m_Counter, m_Mutex, m_ThreadSafe); } // methods @@ -154,10 +156,7 @@ private: if (m_Mutex) { NPT_Mutex* mutex = m_Mutex; - // reset m_Mutex prior to releasing the lock - // in case another reference is waiting on the mutex - // so that it doesn't try to unlock it while we're deleting it here afterwards - if (last_reference) m_Mutex = NULL; + m_Mutex = NULL; mutex->Unlock(); if (last_reference) delete mutex; } @@ -168,6 +167,7 @@ private: T* m_Object; NPT_Cardinal* m_Counter; NPT_Mutex* m_Mutex; + bool m_ThreadSafe; }; #endif // _NPT_REFERENCES_H_ diff --git a/lib/libUPnP/Neptune/Source/Core/NptRingBuffer.cpp b/lib/libUPnP/Neptune/Source/Core/NptRingBuffer.cpp index 23d85295de..76739c882c 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptRingBuffer.cpp +++ b/lib/libUPnP/Neptune/Source/Core/NptRingBuffer.cpp @@ -41,7 +41,7 @@ | NPT_RingBuffer::NPT_RingBuffer +---------------------------------------------------------------------*/ NPT_RingBuffer::NPT_RingBuffer(NPT_Size size) : - m_Size(size), +// m_Size(size), m_BufferIsLocal(true), m_Closed(false) { @@ -55,7 +55,7 @@ NPT_RingBuffer::NPT_RingBuffer(NPT_Size size) : | NPT_RingBuffer::NPT_RingBuffer +---------------------------------------------------------------------*/ NPT_RingBuffer::NPT_RingBuffer(void* buffer, NPT_Size size) : - m_Size(size), +// m_Size(size), m_BufferIsLocal(false), m_Closed(false) { diff --git a/lib/libUPnP/Neptune/Source/Core/NptRingBuffer.h b/lib/libUPnP/Neptune/Source/Core/NptRingBuffer.h index ceda43ff9c..990b4a6c6e 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptRingBuffer.h +++ b/lib/libUPnP/Neptune/Source/Core/NptRingBuffer.h @@ -74,7 +74,7 @@ class NPT_RingBuffer } m_Data; unsigned char* m_In; unsigned char* m_Out; - NPT_Size m_Size; +// NPT_Size m_Size; bool m_BufferIsLocal; bool m_Closed; }; diff --git a/lib/libUPnP/Neptune/Source/Core/NptSimpleMessageQueue.cpp b/lib/libUPnP/Neptune/Source/Core/NptSimpleMessageQueue.cpp index bb54220975..a6ed2cfe31 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptSimpleMessageQueue.cpp +++ b/lib/libUPnP/Neptune/Source/Core/NptSimpleMessageQueue.cpp @@ -96,7 +96,7 @@ NPT_SimpleMessageQueue::QueueMessage(NPT_Message* message, NPT_Result NPT_SimpleMessageQueue::PumpMessage(NPT_Timeout timeout /* = NPT_TIMEOUT_INFINITE */) { - NPT_SimpleMessageCapsule* capsule; + NPT_SimpleMessageCapsule* capsule = NULL; NPT_LOG_FINEST_1("popping message from queue, timeout=%d", timeout); NPT_Result result = m_Queue.Pop(capsule, timeout); diff --git a/lib/libUPnP/Neptune/Source/Core/NptStack.h b/lib/libUPnP/Neptune/Source/Core/NptStack.h index 933c12cc23..50788050aa 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptStack.h +++ b/lib/libUPnP/Neptune/Source/Core/NptStack.h @@ -48,6 +48,8 @@ class NPT_Stack : public NPT_List<T> public: // methods NPT_Result Push(const T& value) { + // NOTE: we must use the this-> accessor here because the standard + // requires it when the member to look up is in a parent template return this->Add(value); } diff --git a/lib/libUPnP/Neptune/Source/Core/NptStreams.cpp b/lib/libUPnP/Neptune/Source/Core/NptStreams.cpp index 79909fa0d8..9d00488256 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptStreams.cpp +++ b/lib/libUPnP/Neptune/Source/Core/NptStreams.cpp @@ -553,7 +553,7 @@ NPT_StreamToStreamCopy(NPT_InputStream& from, while (buffer_bytes_to_write) { NPT_Size buffer_bytes_written = 0; result = to.Write(buffer_bytes, buffer_bytes_to_write, &buffer_bytes_written); - if (NPT_FAILED(result)) goto end; + if (NPT_FAILED(result) && result != NPT_ERROR_WOULD_BLOCK) goto end; NPT_ASSERT(buffer_bytes_written <= buffer_bytes_to_write); buffer_bytes_to_write -= buffer_bytes_written; if (bytes_written) *bytes_written += buffer_bytes_written; diff --git a/lib/libUPnP/Neptune/Source/Core/NptStreams.h b/lib/libUPnP/Neptune/Source/Core/NptStreams.h index 6d9ecc5637..6cdab10fcb 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptStreams.h +++ b/lib/libUPnP/Neptune/Source/Core/NptStreams.h @@ -286,11 +286,11 @@ public: // methods virtual NPT_Result Read(void* buffer, NPT_Size bytes_to_read, - NPT_Size* bytes_read = NULL) = 0; - virtual NPT_Result Seek(NPT_Position offset) = 0; - virtual NPT_Result Tell(NPT_Position& offset) = 0; - virtual NPT_Result GetSize(NPT_LargeSize& size) = 0; - virtual NPT_Result GetAvailable(NPT_LargeSize& available) = 0; + NPT_Size* bytes_read = NULL); + virtual NPT_Result Seek(NPT_Position offset); + virtual NPT_Result Tell(NPT_Position& offset); + virtual NPT_Result GetSize(NPT_LargeSize& size); + virtual NPT_Result GetAvailable(NPT_LargeSize& available); private: NPT_InputStreamReference m_Source; diff --git a/lib/libUPnP/Neptune/Source/Core/NptStrings.cpp b/lib/libUPnP/Neptune/Source/Core/NptStrings.cpp index 28f042fd54..2a04854a96 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptStrings.cpp +++ b/lib/libUPnP/Neptune/Source/Core/NptStrings.cpp @@ -824,7 +824,7 @@ const NPT_String& NPT_String::Replace(char a, const char* str) { // check args - if (m_Chars == NULL || a == '\0' || str == NULL || str[0] == '\0') return *this; + if (m_Chars == NULL || a == '\0' || str == NULL) return *this; // optimization if (NPT_StringLength(str) == 1) return Replace(a, str[0]); @@ -1054,7 +1054,7 @@ NPT_String::TrimLeft(const char* chars) // shift chars to the left char* d = m_Chars; - GetBuffer()->SetLength(GetLength()-(s-d)); + GetBuffer()->SetLength(GetLength()-(NPT_Size)(s-d)); while ((*d++ = *s++)) {}; return *this; } diff --git a/lib/libUPnP/Neptune/Source/Core/NptTls.cpp b/lib/libUPnP/Neptune/Source/Core/NptTls.cpp index a1c94421c8..c622bb78aa 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptTls.cpp +++ b/lib/libUPnP/Neptune/Source/Core/NptTls.cpp @@ -29,8 +29,6 @@ | ****************************************************************/ -#if defined(NPT_CONFIG_ENABLE_TLS) - /*---------------------------------------------------------------------- | includes +---------------------------------------------------------------------*/ @@ -41,14 +39,16 @@ #include "NptSockets.h" #include "NptSystem.h" #include "NptDigest.h" - -#include "ssl.h" +#include "NptAutomaticCleaner.h" /*---------------------------------------------------------------------- | logging +---------------------------------------------------------------------*/ NPT_SET_LOCAL_LOGGER("neptune.tls") +#if defined(NPT_CONFIG_ENABLE_TLS) +#include "ssl.h" + /*---------------------------------------------------------------------- | constants +---------------------------------------------------------------------*/ @@ -224,6 +224,7 @@ NPT_Tls_MapResult(int err) case SSL_ERROR_CONN_LOST: return NPT_ERROR_CONNECTION_ABORTED; case SSL_ERROR_TIMEOUT: return NPT_ERROR_TIMEOUT; case SSL_ERROR_EOS: return NPT_ERROR_EOS; + case SSL_CLOSE_NOTIFY: return NPT_ERROR_EOS; case SSL_ERROR_NOT_SUPPORTED: return NPT_ERROR_NOT_SUPPORTED; case SSL_ERROR_INVALID_HANDSHAKE: return NPT_ERROR_TLS_INVALID_HANDSHAKE; case SSL_ERROR_INVALID_PROT_MSG: return NPT_ERROR_TLS_INVALID_PROTOCOL_MESSAGE; @@ -266,7 +267,7 @@ public: NPT_TlsContextImpl(NPT_Flags options) : m_SSL_CTX(ssl_ctx_new(((options & NPT_TlsContext::OPTION_VERIFY_LATER)?SSL_SERVER_VERIFY_LATER:0) | ((options & NPT_TlsContext::OPTION_REQUIRE_CLIENT_CERTIFICATE)?SSL_CLIENT_AUTHENTICATION:0), - NPT_TLS_CONTEXT_DEFAULT_SESSION_CACHE)) {} + (options & NPT_TlsContext::OPTION_NO_SESSION_CACHE)?0:NPT_TLS_CONTEXT_DEFAULT_SESSION_CACHE)) {} ~NPT_TlsContextImpl() { ssl_ctx_free(m_SSL_CTX); } NPT_Result LoadKey(NPT_TlsKeyFormat key_format, @@ -968,7 +969,6 @@ NPT_TlsServerSession::NPT_TlsServerSession(NPT_TlsContext& context, /*---------------------------------------------------------------------- | NPT_HttpTlsConnector::DefaultTlsContext +---------------------------------------------------------------------*/ -NPT_HttpTlsConnector::Cleanup NPT_HttpTlsConnector::Cleanup::AutomaticCleaner; NPT_TlsContext* NPT_HttpTlsConnector::DefaultTlsContext = NULL; /*---------------------------------------------------------------------- @@ -1000,6 +1000,9 @@ NPT_HttpTlsConnector::GetDefaultTlsContext() if (DefaultTlsContext == NULL) { DefaultTlsContext = new NPT_TlsContext(NPT_TlsContext::OPTION_VERIFY_LATER | NPT_TlsContext::OPTION_ADD_DEFAULT_TRUST_ANCHORS); + + // Prepare for recycling + NPT_AutomaticCleaner::GetInstance()->RegisterTlsContext(DefaultTlsContext); } NPT_SingletonLock::GetInstance().Unlock(); } @@ -1019,12 +1022,13 @@ NPT_HttpTlsConnector::VerifyPeer(NPT_TlsClientSession& session, const char* host if (result == NPT_ERROR_TLS_CERTIFICATE_SELF_SIGNED) { if (!m_Options && OPTION_ACCEPT_SELF_SIGNED_CERTS) { // self-signed certs are not acceptable - NPT_LOG_FINE("accepting self-signed certificate"); + NPT_LOG_FINE("rejecting self-signed certificate"); return result; } + } else { + NPT_LOG_WARNING_2("TLS certificate verification failed (%d:%s)", result, NPT_ResultText(result)); + return result; } - NPT_LOG_WARNING_2("TLS certificate verification failed (%d:%s)", result, NPT_ResultText(result)); - return result; } // chech the DNS name @@ -1040,6 +1044,8 @@ NPT_HttpTlsConnector::VerifyPeer(NPT_TlsClientSession& session, const char* host return NPT_SUCCESS; } +#endif // defined(NPT_CONFIG_ENABLE_TLS) + /*---------------------------------------------------------------------- | NPT_HttpSimpleTlsConnection +---------------------------------------------------------------------*/ @@ -1102,16 +1108,29 @@ NPT_HttpTlsConnector::Connect(const NPT_HttpUrl& url, connection = connection_manager->FindConnection(socket_address); if (connection) { NPT_LOG_FINE("reusing connection"); + // track connection immediately so we can abort it later + NPT_CHECK_FINE(Connector::TrackConnection(client, connection)); return NPT_SUCCESS; } } - // connect to the server + // create a socket NPT_LOG_FINE_2("TLS connector will connect to %s:%d", server_hostname, server_port); NPT_TcpClientSocket* tcp_socket = new NPT_TcpClientSocket(); NPT_SocketReference socket(tcp_socket); tcp_socket->SetReadTimeout(client.GetConfig().m_IoTimeout); tcp_socket->SetWriteTimeout(client.GetConfig().m_IoTimeout); + + // create a connection object for the socket so we can abort it during connect + // even though streams are not valid yet + NPT_Reference<NPT_HttpConnectionManager::Connection> cref(new NPT_HttpConnectionManager::Connection(*connection_manager, + socket, + input_stream, + output_stream)); + // track connection immediately before connecting so we can abort immediately it if necessary + NPT_CHECK_FINE(Connector::TrackConnection(client, cref.AsPointer())); + + // connect to the server NPT_CHECK_FINE(tcp_socket->Connect(socket_address, client.GetConfig().m_ConnectionTimeout)); // get the streams @@ -1121,6 +1140,7 @@ NPT_HttpTlsConnector::Connect(const NPT_HttpUrl& url, NPT_CHECK_FINE(tcp_socket->GetOutputStream(raw_output)); if (url.GetSchemeId() == NPT_Url::SCHEME_ID_HTTPS) { +#if defined(NPT_CONFIG_ENABLE_TLS) if (proxy) { // RFC 2817 CONNECT NPT_String connect_host = url.GetHost() + ":" + NPT_String::FromInteger(url.GetPort()); @@ -1184,18 +1204,21 @@ NPT_HttpTlsConnector::Connect(const NPT_HttpUrl& url, // return the TLS streams tls_session.GetInputStream(input_stream); tls_session.GetOutputStream(output_stream); +#else + return NPT_ERROR_NOT_SUPPORTED; +#endif } else { input_stream = raw_input; output_stream = raw_output; } - // create a connection object for the streams - connection = new NPT_HttpConnectionManager::Connection(*connection_manager, - socket, - input_stream, - output_stream); + // update connection streams + cref->m_InputStream = input_stream; + cref->m_OutputStream = output_stream; + + connection = cref.AsPointer(); + cref.Detach(); // release the internal ref return NPT_SUCCESS; } -#endif // NPT_CONFIG_ENABLE_TLS diff --git a/lib/libUPnP/Neptune/Source/Core/NptTls.h b/lib/libUPnP/Neptune/Source/Core/NptTls.h index c61c481cf4..4a392fdcc7 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptTls.h +++ b/lib/libUPnP/Neptune/Source/Core/NptTls.h @@ -121,13 +121,14 @@ private: /*---------------------------------------------------------------------- | NPT_TlsContext +---------------------------------------------------------------------*/ -class NPT_TlsContext +class NPT_TlsContext : public NPT_AutomaticCleaner::Singleton { public: enum { OPTION_VERIFY_LATER = 1, OPTION_REQUIRE_CLIENT_CERTIFICATE = 2, - OPTION_ADD_DEFAULT_TRUST_ANCHORS = 4 + OPTION_ADD_DEFAULT_TRUST_ANCHORS = 4, + OPTION_NO_SESSION_CACHE = 8 }; NPT_TlsContext(NPT_Flags options=0); ~NPT_TlsContext(); @@ -242,6 +243,7 @@ public: /*---------------------------------------------------------------------- | NPT_HttpTlsConnector +---------------------------------------------------------------------*/ +#if defined(NPT_CONFIG_ENABLE_TLS) class NPT_HttpTlsConnector : public NPT_HttpClient::Connector { public: @@ -263,20 +265,8 @@ public: const NPT_HttpProxyAddress* proxy, bool reuse, NPT_HttpClient::Connection*& connection); - virtual NPT_Result Abort() { return NPT_ERROR_NOT_IMPLEMENTED; } private: - // singleton management - class Cleanup { - static Cleanup AutomaticCleaner; - ~Cleanup() { - if (DefaultTlsContext) { - delete DefaultTlsContext; - DefaultTlsContext = NULL; - } - } - }; - // class methods static NPT_TlsContext& GetDefaultTlsContext(); @@ -287,6 +277,18 @@ private: NPT_TlsContext& m_TlsContext; NPT_Flags m_Options; }; +#else +class NPT_HttpTlsConnector : public NPT_HttpClient::Connector +{ +public: + virtual ~NPT_HttpTlsConnector() {} + virtual NPT_Result Connect(const NPT_HttpUrl& url, + NPT_HttpClient& client, + const NPT_HttpProxyAddress* proxy, + bool reuse, + NPT_HttpClient::Connection*& connection); +}; +#endif /*---------------------------------------------------------------------- | Trust Anchors @@ -296,7 +298,9 @@ private: * and the last element is a terminator element: the cert_data field is NULL * and the cert_size field is 0 */ +#if defined(NPT_CONFIG_ENABLE_TLS) #include "NptTlsDefaultTrustAnchorsBase.h" #include "NptTlsDefaultTrustAnchorsExtended.h" +#endif #endif // _NPT_TLS_H_ diff --git a/lib/libUPnP/Neptune/Source/Core/NptUri.cpp b/lib/libUPnP/Neptune/Source/Core/NptUri.cpp index 69bfb8381a..dfb145c495 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptUri.cpp +++ b/lib/libUPnP/Neptune/Source/Core/NptUri.cpp @@ -536,7 +536,7 @@ NPT_Url::Parse(const char* url, NPT_UInt16 default_port) break; case NPT_URL_PARSER_STATE_HOST: - if (c == ':' || c == '/' || c == '\0') { + if (c == ':' || c == '/' || c == '\0' || c == '?' || c == '#') { m_Host.Assign(mark, (NPT_Size)(url-1-mark)); if (c == ':') { mark = url; @@ -698,6 +698,18 @@ NPT_Url::ParsePathPlus(const char* path_plus) m_HasQuery = false; m_HasFragment = false; +#ifdef _WIN32 + // Skip the leading '/' if there is an absolute path starting with + // a drive letter on Windows. + if (path_plus[0] == '/' && + ((path_plus[1] >= 'a' && path_plus[1] <= 'z') || + (path_plus[1] >= 'A' && path_plus[1] <= 'Z')) && + path_plus[2] == ':') + { + ++path_plus; + } +#endif + // intialize the parser NPT_UrlParserState state = NPT_URL_PARSER_STATE_PATH; const char* mark = path_plus; diff --git a/lib/libUPnP/Neptune/Source/Core/NptXml.cpp b/lib/libUPnP/Neptune/Source/Core/NptXml.cpp index 6b296106c0..682db1c9b5 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptXml.cpp +++ b/lib/libUPnP/Neptune/Source/Core/NptXml.cpp @@ -565,9 +565,9 @@ NPT_XmlElementNode::GetNamespacePrefix(const char* uri) const /*---------------------------------------------------------------------- | NPT_XmlTextNode::NPT_XmlTextNode +---------------------------------------------------------------------*/ -NPT_XmlTextNode::NPT_XmlTextNode(TokenType token_type, const char* text) : +NPT_XmlTextNode::NPT_XmlTextNode(TokenType, const char* text) : NPT_XmlNode(TEXT), - m_TokenType(token_type), +// m_TokenType(token_type), m_Text(text) { } @@ -1750,8 +1750,8 @@ NPT_XmlParser::Parse(NPT_InputStream& stream, Reset(); } - // use a buffer on the stack - char buffer[256]; + // use a buffer on the stack + char buffer[1024]; // read a buffer and parse it until the end of the stream NPT_Size max_bytes_to_read = size; @@ -1900,7 +1900,7 @@ NPT_XmlParser::OnElementAttribute(const char* name, const char* value) name[4] == 's' && (name[5] == '\0' || name[5] == ':')) { // namespace definition - m_CurrentElement->SetNamespaceUri((name[5] == ':')?name+6:"", value); + m_CurrentElement->SetNamespaceUri((name[5] == ':' && name[6] != '\0')?name+6:"", value); } else { m_CurrentElement->AddAttribute(name, value); } @@ -1968,7 +1968,7 @@ NPT_XmlParser::OnEndElement(const char* name) | NPT_XmlParser::OnCharacterData +---------------------------------------------------------------------*/ NPT_Result -NPT_XmlParser::OnCharacterData(const char* data, unsigned long size) +NPT_XmlParser::OnCharacterData(const char* data, NPT_Size size) { NPT_XML_Debug_1("\nNPT_XmlParser::OnCharacterData: %s\n", data); diff --git a/lib/libUPnP/Neptune/Source/Core/NptXml.h b/lib/libUPnP/Neptune/Source/Core/NptXml.h index 2af260faef..b5d18ea381 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptXml.h +++ b/lib/libUPnP/Neptune/Source/Core/NptXml.h @@ -268,7 +268,7 @@ class NPT_XmlTextNode : public NPT_XmlNode private: // members - TokenType m_TokenType; +// TokenType m_TokenType; NPT_String m_Text; }; @@ -301,7 +301,7 @@ class NPT_XmlParser NPT_Result OnStartElement(const char* name); NPT_Result OnElementAttribute(const char* name, const char* value); NPT_Result OnEndElement(const char* name); - NPT_Result OnCharacterData(const char* data, unsigned long size); + NPT_Result OnCharacterData(const char* data, NPT_Size size); void RemoveIgnorableWhitespace(); // members diff --git a/lib/libUPnP/Neptune/Source/Core/NptZip.cpp b/lib/libUPnP/Neptune/Source/Core/NptZip.cpp index a379e0c64d..463a07f16f 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptZip.cpp +++ b/lib/libUPnP/Neptune/Source/Core/NptZip.cpp @@ -29,7 +29,6 @@ | ****************************************************************/ -#if defined(NPT_CONFIG_ENABLE_ZIP) /*---------------------------------------------------------------------- | includes @@ -49,6 +48,346 @@ NPT_SET_LOCAL_LOGGER("neptune.zip") /*---------------------------------------------------------------------- | constants +---------------------------------------------------------------------*/ +static const NPT_UInt32 NPT_ZIP_END_OF_CENTRAL_DIRECTORY_SIGNATURE = 0x06054b50; +static const NPT_UInt32 NPT_ZIP64_END_OF_CENTRAL_DIRECTORY_SIGNATURE = 0x06064b50; +static const NPT_UInt32 NPT_ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_SIGNATURE = 0x07064b50; +static const NPT_UInt32 NPT_ZIP_CENTRAL_FILE_HEADER_SIGNATURE = 0x02014b50; +static const NPT_UInt32 NPT_ZIP_LOCAL_FILE_HEADER_SIGNATURE = 0x04034b50; +static const NPT_UInt16 NPT_ZIP_EXT_DATA_TYPE_ZIP64 = 0x0001; + +static const NPT_UInt32 NPT_ZIP_MAX_DIRECTORY_SIZE = 0x1000000; // 16 MB +static const NPT_UInt32 NPT_ZIP_MAX_ENTRY_COUNT = 0x100000; // 1M entries + +/*---------------------------------------------------------------------- +| NPT_ZipFile::NPT_ZipFile ++---------------------------------------------------------------------*/ +NPT_ZipFile::NPT_ZipFile() +{ +} + +/*---------------------------------------------------------------------- +| NPT_ZipFile::Parse ++---------------------------------------------------------------------*/ +NPT_Result +NPT_ZipFile::Parse(NPT_InputStream& stream, NPT_ZipFile*& file) +{ + // defautl return value + file = NULL; + + // check that we know the size of the stream + NPT_LargeSize stream_size = 0; + NPT_Result result = stream.GetSize(stream_size); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("cannot get stream size (%d)", result); + return result; + } + if (stream_size < 22) { + NPT_LOG_WARNING("input stream too short"); + return NPT_ERROR_INVALID_FORMAT; + } + + // seek to the most likely start of the end of central directory record + unsigned int max_eocdr_size = 22+65536; + if (max_eocdr_size > stream_size) { + max_eocdr_size = (unsigned int)stream_size; + } + unsigned char eocdr[22]; + bool record_found = false; + NPT_Position position = 0; + for (unsigned int i=0; i<max_eocdr_size; i++) { + position = stream_size-22-i; + result = stream.Seek(position); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("seek failed (%d)", result); + return result; + } + result = stream.ReadFully(eocdr, 22); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("read failed (%d)", result); + return result; + } + NPT_UInt32 signature = NPT_BytesToInt32Le(eocdr); + if (signature == NPT_ZIP_END_OF_CENTRAL_DIRECTORY_SIGNATURE) { + record_found = true; + break; + } + } + if (!record_found) { + NPT_LOG_WARNING("eocd record not found at end of stream"); + return NPT_ERROR_INVALID_FORMAT; + } + + // parse the eocdr + NPT_UInt32 this_disk = NPT_BytesToInt16Le(&eocdr[ 4]); + NPT_UInt32 start_disk = NPT_BytesToInt16Le(&eocdr[ 6]); + NPT_UInt64 this_disk_entry_count = NPT_BytesToInt16Le(&eocdr[ 8]); + NPT_UInt64 total_entry_count = NPT_BytesToInt16Le(&eocdr[10]); + NPT_UInt64 central_directory_size = NPT_BytesToInt32Le(&eocdr[12]); + NPT_Position central_directory_offset = NPT_BytesToInt32Le(&eocdr[16]); + + // format check + if (this_disk != 0 || start_disk != 0) { + return NPT_ERROR_NOT_SUPPORTED; + } + if (this_disk_entry_count != total_entry_count) { + return NPT_ERROR_NOT_SUPPORTED; + } + + // check if this is a zip64 file + if (central_directory_offset == 0xFFFFFFFF) { + unsigned char zip64_locator[20]; + result = stream.Seek(position-20); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("seek failed (%d)", result); + return result; + } + result = stream.ReadFully(zip64_locator, 20); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("read failed (%d)", result); + return result; + } + + NPT_UInt32 signature = NPT_BytesToInt32Le(&zip64_locator[0]); + if (signature != NPT_ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_SIGNATURE) { + NPT_LOG_WARNING("zip64 directory locator signature not found"); + return NPT_ERROR_INVALID_FORMAT; + } + NPT_UInt32 zip64_disk_start = NPT_BytesToInt32Le(&zip64_locator[ 4]); + NPT_UInt64 zip64_directory_offset = NPT_BytesToInt64Le(&zip64_locator[ 8]); + NPT_UInt32 zip64_disk_count = NPT_BytesToInt32Le(&zip64_locator[16]); + + // format check + if (zip64_disk_start != 0 || zip64_disk_count != 1) { + return NPT_ERROR_NOT_SUPPORTED; + } + + // size check + if (zip64_directory_offset > stream_size) { + NPT_LOG_WARNING("zip64 directory offset too large"); + return NPT_ERROR_INVALID_FORMAT; + } + + // load and parse the eocdr64 + unsigned char eocdr64[56]; + result = stream.Seek(zip64_directory_offset); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("seek failed (%d)", result); + return result; + } + result = stream.ReadFully(eocdr64, 56); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("read failed (%d)", result); + return result; + } + + signature = NPT_BytesToInt32Le(&eocdr64[0]); + if (signature != NPT_ZIP64_END_OF_CENTRAL_DIRECTORY_SIGNATURE) { + NPT_LOG_WARNING("zip64 directory signature not found"); + return NPT_ERROR_INVALID_FORMAT; + } + + this_disk = NPT_BytesToInt32Le(&eocdr64[16]); + start_disk = NPT_BytesToInt32Le(&eocdr64[20]); + this_disk_entry_count = NPT_BytesToInt64Le(&eocdr64[24]); + total_entry_count = NPT_BytesToInt64Le(&eocdr64[32]); + central_directory_size = NPT_BytesToInt64Le(&eocdr64[40]); + central_directory_offset = NPT_BytesToInt64Le(&eocdr64[48]); + } + + // format check + if (this_disk != 0 || start_disk != 0) { + return NPT_ERROR_NOT_SUPPORTED; + } + if (this_disk_entry_count != total_entry_count) { + return NPT_ERROR_NOT_SUPPORTED; + } + + // check that the size looks reasonable + if (central_directory_size > NPT_ZIP_MAX_DIRECTORY_SIZE) { + NPT_LOG_WARNING("central directory larger than max supported"); + return NPT_ERROR_OUT_OF_RANGE; + } + if (total_entry_count > NPT_ZIP_MAX_ENTRY_COUNT) { + NPT_LOG_WARNING("central directory larger than max supported"); + return NPT_ERROR_OUT_OF_RANGE; + } + + // read the central directory + NPT_DataBuffer central_directory_buffer; + result = central_directory_buffer.SetDataSize((NPT_Size)central_directory_size); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("central directory too large (%lld)", central_directory_size); + return result; + } + result = stream.Seek(central_directory_offset); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("seek failed (%d)", result); + return result; + } + result = stream.ReadFully(central_directory_buffer.UseData(), (NPT_Size)central_directory_size); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("failed to read central directory (%d)", result); + return result; + } + + // create a new file object + file = new NPT_ZipFile(); + file->m_Entries.Reserve((NPT_Cardinal)total_entry_count); + + // parse all entries + const unsigned char* buffer = (const unsigned char*)central_directory_buffer.GetData(); + for (unsigned int i=0; i<total_entry_count; i++) { + NPT_UInt32 signature = NPT_BytesToInt32Le(buffer); + if (signature != NPT_ZIP_CENTRAL_FILE_HEADER_SIGNATURE) { + NPT_LOG_WARNING("unexpected signature in central directory"); + break; + } + + NPT_ZipFile::Entry entry(buffer); + + if (entry.m_DirectoryEntrySize > central_directory_size) { + NPT_LOG_WARNING_1("entry size too large (%d)", entry.m_DirectoryEntrySize); + break; + } + + file->GetEntries().Add(entry); + + central_directory_size -= entry.m_DirectoryEntrySize; + buffer += entry.m_DirectoryEntrySize; + } + + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_ZipFile::GetInputStream ++---------------------------------------------------------------------*/ +NPT_Result +NPT_ZipFile::GetInputStream(Entry& entry, NPT_InputStreamReference& zip_stream, NPT_InputStream*& file_stream) +{ + // default return value + file_stream = NULL; + + // we don't support encrypted files + if (entry.m_Flags & NPT_ZIP_FILE_FLAG_ENCRYPTED) { + return NPT_ERROR_NOT_SUPPORTED; + } + + // check that we support the compression method +#if NPT_CONFIG_ENABLE_ZIP + if (entry.m_CompressionMethod != NPT_ZIP_FILE_COMPRESSION_METHOD_NONE && + entry.m_CompressionMethod != NPT_ZIP_FILE_COMPRESSION_METHOD_DEFLATE) { + return NPT_ERROR_NOT_SUPPORTED; + } +#else + if (entry.m_CompressionMethod != NPT_ZIP_COMPRESSION_METHOD_NONE) { + return NPT_ERROR_NOT_SUPPORTED; + } +#endif + + // seek to the start of the file entry + NPT_Result result = zip_stream->Seek(entry.m_RelativeOffset); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("seek failed (%d)", result); + return result; + } + + // read the fixed part of the header + unsigned char header[30]; + result = zip_stream->ReadFully(header, 30); + if (NPT_FAILED(result)) { + NPT_LOG_WARNING_1("read failed (%d)", result); + return result; + } + + NPT_UInt16 file_name_length = NPT_BytesToInt16Le(&header[26]); + NPT_UInt16 extra_field_length = NPT_BytesToInt16Le(&header[28]); + + unsigned int header_size = 30+file_name_length+extra_field_length; + NPT_LargeSize zip_stream_size = 0; + zip_stream->GetSize(zip_stream_size); + if (entry.m_RelativeOffset+header_size+entry.m_CompressedSize > zip_stream_size) { + // something's wrong here + return NPT_ERROR_INVALID_FORMAT; + } + + file_stream = new NPT_SubInputStream(zip_stream, entry.m_RelativeOffset+header_size, entry.m_CompressedSize); + +#if NPT_CONFIG_ENABLE_ZIP + if (entry.m_CompressionMethod == NPT_ZIP_FILE_COMPRESSION_METHOD_DEFLATE) { + NPT_InputStreamReference file_stream_ref(file_stream); + file_stream = new NPT_ZipInflatingInputStream(file_stream_ref, true); + } +#endif + + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_ZipFile::Entry::Entry ++---------------------------------------------------------------------*/ +NPT_ZipFile::Entry::Entry(const unsigned char* data) +{ + m_Flags = NPT_BytesToInt16Le(data+ 8); + m_CompressionMethod = NPT_BytesToInt16Le(data+10); + m_Crc32 = NPT_BytesToInt32Le(data+16); + m_CompressedSize = NPT_BytesToInt32Le(data+20); + m_UncompressedSize = NPT_BytesToInt32Le(data+24); + m_DiskNumber = NPT_BytesToInt16Le(data+34); + m_InternalFileAttributes = NPT_BytesToInt32Le(data+36); + m_ExternalFileAttributes = NPT_BytesToInt32Le(data+38); + m_RelativeOffset = NPT_BytesToInt32Le(data+42); + + NPT_UInt16 file_name_length = NPT_BytesToInt16Le(data+28); + NPT_UInt16 extra_field_length = NPT_BytesToInt16Le(data+30); + NPT_UInt16 file_comment_length = NPT_BytesToInt16Le(data+32); + + // extract the file name + m_Name.Assign((const char*)data+46, file_name_length); + + m_DirectoryEntrySize = 46+file_name_length+extra_field_length+file_comment_length; + + // check for a zip64 extension + const unsigned char* ext_data = data+46+file_name_length; + unsigned int ext_data_size = extra_field_length; + while (ext_data_size >= 4) { + unsigned int ext_id = NPT_BytesToInt16Le(ext_data); + unsigned int ext_size = NPT_BytesToInt16Le(ext_data+2); + + if (ext_id == NPT_ZIP_EXT_DATA_TYPE_ZIP64) { + const unsigned char* local_data = ext_data+4; + if (m_UncompressedSize == 0xFFFFFFFF) { + m_UncompressedSize = NPT_BytesToInt64Le(local_data); + local_data += 8; + } + if (m_CompressedSize == 0xFFFFFFFF) { + m_CompressedSize = NPT_BytesToInt64Le(local_data); + local_data += 8; + } + if (m_RelativeOffset == 0xFFFFFFFF) { + m_RelativeOffset = NPT_BytesToInt64Le(local_data); + local_data += 8; + } + if (m_DiskNumber == 0xFFFF) { + m_DiskNumber = NPT_BytesToInt32Le(local_data); + local_data += 4; + } + } + + ext_data += 4+ext_size; + if (ext_data_size >= 4+ext_size) { + ext_data_size -= 4+ext_size; + } else { + ext_data_size = 0; + } + } +} + +#if defined(NPT_CONFIG_ENABLE_ZIP) + +/*---------------------------------------------------------------------- +| constants ++---------------------------------------------------------------------*/ const unsigned int NPT_ZIP_DEFAULT_BUFFER_SIZE = 4096; /*---------------------------------------------------------------------- @@ -74,7 +413,7 @@ NPT_Zip::MapError(int err) +---------------------------------------------------------------------*/ class NPT_ZipInflateState { public: - NPT_ZipInflateState(); + NPT_ZipInflateState(bool raw = false); ~NPT_ZipInflateState(); z_stream m_Stream; }; @@ -82,13 +421,13 @@ public: /*---------------------------------------------------------------------- | NPT_ZipInflateState::NPT_ZipInflateState +---------------------------------------------------------------------*/ -NPT_ZipInflateState::NPT_ZipInflateState() +NPT_ZipInflateState::NPT_ZipInflateState(bool raw) { // initialize the state NPT_SetMemory(&m_Stream, 0, sizeof(m_Stream)); // initialize the decompressor - inflateInit2(&m_Stream, 15+32); // 15 = default window bits, +32 = automatic header + inflateInit2(&m_Stream, raw?-15:15+32); // 15 = default window bits, +32 = automatic header } /*---------------------------------------------------------------------- @@ -145,10 +484,10 @@ NPT_ZipDeflateState::~NPT_ZipDeflateState() /*---------------------------------------------------------------------- | NPT_ZipInflatingInputStream::NPT_ZipInflatingInputStream +---------------------------------------------------------------------*/ -NPT_ZipInflatingInputStream::NPT_ZipInflatingInputStream(NPT_InputStreamReference& source) : +NPT_ZipInflatingInputStream::NPT_ZipInflatingInputStream(NPT_InputStreamReference& source, bool raw) : m_Source(source), m_Position(0), - m_State(new NPT_ZipInflateState()), + m_State(new NPT_ZipInflateState(raw)), m_Buffer(NPT_ZIP_DEFAULT_BUFFER_SIZE) { } @@ -423,7 +762,7 @@ NPT_Zip::Deflate(const NPT_DataBuffer& in, if (err != Z_OK) return MapError(err); // reserve an output buffer known to be large enough - out.Reserve(deflateBound(&stream, stream.avail_in) + (format==GZIP?10:0)); + out.Reserve((NPT_Size)deflateBound(&stream, stream.avail_in) + (format==GZIP?10:0)); stream.next_out = out.UseData(); stream.avail_out = out.GetBufferSize(); @@ -435,7 +774,7 @@ NPT_Zip::Deflate(const NPT_DataBuffer& in, } // update the output size - out.SetDataSize(stream.total_out); + out.SetDataSize((NPT_Size)stream.total_out); // cleanup err = deflateEnd(&stream); @@ -447,7 +786,8 @@ NPT_Zip::Deflate(const NPT_DataBuffer& in, +---------------------------------------------------------------------*/ NPT_Result NPT_Zip::Inflate(const NPT_DataBuffer& in, - NPT_DataBuffer& out) + NPT_DataBuffer& out, + bool raw) { // assume an output buffer twice the size of the input plus a bit NPT_CHECK_WARNING(out.Reserve(32+2*in.GetDataSize())); @@ -465,19 +805,19 @@ NPT_Zip::Inflate(const NPT_DataBuffer& in, stream.opaque = (voidpf)0; // initialize the decompressor - int err = inflateInit2(&stream, 15+32); // 15 = default window bits, +32 = automatic header + int err = inflateInit2(&stream, raw?-15:15+32); // 15 = default window bits, +32 = automatic header if (err != Z_OK) return MapError(err); // decompress until the end do { err = inflate(&stream, Z_SYNC_FLUSH); if (err == Z_STREAM_END || err == Z_OK || err == Z_BUF_ERROR) { - out.SetDataSize(stream.total_out); + out.SetDataSize((NPT_Size)stream.total_out); if ((err == Z_OK && stream.avail_out == 0) || err == Z_BUF_ERROR) { // grow the output buffer out.Reserve(out.GetBufferSize()*2); stream.next_out = out.UseData()+stream.total_out; - stream.avail_out = out.GetBufferSize()-stream.total_out; + stream.avail_out = out.GetBufferSize()-(NPT_Size)stream.total_out; } } } while (err == Z_OK); diff --git a/lib/libUPnP/Neptune/Source/Core/NptZip.h b/lib/libUPnP/Neptune/Source/Core/NptZip.h index 384783b135..3720451e70 100644 --- a/lib/libUPnP/Neptune/Source/Core/NptZip.h +++ b/lib/libUPnP/Neptune/Source/Core/NptZip.h @@ -37,6 +37,7 @@ +---------------------------------------------------------------------*/ #include "NptConfig.h" #include "NptStreams.h" +#include "NptArray.h" #include "NptFile.h" /*---------------------------------------------------------------------- @@ -46,6 +47,48 @@ class NPT_ZipInflateState; class NPT_ZipDeflateState; /*---------------------------------------------------------------------- +| NPT_ZipFile ++---------------------------------------------------------------------*/ +const unsigned int NPT_ZIP_FILE_FLAG_ENCRYPTED = 0x01; +const unsigned int NPT_ZIP_FILE_COMPRESSION_METHOD_NONE = 0x00; +const unsigned int NPT_ZIP_FILE_COMPRESSION_METHOD_DEFLATE = 0x08; + +class NPT_ZipFile +{ +public: + // types + class Entry { + public: + Entry(const unsigned char* data); + NPT_String m_Name; + NPT_UInt16 m_Flags; + NPT_UInt16 m_CompressionMethod; + NPT_UInt32 m_Crc32; + NPT_LargeSize m_CompressedSize; + NPT_LargeSize m_UncompressedSize; + NPT_UInt16 m_DiskNumber; + NPT_UInt16 m_InternalFileAttributes; + NPT_UInt32 m_ExternalFileAttributes; + NPT_Position m_RelativeOffset; + NPT_UInt32 m_DirectoryEntrySize; + }; + + // class methods + static NPT_Result Parse(NPT_InputStream& stream, NPT_ZipFile*& file); + static NPT_Result GetInputStream(Entry& entry, NPT_InputStreamReference& zip_stream, NPT_InputStream*& file_stream); + + // accessors + NPT_Array<Entry>& GetEntries() { return m_Entries; } + +private: + // constructor + NPT_ZipFile(); + + // members + NPT_Array<Entry> m_Entries; +}; + +/*---------------------------------------------------------------------- | NPT_Zip +---------------------------------------------------------------------*/ const int NPT_ZIP_COMPRESSION_LEVEL_DEFAULT = -1; @@ -78,7 +121,8 @@ public: * Inflate (i.e decompress) a buffer */ static NPT_Result Inflate(const NPT_DataBuffer& in, - NPT_DataBuffer& out); + NPT_DataBuffer& out, + bool raw = false); /** * Deflate (i.e compress) a file @@ -96,7 +140,7 @@ public: class NPT_ZipInflatingInputStream : public NPT_InputStream { public: - NPT_ZipInflatingInputStream(NPT_InputStreamReference& source); + NPT_ZipInflatingInputStream(NPT_InputStreamReference& source, bool raw = false); ~NPT_ZipInflatingInputStream(); // NPT_InputStream methods diff --git a/lib/libUPnP/Neptune/Source/System/Apple/NptAppleLogConfig.mm b/lib/libUPnP/Neptune/Source/System/Apple/NptAppleLogConfig.mm index 68eda81bd5..2766ba1b08 100644 --- a/lib/libUPnP/Neptune/Source/System/Apple/NptAppleLogConfig.mm +++ b/lib/libUPnP/Neptune/Source/System/Apple/NptAppleLogConfig.mm @@ -15,19 +15,22 @@ NPT_Result NPT_GetSystemLogConfig(NPT_String& config) { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - NPT_Result result; - NSDictionary* env_vars = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"LSEnvironment"]; - NSString* npt_log_config = [env_vars objectForKey:@"NEPTUNE_LOG_CONFIG"]; +#if !TARGET_OS_IPHONE + NSDictionary* env_vars = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"LSEnvironment"]; + NSString* npt_log_config = [env_vars objectForKey:@"NEPTUNE_LOG_CONFIG"]; +#else + NSString *npt_log_config = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NEPTUNE_LOG_CONFIG"]; +#endif + + NPT_Result result = NPT_SUCCESS; if (npt_log_config) { NSLog(@"NEPTUNE_LOG_CONFIG in plist is: %@", npt_log_config); config = (const char*)[npt_log_config UTF8String]; - result = NPT_SUCCESS; } else { NSLog(@"NEPTUNE_LOG_CONFIG not found in 'Info.plist'"); result = NPT_ERROR_NO_SUCH_PROPERTY; } - [pool release]; return result; } diff --git a/lib/libUPnP/Neptune/Source/System/Bsd/NptBsdResolver.cpp b/lib/libUPnP/Neptune/Source/System/Bsd/NptBsdResolver.cpp index 009181d387..2cc8655e94 100644 --- a/lib/libUPnP/Neptune/Source/System/Bsd/NptBsdResolver.cpp +++ b/lib/libUPnP/Neptune/Source/System/Bsd/NptBsdResolver.cpp @@ -60,15 +60,9 @@ const unsigned int NPT_BSD_NETWORK_MAX_ADDR_LIST_LENGTH = 1024; | MapGetAddrInfoErrorCode +---------------------------------------------------------------------*/ static NPT_Result -MapGetAddrInfoErrorCode(int error_code) +MapGetAddrInfoErrorCode(int /*error_code*/) { - switch (error_code) { - case EAI_AGAIN: - return NPT_ERROR_TIMEOUT; - - default: - return NPT_ERROR_HOST_UNKNOWN; - } + return NPT_ERROR_HOST_UNKNOWN; } /*---------------------------------------------------------------------- diff --git a/lib/libUPnP/Neptune/Source/System/Bsd/NptBsdSockets.cpp b/lib/libUPnP/Neptune/Source/System/Bsd/NptBsdSockets.cpp index 8f14c0292e..6174ff96f9 100644 --- a/lib/libUPnP/Neptune/Source/System/Bsd/NptBsdSockets.cpp +++ b/lib/libUPnP/Neptune/Source/System/Bsd/NptBsdSockets.cpp @@ -163,6 +163,7 @@ typedef SOCKET SocketFd; #define NPT_BSD_SOCKET_IS_INVALID(_s) ((_s) == INVALID_SOCKET) #define NPT_BSD_SOCKET_CALL_FAILED(_e) ((_e) == SOCKET_ERROR) #define NPT_BSD_SOCKET_SELECT_FAILED(_e) ((_e) == SOCKET_ERROR) +#define NPT_BSD_SOCKET_INVALID_HANDLE INVALID_SOCKET /*---------------------------------------------------------------------- | Trimedia adaptation layer @@ -177,6 +178,7 @@ typedef int SocketFd; #define NPT_BSD_SOCKET_IS_INVALID(_s) ((_s) < 0) #define NPT_BSD_SOCKET_CALL_FAILED(_e) ((_e) < 0) #define NPT_BSD_SOCKET_SELECT_FAILED(_e) ((_e) < 0) +#define NPT_BSD_SOCKET_INVALID_HANDLE (-1) /*---------------------------------------------------------------------- | PSP adaptation layer @@ -253,6 +255,7 @@ typedef int SocketFd; #define NPT_BSD_SOCKET_IS_INVALID(_s) ((_s) < 0) #define NPT_BSD_SOCKET_CALL_FAILED(_e) ((_e) < 0) #define NPT_BSD_SOCKET_SELECT_FAILED(_e) ((_e) < 0) +#define NPT_BSD_SOCKET_INVALID_HANDLE (-1) /*---------------------------------------------------------------------- | PS3 adaptation layer @@ -296,6 +299,7 @@ typedef int SocketFd; #define NPT_BSD_SOCKET_IS_INVALID(_s) ((_s) < 0) #define NPT_BSD_SOCKET_CALL_FAILED(_e) ((_e) < 0) #define NPT_BSD_SOCKET_SELECT_FAILED(_e) ((_e) < 0) +#define NPT_BSD_SOCKET_INVALID_HANDLE (-1) // network initializer static struct NPT_Ps3NetworkInitializer { @@ -323,6 +327,7 @@ typedef int SocketFd; #define NPT_BSD_SOCKET_IS_INVALID(_s) ((_s) < 0) #define NPT_BSD_SOCKET_CALL_FAILED(_e) ((_e) < 0) #define NPT_BSD_SOCKET_SELECT_FAILED(_e) ((_e) < 0) +#define NPT_BSD_SOCKET_INVALID_HANDLE (-1) #endif @@ -366,8 +371,6 @@ MapErrorCode(int error) return NPT_ERROR_CONNECTION_RESET; case ECONNABORTED: - //case ENOTCONN: - //case ESHUTDOWN: return NPT_ERROR_CONNECTION_ABORTED; case ECONNREFUSED: @@ -422,15 +425,9 @@ MapErrorCode(int error) +---------------------------------------------------------------------*/ #if defined(NPT_CONFIG_HAVE_GETADDRINFO) static NPT_Result -MapGetAddrInfoErrorCode(int error_code) +MapGetAddrInfoErrorCode(int /*error_code*/) { - switch (error_code) { - case EAI_AGAIN: - return NPT_ERROR_TIMEOUT; - - default: - return NPT_ERROR_HOST_UNKNOWN; - } + return NPT_ERROR_HOST_UNKNOWN; } #endif @@ -489,6 +486,66 @@ gethostbyname(const char* name) #endif // _XBOX +#if defined(__WINSOCK__) +/*---------------------------------------------------------------------- +| socketpair ++---------------------------------------------------------------------*/ +static int +socketpair(int, int, int, SOCKET sockets[2]) // we ignore the first two params: we only use this for a strictly limited case +{ + int result = 0; + + // initialize with default values + sockets[0] = INVALID_SOCKET; + sockets[1] = INVALID_SOCKET; + + // create a listener socket and bind to the loopback address, any port + SOCKET listener = socket(AF_INET, SOCK_STREAM, 0); + if (listener == INVALID_SOCKET) goto fail; + + // bind the listener and listen for connections + struct sockaddr_in inet_address; + memset(&inet_address, 0, sizeof(inet_address)); + inet_address.sin_family = AF_INET; + inet_address.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + int reuse = 1; + setsockopt(listener, SOL_SOCKET, SO_REUSEADDR, (const char*)&reuse, sizeof(reuse)); + result = bind(listener, (const sockaddr*)&inet_address, sizeof(inet_address)); + if (result != 0) goto fail; + listen(listener, 1); + + // read the port that was assigned to the listener socket + socklen_t name_length = sizeof(inet_address); + result = getsockname(listener, (struct sockaddr*)&inet_address, &name_length); + if (result != 0) goto fail; + + // create the first socket + sockets[0] = socket(AF_INET, SOCK_STREAM, 0); + if (sockets[0] == INVALID_SOCKET) goto fail; + + // connect the first socket + result = connect(sockets[0], (const sockaddr*)&inet_address, sizeof(inet_address)); + if (result != 0) goto fail; + + // accept the connection, resulting in the second socket + name_length = sizeof(inet_address); + sockets[1] = accept(listener, (sockaddr*)&inet_address, &name_length); + if (result != 0) goto fail; + + // we don't need the listener anymore + closesocket(listener); + return 0; + +fail: + result = MapErrorCode(GetSocketError()); + if (listener != INVALID_SOCKET) closesocket(listener); + if (sockets[0] != INVALID_SOCKET) closesocket(sockets[0]); + if (sockets[1] != INVALID_SOCKET) closesocket(sockets[1]); + sockets[0] = sockets[1] = INVALID_SOCKET; + return result; +} +#endif + /*---------------------------------------------------------------------- | NPT_IpAddress::ResolveName +---------------------------------------------------------------------*/ @@ -583,7 +640,6 @@ public: SetBlockingMode(false); // cancellation support -#if !defined(__WINSOCK__) if (flags & NPT_SOCKET_FLAG_CANCELLABLE) { int result = socketpair(AF_UNIX, SOCK_DGRAM, 0, m_CancelFds); if (result != 0) { @@ -592,17 +648,14 @@ public: m_Cancellable = false; } } else { - m_CancelFds[0] = m_CancelFds[1] = -1; + m_CancelFds[0] = m_CancelFds[1] = NPT_BSD_SOCKET_INVALID_HANDLE; } -#endif } ~NPT_BsdSocketFd() { -#if !defined(__WINSOCK__) if (m_Cancellable) { - close(m_CancelFds[0]); - close(m_CancelFds[1]); + if (!NPT_BSD_SOCKET_IS_INVALID(m_CancelFds[0])) closesocket(m_CancelFds[0]); + if (!NPT_BSD_SOCKET_IS_INVALID(m_CancelFds[1])) closesocket(m_CancelFds[1]); } -#endif closesocket(m_SocketFd); } @@ -610,6 +663,7 @@ public: NPT_Result SetBlockingMode(bool blocking); NPT_Result WaitUntilReadable(); NPT_Result WaitUntilWriteable(); + NPT_Result WaitForCondition(bool readable, bool writeable, bool async_connect, NPT_Timeout timeout); // members SocketFd m_SocketFd; @@ -618,15 +672,12 @@ public: NPT_Position m_Position; volatile bool m_Cancelled; bool m_Cancellable; -#if !defined(__WINSOCK__) SocketFd m_CancelFds[2]; -#endif private: // methods friend class NPT_BsdTcpServerSocket; friend class NPT_BsdTcpClientSocket; - NPT_Result WaitForCondition(bool readable, bool writeable, bool async_connect, NPT_Timeout timeout); }; typedef NPT_Reference<NPT_BsdSocketFd> NPT_BsdSocketFdReference; @@ -717,13 +768,11 @@ NPT_BsdSocketFd::WaitForCondition(bool wait_for_readable, FD_ZERO(&except_set); FD_SET(m_SocketFd, &except_set); -#if !defined(__WINSOCK__) // setup the cancel fd if (m_Cancellable && timeout) { - if (m_CancelFds[1] > max_fd) max_fd = m_CancelFds[1]; + if ((int)m_CancelFds[1] > max_fd) max_fd = m_CancelFds[1]; FD_SET(m_CancelFds[1], &read_set); } -#endif struct timeval timeout_value; if (timeout != NPT_TIMEOUT_INFINITE) { @@ -888,7 +937,7 @@ NPT_BsdSocketInputStream::Read(void* buffer, } // update position and return - if (bytes_read) *bytes_read = nb_read; + if (bytes_read) *bytes_read = (NPT_Size)nb_read; m_SocketFdReference->m_Position += nb_read; return NPT_SUCCESS; } @@ -927,6 +976,15 @@ NPT_BsdSocketInputStream::GetAvailable(NPT_LargeSize& available) return NPT_ERROR_SOCKET_CONTROL_FAILED; } else { available = ready; + if (available == 0) { + // check if the socket is disconnected + NPT_Result result = m_SocketFdReference->WaitForCondition(true, false, false, 0); + if (result == NPT_ERROR_WOULD_BLOCK) { + return NPT_SUCCESS; + } else { + available = 1; // pretend that there's data available + } + } return NPT_SUCCESS; } } @@ -998,7 +1056,7 @@ NPT_BsdSocketOutputStream::Write(const void* buffer, } // update position and return - if (bytes_written) *bytes_written = nb_written; + if (bytes_written) *bytes_written = (NPT_Size)nb_written; m_SocketFdReference->m_Position += nb_written; return NPT_SUCCESS; } @@ -1044,7 +1102,10 @@ NPT_BsdSocketOutputStream::Flush() flags |= MSG_NOSIGNAL; #endif char dummy = 0; - send(m_SocketFdReference->m_SocketFd, &dummy, 0, flags); + ssize_t io_result = send(m_SocketFdReference->m_SocketFd, &dummy, 0, flags); + if (NPT_BSD_SOCKET_CALL_FAILED(io_result)) { + NPT_LOG_FINE_1("send failed during flush (%d)", MapErrorCode(GetSocketError())); + } // restore the nagle algorithm to its original setting args = 0; @@ -1098,11 +1159,15 @@ NPT_BsdSocket::NPT_BsdSocket(SocketFd fd, NPT_Flags flags) : // disable the SIGPIPE signal #if defined(SO_NOSIGPIPE) int option = 1; - setsockopt(m_SocketFdReference->m_SocketFd, + int io_result = setsockopt(m_SocketFdReference->m_SocketFd, SOL_SOCKET, SO_NOSIGPIPE, (SocketOption)&option, sizeof(option)); + if (NPT_BSD_SOCKET_CALL_FAILED(io_result)) { + NPT_LOG_FINE_1("setsockopt SO_NOSIGPIPE failed (%d)", MapErrorCode(GetSocketError())); + } + #elif defined(SIGPIPE) signal(SIGPIPE, SIG_IGN); #endif @@ -1130,29 +1195,42 @@ NPT_BsdSocket::Bind(const NPT_SocketAddress& address, bool reuse_address) // but is still in a timed-out mode #if !defined(__WIN32__) && !defined(_XBOX) int option_ra = 1; - setsockopt(m_SocketFdReference->m_SocketFd, - SOL_SOCKET, - SO_REUSEADDR, - (SocketOption)&option_ra, - sizeof(option_ra)); + int io_result = setsockopt(m_SocketFdReference->m_SocketFd, + SOL_SOCKET, + SO_REUSEADDR, + (SocketOption)&option_ra, + sizeof(option_ra)); + if (NPT_BSD_SOCKET_CALL_FAILED(io_result)) { + NPT_LOG_FINE_1("setsockopt SO_REUSEADDR failed (%d)", MapErrorCode(GetSocketError())); + } + +#elif defined(SIGPIPE) + signal(SIGPIPE, SIG_IGN); #endif - + // set socket options if (reuse_address) { + NPT_LOG_FINE("setting SO_REUSEADDR option on socket"); int option = 1; // on macosx/linux, we need to use SO_REUSEPORT instead of SO_REUSEADDR #if defined(SO_REUSEPORT) - setsockopt(m_SocketFdReference->m_SocketFd, - SOL_SOCKET, - SO_REUSEPORT, - (SocketOption)&option, - sizeof(option)); + int result = setsockopt(m_SocketFdReference->m_SocketFd, + SOL_SOCKET, + SO_REUSEPORT, + (SocketOption)&option, + sizeof(option)); + if (NPT_BSD_SOCKET_CALL_FAILED(result)) { + NPT_LOG_FINE_1("setsockopt SO_REUSEPORT failed (%d)", MapErrorCode(GetSocketError())); + } #else - setsockopt(m_SocketFdReference->m_SocketFd, - SOL_SOCKET, - SO_REUSEADDR, - (SocketOption)&option, - sizeof(option)); + int result = setsockopt(m_SocketFdReference->m_SocketFd, + SOL_SOCKET, + SO_REUSEADDR, + (SocketOption)&option, + sizeof(option)); + if (NPT_BSD_SOCKET_CALL_FAILED(result)) { + NPT_LOG_FINE_1("setsockopt SO_REUSEADDR failed (%d)", MapErrorCode(GetSocketError())); + } #endif } @@ -1320,15 +1398,14 @@ NPT_BsdSocket::Cancel(bool do_shutdown) } } -#if !defined(__WINSOCK__) // unblock waiting selects if (m_SocketFdReference->m_Cancellable) { char dummy = 0; - send(m_SocketFdReference->m_CancelFds[0], &dummy, 1, 0); + ssize_t io_result = send(m_SocketFdReference->m_CancelFds[0], &dummy, 1, 0); + if (NPT_BSD_SOCKET_CALL_FAILED(io_result)) { + NPT_LOG_FINE_1("send failed during cancel (%d)", MapErrorCode(GetSocketError())); + } } -#else - closesocket(m_SocketFdReference->m_SocketFd); -#endif return NPT_SUCCESS; } @@ -1460,7 +1537,7 @@ NPT_BsdUdpSocket::Send(const NPT_DataBuffer& packet, } // send the packet buffer - int io_result; + ssize_t io_result; if (address) { // send to the specified address @@ -1529,7 +1606,7 @@ NPT_BsdUdpSocket::Receive(NPT_DataBuffer& packet, } // receive a packet - int io_result = 0; + ssize_t io_result = 0; if (address) { struct sockaddr_in inet_address; socklen_t inet_address_length = sizeof(inet_address); @@ -1573,7 +1650,7 @@ NPT_BsdUdpSocket::Receive(NPT_DataBuffer& packet, } // update position and return - packet.SetDataSize(io_result); + packet.SetDataSize((NPT_Size)io_result); m_SocketFdReference->m_Position += io_result; return NPT_SUCCESS; } diff --git a/lib/libUPnP/Neptune/Source/System/Cocoa/NptCocoaConsole.mm b/lib/libUPnP/Neptune/Source/System/Cocoa/NptCocoaConsole.mm index 121fed45e2..9c0989bd55 100755 --- a/lib/libUPnP/Neptune/Source/System/Cocoa/NptCocoaConsole.mm +++ b/lib/libUPnP/Neptune/Source/System/Cocoa/NptCocoaConsole.mm @@ -14,6 +14,7 @@ #import <Foundation/Foundation.h> #include "NptConfig.h" #include "NptConsole.h" +#include "NptUtils.h" /*---------------------------------------------------------------------- | NPT_Console::Output @@ -21,6 +22,10 @@ void NPT_Console::Output(const char* message) { - NSLog(@"%s", message); + // trim extra \r\n + char *msg = (char *)message; + msg[NPT_StringLength(message)-2] = 0; + + NSLog(@"%s", msg); } diff --git a/lib/libUPnP/Neptune/Source/System/Cocoa/NptCocoaEnviroment.mm b/lib/libUPnP/Neptune/Source/System/Cocoa/NptCocoaEnviroment.mm index b0f623973e..23e2ebbc45 100644 --- a/lib/libUPnP/Neptune/Source/System/Cocoa/NptCocoaEnviroment.mm +++ b/lib/libUPnP/Neptune/Source/System/Cocoa/NptCocoaEnviroment.mm @@ -13,14 +13,13 @@ #include "NptConfig.h" #include "NptSystem.h" -#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE -#include <Cocoa/Cocoa.h> -#else -#include <UIKit/UIKit.h> -#endif - +#import <Foundation/Foundation.h> #import <SystemConfiguration/SystemConfiguration.h> +#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE +#import <UIKit/UIKit.h> +#endif + NPT_Result NPT_GetSystemMachineName(NPT_String& name) { diff --git a/lib/libUPnP/Neptune/Source/System/Cocoa/NptCocoaMessageQueue.mm b/lib/libUPnP/Neptune/Source/System/Cocoa/NptCocoaMessageQueue.mm index dfbf646bf8..053a12a865 100644 --- a/lib/libUPnP/Neptune/Source/System/Cocoa/NptCocoaMessageQueue.mm +++ b/lib/libUPnP/Neptune/Source/System/Cocoa/NptCocoaMessageQueue.mm @@ -12,11 +12,7 @@ +---------------------------------------------------------------------*/ #include "NptConfig.h" -#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE -#include <Cocoa/Cocoa.h> -#else -#include <UIKit/UIKit.h> -#endif +#import <Foundation/Foundation.h> #include "NptCocoaMessageQueue.h" /*---------------------------------------------------------------------- @@ -92,8 +88,7 @@ NPT_CocoaMessageQueue::QueueMessage(NPT_Message* message, NPT_MessageHandler* handler) { // create a capsule to represent the message and handler - NPT_CocoaMessageCapsule* capsule = [NPT_CocoaMessageCapsule alloc]; - [capsule initWithMessage: message andHandler: handler]; + NPT_CocoaMessageCapsule* capsule = [[NPT_CocoaMessageCapsule alloc] initWithMessage: message andHandler: handler]; // trigger the handling of the message on the main thread [capsule performSelectorOnMainThread: @selector(handle) diff --git a/lib/libUPnP/Neptune/Source/System/Posix/NptPosixQueue.cpp b/lib/libUPnP/Neptune/Source/System/Posix/NptPosixQueue.cpp index 9f264f2558..f32dfe54ee 100644 --- a/lib/libUPnP/Neptune/Source/System/Posix/NptPosixQueue.cpp +++ b/lib/libUPnP/Neptune/Source/System/Posix/NptPosixQueue.cpp @@ -44,6 +44,10 @@ public: NPT_Result Peek(NPT_QueueItem*& item, NPT_Timeout timeout); private: + void Abort(); + NPT_Result GetTimeOut(NPT_Timeout timeout, struct timespec& timed); + +private: // members NPT_Cardinal m_MaxItems; pthread_mutex_t m_Mutex; @@ -52,6 +56,7 @@ private: NPT_Cardinal m_PushersWaitingCount; NPT_Cardinal m_PoppersWaitingCount; NPT_List<NPT_QueueItem*> m_Items; + bool m_Aborting; }; /*---------------------------------------------------------------------- @@ -60,7 +65,8 @@ private: NPT_PosixQueue::NPT_PosixQueue(NPT_Cardinal max_items) : m_MaxItems(max_items), m_PushersWaitingCount(0), - m_PoppersWaitingCount(0) + m_PoppersWaitingCount(0), + m_Aborting(false) { pthread_mutex_init(&m_Mutex, NULL); pthread_cond_init(&m_CanPushCondition, NULL); @@ -72,6 +78,8 @@ NPT_PosixQueue::NPT_PosixQueue(NPT_Cardinal max_items) : +---------------------------------------------------------------------*/ NPT_PosixQueue::~NPT_PosixQueue() { + Abort(); + // destroy resources pthread_cond_destroy(&m_CanPushCondition); pthread_cond_destroy(&m_CanPopCondition); @@ -79,12 +87,45 @@ NPT_PosixQueue::~NPT_PosixQueue() } /*---------------------------------------------------------------------- -| NPT_PosixQueue::Push +| NPT_PosixQueue::Abort +---------------------------------------------------------------------*/ -NPT_Result -NPT_PosixQueue::Push(NPT_QueueItem* item, NPT_Timeout timeout) +void +NPT_PosixQueue::Abort() { + pthread_cond_t abort_condition; + pthread_cond_init(&abort_condition, NULL); + struct timespec timed; + GetTimeOut(20, timed); + + // acquire mutex + if (pthread_mutex_lock(&m_Mutex)) { + return; + } + + // tell other threads that they should exit immediately + m_Aborting = true; + + // notify clients + pthread_cond_broadcast(&m_CanPopCondition); + pthread_cond_broadcast(&m_CanPushCondition); + + // wait for all waiters to exit + while (m_PoppersWaitingCount > 0 || m_PushersWaitingCount > 0) { + pthread_cond_timedwait(&abort_condition, + &m_Mutex, + &timed); + } + + pthread_mutex_unlock(&m_Mutex); +} + +/*---------------------------------------------------------------------- +| NPT_PosixQueue::GetTimeOut ++---------------------------------------------------------------------*/ +NPT_Result +NPT_PosixQueue::GetTimeOut(NPT_Timeout timeout, struct timespec& timed) +{ if (timeout != NPT_TIMEOUT_INFINITE) { // get current time from system struct timeval now; @@ -102,6 +143,19 @@ NPT_PosixQueue::Push(NPT_QueueItem* item, NPT_Timeout timeout) timed.tv_sec = now.tv_sec; timed.tv_nsec = now.tv_usec * 1000; } + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_PosixQueue::Push ++---------------------------------------------------------------------*/ +NPT_Result +NPT_PosixQueue::Push(NPT_QueueItem* item, NPT_Timeout timeout) +{ + struct timespec timed; + if (timeout != NPT_TIMEOUT_INFINITE) { + NPT_CHECK(GetTimeOut(timeout, timed)); + } // lock the mutex that protects the list if (pthread_mutex_lock(&m_Mutex)) { @@ -127,6 +181,11 @@ NPT_PosixQueue::Push(NPT_QueueItem* item, NPT_Timeout timeout) break; } } + + if (m_Aborting) { + result = NPT_ERROR_INTERRUPTED; + break; + } } } @@ -154,21 +213,7 @@ NPT_PosixQueue::Pop(NPT_QueueItem*& item, NPT_Timeout timeout) { struct timespec timed; if (timeout != NPT_TIMEOUT_INFINITE) { - // get current time from system - struct timeval now; - if (gettimeofday(&now, NULL)) { - return NPT_FAILURE; - } - - now.tv_usec += timeout * 1000; - if (now.tv_usec >= 1000000) { - now.tv_sec += now.tv_usec / 1000000; - now.tv_usec = now.tv_usec % 1000000; - } - - // setup timeout - timed.tv_sec = now.tv_sec; - timed.tv_nsec = now.tv_usec * 1000; + NPT_CHECK(GetTimeOut(timeout, timed)); } // lock the mutex that protects the list @@ -194,6 +239,11 @@ NPT_PosixQueue::Pop(NPT_QueueItem*& item, NPT_Timeout timeout) break; } } + + if (m_Aborting) { + result = NPT_ERROR_INTERRUPTED; + break; + } } } else { result = m_Items.PopHead(item); @@ -218,21 +268,7 @@ NPT_PosixQueue::Peek(NPT_QueueItem*& item, NPT_Timeout timeout) { struct timespec timed; if (timeout != NPT_TIMEOUT_INFINITE) { - // get current time from system - struct timeval now; - if (gettimeofday(&now, NULL)) { - return NPT_FAILURE; - } - - now.tv_usec += timeout * 1000; - if (now.tv_usec >= 1000000) { - now.tv_sec += now.tv_usec / 1000000; - now.tv_usec = now.tv_usec % 1000000; - } - - // setup timeout - timed.tv_sec = now.tv_sec; - timed.tv_nsec = now.tv_usec * 1000; + NPT_CHECK(GetTimeOut(timeout, timed)); } // lock the mutex that protects the list @@ -260,6 +296,11 @@ NPT_PosixQueue::Peek(NPT_QueueItem*& item, NPT_Timeout timeout) } } + if (m_Aborting) { + result = NPT_ERROR_INTERRUPTED; + break; + } + head = m_Items.GetFirstItem(); } } else { diff --git a/lib/libUPnP/Neptune/Source/System/Posix/NptPosixThreads.cpp b/lib/libUPnP/Neptune/Source/System/Posix/NptPosixThreads.cpp index ba18fa5276..36eb9978b0 100644 --- a/lib/libUPnP/Neptune/Source/System/Posix/NptPosixThreads.cpp +++ b/lib/libUPnP/Neptune/Source/System/Posix/NptPosixThreads.cpp @@ -57,7 +57,12 @@ private: +---------------------------------------------------------------------*/ NPT_PosixMutex::NPT_PosixMutex() { - pthread_mutex_init(&m_Mutex, NULL); + // Recursive by default + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + + pthread_mutex_init(&m_Mutex, &attr); } /*---------------------------------------------------------------------- diff --git a/lib/libUPnP/Neptune/Source/System/Posix/NptPosixTime.cpp b/lib/libUPnP/Neptune/Source/System/Posix/NptPosixTime.cpp index 936ccc4c38..6f9500f0a9 100644 --- a/lib/libUPnP/Neptune/Source/System/Posix/NptPosixTime.cpp +++ b/lib/libUPnP/Neptune/Source/System/Posix/NptPosixTime.cpp @@ -76,9 +76,9 @@ NPT_DateTime::GetLocalTimeZone() localtime_r(&epoch, &tm_local); -#if defined(__CYGWIN__) || defined(_MSC_VER) - return (int)timezone/60; +#if defined(__CYGWIN__) + return (NPT_Int32)timezone/60; #else - return tm_local.tm_gmtoff/60; + return (NPT_Int32)tm_local.tm_gmtoff/60; #endif } diff --git a/lib/libUPnP/Neptune/Source/System/Win32/NptWin32Network.cpp b/lib/libUPnP/Neptune/Source/System/Win32/NptWin32Network.cpp index 4f8be9e9d1..318fb1377f 100644 --- a/lib/libUPnP/Neptune/Source/System/Win32/NptWin32Network.cpp +++ b/lib/libUPnP/Neptune/Source/System/Win32/NptWin32Network.cpp @@ -167,10 +167,9 @@ NPT_NetworkInterface::GetNetworkInterfaces(NPT_List<NPT_NetworkInterface*>& inte if (result == NO_ERROR) { break; } else { - if (result == ERROR_BUFFER_OVERFLOW) { - // free and try again - free(iface_list); - } else { + // free and try again + free(iface_list); + if (result != ERROR_BUFFER_OVERFLOW) { return NPT_FAILURE; } } @@ -239,6 +238,7 @@ NPT_NetworkInterface::GetNetworkInterfaces(NPT_List<NPT_NetworkInterface*>& inte interfaces.Add(iface_object); } + free(iface_list); return NPT_SUCCESS; } #else diff --git a/lib/libUPnP/Neptune/Source/System/Win32/NptWin32Threads.cpp b/lib/libUPnP/Neptune/Source/System/Win32/NptWin32Threads.cpp index aca91a1d71..9666a4cd22 100644 --- a/lib/libUPnP/Neptune/Source/System/Win32/NptWin32Threads.cpp +++ b/lib/libUPnP/Neptune/Source/System/Win32/NptWin32Threads.cpp @@ -198,19 +198,23 @@ class NPT_Win32SharedVariable : public NPT_SharedVariableInterface int GetValue(); NPT_Result WaitUntilEquals(int value, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE); NPT_Result WaitWhileEquals(int value, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE); + NPT_Result WaitWhileOrUntilEquals(int value, NPT_Timeout timeout, bool until); private: // members - volatile int m_Value; - NPT_Mutex m_Lock; - NPT_Win32Event m_Event; + volatile int m_Value; + volatile unsigned int m_Waiters; + NPT_Mutex m_Lock; + NPT_Win32Event m_Event; }; /*---------------------------------------------------------------------- | NPT_Win32SharedVariable::NPT_Win32SharedVariable +---------------------------------------------------------------------*/ NPT_Win32SharedVariable::NPT_Win32SharedVariable(int value) : - m_Value(value) + m_Value(value), + m_Waiters(0), + m_Event(true) { } @@ -230,7 +234,7 @@ NPT_Win32SharedVariable::SetValue(int value) m_Lock.Lock(); if (value != m_Value) { m_Value = value; - m_Event.Signal(); + if (m_Waiters) m_Event.Signal(); } m_Lock.Unlock(); } @@ -246,22 +250,38 @@ NPT_Win32SharedVariable::GetValue() } /*---------------------------------------------------------------------- -| NPT_Win32SharedVariable::WaitUntilEquals +| NPT_Win32SharedVariable::WaitWhileOrUntilEquals +---------------------------------------------------------------------*/ NPT_Result -NPT_Win32SharedVariable::WaitUntilEquals(int value, NPT_Timeout timeout) +NPT_Win32SharedVariable::WaitWhileOrUntilEquals(int value, NPT_Timeout timeout, bool until) { do { m_Lock.Lock(); - if (m_Value == value) { - break; - } - m_Lock.Unlock(); - { - NPT_Result result = m_Event.Wait(timeout); - if (NPT_FAILED(result)) return result; - } - } while (1); + if (until) { + if (m_Value == value) break; + } else { + if (m_Value != value) break; + } + ++m_Waiters; + m_Lock.Unlock(); + + NPT_Result result = m_Event.Wait(timeout); + bool last_waiter = true; + m_Lock.Lock(); + if (--m_Waiters == 0) { + m_Event.Reset(); + } else { + last_waiter = false; + } + m_Lock.Unlock(); + + if (NPT_FAILED(result)) return result; + + // FIXME: this is suboptimal, but we need it to ensure we don't busy-loop + if (!last_waiter) { + Sleep(10); + } + } while (true); m_Lock.Unlock(); @@ -269,26 +289,21 @@ NPT_Win32SharedVariable::WaitUntilEquals(int value, NPT_Timeout timeout) } /*---------------------------------------------------------------------- +| NPT_Win32SharedVariable::WaitUntilEquals ++---------------------------------------------------------------------*/ +NPT_Result +NPT_Win32SharedVariable::WaitUntilEquals(int value, NPT_Timeout timeout) +{ + return WaitWhileOrUntilEquals(value, timeout, true); +} + +/*---------------------------------------------------------------------- | NPT_Win32SharedVariable::WaitWhileEquals +---------------------------------------------------------------------*/ NPT_Result NPT_Win32SharedVariable::WaitWhileEquals(int value, NPT_Timeout timeout) { - do { - m_Lock.Lock(); - if (m_Value != value) { - break; - } - m_Lock.Unlock(); - { - NPT_Result result = m_Event.Wait(timeout); - if (NPT_FAILED(result)) return result; - } - } while (1); - - m_Lock.Unlock(); - - return NPT_SUCCESS; + return WaitWhileOrUntilEquals(value, timeout, false); } /*---------------------------------------------------------------------- @@ -506,28 +521,6 @@ NPT_Win32Thread::EntryPoint(void* argument) NPT_System::GetCurrentTimeStamp(now); NPT_System::SetRandomSeed((NPT_UInt32)(now.ToNanos()) + ::GetCurrentThreadId()); - // set a default name - #pragma pack(push,8) - struct THREADNAME_INFO - { - DWORD dwType; // must be 0x1000 - LPCSTR szName; // pointer to name (in same addr space) - DWORD dwThreadID; // thread ID (-1 caller thread) - DWORD dwFlags; // reserved for future use, most be zero - } info; - #pragma pack(pop) - info.dwType = 0x1000; - info.szName = "Neptune Thread"; - info.dwThreadID = GetCurrentThreadId(); - info.dwFlags = 0; - __try - { - RaiseException(0x406d1388, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR *)&info); - } - __except(EXCEPTION_EXECUTE_HANDLER) - { - } - // run the thread thread->Run(); diff --git a/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtConsole.cpp b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtConsole.cpp new file mode 100644 index 0000000000..a00c4cc7b0 --- /dev/null +++ b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtConsole.cpp @@ -0,0 +1,52 @@ +/***************************************************************** +| +| Neptune - Console Support: Win32 Implementation +| +| (c) 2002-2006 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| + ****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptWinRtPch.h" + +#include "NptConfig.h" +#include "NptConsole.h" + +/*---------------------------------------------------------------------- +| A2WHelper ++---------------------------------------------------------------------*/ +static LPWSTR A2WHelper(LPWSTR lpw, LPCSTR lpa, int nChars, UINT acp) +{ + int ret; + + if (lpw == NULL || lpa == NULL) return NULL; + + lpw[0] = '\0'; + ret = MultiByteToWideChar(acp, 0, lpa, -1, lpw, nChars); + if (ret == 0) { + return NULL; + } + return lpw; +} + +#define NPT_WIN32_USE_CHAR_CONVERSION int _convert = 0; LPCWSTR _lpw = NULL; LPCSTR _lpa = NULL + +#define NPT_WIN32_A2W(lpa) (\ + ((_lpa = lpa) == NULL) ? NULL : (\ + _convert = (int)(strlen(_lpa)+1),\ + (INT_MAX/2<_convert)? NULL : \ + A2WHelper((LPWSTR) alloca(_convert*sizeof(WCHAR)), _lpa, _convert, CP_UTF8))) + +/*---------------------------------------------------------------------- +| NPT_Console::Output ++---------------------------------------------------------------------*/ +void +NPT_Console::Output(const char* message) +{ + NPT_WIN32_USE_CHAR_CONVERSION; + OutputDebugStringW(NPT_WIN32_A2W(message)); +} + diff --git a/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtDebug.cpp b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtDebug.cpp new file mode 100644 index 0000000000..37bc879deb --- /dev/null +++ b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtDebug.cpp @@ -0,0 +1,54 @@ +/***************************************************************** +| +| Neptune - Debug Support: WinRt Implementation +| +| (c) 2002-2012 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| + ****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptWinRtPch.h" + +#include "NptConfig.h" +#include "NptDefs.h" +#include "NptTypes.h" +#include "NptDebug.h" + +/*---------------------------------------------------------------------- +| A2WHelper ++---------------------------------------------------------------------*/ +static LPWSTR A2WHelper(LPWSTR lpw, LPCSTR lpa, int nChars, UINT acp) +{ + int ret; + + if (lpw == NULL || lpa == NULL) return NULL; + + lpw[0] = '\0'; + ret = MultiByteToWideChar(acp, 0, lpa, -1, lpw, nChars); + if (ret == 0) { + return NULL; + } + return lpw; +} + +#define NPT_WIN32_USE_CHAR_CONVERSION int _convert = 0; LPCWSTR _lpw = NULL; LPCSTR _lpa = NULL + +#define NPT_WIN32_A2W(lpa) (\ + ((_lpa = lpa) == NULL) ? NULL : (\ + _convert = (int)(strlen(_lpa)+1),\ + (INT_MAX/2<_convert)? NULL : \ + A2WHelper((LPWSTR) alloca(_convert*sizeof(WCHAR)), _lpa, _convert, CP_UTF8))) + +/*---------------------------------------------------------------------- +| NPT_DebugOutput ++---------------------------------------------------------------------*/ +void +NPT_DebugOutput(const char* message) +{ + NPT_WIN32_USE_CHAR_CONVERSION; + OutputDebugStringW(NPT_WIN32_A2W(message)); +} + diff --git a/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtEnvironment.cpp b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtEnvironment.cpp new file mode 100644 index 0000000000..c50f1e36ee --- /dev/null +++ b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtEnvironment.cpp @@ -0,0 +1,36 @@ +/***************************************************************** +| +| Neptune - Environment variables: WinRT Implementation +| +| (c) 2002-2012 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| + ****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptConfig.h" +#include "NptUtils.h" +#include "NptResults.h" + +/*---------------------------------------------------------------------- +| NPT_Environment::Get ++---------------------------------------------------------------------*/ +NPT_Result +NPT_Environment::Get(const char* name, NPT_String& value) +{ + /* default value */ + value.SetLength(0); + + return NPT_ERROR_NOT_SUPPORTED; +} + +/*---------------------------------------------------------------------- +| NPT_Environment::Set ++---------------------------------------------------------------------*/ +NPT_Result +NPT_Environment::Set(const char* name, const char* value) +{ + return NPT_ERROR_NOT_SUPPORTED; +} diff --git a/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtFile.cpp b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtFile.cpp new file mode 100644 index 0000000000..5fde332c30 --- /dev/null +++ b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtFile.cpp @@ -0,0 +1,214 @@ +/***************************************************************** +| +| Neptune - Files :: WinRT Implementation +| +| (c) 2001-2012 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| + ****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptConfig.h" +#include "NptUtils.h" +#include "NptFile.h" +#include "NptThreads.h" +#include "NptInterfaces.h" +#include "NptStrings.h" +#include "NptDebug.h" + +/*---------------------------------------------------------------------- +| NPT_WinRtFile ++---------------------------------------------------------------------*/ +class NPT_WinRtFile: public NPT_FileInterface +{ +public: + // constructors and destructor + NPT_WinRtFile(NPT_File& delegator); + ~NPT_WinRtFile(); + + // NPT_FileInterface methods + NPT_Result Open(OpenMode mode); + NPT_Result Close(); + NPT_Result GetInputStream(NPT_InputStreamReference& stream); + NPT_Result GetOutputStream(NPT_OutputStreamReference& stream); + +private: + // members + NPT_File& m_Delegator; + OpenMode m_Mode; +}; + +/*---------------------------------------------------------------------- +| NPT_WinRtFile::NPT_WinRtFile ++---------------------------------------------------------------------*/ +NPT_WinRtFile::NPT_WinRtFile(NPT_File& delegator) : + m_Delegator(delegator), + m_Mode(0) +{ +} + +/*---------------------------------------------------------------------- +| NPT_WinRtFile::~NPT_WinRtFile ++---------------------------------------------------------------------*/ +NPT_WinRtFile::~NPT_WinRtFile() +{ + Close(); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtFile::Open ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtFile::Open(NPT_File::OpenMode /*mode*/) +{ + return NPT_ERROR_NOT_IMPLEMENTED; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtFile::Close ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtFile::Close() +{ + // reset the mode + m_Mode = 0; + + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtFile::GetInputStream ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtFile::GetInputStream(NPT_InputStreamReference& stream) +{ + // default value + stream = NULL; + + return NPT_ERROR_NOT_IMPLEMENTED; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtFile::GetOutputStream ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtFile::GetOutputStream(NPT_OutputStreamReference& stream) +{ + // default value + stream = NULL; + + return NPT_ERROR_NOT_IMPLEMENTED; +} + +/*---------------------------------------------------------------------- +| NPT_File::NPT_File ++---------------------------------------------------------------------*/ +NPT_File::NPT_File(const char* path) : m_Path(path), m_IsSpecial(false) +{ + m_Delegate = new NPT_WinRtFile(*this); + + if (NPT_StringsEqual(path, NPT_FILE_STANDARD_INPUT) || + NPT_StringsEqual(path, NPT_FILE_STANDARD_OUTPUT) || + NPT_StringsEqual(path, NPT_FILE_STANDARD_ERROR)) { + m_IsSpecial = true; + } +} + +/*---------------------------------------------------------------------- +| NPT_File::operator= ++---------------------------------------------------------------------*/ +NPT_File& +NPT_File::operator=(const NPT_File& file) +{ + if (this != &file) { + delete m_Delegate; + m_Path = file.m_Path; + m_IsSpecial = file.m_IsSpecial; + m_Delegate = new NPT_WinRtFile(*this);; + } + return *this; +} + +/*---------------------------------------------------------------------- +| NPT_FilePath::Separator ++---------------------------------------------------------------------*/ +const char* const NPT_FilePath::Separator = "\\"; + +/*---------------------------------------------------------------------- +| NPT_File::GetRoots ++---------------------------------------------------------------------*/ +NPT_Result +NPT_File::GetRoots(NPT_List<NPT_String>& roots) +{ + roots.Clear(); + return NPT_ERROR_NOT_IMPLEMENTED; +} + +/*---------------------------------------------------------------------- +| NPT_File::GetWorkingDir ++---------------------------------------------------------------------*/ +NPT_Result +NPT_File::GetWorkingDir(NPT_String& path) +{ + path.SetLength(0); + return NPT_ERROR_NOT_IMPLEMENTED; +} + +/*---------------------------------------------------------------------- +| NPT_File::GetInfo ++---------------------------------------------------------------------*/ +NPT_Result +NPT_File::GetInfo(const char* path, NPT_FileInfo* info) +{ + return NPT_ERROR_NOT_IMPLEMENTED; +} + +/*---------------------------------------------------------------------- +| NPT_File::CreateDir ++---------------------------------------------------------------------*/ +NPT_Result +NPT_File::CreateDir(const char* path) +{ + return NPT_ERROR_NOT_IMPLEMENTED; +} + +/*---------------------------------------------------------------------- +| NPT_File::RemoveFile ++---------------------------------------------------------------------*/ +NPT_Result +NPT_File::RemoveFile(const char* path) +{ + return NPT_ERROR_NOT_IMPLEMENTED; +} + +/*---------------------------------------------------------------------- +| NPT_File::RemoveDir ++---------------------------------------------------------------------*/ +NPT_Result +NPT_File::RemoveDir(const char* path) +{ + return NPT_ERROR_NOT_IMPLEMENTED; +} + +/*---------------------------------------------------------------------- +| NPT_File::Rename ++---------------------------------------------------------------------*/ +NPT_Result +NPT_File::Rename(const char* from_path, const char* to_path) +{ + return NPT_ERROR_NOT_IMPLEMENTED; +} + +/*---------------------------------------------------------------------- +| NPT_File::ListDir ++---------------------------------------------------------------------*/ +NPT_Result +NPT_File::ListDir(const char* path, + NPT_List<NPT_String>& entries, + NPT_Ordinal start /* = 0 */, + NPT_Cardinal max /* = 0 */) +{ + return NPT_ERROR_NOT_IMPLEMENTED; +} diff --git a/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtNetwork.cpp b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtNetwork.cpp new file mode 100644 index 0000000000..5b62d0a8c0 --- /dev/null +++ b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtNetwork.cpp @@ -0,0 +1,39 @@ +/***************************************************************** +| +| Neptune - Network :: WinRT Implementation +| +| (c) 2011-2012 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| + ****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptConfig.h" +#include "NptTypes.h" +#include "NptStreams.h" +#include "NptThreads.h" +#include "NptNetwork.h" +#include "NptUtils.h" +#include "NptConstants.h" +#include "NptSockets.h" + +/*---------------------------------------------------------------------- +| NPT_NetworkInterface::GetNetworkInterfaces ++---------------------------------------------------------------------*/ +NPT_Result +NPT_NetworkInterface::GetNetworkInterfaces(NPT_List<NPT_NetworkInterface*>& interfaces) +{ + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_IpAddress::ResolveName ++---------------------------------------------------------------------*/ +NPT_Result +NPT_IpAddress::ResolveName(const char* name, NPT_Timeout timeout) +{ + m_HostName = name; + return NPT_SUCCESS; +}
\ No newline at end of file diff --git a/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtPch.cpp b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtPch.cpp new file mode 100644 index 0000000000..0a77c70c25 --- /dev/null +++ b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtPch.cpp @@ -0,0 +1,13 @@ +/***************************************************************** +| +| Neptune - WinRT precompiled headers +| +| (c) 2002-2012 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| +****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptWinRtPch.h" diff --git a/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtPch.h b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtPch.h new file mode 100644 index 0000000000..ac964d4765 --- /dev/null +++ b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtPch.h @@ -0,0 +1,16 @@ +/***************************************************************** +| +| Neptune - WinRT precompiled headers +| +| (c) 2002-2012 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| +****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include <windows.h> +#include <ppltasks.h> + +#include "Neptune.h"
\ No newline at end of file diff --git a/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtSockets.cpp b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtSockets.cpp new file mode 100644 index 0000000000..89ad5733a2 --- /dev/null +++ b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtSockets.cpp @@ -0,0 +1,664 @@ +/***************************************************************** +| +| Neptune - Sockets :: WinRT Implementation +| +| (c) 2001-2012 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| + ****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptWinRtPch.h" + +using namespace Platform; +using namespace Windows::Foundation; +using namespace Windows::Foundation::Collections; +using namespace Windows::Networking; +using namespace Windows::Networking::Sockets; +using namespace Windows::Storage::Streams; +using namespace Concurrency; + +/*---------------------------------------------------------------------- +| logging ++---------------------------------------------------------------------*/ +NPT_SET_LOCAL_LOGGER("neptune.sockets.winrt") + +/*---------------------------------------------------------------------- +| constants ++---------------------------------------------------------------------*/ +const DWORD NPT_WINRT_SOCKET_DEFAULT_READ_TIMEOUT = 30000; +const DWORD NPT_WINRT_SOCKET_DEFAULT_WRITE_TIMEOUT = 30000; + +/*---------------------------------------------------------------------- +| NPT_WinRtTcpClientSocket ++---------------------------------------------------------------------*/ +class NPT_WinRtTcpClientSocket : public NPT_SocketInterface +{ + public: + // constructors and destructor + NPT_WinRtTcpClientSocket(); + virtual ~NPT_WinRtTcpClientSocket(); + + // NPT_SocketInterface methods + NPT_Result Bind(const NPT_SocketAddress& address, bool reuse_address = true); + NPT_Result Connect(const NPT_SocketAddress& address, NPT_Timeout timeout); + NPT_Result GetInputStream(NPT_InputStreamReference& stream); + NPT_Result GetOutputStream(NPT_OutputStreamReference& stream); + NPT_Result GetInfo(NPT_SocketInfo& info); + NPT_Result SetReadTimeout(NPT_Timeout timeout); + NPT_Result SetWriteTimeout(NPT_Timeout timeout); + NPT_Result Cancel(bool shutdown); + +protected: + StreamSocket^ m_Socket; + HostName^ m_RemoteHostName; + HANDLE m_WaitEvent; + NPT_Timeout m_ReadTimeout; + NPT_Timeout m_WriteTimeout; +}; + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketInputStream ++---------------------------------------------------------------------*/ +class NPT_WinRtSocketInputStream : public NPT_InputStream +{ +public: + // constructors and destructor + NPT_WinRtSocketInputStream(StreamSocket^ socket, NPT_Timeout timeout); + virtual ~NPT_WinRtSocketInputStream(); + + // NPT_InputStream methods + NPT_Result Read(void* buffer, + NPT_Size bytes_to_read, + NPT_Size* bytes_read); + NPT_Result Seek(NPT_Position offset); + NPT_Result Tell(NPT_Position& where); + NPT_Result GetSize(NPT_LargeSize& size); + NPT_Result GetAvailable(NPT_LargeSize& available); + +private: + StreamSocket^ m_Socket; + IInputStream^ m_InputStream; + DataReader^ m_Reader; + HANDLE m_WaitEvent; + NPT_Timeout m_Timeout; +}; + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketOutputStream ++---------------------------------------------------------------------*/ +class NPT_WinRtSocketOutputStream : public NPT_OutputStream +{ +public: + // constructors and destructor + NPT_WinRtSocketOutputStream(StreamSocket^ socket, NPT_Timeout timeout); + virtual ~NPT_WinRtSocketOutputStream(); + + // NPT_OutputStream methods + NPT_Result Write(const void* buffer, + NPT_Size bytes_to_write, + NPT_Size* bytes_written); + NPT_Result Seek(NPT_Position offset); + NPT_Result Tell(NPT_Position& where); + NPT_Result Flush(); + +private: + StreamSocket^ m_Socket; + IOutputStream^ m_OutputStream; + DataWriter^ m_Writer; + HANDLE m_WaitEvent; + NPT_Timeout m_Timeout; +}; + +/*---------------------------------------------------------------------- +| StringFromUTF8 ++---------------------------------------------------------------------*/ +static String^ +StringFromUTF8(const char* utf) +{ + unsigned int utf_len = NPT_StringLength(utf); + unsigned int wide_len = utf_len; + wchar_t* wide = new wchar_t[wide_len+1]; + int result = MultiByteToWideChar(CP_UTF8, + 0, + utf, + utf_len+1, + wide, + wide_len+1); + String^ str; + if (result) { + str = ref new String(wide); + } else { + str = ref new String(); + } + delete[] wide; + return str; +} + +/*---------------------------------------------------------------------- +| TranslateHResult ++---------------------------------------------------------------------*/ +static NPT_Result +TranslateHResult(HResult result) +{ + switch (HRESULT_FACILITY(result.Value)) { + case FACILITY_WIN32: + switch (HRESULT_CODE(result.Value)) { + case WSAHOST_NOT_FOUND: + return NPT_ERROR_HOST_UNKNOWN; + + case WSAETIMEDOUT: + return NPT_ERROR_TIMEOUT; + + case WSAECONNREFUSED: + return NPT_ERROR_CONNECTION_REFUSED; + + case WSAEWOULDBLOCK: + return NPT_ERROR_WOULD_BLOCK; + + case WSAECONNABORTED: + return NPT_ERROR_CONNECTION_ABORTED; + + case WSAECONNRESET: + case WSAENETRESET: + return NPT_ERROR_CONNECTION_RESET; + + case WSAEADDRINUSE: + return NPT_ERROR_ADDRESS_IN_USE; + + case WSAENETDOWN: + return NPT_ERROR_NETWORK_DOWN; + + case WSAENETUNREACH: + return NPT_ERROR_NETWORK_UNREACHABLE; + + case WSAEINTR: + return NPT_ERROR_INTERRUPTED; + + case WSAENOTCONN: + return NPT_ERROR_NOT_CONNECTED; + + default: + return NPT_FAILURE; + } + break; + + /* TODO: map error codes */ + default: + return NPT_FAILURE; + } +} + +/*---------------------------------------------------------------------- +| WaitForAsyncAction ++---------------------------------------------------------------------*/ +static NPT_Result +WaitForAsyncAction(IAsyncAction^ action, + HANDLE wait_event, + DWORD timeout = INFINITE) +{ + NPT_Result result = NPT_ERROR_INTERNAL; + + NPT_LOG_FINEST("waiting for async action..."); + ResetEvent(wait_event); + + action->Completed = ref new AsyncActionCompletedHandler + ([&](IAsyncAction^ action_, AsyncStatus status) { + switch (status) { + case AsyncStatus::Canceled: + result = NPT_ERROR_TIMEOUT; + break; + + case AsyncStatus::Completed: + result = NPT_SUCCESS; + break; + + case AsyncStatus::Error: + NPT_LOG_FINE_1("AsyncAction error %x", action_->ErrorCode.Value); + result = TranslateHResult(action_->ErrorCode); + break; + + default: + result = NPT_ERROR_INTERNAL; + break; + } + SetEvent(wait_event); + }); + + DWORD wait_result = WaitForSingleObjectEx(wait_event, timeout, FALSE); + if (wait_result != WAIT_OBJECT_0) { + NPT_LOG_FINE("action timed out, canceling..."); + action->Cancel(); + WaitForSingleObjectEx(wait_event, INFINITE, FALSE); + } + NPT_LOG_FINEST("done waiting for async action"); + + return result; +} + +/*---------------------------------------------------------------------- +| WaitForAsyncOperation ++---------------------------------------------------------------------*/ +static NPT_Result +WaitForAsyncOperation(IAsyncOperation<unsigned int>^ operation, + HANDLE wait_event, + unsigned int& return_value, + DWORD timeout = INFINITE) +{ + NPT_Result result = NPT_ERROR_INTERNAL; + + NPT_LOG_FINEST("waiting for async operation..."); + return_value = 0; + ResetEvent(wait_event); + + operation->Completed = ref new AsyncOperationCompletedHandler<unsigned int> + ([&](IAsyncOperation<unsigned int>^ operation_, AsyncStatus status) { + switch (status) { + case AsyncStatus::Canceled: + result = NPT_ERROR_TIMEOUT; + break; + + case AsyncStatus::Completed: + return_value = operation_->GetResults(); + result = NPT_SUCCESS; + break; + + case AsyncStatus::Error: + NPT_LOG_FINE_1("AsyncOperation error %x", operation_->ErrorCode.Value); + result = TranslateHResult(operation_->ErrorCode); + break; + + default: + result = NPT_ERROR_INTERNAL; + break; + } + operation_->Close(); + SetEvent(wait_event); + }); + + DWORD wait_result = WaitForSingleObjectEx(wait_event, timeout, FALSE); + if (wait_result != WAIT_OBJECT_0) { + NPT_LOG_FINE("operation timed out, canceling..."); + operation->Cancel(); + WaitForSingleObjectEx(wait_event, INFINITE, FALSE); + } + NPT_LOG_FINEST("done waiting for async operation"); + + return result; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketInputStream::NPT_WinRtSocketInputStream ++---------------------------------------------------------------------*/ +NPT_WinRtSocketInputStream::NPT_WinRtSocketInputStream(StreamSocket^ socket, + NPT_Timeout timeout) : + m_Socket(socket), + m_Timeout(timeout) +{ + m_InputStream = socket->InputStream; + m_Reader = ref new DataReader(m_InputStream); + m_Reader->InputStreamOptions = InputStreamOptions::Partial; + m_WaitEvent = CreateEventExW(NULL, L"", 0, EVENT_ALL_ACCESS); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketInputStream::~NPT_WinRtSocketInputStream ++---------------------------------------------------------------------*/ +NPT_WinRtSocketInputStream::~NPT_WinRtSocketInputStream() +{ + m_Reader->DetachStream(); + CloseHandle(m_WaitEvent); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketInputStream::Read ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtSocketInputStream::Read(void* buffer, + NPT_Size bytes_to_read, + NPT_Size* bytes_read) +{ + // init and shortcut + if (bytes_read) *bytes_read = 0; + if (bytes_to_read == 0) return NPT_SUCCESS; + + NPT_LOG_FINER_1("reading %d bytes", bytes_to_read); + auto operation = m_Reader->LoadAsync(bytes_to_read); + + unsigned int return_value = 0; + NPT_Result result = WaitForAsyncOperation(operation, m_WaitEvent, return_value, m_Timeout); + + if (NPT_SUCCEEDED(result)) { + if (return_value) { + unsigned int bytes_available = m_Reader->UnconsumedBufferLength; + Array<unsigned char>^ bytes = ref new Array<unsigned char>(bytes_available); + m_Reader->ReadBytes(bytes); + NPT_CopyMemory(buffer, bytes->Data, bytes_available); + if (bytes_read) *bytes_read = bytes_available; + return NPT_SUCCESS; + } else { + return NPT_ERROR_EOS; + } + } + + return result; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketInputStream::Seek ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtSocketInputStream::Seek(NPT_Position offset) +{ + return NPT_ERROR_NOT_SUPPORTED; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketInputStream::Tell ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtSocketInputStream::Tell(NPT_Position& where) +{ + where = 0; + return NPT_ERROR_NOT_SUPPORTED; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketInputStream::GetSize ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtSocketInputStream::GetSize(NPT_LargeSize& size) +{ + size = 0; + return NPT_ERROR_NOT_SUPPORTED; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketInputStream::GetAvailable ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtSocketInputStream::GetAvailable(NPT_LargeSize& available) +{ + available = 0; + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketOutputStream::NPT_WinRtSocketOutputStream ++---------------------------------------------------------------------*/ +NPT_WinRtSocketOutputStream::NPT_WinRtSocketOutputStream(StreamSocket^ socket, + NPT_Timeout timeout) : + m_Socket(socket), + m_Timeout(timeout) +{ + m_OutputStream = socket->OutputStream; + m_Writer = ref new DataWriter(m_OutputStream); + m_WaitEvent = CreateEventExW(NULL, L"", 0, EVENT_ALL_ACCESS); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketOutputStream::~NPT_WinRtSocketOutputStream ++---------------------------------------------------------------------*/ +NPT_WinRtSocketOutputStream::~NPT_WinRtSocketOutputStream() +{ + m_Writer->DetachStream(); + CloseHandle(m_WaitEvent); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketOutputStream::Write ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtSocketOutputStream::Write(const void* buffer, + NPT_Size bytes_to_write, + NPT_Size* bytes_written) +{ + NPT_LOG_FINER_1("writing %d bytes", bytes_to_write); + + Array<unsigned char>^ bytes = ref new Array<unsigned char>(bytes_to_write); + NPT_CopyMemory(bytes->Data, buffer, bytes_to_write); + m_Writer->WriteBytes(bytes); + auto operation = m_Writer->StoreAsync(); + unsigned int return_value = 0; + + NPT_Result result = WaitForAsyncOperation(operation, m_WaitEvent, return_value, m_Timeout); + if (bytes_written) *bytes_written = return_value; + + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketOutputStream::Seek ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtSocketOutputStream::Seek(NPT_Position offset) +{ + return NPT_ERROR_NOT_SUPPORTED; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketOutputStream::Tell ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtSocketOutputStream::Tell(NPT_Position& where) +{ + where = 0; + return NPT_ERROR_NOT_SUPPORTED; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSocketOutputStream ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtSocketOutputStream::Flush() +{ + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtTcpClientSocket::NPT_WinRtTcpClientSocket ++---------------------------------------------------------------------*/ +NPT_WinRtTcpClientSocket::NPT_WinRtTcpClientSocket() : + m_ReadTimeout(NPT_WINRT_SOCKET_DEFAULT_READ_TIMEOUT), + m_WriteTimeout(NPT_WINRT_SOCKET_DEFAULT_WRITE_TIMEOUT) +{ + m_Socket = ref new StreamSocket(); + m_WaitEvent = CreateEventExW(NULL, L"", 0, EVENT_ALL_ACCESS); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtTcpClientSocket::NPT_WinRtTcpClientSocket ++---------------------------------------------------------------------*/ +NPT_WinRtTcpClientSocket::~NPT_WinRtTcpClientSocket() +{ + CloseHandle(m_WaitEvent); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtTcpClientSocket::Bind ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtTcpClientSocket::Bind(const NPT_SocketAddress& address, bool reuse_address) +{ + return NPT_ERROR_NOT_IMPLEMENTED; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtTcpClientSocket::Connect ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtTcpClientSocket::Connect(const NPT_SocketAddress& address, NPT_Timeout timeout) +{ + try { + NPT_LOG_FINE_1("connecting to %s", address.GetIpAddress().m_HostName.GetChars()); + + m_RemoteHostName = ref new HostName(StringFromUTF8(address.GetIpAddress().m_HostName.GetChars())); + String^ remote_service = ref new String(); + NPT_String port = NPT_String::FromIntegerU(address.GetPort()); + IAsyncAction^ connection = m_Socket->ConnectAsync(m_RemoteHostName, StringFromUTF8(port.GetChars())); + + // wait for the connection to be established + NPT_Result result = WaitForAsyncAction(connection, m_WaitEvent, timeout); + if (NPT_FAILED(result)) { + NPT_LOG_FINE_1("connection failed (%d)", result); + } else { + NPT_LOG_FINE("connected"); + } + return result; + } catch (Exception^ e) { + NPT_LOG_FINE("exception caught"); + return NPT_FAILURE; + } +} + +/*---------------------------------------------------------------------- +| NPT_WinRtTcpClientSocket::GetInputStream ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtTcpClientSocket::GetInputStream(NPT_InputStreamReference& stream) +{ + stream = new NPT_WinRtSocketInputStream(m_Socket, m_ReadTimeout); + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtTcpClientSocket::GetOutputStream ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtTcpClientSocket::GetOutputStream(NPT_OutputStreamReference& stream) +{ + stream = new NPT_WinRtSocketOutputStream(m_Socket, m_WriteTimeout); + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtTcpClientSocket::GetInfo ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtTcpClientSocket::GetInfo(NPT_SocketInfo& info) +{ + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtTcpClientSocket::SetReadTimeout ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtTcpClientSocket::SetReadTimeout(NPT_Timeout timeout) +{ + m_ReadTimeout = timeout; + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtTcpClientSocket::SetWriteTimeout ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtTcpClientSocket::SetWriteTimeout(NPT_Timeout timeout) +{ + m_WriteTimeout = timeout; + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtTcpClientSocket::Cancel ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtTcpClientSocket::Cancel(bool shutdown) +{ + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_Socket::~NPT_Socket ++---------------------------------------------------------------------*/ +NPT_Socket::~NPT_Socket() +{ + delete m_SocketDelegate; +} + +/*---------------------------------------------------------------------- +| NPT_UdpSocket::NPT_UdpSocket ++---------------------------------------------------------------------*/ +NPT_UdpSocket::NPT_UdpSocket(NPT_Flags flags) +{ + m_SocketDelegate = NULL; + m_UdpSocketDelegate = NULL; +} + +/*---------------------------------------------------------------------- +| NPT_UdpSocket::NPT_UdpSocket ++---------------------------------------------------------------------*/ +NPT_UdpSocket::NPT_UdpSocket(NPT_UdpSocketInterface* delegate) : + m_UdpSocketDelegate(delegate) +{ +} + +/*---------------------------------------------------------------------- +| NPT_UdpSocket::~NPT_UdpSocket ++---------------------------------------------------------------------*/ +NPT_UdpSocket::~NPT_UdpSocket() +{ + m_UdpSocketDelegate = NULL; + m_SocketDelegate = NULL; +} + +/*---------------------------------------------------------------------- +| NPT_UdpMulticastSocket::NPT_UdpMulticastSocket ++---------------------------------------------------------------------*/ +NPT_UdpMulticastSocket::NPT_UdpMulticastSocket(NPT_Flags flags) : + NPT_UdpSocket((NPT_UdpSocketInterface*)0) +{ + m_SocketDelegate = NULL; + m_UdpSocketDelegate = NULL; + m_UdpMulticastSocketDelegate = NULL; +} + +/*---------------------------------------------------------------------- +| NPT_UdpMulticastSocket::~NPT_UdpMulticastSocket ++---------------------------------------------------------------------*/ +NPT_UdpMulticastSocket::~NPT_UdpMulticastSocket() +{ + m_SocketDelegate = NULL; + m_UdpSocketDelegate = NULL; + m_UdpMulticastSocketDelegate = NULL; +} + +/*---------------------------------------------------------------------- +| NPT_TcpClientSocket::NPT_TcpClientSocket ++---------------------------------------------------------------------*/ +NPT_TcpClientSocket::NPT_TcpClientSocket(NPT_Flags flags) : + NPT_Socket(NULL) +{ + m_SocketDelegate = new NPT_WinRtTcpClientSocket(); +} + +/*---------------------------------------------------------------------- +| NPT_TcpClientSocket::NPT_TcpClientSocket ++---------------------------------------------------------------------*/ +NPT_TcpClientSocket::~NPT_TcpClientSocket() +{ + delete m_SocketDelegate; + + m_SocketDelegate = NULL; +} + +/*---------------------------------------------------------------------- +| NPT_TcpServerSocket::NPT_TcpServerSocket ++---------------------------------------------------------------------*/ +NPT_TcpServerSocket::NPT_TcpServerSocket(NPT_Flags flags) +{ + m_SocketDelegate = NULL; + m_TcpServerSocketDelegate = NULL; +} + +/*---------------------------------------------------------------------- +| NPT_TcpServerSocket::NPT_TcpServerSocket ++---------------------------------------------------------------------*/ +NPT_TcpServerSocket::~NPT_TcpServerSocket() +{ + m_SocketDelegate = NULL; + m_TcpServerSocketDelegate = NULL; +} diff --git a/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtSystem.cpp b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtSystem.cpp new file mode 100644 index 0000000000..195768fedc --- /dev/null +++ b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtSystem.cpp @@ -0,0 +1,115 @@ +/***************************************************************** +| +| Neptune - System :: WinRT Implementation +| +| (c) 2001-2012 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| + ****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptWinRtPch.h" +#include "NptConfig.h" +#include "NptTypes.h" +#include "NptSystem.h" +#include "NptResults.h" +#include "NptDebug.h" + +using namespace Windows::Security::Cryptography; + +/*---------------------------------------------------------------------- +| NPT_WinRtSystemInitializer ++---------------------------------------------------------------------*/ +class NPT_WinRtSystem { +public: + static NPT_WinRtSystem Global; + ~NPT_WinRtSystem() { + CloseHandle(m_WaitEvent); + } + HANDLE m_WaitEvent; + +private: + NPT_WinRtSystem() { + m_WaitEvent = CreateEventExW(NULL, L"", 0, EVENT_ALL_ACCESS); + } +}; +NPT_WinRtSystem NPT_WinRtSystem::Global; + +/*---------------------------------------------------------------------- +| NPT_System::GetProcessId ++---------------------------------------------------------------------*/ +NPT_Result +NPT_System::GetProcessId(NPT_UInt32& id) +{ + id = GetCurrentProcessId(); + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_System::GetCurrentTimeStamp ++---------------------------------------------------------------------*/ +NPT_Result +NPT_System::GetCurrentTimeStamp(NPT_TimeStamp& now) +{ + FILETIME time; + GetSystemTimeAsFileTime(&time); + ULARGE_INTEGER ltime; + ltime.LowPart = time.dwLowDateTime; + ltime.HighPart = time.dwHighDateTime; + + /* convert to 64-bits 100-nanoseconds value */ + ULONGLONG time64 = ltime.QuadPart; + time64 -= 116444736000000000; /* convert from the Windows epoch (Jan. 1, 1601) to the + * Unix epoch (Jan. 1, 1970) */ + now.FromNanos(time64*100); + + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_System::Sleep ++---------------------------------------------------------------------*/ +NPT_Result +NPT_System::Sleep(const NPT_TimeInterval& duration) +{ + DWORD timeout = (DWORD)duration.ToMillis(); + WaitForSingleObjectEx(NPT_WinRtSystem::Global.m_WaitEvent, timeout, FALSE); + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_System::SleepUntil ++---------------------------------------------------------------------*/ +NPT_Result +NPT_System::SleepUntil(const NPT_TimeStamp& when) +{ + NPT_TimeStamp now; + GetCurrentTimeStamp(now); + if (when > now) { + NPT_TimeInterval duration = when-now; + return Sleep(duration); + } else { + return NPT_SUCCESS; + } +} + +/*---------------------------------------------------------------------- +| NPT_System::SetRandomSeed ++---------------------------------------------------------------------*/ +NPT_Result +NPT_System::SetRandomSeed(unsigned int seed) +{ + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_System::NPT_System ++---------------------------------------------------------------------*/ +NPT_UInt32 +NPT_System::GetRandomInteger() +{ + return CryptographicBuffer::GenerateRandomNumber(); +} + diff --git a/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtThreads.cpp b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtThreads.cpp new file mode 100644 index 0000000000..034871864c --- /dev/null +++ b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtThreads.cpp @@ -0,0 +1,712 @@ +/***************************************************************** +| +| Neptune - Threads :: WinRT Implementation +| +| (c) 2001-2012 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| + ****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptWinRtPch.h" + +using namespace Platform; +using namespace Windows::System::Threading; +using namespace Windows::Foundation; +using namespace Windows::Foundation::Collections; +using namespace Concurrency; + +#include "NptConfig.h" +#include "NptTypes.h" +#include "NptConstants.h" +#include "NptThreads.h" +#include "NptDebug.h" +#include "NptResults.h" +#include "NptWinRtThreads.h" +#include "NptTime.h" +#include "NptSystem.h" +#include "NptLogging.h" + +/*---------------------------------------------------------------------- +| logging ++---------------------------------------------------------------------*/ +NPT_SET_LOCAL_LOGGER("neptune.threads.winrt") + +/*---------------------------------------------------------------------- +| NPT_WinRtMutex::NPT_WinRtMutex ++---------------------------------------------------------------------*/ +NPT_WinRtMutex::NPT_WinRtMutex() +{ + m_Handle = CreateMutexExW(NULL, L"", FALSE, MUTEX_ALL_ACCESS); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtMutex::~NPT_WinRtMutex ++---------------------------------------------------------------------*/ +NPT_WinRtMutex::~NPT_WinRtMutex() +{ + CloseHandle(m_Handle); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtMutex::Lock ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtMutex::Lock() +{ + DWORD result = WaitForSingleObjectEx(m_Handle, INFINITE, FALSE); + if (result == WAIT_OBJECT_0) { + return NPT_SUCCESS; + } else { + return NPT_FAILURE; + } +} + +/*---------------------------------------------------------------------- +| NPT_WinRtMutex::Unlock ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtMutex::Unlock() +{ + ReleaseMutex(m_Handle); + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_Mutex::NPT_Mutex ++---------------------------------------------------------------------*/ +NPT_Mutex::NPT_Mutex() +{ + m_Delegate = new NPT_WinRtMutex(); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtCriticalSection::NPT_WinRtCriticalSection ++---------------------------------------------------------------------*/ +NPT_WinRtCriticalSection::NPT_WinRtCriticalSection() +{ + InitializeCriticalSectionEx(&m_CriticalSection, 0, 0); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtCriticalSection::~NPT_WinRtCriticalSection ++---------------------------------------------------------------------*/ +NPT_WinRtCriticalSection::~NPT_WinRtCriticalSection() +{ + DeleteCriticalSection(&m_CriticalSection); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtCriticalSection::Lock ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtCriticalSection::Lock() +{ + EnterCriticalSection(&m_CriticalSection); + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtCriticalSection::Unlock ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtCriticalSection::Unlock() +{ + LeaveCriticalSection(&m_CriticalSection); + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtEvent::NPT_WinRtEvent ++---------------------------------------------------------------------*/ +NPT_WinRtEvent::NPT_WinRtEvent(bool manual /* = false */, bool initial /* = false */) +{ + DWORD flags = 0; + if (manual) flags |= CREATE_EVENT_MANUAL_RESET; + if (initial) flags |= CREATE_EVENT_INITIAL_SET; + m_Event = CreateEventExW(NULL, L"", flags, EVENT_ALL_ACCESS); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtEvent::~NPT_WinRtEvent ++---------------------------------------------------------------------*/ +NPT_WinRtEvent::~NPT_WinRtEvent() +{ + CloseHandle(m_Event); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtEvent::Wait ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtEvent::Wait(NPT_Timeout timeout) +{ + if (m_Event) { + DWORD result = WaitForSingleObjectEx(m_Event, timeout==NPT_TIMEOUT_INFINITE?INFINITE:timeout, FALSE); + if (result == WAIT_TIMEOUT) { + return NPT_ERROR_TIMEOUT; + } + if (result != WAIT_OBJECT_0 && result != WAIT_ABANDONED) { + return NPT_FAILURE; + } + } + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtEvent::Signal ++---------------------------------------------------------------------*/ +void +NPT_WinRtEvent::Signal() +{ + SetEvent(m_Event); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtEvent::Reset ++---------------------------------------------------------------------*/ +void +NPT_WinRtEvent::Reset() +{ + ResetEvent(m_Event); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable ++---------------------------------------------------------------------*/ +class NPT_WinRtSharedVariable : public NPT_SharedVariableInterface +{ +public: + // methods + NPT_WinRtSharedVariable(int value); + ~NPT_WinRtSharedVariable(); + void SetValue(int value); + int GetValue(); + NPT_Result WaitUntilEquals(int value, NPT_Timeout timeout); + NPT_Result WaitWhileEquals(int value, NPT_Timeout timeout); + + private: + // members + volatile int m_Value; + CRITICAL_SECTION m_Mutex; + CONDITION_VARIABLE m_Condition; +}; + +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable::NPT_WinRtSharedVariable ++---------------------------------------------------------------------*/ +NPT_WinRtSharedVariable::NPT_WinRtSharedVariable(int value) : + m_Value(value) +{ + InitializeCriticalSectionEx(&m_Mutex, 0, 0); + InitializeConditionVariable(&m_Condition); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable::~NPT_WinRtSharedVariable ++---------------------------------------------------------------------*/ +NPT_WinRtSharedVariable::~NPT_WinRtSharedVariable() +{ + DeleteCriticalSection(&m_Mutex); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable::SetValue ++---------------------------------------------------------------------*/ +void +NPT_WinRtSharedVariable::SetValue(int value) +{ + EnterCriticalSection(&m_Mutex); + m_Value = value; + WakeAllConditionVariable(&m_Condition); + LeaveCriticalSection(&m_Mutex); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable::GetValue ++---------------------------------------------------------------------*/ +int +NPT_WinRtSharedVariable::GetValue() +{ + // we assume that int read/write are atomic on the platform + return m_Value; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable::WaitUntilEquals ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtSharedVariable::WaitUntilEquals(int value, NPT_Timeout timeout) +{ + NPT_Result result = NPT_SUCCESS; + + EnterCriticalSection(&m_Mutex); + while (value != m_Value) { + if (!SleepConditionVariableCS(&m_Condition, &m_Mutex, timeout==NPT_TIMEOUT_INFINITE?INFINITE:timeout)) { + DWORD error = GetLastError(); + if (error == ERROR_TIMEOUT) { + result = NPT_ERROR_TIMEOUT; + } else { + result = NPT_FAILURE; + } + } + } + LeaveCriticalSection(&m_Mutex); + + return result; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable::WaitWhileEquals ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtSharedVariable::WaitWhileEquals(int value, NPT_Timeout timeout) +{ + NPT_Result result = NPT_SUCCESS; + + EnterCriticalSection(&m_Mutex); + while (value == m_Value) { + if (!SleepConditionVariableCS(&m_Condition, &m_Mutex, timeout==NPT_TIMEOUT_INFINITE?INFINITE:timeout)) { + DWORD error = GetLastError(); + if (error == ERROR_TIMEOUT) { + result = NPT_ERROR_TIMEOUT; + } else { + result = NPT_FAILURE; + } + } + } + LeaveCriticalSection(&m_Mutex); + + return result; +} + +/*---------------------------------------------------------------------- +| NPT_SharedVariable::NPT_SharedVariable ++---------------------------------------------------------------------*/ +NPT_SharedVariable::NPT_SharedVariable(int value) +{ + m_Delegate = new NPT_WinRtSharedVariable(value); +} + +#if 0 +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable ++---------------------------------------------------------------------*/ +class NPT_WinRtSharedVariable : public NPT_SharedVariableInterface +{ + public: + // methods + NPT_WinRtSharedVariable(int value); + ~NPT_WinRtSharedVariable(); + void SetValue(int value); + int GetValue(); + NPT_Result WaitUntilEquals(int value, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE); + NPT_Result WaitWhileEquals(int value, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE); + + private: + // members + volatile int m_Value; + NPT_Mutex m_Lock; + NPT_WinRtEvent m_Event; +}; + +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable::NPT_WinRtSharedVariable ++---------------------------------------------------------------------*/ +NPT_WinRtSharedVariable::NPT_WinRtSharedVariable(int value) : + m_Value(value) +{ +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable::~NPT_WinRtSharedVariable ++---------------------------------------------------------------------*/ +NPT_WinRtSharedVariable::~NPT_WinRtSharedVariable() +{ +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable::SetValue ++---------------------------------------------------------------------*/ +void +NPT_WinRtSharedVariable::SetValue(int value) +{ + m_Lock.Lock(); + if (value != m_Value) { + m_Value = value; + m_Event.Signal(); + } + m_Lock.Unlock(); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable::GetValue ++---------------------------------------------------------------------*/ +int +NPT_WinRtSharedVariable::GetValue() +{ + // reading an integer should be atomic on all WinRt platforms + return m_Value; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable::WaitUntilEquals ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtSharedVariable::WaitUntilEquals(int value, NPT_Timeout timeout) +{ + do { + m_Lock.Lock(); + if (m_Value == value) { + break; + } + m_Lock.Unlock(); + { + NPT_Result result = m_Event.Wait(timeout); + if (NPT_FAILED(result)) return result; + } + } while (1); + + m_Lock.Unlock(); + + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtSharedVariable::WaitWhileEquals ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtSharedVariable::WaitWhileEquals(int value, NPT_Timeout timeout) +{ + do { + m_Lock.Lock(); + if (m_Value != value) { + break; + } + m_Lock.Unlock(); + { + NPT_Result result = m_Event.Wait(timeout); + if (NPT_FAILED(result)) return result; + } + } while (1); + + m_Lock.Unlock(); + + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_SharedVariable::NPT_SharedVariable ++---------------------------------------------------------------------*/ +NPT_SharedVariable::NPT_SharedVariable(int value) +{ + m_Delegate = new NPT_WinRtSharedVariable(value); +} +#endif + +/*---------------------------------------------------------------------- +| NPT_WinRtAtomicVariable ++---------------------------------------------------------------------*/ +class NPT_WinRtAtomicVariable : public NPT_AtomicVariableInterface +{ + public: + // methods + NPT_WinRtAtomicVariable(int value); + ~NPT_WinRtAtomicVariable(); + int Increment(); + int Decrement(); + void SetValue(int value); + int GetValue(); + + private: + // members + volatile LONG m_Value; +}; + +/*---------------------------------------------------------------------- +| NPT_WinRtAtomicVariable::NPT_WinRtAtomicVariable ++---------------------------------------------------------------------*/ +NPT_WinRtAtomicVariable::NPT_WinRtAtomicVariable(int value) : + m_Value(value) +{ +} + +/*---------------------------------------------------------------------- +| NPT_WinRtAtomicVariable::~NPT_WinRtAtomicVariable ++---------------------------------------------------------------------*/ +NPT_WinRtAtomicVariable::~NPT_WinRtAtomicVariable() +{ +} + +/*---------------------------------------------------------------------- +| NPT_WinRtAtomicVariable::Increment ++---------------------------------------------------------------------*/ +int +NPT_WinRtAtomicVariable::Increment() +{ + return InterlockedIncrement(const_cast<LONG*>(&m_Value)); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtAtomicVariable::Decrement ++---------------------------------------------------------------------*/ +int +NPT_WinRtAtomicVariable::Decrement() +{ + return InterlockedDecrement(const_cast<LONG*>(&m_Value)); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtAtomicVariable::SetValue ++---------------------------------------------------------------------*/ +void +NPT_WinRtAtomicVariable::SetValue(int value) +{ + m_Value = value; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtAtomicVariable::GetValue ++---------------------------------------------------------------------*/ +int +NPT_WinRtAtomicVariable::GetValue() +{ + return m_Value; +} + +/*---------------------------------------------------------------------- +| NPT_AtomicVariable::NPT_AtomicVariable ++---------------------------------------------------------------------*/ +NPT_AtomicVariable::NPT_AtomicVariable(int value) +{ + m_Delegate = new NPT_WinRtAtomicVariable(value); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtThread ++---------------------------------------------------------------------*/ +class NPT_WinRtThread : public NPT_ThreadInterface +{ + public: + // class methods + static NPT_Result SetThreadPriority(HANDLE thread, int priority); + + // methods + NPT_WinRtThread(NPT_Thread* delegator, + NPT_Runnable& target, + bool detached); + ~NPT_WinRtThread(); + NPT_Result Start(); + NPT_Result Wait(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE); + NPT_Result SetPriority(int priority); + + private: + // methods + static unsigned int __stdcall EntryPoint(void* argument); + + // NPT_Runnable methods + void Run(); + + // NPT_Interruptible methods + NPT_Result Interrupt() { return NPT_ERROR_NOT_IMPLEMENTED; } + + // members + NPT_Thread* m_Delegator; + NPT_Runnable& m_Target; + bool m_Detached; + HANDLE m_ThreadHandle; +}; + +/*---------------------------------------------------------------------- +| NPT_WinRtThread::NPT_WinRtThread ++---------------------------------------------------------------------*/ +NPT_WinRtThread::NPT_WinRtThread(NPT_Thread* delegator, + NPT_Runnable& target, + bool detached) : + m_Delegator(delegator), + m_Target(target), + m_Detached(detached), + m_ThreadHandle(0) +{ +} + +/*---------------------------------------------------------------------- +| NPT_WinRtThread::~NPT_WinRtThread ++---------------------------------------------------------------------*/ +NPT_WinRtThread::~NPT_WinRtThread() +{ + if (!m_Detached) { + // we're not detached, and not in the Run() method, so we need to + // wait until the thread is done + Wait(); + } + + // close the thread handle + if (m_ThreadHandle) { + CloseHandle(m_ThreadHandle); + } +} + +/*---------------------------------------------------------------------- +| NPT_WinRtThread::SetThreadPriority ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtThread::SetThreadPriority(HANDLE thread, int priority) +{ + int WinRt_priority; + if (priority < NPT_THREAD_PRIORITY_LOWEST) { + WinRt_priority = THREAD_PRIORITY_IDLE; + } else if (priority < NPT_THREAD_PRIORITY_BELOW_NORMAL) { + WinRt_priority = THREAD_PRIORITY_LOWEST; + } else if (priority < NPT_THREAD_PRIORITY_NORMAL) { + WinRt_priority = THREAD_PRIORITY_BELOW_NORMAL; + } else if (priority < NPT_THREAD_PRIORITY_ABOVE_NORMAL) { + WinRt_priority = THREAD_PRIORITY_NORMAL; + } else if (priority < NPT_THREAD_PRIORITY_HIGHEST) { + WinRt_priority = THREAD_PRIORITY_ABOVE_NORMAL; + } else if (priority < NPT_THREAD_PRIORITY_TIME_CRITICAL) { + WinRt_priority = THREAD_PRIORITY_HIGHEST; + } else { + WinRt_priority = THREAD_PRIORITY_TIME_CRITICAL; + } +#if 0 + BOOL result = ::SetThreadPriority(thread, WinRt_priority); + if (!result) { + NPT_LOG_WARNING_1("SetThreadPriority failed (%x)", GetLastError()); + return NPT_FAILURE; + } +#endif + + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtThread::Start ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtThread::Start() +{ + if (m_ThreadHandle > 0) { + // failed + NPT_LOG_WARNING("thread already started !"); + return NPT_ERROR_INVALID_STATE; + } + + NPT_LOG_FINER("creating thread"); + + // create a stack local variable 'detached', as this object + // may already be deleted when the thread creation returns and + // before we get to call detach on the given thread + bool detached = m_Detached; + + HANDLE thread_handle = CreateEventExW(NULL, NULL, CREATE_EVENT_MANUAL_RESET, EVENT_ALL_ACCESS); + + auto handler = ref new WorkItemHandler([=](IAsyncAction^) + { + // run the thread routine + NPT_LOG_FINE("+++ thread routine start +++"); + try { + Run(); + } catch(...) { + NPT_LOG_FINE("*** exception caught during thread routine ***"); + } + NPT_LOG_FINE("--- thread routine done +++"); + + // signal that we're done + SetEvent(thread_handle); + + // if the thread is detached, delete it + if (detached) { + delete m_Delegator; + CloseHandle(thread_handle); + } + }); + + // remember the handle unless we're detached + if (!detached) { + m_ThreadHandle = thread_handle; + } + + // run the thread + ThreadPool::RunAsync(handler, WorkItemPriority::Normal, WorkItemOptions::TimeSliced); + + return NPT_SUCCESS; +} + +/*---------------------------------------------------------------------- +| NPT_WinRtThread::Run ++---------------------------------------------------------------------*/ +void +NPT_WinRtThread::Run() +{ + m_Target.Run(); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtThread::SetPriority ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtThread::SetPriority(int priority) +{ + if (m_ThreadHandle == 0) return NPT_ERROR_INVALID_STATE; + return NPT_WinRtThread::SetThreadPriority(m_ThreadHandle, priority); +} + +/*---------------------------------------------------------------------- +| NPT_WinRtThread::Wait ++---------------------------------------------------------------------*/ +NPT_Result +NPT_WinRtThread::Wait(NPT_Timeout timeout /* = NPT_TIMEOUT_INFINITE */) +{ + // check that we're not detached + if (m_ThreadHandle == 0 || m_Detached) { + return NPT_FAILURE; + } + + // wait for the thread to finish + // Logging here will cause a crash on exit because LogManager may already be destroyed + DWORD result = WaitForSingleObjectEx(m_ThreadHandle, + timeout==NPT_TIMEOUT_INFINITE?INFINITE:timeout, + FALSE); + if (result != WAIT_OBJECT_0) { + return NPT_ERROR_TIMEOUT; + } else { + return NPT_SUCCESS; + } +} + +/*---------------------------------------------------------------------- +| NPT_Thread::GetCurrentThreadId ++---------------------------------------------------------------------*/ +NPT_Thread::ThreadId +NPT_Thread::GetCurrentThreadId() +{ + return ::GetCurrentThreadId(); +} + +/*---------------------------------------------------------------------- +| NPT_Thread::SetCurrentThreadPriority ++---------------------------------------------------------------------*/ +NPT_Result +NPT_Thread::SetCurrentThreadPriority(int priority) +{ + return NPT_WinRtThread::SetThreadPriority(::GetCurrentThread(), priority); +} + +/*---------------------------------------------------------------------- +| NPT_Thread::NPT_Thread ++---------------------------------------------------------------------*/ +NPT_Thread::NPT_Thread(bool detached) +{ + m_Delegate = new NPT_WinRtThread(this, *this, detached); +} + +/*---------------------------------------------------------------------- +| NPT_Thread::NPT_Thread ++---------------------------------------------------------------------*/ +NPT_Thread::NPT_Thread(NPT_Runnable& target, bool detached) +{ + m_Delegate = new NPT_WinRtThread(this, target, detached); +} diff --git a/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtThreads.h b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtThreads.h new file mode 100644 index 0000000000..e38609d0e0 --- /dev/null +++ b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtThreads.h @@ -0,0 +1,73 @@ +/***************************************************************** +| +| Neptune - Threads :: WinRT Implementation +| +| (c) 2001-2012 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| + ****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptConfig.h" +#include "NptTypes.h" +#include "NptThreads.h" +#include "NptDebug.h" + +/*---------------------------------------------------------------------- +| NPT_WinRtMutex ++---------------------------------------------------------------------*/ +class NPT_WinRtMutex : public NPT_MutexInterface +{ +public: + // methods + NPT_WinRtMutex(); + virtual ~NPT_WinRtMutex(); + + // NPT_Mutex methods + virtual NPT_Result Lock(); + virtual NPT_Result Unlock(); + +private: + // members + HANDLE m_Handle; +}; + +/*---------------------------------------------------------------------- +| NPT_WinRtEvent ++---------------------------------------------------------------------*/ +class NPT_WinRtEvent +{ +public: + // methods + NPT_WinRtEvent(bool manual = false, bool initial = false); + virtual ~NPT_WinRtEvent(); + + virtual NPT_Result Wait(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE); + virtual void Signal(); + virtual void Reset(); + +private: + // members + HANDLE m_Event; +}; + +/*---------------------------------------------------------------------- +| NPT_WinRtCriticalSection ++---------------------------------------------------------------------*/ +class NPT_WinRtCriticalSection +{ +public: + // methods + NPT_WinRtCriticalSection(); + ~NPT_WinRtCriticalSection(); + + // NPT_Mutex methods + NPT_Result Lock(); + NPT_Result Unlock(); + +private: + // members + CRITICAL_SECTION m_CriticalSection; +}; diff --git a/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtTime.cpp b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtTime.cpp new file mode 100644 index 0000000000..f9c94073a9 --- /dev/null +++ b/lib/libUPnP/Neptune/Source/System/WinRT/NptWinRtTime.cpp @@ -0,0 +1,32 @@ +/***************************************************************** +| +| Neptune - Time: WinRT Implementation +| +| (c) 2002-2012 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| +****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "NptTime.h" +#include "NptResults.h" +#include "NptWinRtPch.h" + +/*---------------------------------------------------------------------- +| logging ++---------------------------------------------------------------------*/ +//NPT_SET_LOCAL_LOGGER("neptune.system.win32.time") + +/*---------------------------------------------------------------------- +| NPT_DateTime::GetTimeZone ++---------------------------------------------------------------------*/ +NPT_Int32 +NPT_DateTime::GetLocalTimeZone() +{ + TIME_ZONE_INFORMATION tz_info; + DWORD result = GetTimeZoneInformation(&tz_info); + if (result == TIME_ZONE_ID_INVALID) return 0; + return -tz_info.Bias; +} diff --git a/lib/libUPnP/Neptune/Source/Tests/HttpClient2/HttpClientTest2.cpp b/lib/libUPnP/Neptune/Source/Tests/HttpClient2/HttpClientTest2.cpp index d65850b018..cba3c563be 100644 --- a/lib/libUPnP/Neptune/Source/Tests/HttpClient2/HttpClientTest2.cpp +++ b/lib/libUPnP/Neptune/Source/Tests/HttpClient2/HttpClientTest2.cpp @@ -15,19 +15,28 @@ #define LOG_FORMAT "%30s,%3d,%8d, %8d, %8d, [%30s], %s\n" +static NPT_HttpClient::Connector* HttpConnector = NULL; +static NPT_TlsContext* TlsContext = NULL; + /*---------------------------------------------------------------------- | TestHttpGet +---------------------------------------------------------------------*/ static void TestHttpGet(const char* arg, bool use_http_1_1, int verbosity) { + const char* method = NPT_HTTP_METHOD_GET; + if (arg && arg[0] == '@') { + method = NPT_HTTP_METHOD_HEAD; + ++arg; + } NPT_HttpUrl url(arg); - NPT_HttpRequest request(url, NPT_HTTP_METHOD_GET); + NPT_HttpRequest request(url, method); NPT_HttpClient client; NPT_HttpResponse* response; if (!url.IsValid()) return; if (use_http_1_1) request.SetProtocol(NPT_HTTP_PROTOCOL_1_1); + if (HttpConnector) client.SetConnector(HttpConnector); NPT_TimeStamp before; NPT_System::GetCurrentTimeStamp(before); @@ -38,15 +47,22 @@ TestHttpGet(const char* arg, bool use_http_1_1, int verbosity) if (NPT_FAILED(result)) { if (verbosity >= 1) printf(LOG_FORMAT, NPT_ResultText(result), 0, 0, 0, (int)elapsed, "", arg); return; - } - NPT_DataBuffer payload; - result = response->GetEntity()->Load(payload); + } int loaded = -1; - if (NPT_SUCCEEDED(result)) { - loaded = (int)payload.GetDataSize(); + if (method != NPT_HTTP_METHOD_HEAD) { + NPT_DataBuffer payload; + result = response->GetEntity()->Load(payload); + if (NPT_SUCCEEDED(result)) { + loaded = (int)payload.GetDataSize(); + } + } else { + loaded = 0; } const NPT_String* server = response->GetHeaders().GetHeaderValue("Server"); - if (verbosity >= 1) printf(LOG_FORMAT, "NPT_SUCCESS", response->GetStatusCode(), loaded, (int)response->GetEntity()->GetContentLength(), (int)elapsed, server?server->GetChars():"", arg); + if (verbosity >= 1) { + NPT_LargeSize entity_size = response->GetEntity()?response->GetEntity()->GetContentLength():0; + printf(LOG_FORMAT, "NPT_SUCCESS", response->GetStatusCode(), loaded, (int)entity_size, (int)elapsed, server?server->GetChars():"", arg); + } delete response; } @@ -200,6 +216,9 @@ main(int argc, char** argv) NPT_ParseInteger(*++argv, verbosity); } else if (NPT_StringsEqual(*argv, "--threads")) { NPT_ParseInteger(*++argv, threads); + } else if (NPT_StringsEqual(*argv, "--no-cert-check")) { + TlsContext = new NPT_TlsContext(NPT_TlsContext::OPTION_VERIFY_LATER | NPT_TlsContext::OPTION_ADD_DEFAULT_TRUST_ANCHORS); + HttpConnector = new NPT_HttpTlsConnector(*TlsContext, NPT_HttpTlsConnector::OPTION_ACCEPT_SELF_SIGNED_CERTS | NPT_HttpTlsConnector::OPTION_ACCEPT_HOSTNAME_MISMATCH); } else { break; } @@ -224,6 +243,9 @@ main(int argc, char** argv) cthreads[i]->Wait(); delete cthreads[i]; } + + delete TlsContext; + delete HttpConnector; return 0; } diff --git a/lib/libUPnP/Neptune/Source/Tests/SharedVariables1/SharedVariablesTest1.cpp b/lib/libUPnP/Neptune/Source/Tests/SharedVariables1/SharedVariablesTest1.cpp new file mode 100644 index 0000000000..7dcff58edf --- /dev/null +++ b/lib/libUPnP/Neptune/Source/Tests/SharedVariables1/SharedVariablesTest1.cpp @@ -0,0 +1,111 @@ +/***************************************************************** +| +| Threads Test Program 1 +| +| (c) 2001-2012 Gilles Boccon-Gibod +| Author: Gilles Boccon-Gibod (bok@bok.net) +| + ****************************************************************/ + +/*---------------------------------------------------------------------- +| includes ++---------------------------------------------------------------------*/ +#include "Neptune.h" + +#if defined(WIN32) && defined(_DEBUG) +#include <crtdbg.h> +#endif + +#define CHECK(x) { \ + if (!(x)) { \ + NPT_Console::OutputF("TEST FAILED line %d\n", __LINE__); \ + NPT_ASSERT(0); \ + } \ +} + +/*---------------------------------------------------------------------- +| SharedVariableThread ++---------------------------------------------------------------------*/ +class SharedVariableThread : public NPT_Thread +{ +public: + SharedVariableThread(int ping, int pong, NPT_SharedVariable& shared, float wait) : + m_Ping(ping), m_Pong(pong), m_Shared(shared), m_Transitions(0), m_Wait(wait), m_Stop(false), m_Result(NPT_SUCCESS) {} + + void Run() { + for (;;) { + if (m_Stop) return; + NPT_Result result = m_Shared.WaitUntilEquals(m_Ping, 1000); + if (result != NPT_SUCCESS) { + NPT_Console::Output("timeout\n"); + m_Result = -1; + return; + } + if (m_Wait != 0.0f) NPT_System::Sleep(m_Wait); + m_Shared.SetValue(m_Pong); + ++m_Transitions; + } + } + + int m_Ping; + int m_Pong; + NPT_SharedVariable& m_Shared; + unsigned long m_Transitions; + float m_Wait; + volatile bool m_Stop; + NPT_Result m_Result; +}; + +/*---------------------------------------------------------------------- +| TestSharedVariables ++---------------------------------------------------------------------*/ +static void +TestSharedVariables() +{ + NPT_SharedVariable shared; + SharedVariableThread t0(1, 2, shared, 0); + SharedVariableThread t1(2, 1, shared, 0.001f); + + t0.Start(); + t1.Start(); + + shared.SetValue(1); + NPT_Result result = t0.Wait(10000); + t0.m_Stop = true; + t1.m_Stop = true; + t1.Wait(); + + NPT_Console::OutputF("T0 transitions=%d, result: %d\n", t0.m_Transitions, t0.m_Result); + NPT_Console::OutputF("T1 transitions=%d, result: %d\n", t1.m_Transitions, t1.m_Result); + + CHECK(t0.m_Result == NPT_SUCCESS); + CHECK(t1.m_Result == NPT_SUCCESS); +} + +/*---------------------------------------------------------------------- +| main ++---------------------------------------------------------------------*/ +int +main(int argc, char** argv) +{ + NPT_COMPILER_UNUSED(argc); + NPT_COMPILER_UNUSED(argv); + +#if defined(WIN32) && defined(_DEBUG) + _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | + _CRTDBG_CHECK_ALWAYS_DF | + _CRTDBG_LEAK_CHECK_DF); +#endif + + TestSharedVariables(); + + NPT_Debug("- program done -\n"); + + return 0; +} + + + + + + diff --git a/lib/libUPnP/Neptune/Source/Tests/Sockets1/SocketsTest1.cpp b/lib/libUPnP/Neptune/Source/Tests/Sockets1/SocketsTest1.cpp index af2dfb5321..1e3ace4d52 100755 --- a/lib/libUPnP/Neptune/Source/Tests/Sockets1/SocketsTest1.cpp +++ b/lib/libUPnP/Neptune/Source/Tests/Sockets1/SocketsTest1.cpp @@ -59,7 +59,7 @@ public: NPT_TcpServerSocket m_Socket; NPT_SharedVariable m_Ready; - bool m_Interrupted; + volatile bool m_Interrupted; }; /*---------------------------------------------------------------------- @@ -114,7 +114,8 @@ main(int /*argc*/, char** /*argv*/) NPT_TcpServerSocket* tcp_server = NULL; CancellerThread* canceller = NULL; - NPT_SocketAddress address(NPT_IpAddress(127,0,0,1), 10000); + NPT_SocketAddress address(NPT_IpAddress(127,0,0,1), 10000); +#if 0 result = RemoteIpAddress.ResolveName("www.google.com"); CHECK(result == NPT_SUCCESS); @@ -175,7 +176,8 @@ main(int /*argc*/, char** /*argv*/) NPT_Console::OutputF("[01] connect returns %d : %s\n", result, NPT_ResultText(result)); CHECK(result == NPT_SUCCESS); delete tcp_client; - +#endif + for (int i=0; i<2; i++) { NPT_Console::OutputF("\n--- test for cancelled connection, shutdown=%d\n", i); address.SetIpAddress(NPT_IpAddress(1,1,1,1)); diff --git a/lib/libUPnP/Neptune/Source/Tests/Threads1/ThreadsTest1.cpp b/lib/libUPnP/Neptune/Source/Tests/Threads1/ThreadsTest1.cpp index 09e5b712e6..260f7a8da6 100644 --- a/lib/libUPnP/Neptune/Source/Tests/Threads1/ThreadsTest1.cpp +++ b/lib/libUPnP/Neptune/Source/Tests/Threads1/ThreadsTest1.cpp @@ -18,7 +18,7 @@ #define CHECK(x) { \ if (!(x)) { \ - printf("TEST FAILED line %d\n", __LINE__); \ + NPT_Console::OutputF("TEST FAILED line %d\n", __LINE__); \ NPT_ASSERT(0); \ } \ } @@ -29,7 +29,9 @@ class Thread1 : public NPT_Thread { public: - virtual ~Thread1() { NPT_Debug("~Thread1\n"); } + virtual ~Thread1() { + NPT_Debug("~Thread1\n"); + } void Run() { NPT_Debug("Thread1::Run - start\n"); @@ -110,7 +112,9 @@ public: class Thread4 : public NPT_Runnable { public: - virtual ~Thread4() { NPT_Debug("~Thread4\n"); } + virtual ~Thread4() { + NPT_Debug("~Thread4\n"); + } void Run() { NPT_Debug("Thread4::Run - start\n"); @@ -200,7 +204,7 @@ Test1() NPT_Debug("+++ waiting for non-detached thread +++\n"); NPT_Result result = thread1->Wait(); CHECK(NPT_SUCCEEDED(result)); - NPT_Debug("+++ deleting for non-detached thread +++\n"); + NPT_Debug("+++ deleting non-detached thread +++\n"); delete thread1; NPT_Debug("+++ done with non-detached thread +++\n"); @@ -217,7 +221,7 @@ Test1() thread1 = new NPT_Thread(runnable); // not detached NPT_Debug("+++ starting non-detached thread +++\n"); thread1->Start(); - NPT_Debug("+++ deleting for non-detached thread +++\n"); + NPT_Debug("+++ deleting non-detached thread +++\n"); delete thread1; NPT_Debug("+++ done with non-detached thread +++\n"); @@ -262,7 +266,7 @@ Test2() NPT_Debug("deleting thread4\n"); delete thread4; - NPT_Debug("deleting for thread1...\n"); + NPT_Debug("deleting thread1...\n"); delete thread1; NPT_Debug("...done\n"); @@ -488,13 +492,13 @@ TestSharedVariables() NPT_System::Sleep(2.0); shared.SetValue(2); - NPT_Result result = t1.Wait(1000); + NPT_Result result = t1.Wait(20000); CHECK(result == NPT_SUCCESS); CHECK(t1.m_Result == NPT_SUCCESS); - result = t2.Wait(1000); + result = t2.Wait(20000); CHECK(result == NPT_SUCCESS); CHECK(t2.m_Result == NPT_SUCCESS); - result = t3.Wait(1000); + result = t3.Wait(20000); CHECK(result == NPT_SUCCESS); CHECK(t3.m_Result == NPT_SUCCESS); } diff --git a/lib/libUPnP/Neptune/Source/Tests/Url1/UrlTest1.cpp b/lib/libUPnP/Neptune/Source/Tests/Url1/UrlTest1.cpp index 8b044bc2dc..5ba2a29229 100644 --- a/lib/libUPnP/Neptune/Source/Tests/Url1/UrlTest1.cpp +++ b/lib/libUPnP/Neptune/Source/Tests/Url1/UrlTest1.cpp @@ -263,6 +263,15 @@ main(int /*argc*/, char** /*argv*/) CHECK(field2 != NULL); CHECK(NPT_UrlQuery::UrlDecode(field2) == "c&5"); + // url query with empty values + NPT_UrlQuery query4("a=1&b&c="); + a_field = query4.GetField("a"); + b_field = query4.GetField("b"); + c_field = query4.GetField("c"); + CHECK(NPT_StringsEqual(a_field, "1")); + CHECK(NPT_StringsEqual(b_field, "")); + CHECK(NPT_StringsEqual(c_field, "")); + printf("--- test done\n"); return 0; diff --git a/lib/libUPnP/Neptune/Source/Tests/Xml1/XmlTest1.cpp b/lib/libUPnP/Neptune/Source/Tests/Xml1/XmlTest1.cpp index 8a81b556cc..0b101eeb83 100644 --- a/lib/libUPnP/Neptune/Source/Tests/Xml1/XmlTest1.cpp +++ b/lib/libUPnP/Neptune/Source/Tests/Xml1/XmlTest1.cpp @@ -277,7 +277,8 @@ TestCanonicalizer() NPT_XmlCanonicalizer canonicalizer; NPT_MemoryStream buffer1; NPT_Result result = canonicalizer.Serialize(*root, buffer1); - + CHECK(result == NPT_SUCCESS); + NPT_String str((const char*)buffer1.GetData(), buffer1.GetDataSize()); NPT_Debug("%s", str.GetChars()); CHECK(str == xml_out); diff --git a/lib/libUPnP/Neptune/ThirdParty/axTLS/config/Win32/config.h b/lib/libUPnP/Neptune/ThirdParty/axTLS/config/Win32/config.h index 133e0befae..d1c0dc3f5c 100644 --- a/lib/libUPnP/Neptune/ThirdParty/axTLS/config/Win32/config.h +++ b/lib/libUPnP/Neptune/ThirdParty/axTLS/config/Win32/config.h @@ -47,7 +47,7 @@ /* #define CONFIG_SSL_MAX_CERTS 8 */ #define CONFIG_SSL_CTX_MUTEXING #undef CONFIG_USE_DEV_URANDOM -#define CONFIG_WIN32_USE_CRYPTO_LIB +#undef CONFIG_WIN32_USE_CRYPTO_LIB /* GBG: removed temporarily */ #define CONFIG_OPENSSL_COMPATIBLE 1 #define CONFIG_PERFORMANCE_TESTING 1 #define CONFIG_SSL_TEST 1 diff --git a/lib/libUPnP/Neptune/ThirdParty/axTLS/crypto/crypto.h b/lib/libUPnP/Neptune/ThirdParty/axTLS/crypto/crypto.h index 04bc7325d4..dbd2223f18 100644 --- a/lib/libUPnP/Neptune/ThirdParty/axTLS/crypto/crypto.h +++ b/lib/libUPnP/Neptune/ThirdParty/axTLS/crypto/crypto.h @@ -214,7 +214,8 @@ void RSA_print(const RSA_CTX *ctx); /************************************************************************** * RNG declarations **************************************************************************/ -EXP_FUNC void STDCALL RNG_initialize(const uint8_t *seed_buf, int size); +EXP_FUNC void STDCALL RNG_initialize(void); +EXP_FUNC void STDCALL RNG_custom_init(const uint8_t *seed_buf, int size); EXP_FUNC void STDCALL RNG_terminate(void); EXP_FUNC void STDCALL get_random(int num_rand_bytes, uint8_t *rand_data); void get_random_NZ(int num_rand_bytes, uint8_t *rand_data); diff --git a/lib/libUPnP/Neptune/ThirdParty/axTLS/crypto/crypto_misc.c b/lib/libUPnP/Neptune/ThirdParty/axTLS/crypto/crypto_misc.c index 6e2086ef6f..c376335ae2 100644 --- a/lib/libUPnP/Neptune/ThirdParty/axTLS/crypto/crypto_misc.c +++ b/lib/libUPnP/Neptune/ThirdParty/axTLS/crypto/crypto_misc.c @@ -42,17 +42,17 @@ #include "wincrypt.h" #endif -#if !defined(WIN32) -#include <sys/time.h> -#endif - -#if !defined(WIN32) && defined(CONFIG_USE_DEV_URANDOM) +#if !defined(WIN32) && defined(CONFIG_USE_DEV_URANDOM) /* GBG modified */ static int rng_fd = -1; #elif defined(CONFIG_WIN32_USE_CRYPTO_LIB) static HCRYPTPROV gCryptProv; #endif -#if (!defined(CONFIG_USE_DEV_URANDOM) && !defined(CONFIG_WIN32_USE_CRYPTO_LIB)) +#if !defined(CONFIG_USE_DEV_URANDOM) && !defined(CONFIG_WIN32_USE_CRYPTO_LIB) && !defined(WIN32) +#include <sys/time.h> /* GBG */ +#endif + +#if !defined(CONFIG_USE_DEV_URANDOM) && !defined(CONFIG_WIN32_USE_CRYPTO_LIB) /* change to processor registers as appropriate */ #define ENTROPY_POOL_SIZE 32 #define ENTROPY_COUNTER1 ((((uint64_t)tv.tv_sec)<<32) | tv.tv_usec) @@ -60,9 +60,32 @@ static HCRYPTPROV gCryptProv; static uint8_t entropy_pool[ENTROPY_POOL_SIZE]; #endif -static int rng_ref_count; const char * const unsupported_str = "Error: Feature not supported\n"; +/* GBG: compatibility layer */ +#if defined(WIN32) && !defined(CONFIG_WIN32_USE_CRYPTO_LIB) +static int _gettimeofday(struct timeval *tv) +{ + if (tv) { + FILETIME ft; + unsigned __int64 tmpres = 0; + + GetSystemTimeAsFileTime(&ft); + + tmpres |= ft.dwHighDateTime; + tmpres <<= 32; + tmpres |= ft.dwLowDateTime; + + tmpres /= 10; + tv->tv_sec = (long)(tmpres / 1000000UL); + tv->tv_usec = (long)(tmpres % 1000000UL); + } + + return 0; +} +#define gettimeofday(x,y) _gettimeofday(x) +#endif + #if 0 /* GBG */ #ifndef CONFIG_SSL_SKELETON_MODE /** @@ -108,47 +131,47 @@ int get_file(const char *filename, uint8_t **buf) * - On Linux use /dev/urandom * - If none of these work then use a custom RNG. */ -EXP_FUNC void STDCALL RNG_initialize(const uint8_t *seed_buf, int size) +EXP_FUNC void STDCALL RNG_initialize() { - (void)size; /* GBG */ - if (rng_ref_count == 0) - { #if !defined(WIN32) && defined(CONFIG_USE_DEV_URANDOM) - rng_fd = ax_open("/dev/urandom", O_RDONLY); + rng_fd = ax_open("/dev/urandom", O_RDONLY); #elif defined(WIN32) && defined(CONFIG_WIN32_USE_CRYPTO_LIB) - if (!CryptAcquireContext(&gCryptProv, - NULL, NULL, PROV_RSA_FULL, 0)) + if (!CryptAcquireContext(&gCryptProv, + NULL, NULL, PROV_RSA_FULL, 0)) + { + if (GetLastError() == NTE_BAD_KEYSET && + !CryptAcquireContext(&gCryptProv, + NULL, + NULL, + PROV_RSA_FULL, + CRYPT_NEWKEYSET)) { - if (GetLastError() == NTE_BAD_KEYSET && - !CryptAcquireContext(&gCryptProv, - NULL, - NULL, - PROV_RSA_FULL, - CRYPT_NEWKEYSET)) - { - /*printf("CryptoLib: %x\n", unsupported_str, GetLastError()); - exit(1);*/ - } + printf("CryptoLib: %x\n", unsupported_str, GetLastError()); + exit(1); } + } #else - int i; - uint32_t seed_addr_val = (uint32_t)(intptr_t)&seed_buf; - uint32_t *ep = (uint32_t *)entropy_pool; - - /* help start the entropy with the user's private key - this is - a number that should be hard to find, due to the fact that it - relies on knowing the private key */ - memcpy(entropy_pool, seed_buf, ENTROPY_POOL_SIZE); - srand((long)entropy_pool); + /* start of with a stack to copy across */ + int i = 0; /* GBG */ + memcpy(entropy_pool, &i, ENTROPY_POOL_SIZE); + srand((unsigned int)&i); +#endif +} - /* mix it up a little with a stack address */ - for (i = 0; i < ENTROPY_POOL_SIZE/4; i++) - ep[i] ^= seed_addr_val; +/** + * If no /dev/urandom, then initialise the RNG with something interesting. + */ +EXP_FUNC void STDCALL RNG_custom_init(const uint8_t *seed_buf, int size) +{ +#if defined(WIN32) || defined(CONFIG_WIN32_USE_CRYPTO_LIB) + int i; + for (i = 0; i < ENTROPY_POOL_SIZE && i < size; i++) + entropy_pool[i] ^= seed_buf[i]; +#else /* GBG */ + (void)seed_buf; + (void)size; #endif - } - - rng_ref_count++; } /** @@ -156,14 +179,11 @@ EXP_FUNC void STDCALL RNG_initialize(const uint8_t *seed_buf, int size) */ EXP_FUNC void STDCALL RNG_terminate(void) { - if (--rng_ref_count == 0) - { #if !defined(WIN32) && defined(CONFIG_USE_DEV_URANDOM) - close(rng_fd); + close(rng_fd); #elif defined(CONFIG_WIN32_USE_CRYPTO_LIB) - CryptReleaseContext(gCryptProv, 0); + CryptReleaseContext(gCryptProv, 0); #endif - } } /** @@ -355,13 +375,16 @@ EXP_FUNC int STDCALL base64_decode(const char *in, int len, y = t = 0; } + + /* check that we don't go past the output buffer */ + if (z > *outlen) + goto error; } if (y != 0) goto error; - if (outlen) - *outlen = z; + *outlen = z; ret = 0; error: diff --git a/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/asn1.c b/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/asn1.c index 9cb68487b4..2ec99d5aca 100644 --- a/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/asn1.c +++ b/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/asn1.c @@ -162,8 +162,8 @@ int asn1_get_private_key(const uint8_t *buf, int len, RSA_CTX **rsa_ctx) return X509_INVALID_PRIV_KEY; } - /* initialise the RNG */ - RNG_initialize(buf, len); + /* Use the private key to mix up the RNG if possible. */ + RNG_custom_init(buf, len); mod_len = asn1_get_int(buf, &offset, &modulus); pub_len = asn1_get_int(buf, &offset, &pub_exp); @@ -300,38 +300,38 @@ end_oid: static int asn1_get_printable_str(const uint8_t *buf, int *offset, char **str) { int len = X509_NOT_OK; - int string_type = buf[*offset]; /* GBG */ + int asn1_type = buf[*offset]; /* some certs have this awful crud in them for some reason */ - if (string_type != ASN1_PRINTABLE_STR && - string_type != ASN1_TELETEX_STR && - string_type != ASN1_IA5_STR && - string_type != ASN1_UNICODE_STR && - string_type != ASN1_UTF8_STR && - string_type != ASN1_UNIVERSAL_STR) + if (asn1_type != ASN1_PRINTABLE_STR && + asn1_type != ASN1_PRINTABLE_STR2 && + asn1_type != ASN1_TELETEX_STR && + asn1_type != ASN1_IA5_STR && + asn1_type != ASN1_UNICODE_STR && + asn1_type != ASN1_UNIVERSAL_STR) goto end_pnt_str; - (*offset)++; - len = get_asn1_length(buf, offset); + (*offset)++; + len = get_asn1_length(buf, offset); - if (string_type == ASN1_UNICODE_STR) - { - int i; - *str = (char *)malloc(len/2+1); /* allow for null */ + if (asn1_type == ASN1_UNICODE_STR) + { + int i; + *str = (char *)malloc(len/2+1); /* allow for null */ - for (i = 0; i < len; i += 2) - (*str)[i/2] = buf[*offset + i + 1]; + for (i = 0; i < len; i += 2) + (*str)[i/2] = buf[*offset + i + 1]; - (*str)[len/2] = 0; /* null terminate */ - } - else - { - *str = (char *)malloc(len+1); /* allow for null */ - memcpy(*str, &buf[*offset], len); - (*str)[len] = 0; /* null terminate */ - } + (*str)[len/2] = 0; /* null terminate */ + } + else + { + *str = (char *)malloc(len+1); /* allow for null */ + memcpy(*str, &buf[*offset], len); + (*str)[len] = 0; /* null terminate */ + } - *offset += len; + *offset += len; end_pnt_str: return len; @@ -390,7 +390,7 @@ asn1_oid_to_string(const uint8_t *oid, int len) /* other values */ { - unsigned long value = 0; + unsigned int /* GBG long */ value = 0; for (i=1; i<len; i++) { value = (value<<7) + (oid[i]&0x7F); if ((oid[i]&0x80) == 0) { diff --git a/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/crypto_misc.h b/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/crypto_misc.h index a3e1146761..f868252d93 100644 --- a/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/crypto_misc.h +++ b/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/crypto_misc.h @@ -112,8 +112,8 @@ const char * x509_display_error(int error); #define ASN1_BIT_STRING 0x03 #define ASN1_OCTET_STRING 0x04 #define ASN1_NULL 0x05 +#define ASN1_PRINTABLE_STR2 0x0C #define ASN1_OID 0x06 -#define ASN1_UTF8_STR 0x0C /* GBG */ #define ASN1_UNIVERSAL_STR 0x1C /* GBG */ #define ASN1_PRINTABLE_STR 0x13 #define ASN1_TELETEX_STR 0x14 diff --git a/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/loader.c b/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/loader.c index 3e856a2731..eb6ec09919 100644 --- a/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/loader.c +++ b/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/loader.c @@ -319,6 +319,7 @@ static int new_pem_obj(SSL_CTX *ssl_ctx, int is_cacert, char *where, /* 4/3 bigger than what we need but so what */ ssl_obj->buf = (uint8_t *)calloc(1, pem_size); + ssl_obj->len = pem_size; if (i == IS_RSA_PRIVATE_KEY && strstr(start, "Proc-Type:") && @@ -331,11 +332,15 @@ static int new_pem_obj(SSL_CTX *ssl_ctx, int is_cacert, char *where, goto error; } } - else if (base64_decode(start, pem_size, - ssl_obj->buf, &ssl_obj->len) != 0) + else { - ret = SSL_ERROR_BAD_CERTIFICATE; - goto error; + ssl_obj->len = pem_size; + if (base64_decode(start, pem_size, + ssl_obj->buf, &ssl_obj->len) != 0) + { + ret = SSL_ERROR_BAD_CERTIFICATE; + goto error; + } } switch (i) diff --git a/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/tls1.c b/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/tls1.c index dbeb9197bf..d8eaf94972 100755 --- a/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/tls1.c +++ b/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/tls1.c @@ -154,8 +154,11 @@ static void add_hmac_digest(SSL *ssl, int snd, uint8_t *hmac_header, const uint8_t *buf, int buf_len, uint8_t *hmac_buf); /* win32 VC6.0 doesn't have variadic macros */ -/*#if defined(WIN32) && !defined(CONFIG_SSL_FULL_MODE)*/ -#if 1 +/* GBG added +//#if defined(WIN32) && !defined(CONFIG_SSL_FULL_MODE) +//void DISPLAY_BYTES(SSL *ssl, const char *format, +// const uint8_t *data, int size, ...) {} +//#endif */ void DISPLAY_BYTES(SSL *ssl, const char *format, const uint8_t *data, int size, ...) { (void)ssl; @@ -163,7 +166,7 @@ void DISPLAY_BYTES(SSL *ssl, const char *format, (void)data; (void)size; } -#endif +/* /GBG */ /** * Establish a new client/server context. @@ -172,6 +175,7 @@ EXP_FUNC SSL_CTX *STDCALL ssl_ctx_new(uint32_t options, int num_sessions) { SSL_CTX *ssl_ctx = (SSL_CTX *)calloc(1, sizeof (SSL_CTX)); ssl_ctx->options = options; + RNG_initialize(); #if 0 /* GBG: no automatic cert loading */ if (load_key_certs(ssl_ctx) < 0) @@ -302,10 +306,9 @@ EXP_FUNC int STDCALL ssl_read(SSL *ssl, uint8_t **in_data) int ret = basic_read(ssl, in_data); /* check for return code so we can send an alert */ - if (ret < SSL_OK) + if (ret < SSL_OK && ret != SSL_CLOSE_NOTIFY) { if (ret != SSL_ERROR_CONN_LOST && - ret != SSL_CLOSE_NOTIFY && ret != SSL_ERROR_TIMEOUT && /* GBG */ ret != SSL_ERROR_EOS /* GBG */ ) { @@ -408,9 +411,8 @@ error: */ int add_cert_auth(SSL_CTX *ssl_ctx, const uint8_t *buf, int len) { - int ret = SSL_ERROR_NO_CERT_DEFINED; + int ret = SSL_OK; /* ignore errors for now */ int i = 0; - int offset; CA_CERT_CTX *ca_cert_ctx; if (ssl_ctx->ca_cert_ctx == NULL) @@ -421,28 +423,33 @@ int add_cert_auth(SSL_CTX *ssl_ctx, const uint8_t *buf, int len) while (i < CONFIG_X509_MAX_CA_CERTS && ca_cert_ctx->cert[i]) i++; - if (i >= CONFIG_X509_MAX_CA_CERTS) + while (len > 0) { + int offset; + if (i >= CONFIG_X509_MAX_CA_CERTS) + { #ifdef CONFIG_SSL_FULL_MODE - printf("Error: maximum number of CA certs added - change of " - "compile-time configuration required\n"); + printf("Error: maximum number of CA certs added (%d) - change of " + "compile-time configuration required\n", + CONFIG_X509_MAX_CA_CERTS); #endif - goto error; - } + break; + } - if ((ret = x509_new(buf, &offset, &ca_cert_ctx->cert[i]))) { - ret = SSL_X509_ERROR(ret); /* GBG */ - goto error; - } - len -= offset; - ret = SSL_OK; /* ok so far */ + /* ignore the return code */ + if (x509_new(buf, &offset, &ca_cert_ctx->cert[i]) == X509_OK) + { +#if defined (CONFIG_SSL_FULL_MODE) + if (ssl_ctx->options & SSL_DISPLAY_CERTS) + x509_print(ca_cert_ctx->cert[i], NULL); +#endif + } - /* recurse? */ - if (len > 0) - ret = add_cert_auth(ssl_ctx, &buf[offset], len); + i++; + len -= offset; + } -error: return ret; } #else /* GBG */ @@ -742,7 +749,7 @@ static void add_hmac_digest(SSL *ssl, int mode, uint8_t *hmac_header, ssl->cipher_info->digest_size, hmac_buf); #if 0 - print_blob("record", ssl->hmac_tx, SSL_RECORD_SIZE); + print_blob("record", hmac_header, SSL_RECORD_SIZE); print_blob("buf", buf, buf_len); if (mode == SSL_SERVER_WRITE || mode == SSL_CLIENT_WRITE) { @@ -1135,7 +1142,6 @@ int send_packet(SSL *ssl, uint8_t protocol, const uint8_t *in, int length) /* add the explicit IV for TLS1.1 */ if (ssl->version >= SSL_PROTOCOL_VERSION1_1 && ssl->cipher_info->iv_size) - { uint8_t iv_size = ssl->cipher_info->iv_size; uint8_t *t_buf = alloca(msg_length + iv_size); @@ -1195,7 +1201,7 @@ static int set_key_block(SSL *ssl, int is_write) ssl->dc->master_secret, ssl->dc->key_block, ciph_info->key_block_size); #if 0 - print_blob("keyblock", ssl->key_block, ciph_info->key_block_size); + print_blob("keyblock", ssl->dc->key_block, ciph_info->key_block_size); #endif } @@ -1732,8 +1738,10 @@ SSL_SESSION *ssl_session_update(int max_sessions, SSL_SESSION *ssl_sessions[], { if (ssl_sessions[i]) { - /* kill off any expired sessions */ - if (tm > ssl_sessions[i]->conn_time + SSL_EXPIRY_TIME) + /* kill off any expired sessions (including those in + the future) */ + if ((tm > ssl_sessions[i]->conn_time + SSL_EXPIRY_TIME) || + (tm < ssl_sessions[i]->conn_time)) { session_free(ssl_sessions, i); continue; @@ -1777,13 +1785,9 @@ SSL_SESSION *ssl_session_update(int max_sessions, SSL_SESSION *ssl_sessions[], } /* ok, we've used up all of our sessions. So blow the oldest session away */ - if (oldest_sess != NULL) - { - oldest_sess->conn_time = tm; - memset(oldest_sess->session_id, 0, sizeof(SSL_SESSION_ID_SIZE)); - memset(oldest_sess->master_secret, 0, sizeof(SSL_SECRET_SIZE)); - } - + oldest_sess->conn_time = tm; + memset(oldest_sess->session_id, 0, sizeof(SSL_SESSION_ID_SIZE)); + memset(oldest_sess->master_secret, 0, sizeof(SSL_SECRET_SIZE)); SSL_CTX_UNLOCK(ssl->ssl_ctx->mutex); return oldest_sess; } diff --git a/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/tls1_svr.c b/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/tls1_svr.c index 9b86b959cc..b252311471 100644 --- a/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/tls1_svr.c +++ b/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/tls1_svr.c @@ -118,12 +118,12 @@ int do_svr_handshake(SSL *ssl, int handshake_type, uint8_t *buf, int hs_len) static int process_client_hello(SSL *ssl) { uint8_t *buf = ssl->bm_data; - uint8_t *record_buf = ssl->hmac_header; + /* GBG: removed - uint8_t *record_buf = ssl->hmac_header; */ int pkt_size = ssl->bm_index; int i, j, cs_len, id_len, offset = 6 + SSL_RANDOM_SIZE; int ret = SSL_OK; - uint8_t version = (record_buf[1] << 4) + record_buf[2]; + uint8_t version = (buf[4] << 4) + buf[5]; ssl->version = ssl->client_version = version; if (version > SSL_PROTOCOL_VERSION_MAX) diff --git a/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/version.h b/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/version.h index cc1ddb2379..e8158cc0d9 100644 --- a/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/version.h +++ b/lib/libUPnP/Neptune/ThirdParty/axTLS/ssl/version.h @@ -1 +1 @@ -#define AXTLS_VERSION "1.4.4" +#define AXTLS_VERSION "1.4.9" diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/README b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/README new file mode 100644 index 0000000000..5ca9d127ed --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/README @@ -0,0 +1,115 @@ +ZLIB DATA COMPRESSION LIBRARY + +zlib 1.2.8 is a general purpose data compression library. All the code is +thread safe. The data format used by the zlib library is described by RFCs +(Request for Comments) 1950 to 1952 in the files +http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and +rfc1952 (gzip format). + +All functions of the compression library are documented in the file zlib.h +(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example +of the library is given in the file test/example.c which also tests that +the library is working correctly. Another example is given in the file +test/minigzip.c. The compression library itself is composed of all source +files in the root directory. + +To compile all files and run the test program, follow the instructions given at +the top of Makefile.in. In short "./configure; make test", and if that goes +well, "make install" should work for most flavors of Unix. For Windows, use +one of the special makefiles in win32/ or contrib/vstudio/ . For VMS, use +make_vms.com. + +Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant +<info@winimage.com> for the Windows DLL version. The zlib home page is +http://zlib.net/ . Before reporting a problem, please check this site to +verify that you have the latest version of zlib; otherwise get the latest +version and check whether the problem still exists or not. + +PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help. + +Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997 +issue of Dr. Dobb's Journal; a copy of the article is available at +http://marknelson.us/1997/01/01/zlib-engine/ . + +The changes made in version 1.2.8 are documented in the file ChangeLog. + +Unsupported third party contributions are provided in directory contrib/ . + +zlib is available in Java using the java.util.zip package, documented at +http://java.sun.com/developer/technicalArticles/Programming/compression/ . + +A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available +at CPAN (Comprehensive Perl Archive Network) sites, including +http://search.cpan.org/~pmqs/IO-Compress-Zlib/ . + +A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is +available in Python 1.5 and later versions, see +http://docs.python.org/library/zlib.html . + +zlib is built into tcl: http://wiki.tcl.tk/4610 . + +An experimental package to read and write files in .zip format, written on top +of zlib by Gilles Vollant <info@winimage.com>, is available in the +contrib/minizip directory of zlib. + + +Notes for some targets: + +- For Windows DLL versions, please see win32/DLL_FAQ.txt + +- For 64-bit Irix, deflate.c must be compiled without any optimization. With + -O, one libpng test fails. The test works in 32 bit mode (with the -n32 + compiler flag). The compiler bug has been reported to SGI. + +- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works + when compiled with cc. + +- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is + necessary to get gzprintf working correctly. This is done by configure. + +- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with + other compilers. Use "make test" to check your compiler. + +- gzdopen is not supported on RISCOS or BEOS. + +- For PalmOs, see http://palmzlib.sourceforge.net/ + + +Acknowledgments: + + The deflate format used by zlib was defined by Phil Katz. The deflate and + zlib specifications were written by L. Peter Deutsch. Thanks to all the + people who reported problems and suggested various improvements in zlib; they + are too numerous to cite here. + +Copyright notice: + + (C) 1995-2013 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + +If you use the zlib library in a product, we would appreciate *not* receiving +lengthy legal documents to sign. The sources are provided for free but without +warranty of any kind. The library has been entirely written by Jean-loup +Gailly and Mark Adler; it does not include third-party code. + +If you redistribute modified sources, we would appreciate that you include in +the file ChangeLog history information documenting your changes. Please read +the FAQ for more information on the distribution of modified source versions. diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/adler32.c b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/adler32.c new file mode 100644 index 0000000000..a868f073d8 --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/adler32.c @@ -0,0 +1,179 @@ +/* adler32.c -- compute the Adler-32 checksum of a data stream + * Copyright (C) 1995-2011 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#include "zutil.h" + +#define local static + +local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); + +#define BASE 65521 /* largest prime smaller than 65536 */ +#define NMAX 5552 +/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ + +#define DO1(buf,i) {adler += (buf)[i]; sum2 += adler;} +#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); +#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); +#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); +#define DO16(buf) DO8(buf,0); DO8(buf,8); + +/* use NO_DIVIDE if your processor does not do division in hardware -- + try it both ways to see which is faster */ +#ifdef NO_DIVIDE +/* note that this assumes BASE is 65521, where 65536 % 65521 == 15 + (thank you to John Reiser for pointing this out) */ +# define CHOP(a) \ + do { \ + unsigned long tmp = a >> 16; \ + a &= 0xffffUL; \ + a += (tmp << 4) - tmp; \ + } while (0) +# define MOD28(a) \ + do { \ + CHOP(a); \ + if (a >= BASE) a -= BASE; \ + } while (0) +# define MOD(a) \ + do { \ + CHOP(a); \ + MOD28(a); \ + } while (0) +# define MOD63(a) \ + do { /* this assumes a is not negative */ \ + z_off64_t tmp = a >> 32; \ + a &= 0xffffffffL; \ + a += (tmp << 8) - (tmp << 5) + tmp; \ + tmp = a >> 16; \ + a &= 0xffffL; \ + a += (tmp << 4) - tmp; \ + tmp = a >> 16; \ + a &= 0xffffL; \ + a += (tmp << 4) - tmp; \ + if (a >= BASE) a -= BASE; \ + } while (0) +#else +# define MOD(a) a %= BASE +# define MOD28(a) a %= BASE +# define MOD63(a) a %= BASE +#endif + +/* ========================================================================= */ +uLong ZEXPORT adler32(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +{ + unsigned long sum2; + unsigned n; + + /* split Adler-32 into component sums */ + sum2 = (adler >> 16) & 0xffff; + adler &= 0xffff; + + /* in case user likes doing a byte at a time, keep it fast */ + if (len == 1) { + adler += buf[0]; + if (adler >= BASE) + adler -= BASE; + sum2 += adler; + if (sum2 >= BASE) + sum2 -= BASE; + return adler | (sum2 << 16); + } + + /* initial Adler-32 value (deferred check for len == 1 speed) */ + if (buf == Z_NULL) + return 1L; + + /* in case short lengths are provided, keep it somewhat fast */ + if (len < 16) { + while (len--) { + adler += *buf++; + sum2 += adler; + } + if (adler >= BASE) + adler -= BASE; + MOD28(sum2); /* only added so many BASE's */ + return adler | (sum2 << 16); + } + + /* do length NMAX blocks -- requires just one modulo operation */ + while (len >= NMAX) { + len -= NMAX; + n = NMAX / 16; /* NMAX is divisible by 16 */ + do { + DO16(buf); /* 16 sums unrolled */ + buf += 16; + } while (--n); + MOD(adler); + MOD(sum2); + } + + /* do remaining bytes (less than NMAX, still just one modulo) */ + if (len) { /* avoid modulos if none remaining */ + while (len >= 16) { + len -= 16; + DO16(buf); + buf += 16; + } + while (len--) { + adler += *buf++; + sum2 += adler; + } + MOD(adler); + MOD(sum2); + } + + /* return recombined sums */ + return adler | (sum2 << 16); +} + +/* ========================================================================= */ +local uLong adler32_combine_(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off64_t len2; +{ + unsigned long sum1; + unsigned long sum2; + unsigned rem; + + /* for negative len, return invalid adler32 as a clue for debugging */ + if (len2 < 0) + return 0xffffffffUL; + + /* the derivation of this formula is left as an exercise for the reader */ + MOD63(len2); /* assumes len2 >= 0 */ + rem = (unsigned)len2; + sum1 = adler1 & 0xffff; + sum2 = rem * sum1; + MOD(sum2); + sum1 += (adler2 & 0xffff) + BASE - 1; + sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; + if (sum1 >= BASE) sum1 -= BASE; + if (sum1 >= BASE) sum1 -= BASE; + if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); + if (sum2 >= BASE) sum2 -= BASE; + return sum1 | (sum2 << 16); +} + +/* ========================================================================= */ +uLong ZEXPORT adler32_combine(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off_t len2; +{ + return adler32_combine_(adler1, adler2, len2); +} + +uLong ZEXPORT adler32_combine64(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off64_t len2; +{ + return adler32_combine_(adler1, adler2, len2); +} diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/compress.c b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/compress.c new file mode 100644 index 0000000000..6e9762676a --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/compress.c @@ -0,0 +1,80 @@ +/* compress.c -- compress a memory buffer + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#define ZLIB_INTERNAL +#include "zlib.h" + +/* =========================================================================== + Compresses the source buffer into the destination buffer. The level + parameter has the same meaning as in deflateInit. sourceLen is the byte + length of the source buffer. Upon entry, destLen is the total size of the + destination buffer, which must be at least 0.1% larger than sourceLen plus + 12 bytes. Upon exit, destLen is the actual size of the compressed buffer. + + compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. +*/ +int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) + Bytef *dest; + uLongf *destLen; + const Bytef *source; + uLong sourceLen; + int level; +{ + z_stream stream; + int err; + + stream.next_in = (z_const Bytef *)source; + stream.avail_in = (uInt)sourceLen; +#ifdef MAXSEG_64K + /* Check for source > 64K on 16-bit machine: */ + if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; +#endif + stream.next_out = dest; + stream.avail_out = (uInt)*destLen; + if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; + + stream.zalloc = (alloc_func)0; + stream.zfree = (free_func)0; + stream.opaque = (voidpf)0; + + err = deflateInit(&stream, level); + if (err != Z_OK) return err; + + err = deflate(&stream, Z_FINISH); + if (err != Z_STREAM_END) { + deflateEnd(&stream); + return err == Z_OK ? Z_BUF_ERROR : err; + } + *destLen = stream.total_out; + + err = deflateEnd(&stream); + return err; +} + +/* =========================================================================== + */ +int ZEXPORT compress (dest, destLen, source, sourceLen) + Bytef *dest; + uLongf *destLen; + const Bytef *source; + uLong sourceLen; +{ + return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION); +} + +/* =========================================================================== + If the default memLevel or windowBits for deflateInit() is changed, then + this function needs to be updated. + */ +uLong ZEXPORT compressBound (sourceLen) + uLong sourceLen; +{ + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + + (sourceLen >> 25) + 13; +} diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/crc32.c b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/crc32.c new file mode 100644 index 0000000000..979a7190a3 --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/crc32.c @@ -0,0 +1,425 @@ +/* crc32.c -- compute the CRC-32 of a data stream + * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + * + * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster + * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing + * tables for updating the shift register in one step with three exclusive-ors + * instead of four steps with four exclusive-ors. This results in about a + * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3. + */ + +/* @(#) $Id$ */ + +/* + Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore + protection on the static variables used to control the first-use generation + of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should + first call get_crc_table() to initialize the tables before allowing more than + one thread to use crc32(). + + DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h. + */ + +#ifdef MAKECRCH +# include <stdio.h> +# ifndef DYNAMIC_CRC_TABLE +# define DYNAMIC_CRC_TABLE +# endif /* !DYNAMIC_CRC_TABLE */ +#endif /* MAKECRCH */ + +#include "zutil.h" /* for STDC and FAR definitions */ + +#define local static + +/* Definitions for doing the crc four data bytes at a time. */ +#if !defined(NOBYFOUR) && defined(Z_U4) +# define BYFOUR +#endif +#ifdef BYFOUR + local unsigned long crc32_little OF((unsigned long, + const unsigned char FAR *, unsigned)); + local unsigned long crc32_big OF((unsigned long, + const unsigned char FAR *, unsigned)); +# define TBLS 8 +#else +# define TBLS 1 +#endif /* BYFOUR */ + +/* Local functions for crc concatenation */ +local unsigned long gf2_matrix_times OF((unsigned long *mat, + unsigned long vec)); +local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat)); +local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2)); + + +#ifdef DYNAMIC_CRC_TABLE + +local volatile int crc_table_empty = 1; +local z_crc_t FAR crc_table[TBLS][256]; +local void make_crc_table OF((void)); +#ifdef MAKECRCH + local void write_table OF((FILE *, const z_crc_t FAR *)); +#endif /* MAKECRCH */ +/* + Generate tables for a byte-wise 32-bit CRC calculation on the polynomial: + x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1. + + Polynomials over GF(2) are represented in binary, one bit per coefficient, + with the lowest powers in the most significant bit. Then adding polynomials + is just exclusive-or, and multiplying a polynomial by x is a right shift by + one. If we call the above polynomial p, and represent a byte as the + polynomial q, also with the lowest power in the most significant bit (so the + byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p, + where a mod b means the remainder after dividing a by b. + + This calculation is done using the shift-register method of multiplying and + taking the remainder. The register is initialized to zero, and for each + incoming bit, x^32 is added mod p to the register if the bit is a one (where + x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by + x (which is shifting right by one and adding x^32 mod p if the bit shifted + out is a one). We start with the highest power (least significant bit) of + q and repeat for all eight bits of q. + + The first table is simply the CRC of all possible eight bit values. This is + all the information needed to generate CRCs on data a byte at a time for all + combinations of CRC register values and incoming bytes. The remaining tables + allow for word-at-a-time CRC calculation for both big-endian and little- + endian machines, where a word is four bytes. +*/ +local void make_crc_table() +{ + z_crc_t c; + int n, k; + z_crc_t poly; /* polynomial exclusive-or pattern */ + /* terms of polynomial defining this crc (except x^32): */ + static volatile int first = 1; /* flag to limit concurrent making */ + static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26}; + + /* See if another task is already doing this (not thread-safe, but better + than nothing -- significantly reduces duration of vulnerability in + case the advice about DYNAMIC_CRC_TABLE is ignored) */ + if (first) { + first = 0; + + /* make exclusive-or pattern from polynomial (0xedb88320UL) */ + poly = 0; + for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++) + poly |= (z_crc_t)1 << (31 - p[n]); + + /* generate a crc for every 8-bit value */ + for (n = 0; n < 256; n++) { + c = (z_crc_t)n; + for (k = 0; k < 8; k++) + c = c & 1 ? poly ^ (c >> 1) : c >> 1; + crc_table[0][n] = c; + } + +#ifdef BYFOUR + /* generate crc for each value followed by one, two, and three zeros, + and then the byte reversal of those as well as the first table */ + for (n = 0; n < 256; n++) { + c = crc_table[0][n]; + crc_table[4][n] = ZSWAP32(c); + for (k = 1; k < 4; k++) { + c = crc_table[0][c & 0xff] ^ (c >> 8); + crc_table[k][n] = c; + crc_table[k + 4][n] = ZSWAP32(c); + } + } +#endif /* BYFOUR */ + + crc_table_empty = 0; + } + else { /* not first */ + /* wait for the other guy to finish (not efficient, but rare) */ + while (crc_table_empty) + ; + } + +#ifdef MAKECRCH + /* write out CRC tables to crc32.h */ + { + FILE *out; + + out = fopen("crc32.h", "w"); + if (out == NULL) return; + fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n"); + fprintf(out, " * Generated automatically by crc32.c\n */\n\n"); + fprintf(out, "local const z_crc_t FAR "); + fprintf(out, "crc_table[TBLS][256] =\n{\n {\n"); + write_table(out, crc_table[0]); +# ifdef BYFOUR + fprintf(out, "#ifdef BYFOUR\n"); + for (k = 1; k < 8; k++) { + fprintf(out, " },\n {\n"); + write_table(out, crc_table[k]); + } + fprintf(out, "#endif\n"); +# endif /* BYFOUR */ + fprintf(out, " }\n};\n"); + fclose(out); + } +#endif /* MAKECRCH */ +} + +#ifdef MAKECRCH +local void write_table(out, table) + FILE *out; + const z_crc_t FAR *table; +{ + int n; + + for (n = 0; n < 256; n++) + fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ", + (unsigned long)(table[n]), + n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", ")); +} +#endif /* MAKECRCH */ + +#else /* !DYNAMIC_CRC_TABLE */ +/* ======================================================================== + * Tables of CRC-32s of all single-byte values, made by make_crc_table(). + */ +#include "crc32.h" +#endif /* DYNAMIC_CRC_TABLE */ + +/* ========================================================================= + * This function can be used by asm versions of crc32() + */ +const z_crc_t FAR * ZEXPORT get_crc_table() +{ +#ifdef DYNAMIC_CRC_TABLE + if (crc_table_empty) + make_crc_table(); +#endif /* DYNAMIC_CRC_TABLE */ + return (const z_crc_t FAR *)crc_table; +} + +/* ========================================================================= */ +#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8) +#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 + +/* ========================================================================= */ +unsigned long ZEXPORT crc32(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + uInt len; +{ + if (buf == Z_NULL) return 0UL; + +#ifdef DYNAMIC_CRC_TABLE + if (crc_table_empty) + make_crc_table(); +#endif /* DYNAMIC_CRC_TABLE */ + +#ifdef BYFOUR + if (sizeof(void *) == sizeof(ptrdiff_t)) { + z_crc_t endian; + + endian = 1; + if (*((unsigned char *)(&endian))) + return crc32_little(crc, buf, len); + else + return crc32_big(crc, buf, len); + } +#endif /* BYFOUR */ + crc = crc ^ 0xffffffffUL; + while (len >= 8) { + DO8; + len -= 8; + } + if (len) do { + DO1; + } while (--len); + return crc ^ 0xffffffffUL; +} + +#ifdef BYFOUR + +/* ========================================================================= */ +#define DOLIT4 c ^= *buf4++; \ + c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \ + crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24] +#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4 + +/* ========================================================================= */ +local unsigned long crc32_little(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + unsigned len; +{ + register z_crc_t c; + register const z_crc_t FAR *buf4; + + c = (z_crc_t)crc; + c = ~c; + while (len && ((ptrdiff_t)buf & 3)) { + c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); + len--; + } + + buf4 = (const z_crc_t FAR *)(const void FAR *)buf; + while (len >= 32) { + DOLIT32; + len -= 32; + } + while (len >= 4) { + DOLIT4; + len -= 4; + } + buf = (const unsigned char FAR *)buf4; + + if (len) do { + c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); + } while (--len); + c = ~c; + return (unsigned long)c; +} + +/* ========================================================================= */ +#define DOBIG4 c ^= *++buf4; \ + c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \ + crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24] +#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 + +/* ========================================================================= */ +local unsigned long crc32_big(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + unsigned len; +{ + register z_crc_t c; + register const z_crc_t FAR *buf4; + + c = ZSWAP32((z_crc_t)crc); + c = ~c; + while (len && ((ptrdiff_t)buf & 3)) { + c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); + len--; + } + + buf4 = (const z_crc_t FAR *)(const void FAR *)buf; + buf4--; + while (len >= 32) { + DOBIG32; + len -= 32; + } + while (len >= 4) { + DOBIG4; + len -= 4; + } + buf4++; + buf = (const unsigned char FAR *)buf4; + + if (len) do { + c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); + } while (--len); + c = ~c; + return (unsigned long)(ZSWAP32(c)); +} + +#endif /* BYFOUR */ + +#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */ + +/* ========================================================================= */ +local unsigned long gf2_matrix_times(mat, vec) + unsigned long *mat; + unsigned long vec; +{ + unsigned long sum; + + sum = 0; + while (vec) { + if (vec & 1) + sum ^= *mat; + vec >>= 1; + mat++; + } + return sum; +} + +/* ========================================================================= */ +local void gf2_matrix_square(square, mat) + unsigned long *square; + unsigned long *mat; +{ + int n; + + for (n = 0; n < GF2_DIM; n++) + square[n] = gf2_matrix_times(mat, mat[n]); +} + +/* ========================================================================= */ +local uLong crc32_combine_(crc1, crc2, len2) + uLong crc1; + uLong crc2; + z_off64_t len2; +{ + int n; + unsigned long row; + unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */ + unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */ + + /* degenerate case (also disallow negative lengths) */ + if (len2 <= 0) + return crc1; + + /* put operator for one zero bit in odd */ + odd[0] = 0xedb88320UL; /* CRC-32 polynomial */ + row = 1; + for (n = 1; n < GF2_DIM; n++) { + odd[n] = row; + row <<= 1; + } + + /* put operator for two zero bits in even */ + gf2_matrix_square(even, odd); + + /* put operator for four zero bits in odd */ + gf2_matrix_square(odd, even); + + /* apply len2 zeros to crc1 (first square will put the operator for one + zero byte, eight zero bits, in even) */ + do { + /* apply zeros operator for this bit of len2 */ + gf2_matrix_square(even, odd); + if (len2 & 1) + crc1 = gf2_matrix_times(even, crc1); + len2 >>= 1; + + /* if no more bits set, then done */ + if (len2 == 0) + break; + + /* another iteration of the loop with odd and even swapped */ + gf2_matrix_square(odd, even); + if (len2 & 1) + crc1 = gf2_matrix_times(odd, crc1); + len2 >>= 1; + + /* if no more bits set, then done */ + } while (len2 != 0); + + /* return combined crc */ + crc1 ^= crc2; + return crc1; +} + +/* ========================================================================= */ +uLong ZEXPORT crc32_combine(crc1, crc2, len2) + uLong crc1; + uLong crc2; + z_off_t len2; +{ + return crc32_combine_(crc1, crc2, len2); +} + +uLong ZEXPORT crc32_combine64(crc1, crc2, len2) + uLong crc1; + uLong crc2; + z_off64_t len2; +{ + return crc32_combine_(crc1, crc2, len2); +} diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/crc32.h b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/crc32.h new file mode 100644 index 0000000000..9e0c778102 --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/crc32.h @@ -0,0 +1,441 @@ +/* crc32.h -- tables for rapid CRC calculation + * Generated automatically by crc32.c + */ + +local const z_crc_t FAR crc_table[TBLS][256] = +{ + { + 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, + 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL, + 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL, + 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL, + 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL, + 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL, + 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL, + 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL, + 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL, + 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL, + 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL, + 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL, + 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL, + 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL, + 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL, + 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL, + 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL, + 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL, + 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL, + 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL, + 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL, + 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL, + 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL, + 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL, + 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL, + 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL, + 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL, + 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL, + 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL, + 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL, + 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL, + 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL, + 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL, + 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL, + 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL, + 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL, + 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL, + 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL, + 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL, + 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL, + 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL, + 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL, + 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL, + 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL, + 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL, + 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL, + 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL, + 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL, + 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL, + 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, + 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, + 0x2d02ef8dUL +#ifdef BYFOUR + }, + { + 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL, + 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL, + 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL, + 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL, + 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL, + 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL, + 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL, + 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL, + 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL, + 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL, + 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL, + 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL, + 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL, + 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL, + 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL, + 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL, + 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL, + 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL, + 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL, + 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL, + 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL, + 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL, + 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL, + 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL, + 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL, + 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL, + 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL, + 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL, + 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL, + 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL, + 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL, + 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL, + 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL, + 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL, + 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL, + 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL, + 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL, + 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL, + 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL, + 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL, + 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL, + 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL, + 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL, + 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL, + 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL, + 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL, + 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL, + 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL, + 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL, + 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL, + 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL, + 0x9324fd72UL + }, + { + 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL, + 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL, + 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL, + 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL, + 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL, + 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL, + 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL, + 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL, + 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL, + 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL, + 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL, + 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL, + 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL, + 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL, + 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL, + 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL, + 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL, + 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL, + 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL, + 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL, + 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL, + 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL, + 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL, + 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL, + 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL, + 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL, + 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL, + 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL, + 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL, + 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL, + 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL, + 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL, + 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL, + 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL, + 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL, + 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL, + 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL, + 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL, + 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL, + 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL, + 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL, + 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL, + 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL, + 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL, + 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL, + 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL, + 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL, + 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL, + 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL, + 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL, + 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL, + 0xbe9834edUL + }, + { + 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL, + 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL, + 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL, + 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL, + 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL, + 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL, + 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL, + 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL, + 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL, + 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL, + 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL, + 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL, + 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL, + 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL, + 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL, + 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL, + 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL, + 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL, + 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL, + 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL, + 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL, + 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL, + 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL, + 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL, + 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL, + 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL, + 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL, + 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL, + 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL, + 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL, + 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL, + 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL, + 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL, + 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL, + 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL, + 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL, + 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL, + 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL, + 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL, + 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL, + 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL, + 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL, + 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL, + 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL, + 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL, + 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL, + 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL, + 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL, + 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL, + 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL, + 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL, + 0xde0506f1UL + }, + { + 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL, + 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL, + 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL, + 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL, + 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL, + 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL, + 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL, + 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL, + 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL, + 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL, + 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL, + 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL, + 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL, + 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL, + 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL, + 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL, + 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL, + 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL, + 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL, + 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL, + 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL, + 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL, + 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL, + 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL, + 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL, + 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL, + 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL, + 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL, + 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL, + 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL, + 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL, + 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL, + 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL, + 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL, + 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL, + 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL, + 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL, + 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL, + 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL, + 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL, + 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL, + 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL, + 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL, + 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL, + 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL, + 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL, + 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL, + 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL, + 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL, + 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL, + 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL, + 0x8def022dUL + }, + { + 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL, + 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL, + 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL, + 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL, + 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL, + 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL, + 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL, + 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL, + 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL, + 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL, + 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL, + 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL, + 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL, + 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL, + 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL, + 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL, + 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL, + 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL, + 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL, + 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL, + 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL, + 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL, + 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL, + 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL, + 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL, + 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL, + 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL, + 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL, + 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL, + 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL, + 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL, + 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL, + 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL, + 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL, + 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL, + 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL, + 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL, + 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL, + 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL, + 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL, + 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL, + 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL, + 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL, + 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL, + 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL, + 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL, + 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL, + 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL, + 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL, + 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL, + 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL, + 0x72fd2493UL + }, + { + 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL, + 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL, + 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL, + 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL, + 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL, + 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL, + 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL, + 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL, + 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL, + 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL, + 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL, + 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL, + 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL, + 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL, + 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL, + 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL, + 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL, + 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL, + 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL, + 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL, + 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL, + 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL, + 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL, + 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL, + 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL, + 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL, + 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL, + 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL, + 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL, + 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL, + 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL, + 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL, + 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL, + 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL, + 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL, + 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL, + 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL, + 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL, + 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL, + 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL, + 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL, + 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL, + 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL, + 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL, + 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL, + 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL, + 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL, + 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL, + 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL, + 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL, + 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL, + 0xed3498beUL + }, + { + 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL, + 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL, + 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL, + 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL, + 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL, + 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL, + 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL, + 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL, + 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL, + 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL, + 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL, + 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL, + 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL, + 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL, + 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL, + 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL, + 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL, + 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL, + 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL, + 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL, + 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL, + 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL, + 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL, + 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL, + 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL, + 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL, + 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL, + 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL, + 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL, + 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL, + 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL, + 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL, + 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL, + 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL, + 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL, + 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL, + 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL, + 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL, + 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL, + 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL, + 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL, + 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL, + 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL, + 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL, + 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL, + 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL, + 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL, + 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL, + 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL, + 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL, + 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL, + 0xf10605deUL +#endif + } +}; diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/deflate.c b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/deflate.c new file mode 100644 index 0000000000..696957705b --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/deflate.c @@ -0,0 +1,1967 @@ +/* deflate.c -- compress data using the deflation algorithm + * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + * ALGORITHM + * + * The "deflation" process depends on being able to identify portions + * of the input text which are identical to earlier input (within a + * sliding window trailing behind the input currently being processed). + * + * The most straightforward technique turns out to be the fastest for + * most input files: try all possible matches and select the longest. + * The key feature of this algorithm is that insertions into the string + * dictionary are very simple and thus fast, and deletions are avoided + * completely. Insertions are performed at each input character, whereas + * string matches are performed only when the previous match ends. So it + * is preferable to spend more time in matches to allow very fast string + * insertions and avoid deletions. The matching algorithm for small + * strings is inspired from that of Rabin & Karp. A brute force approach + * is used to find longer strings when a small match has been found. + * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze + * (by Leonid Broukhis). + * A previous version of this file used a more sophisticated algorithm + * (by Fiala and Greene) which is guaranteed to run in linear amortized + * time, but has a larger average cost, uses more memory and is patented. + * However the F&G algorithm may be faster for some highly redundant + * files if the parameter max_chain_length (described below) is too large. + * + * ACKNOWLEDGEMENTS + * + * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and + * I found it in 'freeze' written by Leonid Broukhis. + * Thanks to many people for bug reports and testing. + * + * REFERENCES + * + * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification". + * Available in http://tools.ietf.org/html/rfc1951 + * + * A description of the Rabin and Karp algorithm is given in the book + * "Algorithms" by R. Sedgewick, Addison-Wesley, p252. + * + * Fiala,E.R., and Greene,D.H. + * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595 + * + */ + +/* @(#) $Id$ */ + +#include "deflate.h" + +const char deflate_copyright[] = + " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler "; +/* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot + include such an acknowledgment, I would appreciate that you keep this + copyright string in the executable of your product. + */ + +/* =========================================================================== + * Function prototypes. + */ +typedef enum { + need_more, /* block not completed, need more input or more output */ + block_done, /* block flush performed */ + finish_started, /* finish started, need only more output at next deflate */ + finish_done /* finish done, accept no more input or output */ +} block_state; + +typedef block_state (*compress_func) OF((deflate_state *s, int flush)); +/* Compression function. Returns the block state after the call. */ + +local void fill_window OF((deflate_state *s)); +local block_state deflate_stored OF((deflate_state *s, int flush)); +local block_state deflate_fast OF((deflate_state *s, int flush)); +#ifndef FASTEST +local block_state deflate_slow OF((deflate_state *s, int flush)); +#endif +local block_state deflate_rle OF((deflate_state *s, int flush)); +local block_state deflate_huff OF((deflate_state *s, int flush)); +local void lm_init OF((deflate_state *s)); +local void putShortMSB OF((deflate_state *s, uInt b)); +local void flush_pending OF((z_streamp strm)); +local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); +#ifdef ASMV + void match_init OF((void)); /* asm code initialization */ + uInt longest_match OF((deflate_state *s, IPos cur_match)); +#else +local uInt longest_match OF((deflate_state *s, IPos cur_match)); +#endif + +#ifdef DEBUG +local void check_match OF((deflate_state *s, IPos start, IPos match, + int length)); +#endif + +/* =========================================================================== + * Local data + */ + +#define NIL 0 +/* Tail of hash chains */ + +#ifndef TOO_FAR +# define TOO_FAR 4096 +#endif +/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ + +/* Values for max_lazy_match, good_match and max_chain_length, depending on + * the desired pack level (0..9). The values given below have been tuned to + * exclude worst case performance for pathological files. Better values may be + * found for specific files. + */ +typedef struct config_s { + ush good_length; /* reduce lazy search above this match length */ + ush max_lazy; /* do not perform lazy search above this match length */ + ush nice_length; /* quit search above this match length */ + ush max_chain; + compress_func func; +} config; + +#ifdef FASTEST +local const config configuration_table[2] = { +/* good lazy nice chain */ +/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ +/* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */ +#else +local const config configuration_table[10] = { +/* good lazy nice chain */ +/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ +/* 1 */ {4, 4, 8, 4, deflate_fast}, /* max speed, no lazy matches */ +/* 2 */ {4, 5, 16, 8, deflate_fast}, +/* 3 */ {4, 6, 32, 32, deflate_fast}, + +/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */ +/* 5 */ {8, 16, 32, 32, deflate_slow}, +/* 6 */ {8, 16, 128, 128, deflate_slow}, +/* 7 */ {8, 32, 128, 256, deflate_slow}, +/* 8 */ {32, 128, 258, 1024, deflate_slow}, +/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */ +#endif + +/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 + * For deflate_fast() (levels <= 3) good is ignored and lazy has a different + * meaning. + */ + +#define EQUAL 0 +/* result of memcmp for equal strings */ + +#ifndef NO_DUMMY_DECL +struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ +#endif + +/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */ +#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0)) + +/* =========================================================================== + * Update a hash value with the given input byte + * IN assertion: all calls to to UPDATE_HASH are made with consecutive + * input characters, so that a running hash key can be computed from the + * previous key instead of complete recalculation each time. + */ +#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask) + + +/* =========================================================================== + * Insert string str in the dictionary and set match_head to the previous head + * of the hash chain (the most recent string with same hash key). Return + * the previous length of the hash chain. + * If this file is compiled with -DFASTEST, the compression level is forced + * to 1, and no hash chains are maintained. + * IN assertion: all calls to to INSERT_STRING are made with consecutive + * input characters and the first MIN_MATCH bytes of str are valid + * (except for the last MIN_MATCH-1 bytes of the input file). + */ +#ifdef FASTEST +#define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) +#else +#define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) +#endif + +/* =========================================================================== + * Initialize the hash table (avoiding 64K overflow for 16 bit systems). + * prev[] will be initialized on the fly. + */ +#define CLEAR_HASH(s) \ + s->head[s->hash_size-1] = NIL; \ + zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); + +/* ========================================================================= */ +int ZEXPORT deflateInit_(strm, level, version, stream_size) + z_streamp strm; + int level; + const char *version; + int stream_size; +{ + return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, + Z_DEFAULT_STRATEGY, version, stream_size); + /* To do: ignore strm->next_in if we use it as window */ +} + +/* ========================================================================= */ +int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + version, stream_size) + z_streamp strm; + int level; + int method; + int windowBits; + int memLevel; + int strategy; + const char *version; + int stream_size; +{ + deflate_state *s; + int wrap = 1; + static const char my_version[] = ZLIB_VERSION; + + ushf *overlay; + /* We overlay pending_buf and d_buf+l_buf. This works since the average + * output size for (length,distance) codes is <= 24 bits. + */ + + if (version == Z_NULL || version[0] != my_version[0] || + stream_size != sizeof(z_stream)) { + return Z_VERSION_ERROR; + } + if (strm == Z_NULL) return Z_STREAM_ERROR; + + strm->msg = Z_NULL; + if (strm->zalloc == (alloc_func)0) { +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; +#endif + } + if (strm->zfree == (free_func)0) +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else + strm->zfree = zcfree; +#endif + +#ifdef FASTEST + if (level != 0) level = 1; +#else + if (level == Z_DEFAULT_COMPRESSION) level = 6; +#endif + + if (windowBits < 0) { /* suppress zlib wrapper */ + wrap = 0; + windowBits = -windowBits; + } +#ifdef GZIP + else if (windowBits > 15) { + wrap = 2; /* write gzip wrapper instead */ + windowBits -= 16; + } +#endif + if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || + windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || + strategy < 0 || strategy > Z_FIXED) { + return Z_STREAM_ERROR; + } + if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ + s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state)); + if (s == Z_NULL) return Z_MEM_ERROR; + strm->state = (struct internal_state FAR *)s; + s->strm = strm; + + s->wrap = wrap; + s->gzhead = Z_NULL; + s->w_bits = windowBits; + s->w_size = 1 << s->w_bits; + s->w_mask = s->w_size - 1; + + s->hash_bits = memLevel + 7; + s->hash_size = 1 << s->hash_bits; + s->hash_mask = s->hash_size - 1; + s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH); + + s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); + s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); + s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); + + s->high_water = 0; /* nothing written to s->window yet */ + + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + + overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); + s->pending_buf = (uchf *) overlay; + s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); + + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { + s->status = FINISH_STATE; + strm->msg = ERR_MSG(Z_MEM_ERROR); + deflateEnd (strm); + return Z_MEM_ERROR; + } + s->d_buf = overlay + s->lit_bufsize/sizeof(ush); + s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; + + s->level = level; + s->strategy = strategy; + s->method = (Byte)method; + + return deflateReset(strm); +} + +/* ========================================================================= */ +int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) + z_streamp strm; + const Bytef *dictionary; + uInt dictLength; +{ + deflate_state *s; + uInt str, n; + int wrap; + unsigned avail; + z_const unsigned char *next; + + if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL) + return Z_STREAM_ERROR; + s = strm->state; + wrap = s->wrap; + if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead) + return Z_STREAM_ERROR; + + /* when using zlib wrappers, compute Adler-32 for provided dictionary */ + if (wrap == 1) + strm->adler = adler32(strm->adler, dictionary, dictLength); + s->wrap = 0; /* avoid computing Adler-32 in read_buf */ + + /* if dictionary would fill window, just replace the history */ + if (dictLength >= s->w_size) { + if (wrap == 0) { /* already empty otherwise */ + CLEAR_HASH(s); + s->strstart = 0; + s->block_start = 0L; + s->insert = 0; + } + dictionary += dictLength - s->w_size; /* use the tail */ + dictLength = s->w_size; + } + + /* insert dictionary into window and hash */ + avail = strm->avail_in; + next = strm->next_in; + strm->avail_in = dictLength; + strm->next_in = (z_const Bytef *)dictionary; + fill_window(s); + while (s->lookahead >= MIN_MATCH) { + str = s->strstart; + n = s->lookahead - (MIN_MATCH-1); + do { + UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); +#ifndef FASTEST + s->prev[str & s->w_mask] = s->head[s->ins_h]; +#endif + s->head[s->ins_h] = (Pos)str; + str++; + } while (--n); + s->strstart = str; + s->lookahead = MIN_MATCH-1; + fill_window(s); + } + s->strstart += s->lookahead; + s->block_start = (long)s->strstart; + s->insert = s->lookahead; + s->lookahead = 0; + s->match_length = s->prev_length = MIN_MATCH-1; + s->match_available = 0; + strm->next_in = next; + strm->avail_in = avail; + s->wrap = wrap; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateResetKeep (strm) + z_streamp strm; +{ + deflate_state *s; + + if (strm == Z_NULL || strm->state == Z_NULL || + strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) { + return Z_STREAM_ERROR; + } + + strm->total_in = strm->total_out = 0; + strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */ + strm->data_type = Z_UNKNOWN; + + s = (deflate_state *)strm->state; + s->pending = 0; + s->pending_out = s->pending_buf; + + if (s->wrap < 0) { + s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ + } + s->status = s->wrap ? INIT_STATE : BUSY_STATE; + strm->adler = +#ifdef GZIP + s->wrap == 2 ? crc32(0L, Z_NULL, 0) : +#endif + adler32(0L, Z_NULL, 0); + s->last_flush = Z_NO_FLUSH; + + _tr_init(s); + + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateReset (strm) + z_streamp strm; +{ + int ret; + + ret = deflateResetKeep(strm); + if (ret == Z_OK) + lm_init(strm->state); + return ret; +} + +/* ========================================================================= */ +int ZEXPORT deflateSetHeader (strm, head) + z_streamp strm; + gz_headerp head; +{ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (strm->state->wrap != 2) return Z_STREAM_ERROR; + strm->state->gzhead = head; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflatePending (strm, pending, bits) + unsigned *pending; + int *bits; + z_streamp strm; +{ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (pending != Z_NULL) + *pending = strm->state->pending; + if (bits != Z_NULL) + *bits = strm->state->bi_valid; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflatePrime (strm, bits, value) + z_streamp strm; + int bits; + int value; +{ + deflate_state *s; + int put; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + s = strm->state; + if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) + return Z_BUF_ERROR; + do { + put = Buf_size - s->bi_valid; + if (put > bits) + put = bits; + s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid); + s->bi_valid += put; + _tr_flush_bits(s); + value >>= put; + bits -= put; + } while (bits); + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateParams(strm, level, strategy) + z_streamp strm; + int level; + int strategy; +{ + deflate_state *s; + compress_func func; + int err = Z_OK; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + s = strm->state; + +#ifdef FASTEST + if (level != 0) level = 1; +#else + if (level == Z_DEFAULT_COMPRESSION) level = 6; +#endif + if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) { + return Z_STREAM_ERROR; + } + func = configuration_table[s->level].func; + + if ((strategy != s->strategy || func != configuration_table[level].func) && + strm->total_in != 0) { + /* Flush the last buffer: */ + err = deflate(strm, Z_BLOCK); + if (err == Z_BUF_ERROR && s->pending == 0) + err = Z_OK; + } + if (s->level != level) { + s->level = level; + s->max_lazy_match = configuration_table[level].max_lazy; + s->good_match = configuration_table[level].good_length; + s->nice_match = configuration_table[level].nice_length; + s->max_chain_length = configuration_table[level].max_chain; + } + s->strategy = strategy; + return err; +} + +/* ========================================================================= */ +int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) + z_streamp strm; + int good_length; + int max_lazy; + int nice_length; + int max_chain; +{ + deflate_state *s; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + s = strm->state; + s->good_match = good_length; + s->max_lazy_match = max_lazy; + s->nice_match = nice_length; + s->max_chain_length = max_chain; + return Z_OK; +} + +/* ========================================================================= + * For the default windowBits of 15 and memLevel of 8, this function returns + * a close to exact, as well as small, upper bound on the compressed size. + * They are coded as constants here for a reason--if the #define's are + * changed, then this function needs to be changed as well. The return + * value for 15 and 8 only works for those exact settings. + * + * For any setting other than those defaults for windowBits and memLevel, + * the value returned is a conservative worst case for the maximum expansion + * resulting from using fixed blocks instead of stored blocks, which deflate + * can emit on compressed data for some combinations of the parameters. + * + * This function could be more sophisticated to provide closer upper bounds for + * every combination of windowBits and memLevel. But even the conservative + * upper bound of about 14% expansion does not seem onerous for output buffer + * allocation. + */ +uLong ZEXPORT deflateBound(strm, sourceLen) + z_streamp strm; + uLong sourceLen; +{ + deflate_state *s; + uLong complen, wraplen; + Bytef *str; + + /* conservative upper bound for compressed data */ + complen = sourceLen + + ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5; + + /* if can't get parameters, return conservative bound plus zlib wrapper */ + if (strm == Z_NULL || strm->state == Z_NULL) + return complen + 6; + + /* compute wrapper length */ + s = strm->state; + switch (s->wrap) { + case 0: /* raw deflate */ + wraplen = 0; + break; + case 1: /* zlib wrapper */ + wraplen = 6 + (s->strstart ? 4 : 0); + break; + case 2: /* gzip wrapper */ + wraplen = 18; + if (s->gzhead != Z_NULL) { /* user-supplied gzip header */ + if (s->gzhead->extra != Z_NULL) + wraplen += 2 + s->gzhead->extra_len; + str = s->gzhead->name; + if (str != Z_NULL) + do { + wraplen++; + } while (*str++); + str = s->gzhead->comment; + if (str != Z_NULL) + do { + wraplen++; + } while (*str++); + if (s->gzhead->hcrc) + wraplen += 2; + } + break; + default: /* for compiler happiness */ + wraplen = 6; + } + + /* if not default parameters, return conservative bound */ + if (s->w_bits != 15 || s->hash_bits != 8 + 7) + return complen + wraplen; + + /* default settings: return tight bound for that case */ + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + + (sourceLen >> 25) + 13 - 6 + wraplen; +} + +/* ========================================================================= + * Put a short in the pending buffer. The 16-bit value is put in MSB order. + * IN assertion: the stream state is correct and there is enough room in + * pending_buf. + */ +local void putShortMSB (s, b) + deflate_state *s; + uInt b; +{ + put_byte(s, (Byte)(b >> 8)); + put_byte(s, (Byte)(b & 0xff)); +} + +/* ========================================================================= + * Flush as much pending output as possible. All deflate() output goes + * through this function so some applications may wish to modify it + * to avoid allocating a large strm->next_out buffer and copying into it. + * (See also read_buf()). + */ +local void flush_pending(strm) + z_streamp strm; +{ + unsigned len; + deflate_state *s = strm->state; + + _tr_flush_bits(s); + len = s->pending; + if (len > strm->avail_out) len = strm->avail_out; + if (len == 0) return; + + zmemcpy(strm->next_out, s->pending_out, len); + strm->next_out += len; + s->pending_out += len; + strm->total_out += len; + strm->avail_out -= len; + s->pending -= len; + if (s->pending == 0) { + s->pending_out = s->pending_buf; + } +} + +/* ========================================================================= */ +int ZEXPORT deflate (strm, flush) + z_streamp strm; + int flush; +{ + int old_flush; /* value of flush param for previous deflate call */ + deflate_state *s; + + if (strm == Z_NULL || strm->state == Z_NULL || + flush > Z_BLOCK || flush < 0) { + return Z_STREAM_ERROR; + } + s = strm->state; + + if (strm->next_out == Z_NULL || + (strm->next_in == Z_NULL && strm->avail_in != 0) || + (s->status == FINISH_STATE && flush != Z_FINISH)) { + ERR_RETURN(strm, Z_STREAM_ERROR); + } + if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR); + + s->strm = strm; /* just in case */ + old_flush = s->last_flush; + s->last_flush = flush; + + /* Write the header */ + if (s->status == INIT_STATE) { +#ifdef GZIP + if (s->wrap == 2) { + strm->adler = crc32(0L, Z_NULL, 0); + put_byte(s, 31); + put_byte(s, 139); + put_byte(s, 8); + if (s->gzhead == Z_NULL) { + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, OS_CODE); + s->status = BUSY_STATE; + } + else { + put_byte(s, (s->gzhead->text ? 1 : 0) + + (s->gzhead->hcrc ? 2 : 0) + + (s->gzhead->extra == Z_NULL ? 0 : 4) + + (s->gzhead->name == Z_NULL ? 0 : 8) + + (s->gzhead->comment == Z_NULL ? 0 : 16) + ); + put_byte(s, (Byte)(s->gzhead->time & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, s->gzhead->os & 0xff); + if (s->gzhead->extra != Z_NULL) { + put_byte(s, s->gzhead->extra_len & 0xff); + put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); + } + if (s->gzhead->hcrc) + strm->adler = crc32(strm->adler, s->pending_buf, + s->pending); + s->gzindex = 0; + s->status = EXTRA_STATE; + } + } + else +#endif + { + uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; + uInt level_flags; + + if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) + level_flags = 0; + else if (s->level < 6) + level_flags = 1; + else if (s->level == 6) + level_flags = 2; + else + level_flags = 3; + header |= (level_flags << 6); + if (s->strstart != 0) header |= PRESET_DICT; + header += 31 - (header % 31); + + s->status = BUSY_STATE; + putShortMSB(s, header); + + /* Save the adler32 of the preset dictionary: */ + if (s->strstart != 0) { + putShortMSB(s, (uInt)(strm->adler >> 16)); + putShortMSB(s, (uInt)(strm->adler & 0xffff)); + } + strm->adler = adler32(0L, Z_NULL, 0); + } + } +#ifdef GZIP + if (s->status == EXTRA_STATE) { + if (s->gzhead->extra != Z_NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + + while (s->gzindex < (s->gzhead->extra_len & 0xffff)) { + if (s->pending == s->pending_buf_size) { + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + flush_pending(strm); + beg = s->pending; + if (s->pending == s->pending_buf_size) + break; + } + put_byte(s, s->gzhead->extra[s->gzindex]); + s->gzindex++; + } + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (s->gzindex == s->gzhead->extra_len) { + s->gzindex = 0; + s->status = NAME_STATE; + } + } + else + s->status = NAME_STATE; + } + if (s->status == NAME_STATE) { + if (s->gzhead->name != Z_NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + int val; + + do { + if (s->pending == s->pending_buf_size) { + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + flush_pending(strm); + beg = s->pending; + if (s->pending == s->pending_buf_size) { + val = 1; + break; + } + } + val = s->gzhead->name[s->gzindex++]; + put_byte(s, val); + } while (val != 0); + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (val == 0) { + s->gzindex = 0; + s->status = COMMENT_STATE; + } + } + else + s->status = COMMENT_STATE; + } + if (s->status == COMMENT_STATE) { + if (s->gzhead->comment != Z_NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + int val; + + do { + if (s->pending == s->pending_buf_size) { + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + flush_pending(strm); + beg = s->pending; + if (s->pending == s->pending_buf_size) { + val = 1; + break; + } + } + val = s->gzhead->comment[s->gzindex++]; + put_byte(s, val); + } while (val != 0); + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (val == 0) + s->status = HCRC_STATE; + } + else + s->status = HCRC_STATE; + } + if (s->status == HCRC_STATE) { + if (s->gzhead->hcrc) { + if (s->pending + 2 > s->pending_buf_size) + flush_pending(strm); + if (s->pending + 2 <= s->pending_buf_size) { + put_byte(s, (Byte)(strm->adler & 0xff)); + put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); + strm->adler = crc32(0L, Z_NULL, 0); + s->status = BUSY_STATE; + } + } + else + s->status = BUSY_STATE; + } +#endif + + /* Flush as much pending output as possible */ + if (s->pending != 0) { + flush_pending(strm); + if (strm->avail_out == 0) { + /* Since avail_out is 0, deflate will be called again with + * more output space, but possibly with both pending and + * avail_in equal to zero. There won't be anything to do, + * but this is not an error situation so make sure we + * return OK instead of BUF_ERROR at next call of deflate: + */ + s->last_flush = -1; + return Z_OK; + } + + /* Make sure there is something to do and avoid duplicate consecutive + * flushes. For repeated and useless calls with Z_FINISH, we keep + * returning Z_STREAM_END instead of Z_BUF_ERROR. + */ + } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) && + flush != Z_FINISH) { + ERR_RETURN(strm, Z_BUF_ERROR); + } + + /* User must not provide more input after the first FINISH: */ + if (s->status == FINISH_STATE && strm->avail_in != 0) { + ERR_RETURN(strm, Z_BUF_ERROR); + } + + /* Start a new block or continue the current one. + */ + if (strm->avail_in != 0 || s->lookahead != 0 || + (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { + block_state bstate; + + bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) : + (s->strategy == Z_RLE ? deflate_rle(s, flush) : + (*(configuration_table[s->level].func))(s, flush)); + + if (bstate == finish_started || bstate == finish_done) { + s->status = FINISH_STATE; + } + if (bstate == need_more || bstate == finish_started) { + if (strm->avail_out == 0) { + s->last_flush = -1; /* avoid BUF_ERROR next call, see above */ + } + return Z_OK; + /* If flush != Z_NO_FLUSH && avail_out == 0, the next call + * of deflate should use the same flush parameter to make sure + * that the flush is complete. So we don't have to output an + * empty block here, this will be done at next call. This also + * ensures that for a very small output buffer, we emit at most + * one empty block. + */ + } + if (bstate == block_done) { + if (flush == Z_PARTIAL_FLUSH) { + _tr_align(s); + } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */ + _tr_stored_block(s, (char*)0, 0L, 0); + /* For a full flush, this empty block will be recognized + * as a special marker by inflate_sync(). + */ + if (flush == Z_FULL_FLUSH) { + CLEAR_HASH(s); /* forget history */ + if (s->lookahead == 0) { + s->strstart = 0; + s->block_start = 0L; + s->insert = 0; + } + } + } + flush_pending(strm); + if (strm->avail_out == 0) { + s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */ + return Z_OK; + } + } + } + Assert(strm->avail_out > 0, "bug2"); + + if (flush != Z_FINISH) return Z_OK; + if (s->wrap <= 0) return Z_STREAM_END; + + /* Write the trailer */ +#ifdef GZIP + if (s->wrap == 2) { + put_byte(s, (Byte)(strm->adler & 0xff)); + put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); + put_byte(s, (Byte)((strm->adler >> 16) & 0xff)); + put_byte(s, (Byte)((strm->adler >> 24) & 0xff)); + put_byte(s, (Byte)(strm->total_in & 0xff)); + put_byte(s, (Byte)((strm->total_in >> 8) & 0xff)); + put_byte(s, (Byte)((strm->total_in >> 16) & 0xff)); + put_byte(s, (Byte)((strm->total_in >> 24) & 0xff)); + } + else +#endif + { + putShortMSB(s, (uInt)(strm->adler >> 16)); + putShortMSB(s, (uInt)(strm->adler & 0xffff)); + } + flush_pending(strm); + /* If avail_out is zero, the application will call deflate again + * to flush the rest. + */ + if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */ + return s->pending != 0 ? Z_OK : Z_STREAM_END; +} + +/* ========================================================================= */ +int ZEXPORT deflateEnd (strm) + z_streamp strm; +{ + int status; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + + status = strm->state->status; + if (status != INIT_STATE && + status != EXTRA_STATE && + status != NAME_STATE && + status != COMMENT_STATE && + status != HCRC_STATE && + status != BUSY_STATE && + status != FINISH_STATE) { + return Z_STREAM_ERROR; + } + + /* Deallocate in reverse order of allocations: */ + TRY_FREE(strm, strm->state->pending_buf); + TRY_FREE(strm, strm->state->head); + TRY_FREE(strm, strm->state->prev); + TRY_FREE(strm, strm->state->window); + + ZFREE(strm, strm->state); + strm->state = Z_NULL; + + return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK; +} + +/* ========================================================================= + * Copy the source state to the destination state. + * To simplify the source, this is not supported for 16-bit MSDOS (which + * doesn't have enough memory anyway to duplicate compression states). + */ +int ZEXPORT deflateCopy (dest, source) + z_streamp dest; + z_streamp source; +{ +#ifdef MAXSEG_64K + return Z_STREAM_ERROR; +#else + deflate_state *ds; + deflate_state *ss; + ushf *overlay; + + + if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) { + return Z_STREAM_ERROR; + } + + ss = source->state; + + zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); + + ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state)); + if (ds == Z_NULL) return Z_MEM_ERROR; + dest->state = (struct internal_state FAR *) ds; + zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state)); + ds->strm = dest; + + ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); + ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); + ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); + overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); + ds->pending_buf = (uchf *) overlay; + + if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || + ds->pending_buf == Z_NULL) { + deflateEnd (dest); + return Z_MEM_ERROR; + } + /* following zmemcpy do not work for 16-bit MSDOS */ + zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte)); + zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos)); + zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos)); + zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); + + ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); + ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); + ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; + + ds->l_desc.dyn_tree = ds->dyn_ltree; + ds->d_desc.dyn_tree = ds->dyn_dtree; + ds->bl_desc.dyn_tree = ds->bl_tree; + + return Z_OK; +#endif /* MAXSEG_64K */ +} + +/* =========================================================================== + * Read a new buffer from the current input stream, update the adler32 + * and total number of bytes read. All deflate() input goes through + * this function so some applications may wish to modify it to avoid + * allocating a large strm->next_in buffer and copying from it. + * (See also flush_pending()). + */ +local int read_buf(strm, buf, size) + z_streamp strm; + Bytef *buf; + unsigned size; +{ + unsigned len = strm->avail_in; + + if (len > size) len = size; + if (len == 0) return 0; + + strm->avail_in -= len; + + zmemcpy(buf, strm->next_in, len); + if (strm->state->wrap == 1) { + strm->adler = adler32(strm->adler, buf, len); + } +#ifdef GZIP + else if (strm->state->wrap == 2) { + strm->adler = crc32(strm->adler, buf, len); + } +#endif + strm->next_in += len; + strm->total_in += len; + + return (int)len; +} + +/* =========================================================================== + * Initialize the "longest match" routines for a new zlib stream + */ +local void lm_init (s) + deflate_state *s; +{ + s->window_size = (ulg)2L*s->w_size; + + CLEAR_HASH(s); + + /* Set the default configuration parameters: + */ + s->max_lazy_match = configuration_table[s->level].max_lazy; + s->good_match = configuration_table[s->level].good_length; + s->nice_match = configuration_table[s->level].nice_length; + s->max_chain_length = configuration_table[s->level].max_chain; + + s->strstart = 0; + s->block_start = 0L; + s->lookahead = 0; + s->insert = 0; + s->match_length = s->prev_length = MIN_MATCH-1; + s->match_available = 0; + s->ins_h = 0; +#ifndef FASTEST +#ifdef ASMV + match_init(); /* initialize the asm code */ +#endif +#endif +} + +#ifndef FASTEST +/* =========================================================================== + * Set match_start to the longest match starting at the given string and + * return its length. Matches shorter or equal to prev_length are discarded, + * in which case the result is equal to prev_length and match_start is + * garbage. + * IN assertions: cur_match is the head of the hash chain for the current + * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1 + * OUT assertion: the match length is not greater than s->lookahead. + */ +#ifndef ASMV +/* For 80x86 and 680x0, an optimized version will be provided in match.asm or + * match.S. The code will be functionally equivalent. + */ +local uInt longest_match(s, cur_match) + deflate_state *s; + IPos cur_match; /* current match */ +{ + unsigned chain_length = s->max_chain_length;/* max hash chain length */ + register Bytef *scan = s->window + s->strstart; /* current string */ + register Bytef *match; /* matched string */ + register int len; /* length of current match */ + int best_len = s->prev_length; /* best match length so far */ + int nice_match = s->nice_match; /* stop if match long enough */ + IPos limit = s->strstart > (IPos)MAX_DIST(s) ? + s->strstart - (IPos)MAX_DIST(s) : NIL; + /* Stop when cur_match becomes <= limit. To simplify the code, + * we prevent matches with the string of window index 0. + */ + Posf *prev = s->prev; + uInt wmask = s->w_mask; + +#ifdef UNALIGNED_OK + /* Compare two bytes at a time. Note: this is not always beneficial. + * Try with and without -DUNALIGNED_OK to check. + */ + register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1; + register ush scan_start = *(ushf*)scan; + register ush scan_end = *(ushf*)(scan+best_len-1); +#else + register Bytef *strend = s->window + s->strstart + MAX_MATCH; + register Byte scan_end1 = scan[best_len-1]; + register Byte scan_end = scan[best_len]; +#endif + + /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. + * It is easy to get rid of this optimization if necessary. + */ + Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); + + /* Do not waste too much time if we already have a good match: */ + if (s->prev_length >= s->good_match) { + chain_length >>= 2; + } + /* Do not look for matches beyond the end of the input. This is necessary + * to make deflate deterministic. + */ + if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; + + Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); + + do { + Assert(cur_match < s->strstart, "no future"); + match = s->window + cur_match; + + /* Skip to next match if the match length cannot increase + * or if the match length is less than 2. Note that the checks below + * for insufficient lookahead only occur occasionally for performance + * reasons. Therefore uninitialized memory will be accessed, and + * conditional jumps will be made that depend on those values. + * However the length of the match is limited to the lookahead, so + * the output of deflate is not affected by the uninitialized values. + */ +#if (defined(UNALIGNED_OK) && MAX_MATCH == 258) + /* This code assumes sizeof(unsigned short) == 2. Do not use + * UNALIGNED_OK if your compiler uses a different size. + */ + if (*(ushf*)(match+best_len-1) != scan_end || + *(ushf*)match != scan_start) continue; + + /* It is not necessary to compare scan[2] and match[2] since they are + * always equal when the other bytes match, given that the hash keys + * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at + * strstart+3, +5, ... up to strstart+257. We check for insufficient + * lookahead only every 4th comparison; the 128th check will be made + * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is + * necessary to put more guard bytes at the end of the window, or + * to check more often for insufficient lookahead. + */ + Assert(scan[2] == match[2], "scan[2]?"); + scan++, match++; + do { + } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) && + *(ushf*)(scan+=2) == *(ushf*)(match+=2) && + *(ushf*)(scan+=2) == *(ushf*)(match+=2) && + *(ushf*)(scan+=2) == *(ushf*)(match+=2) && + scan < strend); + /* The funny "do {}" generates better code on most compilers */ + + /* Here, scan <= window+strstart+257 */ + Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); + if (*scan == *match) scan++; + + len = (MAX_MATCH - 1) - (int)(strend-scan); + scan = strend - (MAX_MATCH-1); + +#else /* UNALIGNED_OK */ + + if (match[best_len] != scan_end || + match[best_len-1] != scan_end1 || + *match != *scan || + *++match != scan[1]) continue; + + /* The check at best_len-1 can be removed because it will be made + * again later. (This heuristic is not always a win.) + * It is not necessary to compare scan[2] and match[2] since they + * are always equal when the other bytes match, given that + * the hash keys are equal and that HASH_BITS >= 8. + */ + scan += 2, match++; + Assert(*scan == *match, "match[2]?"); + + /* We check for insufficient lookahead only every 8th comparison; + * the 256th check will be made at strstart+258. + */ + do { + } while (*++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + scan < strend); + + Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); + + len = MAX_MATCH - (int)(strend - scan); + scan = strend - MAX_MATCH; + +#endif /* UNALIGNED_OK */ + + if (len > best_len) { + s->match_start = cur_match; + best_len = len; + if (len >= nice_match) break; +#ifdef UNALIGNED_OK + scan_end = *(ushf*)(scan+best_len-1); +#else + scan_end1 = scan[best_len-1]; + scan_end = scan[best_len]; +#endif + } + } while ((cur_match = prev[cur_match & wmask]) > limit + && --chain_length != 0); + + if ((uInt)best_len <= s->lookahead) return (uInt)best_len; + return s->lookahead; +} +#endif /* ASMV */ + +#else /* FASTEST */ + +/* --------------------------------------------------------------------------- + * Optimized version for FASTEST only + */ +local uInt longest_match(s, cur_match) + deflate_state *s; + IPos cur_match; /* current match */ +{ + register Bytef *scan = s->window + s->strstart; /* current string */ + register Bytef *match; /* matched string */ + register int len; /* length of current match */ + register Bytef *strend = s->window + s->strstart + MAX_MATCH; + + /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. + * It is easy to get rid of this optimization if necessary. + */ + Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); + + Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); + + Assert(cur_match < s->strstart, "no future"); + + match = s->window + cur_match; + + /* Return failure if the match length is less than 2: + */ + if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1; + + /* The check at best_len-1 can be removed because it will be made + * again later. (This heuristic is not always a win.) + * It is not necessary to compare scan[2] and match[2] since they + * are always equal when the other bytes match, given that + * the hash keys are equal and that HASH_BITS >= 8. + */ + scan += 2, match += 2; + Assert(*scan == *match, "match[2]?"); + + /* We check for insufficient lookahead only every 8th comparison; + * the 256th check will be made at strstart+258. + */ + do { + } while (*++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + scan < strend); + + Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); + + len = MAX_MATCH - (int)(strend - scan); + + if (len < MIN_MATCH) return MIN_MATCH - 1; + + s->match_start = cur_match; + return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead; +} + +#endif /* FASTEST */ + +#ifdef DEBUG +/* =========================================================================== + * Check that the match at match_start is indeed a match. + */ +local void check_match(s, start, match, length) + deflate_state *s; + IPos start, match; + int length; +{ + /* check that the match is indeed a match */ + if (zmemcmp(s->window + match, + s->window + start, length) != EQUAL) { + fprintf(stderr, " start %u, match %u, length %d\n", + start, match, length); + do { + fprintf(stderr, "%c%c", s->window[match++], s->window[start++]); + } while (--length != 0); + z_error("invalid match"); + } + if (z_verbose > 1) { + fprintf(stderr,"\\[%d,%d]", start-match, length); + do { putc(s->window[start++], stderr); } while (--length != 0); + } +} +#else +# define check_match(s, start, match, length) +#endif /* DEBUG */ + +/* =========================================================================== + * Fill the window when the lookahead becomes insufficient. + * Updates strstart and lookahead. + * + * IN assertion: lookahead < MIN_LOOKAHEAD + * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD + * At least one byte has been read, or avail_in == 0; reads are + * performed for at least two bytes (required for the zip translate_eol + * option -- not supported here). + */ +local void fill_window(s) + deflate_state *s; +{ + register unsigned n, m; + register Posf *p; + unsigned more; /* Amount of free space at the end of the window. */ + uInt wsize = s->w_size; + + Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead"); + + do { + more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); + + /* Deal with !@#$% 64K limit: */ + if (sizeof(int) <= 2) { + if (more == 0 && s->strstart == 0 && s->lookahead == 0) { + more = wsize; + + } else if (more == (unsigned)(-1)) { + /* Very unlikely, but possible on 16 bit machine if + * strstart == 0 && lookahead == 1 (input done a byte at time) + */ + more--; + } + } + + /* If the window is almost full and there is insufficient lookahead, + * move the upper half to the lower one to make room in the upper half. + */ + if (s->strstart >= wsize+MAX_DIST(s)) { + + zmemcpy(s->window, s->window+wsize, (unsigned)wsize); + s->match_start -= wsize; + s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ + s->block_start -= (long) wsize; + + /* Slide the hash table (could be avoided with 32 bit values + at the expense of memory usage). We slide even when level == 0 + to keep the hash table consistent if we switch back to level > 0 + later. (Using level 0 permanently is not an optimal usage of + zlib, so we don't care about this pathological case.) + */ + n = s->hash_size; + p = &s->head[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m-wsize : NIL); + } while (--n); + + n = wsize; +#ifndef FASTEST + p = &s->prev[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m-wsize : NIL); + /* If n is not on any hash chain, prev[n] is garbage but + * its value will never be used. + */ + } while (--n); +#endif + more += wsize; + } + if (s->strm->avail_in == 0) break; + + /* If there was no sliding: + * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && + * more == window_size - lookahead - strstart + * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) + * => more >= window_size - 2*WSIZE + 2 + * In the BIG_MEM or MMAP case (not yet supported), + * window_size == input_size + MIN_LOOKAHEAD && + * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD. + * Otherwise, window_size == 2*WSIZE so more >= 2. + * If there was sliding, more >= WSIZE. So in all cases, more >= 2. + */ + Assert(more >= 2, "more < 2"); + + n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more); + s->lookahead += n; + + /* Initialize the hash value now that we have some input: */ + if (s->lookahead + s->insert >= MIN_MATCH) { + uInt str = s->strstart - s->insert; + s->ins_h = s->window[str]; + UPDATE_HASH(s, s->ins_h, s->window[str + 1]); +#if MIN_MATCH != 3 + Call UPDATE_HASH() MIN_MATCH-3 more times +#endif + while (s->insert) { + UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); +#ifndef FASTEST + s->prev[str & s->w_mask] = s->head[s->ins_h]; +#endif + s->head[s->ins_h] = (Pos)str; + str++; + s->insert--; + if (s->lookahead + s->insert < MIN_MATCH) + break; + } + } + /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage, + * but this is not important since only literal bytes will be emitted. + */ + + } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); + + /* If the WIN_INIT bytes after the end of the current data have never been + * written, then zero those bytes in order to avoid memory check reports of + * the use of uninitialized (or uninitialised as Julian writes) bytes by + * the longest match routines. Update the high water mark for the next + * time through here. WIN_INIT is set to MAX_MATCH since the longest match + * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead. + */ + if (s->high_water < s->window_size) { + ulg curr = s->strstart + (ulg)(s->lookahead); + ulg init; + + if (s->high_water < curr) { + /* Previous high water mark below current data -- zero WIN_INIT + * bytes or up to end of window, whichever is less. + */ + init = s->window_size - curr; + if (init > WIN_INIT) + init = WIN_INIT; + zmemzero(s->window + curr, (unsigned)init); + s->high_water = curr + init; + } + else if (s->high_water < (ulg)curr + WIN_INIT) { + /* High water mark at or above current data, but below current data + * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up + * to end of window, whichever is less. + */ + init = (ulg)curr + WIN_INIT - s->high_water; + if (init > s->window_size - s->high_water) + init = s->window_size - s->high_water; + zmemzero(s->window + s->high_water, (unsigned)init); + s->high_water += init; + } + } + + Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD, + "not enough room for search"); +} + +/* =========================================================================== + * Flush the current block, with given end-of-file flag. + * IN assertion: strstart is set to the end of the current match. + */ +#define FLUSH_BLOCK_ONLY(s, last) { \ + _tr_flush_block(s, (s->block_start >= 0L ? \ + (charf *)&s->window[(unsigned)s->block_start] : \ + (charf *)Z_NULL), \ + (ulg)((long)s->strstart - s->block_start), \ + (last)); \ + s->block_start = s->strstart; \ + flush_pending(s->strm); \ + Tracev((stderr,"[FLUSH]")); \ +} + +/* Same but force premature exit if necessary. */ +#define FLUSH_BLOCK(s, last) { \ + FLUSH_BLOCK_ONLY(s, last); \ + if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \ +} + +/* =========================================================================== + * Copy without compression as much as possible from the input stream, return + * the current block state. + * This function does not insert new strings in the dictionary since + * uncompressible data is probably not useful. This function is used + * only for the level=0 compression option. + * NOTE: this function should be optimized to avoid extra copying from + * window to pending_buf. + */ +local block_state deflate_stored(s, flush) + deflate_state *s; + int flush; +{ + /* Stored blocks are limited to 0xffff bytes, pending_buf is limited + * to pending_buf_size, and each stored block has a 5 byte header: + */ + ulg max_block_size = 0xffff; + ulg max_start; + + if (max_block_size > s->pending_buf_size - 5) { + max_block_size = s->pending_buf_size - 5; + } + + /* Copy as much as possible from input to output: */ + for (;;) { + /* Fill the window as much as possible: */ + if (s->lookahead <= 1) { + + Assert(s->strstart < s->w_size+MAX_DIST(s) || + s->block_start >= (long)s->w_size, "slide too late"); + + fill_window(s); + if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more; + + if (s->lookahead == 0) break; /* flush the current block */ + } + Assert(s->block_start >= 0L, "block gone"); + + s->strstart += s->lookahead; + s->lookahead = 0; + + /* Emit a stored block if pending_buf will be full: */ + max_start = s->block_start + max_block_size; + if (s->strstart == 0 || (ulg)s->strstart >= max_start) { + /* strstart == 0 is possible when wraparound on 16-bit machine */ + s->lookahead = (uInt)(s->strstart - max_start); + s->strstart = (uInt)max_start; + FLUSH_BLOCK(s, 0); + } + /* Flush if we may have to slide, otherwise block_start may become + * negative and the data will be gone: + */ + if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) { + FLUSH_BLOCK(s, 0); + } + } + s->insert = 0; + if (flush == Z_FINISH) { + FLUSH_BLOCK(s, 1); + return finish_done; + } + if ((long)s->strstart > s->block_start) + FLUSH_BLOCK(s, 0); + return block_done; +} + +/* =========================================================================== + * Compress as much as possible from the input stream, return the current + * block state. + * This function does not perform lazy evaluation of matches and inserts + * new strings in the dictionary only for unmatched strings or for short + * matches. It is used only for the fast compression options. + */ +local block_state deflate_fast(s, flush) + deflate_state *s; + int flush; +{ + IPos hash_head; /* head of the hash chain */ + int bflush; /* set if current block must be flushed */ + + for (;;) { + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the next match, plus MIN_MATCH bytes to insert the + * string following the next match. + */ + if (s->lookahead < MIN_LOOKAHEAD) { + fill_window(s); + if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { + return need_more; + } + if (s->lookahead == 0) break; /* flush the current block */ + } + + /* Insert the string window[strstart .. strstart+2] in the + * dictionary, and set hash_head to the head of the hash chain: + */ + hash_head = NIL; + if (s->lookahead >= MIN_MATCH) { + INSERT_STRING(s, s->strstart, hash_head); + } + + /* Find the longest match, discarding those <= prev_length. + * At this point we have always match_length < MIN_MATCH + */ + if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) { + /* To simplify the code, we prevent matches with the string + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). + */ + s->match_length = longest_match (s, hash_head); + /* longest_match() sets match_start */ + } + if (s->match_length >= MIN_MATCH) { + check_match(s, s->strstart, s->match_start, s->match_length); + + _tr_tally_dist(s, s->strstart - s->match_start, + s->match_length - MIN_MATCH, bflush); + + s->lookahead -= s->match_length; + + /* Insert new strings in the hash table only if the match length + * is not too large. This saves time but degrades compression. + */ +#ifndef FASTEST + if (s->match_length <= s->max_insert_length && + s->lookahead >= MIN_MATCH) { + s->match_length--; /* string at strstart already in table */ + do { + s->strstart++; + INSERT_STRING(s, s->strstart, hash_head); + /* strstart never exceeds WSIZE-MAX_MATCH, so there are + * always MIN_MATCH bytes ahead. + */ + } while (--s->match_length != 0); + s->strstart++; + } else +#endif + { + s->strstart += s->match_length; + s->match_length = 0; + s->ins_h = s->window[s->strstart]; + UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]); +#if MIN_MATCH != 3 + Call UPDATE_HASH() MIN_MATCH-3 more times +#endif + /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not + * matter since it will be recomputed at next deflate call. + */ + } + } else { + /* No match, output a literal byte */ + Tracevv((stderr,"%c", s->window[s->strstart])); + _tr_tally_lit (s, s->window[s->strstart], bflush); + s->lookahead--; + s->strstart++; + } + if (bflush) FLUSH_BLOCK(s, 0); + } + s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1; + if (flush == Z_FINISH) { + FLUSH_BLOCK(s, 1); + return finish_done; + } + if (s->last_lit) + FLUSH_BLOCK(s, 0); + return block_done; +} + +#ifndef FASTEST +/* =========================================================================== + * Same as above, but achieves better compression. We use a lazy + * evaluation for matches: a match is finally adopted only if there is + * no better match at the next window position. + */ +local block_state deflate_slow(s, flush) + deflate_state *s; + int flush; +{ + IPos hash_head; /* head of hash chain */ + int bflush; /* set if current block must be flushed */ + + /* Process the input block. */ + for (;;) { + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the next match, plus MIN_MATCH bytes to insert the + * string following the next match. + */ + if (s->lookahead < MIN_LOOKAHEAD) { + fill_window(s); + if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { + return need_more; + } + if (s->lookahead == 0) break; /* flush the current block */ + } + + /* Insert the string window[strstart .. strstart+2] in the + * dictionary, and set hash_head to the head of the hash chain: + */ + hash_head = NIL; + if (s->lookahead >= MIN_MATCH) { + INSERT_STRING(s, s->strstart, hash_head); + } + + /* Find the longest match, discarding those <= prev_length. + */ + s->prev_length = s->match_length, s->prev_match = s->match_start; + s->match_length = MIN_MATCH-1; + + if (hash_head != NIL && s->prev_length < s->max_lazy_match && + s->strstart - hash_head <= MAX_DIST(s)) { + /* To simplify the code, we prevent matches with the string + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). + */ + s->match_length = longest_match (s, hash_head); + /* longest_match() sets match_start */ + + if (s->match_length <= 5 && (s->strategy == Z_FILTERED +#if TOO_FAR <= 32767 + || (s->match_length == MIN_MATCH && + s->strstart - s->match_start > TOO_FAR) +#endif + )) { + + /* If prev_match is also MIN_MATCH, match_start is garbage + * but we will ignore the current match anyway. + */ + s->match_length = MIN_MATCH-1; + } + } + /* If there was a match at the previous step and the current + * match is not better, output the previous match: + */ + if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) { + uInt max_insert = s->strstart + s->lookahead - MIN_MATCH; + /* Do not insert strings in hash table beyond this. */ + + check_match(s, s->strstart-1, s->prev_match, s->prev_length); + + _tr_tally_dist(s, s->strstart -1 - s->prev_match, + s->prev_length - MIN_MATCH, bflush); + + /* Insert in hash table all strings up to the end of the match. + * strstart-1 and strstart are already inserted. If there is not + * enough lookahead, the last two strings are not inserted in + * the hash table. + */ + s->lookahead -= s->prev_length-1; + s->prev_length -= 2; + do { + if (++s->strstart <= max_insert) { + INSERT_STRING(s, s->strstart, hash_head); + } + } while (--s->prev_length != 0); + s->match_available = 0; + s->match_length = MIN_MATCH-1; + s->strstart++; + + if (bflush) FLUSH_BLOCK(s, 0); + + } else if (s->match_available) { + /* If there was no match at the previous position, output a + * single literal. If there was a match but the current match + * is longer, truncate the previous match to a single literal. + */ + Tracevv((stderr,"%c", s->window[s->strstart-1])); + _tr_tally_lit(s, s->window[s->strstart-1], bflush); + if (bflush) { + FLUSH_BLOCK_ONLY(s, 0); + } + s->strstart++; + s->lookahead--; + if (s->strm->avail_out == 0) return need_more; + } else { + /* There is no previous match to compare with, wait for + * the next step to decide. + */ + s->match_available = 1; + s->strstart++; + s->lookahead--; + } + } + Assert (flush != Z_NO_FLUSH, "no flush?"); + if (s->match_available) { + Tracevv((stderr,"%c", s->window[s->strstart-1])); + _tr_tally_lit(s, s->window[s->strstart-1], bflush); + s->match_available = 0; + } + s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1; + if (flush == Z_FINISH) { + FLUSH_BLOCK(s, 1); + return finish_done; + } + if (s->last_lit) + FLUSH_BLOCK(s, 0); + return block_done; +} +#endif /* FASTEST */ + +/* =========================================================================== + * For Z_RLE, simply look for runs of bytes, generate matches only of distance + * one. Do not maintain a hash table. (It will be regenerated if this run of + * deflate switches away from Z_RLE.) + */ +local block_state deflate_rle(s, flush) + deflate_state *s; + int flush; +{ + int bflush; /* set if current block must be flushed */ + uInt prev; /* byte at distance one to match */ + Bytef *scan, *strend; /* scan goes up to strend for length of run */ + + for (;;) { + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the longest run, plus one for the unrolled loop. + */ + if (s->lookahead <= MAX_MATCH) { + fill_window(s); + if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) { + return need_more; + } + if (s->lookahead == 0) break; /* flush the current block */ + } + + /* See how many times the previous byte repeats */ + s->match_length = 0; + if (s->lookahead >= MIN_MATCH && s->strstart > 0) { + scan = s->window + s->strstart - 1; + prev = *scan; + if (prev == *++scan && prev == *++scan && prev == *++scan) { + strend = s->window + s->strstart + MAX_MATCH; + do { + } while (prev == *++scan && prev == *++scan && + prev == *++scan && prev == *++scan && + prev == *++scan && prev == *++scan && + prev == *++scan && prev == *++scan && + scan < strend); + s->match_length = MAX_MATCH - (int)(strend - scan); + if (s->match_length > s->lookahead) + s->match_length = s->lookahead; + } + Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan"); + } + + /* Emit match if have run of MIN_MATCH or longer, else emit literal */ + if (s->match_length >= MIN_MATCH) { + check_match(s, s->strstart, s->strstart - 1, s->match_length); + + _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush); + + s->lookahead -= s->match_length; + s->strstart += s->match_length; + s->match_length = 0; + } else { + /* No match, output a literal byte */ + Tracevv((stderr,"%c", s->window[s->strstart])); + _tr_tally_lit (s, s->window[s->strstart], bflush); + s->lookahead--; + s->strstart++; + } + if (bflush) FLUSH_BLOCK(s, 0); + } + s->insert = 0; + if (flush == Z_FINISH) { + FLUSH_BLOCK(s, 1); + return finish_done; + } + if (s->last_lit) + FLUSH_BLOCK(s, 0); + return block_done; +} + +/* =========================================================================== + * For Z_HUFFMAN_ONLY, do not look for matches. Do not maintain a hash table. + * (It will be regenerated if this run of deflate switches away from Huffman.) + */ +local block_state deflate_huff(s, flush) + deflate_state *s; + int flush; +{ + int bflush; /* set if current block must be flushed */ + + for (;;) { + /* Make sure that we have a literal to write. */ + if (s->lookahead == 0) { + fill_window(s); + if (s->lookahead == 0) { + if (flush == Z_NO_FLUSH) + return need_more; + break; /* flush the current block */ + } + } + + /* Output a literal byte */ + s->match_length = 0; + Tracevv((stderr,"%c", s->window[s->strstart])); + _tr_tally_lit (s, s->window[s->strstart], bflush); + s->lookahead--; + s->strstart++; + if (bflush) FLUSH_BLOCK(s, 0); + } + s->insert = 0; + if (flush == Z_FINISH) { + FLUSH_BLOCK(s, 1); + return finish_done; + } + if (s->last_lit) + FLUSH_BLOCK(s, 0); + return block_done; +} diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/deflate.h b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/deflate.h new file mode 100644 index 0000000000..ce0299edd1 --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/deflate.h @@ -0,0 +1,346 @@ +/* deflate.h -- internal compression state + * Copyright (C) 1995-2012 Jean-loup Gailly + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +/* @(#) $Id$ */ + +#ifndef DEFLATE_H +#define DEFLATE_H + +#include "zutil.h" + +/* define NO_GZIP when compiling if you want to disable gzip header and + trailer creation by deflate(). NO_GZIP would be used to avoid linking in + the crc code when it is not needed. For shared libraries, gzip encoding + should be left enabled. */ +#ifndef NO_GZIP +# define GZIP +#endif + +/* =========================================================================== + * Internal compression state. + */ + +#define LENGTH_CODES 29 +/* number of length codes, not counting the special END_BLOCK code */ + +#define LITERALS 256 +/* number of literal bytes 0..255 */ + +#define L_CODES (LITERALS+1+LENGTH_CODES) +/* number of Literal or Length codes, including the END_BLOCK code */ + +#define D_CODES 30 +/* number of distance codes */ + +#define BL_CODES 19 +/* number of codes used to transfer the bit lengths */ + +#define HEAP_SIZE (2*L_CODES+1) +/* maximum heap size */ + +#define MAX_BITS 15 +/* All codes must not exceed MAX_BITS bits */ + +#define Buf_size 16 +/* size of bit buffer in bi_buf */ + +#define INIT_STATE 42 +#define EXTRA_STATE 69 +#define NAME_STATE 73 +#define COMMENT_STATE 91 +#define HCRC_STATE 103 +#define BUSY_STATE 113 +#define FINISH_STATE 666 +/* Stream status */ + + +/* Data structure describing a single value and its code string. */ +typedef struct ct_data_s { + union { + ush freq; /* frequency count */ + ush code; /* bit string */ + } fc; + union { + ush dad; /* father node in Huffman tree */ + ush len; /* length of bit string */ + } dl; +} FAR ct_data; + +#define Freq fc.freq +#define Code fc.code +#define Dad dl.dad +#define Len dl.len + +typedef struct static_tree_desc_s static_tree_desc; + +typedef struct tree_desc_s { + ct_data *dyn_tree; /* the dynamic tree */ + int max_code; /* largest code with non zero frequency */ + static_tree_desc *stat_desc; /* the corresponding static tree */ +} FAR tree_desc; + +typedef ush Pos; +typedef Pos FAR Posf; +typedef unsigned IPos; + +/* A Pos is an index in the character window. We use short instead of int to + * save space in the various tables. IPos is used only for parameter passing. + */ + +typedef struct internal_state { + z_streamp strm; /* pointer back to this zlib stream */ + int status; /* as the name implies */ + Bytef *pending_buf; /* output still pending */ + ulg pending_buf_size; /* size of pending_buf */ + Bytef *pending_out; /* next pending byte to output to the stream */ + uInt pending; /* nb of bytes in the pending buffer */ + int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ + gz_headerp gzhead; /* gzip header information to write */ + uInt gzindex; /* where in extra, name, or comment */ + Byte method; /* can only be DEFLATED */ + int last_flush; /* value of flush param for previous deflate call */ + + /* used by deflate.c: */ + + uInt w_size; /* LZ77 window size (32K by default) */ + uInt w_bits; /* log2(w_size) (8..16) */ + uInt w_mask; /* w_size - 1 */ + + Bytef *window; + /* Sliding window. Input bytes are read into the second half of the window, + * and move to the first half later to keep a dictionary of at least wSize + * bytes. With this organization, matches are limited to a distance of + * wSize-MAX_MATCH bytes, but this ensures that IO is always + * performed with a length multiple of the block size. Also, it limits + * the window size to 64K, which is quite useful on MSDOS. + * To do: use the user input buffer as sliding window. + */ + + ulg window_size; + /* Actual size of window: 2*wSize, except when the user input buffer + * is directly used as sliding window. + */ + + Posf *prev; + /* Link to older string with same hash index. To limit the size of this + * array to 64K, this link is maintained only for the last 32K strings. + * An index in this array is thus a window index modulo 32K. + */ + + Posf *head; /* Heads of the hash chains or NIL. */ + + uInt ins_h; /* hash index of string to be inserted */ + uInt hash_size; /* number of elements in hash table */ + uInt hash_bits; /* log2(hash_size) */ + uInt hash_mask; /* hash_size-1 */ + + uInt hash_shift; + /* Number of bits by which ins_h must be shifted at each input + * step. It must be such that after MIN_MATCH steps, the oldest + * byte no longer takes part in the hash key, that is: + * hash_shift * MIN_MATCH >= hash_bits + */ + + long block_start; + /* Window position at the beginning of the current output block. Gets + * negative when the window is moved backwards. + */ + + uInt match_length; /* length of best match */ + IPos prev_match; /* previous match */ + int match_available; /* set if previous match exists */ + uInt strstart; /* start of string to insert */ + uInt match_start; /* start of matching string */ + uInt lookahead; /* number of valid bytes ahead in window */ + + uInt prev_length; + /* Length of the best match at previous step. Matches not greater than this + * are discarded. This is used in the lazy match evaluation. + */ + + uInt max_chain_length; + /* To speed up deflation, hash chains are never searched beyond this + * length. A higher limit improves compression ratio but degrades the + * speed. + */ + + uInt max_lazy_match; + /* Attempt to find a better match only when the current match is strictly + * smaller than this value. This mechanism is used only for compression + * levels >= 4. + */ +# define max_insert_length max_lazy_match + /* Insert new strings in the hash table only if the match length is not + * greater than this length. This saves time but degrades compression. + * max_insert_length is used only for compression levels <= 3. + */ + + int level; /* compression level (1..9) */ + int strategy; /* favor or force Huffman coding*/ + + uInt good_match; + /* Use a faster search when the previous match is longer than this */ + + int nice_match; /* Stop searching when current match exceeds this */ + + /* used by trees.c: */ + /* Didn't use ct_data typedef below to suppress compiler warning */ + struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ + struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ + struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ + + struct tree_desc_s l_desc; /* desc. for literal tree */ + struct tree_desc_s d_desc; /* desc. for distance tree */ + struct tree_desc_s bl_desc; /* desc. for bit length tree */ + + ush bl_count[MAX_BITS+1]; + /* number of codes at each bit length for an optimal tree */ + + int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */ + int heap_len; /* number of elements in the heap */ + int heap_max; /* element of largest frequency */ + /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used. + * The same heap array is used to build all trees. + */ + + uch depth[2*L_CODES+1]; + /* Depth of each subtree used as tie breaker for trees of equal frequency + */ + + uchf *l_buf; /* buffer for literals or lengths */ + + uInt lit_bufsize; + /* Size of match buffer for literals/lengths. There are 4 reasons for + * limiting lit_bufsize to 64K: + * - frequencies can be kept in 16 bit counters + * - if compression is not successful for the first block, all input + * data is still in the window so we can still emit a stored block even + * when input comes from standard input. (This can also be done for + * all blocks if lit_bufsize is not greater than 32K.) + * - if compression is not successful for a file smaller than 64K, we can + * even emit a stored file instead of a stored block (saving 5 bytes). + * This is applicable only for zip (not gzip or zlib). + * - creating new Huffman trees less frequently may not provide fast + * adaptation to changes in the input data statistics. (Take for + * example a binary file with poorly compressible code followed by + * a highly compressible string table.) Smaller buffer sizes give + * fast adaptation but have of course the overhead of transmitting + * trees more frequently. + * - I can't count above 4 + */ + + uInt last_lit; /* running index in l_buf */ + + ushf *d_buf; + /* Buffer for distances. To simplify the code, d_buf and l_buf have + * the same number of elements. To use different lengths, an extra flag + * array would be necessary. + */ + + ulg opt_len; /* bit length of current block with optimal trees */ + ulg static_len; /* bit length of current block with static trees */ + uInt matches; /* number of string matches in current block */ + uInt insert; /* bytes at end of window left to insert */ + +#ifdef DEBUG + ulg compressed_len; /* total bit length of compressed file mod 2^32 */ + ulg bits_sent; /* bit length of compressed data sent mod 2^32 */ +#endif + + ush bi_buf; + /* Output buffer. bits are inserted starting at the bottom (least + * significant bits). + */ + int bi_valid; + /* Number of valid bits in bi_buf. All bits above the last valid bit + * are always zero. + */ + + ulg high_water; + /* High water mark offset in window for initialized bytes -- bytes above + * this are set to zero in order to avoid memory check warnings when + * longest match routines access bytes past the input. This is then + * updated to the new high water mark. + */ + +} FAR deflate_state; + +/* Output a byte on the stream. + * IN assertion: there is enough room in pending_buf. + */ +#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);} + + +#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) +/* Minimum amount of lookahead, except at the end of the input file. + * See deflate.c for comments about the MIN_MATCH+1. + */ + +#define MAX_DIST(s) ((s)->w_size-MIN_LOOKAHEAD) +/* In order to simplify the code, particularly on 16 bit machines, match + * distances are limited to MAX_DIST instead of WSIZE. + */ + +#define WIN_INIT MAX_MATCH +/* Number of bytes after end of data in window to initialize in order to avoid + memory checker errors from longest match routines */ + + /* in trees.c */ +void ZLIB_INTERNAL _tr_init OF((deflate_state *s)); +int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); +void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf, + ulg stored_len, int last)); +void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s)); +void ZLIB_INTERNAL _tr_align OF((deflate_state *s)); +void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, + ulg stored_len, int last)); + +#define d_code(dist) \ + ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)]) +/* Mapping from a distance to a distance code. dist is the distance - 1 and + * must not have side effects. _dist_code[256] and _dist_code[257] are never + * used. + */ + +#ifndef DEBUG +/* Inline versions of _tr_tally for speed: */ + +#if defined(GEN_TREES_H) || !defined(STDC) + extern uch ZLIB_INTERNAL _length_code[]; + extern uch ZLIB_INTERNAL _dist_code[]; +#else + extern const uch ZLIB_INTERNAL _length_code[]; + extern const uch ZLIB_INTERNAL _dist_code[]; +#endif + +# define _tr_tally_lit(s, c, flush) \ + { uch cc = (c); \ + s->d_buf[s->last_lit] = 0; \ + s->l_buf[s->last_lit++] = cc; \ + s->dyn_ltree[cc].Freq++; \ + flush = (s->last_lit == s->lit_bufsize-1); \ + } +# define _tr_tally_dist(s, distance, length, flush) \ + { uch len = (length); \ + ush dist = (distance); \ + s->d_buf[s->last_lit] = dist; \ + s->l_buf[s->last_lit++] = len; \ + dist--; \ + s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ + s->dyn_dtree[d_code(dist)].Freq++; \ + flush = (s->last_lit == s->lit_bufsize-1); \ + } +#else +# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) +# define _tr_tally_dist(s, distance, length, flush) \ + flush = _tr_tally(s, distance, length) +#endif + +#endif /* DEFLATE_H */ diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/gzguts.h b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/gzguts.h new file mode 100644 index 0000000000..d87659d031 --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/gzguts.h @@ -0,0 +1,209 @@ +/* gzguts.h -- zlib internal header definitions for gz* operations + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#ifdef _LARGEFILE64_SOURCE +# ifndef _LARGEFILE_SOURCE +# define _LARGEFILE_SOURCE 1 +# endif +# ifdef _FILE_OFFSET_BITS +# undef _FILE_OFFSET_BITS +# endif +#endif + +#ifdef HAVE_HIDDEN +# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) +#else +# define ZLIB_INTERNAL +#endif + +#include <stdio.h> +#include "zlib.h" +#ifdef STDC +# include <string.h> +# include <stdlib.h> +# include <limits.h> +#endif +#include <fcntl.h> + +#ifdef _WIN32 +# include <stddef.h> +#endif + +#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32) +# include <io.h> +#endif + +#ifdef WINAPI_FAMILY +# define open _open +# define read _read +# define write _write +# define close _close +#endif + +#ifdef NO_DEFLATE /* for compatibility with old definition */ +# define NO_GZCOMPRESS +#endif + +#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) +# ifndef HAVE_VSNPRINTF +# define HAVE_VSNPRINTF +# endif +#endif + +#if defined(__CYGWIN__) +# ifndef HAVE_VSNPRINTF +# define HAVE_VSNPRINTF +# endif +#endif + +#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410) +# ifndef HAVE_VSNPRINTF +# define HAVE_VSNPRINTF +# endif +#endif + +#ifndef HAVE_VSNPRINTF +# ifdef MSDOS +/* vsnprintf may exist on some MS-DOS compilers (DJGPP?), + but for now we just assume it doesn't. */ +# define NO_vsnprintf +# endif +# ifdef __TURBOC__ +# define NO_vsnprintf +# endif +# ifdef WIN32 +/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ +# if !defined(vsnprintf) && !defined(NO_vsnprintf) +# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 ) +# define vsnprintf _vsnprintf +# endif +# endif +# endif +# ifdef __SASC +# define NO_vsnprintf +# endif +# ifdef VMS +# define NO_vsnprintf +# endif +# ifdef __OS400__ +# define NO_vsnprintf +# endif +# ifdef __MVS__ +# define NO_vsnprintf +# endif +#endif + +/* unlike snprintf (which is required in C99, yet still not supported by + Microsoft more than a decade later!), _snprintf does not guarantee null + termination of the result -- however this is only used in gzlib.c where + the result is assured to fit in the space provided */ +#ifdef _MSC_VER +# define snprintf _snprintf +#endif + +#ifndef local +# define local static +#endif +/* compile with -Dlocal if your debugger can't find static symbols */ + +/* gz* functions always use library allocation functions */ +#ifndef STDC + extern voidp malloc OF((uInt size)); + extern void free OF((voidpf ptr)); +#endif + +/* get errno and strerror definition */ +#if defined UNDER_CE +# include <windows.h> +# define zstrerror() gz_strwinerror((DWORD)GetLastError()) +#else +# ifndef NO_STRERROR +# include <errno.h> +# define zstrerror() strerror(errno) +# else +# define zstrerror() "stdio error (consult errno)" +# endif +#endif + +/* provide prototypes for these when building zlib without LFS */ +#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0 + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); + ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); + ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); +#endif + +/* default memLevel */ +#if MAX_MEM_LEVEL >= 8 +# define DEF_MEM_LEVEL 8 +#else +# define DEF_MEM_LEVEL MAX_MEM_LEVEL +#endif + +/* default i/o buffer size -- double this for output when reading (this and + twice this must be able to fit in an unsigned type) */ +#define GZBUFSIZE 8192 + +/* gzip modes, also provide a little integrity check on the passed structure */ +#define GZ_NONE 0 +#define GZ_READ 7247 +#define GZ_WRITE 31153 +#define GZ_APPEND 1 /* mode set to GZ_WRITE after the file is opened */ + +/* values for gz_state how */ +#define LOOK 0 /* look for a gzip header */ +#define COPY 1 /* copy input directly */ +#define GZIP 2 /* decompress a gzip stream */ + +/* internal gzip file state data structure */ +typedef struct { + /* exposed contents for gzgetc() macro */ + struct gzFile_s x; /* "x" for exposed */ + /* x.have: number of bytes available at x.next */ + /* x.next: next output data to deliver or write */ + /* x.pos: current position in uncompressed data */ + /* used for both reading and writing */ + int mode; /* see gzip modes above */ + int fd; /* file descriptor */ + char *path; /* path or fd for error messages */ + unsigned size; /* buffer size, zero if not allocated yet */ + unsigned want; /* requested buffer size, default is GZBUFSIZE */ + unsigned char *in; /* input buffer */ + unsigned char *out; /* output buffer (double-sized when reading) */ + int direct; /* 0 if processing gzip, 1 if transparent */ + /* just for reading */ + int how; /* 0: get header, 1: copy, 2: decompress */ + z_off64_t start; /* where the gzip data started, for rewinding */ + int eof; /* true if end of input file reached */ + int past; /* true if read requested past end */ + /* just for writing */ + int level; /* compression level */ + int strategy; /* compression strategy */ + /* seek request */ + z_off64_t skip; /* amount to skip (already rewound if backwards) */ + int seek; /* true if seek request pending */ + /* error information */ + int err; /* error code */ + char *msg; /* error message */ + /* zlib inflate or deflate stream */ + z_stream strm; /* stream structure in-place (not a pointer) */ +} gz_state; +typedef gz_state FAR *gz_statep; + +/* shared functions */ +void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *)); +#if defined UNDER_CE +char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error)); +#endif + +/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t + value -- needed when comparing unsigned to z_off64_t, which is signed + (possible z_off64_t types off_t, off64_t, and long are all signed) */ +#ifdef INT_MAX +# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX) +#else +unsigned ZLIB_INTERNAL gz_intmax OF((void)); +# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax()) +#endif diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/infback.c b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/infback.c new file mode 100644 index 0000000000..f3833c2e43 --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/infback.c @@ -0,0 +1,640 @@ +/* infback.c -- inflate using a call-back interface + * Copyright (C) 1995-2011 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + This code is largely copied from inflate.c. Normally either infback.o or + inflate.o would be linked into an application--not both. The interface + with inffast.c is retained so that optimized assembler-coded versions of + inflate_fast() can be used with either inflate.c or infback.c. + */ + +#include "zutil.h" +#include "inftrees.h" +#include "inflate.h" +#include "inffast.h" + +/* function prototypes */ +local void fixedtables OF((struct inflate_state FAR *state)); + +/* + strm provides memory allocation functions in zalloc and zfree, or + Z_NULL to use the library memory allocation functions. + + windowBits is in the range 8..15, and window is a user-supplied + window and output buffer that is 2**windowBits bytes. + */ +int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) +z_streamp strm; +int windowBits; +unsigned char FAR *window; +const char *version; +int stream_size; +{ + struct inflate_state FAR *state; + + if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || + stream_size != (int)(sizeof(z_stream))) + return Z_VERSION_ERROR; + if (strm == Z_NULL || window == Z_NULL || + windowBits < 8 || windowBits > 15) + return Z_STREAM_ERROR; + strm->msg = Z_NULL; /* in case we return an error */ + if (strm->zalloc == (alloc_func)0) { +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; +#endif + } + if (strm->zfree == (free_func)0) +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else + strm->zfree = zcfree; +#endif + state = (struct inflate_state FAR *)ZALLOC(strm, 1, + sizeof(struct inflate_state)); + if (state == Z_NULL) return Z_MEM_ERROR; + Tracev((stderr, "inflate: allocated\n")); + strm->state = (struct internal_state FAR *)state; + state->dmax = 32768U; + state->wbits = windowBits; + state->wsize = 1U << windowBits; + state->window = window; + state->wnext = 0; + state->whave = 0; + return Z_OK; +} + +/* + Return state with length and distance decoding tables and index sizes set to + fixed code decoding. Normally this returns fixed tables from inffixed.h. + If BUILDFIXED is defined, then instead this routine builds the tables the + first time it's called, and returns those tables the first time and + thereafter. This reduces the size of the code by about 2K bytes, in + exchange for a little execution time. However, BUILDFIXED should not be + used for threaded applications, since the rewriting of the tables and virgin + may not be thread-safe. + */ +local void fixedtables(state) +struct inflate_state FAR *state; +{ +#ifdef BUILDFIXED + static int virgin = 1; + static code *lenfix, *distfix; + static code fixed[544]; + + /* build fixed huffman tables if first call (may not be thread safe) */ + if (virgin) { + unsigned sym, bits; + static code *next; + + /* literal/length table */ + sym = 0; + while (sym < 144) state->lens[sym++] = 8; + while (sym < 256) state->lens[sym++] = 9; + while (sym < 280) state->lens[sym++] = 7; + while (sym < 288) state->lens[sym++] = 8; + next = fixed; + lenfix = next; + bits = 9; + inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); + + /* distance table */ + sym = 0; + while (sym < 32) state->lens[sym++] = 5; + distfix = next; + bits = 5; + inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); + + /* do this just once */ + virgin = 0; + } +#else /* !BUILDFIXED */ +# include "inffixed.h" +#endif /* BUILDFIXED */ + state->lencode = lenfix; + state->lenbits = 9; + state->distcode = distfix; + state->distbits = 5; +} + +/* Macros for inflateBack(): */ + +/* Load returned state from inflate_fast() */ +#define LOAD() \ + do { \ + put = strm->next_out; \ + left = strm->avail_out; \ + next = strm->next_in; \ + have = strm->avail_in; \ + hold = state->hold; \ + bits = state->bits; \ + } while (0) + +/* Set state from registers for inflate_fast() */ +#define RESTORE() \ + do { \ + strm->next_out = put; \ + strm->avail_out = left; \ + strm->next_in = next; \ + strm->avail_in = have; \ + state->hold = hold; \ + state->bits = bits; \ + } while (0) + +/* Clear the input bit accumulator */ +#define INITBITS() \ + do { \ + hold = 0; \ + bits = 0; \ + } while (0) + +/* Assure that some input is available. If input is requested, but denied, + then return a Z_BUF_ERROR from inflateBack(). */ +#define PULL() \ + do { \ + if (have == 0) { \ + have = in(in_desc, &next); \ + if (have == 0) { \ + next = Z_NULL; \ + ret = Z_BUF_ERROR; \ + goto inf_leave; \ + } \ + } \ + } while (0) + +/* Get a byte of input into the bit accumulator, or return from inflateBack() + with an error if there is no input available. */ +#define PULLBYTE() \ + do { \ + PULL(); \ + have--; \ + hold += (unsigned long)(*next++) << bits; \ + bits += 8; \ + } while (0) + +/* Assure that there are at least n bits in the bit accumulator. If there is + not enough available input to do that, then return from inflateBack() with + an error. */ +#define NEEDBITS(n) \ + do { \ + while (bits < (unsigned)(n)) \ + PULLBYTE(); \ + } while (0) + +/* Return the low n bits of the bit accumulator (n < 16) */ +#define BITS(n) \ + ((unsigned)hold & ((1U << (n)) - 1)) + +/* Remove n bits from the bit accumulator */ +#define DROPBITS(n) \ + do { \ + hold >>= (n); \ + bits -= (unsigned)(n); \ + } while (0) + +/* Remove zero to seven bits as needed to go to a byte boundary */ +#define BYTEBITS() \ + do { \ + hold >>= bits & 7; \ + bits -= bits & 7; \ + } while (0) + +/* Assure that some output space is available, by writing out the window + if it's full. If the write fails, return from inflateBack() with a + Z_BUF_ERROR. */ +#define ROOM() \ + do { \ + if (left == 0) { \ + put = state->window; \ + left = state->wsize; \ + state->whave = left; \ + if (out(out_desc, put, left)) { \ + ret = Z_BUF_ERROR; \ + goto inf_leave; \ + } \ + } \ + } while (0) + +/* + strm provides the memory allocation functions and window buffer on input, + and provides information on the unused input on return. For Z_DATA_ERROR + returns, strm will also provide an error message. + + in() and out() are the call-back input and output functions. When + inflateBack() needs more input, it calls in(). When inflateBack() has + filled the window with output, or when it completes with data in the + window, it calls out() to write out the data. The application must not + change the provided input until in() is called again or inflateBack() + returns. The application must not change the window/output buffer until + inflateBack() returns. + + in() and out() are called with a descriptor parameter provided in the + inflateBack() call. This parameter can be a structure that provides the + information required to do the read or write, as well as accumulated + information on the input and output such as totals and check values. + + in() should return zero on failure. out() should return non-zero on + failure. If either in() or out() fails, than inflateBack() returns a + Z_BUF_ERROR. strm->next_in can be checked for Z_NULL to see whether it + was in() or out() that caused in the error. Otherwise, inflateBack() + returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format + error, or Z_MEM_ERROR if it could not allocate memory for the state. + inflateBack() can also return Z_STREAM_ERROR if the input parameters + are not correct, i.e. strm is Z_NULL or the state was not initialized. + */ +int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) +z_streamp strm; +in_func in; +void FAR *in_desc; +out_func out; +void FAR *out_desc; +{ + struct inflate_state FAR *state; + z_const unsigned char FAR *next; /* next input */ + unsigned char FAR *put; /* next output */ + unsigned have, left; /* available input and output */ + unsigned long hold; /* bit buffer */ + unsigned bits; /* bits in bit buffer */ + unsigned copy; /* number of stored or match bytes to copy */ + unsigned char FAR *from; /* where to copy match bytes from */ + code here; /* current decoding table entry */ + code last; /* parent table entry */ + unsigned len; /* length to copy for repeats, bits to drop */ + int ret; /* return code */ + static const unsigned short order[19] = /* permutation of code lengths */ + {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; + + /* Check that the strm exists and that the state was initialized */ + if (strm == Z_NULL || strm->state == Z_NULL) + return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + + /* Reset the state */ + strm->msg = Z_NULL; + state->mode = TYPE; + state->last = 0; + state->whave = 0; + next = strm->next_in; + have = next != Z_NULL ? strm->avail_in : 0; + hold = 0; + bits = 0; + put = state->window; + left = state->wsize; + + /* Inflate until end of block marked as last */ + for (;;) + switch (state->mode) { + case TYPE: + /* determine and dispatch block type */ + if (state->last) { + BYTEBITS(); + state->mode = DONE; + break; + } + NEEDBITS(3); + state->last = BITS(1); + DROPBITS(1); + switch (BITS(2)) { + case 0: /* stored block */ + Tracev((stderr, "inflate: stored block%s\n", + state->last ? " (last)" : "")); + state->mode = STORED; + break; + case 1: /* fixed block */ + fixedtables(state); + Tracev((stderr, "inflate: fixed codes block%s\n", + state->last ? " (last)" : "")); + state->mode = LEN; /* decode codes */ + break; + case 2: /* dynamic block */ + Tracev((stderr, "inflate: dynamic codes block%s\n", + state->last ? " (last)" : "")); + state->mode = TABLE; + break; + case 3: + strm->msg = (char *)"invalid block type"; + state->mode = BAD; + } + DROPBITS(2); + break; + + case STORED: + /* get and verify stored block length */ + BYTEBITS(); /* go to byte boundary */ + NEEDBITS(32); + if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { + strm->msg = (char *)"invalid stored block lengths"; + state->mode = BAD; + break; + } + state->length = (unsigned)hold & 0xffff; + Tracev((stderr, "inflate: stored length %u\n", + state->length)); + INITBITS(); + + /* copy stored block from input to output */ + while (state->length != 0) { + copy = state->length; + PULL(); + ROOM(); + if (copy > have) copy = have; + if (copy > left) copy = left; + zmemcpy(put, next, copy); + have -= copy; + next += copy; + left -= copy; + put += copy; + state->length -= copy; + } + Tracev((stderr, "inflate: stored end\n")); + state->mode = TYPE; + break; + + case TABLE: + /* get dynamic table entries descriptor */ + NEEDBITS(14); + state->nlen = BITS(5) + 257; + DROPBITS(5); + state->ndist = BITS(5) + 1; + DROPBITS(5); + state->ncode = BITS(4) + 4; + DROPBITS(4); +#ifndef PKZIP_BUG_WORKAROUND + if (state->nlen > 286 || state->ndist > 30) { + strm->msg = (char *)"too many length or distance symbols"; + state->mode = BAD; + break; + } +#endif + Tracev((stderr, "inflate: table sizes ok\n")); + + /* get code length code lengths (not a typo) */ + state->have = 0; + while (state->have < state->ncode) { + NEEDBITS(3); + state->lens[order[state->have++]] = (unsigned short)BITS(3); + DROPBITS(3); + } + while (state->have < 19) + state->lens[order[state->have++]] = 0; + state->next = state->codes; + state->lencode = (code const FAR *)(state->next); + state->lenbits = 7; + ret = inflate_table(CODES, state->lens, 19, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid code lengths set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: code lengths ok\n")); + + /* get length and distance code code lengths */ + state->have = 0; + while (state->have < state->nlen + state->ndist) { + for (;;) { + here = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } + if (here.val < 16) { + DROPBITS(here.bits); + state->lens[state->have++] = here.val; + } + else { + if (here.val == 16) { + NEEDBITS(here.bits + 2); + DROPBITS(here.bits); + if (state->have == 0) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + len = (unsigned)(state->lens[state->have - 1]); + copy = 3 + BITS(2); + DROPBITS(2); + } + else if (here.val == 17) { + NEEDBITS(here.bits + 3); + DROPBITS(here.bits); + len = 0; + copy = 3 + BITS(3); + DROPBITS(3); + } + else { + NEEDBITS(here.bits + 7); + DROPBITS(here.bits); + len = 0; + copy = 11 + BITS(7); + DROPBITS(7); + } + if (state->have + copy > state->nlen + state->ndist) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + while (copy--) + state->lens[state->have++] = (unsigned short)len; + } + } + + /* handle error breaks in while */ + if (state->mode == BAD) break; + + /* check for end-of-block code (better have one) */ + if (state->lens[256] == 0) { + strm->msg = (char *)"invalid code -- missing end-of-block"; + state->mode = BAD; + break; + } + + /* build code tables -- note: do not change the lenbits or distbits + values here (9 and 6) without reading the comments in inftrees.h + concerning the ENOUGH constants, which depend on those values */ + state->next = state->codes; + state->lencode = (code const FAR *)(state->next); + state->lenbits = 9; + ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid literal/lengths set"; + state->mode = BAD; + break; + } + state->distcode = (code const FAR *)(state->next); + state->distbits = 6; + ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, + &(state->next), &(state->distbits), state->work); + if (ret) { + strm->msg = (char *)"invalid distances set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: codes ok\n")); + state->mode = LEN; + + case LEN: + /* use inflate_fast() if we have enough input and output */ + if (have >= 6 && left >= 258) { + RESTORE(); + if (state->whave < state->wsize) + state->whave = state->wsize - left; + inflate_fast(strm, state->wsize); + LOAD(); + break; + } + + /* get a literal, length, or end-of-block code */ + for (;;) { + here = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } + if (here.op && (here.op & 0xf0) == 0) { + last = here; + for (;;) { + here = state->lencode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + here.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(here.bits); + state->length = (unsigned)here.val; + + /* process literal */ + if (here.op == 0) { + Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? + "inflate: literal '%c'\n" : + "inflate: literal 0x%02x\n", here.val)); + ROOM(); + *put++ = (unsigned char)(state->length); + left--; + state->mode = LEN; + break; + } + + /* process end of block */ + if (here.op & 32) { + Tracevv((stderr, "inflate: end of block\n")); + state->mode = TYPE; + break; + } + + /* invalid code */ + if (here.op & 64) { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } + + /* length code -- get extra bits, if any */ + state->extra = (unsigned)(here.op) & 15; + if (state->extra != 0) { + NEEDBITS(state->extra); + state->length += BITS(state->extra); + DROPBITS(state->extra); + } + Tracevv((stderr, "inflate: length %u\n", state->length)); + + /* get distance code */ + for (;;) { + here = state->distcode[BITS(state->distbits)]; + if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } + if ((here.op & 0xf0) == 0) { + last = here; + for (;;) { + here = state->distcode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + here.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(here.bits); + if (here.op & 64) { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } + state->offset = (unsigned)here.val; + + /* get distance extra bits, if any */ + state->extra = (unsigned)(here.op) & 15; + if (state->extra != 0) { + NEEDBITS(state->extra); + state->offset += BITS(state->extra); + DROPBITS(state->extra); + } + if (state->offset > state->wsize - (state->whave < state->wsize ? + left : 0)) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } + Tracevv((stderr, "inflate: distance %u\n", state->offset)); + + /* copy match from window to output */ + do { + ROOM(); + copy = state->wsize - state->offset; + if (copy < left) { + from = put + copy; + copy = left - copy; + } + else { + from = put - state->offset; + copy = left; + } + if (copy > state->length) copy = state->length; + state->length -= copy; + left -= copy; + do { + *put++ = *from++; + } while (--copy); + } while (state->length != 0); + break; + + case DONE: + /* inflate stream terminated properly -- write leftover output */ + ret = Z_STREAM_END; + if (left < state->wsize) { + if (out(out_desc, state->window, state->wsize - left)) + ret = Z_BUF_ERROR; + } + goto inf_leave; + + case BAD: + ret = Z_DATA_ERROR; + goto inf_leave; + + default: /* can't happen, but makes compilers happy */ + ret = Z_STREAM_ERROR; + goto inf_leave; + } + + /* Return unused input */ + inf_leave: + strm->next_in = next; + strm->avail_in = have; + return ret; +} + +int ZEXPORT inflateBackEnd(strm) +z_streamp strm; +{ + if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) + return Z_STREAM_ERROR; + ZFREE(strm, strm->state); + strm->state = Z_NULL; + Tracev((stderr, "inflate: end\n")); + return Z_OK; +} diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inffast.c b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inffast.c new file mode 100644 index 0000000000..bda59ceb6a --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inffast.c @@ -0,0 +1,340 @@ +/* inffast.c -- fast decoding + * Copyright (C) 1995-2008, 2010, 2013 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "zutil.h" +#include "inftrees.h" +#include "inflate.h" +#include "inffast.h" + +#ifndef ASMINF + +/* Allow machine dependent optimization for post-increment or pre-increment. + Based on testing to date, + Pre-increment preferred for: + - PowerPC G3 (Adler) + - MIPS R5000 (Randers-Pehrson) + Post-increment preferred for: + - none + No measurable difference: + - Pentium III (Anderson) + - M68060 (Nikl) + */ +#ifdef POSTINC +# define OFF 0 +# define PUP(a) *(a)++ +#else +# define OFF 1 +# define PUP(a) *++(a) +#endif + +/* + Decode literal, length, and distance codes and write out the resulting + literal and match bytes until either not enough input or output is + available, an end-of-block is encountered, or a data error is encountered. + When large enough input and output buffers are supplied to inflate(), for + example, a 16K input buffer and a 64K output buffer, more than 95% of the + inflate execution time is spent in this routine. + + Entry assumptions: + + state->mode == LEN + strm->avail_in >= 6 + strm->avail_out >= 258 + start >= strm->avail_out + state->bits < 8 + + On return, state->mode is one of: + + LEN -- ran out of enough output space or enough available input + TYPE -- reached end of block code, inflate() to interpret next block + BAD -- error in block data + + Notes: + + - The maximum input bits used by a length/distance pair is 15 bits for the + length code, 5 bits for the length extra, 15 bits for the distance code, + and 13 bits for the distance extra. This totals 48 bits, or six bytes. + Therefore if strm->avail_in >= 6, then there is enough input to avoid + checking for available input while decoding. + + - The maximum bytes that a single length/distance pair can output is 258 + bytes, which is the maximum length that can be coded. inflate_fast() + requires strm->avail_out >= 258 for each loop to avoid checking for + output space. + */ +void ZLIB_INTERNAL inflate_fast(strm, start) +z_streamp strm; +unsigned start; /* inflate()'s starting value for strm->avail_out */ +{ + struct inflate_state FAR *state; + z_const unsigned char FAR *in; /* local strm->next_in */ + z_const unsigned char FAR *last; /* have enough input while in < last */ + unsigned char FAR *out; /* local strm->next_out */ + unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ + unsigned char FAR *end; /* while out < end, enough space available */ +#ifdef INFLATE_STRICT + unsigned dmax; /* maximum distance from zlib header */ +#endif + unsigned wsize; /* window size or zero if not using window */ + unsigned whave; /* valid bytes in the window */ + unsigned wnext; /* window write index */ + unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */ + unsigned long hold; /* local strm->hold */ + unsigned bits; /* local strm->bits */ + code const FAR *lcode; /* local strm->lencode */ + code const FAR *dcode; /* local strm->distcode */ + unsigned lmask; /* mask for first level of length codes */ + unsigned dmask; /* mask for first level of distance codes */ + code here; /* retrieved table entry */ + unsigned op; /* code bits, operation, extra bits, or */ + /* window position, window bytes to copy */ + unsigned len; /* match length, unused bytes */ + unsigned dist; /* match distance */ + unsigned char FAR *from; /* where to copy match from */ + + /* copy state to local variables */ + state = (struct inflate_state FAR *)strm->state; + in = strm->next_in - OFF; + last = in + (strm->avail_in - 5); + out = strm->next_out - OFF; + beg = out - (start - strm->avail_out); + end = out + (strm->avail_out - 257); +#ifdef INFLATE_STRICT + dmax = state->dmax; +#endif + wsize = state->wsize; + whave = state->whave; + wnext = state->wnext; + window = state->window; + hold = state->hold; + bits = state->bits; + lcode = state->lencode; + dcode = state->distcode; + lmask = (1U << state->lenbits) - 1; + dmask = (1U << state->distbits) - 1; + + /* decode literals and length/distances until end-of-block or not enough + input data or output space */ + do { + if (bits < 15) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + here = lcode[hold & lmask]; + dolen: + op = (unsigned)(here.bits); + hold >>= op; + bits -= op; + op = (unsigned)(here.op); + if (op == 0) { /* literal */ + Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? + "inflate: literal '%c'\n" : + "inflate: literal 0x%02x\n", here.val)); + PUP(out) = (unsigned char)(here.val); + } + else if (op & 16) { /* length base */ + len = (unsigned)(here.val); + op &= 15; /* number of extra bits */ + if (op) { + if (bits < op) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + len += (unsigned)hold & ((1U << op) - 1); + hold >>= op; + bits -= op; + } + Tracevv((stderr, "inflate: length %u\n", len)); + if (bits < 15) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + here = dcode[hold & dmask]; + dodist: + op = (unsigned)(here.bits); + hold >>= op; + bits -= op; + op = (unsigned)(here.op); + if (op & 16) { /* distance base */ + dist = (unsigned)(here.val); + op &= 15; /* number of extra bits */ + if (bits < op) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + if (bits < op) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + } + dist += (unsigned)hold & ((1U << op) - 1); +#ifdef INFLATE_STRICT + if (dist > dmax) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } +#endif + hold >>= op; + bits -= op; + Tracevv((stderr, "inflate: distance %u\n", dist)); + op = (unsigned)(out - beg); /* max distance in output */ + if (dist > op) { /* see if copy from window */ + op = dist - op; /* distance back in window */ + if (op > whave) { + if (state->sane) { + strm->msg = + (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } +#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR + if (len <= op - whave) { + do { + PUP(out) = 0; + } while (--len); + continue; + } + len -= op - whave; + do { + PUP(out) = 0; + } while (--op > whave); + if (op == 0) { + from = out - dist; + do { + PUP(out) = PUP(from); + } while (--len); + continue; + } +#endif + } + from = window - OFF; + if (wnext == 0) { /* very common case */ + from += wsize - op; + if (op < len) { /* some from window */ + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = out - dist; /* rest from output */ + } + } + else if (wnext < op) { /* wrap around window */ + from += wsize + wnext - op; + op -= wnext; + if (op < len) { /* some from end of window */ + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = window - OFF; + if (wnext < len) { /* some from start of window */ + op = wnext; + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = out - dist; /* rest from output */ + } + } + } + else { /* contiguous in window */ + from += wnext - op; + if (op < len) { /* some from window */ + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = out - dist; /* rest from output */ + } + } + while (len > 2) { + PUP(out) = PUP(from); + PUP(out) = PUP(from); + PUP(out) = PUP(from); + len -= 3; + } + if (len) { + PUP(out) = PUP(from); + if (len > 1) + PUP(out) = PUP(from); + } + } + else { + from = out - dist; /* copy direct from output */ + do { /* minimum length is three */ + PUP(out) = PUP(from); + PUP(out) = PUP(from); + PUP(out) = PUP(from); + len -= 3; + } while (len > 2); + if (len) { + PUP(out) = PUP(from); + if (len > 1) + PUP(out) = PUP(from); + } + } + } + else if ((op & 64) == 0) { /* 2nd level distance code */ + here = dcode[here.val + (hold & ((1U << op) - 1))]; + goto dodist; + } + else { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } + } + else if ((op & 64) == 0) { /* 2nd level length code */ + here = lcode[here.val + (hold & ((1U << op) - 1))]; + goto dolen; + } + else if (op & 32) { /* end-of-block */ + Tracevv((stderr, "inflate: end of block\n")); + state->mode = TYPE; + break; + } + else { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } + } while (in < last && out < end); + + /* return unused bytes (on entry, bits < 8, so in won't go too far back) */ + len = bits >> 3; + in -= len; + bits -= len << 3; + hold &= (1U << bits) - 1; + + /* update state and return */ + strm->next_in = in + OFF; + strm->next_out = out + OFF; + strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last)); + strm->avail_out = (unsigned)(out < end ? + 257 + (end - out) : 257 - (out - end)); + state->hold = hold; + state->bits = bits; + return; +} + +/* + inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe): + - Using bit fields for code structure + - Different op definition to avoid & for extra bits (do & for table bits) + - Three separate decoding do-loops for direct, window, and wnext == 0 + - Special case for distance > 1 copies to do overlapped load and store copy + - Explicit branch predictions (based on measured branch probabilities) + - Deferring match copy and interspersed it with decoding subsequent codes + - Swapping literal/length else + - Swapping window/direct else + - Larger unrolled copy loops (three is about right) + - Moving len -= 3 statement into middle of loop + */ + +#endif /* !ASMINF */ diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inffast.h b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inffast.h new file mode 100644 index 0000000000..e5c1aa4ca8 --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inffast.h @@ -0,0 +1,11 @@ +/* inffast.h -- header to use inffast.c + * Copyright (C) 1995-2003, 2010 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start)); diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inffixed.h b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inffixed.h new file mode 100644 index 0000000000..d628327769 --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inffixed.h @@ -0,0 +1,94 @@ + /* inffixed.h -- table for decoding fixed codes + * Generated automatically by makefixed(). + */ + + /* WARNING: this file should *not* be used by applications. + It is part of the implementation of this library and is + subject to change. Applications should only use zlib.h. + */ + + static const code lenfix[512] = { + {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48}, + {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128}, + {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59}, + {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176}, + {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20}, + {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100}, + {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8}, + {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216}, + {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76}, + {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114}, + {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2}, + {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148}, + {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42}, + {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86}, + {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15}, + {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236}, + {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62}, + {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142}, + {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31}, + {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162}, + {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25}, + {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105}, + {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4}, + {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202}, + {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69}, + {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125}, + {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13}, + {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195}, + {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35}, + {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91}, + {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19}, + {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246}, + {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55}, + {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135}, + {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99}, + {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190}, + {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16}, + {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96}, + {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6}, + {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209}, + {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72}, + {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116}, + {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4}, + {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153}, + {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44}, + {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82}, + {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11}, + {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229}, + {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58}, + {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138}, + {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51}, + {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173}, + {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30}, + {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110}, + {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0}, + {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195}, + {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65}, + {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121}, + {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9}, + {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258}, + {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37}, + {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93}, + {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23}, + {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251}, + {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51}, + {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131}, + {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67}, + {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183}, + {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23}, + {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103}, + {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9}, + {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223}, + {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79}, + {0,9,255} + }; + + static const code distfix[32] = { + {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025}, + {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193}, + {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385}, + {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577}, + {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073}, + {22,5,193},{64,5,0} + }; diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inflate.c b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inflate.c new file mode 100644 index 0000000000..870f89bb4d --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inflate.c @@ -0,0 +1,1512 @@ +/* inflate.c -- zlib decompression + * Copyright (C) 1995-2012 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + * Change history: + * + * 1.2.beta0 24 Nov 2002 + * - First version -- complete rewrite of inflate to simplify code, avoid + * creation of window when not needed, minimize use of window when it is + * needed, make inffast.c even faster, implement gzip decoding, and to + * improve code readability and style over the previous zlib inflate code + * + * 1.2.beta1 25 Nov 2002 + * - Use pointers for available input and output checking in inffast.c + * - Remove input and output counters in inffast.c + * - Change inffast.c entry and loop from avail_in >= 7 to >= 6 + * - Remove unnecessary second byte pull from length extra in inffast.c + * - Unroll direct copy to three copies per loop in inffast.c + * + * 1.2.beta2 4 Dec 2002 + * - Change external routine names to reduce potential conflicts + * - Correct filename to inffixed.h for fixed tables in inflate.c + * - Make hbuf[] unsigned char to match parameter type in inflate.c + * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset) + * to avoid negation problem on Alphas (64 bit) in inflate.c + * + * 1.2.beta3 22 Dec 2002 + * - Add comments on state->bits assertion in inffast.c + * - Add comments on op field in inftrees.h + * - Fix bug in reuse of allocated window after inflateReset() + * - Remove bit fields--back to byte structure for speed + * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths + * - Change post-increments to pre-increments in inflate_fast(), PPC biased? + * - Add compile time option, POSTINC, to use post-increments instead (Intel?) + * - Make MATCH copy in inflate() much faster for when inflate_fast() not used + * - Use local copies of stream next and avail values, as well as local bit + * buffer and bit count in inflate()--for speed when inflate_fast() not used + * + * 1.2.beta4 1 Jan 2003 + * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings + * - Move a comment on output buffer sizes from inffast.c to inflate.c + * - Add comments in inffast.c to introduce the inflate_fast() routine + * - Rearrange window copies in inflate_fast() for speed and simplification + * - Unroll last copy for window match in inflate_fast() + * - Use local copies of window variables in inflate_fast() for speed + * - Pull out common wnext == 0 case for speed in inflate_fast() + * - Make op and len in inflate_fast() unsigned for consistency + * - Add FAR to lcode and dcode declarations in inflate_fast() + * - Simplified bad distance check in inflate_fast() + * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new + * source file infback.c to provide a call-back interface to inflate for + * programs like gzip and unzip -- uses window as output buffer to avoid + * window copying + * + * 1.2.beta5 1 Jan 2003 + * - Improved inflateBack() interface to allow the caller to provide initial + * input in strm. + * - Fixed stored blocks bug in inflateBack() + * + * 1.2.beta6 4 Jan 2003 + * - Added comments in inffast.c on effectiveness of POSTINC + * - Typecasting all around to reduce compiler warnings + * - Changed loops from while (1) or do {} while (1) to for (;;), again to + * make compilers happy + * - Changed type of window in inflateBackInit() to unsigned char * + * + * 1.2.beta7 27 Jan 2003 + * - Changed many types to unsigned or unsigned short to avoid warnings + * - Added inflateCopy() function + * + * 1.2.0 9 Mar 2003 + * - Changed inflateBack() interface to provide separate opaque descriptors + * for the in() and out() functions + * - Changed inflateBack() argument and in_func typedef to swap the length + * and buffer address return values for the input function + * - Check next_in and next_out for Z_NULL on entry to inflate() + * + * The history for versions after 1.2.0 are in ChangeLog in zlib distribution. + */ + +#include "zutil.h" +#include "inftrees.h" +#include "inflate.h" +#include "inffast.h" + +#ifdef MAKEFIXED +# ifndef BUILDFIXED +# define BUILDFIXED +# endif +#endif + +/* function prototypes */ +local void fixedtables OF((struct inflate_state FAR *state)); +local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, + unsigned copy)); +#ifdef BUILDFIXED + void makefixed OF((void)); +#endif +local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf, + unsigned len)); + +int ZEXPORT inflateResetKeep(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + strm->total_in = strm->total_out = state->total = 0; + strm->msg = Z_NULL; + if (state->wrap) /* to support ill-conceived Java test suite */ + strm->adler = state->wrap & 1; + state->mode = HEAD; + state->last = 0; + state->havedict = 0; + state->dmax = 32768U; + state->head = Z_NULL; + state->hold = 0; + state->bits = 0; + state->lencode = state->distcode = state->next = state->codes; + state->sane = 1; + state->back = -1; + Tracev((stderr, "inflate: reset\n")); + return Z_OK; +} + +int ZEXPORT inflateReset(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + state->wsize = 0; + state->whave = 0; + state->wnext = 0; + return inflateResetKeep(strm); +} + +int ZEXPORT inflateReset2(strm, windowBits) +z_streamp strm; +int windowBits; +{ + int wrap; + struct inflate_state FAR *state; + + /* get the state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + + /* extract wrap request from windowBits parameter */ + if (windowBits < 0) { + wrap = 0; + windowBits = -windowBits; + } + else { + wrap = (windowBits >> 4) + 1; +#ifdef GUNZIP + if (windowBits < 48) + windowBits &= 15; +#endif + } + + /* set number of window bits, free window if different */ + if (windowBits && (windowBits < 8 || windowBits > 15)) + return Z_STREAM_ERROR; + if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) { + ZFREE(strm, state->window); + state->window = Z_NULL; + } + + /* update state and reset the rest of it */ + state->wrap = wrap; + state->wbits = (unsigned)windowBits; + return inflateReset(strm); +} + +int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) +z_streamp strm; +int windowBits; +const char *version; +int stream_size; +{ + int ret; + struct inflate_state FAR *state; + + if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || + stream_size != (int)(sizeof(z_stream))) + return Z_VERSION_ERROR; + if (strm == Z_NULL) return Z_STREAM_ERROR; + strm->msg = Z_NULL; /* in case we return an error */ + if (strm->zalloc == (alloc_func)0) { +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; +#endif + } + if (strm->zfree == (free_func)0) +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else + strm->zfree = zcfree; +#endif + state = (struct inflate_state FAR *) + ZALLOC(strm, 1, sizeof(struct inflate_state)); + if (state == Z_NULL) return Z_MEM_ERROR; + Tracev((stderr, "inflate: allocated\n")); + strm->state = (struct internal_state FAR *)state; + state->window = Z_NULL; + ret = inflateReset2(strm, windowBits); + if (ret != Z_OK) { + ZFREE(strm, state); + strm->state = Z_NULL; + } + return ret; +} + +int ZEXPORT inflateInit_(strm, version, stream_size) +z_streamp strm; +const char *version; +int stream_size; +{ + return inflateInit2_(strm, DEF_WBITS, version, stream_size); +} + +int ZEXPORT inflatePrime(strm, bits, value) +z_streamp strm; +int bits; +int value; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (bits < 0) { + state->hold = 0; + state->bits = 0; + return Z_OK; + } + if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR; + value &= (1L << bits) - 1; + state->hold += value << state->bits; + state->bits += bits; + return Z_OK; +} + +/* + Return state with length and distance decoding tables and index sizes set to + fixed code decoding. Normally this returns fixed tables from inffixed.h. + If BUILDFIXED is defined, then instead this routine builds the tables the + first time it's called, and returns those tables the first time and + thereafter. This reduces the size of the code by about 2K bytes, in + exchange for a little execution time. However, BUILDFIXED should not be + used for threaded applications, since the rewriting of the tables and virgin + may not be thread-safe. + */ +local void fixedtables(state) +struct inflate_state FAR *state; +{ +#ifdef BUILDFIXED + static int virgin = 1; + static code *lenfix, *distfix; + static code fixed[544]; + + /* build fixed huffman tables if first call (may not be thread safe) */ + if (virgin) { + unsigned sym, bits; + static code *next; + + /* literal/length table */ + sym = 0; + while (sym < 144) state->lens[sym++] = 8; + while (sym < 256) state->lens[sym++] = 9; + while (sym < 280) state->lens[sym++] = 7; + while (sym < 288) state->lens[sym++] = 8; + next = fixed; + lenfix = next; + bits = 9; + inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); + + /* distance table */ + sym = 0; + while (sym < 32) state->lens[sym++] = 5; + distfix = next; + bits = 5; + inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); + + /* do this just once */ + virgin = 0; + } +#else /* !BUILDFIXED */ +# include "inffixed.h" +#endif /* BUILDFIXED */ + state->lencode = lenfix; + state->lenbits = 9; + state->distcode = distfix; + state->distbits = 5; +} + +#ifdef MAKEFIXED +#include <stdio.h> + +/* + Write out the inffixed.h that is #include'd above. Defining MAKEFIXED also + defines BUILDFIXED, so the tables are built on the fly. makefixed() writes + those tables to stdout, which would be piped to inffixed.h. A small program + can simply call makefixed to do this: + + void makefixed(void); + + int main(void) + { + makefixed(); + return 0; + } + + Then that can be linked with zlib built with MAKEFIXED defined and run: + + a.out > inffixed.h + */ +void makefixed() +{ + unsigned low, size; + struct inflate_state state; + + fixedtables(&state); + puts(" /* inffixed.h -- table for decoding fixed codes"); + puts(" * Generated automatically by makefixed()."); + puts(" */"); + puts(""); + puts(" /* WARNING: this file should *not* be used by applications."); + puts(" It is part of the implementation of this library and is"); + puts(" subject to change. Applications should only use zlib.h."); + puts(" */"); + puts(""); + size = 1U << 9; + printf(" static const code lenfix[%u] = {", size); + low = 0; + for (;;) { + if ((low % 7) == 0) printf("\n "); + printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op, + state.lencode[low].bits, state.lencode[low].val); + if (++low == size) break; + putchar(','); + } + puts("\n };"); + size = 1U << 5; + printf("\n static const code distfix[%u] = {", size); + low = 0; + for (;;) { + if ((low % 6) == 0) printf("\n "); + printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits, + state.distcode[low].val); + if (++low == size) break; + putchar(','); + } + puts("\n };"); +} +#endif /* MAKEFIXED */ + +/* + Update the window with the last wsize (normally 32K) bytes written before + returning. If window does not exist yet, create it. This is only called + when a window is already in use, or when output has been written during this + inflate call, but the end of the deflate stream has not been reached yet. + It is also called to create a window for dictionary data when a dictionary + is loaded. + + Providing output buffers larger than 32K to inflate() should provide a speed + advantage, since only the last 32K of output is copied to the sliding window + upon return from inflate(), and since all distances after the first 32K of + output will fall in the output data, making match copies simpler and faster. + The advantage may be dependent on the size of the processor's data caches. + */ +local int updatewindow(strm, end, copy) +z_streamp strm; +const Bytef *end; +unsigned copy; +{ + struct inflate_state FAR *state; + unsigned dist; + + state = (struct inflate_state FAR *)strm->state; + + /* if it hasn't been done already, allocate space for the window */ + if (state->window == Z_NULL) { + state->window = (unsigned char FAR *) + ZALLOC(strm, 1U << state->wbits, + sizeof(unsigned char)); + if (state->window == Z_NULL) return 1; + } + + /* if window not in use yet, initialize */ + if (state->wsize == 0) { + state->wsize = 1U << state->wbits; + state->wnext = 0; + state->whave = 0; + } + + /* copy state->wsize or less output bytes into the circular window */ + if (copy >= state->wsize) { + zmemcpy(state->window, end - state->wsize, state->wsize); + state->wnext = 0; + state->whave = state->wsize; + } + else { + dist = state->wsize - state->wnext; + if (dist > copy) dist = copy; + zmemcpy(state->window + state->wnext, end - copy, dist); + copy -= dist; + if (copy) { + zmemcpy(state->window, end - copy, copy); + state->wnext = copy; + state->whave = state->wsize; + } + else { + state->wnext += dist; + if (state->wnext == state->wsize) state->wnext = 0; + if (state->whave < state->wsize) state->whave += dist; + } + } + return 0; +} + +/* Macros for inflate(): */ + +/* check function to use adler32() for zlib or crc32() for gzip */ +#ifdef GUNZIP +# define UPDATE(check, buf, len) \ + (state->flags ? crc32(check, buf, len) : adler32(check, buf, len)) +#else +# define UPDATE(check, buf, len) adler32(check, buf, len) +#endif + +/* check macros for header crc */ +#ifdef GUNZIP +# define CRC2(check, word) \ + do { \ + hbuf[0] = (unsigned char)(word); \ + hbuf[1] = (unsigned char)((word) >> 8); \ + check = crc32(check, hbuf, 2); \ + } while (0) + +# define CRC4(check, word) \ + do { \ + hbuf[0] = (unsigned char)(word); \ + hbuf[1] = (unsigned char)((word) >> 8); \ + hbuf[2] = (unsigned char)((word) >> 16); \ + hbuf[3] = (unsigned char)((word) >> 24); \ + check = crc32(check, hbuf, 4); \ + } while (0) +#endif + +/* Load registers with state in inflate() for speed */ +#define LOAD() \ + do { \ + put = strm->next_out; \ + left = strm->avail_out; \ + next = strm->next_in; \ + have = strm->avail_in; \ + hold = state->hold; \ + bits = state->bits; \ + } while (0) + +/* Restore state from registers in inflate() */ +#define RESTORE() \ + do { \ + strm->next_out = put; \ + strm->avail_out = left; \ + strm->next_in = next; \ + strm->avail_in = have; \ + state->hold = hold; \ + state->bits = bits; \ + } while (0) + +/* Clear the input bit accumulator */ +#define INITBITS() \ + do { \ + hold = 0; \ + bits = 0; \ + } while (0) + +/* Get a byte of input into the bit accumulator, or return from inflate() + if there is no input available. */ +#define PULLBYTE() \ + do { \ + if (have == 0) goto inf_leave; \ + have--; \ + hold += (unsigned long)(*next++) << bits; \ + bits += 8; \ + } while (0) + +/* Assure that there are at least n bits in the bit accumulator. If there is + not enough available input to do that, then return from inflate(). */ +#define NEEDBITS(n) \ + do { \ + while (bits < (unsigned)(n)) \ + PULLBYTE(); \ + } while (0) + +/* Return the low n bits of the bit accumulator (n < 16) */ +#define BITS(n) \ + ((unsigned)hold & ((1U << (n)) - 1)) + +/* Remove n bits from the bit accumulator */ +#define DROPBITS(n) \ + do { \ + hold >>= (n); \ + bits -= (unsigned)(n); \ + } while (0) + +/* Remove zero to seven bits as needed to go to a byte boundary */ +#define BYTEBITS() \ + do { \ + hold >>= bits & 7; \ + bits -= bits & 7; \ + } while (0) + +/* + inflate() uses a state machine to process as much input data and generate as + much output data as possible before returning. The state machine is + structured roughly as follows: + + for (;;) switch (state) { + ... + case STATEn: + if (not enough input data or output space to make progress) + return; + ... make progress ... + state = STATEm; + break; + ... + } + + so when inflate() is called again, the same case is attempted again, and + if the appropriate resources are provided, the machine proceeds to the + next state. The NEEDBITS() macro is usually the way the state evaluates + whether it can proceed or should return. NEEDBITS() does the return if + the requested bits are not available. The typical use of the BITS macros + is: + + NEEDBITS(n); + ... do something with BITS(n) ... + DROPBITS(n); + + where NEEDBITS(n) either returns from inflate() if there isn't enough + input left to load n bits into the accumulator, or it continues. BITS(n) + gives the low n bits in the accumulator. When done, DROPBITS(n) drops + the low n bits off the accumulator. INITBITS() clears the accumulator + and sets the number of available bits to zero. BYTEBITS() discards just + enough bits to put the accumulator on a byte boundary. After BYTEBITS() + and a NEEDBITS(8), then BITS(8) would return the next byte in the stream. + + NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return + if there is no input available. The decoding of variable length codes uses + PULLBYTE() directly in order to pull just enough bytes to decode the next + code, and no more. + + Some states loop until they get enough input, making sure that enough + state information is maintained to continue the loop where it left off + if NEEDBITS() returns in the loop. For example, want, need, and keep + would all have to actually be part of the saved state in case NEEDBITS() + returns: + + case STATEw: + while (want < need) { + NEEDBITS(n); + keep[want++] = BITS(n); + DROPBITS(n); + } + state = STATEx; + case STATEx: + + As shown above, if the next state is also the next case, then the break + is omitted. + + A state may also return if there is not enough output space available to + complete that state. Those states are copying stored data, writing a + literal byte, and copying a matching string. + + When returning, a "goto inf_leave" is used to update the total counters, + update the check value, and determine whether any progress has been made + during that inflate() call in order to return the proper return code. + Progress is defined as a change in either strm->avail_in or strm->avail_out. + When there is a window, goto inf_leave will update the window with the last + output written. If a goto inf_leave occurs in the middle of decompression + and there is no window currently, goto inf_leave will create one and copy + output to the window for the next call of inflate(). + + In this implementation, the flush parameter of inflate() only affects the + return code (per zlib.h). inflate() always writes as much as possible to + strm->next_out, given the space available and the provided input--the effect + documented in zlib.h of Z_SYNC_FLUSH. Furthermore, inflate() always defers + the allocation of and copying into a sliding window until necessary, which + provides the effect documented in zlib.h for Z_FINISH when the entire input + stream available. So the only thing the flush parameter actually does is: + when flush is set to Z_FINISH, inflate() cannot return Z_OK. Instead it + will return Z_BUF_ERROR if it has not reached the end of the stream. + */ + +int ZEXPORT inflate(strm, flush) +z_streamp strm; +int flush; +{ + struct inflate_state FAR *state; + z_const unsigned char FAR *next; /* next input */ + unsigned char FAR *put; /* next output */ + unsigned have, left; /* available input and output */ + unsigned long hold; /* bit buffer */ + unsigned bits; /* bits in bit buffer */ + unsigned in, out; /* save starting available input and output */ + unsigned copy; /* number of stored or match bytes to copy */ + unsigned char FAR *from; /* where to copy match bytes from */ + code here; /* current decoding table entry */ + code last; /* parent table entry */ + unsigned len; /* length to copy for repeats, bits to drop */ + int ret; /* return code */ +#ifdef GUNZIP + unsigned char hbuf[4]; /* buffer for gzip header crc calculation */ +#endif + static const unsigned short order[19] = /* permutation of code lengths */ + {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; + + if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL || + (strm->next_in == Z_NULL && strm->avail_in != 0)) + return Z_STREAM_ERROR; + + state = (struct inflate_state FAR *)strm->state; + if (state->mode == TYPE) state->mode = TYPEDO; /* skip check */ + LOAD(); + in = have; + out = left; + ret = Z_OK; + for (;;) + switch (state->mode) { + case HEAD: + if (state->wrap == 0) { + state->mode = TYPEDO; + break; + } + NEEDBITS(16); +#ifdef GUNZIP + if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */ + state->check = crc32(0L, Z_NULL, 0); + CRC2(state->check, hold); + INITBITS(); + state->mode = FLAGS; + break; + } + state->flags = 0; /* expect zlib header */ + if (state->head != Z_NULL) + state->head->done = -1; + if (!(state->wrap & 1) || /* check if zlib header allowed */ +#else + if ( +#endif + ((BITS(8) << 8) + (hold >> 8)) % 31) { + strm->msg = (char *)"incorrect header check"; + state->mode = BAD; + break; + } + if (BITS(4) != Z_DEFLATED) { + strm->msg = (char *)"unknown compression method"; + state->mode = BAD; + break; + } + DROPBITS(4); + len = BITS(4) + 8; + if (state->wbits == 0) + state->wbits = len; + else if (len > state->wbits) { + strm->msg = (char *)"invalid window size"; + state->mode = BAD; + break; + } + state->dmax = 1U << len; + Tracev((stderr, "inflate: zlib header ok\n")); + strm->adler = state->check = adler32(0L, Z_NULL, 0); + state->mode = hold & 0x200 ? DICTID : TYPE; + INITBITS(); + break; +#ifdef GUNZIP + case FLAGS: + NEEDBITS(16); + state->flags = (int)(hold); + if ((state->flags & 0xff) != Z_DEFLATED) { + strm->msg = (char *)"unknown compression method"; + state->mode = BAD; + break; + } + if (state->flags & 0xe000) { + strm->msg = (char *)"unknown header flags set"; + state->mode = BAD; + break; + } + if (state->head != Z_NULL) + state->head->text = (int)((hold >> 8) & 1); + if (state->flags & 0x0200) CRC2(state->check, hold); + INITBITS(); + state->mode = TIME; + case TIME: + NEEDBITS(32); + if (state->head != Z_NULL) + state->head->time = hold; + if (state->flags & 0x0200) CRC4(state->check, hold); + INITBITS(); + state->mode = OS; + case OS: + NEEDBITS(16); + if (state->head != Z_NULL) { + state->head->xflags = (int)(hold & 0xff); + state->head->os = (int)(hold >> 8); + } + if (state->flags & 0x0200) CRC2(state->check, hold); + INITBITS(); + state->mode = EXLEN; + case EXLEN: + if (state->flags & 0x0400) { + NEEDBITS(16); + state->length = (unsigned)(hold); + if (state->head != Z_NULL) + state->head->extra_len = (unsigned)hold; + if (state->flags & 0x0200) CRC2(state->check, hold); + INITBITS(); + } + else if (state->head != Z_NULL) + state->head->extra = Z_NULL; + state->mode = EXTRA; + case EXTRA: + if (state->flags & 0x0400) { + copy = state->length; + if (copy > have) copy = have; + if (copy) { + if (state->head != Z_NULL && + state->head->extra != Z_NULL) { + len = state->head->extra_len - state->length; + zmemcpy(state->head->extra + len, next, + len + copy > state->head->extra_max ? + state->head->extra_max - len : copy); + } + if (state->flags & 0x0200) + state->check = crc32(state->check, next, copy); + have -= copy; + next += copy; + state->length -= copy; + } + if (state->length) goto inf_leave; + } + state->length = 0; + state->mode = NAME; + case NAME: + if (state->flags & 0x0800) { + if (have == 0) goto inf_leave; + copy = 0; + do { + len = (unsigned)(next[copy++]); + if (state->head != Z_NULL && + state->head->name != Z_NULL && + state->length < state->head->name_max) + state->head->name[state->length++] = len; + } while (len && copy < have); + if (state->flags & 0x0200) + state->check = crc32(state->check, next, copy); + have -= copy; + next += copy; + if (len) goto inf_leave; + } + else if (state->head != Z_NULL) + state->head->name = Z_NULL; + state->length = 0; + state->mode = COMMENT; + case COMMENT: + if (state->flags & 0x1000) { + if (have == 0) goto inf_leave; + copy = 0; + do { + len = (unsigned)(next[copy++]); + if (state->head != Z_NULL && + state->head->comment != Z_NULL && + state->length < state->head->comm_max) + state->head->comment[state->length++] = len; + } while (len && copy < have); + if (state->flags & 0x0200) + state->check = crc32(state->check, next, copy); + have -= copy; + next += copy; + if (len) goto inf_leave; + } + else if (state->head != Z_NULL) + state->head->comment = Z_NULL; + state->mode = HCRC; + case HCRC: + if (state->flags & 0x0200) { + NEEDBITS(16); + if (hold != (state->check & 0xffff)) { + strm->msg = (char *)"header crc mismatch"; + state->mode = BAD; + break; + } + INITBITS(); + } + if (state->head != Z_NULL) { + state->head->hcrc = (int)((state->flags >> 9) & 1); + state->head->done = 1; + } + strm->adler = state->check = crc32(0L, Z_NULL, 0); + state->mode = TYPE; + break; +#endif + case DICTID: + NEEDBITS(32); + strm->adler = state->check = ZSWAP32(hold); + INITBITS(); + state->mode = DICT; + case DICT: + if (state->havedict == 0) { + RESTORE(); + return Z_NEED_DICT; + } + strm->adler = state->check = adler32(0L, Z_NULL, 0); + state->mode = TYPE; + case TYPE: + if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave; + case TYPEDO: + if (state->last) { + BYTEBITS(); + state->mode = CHECK; + break; + } + NEEDBITS(3); + state->last = BITS(1); + DROPBITS(1); + switch (BITS(2)) { + case 0: /* stored block */ + Tracev((stderr, "inflate: stored block%s\n", + state->last ? " (last)" : "")); + state->mode = STORED; + break; + case 1: /* fixed block */ + fixedtables(state); + Tracev((stderr, "inflate: fixed codes block%s\n", + state->last ? " (last)" : "")); + state->mode = LEN_; /* decode codes */ + if (flush == Z_TREES) { + DROPBITS(2); + goto inf_leave; + } + break; + case 2: /* dynamic block */ + Tracev((stderr, "inflate: dynamic codes block%s\n", + state->last ? " (last)" : "")); + state->mode = TABLE; + break; + case 3: + strm->msg = (char *)"invalid block type"; + state->mode = BAD; + } + DROPBITS(2); + break; + case STORED: + BYTEBITS(); /* go to byte boundary */ + NEEDBITS(32); + if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { + strm->msg = (char *)"invalid stored block lengths"; + state->mode = BAD; + break; + } + state->length = (unsigned)hold & 0xffff; + Tracev((stderr, "inflate: stored length %u\n", + state->length)); + INITBITS(); + state->mode = COPY_; + if (flush == Z_TREES) goto inf_leave; + case COPY_: + state->mode = COPY; + case COPY: + copy = state->length; + if (copy) { + if (copy > have) copy = have; + if (copy > left) copy = left; + if (copy == 0) goto inf_leave; + zmemcpy(put, next, copy); + have -= copy; + next += copy; + left -= copy; + put += copy; + state->length -= copy; + break; + } + Tracev((stderr, "inflate: stored end\n")); + state->mode = TYPE; + break; + case TABLE: + NEEDBITS(14); + state->nlen = BITS(5) + 257; + DROPBITS(5); + state->ndist = BITS(5) + 1; + DROPBITS(5); + state->ncode = BITS(4) + 4; + DROPBITS(4); +#ifndef PKZIP_BUG_WORKAROUND + if (state->nlen > 286 || state->ndist > 30) { + strm->msg = (char *)"too many length or distance symbols"; + state->mode = BAD; + break; + } +#endif + Tracev((stderr, "inflate: table sizes ok\n")); + state->have = 0; + state->mode = LENLENS; + case LENLENS: + while (state->have < state->ncode) { + NEEDBITS(3); + state->lens[order[state->have++]] = (unsigned short)BITS(3); + DROPBITS(3); + } + while (state->have < 19) + state->lens[order[state->have++]] = 0; + state->next = state->codes; + state->lencode = (const code FAR *)(state->next); + state->lenbits = 7; + ret = inflate_table(CODES, state->lens, 19, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid code lengths set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: code lengths ok\n")); + state->have = 0; + state->mode = CODELENS; + case CODELENS: + while (state->have < state->nlen + state->ndist) { + for (;;) { + here = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } + if (here.val < 16) { + DROPBITS(here.bits); + state->lens[state->have++] = here.val; + } + else { + if (here.val == 16) { + NEEDBITS(here.bits + 2); + DROPBITS(here.bits); + if (state->have == 0) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + len = state->lens[state->have - 1]; + copy = 3 + BITS(2); + DROPBITS(2); + } + else if (here.val == 17) { + NEEDBITS(here.bits + 3); + DROPBITS(here.bits); + len = 0; + copy = 3 + BITS(3); + DROPBITS(3); + } + else { + NEEDBITS(here.bits + 7); + DROPBITS(here.bits); + len = 0; + copy = 11 + BITS(7); + DROPBITS(7); + } + if (state->have + copy > state->nlen + state->ndist) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + while (copy--) + state->lens[state->have++] = (unsigned short)len; + } + } + + /* handle error breaks in while */ + if (state->mode == BAD) break; + + /* check for end-of-block code (better have one) */ + if (state->lens[256] == 0) { + strm->msg = (char *)"invalid code -- missing end-of-block"; + state->mode = BAD; + break; + } + + /* build code tables -- note: do not change the lenbits or distbits + values here (9 and 6) without reading the comments in inftrees.h + concerning the ENOUGH constants, which depend on those values */ + state->next = state->codes; + state->lencode = (const code FAR *)(state->next); + state->lenbits = 9; + ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid literal/lengths set"; + state->mode = BAD; + break; + } + state->distcode = (const code FAR *)(state->next); + state->distbits = 6; + ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, + &(state->next), &(state->distbits), state->work); + if (ret) { + strm->msg = (char *)"invalid distances set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: codes ok\n")); + state->mode = LEN_; + if (flush == Z_TREES) goto inf_leave; + case LEN_: + state->mode = LEN; + case LEN: + if (have >= 6 && left >= 258) { + RESTORE(); + inflate_fast(strm, out); + LOAD(); + if (state->mode == TYPE) + state->back = -1; + break; + } + state->back = 0; + for (;;) { + here = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } + if (here.op && (here.op & 0xf0) == 0) { + last = here; + for (;;) { + here = state->lencode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + here.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + state->back += last.bits; + } + DROPBITS(here.bits); + state->back += here.bits; + state->length = (unsigned)here.val; + if ((int)(here.op) == 0) { + Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? + "inflate: literal '%c'\n" : + "inflate: literal 0x%02x\n", here.val)); + state->mode = LIT; + break; + } + if (here.op & 32) { + Tracevv((stderr, "inflate: end of block\n")); + state->back = -1; + state->mode = TYPE; + break; + } + if (here.op & 64) { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } + state->extra = (unsigned)(here.op) & 15; + state->mode = LENEXT; + case LENEXT: + if (state->extra) { + NEEDBITS(state->extra); + state->length += BITS(state->extra); + DROPBITS(state->extra); + state->back += state->extra; + } + Tracevv((stderr, "inflate: length %u\n", state->length)); + state->was = state->length; + state->mode = DIST; + case DIST: + for (;;) { + here = state->distcode[BITS(state->distbits)]; + if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } + if ((here.op & 0xf0) == 0) { + last = here; + for (;;) { + here = state->distcode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + here.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + state->back += last.bits; + } + DROPBITS(here.bits); + state->back += here.bits; + if (here.op & 64) { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } + state->offset = (unsigned)here.val; + state->extra = (unsigned)(here.op) & 15; + state->mode = DISTEXT; + case DISTEXT: + if (state->extra) { + NEEDBITS(state->extra); + state->offset += BITS(state->extra); + DROPBITS(state->extra); + state->back += state->extra; + } +#ifdef INFLATE_STRICT + if (state->offset > state->dmax) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } +#endif + Tracevv((stderr, "inflate: distance %u\n", state->offset)); + state->mode = MATCH; + case MATCH: + if (left == 0) goto inf_leave; + copy = out - left; + if (state->offset > copy) { /* copy from window */ + copy = state->offset - copy; + if (copy > state->whave) { + if (state->sane) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } +#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR + Trace((stderr, "inflate.c too far\n")); + copy -= state->whave; + if (copy > state->length) copy = state->length; + if (copy > left) copy = left; + left -= copy; + state->length -= copy; + do { + *put++ = 0; + } while (--copy); + if (state->length == 0) state->mode = LEN; + break; +#endif + } + if (copy > state->wnext) { + copy -= state->wnext; + from = state->window + (state->wsize - copy); + } + else + from = state->window + (state->wnext - copy); + if (copy > state->length) copy = state->length; + } + else { /* copy from output */ + from = put - state->offset; + copy = state->length; + } + if (copy > left) copy = left; + left -= copy; + state->length -= copy; + do { + *put++ = *from++; + } while (--copy); + if (state->length == 0) state->mode = LEN; + break; + case LIT: + if (left == 0) goto inf_leave; + *put++ = (unsigned char)(state->length); + left--; + state->mode = LEN; + break; + case CHECK: + if (state->wrap) { + NEEDBITS(32); + out -= left; + strm->total_out += out; + state->total += out; + if (out) + strm->adler = state->check = + UPDATE(state->check, put - out, out); + out = left; + if (( +#ifdef GUNZIP + state->flags ? hold : +#endif + ZSWAP32(hold)) != state->check) { + strm->msg = (char *)"incorrect data check"; + state->mode = BAD; + break; + } + INITBITS(); + Tracev((stderr, "inflate: check matches trailer\n")); + } +#ifdef GUNZIP + state->mode = LENGTH; + case LENGTH: + if (state->wrap && state->flags) { + NEEDBITS(32); + if (hold != (state->total & 0xffffffffUL)) { + strm->msg = (char *)"incorrect length check"; + state->mode = BAD; + break; + } + INITBITS(); + Tracev((stderr, "inflate: length matches trailer\n")); + } +#endif + state->mode = DONE; + case DONE: + ret = Z_STREAM_END; + goto inf_leave; + case BAD: + ret = Z_DATA_ERROR; + goto inf_leave; + case MEM: + return Z_MEM_ERROR; + case SYNC: + default: + return Z_STREAM_ERROR; + } + + /* + Return from inflate(), updating the total counts and the check value. + If there was no progress during the inflate() call, return a buffer + error. Call updatewindow() to create and/or update the window state. + Note: a memory error from inflate() is non-recoverable. + */ + inf_leave: + RESTORE(); + if (state->wsize || (out != strm->avail_out && state->mode < BAD && + (state->mode < CHECK || flush != Z_FINISH))) + if (updatewindow(strm, strm->next_out, out - strm->avail_out)) { + state->mode = MEM; + return Z_MEM_ERROR; + } + in -= strm->avail_in; + out -= strm->avail_out; + strm->total_in += in; + strm->total_out += out; + state->total += out; + if (state->wrap && out) + strm->adler = state->check = + UPDATE(state->check, strm->next_out - out, out); + strm->data_type = state->bits + (state->last ? 64 : 0) + + (state->mode == TYPE ? 128 : 0) + + (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0); + if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) + ret = Z_BUF_ERROR; + return ret; +} + +int ZEXPORT inflateEnd(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) + return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (state->window != Z_NULL) ZFREE(strm, state->window); + ZFREE(strm, strm->state); + strm->state = Z_NULL; + Tracev((stderr, "inflate: end\n")); + return Z_OK; +} + +int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength) +z_streamp strm; +Bytef *dictionary; +uInt *dictLength; +{ + struct inflate_state FAR *state; + + /* check state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + + /* copy dictionary */ + if (state->whave && dictionary != Z_NULL) { + zmemcpy(dictionary, state->window + state->wnext, + state->whave - state->wnext); + zmemcpy(dictionary + state->whave - state->wnext, + state->window, state->wnext); + } + if (dictLength != Z_NULL) + *dictLength = state->whave; + return Z_OK; +} + +int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) +z_streamp strm; +const Bytef *dictionary; +uInt dictLength; +{ + struct inflate_state FAR *state; + unsigned long dictid; + int ret; + + /* check state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (state->wrap != 0 && state->mode != DICT) + return Z_STREAM_ERROR; + + /* check for correct dictionary identifier */ + if (state->mode == DICT) { + dictid = adler32(0L, Z_NULL, 0); + dictid = adler32(dictid, dictionary, dictLength); + if (dictid != state->check) + return Z_DATA_ERROR; + } + + /* copy dictionary to window using updatewindow(), which will amend the + existing dictionary if appropriate */ + ret = updatewindow(strm, dictionary + dictLength, dictLength); + if (ret) { + state->mode = MEM; + return Z_MEM_ERROR; + } + state->havedict = 1; + Tracev((stderr, "inflate: dictionary set\n")); + return Z_OK; +} + +int ZEXPORT inflateGetHeader(strm, head) +z_streamp strm; +gz_headerp head; +{ + struct inflate_state FAR *state; + + /* check state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if ((state->wrap & 2) == 0) return Z_STREAM_ERROR; + + /* save header structure */ + state->head = head; + head->done = 0; + return Z_OK; +} + +/* + Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff. Return when found + or when out of input. When called, *have is the number of pattern bytes + found in order so far, in 0..3. On return *have is updated to the new + state. If on return *have equals four, then the pattern was found and the + return value is how many bytes were read including the last byte of the + pattern. If *have is less than four, then the pattern has not been found + yet and the return value is len. In the latter case, syncsearch() can be + called again with more data and the *have state. *have is initialized to + zero for the first call. + */ +local unsigned syncsearch(have, buf, len) +unsigned FAR *have; +const unsigned char FAR *buf; +unsigned len; +{ + unsigned got; + unsigned next; + + got = *have; + next = 0; + while (next < len && got < 4) { + if ((int)(buf[next]) == (got < 2 ? 0 : 0xff)) + got++; + else if (buf[next]) + got = 0; + else + got = 4 - got; + next++; + } + *have = got; + return next; +} + +int ZEXPORT inflateSync(strm) +z_streamp strm; +{ + unsigned len; /* number of bytes to look at or looked at */ + unsigned long in, out; /* temporary to save total_in and total_out */ + unsigned char buf[4]; /* to restore bit buffer to byte string */ + struct inflate_state FAR *state; + + /* check parameters */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR; + + /* if first time, start search in bit buffer */ + if (state->mode != SYNC) { + state->mode = SYNC; + state->hold <<= state->bits & 7; + state->bits -= state->bits & 7; + len = 0; + while (state->bits >= 8) { + buf[len++] = (unsigned char)(state->hold); + state->hold >>= 8; + state->bits -= 8; + } + state->have = 0; + syncsearch(&(state->have), buf, len); + } + + /* search available input */ + len = syncsearch(&(state->have), strm->next_in, strm->avail_in); + strm->avail_in -= len; + strm->next_in += len; + strm->total_in += len; + + /* return no joy or set up to restart inflate() on a new block */ + if (state->have != 4) return Z_DATA_ERROR; + in = strm->total_in; out = strm->total_out; + inflateReset(strm); + strm->total_in = in; strm->total_out = out; + state->mode = TYPE; + return Z_OK; +} + +/* + Returns true if inflate is currently at the end of a block generated by + Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP + implementation to provide an additional safety check. PPP uses + Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored + block. When decompressing, PPP checks that at the end of input packet, + inflate is waiting for these length bytes. + */ +int ZEXPORT inflateSyncPoint(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + return state->mode == STORED && state->bits == 0; +} + +int ZEXPORT inflateCopy(dest, source) +z_streamp dest; +z_streamp source; +{ + struct inflate_state FAR *state; + struct inflate_state FAR *copy; + unsigned char FAR *window; + unsigned wsize; + + /* check input */ + if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL || + source->zalloc == (alloc_func)0 || source->zfree == (free_func)0) + return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)source->state; + + /* allocate space */ + copy = (struct inflate_state FAR *) + ZALLOC(source, 1, sizeof(struct inflate_state)); + if (copy == Z_NULL) return Z_MEM_ERROR; + window = Z_NULL; + if (state->window != Z_NULL) { + window = (unsigned char FAR *) + ZALLOC(source, 1U << state->wbits, sizeof(unsigned char)); + if (window == Z_NULL) { + ZFREE(source, copy); + return Z_MEM_ERROR; + } + } + + /* copy state */ + zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); + zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state)); + if (state->lencode >= state->codes && + state->lencode <= state->codes + ENOUGH - 1) { + copy->lencode = copy->codes + (state->lencode - state->codes); + copy->distcode = copy->codes + (state->distcode - state->codes); + } + copy->next = copy->codes + (state->next - state->codes); + if (window != Z_NULL) { + wsize = 1U << state->wbits; + zmemcpy(window, state->window, wsize); + } + copy->window = window; + dest->state = (struct internal_state FAR *)copy; + return Z_OK; +} + +int ZEXPORT inflateUndermine(strm, subvert) +z_streamp strm; +int subvert; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + state->sane = !subvert; +#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR + return Z_OK; +#else + state->sane = 1; + return Z_DATA_ERROR; +#endif +} + +long ZEXPORT inflateMark(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; + state = (struct inflate_state FAR *)strm->state; + return ((long)(state->back) << 16) + + (state->mode == COPY ? state->length : + (state->mode == MATCH ? state->was - state->length : 0)); +} diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inflate.h b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inflate.h new file mode 100644 index 0000000000..95f4986d40 --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inflate.h @@ -0,0 +1,122 @@ +/* inflate.h -- internal inflate state definition + * Copyright (C) 1995-2009 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +/* define NO_GZIP when compiling if you want to disable gzip header and + trailer decoding by inflate(). NO_GZIP would be used to avoid linking in + the crc code when it is not needed. For shared libraries, gzip decoding + should be left enabled. */ +#ifndef NO_GZIP +# define GUNZIP +#endif + +/* Possible inflate modes between inflate() calls */ +typedef enum { + HEAD, /* i: waiting for magic header */ + FLAGS, /* i: waiting for method and flags (gzip) */ + TIME, /* i: waiting for modification time (gzip) */ + OS, /* i: waiting for extra flags and operating system (gzip) */ + EXLEN, /* i: waiting for extra length (gzip) */ + EXTRA, /* i: waiting for extra bytes (gzip) */ + NAME, /* i: waiting for end of file name (gzip) */ + COMMENT, /* i: waiting for end of comment (gzip) */ + HCRC, /* i: waiting for header crc (gzip) */ + DICTID, /* i: waiting for dictionary check value */ + DICT, /* waiting for inflateSetDictionary() call */ + TYPE, /* i: waiting for type bits, including last-flag bit */ + TYPEDO, /* i: same, but skip check to exit inflate on new block */ + STORED, /* i: waiting for stored size (length and complement) */ + COPY_, /* i/o: same as COPY below, but only first time in */ + COPY, /* i/o: waiting for input or output to copy stored block */ + TABLE, /* i: waiting for dynamic block table lengths */ + LENLENS, /* i: waiting for code length code lengths */ + CODELENS, /* i: waiting for length/lit and distance code lengths */ + LEN_, /* i: same as LEN below, but only first time in */ + LEN, /* i: waiting for length/lit/eob code */ + LENEXT, /* i: waiting for length extra bits */ + DIST, /* i: waiting for distance code */ + DISTEXT, /* i: waiting for distance extra bits */ + MATCH, /* o: waiting for output space to copy string */ + LIT, /* o: waiting for output space to write literal */ + CHECK, /* i: waiting for 32-bit check value */ + LENGTH, /* i: waiting for 32-bit length (gzip) */ + DONE, /* finished check, done -- remain here until reset */ + BAD, /* got a data error -- remain here until reset */ + MEM, /* got an inflate() memory error -- remain here until reset */ + SYNC /* looking for synchronization bytes to restart inflate() */ +} inflate_mode; + +/* + State transitions between above modes - + + (most modes can go to BAD or MEM on error -- not shown for clarity) + + Process header: + HEAD -> (gzip) or (zlib) or (raw) + (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT -> + HCRC -> TYPE + (zlib) -> DICTID or TYPE + DICTID -> DICT -> TYPE + (raw) -> TYPEDO + Read deflate blocks: + TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK + STORED -> COPY_ -> COPY -> TYPE + TABLE -> LENLENS -> CODELENS -> LEN_ + LEN_ -> LEN + Read deflate codes in fixed or dynamic block: + LEN -> LENEXT or LIT or TYPE + LENEXT -> DIST -> DISTEXT -> MATCH -> LEN + LIT -> LEN + Process trailer: + CHECK -> LENGTH -> DONE + */ + +/* state maintained between inflate() calls. Approximately 10K bytes. */ +struct inflate_state { + inflate_mode mode; /* current inflate mode */ + int last; /* true if processing last block */ + int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ + int havedict; /* true if dictionary provided */ + int flags; /* gzip header method and flags (0 if zlib) */ + unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */ + unsigned long check; /* protected copy of check value */ + unsigned long total; /* protected copy of output count */ + gz_headerp head; /* where to save gzip header information */ + /* sliding window */ + unsigned wbits; /* log base 2 of requested window size */ + unsigned wsize; /* window size or zero if not using window */ + unsigned whave; /* valid bytes in the window */ + unsigned wnext; /* window write index */ + unsigned char FAR *window; /* allocated sliding window, if needed */ + /* bit accumulator */ + unsigned long hold; /* input bit accumulator */ + unsigned bits; /* number of bits in "in" */ + /* for string and stored block copying */ + unsigned length; /* literal or length of data to copy */ + unsigned offset; /* distance back to copy string from */ + /* for table and code decoding */ + unsigned extra; /* extra bits needed */ + /* fixed and dynamic code tables */ + code const FAR *lencode; /* starting table for length/literal codes */ + code const FAR *distcode; /* starting table for distance codes */ + unsigned lenbits; /* index bits for lencode */ + unsigned distbits; /* index bits for distcode */ + /* dynamic table building */ + unsigned ncode; /* number of code length code lengths */ + unsigned nlen; /* number of length code lengths */ + unsigned ndist; /* number of distance code lengths */ + unsigned have; /* number of code lengths in lens[] */ + code FAR *next; /* next available space in codes[] */ + unsigned short lens[320]; /* temporary storage for code lengths */ + unsigned short work[288]; /* work area for code table building */ + code codes[ENOUGH]; /* space for code tables */ + int sane; /* if false, allow invalid distance too far */ + int back; /* bits back of last unprocessed length/lit */ + unsigned was; /* initial length of match */ +}; diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inftrees.c b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inftrees.c new file mode 100644 index 0000000000..44d89cf24e --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inftrees.c @@ -0,0 +1,306 @@ +/* inftrees.c -- generate Huffman trees for efficient decoding + * Copyright (C) 1995-2013 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "zutil.h" +#include "inftrees.h" + +#define MAXBITS 15 + +const char inflate_copyright[] = + " inflate 1.2.8 Copyright 1995-2013 Mark Adler "; +/* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot + include such an acknowledgment, I would appreciate that you keep this + copyright string in the executable of your product. + */ + +/* + Build a set of tables to decode the provided canonical Huffman code. + The code lengths are lens[0..codes-1]. The result starts at *table, + whose indices are 0..2^bits-1. work is a writable array of at least + lens shorts, which is used as a work area. type is the type of code + to be generated, CODES, LENS, or DISTS. On return, zero is success, + -1 is an invalid code, and +1 means that ENOUGH isn't enough. table + on return points to the next available entry's address. bits is the + requested root table index bits, and on return it is the actual root + table index bits. It will differ if the request is greater than the + longest code or if it is less than the shortest code. + */ +int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work) +codetype type; +unsigned short FAR *lens; +unsigned codes; +code FAR * FAR *table; +unsigned FAR *bits; +unsigned short FAR *work; +{ + unsigned len; /* a code's length in bits */ + unsigned sym; /* index of code symbols */ + unsigned min, max; /* minimum and maximum code lengths */ + unsigned root; /* number of index bits for root table */ + unsigned curr; /* number of index bits for current table */ + unsigned drop; /* code bits to drop for sub-table */ + int left; /* number of prefix codes available */ + unsigned used; /* code entries in table used */ + unsigned huff; /* Huffman code */ + unsigned incr; /* for incrementing code, index */ + unsigned fill; /* index for replicating entries */ + unsigned low; /* low bits for current root entry */ + unsigned mask; /* mask for low root bits */ + code here; /* table entry for duplication */ + code FAR *next; /* next available space in table */ + const unsigned short FAR *base; /* base value table to use */ + const unsigned short FAR *extra; /* extra bits table to use */ + int end; /* use base and extra for symbol > end */ + unsigned short count[MAXBITS+1]; /* number of codes of each length */ + unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ + static const unsigned short lbase[31] = { /* Length codes 257..285 base */ + 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, + 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; + static const unsigned short lext[31] = { /* Length codes 257..285 extra */ + 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78}; + static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, + 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, + 8193, 12289, 16385, 24577, 0, 0}; + static const unsigned short dext[32] = { /* Distance codes 0..29 extra */ + 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, + 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, + 28, 28, 29, 29, 64, 64}; + + /* + Process a set of code lengths to create a canonical Huffman code. The + code lengths are lens[0..codes-1]. Each length corresponds to the + symbols 0..codes-1. The Huffman code is generated by first sorting the + symbols by length from short to long, and retaining the symbol order + for codes with equal lengths. Then the code starts with all zero bits + for the first code of the shortest length, and the codes are integer + increments for the same length, and zeros are appended as the length + increases. For the deflate format, these bits are stored backwards + from their more natural integer increment ordering, and so when the + decoding tables are built in the large loop below, the integer codes + are incremented backwards. + + This routine assumes, but does not check, that all of the entries in + lens[] are in the range 0..MAXBITS. The caller must assure this. + 1..MAXBITS is interpreted as that code length. zero means that that + symbol does not occur in this code. + + The codes are sorted by computing a count of codes for each length, + creating from that a table of starting indices for each length in the + sorted table, and then entering the symbols in order in the sorted + table. The sorted table is work[], with that space being provided by + the caller. + + The length counts are used for other purposes as well, i.e. finding + the minimum and maximum length codes, determining if there are any + codes at all, checking for a valid set of lengths, and looking ahead + at length counts to determine sub-table sizes when building the + decoding tables. + */ + + /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ + for (len = 0; len <= MAXBITS; len++) + count[len] = 0; + for (sym = 0; sym < codes; sym++) + count[lens[sym]]++; + + /* bound code lengths, force root to be within code lengths */ + root = *bits; + for (max = MAXBITS; max >= 1; max--) + if (count[max] != 0) break; + if (root > max) root = max; + if (max == 0) { /* no symbols to code at all */ + here.op = (unsigned char)64; /* invalid code marker */ + here.bits = (unsigned char)1; + here.val = (unsigned short)0; + *(*table)++ = here; /* make a table to force an error */ + *(*table)++ = here; + *bits = 1; + return 0; /* no symbols, but wait for decoding to report error */ + } + for (min = 1; min < max; min++) + if (count[min] != 0) break; + if (root < min) root = min; + + /* check for an over-subscribed or incomplete set of lengths */ + left = 1; + for (len = 1; len <= MAXBITS; len++) { + left <<= 1; + left -= count[len]; + if (left < 0) return -1; /* over-subscribed */ + } + if (left > 0 && (type == CODES || max != 1)) + return -1; /* incomplete set */ + + /* generate offsets into symbol table for each length for sorting */ + offs[1] = 0; + for (len = 1; len < MAXBITS; len++) + offs[len + 1] = offs[len] + count[len]; + + /* sort symbols by length, by symbol order within each length */ + for (sym = 0; sym < codes; sym++) + if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym; + + /* + Create and fill in decoding tables. In this loop, the table being + filled is at next and has curr index bits. The code being used is huff + with length len. That code is converted to an index by dropping drop + bits off of the bottom. For codes where len is less than drop + curr, + those top drop + curr - len bits are incremented through all values to + fill the table with replicated entries. + + root is the number of index bits for the root table. When len exceeds + root, sub-tables are created pointed to by the root entry with an index + of the low root bits of huff. This is saved in low to check for when a + new sub-table should be started. drop is zero when the root table is + being filled, and drop is root when sub-tables are being filled. + + When a new sub-table is needed, it is necessary to look ahead in the + code lengths to determine what size sub-table is needed. The length + counts are used for this, and so count[] is decremented as codes are + entered in the tables. + + used keeps track of how many table entries have been allocated from the + provided *table space. It is checked for LENS and DIST tables against + the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in + the initial root table size constants. See the comments in inftrees.h + for more information. + + sym increments through all symbols, and the loop terminates when + all codes of length max, i.e. all codes, have been processed. This + routine permits incomplete codes, so another loop after this one fills + in the rest of the decoding tables with invalid code markers. + */ + + /* set up for code type */ + switch (type) { + case CODES: + base = extra = work; /* dummy value--not used */ + end = 19; + break; + case LENS: + base = lbase; + base -= 257; + extra = lext; + extra -= 257; + end = 256; + break; + default: /* DISTS */ + base = dbase; + extra = dext; + end = -1; + } + + /* initialize state for loop */ + huff = 0; /* starting code */ + sym = 0; /* starting code symbol */ + len = min; /* starting code length */ + next = *table; /* current table to fill in */ + curr = root; /* current table index bits */ + drop = 0; /* current bits to drop from code for index */ + low = (unsigned)(-1); /* trigger new sub-table when len > root */ + used = 1U << root; /* use root table entries */ + mask = used - 1; /* mask for comparing low */ + + /* check available table space */ + if ((type == LENS && used > ENOUGH_LENS) || + (type == DISTS && used > ENOUGH_DISTS)) + return 1; + + /* process all codes and make table entries */ + for (;;) { + /* create table entry */ + here.bits = (unsigned char)(len - drop); + if ((int)(work[sym]) < end) { + here.op = (unsigned char)0; + here.val = work[sym]; + } + else if ((int)(work[sym]) > end) { + here.op = (unsigned char)(extra[work[sym]]); + here.val = base[work[sym]]; + } + else { + here.op = (unsigned char)(32 + 64); /* end of block */ + here.val = 0; + } + + /* replicate for those indices with low len bits equal to huff */ + incr = 1U << (len - drop); + fill = 1U << curr; + min = fill; /* save offset to next table */ + do { + fill -= incr; + next[(huff >> drop) + fill] = here; + } while (fill != 0); + + /* backwards increment the len-bit code huff */ + incr = 1U << (len - 1); + while (huff & incr) + incr >>= 1; + if (incr != 0) { + huff &= incr - 1; + huff += incr; + } + else + huff = 0; + + /* go to next symbol, update count, len */ + sym++; + if (--(count[len]) == 0) { + if (len == max) break; + len = lens[work[sym]]; + } + + /* create new sub-table if needed */ + if (len > root && (huff & mask) != low) { + /* if first time, transition to sub-tables */ + if (drop == 0) + drop = root; + + /* increment past last table */ + next += min; /* here min is 1 << curr */ + + /* determine length of next table */ + curr = len - drop; + left = (int)(1 << curr); + while (curr + drop < max) { + left -= count[curr + drop]; + if (left <= 0) break; + curr++; + left <<= 1; + } + + /* check for enough space */ + used += 1U << curr; + if ((type == LENS && used > ENOUGH_LENS) || + (type == DISTS && used > ENOUGH_DISTS)) + return 1; + + /* point entry in root table to sub-table */ + low = huff & mask; + (*table)[low].op = (unsigned char)curr; + (*table)[low].bits = (unsigned char)root; + (*table)[low].val = (unsigned short)(next - *table); + } + } + + /* fill in remaining table entry if code is incomplete (guaranteed to have + at most one remaining entry, since if the code is incomplete, the + maximum code length that was allowed to get this far is one bit) */ + if (huff != 0) { + here.op = (unsigned char)64; /* invalid code marker */ + here.bits = (unsigned char)(len - drop); + here.val = (unsigned short)0; + next[huff] = here; + } + + /* set return parameters */ + *table += used; + *bits = root; + return 0; +} diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inftrees.h b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inftrees.h new file mode 100644 index 0000000000..baa53a0b1a --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/inftrees.h @@ -0,0 +1,62 @@ +/* inftrees.h -- header to use inftrees.c + * Copyright (C) 1995-2005, 2010 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +/* Structure for decoding tables. Each entry provides either the + information needed to do the operation requested by the code that + indexed that table entry, or it provides a pointer to another + table that indexes more bits of the code. op indicates whether + the entry is a pointer to another table, a literal, a length or + distance, an end-of-block, or an invalid code. For a table + pointer, the low four bits of op is the number of index bits of + that table. For a length or distance, the low four bits of op + is the number of extra bits to get after the code. bits is + the number of bits in this code or part of the code to drop off + of the bit buffer. val is the actual byte to output in the case + of a literal, the base length or distance, or the offset from + the current table to the next table. Each entry is four bytes. */ +typedef struct { + unsigned char op; /* operation, extra bits, table bits */ + unsigned char bits; /* bits in this part of the code */ + unsigned short val; /* offset in table or code value */ +} code; + +/* op values as set by inflate_table(): + 00000000 - literal + 0000tttt - table link, tttt != 0 is the number of table index bits + 0001eeee - length or distance, eeee is the number of extra bits + 01100000 - end of block + 01000000 - invalid code + */ + +/* Maximum size of the dynamic table. The maximum number of code structures is + 1444, which is the sum of 852 for literal/length codes and 592 for distance + codes. These values were found by exhaustive searches using the program + examples/enough.c found in the zlib distribtution. The arguments to that + program are the number of symbols, the initial root table size, and the + maximum bit length of a code. "enough 286 9 15" for literal/length codes + returns returns 852, and "enough 30 6 15" for distance codes returns 592. + The initial root table size (9 or 6) is found in the fifth argument of the + inflate_table() calls in inflate.c and infback.c. If the root table size is + changed, then these maximum sizes would be need to be recalculated and + updated. */ +#define ENOUGH_LENS 852 +#define ENOUGH_DISTS 592 +#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS) + +/* Type of code to build for inflate_table() */ +typedef enum { + CODES, + LENS, + DISTS +} codetype; + +int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens, + unsigned codes, code FAR * FAR *table, + unsigned FAR *bits, unsigned short FAR *work)); diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/trees.c b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/trees.c new file mode 100644 index 0000000000..1fd7759ef0 --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/trees.c @@ -0,0 +1,1226 @@ +/* trees.c -- output deflated data using Huffman coding + * Copyright (C) 1995-2012 Jean-loup Gailly + * detect_data_type() function provided freely by Cosmin Truta, 2006 + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + * ALGORITHM + * + * The "deflation" process uses several Huffman trees. The more + * common source values are represented by shorter bit sequences. + * + * Each code tree is stored in a compressed form which is itself + * a Huffman encoding of the lengths of all the code strings (in + * ascending order by source values). The actual code strings are + * reconstructed from the lengths in the inflate process, as described + * in the deflate specification. + * + * REFERENCES + * + * Deutsch, L.P.,"'Deflate' Compressed Data Format Specification". + * Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc + * + * Storer, James A. + * Data Compression: Methods and Theory, pp. 49-50. + * Computer Science Press, 1988. ISBN 0-7167-8156-5. + * + * Sedgewick, R. + * Algorithms, p290. + * Addison-Wesley, 1983. ISBN 0-201-06672-6. + */ + +/* @(#) $Id$ */ + +/* #define GEN_TREES_H */ + +#include "deflate.h" + +#ifdef DEBUG +# include <ctype.h> +#endif + +/* =========================================================================== + * Constants + */ + +#define MAX_BL_BITS 7 +/* Bit length codes must not exceed MAX_BL_BITS bits */ + +#define END_BLOCK 256 +/* end of block literal code */ + +#define REP_3_6 16 +/* repeat previous bit length 3-6 times (2 bits of repeat count) */ + +#define REPZ_3_10 17 +/* repeat a zero length 3-10 times (3 bits of repeat count) */ + +#define REPZ_11_138 18 +/* repeat a zero length 11-138 times (7 bits of repeat count) */ + +local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */ + = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0}; + +local const int extra_dbits[D_CODES] /* extra bits for each distance code */ + = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; + +local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */ + = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7}; + +local const uch bl_order[BL_CODES] + = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15}; +/* The lengths of the bit length codes are sent in order of decreasing + * probability, to avoid transmitting the lengths for unused bit length codes. + */ + +/* =========================================================================== + * Local data. These are initialized only once. + */ + +#define DIST_CODE_LEN 512 /* see definition of array dist_code below */ + +#if defined(GEN_TREES_H) || !defined(STDC) +/* non ANSI compilers may not accept trees.h */ + +local ct_data static_ltree[L_CODES+2]; +/* The static literal tree. Since the bit lengths are imposed, there is no + * need for the L_CODES extra codes used during heap construction. However + * The codes 286 and 287 are needed to build a canonical tree (see _tr_init + * below). + */ + +local ct_data static_dtree[D_CODES]; +/* The static distance tree. (Actually a trivial tree since all codes use + * 5 bits.) + */ + +uch _dist_code[DIST_CODE_LEN]; +/* Distance codes. The first 256 values correspond to the distances + * 3 .. 258, the last 256 values correspond to the top 8 bits of + * the 15 bit distances. + */ + +uch _length_code[MAX_MATCH-MIN_MATCH+1]; +/* length code for each normalized match length (0 == MIN_MATCH) */ + +local int base_length[LENGTH_CODES]; +/* First normalized length for each code (0 = MIN_MATCH) */ + +local int base_dist[D_CODES]; +/* First normalized distance for each code (0 = distance of 1) */ + +#else +# include "trees.h" +#endif /* GEN_TREES_H */ + +struct static_tree_desc_s { + const ct_data *static_tree; /* static tree or NULL */ + const intf *extra_bits; /* extra bits for each code or NULL */ + int extra_base; /* base index for extra_bits */ + int elems; /* max number of elements in the tree */ + int max_length; /* max bit length for the codes */ +}; + +local static_tree_desc static_l_desc = +{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS}; + +local static_tree_desc static_d_desc = +{static_dtree, extra_dbits, 0, D_CODES, MAX_BITS}; + +local static_tree_desc static_bl_desc = +{(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS}; + +/* =========================================================================== + * Local (static) routines in this file. + */ + +local void tr_static_init OF((void)); +local void init_block OF((deflate_state *s)); +local void pqdownheap OF((deflate_state *s, ct_data *tree, int k)); +local void gen_bitlen OF((deflate_state *s, tree_desc *desc)); +local void gen_codes OF((ct_data *tree, int max_code, ushf *bl_count)); +local void build_tree OF((deflate_state *s, tree_desc *desc)); +local void scan_tree OF((deflate_state *s, ct_data *tree, int max_code)); +local void send_tree OF((deflate_state *s, ct_data *tree, int max_code)); +local int build_bl_tree OF((deflate_state *s)); +local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes, + int blcodes)); +local void compress_block OF((deflate_state *s, const ct_data *ltree, + const ct_data *dtree)); +local int detect_data_type OF((deflate_state *s)); +local unsigned bi_reverse OF((unsigned value, int length)); +local void bi_windup OF((deflate_state *s)); +local void bi_flush OF((deflate_state *s)); +local void copy_block OF((deflate_state *s, charf *buf, unsigned len, + int header)); + +#ifdef GEN_TREES_H +local void gen_trees_header OF((void)); +#endif + +#ifndef DEBUG +# define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len) + /* Send a code of the given tree. c and tree must not have side effects */ + +#else /* DEBUG */ +# define send_code(s, c, tree) \ + { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \ + send_bits(s, tree[c].Code, tree[c].Len); } +#endif + +/* =========================================================================== + * Output a short LSB first on the stream. + * IN assertion: there is enough room in pendingBuf. + */ +#define put_short(s, w) { \ + put_byte(s, (uch)((w) & 0xff)); \ + put_byte(s, (uch)((ush)(w) >> 8)); \ +} + +/* =========================================================================== + * Send a value on a given number of bits. + * IN assertion: length <= 16 and value fits in length bits. + */ +#ifdef DEBUG +local void send_bits OF((deflate_state *s, int value, int length)); + +local void send_bits(s, value, length) + deflate_state *s; + int value; /* value to send */ + int length; /* number of bits */ +{ + Tracevv((stderr," l %2d v %4x ", length, value)); + Assert(length > 0 && length <= 15, "invalid length"); + s->bits_sent += (ulg)length; + + /* If not enough room in bi_buf, use (valid) bits from bi_buf and + * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid)) + * unused bits in value. + */ + if (s->bi_valid > (int)Buf_size - length) { + s->bi_buf |= (ush)value << s->bi_valid; + put_short(s, s->bi_buf); + s->bi_buf = (ush)value >> (Buf_size - s->bi_valid); + s->bi_valid += length - Buf_size; + } else { + s->bi_buf |= (ush)value << s->bi_valid; + s->bi_valid += length; + } +} +#else /* !DEBUG */ + +#define send_bits(s, value, length) \ +{ int len = length;\ + if (s->bi_valid > (int)Buf_size - len) {\ + int val = value;\ + s->bi_buf |= (ush)val << s->bi_valid;\ + put_short(s, s->bi_buf);\ + s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\ + s->bi_valid += len - Buf_size;\ + } else {\ + s->bi_buf |= (ush)(value) << s->bi_valid;\ + s->bi_valid += len;\ + }\ +} +#endif /* DEBUG */ + + +/* the arguments must not have side effects */ + +/* =========================================================================== + * Initialize the various 'constant' tables. + */ +local void tr_static_init() +{ +#if defined(GEN_TREES_H) || !defined(STDC) + static int static_init_done = 0; + int n; /* iterates over tree elements */ + int bits; /* bit counter */ + int length; /* length value */ + int code; /* code value */ + int dist; /* distance index */ + ush bl_count[MAX_BITS+1]; + /* number of codes at each bit length for an optimal tree */ + + if (static_init_done) return; + + /* For some embedded targets, global variables are not initialized: */ +#ifdef NO_INIT_GLOBAL_POINTERS + static_l_desc.static_tree = static_ltree; + static_l_desc.extra_bits = extra_lbits; + static_d_desc.static_tree = static_dtree; + static_d_desc.extra_bits = extra_dbits; + static_bl_desc.extra_bits = extra_blbits; +#endif + + /* Initialize the mapping length (0..255) -> length code (0..28) */ + length = 0; + for (code = 0; code < LENGTH_CODES-1; code++) { + base_length[code] = length; + for (n = 0; n < (1<<extra_lbits[code]); n++) { + _length_code[length++] = (uch)code; + } + } + Assert (length == 256, "tr_static_init: length != 256"); + /* Note that the length 255 (match length 258) can be represented + * in two different ways: code 284 + 5 bits or code 285, so we + * overwrite length_code[255] to use the best encoding: + */ + _length_code[length-1] = (uch)code; + + /* Initialize the mapping dist (0..32K) -> dist code (0..29) */ + dist = 0; + for (code = 0 ; code < 16; code++) { + base_dist[code] = dist; + for (n = 0; n < (1<<extra_dbits[code]); n++) { + _dist_code[dist++] = (uch)code; + } + } + Assert (dist == 256, "tr_static_init: dist != 256"); + dist >>= 7; /* from now on, all distances are divided by 128 */ + for ( ; code < D_CODES; code++) { + base_dist[code] = dist << 7; + for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) { + _dist_code[256 + dist++] = (uch)code; + } + } + Assert (dist == 256, "tr_static_init: 256+dist != 512"); + + /* Construct the codes of the static literal tree */ + for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0; + n = 0; + while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++; + while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++; + while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++; + while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++; + /* Codes 286 and 287 do not exist, but we must include them in the + * tree construction to get a canonical Huffman tree (longest code + * all ones) + */ + gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count); + + /* The static distance tree is trivial: */ + for (n = 0; n < D_CODES; n++) { + static_dtree[n].Len = 5; + static_dtree[n].Code = bi_reverse((unsigned)n, 5); + } + static_init_done = 1; + +# ifdef GEN_TREES_H + gen_trees_header(); +# endif +#endif /* defined(GEN_TREES_H) || !defined(STDC) */ +} + +/* =========================================================================== + * Genererate the file trees.h describing the static trees. + */ +#ifdef GEN_TREES_H +# ifndef DEBUG +# include <stdio.h> +# endif + +# define SEPARATOR(i, last, width) \ + ((i) == (last)? "\n};\n\n" : \ + ((i) % (width) == (width)-1 ? ",\n" : ", ")) + +void gen_trees_header() +{ + FILE *header = fopen("trees.h", "w"); + int i; + + Assert (header != NULL, "Can't open trees.h"); + fprintf(header, + "/* header created automatically with -DGEN_TREES_H */\n\n"); + + fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n"); + for (i = 0; i < L_CODES+2; i++) { + fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code, + static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5)); + } + + fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n"); + for (i = 0; i < D_CODES; i++) { + fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code, + static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5)); + } + + fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n"); + for (i = 0; i < DIST_CODE_LEN; i++) { + fprintf(header, "%2u%s", _dist_code[i], + SEPARATOR(i, DIST_CODE_LEN-1, 20)); + } + + fprintf(header, + "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n"); + for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) { + fprintf(header, "%2u%s", _length_code[i], + SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20)); + } + + fprintf(header, "local const int base_length[LENGTH_CODES] = {\n"); + for (i = 0; i < LENGTH_CODES; i++) { + fprintf(header, "%1u%s", base_length[i], + SEPARATOR(i, LENGTH_CODES-1, 20)); + } + + fprintf(header, "local const int base_dist[D_CODES] = {\n"); + for (i = 0; i < D_CODES; i++) { + fprintf(header, "%5u%s", base_dist[i], + SEPARATOR(i, D_CODES-1, 10)); + } + + fclose(header); +} +#endif /* GEN_TREES_H */ + +/* =========================================================================== + * Initialize the tree data structures for a new zlib stream. + */ +void ZLIB_INTERNAL _tr_init(s) + deflate_state *s; +{ + tr_static_init(); + + s->l_desc.dyn_tree = s->dyn_ltree; + s->l_desc.stat_desc = &static_l_desc; + + s->d_desc.dyn_tree = s->dyn_dtree; + s->d_desc.stat_desc = &static_d_desc; + + s->bl_desc.dyn_tree = s->bl_tree; + s->bl_desc.stat_desc = &static_bl_desc; + + s->bi_buf = 0; + s->bi_valid = 0; +#ifdef DEBUG + s->compressed_len = 0L; + s->bits_sent = 0L; +#endif + + /* Initialize the first block of the first file: */ + init_block(s); +} + +/* =========================================================================== + * Initialize a new block. + */ +local void init_block(s) + deflate_state *s; +{ + int n; /* iterates over tree elements */ + + /* Initialize the trees. */ + for (n = 0; n < L_CODES; n++) s->dyn_ltree[n].Freq = 0; + for (n = 0; n < D_CODES; n++) s->dyn_dtree[n].Freq = 0; + for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0; + + s->dyn_ltree[END_BLOCK].Freq = 1; + s->opt_len = s->static_len = 0L; + s->last_lit = s->matches = 0; +} + +#define SMALLEST 1 +/* Index within the heap array of least frequent node in the Huffman tree */ + + +/* =========================================================================== + * Remove the smallest element from the heap and recreate the heap with + * one less element. Updates heap and heap_len. + */ +#define pqremove(s, tree, top) \ +{\ + top = s->heap[SMALLEST]; \ + s->heap[SMALLEST] = s->heap[s->heap_len--]; \ + pqdownheap(s, tree, SMALLEST); \ +} + +/* =========================================================================== + * Compares to subtrees, using the tree depth as tie breaker when + * the subtrees have equal frequency. This minimizes the worst case length. + */ +#define smaller(tree, n, m, depth) \ + (tree[n].Freq < tree[m].Freq || \ + (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m])) + +/* =========================================================================== + * Restore the heap property by moving down the tree starting at node k, + * exchanging a node with the smallest of its two sons if necessary, stopping + * when the heap property is re-established (each father smaller than its + * two sons). + */ +local void pqdownheap(s, tree, k) + deflate_state *s; + ct_data *tree; /* the tree to restore */ + int k; /* node to move down */ +{ + int v = s->heap[k]; + int j = k << 1; /* left son of k */ + while (j <= s->heap_len) { + /* Set j to the smallest of the two sons: */ + if (j < s->heap_len && + smaller(tree, s->heap[j+1], s->heap[j], s->depth)) { + j++; + } + /* Exit if v is smaller than both sons */ + if (smaller(tree, v, s->heap[j], s->depth)) break; + + /* Exchange v with the smallest son */ + s->heap[k] = s->heap[j]; k = j; + + /* And continue down the tree, setting j to the left son of k */ + j <<= 1; + } + s->heap[k] = v; +} + +/* =========================================================================== + * Compute the optimal bit lengths for a tree and update the total bit length + * for the current block. + * IN assertion: the fields freq and dad are set, heap[heap_max] and + * above are the tree nodes sorted by increasing frequency. + * OUT assertions: the field len is set to the optimal bit length, the + * array bl_count contains the frequencies for each bit length. + * The length opt_len is updated; static_len is also updated if stree is + * not null. + */ +local void gen_bitlen(s, desc) + deflate_state *s; + tree_desc *desc; /* the tree descriptor */ +{ + ct_data *tree = desc->dyn_tree; + int max_code = desc->max_code; + const ct_data *stree = desc->stat_desc->static_tree; + const intf *extra = desc->stat_desc->extra_bits; + int base = desc->stat_desc->extra_base; + int max_length = desc->stat_desc->max_length; + int h; /* heap index */ + int n, m; /* iterate over the tree elements */ + int bits; /* bit length */ + int xbits; /* extra bits */ + ush f; /* frequency */ + int overflow = 0; /* number of elements with bit length too large */ + + for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0; + + /* In a first pass, compute the optimal bit lengths (which may + * overflow in the case of the bit length tree). + */ + tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */ + + for (h = s->heap_max+1; h < HEAP_SIZE; h++) { + n = s->heap[h]; + bits = tree[tree[n].Dad].Len + 1; + if (bits > max_length) bits = max_length, overflow++; + tree[n].Len = (ush)bits; + /* We overwrite tree[n].Dad which is no longer needed */ + + if (n > max_code) continue; /* not a leaf node */ + + s->bl_count[bits]++; + xbits = 0; + if (n >= base) xbits = extra[n-base]; + f = tree[n].Freq; + s->opt_len += (ulg)f * (bits + xbits); + if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits); + } + if (overflow == 0) return; + + Trace((stderr,"\nbit length overflow\n")); + /* This happens for example on obj2 and pic of the Calgary corpus */ + + /* Find the first bit length which could increase: */ + do { + bits = max_length-1; + while (s->bl_count[bits] == 0) bits--; + s->bl_count[bits]--; /* move one leaf down the tree */ + s->bl_count[bits+1] += 2; /* move one overflow item as its brother */ + s->bl_count[max_length]--; + /* The brother of the overflow item also moves one step up, + * but this does not affect bl_count[max_length] + */ + overflow -= 2; + } while (overflow > 0); + + /* Now recompute all bit lengths, scanning in increasing frequency. + * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all + * lengths instead of fixing only the wrong ones. This idea is taken + * from 'ar' written by Haruhiko Okumura.) + */ + for (bits = max_length; bits != 0; bits--) { + n = s->bl_count[bits]; + while (n != 0) { + m = s->heap[--h]; + if (m > max_code) continue; + if ((unsigned) tree[m].Len != (unsigned) bits) { + Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits)); + s->opt_len += ((long)bits - (long)tree[m].Len) + *(long)tree[m].Freq; + tree[m].Len = (ush)bits; + } + n--; + } + } +} + +/* =========================================================================== + * Generate the codes for a given tree and bit counts (which need not be + * optimal). + * IN assertion: the array bl_count contains the bit length statistics for + * the given tree and the field len is set for all tree elements. + * OUT assertion: the field code is set for all tree elements of non + * zero code length. + */ +local void gen_codes (tree, max_code, bl_count) + ct_data *tree; /* the tree to decorate */ + int max_code; /* largest code with non zero frequency */ + ushf *bl_count; /* number of codes at each bit length */ +{ + ush next_code[MAX_BITS+1]; /* next code value for each bit length */ + ush code = 0; /* running code value */ + int bits; /* bit index */ + int n; /* code index */ + + /* The distribution counts are first used to generate the code values + * without bit reversal. + */ + for (bits = 1; bits <= MAX_BITS; bits++) { + next_code[bits] = code = (code + bl_count[bits-1]) << 1; + } + /* Check that the bit counts in bl_count are consistent. The last code + * must be all ones. + */ + Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1, + "inconsistent bit counts"); + Tracev((stderr,"\ngen_codes: max_code %d ", max_code)); + + for (n = 0; n <= max_code; n++) { + int len = tree[n].Len; + if (len == 0) continue; + /* Now reverse the bits */ + tree[n].Code = bi_reverse(next_code[len]++, len); + + Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ", + n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1)); + } +} + +/* =========================================================================== + * Construct one Huffman tree and assigns the code bit strings and lengths. + * Update the total bit length for the current block. + * IN assertion: the field freq is set for all tree elements. + * OUT assertions: the fields len and code are set to the optimal bit length + * and corresponding code. The length opt_len is updated; static_len is + * also updated if stree is not null. The field max_code is set. + */ +local void build_tree(s, desc) + deflate_state *s; + tree_desc *desc; /* the tree descriptor */ +{ + ct_data *tree = desc->dyn_tree; + const ct_data *stree = desc->stat_desc->static_tree; + int elems = desc->stat_desc->elems; + int n, m; /* iterate over heap elements */ + int max_code = -1; /* largest code with non zero frequency */ + int node; /* new node being created */ + + /* Construct the initial heap, with least frequent element in + * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. + * heap[0] is not used. + */ + s->heap_len = 0, s->heap_max = HEAP_SIZE; + + for (n = 0; n < elems; n++) { + if (tree[n].Freq != 0) { + s->heap[++(s->heap_len)] = max_code = n; + s->depth[n] = 0; + } else { + tree[n].Len = 0; + } + } + + /* The pkzip format requires that at least one distance code exists, + * and that at least one bit should be sent even if there is only one + * possible code. So to avoid special checks later on we force at least + * two codes of non zero frequency. + */ + while (s->heap_len < 2) { + node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0); + tree[node].Freq = 1; + s->depth[node] = 0; + s->opt_len--; if (stree) s->static_len -= stree[node].Len; + /* node is 0 or 1 so it does not have extra bits */ + } + desc->max_code = max_code; + + /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree, + * establish sub-heaps of increasing lengths: + */ + for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n); + + /* Construct the Huffman tree by repeatedly combining the least two + * frequent nodes. + */ + node = elems; /* next internal node of the tree */ + do { + pqremove(s, tree, n); /* n = node of least frequency */ + m = s->heap[SMALLEST]; /* m = node of next least frequency */ + + s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */ + s->heap[--(s->heap_max)] = m; + + /* Create a new node father of n and m */ + tree[node].Freq = tree[n].Freq + tree[m].Freq; + s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ? + s->depth[n] : s->depth[m]) + 1); + tree[n].Dad = tree[m].Dad = (ush)node; +#ifdef DUMP_BL_TREE + if (tree == s->bl_tree) { + fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)", + node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq); + } +#endif + /* and insert the new node in the heap */ + s->heap[SMALLEST] = node++; + pqdownheap(s, tree, SMALLEST); + + } while (s->heap_len >= 2); + + s->heap[--(s->heap_max)] = s->heap[SMALLEST]; + + /* At this point, the fields freq and dad are set. We can now + * generate the bit lengths. + */ + gen_bitlen(s, (tree_desc *)desc); + + /* The field len is now set, we can generate the bit codes */ + gen_codes ((ct_data *)tree, max_code, s->bl_count); +} + +/* =========================================================================== + * Scan a literal or distance tree to determine the frequencies of the codes + * in the bit length tree. + */ +local void scan_tree (s, tree, max_code) + deflate_state *s; + ct_data *tree; /* the tree to be scanned */ + int max_code; /* and its largest code of non zero frequency */ +{ + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ + int nextlen = tree[0].Len; /* length of next code */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ + + if (nextlen == 0) max_count = 138, min_count = 3; + tree[max_code+1].Len = (ush)0xffff; /* guard */ + + for (n = 0; n <= max_code; n++) { + curlen = nextlen; nextlen = tree[n+1].Len; + if (++count < max_count && curlen == nextlen) { + continue; + } else if (count < min_count) { + s->bl_tree[curlen].Freq += count; + } else if (curlen != 0) { + if (curlen != prevlen) s->bl_tree[curlen].Freq++; + s->bl_tree[REP_3_6].Freq++; + } else if (count <= 10) { + s->bl_tree[REPZ_3_10].Freq++; + } else { + s->bl_tree[REPZ_11_138].Freq++; + } + count = 0; prevlen = curlen; + if (nextlen == 0) { + max_count = 138, min_count = 3; + } else if (curlen == nextlen) { + max_count = 6, min_count = 3; + } else { + max_count = 7, min_count = 4; + } + } +} + +/* =========================================================================== + * Send a literal or distance tree in compressed form, using the codes in + * bl_tree. + */ +local void send_tree (s, tree, max_code) + deflate_state *s; + ct_data *tree; /* the tree to be scanned */ + int max_code; /* and its largest code of non zero frequency */ +{ + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ + int nextlen = tree[0].Len; /* length of next code */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ + + /* tree[max_code+1].Len = -1; */ /* guard already set */ + if (nextlen == 0) max_count = 138, min_count = 3; + + for (n = 0; n <= max_code; n++) { + curlen = nextlen; nextlen = tree[n+1].Len; + if (++count < max_count && curlen == nextlen) { + continue; + } else if (count < min_count) { + do { send_code(s, curlen, s->bl_tree); } while (--count != 0); + + } else if (curlen != 0) { + if (curlen != prevlen) { + send_code(s, curlen, s->bl_tree); count--; + } + Assert(count >= 3 && count <= 6, " 3_6?"); + send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2); + + } else if (count <= 10) { + send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3); + + } else { + send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7); + } + count = 0; prevlen = curlen; + if (nextlen == 0) { + max_count = 138, min_count = 3; + } else if (curlen == nextlen) { + max_count = 6, min_count = 3; + } else { + max_count = 7, min_count = 4; + } + } +} + +/* =========================================================================== + * Construct the Huffman tree for the bit lengths and return the index in + * bl_order of the last bit length code to send. + */ +local int build_bl_tree(s) + deflate_state *s; +{ + int max_blindex; /* index of last bit length code of non zero freq */ + + /* Determine the bit length frequencies for literal and distance trees */ + scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code); + scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code); + + /* Build the bit length tree: */ + build_tree(s, (tree_desc *)(&(s->bl_desc))); + /* opt_len now includes the length of the tree representations, except + * the lengths of the bit lengths codes and the 5+5+4 bits for the counts. + */ + + /* Determine the number of bit length codes to send. The pkzip format + * requires that at least 4 bit length codes be sent. (appnote.txt says + * 3 but the actual value used is 4.) + */ + for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) { + if (s->bl_tree[bl_order[max_blindex]].Len != 0) break; + } + /* Update opt_len to include the bit length tree and counts */ + s->opt_len += 3*(max_blindex+1) + 5+5+4; + Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", + s->opt_len, s->static_len)); + + return max_blindex; +} + +/* =========================================================================== + * Send the header for a block using dynamic Huffman trees: the counts, the + * lengths of the bit length codes, the literal tree and the distance tree. + * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4. + */ +local void send_all_trees(s, lcodes, dcodes, blcodes) + deflate_state *s; + int lcodes, dcodes, blcodes; /* number of codes for each tree */ +{ + int rank; /* index in bl_order */ + + Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes"); + Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES, + "too many codes"); + Tracev((stderr, "\nbl counts: ")); + send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */ + send_bits(s, dcodes-1, 5); + send_bits(s, blcodes-4, 4); /* not -3 as stated in appnote.txt */ + for (rank = 0; rank < blcodes; rank++) { + Tracev((stderr, "\nbl code %2d ", bl_order[rank])); + send_bits(s, s->bl_tree[bl_order[rank]].Len, 3); + } + Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent)); + + send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */ + Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent)); + + send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */ + Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent)); +} + +/* =========================================================================== + * Send a stored block + */ +void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last) + deflate_state *s; + charf *buf; /* input block */ + ulg stored_len; /* length of input block */ + int last; /* one if this is the last block for a file */ +{ + send_bits(s, (STORED_BLOCK<<1)+last, 3); /* send block type */ +#ifdef DEBUG + s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; + s->compressed_len += (stored_len + 4) << 3; +#endif + copy_block(s, buf, (unsigned)stored_len, 1); /* with header */ +} + +/* =========================================================================== + * Flush the bits in the bit buffer to pending output (leaves at most 7 bits) + */ +void ZLIB_INTERNAL _tr_flush_bits(s) + deflate_state *s; +{ + bi_flush(s); +} + +/* =========================================================================== + * Send one empty static block to give enough lookahead for inflate. + * This takes 10 bits, of which 7 may remain in the bit buffer. + */ +void ZLIB_INTERNAL _tr_align(s) + deflate_state *s; +{ + send_bits(s, STATIC_TREES<<1, 3); + send_code(s, END_BLOCK, static_ltree); +#ifdef DEBUG + s->compressed_len += 10L; /* 3 for block type, 7 for EOB */ +#endif + bi_flush(s); +} + +/* =========================================================================== + * Determine the best encoding for the current block: dynamic trees, static + * trees or store, and output the encoded block to the zip file. + */ +void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) + deflate_state *s; + charf *buf; /* input block, or NULL if too old */ + ulg stored_len; /* length of input block */ + int last; /* one if this is the last block for a file */ +{ + ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ + int max_blindex = 0; /* index of last bit length code of non zero freq */ + + /* Build the Huffman trees unless a stored block is forced */ + if (s->level > 0) { + + /* Check if the file is binary or text */ + if (s->strm->data_type == Z_UNKNOWN) + s->strm->data_type = detect_data_type(s); + + /* Construct the literal and distance trees */ + build_tree(s, (tree_desc *)(&(s->l_desc))); + Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len, + s->static_len)); + + build_tree(s, (tree_desc *)(&(s->d_desc))); + Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len, + s->static_len)); + /* At this point, opt_len and static_len are the total bit lengths of + * the compressed block data, excluding the tree representations. + */ + + /* Build the bit length tree for the above two trees, and get the index + * in bl_order of the last bit length code to send. + */ + max_blindex = build_bl_tree(s); + + /* Determine the best encoding. Compute the block lengths in bytes. */ + opt_lenb = (s->opt_len+3+7)>>3; + static_lenb = (s->static_len+3+7)>>3; + + Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", + opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, + s->last_lit)); + + if (static_lenb <= opt_lenb) opt_lenb = static_lenb; + + } else { + Assert(buf != (char*)0, "lost buf"); + opt_lenb = static_lenb = stored_len + 5; /* force a stored block */ + } + +#ifdef FORCE_STORED + if (buf != (char*)0) { /* force stored block */ +#else + if (stored_len+4 <= opt_lenb && buf != (char*)0) { + /* 4: two words for the lengths */ +#endif + /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. + * Otherwise we can't have processed more than WSIZE input bytes since + * the last block flush, because compression would have been + * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to + * transform a block into a stored block. + */ + _tr_stored_block(s, buf, stored_len, last); + +#ifdef FORCE_STATIC + } else if (static_lenb >= 0) { /* force static trees */ +#else + } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { +#endif + send_bits(s, (STATIC_TREES<<1)+last, 3); + compress_block(s, (const ct_data *)static_ltree, + (const ct_data *)static_dtree); +#ifdef DEBUG + s->compressed_len += 3 + s->static_len; +#endif + } else { + send_bits(s, (DYN_TREES<<1)+last, 3); + send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, + max_blindex+1); + compress_block(s, (const ct_data *)s->dyn_ltree, + (const ct_data *)s->dyn_dtree); +#ifdef DEBUG + s->compressed_len += 3 + s->opt_len; +#endif + } + Assert (s->compressed_len == s->bits_sent, "bad compressed size"); + /* The above check is made mod 2^32, for files larger than 512 MB + * and uLong implemented on 32 bits. + */ + init_block(s); + + if (last) { + bi_windup(s); +#ifdef DEBUG + s->compressed_len += 7; /* align on byte boundary */ +#endif + } + Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3, + s->compressed_len-7*last)); +} + +/* =========================================================================== + * Save the match info and tally the frequency counts. Return true if + * the current block must be flushed. + */ +int ZLIB_INTERNAL _tr_tally (s, dist, lc) + deflate_state *s; + unsigned dist; /* distance of matched string */ + unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ +{ + s->d_buf[s->last_lit] = (ush)dist; + s->l_buf[s->last_lit++] = (uch)lc; + if (dist == 0) { + /* lc is the unmatched char */ + s->dyn_ltree[lc].Freq++; + } else { + s->matches++; + /* Here, lc is the match length - MIN_MATCH */ + dist--; /* dist = match distance - 1 */ + Assert((ush)dist < (ush)MAX_DIST(s) && + (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) && + (ush)d_code(dist) < (ush)D_CODES, "_tr_tally: bad match"); + + s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; + s->dyn_dtree[d_code(dist)].Freq++; + } + +#ifdef TRUNCATE_BLOCK + /* Try to guess if it is profitable to stop the current block here */ + if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { + /* Compute an upper bound for the compressed length */ + ulg out_length = (ulg)s->last_lit*8L; + ulg in_length = (ulg)((long)s->strstart - s->block_start); + int dcode; + for (dcode = 0; dcode < D_CODES; dcode++) { + out_length += (ulg)s->dyn_dtree[dcode].Freq * + (5L+extra_dbits[dcode]); + } + out_length >>= 3; + Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", + s->last_lit, in_length, out_length, + 100L - out_length*100L/in_length)); + if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; + } +#endif + return (s->last_lit == s->lit_bufsize-1); + /* We avoid equality with lit_bufsize because of wraparound at 64K + * on 16 bit machines and because stored blocks are restricted to + * 64K-1 bytes. + */ +} + +/* =========================================================================== + * Send the block data compressed using the given Huffman trees + */ +local void compress_block(s, ltree, dtree) + deflate_state *s; + const ct_data *ltree; /* literal tree */ + const ct_data *dtree; /* distance tree */ +{ + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ + unsigned lx = 0; /* running index in l_buf */ + unsigned code; /* the code to send */ + int extra; /* number of extra bits to send */ + + if (s->last_lit != 0) do { + dist = s->d_buf[lx]; + lc = s->l_buf[lx++]; + if (dist == 0) { + send_code(s, lc, ltree); /* send a literal byte */ + Tracecv(isgraph(lc), (stderr," '%c' ", lc)); + } else { + /* Here, lc is the match length - MIN_MATCH */ + code = _length_code[lc]; + send_code(s, code+LITERALS+1, ltree); /* send the length code */ + extra = extra_lbits[code]; + if (extra != 0) { + lc -= base_length[code]; + send_bits(s, lc, extra); /* send the extra length bits */ + } + dist--; /* dist is now the match distance - 1 */ + code = d_code(dist); + Assert (code < D_CODES, "bad d_code"); + + send_code(s, code, dtree); /* send the distance code */ + extra = extra_dbits[code]; + if (extra != 0) { + dist -= base_dist[code]; + send_bits(s, dist, extra); /* send the extra distance bits */ + } + } /* literal or match pair ? */ + + /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ + Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, + "pendingBuf overflow"); + + } while (lx < s->last_lit); + + send_code(s, END_BLOCK, ltree); +} + +/* =========================================================================== + * Check if the data type is TEXT or BINARY, using the following algorithm: + * - TEXT if the two conditions below are satisfied: + * a) There are no non-portable control characters belonging to the + * "black list" (0..6, 14..25, 28..31). + * b) There is at least one printable character belonging to the + * "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255). + * - BINARY otherwise. + * - The following partially-portable control characters form a + * "gray list" that is ignored in this detection algorithm: + * (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}). + * IN assertion: the fields Freq of dyn_ltree are set. + */ +local int detect_data_type(s) + deflate_state *s; +{ + /* black_mask is the bit mask of black-listed bytes + * set bits 0..6, 14..25, and 28..31 + * 0xf3ffc07f = binary 11110011111111111100000001111111 + */ + unsigned long black_mask = 0xf3ffc07fUL; + int n; + + /* Check for non-textual ("black-listed") bytes. */ + for (n = 0; n <= 31; n++, black_mask >>= 1) + if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0)) + return Z_BINARY; + + /* Check for textual ("white-listed") bytes. */ + if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0 + || s->dyn_ltree[13].Freq != 0) + return Z_TEXT; + for (n = 32; n < LITERALS; n++) + if (s->dyn_ltree[n].Freq != 0) + return Z_TEXT; + + /* There are no "black-listed" or "white-listed" bytes: + * this stream either is empty or has tolerated ("gray-listed") bytes only. + */ + return Z_BINARY; +} + +/* =========================================================================== + * Reverse the first len bits of a code, using straightforward code (a faster + * method would use a table) + * IN assertion: 1 <= len <= 15 + */ +local unsigned bi_reverse(code, len) + unsigned code; /* the value to invert */ + int len; /* its bit length */ +{ + register unsigned res = 0; + do { + res |= code & 1; + code >>= 1, res <<= 1; + } while (--len > 0); + return res >> 1; +} + +/* =========================================================================== + * Flush the bit buffer, keeping at most 7 bits in it. + */ +local void bi_flush(s) + deflate_state *s; +{ + if (s->bi_valid == 16) { + put_short(s, s->bi_buf); + s->bi_buf = 0; + s->bi_valid = 0; + } else if (s->bi_valid >= 8) { + put_byte(s, (Byte)s->bi_buf); + s->bi_buf >>= 8; + s->bi_valid -= 8; + } +} + +/* =========================================================================== + * Flush the bit buffer and align the output on a byte boundary + */ +local void bi_windup(s) + deflate_state *s; +{ + if (s->bi_valid > 8) { + put_short(s, s->bi_buf); + } else if (s->bi_valid > 0) { + put_byte(s, (Byte)s->bi_buf); + } + s->bi_buf = 0; + s->bi_valid = 0; +#ifdef DEBUG + s->bits_sent = (s->bits_sent+7) & ~7; +#endif +} + +/* =========================================================================== + * Copy a stored block, storing first the length and its + * one's complement if requested. + */ +local void copy_block(s, buf, len, header) + deflate_state *s; + charf *buf; /* the input data */ + unsigned len; /* its length */ + int header; /* true if block header must be written */ +{ + bi_windup(s); /* align on byte boundary */ + + if (header) { + put_short(s, (ush)len); + put_short(s, (ush)~len); +#ifdef DEBUG + s->bits_sent += 2*16; +#endif + } +#ifdef DEBUG + s->bits_sent += (ulg)len<<3; +#endif + while (len--) { + put_byte(s, *buf++); + } +} diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/trees.h b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/trees.h new file mode 100644 index 0000000000..d35639d82a --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/trees.h @@ -0,0 +1,128 @@ +/* header created automatically with -DGEN_TREES_H */ + +local const ct_data static_ltree[L_CODES+2] = { +{{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}}, +{{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}}, +{{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}}, +{{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}}, +{{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}}, +{{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}}, +{{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}}, +{{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}}, +{{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}}, +{{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}}, +{{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}}, +{{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}}, +{{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}}, +{{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}}, +{{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}}, +{{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}}, +{{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}}, +{{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}}, +{{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}}, +{{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}}, +{{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}}, +{{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}}, +{{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}}, +{{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}}, +{{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}}, +{{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}}, +{{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}}, +{{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}}, +{{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}}, +{{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}}, +{{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}}, +{{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}}, +{{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}}, +{{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}}, +{{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}}, +{{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}}, +{{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}}, +{{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}}, +{{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}}, +{{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}}, +{{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}}, +{{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}}, +{{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}}, +{{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}}, +{{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}}, +{{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}}, +{{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}}, +{{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}}, +{{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}}, +{{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}}, +{{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}}, +{{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}}, +{{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}}, +{{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}}, +{{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}}, +{{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}}, +{{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}}, +{{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}} +}; + +local const ct_data static_dtree[D_CODES] = { +{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}}, +{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}}, +{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}}, +{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}}, +{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}}, +{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} +}; + +const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = { + 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, + 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, +10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, +11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, +12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, +13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, +13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, +14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, +14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, +14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, +15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, +15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, +15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17, +18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, +23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, +26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, +26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, +27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, +27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, +28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, +28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, +28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, +29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, +29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, +29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 +}; + +const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, +13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, +17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, +19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, +21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, +22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, +23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, +25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, +26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, +26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, +27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28 +}; + +local const int base_length[LENGTH_CODES] = { +0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, +64, 80, 96, 112, 128, 160, 192, 224, 0 +}; + +local const int base_dist[D_CODES] = { + 0, 1, 2, 3, 4, 6, 8, 12, 16, 24, + 32, 48, 64, 96, 128, 192, 256, 384, 512, 768, + 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 +}; + diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/zconf.h b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/zconf.h new file mode 100644 index 0000000000..5e6ebbef73 --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/zconf.h @@ -0,0 +1,511 @@ +/* zconf.h -- configuration of the zlib compression library + * Copyright (C) 1995-2013 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#ifndef ZCONF_H +#define ZCONF_H + +/* + * 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. + * Even better than compiling with -DZ_PREFIX would be to use configure to set + * this permanently in zconf.h using "./configure --zprefix". + */ +#if 1 /* was set to #if 1 by ./configure */ +# define Z_PREFIX_SET + +/* all linked symbols */ +# 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 +# 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 deflate z_deflate +# define deflateBound z_deflateBound +# define deflateCopy z_deflateCopy +# define deflateEnd z_deflateEnd +# define deflateInit2_ z_deflateInit2_ +# define deflateInit_ z_deflateInit_ +# define deflateParams z_deflateParams +# define deflatePending z_deflatePending +# 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 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 gzvprintf z_gzvprintf +# 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 gzwrite z_gzwrite +# endif +# define inflate z_inflate +# define inflateBack z_inflateBack +# define inflateBackEnd z_inflateBackEnd +# define inflateBackInit_ z_inflateBackInit_ +# define inflateCopy z_inflateCopy +# define inflateEnd z_inflateEnd +# define inflateGetHeader z_inflateGetHeader +# 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 inflateSetDictionary z_inflateSetDictionary +# define inflateGetDictionary z_inflateGetDictionary +# define inflateSync z_inflateSync +# define inflateSyncPoint z_inflateSyncPoint +# define inflateUndermine z_inflateUndermine +# define inflateResetKeep z_inflateResetKeep +# define inflate_copyright z_inflate_copyright +# define inflate_fast z_inflate_fast +# define inflate_table z_inflate_table +# ifndef Z_SOLO +# define uncompress z_uncompress +# endif +# define zError z_zError +# ifndef Z_SOLO +# define zcalloc z_zcalloc +# define zcfree z_zcfree +# endif +# define zlibCompileFlags z_zlibCompileFlags +# define zlibVersion z_zlibVersion + +/* all zlib typedefs in zlib.h and zconf.h */ +# define Byte z_Byte +# define Bytef z_Bytef +# define alloc_func z_alloc_func +# 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 out_func z_out_func +# define uInt z_uInt +# define uIntf z_uIntf +# define uLong z_uLong +# define uLongf z_uLongf +# 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 + +#if defined(__MSDOS__) && !defined(MSDOS) +# define MSDOS +#endif +#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) +# define OS2 +#endif +#if defined(_WINDOWS) && !defined(WINDOWS) +# define WINDOWS +#endif +#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) +# ifndef WIN32 +# define WIN32 +# endif +#endif +#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) +# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) +# ifndef SYS16BIT +# define SYS16BIT +# endif +# endif +#endif + +/* + * Compile with -DMAXSEG_64K if the alloc function cannot allocate more + * than 64k bytes at a time (needed on systems with 16-bit int). + */ +#ifdef SYS16BIT +# define MAXSEG_64K +#endif +#ifdef MSDOS +# define UNALIGNED_OK +#endif + +#ifdef __STDC_VERSION__ +# ifndef STDC +# define STDC +# endif +# if __STDC_VERSION__ >= 199901L +# ifndef STDC99 +# define STDC99 +# endif +# endif +#endif +#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) +# define STDC +#endif +#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) +# define STDC +#endif +#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) +# define STDC +#endif +#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) +# define STDC +#endif + +#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ +# define STDC +#endif + +#ifndef STDC +# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ +# define const /* note: need a more gentle solution here */ +# endif +#endif + +#if defined(ZLIB_CONST) && !defined(z_const) +# define z_const const +#else +# define z_const +#endif + +/* Some Mac compilers merge all .h files incorrectly: */ +#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +# define NO_DUMMY_DECL +#endif + +/* Maximum value for memLevel in deflateInit2 */ +#ifndef MAX_MEM_LEVEL +# ifdef MAXSEG_64K +# define MAX_MEM_LEVEL 8 +# else +# define MAX_MEM_LEVEL 9 +# endif +#endif + +/* Maximum value for windowBits in deflateInit2 and inflateInit2. + * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files + * created by gzip. (Files created by minigzip can still be extracted by + * gzip.) + */ +#ifndef MAX_WBITS +# define MAX_WBITS 15 /* 32K LZ77 window */ +#endif + +/* The memory requirements for deflate are (in bytes): + (1 << (windowBits+2)) + (1 << (memLevel+9)) + that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) + plus a few kilobytes for small objects. For example, if you want to reduce + the default memory requirements from 256K to 128K, compile with + make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" + Of course this will generally degrade compression (there's no free lunch). + + The memory requirements for inflate are (in bytes) 1 << windowBits + that is, 32K for windowBits=15 (default value) plus a few kilobytes + for small objects. +*/ + + /* Type declarations */ + +#ifndef OF /* function prototypes */ +# ifdef STDC +# define OF(args) args +# else +# define OF(args) () +# 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 + * model programming (small or medium model with some far allocations). + * This was tested only with MSC; for other MSDOS compilers you may have + * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, + * just define FAR to be empty. + */ +#ifdef SYS16BIT +# if defined(M_I86SM) || defined(M_I86MM) + /* MSC small or medium model */ +# define SMALL_MEDIUM +# ifdef _MSC_VER +# define FAR _far +# else +# define FAR far +# endif +# endif +# if (defined(__SMALL__) || defined(__MEDIUM__)) + /* Turbo C small or medium model */ +# define SMALL_MEDIUM +# ifdef __BORLANDC__ +# define FAR _far +# else +# define FAR far +# endif +# endif +#endif + +#if defined(WINDOWS) || defined(WIN32) + /* If building or using zlib as a DLL, define ZLIB_DLL. + * This is not mandatory, but it offers a little performance increase. + */ +# ifdef ZLIB_DLL +# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) +# ifdef ZLIB_INTERNAL +# define ZEXTERN extern __declspec(dllexport) +# else +# define ZEXTERN extern __declspec(dllimport) +# endif +# endif +# endif /* ZLIB_DLL */ + /* If building or using zlib with the WINAPI/WINAPIV calling convention, + * define ZLIB_WINAPI. + * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. + */ +# ifdef ZLIB_WINAPI +# ifdef FAR +# undef FAR +# endif +# include <windows.h> + /* No need for _export, use ZLIB.DEF instead. */ + /* For complete Windows compatibility, use WINAPI, not __stdcall. */ +# define ZEXPORT WINAPI +# ifdef WIN32 +# define ZEXPORTVA WINAPIV +# else +# define ZEXPORTVA FAR CDECL +# endif +# endif +#endif + +#if defined (__BEOS__) +# ifdef ZLIB_DLL +# ifdef ZLIB_INTERNAL +# define ZEXPORT __declspec(dllexport) +# define ZEXPORTVA __declspec(dllexport) +# else +# define ZEXPORT __declspec(dllimport) +# define ZEXPORTVA __declspec(dllimport) +# endif +# endif +#endif + +#ifndef ZEXTERN +# define ZEXTERN extern +#endif +#ifndef ZEXPORT +# define ZEXPORT +#endif +#ifndef ZEXPORTVA +# define ZEXPORTVA +#endif + +#ifndef FAR +# define FAR +#endif + +#if !defined(__MACTYPES__) +typedef unsigned char Byte; /* 8 bits */ +#endif +typedef unsigned int uInt; /* 16 bits or more */ +typedef unsigned long uLong; /* 32 bits or more */ + +#ifdef SMALL_MEDIUM + /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ +# define Bytef Byte FAR +#else + typedef Byte FAR Bytef; +#endif +typedef char FAR charf; +typedef int FAR intf; +typedef uInt FAR uIntf; +typedef uLong FAR uLongf; + +#ifdef STDC + typedef void const *voidpc; + typedef void FAR *voidpf; + typedef void *voidp; +#else + typedef Byte const *voidpc; + typedef Byte FAR *voidpf; + typedef Byte *voidp; +#endif + +#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) +# include <limits.h> +# if (UINT_MAX == 0xffffffffUL) +# define Z_U4 unsigned +# elif (ULONG_MAX == 0xffffffffUL) +# define Z_U4 unsigned long +# elif (USHRT_MAX == 0xffffffffUL) +# define Z_U4 unsigned short +# endif +#endif + +#ifdef Z_U4 + typedef Z_U4 z_crc_t; +#else + typedef unsigned long z_crc_t; +#endif + +#if 1 /* was set to #if 1 by ./configure */ +# define Z_HAVE_UNISTD_H +#endif + +#if 1 /* was 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_CUR 1 /* Seek from current position. */ +# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ +#endif + +#ifndef z_off_t +# define z_off_t long +#endif + +#if !defined(_WIN32) && defined(Z_LARGE64) +# define z_off64_t off64_t +#else +# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) +# define z_off64_t __int64 +# else +# define z_off64_t z_off_t +# endif +#endif + +/* MVS linker does not support external names larger than 8 bytes */ +#if defined(__MVS__) + #pragma map(deflateInit_,"DEIN") + #pragma map(deflateInit2_,"DEIN2") + #pragma map(deflateEnd,"DEEND") + #pragma map(deflateBound,"DEBND") + #pragma map(inflateInit_,"ININ") + #pragma map(inflateInit2_,"ININ2") + #pragma map(inflateEnd,"INEND") + #pragma map(inflateSync,"INSY") + #pragma map(inflateSetDictionary,"INSEDI") + #pragma map(compressBound,"CMBND") + #pragma map(inflate_table,"INTABL") + #pragma map(inflate_fast,"INFA") + #pragma map(inflate_copyright,"INCOPY") +#endif + +#endif /* ZCONF_H */ diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/zlib.h b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/zlib.h new file mode 100644 index 0000000000..3e0c7672ac --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/zlib.h @@ -0,0 +1,1768 @@ +/* zlib.h -- interface of the 'zlib' general purpose compression library + version 1.2.8, April 28th, 2013 + + Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + + The data format used by the zlib library is described by RFCs (Request for + Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950 + (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format). +*/ + +#ifndef ZLIB_H +#define ZLIB_H + +#include "zconf.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define ZLIB_VERSION "1.2.8" +#define ZLIB_VERNUM 0x1280 +#define ZLIB_VER_MAJOR 1 +#define ZLIB_VER_MINOR 2 +#define ZLIB_VER_REVISION 8 +#define ZLIB_VER_SUBREVISION 0 + +/* + The 'zlib' compression library provides in-memory compression and + decompression functions, including integrity checks of the uncompressed data. + This version of the library supports only one compression method (deflation) + but other algorithms will be added later and will have the same stream + interface. + + Compression can be done in a single step if the buffers are large enough, + or can be done by repeated calls of the compression function. In the latter + case, the application must provide more input and/or consume the output + (providing more output space) before each call. + + The compressed data format used by default by the in-memory functions is + the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped + around a deflate stream, which is itself documented in RFC 1951. + + The library also supports reading and writing files in gzip (.gz) format + with an interface similar to that of stdio using the functions that start + with "gz". The gzip format is different from the zlib format. gzip is a + gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. + + This library can optionally read and write gzip streams in memory as well. + + The zlib format was designed to be compact and fast for use in memory + and on communications channels. The gzip format was designed for single- + file compression on file systems, has a larger header than zlib to maintain + directory information, and uses a different, slower check method than zlib. + + The library does not install any signal handler. The decoder checks + the consistency of the compressed data, so the library should never crash + even in case of corrupted input. +*/ + +typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); +typedef void (*free_func) OF((voidpf opaque, voidpf address)); + +struct internal_state; + +typedef struct z_stream_s { + z_const Bytef *next_in; /* next input byte */ + uInt avail_in; /* number of bytes available at next_in */ + uLong total_in; /* total number of input bytes read so far */ + + Bytef *next_out; /* next output byte should be put there */ + uInt avail_out; /* remaining free space at next_out */ + uLong total_out; /* total number of bytes output so far */ + + z_const char *msg; /* last error message, NULL if no error */ + struct internal_state FAR *state; /* not visible by applications */ + + alloc_func zalloc; /* used to allocate the internal state */ + free_func zfree; /* used to free the internal state */ + voidpf opaque; /* private data object passed to zalloc and zfree */ + + int data_type; /* best guess about the data type: binary or text */ + uLong adler; /* adler32 value of the uncompressed data */ + uLong reserved; /* reserved for future use */ +} z_stream; + +typedef z_stream FAR *z_streamp; + +/* + gzip header information passed to and from zlib routines. See RFC 1952 + for more details on the meanings of these fields. +*/ +typedef struct gz_header_s { + int text; /* true if compressed data believed to be text */ + uLong time; /* modification time */ + int xflags; /* extra flags (not used when writing a gzip file) */ + int os; /* operating system */ + Bytef *extra; /* pointer to extra field or Z_NULL if none */ + uInt extra_len; /* extra field length (valid if extra != Z_NULL) */ + uInt extra_max; /* space at extra (only when reading header) */ + Bytef *name; /* pointer to zero-terminated file name or Z_NULL */ + uInt name_max; /* space at name (only when reading header) */ + Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */ + uInt comm_max; /* space at comment (only when reading header) */ + int hcrc; /* true if there was or will be a header crc */ + int done; /* true when done reading gzip header (not used + when writing a gzip file) */ +} gz_header; + +typedef gz_header FAR *gz_headerp; + +/* + The application must update next_in and avail_in when avail_in has dropped + to zero. It must update next_out and avail_out when avail_out has dropped + to zero. The application must initialize zalloc, zfree and opaque before + calling the init function. All other fields are set by the compression + library and must not be updated by the application. + + The opaque value provided by the application will be passed as the first + parameter for calls of zalloc and zfree. This can be useful for custom + memory management. The compression library attaches no meaning to the + opaque value. + + zalloc must return Z_NULL if there is not enough memory for the object. + If zlib is used in a multi-threaded application, zalloc and zfree must be + thread safe. + + On 16-bit systems, the functions zalloc and zfree must be able to allocate + exactly 65536 bytes, but will not be required to allocate more than this if + the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers + returned by zalloc for objects of exactly 65536 bytes *must* have their + offset normalized to zero. The default allocation function provided by this + library ensures this (see zutil.c). To reduce memory requirements and avoid + any allocation of 64K objects, at the expense of compression ratio, compile + the library with -DMAX_WBITS=14 (see zconf.h). + + The fields total_in and total_out can be used for statistics or progress + reports. After compression, total_in holds the total size of the + uncompressed data and may be saved for use in the decompressor (particularly + if the decompressor wants to decompress everything in a single step). +*/ + + /* constants */ + +#define Z_NO_FLUSH 0 +#define Z_PARTIAL_FLUSH 1 +#define Z_SYNC_FLUSH 2 +#define Z_FULL_FLUSH 3 +#define Z_FINISH 4 +#define Z_BLOCK 5 +#define Z_TREES 6 +/* Allowed flush values; see deflate() and inflate() below for details */ + +#define Z_OK 0 +#define Z_STREAM_END 1 +#define Z_NEED_DICT 2 +#define Z_ERRNO (-1) +#define Z_STREAM_ERROR (-2) +#define Z_DATA_ERROR (-3) +#define Z_MEM_ERROR (-4) +#define Z_BUF_ERROR (-5) +#define Z_VERSION_ERROR (-6) +/* Return codes for the compression/decompression functions. Negative values + * are errors, positive values are used for special but normal events. + */ + +#define Z_NO_COMPRESSION 0 +#define Z_BEST_SPEED 1 +#define Z_BEST_COMPRESSION 9 +#define Z_DEFAULT_COMPRESSION (-1) +/* compression levels */ + +#define Z_FILTERED 1 +#define Z_HUFFMAN_ONLY 2 +#define Z_RLE 3 +#define Z_FIXED 4 +#define Z_DEFAULT_STRATEGY 0 +/* compression strategy; see deflateInit2() below for details */ + +#define Z_BINARY 0 +#define Z_TEXT 1 +#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */ +#define Z_UNKNOWN 2 +/* Possible values of the data_type field (though see inflate()) */ + +#define Z_DEFLATED 8 +/* The deflate compression method (the only one supported in this version) */ + +#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ + +#define zlib_version zlibVersion() +/* for compatibility with versions < 1.0.2 */ + + + /* basic functions */ + +ZEXTERN const char * ZEXPORT zlibVersion OF((void)); +/* The application can compare zlibVersion and ZLIB_VERSION for consistency. + If the first character differs, the library code actually used is not + compatible with the zlib.h header file used by the application. This check + is automatically made by deflateInit and inflateInit. + */ + +/* +ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); + + Initializes the internal stream state for compression. The fields + zalloc, zfree and opaque must be initialized before by the caller. If + zalloc and zfree are set to Z_NULL, deflateInit updates them to use default + allocation functions. + + The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: + 1 gives best speed, 9 gives best compression, 0 gives no compression at all + (the input data is simply copied a block at a time). Z_DEFAULT_COMPRESSION + requests a default compromise between speed and compression (currently + equivalent to level 6). + + deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if level is not a valid compression level, or + Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible + with the version assumed by the caller (ZLIB_VERSION). msg is set to null + if there is no error message. deflateInit does not perform any compression: + this will be done by deflate(). +*/ + + +ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); +/* + deflate compresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce + some output latency (reading input without producing any output) except when + forced to flush. + + The detailed semantics are as follows. deflate performs one or both of the + following actions: + + - Compress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in and avail_in are updated and + processing will resume at this point for the next call of deflate(). + + - Provide more output starting at next_out and update next_out and avail_out + accordingly. This action is forced if the parameter flush is non zero. + Forcing flush frequently degrades the compression ratio, so this parameter + should be set only when necessary (in interactive applications). Some + output may be provided even if flush is not set. + + Before the call of deflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming more + output, and updating avail_in or avail_out accordingly; avail_out should + never be zero before the call. The application can consume the compressed + output when it wants, for example when the output buffer is full (avail_out + == 0), or after each call of deflate(). If deflate returns Z_OK and with + zero avail_out, it must be called again after making room in the output + buffer because there might be more output pending. + + Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to + decide how much data to accumulate before producing output, in order to + maximize compression. + + If the parameter flush is set to Z_SYNC_FLUSH, all pending output is + flushed to the output buffer and the output is aligned on a byte boundary, so + that the decompressor can get all input data available so far. (In + particular avail_in is zero after the call if enough output space has been + provided before the call.) Flushing may degrade compression for some + compression algorithms and so it should be used only when necessary. This + completes the current deflate block and follows it with an empty stored block + that is three bits plus filler bits to the next byte, followed by four bytes + (00 00 ff ff). + + If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the + output buffer, but the output is not aligned to a byte boundary. All of the + input data so far will be available to the decompressor, as for Z_SYNC_FLUSH. + This completes the current deflate block and follows it with an empty fixed + codes block that is 10 bits long. This assures that enough bytes are output + in order for the decompressor to finish the block before the empty fixed code + block. + + If flush is set to Z_BLOCK, a deflate block is completed and emitted, as + for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to + seven bits of the current block are held to be written as the next byte after + the next deflate block is completed. In this case, the decompressor may not + be provided enough bits at this point in order to complete decompression of + the data provided so far to the compressor. It may need to wait for the next + block to be emitted. This is for advanced applications that need to control + the emission of deflate blocks. + + If flush is set to Z_FULL_FLUSH, all output is flushed as with + Z_SYNC_FLUSH, and the compression state is reset so that decompression can + restart from this point if previous compressed data has been damaged or if + random access is desired. Using Z_FULL_FLUSH too often can seriously degrade + compression. + + If deflate returns with avail_out == 0, this function must be called again + with the same value of the flush parameter and more output space (updated + avail_out), until the flush is complete (deflate returns with non-zero + avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that + avail_out is greater than six to avoid repeated flush markers due to + avail_out == 0 on return. + + If the parameter flush is set to Z_FINISH, pending input is processed, + pending output is flushed and deflate returns with Z_STREAM_END if there was + enough output space; if deflate returns with Z_OK, this function must be + called again with Z_FINISH and more output space (updated avail_out) but no + more input data, until it returns with Z_STREAM_END or an error. After + deflate has returned Z_STREAM_END, the only possible operations on the stream + are deflateReset or deflateEnd. + + Z_FINISH can be used immediately after deflateInit if all the compression + is to be done in a single step. In this case, avail_out must be at least the + value returned by deflateBound (see below). Then deflate is guaranteed to + return Z_STREAM_END. If not enough output space is provided, deflate will + not return Z_STREAM_END, and it must be called again as described above. + + deflate() sets strm->adler to the adler32 checksum of all input read + so far (that is, total_in bytes). + + deflate() may update strm->data_type if it can make a good guess about + the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered + binary. This field is only for information purposes and does not affect the + compression algorithm in any manner. + + deflate() returns Z_OK if some progress has been made (more input + processed or more output produced), Z_STREAM_END if all input has been + consumed and all output has been produced (only when flush is set to + Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example + if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible + (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not + fatal, and deflate() can be called again with more input and more output + space to continue compressing. +*/ + + +ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); +/* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any pending + output. + + deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the + stream state was inconsistent, Z_DATA_ERROR if the stream was freed + prematurely (some input or output was discarded). In the error case, msg + may be set but then points to a static string (which must not be + deallocated). +*/ + + +/* +ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); + + Initializes the internal stream state for decompression. The fields + next_in, avail_in, zalloc, zfree and opaque must be initialized before by + the caller. If next_in is not Z_NULL and avail_in is large enough (the + exact value depends on the compression method), inflateInit determines the + compression method from the zlib header and allocates all data structures + accordingly; otherwise the allocation will be deferred to the first call of + inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to + use default allocation functions. + + inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_VERSION_ERROR if the zlib library version is incompatible with the + version assumed by the caller, or Z_STREAM_ERROR if the parameters are + invalid, such as a null pointer to the structure. msg is set to null if + there is no error message. inflateInit does not perform any decompression + apart from possibly reading the zlib header if present: actual decompression + will be done by inflate(). (So next_in and avail_in may be modified, but + next_out and avail_out are unused and unchanged.) The current implementation + of inflateInit() does not process any header information -- that is deferred + until inflate() is called. +*/ + + +ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); +/* + inflate decompresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce + some output latency (reading input without producing any output) except when + forced to flush. + + The detailed semantics are as follows. inflate performs one or both of the + following actions: + + - Decompress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in is updated and processing will + resume at this point for the next call of inflate(). + + - Provide more output starting at next_out and update next_out and avail_out + accordingly. inflate() provides as much output as possible, until there is + no more input data or no more space in the output buffer (see below about + the flush parameter). + + Before the call of inflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming more + output, and updating the next_* and avail_* values accordingly. The + application can consume the uncompressed output when it wants, for example + when the output buffer is full (avail_out == 0), or after each call of + inflate(). If inflate returns Z_OK and with zero avail_out, it must be + called again after making room in the output buffer because there might be + more output pending. + + The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH, + Z_BLOCK, or Z_TREES. Z_SYNC_FLUSH requests that inflate() flush as much + output as possible to the output buffer. Z_BLOCK requests that inflate() + stop if and when it gets to the next deflate block boundary. When decoding + the zlib or gzip format, this will cause inflate() to return immediately + after the header and before the first block. When doing a raw inflate, + inflate() will go ahead and process the first block, and will return when it + gets to the end of that block, or when it runs out of data. + + The Z_BLOCK option assists in appending to or combining deflate streams. + Also to assist in this, on return inflate() will set strm->data_type to the + number of unused bits in the last byte taken from strm->next_in, plus 64 if + inflate() is currently decoding the last block in the deflate stream, plus + 128 if inflate() returned immediately after decoding an end-of-block code or + decoding the complete header up to just before the first byte of the deflate + stream. The end-of-block will not be indicated until all of the uncompressed + data from that block has been written to strm->next_out. The number of + unused bits may in general be greater than seven, except when bit 7 of + data_type is set, in which case the number of unused bits will be less than + eight. data_type is set as noted here every time inflate() returns for all + flush options, and so can be used to determine the amount of currently + consumed input in bits. + + The Z_TREES option behaves as Z_BLOCK does, but it also returns when the + end of each deflate block header is reached, before any actual data in that + block is decoded. This allows the caller to determine the length of the + deflate block header for later use in random access within a deflate block. + 256 is added to the value of strm->data_type when inflate() returns + immediately after reaching the end of the deflate block header. + + inflate() should normally be called until it returns Z_STREAM_END or an + error. However if all decompression is to be performed in a single step (a + single call of inflate), the parameter flush should be set to Z_FINISH. In + this case all pending input is processed and all pending output is flushed; + avail_out must be large enough to hold all of the uncompressed data for the + operation to complete. (The size of the uncompressed data may have been + saved by the compressor for this purpose.) The use of Z_FINISH is not + required to perform an inflation in one step. However it may be used to + inform inflate that a faster approach can be used for the single inflate() + call. Z_FINISH also informs inflate to not maintain a sliding window if the + stream completes, which reduces inflate's memory footprint. If the stream + does not complete, either because not all of the stream is provided or not + enough output space is provided, then a sliding window will be allocated and + inflate() can be called again to continue the operation as if Z_NO_FLUSH had + been used. + + In this implementation, inflate() always flushes as much output as + possible to the output buffer, and always uses the faster approach on the + first call. So the effects of the flush parameter in this implementation are + on the return value of inflate() as noted below, when inflate() returns early + when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of + memory for a sliding window when Z_FINISH is used. + + If a preset dictionary is needed after this call (see inflateSetDictionary + below), inflate sets strm->adler to the Adler-32 checksum of the dictionary + chosen by the compressor and returns Z_NEED_DICT; otherwise it sets + strm->adler to the Adler-32 checksum of all output produced so far (that is, + total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described + below. At the end of the stream, inflate() checks that its computed adler32 + checksum is equal to that saved by the compressor and returns Z_STREAM_END + only if the checksum is correct. + + inflate() can decompress and check either zlib-wrapped or gzip-wrapped + deflate data. The header type is detected automatically, if requested when + initializing with inflateInit2(). Any information contained in the gzip + header is not retained, so applications that need that information should + instead use raw inflate, see inflateInit2() below, or inflateBack() and + perform their own processing of the gzip header and trailer. When processing + gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output + producted so far. The CRC-32 is checked against the gzip trailer. + + inflate() returns Z_OK if some progress has been made (more input processed + or more output produced), Z_STREAM_END if the end of the compressed data has + been reached and all uncompressed output has been produced, Z_NEED_DICT if a + preset dictionary is needed at this point, Z_DATA_ERROR if the input data was + corrupted (input stream not conforming to the zlib format or incorrect check + value), Z_STREAM_ERROR if the stream structure was inconsistent (for example + next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory, + Z_BUF_ERROR if no progress is possible or if there was not enough room in the + output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and + inflate() can be called again with more input and more output space to + continue decompressing. If Z_DATA_ERROR is returned, the application may + then call inflateSync() to look for a good compression block if a partial + recovery of the data is desired. +*/ + + +ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); +/* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any pending + output. + + inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state + was inconsistent. In the error case, msg may be set but then points to a + static string (which must not be deallocated). +*/ + + + /* Advanced functions */ + +/* + The following functions are needed only in some special applications. +*/ + +/* +ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, + int level, + int method, + int windowBits, + int memLevel, + int strategy)); + + This is another version of deflateInit with more compression options. The + fields next_in, zalloc, zfree and opaque must be initialized before by the + caller. + + The method parameter is the compression method. It must be Z_DEFLATED in + this version of the library. + + The windowBits parameter is the base two logarithm of the window size + (the size of the history buffer). It should be in the range 8..15 for this + version of the library. Larger values of this parameter result in better + compression at the expense of memory usage. The default value is 15 if + deflateInit is used instead. + + windowBits can also be -8..-15 for raw deflate. In this case, -windowBits + determines the window size. deflate() will then generate raw deflate data + with no zlib header or trailer, and will not compute an adler32 check value. + + windowBits can also be greater than 15 for optional gzip encoding. Add + 16 to windowBits to write a simple gzip header and trailer around the + compressed data instead of a zlib wrapper. The gzip header will have no + file name, no extra data, no comment, no modification time (set to zero), no + header crc, and the operating system will be set to 255 (unknown). If a + gzip stream is being written, strm->adler is a crc32 instead of an adler32. + + The memLevel parameter specifies how much memory should be allocated + for the internal compression state. memLevel=1 uses minimum memory but is + slow and reduces compression ratio; memLevel=9 uses maximum memory for + optimal speed. The default value is 8. See zconf.h for total memory usage + as a function of windowBits and memLevel. + + The strategy parameter is used to tune the compression algorithm. Use the + value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a + filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no + string match), or Z_RLE to limit match distances to one (run-length + encoding). Filtered data consists mostly of small values with a somewhat + random distribution. In this case, the compression algorithm is tuned to + compress them better. The effect of Z_FILTERED is to force more Huffman + coding and less string matching; it is somewhat intermediate between + Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as + fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data. The + strategy parameter only affects the compression ratio but not the + correctness of the compressed output even if it is not set appropriately. + Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler + decoder for special applications. + + deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid + method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is + incompatible with the version assumed by the caller (ZLIB_VERSION). msg is + set to null if there is no error message. deflateInit2 does not perform any + compression: this will be done by deflate(). +*/ + +ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); +/* + Initializes the compression dictionary from the given byte sequence + without producing any compressed output. When using the zlib format, this + function must be called immediately after deflateInit, deflateInit2 or + deflateReset, and before any call of deflate. When doing raw deflate, this + function must be called either before any call of deflate, or immediately + after the completion of a deflate block, i.e. after all input has been + consumed and all output has been delivered when using any of the flush + options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH. The + compressor and decompressor must use exactly the same dictionary (see + inflateSetDictionary). + + The dictionary should consist of strings (byte sequences) that are likely + to be encountered later in the data to be compressed, with the most commonly + used strings preferably put towards the end of the dictionary. Using a + dictionary is most useful when the data to be compressed is short and can be + predicted with good accuracy; the data can then be compressed better than + with the default empty dictionary. + + Depending on the size of the compression data structures selected by + deflateInit or deflateInit2, a part of the dictionary may in effect be + discarded, for example if the dictionary is larger than the window size + provided in deflateInit or deflateInit2. Thus the strings most likely to be + useful should be put at the end of the dictionary, not at the front. In + addition, the current implementation of deflate will use at most the window + size minus 262 bytes of the provided dictionary. + + Upon return of this function, strm->adler is set to the adler32 value + of the dictionary; the decompressor may later use this value to determine + which dictionary has been used by the compressor. (The adler32 value + applies to the whole dictionary even if only a subset of the dictionary is + actually used by the compressor.) If a raw deflate was requested, then the + adler32 value is not computed and strm->adler is not set. + + deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a + parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is + inconsistent (for example if deflate has already been called for this stream + or if not at a block boundary for raw deflate). deflateSetDictionary does + not perform any compression: this will be done by deflate(). +*/ + +ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, + z_streamp source)); +/* + Sets the destination stream as a complete copy of the source stream. + + This function can be useful when several compression strategies will be + tried, for example when there are several ways of pre-processing the input + data with a filter. The streams that will be discarded should then be freed + by calling deflateEnd. Note that deflateCopy duplicates the internal + compression state which can be quite large, so this strategy is slow and can + consume lots of memory. + + deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent + (such as zalloc being Z_NULL). msg is left unchanged in both source and + destination. +*/ + +ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); +/* + This function is equivalent to deflateEnd followed by deflateInit, + but does not free and reallocate all the internal compression state. The + stream will keep the same compression level and any other attributes that + may have been set by deflateInit2. + + deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being Z_NULL). +*/ + +ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, + int level, + int strategy)); +/* + Dynamically update the compression level and compression strategy. The + interpretation of level and strategy is as in deflateInit2. This can be + used to switch between compression and straight copy of the input data, or + to switch to a different kind of input data requiring a different strategy. + If the compression level is changed, the input available so far is + compressed with the old level (and may be flushed); the new level will take + effect only at the next call of deflate(). + + Before the call of deflateParams, the stream state must be set as for + a call of deflate(), since the currently available input may have to be + compressed and flushed. In particular, strm->avail_out must be non-zero. + + deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source + stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if + strm->avail_out was zero. +*/ + +ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, + int good_length, + int max_lazy, + int nice_length, + int max_chain)); +/* + Fine tune deflate's internal compression parameters. This should only be + used by someone who understands the algorithm used by zlib's deflate for + searching for the best matching string, and even then only by the most + fanatic optimizer trying to squeeze out the last compressed bit for their + specific input data. Read the deflate.c source code for the meaning of the + max_lazy, good_length, nice_length, and max_chain parameters. + + deflateTune() can be called after deflateInit() or deflateInit2(), and + returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. + */ + +ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, + uLong sourceLen)); +/* + deflateBound() returns an upper bound on the compressed size after + deflation of sourceLen bytes. It must be called after deflateInit() or + deflateInit2(), and after deflateSetHeader(), if used. This would be used + to allocate an output buffer for deflation in a single pass, and so would be + called before deflate(). If that first deflate() call is provided the + sourceLen input bytes, an output buffer allocated to the size returned by + deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed + to return Z_STREAM_END. Note that it is possible for the compressed size to + be larger than the value returned by deflateBound() if flush options other + than Z_FINISH or Z_NO_FLUSH are used. +*/ + +ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm, + unsigned *pending, + int *bits)); +/* + deflatePending() returns the number of bytes and bits of output that have + been generated, but not yet provided in the available output. The bytes not + provided would be due to the available output space having being consumed. + The number of bits of output not provided are between 0 and 7, where they + await more bits to join them in order to fill out a full byte. If pending + or bits are Z_NULL, then those values are not set. + + deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. + */ + +ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, + int bits, + int value)); +/* + deflatePrime() inserts bits in the deflate output stream. The intent + is that this function is used to start off the deflate output with the bits + leftover from a previous deflate stream when appending to it. As such, this + function can only be used for raw deflate, and must be used before the first + deflate() call after a deflateInit2() or deflateReset(). bits must be less + than or equal to 16, and that many of the least significant bits of value + will be inserted in the output. + + deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough + room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the + source stream state was inconsistent. +*/ + +ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, + gz_headerp head)); +/* + deflateSetHeader() provides gzip header information for when a gzip + stream is requested by deflateInit2(). deflateSetHeader() may be called + after deflateInit2() or deflateReset() and before the first call of + deflate(). The text, time, os, extra field, name, and comment information + in the provided gz_header structure are written to the gzip header (xflag is + ignored -- the extra flags are set according to the compression level). The + caller must assure that, if not Z_NULL, name and comment are terminated with + a zero byte, and that if extra is not Z_NULL, that extra_len bytes are + available there. If hcrc is true, a gzip header crc is included. Note that + the current versions of the command-line version of gzip (up through version + 1.3.x) do not support header crc's, and will report that it is a "multi-part + gzip file" and give up. + + If deflateSetHeader is not used, the default gzip header has text false, + the time set to zero, and os set to 255, with no extra, name, or comment + fields. The gzip header is returned to the default state by deflateReset(). + + deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +/* +ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, + int windowBits)); + + This is another version of inflateInit with an extra parameter. The + fields next_in, avail_in, zalloc, zfree and opaque must be initialized + before by the caller. + + The windowBits parameter is the base two logarithm of the maximum window + size (the size of the history buffer). It should be in the range 8..15 for + this version of the library. The default value is 15 if inflateInit is used + instead. windowBits must be greater than or equal to the windowBits value + provided to deflateInit2() while compressing, or it must be equal to 15 if + deflateInit2() was not used. If a compressed stream with a larger window + size is given as input, inflate() will return with the error code + Z_DATA_ERROR instead of trying to allocate a larger window. + + windowBits can also be zero to request that inflate use the window size in + the zlib header of the compressed stream. + + windowBits can also be -8..-15 for raw inflate. In this case, -windowBits + determines the window size. inflate() will then process raw deflate data, + not looking for a zlib or gzip header, not generating a check value, and not + looking for any check values for comparison at the end of the stream. This + is for use with other formats that use the deflate compressed data format + such as zip. Those formats provide their own check values. If a custom + format is developed using the raw deflate format for compressed data, it is + recommended that a check value such as an adler32 or a crc32 be applied to + the uncompressed data as is done in the zlib, gzip, and zip formats. For + most applications, the zlib format should be used as is. Note that comments + above on the use in deflateInit2() applies to the magnitude of windowBits. + + windowBits can also be greater than 15 for optional gzip decoding. Add + 32 to windowBits to enable zlib and gzip decoding with automatic header + detection, or add 16 to decode only the gzip format (the zlib format will + return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a + crc32 instead of an adler32. + + inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_VERSION_ERROR if the zlib library version is incompatible with the + version assumed by the caller, or Z_STREAM_ERROR if the parameters are + invalid, such as a null pointer to the structure. msg is set to null if + there is no error message. inflateInit2 does not perform any decompression + apart from possibly reading the zlib header if present: actual decompression + will be done by inflate(). (So next_in and avail_in may be modified, but + next_out and avail_out are unused and unchanged.) The current implementation + of inflateInit2() does not process any header information -- that is + deferred until inflate() is called. +*/ + +ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); +/* + Initializes the decompression dictionary from the given uncompressed byte + sequence. This function must be called immediately after a call of inflate, + if that call returned Z_NEED_DICT. The dictionary chosen by the compressor + can be determined from the adler32 value returned by that call of inflate. + The compressor and decompressor must use exactly the same dictionary (see + deflateSetDictionary). For raw inflate, this function can be called at any + time to set the dictionary. If the provided dictionary is smaller than the + window and there is already data in the window, then the provided dictionary + will amend what's there. The application must insure that the dictionary + that was used for compression is provided. + + inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a + parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is + inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the + expected one (incorrect adler32 value). inflateSetDictionary does not + perform any decompression: this will be done by subsequent calls of + inflate(). +*/ + +ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm, + Bytef *dictionary, + uInt *dictLength)); +/* + Returns the sliding dictionary being maintained by inflate. dictLength is + set to the number of bytes in the dictionary, and that many bytes are copied + to dictionary. dictionary must have enough space, where 32768 bytes is + always enough. If inflateGetDictionary() is called with dictionary equal to + Z_NULL, then only the dictionary length is returned, and nothing is copied. + Similary, if dictLength is Z_NULL, then it is not set. + + inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the + stream state is inconsistent. +*/ + +ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); +/* + Skips invalid compressed data until a possible full flush point (see above + for the description of deflate with Z_FULL_FLUSH) can be found, or until all + available input is skipped. No output is provided. + + inflateSync searches for a 00 00 FF FF pattern in the compressed data. + All full flush points have this pattern, but not all occurrences of this + pattern are full flush points. + + inflateSync returns Z_OK if a possible full flush point has been found, + Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point + has been found, or Z_STREAM_ERROR if the stream structure was inconsistent. + In the success case, the application may save the current current value of + total_in which indicates where valid compressed data was found. In the + error case, the application may repeatedly call inflateSync, providing more + input each time, until success or end of the input data. +*/ + +ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, + z_streamp source)); +/* + Sets the destination stream as a complete copy of the source stream. + + This function can be useful when randomly accessing a large stream. The + first pass through the stream can periodically record the inflate state, + allowing restarting inflate at those points when randomly accessing the + stream. + + inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent + (such as zalloc being Z_NULL). msg is left unchanged in both source and + destination. +*/ + +ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); +/* + This function is equivalent to inflateEnd followed by inflateInit, + but does not free and reallocate all the internal decompression state. The + stream will keep attributes that may have been set by inflateInit2. + + inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being Z_NULL). +*/ + +ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, + int windowBits)); +/* + This function is the same as inflateReset, but it also permits changing + the wrap and window size requests. The windowBits parameter is interpreted + the same as it is for inflateInit2. + + inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being Z_NULL), or if + the windowBits parameter is invalid. +*/ + +ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, + int bits, + int value)); +/* + This function inserts bits in the inflate input stream. The intent is + that this function is used to start inflating at a bit position in the + middle of a byte. The provided bits will be used before any bytes are used + from next_in. This function should only be used with raw inflate, and + should be used before the first inflate() call after inflateInit2() or + inflateReset(). bits must be less than or equal to 16, and that many of the + least significant bits of value will be inserted in the input. + + If bits is negative, then the input stream bit buffer is emptied. Then + inflatePrime() can be called again to put bits in the buffer. This is used + to clear out bits leftover after feeding inflate a block description prior + to feeding inflate codes. + + inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm)); +/* + This function returns two values, one in the lower 16 bits of the return + value, and the other in the remaining upper bits, obtained by shifting the + return value down 16 bits. If the upper value is -1 and the lower value is + zero, then inflate() is currently decoding information outside of a block. + If the upper value is -1 and the lower value is non-zero, then inflate is in + the middle of a stored block, with the lower value equaling the number of + bytes from the input remaining to copy. If the upper value is not -1, then + it is the number of bits back from the current bit position in the input of + the code (literal or length/distance pair) currently being processed. In + that case the lower value is the number of bytes already emitted for that + code. + + A code is being processed if inflate is waiting for more input to complete + decoding of the code, or if it has completed decoding but is waiting for + more output space to write the literal or match data. + + inflateMark() is used to mark locations in the input data for random + access, which may be at bit positions, and to note those cases where the + output of a code may span boundaries of random access blocks. The current + location in the input stream can be determined from avail_in and data_type + as noted in the description for the Z_BLOCK flush parameter for inflate. + + inflateMark returns the value noted above or -1 << 16 if the provided + source stream state was inconsistent. +*/ + +ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, + gz_headerp head)); +/* + inflateGetHeader() requests that gzip header information be stored in the + provided gz_header structure. inflateGetHeader() may be called after + inflateInit2() or inflateReset(), and before the first call of inflate(). + As inflate() processes the gzip stream, head->done is zero until the header + is completed, at which time head->done is set to one. If a zlib stream is + being decoded, then head->done is set to -1 to indicate that there will be + no gzip header information forthcoming. Note that Z_BLOCK or Z_TREES can be + used to force inflate() to return immediately after header processing is + complete and before any actual data is decompressed. + + The text, time, xflags, and os fields are filled in with the gzip header + contents. hcrc is set to true if there is a header CRC. (The header CRC + was valid if done is set to one.) If extra is not Z_NULL, then extra_max + contains the maximum number of bytes to write to extra. Once done is true, + extra_len contains the actual extra field length, and extra contains the + extra field, or that field truncated if extra_max is less than extra_len. + If name is not Z_NULL, then up to name_max characters are written there, + terminated with a zero unless the length is greater than name_max. If + comment is not Z_NULL, then up to comm_max characters are written there, + terminated with a zero unless the length is greater than comm_max. When any + of extra, name, or comment are not Z_NULL and the respective field is not + present in the header, then that field is set to Z_NULL to signal its + absence. This allows the use of deflateSetHeader() with the returned + structure to duplicate the header. However if those fields are set to + allocated memory, then the application will need to save those pointers + elsewhere so that they can be eventually freed. + + If inflateGetHeader is not used, then the header information is simply + discarded. The header is always checked for validity, including the header + CRC if present. inflateReset() will reset the process to discard the header + information. The application would need to call inflateGetHeader() again to + retrieve the header from the next gzip stream. + + inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +/* +ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, + unsigned char FAR *window)); + + Initialize the internal stream state for decompression using inflateBack() + calls. The fields zalloc, zfree and opaque in strm must be initialized + before the call. If zalloc and zfree are Z_NULL, then the default library- + derived memory allocation routines are used. windowBits is the base two + logarithm of the window size, in the range 8..15. window is a caller + supplied buffer of that size. Except for special applications where it is + assured that deflate was used with small window sizes, windowBits must be 15 + and a 32K byte window must be supplied to be able to decompress general + deflate streams. + + See inflateBack() for the usage of these routines. + + inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of + the parameters are invalid, Z_MEM_ERROR if the internal state could not be + allocated, or Z_VERSION_ERROR if the version of the library does not match + the version of the header file. +*/ + +typedef unsigned (*in_func) OF((void FAR *, + z_const unsigned char FAR * FAR *)); +typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); + +ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, + in_func in, void FAR *in_desc, + out_func out, void FAR *out_desc)); +/* + inflateBack() does a raw inflate with a single call using a call-back + interface for input and output. This is potentially more efficient than + inflate() for file i/o applications, in that it avoids copying between the + output and the sliding window by simply making the window itself the output + buffer. inflate() can be faster on modern CPUs when used with large + buffers. inflateBack() trusts the application to not change the output + buffer passed by the output function, at least until inflateBack() returns. + + inflateBackInit() must be called first to allocate the internal state + and to initialize the state with the user-provided window buffer. + inflateBack() may then be used multiple times to inflate a complete, raw + deflate stream with each call. inflateBackEnd() is then called to free the + allocated state. + + A raw deflate stream is one with no zlib or gzip header or trailer. + This routine would normally be used in a utility that reads zip or gzip + files and writes out uncompressed files. The utility would decode the + header and process the trailer on its own, hence this routine expects only + the raw deflate stream to decompress. This is different from the normal + behavior of inflate(), which expects either a zlib or gzip header and + trailer around the deflate stream. + + inflateBack() uses two subroutines supplied by the caller that are then + called by inflateBack() for input and output. inflateBack() calls those + routines until it reads a complete deflate stream and writes out all of the + uncompressed data, or until it encounters an error. The function's + parameters and return types are defined above in the in_func and out_func + typedefs. inflateBack() will call in(in_desc, &buf) which should return the + number of bytes of provided input, and a pointer to that input in buf. If + there is no input available, in() must return zero--buf is ignored in that + case--and inflateBack() will return a buffer error. inflateBack() will call + out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out() + should return zero on success, or non-zero on failure. If out() returns + non-zero, inflateBack() will return with an error. Neither in() nor out() + are permitted to change the contents of the window provided to + inflateBackInit(), which is also the buffer that out() uses to write from. + The length written by out() will be at most the window size. Any non-zero + amount of input may be provided by in(). + + For convenience, inflateBack() can be provided input on the first call by + setting strm->next_in and strm->avail_in. If that input is exhausted, then + in() will be called. Therefore strm->next_in must be initialized before + calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called + immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in + must also be initialized, and then if strm->avail_in is not zero, input will + initially be taken from strm->next_in[0 .. strm->avail_in - 1]. + + The in_desc and out_desc parameters of inflateBack() is passed as the + first parameter of in() and out() respectively when they are called. These + descriptors can be optionally used to pass any information that the caller- + supplied in() and out() functions need to do their job. + + On return, inflateBack() will set strm->next_in and strm->avail_in to + pass back any unused input that was provided by the last in() call. The + return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR + if in() or out() returned an error, Z_DATA_ERROR if there was a format error + in the deflate stream (in which case strm->msg is set to indicate the nature + of the error), or Z_STREAM_ERROR if the stream was not properly initialized. + In the case of Z_BUF_ERROR, an input or output error can be distinguished + using strm->next_in which will be Z_NULL only if in() returned an error. If + strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning + non-zero. (in() will always be called before out(), so strm->next_in is + assured to be defined if out() returns non-zero.) Note that inflateBack() + cannot return Z_OK. +*/ + +ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); +/* + All memory allocated by inflateBackInit() is freed. + + inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream + state was inconsistent. +*/ + +ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); +/* Return flags indicating compile-time options. + + Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: + 1.0: size of uInt + 3.2: size of uLong + 5.4: size of voidpf (pointer) + 7.6: size of z_off_t + + Compiler, assembler, and debug options: + 8: DEBUG + 9: ASMV or ASMINF -- use ASM code + 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention + 11: 0 (reserved) + + One-time table building (smaller code, but not thread-safe if true): + 12: BUILDFIXED -- build static block decoding tables when needed + 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed + 14,15: 0 (reserved) + + Library content (indicates missing functionality): + 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking + deflate code when not needed) + 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect + and decode gzip streams (to avoid linking crc code) + 18-19: 0 (reserved) + + Operation variations (changes in library functionality): + 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate + 21: FASTEST -- deflate algorithm with only one, lowest compression level + 22,23: 0 (reserved) + + The sprintf variant used by gzprintf (zero is best): + 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format + 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure! + 26: 0 = returns value, 1 = void -- 1 means inferred string length returned + + Remainder: + 27-31: 0 (reserved) + */ + +#ifndef Z_SOLO + + /* utility functions */ + +/* + The following utility functions are implemented on top of the basic + stream-oriented functions. To simplify the interface, some default options + are assumed (compression level and memory usage, standard memory allocation + functions). The source code of these utility functions can be modified if + you need special options. +*/ + +ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); +/* + Compresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total size + of the destination buffer, which must be at least the value returned by + compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed buffer. + + compress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer. +*/ + +ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen, + int level)); +/* + Compresses the source buffer into the destination buffer. The level + parameter has the same meaning as in deflateInit. sourceLen is the byte + length of the source buffer. Upon entry, destLen is the total size of the + destination buffer, which must be at least the value returned by + compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed buffer. + + compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. +*/ + +ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); +/* + compressBound() returns an upper bound on the compressed size after + compress() or compress2() on sourceLen bytes. It would be used before a + compress() or compress2() call to allocate the destination buffer. +*/ + +ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); +/* + Decompresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total size + of the destination buffer, which must be large enough to hold the entire + uncompressed data. (The size of the uncompressed data must have been saved + previously by the compressor and transmitted to the decompressor by some + mechanism outside the scope of this compression library.) Upon exit, destLen + is the actual size of the uncompressed buffer. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. In + the case where there is not enough room, uncompress() will fill the output + buffer with the uncompressed data up to that point. +*/ + + /* gzip file access functions */ + +/* + This library supports reading and writing files in gzip (.gz) format with + an interface similar to that of stdio, using the functions that start with + "gz". The gzip format is different from the zlib format. gzip is a gzip + wrapper, documented in RFC 1952, wrapped around a deflate stream. +*/ + +typedef struct gzFile_s *gzFile; /* semi-opaque gzip file descriptor */ + +/* +ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); + + Opens a gzip (.gz) file for reading or writing. The mode parameter is as + in fopen ("rb" or "wb") but can also include a compression level ("wb9") or + a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only + compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F' + for fixed code compression as in "wb9F". (See the description of + deflateInit2 for more information about the strategy parameter.) 'T' will + request transparent writing or appending with no compression and not using + the gzip format. + + "a" can be used instead of "w" to request that the gzip stream that will + be written be appended to the file. "+" will result in an error, since + reading and writing to the same gzip file is not supported. The addition of + "x" when writing will create the file exclusively, which fails if the file + already exists. On systems that support it, the addition of "e" when + reading or writing will set the flag to close the file on an execve() call. + + These functions, as well as gzip, will read and decode a sequence of gzip + streams in a file. The append function of gzopen() can be used to create + such a file. (Also see gzflush() for another way to do this.) When + appending, gzopen does not test whether the file begins with a gzip stream, + nor does it look for the end of the gzip streams to begin appending. gzopen + will simply append a gzip stream to the existing file. + + gzopen can be used to read a file which is not in gzip format; in this + case gzread will directly read from the file without decompression. When + reading, this will be detected automatically by looking for the magic two- + byte gzip header. + + gzopen returns NULL if the file could not be opened, if there was + insufficient memory to allocate the gzFile state, or if an invalid mode was + specified (an 'r', 'w', or 'a' was not provided, or '+' was provided). + errno can be checked to determine if the reason gzopen failed was that the + file could not be opened. +*/ + +ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); +/* + gzdopen associates a gzFile with the file descriptor fd. File descriptors + are obtained from calls like open, dup, creat, pipe or fileno (if the file + has been previously opened with fopen). The mode parameter is as in gzopen. + + The next call of gzclose on the returned gzFile will also close the file + descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor + fd. If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd, + mode);. The duplicated descriptor should be saved to avoid a leak, since + gzdopen does not close fd if it fails. If you are using fileno() to get the + file descriptor from a FILE *, then you will have to use dup() to avoid + double-close()ing the file descriptor. Both gzclose() and fclose() will + close the associated file descriptor, so they need to have different file + descriptors. + + gzdopen returns NULL if there was insufficient memory to allocate the + gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not + provided, or '+' was provided), or if fd is -1. The file descriptor is not + used until the next gz* read, write, seek, or close operation, so gzdopen + will not detect if fd is invalid (unless fd is -1). +*/ + +ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); +/* + Set the internal buffer size used by this library's functions. The + default buffer size is 8192 bytes. This function must be called after + gzopen() or gzdopen(), and before any other calls that read or write the + file. The buffer memory allocation is always deferred to the first read or + write. Two buffers are allocated, either both of the specified size when + writing, or one of the specified size and the other twice that size when + reading. A larger buffer size of, for example, 64K or 128K bytes will + noticeably increase the speed of decompression (reading). + + The new buffer size also affects the maximum length for gzprintf(). + + gzbuffer() returns 0 on success, or -1 on failure, such as being called + too late. +*/ + +ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); +/* + Dynamically update the compression level or strategy. See the description + of deflateInit2 for the meaning of these parameters. + + gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not + opened for writing. +*/ + +ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); +/* + Reads the given number of uncompressed bytes from the compressed file. If + the input file is not in gzip format, gzread copies the given number of + bytes into the buffer directly from the file. + + After reaching the end of a gzip stream in the input, gzread will continue + to read, looking for another gzip stream. Any number of gzip streams may be + concatenated in the input file, and will all be decompressed by gzread(). + If something other than a gzip stream is encountered after a gzip stream, + that remaining trailing garbage is ignored (and no error is returned). + + gzread can be used to read a gzip file that is being concurrently written. + Upon reaching the end of the input, gzread will return with the available + data. If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then + gzclearerr can be used to clear the end of file indicator in order to permit + gzread to be tried again. Z_OK indicates that a gzip stream was completed + on the last gzread. Z_BUF_ERROR indicates that the input file ended in the + middle of a gzip stream. Note that gzread does not return -1 in the event + of an incomplete gzip stream. This error is deferred until gzclose(), which + will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip + stream. Alternatively, gzerror can be used before gzclose to detect this + case. + + gzread returns the number of uncompressed bytes actually read, less than + len for end of file, or -1 for error. +*/ + +ZEXTERN int ZEXPORT gzwrite OF((gzFile file, + voidpc buf, unsigned len)); +/* + Writes the given number of uncompressed bytes into the compressed file. + gzwrite returns the number of uncompressed bytes written or 0 in case of + error. +*/ + +ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...)); +/* + Converts, formats, and writes the arguments to the compressed file under + control of the format string, as in fprintf. gzprintf returns the number of + uncompressed bytes actually written, or 0 in case of error. The number of + uncompressed bytes written is limited to 8191, or one less than the buffer + size given to gzbuffer(). The caller should assure that this limit is not + exceeded. If it is exceeded, then gzprintf() will return an error (0) with + nothing written. In this case, there may also be a buffer overflow with + unpredictable consequences, which is possible only if zlib was compiled with + the insecure functions sprintf() or vsprintf() because the secure snprintf() + or vsnprintf() functions were not available. This can be determined using + zlibCompileFlags(). +*/ + +ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); +/* + Writes the given null-terminated string to the compressed file, excluding + the terminating null character. + + gzputs returns the number of characters written, or -1 in case of error. +*/ + +ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); +/* + Reads bytes from the compressed file until len-1 characters are read, or a + newline character is read and transferred to buf, or an end-of-file + condition is encountered. If any characters are read or if len == 1, the + string is terminated with a null character. If no characters are read due + to an end-of-file or len < 1, then the buffer is left untouched. + + gzgets returns buf which is a null-terminated string, or it returns NULL + for end-of-file or in case of error. If there was an error, the contents at + buf are indeterminate. +*/ + +ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); +/* + Writes c, converted to an unsigned char, into the compressed file. gzputc + returns the value that was written, or -1 in case of error. +*/ + +ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); +/* + Reads one byte from the compressed file. gzgetc returns this byte or -1 + in case of end of file or error. This is implemented as a macro for speed. + As such, it does not do all of the checking the other functions do. I.e. + it does not check to see if file is NULL, nor whether the structure file + points to has been clobbered or not. +*/ + +ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); +/* + Push one character back onto the stream to be read as the first character + on the next read. At least one character of push-back is allowed. + gzungetc() returns the character pushed, or -1 on failure. gzungetc() will + fail if c is -1, and may fail if a character has been pushed but not read + yet. If gzungetc is used immediately after gzopen or gzdopen, at least the + output buffer size of pushed characters is allowed. (See gzbuffer above.) + The pushed character will be discarded if the stream is repositioned with + gzseek() or gzrewind(). +*/ + +ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); +/* + Flushes all pending output into the compressed file. The parameter flush + is as in the deflate() function. The return value is the zlib error number + (see function gzerror below). gzflush is only permitted when writing. + + If the flush parameter is Z_FINISH, the remaining data is written and the + gzip stream is completed in the output. If gzwrite() is called again, a new + gzip stream will be started in the output. gzread() is able to read such + concatented gzip streams. + + gzflush should be called only when strictly necessary because it will + degrade compression if called too often. +*/ + +/* +ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, + z_off_t offset, int whence)); + + Sets the starting position for the next gzread or gzwrite on the given + compressed file. The offset represents a number of bytes in the + uncompressed data stream. The whence parameter is defined as in lseek(2); + the value SEEK_END is not supported. + + If the file is opened for reading, this function is emulated but can be + extremely slow. If the file is opened for writing, only forward seeks are + supported; gzseek then compresses a sequence of zeroes up to the new + starting position. + + gzseek returns the resulting offset location as measured in bytes from + the beginning of the uncompressed stream, or -1 in case of error, in + particular if the file is opened for writing and the new starting position + would be before the current position. +*/ + +ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); +/* + Rewinds the given file. This function is supported only for reading. + + gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) +*/ + +/* +ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); + + Returns the starting position for the next gzread or gzwrite on the given + compressed file. This position represents a number of bytes in the + uncompressed data stream, and is zero when starting, even if appending or + reading a gzip stream from the middle of a file using gzdopen(). + + gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) +*/ + +/* +ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file)); + + Returns the current offset in the file being read or written. This offset + includes the count of bytes that precede the gzip stream, for example when + appending or when using gzdopen() for reading. When reading, the offset + does not include as yet unused buffered input. This information can be used + for a progress indicator. On error, gzoffset() returns -1. +*/ + +ZEXTERN int ZEXPORT gzeof OF((gzFile file)); +/* + Returns true (1) if the end-of-file indicator has been set while reading, + false (0) otherwise. Note that the end-of-file indicator is set only if the + read tried to go past the end of the input, but came up short. Therefore, + just like feof(), gzeof() may return false even if there is no more data to + read, in the event that the last read request was for the exact number of + bytes remaining in the input file. This will happen if the input file size + is an exact multiple of the buffer size. + + If gzeof() returns true, then the read functions will return no more data, + unless the end-of-file indicator is reset by gzclearerr() and the input file + has grown since the previous end of file was detected. +*/ + +ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); +/* + Returns true (1) if file is being copied directly while reading, or false + (0) if file is a gzip stream being decompressed. + + If the input file is empty, gzdirect() will return true, since the input + does not contain a gzip stream. + + If gzdirect() is used immediately after gzopen() or gzdopen() it will + cause buffers to be allocated to allow reading the file to determine if it + is a gzip file. Therefore if gzbuffer() is used, it should be called before + gzdirect(). + + When writing, gzdirect() returns true (1) if transparent writing was + requested ("wT" for the gzopen() mode), or false (0) otherwise. (Note: + gzdirect() is not needed when writing. Transparent writing must be + explicitly requested, so the application already knows the answer. When + linking statically, using gzdirect() will include all of the zlib code for + gzip file reading and decompression, which may not be desired.) +*/ + +ZEXTERN int ZEXPORT gzclose OF((gzFile file)); +/* + Flushes all pending output if necessary, closes the compressed file and + deallocates the (de)compression state. Note that once file is closed, you + cannot call gzerror with file, since its structures have been deallocated. + gzclose must not be called more than once on the same file, just as free + must not be called more than once on the same allocation. + + gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a + file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the + last read ended in the middle of a gzip stream, or Z_OK on success. +*/ + +ZEXTERN int ZEXPORT gzclose_r OF((gzFile file)); +ZEXTERN int ZEXPORT gzclose_w OF((gzFile file)); +/* + Same as gzclose(), but gzclose_r() is only for use when reading, and + gzclose_w() is only for use when writing or appending. The advantage to + using these instead of gzclose() is that they avoid linking in zlib + compression or decompression code that is not used when only reading or only + writing respectively. If gzclose() is used, then both compression and + decompression code will be included the application when linking to a static + zlib library. +*/ + +ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); +/* + Returns the error message for the last error which occurred on the given + compressed file. errnum is set to zlib error number. If an error occurred + in the file system and not in the compression library, errnum is set to + Z_ERRNO and the application may consult errno to get the exact error code. + + The application must not modify the returned string. Future calls to + this function may invalidate the previously returned string. If file is + closed, then the string previously returned by gzerror will no longer be + available. + + gzerror() should be used to distinguish errors from end-of-file for those + functions above that do not distinguish those cases in their return values. +*/ + +ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); +/* + Clears the error and end-of-file flags for file. This is analogous to the + clearerr() function in stdio. This is useful for continuing to read a gzip + file that is being written concurrently. +*/ + +#endif /* !Z_SOLO */ + + /* checksum functions */ + +/* + These functions are not related to compression but are exported + anyway because they might be useful in applications using the compression + library. +*/ + +ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); +/* + Update a running Adler-32 checksum with the bytes buf[0..len-1] and + return the updated checksum. If buf is Z_NULL, this function returns the + required initial value for the checksum. + + An Adler-32 checksum is almost as reliable as a CRC32 but can be computed + much faster. + + Usage example: + + uLong adler = adler32(0L, Z_NULL, 0); + + while (read_buffer(buffer, length) != EOF) { + adler = adler32(adler, buffer, length); + } + if (adler != original_adler) error(); +*/ + +/* +ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, + z_off_t len2)); + + Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 + and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for + each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of + seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. Note + that the z_off_t type (like off_t) is a signed integer. If len2 is + negative, the result has no meaning or utility. +*/ + +ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); +/* + Update a running CRC-32 with the bytes buf[0..len-1] and return the + updated CRC-32. If buf is Z_NULL, this function returns the required + initial value for the crc. Pre- and post-conditioning (one's complement) is + performed within this function so it shouldn't be done by the application. + + Usage example: + + uLong crc = crc32(0L, Z_NULL, 0); + + while (read_buffer(buffer, length) != EOF) { + crc = crc32(crc, buffer, length); + } + if (crc != original_crc) error(); +*/ + +/* +ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); + + Combine two CRC-32 check values into one. For two sequences of bytes, + seq1 and seq2 with lengths len1 and len2, CRC-32 check values were + calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 + check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and + len2. +*/ + + + /* various hacks, don't look :) */ + +/* deflateInit and inflateInit are macros to allow checking the zlib version + * and the compiler's view of z_stream: + */ +ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, + int windowBits, int memLevel, + int strategy, const char *version, + int stream_size)); +ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, + unsigned char FAR *window, + const char *version, + int stream_size)); +#define deflateInit(strm, level) \ + deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) +#define inflateInit(strm) \ + inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) +#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ + deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ + (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) +#define inflateInit2(strm, windowBits) \ + inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ + (int)sizeof(z_stream)) +#define inflateBackInit(strm, windowBits, window) \ + inflateBackInit_((strm), (windowBits), (window), \ + ZLIB_VERSION, (int)sizeof(z_stream)) + +#ifndef Z_SOLO + +/* gzgetc() macro and its supporting function and exposed data structure. Note + * that the real internal state is much larger than the exposed structure. + * This abbreviated structure exposes just enough for the gzgetc() macro. The + * user should not mess with these exposed elements, since their names or + * behavior could change in the future, perhaps even capriciously. They can + * only be used by the gzgetc() macro. You have been warned. + */ +struct gzFile_s { + unsigned have; + unsigned char *next; + z_off64_t pos; +}; +ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ +#ifdef Z_PREFIX_SET +# undef z_gzgetc +# define z_gzgetc(g) \ + ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) +#else +# define gzgetc(g) \ + ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) +#endif + +/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or + * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if + * both are true, the application gets the *64 functions, and the regular + * functions are changed to 64 bits) -- in case these are set on systems + * without large file support, _LFS64_LARGEFILE must also be true + */ +#ifdef Z_LARGE64 + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); + ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); + ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); + ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t)); + ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t)); +#endif + +#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64) +# ifdef Z_PREFIX_SET +# define z_gzopen z_gzopen64 +# define z_gzseek z_gzseek64 +# define z_gztell z_gztell64 +# define z_gzoffset z_gzoffset64 +# define z_adler32_combine z_adler32_combine64 +# define z_crc32_combine z_crc32_combine64 +# else +# define gzopen gzopen64 +# define gzseek gzseek64 +# define gztell gztell64 +# define gzoffset gzoffset64 +# define adler32_combine adler32_combine64 +# define crc32_combine crc32_combine64 +# endif +# ifndef Z_LARGE64 + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); + ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); + ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); +# endif +#else + ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell OF((gzFile)); + ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile)); + ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); +#endif + +#else /* Z_SOLO */ + + ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); + +#endif /* !Z_SOLO */ + +/* hack for buggy compilers */ +#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) + struct internal_state {int dummy;}; +#endif + +/* undocumented functions */ +ZEXTERN const char * ZEXPORT zError OF((int)); +ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp)); +ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void)); +ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int)); +ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); +ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); +#if defined(_WIN32) && !defined(Z_SOLO) +ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path, + const char *mode)); +#endif +#if defined(STDC) || defined(Z_HAVE_STDARG_H) +# ifndef Z_SOLO +ZEXTERN int ZEXPORTVA gzvprintf Z_ARG((gzFile file, + const char *format, + va_list va)); +# endif +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* ZLIB_H */ diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/zutil.c b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/zutil.c new file mode 100644 index 0000000000..23d2ebef00 --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/zutil.c @@ -0,0 +1,324 @@ +/* zutil.c -- target dependent utility functions for the compression library + * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#include "zutil.h" +#ifndef Z_SOLO +# include "gzguts.h" +#endif + +#ifndef NO_DUMMY_DECL +struct internal_state {int dummy;}; /* for buggy compilers */ +#endif + +z_const char * const z_errmsg[10] = { +"need dictionary", /* Z_NEED_DICT 2 */ +"stream end", /* Z_STREAM_END 1 */ +"", /* Z_OK 0 */ +"file error", /* Z_ERRNO (-1) */ +"stream error", /* Z_STREAM_ERROR (-2) */ +"data error", /* Z_DATA_ERROR (-3) */ +"insufficient memory", /* Z_MEM_ERROR (-4) */ +"buffer error", /* Z_BUF_ERROR (-5) */ +"incompatible version",/* Z_VERSION_ERROR (-6) */ +""}; + + +const char * ZEXPORT zlibVersion() +{ + return ZLIB_VERSION; +} + +uLong ZEXPORT zlibCompileFlags() +{ + uLong flags; + + flags = 0; + switch ((int)(sizeof(uInt))) { + case 2: break; + case 4: flags += 1; break; + case 8: flags += 2; break; + default: flags += 3; + } + switch ((int)(sizeof(uLong))) { + case 2: break; + case 4: flags += 1 << 2; break; + case 8: flags += 2 << 2; break; + default: flags += 3 << 2; + } + switch ((int)(sizeof(voidpf))) { + case 2: break; + case 4: flags += 1 << 4; break; + case 8: flags += 2 << 4; break; + default: flags += 3 << 4; + } + switch ((int)(sizeof(z_off_t))) { + case 2: break; + case 4: flags += 1 << 6; break; + case 8: flags += 2 << 6; break; + default: flags += 3 << 6; + } +#ifdef DEBUG + flags += 1 << 8; +#endif +#if defined(ASMV) || defined(ASMINF) + flags += 1 << 9; +#endif +#ifdef ZLIB_WINAPI + flags += 1 << 10; +#endif +#ifdef BUILDFIXED + flags += 1 << 12; +#endif +#ifdef DYNAMIC_CRC_TABLE + flags += 1 << 13; +#endif +#ifdef NO_GZCOMPRESS + flags += 1L << 16; +#endif +#ifdef NO_GZIP + flags += 1L << 17; +#endif +#ifdef PKZIP_BUG_WORKAROUND + flags += 1L << 20; +#endif +#ifdef FASTEST + flags += 1L << 21; +#endif +#if defined(STDC) || defined(Z_HAVE_STDARG_H) +# ifdef NO_vsnprintf + flags += 1L << 25; +# ifdef HAS_vsprintf_void + flags += 1L << 26; +# endif +# else +# ifdef HAS_vsnprintf_void + flags += 1L << 26; +# endif +# endif +#else + flags += 1L << 24; +# ifdef NO_snprintf + flags += 1L << 25; +# ifdef HAS_sprintf_void + flags += 1L << 26; +# endif +# else +# ifdef HAS_snprintf_void + flags += 1L << 26; +# endif +# endif +#endif + return flags; +} + +#ifdef DEBUG + +# ifndef verbose +# define verbose 0 +# endif +int ZLIB_INTERNAL z_verbose = verbose; + +void ZLIB_INTERNAL z_error (m) + char *m; +{ + fprintf(stderr, "%s\n", m); + exit(1); +} +#endif + +/* exported to allow conversion of error code to string for compress() and + * uncompress() + */ +const char * ZEXPORT zError(err) + int err; +{ + return ERR_MSG(err); +} + +#if defined(_WIN32_WCE) + /* The Microsoft C Run-Time Library for Windows CE doesn't have + * errno. We define it as a global variable to simplify porting. + * Its value is always 0 and should not be used. + */ + int errno = 0; +#endif + +#ifndef HAVE_MEMCPY + +void ZLIB_INTERNAL zmemcpy(dest, source, len) + Bytef* dest; + const Bytef* source; + uInt len; +{ + if (len == 0) return; + do { + *dest++ = *source++; /* ??? to be unrolled */ + } while (--len != 0); +} + +int ZLIB_INTERNAL zmemcmp(s1, s2, len) + const Bytef* s1; + const Bytef* s2; + uInt len; +{ + uInt j; + + for (j = 0; j < len; j++) { + if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1; + } + return 0; +} + +void ZLIB_INTERNAL zmemzero(dest, len) + Bytef* dest; + uInt len; +{ + if (len == 0) return; + do { + *dest++ = 0; /* ??? to be unrolled */ + } while (--len != 0); +} +#endif + +#ifndef Z_SOLO + +#ifdef SYS16BIT + +#ifdef __TURBOC__ +/* Turbo C in 16-bit mode */ + +# define MY_ZCALLOC + +/* Turbo C malloc() does not allow dynamic allocation of 64K bytes + * and farmalloc(64K) returns a pointer with an offset of 8, so we + * must fix the pointer. Warning: the pointer must be put back to its + * original form in order to free it, use zcfree(). + */ + +#define MAX_PTR 10 +/* 10*64K = 640K */ + +local int next_ptr = 0; + +typedef struct ptr_table_s { + voidpf org_ptr; + voidpf new_ptr; +} ptr_table; + +local ptr_table table[MAX_PTR]; +/* This table is used to remember the original form of pointers + * to large buffers (64K). Such pointers are normalized with a zero offset. + * Since MSDOS is not a preemptive multitasking OS, this table is not + * protected from concurrent access. This hack doesn't work anyway on + * a protected system like OS/2. Use Microsoft C instead. + */ + +voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) +{ + voidpf buf = opaque; /* just to make some compilers happy */ + ulg bsize = (ulg)items*size; + + /* If we allocate less than 65520 bytes, we assume that farmalloc + * will return a usable pointer which doesn't have to be normalized. + */ + if (bsize < 65520L) { + buf = farmalloc(bsize); + if (*(ush*)&buf != 0) return buf; + } else { + buf = farmalloc(bsize + 16L); + } + if (buf == NULL || next_ptr >= MAX_PTR) return NULL; + table[next_ptr].org_ptr = buf; + + /* Normalize the pointer to seg:0 */ + *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4; + *(ush*)&buf = 0; + table[next_ptr++].new_ptr = buf; + return buf; +} + +void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) +{ + int n; + if (*(ush*)&ptr != 0) { /* object < 64K */ + farfree(ptr); + return; + } + /* Find the original pointer */ + for (n = 0; n < next_ptr; n++) { + if (ptr != table[n].new_ptr) continue; + + farfree(table[n].org_ptr); + while (++n < next_ptr) { + table[n-1] = table[n]; + } + next_ptr--; + return; + } + ptr = opaque; /* just to make some compilers happy */ + Assert(0, "zcfree: ptr not found"); +} + +#endif /* __TURBOC__ */ + + +#ifdef M_I86 +/* Microsoft C in 16-bit mode */ + +# define MY_ZCALLOC + +#if (!defined(_MSC_VER) || (_MSC_VER <= 600)) +# define _halloc halloc +# define _hfree hfree +#endif + +voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) +{ + if (opaque) opaque = 0; /* to make compiler happy */ + return _halloc((long)items, size); +} + +void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) +{ + if (opaque) opaque = 0; /* to make compiler happy */ + _hfree(ptr); +} + +#endif /* M_I86 */ + +#endif /* SYS16BIT */ + + +#ifndef MY_ZCALLOC /* Any system without a special alloc function */ + +#ifndef STDC +extern voidp malloc OF((uInt size)); +extern voidp calloc OF((uInt items, uInt size)); +extern void free OF((voidpf ptr)); +#endif + +voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) + voidpf opaque; + unsigned items; + unsigned size; +{ + if (opaque) items += size - size; /* make compiler happy */ + return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : + (voidpf)calloc(items, size); +} + +void ZLIB_INTERNAL zcfree (opaque, ptr) + voidpf opaque; + voidpf ptr; +{ + free(ptr); + if (opaque) return; /* make compiler happy */ +} + +#endif /* MY_ZCALLOC */ + +#endif /* !Z_SOLO */ diff --git a/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/zutil.h b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/zutil.h new file mode 100644 index 0000000000..24ab06b1cf --- /dev/null +++ b/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.8/zutil.h @@ -0,0 +1,253 @@ +/* zutil.h -- internal interface and configuration of the compression library + * Copyright (C) 1995-2013 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +/* @(#) $Id$ */ + +#ifndef ZUTIL_H +#define ZUTIL_H + +#ifdef HAVE_HIDDEN +# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) +#else +# define ZLIB_INTERNAL +#endif + +#include "zlib.h" + +#if defined(STDC) && !defined(Z_SOLO) +# if !(defined(_WIN32_WCE) && defined(_MSC_VER)) +# include <stddef.h> +# endif +# include <string.h> +# include <stdlib.h> +#endif + +#ifdef Z_SOLO + typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */ +#endif + +#ifndef local +# define local static +#endif +/* compile with -Dlocal if your debugger can't find static symbols */ + +typedef unsigned char uch; +typedef uch FAR uchf; +typedef unsigned short ush; +typedef ush FAR ushf; +typedef unsigned long ulg; + +extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ +/* (size given to avoid silly warnings with Visual C++) */ + +#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] + +#define ERR_RETURN(strm,err) \ + return (strm->msg = ERR_MSG(err), (err)) +/* To be used only when the state is known to be valid */ + + /* common constants */ + +#ifndef DEF_WBITS +# define DEF_WBITS MAX_WBITS +#endif +/* default windowBits for decompression. MAX_WBITS is for compression only */ + +#if MAX_MEM_LEVEL >= 8 +# define DEF_MEM_LEVEL 8 +#else +# define DEF_MEM_LEVEL MAX_MEM_LEVEL +#endif +/* default memLevel */ + +#define STORED_BLOCK 0 +#define STATIC_TREES 1 +#define DYN_TREES 2 +/* The three kinds of block type */ + +#define MIN_MATCH 3 +#define MAX_MATCH 258 +/* The minimum and maximum match lengths */ + +#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */ + + /* target dependencies */ + +#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) +# define OS_CODE 0x00 +# ifndef Z_SOLO +# if defined(__TURBOC__) || defined(__BORLANDC__) +# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) + /* Allow compilation with ANSI keywords only enabled */ + void _Cdecl farfree( void *block ); + void *_Cdecl farmalloc( unsigned long nbytes ); +# else +# include <alloc.h> +# endif +# else /* MSC or DJGPP */ +# include <malloc.h> +# endif +# endif +#endif + +#ifdef AMIGA +# define OS_CODE 0x01 +#endif + +#if defined(VAXC) || defined(VMS) +# define OS_CODE 0x02 +# define F_OPEN(name, mode) \ + fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") +#endif + +#if defined(ATARI) || defined(atarist) +# define OS_CODE 0x05 +#endif + +#ifdef OS2 +# define OS_CODE 0x06 +# if defined(M_I86) && !defined(Z_SOLO) +# include <malloc.h> +# endif +#endif + +#if defined(MACOS) || defined(TARGET_OS_MAC) +# define OS_CODE 0x07 +# ifndef Z_SOLO +# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os +# include <unix.h> /* for fdopen */ +# else +# ifndef fdopen +# define fdopen(fd,mode) NULL /* No fdopen() */ +# endif +# endif +# endif +#endif + +#ifdef TOPS20 +# define OS_CODE 0x0a +#endif + +#ifdef WIN32 +# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ +# define OS_CODE 0x0b +# endif +#endif + +#ifdef __50SERIES /* Prime/PRIMOS */ +# define OS_CODE 0x0f +#endif + +#if defined(_BEOS_) || defined(RISCOS) +# define fdopen(fd,mode) NULL /* No fdopen() */ +#endif + +#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX +# if defined(_WIN32_WCE) +# define fdopen(fd,mode) NULL /* No fdopen() */ +# ifndef _PTRDIFF_T_DEFINED + typedef int ptrdiff_t; +# define _PTRDIFF_T_DEFINED +# endif +# else +# define fdopen(fd,type) _fdopen(fd,type) +# endif +#endif + +#if defined(__BORLANDC__) && !defined(MSDOS) + #pragma warn -8004 + #pragma warn -8008 + #pragma warn -8066 +#endif + +/* provide prototypes for these when building zlib without LFS */ +#if !defined(_WIN32) && \ + (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) + ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); +#endif + + /* common defaults */ + +#ifndef OS_CODE +# define OS_CODE 0x03 /* assume Unix */ +#endif + +#ifndef F_OPEN +# define F_OPEN(name, mode) fopen((name), (mode)) +#endif + + /* functions */ + +#if defined(pyr) || defined(Z_SOLO) +# define NO_MEMCPY +#endif +#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__) + /* Use our own functions for small and medium model with MSC <= 5.0. + * You may have to use the same strategy for Borland C (untested). + * The __SC__ check is for Symantec. + */ +# define NO_MEMCPY +#endif +#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY) +# define HAVE_MEMCPY +#endif +#ifdef HAVE_MEMCPY +# ifdef SMALL_MEDIUM /* MSDOS small or medium model */ +# define zmemcpy _fmemcpy +# define zmemcmp _fmemcmp +# define zmemzero(dest, len) _fmemset(dest, 0, len) +# else +# define zmemcpy memcpy +# define zmemcmp memcmp +# define zmemzero(dest, len) memset(dest, 0, len) +# endif +#else + void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); + int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); + void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len)); +#endif + +/* Diagnostic functions */ +#ifdef DEBUG +# include <stdio.h> + extern int ZLIB_INTERNAL z_verbose; + extern void ZLIB_INTERNAL z_error OF((char *m)); +# define Assert(cond,msg) {if(!(cond)) z_error(msg);} +# define Trace(x) {if (z_verbose>=0) fprintf x ;} +# define Tracev(x) {if (z_verbose>0) fprintf x ;} +# define Tracevv(x) {if (z_verbose>1) fprintf x ;} +# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;} +# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;} +#else +# define Assert(cond,msg) +# define Trace(x) +# define Tracev(x) +# define Tracevv(x) +# define Tracec(c,x) +# define Tracecv(c,x) +#endif + +#ifndef Z_SOLO + voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items, + unsigned size)); + void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr)); +#endif + +#define ZALLOC(strm, items, size) \ + (*((strm)->zalloc))((strm)->opaque, (items), (size)) +#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) +#define TRY_FREE(s, p) {if (p) ZFREE(s, p);} + +/* Reverse the bytes in a 32-bit value */ +#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ + (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) + +#endif /* ZUTIL_H */ |
