From: <jk...@us...> - 2009-01-02 19:33:19
|
Revision: 919 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=919&view=rev Author: jkring Date: 2009-01-02 19:33:12 +0000 (Fri, 02 Jan 2009) Log Message: ----------- migrated lvzip sources from CVS to SVN Added Paths: ----------- trunk/lvzip/Change-Log.txt trunk/lvzip/Dynamic Palette MNUs/ trunk/lvzip/Dynamic Palette MNUs/oglib_lvzip.mnu trunk/lvzip/PostInstall.vi trunk/lvzip/PreInstall.vi trunk/lvzip/PreUninstall.vi trunk/lvzip/build lvzip 61.vi trunk/lvzip/build lvzip.vi trunk/lvzip/build_support/ trunk/lvzip/build_support/Build Package (Proxy).vi trunk/lvzip/build_support/Build SPEC file List from Dir.vi trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title - Sub.vi trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title.vi trunk/lvzip/build_support/Pre-Post Build (testing).vi trunk/lvzip/build_support/Update File Info in File Group Section.vi trunk/lvzip/build_support/Update Spec File List (Proxy).vi trunk/lvzip/build_support/Update Spec File List.vi trunk/lvzip/build_support/lvzip.rev trunk/lvzip/c_source/ trunk/lvzip/c_source/ChangeLog trunk/lvzip/c_source/ChangeLogUnzip trunk/lvzip/c_source/FAQ trunk/lvzip/c_source/INDEX trunk/lvzip/c_source/MacBinaryIII.c trunk/lvzip/c_source/MacBinaryIII.h trunk/lvzip/c_source/Makefile trunk/lvzip/c_source/Makefile.vxworks trunk/lvzip/c_source/README trunk/lvzip/c_source/adler32.c trunk/lvzip/c_source/algorithm.txt trunk/lvzip/c_source/compress.c trunk/lvzip/c_source/crc32.c trunk/lvzip/c_source/crc32.h trunk/lvzip/c_source/crypt.h trunk/lvzip/c_source/deflate.c trunk/lvzip/c_source/deflate.h trunk/lvzip/c_source/example.c trunk/lvzip/c_source/gvmat32.asm trunk/lvzip/c_source/gvmat32.obj trunk/lvzip/c_source/gvmat32c.c trunk/lvzip/c_source/gzio.c trunk/lvzip/c_source/infback.c trunk/lvzip/c_source/inffas32.asm trunk/lvzip/c_source/inffas32.obj trunk/lvzip/c_source/inffast.c trunk/lvzip/c_source/inffast.h trunk/lvzip/c_source/inffixed.h trunk/lvzip/c_source/inflate.c trunk/lvzip/c_source/inflate.h trunk/lvzip/c_source/inftrees.c trunk/lvzip/c_source/inftrees.h trunk/lvzip/c_source/ioapi.c trunk/lvzip/c_source/ioapi.h trunk/lvzip/c_source/iomem.c trunk/lvzip/c_source/iomem.h trunk/lvzip/c_source/iowin32.c trunk/lvzip/c_source/iowin32.h trunk/lvzip/c_source/lvutil.c trunk/lvzip/c_source/lvutil.h trunk/lvzip/c_source/lvzip.cws trunk/lvzip/c_source/lvzip.prj trunk/lvzip/c_source/lvzip.xcode/ trunk/lvzip/c_source/lvzip.xcode/project.pbxproj trunk/lvzip/c_source/lvzip.xcodeproj/ trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj trunk/lvzip/c_source/lvzlib.ico trunk/lvzip/c_source/minigzip.c trunk/lvzip/c_source/miniunz.c trunk/lvzip/c_source/minizip.c trunk/lvzip/c_source/mztools.c trunk/lvzip/c_source/mztools.h trunk/lvzip/c_source/trees.c trunk/lvzip/c_source/trees.h trunk/lvzip/c_source/uncompr.c trunk/lvzip/c_source/unzip.c trunk/lvzip/c_source/unzip.h trunk/lvzip/c_source/zalias.h trunk/lvzip/c_source/zconf.h trunk/lvzip/c_source/zconf.in.h trunk/lvzip/c_source/zip.c trunk/lvzip/c_source/zip.h trunk/lvzip/c_source/zlib.3 trunk/lvzip/c_source/zlib.h trunk/lvzip/c_source/zlib.html trunk/lvzip/c_source/zlib.rc trunk/lvzip/c_source/zlibvc.def trunk/lvzip/c_source/zlibvc.dsp trunk/lvzip/c_source/zlibvc.dsw trunk/lvzip/c_source/zutil.c trunk/lvzip/c_source/zutil.h trunk/lvzip/developer docs/ trunk/lvzip/developer docs/Palette Menu Editing Process.txt trunk/lvzip/developer docs/error logs/ trunk/lvzip/developer docs/error logs/errors_01.png trunk/lvzip/developer docs/error logs/errors_02.png trunk/lvzip/developer docs/error logs/finder_error.png trunk/lvzip/lvzip.bmp trunk/lvzip/lvzip.ogbld trunk/lvzip/lvzip.ogpb trunk/lvzip/lvzip.spec trunk/lvzip/source/ trunk/lvzip/source/lvzip.llb/ trunk/lvzip/source/lvzip.llb/ZLIB Block Size.vi trunk/lvzip/source/lvzip.llb/ZLIB CRC32.vi trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi trunk/lvzip/source/lvzip.llb/ZLIB Close Unzip Archive.vi trunk/lvzip/source/lvzip.llb/ZLIB Close Write File.vi trunk/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi trunk/lvzip/source/lvzip.llb/ZLIB Compress File Info.ctl trunk/lvzip/source/lvzip.llb/ZLIB Compress Files.vi trunk/lvzip/source/lvzip.llb/ZLIB Convert File Info.vi trunk/lvzip/source/lvzip.llb/ZLIB Copy Raw File.vi trunk/lvzip/source/lvzip.llb/ZLIB Deflate.vi trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents Old.vi trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents.vi trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi trunk/lvzip/source/lvzip.llb/ZLIB Extract File.vi trunk/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi trunk/lvzip/source/lvzip.llb/ZLIB Extract.vi trunk/lvzip/source/lvzip.llb/ZLIB File Info Old.ctl trunk/lvzip/source/lvzip.llb/ZLIB File Info.ctl trunk/lvzip/source/lvzip.llb/ZLIB File Information.vi trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info Old.vi trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi trunk/lvzip/source/lvzip.llb/ZLIB Get File CRC32.vi trunk/lvzip/source/lvzip.llb/ZLIB Get Global Info.vi trunk/lvzip/source/lvzip.llb/ZLIB Get Version.vi trunk/lvzip/source/lvzip.llb/ZLIB Go To First File.vi trunk/lvzip/source/lvzip.llb/ZLIB Go To Next File.vi trunk/lvzip/source/lvzip.llb/ZLIB Inflate.vi trunk/lvzip/source/lvzip.llb/ZLIB Initialize File Functions.vi trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi trunk/lvzip/source/lvzip.llb/ZLIB Locate File.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Read File.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Write File.vi trunk/lvzip/source/lvzip.llb/ZLIB Open ZIP Mode.ctl trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Archive.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Stream.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Zip.vi trunk/lvzip/source/lvzip.llb/ZLIB Path to Path String.vi trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed File.vi trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed Stream.vi trunk/lvzip/source/lvzip.llb/ZLIB Read Local Extra Data.vi trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi trunk/lvzip/source/lvzip.llb/ZLIB Store Stream.vi trunk/lvzip/source/lvzip.llb/ZLIB Store.vi trunk/lvzip/source/lvzip.llb/ZLIB Transfer Raw File.vi trunk/lvzip/source/lvzip.llb/ZLIB Uncompress File Info.ctl trunk/lvzip/source/lvzip.llb/ZLIB Unzip Handle.ctl trunk/lvzip/source/lvzip.llb/ZLIB VI Tree.vi trunk/lvzip/source/lvzip.llb/ZLIB Write File.vi trunk/lvzip/source/lvzip.llb/ZLIB Write Stream.vi trunk/lvzip/source/lvzip.llb/ZLIB Zip Handle.ctl trunk/lvzip/source/lvzlib.dll trunk/lvzip/source/lvzlib.framework.zip trunk/lvzip/source/macbin.llb/ trunk/lvzip/source/macbin.llb/DecodemacBinary.vi trunk/lvzip/source/macbin.llb/EncodemacBinary.vi trunk/lvzip/source/macbin.llb/MACBIN CCITT_CRC16.vi trunk/lvzip/source/macbin.llb/MACBIN Copy Fork From File.vi trunk/lvzip/source/macbin.llb/MACBIN Copy Fork To File.vi trunk/lvzip/source/macbin.llb/MACBIN Create Header.vi trunk/lvzip/source/macbin.llb/MACBIN Decode MacBinary.vi trunk/lvzip/source/macbin.llb/MACBIN Encode MacBinary.vi trunk/lvzip/source/macbin.llb/MACBIN Has Resource Fork.vi trunk/lvzip/source/macbin.llb/MACBIN Macbinary Header.ctl trunk/lvzip/source/macbin.llb/MACBIN Open File Refnum.vi trunk/lvzip/source/macbin.llb/MACBIN Read Header.vi trunk/lvzip/source/macbin.llb/MACBIN Resource File Info Core.vi trunk/lvzip/source/macbin.llb/MACBIN Resource File Info.vi trunk/lvzip/source/macbin.llb/MACBIN Resource Header.ctl trunk/lvzip/source/macbin.llb/MACBIN Size Padding.vi trunk/lvzip/source/macbin.llb/MACBIN VI Tree.vi trunk/lvzip/source/macbin.llb/MACBIN Verify Header.vi trunk/lvzip/source/opengdoc.txt trunk/lvzip/source/readme.txt trunk/lvzip/source/readonly.txt trunk/lvzip/source/submenus/ trunk/lvzip/source/submenus/macbin.mnu trunk/lvzip/source/submenus/unzip.mnu trunk/lvzip/source/submenus/zip.mnu trunk/lvzip/source/submenus/zlib-string.mnu trunk/lvzip/source/vxWorks LV8.2/ trunk/lvzip/source/vxWorks LV8.2/lvzlib.out trunk/lvzip/source/vxWorks LV8.5/ trunk/lvzip/source/vxWorks LV8.5/lvzlib.out trunk/lvzip/tests/ trunk/lvzip/tests/lvzip-test add to empty archive.vi trunk/lvzip/tests/lvzip-test-delete files from archive.vi trunk/lvzip/tests/lvzip-test-lg bin files.vi trunk/lvzip/tests/lvzip-test-memory stream.vi trunk/lvzip/tests/lvzip-test-sm text files.vi trunk/lvzip/tests/lvzip-test-string compress.vi Property Changed: ---------------- trunk/lvzip/ Property changes on: trunk/lvzip ___________________________________________________________________ Added: bugtraq:label + TrackerID: Added: bugtraq:url + https://sourceforge.net/support/tracker.php?aid=%BUGID% Added: bugtraq:message + TrackerID: %BUGID% Added: svn:ignore + built build zlib *.ogb .DS_Store packaged lvzip.log Added: bugtraq:number + true Added: bugtraq:warnifnoissue + false Added: trunk/lvzip/Change-Log.txt =================================================================== --- trunk/lvzip/Change-Log.txt (rev 0) +++ trunk/lvzip/Change-Log.txt 2009-01-02 19:33:12 UTC (rev 919) @@ -0,0 +1,79 @@ +2003-09-10 rk +Removed "File Info.vi". it uses a CIN Manager function which +starts to behave rather badly in newer (>=7.0) non-Windows LabVIEW version. + +2005-01-12 rk +Incorporated newest zlib version 1.22 and 1.0.1 of Jean-loup Gailly's +minizip library. Added and adapted VIs to support addition of files to +existing archives, delete files from an archive, and add and retrieve +password protected files. +Fixed a bug in the "File Info.vi" in the file package and reactivated +it in the lvzip library. + +2005-04-04 rk +Many minor changes to the shared library to clean it up and make it +compile on Linux, too + +2005-04-12 rk +Changed several connector panes to 12 pane connector to generalize and +allow for consistent password parameter support up to the top most +(easy level) VIs. + +2005-04-14 rk +Added functionality to prepend the file name to the error message if an +input file couldn't be found. + +2005-12-31 rk +Found that the last build on sf did not include the modified VIs. Cleaned +up a bit. + +2006-01-02 jk +Added the Xcode project files and source code. + +2006-01-04 rk +Combined the Macintosh C source and Xcode project file into the standard +C source directory. + +2006-01-07 rk +Updated zlib sources to version 1.2.3 as they have some important security fixes. + +2006-03-01 rk +Added support for transparent Macintosh resource file handling through MacBinary encoding. + +2006-09-23 rk +Fixed error in LabVIEW 8 when extracting read-only files. + +2007-09-10 rk +Added support for adding and extracting memory streams to and from a ZIP file. + +2007-09-16 rk +Added support for ZIP streams itself instead of disk based ZIP files. + +2007-12-8 rk +Minor modifications to try to get it to compile in LabWindows/CVI + +2007-12-10 rk +created vxWorks .out shared libraries for LabVIEW RT 8.2 and 8.5. + +2008-03-31 rk +changed zipOpen2() to properly open an empty archive that contains no files at all + +2008-04-28 rk +changed ZLIB Store File.vi to also work for LabVIEW files that are located in LLBs +by creating a temporary copy to add to the archive. + +2008-10-25 rk +Added missing VI documentation to various VIs. +changed ZLIB Delete Files From Archive.vi to use a correct temporary filename for +the intermediate archive file. +by creating a temporary copy to add to the archive. + +2008-12-23 rk +Prepended all public symbols with lvzip_ to avoid name conflicts with the LabVIEW +VxWorks kernel on cRIO targets. + +2008-12-24 jk +Removed Mac OS 9 shared library and changed to zip format for packaged Mac OS X framework. Still need to update install script VI to handle unzipping via command-line during install. + +2008-12-27 jk +Changed package URL to http://wiki.openg.org/oglib_lvzip Added: trunk/lvzip/Dynamic Palette MNUs/oglib_lvzip.mnu =================================================================== (Binary files differ) Property changes on: trunk/lvzip/Dynamic Palette MNUs/oglib_lvzip.mnu ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/PostInstall.vi =================================================================== (Binary files differ) Property changes on: trunk/lvzip/PostInstall.vi ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/PreInstall.vi =================================================================== (Binary files differ) Property changes on: trunk/lvzip/PreInstall.vi ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/PreUninstall.vi =================================================================== (Binary files differ) Property changes on: trunk/lvzip/PreUninstall.vi ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/build lvzip 61.vi =================================================================== (Binary files differ) Property changes on: trunk/lvzip/build lvzip 61.vi ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/build lvzip.vi =================================================================== (Binary files differ) Property changes on: trunk/lvzip/build lvzip.vi ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/build_support/Build Package (Proxy).vi =================================================================== (Binary files differ) Property changes on: trunk/lvzip/build_support/Build Package (Proxy).vi ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/build_support/Build SPEC file List from Dir.vi =================================================================== (Binary files differ) Property changes on: trunk/lvzip/build_support/Build SPEC file List from Dir.vi ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title - Sub.vi =================================================================== (Binary files differ) Property changes on: trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title - Sub.vi ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title.vi =================================================================== (Binary files differ) Property changes on: trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title.vi ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/build_support/Pre-Post Build (testing).vi =================================================================== (Binary files differ) Property changes on: trunk/lvzip/build_support/Pre-Post Build (testing).vi ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/build_support/Update File Info in File Group Section.vi =================================================================== (Binary files differ) Property changes on: trunk/lvzip/build_support/Update File Info in File Group Section.vi ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/build_support/Update Spec File List (Proxy).vi =================================================================== (Binary files differ) Property changes on: trunk/lvzip/build_support/Update Spec File List (Proxy).vi ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/build_support/Update Spec File List.vi =================================================================== (Binary files differ) Property changes on: trunk/lvzip/build_support/Update Spec File List.vi ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lvzip/build_support/lvzip.rev =================================================================== --- trunk/lvzip/build_support/lvzip.rev (rev 0) +++ trunk/lvzip/build_support/lvzip.rev 2009-01-02 19:33:12 UTC (rev 919) @@ -0,0 +1,8 @@ +[lvzip.ogbld] +Version=2.4 +Build_Number=26 +Build_Date="1/2/2009 9:38:37 AM" +Status=OK +Warnings=1 +Log_File=/D/Projects/OpenG/opengtoolkit/CVS_Folders/lvzip/built/lvzip.log + Property changes on: trunk/lvzip/c_source ___________________________________________________________________ Added: svn:ignore + .DS_Store .bak .ncb .opt .plg .o Added: trunk/lvzip/c_source/ChangeLog =================================================================== --- trunk/lvzip/c_source/ChangeLog (rev 0) +++ trunk/lvzip/c_source/ChangeLog 2009-01-02 19:33:12 UTC (rev 919) @@ -0,0 +1,872 @@ + + ChangeLog file for zlib + +Changes in 1.2.3 (18 July 2005) +- Apply security vulnerability fixes to contrib/infback9 as well +- Clean up some text files (carriage returns, trailing space) +- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant] + +Changes in 1.2.2.4 (11 July 2005) +- Add inflatePrime() function for starting inflation at bit boundary +- Avoid some Visual C warnings in deflate.c +- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit + compile +- Fix some spelling errors in comments [Betts] +- Correct inflateInit2() error return documentation in zlib.h +- Added zran.c example of compressed data random access to examples + directory, shows use of inflatePrime() +- Fix cast for assignments to strm->state in inflate.c and infback.c +- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer] +- Move declarations of gf2 functions to right place in crc32.c [Oberhumer] +- Add cast in trees.c t avoid a warning [Oberhumer] +- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer] +- Update make_vms.com [Zinser] +- Initialize state->write in inflateReset() since copied in inflate_fast() +- Be more strict on incomplete code sets in inflate_table() and increase + ENOUGH and MAXD -- this repairs a possible security vulnerability for + invalid inflate input. Thanks to Tavis Ormandy and Markus Oberhumer for + discovering the vulnerability and providing test cases. +- Add ia64 support to configure for HP-UX [Smith] +- Add error return to gzread() for format or i/o error [Levin] +- Use malloc.h for OS/2 [Necasek] + +Changes in 1.2.2.3 (27 May 2005) +- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile +- Typecast fread() return values in gzio.c [Vollant] +- Remove trailing space in minigzip.c outmode (VC++ can't deal with it) +- Fix crc check bug in gzread() after gzungetc() [Heiner] +- Add the deflateTune() function to adjust internal compression parameters +- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack) +- Remove an incorrect assertion in examples/zpipe.c +- Add C++ wrapper in infback9.h [Donais] +- Fix bug in inflateCopy() when decoding fixed codes +- Note in zlib.h how much deflateSetDictionary() actually uses +- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used) +- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer] +- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer] +- Add gzdirect() function to indicate transparent reads +- Update contrib/minizip [Vollant] +- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer] +- Add casts in crc32.c to avoid warnings [Oberhumer] +- Add contrib/masmx64 [Vollant] +- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant] + +Changes in 1.2.2.2 (30 December 2004) +- Replace structure assignments in deflate.c and inflate.c with zmemcpy to + avoid implicit memcpy calls (portability for no-library compilation) +- Increase sprintf() buffer size in gzdopen() to allow for large numbers +- Add INFLATE_STRICT to check distances against zlib header +- Improve WinCE errno handling and comments [Chang] +- Remove comment about no gzip header processing in FAQ +- Add Z_FIXED strategy option to deflateInit2() to force fixed trees +- Add updated make_vms.com [Coghlan], update README +- Create a new "examples" directory, move gzappend.c there, add zpipe.c, + fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html. +- Add FAQ entry and comments in deflate.c on uninitialized memory access +- Add Solaris 9 make options in configure [Gilbert] +- Allow strerror() usage in gzio.c for STDC +- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer] +- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant] +- Use z_off_t for adler32_combine() and crc32_combine() lengths +- Make adler32() much faster for small len +- Use OS_CODE in deflate() default gzip header + +Changes in 1.2.2.1 (31 October 2004) +- Allow inflateSetDictionary() call for raw inflate +- Fix inflate header crc check bug for file names and comments +- Add deflateSetHeader() and gz_header structure for custom gzip headers +- Add inflateGetheader() to retrieve gzip headers +- Add crc32_combine() and adler32_combine() functions +- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list +- Use zstreamp consistently in zlib.h (inflate_back functions) +- Remove GUNZIP condition from definition of inflate_mode in inflate.h + and in contrib/inflate86/inffast.S [Truta, Anderson] +- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson] +- Update projects/README.projects and projects/visualc6 [Truta] +- Update win32/DLL_FAQ.txt [Truta] +- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta] +- Deprecate Z_ASCII; use Z_TEXT instead [Truta] +- Use a new algorithm for setting strm->data_type in trees.c [Truta] +- Do not define an exit() prototype in zutil.c unless DEBUG defined +- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta] +- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate() +- Fix Darwin build version identification [Peterson] + +Changes in 1.2.2.LV3 (17 November 2004) +- Added the 1.01d, October, 2003 version of zip and unzip from + Gilles Vollant to the library. + +Changes in 1.2.2 (3 October 2004) +- Update zlib.h comments on gzip in-memory processing +- Set adler to 1 in inflateReset() to support Java test suite [Walles] +- Add contrib/dotzlib [Ravn] +- Update win32/DLL_FAQ.txt [Truta] +- Update contrib/minizip [Vollant] +- Move contrib/visual-basic.txt to old/ [Truta] +- Fix assembler builds in projects/visualc6/ [Truta] + +Changes in 1.2.1.2 (9 September 2004) +- Update INDEX file +- Fix trees.c to update strm->data_type (no one ever noticed!) +- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown] +- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE) +- Add limited multitasking protection to DYNAMIC_CRC_TABLE +- Add NO_vsnprintf for VMS in zutil.h [Mozilla] +- Don't declare strerror() under VMS [Mozilla] +- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize +- Update contrib/ada [Anisimkov] +- Update contrib/minizip [Vollant] +- Fix configure to not hardcode directories for Darwin [Peterson] +- Fix gzio.c to not return error on empty files [Brown] +- Fix indentation; update version in contrib/delphi/ZLib.pas and + contrib/pascal/zlibpas.pas [Truta] +- Update mkasm.bat in contrib/masmx86 [Truta] +- Update contrib/untgz [Truta] +- Add projects/README.projects [Truta] +- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta] +- Update win32/DLL_FAQ.txt [Truta] +- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta] +- Remove an unnecessary assignment to curr in inftrees.c [Truta] +- Add OS/2 to exe builds in configure [Poltorak] +- Remove err dummy parameter in zlib.h [Kientzle] + +Changes in 1.2.1.1 (9 January 2004) +- Update email address in README +- Several FAQ updates +- Fix a big fat bug in inftrees.c that prevented decoding valid + dynamic blocks with only literals and no distance codes -- + Thanks to "Hot Emu" for the bug report and sample file +- Add a note to puff.c on no distance codes case. + +Changes in 1.2.1 (17 November 2003) +- Remove a tab in contrib/gzappend/gzappend.c +- Update some interfaces in contrib for new zlib functions +- Update zlib version number in some contrib entries +- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta] +- Support shared libraries on Hurd and KFreeBSD [Brown] +- Fix error in NO_DIVIDE option of adler32.c + +Changes in 1.2.0.8 (4 November 2003) +- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas +- Add experimental NO_DIVIDE #define in adler32.c + - Possibly faster on some processors (let me know if it is) +- Correct Z_BLOCK to not return on first inflate call if no wrap +- Fix strm->data_type on inflate() return to correctly indicate EOB +- Add deflatePrime() function for appending in the middle of a byte +- Add contrib/gzappend for an example of appending to a stream +- Update win32/DLL_FAQ.txt [Truta] +- Delete Turbo C comment in README [Truta] +- Improve some indentation in zconf.h [Truta] +- Fix infinite loop on bad input in configure script [Church] +- Fix gzeof() for concatenated gzip files [Johnson] +- Add example to contrib/visual-basic.txt [Michael B.] +- Add -p to mkdir's in Makefile.in [vda] +- Fix configure to properly detect presence or lack of printf functions +- Add AS400 support [Monnerat] +- Add a little Cygwin support [Wilson] + +Changes in 1.2.0.7 (21 September 2003) +- Correct some debug formats in contrib/infback9 +- Cast a type in a debug statement in trees.c +- Change search and replace delimiter in configure from % to # [Beebe] +- Update contrib/untgz to 0.2 with various fixes [Truta] +- Add build support for Amiga [Nikl] +- Remove some directories in old that have been updated to 1.2 +- Add dylib building for Mac OS X in configure and Makefile.in +- Remove old distribution stuff from Makefile +- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X +- Update links in README + +Changes in 1.2.0.6 (13 September 2003) +- Minor FAQ updates +- Update contrib/minizip to 1.00 [Vollant] +- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta] +- Update POSTINC comment for 68060 [Nikl] +- Add contrib/infback9 with deflate64 decoding (unsupported) +- For MVS define NO_vsnprintf and undefine FAR [van Burik] +- Add pragma for fdopen on MVS [van Burik] + +Changes in 1.2.0.5 (8 September 2003) +- Add OF to inflateBackEnd() declaration in zlib.h +- Remember start when using gzdopen in the middle of a file +- Use internal off_t counters in gz* functions to properly handle seeks +- Perform more rigorous check for distance-too-far in inffast.c +- Add Z_BLOCK flush option to return from inflate at block boundary +- Set strm->data_type on return from inflate + - Indicate bits unused, if at block boundary, and if in last block +- Replace size_t with ptrdiff_t in crc32.c, and check for correct size +- Add condition so old NO_DEFLATE define still works for compatibility +- FAQ update regarding the Windows DLL [Truta] +- INDEX update: add qnx entry, remove aix entry [Truta] +- Install zlib.3 into mandir [Wilson] +- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta] +- Adapt the zlib interface to the new DLL convention guidelines [Truta] +- Introduce ZLIB_WINAPI macro to allow the export of functions using + the WINAPI calling convention, for Visual Basic [Vollant, Truta] +- Update msdos and win32 scripts and makefiles [Truta] +- Export symbols by name, not by ordinal, in win32/zlib.def [Truta] +- Add contrib/ada [Anisimkov] +- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta] +- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant] +- Add contrib/masm686 [Truta] +- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm + [Truta, Vollant] +- Update contrib/delphi; rename to contrib/pascal; add example [Truta] +- Remove contrib/delphi2; add a new contrib/delphi [Truta] +- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream, + and fix some method prototypes [Truta] +- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip + [Truta] +- Avoid the use of backslash (\) in contrib/minizip [Vollant] +- Fix file time handling in contrib/untgz; update makefiles [Truta] +- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines + [Vollant] +- Remove contrib/vstudio/vc15_16 [Vollant] +- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta] +- Update README.contrib [Truta] +- Invert the assignment order of match_head and s->prev[...] in + INSERT_STRING [Truta] +- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings + [Truta] +- Compare function pointers with 0, not with NULL or Z_NULL [Truta] +- Fix prototype of syncsearch in inflate.c [Truta] +- Introduce ASMINF macro to be enabled when using an ASM implementation + of inflate_fast [Truta] +- Change NO_DEFLATE to NO_GZCOMPRESS [Truta] +- Modify test_gzio in example.c to take a single file name as a + parameter [Truta] +- Exit the example.c program if gzopen fails [Truta] +- Add type casts around strlen in example.c [Truta] +- Remove casting to sizeof in minigzip.c; give a proper type + to the variable compared with SUFFIX_LEN [Truta] +- Update definitions of STDC and STDC99 in zconf.h [Truta] +- Synchronize zconf.h with the new Windows DLL interface [Truta] +- Use SYS16BIT instead of __32BIT__ to distinguish between + 16- and 32-bit platforms [Truta] +- Use far memory allocators in small 16-bit memory models for + Turbo C [Truta] +- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in + zlibCompileFlags [Truta] +- Cygwin has vsnprintf [Wilson] +- In Windows16, OS_CODE is 0, as in MSDOS [Truta] +- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson] + +Changes in 1.2.0.4 (10 August 2003) +- Minor FAQ updates +- Be more strict when checking inflateInit2's windowBits parameter +- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well +- Add gzip wrapper option to deflateInit2 using windowBits +- Add updated QNX rule in configure and qnx directory [Bonnefoy] +- Make inflate distance-too-far checks more rigorous +- Clean up FAR usage in inflate +- Add casting to sizeof() in gzio.c and minigzip.c + +Changes in 1.2.0.3 (19 July 2003) +- Fix silly error in gzungetc() implementation [Vollant] +- Update contrib/minizip and contrib/vstudio [Vollant] +- Fix printf format in example.c +- Correct cdecl support in zconf.in.h [Anisimkov] +- Minor FAQ updates + +Changes in 1.2.0.2 (13 July 2003) +- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons +- Attempt to avoid warnings in crc32.c for pointer-int conversion +- Add AIX to configure, remove aix directory [Bakker] +- Add some casts to minigzip.c +- Improve checking after insecure sprintf() or vsprintf() calls +- Remove #elif's from crc32.c +- Change leave label to inf_leave in inflate.c and infback.c to avoid + library conflicts +- Remove inflate gzip decoding by default--only enable gzip decoding by + special request for stricter backward compatibility +- Add zlibCompileFlags() function to return compilation information +- More typecasting in deflate.c to avoid warnings +- Remove leading underscore from _Capital #defines [Truta] +- Fix configure to link shared library when testing +- Add some Windows CE target adjustments [Mai] +- Remove #define ZLIB_DLL in zconf.h [Vollant] +- Add zlib.3 [Rodgers] +- Update RFC URL in deflate.c and algorithm.txt [Mai] +- Add zlib_dll_FAQ.txt to contrib [Truta] +- Add UL to some constants [Truta] +- Update minizip and vstudio [Vollant] +- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h +- Expand use of NO_DUMMY_DECL to avoid all dummy structures +- Added iostream3 to contrib [Schwardt] +- Replace rewind() with fseek() for WinCE [Truta] +- Improve setting of zlib format compression level flags + - Report 0 for huffman and rle strategies and for level == 0 or 1 + - Report 2 only for level == 6 +- Only deal with 64K limit when necessary at compile time [Truta] +- Allow TOO_FAR check to be turned off at compile time [Truta] +- Add gzclearerr() function [Souza] +- Add gzungetc() function + +Changes in 1.2.0.1 (17 March 2003) +- Add Z_RLE strategy for run-length encoding [Truta] + - When Z_RLE requested, restrict matches to distance one + - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE +- Correct FASTEST compilation to allow level == 0 +- Clean up what gets compiled for FASTEST +- Incorporate changes to zconf.in.h [Vollant] + - Refine detection of Turbo C need for dummy returns + - Refine ZLIB_DLL compilation + - Include additional header file on VMS for off_t typedef +- Try to use _vsnprintf where it supplants vsprintf [Vollant] +- Add some casts in inffast.c +- Enchance comments in zlib.h on what happens if gzprintf() tries to + write more than 4095 bytes before compression +- Remove unused state from inflateBackEnd() +- Remove exit(0) from minigzip.c, example.c +- Get rid of all those darn tabs +- Add "check" target to Makefile.in that does the same thing as "test" +- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in +- Update contrib/inflate86 [Anderson] +- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant] +- Add msdos and win32 directories with makefiles [Truta] +- More additions and improvements to the FAQ + +Changes in 1.2.0 (9 March 2003) +- New and improved inflate code + - About 20% faster + - Does not allocate 32K window unless and until needed + - Automatically detects and decompresses gzip streams + - Raw inflate no longer needs an extra dummy byte at end + - Added inflateBack functions using a callback interface--even faster + than inflate, useful for file utilities (gzip, zip) + - Added inflateCopy() function to record state for random access on + externally generated deflate streams (e.g. in gzip files) + - More readable code (I hope) +- New and improved crc32() + - About 50% faster, thanks to suggestions from Rodney Brown +- Add deflateBound() and compressBound() functions +- Fix memory leak in deflateInit2() +- Permit setting dictionary for raw deflate (for parallel deflate) +- Fix const declaration for gzwrite() +- Check for some malloc() failures in gzio.c +- Fix bug in gzopen() on single-byte file 0x1f +- Fix bug in gzread() on concatenated file with 0x1f at end of buffer + and next buffer doesn't start with 0x8b +- Fix uncompress() to return Z_DATA_ERROR on truncated input +- Free memory at end of example.c +- Remove MAX #define in trees.c (conflicted with some libraries) +- Fix static const's in deflate.c, gzio.c, and zutil.[ch] +- Declare malloc() and free() in gzio.c if STDC not defined +- Use malloc() instead of calloc() in zutil.c if int big enough +- Define STDC for AIX +- Add aix/ with approach for compiling shared library on AIX +- Add HP-UX support for shared libraries in configure +- Add OpenUNIX support for shared libraries in configure +- Use $cc instead of gcc to build shared library +- Make prefix directory if needed when installing +- Correct Macintosh avoidance of typedef Byte in zconf.h +- Correct Turbo C memory allocation when under Linux +- Use libz.a instead of -lz in Makefile (assure use of compiled library) +- Update configure to check for snprintf or vsnprintf functions and their + return value, warn during make if using an insecure function +- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that + is lost when library is used--resolution is to build new zconf.h +- Documentation improvements (in zlib.h): + - Document raw deflate and inflate + - Update RFCs URL + - Point out that zlib and gzip formats are different + - Note that Z_BUF_ERROR is not fatal + - Document string limit for gzprintf() and possible buffer overflow + - Note requirement on avail_out when flushing + - Note permitted values of flush parameter of inflate() +- Add some FAQs (and even answers) to the FAQ +- Add contrib/inflate86/ for x86 faster inflate +- Add contrib/blast/ for PKWare Data Compression Library decompression +- Add contrib/puff/ simple inflate for deflate format description + +Changes in 1.1.4.LV2 (26 March 2003) +- Added the 0.21, March 10th, 2003 version of zip and unzip from + Gilles Vollant to the library. + +Changes in 1.1.4.LV (16 Sept 2002) +- Changed export declaration to __cdecl on MSC target when -DLabVIEW is + specified as compiler switch. This is to allow shared libraries with + the same calling convention on all plattforms. +- Added the 0.18 beta, Feb 26th, 2002 version of zip and unzip from + Gilles Vollant to the library. +- Renamed library to lvzlib.dll/so/shlB to avoid confilicts with differently + compiled orginal ZLIB libraries on possible target computers. + +Changes in 1.1.4 (11 March 2002) +- ZFREE was repeated on same allocation on some error conditions. + This creates a security problem described in + http://www.zlib.org/advisory-2002-03-11.txt +- Returned incorrect error (Z_MEM_ERROR) on some invalid data +- Avoid accesses before window for invalid distances with inflate window + less than 32K. +- force windowBits > 8 to avoid a bug in the encoder for a window size + of 256 bytes. (A complete fix will be available in 1.1.5). + +Changes in 1.1.3 (9 July 1998) +- fix "an inflate input buffer bug that shows up on rare but persistent + occasions" (Mark) +- fix gzread and gztell for concatenated .gz files (Didier Le Botlan) +- fix gzseek(..., SEEK_SET) in write mode +- fix crc check after a gzeek (Frank Faubert) +- fix miniunzip when the last entry in a zip file is itself a zip file + (J Lillge) +- add contrib/asm586 and contrib/asm686 (Brian Raiter) + See http://www.muppetlabs.com/~breadbox/software/assembly.html +- add support for Delphi 3 in contrib/delphi (Bob Dellaca) +- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti) +- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren) +- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks) +- added a FAQ file + +- Support gzdopen on Mac with Metrowerks (Jason Linhart) +- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart) +- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young) +- avoid some warnings with Borland C (Tom Tanner) +- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant) +- emulate utime() for WIN32 in contrib/untgz (Gilles Vollant) +- allow several arguments to configure (Tim Mooney, Frodo Looijaard) +- use libdir and includedir in Makefile.in (Tim Mooney) +- support shared libraries on OSF1 V4 (Tim Mooney) +- remove so_locations in "make clean" (Tim Mooney) +- fix maketree.c compilation error (Glenn, Mark) +- Python interface to zlib now in Python 1.5 (Jeremy Hylton) +- new Makefile.riscos (Rich Walker) +- initialize static descriptors in trees.c for embedded targets (Nick Smith) +- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith) +- add the OS/2 files in Makefile.in too (Andrew Zabolotny) +- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane) +- fix maketree.c to allow clean compilation of inffixed.h (Mark) +- fix parameter check in deflateCopy (Gunther Nikl) +- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler) +- Many portability patches by Christian Spieler: + . zutil.c, zutil.h: added "const" for zmem* + . Make_vms.com: fixed some typos + . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists + . msdos/Makefile.msc: remove "default rtl link library" info from obj files + . msdos/Makefile.*: use model-dependent name for the built zlib library + . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc: + new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT) +- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane) +- replace __far with _far for better portability (Christian Spieler, Tom Lane) +- fix test for errno.h in configure (Tim Newsham) + +Changes in 1.1.2 (19 March 98) +- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant) + See http://www.winimage.com/zLibDll/unzip.html +- preinitialize the inflate tables for fixed codes, to make the code + completely thread safe (Mark) +- some simplifications and slight speed-up to the inflate code (Mark) +- fix gzeof on non-compressed files (Allan Schrum) +- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs) +- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn) +- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny) +- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori) +- do not wrap extern "C" around system includes (Tom Lane) +- mention zlib binding for TCL in README (Andreas Kupries) +- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert) +- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson) +- allow "configure --prefix $HOME" (Tim Mooney) +- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson) +- move Makefile.sas to amiga/Makefile.sas + +Changes in 1.1.1 (27 Feb 98) +- fix macros _tr_tally_* in deflate.h for debug mode (Glenn Randers-Pehrson) +- remove block truncation heuristic which had very marginal effect for zlib + (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the + compression ratio on some files. This also allows inlining _tr_tally for + matches in deflate_slow. +- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier) + +Changes in 1.1.0 (24 Feb 98) +- do not return STREAM_END prematurely in inflate (John Bowler) +- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler) +- compile with -DFASTEST to get compression code optimized for speed only +- in minigzip, try mmap'ing the input file first (Miguel Albrecht) +- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain + on Sun but significant on HP) + +- add a pointer to experimental unzip library in README (Gilles Vollant) +- initialize variable gcc in configure (Chris Herborth) + +Changes in 1.0.9 (17 Feb 1998) +- added gzputs and gzgets functions +- do not clear eof flag in gzseek (Mark Diekhans) +- fix gzseek for files in transparent mode (Mark Diekhans) +- do not assume that vsprintf returns the number of bytes written (Jens Krinke) +- replace EXPORT with ZEXPORT to avoid conflict with other programs +- added compress2 in zconf.h, zlib.def, zlib.dnt +- new asm code from Gilles Vollant in contrib/asm386 +- simplify the inflate code (Mark): + . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new() + . ZALLOC the length list in inflate_trees_fixed() instead of using stack + . ZALLOC the value area for huft_build() instead of using stack + . Simplify Z_FINISH check in inflate() + +- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8 +- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi) +- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with + the declaration of FAR (Gilles VOllant) +- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann) +- read_buf buf parameter of type Bytef* instead of charf* +- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout) +- do not redeclare unlink in minigzip.c for WIN32 (John Bowler) +- fix check for presence of directories in "make install" (Ian Willis) + +Changes in 1.0.8 (27 Jan 1998) +- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant) +- fix gzgetc and gzputc for big endian systems (Markus Oberhumer) +- added compress2() to allow setting the compression level +- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong) +- use constant arrays for the static trees in trees.c instead of computing + them at run time (thanks to Ken Raeburn for this suggestion). To create + trees.h, compile with GEN_TREES_H and run "make test". +- check return code of example in "make test" and display result +- pass minigzip command line options to file_compress +- simplifying code of inflateSync to avoid gcc 2.8 bug + +- support CC="gcc -Wall" in configure -s (QingLong) +- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn) +- fix test for shared library support to avoid compiler warnings +- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant) +- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit) +- do not use fdopen for Metrowerks on Mac (Brad Pettit)) +- add checks for gzputc and gzputc in example.c +- avoid warnings in gzio.c and deflate.c (Andreas Kleinert) +- use const for the CRC table (Ken Raeburn) +- fixed "make uninstall" for shared libraries +- use Tracev instead of Trace in infblock.c +- in example.c use correct compressed length for test_sync +- suppress +vnocompatwarnings in configure for HPUX (not always supported) + +Changes in 1.0.7 (20 Jan 1998) +- fix gzseek which was broken in write mode +- return error for gzseek to negative absolute position +- fix configure for Linux (Chun-Chung Chen) +- increase stack space for MSC (Tim Wegner) +- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant) +- define EXPORTVA for gzprintf (Gilles Vollant) +- added man page zlib.3 (Rick Rodgers) +- for contrib/untgz, fix makedir() and improve Makefile + +- check gzseek in write mode in example.c +- allocate extra buffer for seeks only if gzseek is actually called +- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant) +- add inflateSyncPoint in zconf.h +- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def + +Changes in 1.0.6 (19 Jan 1998) +- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and + gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code) +- Fix a deflate bug occuring only with compression level 0 (thanks to + Andy Buckler for finding this one). +- In minigzip, pass transparently also the first byte for .Z files. +- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress() +- check Z_FINISH in inflate (thanks to Marc Schluper) +- Implement deflateCopy (thanks to Adam Costello) +- make static libraries by default in configure, add --shared option. +- move MSDOS or Windows specific files to directory msdos +- suppress the notion of partial flush to simplify the interface + (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4) +- suppress history buffer provided by application to simplify the interface + (this feature was not implemented anyway in 1.0.4) +- next_in and avail_in must be initialized before calling inflateInit or + inflateInit2 +- add EXPORT in all exported functions (for Windows DLL) +- added Makefile.nt (thanks to Stephen Williams) +- added the unsupported "contrib" directory: + contrib/asm386/ by Gilles Vollant <in...@wi...> + 386 asm code replacing longest_match(). + contrib/iostream/ by Kevin Ruland <ke...@ro...> + A C++ I/O streams interface to the zlib gz* functions + contrib/iostream2/ by Tyge L\xF8vset <Tyg...@cm...> + Another C++ I/O streams interface + contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <pa...@ti...> + A very simple tar.gz file extractor using zlib + contrib/visual-basic.txt by Carlos Rios <c_...@so...> + How to use compress(), uncompress() and the gz* functions from VB. +- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression + level) in minigzip (thanks to Tom Lane) + +- use const for rommable constants in deflate +- added test for gzseek and gztell in example.c +- add undocumented function inflateSyncPoint() (hack for Paul Mackerras) +- add undocumented function zError to convert error code to string + (for Tim Smithers) +- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code. +- Use default memcpy for Symantec MSDOS compiler. +- Add EXPORT keyword for check_func (needed for Windows DLL) +- add current directory to LD_LIBRARY_PATH for "make test" +- create also a link for libz.so.1 +- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura) +- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX) +- added -soname for Linux in configure (Chun-Chung Chen, +- assign numbers to the exported functions in zlib.def (for Windows DLL) +- add advice in zlib.h for best usage of deflateSetDictionary +- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn) +- allow compilation with ANSI keywords only enabled for TurboC in large model +- avoid "versionString"[0] (Borland bug) +- add NEED_DUMMY_RETURN for Borland +- use variable z_verbose for tracing in debug mode (L. Peter Deutsch). +- allow compilation with CC +- defined STDC for OS/2 (David Charlap) +- limit external names to 8 chars for MVS (Thomas Lund) +- in minigzip.c, use static buffers only for 16-bit systems +- fix suffix check for "minigzip -d foo.gz" +- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee) +- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau) +- added makelcc.bat for lcc-win32 (Tom St Denis) +- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe) +- Avoid expanded $Id: ChangeLog,v 1.6 2006/01/07 20:06:22 labviewer Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. +- check for unistd.h in configure (for off_t) +- remove useless check parameter in inflate_blocks_free +- avoid useless assignment of s->check to itself in inflate_blocks_new +- do not flush twice in gzclose (thanks to Ken Raeburn) +- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h +- use NO_ERRNO_H instead of enumeration of operating systems with errno.h +- work around buggy fclose on pipes for HP/UX +- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson) +- fix configure if CC is already equal to gcc + +Changes in 1.0.5 (3 Jan 98) +- Fix inflate to terminate gracefully when fed corrupted or invalid data +- Use const for rommable constants in inflate +- Eliminate memory leaks on error conditions in inflate +- Removed some vestigial code in inflate +- Update web address in README + +Changes in 1.0.4 (24 Jul 96) +- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF + bit, so the decompressor could decompress all the correct data but went + on to attempt decompressing extra garbage data. This affected minigzip too. +- zlibVersion and gzerror return const char* (needed for DLL) +- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno) +- use z_error only for DEBUG (avoid problem with DLLs) + +Changes in 1.0.3 (2 Jul 96) +- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS + small and medium models; this makes the library incompatible with previous + versions for these models. (No effect in large model or on other systems.) +- return OK instead of BUF_ERROR if previous deflate call returned with + avail_out as zero but there is nothing to do +- added memcmp for non STDC compilers +- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly) +- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO) +- better check for 16-bit mode MSC (avoids problem with Symantec) + +Changes in 1.0.2 (23 May 96) +- added Windows DLL support +- added a function zlibVersion (for the DLL support) +- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model) +- Bytef is define's instead of typedef'd only for Borland C +- avoid reading uninitialized memory in example.c +- mention in README that the zlib format is now RFC1950 +- updated Makefile.dj2 +- added algorithm.doc + +Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion] +- fix array overlay in deflate.c which sometimes caused bad compressed data +- fix inflate bug with empty stored block +- fix MSDOS medium model which was broken in 0.99 +- fix deflateParams() which could generated bad compressed data. +- Bytef is define'd instead of typedef'ed (work around Borland bug) +- added an INDEX file +- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32), + Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas) +- speed up adler32 for modern machines without auto-increment +- added -ansi for IRIX in configure +- static_init_done in trees.c is an int +- define unlink as delete for VMS +- fix configure for QNX +- add configure branch for SCO and HPUX +- avoid many warnings (unused variables, dead assignments, etc...) +- no fdopen for BeOS +- fix the Watcom fix for 32 bit mode (define FAR as empty) +- removed redefinition of Byte for MKWERKS +- work around an MWKERKS bug (incorrect merge of all .h files) + +Changes in 0.99 (27 Jan 96) +- allow preset dictionary shared between compressor and decompressor +- allow compression level 0 (no compression) +- add deflateParams in zlib.h: allow dynamic change of compression level + and compression strategy. +- test large buffers and deflateParams in example.c +- add optional "configure" to build zlib as a shared library +- suppress Makefile.qnx, use configure instead +- fixed deflate for 64-bit systems (detected on Cray) +- fixed inflate_blocks for 64-bit systems (detected on Alpha) +- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2) +- always return Z_BUF_ERROR when deflate() has nothing to do +- deflateInit and inflateInit are now macros to allow version checking +- prefix all global functions and types with z_ with -DZ_PREFIX +- make falloc completely reentrant (inftrees.c) +- fixed very unlikely race condition in ct_static_init +- free in reverse order of allocation to help memory manager +- use zlib-1.0/* instead of zlib/* inside the tar.gz +- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith + -Wconversion -Wstrict-prototypes -Wmissing-prototypes" +- allow gzread on concatenated .gz files +- deflateEnd now returns Z_DATA_ERROR if it was premature +- deflate is finally (?) fully deterministic (no matches beyond end of input) +- Document Z_SYNC_FLUSH +- add uninstall in Makefile +- Check for __cpluplus in zlib.h +- Better test in ct_align for partial flush +- avoid harmless warnings for Borland C++ +- initialize hash_head in deflate.c +- avoid warning on fdopen (gzio.c) for HP cc -Aa +- include stdlib.h for STDC compilers +- include errno.h for Cray +- ignore error if ranlib doesn't exist +- call ranlib twice for NeXTSTEP +- use exec_prefix instead of prefix for libz.a +- renamed ct_* as _tr_* to avoid conflict with applications +- clear z->msg in inflateInit2 before any error return +- initialize opaque in example.c, gzio.c, deflate.c and inflate.c +- fixed typo in zconf.h (_GNUC__ => __GNUC__) +- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode) +- fix typo in Make_vms.com (f$trnlnm -> f$getsyi) +- in fcalloc, normalize pointer if size > 65520 bytes +- don't use special fcalloc for 32 bit Borland C++ +- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc... +- use Z_BINARY instead of BINARY +- document that gzclose after gzdopen will close the file +- allow "a" as mode in gzopen. +- fix error checking in gzread +- allow skipping .gz extra-field on pipes +- added reference to Perl interface in README +- put the crc table in FAR data (I dislike more and more the medium model :) +- added get_crc_table +- added a dimension to all arrays (Borland C can't count). +- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast +- guard against multiple inclusion of *.h (for precompiled header on Mac) +- Watcom C pretends to be Microsoft C small model even in 32 bit mode. +- don't use unsized arrays to avoid silly warnings by Visual C++: + warning C4746: 'inflate_mask' : unsized array treated as '__far' + (what's wrong with far data in far model?). +- define enum out of inflate_blocks_state to allow compilation with C++ + +Changes in 0.95 (16 Aug 95) +- fix MSDOS small and medium model (now easier to adapt to any compiler) +- inlined send_bits +- fix the final (:-) bug for deflate with flush (output was correct but + not completely flushed in rare occasions). +- default window size is same for compression and decompression + (it's now sufficient to set MAX_WBITS in zconf.h). +- voidp -> voidpf and voidnp -> voidp (for consistency with other + typedefs and because voidnp was not near in large model). + +Changes in 0.94 (13 Aug 95) +- support MSDOS medium model +- fix deflate with flush (could sometimes generate bad output) +- fix deflateReset (zlib header was incorrectly suppressed) +- added support for VMS +- allow a compression level in gzopen() +- gzflush now calls fflush +- For deflate with flush, flush even if no more input is provided. +- rename libgz.a as libz.a +- avoid complex expression in infcodes.c triggering Turbo C bug +- work around a problem with gcc on Alpha (in INSERT_STRING) +- don't use inline functions (problem with some gcc versions) +- allow renaming of Byte, uInt, etc... with #define. +- avoid warning about (unused) pointer before start of array in deflate.c +- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c +- avoid reserved word 'new' in trees.c + +Changes in 0.93 (25 June 95) +- temporarily disable inline functions +- make deflate deterministic +- give enough lookahead for PARTIAL_FLUSH +- Set binary mode for stdin/stdout in minigzip.c for OS/2 +- don't even use signed char in inflate (not portable enough) +- fix inflate memory leak for segmented architectures + +Changes in 0.92 (3 May 95) +- don't assume that char is signed (problem on SGI) +- Clear bit buffer when starting a stored block +- no memcpy on Pyramid +- suppressed inftest.c +- optimized fill_window, put longest_match inline for gcc +- optimized inflate on stored blocks. +- untabify all sources to simplify patches + +Changes in 0.91 (2 May 95) +- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h +- Document the memory requirements in zconf.h +- added "make install" +- fix sync search logic in inflateSync +- deflate(Z_FULL_FLUSH) now works even if output buffer too short +- after inflateSync, don't scare people with just "lo world" +- added support for DJGPP + +Changes in 0.9 (1 May 95) +- don't assume that zalloc clears the allocated memory (the TurboC bug + was Mark's bug after all :) +- let again gzread copy uncompressed data unchanged (was working in 0.71) +- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented +- added a test of inflateSync in example.c +- moved MAX_WBITS to zconf.h because users might want to change that. +- document explicitly that zalloc(64K) on MSDOS must return a normalized + pointer (zero offset) +- added Makefiles for Microsoft C, Turbo C, Borland C++ +- faster crc32() + +Changes in 0.8 (29 April 95) +- added fast inflate (inffast.c) +- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this + is incompatible with previous versions of zlib which returned Z_OK. +- work ar... [truncated message content] |
From: <lab...@us...> - 2009-01-06 08:32:05
|
Revision: 921 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=921&view=rev Author: labviewer Date: 2009-01-06 08:31:58 +0000 (Tue, 06 Jan 2009) Log Message: ----------- Modified ZLIB Delete Files From Archive.vi and ZLIB Extract All Files To Dir.vi to have a better performance. Modified Paths: -------------- trunk/lvzip/source/lvzip.llb/ZLIB Copy Raw File.vi trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi trunk/lvzip/source/lvzip.llb/ZLIB Extract File.vi trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi trunk/lvzip/source/lvzip.llb/ZLIB VI Tree.vi trunk/lvzip/tests/lvzip-test-delete files from archive.vi Modified: trunk/lvzip/source/lvzip.llb/ZLIB Copy Raw File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB VI Tree.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/tests/lvzip-test-delete files from archive.vi =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2009-01-13 22:49:35
|
Revision: 929 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=929&view=rev Author: labviewer Date: 2009-01-13 21:58:55 +0000 (Tue, 13 Jan 2009) Log Message: ----------- Update changelog and changed version to 2.5 Modified Paths: -------------- trunk/lvzip/Change-Log.txt trunk/lvzip/lvzip.ogpb trunk/lvzip/lvzip.spec Modified: trunk/lvzip/Change-Log.txt =================================================================== --- trunk/lvzip/Change-Log.txt 2009-01-13 21:55:39 UTC (rev 928) +++ trunk/lvzip/Change-Log.txt 2009-01-13 21:58:55 UTC (rev 929) @@ -73,7 +73,12 @@ VxWorks kernel on cRIO targets. 2008-12-24 jk -Removed Mac OS 9 shared library and changed to zip format for packaged Mac OS X framework. Still need to update install script VI to handle unzipping via command-line during install. +Removed Mac OS 9 shared library and changed to zip format for packaged Mac OS X framework. +Still need to update install script VI to handle unzipping via command-line during install. 2008-12-27 jk Changed package URL to http://wiki.openg.org/oglib_lvzip + +2009-01-06 rk +Optimized ZLIB Extract All Files To Dir.vi and ZLIB Delete Files From Archive.vi to +not index files uneccessarily to speed up the operation considerably. Modified: trunk/lvzip/lvzip.ogpb =================================================================== --- trunk/lvzip/lvzip.ogpb 2009-01-13 21:55:39 UTC (rev 928) +++ trunk/lvzip/lvzip.ogpb 2009-01-13 21:58:55 UTC (rev 929) @@ -1,6 +1,6 @@ [Package Name] Name=oglib_lvzip -Version=2.4 +Version=2.5 Release=1 [Description] Modified: trunk/lvzip/lvzip.spec =================================================================== --- trunk/lvzip/lvzip.spec 2009-01-13 21:55:39 UTC (rev 928) +++ trunk/lvzip/lvzip.spec 2009-01-13 21:58:55 UTC (rev 929) @@ -1,6 +1,6 @@ [Package Name] Name=oglib_lvzip -Version=2.4 +Version=2.5 Release=1 [Description] @@ -35,7 +35,7 @@ Target Dir=<user.lib>/_OpenG.lib/lvzip Replace Mode=Always -Num Files=79 +Num Files=81 File 0=macbin.mnu File 1=readme.txt @@ -85,37 +85,39 @@ File 45=lvzip.llb/ZLIB Get Current File Info Old__ogtk.vi File 46=lvzip.llb/ZLIB Get Current File Info__ogtk.vi File 47=lvzip.llb/ZLIB Get File CRC32__ogtk.vi -File 48=lvzip.llb/ZLIB Get Global Info__ogtk.vi -File 49=lvzip.llb/ZLIB Get Version__ogtk.vi -File 50=lvzip.llb/ZLIB Go To First File__ogtk.vi -File 51=lvzip.llb/ZLIB Go To Next File__ogtk.vi -File 52=lvzip.llb/ZLIB Inflate__ogtk.vi -File 53=lvzip.llb/ZLIB Initialize File Functions__ogtk.vi -File 54=lvzip.llb/ZLIB Initialize Stream Functions__ogtk.vi -File 55=lvzip.llb/ZLIB Locate File__ogtk.vi -File 56=lvzip.llb/ZLIB Open Read File__ogtk.vi -File 57=lvzip.llb/ZLIB Open Unzip Archive__ogtk.vi -File 58=lvzip.llb/ZLIB Open Unzip Stream__ogtk.vi -File 59=lvzip.llb/ZLIB Open Unzip__ogtk.vi -File 60=lvzip.llb/ZLIB Open Write File__ogtk.vi -File 61=lvzip.llb/ZLIB Open Zip Archive__ogtk.vi -File 62=lvzip.llb/ZLIB Open ZIP Mode__ogtk.ctl -File 63=lvzip.llb/ZLIB Open Zip Stream__ogtk.vi -File 64=lvzip.llb/ZLIB Open Zip__ogtk.vi -File 65=lvzip.llb/ZLIB Path to Path String__ogtk.vi -File 66=lvzip.llb/ZLIB Read Compressed File__ogtk.vi -File 67=lvzip.llb/ZLIB Read Compressed Stream__ogtk.vi -File 68=lvzip.llb/ZLIB Read Local Extra Data__ogtk.vi -File 69=lvzip.llb/ZLIB Store File__ogtk.vi -File 70=lvzip.llb/ZLIB Store Stream__ogtk.vi -File 71=lvzip.llb/ZLIB Store__ogtk.vi -File 72=lvzip.llb/ZLIB Transfer Raw File__ogtk.vi -File 73=lvzip.llb/ZLIB Uncompress File Info__ogtk.ctl -File 74=lvzip.llb/ZLIB Unzip Handle__ogtk.ctl -File 75=lvzip.llb/ZLIB VI Tree__ogtk.vi -File 76=lvzip.llb/ZLIB Write File__ogtk.vi -File 77=lvzip.llb/ZLIB Write Stream__ogtk.vi -File 78=lvzip.llb/ZLIB Zip Handle__ogtk.ctl +File 48=lvzip.llb/ZLIB Get File__ogtk.vi +File 49=lvzip.llb/ZLIB Get Global Info__ogtk.vi +File 50=lvzip.llb/ZLIB Get Version__ogtk.vi +File 51=lvzip.llb/ZLIB Go To First File__ogtk.vi +File 52=lvzip.llb/ZLIB Go To Next File__ogtk.vi +File 53=lvzip.llb/ZLIB Inflate__ogtk.vi +File 54=lvzip.llb/ZLIB Initialize File Functions__ogtk.vi +File 55=lvzip.llb/ZLIB Initialize Stream Functions__ogtk.vi +File 56=lvzip.llb/ZLIB Locate File__ogtk.vi +File 57=lvzip.llb/ZLIB Move Raw File__ogtk.vi +File 58=lvzip.llb/ZLIB Open Read File__ogtk.vi +File 59=lvzip.llb/ZLIB Open Unzip Archive__ogtk.vi +File 60=lvzip.llb/ZLIB Open Unzip Stream__ogtk.vi +File 61=lvzip.llb/ZLIB Open Unzip__ogtk.vi +File 62=lvzip.llb/ZLIB Open Write File__ogtk.vi +File 63=lvzip.llb/ZLIB Open Zip Archive__ogtk.vi +File 64=lvzip.llb/ZLIB Open ZIP Mode__ogtk.ctl +File 65=lvzip.llb/ZLIB Open Zip Stream__ogtk.vi +File 66=lvzip.llb/ZLIB Open Zip__ogtk.vi +File 67=lvzip.llb/ZLIB Path to Path String__ogtk.vi +File 68=lvzip.llb/ZLIB Read Compressed File__ogtk.vi +File 69=lvzip.llb/ZLIB Read Compressed Stream__ogtk.vi +File 70=lvzip.llb/ZLIB Read Local Extra Data__ogtk.vi +File 71=lvzip.llb/ZLIB Store File__ogtk.vi +File 72=lvzip.llb/ZLIB Store Stream__ogtk.vi +File 73=lvzip.llb/ZLIB Store__ogtk.vi +File 74=lvzip.llb/ZLIB Transfer Raw File__ogtk.vi +File 75=lvzip.llb/ZLIB Uncompress File Info__ogtk.ctl +File 76=lvzip.llb/ZLIB Unzip Handle__ogtk.ctl +File 77=lvzip.llb/ZLIB VI Tree__ogtk.vi +File 78=lvzip.llb/ZLIB Write File__ogtk.vi +File 79=lvzip.llb/ZLIB Write Stream__ogtk.vi +File 80=lvzip.llb/ZLIB Zip Handle__ogtk.ctl [File Group 1] Source Dir=built/lvzip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2009-03-30 22:30:05
|
Revision: 969 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=969&view=rev Author: labviewer Date: 2009-03-30 22:29:43 +0000 (Mon, 30 Mar 2009) Log Message: ----------- Fixed a bug that prevented to open UNC paths Modified Paths: -------------- trunk/lvzip/c_source/lvutil.c trunk/lvzip/c_source/lvutil.h trunk/lvzip/source/lvzlib.dll Modified: trunk/lvzip/c_source/lvutil.c =================================================================== --- trunk/lvzip/c_source/lvutil.c 2009-02-28 16:25:29 UTC (rev 968) +++ trunk/lvzip/c_source/lvutil.c 2009-03-30 22:29:43 UTC (rev 969) @@ -343,6 +343,7 @@ int32 pathLen = -1; MgErr err = FPathToText(path, (LStrPtr)&pathLen); + DoDebugger(); if (!err) { *lstr = (LStrPtr)DSNewPClr(sizeof(int32) + pathLen + 1); @@ -551,6 +552,7 @@ extern MgErr ZEXPORT LVPath_OpenFile(LVRefNum *refnum, Path path, uInt8 rsrc, uInt32 openMode, uInt32 denyMode) { MgErr err; + int32 type; File ioRefNum; #if MacOS FSSpec fss; @@ -570,8 +572,11 @@ #endif *refnum = 0; - if (!FIsAPathOfType(path, fAbsPath)) - return mgArgErr; + if (err = FGetPathType(path, &type)) + return err; + + if ((type != fAbsPath) && (type != fUNCPath)) + return mgArgErr; #if MacOS if (err = MakeMacSpec(path, &fss)) Modified: trunk/lvzip/c_source/lvutil.h =================================================================== --- trunk/lvzip/c_source/lvutil.h 2009-02-28 16:25:29 UTC (rev 968) +++ trunk/lvzip/c_source/lvutil.h 2009-03-30 22:29:43 UTC (rev 969) @@ -250,6 +250,7 @@ MgErr FPathToPath(Path *p); MgErr FAppendName(Path path, PStr name); Bool32 FIsAPathOfType(Path path, int32 ofType); +MgErr FGetPathType(Path, int32*); int32 FDepth(Path path); MgErr FDisposePath(Path p); Modified: trunk/lvzip/source/lvzlib.dll =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jk...@us...> - 2009-03-30 23:18:32
|
Revision: 972 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=972&view=rev Author: jkring Date: 2009-03-30 23:18:20 +0000 (Mon, 30 Mar 2009) Log Message: ----------- updated revision history in spec file Modified Paths: -------------- trunk/lvzip/build_support/lvzip.rev trunk/lvzip/lvzip.ogpb Modified: trunk/lvzip/build_support/lvzip.rev =================================================================== --- trunk/lvzip/build_support/lvzip.rev 2009-03-30 23:05:12 UTC (rev 971) +++ trunk/lvzip/build_support/lvzip.rev 2009-03-30 23:18:20 UTC (rev 972) @@ -1,7 +1,7 @@ [lvzip.ogbld] Version=2.5 -Build_Number=27 -Build_Date="3/30/2009 3:56:37 PM" +Build_Number=29 +Build_Date="3/30/2009 4:15:53 PM" Status=OK Warnings=1 Log_File=/D/Projects/OpenG/opengtoolkit/SVN_Folders/lvzip/built/lvzip.log Modified: trunk/lvzip/lvzip.ogpb =================================================================== --- trunk/lvzip/lvzip.ogpb 2009-03-30 23:05:12 UTC (rev 971) +++ trunk/lvzip/lvzip.ogpb 2009-03-30 23:18:20 UTC (rev 972) @@ -4,10 +4,11 @@ Release=1 [Description] -Description="The lvzip package contains several routines for operating on zip files.\0D\0AThe new version 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files.\0D\0A\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.4 adds support for direct memory stream handling." +Description="The lvzip package contains several routines for operating on zip files.\0D\0A\0D\0AVersion 2.5: Changes license of LabVIEW sources from LGPL to BSD, Adds Memory Stream VIs to the palettes, Optimizes ZLIB Extract All Files to Dir, Fixes potential problem where error such as out of disk on finishing to add a file into an archive might get lost meaning that a corrupted archive could result without the user being informed about it, Fixes issue preventing adding files specified by UNC network path to zip archive.\0D\0AVersion 2.4 adds support for direct memory stream handling.\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files." + Summary="OpenG Zip Tools" -License=LGPL -Copyright="1995-2004 Mark Adler, Jean-loup Gailly\0A1998-2004 Gilles Vollant\0A2002 - 2007 Christophe Salzmann, Jim Kring, Rolf Kalbermatter" +License="BSD (VIs), LGPL (Shared Library)" +Copyright="1995-2004 Mark Adler, Jean-loup Gailly\0A1998-2004 Gilles Vollant\0A2002 - 2009 Christophe Salzmann, Jim Kring, Rolf Kalbermatter" Distribution="OpenG Toolkit" Icon=lvzip.bmp Vendor=OpenG.org This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2009-09-02 20:52:02
|
Revision: 996 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=996&view=rev Author: labviewer Date: 2009-09-02 20:51:44 +0000 (Wed, 02 Sep 2009) Log Message: ----------- Fixed a LabVIEW 2009 problem where the used path conversion functions are now private. Modified Paths: -------------- trunk/lvzip/Change-Log.txt trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi trunk/lvzip/source/lvzip.llb/ZLIB VI Tree.vi trunk/lvzip/source/lvzlib.dll trunk/lvzip/source/readme.txt Modified: trunk/lvzip/Change-Log.txt =================================================================== --- trunk/lvzip/Change-Log.txt 2009-09-02 17:38:35 UTC (rev 995) +++ trunk/lvzip/Change-Log.txt 2009-09-02 20:51:44 UTC (rev 996) @@ -65,8 +65,7 @@ 2008-10-25 rk Added missing VI documentation to various VIs. changed ZLIB Delete Files From Archive.vi to use a correct temporary filename for -the intermediate archive file. -by creating a temporary copy to add to the archive. +the intermediate archive file by creating a temporary copy to add to the archive. 2008-12-23 rk Prepended all public symbols with lvzip_ to avoid name conflicts with the LabVIEW @@ -82,3 +81,9 @@ 2009-01-06 rk Optimized ZLIB Extract All Files To Dir.vi and ZLIB Delete Files From Archive.vi to not index files uneccessarily to speed up the operation considerably. +Fixed palette files to include the polymorphic icons. + +2009-09-02 rk +Removed use of the private vi.lib config file VIs to convert between unix style paths +and platform paths by incorperating them into the library. +Added a test for deleting from an archive. \ No newline at end of file Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB VI Tree.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzlib.dll =================================================================== (Binary files differ) Modified: trunk/lvzip/source/readme.txt =================================================================== --- trunk/lvzip/source/readme.txt 2009-09-02 17:38:35 UTC (rev 995) +++ trunk/lvzip/source/readme.txt 2009-09-02 20:51:44 UTC (rev 996) @@ -1,7 +1,7 @@ -LabVIEW ZIP library, version 2.4 --------------------------------- +LabVIEW ZIP library, version 2.5.2 +---------------------------------- -Copyright 2002-2007 Rolf Kalbermatter +Copyright 2002-2009 Rolf Kalbermatter Please read this document before you upgrade from a version of LVZIP @@ -11,9 +11,32 @@ in comparison to earlier versions which might require you to slightly redo your project. +Release 2.5.2, Released: Sep. 3, 2009 +===================================== -New features in 2.4: --------------------- +Bug fixes: +---------- +1) Fixed the use of LabVIEW config file VIs that are now considered private in 2009. + + +Release 2.5.1, Released: April 28, 2009 +======================================= + +New features: +------------- +1) Optimized ZLIB Extract All Files To Dir.vi and ZLIB Delete Files From Archive.vi to +not index files uneccessarily to speed up the operation considerably. + +Bug fixes: +---------- +1) Fixed palette files to include the polymorphic icons. + + +Release 2.4.1, Released: Jan. 2, 2009 +===================================== + +New features: +------------- 1) Support for ZIP and UNZIP streams directly located in memory contrary to requiring disk based files at all times. @@ -28,24 +51,39 @@ 8.5/8.6. Note, that for VxWorks based targets you have to copy the lvzlib.out file found -typically under "user.lib/_OpenG.lib/lvzipfile" manually to your RT target using -some FTP utility into the "ni-rt/system" folder. LabVIEW will currently not -deploy or download that file automatically for those targets. +typically under "user.lib/_OpenG.lib/lvzip" manually to your RT target using +some FTP utility to copy this file into the "ni-rt/system" folder. LabVIEW will +currently not deploy or download that file automatically for those targets. -Bug fixes in 2.4: ------------------ +Bug fixes: +---------- 1) Fixed a problem in ZIP Open File.vi where one could not open an empty already created archive for appending new files. 2) Fixed a problem in ZLIB Delete Files From Archive.vi to use a correct temporary filename for the intermediate archive file. -3) Fixed a potential problem with uninitialized memory in a function in -the shared library. +3) Fixed a problem in ZLIB Store File.vi to also wirk for LabVIEW files +located inside an LLB. +4) Fixed a potential problem with uninitialized memory in a function in +the shared library that could cause ZLIB Get Global Info to error on an +not properly closed archive. -New features in 2.3: --------------------- +Removed support: +---------------- +1) Removed MacOS 9 Shared library. + + +Release 2.3.2, Released: Feb. 6, 2007 +===================================== + + +Release 2.3.1, Released: Sep. 23, 2006 +====================================== + +New features: +------------- 1) Transparent MacBinary support on the Macintosh (experimental feature) If the compression routine encounters a Macintosh file with a resource fork @@ -63,9 +101,12 @@ modification time has been applied. -New features in 2.2 (never really properly released): ------------------------------------------------------ +Release 2.2, (never really properly released) +============================================= +New features: +------------- + 1) Password support (limited testing) ZLIB Extract All Files To Dir.vi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2009-09-02 20:52:57
|
Revision: 997 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=997&view=rev Author: labviewer Date: 2009-09-02 20:52:49 +0000 (Wed, 02 Sep 2009) Log Message: ----------- Changed build version to 2.5.2 Modified Paths: -------------- trunk/lvzip/build_support/lvzip.rev trunk/lvzip/lvzip.ogpb trunk/lvzip/lvzip.spec trunk/lvzip/source/opengdoc.txt Modified: trunk/lvzip/build_support/lvzip.rev =================================================================== --- trunk/lvzip/build_support/lvzip.rev 2009-09-02 20:51:44 UTC (rev 996) +++ trunk/lvzip/build_support/lvzip.rev 2009-09-02 20:52:49 UTC (rev 997) @@ -1,8 +1,8 @@ [lvzip.ogbld] -Version=2.5 -Build_Number=29 -Build_Date="3/30/2009 4:15:53 PM" +Version=2.5.2 +Build_Number=30 +Build_Date="9/2/2009 9:48:00 PM" Status=OK -Warnings=1 -Log_File=/D/Projects/OpenG/opengtoolkit/SVN_Folders/lvzip/built/lvzip.log +Warnings=0 +Log_File="/C/Work/OpenG/OpenG SVN/lvzip/built/lvzip.log" Modified: trunk/lvzip/lvzip.ogpb =================================================================== --- trunk/lvzip/lvzip.ogpb 2009-09-02 20:51:44 UTC (rev 996) +++ trunk/lvzip/lvzip.ogpb 2009-09-02 20:52:49 UTC (rev 997) @@ -1,7 +1,7 @@ [Package Name] Name=oglib_lvzip Version=2.5 -Release=1 +Release=2 [Description] Description="The lvzip package contains several routines for operating on zip files.\0D\0A\0D\0AVersion 2.5: Changes license of LabVIEW sources from LGPL to BSD, Adds Memory Stream VIs to the palettes, Optimizes ZLIB Extract All Files to Dir, Fixes potential problem where error such as out of disk on finishing to add a file into an archive might get lost meaning that a corrupted archive could result without the user being informed about it, Fixes issue preventing adding files specified by UNC network path to zip archive.\0D\0AVersion 2.4 adds support for direct memory stream handling.\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files." Modified: trunk/lvzip/lvzip.spec =================================================================== --- trunk/lvzip/lvzip.spec 2009-09-02 20:51:44 UTC (rev 996) +++ trunk/lvzip/lvzip.spec 2009-09-02 20:52:49 UTC (rev 997) @@ -1,7 +1,7 @@ [Package Name] Name=oglib_lvzip Version=2.5 -Release=1 +Release=2 [Description] Description="The lvzip package contains several routines for operating on zip files.\0D\0A\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files.\0D\0A\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.4 adds support for direct memory stream handling." @@ -35,7 +35,7 @@ Target Dir=<user.lib>/_OpenG.lib/lvzip Replace Mode=Always -Num Files=81 +Num Files=83 File 0=macbin.mnu File 1=readme.txt @@ -65,59 +65,61 @@ File 25=lvzip.llb/ZLIB Close Unzip Archive__ogtk.vi File 26=lvzip.llb/ZLIB Close Write File__ogtk.vi File 27=lvzip.llb/ZLIB Close Zip Archive__ogtk.vi -File 28=lvzip.llb/ZLIB Compress Directory__ogtk.vi -File 29=lvzip.llb/ZLIB Compress File Info__ogtk.ctl -File 30=lvzip.llb/ZLIB Compress Files__ogtk.vi -File 31=lvzip.llb/ZLIB Convert File Info__ogtk.vi -File 32=lvzip.llb/ZLIB Copy Raw File__ogtk.vi -File 33=lvzip.llb/ZLIB CRC32__ogtk.vi -File 34=lvzip.llb/ZLIB Deflate__ogtk.vi -File 35=lvzip.llb/ZLIB Delete Files From Archive__ogtk.vi -File 36=lvzip.llb/ZLIB Enumerate File Contents Old__ogtk.vi -File 37=lvzip.llb/ZLIB Enumerate File Contents__ogtk.vi -File 38=lvzip.llb/ZLIB Extract All Files To Dir__ogtk.vi -File 39=lvzip.llb/ZLIB Extract File__ogtk.vi -File 40=lvzip.llb/ZLIB Extract Stream__ogtk.vi -File 41=lvzip.llb/ZLIB Extract__ogtk.vi -File 42=lvzip.llb/ZLIB File Info Old__ogtk.ctl -File 43=lvzip.llb/ZLIB File Info__ogtk.ctl -File 44=lvzip.llb/ZLIB File Information__ogtk.vi -File 45=lvzip.llb/ZLIB Get Current File Info Old__ogtk.vi -File 46=lvzip.llb/ZLIB Get Current File Info__ogtk.vi -File 47=lvzip.llb/ZLIB Get File CRC32__ogtk.vi -File 48=lvzip.llb/ZLIB Get File__ogtk.vi -File 49=lvzip.llb/ZLIB Get Global Info__ogtk.vi -File 50=lvzip.llb/ZLIB Get Version__ogtk.vi -File 51=lvzip.llb/ZLIB Go To First File__ogtk.vi -File 52=lvzip.llb/ZLIB Go To Next File__ogtk.vi -File 53=lvzip.llb/ZLIB Inflate__ogtk.vi -File 54=lvzip.llb/ZLIB Initialize File Functions__ogtk.vi -File 55=lvzip.llb/ZLIB Initialize Stream Functions__ogtk.vi -File 56=lvzip.llb/ZLIB Locate File__ogtk.vi -File 57=lvzip.llb/ZLIB Move Raw File__ogtk.vi -File 58=lvzip.llb/ZLIB Open Read File__ogtk.vi -File 59=lvzip.llb/ZLIB Open Unzip Archive__ogtk.vi -File 60=lvzip.llb/ZLIB Open Unzip Stream__ogtk.vi -File 61=lvzip.llb/ZLIB Open Unzip__ogtk.vi -File 62=lvzip.llb/ZLIB Open Write File__ogtk.vi -File 63=lvzip.llb/ZLIB Open Zip Archive__ogtk.vi -File 64=lvzip.llb/ZLIB Open ZIP Mode__ogtk.ctl -File 65=lvzip.llb/ZLIB Open Zip Stream__ogtk.vi -File 66=lvzip.llb/ZLIB Open Zip__ogtk.vi -File 67=lvzip.llb/ZLIB Path to Path String__ogtk.vi -File 68=lvzip.llb/ZLIB Read Compressed File__ogtk.vi -File 69=lvzip.llb/ZLIB Read Compressed Stream__ogtk.vi -File 70=lvzip.llb/ZLIB Read Local Extra Data__ogtk.vi -File 71=lvzip.llb/ZLIB Store File__ogtk.vi -File 72=lvzip.llb/ZLIB Store Stream__ogtk.vi -File 73=lvzip.llb/ZLIB Store__ogtk.vi -File 74=lvzip.llb/ZLIB Transfer Raw File__ogtk.vi -File 75=lvzip.llb/ZLIB Uncompress File Info__ogtk.ctl -File 76=lvzip.llb/ZLIB Unzip Handle__ogtk.ctl -File 77=lvzip.llb/ZLIB VI Tree__ogtk.vi -File 78=lvzip.llb/ZLIB Write File__ogtk.vi -File 79=lvzip.llb/ZLIB Write Stream__ogtk.vi -File 80=lvzip.llb/ZLIB Zip Handle__ogtk.ctl +File 28=lvzip.llb/ZLIB Common Path to Specific Path__ogtk.vi +File 29=lvzip.llb/ZLIB Compress Directory__ogtk.vi +File 30=lvzip.llb/ZLIB Compress File Info__ogtk.ctl +File 31=lvzip.llb/ZLIB Compress Files__ogtk.vi +File 32=lvzip.llb/ZLIB Convert File Info__ogtk.vi +File 33=lvzip.llb/ZLIB Copy Raw File__ogtk.vi +File 34=lvzip.llb/ZLIB CRC32__ogtk.vi +File 35=lvzip.llb/ZLIB Deflate__ogtk.vi +File 36=lvzip.llb/ZLIB Delete Files From Archive__ogtk.vi +File 37=lvzip.llb/ZLIB Enumerate File Contents Old__ogtk.vi +File 38=lvzip.llb/ZLIB Enumerate File Contents__ogtk.vi +File 39=lvzip.llb/ZLIB Extract All Files To Dir__ogtk.vi +File 40=lvzip.llb/ZLIB Extract File__ogtk.vi +File 41=lvzip.llb/ZLIB Extract Stream__ogtk.vi +File 42=lvzip.llb/ZLIB Extract__ogtk.vi +File 43=lvzip.llb/ZLIB File Info Old__ogtk.ctl +File 44=lvzip.llb/ZLIB File Info__ogtk.ctl +File 45=lvzip.llb/ZLIB File Information__ogtk.vi +File 46=lvzip.llb/ZLIB Get Current File Info Old__ogtk.vi +File 47=lvzip.llb/ZLIB Get Current File Info__ogtk.vi +File 48=lvzip.llb/ZLIB Get File CRC32__ogtk.vi +File 49=lvzip.llb/ZLIB Get File__ogtk.vi +File 50=lvzip.llb/ZLIB Get Global Info__ogtk.vi +File 51=lvzip.llb/ZLIB Get Version__ogtk.vi +File 52=lvzip.llb/ZLIB Go To First File__ogtk.vi +File 53=lvzip.llb/ZLIB Go To Next File__ogtk.vi +File 54=lvzip.llb/ZLIB Inflate__ogtk.vi +File 55=lvzip.llb/ZLIB Initialize File Functions__ogtk.vi +File 56=lvzip.llb/ZLIB Initialize Stream Functions__ogtk.vi +File 57=lvzip.llb/ZLIB Locate File__ogtk.vi +File 58=lvzip.llb/ZLIB Move Raw File__ogtk.vi +File 59=lvzip.llb/ZLIB Open Read File__ogtk.vi +File 60=lvzip.llb/ZLIB Open Unzip Archive__ogtk.vi +File 61=lvzip.llb/ZLIB Open Unzip Stream__ogtk.vi +File 62=lvzip.llb/ZLIB Open Unzip__ogtk.vi +File 63=lvzip.llb/ZLIB Open Write File__ogtk.vi +File 64=lvzip.llb/ZLIB Open Zip Archive__ogtk.vi +File 65=lvzip.llb/ZLIB Open ZIP Mode__ogtk.ctl +File 66=lvzip.llb/ZLIB Open Zip Stream__ogtk.vi +File 67=lvzip.llb/ZLIB Open Zip__ogtk.vi +File 68=lvzip.llb/ZLIB Path to Path String__ogtk.vi +File 69=lvzip.llb/ZLIB Read Compressed File__ogtk.vi +File 70=lvzip.llb/ZLIB Read Compressed Stream__ogtk.vi +File 71=lvzip.llb/ZLIB Read Local Extra Data__ogtk.vi +File 72=lvzip.llb/ZLIB Specific Path to Common Path__ogtk.vi +File 73=lvzip.llb/ZLIB Store File__ogtk.vi +File 74=lvzip.llb/ZLIB Store Stream__ogtk.vi +File 75=lvzip.llb/ZLIB Store__ogtk.vi +File 76=lvzip.llb/ZLIB Transfer Raw File__ogtk.vi +File 77=lvzip.llb/ZLIB Uncompress File Info__ogtk.ctl +File 78=lvzip.llb/ZLIB Unzip Handle__ogtk.ctl +File 79=lvzip.llb/ZLIB VI Tree__ogtk.vi +File 80=lvzip.llb/ZLIB Write File__ogtk.vi +File 81=lvzip.llb/ZLIB Write Stream__ogtk.vi +File 82=lvzip.llb/ZLIB Zip Handle__ogtk.ctl [File Group 1] Source Dir=built/lvzip Modified: trunk/lvzip/source/opengdoc.txt =================================================================== --- trunk/lvzip/source/opengdoc.txt 2009-09-02 20:51:44 UTC (rev 996) +++ trunk/lvzip/source/opengdoc.txt 2009-09-02 20:52:49 UTC (rev 997) @@ -40,4 +40,4 @@ Copyright (C) 1995-2004 Mark Adler, Jean-loup Gailly Copyright (C) 1998-2004 Gilles Vollant -Copyright (C) 2002-2007 Rolf Kalbermatter, Jim Kring, Christoph Salzmann +Copyright (C) 2002-2009 Rolf Kalbermatter, Jim Kring, Christoph Salzmann This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2009-09-02 20:54:13
|
Revision: 998 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=998&view=rev Author: labviewer Date: 2009-09-02 20:54:04 +0000 (Wed, 02 Sep 2009) Log Message: ----------- Updated test files and added a new test for deleting files from an archive Modified Paths: -------------- trunk/lvzip/build lvzip.vi trunk/lvzip/build_support/Pre-Post Build (testing).vi trunk/lvzip/tests/lvzip-test add to empty archive.vi trunk/lvzip/tests/lvzip-test-delete files from archive.vi trunk/lvzip/tests/lvzip-test-lg bin files.vi trunk/lvzip/tests/lvzip-test-memory stream.vi trunk/lvzip/tests/lvzip-test-sm text files.vi trunk/lvzip/tests/lvzip-test-string compress.vi Modified: trunk/lvzip/build lvzip.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/build_support/Pre-Post Build (testing).vi =================================================================== (Binary files differ) Modified: trunk/lvzip/tests/lvzip-test add to empty archive.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/tests/lvzip-test-delete files from archive.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/tests/lvzip-test-lg bin files.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/tests/lvzip-test-memory stream.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/tests/lvzip-test-sm text files.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/tests/lvzip-test-string compress.vi =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2009-09-03 07:28:56
|
Revision: 1001 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1001&view=rev Author: labviewer Date: 2009-09-03 07:28:49 +0000 (Thu, 03 Sep 2009) Log Message: ----------- Added a comment about what release 2.3.2 was Modified Paths: -------------- trunk/lvzip/PreInstall.vi trunk/lvzip/source/readme.txt Modified: trunk/lvzip/PreInstall.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/readme.txt =================================================================== --- trunk/lvzip/source/readme.txt 2009-09-02 21:21:04 UTC (rev 1000) +++ trunk/lvzip/source/readme.txt 2009-09-03 07:28:49 UTC (rev 1001) @@ -78,7 +78,11 @@ Release 2.3.2, Released: Feb. 6, 2007 ===================================== +Bug fix: +-------- +1) changed incorrect dependency on dynamicpalette to >= 0.2 + Release 2.3.1, Released: Sep. 23, 2006 ====================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jk...@us...> - 2009-09-05 19:14:08
|
Revision: 1003 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1003&view=rev Author: jkring Date: 2009-09-05 19:14:02 +0000 (Sat, 05 Sep 2009) Log Message: ----------- changed version to 2.5.1-1 and updated package description to reflect changes Modified Paths: -------------- trunk/lvzip/build_support/lvzip.rev trunk/lvzip/lvzip.ogpb trunk/lvzip/lvzip.spec Modified: trunk/lvzip/build_support/lvzip.rev =================================================================== --- trunk/lvzip/build_support/lvzip.rev 2009-09-05 18:55:40 UTC (rev 1002) +++ trunk/lvzip/build_support/lvzip.rev 2009-09-05 19:14:02 UTC (rev 1003) @@ -1,8 +1,8 @@ [lvzip.ogbld] Version=2.5.2 -Build_Number=30 -Build_Date="9/2/2009 9:48:00 PM" +Build_Number=34 +Build_Date="9/5/2009 12:09:58 PM" Status=OK -Warnings=0 -Log_File="/C/Work/OpenG/OpenG SVN/lvzip/built/lvzip.log" +Warnings=1 +Log_File=/D/Projects/OpenG/opengtoolkit/SVN_Folders/lvzip/built/lvzip.log Modified: trunk/lvzip/lvzip.ogpb =================================================================== --- trunk/lvzip/lvzip.ogpb 2009-09-05 18:55:40 UTC (rev 1002) +++ trunk/lvzip/lvzip.ogpb 2009-09-05 19:14:02 UTC (rev 1003) @@ -1,10 +1,10 @@ [Package Name] Name=oglib_lvzip -Version=2.5 -Release=2 +Version=2.5.1 +Release=1 [Description] -Description="The lvzip package contains several routines for operating on zip files.\0D\0A\0D\0AVersion 2.5: Changes license of LabVIEW sources from LGPL to BSD, Adds Memory Stream VIs to the palettes, Optimizes ZLIB Extract All Files to Dir, Fixes potential problem where error such as out of disk on finishing to add a file into an archive might get lost meaning that a corrupted archive could result without the user being informed about it, Fixes issue preventing adding files specified by UNC network path to zip archive.\0D\0AVersion 2.4 adds support for direct memory stream handling.\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files." +Description="The lvzip package contains several routines for operating on zip files.\0D\0A\0D\0AVersion 2.5.1: Fixes issue with broken VIs in LabVIEW 2009 due to calling (now) private config utilities.\0D\0AVersion 2.5: Changes license of LabVIEW sources from LGPL to BSD, Adds Memory Stream VIs to the palettes, Optimizes ZLIB Extract All Files to Dir, Fixes potential problem where error such as out of disk on finishing to add a file into an archive might get lost meaning that a corrupted archive could result without the user being informed about it, Fixes issue preventing adding files specified by UNC network path to zip archive.\0D\0AVersion 2.4 adds support for direct memory stream handling.\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files." Summary="OpenG Zip Tools" License="BSD (VIs), LGPL (Shared Library)" Modified: trunk/lvzip/lvzip.spec =================================================================== --- trunk/lvzip/lvzip.spec 2009-09-05 18:55:40 UTC (rev 1002) +++ trunk/lvzip/lvzip.spec 2009-09-05 19:14:02 UTC (rev 1003) @@ -1,13 +1,14 @@ [Package Name] Name=oglib_lvzip -Version=2.5 -Release=2 +Version=2.5.1 +Release=1 [Description] -Description="The lvzip package contains several routines for operating on zip files.\0D\0A\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files.\0D\0A\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.4 adds support for direct memory stream handling." +Description="The lvzip package contains several routines for operating on zip files.\0D\0A\0D\0AVersion 2.5.1: Fixes issue with broken VIs in LabVIEW 2009 due to calling (now) private config utilities.\0D\0AVersion 2.5: Changes license of LabVIEW sources from LGPL to BSD, Adds Memory Stream VIs to the palettes, Optimizes ZLIB Extract All Files to Dir, Fixes potential problem where error such as out of disk on finishing to add a file into an archive might get lost meaning that a corrupted archive could result without the user being informed about it, Fixes issue preventing adding files specified by UNC network path to zip archive.\0D\0AVersion 2.4 adds support for direct memory stream handling.\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files." + Summary="OpenG Zip Tools" -License=LGPL -Copyright="1995-2005 Mark Adler, Jean-loup Gailly\0A1998-2005 Gilles Vollant\0A2002 - 2009 Christophe Salzmann, Jim Kring, Rolf Kalbermatter" +License="BSD (VIs), LGPL (Shared Library)" +Copyright="1995-2004 Mark Adler, Jean-loup Gailly\0A1998-2004 Gilles Vollant\0A2002 - 2009 Christophe Salzmann, Jim Kring, Rolf Kalbermatter" Distribution="OpenG Toolkit" Icon=lvzip.bmp Vendor=OpenG.org This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jk...@us...> - 2009-09-16 03:47:27
|
Revision: 1006 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1006&view=rev Author: jkring Date: 2009-09-16 03:47:16 +0000 (Wed, 16 Sep 2009) Log Message: ----------- changed latest VxWorks file to state compatibility with LV >= 8.5 Modified Paths: -------------- trunk/lvzip/lvzip.ogpb trunk/lvzip/lvzip.spec Modified: trunk/lvzip/lvzip.ogpb =================================================================== --- trunk/lvzip/lvzip.ogpb 2009-09-16 03:42:43 UTC (rev 1005) +++ trunk/lvzip/lvzip.ogpb 2009-09-16 03:47:16 UTC (rev 1006) @@ -95,7 +95,7 @@ [File Group 7] Source Dir=built/lvzip/vxWorks85 Target Dir=<OpenG.lib>/lvzip -Exclusive_LabVIEW_Version=8.5,8.6,9.0 +Exclusive_LabVIEW_Version=>=8.5 Num Files=1 File 0=lvzlib.out Modified: trunk/lvzip/lvzip.spec =================================================================== --- trunk/lvzip/lvzip.spec 2009-09-16 03:42:43 UTC (rev 1005) +++ trunk/lvzip/lvzip.spec 2009-09-16 03:47:16 UTC (rev 1006) @@ -156,7 +156,7 @@ [File Group 5] Source Dir=built/lvzip/vxWorks85 Target Dir=<OpenG.lib>/lvzip -Exclusive_LabVIEW_Version=8.5,8.6 +Exclusive_LabVIEW_Version=>=8.5 Num Files=1 File 0=lvzlib.out This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2010-06-16 20:55:47
|
Revision: 1050 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1050&view=rev Author: labviewer Date: 2010-06-16 20:55:40 +0000 (Wed, 16 Jun 2010) Log Message: ----------- Incorporated zlib 1.2.5 and minizip 1.1 Modified Paths: -------------- trunk/lvzip/c_source/ioapi.c trunk/lvzip/c_source/ioapi.h trunk/lvzip/c_source/iomem.h trunk/lvzip/c_source/lvutil.c trunk/lvzip/c_source/zconf.h trunk/lvzip/c_source/zlibvc.dsp trunk/lvzip/source/lvzlib.dll Added Paths: ----------- trunk/lvzip/c_source/Makefile.x64 Removed Paths: ------------- trunk/lvzip/c_source/iowin32.c trunk/lvzip/c_source/iowin32.h Added: trunk/lvzip/c_source/Makefile.x64 =================================================================== --- trunk/lvzip/c_source/Makefile.x64 (rev 0) +++ trunk/lvzip/c_source/Makefile.x64 2010-06-16 20:55:40 UTC (rev 1050) @@ -0,0 +1,63 @@ +# Nmake macros for building makefile +!include <win32.mak> + +PROJ = LVZLIB + +all: $(OUTDIR) $(OUTDIR)\lvzlib.dll + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +#--------------------------------------------------------------------# + +SOURCES=adler32.c \ + compress.c \ + crc32.c \ + uncompr.c \ + deflate.c \ + trees.c \ + zutil.c \ + inflate.c \ + infback.c \ + inftrees.c \ + inffast.c \ + ioapi.c \ + iowin.c \ + iomem.c \ + lvutil.c \ + zip.c \ + unzip.c + +OBJS=$(OUTDIR)\adler32.obj \ + $(OUTDIR)\compress.obj \ + $(OUTDIR)\crc32.obj \ + $(OUTDIR)\uncompr.obj \ + $(OUTDIR)\deflate.obj \ + $(OUTDIR)\trees.obj \ + $(OUTDIR)\zutil.obj \ + $(OUTDIR)\inflate.obj \ + $(OUTDIR)\infback.obj \ + $(OUTDIR)\inftrees.obj \ + $(OUTDIR)\inffast.obj \ + $(OUTDIR)\ioapi.obj \ + $(OUTDIR)\iowin.obj \ + $(OUTDIR)\iomem.obj \ + $(OUTDIR)\lvutil.obj \ + $(OUTDIR)\zip.obj \ + $(OUTDIR)\unzip.obj + +ELIBS=user32.lib kernel32.lib + +# Build rules for resource files + +$(OUTDIR)\lvzlib.res: zlib.rc + $(rc) $(rcflags) $(rcvars) /fo $(OUTDIR)\lvzlib.res zlib.rc + +.c{$(OUTDIR)}.obj: + $(cc) $(cdebug) $(cflags) $(cvarsdll) /Fp"$(OUTDIR)\\" /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" $** + +$(OUTDIR)\lvzlib.dll: $(OBJS) $(OUTDIR)\lvzlib.res + $(link) $(ldebug) $(dlllflags) $(conlibsdll) /MACHINE:$(CPU) -out:$(OUTDIR)\lvzlib.dll $(OBJS) $(ELIBS) /PDB:$(OUTDIR)\$(PROJ).PDB $(OUTDIR)\lvzlib.res + +clean: + $(CLEANUP) \ No newline at end of file Modified: trunk/lvzip/c_source/ioapi.c =================================================================== --- trunk/lvzip/c_source/ioapi.c 2010-06-16 15:07:29 UTC (rev 1049) +++ trunk/lvzip/c_source/ioapi.c 2010-06-16 20:55:40 UTC (rev 1050) @@ -11,9 +11,9 @@ */ #if (defined(_WIN32)) - #define _CRT_SECURE_NO_WARNINGS + #define _CRT_SECURE_NO_WARNINGS #endif - +#define USE_FILE32API #include "ioapi.h" voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode) Modified: trunk/lvzip/c_source/ioapi.h =================================================================== --- trunk/lvzip/c_source/ioapi.h 2010-06-16 15:07:29 UTC (rev 1049) +++ trunk/lvzip/c_source/ioapi.h 2010-06-16 20:55:40 UTC (rev 1050) @@ -22,7 +22,6 @@ #define _ZLIBIOAPI64_H #if (!defined(_WIN32)) && (!defined(WIN32)) - // Linux needs this to support file operation on files larger then 4+GB // But might need better if/def to select just the platforms that needs them. Modified: trunk/lvzip/c_source/iomem.h =================================================================== --- trunk/lvzip/c_source/iomem.h 2010-06-16 15:07:29 UTC (rev 1049) +++ trunk/lvzip/c_source/iomem.h 2010-06-16 20:55:40 UTC (rev 1050) @@ -1,10 +1,5 @@ -/* iowin32.h -- IO base function header for compress/uncompress .zip +/* iomem.h -- IO base function header for compress/uncompress .zip files using zlib + zip or unzip API - This IO API version uses the Win32 API (for Microsoft Windows) - - Version 1.01e, February 12th, 2005 - - Copyright (C) 1998-2005 Gilles Vollant */ #include <stdlib.h> Deleted: trunk/lvzip/c_source/iowin32.c =================================================================== --- trunk/lvzip/c_source/iowin32.c 2010-06-16 15:07:29 UTC (rev 1049) +++ trunk/lvzip/c_source/iowin32.c 2010-06-16 20:55:40 UTC (rev 1050) @@ -1,389 +0,0 @@ -/* iowin32.c -- IO base function header for compress/uncompress .zip - Version 1.1, February 14h, 2010 - part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) - - Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) - - Modifications for Zip64 support - Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) - - For more info read MiniZip_info.txt - -*/ - -#include <stdlib.h> - -#include "zlib.h" -#include "ioapi.h" -#include "iowin32.h" - -#ifndef INVALID_HANDLE_VALUE -#define INVALID_HANDLE_VALUE (0xFFFFFFFF) -#endif - -#ifndef INVALID_SET_FILE_POINTER -#define INVALID_SET_FILE_POINTER ((DWORD)-1) -#endif - -voidpf ZCALLBACK win32_open_file_func OF((voidpf opaque, const char* filename, int mode)); -uLong ZCALLBACK win32_read_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size)); -uLong ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); -ZPOS64_T ZCALLBACK win32_tell64_file_func OF((voidpf opaque, voidpf stream)); -long ZCALLBACK win32_seek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)); -int ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream,voidpf output)); -int ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream)); - -typedef struct -{ - HANDLE hf; - int error; -} WIN32FILE_IOWIN; - - -static void win32_translate_open_mode(int mode, - DWORD* lpdwDesiredAccess, - DWORD* lpdwCreationDisposition, - DWORD* lpdwShareMode, - DWORD* lpdwFlagsAndAttributes) -{ - *lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0; - - if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) - { - *lpdwDesiredAccess = GENERIC_READ; - *lpdwCreationDisposition = OPEN_EXISTING; - *lpdwShareMode = FILE_SHARE_READ; - } - else if (mode & ZLIB_FILEFUNC_MODE_EXISTING) - { - *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ; - *lpdwCreationDisposition = OPEN_EXISTING; - } - else if (mode & ZLIB_FILEFUNC_MODE_CREATE) - { - *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ; - *lpdwCreationDisposition = CREATE_ALWAYS; - } -} - -static voidpf win32_build_iowin(HANDLE hFile) -{ - voidpf ret=NULL; - - if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE)) - { - WIN32FILE_IOWIN w32fiow; - w32fiow.hf = hFile; - w32fiow.error = 0; - ret = malloc(sizeof(WIN32FILE_IOWIN)); - - if (ret==NULL) - CloseHandle(hFile); - else - *((WIN32FILE_IOWIN*)ret) = w32fiow; - } - return ret; -} - -voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int mode) -{ - const char* mode_fopen = NULL; - DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; - HANDLE hFile = NULL; - - win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); - - if ((filename!=NULL) && (dwDesiredAccess != 0)) - hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); - - return win32_build_iowin(hFile); -} - - -voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int mode) -{ - const char* mode_fopen = NULL; - DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; - HANDLE hFile = NULL; - - win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); - - if ((filename!=NULL) && (dwDesiredAccess != 0)) - hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); - - return win32_build_iowin(hFile); -} - - -voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int mode) -{ - const char* mode_fopen = NULL; - DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; - HANDLE hFile = NULL; - - win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); - - if ((filename!=NULL) && (dwDesiredAccess != 0)) - hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); - - return win32_build_iowin(hFile); -} - - -voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mode) -{ - const char* mode_fopen = NULL; - DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; - HANDLE hFile = NULL; - - win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); - - if ((filename!=NULL) && (dwDesiredAccess != 0)) - hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); - - return win32_build_iowin(hFile); -} - - -uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uLong size) -{ - uLong ret=0; - HANDLE hFile = NULL; - if (stream!=NULL) - hFile = ((WIN32FILE_IOWIN*)stream) -> hf; - - if (hFile != NULL) - { - if (!ReadFile(hFile, buf, size, &ret, NULL)) - { - DWORD dwErr = GetLastError(); - if (dwErr == ERROR_HANDLE_EOF) - dwErr = 0; - ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; - } - } - - return ret; -} - - -uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size) -{ - uLong ret=0; - HANDLE hFile = NULL; - if (stream!=NULL) - hFile = ((WIN32FILE_IOWIN*)stream) -> hf; - - if (hFile != NULL) - { - if (!WriteFile(hFile, buf, size, &ret, NULL)) - { - DWORD dwErr = GetLastError(); - if (dwErr == ERROR_HANDLE_EOF) - dwErr = 0; - ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; - } - } - - return ret; -} - -long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream) -{ - long ret=-1; - HANDLE hFile = NULL; - if (stream!=NULL) - hFile = ((WIN32FILE_IOWIN*)stream) -> hf; - if (hFile != NULL) - { - DWORD dwSet = SetFilePointer(hFile, 0, NULL, FILE_CURRENT); - if (dwSet == INVALID_SET_FILE_POINTER) - { - DWORD dwErr = GetLastError(); - ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; - ret = -1; - } - else - ret=(long)dwSet; - } - return ret; -} - -ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream) -{ - ZPOS64_T ret= (ZPOS64_T)-1; - HANDLE hFile = NULL; - if (stream!=NULL) - hFile = ((WIN32FILE_IOWIN*)stream)->hf; - - if (hFile) - { - LARGE_INTEGER li; - li.QuadPart = 0; - li.u.LowPart = SetFilePointer(hFile, li.u.LowPart, &li.u.HighPart, FILE_CURRENT); - if ( (li.LowPart == 0xFFFFFFFF) && (GetLastError() != NO_ERROR)) - { - DWORD dwErr = GetLastError(); - ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; - ret = (ZPOS64_T)-1; - } - else - ret=li.QuadPart; - } - return ret; -} - - -long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,int origin) -{ - DWORD dwMoveMethod=0xFFFFFFFF; - HANDLE hFile = NULL; - - long ret=-1; - if (stream!=NULL) - hFile = ((WIN32FILE_IOWIN*)stream) -> hf; - switch (origin) - { - case ZLIB_FILEFUNC_SEEK_CUR : - dwMoveMethod = FILE_CURRENT; - break; - case ZLIB_FILEFUNC_SEEK_END : - dwMoveMethod = FILE_END; - break; - case ZLIB_FILEFUNC_SEEK_SET : - dwMoveMethod = FILE_BEGIN; - break; - default: return -1; - } - - if (hFile != NULL) - { - DWORD dwSet = SetFilePointer(hFile, offset, NULL, dwMoveMethod); - if (dwSet == INVALID_SET_FILE_POINTER) - { - DWORD dwErr = GetLastError(); - ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; - ret = -1; - } - else - ret=0; - } - return ret; -} - -long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin) -{ - DWORD dwMoveMethod=0xFFFFFFFF; - HANDLE hFile = NULL; - long ret=-1; - - if (stream!=NULL) - hFile = ((WIN32FILE_IOWIN*)stream)->hf; - - switch (origin) - { - case ZLIB_FILEFUNC_SEEK_CUR : - dwMoveMethod = FILE_CURRENT; - break; - case ZLIB_FILEFUNC_SEEK_END : - dwMoveMethod = FILE_END; - break; - case ZLIB_FILEFUNC_SEEK_SET : - dwMoveMethod = FILE_BEGIN; - break; - default: return -1; - } - - if (hFile) - { - LARGE_INTEGER* li = (LARGE_INTEGER*)&offset; - DWORD dwSet = SetFilePointer(hFile, li->u.LowPart, &li->u.HighPart, dwMoveMethod); - if (dwSet == INVALID_SET_FILE_POINTER) - { - DWORD dwErr = GetLastError(); - ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; - ret = -1; - } - else - ret=0; - } - return ret; -} - -int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream, voidpf output) -{ - int ret=-1; - - if (stream!=NULL) - { - HANDLE hFile; - hFile = ((WIN32FILE_IOWIN*)stream) -> hf; - if (hFile != NULL) - { - CloseHandle(hFile); - ret=0; - } - free(stream); - } - return ret; -} - -int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream) -{ - int ret=-1; - if (stream!=NULL) - { - ret = ((WIN32FILE_IOWIN*)stream) -> error; - } - return ret; -} - -void fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def) -{ - pzlib_filefunc_def->zopen_file = win32_open_file_func; - pzlib_filefunc_def->zread_file = win32_read_file_func; - pzlib_filefunc_def->zwrite_file = win32_write_file_func; - pzlib_filefunc_def->ztell_file = win32_tell_file_func; - pzlib_filefunc_def->zseek_file = win32_seek_file_func; - pzlib_filefunc_def->zclose_file = win32_close_file_func; - pzlib_filefunc_def->zerror_file = win32_error_file_func; - pzlib_filefunc_def->opaque = NULL; -} - -void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def) -{ - pzlib_filefunc_def->zopen64_file = win32_open64_file_func; - pzlib_filefunc_def->zread_file = win32_read_file_func; - pzlib_filefunc_def->zwrite_file = win32_write_file_func; - pzlib_filefunc_def->ztell64_file = win32_tell64_file_func; - pzlib_filefunc_def->zseek64_file = win32_seek64_file_func; - pzlib_filefunc_def->zclose_file = win32_close_file_func; - pzlib_filefunc_def->zerror_file = win32_error_file_func; - pzlib_filefunc_def->opaque = NULL; -} - - -void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def) -{ - pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA; - pzlib_filefunc_def->zread_file = win32_read_file_func; - pzlib_filefunc_def->zwrite_file = win32_write_file_func; - pzlib_filefunc_def->ztell64_file = win32_tell64_file_func; - pzlib_filefunc_def->zseek64_file = win32_seek64_file_func; - pzlib_filefunc_def->zclose_file = win32_close_file_func; - pzlib_filefunc_def->zerror_file = win32_error_file_func; - pzlib_filefunc_def->opaque = NULL; -} - - -void fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def) -{ - pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW; - pzlib_filefunc_def->zread_file = win32_read_file_func; - pzlib_filefunc_def->zwrite_file = win32_write_file_func; - pzlib_filefunc_def->ztell64_file = win32_tell64_file_func; - pzlib_filefunc_def->zseek64_file = win32_seek64_file_func; - pzlib_filefunc_def->zclose_file = win32_close_file_func; - pzlib_filefunc_def->zerror_file = win32_error_file_func; - pzlib_filefunc_def->opaque = NULL; -} Deleted: trunk/lvzip/c_source/iowin32.h =================================================================== --- trunk/lvzip/c_source/iowin32.h 2010-06-16 15:07:29 UTC (rev 1049) +++ trunk/lvzip/c_source/iowin32.h 2010-06-16 20:55:40 UTC (rev 1050) @@ -1,28 +0,0 @@ -/* iowin32.h -- IO base function header for compress/uncompress .zip - Version 1.1, February 14h, 2010 - part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) - - Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) - - Modifications for Zip64 support - Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) - - For more info read MiniZip_info.txt - -*/ - -#include <windows.h> - - -#ifdef __cplusplus -extern "C" { -#endif - -void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); -void fill_win32_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def)); -void fill_win32_filefunc64A OF((zlib_filefunc64_def* pzlib_filefunc_def)); -void fill_win32_filefunc64W OF((zlib_filefunc64_def* pzlib_filefunc_def)); - -#ifdef __cplusplus -} -#endif Modified: trunk/lvzip/c_source/lvutil.c =================================================================== --- trunk/lvzip/c_source/lvutil.c 2010-06-16 15:07:29 UTC (rev 1049) +++ trunk/lvzip/c_source/lvutil.c 2010-06-16 20:55:40 UTC (rev 1050) @@ -32,7 +32,7 @@ #include <fcntl.h> #include <dirent.h> #elif Win32 -#include "iowin32.h" +#include "iowin.h" #ifndef INVALID_FILE_ATTRIBUTES #define INVALID_FILE_ATTRIBUTES ((DWORD)-1) #endif @@ -481,7 +481,7 @@ extern void ZEXPORT DLLVersion(uChar* version) { - sprintf(version, "lvzlib date: %s, time: %s",__DATE__,__TIME__); + sprintf((char*)version, "lvzlib date: %s, time: %s",__DATE__,__TIME__); } extern MgErr ZEXPORT LVPath_HasResourceFork(Path path, int32 *hasResFork) @@ -696,7 +696,7 @@ while (attempts) { - ioRefNum = CreateFile(lstr->str, openAcc, shareAcc, 0, createMode, + ioRefNum = CreateFile((LPCSTR)lstr->str, openAcc, shareAcc, 0, createMode, FILE_ATTRIBUTE_NORMAL, 0); if (ioRefNum == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION) { @@ -944,12 +944,12 @@ } else { - handle = FindFirstFileA(lstr->str, &fi); + handle = FindFirstFileA((LPCSTR)lstr->str, &fi); if (handle == INVALID_HANDLE_VALUE) err = Win32ToLVFileErr(); else { - *isDirectory = ((fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0); + *isDirectory = ((fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? 1 : 0); if (!FindClose(handle)) err = Win32ToLVFileErr(); } @@ -963,14 +963,14 @@ Win32ConvertFromLVTime(fileInfo->mDate, &fi.ftLastWriteTime); if (!SetFileTime(handle, &fi.ftCreationTime, &fi.ftLastAccessTime, &fi.ftLastWriteTime)) err = Win32ToLVFileErr(); - fi.dwFileAttributes = GetFileAttributesA(lstr->str); + fi.dwFileAttributes = GetFileAttributesA((LPCSTR)lstr->str); if (fi.dwFileAttributes != INVALID_FILE_ATTRIBUTES) { if (fileInfo->flags & 0x4000) fi.dwFileAttributes |= FILE_ATTRIBUTE_HIDDEN; else fi.dwFileAttributes &= ~FILE_ATTRIBUTE_HIDDEN; - SetFileAttributesA(lstr->str, fi.dwFileAttributes); + SetFileAttributesA((LPCSTR)lstr->str, fi.dwFileAttributes); } } else @@ -997,7 +997,7 @@ if (!err) { - handle = FindFirstFileA(lstr->str, &fi); + handle = FindFirstFileA((LPCSTR)lstr->str, &fi); if (handle == INVALID_HANDLE_VALUE) count = 0; else Modified: trunk/lvzip/c_source/zconf.h =================================================================== --- trunk/lvzip/c_source/zconf.h 2010-06-16 15:07:29 UTC (rev 1049) +++ trunk/lvzip/c_source/zconf.h 2010-06-16 20:55:40 UTC (rev 1050) @@ -7,7 +7,8 @@ #ifndef ZCONF_H #define ZCONF_H - + +#pragma warning(disable:4131) /* * If you *really* need a unique prefix for all types and library functions, * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. Modified: trunk/lvzip/c_source/zlibvc.dsp =================================================================== --- trunk/lvzip/c_source/zlibvc.dsp 2010-06-16 15:07:29 UTC (rev 1049) +++ trunk/lvzip/c_source/zlibvc.dsp 2010-06-16 20:55:40 UTC (rev 1050) @@ -336,7 +336,7 @@ # End Source File # Begin Source File -SOURCE=.\iowin32.c +SOURCE=.\iowin.c # End Source File # Begin Source File @@ -413,7 +413,7 @@ # End Source File # Begin Source File -SOURCE=.\iowin32.h +SOURCE=.\iowin.h # End Source File # Begin Source File Modified: trunk/lvzip/source/lvzlib.dll =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2010-06-16 23:32:09
|
Revision: 1052 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1052&view=rev Author: labviewer Date: 2010-06-16 23:32:03 +0000 (Wed, 16 Jun 2010) Log Message: ----------- modifications for 64 bit support Modified Paths: -------------- trunk/lvzip/c_source/Makefile.x64 trunk/lvzip/source/readme.txt Modified: trunk/lvzip/c_source/Makefile.x64 =================================================================== --- trunk/lvzip/c_source/Makefile.x64 2010-06-16 20:56:45 UTC (rev 1051) +++ trunk/lvzip/c_source/Makefile.x64 2010-06-16 23:32:03 UTC (rev 1052) @@ -46,7 +46,7 @@ $(OUTDIR)\zip.obj \ $(OUTDIR)\unzip.obj -ELIBS=user32.lib kernel32.lib +ELIBS=user32.lib kernel32.lib labview.lib # Build rules for resource files Modified: trunk/lvzip/source/readme.txt =================================================================== --- trunk/lvzip/source/readme.txt 2010-06-16 20:56:45 UTC (rev 1051) +++ trunk/lvzip/source/readme.txt 2010-06-16 23:32:03 UTC (rev 1052) @@ -11,6 +11,19 @@ in comparison to earlier versions which might require you to slightly redo your project. +Release 2.6.1, Released: Jun. xx, 2010 +====================================== + +New features: +------------- +1) Upgraded to zlib 1.2.5 and minizip 1.1 sources +2) Support for ZIP64 Archives (>4GB) (an individual file inside the archive still + needs to be smaller than 4GB when getting added or extracted and memory stream + based retrieval is limited to < 2GB large archives due to LabVIEWs 2GB limit for + string handles) +3) Support for LabVIEW for 64 Bit + + Release 2.5.2, Released: Sep. 3, 2009 ===================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2010-07-01 02:54:30
|
Revision: 1054 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1054&view=rev Author: labviewer Date: 2010-07-01 02:54:21 +0000 (Thu, 01 Jul 2010) Log Message: ----------- Modified Paths: -------------- trunk/lvzip/c_source/Makefile.x64 trunk/lvzip/c_source/zlibvc.dsp trunk/lvzip/source/Win64/lvzlib.dll Added Paths: ----------- trunk/lvzip/c_source/lvzlib.def Modified: trunk/lvzip/c_source/Makefile.x64 =================================================================== --- trunk/lvzip/c_source/Makefile.x64 2010-06-16 23:33:16 UTC (rev 1053) +++ trunk/lvzip/c_source/Makefile.x64 2010-07-01 02:54:21 UTC (rev 1054) @@ -25,6 +25,7 @@ iowin.c \ iomem.c \ lvutil.c \ + mztools.c \ zip.c \ unzip.c @@ -43,21 +44,34 @@ $(OUTDIR)\iowin.obj \ $(OUTDIR)\iomem.obj \ $(OUTDIR)\lvutil.obj \ + $(OUTDIR)\mztools.obj \ $(OUTDIR)\zip.obj \ $(OUTDIR)\unzip.obj ELIBS=user32.lib kernel32.lib labview.lib # Build rules for resource files - + +# Update the resources + $(OUTDIR)\lvzlib.res: zlib.rc $(rc) $(rcflags) $(rcvars) /fo $(OUTDIR)\lvzlib.res zlib.rc +# Compile the sources + .c{$(OUTDIR)}.obj: $(cc) $(cdebug) $(cflags) $(cvarsdll) /Fp"$(OUTDIR)\\" /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" $** -$(OUTDIR)\lvzlib.dll: $(OBJS) $(OUTDIR)\lvzlib.res - $(link) $(ldebug) $(dlllflags) $(conlibsdll) /MACHINE:$(CPU) -out:$(OUTDIR)\lvzlib.dll $(OBJS) $(ELIBS) /PDB:$(OUTDIR)\$(PROJ).PDB $(OUTDIR)\lvzlib.res +# Update the import library +$(OUTDIR)\lvzlib.exp: $(OBJS) lvzlib.def + $(implib) -machine:$(CPU) -def:lvzlib.def -out:$(OUTDIR)\lvzlib.lib $(OBJS) + +# Update the dynamic link library + +$(OUTDIR)\lvzlib.dll: $(OBJS) $(OUTDIR)\lvzlib.res $(OUTDIR)\lvzlib.exp lvzlib.def + $(link) $(ldebug) $(dlllflags) $(conlibsdll) /MACHINE:$(CPU) -out:$(OUTDIR)\lvzlib.dll \ + $(OBJS) $(ELIBS) $(OUTDIR)\lvzlib.exp $(OUTDIR)\lvzlib.res + clean: $(CLEANUP) \ No newline at end of file Added: trunk/lvzip/c_source/lvzlib.def =================================================================== --- trunk/lvzip/c_source/lvzlib.def (rev 0) +++ trunk/lvzip/c_source/lvzlib.def 2010-07-01 02:54:21 UTC (rev 1054) @@ -0,0 +1,64 @@ +LIBRARY "lvzlib" + +DESCRIPTION '"""LabVIEW zlib data compression library"""' + + +VERSION 1.21 + + +HEAPSIZE 1048576,8192 + +EXPORTS + DLLVersion + InitializeFileFuncs + LVPath_ToText + LVPath_UtilFileInfo + LVPath_OpenFile + LVPath_HasResourceFork + LVPath_EncodeMacbinary + LVPath_DecodeMacbinary + + lvzip_adler32 + lvzip_compress + lvzip_compress2 + lvzip_crc32 + lvzip_deflate + lvzip_inflate + lvzip_uncompress + lvzip_zlibVersion + + lvzip_unzClose + lvzip_unzCloseCurrentFile + lvzip_unzGetCurrentFileInfo + lvzip_unzGetFilePos + lvzip_unzGetGlobalComment + lvzip_unzGetGlobalInfo + lvzip_unzGetLocalExtrafield + lvzip_unzGoToFilePos + lvzip_unzGoToFirstFile + lvzip_unzGoToNextFile + lvzip_unzLocateFile + lvzip_unzOpen + lvzip_unzOpen2 + lvzip_unzOpen2_64 + lvzip_unzOpenCurrentFile + lvzip_unzOpenCurrentFile2 + lvzip_unzOpenCurrentFile3 + lvzip_unzOpenCurrentFilePassword + lvzip_unzReadCurrentFile + lvzip_unzRepair + lvzip_unzStringFileNameCompare + lvzip_unztell + lvzip_unzeof + + lvzip_zipClose + lvzip_zipClose2 + lvzip_zipCloseFileInZip + lvzip_zipCloseFileInZipRaw + lvzip_zipOpen + lvzip_zipOpen2 + lvzip_zipOpen2_64 + lvzip_zipOpenNewFileInZip + lvzip_zipOpenNewFileInZip2 + lvzip_zipOpenNewFileInZip3 + lvzip_zipWriteInFileInZip Modified: trunk/lvzip/c_source/zlibvc.dsp =================================================================== --- trunk/lvzip/c_source/zlibvc.dsp 2010-06-16 23:33:16 UTC (rev 1053) +++ trunk/lvzip/c_source/zlibvc.dsp 2010-07-01 02:54:21 UTC (rev 1054) @@ -312,23 +312,6 @@ # Begin Source File SOURCE=.\ioapi.c - -!IF "$(CFG)" == "zlibvc - Win32 DLL Release" - -!ELSEIF "$(CFG)" == "zlibvc - Win32 DLL Debug" - -!ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Release" - -!ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Debug" - -!ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Obj Release" - -!ELSEIF "$(CFG)" == "zlibvc - Win32 static ASM Release" - -!ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" - -!ENDIF - # End Source File # Begin Source File @@ -344,6 +327,10 @@ # End Source File # Begin Source File +SOURCE=.\lvzlib.def +# End Source File +# Begin Source File + SOURCE=.\MacBinaryIII.c # PROP Exclude_From_Build 1 # End Source File Modified: trunk/lvzip/source/Win64/lvzlib.dll =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jk...@us...> - 2011-04-08 00:07:48
|
Revision: 1338 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1338&view=rev Author: jkring Date: 2011-04-08 00:07:42 +0000 (Fri, 08 Apr 2011) Log Message: ----------- Version 2.5.2: Adds support for the new palette locations of OpenG 4.x packages and removes dependency on ogrsc_dynamicpalette package. Modified Paths: -------------- trunk/lvzip/lvzip.ogpb Added Paths: ----------- trunk/lvzip/Dynamic Palette MNUs/dir.mnu Added: trunk/lvzip/Dynamic Palette MNUs/dir.mnu =================================================================== (Binary files differ) Property changes on: trunk/lvzip/Dynamic Palette MNUs/dir.mnu ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/lvzip/lvzip.ogpb =================================================================== --- trunk/lvzip/lvzip.ogpb 2011-04-06 10:32:39 UTC (rev 1337) +++ trunk/lvzip/lvzip.ogpb 2011-04-08 00:07:42 UTC (rev 1338) @@ -1,10 +1,10 @@ [Package Name] Name=oglib_lvzip -Version=2.5.1 +Version=2.5.2 Release=2 [Description] -Description="The lvzip package contains several routines for operating on zip files.\0D\0A\0D\0AVersion 2.5.1: Fixes issue with broken VIs in LabVIEW 2009 due to calling (now) private config utilities.\0D\0AVersion 2.5: Changes license of LabVIEW sources from LGPL to BSD, Adds Memory Stream VIs to the palettes, Optimizes ZLIB Extract All Files to Dir, Fixes potential problem where error such as out of disk on finishing to add a file into an archive might get lost meaning that a corrupted archive could result without the user being informed about it, Fixes issue preventing adding files specified by UNC network path to zip archive.\0D\0AVersion 2.4 adds support for direct memory stream handling.\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files." +Description="The lvzip package contains several routines for operating on zip files.\0D\0A\0D\0AVersion 2.5.2: Adds support for the new palette locations of OpenG 4.x packages and removes dependency on ogrsc_dynamicpalette package.\0D\0AVersion 2.5.1: Fixes issue with broken VIs in LabVIEW 2009 due to calling (now) private config utilities.\0D\0AVersion 2.5: Changes license of LabVIEW sources from LGPL to BSD, Adds Memory Stream VIs to the palettes, Optimizes ZLIB Extract All Files to Dir, Fixes potential problem where error such as out of disk on finishing to add a file into an archive might get lost meaning that a corrupted archive could result without the user being informed about it, Fixes issue preventing adding files specified by UNC network path to zip archive.\0D\0AVersion 2.4 adds support for direct memory stream handling.\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files." Summary="OpenG Zip Tools" License="BSD (VIs), LGPL (Shared Library)" @@ -31,11 +31,11 @@ [Dependencies] AutoReqProv=FALSE -Requires="ogrsc_dynamicpalette >= 0.2, oglib_error >= 2.0, oglib_file >= 2.5" +Requires="oglib_error >= 2.0, oglib_file >= 2.5" Conflicts="" [Files] -Num File Groups=11 +Num File Groups=13 [File Group 0] Source Dir=built/lvzip @@ -120,3 +120,16 @@ Num Files=1 File 0=oglib_lvzip.mnu +[File Group 11] +Source Dir="Dynamic Palette MNUs" +Target Dir="<application>/menus/Categories/OpenG" +Replace Mode=Always +Num Files=1 +File 0=oglib_lvzip.mnu + +[File Group 12] +Source Dir="Dynamic Palette MNUs" +Target Dir="<application>/menus/Categories/OpenG" +Replace Mode=If Newer +Num Files=1 +File 0=dir.mnu \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2011-04-11 17:42:44
|
Revision: 1352 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1352&view=rev Author: labviewer Date: 2011-04-11 17:42:38 +0000 (Mon, 11 Apr 2011) Log Message: ----------- Minor bug fixes to the zlip/minizip C sources Modified Paths: -------------- trunk/lvzip/c_source/unzip.c trunk/lvzip/c_source/zip.c trunk/lvzip/source/lvzlib.dll Modified: trunk/lvzip/c_source/unzip.c =================================================================== --- trunk/lvzip/c_source/unzip.c 2011-04-11 00:34:37 UTC (rev 1351) +++ trunk/lvzip/c_source/unzip.c 2011-04-11 17:42:38 UTC (rev 1352) @@ -1142,7 +1142,7 @@ szFileName,fileNameBufferSize, extraField,extraFieldBufferSize, szComment,commentBufferSize); - if (err==UNZ_OK) + if ((err==UNZ_OK) && (pfile_info!=NULL)) { pfile_info->version = file_info64.version; pfile_info->version_needed = file_info64.version_needed; Modified: trunk/lvzip/c_source/zip.c =================================================================== --- trunk/lvzip/c_source/zip.c 2011-04-11 00:34:37 UTC (rev 1351) +++ trunk/lvzip/c_source/zip.c 2011-04-11 17:42:38 UTC (rev 1352) @@ -1710,7 +1710,7 @@ if (err==ZIP_OK) err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */ - if(uncompressed_size >= 0xffffffff) + if(uncompressed_size >= 0xffffffff || compressed_size >= 0xffffffff) { if(zi->ci.pos_zip64extrainfo > 0) { @@ -1724,7 +1724,9 @@ if (err==ZIP_OK) /* uncompressed size, unknown */ err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8); } - } + else + err = ZIP_BADZIPFILE; // Caller passed zip64 = 0, so no room for zip64 info -> fatal + } else { if (err==ZIP_OK) /* compressed size, unknown */ @@ -1852,7 +1854,7 @@ err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4); } else - err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4); + err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4); } return err; @@ -1919,7 +1921,7 @@ free_linkedlist(&(zi->central_dir)); pos = centraldir_pos_inzip - zi->add_position_when_writting_offset; - if(pos >= 0xffffffff) + if (pos >= 0xffffffff || zi->number_entry > 0xFFFF) { ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream); Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip); Modified: trunk/lvzip/source/lvzlib.dll =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2011-04-11 17:43:19
|
Revision: 1353 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1353&view=rev Author: labviewer Date: 2011-04-11 17:43:13 +0000 (Mon, 11 Apr 2011) Log Message: ----------- Version number changes to 2.6.1 Modified Paths: -------------- trunk/lvzip/Change-Log.txt trunk/lvzip/lvzip.ogpb Modified: trunk/lvzip/Change-Log.txt =================================================================== --- trunk/lvzip/Change-Log.txt 2011-04-11 17:42:38 UTC (rev 1352) +++ trunk/lvzip/Change-Log.txt 2011-04-11 17:43:13 UTC (rev 1353) @@ -89,4 +89,14 @@ Added a test for deleting from an archive. 2010-06-16 rk -Incorporated zlib 1.2.5 and minizip 1.1 to prepare for LabVIEW 64 Bit support \ No newline at end of file +Incorporated zlib 1.2.5 and minizip 1.1 to prepare for LabVIEW 64 Bit support + +2011-04-08 jk +Adds support for the new palette locations of OpenG 4.x packages and removes dependency on +ogrsc_dynamicpalette package. + +2011-04-10 rk +Fixed issue in ZLIB Store File when adding direcotry trees with password: The directory +entries need not to be password protected. +Added "Carbon" to the case selector of ZLIB Specific Path to Common Path.vi and +ZLIB Common Path to Specific Path.vi Modified: trunk/lvzip/lvzip.ogpb =================================================================== --- trunk/lvzip/lvzip.ogpb 2011-04-11 17:42:38 UTC (rev 1352) +++ trunk/lvzip/lvzip.ogpb 2011-04-11 17:43:13 UTC (rev 1353) @@ -1,6 +1,6 @@ [Package Name] Name=oglib_lvzip -Version=2.5.2 +Version=2.6.1 Release=2 [Description] @@ -8,7 +8,7 @@ Summary="OpenG Zip Tools" License="BSD (VIs), LGPL (Shared Library)" -Copyright="1995-2004 Mark Adler, Jean-loup Gailly\0A1998-2004 Gilles Vollant\0A2002 - 2009 Christophe Salzmann, Jim Kring, Rolf Kalbermatter" +Copyright="1995-2010 Mark Adler, Jean-loup Gailly\0A1998-2010 Gilles Vollant\0A2002 - 2011 Christophe Salzmann, Jim Kring, Rolf Kalbermatter" Distribution="OpenG Toolkit" Icon=lvzip.bmp Vendor=OpenG.org This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2012-07-16 09:10:42
|
Revision: 1480 http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1480&view=rev Author: labviewer Date: 2012-07-16 09:10:35 +0000 (Mon, 16 Jul 2012) Log Message: ----------- Update to zlib 1.2.7 Modified Paths: -------------- trunk/lvzip/c_source/Makefile trunk/lvzip/c_source/gzread.c trunk/lvzip/c_source/zalias.h trunk/lvzip/c_source/zlib.h trunk/lvzip/c_source/zlibvc.suo trunk/lvzip/c_source/zlibvc.vcproj trunk/lvzip/source/Win64/lvzlib.dll trunk/lvzip/source/lvzlib.dll trunk/lvzip/source/lvzlib.so Modified: trunk/lvzip/c_source/Makefile =================================================================== --- trunk/lvzip/c_source/Makefile 2012-07-06 16:38:20 UTC (rev 1479) +++ trunk/lvzip/c_source/Makefile 2012-07-16 09:10:35 UTC (rev 1480) @@ -32,7 +32,7 @@ CPP=gcc -E STATICLIB=lvzlib.a -SHAREDLIB=lvzlib.so.2 +SHAREDLIB=lvzlib.so.1 SHAREDLIBV=lvzlib.so SHAREDLIBM= LIBS=$(STATICLIB) $(SHAREDLIBV) @@ -41,7 +41,7 @@ ARFLAGS=rc RANLIB=ranlib LDCONFIG=ldconfig -LDSHAREDLIBC=-lc -llv +LDSHAREDLIBC=-lc TAR=tar SHELL=/bin/sh EXE= @@ -57,12 +57,12 @@ OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o -OBJL = lvutil.o ioapi.o iomem.o mztools.o +OBJL = unzip.o zip.o lvutil.o ioapi.o iomem.o mztools.o OBJC = $(OBJZ) $(OBJL) $(OBJG) PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo -PIC_OBJL = lvutil.lo ioapi.lo iomem.lo mztools.lo +PIC_OBJL = unzip.lo zip.lo lvutil.lo ioapi.lo iomem.lo mztools.lo PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJL) $(PIC_OBJG) # to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo Modified: trunk/lvzip/c_source/gzread.c =================================================================== --- trunk/lvzip/c_source/gzread.c 2012-07-06 16:38:20 UTC (rev 1479) +++ trunk/lvzip/c_source/gzread.c 2012-07-16 09:10:35 UTC (rev 1480) @@ -378,7 +378,7 @@ } /* -- see zlib.h -- */ -#undef gzgetc +//#undef gzgetc int ZEXPORT gzgetc(file) gzFile file; { @@ -408,11 +408,13 @@ return ret < 1 ? -1 : buf[0]; } +#if 0 int ZEXPORT gzgetc_(file) gzFile file; { return gzgetc(file); } +#endif /* -- see zlib.h -- */ int ZEXPORT gzungetc(c, file) Modified: trunk/lvzip/c_source/zalias.h =================================================================== --- trunk/lvzip/c_source/zalias.h 2012-07-06 16:38:20 UTC (rev 1479) +++ trunk/lvzip/c_source/zalias.h 2012-07-16 09:10:35 UTC (rev 1480) @@ -110,11 +110,35 @@ #define zipOpenNewFileInZip3_64 lvzip_zipOpenNewFileInZip3_64 #define zipOpenNewFileInZip4 lvzip_zipOpenNewFileInZip4 #define zipOpenNewFileInZip4_64 lvzip_zipOpenNewFileInZip4_64 -#define zipRemoveExtraInfoBlock lvzip_RemoveExtraInfoBlock +#define zipRemoveExtraInfoBlock lvzip_zipRemoveExtraInfoBlock #define zipWriteInFileInZip lvzip_zipWriteInFileInZip -#define gzopen lvzip_gzopen -#define gzseek lvzip_gzseek -#define gztell lvzip_gztell -#define gzoffset lvzip_gzoffset -#define adler32_combine lvzip_adler32_combine -#define gcrc32_combine lvzip_crc32_combine +#define gzopen lvzlib_gzopen +#define gzopen64 lvzlib_gzopen64 +#define gzdopen lvzlib_gzdopen +#define gzbuffer lvzlib_gzbuffer +#define gzseek lvzlib_gzseek +#define gzseek64 lvzlib_gzseek64 +#define gzsetparams lvzlib_gzsetparams +#define gzread lvzlib_gzread +#define gzwrite lvzlib_gzwrite +#define gzprintf lvzlib_gzprintf +#define gzputc lvzlib_gzputc +#define gzputs lvzlib_gzputs +#define gzgetc lvzlib_gzgetc +#define gzgets lvzlib_gzgets +#define gzungetc lvzlib_gzungetc +#define gzrewind lvzlib_gzrewind +#define gzeof lvzlib_gzeof +#define gzclearerr lvzlib_gzclearerr +#define gzflush lvzlib_gzflush +#define gzdirect lvzlib_gzdirect +#define gzerror lvzlib_gzerror +#define gzclose lvzlib_gzclose +#define gzclose_r lvzlib_gzclose_r +#define gzclose_w lvzlib_gzclose_w +#define gztell lvzlib_gztell +#define gztell64 lvzlib_gztell64 +#define gzoffset lvzlib_gzoffset +#define gzoffset64 lvzlib_gzoffset64 +#define gcrc32_combine lvzlib_crc32_combine +#define gcrc32_combine64 lvzlib_crc32_combine64 Modified: trunk/lvzip/c_source/zlib.h =================================================================== --- trunk/lvzip/c_source/zlib.h 2012-07-06 16:38:20 UTC (rev 1479) +++ trunk/lvzip/c_source/zlib.h 2012-07-16 09:10:35 UTC (rev 1480) @@ -1656,6 +1656,7 @@ unsigned char *next; z_off64_t pos; }; +#if 0 ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ #ifdef Z_PREFIX_SET # undef z_gzgetc @@ -1665,6 +1666,7 @@ # define gzgetc(g) \ ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) #endif +#endif /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if Modified: trunk/lvzip/c_source/zlibvc.suo =================================================================== (Binary files differ) Modified: trunk/lvzip/c_source/zlibvc.vcproj =================================================================== --- trunk/lvzip/c_source/zlibvc.vcproj 2012-07-06 16:38:20 UTC (rev 1479) +++ trunk/lvzip/c_source/zlibvc.vcproj 2012-07-16 09:10:35 UTC (rev 1480) @@ -351,8 +351,8 @@ </Configuration> <Configuration Name="DLL Debug|Win32" - OutputDirectory=".\zlibvc___Win32_DLL_Debug" - IntermediateDirectory=".\zlibvc___Win32_DLL_Debug" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" @@ -382,12 +382,12 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL" + PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" - PrecompiledHeaderFile=".\zlibvc___Win32_DLL_Debug/zlibvc.pch" - AssemblerListingLocation=".\zlibvc___Win32_DLL_Debug/" - ObjectFile=".\zlibvc___Win32_DLL_Debug/" - ProgramDataBaseFileName=".\zlibvc___Win32_DLL_Debug/" + PrecompiledHeaderFile="$(IntDir)\zlibvc.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" @@ -400,7 +400,7 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="WIN32,_DEBUG" Culture="1033" - ResourceOutputFileName="zlibvc___Win32_DLL_Debug\lvzlib.res" + ResourceOutputFileName="$(IntDir)\lvzlib.res" /> <Tool Name="VCPreLinkEventTool" @@ -409,16 +409,16 @@ Name="VCLinkerTool" IgnoreImportLibrary="true" AdditionalDependencies="labviewv.lib" - OutputFile="zlibvc___Win32_DLL_Debug\lvzlib.dll" + OutputFile="$(IntDir)\\lvzlib.dll" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../cintools" IgnoreDefaultLibraryNames="msvcrt" - ModuleDefinitionFile=".\lvzlib.def" + ModuleDefinitionFile="" GenerateDebugInformation="true" - ProgramDatabaseFile=".\zlibvc___Win32_DLL_Debug/lvzlib.pdb" + ProgramDatabaseFile="$(IntDir)\lvzlib.pdb" SubSystem="2" - ImportLibrary=".\zlibvc___Win32_DLL_Debug/lvzlib.lib" + ImportLibrary="$(IntDir)\lvzlib.lib" TargetMachine="1" /> <Tool @@ -433,7 +433,7 @@ <Tool Name="VCBscMakeTool" SuppressStartupBanner="true" - OutputFile=".\zlibvc___Win32_DLL_Debug/zlibvc.bsc" + OutputFile="$(IntDir)\zlibvc.bsc" /> <Tool Name="VCFxCopTool" @@ -481,12 +481,12 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL" + PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" - PrecompiledHeaderFile=".\zlibvc___Win32_DLL_Debug/zlibvc.pch" - AssemblerListingLocation=".\zlibvc___Win32_DLL_Debug/" - ObjectFile=".\zlibvc___Win32_DLL_Debug/" - ProgramDataBaseFileName=".\zlibvc___Win32_DLL_Debug/" + PrecompiledHeaderFile="$(IntDir)\zlibvc.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" @@ -499,7 +499,7 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="WIN32,_DEBUG" Culture="1033" - ResourceOutputFileName="zlibvc___Win32_DLL_Debug\lvzlib.res" + ResourceOutputFileName="$(IntDir)\lvzlib.res" /> <Tool Name="VCPreLinkEventTool" @@ -508,16 +508,16 @@ Name="VCLinkerTool" IgnoreImportLibrary="true" AdditionalDependencies="labview64.lib" - OutputFile="zlibvc___Win32_DLL_Debug\lvzlib.dll" + OutputFile="$(IntDir)\\lvzlib.dll" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../cintools" IgnoreDefaultLibraryNames="msvcrt" ModuleDefinitionFile="" GenerateDebugInformation="true" - ProgramDatabaseFile=".\zlibvc___Win32_DLL_Debug/lvzlib.pdb" + ProgramDatabaseFile="$(IntDir)\lvzlib.pdb" SubSystem="2" - ImportLibrary=".\zlibvc___Win32_DLL_Debug/lvzlib.lib" + ImportLibrary="$(IntDir)\lvzlib.lib" TargetMachine="17" /> <Tool @@ -532,7 +532,7 @@ <Tool Name="VCBscMakeTool" SuppressStartupBanner="true" - OutputFile=".\zlibvc___Win32_DLL_Debug/zlibvc.bsc" + OutputFile="$(IntDir)\zlibvc.bsc" /> <Tool Name="VCFxCopTool" @@ -1110,9 +1110,9 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL" + PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" PrecompiledHeaderFile="" AssemblerListingLocation="$(IntDir)\" @@ -1141,7 +1141,7 @@ LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../cintools" - ModuleDefinitionFile=".\lvzlib.def" + ModuleDefinitionFile="" SubSystem="2" ImportLibrary="$(OutDir)/lvzlib.lib" TargetMachine="1" @@ -1207,9 +1207,9 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL" + PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" PrecompiledHeaderFile="" AssemblerListingLocation="$(IntDir)\" Modified: trunk/lvzip/source/Win64/lvzlib.dll =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzlib.dll =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzlib.so =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2015-02-18 08:35:29
|
Revision: 1501 http://sourceforge.net/p/opengtoolkit/svn/1501 Author: labviewer Date: 2015-02-18 08:35:20 +0000 (Wed, 18 Feb 2015) Log Message: ----------- Adding Realtime image support file structure Added Paths: ----------- trunk/lvzip/RT Images/ trunk/lvzip/RT Images/OpenG ZIP Tools/ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/lvzlib.so trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/lvzlib.so trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-armv7a.cdf trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-x64.cdf trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_pharlap.cdf trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks61.cdf trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks63.cdf trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/lvzlib.dll trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/lvzlib.out trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/lvzlib.out Index: trunk/lvzip/RT Images =================================================================== --- trunk/lvzip/RT Images 2015-02-01 01:27:50 UTC (rev 1500) +++ trunk/lvzip/RT Images 2015-02-18 08:35:20 UTC (rev 1501) Property changes on: trunk/lvzip/RT Images ___________________________________________________________________ Added: bugtraq:label ## -0,0 +1 ## +TrackerID: \ No newline at end of property Added: bugtraq:url ## -0,0 +1 ## +https://sourceforge.net/support/tracker.php?aid=%BUGID% \ No newline at end of property Added: bugtraq:message ## -0,0 +1 ## +TrackerID: %BUGID% \ No newline at end of property Index: trunk/lvzip/RT Images/OpenG ZIP Tools =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools 2015-02-01 01:27:50 UTC (rev 1500) +++ trunk/lvzip/RT Images/OpenG ZIP Tools 2015-02-18 08:35:20 UTC (rev 1501) Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools ___________________________________________________________________ Added: bugtraq:label ## -0,0 +1 ## +TrackerID: \ No newline at end of property Added: bugtraq:url ## -0,0 +1 ## +https://sourceforge.net/support/tracker.php?aid=%BUGID% \ No newline at end of property Added: bugtraq:message ## -0,0 +1 ## +TrackerID: %BUGID% \ No newline at end of property Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0 =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0 2015-02-01 01:27:50 UTC (rev 1500) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0 2015-02-18 08:35:20 UTC (rev 1501) Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0 ___________________________________________________________________ Added: bugtraq:label ## -0,0 +1 ## +TrackerID: \ No newline at end of property Added: bugtraq:url ## -0,0 +1 ## +https://sourceforge.net/support/tracker.php?aid=%BUGID% \ No newline at end of property Added: bugtraq:message ## -0,0 +1 ## +TrackerID: %BUGID% \ No newline at end of property Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm 2015-02-01 01:27:50 UTC (rev 1500) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm 2015-02-18 08:35:20 UTC (rev 1501) Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm ___________________________________________________________________ Added: bugtraq:label ## -0,0 +1 ## +TrackerID: \ No newline at end of property Added: bugtraq:url ## -0,0 +1 ## +https://sourceforge.net/support/tracker.php?aid=%BUGID% \ No newline at end of property Added: bugtraq:message ## -0,0 +1 ## +TrackerID: %BUGID% \ No newline at end of property Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/lvzlib.so =================================================================== (Binary files differ) Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/lvzlib.so =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/lvzlib.so 2015-02-01 01:27:50 UTC (rev 1500) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/lvzlib.so 2015-02-18 08:35:20 UTC (rev 1501) Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_arm/lvzlib.so ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64 =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64 2015-02-01 01:27:50 UTC (rev 1500) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64 2015-02-18 08:35:20 UTC (rev 1501) Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64 ___________________________________________________________________ Added: bugtraq:label ## -0,0 +1 ## +TrackerID: \ No newline at end of property Added: bugtraq:url ## -0,0 +1 ## +https://sourceforge.net/support/tracker.php?aid=%BUGID% \ No newline at end of property Added: bugtraq:message ## -0,0 +1 ## +TrackerID: %BUGID% \ No newline at end of property Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/lvzlib.so =================================================================== (Binary files differ) Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/lvzlib.so =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/lvzlib.so 2015-02-01 01:27:50 UTC (rev 1500) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/lvzlib.so 2015-02-18 08:35:20 UTC (rev 1501) Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/LinuxRT_x64/lvzlib.so ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-armv7a.cdf =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-armv7a.cdf (rev 0) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-armv7a.cdf 2015-02-18 08:35:20 UTC (rev 1501) @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<?CDF version="1.5"?> +<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE"> + <TITLE>OpenG ZIP Tools</TITLE> + <ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT> + <IMPLEMENTATION> + <OS VALUE="Linux-ARMv7-A"/> + <CODEBASE FILENAME="LinuxRT_arm/lvzlib.so" TARGET="/usr/lib/lvzlib.so"/> + <DEPENDENCY> + <SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="12.0"> + <TITLE>LabVIEW Real-Time</TITLE> + </SOFTPKG> + </DEPENDENCY> + </IMPLEMENTATION> +</SOFTPKG> \ No newline at end of file Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-x64.cdf =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-x64.cdf (rev 0) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_linux-x64.cdf 2015-02-18 08:35:20 UTC (rev 1501) @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<?CDF version="1.5"?> +<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE"> + <TITLE>OpenG ZIP Tools</TITLE> + <ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT> + <IMPLEMENTATION> + <OS VALUE="NI-Linux x64" /> + <CODEBASE FILENAME="LinuxRT_x64/lvzlib.so" TARGET="/usr/lib/lvzlib.so"/> + <DEPENDENCY> + <SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="12.0"> + <TITLE>LabVIEW Real-Time</TITLE> + </SOFTPKG> + </DEPENDENCY> + </IMPLEMENTATION> +</SOFTPKG> \ No newline at end of file Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_pharlap.cdf =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_pharlap.cdf (rev 0) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_pharlap.cdf 2015-02-18 08:35:20 UTC (rev 1501) @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<?CDF version="1.2"?> +<!DOCTYPE SOFTPKG SYSTEM "c:\cdf.dtd"> +<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE"> + <TITLE>OpenG ZIP Tools</TITLE> + <ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT> + <IMPLEMENTATION> + <OS VALUE="PharLap" /> + <CODEBASE FILENAME="pharlap/lvzlib.dll" TARGET="/ni-rt/system/lvzlib.dll"/> + <DEPENDENCY> + <SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="7.1.1"> + <TITLE>LabVIEW RT</TITLE> + </SOFTPKG> + </DEPENDENCY> + </IMPLEMENTATION> +</SOFTPKG> \ No newline at end of file Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks61.cdf =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks61.cdf (rev 0) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks61.cdf 2015-02-18 08:35:20 UTC (rev 1501) @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<?CDF version="1.2"?> +<!DOCTYPE SOFTPKG SYSTEM "c:\cdf.dtd"> +<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE"> + <TITLE>OpenG ZIP Tools</TITLE> + <ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT> + <IMPLEMENTATION> + <OS VALUE="VxWorks-PPC603" /> + <CODEBASE FILENAME="vxworks61/lvzlib.out" TARGET="/ni-rt/system/lvzlib.out"/> + <DEPENDENCY> + <SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="8.2.0"> + <TITLE>LabVIEW RT</TITLE> + </SOFTPKG> + </DEPENDENCY> + </IMPLEMENTATION> +</SOFTPKG> \ No newline at end of file Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks63.cdf =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks63.cdf (rev 0) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/lvzlib_vxworks63.cdf 2015-02-18 08:35:20 UTC (rev 1501) @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<?CDF version="1.2"?> +<!DOCTYPE SOFTPKG SYSTEM "c:\cdf.dtd"> +<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE"> + <TITLE>OpenG ZIP Tools</TITLE> + <ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT> + <IMPLEMENTATION> + <OS VALUE="VxWorks-PPC603" /> + <CODEBASE FILENAME="vxworks63/lvzlib.out" TARGET="/ni-rt/system/lvzlib.out"/> + <DEPENDENCY> + <SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="8.5.0"> + <TITLE>LabVIEW RT</TITLE> + </SOFTPKG> + </DEPENDENCY> + </IMPLEMENTATION> +</SOFTPKG> \ No newline at end of file Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap 2015-02-01 01:27:50 UTC (rev 1500) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap 2015-02-18 08:35:20 UTC (rev 1501) Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap ___________________________________________________________________ Added: bugtraq:label ## -0,0 +1 ## +TrackerID: \ No newline at end of property Added: bugtraq:url ## -0,0 +1 ## +https://sourceforge.net/support/tracker.php?aid=%BUGID% \ No newline at end of property Added: bugtraq:message ## -0,0 +1 ## +TrackerID: %BUGID% \ No newline at end of property Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/lvzlib.dll =================================================================== (Binary files differ) Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/lvzlib.dll =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/lvzlib.dll 2015-02-01 01:27:50 UTC (rev 1500) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/lvzlib.dll 2015-02-18 08:35:20 UTC (rev 1501) Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/pharlap/lvzlib.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61 =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61 2015-02-01 01:27:50 UTC (rev 1500) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61 2015-02-18 08:35:20 UTC (rev 1501) Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61 ___________________________________________________________________ Added: bugtraq:label ## -0,0 +1 ## +TrackerID: \ No newline at end of property Added: bugtraq:url ## -0,0 +1 ## +https://sourceforge.net/support/tracker.php?aid=%BUGID% \ No newline at end of property Added: bugtraq:message ## -0,0 +1 ## +TrackerID: %BUGID% \ No newline at end of property Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/lvzlib.out =================================================================== (Binary files differ) Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/lvzlib.out =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/lvzlib.out 2015-02-01 01:27:50 UTC (rev 1500) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/lvzlib.out 2015-02-18 08:35:20 UTC (rev 1501) Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks61/lvzlib.out ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63 =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63 2015-02-01 01:27:50 UTC (rev 1500) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63 2015-02-18 08:35:20 UTC (rev 1501) Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63 ___________________________________________________________________ Added: bugtraq:label ## -0,0 +1 ## +TrackerID: \ No newline at end of property Added: bugtraq:url ## -0,0 +1 ## +https://sourceforge.net/support/tracker.php?aid=%BUGID% \ No newline at end of property Added: bugtraq:message ## -0,0 +1 ## +TrackerID: %BUGID% \ No newline at end of property Added: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/lvzlib.out =================================================================== (Binary files differ) Index: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/lvzlib.out =================================================================== --- trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/lvzlib.out 2015-02-01 01:27:50 UTC (rev 1500) +++ trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/lvzlib.out 2015-02-18 08:35:20 UTC (rev 1501) Property changes on: trunk/lvzip/RT Images/OpenG ZIP Tools/4.1.0/vxworks63/lvzlib.out ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2015-04-07 22:04:02
|
Revision: 1502 http://sourceforge.net/p/opengtoolkit/svn/1502 Author: labviewer Date: 2015-04-07 22:03:55 +0000 (Tue, 07 Apr 2015) Log Message: ----------- Add RT images installer Added Paths: ----------- trunk/lvzip/RT Images/LinuxRT_arm/ trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so trunk/lvzip/RT Images/LinuxRT_x64/ trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf trunk/lvzip/RT Images/lvzlib_linux-x64.cdf trunk/lvzip/RT Images/lvzlib_pharlap.cdf trunk/lvzip/RT Images/lvzlib_vxworks61.cdf trunk/lvzip/RT Images/lvzlib_vxworks63.cdf trunk/lvzip/RT Images/pharlap/ trunk/lvzip/RT Images/pharlap/lvzlib.dll trunk/lvzip/RT Images/vxworks61/ trunk/lvzip/RT Images/vxworks61/lvzlib.out trunk/lvzip/RT Images/vxworks63/ trunk/lvzip/RT Images/vxworks63/lvzlib.out trunk/lvzip/lvzip RT Images.iss Removed Paths: ------------- trunk/lvzip/RT Images/OpenG ZIP Tools/ Index: trunk/lvzip/RT Images/LinuxRT_arm =================================================================== --- trunk/lvzip/RT Images/LinuxRT_arm 2015-02-18 08:35:20 UTC (rev 1501) +++ trunk/lvzip/RT Images/LinuxRT_arm 2015-04-07 22:03:55 UTC (rev 1502) Property changes on: trunk/lvzip/RT Images/LinuxRT_arm ___________________________________________________________________ Added: bugtraq:label ## -0,0 +1 ## +TrackerID: \ No newline at end of property Added: bugtraq:url ## -0,0 +1 ## +https://sourceforge.net/support/tracker.php?aid=%BUGID% \ No newline at end of property Added: bugtraq:message ## -0,0 +1 ## +TrackerID: %BUGID% \ No newline at end of property Added: trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so =================================================================== (Binary files differ) Index: trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so =================================================================== --- trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so 2015-02-18 08:35:20 UTC (rev 1501) +++ trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so 2015-04-07 22:03:55 UTC (rev 1502) Property changes on: trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: trunk/lvzip/RT Images/LinuxRT_x64 =================================================================== --- trunk/lvzip/RT Images/LinuxRT_x64 2015-02-18 08:35:20 UTC (rev 1501) +++ trunk/lvzip/RT Images/LinuxRT_x64 2015-04-07 22:03:55 UTC (rev 1502) Property changes on: trunk/lvzip/RT Images/LinuxRT_x64 ___________________________________________________________________ Added: bugtraq:label ## -0,0 +1 ## +TrackerID: \ No newline at end of property Added: bugtraq:url ## -0,0 +1 ## +https://sourceforge.net/support/tracker.php?aid=%BUGID% \ No newline at end of property Added: bugtraq:message ## -0,0 +1 ## +TrackerID: %BUGID% \ No newline at end of property Added: trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so =================================================================== (Binary files differ) Index: trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so =================================================================== --- trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so 2015-02-18 08:35:20 UTC (rev 1501) +++ trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so 2015-04-07 22:03:55 UTC (rev 1502) Property changes on: trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf =================================================================== --- trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf (rev 0) +++ trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf 2015-04-07 22:03:55 UTC (rev 1502) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<?CDF version="1.5"?> +<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE"> + <TITLE>OpenG ZIP Tools</TITLE> + <ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT> + <IMPLEMENTATION> + <OS VALUE="Linux-ARMv7-A"/> + <CODEBASE FILENAME="LinuxRT_arm/lvzlib.so" TARGET="/usr/local/lib/lvzlib.so" OWNER="root" GROUP="root" /> + </IMPLEMENTATION> +</SOFTPKG> \ No newline at end of file Added: trunk/lvzip/RT Images/lvzlib_linux-x64.cdf =================================================================== --- trunk/lvzip/RT Images/lvzlib_linux-x64.cdf (rev 0) +++ trunk/lvzip/RT Images/lvzlib_linux-x64.cdf 2015-04-07 22:03:55 UTC (rev 1502) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<?CDF version="1.5"?> +<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE"> + <TITLE>OpenG ZIP Tools</TITLE> + <ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT> + <IMPLEMENTATION> + <OS VALUE="NI-Linux x64" /> + <CODEBASE FILENAME="LinuxRT_arm/lvzlib.so" TARGET="/usr/local/lib/lvzlib.so"/> + </IMPLEMENTATION> +</SOFTPKG> \ No newline at end of file Added: trunk/lvzip/RT Images/lvzlib_pharlap.cdf =================================================================== --- trunk/lvzip/RT Images/lvzlib_pharlap.cdf (rev 0) +++ trunk/lvzip/RT Images/lvzlib_pharlap.cdf 2015-04-07 22:03:55 UTC (rev 1502) @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<?CDF version="1.2"?> +<!DOCTYPE SOFTPKG SYSTEM "c:\cdf.dtd"> +<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE"> + <TITLE>OpenG ZIP Tools</TITLE> + <ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT> + <IMPLEMENTATION> + <OS VALUE="PharLap" /> + <CODEBASE FILENAME="pharlap/lvzlib.dll" TARGET="/ni-rt/system/lvzlib.dll"/> + </IMPLEMENTATION> +</SOFTPKG> \ No newline at end of file Added: trunk/lvzip/RT Images/lvzlib_vxworks61.cdf =================================================================== --- trunk/lvzip/RT Images/lvzlib_vxworks61.cdf (rev 0) +++ trunk/lvzip/RT Images/lvzlib_vxworks61.cdf 2015-04-07 22:03:55 UTC (rev 1502) @@ -0,0 +1,17 @@ +<?xml version="1.0"?> +<?CDF version="1.2"?> +<!DOCTYPE SOFTPKG SYSTEM "c:\cdf.dtd"> +<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE"> + <TITLE>OpenG ZIP Tools</TITLE> + <ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT> + <IMPLEMENTATION> + <DEVICECLASS VALUE="cRIO"/> + <OS VALUE="VxWorks-PPC603" /> + <CODEBASE FILENAME="vxworks61/lvzlib.out" TARGET="/ni-rt/system/lvzlib.out"/> + <DEPENDENCY> + <SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="8.2.0"> + <TITLE>LabVIEW RT</TITLE> + </SOFTPKG> + </DEPENDENCY> + </IMPLEMENTATION> +</SOFTPKG> \ No newline at end of file Added: trunk/lvzip/RT Images/lvzlib_vxworks63.cdf =================================================================== --- trunk/lvzip/RT Images/lvzlib_vxworks63.cdf (rev 0) +++ trunk/lvzip/RT Images/lvzlib_vxworks63.cdf 2015-04-07 22:03:55 UTC (rev 1502) @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<?CDF version="1.2"?> +<!DOCTYPE SOFTPKG SYSTEM "c:\cdf.dtd"> +<SOFTPKG NAME="{38D47F1D-07F2-4CA0-89DB-6F89598DA97C}" VERSION="4.1.0" TYPE="VISIBLE"> + <TITLE>OpenG ZIP Tools</TITLE> + <ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT> + <IMPLEMENTATION> + <OS VALUE="VxWorks-PPC603" /> + <CODEBASE FILENAME="vxworks63/lvzlib.out" TARGET="/ni-rt/system/lvzlib.out"/> + <DEPENDENCY> + <SOFTPKG NAME="{899452D2-C085-430B-B76D-7FDB33BB324A}" VERSION="8.5.0"> + <TITLE>LabVIEW RT</TITLE> + </SOFTPKG> + </DEPENDENCY> + </IMPLEMENTATION> +</SOFTPKG> \ No newline at end of file Index: trunk/lvzip/RT Images/pharlap =================================================================== --- trunk/lvzip/RT Images/pharlap 2015-02-18 08:35:20 UTC (rev 1501) +++ trunk/lvzip/RT Images/pharlap 2015-04-07 22:03:55 UTC (rev 1502) Property changes on: trunk/lvzip/RT Images/pharlap ___________________________________________________________________ Added: bugtraq:label ## -0,0 +1 ## +TrackerID: \ No newline at end of property Added: bugtraq:url ## -0,0 +1 ## +https://sourceforge.net/support/tracker.php?aid=%BUGID% \ No newline at end of property Added: bugtraq:message ## -0,0 +1 ## +TrackerID: %BUGID% \ No newline at end of property Added: trunk/lvzip/RT Images/pharlap/lvzlib.dll =================================================================== (Binary files differ) Index: trunk/lvzip/RT Images/pharlap/lvzlib.dll =================================================================== --- trunk/lvzip/RT Images/pharlap/lvzlib.dll 2015-02-18 08:35:20 UTC (rev 1501) +++ trunk/lvzip/RT Images/pharlap/lvzlib.dll 2015-04-07 22:03:55 UTC (rev 1502) Property changes on: trunk/lvzip/RT Images/pharlap/lvzlib.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: trunk/lvzip/RT Images/vxworks61 =================================================================== --- trunk/lvzip/RT Images/vxworks61 2015-02-18 08:35:20 UTC (rev 1501) +++ trunk/lvzip/RT Images/vxworks61 2015-04-07 22:03:55 UTC (rev 1502) Property changes on: trunk/lvzip/RT Images/vxworks61 ___________________________________________________________________ Added: bugtraq:label ## -0,0 +1 ## +TrackerID: \ No newline at end of property Added: bugtraq:url ## -0,0 +1 ## +https://sourceforge.net/support/tracker.php?aid=%BUGID% \ No newline at end of property Added: bugtraq:message ## -0,0 +1 ## +TrackerID: %BUGID% \ No newline at end of property Added: trunk/lvzip/RT Images/vxworks61/lvzlib.out =================================================================== (Binary files differ) Index: trunk/lvzip/RT Images/vxworks61/lvzlib.out =================================================================== --- trunk/lvzip/RT Images/vxworks61/lvzlib.out 2015-02-18 08:35:20 UTC (rev 1501) +++ trunk/lvzip/RT Images/vxworks61/lvzlib.out 2015-04-07 22:03:55 UTC (rev 1502) Property changes on: trunk/lvzip/RT Images/vxworks61/lvzlib.out ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: trunk/lvzip/RT Images/vxworks63 =================================================================== --- trunk/lvzip/RT Images/vxworks63 2015-02-18 08:35:20 UTC (rev 1501) +++ trunk/lvzip/RT Images/vxworks63 2015-04-07 22:03:55 UTC (rev 1502) Property changes on: trunk/lvzip/RT Images/vxworks63 ___________________________________________________________________ Added: bugtraq:label ## -0,0 +1 ## +TrackerID: \ No newline at end of property Added: bugtraq:url ## -0,0 +1 ## +https://sourceforge.net/support/tracker.php?aid=%BUGID% \ No newline at end of property Added: bugtraq:message ## -0,0 +1 ## +TrackerID: %BUGID% \ No newline at end of property Added: trunk/lvzip/RT Images/vxworks63/lvzlib.out =================================================================== (Binary files differ) Index: trunk/lvzip/RT Images/vxworks63/lvzlib.out =================================================================== --- trunk/lvzip/RT Images/vxworks63/lvzlib.out 2015-02-18 08:35:20 UTC (rev 1501) +++ trunk/lvzip/RT Images/vxworks63/lvzlib.out 2015-04-07 22:03:55 UTC (rev 1502) Property changes on: trunk/lvzip/RT Images/vxworks63/lvzlib.out ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/lvzip/lvzip RT Images.iss =================================================================== --- trunk/lvzip/lvzip RT Images.iss (rev 0) +++ trunk/lvzip/lvzip RT Images.iss 2015-04-07 22:03:55 UTC (rev 1502) @@ -0,0 +1,14 @@ +; Script generated by the Inno Script Studio Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +[Setup] +AppName=OpenG ZIP Library for NI RT controllers +AppVersion=4.1 +DefaultDirName={reg:HKLM32\Software\National Instruments\RT Images,Path|{pf32}\National Instruments\RT Images}\OpenG ZIP Tools\4.1.0 +DisableDirPage=yes +SourceDir=RT Images +OutputDir=..\built\RT Images +PrivilegesRequired=admin + +[Files] +Source: "*.*"; DestDir: "{app}"; Flags: recursesubdirs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2015-04-08 22:06:45
|
Revision: 1504 http://sourceforge.net/p/opengtoolkit/svn/1504 Author: labviewer Date: 2015-04-08 22:06:42 +0000 (Wed, 08 Apr 2015) Log Message: ----------- finalize some more stuff Modified Paths: -------------- trunk/lvzip/PostInstall.vi trunk/lvzip/PreUninstall.vi trunk/lvzip/lvzip.ogbld trunk/lvzip/lvzip.ogpb trunk/lvzip/source/lvzip.llb/ZLIB Common Path to Specific Path.vi trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info Old.vi trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi trunk/lvzip/source/lvzip.llb/ZLIB Specific Path to Common Path.vi trunk/lvzip/source/lvzlib.dll trunk/lvzip/source/readme.txt trunk/lvzip/tests/lvzip-test-lg bin files.vi trunk/lvzip/tests/lvzip-test-memory stream.vi Added Paths: ----------- trunk/lvzip/source/liblvzlib.so trunk/lvzip/source/liblvzlib64.so trunk/lvzip/source/lvzlib64.dll Removed Paths: ------------- trunk/lvzip/source/64bit/ trunk/lvzip/source/lvzlib.so trunk/lvzip/source/vxWorks LV8.2/ trunk/lvzip/source/vxWorks LV8.5/ Modified: trunk/lvzip/PostInstall.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/PreUninstall.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/lvzip.ogbld =================================================================== --- trunk/lvzip/lvzip.ogbld 2015-04-07 22:14:23 UTC (rev 1503) +++ trunk/lvzip/lvzip.ogbld 2015-04-08 22:06:42 UTC (rev 1504) @@ -99,19 +99,4 @@ SourceFile 2=submenus/*.mnu SourceFile 3=readme.txt SourceFile 4=PreInstall.vi - -[SupportFiles 2] -TargetDir="vxWorks82" -OverwriteExisting=TRUE -FollowVIDirHierarchy=FALSE -Recursive=FALSE -Exclude=FALSE -SourceFile 1="vxWorks LV8.2/lvzlib.*" - -[SupportFiles 3] -TargetDir="vxWorks85" -OverwriteExisting=TRUE -FollowVIDirHierarchy=FALSE -Recursive=FALSE -Exclude=FALSE -SourceFile 1="vxWorks LV8.5/lvzlib.*" +SourceFile 5=PostInstall.vi \ No newline at end of file Modified: trunk/lvzip/lvzip.ogpb =================================================================== --- trunk/lvzip/lvzip.ogpb 2015-04-07 22:14:23 UTC (rev 1503) +++ trunk/lvzip/lvzip.ogpb 2015-04-08 22:06:42 UTC (rev 1504) @@ -1,27 +1,41 @@ +[OGPB Header] +File Version=1.0.0 + [Package Name] Name=oglib_lvzip -Version=2.6.1 -Release=2 +Version=4.1.0 +Release=1 +Display Name="OpenG ZIP Library" [Description] -Description="The lvzip package contains several routines for operating on zip files.\0D\0A\0D\0AVersion 2.5.2: Adds support for the new palette locations of OpenG 4.x packages and removes dependency on ogrsc_dynamicpalette package.\0D\0AVersion 2.5.1: Fixes issue with broken VIs in LabVIEW 2009 due to calling (now) private config utilities.\0D\0AVersion 2.5: Changes license of LabVIEW sources from LGPL to BSD, Adds Memory Stream VIs to the palettes, Optimizes ZLIB Extract All Files to Dir, Fixes potential problem where error such as out of disk on finishing to add a file into an archive might get lost meaning that a corrupted archive could result without the user being informed about it, Fixes issue preventing adding files specified by UNC network path to zip archive.\0D\0AVersion 2.4 adds support for direct memory stream handling.\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files." - +Description="The lvzip package contains several routines for operating on zip files.\0D\0A" Summary="OpenG Zip Tools" License="BSD (VIs), LGPL (Shared Library)" -Copyright="1995-2010 Mark Adler, Jean-loup Gailly\0A1998-2010 Gilles Vollant\0A2002 - 2011 Christophe Salzmann, Jim Kring, Rolf Kalbermatter" +Copyright="1995-2014 Mark Adler, Jean-loup Gailly\0A1998-2014 Gilles Vollant\0A2002 - 2015 Christophe Salzmann, Jim Kring, Rolf Kalbermatter" Distribution="OpenG Toolkit" -Icon=lvzip.bmp Vendor=OpenG.org URL=http://wiki.openg.org/oglib_lvzip Packager="Jim Kring <ji...@ji...>" +Release Notes="Version 4.1: Updated to zlib 1.2.8 and added support for new cRIO targets\0AVersion 4.0: New palette menu structure\0AVersion 2.5.2: Adds support for the new palette locations of OpenG 4.x packages and removes dependency on ogrsc_dynamicpalette package.\0D\0AVersion 2.5.1: Fixes issue with broken VIs in LabVIEW 2009 due to calling (now) private config utilities.\0D\0AVersion 2.5: Changes license of LabVIEW sources from LGPL to BSD, Adds Memory Stream VIs to the palettes, Optimizes ZLIB Extract All Files to Dir, Fixes potential problem where error such as out of disk on finishing to add a file into an archive might get lost meaning that a corrupted archive could result without the user being informed about it, Fixes issue preventing adding files specified by UNC network path to zip archive.\0D\0AVersion 2.4 adds support for direct memory stream handling.\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files." +Demo=FALSE +System Package=FALSE +Sub Package=FALSE +close labview before install=FALSE +restart labview after install=FALSE +skip mass compile after install=FALSE +[Package Info] +Icon=lvzip.bmp +License File="" + [Platform] -Exclusive_LabVIEW_Version=>=6.1 +Exclusive_LabVIEW_Version=>=7.0 Exclusive_LabVIEW_System=All Exclusive_OS=All [Script VIs] Source Dir="" +PreInstall="" PostInstall=PostInstall.vi PreUninstall=PreUninstall.vi PostUninstall="" @@ -31,105 +45,145 @@ [Dependencies] AutoReqProv=FALSE -Requires="oglib_error >= 2.0, oglib_file >= 2.5" +Requires=oglib_error>=2.0,oglib_file>=2.5 Conflicts="" [Files] -Num File Groups=13 +Num File Groups=11 +Source Dir="" +Target Dir="" +Passwords.<size(s)>=0 +Documentation="" +NameMode=2 +PPFix=ogtlk +Doc Groups="" [File Group 0] -Source Dir=built/lvzip +Source Dir=source/submenus +DirMode=0 +NameMode=0 +PPFix="" Target Dir=<OpenG.lib>/lvzip Replace Mode=Always -Num Files=2 +Num Files=1 File 0=*.mnu -File 1=*.txt +Locked 0=-1 [File Group 1] +Source Dir=source +DirMode=0 +NameMode=0 +PPFix="" +Target Dir=<OpenG.lib>/lvzip +Replace Mode=Always +Num Files=1 +File 0=readme.txt +Locked 0=-1 + +[File Group 2] Source Dir=built/lvzip/lvzip.llb +DirMode=0 +NameMode=0 +PPFix="" Target Dir=<OpenG.lib>/lvzip/lvzip.llb Replace Mode=Always Num Files=2 File 0=*.vi +Locked 0=-1 File 1=*.ctl +Locked 1=-1 -[File Group 2] +[File Group 3] Source Dir=built/lvzip/macbin.llb +DirMode=0 +NameMode=0 +PPFix="" Target Dir=<OpenG.lib>/lvzip/macbin.llb Replace Mode=Always Num Files=2 File 0=*.vi +Locked 0=-1 File 1=*.ctl +Locked 1=-1 -[File Group 3] -Source Dir=built/lvzip +[File Group 4] +Source Dir=source +DirMode=0 +NameMode=0 +PPFix="" Target Dir=<OpenG.lib>/lvzip Replace Mode=Always -Exclusive_OS="Windows NT,Windows 9x" +Exclusive_OS="Windows NT,Windows 9x,Windows x64" Num Files=1 -File 0=lvzlib.dll +File 0=*.dll +Locked 0=-1 -[File Group 4] -Source Dir=built/lvzip/Win64 -Target Dir=<OpenG.lib>/lvzip -Exclusive_OS="Win64" -Num Files=1 -File 0=lvzlib.dll - [File Group 5] -Source Dir=built/lvzip +Source Dir=source +DirMode=0 +NameMode=0 +PPFix="" Target Dir=<OpenG.lib>/lvzip Replace Mode=Always -Exclusive_OS=Linux +Exclusive_OS="Linux,Linux x64" Num Files=1 -File 0=lvzlib.so +File 0=*.so +Locked 0=-1 [File Group 6] -Source Dir=built/lvzip +Source Dir=source +DirMode=0 +NameMode=0 +PPFix="" Target Dir=<OpenG.lib>/lvzip Replace Mode=Always Exclusive_OS="Mac OS>=10" Num Files=1 File 0=lvzlib.framework.zip +Locked 0=-1 [File Group 7] -Source Dir=built/lvzip/vxWorks82 -Target Dir=<OpenG.lib>/lvzip -Exclusive_LabVIEW_Version=<=8.2 +Source Dir="built/RT Images" +DirMode=0 +NameMode=0 +PPFix="" +Target Dir="<OpenG.lib>/lvzip/RT Images/" +Replace Mode="If Newer" +Exclusive_OS="Windows NT,Windows 9x" Num Files=1 -File 0=lvzlib.out +File 0=setup.exe +Locked 0=-1 [File Group 8] -Source Dir=built/lvzip/vxWorks85 -Target Dir=<OpenG.lib>/lvzip -Exclusive_LabVIEW_Version=>=8.5 +Source Dir="Dynamic Palette MNUs" +DirMode=0 +NameMode=0 +PPFix="" +Target Dir=<menus>/Categories/OpenG +Replace Mode=Always Num Files=1 -File 0=lvzlib.out +File 0=oglib_lvzip.mnu +Locked 0=-1 [File Group 9] Source Dir="Dynamic Palette MNUs" +DirMode=0 +NameMode=0 +PPFix="" Target Dir=<user.lib>/_dynamicpalette_dirs/file Replace Mode=Always Num Files=1 File 0=oglib_lvzip.mnu +Locked 0=-1 [File Group 10] Source Dir="Dynamic Palette MNUs" +DirMode=0 +NameMode=0 +PPFix="" Target Dir=<user.lib>/_dynamicpalette_dirs/OpenG Replace Mode=Always Num Files=1 File 0=oglib_lvzip.mnu +Locked 0=-1 -[File Group 11] -Source Dir="Dynamic Palette MNUs" -Target Dir="<application>/menus/Categories/OpenG" -Replace Mode=Always -Num Files=1 -File 0=oglib_lvzip.mnu - -[File Group 12] -Source Dir="Dynamic Palette MNUs" -Target Dir="<application>/menus/Categories/OpenG" -Replace Mode=If Newer -Num Files=1 -File 0=dir.mnu \ No newline at end of file Added: trunk/lvzip/source/liblvzlib.so =================================================================== (Binary files differ) Index: trunk/lvzip/source/liblvzlib.so =================================================================== --- trunk/lvzip/source/liblvzlib.so 2015-04-07 22:14:23 UTC (rev 1503) +++ trunk/lvzip/source/liblvzlib.so 2015-04-08 22:06:42 UTC (rev 1504) Property changes on: trunk/lvzip/source/liblvzlib.so ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/lvzip/source/liblvzlib64.so =================================================================== (Binary files differ) Index: trunk/lvzip/source/liblvzlib64.so =================================================================== --- trunk/lvzip/source/liblvzlib64.so 2015-04-07 22:14:23 UTC (rev 1503) +++ trunk/lvzip/source/liblvzlib64.so 2015-04-08 22:06:42 UTC (rev 1504) Property changes on: trunk/lvzip/source/liblvzlib64.so ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/lvzip/source/lvzip.llb/ZLIB Common Path to Specific Path.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info Old.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Specific Path to Common Path.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzlib.dll =================================================================== (Binary files differ) Deleted: trunk/lvzip/source/lvzlib.so =================================================================== (Binary files differ) Added: trunk/lvzip/source/lvzlib64.dll =================================================================== (Binary files differ) Index: trunk/lvzip/source/lvzlib64.dll =================================================================== --- trunk/lvzip/source/lvzlib64.dll 2015-04-07 22:14:23 UTC (rev 1503) +++ trunk/lvzip/source/lvzlib64.dll 2015-04-08 22:06:42 UTC (rev 1504) Property changes on: trunk/lvzip/source/lvzlib64.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/lvzip/source/readme.txt =================================================================== --- trunk/lvzip/source/readme.txt 2015-04-07 22:14:23 UTC (rev 1503) +++ trunk/lvzip/source/readme.txt 2015-04-08 22:06:42 UTC (rev 1504) @@ -1,7 +1,7 @@ -LabVIEW ZIP library, version 2.5.2 +LabVIEW ZIP library, version 4.1.0 ---------------------------------- -Copyright 2002-2009 Rolf Kalbermatter +Copyright 2002-2015 Rolf Kalbermatter Please read this document before you upgrade from a version of LVZIP @@ -11,19 +11,24 @@ in comparison to earlier versions which might require you to slightly redo your project. -Release 2.6.1, Released: Jun. xx, 2010 +Release 4.1.0, Released: Mar. 05, 2015 ====================================== New features: ------------- -1) Upgraded to zlib 1.2.5 and minizip 1.1 sources +1) Added some support for extended character codes with various character encodings. 2) Support for ZIP64 Archives (>4GB) (an individual file inside the archive still needs to be smaller than 4GB when getting added or extracted and memory stream based retrieval is limited to < 2GB large archives due to LabVIEWs 2GB limit for string handles) -3) Support for LabVIEW for 64 Bit +3) Added support for Windows and Linux 64 bit platforms +4) Added support for all NI-Linux RT platforrms +Bug fixes: +---------- +1) Upgraded to zlib 1.2.8 and included minizip + Release 2.5.2, Released: Sep. 3, 2009 ===================================== Modified: trunk/lvzip/tests/lvzip-test-lg bin files.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/tests/lvzip-test-memory stream.vi =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2015-04-09 22:24:03
|
Revision: 1505 http://sourceforge.net/p/opengtoolkit/svn/1505 Author: labviewer Date: 2015-04-09 22:24:01 +0000 (Thu, 09 Apr 2015) Log Message: ----------- Making a few more changes to the packaging Modified Paths: -------------- trunk/lvzip/PostInstall.vi trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf trunk/lvzip/RT Images/lvzlib_linux-x64.cdf trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title - Sub.vi trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title.vi trunk/lvzip/build_support/Pre-Post Build (testing).vi trunk/lvzip/c_source/.cproject trunk/lvzip/lvzip.ogbld trunk/lvzip/lvzip.ogpb trunk/lvzip/source/opengdoc.txt Added Paths: ----------- trunk/lvzip/build lvzip 70.vi trunk/lvzip/source/lvzlib.so trunk/lvzip/source/lvzlib64.so Removed Paths: ------------- trunk/lvzip/source/liblvzlib.so trunk/lvzip/source/liblvzlib64.so Modified: trunk/lvzip/PostInstall.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/RT Images/LinuxRT_arm/liblvzlib.so =================================================================== (Binary files differ) Modified: trunk/lvzip/RT Images/LinuxRT_x64/liblvzlib.so =================================================================== (Binary files differ) Modified: trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf =================================================================== --- trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf 2015-04-08 22:06:42 UTC (rev 1504) +++ trunk/lvzip/RT Images/lvzlib_linux-armv7a.cdf 2015-04-09 22:24:01 UTC (rev 1505) @@ -5,6 +5,6 @@ <ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT> <IMPLEMENTATION> <OS VALUE="Linux-ARMv7-A"/> - <CODEBASE FILENAME="LinuxRT_arm/lvzlib.so" TARGET="/usr/local/lib/lvzlib.so" OWNER="root" GROUP="root" /> + <CODEBASE FILENAME="LinuxRT_arm/liblvzlib.so" TARGET="/usr/local/lib/liblvzlib.so"/> </IMPLEMENTATION> </SOFTPKG> \ No newline at end of file Modified: trunk/lvzip/RT Images/lvzlib_linux-x64.cdf =================================================================== --- trunk/lvzip/RT Images/lvzlib_linux-x64.cdf 2015-04-08 22:06:42 UTC (rev 1504) +++ trunk/lvzip/RT Images/lvzlib_linux-x64.cdf 2015-04-09 22:24:01 UTC (rev 1505) @@ -5,6 +5,6 @@ <ABSTRACT>Support files neccessary to use the OpenG ZIP library.</ABSTRACT> <IMPLEMENTATION> <OS VALUE="NI-Linux x64" /> - <CODEBASE FILENAME="LinuxRT_arm/lvzlib.so" TARGET="/usr/local/lib/lvzlib.so"/> + <CODEBASE FILENAME="LinuxRT_arm/liblvzlib.so" TARGET="/usr/local/lib/liblvzlib.so"/> </IMPLEMENTATION> </SOFTPKG> \ No newline at end of file Added: trunk/lvzip/build lvzip 70.vi =================================================================== (Binary files differ) Index: trunk/lvzip/build lvzip 70.vi =================================================================== --- trunk/lvzip/build lvzip 70.vi 2015-04-08 22:06:42 UTC (rev 1504) +++ trunk/lvzip/build lvzip 70.vi 2015-04-09 22:24:01 UTC (rev 1505) Property changes on: trunk/lvzip/build lvzip 70.vi ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title - Sub.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/build_support/Call-Back VI - Rem namespace from Window Title.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/build_support/Pre-Post Build (testing).vi =================================================================== (Binary files differ) Modified: trunk/lvzip/c_source/.cproject =================================================================== --- trunk/lvzip/c_source/.cproject 2015-04-08 22:06:42 UTC (rev 1504) +++ trunk/lvzip/c_source/.cproject 2015-04-09 22:24:01 UTC (rev 1505) @@ -46,7 +46,7 @@ </tool> <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.166571776" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"> <option defaultValue="true" id="gnu.c.link.option.shared.2007093736" name="Shared (-shared)" superClass="gnu.c.link.option.shared" valueType="boolean"/> - <option id="gnu.c.link.option.soname.2116511029" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="" valueType="string"/> + <option id="gnu.c.link.option.soname.2116511029" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="lvzlib.so" valueType="string"/> <inputType id="cdt.managedbuild.tool.gnu.c.linker.input.170246944" superClass="cdt.managedbuild.tool.gnu.c.linker.input"> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> <additionalInput kind="additionalinput" paths="$(LIBS)"/> @@ -116,7 +116,7 @@ </tool> <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.1269341061" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"> <option defaultValue="true" id="gnu.c.link.option.shared.1568470041" name="Shared (-shared)" superClass="gnu.c.link.option.shared" valueType="boolean"/> - <option id="gnu.c.link.option.soname.1221077034" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="" valueType="string"/> + <option id="gnu.c.link.option.soname.1221077034" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="lvzlib.so" valueType="string"/> <option id="gnu.c.link.option.libs.898536949" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs"> <listOptionValue builtIn="false" value="c"/> </option> @@ -187,7 +187,7 @@ </tool> <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.477639206" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"> <option defaultValue="true" id="gnu.c.link.option.shared.2029103574" name="Shared (-shared)" superClass="gnu.c.link.option.shared" valueType="boolean"/> - <option id="gnu.c.link.option.soname.572765043" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="" valueType="string"/> + <option id="gnu.c.link.option.soname.572765043" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="lvzlib.so" valueType="string"/> <inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1838097184" superClass="cdt.managedbuild.tool.gnu.c.linker.input"> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> <additionalInput kind="additionalinput" paths="$(LIBS)"/> @@ -256,7 +256,7 @@ </tool> <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.779141276" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"> <option defaultValue="true" id="gnu.c.link.option.shared.424578524" name="Shared (-shared)" superClass="gnu.c.link.option.shared" valueType="boolean"/> - <option id="gnu.c.link.option.soname.1244426688" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="" valueType="string"/> + <option id="gnu.c.link.option.soname.1244426688" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="lvzlib.so" valueType="string"/> <option id="gnu.c.link.option.libs.1119215829" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs"> <listOptionValue builtIn="false" value="c"/> </option> @@ -324,7 +324,7 @@ </tool> <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.198870300" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"> <option defaultValue="true" id="gnu.c.link.option.shared.1898938371" name="Shared (-shared)" superClass="gnu.c.link.option.shared" valueType="boolean"/> - <option id="gnu.c.link.option.soname.1582106034" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="" valueType="string"/> + <option id="gnu.c.link.option.soname.1582106034" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="lvzlib.so" valueType="string"/> <option id="gnu.c.link.option.libs.75776481" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs"> <listOptionValue builtIn="false" value="c"/> </option> @@ -389,7 +389,7 @@ </tool> <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.961407367" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"> <option defaultValue="true" id="gnu.c.link.option.shared.785968802" name="Shared (-shared)" superClass="gnu.c.link.option.shared" valueType="boolean"/> - <option id="gnu.c.link.option.soname.444747950" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="" valueType="string"/> + <option id="gnu.c.link.option.soname.444747950" name="Shared object name (-Wl,-soname=)" superClass="gnu.c.link.option.soname" value="lvzlib.so" valueType="string"/> <inputType id="cdt.managedbuild.tool.gnu.c.linker.input.2125924394" superClass="cdt.managedbuild.tool.gnu.c.linker.input"> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> <additionalInput kind="additionalinput" paths="$(LIBS)"/> Modified: trunk/lvzip/lvzip.ogbld =================================================================== --- trunk/lvzip/lvzip.ogbld 2015-04-08 22:06:42 UTC (rev 1504) +++ trunk/lvzip/lvzip.ogbld 2015-04-09 22:24:01 UTC (rev 1505) @@ -87,16 +87,4 @@ Save Level=0 Default Destination=FALSE Apply New Password="" -Namespace="" - -[SupportFiles 1] -TargetDir="" -OverwriteExisting=TRUE -FollowVIDirHierarchy=FALSE -Recursive=FALSE -Exclude=FALSE -SourceFile 1=lvzlib.* -SourceFile 2=submenus/*.mnu -SourceFile 3=readme.txt -SourceFile 4=PreInstall.vi -SourceFile 5=PostInstall.vi \ No newline at end of file +Namespace="" \ No newline at end of file Modified: trunk/lvzip/lvzip.ogpb =================================================================== --- trunk/lvzip/lvzip.ogpb 2015-04-08 22:06:42 UTC (rev 1504) +++ trunk/lvzip/lvzip.ogpb 2015-04-09 22:24:01 UTC (rev 1505) @@ -11,7 +11,7 @@ Description="The lvzip package contains several routines for operating on zip files.\0D\0A" Summary="OpenG Zip Tools" License="BSD (VIs), LGPL (Shared Library)" -Copyright="1995-2014 Mark Adler, Jean-loup Gailly\0A1998-2014 Gilles Vollant\0A2002 - 2015 Christophe Salzmann, Jim Kring, Rolf Kalbermatter" +Copyright="1995-2014 Mark Adler, Jean-loup Gailly\0A1998-2014 Gilles Vollant\0A2002 - 2009 Christophe Salzmann, Jim Kring\0A2002 - 2015 Rolf Kalbermatter" Distribution="OpenG Toolkit" Vendor=OpenG.org URL=http://wiki.openg.org/oglib_lvzip @@ -147,7 +147,7 @@ DirMode=0 NameMode=0 PPFix="" -Target Dir="<OpenG.lib>/lvzip/RT Images/" +Target Dir="<OpenG.lib>/lvzip/RT Images" Replace Mode="If Newer" Exclusive_OS="Windows NT,Windows 9x" Num Files=1 Deleted: trunk/lvzip/source/liblvzlib.so =================================================================== (Binary files differ) Deleted: trunk/lvzip/source/liblvzlib64.so =================================================================== (Binary files differ) Copied: trunk/lvzip/source/lvzlib.so (from rev 1504, trunk/lvzip/source/liblvzlib.so) =================================================================== (Binary files differ) Copied: trunk/lvzip/source/lvzlib64.so (from rev 1504, trunk/lvzip/source/liblvzlib64.so) =================================================================== (Binary files differ) Modified: trunk/lvzip/source/opengdoc.txt =================================================================== --- trunk/lvzip/source/opengdoc.txt 2015-04-08 22:06:42 UTC (rev 1504) +++ trunk/lvzip/source/opengdoc.txt 2015-04-09 22:24:01 UTC (rev 1505) @@ -40,4 +40,5 @@ Copyright (C) 1995-2004 Mark Adler, Jean-loup Gailly Copyright (C) 1998-2004 Gilles Vollant -Copyright (C) 2002-2009 Rolf Kalbermatter, Jim Kring, Christoph Salzmann +Copyright (C) 2002-2009 Jim Kring, Christoph Salzmann +Copyright (C) 2002-2015 Rolf Kalbermatter This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2015-05-03 15:15:58
|
Revision: 1519 http://sourceforge.net/p/opengtoolkit/svn/1519 Author: labviewer Date: 2015-05-03 15:15:55 +0000 (Sun, 03 May 2015) Log Message: ----------- Add some preliminary support for link handling Modified Paths: -------------- trunk/lvzip/c_source/lvutil.c trunk/lvzip/c_source/lvutil.h trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi trunk/lvzip/source/fileutil.llb/FILE Resource Header.ctl trunk/lvzip/source/fileutil.llb/FILE Size Padding.vi trunk/lvzip/source/lvzip.llb/ZLIB Block Size.vi trunk/lvzip/source/lvzip.llb/ZLIB CRC32.vi trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi trunk/lvzip/source/lvzip.llb/ZLIB Close Unzip Archive.vi trunk/lvzip/source/lvzip.llb/ZLIB Close Write File.vi trunk/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi trunk/lvzip/source/lvzip.llb/ZLIB Common Path to Specific Path.vi trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi trunk/lvzip/source/lvzip.llb/ZLIB Compress File Info.ctl trunk/lvzip/source/lvzip.llb/ZLIB Convert File Info.vi trunk/lvzip/source/lvzip.llb/ZLIB Deflate.vi trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents.vi trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi trunk/lvzip/source/lvzip.llb/ZLIB Extract File.vi trunk/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi trunk/lvzip/source/lvzip.llb/ZLIB Extract.vi trunk/lvzip/source/lvzip.llb/ZLIB File Info.ctl trunk/lvzip/source/lvzip.llb/ZLIB File Information.vi trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi trunk/lvzip/source/lvzip.llb/ZLIB Get File CRC32.vi trunk/lvzip/source/lvzip.llb/ZLIB Get File.vi trunk/lvzip/source/lvzip.llb/ZLIB Get Global Info.vi trunk/lvzip/source/lvzip.llb/ZLIB Go To First File.vi trunk/lvzip/source/lvzip.llb/ZLIB Go To Next File.vi trunk/lvzip/source/lvzip.llb/ZLIB Inflate.vi trunk/lvzip/source/lvzip.llb/ZLIB Initialize File Functions.vi trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi trunk/lvzip/source/lvzip.llb/ZLIB Locate File.vi trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Read File.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Write File.vi trunk/lvzip/source/lvzip.llb/ZLIB Open ZIP Mode.ctl trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Archive.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Stream.vi trunk/lvzip/source/lvzip.llb/ZLIB Open Zip.vi trunk/lvzip/source/lvzip.llb/ZLIB Path to Path String.vi trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed File.vi trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed Stream.vi trunk/lvzip/source/lvzip.llb/ZLIB Read Local Extra Data.vi trunk/lvzip/source/lvzip.llb/ZLIB Specific Path to Common Path.vi trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi trunk/lvzip/source/lvzip.llb/ZLIB Store Stream.vi trunk/lvzip/source/lvzip.llb/ZLIB Store.vi trunk/lvzip/source/lvzip.llb/ZLIB Transfer Raw File.vi trunk/lvzip/source/lvzip.llb/ZLIB Uncompress File Info.ctl trunk/lvzip/source/lvzip.llb/ZLIB Unzip Handle.ctl trunk/lvzip/source/lvzip.llb/ZLIB Write File.vi trunk/lvzip/source/lvzip.llb/ZLIB Write Stream.vi trunk/lvzip/source/lvzip.llb/ZLIB Zip Handle.ctl trunk/lvzip/source/macbin.llb/MACBIN CCITT_CRC16.vi trunk/lvzip/source/macbin.llb/MACBIN Create Header.vi trunk/lvzip/source/macbin.llb/MACBIN Decode MacBinary.vi trunk/lvzip/source/macbin.llb/MACBIN Encode MacBinary.vi trunk/lvzip/source/macbin.llb/MACBIN Macbinary Header.ctl trunk/lvzip/source/macbin.llb/MACBIN Read Header.vi trunk/lvzip/source/macbin.llb/MACBIN Resource File Info.vi trunk/lvzip/source/macbin.llb/MACBIN Verify Header.vi trunk/lvzip/tests/lvzip-test add to empty archive.vi trunk/lvzip/tests/lvzip-test-delete files from archive.vi trunk/lvzip/tests/lvzip-test-memory stream.vi trunk/lvzip/tests/lvzip-test-sm text files.vi trunk/lvzip/tests/lvzip-test-string compress.vi Modified: trunk/lvzip/c_source/lvutil.c =================================================================== --- trunk/lvzip/c_source/lvutil.c 2015-05-03 11:21:46 UTC (rev 1518) +++ trunk/lvzip/c_source/lvutil.c 2015-05-03 15:15:55 UTC (rev 1519) @@ -32,6 +32,37 @@ #ifndef INVALID_FILE_ATTRIBUTES #define INVALID_FILE_ATTRIBUTES ((DWORD)-1) #endif + #define REPARSE_FOLDER (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_REPARSE_POINT) + typedef struct _REPARSE_DATA_BUFFER + { + ULONG ReparseTag; + USHORT ReparseDataLength; + USHORT Reserved; + union + { + struct + { + USHORT SubstituteNameOffset; + USHORT SubstituteNameLength; + USHORT PrintNameOffset; + USHORT PrintNameLength; + ULONG Flags; + WCHAR PathBuffer[1]; + } SymbolicLinkReparseBuffer; + struct + { + USHORT SubstituteNameOffset; + USHORT SubstituteNameLength; + USHORT PrintNameOffset; + USHORT PrintNameLength; + WCHAR PathBuffer[1]; + } MountPointReparseBuffer; + struct + { + UCHAR DataBuffer[1]; + } GenericReparseBuffer; + } DUMMYUNIONNAME; + } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; #elif Unix #include <errno.h> #include <dirent.h> @@ -307,7 +338,7 @@ } #endif -#if usesPosixPath +#if MacOSX || Unix static MgErr UnixToLVFileErr(void) { switch (errno) @@ -883,6 +914,145 @@ return err; } +LibAPI(MgErr) LVPath_CreateLink(Path path, uInt32 flags, Path target) +{ + MgErr err = mgNoErr; + LStrHandle src = NULL; + LStrHandle tgt = NULL; + + if (!FIsAbsPath(path)) + return mgArgErr; + + err = LVPath_ToText(path, &src); + if (!err) + { + err = LVPath_ToText(target, &tgt); + if (!err) + { +#if MacOSX || Unix + if (flags & kLinkHard) + { + if (link((const char*)LStrBuf(*src), (const char*)LStrBuf(*tgt))) + err = UnixToLVFileErr(); + } + else + { + if (symlink((const char*)LStrBuf(*src), (const char*)LStrBuf(*tgt))) + err = UnixToLVFileErr(); + } +#elif Win32 + if (FExists(target)) + { + FInfoRec finfo; + err = FGetInfo(target, &finfo); + if (!err && finfo.folder) + flags |= kLinkDir; + } + if (!err) + { + if (flags & kLinkHard) + { + if (flags & kLinkDir) + err = mgNotSupported; + else if (!CreateHardLinkA(LStrBuf(*src), LStrBuf(*tgt), NULL) + { + err = Win32ToLVFileErr(); + } + } + else if (!CreateSymbolicLinkA(LStrBuf(*src), LStrBuf(*tgt), flags & kLinkDir ? SYMBOLIC_LINK_FLAG_DIRECTORY : 0)) + { + err = Win32ToLVFileErr(); + } + } +#else + err = mgNotSupported; +#endif + DSDisposeHandle((UHandle)tgt); + } + DSDisposeHandle((UHandle)src); + } + return err; +} + +LibAPI(MgErr) LVPath_ReadLink(Path path, Path *target) +{ + MgErr err = mgNoErr; + LStrHandle src = NULL; + + if (!FIsAbsPath(path)) + return mgArgErr; + + err = LVPath_ToText(path, &src); + if (!err) + { +#if MacOSX || Unix + struct stat st; + char *buf; + int len; + + if (lstat((const char*)LStrBuf(*src), &st)) + { + err = UnixToLVFileErr(); + } + else + { + len = st.st_size + 1; + buf = malloc(len); + if (!buf) + { + err = mFullErr; + } + } + + while (!err) + { + ssize_t retval = readlink((const char*)LStrBuf(*src), buf, len); + if (retval < 0) + { + err = UnixToLVFileErr(); + } + else if (retval < len) + { + + free(buf); + break; + } + len += len; + buf = realloc(buf, len); + } +#elif Win32 + if (GetFileAttributes(fpath) & REPARSE_FOLDER == REPARSE_FOLDER) + { + // Open the file correctly depending on the string type. + HANDLE handle = CreateFileA(fpath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_FLAG_OPEN_REPARSE_POINT, 0); + + // MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384 = (16*1024) + buffer = DeviceIoControl(handle, FSCTL_GET_REPARSE_POINT, NULL, 16*1024) + // Above will return an ugly string (byte array), so we'll need to parse it. + // But first, we'll close the handle to our file so we're not locking it anymore. + CloseHandle(handle) + + // Minimum possible length (assuming that the length of the target is bigger than 0) + if len(buffer) < 9: + return None + // Parse and return our result. + result = parse_reparse_buffer(buffer) + offset = result[SYMBOLIC_LINK]['substitute_name_offset'] + ending = offset + result[SYMBOLIC_LINK]['substitute_name_length'] + rpath = result[SYMBOLIC_LINK]['buffer'][offset:ending].replace('\x00','') + if len(rpath) > 4 and rpath[0:4] == '\\??\\': + rpath = rpath[4:] + return rpath; + } +#else + err = mgNotSupported; +#endif + DSDisposeHandle((UHandle)src); + } + return err; +} + + static MgErr lvfile_CloseFile(FileRefNum ioRefNum) { MgErr err = mgNoErr; Modified: trunk/lvzip/c_source/lvutil.h =================================================================== --- trunk/lvzip/c_source/lvutil.h 2015-05-03 11:21:46 UTC (rev 1518) +++ trunk/lvzip/c_source/lvutil.h 2015-05-03 15:15:55 UTC (rev 1519) @@ -310,7 +310,7 @@ int16 h; } LVPoint; -typedef uChar Str255[256], *PStr, *CStr, *UPtr, **UHandle; +typedef uChar Str255[256], *PStr, *CStr, *UPtr, **UHandle, **PStrHandle; typedef const uChar *ConstCStr, *ConstPStr, *ConstUPtr, ConstStr255[256]; #define PStrBuf(b) (&((PStr)(b))[1]) @@ -531,14 +531,28 @@ #define kNotARefNum ((LVRefNum)0L) /* canonical invalid magic cookie */ /* LabVIEW exported functions */ +MgErr FRelPath(ConstPath start, ConstPath end, Path relPath); +MgErr FAddPath(ConstPath basePath, ConstPath relPath, Path newPath); +MgErr FAppendName(Path path, ConstPStr name); +MgErr FName(ConstPath path, PStrHandle name); +MgErr FNamePtr(ConstPath path, PStr name); +MgErr FDirName(ConstPath path, Path dir); +MgErr FVolName(ConstPath path, Path vol); +Path FMakePath(Path path, int32 type, ...); +Path FEmptyPath(Path); +Path FNotAPath(Path); Bool32 FIsAPath(Path path); +Bool32 FIsAbsPath(Path path); MgErr FPathToText(Path path, LStrPtr lstr); MgErr FPathToPath(Path *p); -MgErr FAppendName(Path path, PStr name); Bool32 FIsAPathOfType(Path path, int32 ofType); MgErr FGetPathType(Path, int32*); int32 FDepth(Path path); MgErr FDisposePath(Path p); + +#define FIsAbsPath(path) FIsAPathOfType(path, fAbsPath) +#define FIsRelPath(path) FIsAPathOfType(path, fRelPath) + MgErr FNewRefNum(Path path, File fd, LVRefNum* refnum); Bool32 FIsARefNum(LVRefNum); MgErr FDisposeRefNum(LVRefNum); @@ -588,21 +602,36 @@ FMListDetails elm[1]; } FileInfoArrRec, *FileInfoArrPtr, **FileInfoArrHdl; +#define kLinkNone 0 +#define kLinkHard 1 +#define kLinkDir 2 + /* Our exported functions */ +/**************************/ + +/* Version string of the zlib library */ LibAPI(void) DLLVersion OF((uChar* Version)); +/* Convert the path into a string representation for the current platform */ LibAPI(MgErr) LVPath_ToText(Path path, LStrHandle *str); + +/* Check if the file path points to has a resource fork */ LibAPI(MgErr) LVPath_HasResourceFork(Path path, LVBoolean *hasResFork, uInt32 *sizeLow, uInt32 *sizeHigh); + +/* List the directory contents with an additional array with flags and file type for each file in the names array */ +LibAPI(MgErr) LVPath_ListDirectory(Path dirname, LStrArrHdl *names, FileInfoArrHdl *fileInfo); + +/* Retrieve MacOS finder information from the file, unsupported on non Mac platforms */ +LibAPI(MgErr) LVPath_UtilFileInfo(Path path, uInt8 write, uInt8 *isDirectory, LVFileInfo *finderInfo, LStrHandle comment); + +/* Create and read a link */ +LibAPI(MgErr) LVPath_CreateLink(Path path, uInt32 flags, Path target); +LibAPI(MgErr) LVPath_ReadLink(Path path, Path *target); + +/* Legacy functions not supported on Mac OSX and all non-Mac platforms */ LibAPI(MgErr) LVPath_EncodeMacbinary(Path srcFileName, Path dstFileName); LibAPI(MgErr) LVPath_DecodeMacbinary(Path srcFileName, Path dstFileName); -LibAPI(MgErr) LVPath_ListDirectory(Path dirname, LStrArrHdl *names, FileInfoArrHdl *fileInfo); -LibAPI(MgErr) LVPath_UtilFileInfo(Path path, - uInt8 write, - uInt8 *isDirectory, - LVFileInfo *finderInfo, - LStrHandle comment); - typedef union { int64 q; Modified: trunk/lvzip/source/fileutil.llb/FILE Copy Fork From File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/fileutil.llb/FILE Copy Fork To File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/fileutil.llb/FILE Get Directory Content.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/fileutil.llb/FILE Open File Refnum.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/fileutil.llb/FILE Resource File Info.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/fileutil.llb/FILE Resource Header.ctl =================================================================== (Binary files differ) Modified: trunk/lvzip/source/fileutil.llb/FILE Size Padding.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Block Size.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB CRC32.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Unzip Archive.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Write File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Common Path to Specific Path.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress File Info.ctl =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Convert File Info.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Deflate.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB File Info.ctl =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB File Information.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get File CRC32.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Global Info.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To First File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To Next File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Inflate.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Initialize File Functions.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Locate File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Read File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Write File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open ZIP Mode.ctl =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Archive.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Stream.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Path to Path String.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed Stream.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Local Extra Data.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Specific Path to Common Path.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store Stream.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Transfer Raw File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Uncompress File Info.ctl =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Unzip Handle.ctl =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Write File.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Write Stream.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/lvzip.llb/ZLIB Zip Handle.ctl =================================================================== (Binary files differ) Modified: trunk/lvzip/source/macbin.llb/MACBIN CCITT_CRC16.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/macbin.llb/MACBIN Create Header.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/macbin.llb/MACBIN Decode MacBinary.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/macbin.llb/MACBIN Encode MacBinary.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/macbin.llb/MACBIN Macbinary Header.ctl =================================================================== (Binary files differ) Modified: trunk/lvzip/source/macbin.llb/MACBIN Read Header.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/macbin.llb/MACBIN Resource File Info.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/source/macbin.llb/MACBIN Verify Header.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/tests/lvzip-test add to empty archive.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/tests/lvzip-test-delete files from archive.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/tests/lvzip-test-memory stream.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/tests/lvzip-test-sm text files.vi =================================================================== (Binary files differ) Modified: trunk/lvzip/tests/lvzip-test-string compress.vi =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2015-05-06 17:23:53
|
Revision: 1525 http://sourceforge.net/p/opengtoolkit/svn/1525 Author: labviewer Date: 2015-05-06 17:23:50 +0000 (Wed, 06 May 2015) Log Message: ----------- Fix an error when checking if a file has a resource data Modified Paths: -------------- trunk/lvzip/c_source/lvutil.c trunk/lvzip/source/lvzlib.framework.zip Modified: trunk/lvzip/c_source/lvutil.c =================================================================== --- trunk/lvzip/c_source/lvutil.c 2015-05-06 16:15:31 UTC (rev 1524) +++ trunk/lvzip/c_source/lvutil.c 2015-05-06 17:23:50 UTC (rev 1525) @@ -539,7 +539,7 @@ if (!err) { ssize_t len = getxattr((const char)LStrBuf(*lstr), XATTR_RESOURCEFORK_NAME, NULL, 0, 0, O_NOFOLLOW); - if (len) + if (len != -1) { if (hasResFork) *hasResFork = LV_TRUE; Modified: trunk/lvzip/source/lvzlib.framework.zip =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lab...@us...> - 2015-05-27 18:39:29
|
Revision: 1534 http://sourceforge.net/p/opengtoolkit/svn/1534 Author: labviewer Date: 2015-05-27 18:39:26 +0000 (Wed, 27 May 2015) Log Message: ----------- Add AES and BZIP2 files to project Modified Paths: -------------- trunk/lvzip/c_source/aes/entropy.c trunk/lvzip/c_source/aes/pwd2key.c trunk/lvzip/c_source/bzip2/bzlib.c trunk/lvzip/c_source/lvutil.c trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj trunk/lvzip/c_source/mztools.c trunk/lvzip/c_source/mztools.h trunk/lvzip/c_source/unzip.c trunk/lvzip/c_source/zip.c trunk/lvzip/source/lvzlib.framework.zip Modified: trunk/lvzip/c_source/aes/entropy.c =================================================================== --- trunk/lvzip/c_source/aes/entropy.c 2015-05-27 17:17:08 UTC (rev 1533) +++ trunk/lvzip/c_source/aes/entropy.c 2015-05-27 18:39:26 UTC (rev 1534) @@ -4,6 +4,7 @@ #include <stdio.h> #include <fcntl.h> #endif +#include "entropy.h" #if defined(__cplusplus) extern "C" Modified: trunk/lvzip/c_source/aes/pwd2key.c =================================================================== --- trunk/lvzip/c_source/aes/pwd2key.c 2015-05-27 17:17:08 UTC (rev 1533) +++ trunk/lvzip/c_source/aes/pwd2key.c 2015-05-27 18:39:26 UTC (rev 1534) @@ -35,6 +35,7 @@ #include <memory.h> #include "hmac.h" +#include "pwd2key.h" #if defined(__cplusplus) extern "C" Modified: trunk/lvzip/c_source/bzip2/bzlib.c =================================================================== --- trunk/lvzip/c_source/bzip2/bzlib.c 2015-05-27 17:17:08 UTC (rev 1533) +++ trunk/lvzip/c_source/bzip2/bzlib.c 2015-05-27 18:39:26 UTC (rev 1534) @@ -99,14 +99,14 @@ /*---------------------------------------------------*/ static -void* default_bzalloc ( void* opaque, Int32 items, Int32 size ) +void* default_bzalloc(void* opaque, Int32 items, Int32 size) { - void* v = malloc ( items * size ); + void* v = malloc (items * size); return v; } static -void default_bzfree ( void* opaque, void* addr ) +void default_bzfree(void* opaque, void* addr) { if (addr != NULL) free ( addr ); } Modified: trunk/lvzip/c_source/lvutil.c =================================================================== --- trunk/lvzip/c_source/lvutil.c 2015-05-27 17:17:08 UTC (rev 1533) +++ trunk/lvzip/c_source/lvutil.c 2015-05-27 18:39:26 UTC (rev 1534) @@ -111,11 +111,14 @@ #endif #if HAVE_BZIP2 +void bz_internal_error(int errcode); void bz_internal_error(int errcode) { // if we have a debug build then print the error in the LabVIEW debug console #if DEBUG - DbgPrintf("BZIP2 internal error %ld occurred!!", errcode); + DbgPrintf((CStr)"BZIP2 internal error %ld occurred!!", errcode); +#else + Unused(errcode); #endif } #endif @@ -1820,7 +1823,7 @@ #endif if (!err) { - err = FNewRefNum(path, (File)ioRefNum, refnum); + err = FNewRefNum(path, (File)(ioRefNum), refnum); } if (err) { Modified: trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj =================================================================== --- trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj 2015-05-27 17:17:08 UTC (rev 1533) +++ trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj 2015-05-27 18:39:26 UTC (rev 1534) @@ -42,6 +42,36 @@ 839542EF0894F2490020C3E2 /* gvmat32c.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542B80894F2490020C3E2 /* gvmat32c.c */; }; 839542F10894F2490020C3E2 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542BA0894F2490020C3E2 /* adler32.c */; }; 83D3E26D080D117700DE332C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83D3E26C080D117700DE332C /* Carbon.framework */; }; + 8832627B1B163FAF003BB2F4 /* aes_via_ace.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262661B163FAF003BB2F4 /* aes_via_ace.h */; }; + 8832627C1B163FAF003BB2F4 /* aes.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262671B163FAF003BB2F4 /* aes.h */; }; + 8832627D1B163FAF003BB2F4 /* aescrypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262681B163FAF003BB2F4 /* aescrypt.c */; }; + 8832627E1B163FAF003BB2F4 /* aeskey.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262691B163FAF003BB2F4 /* aeskey.c */; }; + 8832627F1B163FAF003BB2F4 /* aesopt.h in Headers */ = {isa = PBXBuildFile; fileRef = 8832626A1B163FAF003BB2F4 /* aesopt.h */; }; + 883262801B163FAF003BB2F4 /* aestab.c in Sources */ = {isa = PBXBuildFile; fileRef = 8832626B1B163FAF003BB2F4 /* aestab.c */; }; + 883262811B163FAF003BB2F4 /* aestab.h in Headers */ = {isa = PBXBuildFile; fileRef = 8832626C1B163FAF003BB2F4 /* aestab.h */; }; + 883262821B163FAF003BB2F4 /* brg_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = 8832626D1B163FAF003BB2F4 /* brg_endian.h */; }; + 883262831B163FAF003BB2F4 /* brg_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 8832626E1B163FAF003BB2F4 /* brg_types.h */; }; + 883262841B163FAF003BB2F4 /* entropy.c in Sources */ = {isa = PBXBuildFile; fileRef = 8832626F1B163FAF003BB2F4 /* entropy.c */; }; + 883262851B163FAF003BB2F4 /* entropy.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262701B163FAF003BB2F4 /* entropy.h */; }; + 883262861B163FAF003BB2F4 /* fileenc.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262711B163FAF003BB2F4 /* fileenc.c */; }; + 883262871B163FAF003BB2F4 /* fileenc.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262721B163FAF003BB2F4 /* fileenc.h */; }; + 883262881B163FAF003BB2F4 /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262731B163FAF003BB2F4 /* hmac.c */; }; + 883262891B163FAF003BB2F4 /* hmac.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262741B163FAF003BB2F4 /* hmac.h */; }; + 8832628A1B163FAF003BB2F4 /* prng.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262751B163FAF003BB2F4 /* prng.c */; }; + 8832628B1B163FAF003BB2F4 /* prng.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262761B163FAF003BB2F4 /* prng.h */; }; + 8832628C1B163FAF003BB2F4 /* pwd2key.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262771B163FAF003BB2F4 /* pwd2key.c */; }; + 8832628D1B163FAF003BB2F4 /* pwd2key.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262781B163FAF003BB2F4 /* pwd2key.h */; }; + 8832628E1B163FAF003BB2F4 /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262791B163FAF003BB2F4 /* sha1.c */; }; + 8832628F1B163FAF003BB2F4 /* sha1.h in Headers */ = {isa = PBXBuildFile; fileRef = 8832627A1B163FAF003BB2F4 /* sha1.h */; }; + 883262991B163FD6003BB2F4 /* blocksort.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262901B163FD6003BB2F4 /* blocksort.c */; }; + 8832629A1B163FD6003BB2F4 /* bzlib_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262911B163FD6003BB2F4 /* bzlib_private.h */; }; + 8832629B1B163FD6003BB2F4 /* bzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262921B163FD6003BB2F4 /* bzlib.c */; }; + 8832629C1B163FD6003BB2F4 /* bzlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 883262931B163FD6003BB2F4 /* bzlib.h */; }; + 8832629D1B163FD6003BB2F4 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262941B163FD6003BB2F4 /* compress.c */; }; + 8832629E1B163FD6003BB2F4 /* crctable.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262951B163FD6003BB2F4 /* crctable.c */; }; + 8832629F1B163FD6003BB2F4 /* decompress.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262961B163FD6003BB2F4 /* decompress.c */; }; + 883262A01B163FD6003BB2F4 /* huffman.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262971B163FD6003BB2F4 /* huffman.c */; }; + 883262A11B163FD6003BB2F4 /* randtable.c in Sources */ = {isa = PBXBuildFile; fileRef = 883262981B163FD6003BB2F4 /* randtable.c */; }; 888E743A1ADD96A900C5AEFE /* utf.c in Sources */ = {isa = PBXBuildFile; fileRef = 888E74391ADD96A900C5AEFE /* utf.c */; }; 888E743C1ADD96C200C5AEFE /* utf.h in Headers */ = {isa = PBXBuildFile; fileRef = 888E743B1ADD96C200C5AEFE /* utf.h */; }; 888E743E1ADD96D700C5AEFE /* lvapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 888E743D1ADD96D700C5AEFE /* lvapi.c */; }; @@ -86,6 +116,36 @@ 839542BA0894F2490020C3E2 /* adler32.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = adler32.c; sourceTree = "<group>"; }; 83D3E1AF080D116E00DE332C /* lvzlib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = lvzlib.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 83D3E26C080D117700DE332C /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; + 883262661B163FAF003BB2F4 /* aes_via_ace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aes_via_ace.h; path = aes/aes_via_ace.h; sourceTree = "<group>"; }; + 883262671B163FAF003BB2F4 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aes.h; path = aes/aes.h; sourceTree = "<group>"; }; + 883262681B163FAF003BB2F4 /* aescrypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aescrypt.c; path = aes/aescrypt.c; sourceTree = "<group>"; }; + 883262691B163FAF003BB2F4 /* aeskey.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aeskey.c; path = aes/aeskey.c; sourceTree = "<group>"; }; + 8832626A1B163FAF003BB2F4 /* aesopt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aesopt.h; path = aes/aesopt.h; sourceTree = "<group>"; }; + 8832626B1B163FAF003BB2F4 /* aestab.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aestab.c; path = aes/aestab.c; sourceTree = "<group>"; }; + 8832626C1B163FAF003BB2F4 /* aestab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aestab.h; path = aes/aestab.h; sourceTree = "<group>"; }; + 8832626D1B163FAF003BB2F4 /* brg_endian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = brg_endian.h; path = aes/brg_endian.h; sourceTree = "<group>"; }; + 8832626E1B163FAF003BB2F4 /* brg_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = brg_types.h; path = aes/brg_types.h; sourceTree = "<group>"; }; + 8832626F1B163FAF003BB2F4 /* entropy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = entropy.c; path = aes/entropy.c; sourceTree = "<group>"; }; + 883262701B163FAF003BB2F4 /* entropy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = entropy.h; path = aes/entropy.h; sourceTree = "<group>"; }; + 883262711B163FAF003BB2F4 /* fileenc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fileenc.c; path = aes/fileenc.c; sourceTree = "<group>"; }; + 883262721B163FAF003BB2F4 /* fileenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fileenc.h; path = aes/fileenc.h; sourceTree = "<group>"; }; + 883262731B163FAF003BB2F4 /* hmac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hmac.c; path = aes/hmac.c; sourceTree = "<group>"; }; + 883262741B163FAF003BB2F4 /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hmac.h; path = aes/hmac.h; sourceTree = "<group>"; }; + 883262751B163FAF003BB2F4 /* prng.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = prng.c; path = aes/prng.c; sourceTree = "<group>"; }; + 883262761B163FAF003BB2F4 /* prng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prng.h; path = aes/prng.h; sourceTree = "<group>"; }; + 883262771B163FAF003BB2F4 /* pwd2key.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pwd2key.c; path = aes/pwd2key.c; sourceTree = "<group>"; }; + 883262781B163FAF003BB2F4 /* pwd2key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pwd2key.h; path = aes/pwd2key.h; sourceTree = "<group>"; }; + 883262791B163FAF003BB2F4 /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sha1.c; path = aes/sha1.c; sourceTree = "<group>"; }; + 8832627A1B163FAF003BB2F4 /* sha1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sha1.h; path = aes/sha1.h; sourceTree = "<group>"; }; + 883262901B163FD6003BB2F4 /* blocksort.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = blocksort.c; path = bzip2/blocksort.c; sourceTree = "<group>"; }; + 883262911B163FD6003BB2F4 /* bzlib_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bzlib_private.h; path = bzip2/bzlib_private.h; sourceTree = "<group>"; }; + 883262921B163FD6003BB2F4 /* bzlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bzlib.c; path = bzip2/bzlib.c; sourceTree = "<group>"; }; + 883262931B163FD6003BB2F4 /* bzlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bzlib.h; path = bzip2/bzlib.h; sourceTree = "<group>"; }; + 883262941B163FD6003BB2F4 /* compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = compress.c; path = bzip2/compress.c; sourceTree = "<group>"; }; + 883262951B163FD6003BB2F4 /* crctable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = crctable.c; path = bzip2/crctable.c; sourceTree = "<group>"; }; + 883262961B163FD6003BB2F4 /* decompress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = decompress.c; path = bzip2/decompress.c; sourceTree = "<group>"; }; + 883262971B163FD6003BB2F4 /* huffman.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = huffman.c; path = bzip2/huffman.c; sourceTree = "<group>"; }; + 883262981B163FD6003BB2F4 /* randtable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = randtable.c; path = bzip2/randtable.c; sourceTree = "<group>"; }; 88521A381AF4145000A9CDF7 /* lvapi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = lvapi.h; sourceTree = "<group>"; }; 888E74391ADD96A900C5AEFE /* utf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utf.c; sourceTree = "<group>"; }; 888E743B1ADD96C200C5AEFE /* utf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf.h; sourceTree = "<group>"; }; @@ -110,8 +170,8 @@ 83D3E18C080D116E00DE332C = { isa = PBXGroup; children = ( - C79368AA0C9ED687006083BF /* iomem.c */, - C79368AB0C9ED687006083BF /* iomem.h */, + 883262651B163F70003BB2F4 /* bzip2 */, + 883262641B163F5C003BB2F4 /* aes */, 83D3E1B5080D116E00DE332C /* zlib Sources */, 83D3E26B080D117700DE332C /* Frameworks */, 83D3E19A080D116E00DE332C /* Products */, @@ -129,6 +189,8 @@ 83D3E1B5080D116E00DE332C /* zlib Sources */ = { isa = PBXGroup; children = ( + C79368AB0C9ED687006083BF /* iomem.h */, + C79368AA0C9ED687006083BF /* iomem.c */, 88521A381AF4145000A9CDF7 /* lvapi.h */, 888E743D1ADD96D700C5AEFE /* lvapi.c */, 888E743B1ADD96C200C5AEFE /* utf.h */, @@ -179,6 +241,50 @@ name = Frameworks; sourceTree = "<group>"; }; + 883262641B163F5C003BB2F4 /* aes */ = { + isa = PBXGroup; + children = ( + 883262661B163FAF003BB2F4 /* aes_via_ace.h */, + 883262671B163FAF003BB2F4 /* aes.h */, + 883262681B163FAF003BB2F4 /* aescrypt.c */, + 883262691B163FAF003BB2F4 /* aeskey.c */, + 8832626A1B163FAF003BB2F4 /* aesopt.h */, + 8832626B1B163FAF003BB2F4 /* aestab.c */, + 8832626C1B163FAF003BB2F4 /* aestab.h */, + 8832626D1B163FAF003BB2F4 /* brg_endian.h */, + 8832626E1B163FAF003BB2F4 /* brg_types.h */, + 8832626F1B163FAF003BB2F4 /* entropy.c */, + 883262701B163FAF003BB2F4 /* entropy.h */, + 883262711B163FAF003BB2F4 /* fileenc.c */, + 883262721B163FAF003BB2F4 /* fileenc.h */, + 883262731B163FAF003BB2F4 /* hmac.c */, + 883262741B163FAF003BB2F4 /* hmac.h */, + 883262751B163FAF003BB2F4 /* prng.c */, + 883262761B163FAF003BB2F4 /* prng.h */, + 883262771B163FAF003BB2F4 /* pwd2key.c */, + 883262781B163FAF003BB2F4 /* pwd2key.h */, + 883262791B163FAF003BB2F4 /* sha1.c */, + 8832627A1B163FAF003BB2F4 /* sha1.h */, + ); + name = aes; + sourceTree = "<group>"; + }; + 883262651B163F70003BB2F4 /* bzip2 */ = { + isa = PBXGroup; + children = ( + 883262901B163FD6003BB2F4 /* blocksort.c */, + 883262911B163FD6003BB2F4 /* bzlib_private.h */, + 883262921B163FD6003BB2F4 /* bzlib.c */, + 883262931B163FD6003BB2F4 /* bzlib.h */, + 883262941B163FD6003BB2F4 /* compress.c */, + 883262951B163FD6003BB2F4 /* crctable.c */, + 883262961B163FD6003BB2F4 /* decompress.c */, + 883262971B163FD6003BB2F4 /* huffman.c */, + 883262981B163FD6003BB2F4 /* randtable.c */, + ); + name = bzip2; + sourceTree = "<group>"; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -187,22 +293,36 @@ buildActionMask = 2147483647; files = ( 839542C00894F2490020C3E2 /* lvutil.h in Headers */, + 8832627B1B163FAF003BB2F4 /* aes_via_ace.h in Headers */, 839542C60894F2490020C3E2 /* inffast.h in Headers */, 839542C90894F2490020C3E2 /* crc32.h in Headers */, 839542CB0894F2490020C3E2 /* crypt.h in Headers */, + 8832627F1B163FAF003BB2F4 /* aesopt.h in Headers */, 839542CD0894F2490020C3E2 /* inflate.h in Headers */, 839542CE0894F2490020C3E2 /* deflate.h in Headers */, + 883262831B163FAF003BB2F4 /* brg_types.h in Headers */, 888E743C1ADD96C200C5AEFE /* utf.h in Headers */, + 8832627C1B163FAF003BB2F4 /* aes.h in Headers */, 839542CF0894F2490020C3E2 /* zutil.h in Headers */, 839542D90894F2490020C3E2 /* ioapi.h in Headers */, 839542DB0894F2490020C3E2 /* inftrees.h in Headers */, 839542DD0894F2490020C3E2 /* zlib.h in Headers */, + 8832628B1B163FAF003BB2F4 /* prng.h in Headers */, + 8832629C1B163FD6003BB2F4 /* bzlib.h in Headers */, 839542DF0894F2490020C3E2 /* zip.h in Headers */, + 883262821B163FAF003BB2F4 /* brg_endian.h in Headers */, + 8832628D1B163FAF003BB2F4 /* pwd2key.h in Headers */, 839542E20894F2490020C3E2 /* zconf.h in Headers */, + 883262851B163FAF003BB2F4 /* entropy.h in Headers */, 839542E30894F2490020C3E2 /* unzip.h in Headers */, 839542E60894F2490020C3E2 /* trees.h in Headers */, 839542E80894F2490020C3E2 /* mztools.h in Headers */, 839542EC0894F2490020C3E2 /* inffixed.h in Headers */, + 8832628F1B163FAF003BB2F4 /* sha1.h in Headers */, + 883262871B163FAF003BB2F4 /* fileenc.h in Headers */, + 883262811B163FAF003BB2F4 /* aestab.h in Headers */, + 883262891B163FAF003BB2F4 /* hmac.h in Headers */, + 8832629A1B163FD6003BB2F4 /* bzlib_private.h in Headers */, C79368AD0C9ED687006083BF /* iomem.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -267,25 +387,41 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 8832628A1B163FAF003BB2F4 /* prng.c in Sources */, + 883262881B163FAF003BB2F4 /* hmac.c in Sources */, 839542C10894F2490020C3E2 /* lvutil.c in Sources */, 839542C30894F2490020C3E2 /* mztools.c in Sources */, + 8832629F1B163FD6003BB2F4 /* decompress.c in Sources */, 839542C70894F2490020C3E2 /* inffast.c in Sources */, 839542C80894F2490020C3E2 /* crc32.c in Sources */, 839542CA0894F2490020C3E2 /* deflate.c in Sources */, + 8832629D1B163FD6003BB2F4 /* compress.c in Sources */, 839542CC0894F2490020C3E2 /* inftrees.c in Sources */, + 8832628E1B163FAF003BB2F4 /* sha1.c in Sources */, 839542D00894F2490020C3E2 /* zutil.c in Sources */, 839542D60894F2490020C3E2 /* compress.c in Sources */, + 883262861B163FAF003BB2F4 /* fileenc.c in Sources */, 888E743E1ADD96D700C5AEFE /* lvapi.c in Sources */, + 883262A01B163FD6003BB2F4 /* huffman.c in Sources */, + 8832628C1B163FAF003BB2F4 /* pwd2key.c in Sources */, 839542DA0894F2490020C3E2 /* ioapi.c in Sources */, 839542E00894F2490020C3E2 /* zip.c in Sources */, + 883262841B163FAF003BB2F4 /* entropy.c in Sources */, 839542E40894F2490020C3E2 /* unzip.c in Sources */, 839542E50894F2490020C3E2 /* uncompr.c in Sources */, + 8832627E1B163FAF003BB2F4 /* aeskey.c in Sources */, 888E743A1ADD96A900C5AEFE /* utf.c in Sources */, 839542E70894F2490020C3E2 /* trees.c in Sources */, 839542EB0894F2490020C3E2 /* inflate.c in Sources */, 839542ED0894F2490020C3E2 /* infback.c in Sources */, 839542EF0894F2490020C3E2 /* gvmat32c.c in Sources */, 839542F10894F2490020C3E2 /* adler32.c in Sources */, + 8832629B1B163FD6003BB2F4 /* bzlib.c in Sources */, + 8832627D1B163FAF003BB2F4 /* aescrypt.c in Sources */, + 883262991B163FD6003BB2F4 /* blocksort.c in Sources */, + 8832629E1B163FD6003BB2F4 /* crctable.c in Sources */, + 883262A11B163FD6003BB2F4 /* randtable.c in Sources */, + 883262801B163FAF003BB2F4 /* aestab.c in Sources */, C79368AC0C9ED687006083BF /* iomem.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -306,7 +442,11 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = DEBUG; + GCC_PREPROCESSOR_DEFINITIONS = ( + HAVE_AES, + HAVE_BZIP2, + DEBUG, + ); GCC_REUSE_STRINGS = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO; @@ -350,7 +490,11 @@ GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_OPTIMIZATION_LEVEL = 0; + GCC_OPTIMIZATION_LEVEL = 3; + GCC_PREPROCESSOR_DEFINITIONS = ( + HAVE_AES, + HAVE_BZIP2, + ); GCC_REUSE_STRINGS = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO; @@ -393,6 +537,10 @@ GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + HAVE_AES, + HAVE_BZIP2, + ); GCC_REUSE_STRINGS = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO; @@ -431,6 +579,7 @@ "ADDITIONAL_SDKS[arch=i386]" = ""; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_CHAR_IS_UNSIGNED_CHAR = YES; + GCC_SYMBOLS_PRIVATE_EXTERN = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, @@ -441,6 +590,7 @@ MACH_O_TYPE = mh_dylib; MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = NO; + OTHER_CFLAGS = ""; SDKROOT = macosx10.8; }; name = Development; @@ -450,6 +600,7 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_CHAR_IS_UNSIGNED_CHAR = YES; + GCC_SYMBOLS_PRIVATE_EXTERN = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, @@ -460,6 +611,7 @@ MACH_O_TYPE = mh_dylib; MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = NO; + OTHER_CFLAGS = ""; SDKROOT = macosx10.8; }; name = Deployment; @@ -470,6 +622,7 @@ "ADDITIONAL_SDKS[arch=*]" = ""; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_CHAR_IS_UNSIGNED_CHAR = YES; + GCC_SYMBOLS_PRIVATE_EXTERN = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, @@ -480,6 +633,7 @@ MACH_O_TYPE = mh_dylib; MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = NO; + OTHER_CFLAGS = ""; SDKROOT = macosx10.8; }; name = Default; Modified: trunk/lvzip/c_source/mztools.c =================================================================== --- trunk/lvzip/c_source/mztools.c 2015-05-27 17:17:08 UTC (rev 1533) +++ trunk/lvzip/c_source/mztools.c 2015-05-27 18:39:26 UTC (rev 1534) @@ -10,6 +10,7 @@ #include <string.h> #include "zlib.h" #include "unzip.h" +#include "mztools.h" #define READ_8(adr) ((unsigned char)*(adr)) #define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) ) @@ -27,12 +28,7 @@ WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \ } while(0) -ZEXTERN int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered) -const char* file; -const char* fileOut; -const char* fileOutTmp; -uLong* nRecovered; -uLong* bytesRecovered; +ZEXTERN 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 2015-05-27 17:17:08 UTC (rev 1533) +++ trunk/lvzip/c_source/mztools.h 2015-05-27 18:39:26 UTC (rev 1534) @@ -22,11 +22,7 @@ fileOut: output file after recovery fileOutTmp: temporary file name used for recovery */ -extern int ZEXPORT unzRepair(const char* file, - const char* fileOut, - const char* fileOutTmp, - uLong* nRecovered, - uLong* bytesRecovered); +ZEXTERN 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 2015-05-27 17:17:08 UTC (rev 1533) +++ trunk/lvzip/c_source/unzip.c 2015-05-27 18:39:26 UTC (rev 1534) @@ -227,15 +227,15 @@ local int unz64local_getByte OF(( const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, - int *pi)); + uLong *pi)); -local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi) +local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pi) { unsigned char c; - int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1); - if (err==1) + int err = (int)ZREAD64(*pzlib_filefunc_def, filestream, &c,1 ); + if (err == 1) { - *pi = (int)c; + *pi = (uLong)c; return UNZ_OK; } else @@ -260,18 +260,17 @@ voidpf filestream, uLong *pX) { - uLong x ; - int i = 0; + uLong x, i = 0 ; int err; - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); + err = unz64local_getByte(pzlib_filefunc_def, filestream, &i); x = (uLong)i; if (err==UNZ_OK) - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); - x |= ((uLong)i)<<8; + err = unz64local_getByte(pzlib_filefunc_def, filestream, &i); + x |= ((uLong)i) << 8; - if (err==UNZ_OK) + if (err == UNZ_OK) *pX = x; else *pX = 0; @@ -287,26 +286,25 @@ voidpf filestream, uLong *pX) { - uLong x ; - int i = 0; + uLong x, i = 0 ; int err; - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); - x = (uLong)i; + err = unz64local_getByte(pzlib_filefunc_def, filestream,&i); + x = i; - if (err==UNZ_OK) - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); - x |= ((uLong)i)<<8; + if (err == UNZ_OK) + err = unz64local_getByte(pzlib_filefunc_def, filestream, &i); + x |= i << 8; - if (err==UNZ_OK) - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); - x |= ((uLong)i)<<16; + if (err == UNZ_OK) + err = unz64local_getByte(pzlib_filefunc_def, filestream, &i); + x |= i << 16; - if (err==UNZ_OK) - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); - x += ((uLong)i)<<24; + if (err == UNZ_OK) + err = unz64local_getByte(pzlib_filefunc_def, filestream, &i); + x |= i << 24; - if (err==UNZ_OK) + if (err == UNZ_OK) *pX = x; else *pX = 0; @@ -324,41 +322,41 @@ ZPOS64_T *pX) { ZPOS64_T x ; - int i = 0; + uLong i = 0; int err; - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); + err = unz64local_getByte(pzlib_filefunc_def, filestream, &i); x = (ZPOS64_T)i; - if (err==UNZ_OK) - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); - x |= ((ZPOS64_T)i)<<8; + if (err == UNZ_OK) + err = unz64local_getByte(pzlib_filefunc_def, filestream, &i); + x |= ((ZPOS64_T)i) << 8; - if (err==UNZ_OK) - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); - x |= ((ZPOS64_T)i)<<16; + if (err == UNZ_OK) + err = unz64local_getByte(pzlib_filefunc_def, filestream, &i); + x |= ((ZPOS64_T)i) << 16; - if (err==UNZ_OK) - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); - x |= ((ZPOS64_T)i)<<24; + if (err == UNZ_OK) + err = unz64local_getByte(pzlib_filefunc_def, filestream, &i); + x |= ((ZPOS64_T)i) << 24; - if (err==UNZ_OK) - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); - x |= ((ZPOS64_T)i)<<32; + if (err == UNZ_OK) + err = unz64local_getByte(pzlib_filefunc_def, filestream, &i); + x |= ((ZPOS64_T)i) << 32; - if (err==UNZ_OK) - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); - x |= ((ZPOS64_T)i)<<40; + if (err == UNZ_OK) + err = unz64local_getByte(pzlib_filefunc_def, filestream, &i); + x |= ((ZPOS64_T)i) << 40; - if (err==UNZ_OK) - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); - x |= ((ZPOS64_T)i)<<48; + if (err == UNZ_OK) + err = unz64local_getByte(pzlib_filefunc_def, filestream, &i); + x |= ((ZPOS64_T)i) << 48; - if (err==UNZ_OK) - err = unz64local_getByte(pzlib_filefunc_def,filestream,&i); - x |= ((ZPOS64_T)i)<<56; + if (err == UNZ_OK) + err = unz64local_getByte(pzlib_filefunc_def, filestream, &i); + x |= ((ZPOS64_T)i) << 56; - if (err==UNZ_OK) + if (err == UNZ_OK) *pX = x; else *pX = 0; @@ -370,19 +368,19 @@ { for (;;) { - char c1=*(fileName1++); - char c2=*(fileName2++); - if ((c1>='a') && (c1<='z')) + char c1 = *(fileName1++); + char c2 = *(fileName2++); + if ((c1 >= 'a') && (c1 <= 'z')) c1 -= 0x20; - if ((c2>='a') && (c2<='z')) + if ((c2 >= 'a') && (c2 <= 'z')) c2 -= 0x20; - if (c1=='\0') + if (c1 == '\0') return ((c2=='\0') ? 0 : -1); - if (c2=='\0') + if (c2 == '\0') return 1; - if (c1<c2) + if (c1 < c2) return -1; - if (c1>c2) + if (c1 > c2) return 1; } } @@ -1762,7 +1760,7 @@ if (ZREAD64(s->z_filefunc, s->filestream, passverify, AES_PWVERIFYSIZE) != AES_PWVERIFYSIZE) return UNZ_INTERNALERROR; - fcrypt_init(s->cur_file_info_internal.aes_encryption_mode, password, (unsigned long)strlen(password), saltvalue, + fcrypt_init(s->cur_file_info_internal.aes_encryption_mode, (const unsigned char)password, (unsigned long)strlen(password), saltvalue, passverify, &s->pfile_in_zip_read->aes_ctx); pfile_in_zip_read_info->rest_read_compressed -= saltlength + AES_PWVERIFYSIZE; @@ -1894,7 +1892,7 @@ #ifdef HAVE_AES if (s->cur_file_info.compression_method == AES_METHOD) { - fcrypt_decrypt(pfile_in_zip_read_info->read_buffer, uReadThis, &s->pfile_in_zip_read->aes_ctx); + fcrypt_decrypt((const unsigned char)pfile_in_zip_read_info->read_buffer, uReadThis, &s->pfile_in_zip_read->aes_ctx); } else #endif Modified: trunk/lvzip/c_source/zip.c =================================================================== --- trunk/lvzip/c_source/zip.c 2015-05-27 17:17:08 UTC (rev 1533) +++ trunk/lvzip/c_source/zip.c 2015-05-27 18:39:26 UTC (rev 1534) @@ -1446,7 +1446,7 @@ prng_rand(saltvalue, saltlength, zi->ci.aes_rng); prng_end(zi->ci.aes_rng); - fcrypt_init(AES_ENCRYPTIONMODE, password, (unsigned long)strlen(password), saltvalue, passverify, &zi->ci.aes_ctx); + fcrypt_init(AES_ENCRYPTIONMODE, (const unsigned char)password, (unsigned long)strlen(password), saltvalue, passverify, &zi->ci.aes_ctx); if (ZWRITE64(zi->z_filefunc, zi->filestream, saltvalue, saltlength) != saltlength) err = ZIP_ERRNO; @@ -1860,10 +1860,10 @@ zi->ci.stream_initialised = 0; } #ifdef HAVE_BZIP2 - else if((zi->ci.compression_method == Z_BZIP2ED)) + else if (zi->ci.compression_method == Z_BZIP2ED) { int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream); - if (err==ZIP_OK) + if (err == ZIP_OK) err = tmperr; zi->ci.stream_initialised = 0; } Modified: trunk/lvzip/source/lvzlib.framework.zip =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |