[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1566] trunk/lvzip/c_source

[<lab...@us...>]

Revision: 1566
          http://sourceforge.net/p/opengtoolkit/svn/1566
Author:   labviewer
Date:     2018-12-12 11:01:51 +0000 (Wed, 12 Dec 2018)
Log Message:
-----------
Various cleanups for to make everything compile in MSC 6.0 too

Modified Paths:
--------------
    trunk/lvzip/c_source/crypt.c
    trunk/lvzip/c_source/ioapi.h
    trunk/lvzip/c_source/iomem.c
    trunk/lvzip/c_source/iowin.c
    trunk/lvzip/c_source/lvapi.c
    trunk/lvzip/c_source/lvapi.h
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/c_source/mztools.c
    trunk/lvzip/c_source/mztools.h
    trunk/lvzip/c_source/unzip.c
    trunk/lvzip/c_source/zalias.h
    trunk/lvzip/c_source/zconf.h
    trunk/lvzip/c_source/zip.c
    trunk/lvzip/c_source/zlib.h
    trunk/lvzip/c_source/zlibvc.dsp
    trunk/lvzip/c_source/zlibvc.vcproj

Modified: trunk/lvzip/c_source/crypt.c
===================================================================
--- trunk/lvzip/c_source/crypt.c	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/crypt.c	2018-12-12 11:01:51 UTC (rev 1566)
@@ -26,7 +26,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <time.h>
 
 #ifdef _WIN32

Modified: trunk/lvzip/c_source/ioapi.h
===================================================================
--- trunk/lvzip/c_source/ioapi.h	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/ioapi.h	2018-12-12 11:01:51 UTC (rev 1566)
@@ -18,7 +18,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 
 #include "zlib.h"
 

Modified: trunk/lvzip/c_source/iomem.c
===================================================================
--- trunk/lvzip/c_source/iomem.c	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/iomem.c	2018-12-12 11:01:51 UTC (rev 1566)
@@ -134,9 +134,9 @@
 	  return mFullErr;
 
 	if (offset + *size > 0x7FFFFFFF)
-	  *size = (uLong)(0x7FFFFFFF - offset);
+	  *size = 0x7FFFFFFF - offset;
 
-    if ((uint32_t)DSGetHandleSize((UHandle)handle) < (offset + *size + sizeof(int32)))
+    if ((uInt32)DSGetHandleSize((UHandle)handle) < (offset + *size + sizeof(int32)))
     {
         MgErr err = fEOF;
 

Modified: trunk/lvzip/c_source/iowin.c
===================================================================
--- trunk/lvzip/c_source/iowin.c	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/iowin.c	2018-12-12 11:01:51 UTC (rev 1566)
@@ -157,7 +157,7 @@
 			{
 				if (diskFilename[i] != '.') 
 					continue;
-				swprintf(&diskFilename[i], w32fiow->filenameLength - i, L".z%02d", number_disk + 1);
+				swnprintf(&diskFilename[i], w32fiow->filenameLength - i, L".z%02d", number_disk + 1);
 				break;
 			}
 			if (i >= 0)

Modified: trunk/lvzip/c_source/lvapi.c
===================================================================
--- trunk/lvzip/c_source/lvapi.c	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/lvapi.c	2018-12-12 11:01:51 UTC (rev 1566)
@@ -180,14 +180,14 @@
     return version;
 }
 
-LibAPI(int) lvzlib_compress(Bytef *dest, uLongf *destLen,
-                             const Bytef *source, uLong sourceLen, int level)
+LibAPI(int) lvzlib_compress(Bytef *dest, uInt32 *destLen,
+                             const Bytef *source, uInt32 sourceLen, int level)
 {
 	return compress2(dest, destLen, source, sourceLen, level);
 }
 
-LibAPI(int) lvzlib_uncompress(Bytef *dest, uLongf *destLen,
-                             const Bytef *source, uLong sourceLen)
+LibAPI(int) lvzlib_uncompress(Bytef *dest, uInt32 *destLen,
+                             const Bytef *source, uInt32 sourceLen)
 {
 	return uncompress(dest, destLen, source, sourceLen);
 }
