summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <fork@madler.net>2022-10-06 12:52:49 -0700
committerMark Adler <fork@madler.net>2022-10-06 20:43:09 -0700
commitd0704a820186481da35d08f4b655881e1d32089f (patch)
tree6b4365d354376de1e2fd10f1687e2daf48efb73a
parent095da07753035a2b80654553e1cad92d1dee1481 (diff)
downloadzlib-d0704a820186481da35d08f4b655881e1d32089f.tar.gz
zlib-d0704a820186481da35d08f4b655881e1d32089f.tar.bz2
zlib-d0704a820186481da35d08f4b655881e1d32089f.zip
Remove deleted assembler code references.
The code was removed, but the builds that used the code were not updated. This fixes that. Thanks to Adenilson and toxieainc for the patches.
Diffstat
-rw-r--r--CMakeLists.txt40
-rw-r--r--Makefile.in4
-rwxr-xr-xconfigure15
-rw-r--r--contrib/vstudio/readme.txt3
-rw-r--r--contrib/vstudio/vc10/miniunz.vcxproj.filters2
-rw-r--r--contrib/vstudio/vc10/minizip.vcxproj.filters2
-rw-r--r--contrib/vstudio/vc10/testzlib.vcxproj24
-rw-r--r--contrib/vstudio/vc10/testzlib.vcxproj.filters5
-rw-r--r--contrib/vstudio/vc10/testzlibdll.vcxproj.filters2
-rw-r--r--contrib/vstudio/vc10/zlibstat.vcxproj50
-rw-r--r--contrib/vstudio/vc10/zlibstat.vcxproj.filters3
-rw-r--r--contrib/vstudio/vc10/zlibvc.vcxproj58
-rw-r--r--contrib/vstudio/vc10/zlibvc.vcxproj.filters3
-rw-r--r--contrib/vstudio/vc11/testzlib.vcxproj24
-rw-r--r--contrib/vstudio/vc11/zlibstat.vcxproj34
-rw-r--r--contrib/vstudio/vc11/zlibvc.vcxproj58
-rw-r--r--contrib/vstudio/vc12/testzlib.vcxproj24
-rw-r--r--contrib/vstudio/vc12/zlibstat.vcxproj34
-rw-r--r--contrib/vstudio/vc12/zlibvc.vcxproj58
-rw-r--r--contrib/vstudio/vc14/testzlib.vcxproj24
-rw-r--r--contrib/vstudio/vc14/zlibstat.vcxproj34
-rw-r--r--contrib/vstudio/vc14/zlibvc.vcxproj58
-rw-r--r--contrib/vstudio/vc9/miniunz.vcproj2
-rw-r--r--contrib/vstudio/vc9/minizip.vcproj2
-rw-r--r--contrib/vstudio/vc9/testzlib.vcproj66
-rw-r--r--contrib/vstudio/vc9/testzlibdll.vcproj2
-rw-r--r--contrib/vstudio/vc9/zlibstat.vcproj76
-rw-r--r--contrib/vstudio/vc9/zlibvc.vcproj82
-rw-r--r--deflate.c16
-rw-r--r--zutil.c2
30 files changed, 192 insertions, 615 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93815d9..4584bd3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,9 +5,6 @@ project(zlib C)
5 5
6set(VERSION "1.2.12.1") 6set(VERSION "1.2.12.1")
7 7
8option(ASM686 "Enable building i686 assembly implementation")
9option(AMD64 "Enable building amd64 assembly implementation")
10
11set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") 8set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
12set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") 9set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
13set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") 10set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
@@ -129,39 +126,6 @@ if(NOT MINGW)
129 ) 126 )
130endif() 127endif()
131 128
132if(CMAKE_COMPILER_IS_GNUCC)
133 if(ASM686)
134 set(ZLIB_ASMS contrib/asm686/match.S)
135 elseif (AMD64)
136 set(ZLIB_ASMS contrib/amd64/amd64-match.S)
137 endif ()
138
139 if(ZLIB_ASMS)
140 add_definitions(-DASMV)
141 set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
142 endif()
143endif()
144
145if(MSVC)
146 if(ASM686)
147 ENABLE_LANGUAGE(ASM_MASM)
148 set(ZLIB_ASMS
149 contrib/masmx86/inffas32.asm
150 contrib/masmx86/match686.asm
151 )
152 elseif (AMD64)
153 ENABLE_LANGUAGE(ASM_MASM)
154 set(ZLIB_ASMS
155 contrib/masmx64/gvmat64.asm
156 contrib/masmx64/inffasx64.asm
157 )
158 endif()
159
160 if(ZLIB_ASMS)
161 add_definitions(-DASMV -DASMINF)
162 endif()
163endif()
164
165# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION 129# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
166file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents) 130file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
167string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" 131string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
@@ -183,8 +147,8 @@ if(MINGW)
183 set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) 147 set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
184endif(MINGW) 148endif(MINGW)
185 149
186add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) 150add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
187add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) 151add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
188set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) 152set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
189set_target_properties(zlib PROPERTIES SOVERSION 1) 153set_target_properties(zlib PROPERTIES SOVERSION 1)
190 154
diff --git a/Makefile.in b/Makefile.in
index fd28bbf..1cc9f4d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,10 +7,6 @@
7# Normally configure builds both a static and a shared library. 7# Normally configure builds both a static and a shared library.
8# If you want to build just a static library, use: ./configure --static 8# If you want to build just a static library, use: ./configure --static
9 9
10# To use the asm code, type:
11# cp contrib/asm?86/match.S ./match.S
12# make LOC=-DASMV OBJA=match.o
13
14# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: 10# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
15# make install 11# make install
16# To install in $HOME instead of /usr/local, use: 12# To install in $HOME instead of /usr/local, use:
diff --git a/configure b/configure
index 545664a..bf3d49c 100755
--- a/configure
+++ b/configure
@@ -179,7 +179,6 @@ else
179fi 179fi
180 180
181cflags=${CFLAGS-"-O3"} 181cflags=${CFLAGS-"-O3"}
182# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
183case "$cc" in 182case "$cc" in
184 *gcc*) gcc=1 ;; 183 *gcc*) gcc=1 ;;
185 *clang*) gcc=1 ;; 184 *clang*) gcc=1 ;;
@@ -453,20 +452,6 @@ else
453 TEST="all teststatic testshared" 452 TEST="all teststatic testshared"
454fi 453fi
455 454
456# check for underscores in external names for use by assembler code
457CPP=${CPP-"$CC -E"}
458case $CFLAGS in
459 *ASMV*)
460 echo >> configure.log
461 show "$NM $test.o | grep _hello"
462 if test "`$NM $test.o | grep _hello | tee -a configure.log`" = ""; then
463 CPP="$CPP -DNO_UNDERLINE"
464 echo Checking for underline in external names... No. | tee -a configure.log
465 else
466 echo Checking for underline in external names... Yes. | tee -a configure.log
467 fi ;;
468esac
469
470echo >> configure.log 455echo >> configure.log
471 456
472# check for size_t 457# check for size_t
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index edd8ed0..bef144e 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -17,9 +17,6 @@ More information can be found at this site.
17Build instructions for Visual Studio 2008 (32 bits or 64 bits) 17Build instructions for Visual Studio 2008 (32 bits or 64 bits)
18-------------------------------------------------------------- 18--------------------------------------------------------------
19- Decompress current zlib, including all contrib/* files 19- Decompress current zlib, including all contrib/* files
20- Compile assembly code (with Visual Studio Command Prompt) by running:
21 bld_ml64.bat (in contrib\masmx64)
22 bld_ml32.bat (in contrib\masmx86)
23- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008 20- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
24- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32" 21- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
25 22
diff --git a/contrib/vstudio/vc10/miniunz.vcxproj.filters b/contrib/vstudio/vc10/miniunz.vcxproj.filters
index 0b2a3de..e53556a 100644
--- a/contrib/vstudio/vc10/miniunz.vcxproj.filters
+++ b/contrib/vstudio/vc10/miniunz.vcxproj.filters
@@ -3,7 +3,7 @@
3 <ItemGroup> 3 <ItemGroup>
4 <Filter Include="Source Files"> 4 <Filter Include="Source Files">
5 <UniqueIdentifier>{048af943-022b-4db6-beeb-a54c34774ee2}</UniqueIdentifier> 5 <UniqueIdentifier>{048af943-022b-4db6-beeb-a54c34774ee2}</UniqueIdentifier>
6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions> 6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
7 </Filter> 7 </Filter>
8 <Filter Include="Header Files"> 8 <Filter Include="Header Files">
9 <UniqueIdentifier>{c1d600d2-888f-4aea-b73e-8b0dd9befa0c}</UniqueIdentifier> 9 <UniqueIdentifier>{c1d600d2-888f-4aea-b73e-8b0dd9befa0c}</UniqueIdentifier>
diff --git a/contrib/vstudio/vc10/minizip.vcxproj.filters b/contrib/vstudio/vc10/minizip.vcxproj.filters
index dd73cd3..bd18d71 100644
--- a/contrib/vstudio/vc10/minizip.vcxproj.filters
+++ b/contrib/vstudio/vc10/minizip.vcxproj.filters
@@ -3,7 +3,7 @@
3 <ItemGroup> 3 <ItemGroup>
4 <Filter Include="Source Files"> 4 <Filter Include="Source Files">
5 <UniqueIdentifier>{c0419b40-bf50-40da-b153-ff74215b79de}</UniqueIdentifier> 5 <UniqueIdentifier>{c0419b40-bf50-40da-b153-ff74215b79de}</UniqueIdentifier>
6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions> 6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
7 </Filter> 7 </Filter>
8 <Filter Include="Header Files"> 8 <Filter Include="Header Files">
9 <UniqueIdentifier>{bb87b070-735b-478e-92ce-7383abb2f36c}</UniqueIdentifier> 9 <UniqueIdentifier>{bb87b070-735b-478e-92ce-7383abb2f36c}</UniqueIdentifier>
diff --git a/contrib/vstudio/vc10/testzlib.vcxproj b/contrib/vstudio/vc10/testzlib.vcxproj
index 9088d17..0e668f7 100644
--- a/contrib/vstudio/vc10/testzlib.vcxproj
+++ b/contrib/vstudio/vc10/testzlib.vcxproj
@@ -181,7 +181,7 @@
181 <ClCompile> 181 <ClCompile>
182 <Optimization>Disabled</Optimization> 182 <Optimization>Disabled</Optimization>
183 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 183 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
184 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 184 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
185 <MinimalRebuild>true</MinimalRebuild> 185 <MinimalRebuild>true</MinimalRebuild>
186 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 186 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
187 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 187 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -194,7 +194,7 @@
194 <DebugInformationFormat>EditAndContinue</DebugInformationFormat> 194 <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
195 </ClCompile> 195 </ClCompile>
196 <Link> 196 <Link>
197 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 197 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
198 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 198 <OutputFile>$(OutDir)testzlib.exe</OutputFile>
199 <GenerateDebugInformation>true</GenerateDebugInformation> 199 <GenerateDebugInformation>true</GenerateDebugInformation>
200 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> 200 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -241,7 +241,7 @@
241 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 241 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
242 <OmitFramePointers>true</OmitFramePointers> 242 <OmitFramePointers>true</OmitFramePointers>
243 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 243 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
244 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 244 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
245 <StringPooling>true</StringPooling> 245 <StringPooling>true</StringPooling>
246 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 246 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
247 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 247 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -254,7 +254,7 @@
254 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 254 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
255 </ClCompile> 255 </ClCompile>
256 <Link> 256 <Link>
257 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 257 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
258 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 258 <OutputFile>$(OutDir)testzlib.exe</OutputFile>
259 <GenerateDebugInformation>true</GenerateDebugInformation> 259 <GenerateDebugInformation>true</GenerateDebugInformation>
260 <SubSystem>Console</SubSystem> 260 <SubSystem>Console</SubSystem>
@@ -269,14 +269,14 @@
269 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 269 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
270 <ClCompile> 270 <ClCompile>
271 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 271 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
272 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 272 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
273 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 273 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
274 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 274 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
275 <BufferSecurityCheck>false</BufferSecurityCheck> 275 <BufferSecurityCheck>false</BufferSecurityCheck>
276 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> 276 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
277 </ClCompile> 277 </ClCompile>
278 <Link> 278 <Link>
279 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 279 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
280 </Link> 280 </Link>
281 </ItemDefinitionGroup> 281 </ItemDefinitionGroup>
282 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> 282 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
@@ -352,14 +352,14 @@
352 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 352 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
353 <ClCompile> 353 <ClCompile>
354 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 354 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
355 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 355 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
356 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 356 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
357 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> 357 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
358 <BufferSecurityCheck>false</BufferSecurityCheck> 358 <BufferSecurityCheck>false</BufferSecurityCheck>
359 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> 359 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
360 </ClCompile> 360 </ClCompile>
361 <Link> 361 <Link>
362 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 362 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
363 </Link> 363 </Link>
364 </ItemDefinitionGroup> 364 </ItemDefinitionGroup>
365 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> 365 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
@@ -398,14 +398,6 @@
398 <ClCompile Include="..\..\..\crc32.c" /> 398 <ClCompile Include="..\..\..\crc32.c" />
399 <ClCompile Include="..\..\..\deflate.c" /> 399 <ClCompile Include="..\..\..\deflate.c" />
400 <ClCompile Include="..\..\..\infback.c" /> 400 <ClCompile Include="..\..\..\infback.c" />
401 <ClCompile Include="..\..\masmx64\inffas8664.c">
402 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
403 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
404 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
405 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
406 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
407 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
408 </ClCompile>
409 <ClCompile Include="..\..\..\inffast.c" /> 401 <ClCompile Include="..\..\..\inffast.c" />
410 <ClCompile Include="..\..\..\inflate.c" /> 402 <ClCompile Include="..\..\..\inflate.c" />
411 <ClCompile Include="..\..\..\inftrees.c" /> 403 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc10/testzlib.vcxproj.filters b/contrib/vstudio/vc10/testzlib.vcxproj.filters
index 249daa8..3cf52ee 100644
--- a/contrib/vstudio/vc10/testzlib.vcxproj.filters
+++ b/contrib/vstudio/vc10/testzlib.vcxproj.filters
@@ -3,7 +3,7 @@
3 <ItemGroup> 3 <ItemGroup>
4 <Filter Include="Source Files"> 4 <Filter Include="Source Files">
5 <UniqueIdentifier>{c1f6a2e3-5da5-4955-8653-310d3efe05a9}</UniqueIdentifier> 5 <UniqueIdentifier>{c1f6a2e3-5da5-4955-8653-310d3efe05a9}</UniqueIdentifier>
6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions> 6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
7 </Filter> 7 </Filter>
8 <Filter Include="Header Files"> 8 <Filter Include="Header Files">
9 <UniqueIdentifier>{c2aaffdc-2c95-4d6f-8466-4bec5890af2c}</UniqueIdentifier> 9 <UniqueIdentifier>{c2aaffdc-2c95-4d6f-8466-4bec5890af2c}</UniqueIdentifier>
@@ -30,9 +30,6 @@
30 <ClCompile Include="..\..\..\infback.c"> 30 <ClCompile Include="..\..\..\infback.c">
31 <Filter>Source Files</Filter> 31 <Filter>Source Files</Filter>
32 </ClCompile> 32 </ClCompile>
33 <ClCompile Include="..\..\masmx64\inffas8664.c">
34 <Filter>Source Files</Filter>
35 </ClCompile>
36 <ClCompile Include="..\..\..\inffast.c"> 33 <ClCompile Include="..\..\..\inffast.c">
37 <Filter>Source Files</Filter> 34 <Filter>Source Files</Filter>
38 </ClCompile> 35 </ClCompile>
diff --git a/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
index 53a8693..aeb550e 100644
--- a/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
+++ b/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
@@ -3,7 +3,7 @@
3 <ItemGroup> 3 <ItemGroup>
4 <Filter Include="Source Files"> 4 <Filter Include="Source Files">
5 <UniqueIdentifier>{fa61a89f-93fc-4c89-b29e-36224b7592f4}</UniqueIdentifier> 5 <UniqueIdentifier>{fa61a89f-93fc-4c89-b29e-36224b7592f4}</UniqueIdentifier>
6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions> 6 <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
7 </Filter> 7 </Filter>
8 <Filter Include="Header Files"> 8 <Filter Include="Header Files">
9 <UniqueIdentifier>{d4b85da0-2ba2-4934-b57f-e2584e3848ee}</UniqueIdentifier> 9 <UniqueIdentifier>{d4b85da0-2ba2-4934-b57f-e2584e3848ee}</UniqueIdentifier>
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj b/contrib/vstudio/vc10/zlibstat.vcxproj
index b9f2bbe..c7ed09e 100644
--- a/contrib/vstudio/vc10/zlibstat.vcxproj
+++ b/contrib/vstudio/vc10/zlibstat.vcxproj
@@ -160,7 +160,7 @@
160 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 160 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
161 <ClCompile> 161 <ClCompile>
162 <Optimization>Disabled</Optimization> 162 <Optimization>Disabled</Optimization>
163 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 163 <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
164 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 164 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
165 <ExceptionHandling> 165 <ExceptionHandling>
166 </ExceptionHandling> 166 </ExceptionHandling>
@@ -182,16 +182,12 @@
182 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 182 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
183 <SuppressStartupBanner>true</SuppressStartupBanner> 183 <SuppressStartupBanner>true</SuppressStartupBanner>
184 </Lib> 184 </Lib>
185 <PreBuildEvent>
186 <Command>cd ..\..\masmx86
187bld_ml32.bat</Command>
188 </PreBuildEvent>
189 </ItemDefinitionGroup> 185 </ItemDefinitionGroup>
190 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 186 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
191 <ClCompile> 187 <ClCompile>
192 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 188 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
193 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 189 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
194 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 190 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
195 <StringPooling>true</StringPooling> 191 <StringPooling>true</StringPooling>
196 <ExceptionHandling> 192 <ExceptionHandling>
197 </ExceptionHandling> 193 </ExceptionHandling>
@@ -210,19 +206,15 @@ bld_ml32.bat</Command>
210 </ResourceCompile> 206 </ResourceCompile>
211 <Lib> 207 <Lib>
212 <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> 208 <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
213 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 209 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
214 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 210 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
215 <SuppressStartupBanner>true</SuppressStartupBanner> 211 <SuppressStartupBanner>true</SuppressStartupBanner>
216 </Lib> 212 </Lib>
217 <PreBuildEvent>
218 <Command>cd ..\..\masmx86
219bld_ml32.bat</Command>
220 </PreBuildEvent>
221 </ItemDefinitionGroup> 213 </ItemDefinitionGroup>
222 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> 214 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
223 <ClCompile> 215 <ClCompile>
224 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 216 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
225 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 217 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
226 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 218 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
227 <StringPooling>true</StringPooling> 219 <StringPooling>true</StringPooling>
228 <ExceptionHandling> 220 <ExceptionHandling>
@@ -252,7 +244,7 @@ bld_ml32.bat</Command>
252 </Midl> 244 </Midl>
253 <ClCompile> 245 <ClCompile>
254 <Optimization>Disabled</Optimization> 246 <Optimization>Disabled</Optimization>
255 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 247 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
256 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 248 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
257 <ExceptionHandling> 249 <ExceptionHandling>
258 </ExceptionHandling> 250 </ExceptionHandling>
@@ -274,10 +266,6 @@ bld_ml32.bat</Command>
274 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 266 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
275 <SuppressStartupBanner>true</SuppressStartupBanner> 267 <SuppressStartupBanner>true</SuppressStartupBanner>
276 </Lib> 268 </Lib>
277 <PreBuildEvent>
278 <Command>cd ..\..\masmx64
279bld_ml64.bat</Command>
280 </PreBuildEvent>
281 </ItemDefinitionGroup> 269 </ItemDefinitionGroup>
282 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> 270 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
283 <Midl> 271 <Midl>
@@ -285,7 +273,7 @@ bld_ml64.bat</Command>
285 </Midl> 273 </Midl>
286 <ClCompile> 274 <ClCompile>
287 <Optimization>Disabled</Optimization> 275 <Optimization>Disabled</Optimization>
288 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 276 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
289 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 277 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
290 <ExceptionHandling> 278 <ExceptionHandling>
291 </ExceptionHandling> 279 </ExceptionHandling>
@@ -314,8 +302,8 @@ bld_ml64.bat</Command>
314 </Midl> 302 </Midl>
315 <ClCompile> 303 <ClCompile>
316 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 304 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
317 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 305 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
318 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 306 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
319 <StringPooling>true</StringPooling> 307 <StringPooling>true</StringPooling>
320 <ExceptionHandling> 308 <ExceptionHandling>
321 </ExceptionHandling> 309 </ExceptionHandling>
@@ -334,14 +322,10 @@ bld_ml64.bat</Command>
334 </ResourceCompile> 322 </ResourceCompile>
335 <Lib> 323 <Lib>
336 <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> 324 <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
337 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 325 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
338 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 326 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
339 <SuppressStartupBanner>true</SuppressStartupBanner> 327 <SuppressStartupBanner>true</SuppressStartupBanner>
340 </Lib> 328 </Lib>
341 <PreBuildEvent>
342 <Command>cd ..\..\masmx64
343bld_ml64.bat</Command>
344 </PreBuildEvent>
345 </ItemDefinitionGroup> 329 </ItemDefinitionGroup>
346 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> 330 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
347 <Midl> 331 <Midl>
@@ -349,7 +333,7 @@ bld_ml64.bat</Command>
349 </Midl> 333 </Midl>
350 <ClCompile> 334 <ClCompile>
351 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 335 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
352 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 336 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
353 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 337 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
354 <StringPooling>true</StringPooling> 338 <StringPooling>true</StringPooling>
355 <ExceptionHandling> 339 <ExceptionHandling>
@@ -379,7 +363,7 @@ bld_ml64.bat</Command>
379 </Midl> 363 </Midl>
380 <ClCompile> 364 <ClCompile>
381 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 365 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
382 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 366 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
383 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 367 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
384 <StringPooling>true</StringPooling> 368 <StringPooling>true</StringPooling>
385 <ExceptionHandling> 369 <ExceptionHandling>
@@ -409,7 +393,7 @@ bld_ml64.bat</Command>
409 </Midl> 393 </Midl>
410 <ClCompile> 394 <ClCompile>
411 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 395 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
412 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 396 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
413 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 397 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
414 <StringPooling>true</StringPooling> 398 <StringPooling>true</StringPooling>
415 <ExceptionHandling> 399 <ExceptionHandling>
@@ -443,14 +427,6 @@ bld_ml64.bat</Command>
443 <ClCompile Include="..\..\..\gzread.c" /> 427 <ClCompile Include="..\..\..\gzread.c" />
444 <ClCompile Include="..\..\..\gzwrite.c" /> 428 <ClCompile Include="..\..\..\gzwrite.c" />
445 <ClCompile Include="..\..\..\infback.c" /> 429 <ClCompile Include="..\..\..\infback.c" />
446 <ClCompile Include="..\..\masmx64\inffas8664.c">
447 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
448 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
449 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
450 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
451 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
452 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
453 </ClCompile>
454 <ClCompile Include="..\..\..\inffast.c" /> 430 <ClCompile Include="..\..\..\inffast.c" />
455 <ClCompile Include="..\..\..\inflate.c" /> 431 <ClCompile Include="..\..\..\inflate.c" />
456 <ClCompile Include="..\..\..\inftrees.c" /> 432 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/contrib/vstudio/vc10/zlibstat.vcxproj.filters
index c8c7f7e..ba7e23d 100644
--- a/contrib/vstudio/vc10/zlibstat.vcxproj.filters
+++ b/contrib/vstudio/vc10/zlibstat.vcxproj.filters
@@ -33,9 +33,6 @@
33 <ClCompile Include="..\..\..\infback.c"> 33 <ClCompile Include="..\..\..\infback.c">
34 <Filter>Source Files</Filter> 34 <Filter>Source Files</Filter>
35 </ClCompile> 35 </ClCompile>
36 <ClCompile Include="..\..\masmx64\inffas8664.c">
37 <Filter>Source Files</Filter>
38 </ClCompile>
39 <ClCompile Include="..\..\..\inffast.c"> 36 <ClCompile Include="..\..\..\inffast.c">
40 <Filter>Source Files</Filter> 37 <Filter>Source Files</Filter>
41 </ClCompile> 38 </ClCompile>
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/contrib/vstudio/vc10/zlibvc.vcxproj
index 6ff9ddb..19dfc35 100644
--- a/contrib/vstudio/vc10/zlibvc.vcxproj
+++ b/contrib/vstudio/vc10/zlibvc.vcxproj
@@ -197,8 +197,8 @@
197 </Midl> 197 </Midl>
198 <ClCompile> 198 <ClCompile>
199 <Optimization>Disabled</Optimization> 199 <Optimization>Disabled</Optimization>
200 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 200 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
201 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 201 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
202 <ExceptionHandling> 202 <ExceptionHandling>
203 </ExceptionHandling> 203 </ExceptionHandling>
204 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 204 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -219,7 +219,7 @@
219 </ResourceCompile> 219 </ResourceCompile>
220 <Link> 220 <Link>
221 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> 221 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
222 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 222 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
223 <SuppressStartupBanner>true</SuppressStartupBanner> 223 <SuppressStartupBanner>true</SuppressStartupBanner>
224 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 224 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
225 <GenerateDebugInformation>true</GenerateDebugInformation> 225 <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -229,10 +229,6 @@
229 <DataExecutionPrevention> 229 <DataExecutionPrevention>
230 </DataExecutionPrevention> 230 </DataExecutionPrevention>
231 </Link> 231 </Link>
232 <PreBuildEvent>
233 <Command>cd ..\..\masmx86
234bld_ml32.bat</Command>
235 </PreBuildEvent>
236 </ItemDefinitionGroup> 232 </ItemDefinitionGroup>
237 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> 233 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
238 <Midl> 234 <Midl>
@@ -244,7 +240,7 @@ bld_ml32.bat</Command>
244 </Midl> 240 </Midl>
245 <ClCompile> 241 <ClCompile>
246 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 242 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
247 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 243 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
248 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> 244 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
249 <StringPooling>true</StringPooling> 245 <StringPooling>true</StringPooling>
250 <ExceptionHandling> 246 <ExceptionHandling>
@@ -288,8 +284,8 @@ bld_ml32.bat</Command>
288 </Midl> 284 </Midl>
289 <ClCompile> 285 <ClCompile>
290 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 286 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
291 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 287 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
292 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 288 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
293 <StringPooling>true</StringPooling> 289 <StringPooling>true</StringPooling>
294 <ExceptionHandling> 290 <ExceptionHandling>
295 </ExceptionHandling> 291 </ExceptionHandling>
@@ -312,7 +308,7 @@ bld_ml32.bat</Command>
312 </ResourceCompile> 308 </ResourceCompile>
313 <Link> 309 <Link>
314 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> 310 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
315 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 311 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
316 <SuppressStartupBanner>true</SuppressStartupBanner> 312 <SuppressStartupBanner>true</SuppressStartupBanner>
317 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> 313 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
318 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 314 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -322,10 +318,6 @@ bld_ml32.bat</Command>
322 <DataExecutionPrevention> 318 <DataExecutionPrevention>
323 </DataExecutionPrevention> 319 </DataExecutionPrevention>
324 </Link> 320 </Link>
325 <PreBuildEvent>
326 <Command>cd ..\..\masmx86
327bld_ml32.bat</Command>
328 </PreBuildEvent>
329 </ItemDefinitionGroup> 321 </ItemDefinitionGroup>
330 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 322 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
331 <Midl> 323 <Midl>
@@ -337,8 +329,8 @@ bld_ml32.bat</Command>
337 </Midl> 329 </Midl>
338 <ClCompile> 330 <ClCompile>
339 <Optimization>Disabled</Optimization> 331 <Optimization>Disabled</Optimization>
340 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 332 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
341 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 333 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
342 <ExceptionHandling> 334 <ExceptionHandling>
343 </ExceptionHandling> 335 </ExceptionHandling>
344 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 336 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -358,7 +350,7 @@ bld_ml32.bat</Command>
358 <Culture>0x040c</Culture> 350 <Culture>0x040c</Culture>
359 </ResourceCompile> 351 </ResourceCompile>
360 <Link> 352 <Link>
361 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 353 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
362 <SuppressStartupBanner>true</SuppressStartupBanner> 354 <SuppressStartupBanner>true</SuppressStartupBanner>
363 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 355 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
364 <GenerateDebugInformation>true</GenerateDebugInformation> 356 <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -366,10 +358,6 @@ bld_ml32.bat</Command>
366 <SubSystem>Windows</SubSystem> 358 <SubSystem>Windows</SubSystem>
367 <TargetMachine>MachineX64</TargetMachine> 359 <TargetMachine>MachineX64</TargetMachine>
368 </Link> 360 </Link>
369 <PreBuildEvent>
370 <Command>cd ..\..\masmx64
371bld_ml64.bat</Command>
372 </PreBuildEvent>
373 </ItemDefinitionGroup> 361 </ItemDefinitionGroup>
374 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> 362 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
375 <Midl> 363 <Midl>
@@ -381,7 +369,7 @@ bld_ml64.bat</Command>
381 </Midl> 369 </Midl>
382 <ClCompile> 370 <ClCompile>
383 <Optimization>Disabled</Optimization> 371 <Optimization>Disabled</Optimization>
384 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 372 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
385 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 373 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
386 <ExceptionHandling> 374 <ExceptionHandling>
387 </ExceptionHandling> 375 </ExceptionHandling>
@@ -424,7 +412,7 @@ bld_ml64.bat</Command>
424 </Midl> 412 </Midl>
425 <ClCompile> 413 <ClCompile>
426 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 414 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
427 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 415 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
428 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 416 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
429 <StringPooling>true</StringPooling> 417 <StringPooling>true</StringPooling>
430 <ExceptionHandling> 418 <ExceptionHandling>
@@ -465,7 +453,7 @@ bld_ml64.bat</Command>
465 </Midl> 453 </Midl>
466 <ClCompile> 454 <ClCompile>
467 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 455 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
468 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 456 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
469 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 457 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
470 <StringPooling>true</StringPooling> 458 <StringPooling>true</StringPooling>
471 <ExceptionHandling> 459 <ExceptionHandling>
@@ -510,8 +498,8 @@ bld_ml64.bat</Command>
510 </Midl> 498 </Midl>
511 <ClCompile> 499 <ClCompile>
512 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 500 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
513 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 501 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
514 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 502 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
515 <StringPooling>true</StringPooling> 503 <StringPooling>true</StringPooling>
516 <ExceptionHandling> 504 <ExceptionHandling>
517 </ExceptionHandling> 505 </ExceptionHandling>
@@ -533,7 +521,7 @@ bld_ml64.bat</Command>
533 <Culture>0x040c</Culture> 521 <Culture>0x040c</Culture>
534 </ResourceCompile> 522 </ResourceCompile>
535 <Link> 523 <Link>
536 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 524 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
537 <SuppressStartupBanner>true</SuppressStartupBanner> 525 <SuppressStartupBanner>true</SuppressStartupBanner>
538 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> 526 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
539 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 527 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -541,10 +529,6 @@ bld_ml64.bat</Command>
541 <SubSystem>Windows</SubSystem> 529 <SubSystem>Windows</SubSystem>
542 <TargetMachine>MachineX64</TargetMachine> 530 <TargetMachine>MachineX64</TargetMachine>
543 </Link> 531 </Link>
544 <PreBuildEvent>
545 <Command>cd ..\..\masmx64
546bld_ml64.bat</Command>
547 </PreBuildEvent>
548 </ItemDefinitionGroup> 532 </ItemDefinitionGroup>
549 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> 533 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
550 <Midl> 534 <Midl>
@@ -556,7 +540,7 @@ bld_ml64.bat</Command>
556 </Midl> 540 </Midl>
557 <ClCompile> 541 <ClCompile>
558 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 542 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
559 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 543 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
560 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 544 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
561 <StringPooling>true</StringPooling> 545 <StringPooling>true</StringPooling>
562 <ExceptionHandling> 546 <ExceptionHandling>
@@ -601,14 +585,6 @@ bld_ml64.bat</Command>
601 <ClCompile Include="..\..\..\gzread.c" /> 585 <ClCompile Include="..\..\..\gzread.c" />
602 <ClCompile Include="..\..\..\gzwrite.c" /> 586 <ClCompile Include="..\..\..\gzwrite.c" />
603 <ClCompile Include="..\..\..\infback.c" /> 587 <ClCompile Include="..\..\..\infback.c" />
604 <ClCompile Include="..\..\masmx64\inffas8664.c">
605 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
606 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
607 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
608 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
609 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
610 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
611 </ClCompile>
612 <ClCompile Include="..\..\..\inffast.c" /> 588 <ClCompile Include="..\..\..\inffast.c" />
613 <ClCompile Include="..\..\..\inflate.c" /> 589 <ClCompile Include="..\..\..\inflate.c" />
614 <ClCompile Include="..\..\..\inftrees.c" /> 590 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/contrib/vstudio/vc10/zlibvc.vcxproj.filters
index 180b71c..67c444a 100644
--- a/contrib/vstudio/vc10/zlibvc.vcxproj.filters
+++ b/contrib/vstudio/vc10/zlibvc.vcxproj.filters
@@ -42,9 +42,6 @@
42 <ClCompile Include="..\..\..\infback.c"> 42 <ClCompile Include="..\..\..\infback.c">
43 <Filter>Source Files</Filter> 43 <Filter>Source Files</Filter>
44 </ClCompile> 44 </ClCompile>
45 <ClCompile Include="..\..\masmx64\inffas8664.c">
46 <Filter>Source Files</Filter>
47 </ClCompile>
48 <ClCompile Include="..\..\..\inffast.c"> 45 <ClCompile Include="..\..\..\inffast.c">
49 <Filter>Source Files</Filter> 46 <Filter>Source Files</Filter>
50 </ClCompile> 47 </ClCompile>
diff --git a/contrib/vstudio/vc11/testzlib.vcxproj b/contrib/vstudio/vc11/testzlib.vcxproj
index 6d55954..c6198c1 100644
--- a/contrib/vstudio/vc11/testzlib.vcxproj
+++ b/contrib/vstudio/vc11/testzlib.vcxproj
@@ -187,7 +187,7 @@
187 <ClCompile> 187 <ClCompile>
188 <Optimization>Disabled</Optimization> 188 <Optimization>Disabled</Optimization>
189 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 189 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
190 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 190 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
191 <MinimalRebuild>true</MinimalRebuild> 191 <MinimalRebuild>true</MinimalRebuild>
192 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 192 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
193 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 193 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -200,7 +200,7 @@
200 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 200 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
201 </ClCompile> 201 </ClCompile>
202 <Link> 202 <Link>
203 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 203 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
204 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 204 <OutputFile>$(OutDir)testzlib.exe</OutputFile>
205 <GenerateDebugInformation>true</GenerateDebugInformation> 205 <GenerateDebugInformation>true</GenerateDebugInformation>
206 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> 206 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -247,7 +247,7 @@
247 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 247 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
248 <OmitFramePointers>true</OmitFramePointers> 248 <OmitFramePointers>true</OmitFramePointers>
249 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 249 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
250 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 250 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
251 <StringPooling>true</StringPooling> 251 <StringPooling>true</StringPooling>
252 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 252 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
253 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 253 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -260,7 +260,7 @@
260 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 260 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
261 </ClCompile> 261 </ClCompile>
262 <Link> 262 <Link>
263 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 263 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
264 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 264 <OutputFile>$(OutDir)testzlib.exe</OutputFile>
265 <GenerateDebugInformation>true</GenerateDebugInformation> 265 <GenerateDebugInformation>true</GenerateDebugInformation>
266 <SubSystem>Console</SubSystem> 266 <SubSystem>Console</SubSystem>
@@ -275,14 +275,14 @@
275 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 275 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
276 <ClCompile> 276 <ClCompile>
277 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 277 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
278 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 278 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
279 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 279 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
280 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 280 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
281 <BufferSecurityCheck>false</BufferSecurityCheck> 281 <BufferSecurityCheck>false</BufferSecurityCheck>
282 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> 282 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
283 </ClCompile> 283 </ClCompile>
284 <Link> 284 <Link>
285 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 285 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
286 </Link> 286 </Link>
287 </ItemDefinitionGroup> 287 </ItemDefinitionGroup>
288 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> 288 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
@@ -358,14 +358,14 @@
358 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 358 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
359 <ClCompile> 359 <ClCompile>
360 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 360 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
361 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 361 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
362 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 362 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
363 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> 363 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
364 <BufferSecurityCheck>false</BufferSecurityCheck> 364 <BufferSecurityCheck>false</BufferSecurityCheck>
365 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> 365 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
366 </ClCompile> 366 </ClCompile>
367 <Link> 367 <Link>
368 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 368 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
369 </Link> 369 </Link>
370 </ItemDefinitionGroup> 370 </ItemDefinitionGroup>
371 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> 371 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
@@ -404,14 +404,6 @@
404 <ClCompile Include="..\..\..\crc32.c" /> 404 <ClCompile Include="..\..\..\crc32.c" />
405 <ClCompile Include="..\..\..\deflate.c" /> 405 <ClCompile Include="..\..\..\deflate.c" />
406 <ClCompile Include="..\..\..\infback.c" /> 406 <ClCompile Include="..\..\..\infback.c" />
407 <ClCompile Include="..\..\masmx64\inffas8664.c">
408 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
409 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
410 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
411 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
412 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
413 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
414 </ClCompile>
415 <ClCompile Include="..\..\..\inffast.c" /> 407 <ClCompile Include="..\..\..\inffast.c" />
416 <ClCompile Include="..\..\..\inflate.c" /> 408 <ClCompile Include="..\..\..\inflate.c" />
417 <ClCompile Include="..\..\..\inftrees.c" /> 409 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc11/zlibstat.vcxproj b/contrib/vstudio/vc11/zlibstat.vcxproj
index 806b76a..86fb1c8 100644
--- a/contrib/vstudio/vc11/zlibstat.vcxproj
+++ b/contrib/vstudio/vc11/zlibstat.vcxproj
@@ -167,7 +167,7 @@
167 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 167 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
168 <ClCompile> 168 <ClCompile>
169 <Optimization>Disabled</Optimization> 169 <Optimization>Disabled</Optimization>
170 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 170 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
171 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 171 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
172 <ExceptionHandling> 172 <ExceptionHandling>
173 </ExceptionHandling> 173 </ExceptionHandling>
@@ -193,8 +193,8 @@
193 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 193 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
194 <ClCompile> 194 <ClCompile>
195 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 195 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
196 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 196 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
197 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 197 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
198 <StringPooling>true</StringPooling> 198 <StringPooling>true</StringPooling>
199 <ExceptionHandling> 199 <ExceptionHandling>
200 </ExceptionHandling> 200 </ExceptionHandling>
@@ -213,7 +213,7 @@
213 </ResourceCompile> 213 </ResourceCompile>
214 <Lib> 214 <Lib>
215 <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> 215 <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
216 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 216 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
217 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 217 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
218 <SuppressStartupBanner>true</SuppressStartupBanner> 218 <SuppressStartupBanner>true</SuppressStartupBanner>
219 </Lib> 219 </Lib>
@@ -221,7 +221,7 @@
221 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> 221 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
222 <ClCompile> 222 <ClCompile>
223 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 223 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
224 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 224 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
225 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 225 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
226 <StringPooling>true</StringPooling> 226 <StringPooling>true</StringPooling>
227 <ExceptionHandling> 227 <ExceptionHandling>
@@ -251,7 +251,7 @@
251 </Midl> 251 </Midl>
252 <ClCompile> 252 <ClCompile>
253 <Optimization>Disabled</Optimization> 253 <Optimization>Disabled</Optimization>
254 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 254 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
255 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 255 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
256 <ExceptionHandling> 256 <ExceptionHandling>
257 </ExceptionHandling> 257 </ExceptionHandling>
@@ -280,7 +280,7 @@
280 </Midl> 280 </Midl>
281 <ClCompile> 281 <ClCompile>
282 <Optimization>Disabled</Optimization> 282 <Optimization>Disabled</Optimization>
283 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 283 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
284 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 284 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
285 <ExceptionHandling> 285 <ExceptionHandling>
286 </ExceptionHandling> 286 </ExceptionHandling>
@@ -309,8 +309,8 @@
309 </Midl> 309 </Midl>
310 <ClCompile> 310 <ClCompile>
311 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 311 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
312 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 312 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
313 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 313 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
314 <StringPooling>true</StringPooling> 314 <StringPooling>true</StringPooling>
315 <ExceptionHandling> 315 <ExceptionHandling>
316 </ExceptionHandling> 316 </ExceptionHandling>
@@ -329,7 +329,7 @@
329 </ResourceCompile> 329 </ResourceCompile>
330 <Lib> 330 <Lib>
331 <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> 331 <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
332 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 332 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
333 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 333 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
334 <SuppressStartupBanner>true</SuppressStartupBanner> 334 <SuppressStartupBanner>true</SuppressStartupBanner>
335 </Lib> 335 </Lib>
@@ -340,7 +340,7 @@
340 </Midl> 340 </Midl>
341 <ClCompile> 341 <ClCompile>
342 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 342 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
343 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 343 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
344 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 344 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
345 <StringPooling>true</StringPooling> 345 <StringPooling>true</StringPooling>
346 <ExceptionHandling> 346 <ExceptionHandling>
@@ -370,7 +370,7 @@
370 </Midl> 370 </Midl>
371 <ClCompile> 371 <ClCompile>
372 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 372 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
373 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 373 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
374 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 374 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
375 <StringPooling>true</StringPooling> 375 <StringPooling>true</StringPooling>
376 <ExceptionHandling> 376 <ExceptionHandling>
@@ -400,7 +400,7 @@
400 </Midl> 400 </Midl>
401 <ClCompile> 401 <ClCompile>
402 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 402 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
403 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 403 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
404 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 404 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
405 <StringPooling>true</StringPooling> 405 <StringPooling>true</StringPooling>
406 <ExceptionHandling> 406 <ExceptionHandling>
@@ -434,14 +434,6 @@
434 <ClCompile Include="..\..\..\gzread.c" /> 434 <ClCompile Include="..\..\..\gzread.c" />
435 <ClCompile Include="..\..\..\gzwrite.c" /> 435 <ClCompile Include="..\..\..\gzwrite.c" />
436 <ClCompile Include="..\..\..\infback.c" /> 436 <ClCompile Include="..\..\..\infback.c" />
437 <ClCompile Include="..\..\masmx64\inffas8664.c">
438 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
439 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
440 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
441 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
442 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
443 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
444 </ClCompile>
445 <ClCompile Include="..\..\..\inffast.c" /> 437 <ClCompile Include="..\..\..\inffast.c" />
446 <ClCompile Include="..\..\..\inflate.c" /> 438 <ClCompile Include="..\..\..\inflate.c" />
447 <ClCompile Include="..\..\..\inftrees.c" /> 439 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc11/zlibvc.vcxproj b/contrib/vstudio/vc11/zlibvc.vcxproj
index c65b95f..fc8cd9c 100644
--- a/contrib/vstudio/vc11/zlibvc.vcxproj
+++ b/contrib/vstudio/vc11/zlibvc.vcxproj
@@ -204,8 +204,8 @@
204 </Midl> 204 </Midl>
205 <ClCompile> 205 <ClCompile>
206 <Optimization>Disabled</Optimization> 206 <Optimization>Disabled</Optimization>
207 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 207 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
208 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 208 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
209 <ExceptionHandling> 209 <ExceptionHandling>
210 </ExceptionHandling> 210 </ExceptionHandling>
211 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 211 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -226,7 +226,7 @@
226 </ResourceCompile> 226 </ResourceCompile>
227 <Link> 227 <Link>
228 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> 228 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
229 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 229 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
230 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> 230 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
231 <SuppressStartupBanner>true</SuppressStartupBanner> 231 <SuppressStartupBanner>true</SuppressStartupBanner>
232 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 232 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -240,10 +240,6 @@
240 </DataExecutionPrevention> 240 </DataExecutionPrevention>
241 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 241 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
242 </Link> 242 </Link>
243 <PreBuildEvent>
244 <Command>cd ..\..\masmx86
245bld_ml32.bat</Command>
246 </PreBuildEvent>
247 </ItemDefinitionGroup> 243 </ItemDefinitionGroup>
248 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> 244 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
249 <Midl> 245 <Midl>
@@ -255,7 +251,7 @@ bld_ml32.bat</Command>
255 </Midl> 251 </Midl>
256 <ClCompile> 252 <ClCompile>
257 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 253 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
258 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 254 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
259 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> 255 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
260 <StringPooling>true</StringPooling> 256 <StringPooling>true</StringPooling>
261 <ExceptionHandling> 257 <ExceptionHandling>
@@ -303,8 +299,8 @@ bld_ml32.bat</Command>
303 </Midl> 299 </Midl>
304 <ClCompile> 300 <ClCompile>
305 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 301 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
306 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 302 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
307 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 303 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
308 <StringPooling>true</StringPooling> 304 <StringPooling>true</StringPooling>
309 <ExceptionHandling> 305 <ExceptionHandling>
310 </ExceptionHandling> 306 </ExceptionHandling>
@@ -327,7 +323,7 @@ bld_ml32.bat</Command>
327 </ResourceCompile> 323 </ResourceCompile>
328 <Link> 324 <Link>
329 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> 325 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
330 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 326 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
331 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> 327 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
332 <SuppressStartupBanner>true</SuppressStartupBanner> 328 <SuppressStartupBanner>true</SuppressStartupBanner>
333 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> 329 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -341,10 +337,6 @@ bld_ml32.bat</Command>
341 </DataExecutionPrevention> 337 </DataExecutionPrevention>
342 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 338 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
343 </Link> 339 </Link>
344 <PreBuildEvent>
345 <Command>cd ..\..\masmx86
346bld_ml32.bat</Command>
347 </PreBuildEvent>
348 </ItemDefinitionGroup> 340 </ItemDefinitionGroup>
349 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 341 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
350 <Midl> 342 <Midl>
@@ -356,8 +348,8 @@ bld_ml32.bat</Command>
356 </Midl> 348 </Midl>
357 <ClCompile> 349 <ClCompile>
358 <Optimization>Disabled</Optimization> 350 <Optimization>Disabled</Optimization>
359 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 351 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
360 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 352 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
361 <ExceptionHandling> 353 <ExceptionHandling>
362 </ExceptionHandling> 354 </ExceptionHandling>
363 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 355 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -377,7 +369,7 @@ bld_ml32.bat</Command>
377 <Culture>0x040c</Culture> 369 <Culture>0x040c</Culture>
378 </ResourceCompile> 370 </ResourceCompile>
379 <Link> 371 <Link>
380 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 372 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
381 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> 373 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
382 <SuppressStartupBanner>true</SuppressStartupBanner> 374 <SuppressStartupBanner>true</SuppressStartupBanner>
383 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 375 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -389,10 +381,6 @@ bld_ml32.bat</Command>
389 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 381 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
390 <TargetMachine>MachineX64</TargetMachine> 382 <TargetMachine>MachineX64</TargetMachine>
391 </Link> 383 </Link>
392 <PreBuildEvent>
393 <Command>cd ..\..\contrib\masmx64
394bld_ml64.bat</Command>
395 </PreBuildEvent>
396 </ItemDefinitionGroup> 384 </ItemDefinitionGroup>
397 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> 385 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
398 <Midl> 386 <Midl>
@@ -404,7 +392,7 @@ bld_ml64.bat</Command>
404 </Midl> 392 </Midl>
405 <ClCompile> 393 <ClCompile>
406 <Optimization>Disabled</Optimization> 394 <Optimization>Disabled</Optimization>
407 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 395 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
408 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 396 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
409 <ExceptionHandling> 397 <ExceptionHandling>
410 </ExceptionHandling> 398 </ExceptionHandling>
@@ -447,7 +435,7 @@ bld_ml64.bat</Command>
447 </Midl> 435 </Midl>
448 <ClCompile> 436 <ClCompile>
449 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 437 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
450 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 438 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
451 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 439 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
452 <StringPooling>true</StringPooling> 440 <StringPooling>true</StringPooling>
453 <ExceptionHandling> 441 <ExceptionHandling>
@@ -492,7 +480,7 @@ bld_ml64.bat</Command>
492 </Midl> 480 </Midl>
493 <ClCompile> 481 <ClCompile>
494 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 482 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
495 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 483 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
496 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 484 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
497 <StringPooling>true</StringPooling> 485 <StringPooling>true</StringPooling>
498 <ExceptionHandling> 486 <ExceptionHandling>
@@ -537,8 +525,8 @@ bld_ml64.bat</Command>
537 </Midl> 525 </Midl>
538 <ClCompile> 526 <ClCompile>
539 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 527 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
540 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 528 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
541 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 529 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
542 <StringPooling>true</StringPooling> 530 <StringPooling>true</StringPooling>
543 <ExceptionHandling> 531 <ExceptionHandling>
544 </ExceptionHandling> 532 </ExceptionHandling>
@@ -560,7 +548,7 @@ bld_ml64.bat</Command>
560 <Culture>0x040c</Culture> 548 <Culture>0x040c</Culture>
561 </ResourceCompile> 549 </ResourceCompile>
562 <Link> 550 <Link>
563 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 551 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
564 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> 552 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
565 <SuppressStartupBanner>true</SuppressStartupBanner> 553 <SuppressStartupBanner>true</SuppressStartupBanner>
566 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> 554 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -572,10 +560,6 @@ bld_ml64.bat</Command>
572 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 560 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
573 <TargetMachine>MachineX64</TargetMachine> 561 <TargetMachine>MachineX64</TargetMachine>
574 </Link> 562 </Link>
575 <PreBuildEvent>
576 <Command>cd ..\..\masmx64
577bld_ml64.bat</Command>
578 </PreBuildEvent>
579 </ItemDefinitionGroup> 563 </ItemDefinitionGroup>
580 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> 564 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
581 <Midl> 565 <Midl>
@@ -587,7 +571,7 @@ bld_ml64.bat</Command>
587 </Midl> 571 </Midl>
588 <ClCompile> 572 <ClCompile>
589 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 573 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
590 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 574 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
591 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 575 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
592 <StringPooling>true</StringPooling> 576 <StringPooling>true</StringPooling>
593 <ExceptionHandling> 577 <ExceptionHandling>
@@ -632,14 +616,6 @@ bld_ml64.bat</Command>
632 <ClCompile Include="..\..\..\gzread.c" /> 616 <ClCompile Include="..\..\..\gzread.c" />
633 <ClCompile Include="..\..\..\gzwrite.c" /> 617 <ClCompile Include="..\..\..\gzwrite.c" />
634 <ClCompile Include="..\..\..\infback.c" /> 618 <ClCompile Include="..\..\..\infback.c" />
635 <ClCompile Include="..\..\masmx64\inffas8664.c">
636 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
637 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
638 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
639 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
640 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
641 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
642 </ClCompile>
643 <ClCompile Include="..\..\..\inffast.c" /> 619 <ClCompile Include="..\..\..\inffast.c" />
644 <ClCompile Include="..\..\..\inflate.c" /> 620 <ClCompile Include="..\..\..\inflate.c" />
645 <ClCompile Include="..\..\..\inftrees.c" /> 621 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc12/testzlib.vcxproj b/contrib/vstudio/vc12/testzlib.vcxproj
index 64b2cbe..41303c0 100644
--- a/contrib/vstudio/vc12/testzlib.vcxproj
+++ b/contrib/vstudio/vc12/testzlib.vcxproj
@@ -190,7 +190,7 @@
190 <ClCompile> 190 <ClCompile>
191 <Optimization>Disabled</Optimization> 191 <Optimization>Disabled</Optimization>
192 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 192 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
193 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 193 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
194 <MinimalRebuild>true</MinimalRebuild> 194 <MinimalRebuild>true</MinimalRebuild>
195 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 195 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
196 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 196 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -203,7 +203,7 @@
203 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 203 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
204 </ClCompile> 204 </ClCompile>
205 <Link> 205 <Link>
206 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 206 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
207 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 207 <OutputFile>$(OutDir)testzlib.exe</OutputFile>
208 <GenerateDebugInformation>true</GenerateDebugInformation> 208 <GenerateDebugInformation>true</GenerateDebugInformation>
209 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> 209 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -250,7 +250,7 @@
250 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 250 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
251 <OmitFramePointers>true</OmitFramePointers> 251 <OmitFramePointers>true</OmitFramePointers>
252 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 252 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
253 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 253 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
254 <StringPooling>true</StringPooling> 254 <StringPooling>true</StringPooling>
255 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 255 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
256 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 256 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -263,7 +263,7 @@
263 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 263 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
264 </ClCompile> 264 </ClCompile>
265 <Link> 265 <Link>
266 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 266 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
267 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 267 <OutputFile>$(OutDir)testzlib.exe</OutputFile>
268 <GenerateDebugInformation>true</GenerateDebugInformation> 268 <GenerateDebugInformation>true</GenerateDebugInformation>
269 <SubSystem>Console</SubSystem> 269 <SubSystem>Console</SubSystem>
@@ -279,14 +279,14 @@
279 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 279 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
280 <ClCompile> 280 <ClCompile>
281 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 281 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
282 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 282 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
283 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 283 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
284 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 284 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
285 <BufferSecurityCheck>false</BufferSecurityCheck> 285 <BufferSecurityCheck>false</BufferSecurityCheck>
286 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> 286 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
287 </ClCompile> 287 </ClCompile>
288 <Link> 288 <Link>
289 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 289 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
290 </Link> 290 </Link>
291 </ItemDefinitionGroup> 291 </ItemDefinitionGroup>
292 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> 292 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
@@ -362,14 +362,14 @@
362 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 362 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
363 <ClCompile> 363 <ClCompile>
364 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 364 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
365 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 365 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
366 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 366 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
367 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> 367 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
368 <BufferSecurityCheck>false</BufferSecurityCheck> 368 <BufferSecurityCheck>false</BufferSecurityCheck>
369 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> 369 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
370 </ClCompile> 370 </ClCompile>
371 <Link> 371 <Link>
372 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 372 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
373 </Link> 373 </Link>
374 </ItemDefinitionGroup> 374 </ItemDefinitionGroup>
375 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> 375 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
@@ -408,14 +408,6 @@
408 <ClCompile Include="..\..\..\crc32.c" /> 408 <ClCompile Include="..\..\..\crc32.c" />
409 <ClCompile Include="..\..\..\deflate.c" /> 409 <ClCompile Include="..\..\..\deflate.c" />
410 <ClCompile Include="..\..\..\infback.c" /> 410 <ClCompile Include="..\..\..\infback.c" />
411 <ClCompile Include="..\..\masmx64\inffas8664.c">
412 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
413 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
414 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
415 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
416 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
417 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
418 </ClCompile>
419 <ClCompile Include="..\..\..\inffast.c" /> 411 <ClCompile Include="..\..\..\inffast.c" />
420 <ClCompile Include="..\..\..\inflate.c" /> 412 <ClCompile Include="..\..\..\inflate.c" />
421 <ClCompile Include="..\..\..\inftrees.c" /> 413 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc12/zlibstat.vcxproj b/contrib/vstudio/vc12/zlibstat.vcxproj
index 3fdee7c..6629d8e 100644
--- a/contrib/vstudio/vc12/zlibstat.vcxproj
+++ b/contrib/vstudio/vc12/zlibstat.vcxproj
@@ -170,7 +170,7 @@
170 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 170 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
171 <ClCompile> 171 <ClCompile>
172 <Optimization>Disabled</Optimization> 172 <Optimization>Disabled</Optimization>
173 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 173 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
174 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 174 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
175 <ExceptionHandling> 175 <ExceptionHandling>
176 </ExceptionHandling> 176 </ExceptionHandling>
@@ -196,8 +196,8 @@
196 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 196 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
197 <ClCompile> 197 <ClCompile>
198 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 198 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
199 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 199 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
200 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 200 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
201 <StringPooling>true</StringPooling> 201 <StringPooling>true</StringPooling>
202 <ExceptionHandling> 202 <ExceptionHandling>
203 </ExceptionHandling> 203 </ExceptionHandling>
@@ -216,7 +216,7 @@
216 </ResourceCompile> 216 </ResourceCompile>
217 <Lib> 217 <Lib>
218 <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> 218 <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
219 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 219 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
220 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 220 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
221 <SuppressStartupBanner>true</SuppressStartupBanner> 221 <SuppressStartupBanner>true</SuppressStartupBanner>
222 </Lib> 222 </Lib>
@@ -224,7 +224,7 @@
224 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> 224 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
225 <ClCompile> 225 <ClCompile>
226 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 226 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
227 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 227 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
228 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 228 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
229 <StringPooling>true</StringPooling> 229 <StringPooling>true</StringPooling>
230 <ExceptionHandling> 230 <ExceptionHandling>
@@ -254,7 +254,7 @@
254 </Midl> 254 </Midl>
255 <ClCompile> 255 <ClCompile>
256 <Optimization>Disabled</Optimization> 256 <Optimization>Disabled</Optimization>
257 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 257 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
258 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 258 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
259 <ExceptionHandling> 259 <ExceptionHandling>
260 </ExceptionHandling> 260 </ExceptionHandling>
@@ -283,7 +283,7 @@
283 </Midl> 283 </Midl>
284 <ClCompile> 284 <ClCompile>
285 <Optimization>Disabled</Optimization> 285 <Optimization>Disabled</Optimization>
286 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 286 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
287 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 287 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
288 <ExceptionHandling> 288 <ExceptionHandling>
289 </ExceptionHandling> 289 </ExceptionHandling>
@@ -312,8 +312,8 @@
312 </Midl> 312 </Midl>
313 <ClCompile> 313 <ClCompile>
314 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 314 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
315 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 315 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
316 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 316 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
317 <StringPooling>true</StringPooling> 317 <StringPooling>true</StringPooling>
318 <ExceptionHandling> 318 <ExceptionHandling>
319 </ExceptionHandling> 319 </ExceptionHandling>
@@ -332,7 +332,7 @@
332 </ResourceCompile> 332 </ResourceCompile>
333 <Lib> 333 <Lib>
334 <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> 334 <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
335 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 335 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
336 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 336 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
337 <SuppressStartupBanner>true</SuppressStartupBanner> 337 <SuppressStartupBanner>true</SuppressStartupBanner>
338 </Lib> 338 </Lib>
@@ -343,7 +343,7 @@
343 </Midl> 343 </Midl>
344 <ClCompile> 344 <ClCompile>
345 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 345 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
346 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 346 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
347 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 347 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
348 <StringPooling>true</StringPooling> 348 <StringPooling>true</StringPooling>
349 <ExceptionHandling> 349 <ExceptionHandling>
@@ -373,7 +373,7 @@
373 </Midl> 373 </Midl>
374 <ClCompile> 374 <ClCompile>
375 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 375 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
376 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 376 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
377 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 377 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
378 <StringPooling>true</StringPooling> 378 <StringPooling>true</StringPooling>
379 <ExceptionHandling> 379 <ExceptionHandling>
@@ -403,7 +403,7 @@
403 </Midl> 403 </Midl>
404 <ClCompile> 404 <ClCompile>
405 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 405 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
406 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 406 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
407 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 407 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
408 <StringPooling>true</StringPooling> 408 <StringPooling>true</StringPooling>
409 <ExceptionHandling> 409 <ExceptionHandling>
@@ -437,14 +437,6 @@
437 <ClCompile Include="..\..\..\gzread.c" /> 437 <ClCompile Include="..\..\..\gzread.c" />
438 <ClCompile Include="..\..\..\gzwrite.c" /> 438 <ClCompile Include="..\..\..\gzwrite.c" />
439 <ClCompile Include="..\..\..\infback.c" /> 439 <ClCompile Include="..\..\..\infback.c" />
440 <ClCompile Include="..\..\masmx64\inffas8664.c">
441 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
442 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
443 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
444 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
445 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
446 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
447 </ClCompile>
448 <ClCompile Include="..\..\..\inffast.c" /> 440 <ClCompile Include="..\..\..\inffast.c" />
449 <ClCompile Include="..\..\..\inflate.c" /> 441 <ClCompile Include="..\..\..\inflate.c" />
450 <ClCompile Include="..\..\..\inftrees.c" /> 442 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc12/zlibvc.vcxproj b/contrib/vstudio/vc12/zlibvc.vcxproj
index ab2b6c3..4e0de69 100644
--- a/contrib/vstudio/vc12/zlibvc.vcxproj
+++ b/contrib/vstudio/vc12/zlibvc.vcxproj
@@ -207,8 +207,8 @@
207 </Midl> 207 </Midl>
208 <ClCompile> 208 <ClCompile>
209 <Optimization>Disabled</Optimization> 209 <Optimization>Disabled</Optimization>
210 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 210 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
211 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 211 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
212 <ExceptionHandling> 212 <ExceptionHandling>
213 </ExceptionHandling> 213 </ExceptionHandling>
214 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 214 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -229,7 +229,7 @@
229 </ResourceCompile> 229 </ResourceCompile>
230 <Link> 230 <Link>
231 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> 231 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
232 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 232 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
233 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> 233 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
234 <SuppressStartupBanner>true</SuppressStartupBanner> 234 <SuppressStartupBanner>true</SuppressStartupBanner>
235 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 235 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -243,10 +243,6 @@
243 </DataExecutionPrevention> 243 </DataExecutionPrevention>
244 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 244 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
245 </Link> 245 </Link>
246 <PreBuildEvent>
247 <Command>cd ..\..\masmx86
248bld_ml32.bat</Command>
249 </PreBuildEvent>
250 </ItemDefinitionGroup> 246 </ItemDefinitionGroup>
251 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> 247 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
252 <Midl> 248 <Midl>
@@ -258,7 +254,7 @@ bld_ml32.bat</Command>
258 </Midl> 254 </Midl>
259 <ClCompile> 255 <ClCompile>
260 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 256 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
261 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 257 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
262 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> 258 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
263 <StringPooling>true</StringPooling> 259 <StringPooling>true</StringPooling>
264 <ExceptionHandling> 260 <ExceptionHandling>
@@ -306,8 +302,8 @@ bld_ml32.bat</Command>
306 </Midl> 302 </Midl>
307 <ClCompile> 303 <ClCompile>
308 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 304 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
309 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 305 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
310 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 306 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
311 <StringPooling>true</StringPooling> 307 <StringPooling>true</StringPooling>
312 <ExceptionHandling> 308 <ExceptionHandling>
313 </ExceptionHandling> 309 </ExceptionHandling>
@@ -330,7 +326,7 @@ bld_ml32.bat</Command>
330 </ResourceCompile> 326 </ResourceCompile>
331 <Link> 327 <Link>
332 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> 328 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
333 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 329 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
334 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> 330 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
335 <SuppressStartupBanner>true</SuppressStartupBanner> 331 <SuppressStartupBanner>true</SuppressStartupBanner>
336 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> 332 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -345,10 +341,6 @@ bld_ml32.bat</Command>
345 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 341 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
346 <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 342 <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
347 </Link> 343 </Link>
348 <PreBuildEvent>
349 <Command>cd ..\..\masmx86
350bld_ml32.bat</Command>
351 </PreBuildEvent>
352 </ItemDefinitionGroup> 344 </ItemDefinitionGroup>
353 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 345 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
354 <Midl> 346 <Midl>
@@ -360,8 +352,8 @@ bld_ml32.bat</Command>
360 </Midl> 352 </Midl>
361 <ClCompile> 353 <ClCompile>
362 <Optimization>Disabled</Optimization> 354 <Optimization>Disabled</Optimization>
363 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 355 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
364 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 356 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
365 <ExceptionHandling> 357 <ExceptionHandling>
366 </ExceptionHandling> 358 </ExceptionHandling>
367 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 359 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -381,7 +373,7 @@ bld_ml32.bat</Command>
381 <Culture>0x040c</Culture> 373 <Culture>0x040c</Culture>
382 </ResourceCompile> 374 </ResourceCompile>
383 <Link> 375 <Link>
384 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 376 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
385 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> 377 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
386 <SuppressStartupBanner>true</SuppressStartupBanner> 378 <SuppressStartupBanner>true</SuppressStartupBanner>
387 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 379 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -393,10 +385,6 @@ bld_ml32.bat</Command>
393 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 385 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
394 <TargetMachine>MachineX64</TargetMachine> 386 <TargetMachine>MachineX64</TargetMachine>
395 </Link> 387 </Link>
396 <PreBuildEvent>
397 <Command>cd ..\..\contrib\masmx64
398bld_ml64.bat</Command>
399 </PreBuildEvent>
400 </ItemDefinitionGroup> 388 </ItemDefinitionGroup>
401 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> 389 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
402 <Midl> 390 <Midl>
@@ -408,7 +396,7 @@ bld_ml64.bat</Command>
408 </Midl> 396 </Midl>
409 <ClCompile> 397 <ClCompile>
410 <Optimization>Disabled</Optimization> 398 <Optimization>Disabled</Optimization>
411 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 399 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
412 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 400 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
413 <ExceptionHandling> 401 <ExceptionHandling>
414 </ExceptionHandling> 402 </ExceptionHandling>
@@ -451,7 +439,7 @@ bld_ml64.bat</Command>
451 </Midl> 439 </Midl>
452 <ClCompile> 440 <ClCompile>
453 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 441 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
454 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 442 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
455 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 443 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
456 <StringPooling>true</StringPooling> 444 <StringPooling>true</StringPooling>
457 <ExceptionHandling> 445 <ExceptionHandling>
@@ -496,7 +484,7 @@ bld_ml64.bat</Command>
496 </Midl> 484 </Midl>
497 <ClCompile> 485 <ClCompile>
498 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 486 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
499 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 487 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
500 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 488 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
501 <StringPooling>true</StringPooling> 489 <StringPooling>true</StringPooling>
502 <ExceptionHandling> 490 <ExceptionHandling>
@@ -541,8 +529,8 @@ bld_ml64.bat</Command>
541 </Midl> 529 </Midl>
542 <ClCompile> 530 <ClCompile>
543 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 531 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
544 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 532 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
545 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 533 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
546 <StringPooling>true</StringPooling> 534 <StringPooling>true</StringPooling>
547 <ExceptionHandling> 535 <ExceptionHandling>
548 </ExceptionHandling> 536 </ExceptionHandling>
@@ -564,7 +552,7 @@ bld_ml64.bat</Command>
564 <Culture>0x040c</Culture> 552 <Culture>0x040c</Culture>
565 </ResourceCompile> 553 </ResourceCompile>
566 <Link> 554 <Link>
567 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 555 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
568 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> 556 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
569 <SuppressStartupBanner>true</SuppressStartupBanner> 557 <SuppressStartupBanner>true</SuppressStartupBanner>
570 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> 558 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -576,10 +564,6 @@ bld_ml64.bat</Command>
576 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 564 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
577 <TargetMachine>MachineX64</TargetMachine> 565 <TargetMachine>MachineX64</TargetMachine>
578 </Link> 566 </Link>
579 <PreBuildEvent>
580 <Command>cd ..\..\masmx64
581bld_ml64.bat</Command>
582 </PreBuildEvent>
583 </ItemDefinitionGroup> 567 </ItemDefinitionGroup>
584 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> 568 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
585 <Midl> 569 <Midl>
@@ -591,7 +575,7 @@ bld_ml64.bat</Command>
591 </Midl> 575 </Midl>
592 <ClCompile> 576 <ClCompile>
593 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 577 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
594 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 578 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
595 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 579 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
596 <StringPooling>true</StringPooling> 580 <StringPooling>true</StringPooling>
597 <ExceptionHandling> 581 <ExceptionHandling>
@@ -636,14 +620,6 @@ bld_ml64.bat</Command>
636 <ClCompile Include="..\..\..\gzread.c" /> 620 <ClCompile Include="..\..\..\gzread.c" />
637 <ClCompile Include="..\..\..\gzwrite.c" /> 621 <ClCompile Include="..\..\..\gzwrite.c" />
638 <ClCompile Include="..\..\..\infback.c" /> 622 <ClCompile Include="..\..\..\infback.c" />
639 <ClCompile Include="..\..\masmx64\inffas8664.c">
640 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
641 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
642 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
643 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
644 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
645 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
646 </ClCompile>
647 <ClCompile Include="..\..\..\inffast.c" /> 623 <ClCompile Include="..\..\..\inffast.c" />
648 <ClCompile Include="..\..\..\inflate.c" /> 624 <ClCompile Include="..\..\..\inflate.c" />
649 <ClCompile Include="..\..\..\inftrees.c" /> 625 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc14/testzlib.vcxproj b/contrib/vstudio/vc14/testzlib.vcxproj
index 2c37125..5452049 100644
--- a/contrib/vstudio/vc14/testzlib.vcxproj
+++ b/contrib/vstudio/vc14/testzlib.vcxproj
@@ -190,7 +190,7 @@
190 <ClCompile> 190 <ClCompile>
191 <Optimization>Disabled</Optimization> 191 <Optimization>Disabled</Optimization>
192 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 192 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
193 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 193 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
194 <MinimalRebuild>true</MinimalRebuild> 194 <MinimalRebuild>true</MinimalRebuild>
195 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 195 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
196 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 196 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -203,7 +203,7 @@
203 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 203 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
204 </ClCompile> 204 </ClCompile>
205 <Link> 205 <Link>
206 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 206 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
207 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 207 <OutputFile>$(OutDir)testzlib.exe</OutputFile>
208 <GenerateDebugInformation>true</GenerateDebugInformation> 208 <GenerateDebugInformation>true</GenerateDebugInformation>
209 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> 209 <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -250,7 +250,7 @@
250 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 250 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
251 <OmitFramePointers>true</OmitFramePointers> 251 <OmitFramePointers>true</OmitFramePointers>
252 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 252 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
253 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 253 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
254 <StringPooling>true</StringPooling> 254 <StringPooling>true</StringPooling>
255 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 255 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
256 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 256 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -263,7 +263,7 @@
263 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> 263 <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
264 </ClCompile> 264 </ClCompile>
265 <Link> 265 <Link>
266 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 266 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
267 <OutputFile>$(OutDir)testzlib.exe</OutputFile> 267 <OutputFile>$(OutDir)testzlib.exe</OutputFile>
268 <GenerateDebugInformation>true</GenerateDebugInformation> 268 <GenerateDebugInformation>true</GenerateDebugInformation>
269 <SubSystem>Console</SubSystem> 269 <SubSystem>Console</SubSystem>
@@ -279,14 +279,14 @@
279 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 279 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
280 <ClCompile> 280 <ClCompile>
281 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 281 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
282 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 282 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
283 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 283 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
284 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 284 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
285 <BufferSecurityCheck>false</BufferSecurityCheck> 285 <BufferSecurityCheck>false</BufferSecurityCheck>
286 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> 286 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
287 </ClCompile> 287 </ClCompile>
288 <Link> 288 <Link>
289 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 289 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
290 </Link> 290 </Link>
291 </ItemDefinitionGroup> 291 </ItemDefinitionGroup>
292 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> 292 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
@@ -362,14 +362,14 @@
362 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 362 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
363 <ClCompile> 363 <ClCompile>
364 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 364 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
365 <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 365 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
366 <BasicRuntimeChecks>Default</BasicRuntimeChecks> 366 <BasicRuntimeChecks>Default</BasicRuntimeChecks>
367 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> 367 <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
368 <BufferSecurityCheck>false</BufferSecurityCheck> 368 <BufferSecurityCheck>false</BufferSecurityCheck>
369 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> 369 <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
370 </ClCompile> 370 </ClCompile>
371 <Link> 371 <Link>
372 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 372 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
373 </Link> 373 </Link>
374 </ItemDefinitionGroup> 374 </ItemDefinitionGroup>
375 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> 375 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
@@ -408,14 +408,6 @@
408 <ClCompile Include="..\..\..\crc32.c" /> 408 <ClCompile Include="..\..\..\crc32.c" />
409 <ClCompile Include="..\..\..\deflate.c" /> 409 <ClCompile Include="..\..\..\deflate.c" />
410 <ClCompile Include="..\..\..\infback.c" /> 410 <ClCompile Include="..\..\..\infback.c" />
411 <ClCompile Include="..\..\masmx64\inffas8664.c">
412 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
413 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
414 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
415 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
416 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
417 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
418 </ClCompile>
419 <ClCompile Include="..\..\..\inffast.c" /> 411 <ClCompile Include="..\..\..\inffast.c" />
420 <ClCompile Include="..\..\..\inflate.c" /> 412 <ClCompile Include="..\..\..\inflate.c" />
421 <ClCompile Include="..\..\..\inftrees.c" /> 413 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc14/zlibstat.vcxproj b/contrib/vstudio/vc14/zlibstat.vcxproj
index 3e4b986..85c1e89 100644
--- a/contrib/vstudio/vc14/zlibstat.vcxproj
+++ b/contrib/vstudio/vc14/zlibstat.vcxproj
@@ -170,7 +170,7 @@
170 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 170 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
171 <ClCompile> 171 <ClCompile>
172 <Optimization>Disabled</Optimization> 172 <Optimization>Disabled</Optimization>
173 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 173 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
174 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 174 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
175 <ExceptionHandling> 175 <ExceptionHandling>
176 </ExceptionHandling> 176 </ExceptionHandling>
@@ -196,8 +196,8 @@
196 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 196 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
197 <ClCompile> 197 <ClCompile>
198 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 198 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
199 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 199 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
200 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 200 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
201 <StringPooling>true</StringPooling> 201 <StringPooling>true</StringPooling>
202 <ExceptionHandling> 202 <ExceptionHandling>
203 </ExceptionHandling> 203 </ExceptionHandling>
@@ -216,7 +216,7 @@
216 </ResourceCompile> 216 </ResourceCompile>
217 <Lib> 217 <Lib>
218 <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> 218 <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
219 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 219 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
220 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 220 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
221 <SuppressStartupBanner>true</SuppressStartupBanner> 221 <SuppressStartupBanner>true</SuppressStartupBanner>
222 </Lib> 222 </Lib>
@@ -224,7 +224,7 @@
224 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> 224 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
225 <ClCompile> 225 <ClCompile>
226 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 226 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
227 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 227 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
228 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 228 <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
229 <StringPooling>true</StringPooling> 229 <StringPooling>true</StringPooling>
230 <ExceptionHandling> 230 <ExceptionHandling>
@@ -254,7 +254,7 @@
254 </Midl> 254 </Midl>
255 <ClCompile> 255 <ClCompile>
256 <Optimization>Disabled</Optimization> 256 <Optimization>Disabled</Optimization>
257 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 257 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
258 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 258 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
259 <ExceptionHandling> 259 <ExceptionHandling>
260 </ExceptionHandling> 260 </ExceptionHandling>
@@ -283,7 +283,7 @@
283 </Midl> 283 </Midl>
284 <ClCompile> 284 <ClCompile>
285 <Optimization>Disabled</Optimization> 285 <Optimization>Disabled</Optimization>
286 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 286 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
287 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 287 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
288 <ExceptionHandling> 288 <ExceptionHandling>
289 </ExceptionHandling> 289 </ExceptionHandling>
@@ -312,8 +312,8 @@
312 </Midl> 312 </Midl>
313 <ClCompile> 313 <ClCompile>
314 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 314 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
315 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 315 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
316 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 316 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
317 <StringPooling>true</StringPooling> 317 <StringPooling>true</StringPooling>
318 <ExceptionHandling> 318 <ExceptionHandling>
319 </ExceptionHandling> 319 </ExceptionHandling>
@@ -332,7 +332,7 @@
332 </ResourceCompile> 332 </ResourceCompile>
333 <Lib> 333 <Lib>
334 <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> 334 <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
335 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 335 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
336 <OutputFile>$(OutDir)zlibstat.lib</OutputFile> 336 <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
337 <SuppressStartupBanner>true</SuppressStartupBanner> 337 <SuppressStartupBanner>true</SuppressStartupBanner>
338 </Lib> 338 </Lib>
@@ -343,7 +343,7 @@
343 </Midl> 343 </Midl>
344 <ClCompile> 344 <ClCompile>
345 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 345 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
346 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 346 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
347 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 347 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
348 <StringPooling>true</StringPooling> 348 <StringPooling>true</StringPooling>
349 <ExceptionHandling> 349 <ExceptionHandling>
@@ -373,7 +373,7 @@
373 </Midl> 373 </Midl>
374 <ClCompile> 374 <ClCompile>
375 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 375 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
376 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 376 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
377 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 377 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
378 <StringPooling>true</StringPooling> 378 <StringPooling>true</StringPooling>
379 <ExceptionHandling> 379 <ExceptionHandling>
@@ -403,7 +403,7 @@
403 </Midl> 403 </Midl>
404 <ClCompile> 404 <ClCompile>
405 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 405 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
406 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 406 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
407 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 407 <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
408 <StringPooling>true</StringPooling> 408 <StringPooling>true</StringPooling>
409 <ExceptionHandling> 409 <ExceptionHandling>
@@ -437,14 +437,6 @@
437 <ClCompile Include="..\..\..\gzread.c" /> 437 <ClCompile Include="..\..\..\gzread.c" />
438 <ClCompile Include="..\..\..\gzwrite.c" /> 438 <ClCompile Include="..\..\..\gzwrite.c" />
439 <ClCompile Include="..\..\..\infback.c" /> 439 <ClCompile Include="..\..\..\infback.c" />
440 <ClCompile Include="..\..\masmx64\inffas8664.c">
441 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
442 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
443 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
444 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
445 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
446 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
447 </ClCompile>
448 <ClCompile Include="..\..\..\inffast.c" /> 440 <ClCompile Include="..\..\..\inffast.c" />
449 <ClCompile Include="..\..\..\inflate.c" /> 441 <ClCompile Include="..\..\..\inflate.c" />
450 <ClCompile Include="..\..\..\inftrees.c" /> 442 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc14/zlibvc.vcxproj b/contrib/vstudio/vc14/zlibvc.vcxproj
index f8f673c..424ff55 100644
--- a/contrib/vstudio/vc14/zlibvc.vcxproj
+++ b/contrib/vstudio/vc14/zlibvc.vcxproj
@@ -207,8 +207,8 @@
207 </Midl> 207 </Midl>
208 <ClCompile> 208 <ClCompile>
209 <Optimization>Disabled</Optimization> 209 <Optimization>Disabled</Optimization>
210 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 210 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
211 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 211 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
212 <ExceptionHandling> 212 <ExceptionHandling>
213 </ExceptionHandling> 213 </ExceptionHandling>
214 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 214 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -229,7 +229,7 @@
229 </ResourceCompile> 229 </ResourceCompile>
230 <Link> 230 <Link>
231 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> 231 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
232 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 232 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
233 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> 233 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
234 <SuppressStartupBanner>true</SuppressStartupBanner> 234 <SuppressStartupBanner>true</SuppressStartupBanner>
235 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 235 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -243,10 +243,6 @@
243 </DataExecutionPrevention> 243 </DataExecutionPrevention>
244 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 244 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
245 </Link> 245 </Link>
246 <PreBuildEvent>
247 <Command>cd ..\..\masmx86
248bld_ml32.bat</Command>
249 </PreBuildEvent>
250 </ItemDefinitionGroup> 246 </ItemDefinitionGroup>
251 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> 247 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
252 <Midl> 248 <Midl>
@@ -258,7 +254,7 @@ bld_ml32.bat</Command>
258 </Midl> 254 </Midl>
259 <ClCompile> 255 <ClCompile>
260 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 256 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
261 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 257 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
262 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> 258 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
263 <StringPooling>true</StringPooling> 259 <StringPooling>true</StringPooling>
264 <ExceptionHandling> 260 <ExceptionHandling>
@@ -306,8 +302,8 @@ bld_ml32.bat</Command>
306 </Midl> 302 </Midl>
307 <ClCompile> 303 <ClCompile>
308 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 304 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
309 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 305 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
310 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> 306 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
311 <StringPooling>true</StringPooling> 307 <StringPooling>true</StringPooling>
312 <ExceptionHandling> 308 <ExceptionHandling>
313 </ExceptionHandling> 309 </ExceptionHandling>
@@ -330,7 +326,7 @@ bld_ml32.bat</Command>
330 </ResourceCompile> 326 </ResourceCompile>
331 <Link> 327 <Link>
332 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> 328 <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
333 <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> 329 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
334 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> 330 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
335 <SuppressStartupBanner>true</SuppressStartupBanner> 331 <SuppressStartupBanner>true</SuppressStartupBanner>
336 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> 332 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -345,10 +341,6 @@ bld_ml32.bat</Command>
345 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 341 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
346 <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> 342 <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
347 </Link> 343 </Link>
348 <PreBuildEvent>
349 <Command>cd ..\..\masmx86
350bld_ml32.bat</Command>
351 </PreBuildEvent>
352 </ItemDefinitionGroup> 344 </ItemDefinitionGroup>
353 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 345 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
354 <Midl> 346 <Midl>
@@ -360,8 +352,8 @@ bld_ml32.bat</Command>
360 </Midl> 352 </Midl>
361 <ClCompile> 353 <ClCompile>
362 <Optimization>Disabled</Optimization> 354 <Optimization>Disabled</Optimization>
363 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 355 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
364 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 356 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
365 <ExceptionHandling> 357 <ExceptionHandling>
366 </ExceptionHandling> 358 </ExceptionHandling>
367 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> 359 <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -381,7 +373,7 @@ bld_ml32.bat</Command>
381 <Culture>0x040c</Culture> 373 <Culture>0x040c</Culture>
382 </ResourceCompile> 374 </ResourceCompile>
383 <Link> 375 <Link>
384 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 376 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
385 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> 377 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
386 <SuppressStartupBanner>true</SuppressStartupBanner> 378 <SuppressStartupBanner>true</SuppressStartupBanner>
387 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> 379 <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -393,10 +385,6 @@ bld_ml32.bat</Command>
393 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 385 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
394 <TargetMachine>MachineX64</TargetMachine> 386 <TargetMachine>MachineX64</TargetMachine>
395 </Link> 387 </Link>
396 <PreBuildEvent>
397 <Command>cd ..\..\contrib\masmx64
398bld_ml64.bat</Command>
399 </PreBuildEvent>
400 </ItemDefinitionGroup> 388 </ItemDefinitionGroup>
401 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> 389 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
402 <Midl> 390 <Midl>
@@ -408,7 +396,7 @@ bld_ml64.bat</Command>
408 </Midl> 396 </Midl>
409 <ClCompile> 397 <ClCompile>
410 <Optimization>Disabled</Optimization> 398 <Optimization>Disabled</Optimization>
411 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 399 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
412 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 400 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
413 <ExceptionHandling> 401 <ExceptionHandling>
414 </ExceptionHandling> 402 </ExceptionHandling>
@@ -451,7 +439,7 @@ bld_ml64.bat</Command>
451 </Midl> 439 </Midl>
452 <ClCompile> 440 <ClCompile>
453 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 441 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
454 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 442 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
455 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 443 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
456 <StringPooling>true</StringPooling> 444 <StringPooling>true</StringPooling>
457 <ExceptionHandling> 445 <ExceptionHandling>
@@ -496,7 +484,7 @@ bld_ml64.bat</Command>
496 </Midl> 484 </Midl>
497 <ClCompile> 485 <ClCompile>
498 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 486 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
499 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 487 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
500 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 488 <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
501 <StringPooling>true</StringPooling> 489 <StringPooling>true</StringPooling>
502 <ExceptionHandling> 490 <ExceptionHandling>
@@ -541,8 +529,8 @@ bld_ml64.bat</Command>
541 </Midl> 529 </Midl>
542 <ClCompile> 530 <ClCompile>
543 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 531 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
544 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 532 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
545 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 533 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
546 <StringPooling>true</StringPooling> 534 <StringPooling>true</StringPooling>
547 <ExceptionHandling> 535 <ExceptionHandling>
548 </ExceptionHandling> 536 </ExceptionHandling>
@@ -564,7 +552,7 @@ bld_ml64.bat</Command>
564 <Culture>0x040c</Culture> 552 <Culture>0x040c</Culture>
565 </ResourceCompile> 553 </ResourceCompile>
566 <Link> 554 <Link>
567 <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> 555 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
568 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> 556 <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
569 <SuppressStartupBanner>true</SuppressStartupBanner> 557 <SuppressStartupBanner>true</SuppressStartupBanner>
570 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> 558 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -576,10 +564,6 @@ bld_ml64.bat</Command>
576 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> 564 <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
577 <TargetMachine>MachineX64</TargetMachine> 565 <TargetMachine>MachineX64</TargetMachine>
578 </Link> 566 </Link>
579 <PreBuildEvent>
580 <Command>cd ..\..\masmx64
581bld_ml64.bat</Command>
582 </PreBuildEvent>
583 </ItemDefinitionGroup> 567 </ItemDefinitionGroup>
584 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> 568 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
585 <Midl> 569 <Midl>
@@ -591,7 +575,7 @@ bld_ml64.bat</Command>
591 </Midl> 575 </Midl>
592 <ClCompile> 576 <ClCompile>
593 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> 577 <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
594 <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 578 <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
595 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> 579 <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
596 <StringPooling>true</StringPooling> 580 <StringPooling>true</StringPooling>
597 <ExceptionHandling> 581 <ExceptionHandling>
@@ -636,14 +620,6 @@ bld_ml64.bat</Command>
636 <ClCompile Include="..\..\..\gzread.c" /> 620 <ClCompile Include="..\..\..\gzread.c" />
637 <ClCompile Include="..\..\..\gzwrite.c" /> 621 <ClCompile Include="..\..\..\gzwrite.c" />
638 <ClCompile Include="..\..\..\infback.c" /> 622 <ClCompile Include="..\..\..\infback.c" />
639 <ClCompile Include="..\..\masmx64\inffas8664.c">
640 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
641 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
642 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
643 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
644 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
645 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
646 </ClCompile>
647 <ClCompile Include="..\..\..\inffast.c" /> 623 <ClCompile Include="..\..\..\inffast.c" />
648 <ClCompile Include="..\..\..\inflate.c" /> 624 <ClCompile Include="..\..\..\inflate.c" />
649 <ClCompile Include="..\..\..\inftrees.c" /> 625 <ClCompile Include="..\..\..\inftrees.c" />
diff --git a/contrib/vstudio/vc9/miniunz.vcproj b/contrib/vstudio/vc9/miniunz.vcproj
index 7da32b9..cc3d13a 100644
--- a/contrib/vstudio/vc9/miniunz.vcproj
+++ b/contrib/vstudio/vc9/miniunz.vcproj
@@ -542,7 +542,7 @@
542 <Files> 542 <Files>
543 <Filter 543 <Filter
544 Name="Source Files" 544 Name="Source Files"
545 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" 545 Filter="cpp;c;cxx;def;odl;idl;hpj;bat"
546 > 546 >
547 <File 547 <File
548 RelativePath="..\..\minizip\miniunz.c" 548 RelativePath="..\..\minizip\miniunz.c"
diff --git a/contrib/vstudio/vc9/minizip.vcproj b/contrib/vstudio/vc9/minizip.vcproj
index e57e07d..fecd9dd 100644
--- a/contrib/vstudio/vc9/minizip.vcproj
+++ b/contrib/vstudio/vc9/minizip.vcproj
@@ -539,7 +539,7 @@
539 <Files> 539 <Files>
540 <Filter 540 <Filter
541 Name="Source Files" 541 Name="Source Files"
542 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" 542 Filter="cpp;c;cxx;def;odl;idl;hpj;bat"
543 > 543 >
544 <File 544 <File
545 RelativePath="..\..\minizip\minizip.c" 545 RelativePath="..\..\minizip\minizip.c"
diff --git a/contrib/vstudio/vc9/testzlib.vcproj b/contrib/vstudio/vc9/testzlib.vcproj
index 9cb0bf8..ff69640 100644
--- a/contrib/vstudio/vc9/testzlib.vcproj
+++ b/contrib/vstudio/vc9/testzlib.vcproj
@@ -48,7 +48,7 @@
48 Name="VCCLCompilerTool" 48 Name="VCCLCompilerTool"
49 Optimization="0" 49 Optimization="0"
50 AdditionalIncludeDirectories="..\..\.." 50 AdditionalIncludeDirectories="..\..\.."
51 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" 51 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
52 MinimalRebuild="true" 52 MinimalRebuild="true"
53 BasicRuntimeChecks="0" 53 BasicRuntimeChecks="0"
54 RuntimeLibrary="1" 54 RuntimeLibrary="1"
@@ -71,7 +71,6 @@
71 /> 71 />
72 <Tool 72 <Tool
73 Name="VCLinkerTool" 73 Name="VCLinkerTool"
74 AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
75 OutputFile="$(OutDir)/testzlib.exe" 74 OutputFile="$(OutDir)/testzlib.exe"
76 LinkIncremental="2" 75 LinkIncremental="2"
77 GenerateManifest="false" 76 GenerateManifest="false"
@@ -128,7 +127,7 @@
128 <Tool 127 <Tool
129 Name="VCCLCompilerTool" 128 Name="VCCLCompilerTool"
130 AdditionalIncludeDirectories="..\..\.." 129 AdditionalIncludeDirectories="..\..\.."
131 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" 130 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
132 BasicRuntimeChecks="0" 131 BasicRuntimeChecks="0"
133 RuntimeLibrary="3" 132 RuntimeLibrary="3"
134 BufferSecurityCheck="false" 133 BufferSecurityCheck="false"
@@ -145,7 +144,6 @@
145 /> 144 />
146 <Tool 145 <Tool
147 Name="VCLinkerTool" 146 Name="VCLinkerTool"
148 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
149 GenerateManifest="false" 147 GenerateManifest="false"
150 /> 148 />
151 <Tool 149 <Tool
@@ -517,7 +515,7 @@
517 InlineFunctionExpansion="1" 515 InlineFunctionExpansion="1"
518 OmitFramePointers="true" 516 OmitFramePointers="true"
519 AdditionalIncludeDirectories="..\..\.." 517 AdditionalIncludeDirectories="..\..\.."
520 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" 518 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
521 StringPooling="true" 519 StringPooling="true"
522 BasicRuntimeChecks="0" 520 BasicRuntimeChecks="0"
523 RuntimeLibrary="0" 521 RuntimeLibrary="0"
@@ -540,7 +538,6 @@
540 /> 538 />
541 <Tool 539 <Tool
542 Name="VCLinkerTool" 540 Name="VCLinkerTool"
543 AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
544 OutputFile="$(OutDir)/testzlib.exe" 541 OutputFile="$(OutDir)/testzlib.exe"
545 LinkIncremental="1" 542 LinkIncremental="1"
546 GenerateManifest="false" 543 GenerateManifest="false"
@@ -600,7 +597,7 @@
600 <Tool 597 <Tool
601 Name="VCCLCompilerTool" 598 Name="VCCLCompilerTool"
602 AdditionalIncludeDirectories="..\..\.." 599 AdditionalIncludeDirectories="..\..\.."
603 PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" 600 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
604 BasicRuntimeChecks="0" 601 BasicRuntimeChecks="0"
605 RuntimeLibrary="0" 602 RuntimeLibrary="0"
606 BufferSecurityCheck="false" 603 BufferSecurityCheck="false"
@@ -617,7 +614,6 @@
617 /> 614 />
618 <Tool 615 <Tool
619 Name="VCLinkerTool" 616 Name="VCLinkerTool"
620 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
621 GenerateManifest="false" 617 GenerateManifest="false"
622 /> 618 />
623 <Tool 619 <Tool
@@ -733,7 +729,7 @@
733 <Files> 729 <Files>
734 <Filter 730 <Filter
735 Name="Source Files" 731 Name="Source Files"
736 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" 732 Filter="cpp;c;cxx;def;odl;idl;hpj;bat"
737 > 733 >
738 <File 734 <File
739 RelativePath="..\..\..\adler32.c" 735 RelativePath="..\..\..\adler32.c"
@@ -756,58 +752,6 @@
756 > 752 >
757 </File> 753 </File>
758 <File 754 <File
759 RelativePath="..\..\masmx64\inffas8664.c"
760 >
761 <FileConfiguration
762 Name="Debug|Win32"
763 ExcludedFromBuild="true"
764 >
765 <Tool
766 Name="VCCLCompilerTool"
767 />
768 </FileConfiguration>
769 <FileConfiguration
770 Name="Debug|Itanium"
771 ExcludedFromBuild="true"
772 >
773 <Tool
774 Name="VCCLCompilerTool"
775 />
776 </FileConfiguration>
777 <FileConfiguration
778 Name="ReleaseWithoutAsm|Win32"
779 ExcludedFromBuild="true"
780 >
781 <Tool
782 Name="VCCLCompilerTool"
783 />
784 </FileConfiguration>
785 <FileConfiguration
786 Name="ReleaseWithoutAsm|Itanium"
787 ExcludedFromBuild="true"
788 >
789 <Tool
790 Name="VCCLCompilerTool"
791 />
792 </FileConfiguration>
793 <FileConfiguration
794 Name="Release|Win32"
795 ExcludedFromBuild="true"
796 >
797 <Tool
798 Name="VCCLCompilerTool"
799 />
800 </FileConfiguration>
801 <FileConfiguration
802 Name="Release|Itanium"
803 ExcludedFromBuild="true"
804 >
805 <Tool
806 Name="VCCLCompilerTool"
807 />
808 </FileConfiguration>
809 </File>
810 <File
811 RelativePath="..\..\..\inffast.c" 755 RelativePath="..\..\..\inffast.c"
812 > 756 >
813 </File> 757 </File>
diff --git a/contrib/vstudio/vc9/testzlibdll.vcproj b/contrib/vstudio/vc9/testzlibdll.vcproj
index b1ddde0..6448b49 100644
--- a/contrib/vstudio/vc9/testzlibdll.vcproj
+++ b/contrib/vstudio/vc9/testzlibdll.vcproj
@@ -542,7 +542,7 @@
542 <Files> 542 <Files>
543 <Filter 543 <Filter
544 Name="Source Files" 544 Name="Source Files"
545 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" 545 Filter="cpp;c;cxx;def;odl;idl;hpj;bat"
546 > 546 >
547 <File 547 <File
548 RelativePath="..\..\testzlib\testzlib.c" 548 RelativePath="..\..\testzlib\testzlib.c"
diff --git a/contrib/vstudio/vc9/zlibstat.vcproj b/contrib/vstudio/vc9/zlibstat.vcproj
index 61c76c7..1bf1563 100644
--- a/contrib/vstudio/vc9/zlibstat.vcproj
+++ b/contrib/vstudio/vc9/zlibstat.vcproj
@@ -47,7 +47,7 @@
47 <Tool 47 <Tool
48 Name="VCCLCompilerTool" 48 Name="VCCLCompilerTool"
49 Optimization="0" 49 Optimization="0"
50 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 50 AdditionalIncludeDirectories="..\..\.."
51 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" 51 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
52 ExceptionHandling="0" 52 ExceptionHandling="0"
53 RuntimeLibrary="1" 53 RuntimeLibrary="1"
@@ -121,7 +121,7 @@
121 <Tool 121 <Tool
122 Name="VCCLCompilerTool" 122 Name="VCCLCompilerTool"
123 Optimization="0" 123 Optimization="0"
124 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 124 AdditionalIncludeDirectories="..\..\.."
125 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" 125 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
126 ExceptionHandling="0" 126 ExceptionHandling="0"
127 RuntimeLibrary="3" 127 RuntimeLibrary="3"
@@ -195,7 +195,7 @@
195 <Tool 195 <Tool
196 Name="VCCLCompilerTool" 196 Name="VCCLCompilerTool"
197 Optimization="0" 197 Optimization="0"
198 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 198 AdditionalIncludeDirectories="..\..\.."
199 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" 199 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
200 ExceptionHandling="0" 200 ExceptionHandling="0"
201 RuntimeLibrary="3" 201 RuntimeLibrary="3"
@@ -268,8 +268,8 @@
268 <Tool 268 <Tool
269 Name="VCCLCompilerTool" 269 Name="VCCLCompilerTool"
270 InlineFunctionExpansion="1" 270 InlineFunctionExpansion="1"
271 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 271 AdditionalIncludeDirectories="..\..\.."
272 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF" 272 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
273 StringPooling="true" 273 StringPooling="true"
274 ExceptionHandling="0" 274 ExceptionHandling="0"
275 RuntimeLibrary="0" 275 RuntimeLibrary="0"
@@ -295,7 +295,6 @@
295 <Tool 295 <Tool
296 Name="VCLibrarianTool" 296 Name="VCLibrarianTool"
297 AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" 297 AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
298 AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "
299 OutputFile="$(OutDir)\zlibstat.lib" 298 OutputFile="$(OutDir)\zlibstat.lib"
300 SuppressStartupBanner="true" 299 SuppressStartupBanner="true"
301 /> 300 />
@@ -343,8 +342,8 @@
343 <Tool 342 <Tool
344 Name="VCCLCompilerTool" 343 Name="VCCLCompilerTool"
345 InlineFunctionExpansion="1" 344 InlineFunctionExpansion="1"
346 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 345 AdditionalIncludeDirectories="..\..\.."
347 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64" 346 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
348 StringPooling="true" 347 StringPooling="true"
349 ExceptionHandling="0" 348 ExceptionHandling="0"
350 RuntimeLibrary="2" 349 RuntimeLibrary="2"
@@ -370,7 +369,6 @@
370 <Tool 369 <Tool
371 Name="VCLibrarianTool" 370 Name="VCLibrarianTool"
372 AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" 371 AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
373 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
374 OutputFile="$(OutDir)\zlibstat.lib" 372 OutputFile="$(OutDir)\zlibstat.lib"
375 SuppressStartupBanner="true" 373 SuppressStartupBanner="true"
376 /> 374 />
@@ -418,7 +416,7 @@
418 <Tool 416 <Tool
419 Name="VCCLCompilerTool" 417 Name="VCCLCompilerTool"
420 InlineFunctionExpansion="1" 418 InlineFunctionExpansion="1"
421 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 419 AdditionalIncludeDirectories="..\..\.."
422 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" 420 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
423 StringPooling="true" 421 StringPooling="true"
424 ExceptionHandling="0" 422 ExceptionHandling="0"
@@ -491,7 +489,7 @@
491 <Tool 489 <Tool
492 Name="VCCLCompilerTool" 490 Name="VCCLCompilerTool"
493 InlineFunctionExpansion="1" 491 InlineFunctionExpansion="1"
494 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 492 AdditionalIncludeDirectories="..\..\.."
495 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" 493 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
496 StringPooling="true" 494 StringPooling="true"
497 ExceptionHandling="0" 495 ExceptionHandling="0"
@@ -565,7 +563,7 @@
565 <Tool 563 <Tool
566 Name="VCCLCompilerTool" 564 Name="VCCLCompilerTool"
567 InlineFunctionExpansion="1" 565 InlineFunctionExpansion="1"
568 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 566 AdditionalIncludeDirectories="..\..\.."
569 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" 567 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
570 StringPooling="true" 568 StringPooling="true"
571 ExceptionHandling="0" 569 ExceptionHandling="0"
@@ -639,7 +637,7 @@
639 <Tool 637 <Tool
640 Name="VCCLCompilerTool" 638 Name="VCCLCompilerTool"
641 InlineFunctionExpansion="1" 639 InlineFunctionExpansion="1"
642 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 640 AdditionalIncludeDirectories="..\..\.."
643 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" 641 PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
644 StringPooling="true" 642 StringPooling="true"
645 ExceptionHandling="0" 643 ExceptionHandling="0"
@@ -733,58 +731,6 @@
733 > 731 >
734 </File> 732 </File>
735 <File 733 <File
736 RelativePath="..\..\masmx64\inffas8664.c"
737 >
738 <FileConfiguration
739 Name="Debug|Win32"
740 ExcludedFromBuild="true"
741 >
742 <Tool
743 Name="VCCLCompilerTool"
744 />
745 </FileConfiguration>
746 <FileConfiguration
747 Name="Debug|Itanium"
748 ExcludedFromBuild="true"
749 >
750 <Tool
751 Name="VCCLCompilerTool"
752 />
753 </FileConfiguration>
754 <FileConfiguration
755 Name="Release|Win32"
756 ExcludedFromBuild="true"
757 >
758 <Tool
759 Name="VCCLCompilerTool"
760 />
761 </FileConfiguration>
762 <FileConfiguration
763 Name="Release|Itanium"
764 ExcludedFromBuild="true"
765 >
766 <Tool
767 Name="VCCLCompilerTool"
768 />
769 </FileConfiguration>
770 <FileConfiguration
771 Name="ReleaseWithoutAsm|Win32"
772 ExcludedFromBuild="true"
773 >
774 <Tool
775 Name="VCCLCompilerTool"
776 />
777 </FileConfiguration>
778 <FileConfiguration
779 Name="ReleaseWithoutAsm|Itanium"
780 ExcludedFromBuild="true"
781 >
782 <Tool
783 Name="VCCLCompilerTool"
784 />
785 </FileConfiguration>
786 </File>
787 <File
788 RelativePath="..\..\..\inffast.c" 734 RelativePath="..\..\..\inffast.c"
789 > 735 >
790 </File> 736 </File>
diff --git a/contrib/vstudio/vc9/zlibvc.vcproj b/contrib/vstudio/vc9/zlibvc.vcproj
index c9a8947..f11dd1f 100644
--- a/contrib/vstudio/vc9/zlibvc.vcproj
+++ b/contrib/vstudio/vc9/zlibvc.vcproj
@@ -53,8 +53,8 @@
53 <Tool 53 <Tool
54 Name="VCCLCompilerTool" 54 Name="VCCLCompilerTool"
55 Optimization="0" 55 Optimization="0"
56 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 56 AdditionalIncludeDirectories="..\..\.."
57 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF" 57 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"
58 ExceptionHandling="0" 58 ExceptionHandling="0"
59 RuntimeLibrary="1" 59 RuntimeLibrary="1"
60 BufferSecurityCheck="false" 60 BufferSecurityCheck="false"
@@ -81,7 +81,6 @@
81 <Tool 81 <Tool
82 Name="VCLinkerTool" 82 Name="VCLinkerTool"
83 AdditionalOptions="/MACHINE:I386" 83 AdditionalOptions="/MACHINE:I386"
84 AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
85 OutputFile="$(OutDir)\zlibwapi.dll" 84 OutputFile="$(OutDir)\zlibwapi.dll"
86 LinkIncremental="2" 85 LinkIncremental="2"
87 SuppressStartupBanner="true" 86 SuppressStartupBanner="true"
@@ -150,8 +149,8 @@
150 <Tool 149 <Tool
151 Name="VCCLCompilerTool" 150 Name="VCCLCompilerTool"
152 Optimization="0" 151 Optimization="0"
153 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 152 AdditionalIncludeDirectories="..\..\.."
154 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64" 153 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
155 ExceptionHandling="0" 154 ExceptionHandling="0"
156 RuntimeLibrary="3" 155 RuntimeLibrary="3"
157 BufferSecurityCheck="false" 156 BufferSecurityCheck="false"
@@ -177,7 +176,6 @@
177 /> 176 />
178 <Tool 177 <Tool
179 Name="VCLinkerTool" 178 Name="VCLinkerTool"
180 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
181 OutputFile="$(OutDir)\zlibwapi.dll" 179 OutputFile="$(OutDir)\zlibwapi.dll"
182 LinkIncremental="2" 180 LinkIncremental="2"
183 SuppressStartupBanner="true" 181 SuppressStartupBanner="true"
@@ -245,7 +243,7 @@
245 <Tool 243 <Tool
246 Name="VCCLCompilerTool" 244 Name="VCCLCompilerTool"
247 Optimization="0" 245 Optimization="0"
248 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 246 AdditionalIncludeDirectories="..\..\.."
249 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" 247 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
250 ExceptionHandling="0" 248 ExceptionHandling="0"
251 RuntimeLibrary="3" 249 RuntimeLibrary="3"
@@ -340,7 +338,7 @@
340 <Tool 338 <Tool
341 Name="VCCLCompilerTool" 339 Name="VCCLCompilerTool"
342 InlineFunctionExpansion="1" 340 InlineFunctionExpansion="1"
343 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 341 AdditionalIncludeDirectories="..\..\.."
344 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI" 342 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"
345 StringPooling="true" 343 StringPooling="true"
346 ExceptionHandling="0" 344 ExceptionHandling="0"
@@ -440,7 +438,7 @@
440 <Tool 438 <Tool
441 Name="VCCLCompilerTool" 439 Name="VCCLCompilerTool"
442 InlineFunctionExpansion="1" 440 InlineFunctionExpansion="1"
443 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 441 AdditionalIncludeDirectories="..\..\.."
444 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" 442 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
445 StringPooling="true" 443 StringPooling="true"
446 ExceptionHandling="0" 444 ExceptionHandling="0"
@@ -538,7 +536,7 @@
538 <Tool 536 <Tool
539 Name="VCCLCompilerTool" 537 Name="VCCLCompilerTool"
540 InlineFunctionExpansion="1" 538 InlineFunctionExpansion="1"
541 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 539 AdditionalIncludeDirectories="..\..\.."
542 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" 540 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
543 StringPooling="true" 541 StringPooling="true"
544 ExceptionHandling="0" 542 ExceptionHandling="0"
@@ -636,8 +634,8 @@
636 <Tool 634 <Tool
637 Name="VCCLCompilerTool" 635 Name="VCCLCompilerTool"
638 InlineFunctionExpansion="1" 636 InlineFunctionExpansion="1"
639 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 637 AdditionalIncludeDirectories="..\..\.."
640 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF" 638 PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"
641 StringPooling="true" 639 StringPooling="true"
642 ExceptionHandling="0" 640 ExceptionHandling="0"
643 RuntimeLibrary="0" 641 RuntimeLibrary="0"
@@ -666,7 +664,6 @@
666 <Tool 664 <Tool
667 Name="VCLinkerTool" 665 Name="VCLinkerTool"
668 AdditionalOptions="/MACHINE:I386" 666 AdditionalOptions="/MACHINE:I386"
669 AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "
670 OutputFile="$(OutDir)\zlibwapi.dll" 667 OutputFile="$(OutDir)\zlibwapi.dll"
671 LinkIncremental="1" 668 LinkIncremental="1"
672 SuppressStartupBanner="true" 669 SuppressStartupBanner="true"
@@ -737,8 +734,8 @@
737 <Tool 734 <Tool
738 Name="VCCLCompilerTool" 735 Name="VCCLCompilerTool"
739 InlineFunctionExpansion="1" 736 InlineFunctionExpansion="1"
740 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 737 AdditionalIncludeDirectories="..\..\.."
741 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64" 738 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
742 StringPooling="true" 739 StringPooling="true"
743 ExceptionHandling="0" 740 ExceptionHandling="0"
744 RuntimeLibrary="2" 741 RuntimeLibrary="2"
@@ -766,7 +763,6 @@
766 /> 763 />
767 <Tool 764 <Tool
768 Name="VCLinkerTool" 765 Name="VCLinkerTool"
769 AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
770 OutputFile="$(OutDir)\zlibwapi.dll" 766 OutputFile="$(OutDir)\zlibwapi.dll"
771 LinkIncremental="1" 767 LinkIncremental="1"
772 SuppressStartupBanner="true" 768 SuppressStartupBanner="true"
@@ -836,7 +832,7 @@
836 <Tool 832 <Tool
837 Name="VCCLCompilerTool" 833 Name="VCCLCompilerTool"
838 InlineFunctionExpansion="1" 834 InlineFunctionExpansion="1"
839 AdditionalIncludeDirectories="..\..\..;..\..\masmx86" 835 AdditionalIncludeDirectories="..\..\.."
840 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" 836 PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
841 StringPooling="true" 837 StringPooling="true"
842 ExceptionHandling="0" 838 ExceptionHandling="0"
@@ -950,58 +946,6 @@
950 > 946 >
951 </File> 947 </File>
952 <File 948 <File
953 RelativePath="..\..\masmx64\inffas8664.c"
954 >
955 <FileConfiguration
956 Name="Debug|Win32"
957 ExcludedFromBuild="true"
958 >
959 <Tool
960 Name="VCCLCompilerTool"
961 />
962 </FileConfiguration>
963 <FileConfiguration
964 Name="Debug|Itanium"
965 ExcludedFromBuild="true"
966 >
967 <Tool
968 Name="VCCLCompilerTool"
969 />
970 </FileConfiguration>
971 <FileConfiguration
972 Name="ReleaseWithoutAsm|Win32"
973 ExcludedFromBuild="true"
974 >
975 <Tool
976 Name="VCCLCompilerTool"
977 />
978 </FileConfiguration>
979 <FileConfiguration
980 Name="ReleaseWithoutAsm|Itanium"
981 ExcludedFromBuild="true"
982 >
983 <Tool
984 Name="VCCLCompilerTool"
985 />
986 </FileConfiguration>
987 <FileConfiguration
988 Name="Release|Win32"
989 ExcludedFromBuild="true"
990 >
991 <Tool
992 Name="VCCLCompilerTool"
993 />
994 </FileConfiguration>
995 <FileConfiguration
996 Name="Release|Itanium"
997 ExcludedFromBuild="true"
998 >
999 <Tool
1000 Name="VCCLCompilerTool"
1001 />
1002 </FileConfiguration>
1003 </File>
1004 <File
1005 RelativePath="..\..\..\inffast.c" 949 RelativePath="..\..\..\inffast.c"
1006 > 950 >
1007 </File> 951 </File>
diff --git a/deflate.c b/deflate.c
index ac4270b..0345980 100644
--- a/deflate.c
+++ b/deflate.c
@@ -87,13 +87,7 @@ local void lm_init OF((deflate_state *s));
87local void putShortMSB OF((deflate_state *s, uInt b)); 87local void putShortMSB OF((deflate_state *s, uInt b));
88local void flush_pending OF((z_streamp strm)); 88local void flush_pending OF((z_streamp strm));
89local unsigned read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); 89local unsigned read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
90#ifdef ASMV
91# pragma message("Assembler code may have bugs -- use at your own risk")
92 void match_init OF((void)); /* asm code initialization */
93 uInt longest_match OF((deflate_state *s, IPos cur_match));
94#else
95local uInt longest_match OF((deflate_state *s, IPos cur_match)); 90local uInt longest_match OF((deflate_state *s, IPos cur_match));
96#endif
97 91
98#ifdef ZLIB_DEBUG 92#ifdef ZLIB_DEBUG
99local void check_match OF((deflate_state *s, IPos start, IPos match, 93local void check_match OF((deflate_state *s, IPos start, IPos match,
@@ -1267,11 +1261,6 @@ local void lm_init(s)
1267 s->match_length = s->prev_length = MIN_MATCH-1; 1261 s->match_length = s->prev_length = MIN_MATCH-1;
1268 s->match_available = 0; 1262 s->match_available = 0;
1269 s->ins_h = 0; 1263 s->ins_h = 0;
1270#ifndef FASTEST
1271#ifdef ASMV
1272 match_init(); /* initialize the asm code */
1273#endif
1274#endif
1275} 1264}
1276 1265
1277#ifndef FASTEST 1266#ifndef FASTEST
@@ -1284,10 +1273,6 @@ local void lm_init(s)
1284 * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1 1273 * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
1285 * OUT assertion: the match length is not greater than s->lookahead. 1274 * OUT assertion: the match length is not greater than s->lookahead.
1286 */ 1275 */
1287#ifndef ASMV
1288/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
1289 * match.S. The code will be functionally equivalent.
1290 */
1291local uInt longest_match(s, cur_match) 1276local uInt longest_match(s, cur_match)
1292 deflate_state *s; 1277 deflate_state *s;
1293 IPos cur_match; /* current match */ 1278 IPos cur_match; /* current match */
@@ -1433,7 +1418,6 @@ local uInt longest_match(s, cur_match)
1433 if ((uInt)best_len <= s->lookahead) return (uInt)best_len; 1418 if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
1434 return s->lookahead; 1419 return s->lookahead;
1435} 1420}
1436#endif /* ASMV */
1437 1421
1438#else /* FASTEST */ 1422#else /* FASTEST */
1439 1423
diff --git a/zutil.c b/zutil.c
index ec2edac..9543ae8 100644
--- a/zutil.c
+++ b/zutil.c
@@ -61,9 +61,11 @@ uLong ZEXPORT zlibCompileFlags()
61#ifdef ZLIB_DEBUG 61#ifdef ZLIB_DEBUG
62 flags += 1 << 8; 62 flags += 1 << 8;
63#endif 63#endif
64 /*
64#if defined(ASMV) || defined(ASMINF) 65#if defined(ASMV) || defined(ASMINF)
65 flags += 1 << 9; 66 flags += 1 << 9;
66#endif 67#endif
68 */
67#ifdef ZLIB_WINAPI 69#ifdef ZLIB_WINAPI
68 flags += 1 << 10; 70 flags += 1 << 10;
69#endif 71#endif
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-15 21:25:04 +0000