Menu
▾
▴
[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1050] trunk/lvzip
|
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.
|