@@ -236,7 +236,7 @@
 LibAPI(MgErr) lvzlib_zipOpenNewFileInZip(LVRefNum *refnum, LStrHandle filename, const zip_fileinfo* zipfi,
 						   const LStrHandle extrafield_local, const LStrHandle extrafield_global,
 						   LStrHandle comment, int method, int level, int raw, int windowBits,
-						   int memLevel, int strategy, const char* password, uLong crcForCrypting, uLong version, uLong flags, int zip64)
+						   int memLevel, int strategy, const char* password, uInt32 crcForCrypting, uInt32 version, uInt32 flags, int zip64)
 {
 	zipFile node;
 	MgErr err = lvzlibGetRefnum(refnum, &node, ZipMagic);

Modified: trunk/lvzip/c_source/lvapi.h
===================================================================
--- trunk/lvzip/c_source/lvapi.h	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/lvapi.h	2018-12-12 11:01:51 UTC (rev 1566)
@@ -31,14 +31,14 @@
 #ifndef lvzip_lvapi_h
 #define lvzip_lvapi_h
 LibAPI(const char *) lvzlib_zlibVersion(void);
-LibAPI(int) lvzlib_compress(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen, int level);
-LibAPI(int) lvzlib_uncompress(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
+LibAPI(int) lvzlib_compress(Bytef *dest, uInt32 *destLen, const Bytef *source, uInt32 sourceLen, int level);
+LibAPI(int) lvzlib_uncompress(Bytef *dest, uInt32 *destLen, const Bytef *source, uInt32 sourceLen);
 LibAPI(uInt32) lvzlib_crc32(uInt32 crc, const Bytef *buf, uInt32 len);
 LibAPI(MgErr) lvzlib_zipOpen(const void *pathname, int append, LStrHandle *globalcomment, zlib_filefunc64_def* filefuncs, LVRefNum *refnum);
 LibAPI(MgErr) lvzlib_zipOpenNewFileInZip(LVRefNum *refnum, LStrHandle filename, const zip_fileinfo* zipfi,
 						   const LStrHandle extrafield_local, const LStrHandle extrafield_global,
 						   LStrHandle comment, int method, int level, int raw, int windowBits,
-						   int memLevel, int strategy, const char* password, uLong crcForCrypting, uLong version, uLong flags, int zip64);
+						   int memLevel, int strategy, const char* password, uInt32 crcForCrypting, uInt32 version, uInt32 flags, int zip64);
 LibAPI(MgErr) lvzlib_zipWriteInFileInZip(LVRefNum *refnum, const LStrHandle buffer);
 LibAPI(MgErr) lvzlib_zipCloseFileInZipRaw32(LVRefNum *refnum, uInt32 uncompressedSize, uInt32 crc32);
 LibAPI(MgErr) lvzlib_zipCloseFileInZipRaw64(LVRefNum *refnum, uInt64 uncompressedSize, uInt32 crc32);

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/lvutil.c	2018-12-12 11:01:51 UTC (rev 1566)
@@ -687,6 +687,7 @@
 	return noErr;
 }
 
+#if !EMBEDDED
 LibAPI(MgErr) Win32ResolveShortCut(UStrPtr wStr, UStrPtr *wTgt, Bool32 recursive, DWORD *dwAttrs)
 {
 	HRESULT err = noErr;
@@ -940,6 +941,7 @@
 	return err;
 }
 #endif
+#endif
 
 LibAPI(MgErr) LVPath_ListDirectory(Path folderPath, LStrArrHdl *nameArr, FileInfoArrHdl *typeArr)
 {

Modified: trunk/lvzip/c_source/mztools.c
===================================================================
--- trunk/lvzip/c_source/mztools.c	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/mztools.c	2018-12-12 11:01:51 UTC (rev 1566)
@@ -28,7 +28,7 @@
   WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
 } while(0)
 
