zlib 1.2.3.8v1.2.3.8

6 files changed, 7 insertions, 6 deletions

diff --git a/contrib/masmx64/gvmat64.asm b/contrib/masmx64/gvmat64.asm
index 790d6555..d2790cc1 100644
--- a/contrib/masmx64/gvmat64.asm
+++ b/contrib/masmx64/gvmat64.asm
@@ -406,7 +406,8 @@ LoopCmps:
 

         add rdx,8+8+8

 

-        jmp short LoopCmps

+        jnz short LoopCmps

+        jmp short LenMaximum

 LeaveLoopCmps16: add rdx,8

 LeaveLoopCmps8: add rdx,8

 LeaveLoopCmps:

diff --git a/contrib/masmx64/gvmat64.obj b/contrib/masmx64/gvmat64.obj
deleted file mode 100644
index a49ca029..00000000
--- a/contrib/masmx64/gvmat64.obj
+++ /dev/null
diff --git a/contrib/masmx64/inffas8664.c b/contrib/masmx64/inffas8664.c
index 3af764de..2263d774 100644
--- a/contrib/masmx64/inffas8664.c
+++ b/contrib/masmx64/inffas8664.c
@@ -111,11 +111,11 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     type_ar ar;

     void inffas8664fnc(struct inffast_ar * par);

 

-    

+

 

 #if (defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )) || (defined(_MSC_VER) && defined(_M_AMD64))

 #define PAD_AVAIL_IN 6

-#define PAD_AVAIL_OUT 258    

+#define PAD_AVAIL_OUT 258

 #else

 #define PAD_AVAIL_IN 5

 #define PAD_AVAIL_OUT 257

diff --git a/contrib/masmx64/inffasx64.asm b/contrib/masmx64/inffasx64.asm
index b5d93a27..c2ba03f5 100644
--- a/contrib/masmx64/inffasx64.asm
+++ b/contrib/masmx64/inffasx64.asm
@@ -11,7 +11,7 @@
 ;

 ;   ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK

 ;

-;   (you can get Windows 2003 server DDK with ml64 and cl.exe for AMD64 from 

+;   (you can get Windows 2003 server DDK with ml64 and cl.exe for AMD64 from

 ;      http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price)

 ;

 

@@ -379,7 +379,7 @@ L_break_loop_with_status:
         mov r14,[rsp-40]

         mov r15,[rsp-48]

         mov rbx,[rsp-56]

-        

+

     ret 0

 ;          :

 ;          : "m" (ar)

diff --git a/contrib/masmx64/inffasx64.obj b/contrib/masmx64/inffasx64.obj
deleted file mode 100644
index 8df5d826..00000000
--- a/contrib/masmx64/inffasx64.obj
+++ /dev/null
diff --git a/contrib/masmx64/readme.txt b/contrib/masmx64/readme.txt
index ee03115c..cd697c41 100644
--- a/contrib/masmx64/readme.txt
+++ b/contrib/masmx64/readme.txt
@@ -24,5 +24,5 @@ run bld_64.bat with Microsoft Macro Assembler (x64) for AMD64 (ml64.exe)
 

 ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK

 

-You can get Windows 2003 server DDK with ml64 and cl for AMD64 from 

+You can get Windows 2003 server DDK with ml64 and cl for AMD64 from

   http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price)