* Discarded extra deflate function needed for afm reading
- as a result, discarded the whole chain of support functions, .c files and includes needed to make that one function run - also removed zlib compile/link dependencies where they are not needed - reduced the whole zlib package into two core include files - adjusted makefiles / project files to reflect this change git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10273 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage
parent
3b392f3f37
commit
74295231e6
@ -3,6 +3,13 @@ Date Added
|
|||||||
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
|
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
|
||||||
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
|
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
|
||||||
|
|
||||||
|
2007/04/18
|
||||||
|
* Discarded extra deflate function needed for afm reading [ultramage]
|
||||||
|
- as a result, discarded the whole chain of support functions, .c files
|
||||||
|
and includes needed to make that one function run
|
||||||
|
- also removed zlib compile/link dependencies where they are not needed
|
||||||
|
- reduced the whole zlib package into two core include files
|
||||||
|
- adjusted makefiles / project files to reflect this change
|
||||||
2007/04/17
|
2007/04/17
|
||||||
* Massive at+charcommand cleanup, big thanks to HiddenDragon [DracoRPG]
|
* Massive at+charcommand cleanup, big thanks to HiddenDragon [DracoRPG]
|
||||||
* Partially deobfuscated the grfio module
|
* Partially deobfuscated the grfio module
|
||||||
|
|||||||
6
Makefile
6
Makefile
@ -124,7 +124,7 @@ MKDEF = CC="$(CC)" CFLAGS="$(CFLAGS)" LIB_S="$(LIBS)"
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: txt sql common login login_sql char char_sql map map_sql ladmin converters \
|
.PHONY: txt sql common login login_sql char char_sql map map_sql ladmin converters \
|
||||||
addons plugins tools clean zlib depend
|
addons plugins tools clean depend
|
||||||
|
|
||||||
txt : Makefile.cache conf common login char map ladmin
|
txt : Makefile.cache conf common login char map ladmin
|
||||||
|
|
||||||
@ -178,9 +178,6 @@ converters:
|
|||||||
$(MAKE) SQLFLAG=1 $@
|
$(MAKE) SQLFLAG=1 $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
zlib:
|
|
||||||
$(MAKE) -C src/$@ $(MKDEF)
|
|
||||||
|
|
||||||
clean: src/common/GNUmakefile src/login/GNUmakefile src/login_sql/GNUmakefile \
|
clean: src/common/GNUmakefile src/login/GNUmakefile src/login_sql/GNUmakefile \
|
||||||
src/char/GNUmakefile src/char_sql/GNUmakefile src/map/GNUmakefile \
|
src/char/GNUmakefile src/char_sql/GNUmakefile src/map/GNUmakefile \
|
||||||
src/ladmin/GNUmakefile src/plugins/GNUmakefile src/txt-converter/GNUmakefile
|
src/ladmin/GNUmakefile src/plugins/GNUmakefile src/txt-converter/GNUmakefile
|
||||||
@ -193,7 +190,6 @@ clean: src/common/GNUmakefile src/login/GNUmakefile src/login_sql/GNUmakefile \
|
|||||||
$(MAKE) -C src/map $@
|
$(MAKE) -C src/map $@
|
||||||
$(MAKE) -C src/ladmin $@
|
$(MAKE) -C src/ladmin $@
|
||||||
$(MAKE) -C src/plugins $@
|
$(MAKE) -C src/plugins $@
|
||||||
$(MAKE) -C src/zlib $@
|
|
||||||
$(MAKE) -C src/txt-converter $@
|
$(MAKE) -C src/txt-converter $@
|
||||||
|
|
||||||
depend: src/common/GNUmakefile src/login/GNUmakefile src/login_sql/GNUmakefile \
|
depend: src/common/GNUmakefile src/login/GNUmakefile src/login_sql/GNUmakefile \
|
||||||
|
|||||||
@ -4,7 +4,7 @@ COMMON_OBJ = ../common/obj/core.o ../common/obj/socket.o ../common/obj/timer.o \
|
|||||||
../common/obj/db.o ../common/obj/plugins.o ../common/obj/lock.o \
|
../common/obj/db.o ../common/obj/plugins.o ../common/obj/lock.o \
|
||||||
../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/utils.o \
|
../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/utils.o \
|
||||||
../common/obj/strlib.o ../common/obj/grfio.o \
|
../common/obj/strlib.o ../common/obj/grfio.o \
|
||||||
../common/obj/mapindex.o ../common/obj/ers.o ../zlib/unz.o
|
../common/obj/mapindex.o ../common/obj/ers.o
|
||||||
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
|
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
|
||||||
../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
|
../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
|
||||||
../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
|
../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
|
||||||
|
|||||||
@ -4,7 +4,7 @@ COMMON_OBJ = ../common/obj/core.o ../common/obj/socket.o ../common/obj/timer.o \
|
|||||||
../common/obj/db.o ../common/obj/plugins.o ../common/obj/lock.o \
|
../common/obj/db.o ../common/obj/plugins.o ../common/obj/lock.o \
|
||||||
../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/utils.o \
|
../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/utils.o \
|
||||||
../common/obj/strlib.o ../common/obj/grfio.o \
|
../common/obj/strlib.o ../common/obj/grfio.o \
|
||||||
../common/obj/mapindex.o ../common/obj/ers.o ../zlib/unz.o
|
../common/obj/mapindex.o ../common/obj/ers.o
|
||||||
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
|
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
|
||||||
../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
|
../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
|
||||||
../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
|
../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
|
||||||
|
|||||||
@ -6,7 +6,7 @@ obj:
|
|||||||
common: obj/core.o obj/socket.o obj/timer.o obj/db.o obj/plugins.o obj/lock.o \
|
common: obj/core.o obj/socket.o obj/timer.o obj/db.o obj/plugins.o obj/lock.o \
|
||||||
obj/nullpo.o obj/malloc.o obj/showmsg.o obj/strlib.o obj/utils.o \
|
obj/nullpo.o obj/malloc.o obj/showmsg.o obj/strlib.o obj/utils.o \
|
||||||
obj/grfio.o obj/minicore.o obj/minisocket.o obj/minimalloc.o \
|
obj/grfio.o obj/minicore.o obj/minisocket.o obj/minimalloc.o \
|
||||||
obj/mapindex.o obj/unz.o obj/ers.o obj/md5calc.o
|
obj/mapindex.o obj/ers.o obj/md5calc.o
|
||||||
|
|
||||||
|
|
||||||
obj/%.o: %.c
|
obj/%.o: %.c
|
||||||
@ -15,10 +15,6 @@ obj/%.o: %.c
|
|||||||
obj/mini%.o: %.c
|
obj/mini%.o: %.c
|
||||||
$(COMPILE.c) -DMINICORE $(OUTPUT_OPTION) $<
|
$(COMPILE.c) -DMINICORE $(OUTPUT_OPTION) $<
|
||||||
|
|
||||||
obj/unz.o:
|
|
||||||
$(MAKE) -C ../zlib
|
|
||||||
@touch $@
|
|
||||||
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf *.o obj GNUmakefile
|
rm -rf *.o obj GNUmakefile
|
||||||
|
|||||||
@ -4,20 +4,8 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/stat.h>
|
|
||||||
|
|
||||||
#include "grfio.h"
|
#include <zlib.h>
|
||||||
#include "malloc.h"
|
|
||||||
#include "../zlib/unzip.h"
|
|
||||||
|
|
||||||
#ifdef __WIN32
|
|
||||||
#include "../zlib/zlib.h"
|
|
||||||
#include "../zlib/iowin32.h"
|
|
||||||
#else
|
|
||||||
#ifndef __FREEBSD__
|
|
||||||
#include <zlib.h>
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen)
|
int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen)
|
||||||
{
|
{
|
||||||
@ -79,80 +67,3 @@ int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char*
|
|||||||
err = deflateEnd(&stream);
|
err = deflateEnd(&stream);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ===================================
|
|
||||||
* Unzips a file. 1: success, 0: error
|
|
||||||
* Adapted from miniunz.c [Celest]
|
|
||||||
* Version 1.01b, May 30th, 2004
|
|
||||||
* Copyright (C) 1998-2004 Gilles Vollant
|
|
||||||
* -------------------------------------
|
|
||||||
*/
|
|
||||||
int deflate_file (const char *source, const char *filename)
|
|
||||||
{
|
|
||||||
#ifdef _WIN32
|
|
||||||
zlib_filefunc_def ffunc;
|
|
||||||
#endif
|
|
||||||
unzFile uf = NULL;
|
|
||||||
int err = UNZ_OK;
|
|
||||||
uInt size_buf = 8192;
|
|
||||||
FILE *fout = NULL;
|
|
||||||
void *buf;
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
fill_win32_filefunc(&ffunc);
|
|
||||||
uf = unzOpen2(source, &ffunc);
|
|
||||||
#else
|
|
||||||
uf = unzOpen(source);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (uf == NULL) {
|
|
||||||
//printf("Cannot open %s\n", source);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
//printf("%s opened\n", source);
|
|
||||||
|
|
||||||
if (unzLocateFile(uf, filename, 0) != UNZ_OK) {
|
|
||||||
//printf("file %s not found in the zipfile\n", filename);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
err = unzOpenCurrentFilePassword(uf, NULL);
|
|
||||||
//if (err != UNZ_OK)
|
|
||||||
// printf("error %d with zipfile in unzOpenCurrentFilePassword\n", err);
|
|
||||||
|
|
||||||
fout = fopen(filename,"wb");
|
|
||||||
if (fout == NULL) {
|
|
||||||
//printf("error opening %s\n", filename);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
buf = (void *)aMalloc(size_buf);
|
|
||||||
do {
|
|
||||||
err = unzReadCurrentFile(uf, buf, size_buf);
|
|
||||||
if (err < 0) {
|
|
||||||
//printf("error %d with zipfile in unzReadCurrentFile\n", err);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (err > 0 &&
|
|
||||||
fwrite(buf, err, 1, fout)!=1)
|
|
||||||
{
|
|
||||||
//printf("error in writing extracted file\n");
|
|
||||||
err = UNZ_ERRNO;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
} while (err > 0);
|
|
||||||
|
|
||||||
if (fout) fclose(fout);
|
|
||||||
|
|
||||||
if (err == UNZ_OK) {
|
|
||||||
err = unzCloseCurrentFile (uf);
|
|
||||||
//if (err != UNZ_OK)
|
|
||||||
// printf("error %d with zipfile in unzCloseCurrentFile\n", err);
|
|
||||||
aFree(buf);
|
|
||||||
return (err == UNZ_OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
unzCloseCurrentFile(uf); /* don't lose the error */
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|||||||
@ -4,20 +4,8 @@
|
|||||||
#ifndef _GRFIO_H_
|
#ifndef _GRFIO_H_
|
||||||
#define _GRFIO_H_
|
#define _GRFIO_H_
|
||||||
|
|
||||||
void grfio_init(char*); // GRFIO Initialize
|
|
||||||
void grfio_final(void); // GRFIO Finalize
|
|
||||||
void* grfio_reads(char*,int*); // GRFIO data file read & size get
|
|
||||||
char *grfio_find_file(char *fname);
|
|
||||||
char *grfio_alloc_ptr(char *fname);
|
|
||||||
|
|
||||||
#define grfio_read(fn) grfio_reads(fn, NULL)
|
|
||||||
|
|
||||||
int grfio_size(char*); // GRFIO data file size get
|
|
||||||
unsigned long grfio_crc32(const unsigned char *buf, unsigned int len);
|
|
||||||
|
|
||||||
int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
|
int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
|
||||||
int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
|
int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
|
||||||
int deflate_file (const char *source, const char *filename);
|
|
||||||
|
|
||||||
#endif /* _GRFIO_H_ */
|
#endif /* _GRFIO_H_ */
|
||||||
|
|
||||||
|
|||||||
@ -4,8 +4,7 @@ COMMON_OBJ = ../common/obj/core.o ../common/obj/socket.o ../common/obj/timer.o \
|
|||||||
../common/obj/db.o ../common/obj/plugins.o ../common/obj/lock.o \
|
../common/obj/db.o ../common/obj/plugins.o ../common/obj/lock.o \
|
||||||
../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/utils.o \
|
../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/utils.o \
|
||||||
../common/obj/strlib.o ../common/obj/grfio.o \
|
../common/obj/strlib.o ../common/obj/grfio.o \
|
||||||
../common/obj/mapindex.o ../common/obj/ers.o ../common/obj/md5calc.o \
|
../common/obj/mapindex.o ../common/obj/ers.o ../common/obj/md5calc.o
|
||||||
../zlib/unz.o
|
|
||||||
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
|
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
|
||||||
../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
|
../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
|
||||||
../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
|
../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
|
||||||
|
|||||||
@ -4,8 +4,7 @@ COMMON_OBJ = ../common/obj/core.o ../common/obj/socket.o ../common/obj/timer.o \
|
|||||||
../common/obj/db.o ../common/obj/plugins.o ../common/obj/lock.o \
|
../common/obj/db.o ../common/obj/plugins.o ../common/obj/lock.o \
|
||||||
../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/utils.o \
|
../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/utils.o \
|
||||||
../common/obj/strlib.o ../common/obj/grfio.o \
|
../common/obj/strlib.o ../common/obj/grfio.o \
|
||||||
../common/obj/mapindex.o ../common/obj/ers.o ../common/obj/md5calc.o \
|
../common/obj/mapindex.o ../common/obj/ers.o ../common/obj/md5calc.o
|
||||||
../zlib/unz.o
|
|
||||||
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
|
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
|
||||||
../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
|
../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
|
||||||
../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
|
../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
|
||||||
|
|||||||
@ -12,8 +12,7 @@ COMMON_OBJ = ../common/obj/core.o ../common/obj/socket.o ../common/obj/timer.o \
|
|||||||
../common/obj/db.o ../common/obj/plugins.o ../common/obj/lock.o \
|
../common/obj/db.o ../common/obj/plugins.o ../common/obj/lock.o \
|
||||||
../common/obj/nullpo.o ../common/obj/malloc.o ../common/obj/showmsg.o \
|
../common/obj/nullpo.o ../common/obj/malloc.o ../common/obj/showmsg.o \
|
||||||
../common/obj/utils.o ../common/obj/strlib.o ../common/obj/grfio.o \
|
../common/obj/utils.o ../common/obj/strlib.o ../common/obj/grfio.o \
|
||||||
../common/obj/mapindex.o ../common/obj/ers.o \
|
../common/obj/mapindex.o ../common/obj/ers.o
|
||||||
../zlib/unz.o
|
|
||||||
|
|
||||||
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/db.h \
|
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/db.h \
|
||||||
../common/plugins.h ../common/lock.h ../common/nullpo.h ../common/malloc.h \
|
../common/plugins.h ../common/lock.h ../common/nullpo.h ../common/malloc.h \
|
||||||
|
|||||||
@ -5,7 +5,6 @@
|
|||||||
#include "../common/timer.h"
|
#include "../common/timer.h"
|
||||||
#include "../common/nullpo.h"
|
#include "../common/nullpo.h"
|
||||||
#include "../common/malloc.h"
|
#include "../common/malloc.h"
|
||||||
#include "../common/grfio.h"
|
|
||||||
#include "../common/showmsg.h"
|
#include "../common/showmsg.h"
|
||||||
#include "../common/ers.h"
|
#include "../common/ers.h"
|
||||||
#include "../common/db.h"
|
#include "../common/db.h"
|
||||||
|
|||||||
@ -1,15 +1,17 @@
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#else
|
|
||||||
#define getpid GetCurrentProcessId
|
|
||||||
#endif
|
#endif
|
||||||
#ifdef MINGW
|
#ifdef MINGW
|
||||||
#include <process.h>
|
#include <process.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
|
#else
|
||||||
|
#define getpid GetCurrentProcessId
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../common/plugin.h"
|
#include "../common/plugin.h"
|
||||||
|
|
||||||
PLUGIN_INFO = {
|
PLUGIN_INFO = {
|
||||||
|
|||||||
@ -7,9 +7,8 @@ convert:
|
|||||||
$(CC) -o ../../tools/$@ convert.c
|
$(CC) -o ../../tools/$@ convert.c
|
||||||
|
|
||||||
mapcache:
|
mapcache:
|
||||||
$(MAKE) -C ../zlib
|
|
||||||
$(CC) -c -o grfio.o grfio.c
|
$(CC) -c -o grfio.o grfio.c
|
||||||
$(CC) -o ../../$@ mapcache.c grfio.o ../zlib/unz.o -lz
|
$(CC) -o ../../$@ mapcache.c grfio.o -lz
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf *.o ../../tools/adduser ../../tools/convert ../../mapcache
|
rm -rf *.o ../../tools/adduser ../../tools/convert ../../mapcache
|
||||||
|
|||||||
228
src/tool/grfio.c
228
src/tool/grfio.c
@ -5,25 +5,16 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
#include <ctype.h> // tolower()
|
||||||
|
|
||||||
#include "grfio.h"
|
#include "grfio.h"
|
||||||
#include "../zlib/unzip.h"
|
#include <zlib.h>
|
||||||
|
|
||||||
#define CHUNK 16384
|
|
||||||
|
|
||||||
#ifdef __WIN32
|
#ifndef __WIN32
|
||||||
#include "../zlib/zlib.h"
|
|
||||||
#include "../zlib/iowin32.h"
|
|
||||||
#else
|
|
||||||
#include <zlib.h>
|
|
||||||
#define strcmpi strcasecmp
|
#define strcmpi strcasecmp
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef unsigned char BYTE;
|
|
||||||
typedef unsigned short WORD;
|
|
||||||
typedef unsigned long DWORD;
|
|
||||||
|
|
||||||
static char data_dir[1024] = ""; // "../";
|
|
||||||
|
|
||||||
//----------------------------
|
//----------------------------
|
||||||
// file entry table struct
|
// file entry table struct
|
||||||
@ -51,19 +42,22 @@ typedef struct _FILELIST {
|
|||||||
//#define GRFIO_LOCAL
|
//#define GRFIO_LOCAL
|
||||||
|
|
||||||
// stores info about every loaded file
|
// stores info about every loaded file
|
||||||
static FILELIST* filelist = NULL;
|
FILELIST* filelist = NULL;
|
||||||
static int filelist_entrys = 0;
|
int filelist_entrys = 0;
|
||||||
static int filelist_maxentry = 0;
|
int filelist_maxentry = 0;
|
||||||
|
|
||||||
// stores grf file names
|
// stores grf file names
|
||||||
static char** gentry_table = NULL;
|
char** gentry_table = NULL;
|
||||||
static int gentry_entrys = 0;
|
int gentry_entrys = 0;
|
||||||
static int gentry_maxentry = 0;
|
int gentry_maxentry = 0;
|
||||||
|
|
||||||
|
// the path to the data directory
|
||||||
|
char data_dir[1024] = "";
|
||||||
|
|
||||||
//----------------------------
|
//----------------------------
|
||||||
// file list hash table
|
// file list hash table
|
||||||
//----------------------------
|
//----------------------------
|
||||||
static int filelist_hash[256];
|
int filelist_hash[256];
|
||||||
|
|
||||||
//----------------------------
|
//----------------------------
|
||||||
// grf decode data table
|
// grf decode data table
|
||||||
@ -112,31 +106,27 @@ static unsigned char NibbleData[4][64]={
|
|||||||
0xa0, 0x9f, 0xf6, 0x5c, 0x6a, 0x09, 0x8d, 0xf0, 0x0f, 0xe3, 0x53, 0x25, 0x95, 0x36, 0x28, 0xcb,
|
0xa0, 0x9f, 0xf6, 0x5c, 0x6a, 0x09, 0x8d, 0xf0, 0x0f, 0xe3, 0x53, 0x25, 0x95, 0x36, 0x28, 0xcb,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
/*-----------------
|
|
||||||
* long data get
|
// little endian char array to uint conversion
|
||||||
*/
|
|
||||||
static unsigned int getlong(unsigned char* p)
|
static unsigned int getlong(unsigned char* p)
|
||||||
{
|
{
|
||||||
return p[0]
|
return (p[0] | p[1] << 0x08 | p[2] << 0x10 | p[3] << 0x18);
|
||||||
| p[1] << 0x08
|
|
||||||
| p[2] << 0x10
|
|
||||||
| p[3] << 0x18; // Shinomori
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*==========================================
|
/*==========================================
|
||||||
* Grf data decode : Subs
|
* Grf data decode : Subs
|
||||||
*------------------------------------------*/
|
*------------------------------------------*/
|
||||||
static void NibbleSwap(BYTE* Src, int len)
|
static void NibbleSwap(unsigned char* Src, int len)
|
||||||
{
|
{
|
||||||
for(;0<len;len--,Src++) {
|
for(;0<len;len--,Src++) {
|
||||||
*Src = (*Src>>4) | (*Src<<4);
|
*Src = (*Src>>4) | (*Src<<4);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void BitConvert(BYTE* Src, char* BitSwapTable)
|
static void BitConvert(unsigned char* Src, char* BitSwapTable)
|
||||||
{
|
{
|
||||||
int lop,prm;
|
int lop,prm;
|
||||||
BYTE tmp[8];
|
unsigned char tmp[8];
|
||||||
memset(tmp,0,8);
|
memset(tmp,0,8);
|
||||||
for(lop=0;lop!=64;lop++) {
|
for(lop=0;lop!=64;lop++) {
|
||||||
prm = BitSwapTable[lop]-1;
|
prm = BitSwapTable[lop]-1;
|
||||||
@ -147,10 +137,10 @@ static void BitConvert(BYTE* Src, char* BitSwapTable)
|
|||||||
memcpy(Src,tmp,8);
|
memcpy(Src,tmp,8);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void BitConvert4(BYTE* Src)
|
static void BitConvert4(unsigned char* Src)
|
||||||
{
|
{
|
||||||
int lop,prm;
|
int lop,prm;
|
||||||
BYTE tmp[8];
|
unsigned char tmp[8];
|
||||||
tmp[0] = ((Src[7]<<5) | (Src[4]>>3)) & 0x3f; // ..0 vutsr
|
tmp[0] = ((Src[7]<<5) | (Src[4]>>3)) & 0x3f; // ..0 vutsr
|
||||||
tmp[1] = ((Src[4]<<1) | (Src[5]>>7)) & 0x3f; // ..srqpo n
|
tmp[1] = ((Src[4]<<1) | (Src[5]>>7)) & 0x3f; // ..srqpo n
|
||||||
tmp[2] = ((Src[4]<<5) | (Src[5]>>3)) & 0x3f; // ..o nmlkj
|
tmp[2] = ((Src[4]<<5) | (Src[5]>>3)) & 0x3f; // ..o nmlkj
|
||||||
@ -165,7 +155,7 @@ static void BitConvert4(BYTE* Src)
|
|||||||
| (NibbleData[lop][tmp[lop*2+1]] & 0x0f);
|
| (NibbleData[lop][tmp[lop*2+1]] & 0x0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
*(DWORD*)(tmp+4)=0;
|
memset(tmp+4,0,4);
|
||||||
for(lop=0;lop!=32;lop++) {
|
for(lop=0;lop!=32;lop++) {
|
||||||
prm = BitSwapTable3[lop]-1;
|
prm = BitSwapTable3[lop]-1;
|
||||||
if (tmp[prm >> 3] & BitMaskTable[prm & 7]) {
|
if (tmp[prm >> 3] & BitMaskTable[prm & 7]) {
|
||||||
@ -178,25 +168,25 @@ static void BitConvert4(BYTE* Src)
|
|||||||
Src[3] ^= tmp[7];
|
Src[3] ^= tmp[7];
|
||||||
}
|
}
|
||||||
|
|
||||||
static void decode_des_etc(BYTE* buf, int len, int type, int cycle)
|
static void decode_des_etc(unsigned char* buf, size_t len, int type, int cycle)
|
||||||
{
|
{
|
||||||
int lop,cnt=0;
|
size_t lop,cnt=0;
|
||||||
if(cycle<3) cycle=3;
|
if(cycle<3) cycle=3;
|
||||||
else if(cycle<5) cycle++;
|
else if(cycle<5) cycle++;
|
||||||
else if(cycle<7) cycle+=9;
|
else if(cycle<7) cycle+=9;
|
||||||
else cycle+=15;
|
else cycle+=15;
|
||||||
|
|
||||||
for(lop=0;lop*8<len;lop++,buf+=8) {
|
for(lop=0; lop*8<len; lop++, buf+=8)
|
||||||
if(lop<20 || (type==0 && lop%cycle==0)){ // des
|
{
|
||||||
|
if(lop<20 || (type==0 && lop%cycle==0)) { // des
|
||||||
BitConvert(buf,BitSwapTable1);
|
BitConvert(buf,BitSwapTable1);
|
||||||
BitConvert4(buf);
|
BitConvert4(buf);
|
||||||
BitConvert(buf,BitSwapTable2);
|
BitConvert(buf,BitSwapTable2);
|
||||||
} else {
|
} else {
|
||||||
if(cnt==7 && type==0){
|
if(cnt==7 && type==0) {
|
||||||
BYTE a;
|
unsigned char a;
|
||||||
BYTE tmp[8];
|
unsigned char tmp[8];
|
||||||
*(DWORD*)tmp = *(DWORD*)buf;
|
memcpy(tmp,buf,8);
|
||||||
*(DWORD*)(tmp+4) = *(DWORD*)(buf+4);
|
|
||||||
cnt=0;
|
cnt=0;
|
||||||
buf[0]=tmp[3];
|
buf[0]=tmp[3];
|
||||||
buf[1]=tmp[4];
|
buf[1]=tmp[4];
|
||||||
@ -291,68 +281,6 @@ int encode_zip(unsigned char* dest, unsigned long* destLen, const unsigned char*
|
|||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ===================================
|
|
||||||
* Unzips a file. 1: success, 0: error
|
|
||||||
* Adapted from miniunz.c [Celest]
|
|
||||||
* Version 1.01b, May 30th, 2004
|
|
||||||
* Copyright (C) 1998-2004 Gilles Vollant
|
|
||||||
* -------------------------------------*/
|
|
||||||
int deflate_file (const char* source, const char* filename)
|
|
||||||
{
|
|
||||||
#ifdef _WIN32
|
|
||||||
zlib_filefunc_def ffunc;
|
|
||||||
#endif
|
|
||||||
unzFile uf = NULL;
|
|
||||||
int err = UNZ_OK;
|
|
||||||
uInt size_buf = 8192;
|
|
||||||
FILE *fout = NULL;
|
|
||||||
void *buf;
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
fill_win32_filefunc(&ffunc);
|
|
||||||
uf = unzOpen2(source, &ffunc);
|
|
||||||
#else
|
|
||||||
uf = unzOpen(source);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (uf == NULL)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (unzLocateFile(uf, filename, 0) != UNZ_OK)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
err = unzOpenCurrentFilePassword(uf, NULL);
|
|
||||||
|
|
||||||
fout = fopen(filename,"wb");
|
|
||||||
if (fout == NULL)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
buf = (void *)malloc(size_buf);
|
|
||||||
do {
|
|
||||||
err = unzReadCurrentFile(uf, buf, size_buf);
|
|
||||||
if (err < 0)
|
|
||||||
break;
|
|
||||||
if (err > 0 &&
|
|
||||||
fwrite(buf, err, 1, fout)!=1)
|
|
||||||
{
|
|
||||||
err = UNZ_ERRNO;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
} while (err > 0);
|
|
||||||
|
|
||||||
if (fout) fclose(fout);
|
|
||||||
|
|
||||||
if (err == UNZ_OK) {
|
|
||||||
err = unzCloseCurrentFile (uf);
|
|
||||||
free(buf);
|
|
||||||
return (err == UNZ_OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
unzCloseCurrentFile(uf); /* don't lose the error */
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned long grfio_crc32 (const unsigned char* buf, unsigned int len)
|
unsigned long grfio_crc32 (const unsigned char* buf, unsigned int len)
|
||||||
{
|
{
|
||||||
return crc32(crc32(0L, Z_NULL, 0), buf, len);
|
return crc32(crc32(0L, Z_NULL, 0), buf, len);
|
||||||
@ -362,9 +290,15 @@ unsigned long grfio_crc32 (const unsigned char* buf, unsigned int len)
|
|||||||
*** File List Subroutines ***
|
*** File List Subroutines ***
|
||||||
***********************************************************/
|
***********************************************************/
|
||||||
|
|
||||||
/*==========================================
|
// initializes the table that holds the first elements of all hash chains
|
||||||
* File List : Hash make
|
static void hashinit(void)
|
||||||
*------------------------------------------*/
|
{
|
||||||
|
int i;
|
||||||
|
for (i = 0; i < 256; i++)
|
||||||
|
filelist_hash[i] = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// hashes a filename string into a number from {0..255}
|
||||||
static int filehash(char* fname)
|
static int filehash(char* fname)
|
||||||
{
|
{
|
||||||
unsigned int hash = 0;
|
unsigned int hash = 0;
|
||||||
@ -375,19 +309,7 @@ static int filehash(char* fname)
|
|||||||
return hash & 255;
|
return hash & 255;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*==========================================
|
// finds a FILELIST entry with the specified file name
|
||||||
* File List : Hash initalize
|
|
||||||
*------------------------------------------*/
|
|
||||||
static void hashinit(void)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
for (i = 0; i < 256; i++)
|
|
||||||
filelist_hash[i] = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*==========================================
|
|
||||||
* File List : File find
|
|
||||||
*------------------------------------------*/
|
|
||||||
static FILELIST* filelist_find(char* fname)
|
static FILELIST* filelist_find(char* fname)
|
||||||
{
|
{
|
||||||
int hash, index;
|
int hash, index;
|
||||||
@ -413,15 +335,13 @@ char* grfio_find_file(char* fname)
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*==========================================
|
// adds a FILELIST entry into the list of loaded files
|
||||||
* File List : Filelist add
|
|
||||||
*------------------------------------------*/
|
|
||||||
#define FILELIST_ADDS 1024 // number increment of file lists `
|
|
||||||
|
|
||||||
static FILELIST* filelist_add(FILELIST* entry)
|
static FILELIST* filelist_add(FILELIST* entry)
|
||||||
{
|
{
|
||||||
int hash;
|
int hash;
|
||||||
|
|
||||||
|
#define FILELIST_ADDS 1024 // number increment of file lists `
|
||||||
|
|
||||||
if (filelist_entrys >= filelist_maxentry) {
|
if (filelist_entrys >= filelist_maxentry) {
|
||||||
filelist = (FILELIST *)realloc(filelist, (filelist_maxentry + FILELIST_ADDS) * sizeof(FILELIST));
|
filelist = (FILELIST *)realloc(filelist, (filelist_maxentry + FILELIST_ADDS) * sizeof(FILELIST));
|
||||||
memset(filelist + filelist_maxentry, '\0', FILELIST_ADDS * sizeof(FILELIST));
|
memset(filelist + filelist_maxentry, '\0', FILELIST_ADDS * sizeof(FILELIST));
|
||||||
@ -439,7 +359,7 @@ static FILELIST* filelist_add(FILELIST* entry)
|
|||||||
return &filelist[filelist_entrys - 1];
|
return &filelist[filelist_entrys - 1];
|
||||||
}
|
}
|
||||||
|
|
||||||
// adds a new entry or overwrites an existing one
|
// adds a new FILELIST entry or overwrites an existing one
|
||||||
static FILELIST* filelist_modify(FILELIST* entry)
|
static FILELIST* filelist_modify(FILELIST* entry)
|
||||||
{
|
{
|
||||||
FILELIST* fentry = filelist_find(entry->fn);
|
FILELIST* fentry = filelist_find(entry->fn);
|
||||||
@ -502,9 +422,7 @@ int grfio_size(char* fname)
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*==========================================
|
// reads a file into a newly allocated buffer (from grf or data directory)
|
||||||
* Grfio : Resource file read & size get
|
|
||||||
*------------------------------------------*/
|
|
||||||
void* grfio_reads(char* fname, int* size)
|
void* grfio_reads(char* fname, int* size)
|
||||||
{
|
{
|
||||||
FILE* in;
|
FILE* in;
|
||||||
@ -527,10 +445,10 @@ void* grfio_reads(char* fname, int* size)
|
|||||||
if (entry != NULL && entry->gentry == 0) {
|
if (entry != NULL && entry->gentry == 0) {
|
||||||
lentry.declen = entry->declen;
|
lentry.declen = entry->declen;
|
||||||
} else {
|
} else {
|
||||||
fseek(in,0,2); // SEEK_END
|
fseek(in,0,SEEK_END);
|
||||||
lentry.declen = ftell(in);
|
lentry.declen = ftell(in);
|
||||||
}
|
}
|
||||||
fseek(in,0,0); // SEEK_SET
|
fseek(in,0,SEEK_SET);
|
||||||
buf2 = (unsigned char *)malloc(lentry.declen + 1024);
|
buf2 = (unsigned char *)malloc(lentry.declen + 1024);
|
||||||
fread(buf2, 1, lentry.declen, in);
|
fread(buf2, 1, lentry.declen, in);
|
||||||
fclose(in);
|
fclose(in);
|
||||||
@ -542,6 +460,7 @@ void* grfio_reads(char* fname, int* size)
|
|||||||
if (entry != NULL && entry->gentry < 0) {
|
if (entry != NULL && entry->gentry < 0) {
|
||||||
entry->gentry = -entry->gentry; // local file checked
|
entry->gentry = -entry->gentry; // local file checked
|
||||||
} else {
|
} else {
|
||||||
|
printf("%s not found (grfio_reads - local file %s)\n", fname, lfname);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -597,9 +516,8 @@ static char* decode_filename(unsigned char* buf, int len)
|
|||||||
return (char*)buf;
|
return (char*)buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*==========================================
|
// loads all entries in the specified grf file into the filelist
|
||||||
* Grfio : Entry table read
|
// gentry - index of the grf file name in the gentry_table
|
||||||
*------------------------------------------*/
|
|
||||||
static int grfio_entryread(char* grfname, int gentry)
|
static int grfio_entryread(char* grfname, int gentry)
|
||||||
{
|
{
|
||||||
FILE* fp;
|
FILE* fp;
|
||||||
@ -616,12 +534,12 @@ static int grfio_entryread(char* grfname, int gentry)
|
|||||||
} else
|
} else
|
||||||
printf("GRF data file found: '%s'\n",grfname);
|
printf("GRF data file found: '%s'\n",grfname);
|
||||||
|
|
||||||
fseek(fp,0,2); // SEEK_END
|
fseek(fp,0,SEEK_END);
|
||||||
grf_size = ftell(fp);
|
grf_size = ftell(fp);
|
||||||
fseek(fp,0,0); // SEEK_SET
|
fseek(fp,0,SEEK_SET);
|
||||||
fread(grf_header,1,0x2e,fp);
|
fread(grf_header,1,0x2e,fp);
|
||||||
if (strcmp((const char *) grf_header,"Master of Magic") ||
|
if (strcmp((const char *) grf_header,"Master of Magic") ||
|
||||||
fseek(fp,getlong(grf_header+0x1e),1)) // SEEK_CUR
|
fseek(fp,getlong(grf_header+0x1e),SEEK_CUR))
|
||||||
{
|
{
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
printf("GRF %s read error\n", grfname);
|
printf("GRF %s read error\n", grfname);
|
||||||
@ -698,7 +616,7 @@ static int grfio_entryread(char* grfname, int gentry)
|
|||||||
rSize = getlong(eheader); // Read Size
|
rSize = getlong(eheader); // Read Size
|
||||||
eSize = getlong(eheader+4); // Extend Size
|
eSize = getlong(eheader+4); // Extend Size
|
||||||
|
|
||||||
if ((long)rSize > grf_size-ftell(fp)) { // Warning fix [Lance]
|
if ((long)rSize > grf_size-ftell(fp)) {
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
printf("Illegal data format: GRF compress entry size\n");
|
printf("Illegal data format: GRF compress entry size\n");
|
||||||
return 4;
|
return 4;
|
||||||
@ -715,7 +633,7 @@ static int grfio_entryread(char* grfname, int gentry)
|
|||||||
entrys = getlong(grf_header+0x26) - 7;
|
entrys = getlong(grf_header+0x26) - 7;
|
||||||
|
|
||||||
// Get an entry
|
// Get an entry
|
||||||
for(entry = 0, ofs = 0; entry < entrys; entry++){
|
for(entry = 0, ofs = 0; entry < entrys; entry++) {
|
||||||
int ofs2, srclen, srccount, type;
|
int ofs2, srclen, srccount, type;
|
||||||
FILELIST aentry;
|
FILELIST aentry;
|
||||||
|
|
||||||
@ -725,7 +643,6 @@ static int grfio_entryread(char* grfname, int gentry)
|
|||||||
free(grf_filelist);
|
free(grf_filelist);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
//ofs2 = ofs+strlen((char*)(grf_filelist+ofs))+1;
|
|
||||||
ofs2 = ofs + (int)strlen(fname)+1;
|
ofs2 = ofs + (int)strlen(fname)+1;
|
||||||
type = grf_filelist[ofs2+12];
|
type = grf_filelist[ofs2+12];
|
||||||
if (type == 1 || type == 3 || type == 5) {
|
if (type == 1 || type == 3 || type == 5) {
|
||||||
@ -799,7 +716,7 @@ static void grfio_resourcecheck(void)
|
|||||||
FILELIST fentry;
|
FILELIST fentry;
|
||||||
memcpy(&fentry, entry, sizeof(FILELIST));
|
memcpy(&fentry, entry, sizeof(FILELIST));
|
||||||
strncpy(fentry.fn, src, sizeof(fentry.fn) - 1);
|
strncpy(fentry.fn, src, sizeof(fentry.fn) - 1);
|
||||||
fentry.fnd = grfio_alloc_ptr(dst);
|
fentry.fnd = strdup(dst);
|
||||||
filelist_modify(&fentry);
|
filelist_modify(&fentry);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -808,13 +725,12 @@ static void grfio_resourcecheck(void)
|
|||||||
return; // we're done here!
|
return; // we're done here!
|
||||||
}
|
}
|
||||||
|
|
||||||
// read resnametable from loaded GRF's, only if it cannot be
|
// read resnametable from loaded GRF's, only if it cannot be loaded from the data directory
|
||||||
// loaded from the data directory
|
|
||||||
buf = (char *)grfio_reads("data\\resnametable.txt", &size);
|
buf = (char *)grfio_reads("data\\resnametable.txt", &size);
|
||||||
if (buf) {
|
if (buf) {
|
||||||
buf[size] = 0;
|
buf[size] = 0;
|
||||||
ptr = buf;
|
|
||||||
|
|
||||||
|
ptr = buf;
|
||||||
while (ptr - buf < size) {
|
while (ptr - buf < size) {
|
||||||
if (sscanf(ptr, "%[^#]#%[^#]#", w1, w2) == 2 &&
|
if (sscanf(ptr, "%[^#]#%[^#]#", w1, w2) == 2 &&
|
||||||
(strstr(w2, ".gat") || strstr(w2, ".rsw")))
|
(strstr(w2, ".gat") || strstr(w2, ".rsw")))
|
||||||
@ -826,7 +742,7 @@ static void grfio_resourcecheck(void)
|
|||||||
FILELIST fentry;
|
FILELIST fentry;
|
||||||
memcpy(&fentry, entry, sizeof(FILELIST));
|
memcpy(&fentry, entry, sizeof(FILELIST));
|
||||||
strncpy(fentry.fn, src, sizeof(fentry.fn) - 1);
|
strncpy(fentry.fn, src, sizeof(fentry.fn) - 1);
|
||||||
fentry.fnd = grfio_alloc_ptr(dst);
|
fentry.fnd = strdup(dst);
|
||||||
filelist_modify(&fentry);
|
filelist_modify(&fentry);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -840,21 +756,11 @@ static void grfio_resourcecheck(void)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*==========================================
|
// reads a grf file and adds it to the list
|
||||||
* Grfio : Resource add
|
|
||||||
*------------------------------------------*/
|
|
||||||
#define GENTRY_ADDS 4 // The number increment of gentry_table entries
|
|
||||||
|
|
||||||
static int grfio_add(char* fname)
|
static int grfio_add(char* fname)
|
||||||
{
|
{
|
||||||
grfio_alloc_ptr(fname);
|
#define GENTRY_ADDS 4 // The number increment of gentry_table entries
|
||||||
|
|
||||||
return grfio_entryread(fname, gentry_entrys - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
// adds a copy of 'fname' into the gentry_table
|
|
||||||
char* grfio_alloc_ptr(char* fname)
|
|
||||||
{
|
|
||||||
if (gentry_entrys >= gentry_maxentry) {
|
if (gentry_entrys >= gentry_maxentry) {
|
||||||
gentry_maxentry += GENTRY_ADDS;
|
gentry_maxentry += GENTRY_ADDS;
|
||||||
gentry_table = (char**)realloc(gentry_table, gentry_maxentry * sizeof(char*));
|
gentry_table = (char**)realloc(gentry_table, gentry_maxentry * sizeof(char*));
|
||||||
@ -863,12 +769,10 @@ char* grfio_alloc_ptr(char* fname)
|
|||||||
|
|
||||||
gentry_table[gentry_entrys++] = strdup(fname);
|
gentry_table[gentry_entrys++] = strdup(fname);
|
||||||
|
|
||||||
return gentry_table[gentry_entrys - 1];
|
return grfio_entryread(fname, gentry_entrys - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*==========================================
|
// removes all entries
|
||||||
* Grfio : Finalize
|
|
||||||
*------------------------------------------*/
|
|
||||||
void grfio_final(void)
|
void grfio_final(void)
|
||||||
{
|
{
|
||||||
if (filelist != NULL)
|
if (filelist != NULL)
|
||||||
@ -922,7 +826,7 @@ void grfio_init(char* fname)
|
|||||||
printf("No GRF loaded, using default data directory\n");
|
printf("No GRF loaded, using default data directory\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unnecessary area release of filelist
|
// Unneccessary area release of filelist
|
||||||
filelist_adjust();
|
filelist_adjust();
|
||||||
|
|
||||||
// Resource check
|
// Resource check
|
||||||
|
|||||||
@ -8,7 +8,6 @@ void grfio_init(char*); // GRFIO Initialize
|
|||||||
void grfio_final(void); // GRFIO Finalize
|
void grfio_final(void); // GRFIO Finalize
|
||||||
void* grfio_reads(char*,int*); // GRFIO data file read & size get
|
void* grfio_reads(char*,int*); // GRFIO data file read & size get
|
||||||
char *grfio_find_file(char *fname);
|
char *grfio_find_file(char *fname);
|
||||||
char *grfio_alloc_ptr(char *fname);
|
|
||||||
|
|
||||||
#define grfio_read(fn) grfio_reads(fn, NULL)
|
#define grfio_read(fn) grfio_reads(fn, NULL)
|
||||||
|
|
||||||
@ -17,7 +16,6 @@ unsigned long grfio_crc32(const unsigned char *buf, unsigned int len);
|
|||||||
|
|
||||||
int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
|
int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
|
||||||
int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
|
int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
|
||||||
int deflate_file (const char *source, const char *filename);
|
|
||||||
|
|
||||||
#endif /* _GRFIO_H_ */
|
#endif /* _GRFIO_H_ */
|
||||||
|
|
||||||
|
|||||||
@ -218,7 +218,7 @@ char *remove_extension(char *mapname)
|
|||||||
if (ptr) { //Check and remove extension.
|
if (ptr) { //Check and remove extension.
|
||||||
while (ptr[1] && (ptr2 = strchr(ptr+1, '.')))
|
while (ptr[1] && (ptr2 = strchr(ptr+1, '.')))
|
||||||
ptr = ptr2; //Skip to the last dot.
|
ptr = ptr2; //Skip to the last dot.
|
||||||
if(strcmp(ptr,".gat") == 0 ||
|
if (strcmp(ptr,".gat") == 0 ||
|
||||||
strcmp(ptr,".afm") == 0 ||
|
strcmp(ptr,".afm") == 0 ||
|
||||||
strcmp(ptr,".af2") == 0)
|
strcmp(ptr,".af2") == 0)
|
||||||
*ptr = '\0'; //Remove extension.
|
*ptr = '\0'; //Remove extension.
|
||||||
|
|||||||
@ -1,21 +0,0 @@
|
|||||||
|
|
||||||
OBJS = unzip.o ioapi.o
|
|
||||||
|
|
||||||
ifeq ($(findstring MINGW,$(CFLAGS)), MINGW)
|
|
||||||
OBJS += iowin32.o
|
|
||||||
endif
|
|
||||||
|
|
||||||
.c.o:
|
|
||||||
$(CC) -c $(CFLAGS) $*.c
|
|
||||||
|
|
||||||
all: unz.o
|
|
||||||
|
|
||||||
unz.o: $(OBJS)
|
|
||||||
ar rcs $@ $(OBJS)
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *.o
|
|
||||||
|
|
||||||
# DO NOT DELETE
|
|
||||||
ioapi.o: ioapi.h
|
|
||||||
unzip.o: unzip.h ioapi.h crypt.h
|
|
||||||
132
src/zlib/crypt.h
132
src/zlib/crypt.h
@ -1,132 +0,0 @@
|
|||||||
/* crypt.h -- base code for crypt/uncrypt ZIPfile
|
|
||||||
|
|
||||||
|
|
||||||
Version 1.01e, February 12th, 2005
|
|
||||||
|
|
||||||
Copyright (C) 1998-2005 Gilles Vollant
|
|
||||||
|
|
||||||
This code is a modified version of crypting code in Infozip distribution
|
|
||||||
|
|
||||||
The encryption/decryption parts of this source code (as opposed to the
|
|
||||||
non-echoing password parts) were originally written in Europe. The
|
|
||||||
whole source package can be freely distributed, including from the USA.
|
|
||||||
(Prior to January 2000, re-export from the US was a violation of US law.)
|
|
||||||
|
|
||||||
This encryption code is a direct transcription of the algorithm from
|
|
||||||
Roger Schlafly, described by Phil Katz in the file appnote.txt. This
|
|
||||||
file (appnote.txt) is distributed with the PKZIP program (even in the
|
|
||||||
version without encryption capabilities).
|
|
||||||
|
|
||||||
If you don't need crypting in your application, just define symbols
|
|
||||||
NOCRYPT and NOUNCRYPT.
|
|
||||||
|
|
||||||
This code support the "Traditional PKWARE Encryption".
|
|
||||||
|
|
||||||
The new AES encryption added on Zip format by Winzip (see the page
|
|
||||||
http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
|
|
||||||
Encryption is not supported.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* Return the next byte in the pseudo-random sequence
|
|
||||||
*/
|
|
||||||
static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
|
|
||||||
{
|
|
||||||
unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an
|
|
||||||
* unpredictable manner on 16-bit systems; not a problem
|
|
||||||
* with any known compiler so far, though */
|
|
||||||
|
|
||||||
temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
|
|
||||||
return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
|
|
||||||
}
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* Update the encryption keys with the next byte of plain text
|
|
||||||
*/
|
|
||||||
static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
|
|
||||||
{
|
|
||||||
(*(pkeys+0)) = CRC32((*(pkeys+0)), c);
|
|
||||||
(*(pkeys+1)) += (*(pkeys+0)) & 0xff;
|
|
||||||
(*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
|
|
||||||
{
|
|
||||||
register int keyshift = (int)((*(pkeys+1)) >> 24);
|
|
||||||
(*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
|
|
||||||
}
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* Initialize the encryption keys and the random header according to
|
|
||||||
* the given password.
|
|
||||||
*/
|
|
||||||
static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
|
|
||||||
{
|
|
||||||
*(pkeys+0) = 305419896L;
|
|
||||||
*(pkeys+1) = 591751049L;
|
|
||||||
*(pkeys+2) = 878082192L;
|
|
||||||
while (*passwd != '\0') {
|
|
||||||
update_keys(pkeys,pcrc_32_tab,(int)*passwd);
|
|
||||||
passwd++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#define zdecode(pkeys,pcrc_32_tab,c) \
|
|
||||||
(update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
|
|
||||||
|
|
||||||
#define zencode(pkeys,pcrc_32_tab,c,t) \
|
|
||||||
(t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
|
|
||||||
|
|
||||||
#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
|
|
||||||
|
|
||||||
#define RAND_HEAD_LEN 12
|
|
||||||
/* "last resort" source for second part of crypt seed pattern */
|
|
||||||
# ifndef ZCR_SEED2
|
|
||||||
# define ZCR_SEED2 3141592654UL /* use PI as default pattern */
|
|
||||||
# endif
|
|
||||||
|
|
||||||
static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
|
|
||||||
const char *passwd; /* password string */
|
|
||||||
unsigned char *buf; /* where to write header */
|
|
||||||
int bufSize;
|
|
||||||
unsigned long* pkeys;
|
|
||||||
const unsigned long* pcrc_32_tab;
|
|
||||||
unsigned long crcForCrypting;
|
|
||||||
{
|
|
||||||
int n; /* index in random header */
|
|
||||||
int t; /* temporary */
|
|
||||||
int c; /* random byte */
|
|
||||||
unsigned char header[RAND_HEAD_LEN-2]; /* random header */
|
|
||||||
static unsigned calls = 0; /* ensure different random header each time */
|
|
||||||
|
|
||||||
if (bufSize<RAND_HEAD_LEN)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
/* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
|
|
||||||
* output of rand() to get less predictability, since rand() is
|
|
||||||
* often poorly implemented.
|
|
||||||
*/
|
|
||||||
if (++calls == 1)
|
|
||||||
{
|
|
||||||
srand((unsigned)(time(NULL) ^ ZCR_SEED2));
|
|
||||||
}
|
|
||||||
init_keys(passwd, pkeys, pcrc_32_tab);
|
|
||||||
for (n = 0; n < RAND_HEAD_LEN-2; n++)
|
|
||||||
{
|
|
||||||
c = (rand() >> 7) & 0xff;
|
|
||||||
header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
|
|
||||||
}
|
|
||||||
/* Encrypt random header (last two bytes is high word of crc) */
|
|
||||||
init_keys(passwd, pkeys, pcrc_32_tab);
|
|
||||||
for (n = 0; n < RAND_HEAD_LEN-2; n++)
|
|
||||||
{
|
|
||||||
buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
|
|
||||||
}
|
|
||||||
buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
|
|
||||||
buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
177
src/zlib/ioapi.c
177
src/zlib/ioapi.c
@ -1,177 +0,0 @@
|
|||||||
/* ioapi.c -- IO base function header for compress/uncompress .zip
|
|
||||||
files using zlib + zip or unzip API
|
|
||||||
|
|
||||||
Version 1.01e, February 12th, 2005
|
|
||||||
|
|
||||||
Copyright (C) 1998-2005 Gilles Vollant
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "zlib.h"
|
|
||||||
#include "ioapi.h"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
|
|
||||||
|
|
||||||
#ifndef SEEK_CUR
|
|
||||||
#define SEEK_CUR 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SEEK_END
|
|
||||||
#define SEEK_END 2
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SEEK_SET
|
|
||||||
#define SEEK_SET 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
voidpf ZCALLBACK fopen_file_func OF((
|
|
||||||
voidpf opaque,
|
|
||||||
const char* filename,
|
|
||||||
int mode));
|
|
||||||
|
|
||||||
uLong ZCALLBACK fread_file_func OF((
|
|
||||||
voidpf opaque,
|
|
||||||
voidpf stream,
|
|
||||||
void* buf,
|
|
||||||
uLong size));
|
|
||||||
|
|
||||||
uLong ZCALLBACK fwrite_file_func OF((
|
|
||||||
voidpf opaque,
|
|
||||||
voidpf stream,
|
|
||||||
const void* buf,
|
|
||||||
uLong size));
|
|
||||||
|
|
||||||
long ZCALLBACK ftell_file_func OF((
|
|
||||||
voidpf opaque,
|
|
||||||
voidpf stream));
|
|
||||||
|
|
||||||
long ZCALLBACK fseek_file_func OF((
|
|
||||||
voidpf opaque,
|
|
||||||
voidpf stream,
|
|
||||||
uLong offset,
|
|
||||||
int origin));
|
|
||||||
|
|
||||||
int ZCALLBACK fclose_file_func OF((
|
|
||||||
voidpf opaque,
|
|
||||||
voidpf stream));
|
|
||||||
|
|
||||||
int ZCALLBACK ferror_file_func OF((
|
|
||||||
voidpf opaque,
|
|
||||||
voidpf stream));
|
|
||||||
|
|
||||||
|
|
||||||
voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
|
|
||||||
voidpf opaque;
|
|
||||||
const char* filename;
|
|
||||||
int mode;
|
|
||||||
{
|
|
||||||
FILE* file = NULL;
|
|
||||||
const char* mode_fopen = NULL;
|
|
||||||
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
|
|
||||||
mode_fopen = "rb";
|
|
||||||
else
|
|
||||||
if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
|
|
||||||
mode_fopen = "r+b";
|
|
||||||
else
|
|
||||||
if (mode & ZLIB_FILEFUNC_MODE_CREATE)
|
|
||||||
mode_fopen = "wb";
|
|
||||||
|
|
||||||
if ((filename!=NULL) && (mode_fopen != NULL))
|
|
||||||
file = fopen(filename, mode_fopen);
|
|
||||||
return file;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
|
|
||||||
voidpf opaque;
|
|
||||||
voidpf stream;
|
|
||||||
void* buf;
|
|
||||||
uLong size;
|
|
||||||
{
|
|
||||||
uLong ret;
|
|
||||||
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
|
|
||||||
voidpf opaque;
|
|
||||||
voidpf stream;
|
|
||||||
const void* buf;
|
|
||||||
uLong size;
|
|
||||||
{
|
|
||||||
uLong ret;
|
|
||||||
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
long ZCALLBACK ftell_file_func (opaque, stream)
|
|
||||||
voidpf opaque;
|
|
||||||
voidpf stream;
|
|
||||||
{
|
|
||||||
long ret;
|
|
||||||
ret = ftell((FILE *)stream);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
|
|
||||||
voidpf opaque;
|
|
||||||
voidpf stream;
|
|
||||||
uLong offset;
|
|
||||||
int origin;
|
|
||||||
{
|
|
||||||
int fseek_origin=0;
|
|
||||||
long ret;
|
|
||||||
switch (origin)
|
|
||||||
{
|
|
||||||
case ZLIB_FILEFUNC_SEEK_CUR :
|
|
||||||
fseek_origin = SEEK_CUR;
|
|
||||||
break;
|
|
||||||
case ZLIB_FILEFUNC_SEEK_END :
|
|
||||||
fseek_origin = SEEK_END;
|
|
||||||
break;
|
|
||||||
case ZLIB_FILEFUNC_SEEK_SET :
|
|
||||||
fseek_origin = SEEK_SET;
|
|
||||||
break;
|
|
||||||
default: return -1;
|
|
||||||
}
|
|
||||||
ret = 0;
|
|
||||||
fseek((FILE *)stream, offset, fseek_origin);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
int ZCALLBACK fclose_file_func (opaque, stream)
|
|
||||||
voidpf opaque;
|
|
||||||
voidpf stream;
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
ret = fclose((FILE *)stream);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
int ZCALLBACK ferror_file_func (opaque, stream)
|
|
||||||
voidpf opaque;
|
|
||||||
voidpf stream;
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
ret = ferror((FILE *)stream);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
void fill_fopen_filefunc (pzlib_filefunc_def)
|
|
||||||
zlib_filefunc_def* pzlib_filefunc_def;
|
|
||||||
{
|
|
||||||
pzlib_filefunc_def->zopen_file = fopen_file_func;
|
|
||||||
pzlib_filefunc_def->zread_file = fread_file_func;
|
|
||||||
pzlib_filefunc_def->zwrite_file = fwrite_file_func;
|
|
||||||
pzlib_filefunc_def->ztell_file = ftell_file_func;
|
|
||||||
pzlib_filefunc_def->zseek_file = fseek_file_func;
|
|
||||||
pzlib_filefunc_def->zclose_file = fclose_file_func;
|
|
||||||
pzlib_filefunc_def->zerror_file = ferror_file_func;
|
|
||||||
pzlib_filefunc_def->opaque = NULL;
|
|
||||||
}
|
|
||||||
@ -1,75 +0,0 @@
|
|||||||
/* ioapi.h -- IO base function header for compress/uncompress .zip
|
|
||||||
files using zlib + zip or unzip API
|
|
||||||
|
|
||||||
Version 1.01e, February 12th, 2005
|
|
||||||
|
|
||||||
Copyright (C) 1998-2005 Gilles Vollant
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _ZLIBIOAPI_H
|
|
||||||
#define _ZLIBIOAPI_H
|
|
||||||
|
|
||||||
|
|
||||||
#define ZLIB_FILEFUNC_SEEK_CUR (1)
|
|
||||||
#define ZLIB_FILEFUNC_SEEK_END (2)
|
|
||||||
#define ZLIB_FILEFUNC_SEEK_SET (0)
|
|
||||||
|
|
||||||
#define ZLIB_FILEFUNC_MODE_READ (1)
|
|
||||||
#define ZLIB_FILEFUNC_MODE_WRITE (2)
|
|
||||||
#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
|
|
||||||
|
|
||||||
#define ZLIB_FILEFUNC_MODE_EXISTING (4)
|
|
||||||
#define ZLIB_FILEFUNC_MODE_CREATE (8)
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef ZCALLBACK
|
|
||||||
|
|
||||||
#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
|
|
||||||
#define ZCALLBACK CALLBACK
|
|
||||||
#else
|
|
||||||
#define ZCALLBACK
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
|
|
||||||
typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
|
|
||||||
typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
|
|
||||||
typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
|
|
||||||
typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
|
|
||||||
typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
|
|
||||||
typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
|
|
||||||
|
|
||||||
typedef struct zlib_filefunc_def_s
|
|
||||||
{
|
|
||||||
open_file_func zopen_file;
|
|
||||||
read_file_func zread_file;
|
|
||||||
write_file_func zwrite_file;
|
|
||||||
tell_file_func ztell_file;
|
|
||||||
seek_file_func zseek_file;
|
|
||||||
close_file_func zclose_file;
|
|
||||||
testerror_file_func zerror_file;
|
|
||||||
voidpf opaque;
|
|
||||||
} zlib_filefunc_def;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
|
|
||||||
|
|
||||||
#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
|
|
||||||
#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
|
|
||||||
#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
|
|
||||||
#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
|
|
||||||
#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
|
|
||||||
#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@ -1,269 +0,0 @@
|
|||||||
/* iowin32.c -- 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>
|
|
||||||
|
|
||||||
#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));
|
|
||||||
|
|
||||||
long ZCALLBACK win32_tell_file_func OF((
|
|
||||||
voidpf opaque,
|
|
||||||
voidpf stream));
|
|
||||||
|
|
||||||
long ZCALLBACK win32_seek_file_func OF((
|
|
||||||
voidpf opaque,
|
|
||||||
voidpf stream,
|
|
||||||
uLong offset,
|
|
||||||
int origin));
|
|
||||||
|
|
||||||
int ZCALLBACK win32_close_file_func OF((
|
|
||||||
voidpf opaque,
|
|
||||||
voidpf stream));
|
|
||||||
|
|
||||||
int ZCALLBACK win32_error_file_func OF((
|
|
||||||
voidpf opaque,
|
|
||||||
voidpf stream));
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
HANDLE hf;
|
|
||||||
int error;
|
|
||||||
} WIN32FILE_IOWIN;
|
|
||||||
|
|
||||||
voidpf ZCALLBACK win32_open_file_func (opaque, filename, mode)
|
|
||||||
voidpf opaque;
|
|
||||||
const char* filename;
|
|
||||||
int mode;
|
|
||||||
{
|
|
||||||
DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
|
|
||||||
HANDLE hFile = 0;
|
|
||||||
voidpf ret=NULL;
|
|
||||||
|
|
||||||
dwDesiredAccess = dwShareMode = dwFlagsAndAttributes = 0;
|
|
||||||
|
|
||||||
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
|
|
||||||
{
|
|
||||||
dwDesiredAccess = GENERIC_READ;
|
|
||||||
dwCreationDisposition = OPEN_EXISTING;
|
|
||||||
dwShareMode = FILE_SHARE_READ;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
|
|
||||||
{
|
|
||||||
dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
|
|
||||||
dwCreationDisposition = OPEN_EXISTING;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
if (mode & ZLIB_FILEFUNC_MODE_CREATE)
|
|
||||||
{
|
|
||||||
dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
|
|
||||||
dwCreationDisposition = CREATE_ALWAYS;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((filename!=NULL) && (dwDesiredAccess != 0))
|
|
||||||
hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL,
|
|
||||||
dwCreationDisposition, dwFlagsAndAttributes, NULL);
|
|
||||||
|
|
||||||
if (hFile == INVALID_HANDLE_VALUE)
|
|
||||||
hFile = NULL;
|
|
||||||
|
|
||||||
if (hFile != NULL)
|
|
||||||
{
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
uLong ZCALLBACK win32_read_file_func (opaque, stream, buf, size)
|
|
||||||
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 (opaque, stream, buf, size)
|
|
||||||
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 (opaque, stream)
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
int ZCALLBACK win32_close_file_func (opaque, stream)
|
|
||||||
voidpf opaque;
|
|
||||||
voidpf stream;
|
|
||||||
{
|
|
||||||
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 (opaque, stream)
|
|
||||||
voidpf opaque;
|
|
||||||
voidpf stream;
|
|
||||||
{
|
|
||||||
int ret=-1;
|
|
||||||
if (stream!=NULL)
|
|
||||||
{
|
|
||||||
ret = ((WIN32FILE_IOWIN*)stream) -> error;
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
void fill_win32_filefunc (pzlib_filefunc_def)
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
/* iowin32.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 <windows.h>
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
1602
src/zlib/unzip.c
1602
src/zlib/unzip.c
File diff suppressed because it is too large
Load Diff
354
src/zlib/unzip.h
354
src/zlib/unzip.h
@ -1,354 +0,0 @@
|
|||||||
/* unzip.h -- IO for uncompress .zip files using zlib
|
|
||||||
Version 1.01e, February 12th, 2005
|
|
||||||
|
|
||||||
Copyright (C) 1998-2005 Gilles Vollant
|
|
||||||
|
|
||||||
This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
|
|
||||||
WinZip, InfoZip tools and compatible.
|
|
||||||
|
|
||||||
Multi volume ZipFile (span) are not supported.
|
|
||||||
Encryption compatible with pkzip 2.04g only supported
|
|
||||||
Old compressions used by old PKZip 1.x are not supported
|
|
||||||
|
|
||||||
|
|
||||||
I WAIT FEEDBACK at mail info@winimage.com
|
|
||||||
Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
|
|
||||||
|
|
||||||
Condition of use and distribution are the same than zlib :
|
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
|
||||||
warranty. In no event will the authors be held liable for any damages
|
|
||||||
arising from the use of this software.
|
|
||||||
|
|
||||||
Permission is granted to anyone to use this software for any purpose,
|
|
||||||
including commercial applications, and to alter it and redistribute it
|
|
||||||
freely, subject to the following restrictions:
|
|
||||||
|
|
||||||
1. The origin of this software must not be misrepresented; you must not
|
|
||||||
claim that you wrote the original software. If you use this software
|
|
||||||
in a product, an acknowledgment in the product documentation would be
|
|
||||||
appreciated but is not required.
|
|
||||||
2. Altered source versions must be plainly marked as such, and must not be
|
|
||||||
misrepresented as being the original software.
|
|
||||||
3. This notice may not be removed or altered from any source distribution.
|
|
||||||
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* for more info about .ZIP format, see
|
|
||||||
http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
|
|
||||||
http://www.info-zip.org/pub/infozip/doc/
|
|
||||||
PkWare has also a specification at :
|
|
||||||
ftp://ftp.pkware.com/probdesc.zip
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _unz_H
|
|
||||||
#define _unz_H
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _ZLIB_H
|
|
||||||
#include "zlib.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _ZLIBIOAPI_H
|
|
||||||
#include "ioapi.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
|
|
||||||
/* like the STRICT of WIN32, we define a pointer that cannot be converted
|
|
||||||
from (void*) without cast */
|
|
||||||
typedef struct TagunzFile__ { int unused; } unzFile__;
|
|
||||||
typedef unzFile__ *unzFile;
|
|
||||||
#else
|
|
||||||
typedef voidp unzFile;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#define UNZ_OK (0)
|
|
||||||
#define UNZ_END_OF_LIST_OF_FILE (-100)
|
|
||||||
#define UNZ_ERRNO (Z_ERRNO)
|
|
||||||
#define UNZ_EOF (0)
|
|
||||||
#define UNZ_PARAMERROR (-102)
|
|
||||||
#define UNZ_BADZIPFILE (-103)
|
|
||||||
#define UNZ_INTERNALERROR (-104)
|
|
||||||
#define UNZ_CRCERROR (-105)
|
|
||||||
|
|
||||||
/* tm_unz contain date/time info */
|
|
||||||
typedef struct tm_unz_s
|
|
||||||
{
|
|
||||||
uInt tm_sec; /* seconds after the minute - [0,59] */
|
|
||||||
uInt tm_min; /* minutes after the hour - [0,59] */
|
|
||||||
uInt tm_hour; /* hours since midnight - [0,23] */
|
|
||||||
uInt tm_mday; /* day of the month - [1,31] */
|
|
||||||
uInt tm_mon; /* months since January - [0,11] */
|
|
||||||
uInt tm_year; /* years - [1980..2044] */
|
|
||||||
} tm_unz;
|
|
||||||
|
|
||||||
/* unz_global_info structure contain global data about the ZIPfile
|
|
||||||
These data comes from the end of central dir */
|
|
||||||
typedef struct unz_global_info_s
|
|
||||||
{
|
|
||||||
uLong number_entry; /* total number of entries in
|
|
||||||
the central dir on this disk */
|
|
||||||
uLong size_comment; /* size of the global comment of the zipfile */
|
|
||||||
} unz_global_info;
|
|
||||||
|
|
||||||
|
|
||||||
/* unz_file_info contain information about a file in the zipfile */
|
|
||||||
typedef struct unz_file_info_s
|
|
||||||
{
|
|
||||||
uLong version; /* version made by 2 bytes */
|
|
||||||
uLong version_needed; /* version needed to extract 2 bytes */
|
|
||||||
uLong flag; /* general purpose bit flag 2 bytes */
|
|
||||||
uLong compression_method; /* compression method 2 bytes */
|
|
||||||
uLong dosDate; /* last mod file date in Dos fmt 4 bytes */
|
|
||||||
uLong crc; /* crc-32 4 bytes */
|
|
||||||
uLong compressed_size; /* compressed size 4 bytes */
|
|
||||||
uLong uncompressed_size; /* uncompressed size 4 bytes */
|
|
||||||
uLong size_filename; /* filename length 2 bytes */
|
|
||||||
uLong size_file_extra; /* extra field length 2 bytes */
|
|
||||||
uLong size_file_comment; /* file comment length 2 bytes */
|
|
||||||
|
|
||||||
uLong disk_num_start; /* disk number start 2 bytes */
|
|
||||||
uLong internal_fa; /* internal file attributes 2 bytes */
|
|
||||||
uLong external_fa; /* external file attributes 4 bytes */
|
|
||||||
|
|
||||||
tm_unz tmu_date;
|
|
||||||
} unz_file_info;
|
|
||||||
|
|
||||||
extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
|
|
||||||
const char* fileName2,
|
|
||||||
int iCaseSensitivity));
|
|
||||||
/*
|
|
||||||
Compare two filename (fileName1,fileName2).
|
|
||||||
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
|
|
||||||
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
|
|
||||||
or strcasecmp)
|
|
||||||
If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
|
|
||||||
(like 1 on Unix, 2 on Windows)
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
extern unzFile ZEXPORT unzOpen OF((const char *path));
|
|
||||||
/*
|
|
||||||
Open a Zip file. path contain the full pathname (by example,
|
|
||||||
on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
|
|
||||||
"zlib/zlib113.zip".
|
|
||||||
If the zipfile cannot be opened (file don't exist or in not valid), the
|
|
||||||
return value is NULL.
|
|
||||||
Else, the return value is a unzFile Handle, usable with other function
|
|
||||||
of this unzip package.
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern unzFile ZEXPORT unzOpen2 OF((const char *path,
|
|
||||||
zlib_filefunc_def* pzlib_filefunc_def));
|
|
||||||
/*
|
|
||||||
Open a Zip file, like unzOpen, but provide a set of file low level API
|
|
||||||
for read/write the zip file (see ioapi.h)
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzClose OF((unzFile file));
|
|
||||||
/*
|
|
||||||
Close a ZipFile opened with unzipOpen.
|
|
||||||
If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
|
|
||||||
these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
|
|
||||||
return UNZ_OK if there is no problem. */
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
|
|
||||||
unz_global_info *pglobal_info));
|
|
||||||
/*
|
|
||||||
Write info about the ZipFile in the *pglobal_info structure.
|
|
||||||
No preparation of the structure is needed
|
|
||||||
return UNZ_OK if there is no problem. */
|
|
||||||
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
|
|
||||||
char *szComment,
|
|
||||||
uLong uSizeBuf));
|
|
||||||
/*
|
|
||||||
Get the global comment string of the ZipFile, in the szComment buffer.
|
|
||||||
uSizeBuf is the size of the szComment buffer.
|
|
||||||
return the number of byte copied or an error code <0
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************/
|
|
||||||
/* Unzip package allow you browse the directory of the zipfile */
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
|
|
||||||
/*
|
|
||||||
Set the current file of the zipfile to the first file.
|
|
||||||
return UNZ_OK if there is no problem
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGoToNextFile OF((unzFile file));
|
|
||||||
/*
|
|
||||||
Set the current file of the zipfile to the next file.
|
|
||||||
return UNZ_OK if there is no problem
|
|
||||||
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzLocateFile OF((unzFile file,
|
|
||||||
const char *szFileName,
|
|
||||||
int iCaseSensitivity));
|
|
||||||
/*
|
|
||||||
Try locate the file szFileName in the zipfile.
|
|
||||||
For the iCaseSensitivity signification, see unzStringFileNameCompare
|
|
||||||
|
|
||||||
return value :
|
|
||||||
UNZ_OK if the file is found. It becomes the current file.
|
|
||||||
UNZ_END_OF_LIST_OF_FILE if the file is not found
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/* ****************************************** */
|
|
||||||
/* Ryan supplied functions */
|
|
||||||
/* unz_file_info contain information about a file in the zipfile */
|
|
||||||
typedef struct unz_file_pos_s
|
|
||||||
{
|
|
||||||
uLong pos_in_zip_directory; /* offset in zip file directory */
|
|
||||||
uLong num_of_file; /* # of file */
|
|
||||||
} unz_file_pos;
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGetFilePos(
|
|
||||||
unzFile file,
|
|
||||||
unz_file_pos* file_pos);
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGoToFilePos(
|
|
||||||
unzFile file,
|
|
||||||
unz_file_pos* file_pos);
|
|
||||||
|
|
||||||
/* ****************************************** */
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
|
|
||||||
unz_file_info *pfile_info,
|
|
||||||
char *szFileName,
|
|
||||||
uLong fileNameBufferSize,
|
|
||||||
void *extraField,
|
|
||||||
uLong extraFieldBufferSize,
|
|
||||||
char *szComment,
|
|
||||||
uLong commentBufferSize));
|
|
||||||
/*
|
|
||||||
Get Info about the current file
|
|
||||||
if pfile_info!=NULL, the *pfile_info structure will contain somes info about
|
|
||||||
the current file
|
|
||||||
if szFileName!=NULL, the filemane string will be copied in szFileName
|
|
||||||
(fileNameBufferSize is the size of the buffer)
|
|
||||||
if extraField!=NULL, the extra field information will be copied in extraField
|
|
||||||
(extraFieldBufferSize is the size of the buffer).
|
|
||||||
This is the Central-header version of the extra field
|
|
||||||
if szComment!=NULL, the comment string of the file will be copied in szComment
|
|
||||||
(commentBufferSize is the size of the buffer)
|
|
||||||
*/
|
|
||||||
|
|
||||||
/***************************************************************************/
|
|
||||||
/* for reading the content of the current zipfile, you can open it, read data
|
|
||||||
from it, and close it (you can close it before reading all the file)
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
|
|
||||||
/*
|
|
||||||
Open for reading data the current file in the zipfile.
|
|
||||||
If there is no error, the return value is UNZ_OK.
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
|
|
||||||
const char* password));
|
|
||||||
/*
|
|
||||||
Open for reading data the current file in the zipfile.
|
|
||||||
password is a crypting password
|
|
||||||
If there is no error, the return value is UNZ_OK.
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
|
|
||||||
int* method,
|
|
||||||
int* level,
|
|
||||||
int raw));
|
|
||||||
/*
|
|
||||||
Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
|
|
||||||
if raw==1
|
|
||||||
*method will receive method of compression, *level will receive level of
|
|
||||||
compression
|
|
||||||
note : you can set level parameter as NULL (if you did not want known level,
|
|
||||||
but you CANNOT set method parameter as NULL
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
|
|
||||||
int* method,
|
|
||||||
int* level,
|
|
||||||
int raw,
|
|
||||||
const char* password));
|
|
||||||
/*
|
|
||||||
Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
|
|
||||||
if raw==1
|
|
||||||
*method will receive method of compression, *level will receive level of
|
|
||||||
compression
|
|
||||||
note : you can set level parameter as NULL (if you did not want known level,
|
|
||||||
but you CANNOT set method parameter as NULL
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
|
|
||||||
/*
|
|
||||||
Close the file in zip opened with unzOpenCurrentFile
|
|
||||||
Return UNZ_CRCERROR if all the file was read but the CRC is not good
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
|
|
||||||
voidp buf,
|
|
||||||
unsigned len));
|
|
||||||
/*
|
|
||||||
Read bytes from the current file (opened by unzOpenCurrentFile)
|
|
||||||
buf contain buffer where data must be copied
|
|
||||||
len the size of buf.
|
|
||||||
|
|
||||||
return the number of byte copied if somes bytes are copied
|
|
||||||
return 0 if the end of file was reached
|
|
||||||
return <0 with error code if there is an error
|
|
||||||
(UNZ_ERRNO for IO error, or zLib error for uncompress error)
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern z_off_t ZEXPORT unztell OF((unzFile file));
|
|
||||||
/*
|
|
||||||
Give the current position in uncompressed data
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzeof OF((unzFile file));
|
|
||||||
/*
|
|
||||||
return 1 if the end of file was reached, 0 elsewhere
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
|
|
||||||
voidp buf,
|
|
||||||
unsigned len));
|
|
||||||
/*
|
|
||||||
Read extra field from the current file (opened by unzOpenCurrentFile)
|
|
||||||
This is the local-header version of the extra field (sometimes, there is
|
|
||||||
more info in the local-header version than in the central-header)
|
|
||||||
|
|
||||||
if buf==NULL, it return the size of the local extra field
|
|
||||||
|
|
||||||
if buf!=NULL, len is the size of the buffer, the extra header is copied in
|
|
||||||
buf.
|
|
||||||
the return value is the number of bytes copied in buf, or (if <0)
|
|
||||||
the error code
|
|
||||||
*/
|
|
||||||
|
|
||||||
/***************************************************************************/
|
|
||||||
|
|
||||||
/* Get the current file offset */
|
|
||||||
extern uLong ZEXPORT unzGetOffset (unzFile file);
|
|
||||||
|
|
||||||
/* Set the current file offset */
|
|
||||||
extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _unz_H */
|
|
||||||
@ -38,7 +38,7 @@ RSC=rc.exe
|
|||||||
# PROP Ignore_Export_Lib 0
|
# PROP Ignore_Export_Lib 0
|
||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||||
# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /I "..\src\mysql" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_sql/char-server_sql.pch" /YX /Fo"tmp/char_sql/" /Fd"tmp/char_sql/" /FD /c
|
# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /I "..\src\mysql" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_sql/char-server_sql.pch" /YX /Fo"tmp/char_sql/" /Fd"tmp/char_sql/" /FD /c
|
||||||
# ADD BASE RSC /l 0x409
|
# ADD BASE RSC /l 0x409
|
||||||
BSC32=bscmake.exe
|
BSC32=bscmake.exe
|
||||||
# ADD BASE BSC32 /nologo
|
# ADD BASE BSC32 /nologo
|
||||||
@ -250,45 +250,5 @@ SOURCE=..\src\char_sql\itemdb.c
|
|||||||
SOURCE=..\src\char_sql\itemdb.h
|
SOURCE=..\src\char_sql\itemdb.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# End Group
|
# End Group
|
||||||
# Begin Group "zlib"
|
|
||||||
|
|
||||||
# PROP Default_Filter ""
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\crypt.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\ioapi.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\ioapi.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\iowin32.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\iowin32.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\unzip.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\unzip.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\zconf.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\zlib.h
|
|
||||||
# End Source File
|
|
||||||
# End Group
|
|
||||||
# End Target
|
# End Target
|
||||||
# End Project
|
# End Project
|
||||||
|
|||||||
@ -38,7 +38,7 @@ RSC=rc.exe
|
|||||||
# PROP Ignore_Export_Lib 0
|
# PROP Ignore_Export_Lib 0
|
||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||||
# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_txt/char-server_txt.pch" /YX /Fo"tmp/char_txt/" /Fd"tmp/char_txt/" /FD /c
|
# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/char_txt/char-server_txt.pch" /YX /Fo"tmp/char_txt/" /Fd"tmp/char_txt/" /FD /c
|
||||||
# ADD BASE RSC /l 0x409
|
# ADD BASE RSC /l 0x409
|
||||||
BSC32=bscmake.exe
|
BSC32=bscmake.exe
|
||||||
# ADD BASE BSC32 /nologo
|
# ADD BASE BSC32 /nologo
|
||||||
@ -250,45 +250,5 @@ SOURCE=..\src\char\inter.c
|
|||||||
SOURCE=..\src\char\inter.h
|
SOURCE=..\src\char\inter.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# End Group
|
# End Group
|
||||||
# Begin Group "zlib"
|
|
||||||
|
|
||||||
# PROP Default_Filter ""
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\crypt.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\ioapi.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\ioapi.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\iowin32.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\iowin32.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\unzip.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\unzip.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\zconf.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\zlib.h
|
|
||||||
# End Source File
|
|
||||||
# End Group
|
|
||||||
# End Target
|
# End Target
|
||||||
# End Project
|
# End Project
|
||||||
|
|||||||
@ -38,7 +38,7 @@ RSC=rc.exe
|
|||||||
# PROP Ignore_Export_Lib 0
|
# PROP Ignore_Export_Lib 0
|
||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||||
# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /I "..\src\mysql" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/login_sql/login-server_sql.pch" /YX /Fo"tmp/login_sql/" /Fd"tmp/login_sql/" /FD /c
|
# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /I "..\src\mysql" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D PACKETVER=6 /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/login_sql/login-server_sql.pch" /YX /Fo"tmp/login_sql/" /Fd"tmp/login_sql/" /FD /c
|
||||||
# ADD BASE RSC /l 0x409
|
# ADD BASE RSC /l 0x409
|
||||||
BSC32=bscmake.exe
|
BSC32=bscmake.exe
|
||||||
# ADD BASE BSC32 /nologo
|
# ADD BASE BSC32 /nologo
|
||||||
@ -206,45 +206,5 @@ SOURCE=..\src\login_sql\login.c
|
|||||||
SOURCE=..\src\login_sql\login.h
|
SOURCE=..\src\login_sql\login.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# End Group
|
# End Group
|
||||||
# Begin Group "zlib"
|
|
||||||
|
|
||||||
# PROP Default_Filter ""
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\crypt.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\ioapi.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\ioapi.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\iowin32.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\iowin32.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\unzip.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\unzip.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\zconf.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\zlib.h
|
|
||||||
# End Source File
|
|
||||||
# End Group
|
|
||||||
# End Target
|
# End Target
|
||||||
# End Project
|
# End Project
|
||||||
|
|||||||
@ -38,7 +38,7 @@ RSC=rc.exe
|
|||||||
# PROP Ignore_Export_Lib 0
|
# PROP Ignore_Export_Lib 0
|
||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||||
# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/login_txt/login-server_txt.pch" /YX /Fo"tmp/login_txt/" /Fd"tmp/login_txt/" /FD /c
|
# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/login_txt/login-server_txt.pch" /YX /Fo"tmp/login_txt/" /Fd"tmp/login_txt/" /FD /c
|
||||||
# ADD BASE RSC /l 0x409
|
# ADD BASE RSC /l 0x409
|
||||||
BSC32=bscmake.exe
|
BSC32=bscmake.exe
|
||||||
# ADD BASE BSC32 /nologo
|
# ADD BASE BSC32 /nologo
|
||||||
@ -202,45 +202,5 @@ SOURCE=..\src\login\login.c
|
|||||||
SOURCE=..\src\login\login.h
|
SOURCE=..\src\login\login.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# End Group
|
# End Group
|
||||||
# Begin Group "zlib"
|
|
||||||
|
|
||||||
# PROP Default_Filter ""
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\crypt.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\ioapi.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\ioapi.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\iowin32.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\iowin32.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\unzip.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\unzip.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\zconf.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\zlib.h
|
|
||||||
# End Source File
|
|
||||||
# End Group
|
|
||||||
# End Target
|
# End Target
|
||||||
# End Project
|
# End Project
|
||||||
|
|||||||
@ -38,7 +38,7 @@ RSC=rc.exe
|
|||||||
# PROP Ignore_Export_Lib 0
|
# PROP Ignore_Export_Lib 0
|
||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||||
# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /I "..\src\mysql" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_sql/map-server_sql.pch" /YX /Fo"tmp/map_sql/" /Fd"tmp/map_sql/" /FD /c
|
# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /I "..\src\mysql" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_sql/map-server_sql.pch" /YX /Fo"tmp/map_sql/" /Fd"tmp/map_sql/" /FD /c
|
||||||
# ADD BASE RSC /l 0x409
|
# ADD BASE RSC /l 0x409
|
||||||
BSC32=bscmake.exe
|
BSC32=bscmake.exe
|
||||||
# ADD BASE BSC32 /nologo
|
# ADD BASE BSC32 /nologo
|
||||||
@ -419,34 +419,6 @@ SOURCE=..\src\map\vending.h
|
|||||||
# PROP Default_Filter ""
|
# PROP Default_Filter ""
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\src\zlib\crypt.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\ioapi.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\ioapi.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\iowin32.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\iowin32.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\unzip.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\unzip.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\zconf.h
|
SOURCE=..\src\zlib\zconf.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|||||||
@ -38,7 +38,7 @@ RSC=rc.exe
|
|||||||
# PROP Ignore_Export_Lib 0
|
# PROP Ignore_Export_Lib 0
|
||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||||
# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "NEW_006b" /D "__WIN32" /D "LOCALZLIB" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_txt/map-server_txt.pch" /YX /Fo"tmp/map_txt/" /Fd"tmp/map_txt/" /FD /c
|
# ADD CPP /nologo /W2 /GX /O2 /I "..\src\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WIN32" /D "TXT_ONLY" /D "__WIN32" /D "PCRE_SUPPORT" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /Fp"tmp/map_txt/map-server_txt.pch" /YX /Fo"tmp/map_txt/" /Fd"tmp/map_txt/" /FD /c
|
||||||
# ADD BASE RSC /l 0x409
|
# ADD BASE RSC /l 0x409
|
||||||
BSC32=bscmake.exe
|
BSC32=bscmake.exe
|
||||||
# ADD BASE BSC32 /nologo
|
# ADD BASE BSC32 /nologo
|
||||||
@ -188,9 +188,6 @@ SOURCE=..\src\common\version.h
|
|||||||
# End Group
|
# End Group
|
||||||
# Begin Group "map"
|
# Begin Group "map"
|
||||||
|
|
||||||
# PROP Default_Filter ""
|
|
||||||
# Begin Group "cpp"
|
|
||||||
|
|
||||||
# PROP Default_Filter ""
|
# PROP Default_Filter ""
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
@ -308,10 +305,6 @@ SOURCE=..\src\map\unit.c
|
|||||||
|
|
||||||
SOURCE=..\src\map\vending.c
|
SOURCE=..\src\map\vending.c
|
||||||
# End Source File
|
# End Source File
|
||||||
# End Group
|
|
||||||
# Begin Group "h"
|
|
||||||
|
|
||||||
# PROP Default_Filter ""
|
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\src\map\atcommand.h
|
SOURCE=..\src\map\atcommand.h
|
||||||
@ -425,40 +418,11 @@ SOURCE=..\src\map\unit.h
|
|||||||
SOURCE=..\src\map\vending.h
|
SOURCE=..\src\map\vending.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# End Group
|
# End Group
|
||||||
# End Group
|
|
||||||
# Begin Group "zlib"
|
# Begin Group "zlib"
|
||||||
|
|
||||||
# PROP Default_Filter ""
|
# PROP Default_Filter ""
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\src\zlib\crypt.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\ioapi.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\ioapi.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\iowin32.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\iowin32.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\unzip.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\unzip.h
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\src\zlib\zconf.h
|
SOURCE=..\src\zlib\zconf.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|||||||
@ -292,37 +292,6 @@
|
|||||||
RelativePath="..\src\common\version.h">
|
RelativePath="..\src\common\version.h">
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="zlib"
|
|
||||||
Filter="">
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zconf.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zlib.h">
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
</Files>
|
</Files>
|
||||||
<Globals>
|
<Globals>
|
||||||
</Globals>
|
</Globals>
|
||||||
|
|||||||
@ -291,37 +291,6 @@
|
|||||||
RelativePath="..\src\common\version.h">
|
RelativePath="..\src\common\version.h">
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="zlib"
|
|
||||||
Filter="">
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zconf.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zlib.h">
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
</Files>
|
</Files>
|
||||||
<Globals>
|
<Globals>
|
||||||
</Globals>
|
</Globals>
|
||||||
|
|||||||
@ -251,37 +251,6 @@
|
|||||||
RelativePath="..\src\common\version.h">
|
RelativePath="..\src\common\version.h">
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="zlib"
|
|
||||||
Filter="">
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zconf.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zlib.h">
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
</Files>
|
</Files>
|
||||||
<Globals>
|
<Globals>
|
||||||
</Globals>
|
</Globals>
|
||||||
|
|||||||
@ -254,37 +254,6 @@
|
|||||||
RelativePath="..\src\common\version.h">
|
RelativePath="..\src\common\version.h">
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="zlib"
|
|
||||||
Filter="">
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zconf.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zlib.h">
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
</Files>
|
</Files>
|
||||||
<Globals>
|
<Globals>
|
||||||
</Globals>
|
</Globals>
|
||||||
|
|||||||
@ -419,27 +419,6 @@
|
|||||||
<Filter
|
<Filter
|
||||||
Name="zlib"
|
Name="zlib"
|
||||||
Filter="">
|
Filter="">
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h">
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\src\zlib\zconf.h">
|
RelativePath="..\src\zlib\zconf.h">
|
||||||
</File>
|
</File>
|
||||||
|
|||||||
@ -419,27 +419,6 @@
|
|||||||
<Filter
|
<Filter
|
||||||
Name="zlib"
|
Name="zlib"
|
||||||
Filter="">
|
Filter="">
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h">
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\src\zlib\zconf.h">
|
RelativePath="..\src\zlib\zconf.h">
|
||||||
</File>
|
</File>
|
||||||
|
|||||||
@ -153,27 +153,6 @@
|
|||||||
<Filter
|
<Filter
|
||||||
Name="zlib"
|
Name="zlib"
|
||||||
Filter="">
|
Filter="">
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h">
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\src\zlib\zconf.h">
|
RelativePath="..\src\zlib\zconf.h">
|
||||||
</File>
|
</File>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="Windows-1252"?>
|
<?xml version="1.0" encoding="Windows-1252"?>
|
||||||
<VisualStudioProject
|
<VisualStudioProject
|
||||||
ProjectType="Visual C++"
|
ProjectType="Visual C++"
|
||||||
Version="8.00"
|
Version="8,00"
|
||||||
Name="char-server_sql"
|
Name="char-server_sql"
|
||||||
ProjectGUID="{D356871D-58E1-450B-967A-E4E9646175AF}"
|
ProjectGUID="{D356871D-58E1-450B-967A-E4E9646175AF}"
|
||||||
RootNamespace="char-server_sql"
|
RootNamespace="char-server_sql"
|
||||||
@ -233,14 +233,6 @@
|
|||||||
RelativePath="..\src\common\ers.h"
|
RelativePath="..\src\common\ers.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\src\common\grfio.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\common\grfio.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\src\common\lock.c"
|
RelativePath="..\src\common\lock.c"
|
||||||
>
|
>
|
||||||
@ -334,46 +326,6 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="zlib"
|
|
||||||
>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zconf.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zlib.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
<Filter
|
<Filter
|
||||||
Name="char_sql"
|
Name="char_sql"
|
||||||
>
|
>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="Windows-1252"?>
|
<?xml version="1.0" encoding="Windows-1252"?>
|
||||||
<VisualStudioProject
|
<VisualStudioProject
|
||||||
ProjectType="Visual C++"
|
ProjectType="Visual C++"
|
||||||
Version="8.00"
|
Version="8,00"
|
||||||
Name="char-server_txt"
|
Name="char-server_txt"
|
||||||
ProjectGUID="{D356871D-58E1-450B-967A-E3E9646175AF}"
|
ProjectGUID="{D356871D-58E1-450B-967A-E3E9646175AF}"
|
||||||
RootNamespace="char-server_txt"
|
RootNamespace="char-server_txt"
|
||||||
@ -295,14 +295,6 @@
|
|||||||
RelativePath="..\src\common\ers.h"
|
RelativePath="..\src\common\ers.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\src\common\grfio.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\common\grfio.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\src\common\lock.c"
|
RelativePath="..\src\common\lock.c"
|
||||||
>
|
>
|
||||||
@ -396,46 +388,6 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="zlib"
|
|
||||||
>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zconf.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zlib.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
</Files>
|
</Files>
|
||||||
<Globals>
|
<Globals>
|
||||||
</Globals>
|
</Globals>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="Windows-1252"?>
|
<?xml version="1.0" encoding="Windows-1252"?>
|
||||||
<VisualStudioProject
|
<VisualStudioProject
|
||||||
ProjectType="Visual C++"
|
ProjectType="Visual C++"
|
||||||
Version="8.00"
|
Version="8,00"
|
||||||
Name="login-server_sql"
|
Name="login-server_sql"
|
||||||
ProjectGUID="{D356871D-58E1-450B-967A-E5E9646175AF}"
|
ProjectGUID="{D356871D-58E1-450B-967A-E5E9646175AF}"
|
||||||
RootNamespace="login-server_sql"
|
RootNamespace="login-server_sql"
|
||||||
@ -247,14 +247,6 @@
|
|||||||
RelativePath="..\src\common\ers.h"
|
RelativePath="..\src\common\ers.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\src\common\grfio.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\common\grfio.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\src\common\lock.c"
|
RelativePath="..\src\common\lock.c"
|
||||||
>
|
>
|
||||||
@ -348,46 +340,6 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="zlib"
|
|
||||||
>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zconf.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zlib.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
</Files>
|
</Files>
|
||||||
<Globals>
|
<Globals>
|
||||||
</Globals>
|
</Globals>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="Windows-1252"?>
|
<?xml version="1.0" encoding="Windows-1252"?>
|
||||||
<VisualStudioProject
|
<VisualStudioProject
|
||||||
ProjectType="Visual C++"
|
ProjectType="Visual C++"
|
||||||
Version="8.00"
|
Version="8,00"
|
||||||
Name="login-server_txt"
|
Name="login-server_txt"
|
||||||
ProjectGUID="{D356871D-58E1-450B-967A-E2E9646175AF}"
|
ProjectGUID="{D356871D-58E1-450B-967A-E2E9646175AF}"
|
||||||
RootNamespace="login-server_txt"
|
RootNamespace="login-server_txt"
|
||||||
@ -239,14 +239,6 @@
|
|||||||
RelativePath="..\src\common\ers.c"
|
RelativePath="..\src\common\ers.c"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\src\common\grfio.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\common\grfio.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\src\common\lock.c"
|
RelativePath="..\src\common\lock.c"
|
||||||
>
|
>
|
||||||
@ -340,46 +332,6 @@
|
|||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="zlib"
|
|
||||||
>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zconf.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\zlib.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
</Files>
|
</Files>
|
||||||
<Globals>
|
<Globals>
|
||||||
</Globals>
|
</Globals>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="Windows-1252"?>
|
<?xml version="1.0" encoding="Windows-1252"?>
|
||||||
<VisualStudioProject
|
<VisualStudioProject
|
||||||
ProjectType="Visual C++"
|
ProjectType="Visual C++"
|
||||||
Version="8.00"
|
Version="8,00"
|
||||||
Name="map-server_sql"
|
Name="map-server_sql"
|
||||||
ProjectGUID="{D356871D-58E1-450B-967A-E6E9646175AF}"
|
ProjectGUID="{D356871D-58E1-450B-967A-E6E9646175AF}"
|
||||||
RootNamespace="map-server_sql"
|
RootNamespace="map-server_sql"
|
||||||
@ -336,34 +336,6 @@
|
|||||||
<Filter
|
<Filter
|
||||||
Name="zlib"
|
Name="zlib"
|
||||||
>
|
>
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\src\zlib\zconf.h"
|
RelativePath="..\src\zlib\zconf.h"
|
||||||
>
|
>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="Windows-1252"?>
|
<?xml version="1.0" encoding="Windows-1252"?>
|
||||||
<VisualStudioProject
|
<VisualStudioProject
|
||||||
ProjectType="Visual C++"
|
ProjectType="Visual C++"
|
||||||
Version="8.00"
|
Version="8,00"
|
||||||
Name="map-server_txt"
|
Name="map-server_txt"
|
||||||
ProjectGUID="{D356871D-58E1-450B-967A-E1E9646175AF}"
|
ProjectGUID="{D356871D-58E1-450B-967A-E1E9646175AF}"
|
||||||
RootNamespace="map-server_txt"
|
RootNamespace="map-server_txt"
|
||||||
@ -436,34 +436,6 @@
|
|||||||
<Filter
|
<Filter
|
||||||
Name="zlib"
|
Name="zlib"
|
||||||
>
|
>
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\src\zlib\zconf.h"
|
RelativePath="..\src\zlib\zconf.h"
|
||||||
>
|
>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="Windows-1252"?>
|
<?xml version="1.0" encoding="Windows-1252"?>
|
||||||
<VisualStudioProject
|
<VisualStudioProject
|
||||||
ProjectType="Visual C++"
|
ProjectType="Visual C++"
|
||||||
Version="8.00"
|
Version="8,00"
|
||||||
Name="mapcache"
|
Name="mapcache"
|
||||||
ProjectGUID="{82A4EF25-7047-4DF1-A89C-94A6C73E0712}"
|
ProjectGUID="{82A4EF25-7047-4DF1-A89C-94A6C73E0712}"
|
||||||
RootNamespace="mapcache"
|
RootNamespace="mapcache"
|
||||||
@ -219,34 +219,6 @@
|
|||||||
<Filter
|
<Filter
|
||||||
Name="zlib"
|
Name="zlib"
|
||||||
>
|
>
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\crypt.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\ioapi.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\iowin32.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\src\zlib\unzip.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\src\zlib\zconf.h"
|
RelativePath="..\src\zlib\zconf.h"
|
||||||
>
|
>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user