-ZEXTERN int ZEXPORT unzRepair(const char* file, const char* fileOut, const char* fileOutTmp, uLong* nRecovered, uLong* bytesRecovered)
+extern int ZEXPORT unzRepair(const char* file, const char* fileOut, const char* fileOutTmp, uLong* nRecovered, uLong* bytesRecovered)
 {
   int err = Z_OK;
   FILE* fpZip = fopen(file, "rb");

Modified: trunk/lvzip/c_source/mztools.h
===================================================================
--- trunk/lvzip/c_source/mztools.h	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/mztools.h	2018-12-12 11:01:51 UTC (rev 1566)
@@ -22,7 +22,7 @@
    fileOut: output file after recovery
    fileOutTmp: temporary file name used for recovery
 */
-ZEXTERN int ZEXPORT unzRepair OF((const char* file, const char* fileOut, const char* fileOutTmp, uLong* nRecovered, uLong* bytesRecovered));
+extern int ZEXPORT unzRepair OF((const char* file, const char* fileOut, const char* fileOutTmp, uLong* nRecovered, uLong* bytesRecovered));
 
 
 #ifdef __cplusplus

Modified: trunk/lvzip/c_source/unzip.c
===================================================================
--- trunk/lvzip/c_source/unzip.c	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/unzip.c	2018-12-12 11:01:51 UTC (rev 1566)
@@ -19,7 +19,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 

Modified: trunk/lvzip/c_source/zalias.h
===================================================================
--- trunk/lvzip/c_source/zalias.h	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/zalias.h	2018-12-12 11:01:51 UTC (rev 1566)
@@ -50,8 +50,8 @@
 #define deflateBound                lvzip_deflateBound
 #define deflateCopy                 lvzip_deflateCopy
 #define deflateEnd                  lvzip_deflateEnd
-#define deflateInit                 lvzip_deflateInit
-#define deflateInit2                lvzip_deflateInit2
+#define deflateInit_                lvzip_deflateInit
+#define deflateInit2_               lvzip_deflateInit2
 #define deflateParams               lvzip_deflateParams
 #define deflatePrime                lvzip_deflatePrime
 #define deflateReset                lvzip_deflateReset
@@ -64,13 +64,13 @@
 #define inflate_table               lvzip_inflate_table
 #define inflateBack                 lvzip_inflateBack
 #define inflateBackEnd              lvzip_inflateBackEnd
-#define inflateBackInit             lvzip_inflateBackInit
+#define inflateBackInit_            lvzip_inflateBackInit
 #define inflateCopy                 lvzip_inflateCopy
 #define inflateEnd                  lvzip_inflateEnd
 #define inflateGetHeader            lvzip_inflateGetHeader
 #define inflate_fast                lvzip_inflate_fast
-#define inflateInit                 lvzip_inflateInit
-#define inflateInit2                lvzip_inflateInit2
+#define inflateInit_                lvzip_inflateInit
+#define inflateInit2_               lvzip_inflateInit2
 #define inflateMark                 lvzip_inflateMark
 #define inflatePrime                lvzip_inflatePrime
 #define inflateReset                lvzip_inflateReset
@@ -178,3 +178,19 @@
 #define gzoffset64					lvzip_gzoffset64
 #define gcrc32_combine				lvzip_gcrc32_combine
 #define gcrc32_combine64			lvzip_gcrc32_combine64
+
+/* Do some standard C type finicking for compilers that do not support the _t standard types */
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
+typedef char int8_t;
+typedef unsigned char uint8_t;
+typedef short int16_t;
+typedef unsigned short uint16_t;
+typedef int int32_t;
+typedef unsigned int uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+typedef int ssize_t;
+typedef unsigned int size_t;
+#else
+#include <stdint.h>
+#endif

Modified: trunk/lvzip/c_source/zconf.h
===================================================================
--- trunk/lvzip/c_source/zconf.h	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/zconf.h	2018-12-12 11:01:51 UTC (rev 1566)
@@ -512,7 +512,14 @@
 #  else
 #    define z_off64_t z_off_t
 #  endif
-#endif
+#endif
+
+/* Microsoft used a non standard function signature for old MSC compilers */ 
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
+#define swnprintf _snwprintf
+#else
+#define swnprintf swprintf
+#endif
 
 /* MVS linker does not support external names larger than 8 bytes */
 #if defined(__MVS__)

Modified: trunk/lvzip/c_source/zip.c
===================================================================
--- trunk/lvzip/c_source/zip.c	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/zip.c	2018-12-12 11:01:51 UTC (rev 1566)
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 

Modified: trunk/lvzip/c_source/zlib.h
===================================================================
--- trunk/lvzip/c_source/zlib.h	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/zlib.h	2018-12-12 11:01:51 UTC (rev 1566)
@@ -31,8 +31,6 @@
 #ifndef ZLIB_H
 #define ZLIB_H
 
-#include <stdint.h>
-
 #include "zalias.h"
 #include "zconf.h"
 
@@ -1782,21 +1780,21 @@
                                          unsigned char FAR *window,
                                          const char *version,
                                          int stream_size));
-#ifdef Z_PREFIX_SET
-#  define lvzip_deflateInit(strm, level) \
-          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define lvzip_inflateInit(strm) \
-          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define lvzip_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define lvzip_inflateInit2(strm, windowBits) \
-          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                        (int)sizeof(z_stream))
-#  define lvzip_inflateBackInit(strm, windowBits, window) \
-          inflateBackInit_((strm), (windowBits), (window), \
-                           ZLIB_VERSION, (int)sizeof(z_stream))
-#else
+//#ifdef Z_PREFIX_SET
+//#  define lvzip_deflateInit(strm, level) \
+//          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+//#  define lvzip_inflateInit(strm) \
+//          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+//#  define lvzip_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+//          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+//                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+//#  define lvzip_inflateInit2(strm, windowBits) \
+//          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+//                        (int)sizeof(z_stream))
+//#  define lvzip_inflateBackInit(strm, windowBits, window) \
+//          inflateBackInit_((strm), (windowBits), (window), \
+//                           ZLIB_VERSION, (int)sizeof(z_stream))
+//#else
 #  define deflateInit(strm, level) \
           deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
 #  define inflateInit(strm) \
