fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed 64bit compatability.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2531 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2007-07-23 10:57:46 +00:00
parent 19f998ecde
commit 76adf4ae34
3 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
engine/common/unzip.c
View file

@ -4,6 +4,9 @@
Read unzip.h for more info Read unzip.h for more info
*/ */
//Spike: ported to AMD64
//Spike: FTE specific tweeks are in here starting with FTE's VFS filesystem stuff
//# pragma comment (lib, "zip/zlib.lib") //# pragma comment (lib, "zip/zlib.lib")
@ -128,6 +131,24 @@ typedef struct {
IN assertion: the stream s has been sucessfully opened for reading. IN assertion: the stream s has been sucessfully opened for reading.
*/ */
local int unzlocal_getShortSane(vfsfile_t *fin, unsigned short *pi)
{
unsigned short c;
int err = VFS_READ(fin, &c, 2);
if (err==2)
{
*pi = LittleShort(c);
return UNZ_OK;
}
else
{
*pi = 0;
if (VFS_TELL(fin) != VFS_GETLEN(fin))
return UNZ_ERRNO;
else
return UNZ_EOF;
}
}
local int unzlocal_getShort(vfsfile_t *fin,unsigned long *pi) { local int unzlocal_getShort(vfsfile_t *fin,unsigned long *pi) {
unsigned short c; unsigned short c;
@ -352,6 +373,21 @@ local int unzlocal_GetCurrentFileInfoInternal (unzFile file,
else if (uMagic!=0x02014b50) err=UNZ_BADZIPFILE; else if (uMagic!=0x02014b50) err=UNZ_BADZIPFILE;
} }
unzlocal_getShortSane(s->file, &file_info.version);
unzlocal_getShortSane(s->file, &file_info.version_needed);
unzlocal_getShortSane(s->file, &file_info.flag);
unzlocal_getShortSane(s->file, &file_info.compression_method);
unzlocal_getLong(s->file, &file_info.dosDate);
unzlocal_getLong(s->file, &file_info.crc);
unzlocal_getLong(s->file, &file_info.compressed_size);
unzlocal_getLong(s->file, &file_info.uncompressed_size);
unzlocal_getShortSane(s->file, &file_info.size_filename);
unzlocal_getShortSane(s->file, &file_info.size_file_extra);
unzlocal_getShortSane(s->file, &file_info.size_file_comment);
unzlocal_getShortSane(s->file, &file_info.disk_num_start);
unzlocal_getShortSane(s->file, &file_info.internal_fa);
unzlocal_getLong(s->file, &file_info.external_fa);
/*
VFS_READ(s->file, &file_info, sizeof(file_info)-2*4); // 2*4 is the size of 2 my vars VFS_READ(s->file, &file_info, sizeof(file_info)-2*4); // 2*4 is the size of 2 my vars
file_info.version = LittleShort(file_info.version); file_info.version = LittleShort(file_info.version);
file_info.version_needed = LittleShort(file_info.version_needed); file_info.version_needed = LittleShort(file_info.version_needed);
@ -367,7 +403,7 @@ local int unzlocal_GetCurrentFileInfoInternal (unzFile file,
file_info.disk_num_start = LittleShort(file_info.disk_num_start); file_info.disk_num_start = LittleShort(file_info.disk_num_start);
file_info.internal_fa = LittleShort(file_info.internal_fa); file_info.internal_fa = LittleShort(file_info.internal_fa);
file_info.external_fa = LittleLong(file_info.external_fa); file_info.external_fa = LittleLong(file_info.external_fa);
*/
if (unzlocal_getLong(s->file,&file_info_internal.offset_curfile) != UNZ_OK) err=UNZ_ERRNO; if (unzlocal_getLong(s->file,&file_info_internal.offset_curfile) != UNZ_OK) err=UNZ_ERRNO;
file_info.offset = file_info_internal.offset_curfile; file_info.offset = file_info_internal.offset_curfile;

3
engine/common/unzip.h
View file

@ -33,6 +33,9 @@
*/ */
//(2) This source has been modified to compile for AMD64 archetectures with gcc
/* for more info about .ZIP format, see /* for more info about .ZIP format, see
ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip
PkWare has also a specification at : PkWare has also a specification at :

4
engine/http/httpserver.c
View file

@ -356,9 +356,9 @@ cont:
else else
{ {
if (HTTPmarkup>=3) if (HTTPmarkup>=3)
sprintf(resource, "HTTP/1.1 200 OK\r\n" "Content-Type: %s\r\n" "Content-Length: %i\r\n" "Server: "FULLENGINENAME"/0\r\n" "\r\n", strstr(resource, ".htm")?"text/html":"text/plain", VFS_GETLEN(cl->file)); sprintf(resource, "HTTP/1.1 200 OK\r\n" "Content-Type: %s\r\n" "Content-Length: %i\r\n" "Server: "FULLENGINENAME"/0\r\n" "\r\n", strstr(resource, ".htm")?"text/html":"text/plain", (int)VFS_GETLEN(cl->file));
else if (HTTPmarkup==2) else if (HTTPmarkup==2)
sprintf(resource, "HTTP/1.0 200 OK\r\n" "Content-Type: %s\r\n" "Content-Length: %i\r\n" "Server: "FULLENGINENAME"/0\r\n" "\r\n", strstr(resource, ".htm")?"text/html":"text/plain", VFS_GETLEN(cl->file)); sprintf(resource, "HTTP/1.0 200 OK\r\n" "Content-Type: %s\r\n" "Content-Length: %i\r\n" "Server: "FULLENGINENAME"/0\r\n" "\r\n", strstr(resource, ".htm")?"text/html":"text/plain", (int)VFS_GETLEN(cl->file));
else if (HTTPmarkup) else if (HTTPmarkup)
sprintf(resource, "HTTP/0.9 200 OK\r\n\r\n"); sprintf(resource, "HTTP/0.9 200 OK\r\n\r\n");
else else