@@ -1810,7 +1808,7 @@
 #  define inflateBackInit(strm, windowBits, window) \
           inflateBackInit_((strm), (windowBits), (window), \
                            ZLIB_VERSION, (int)sizeof(z_stream))
-#endif
+//#endif
 
 #ifndef Z_SOLO
 

Modified: trunk/lvzip/c_source/zlibvc.dsp
===================================================================
--- trunk/lvzip/c_source/zlibvc.dsp	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/zlibvc.dsp	2018-12-12 11:01:51 UTC (rev 1566)
@@ -50,7 +50,7 @@
 LIB32=link.exe -lib
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "HAVE_AES" /D "HAVE_BZIP2" /D "BZ_NO_STDIO" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "HAVE_AES" /D "HAVE_BZIP2" /D "BZ_NO_STDIO" /D "ZLIB_DLL" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "bzip2" /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "HAVE_AES" /D "HAVE_BZIP2" /D "BZ_NO_STDIO" /D "ZLIB_DLL" /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -115,7 +115,7 @@
 LIB32=link.exe -lib
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "HAVE_BZIP2" /D "BZ_NO_STDIO" /D "EMBEDDED" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "HAVE_BZIP2" /D "BZ_NO_STDIO" /D "EMBEDDED" /D "ZLIB_DLL" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "bzip2" /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "HAVE_BZIP2" /D "HAVE_AES" /D "EMBEDDED" /D "ZLIB_DLL" /FR /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -128,7 +128,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386
-# ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"Win32_DLL_Embedded\lvzlib.dll"
+# ADD LINK32 advapi32.lib user32.lib kernel32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"Win32_DLL_Embedded\lvzlib.dll"
 
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 DLL ASM Release"
 
@@ -325,6 +325,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\crypt.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\deflate.c
 # End Source File
 # Begin Source File
@@ -391,6 +395,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\utf.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zip.c
 # End Source File
 # Begin Source File
@@ -463,6 +471,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\utf.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zalias.h
 # End Source File
 # Begin Source File
@@ -509,6 +521,8 @@
 
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "zlibvc - Win32 DLL Embedded"
+
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 DLL ASM Release"
 
 # Begin Custom Build - Assembling...
@@ -574,6 +588,8 @@
 
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "zlibvc - Win32 DLL Embedded"
+
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 DLL ASM Release"
 
 # PROP BASE Exclude_From_Build 1
@@ -608,6 +624,8 @@
 
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "zlibvc - Win32 DLL Embedded"
+
 !ELSEIF  "$(CFG)" == "zlibvc - Win32 DLL ASM Release"
 
 # Begin Custom Build - Assembling...
@@ -662,8 +680,144 @@
 
 # End Source File
 # End Group
+# Begin Group "bzip2"
+
+# PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\bzip2\blocksort.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bzip2\bzcompress.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bzip2\bzlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bzip2\bzlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\bzip2\bzlib_private.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\bzip2\crctable.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bzip2\decompress.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bzip2\huffman.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bzip2\randtable.c
+# End Source File
+# End Group
+# Begin Group "AES"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\aes\aes.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\aes_ni.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\aes_ni.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\aes_via_ace.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\aescrypt.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\aeskey.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\aesopt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\aestab.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\aestab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\brg_endian.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\brg_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\entropy.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\entropy.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\fileenc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\fileenc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\hmac.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\hmac.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\prng.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\prng.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\pwd2key.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\pwd2key.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\sha1.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aes\sha1.h
+# End Source File
+# End Group
+# Begin Source File
+
 SOURCE=..\..\cintools\labview.lib
 # End Source File
 # End Target

Modified: trunk/lvzip/c_source/zlibvc.vcproj
===================================================================
--- trunk/lvzip/c_source/zlibvc.vcproj	2018-12-12 11:00:57 UTC (rev 1565)
+++ trunk/lvzip/c_source/zlibvc.vcproj	2018-12-12 11:01:51 UTC (rev 1566)
@@ -590,7 +590,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="bzip2"
-				PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;HAVE_BZIP2;BZ_NO_STDIO;EMBEDDED;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;HAVE_AES;HAVE_BZIP2;BZ_NO_STDIO;EMBEDDED;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -2681,6 +2681,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\bzip2\bzcompress.c"
+				>
+			</File>
+			<File
 				RelativePath=".\bzip2\bzlib.c"
 				>
 			</File>
@@ -2693,82 +2697,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\bzip2\compress.c"
-				>
-				<FileConfiguration
-					Name="static Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="static Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Embedded|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Embedded|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath=".\bzip2\crctable.c"
 				>
 			</File>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.