thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 19:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wad: Cache pk3 central directory

Browse source 
Massive improvments from seeking less, allows file buffering to work better too

Co-authored-by: James R <justsomejames2@gmail.com>
This commit is contained in:
Ash Logan 2022-08-23 12:32:07 +10:00 • committed by James R.
parent 331a6ea41e
commit 8ca2dc77e7
1 changed files with 41 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/w_wad.cpp
View file

@ -602,7 +602,6 @@ typedef struct zlentry_s
static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp) static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
{ {
zend_t zend; zend_t zend;
zentry_t zentry;
zlentry_t zlentry; zlentry_t zlentry;
UINT16 numlumps = *nlmp; UINT16 numlumps = *nlmp;
@ -633,37 +632,39 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
lump_p = lumpinfo = static_cast<lumpinfo_t*>(Z_Malloc(numlumps * sizeof (*lumpinfo), PU_STATIC, NULL)); lump_p = lumpinfo = static_cast<lumpinfo_t*>(Z_Malloc(numlumps * sizeof (*lumpinfo), PU_STATIC, NULL));
fseek(handle, LONG(zend.cdiroffset), SEEK_SET); fseek(handle, LONG(zend.cdiroffset), SEEK_SET);
char *cdir = static_cast<char*>(Z_MallocAlign(LONG(zend.cdirsize), PU_STATIC, &cdir, 7));
auto cdir_finally = srb2::finally([cdir] { Z_Free(cdir); });
if (fread(cdir, 1, LONG(zend.cdirsize), handle) < static_cast<UINT32>(LONG(zend.cdirsize)))
{
CONS_Alert(CONS_ERROR, "Failed to read central directory (%s)\n", M_FileError(handle));
Z_Free(lumpinfo);
return NULL;
}
size_t offset = 0;
for (i = 0; i < numlumps; i++, lump_p++) for (i = 0; i < numlumps; i++, lump_p++)
{ {
zentry_t *zentry = reinterpret_cast<zentry_t*>(cdir + offset);
char* fullname; char* fullname;
char* trimname; char* trimname;
char* dotpos; char* dotpos;
if (fread(&zentry, 1, sizeof(zentry_t), handle) < sizeof(zentry_t)) if (memcmp(zentry->signature, pat_central, 4))
{
CONS_Alert(CONS_ERROR, "Failed to read central directory (%s)\n", M_FileError(handle));
Z_Free(lumpinfo);
return NULL;
}
if (memcmp(zentry.signature, pat_central, 4))
{ {
CONS_Alert(CONS_ERROR, "Central directory is corrupt\n"); CONS_Alert(CONS_ERROR, "Central directory is corrupt\n");
Z_Free(lumpinfo); Z_Free(lumpinfo);
return NULL; return NULL;
} }
lump_p->position = LONG(zentry.offset); // NOT ACCURATE YET: we still need to read the local entry to find our true position lump_p->position = LONG(zentry->offset); // NOT ACCURATE YET: we still need to read the local entry to find our true position
lump_p->disksize = LONG(zentry.compsize); lump_p->disksize = LONG(zentry->compsize);
lump_p->size = LONG(zentry.size); lump_p->size = LONG(zentry->size);
fullname = static_cast<char*>(malloc(SHORT(zentry.namelen) + 1)); fullname = static_cast<char*>(malloc(SHORT(zentry->namelen) + 1));
if (fgets(fullname, SHORT(zentry.namelen) + 1, handle) != fullname) strlcpy(fullname, (char*)(zentry + 1), SHORT(zentry->namelen) + 1);
{
CONS_Alert(CONS_ERROR, "Unable to read lumpname (%s)\n", M_FileError(handle));
Z_Free(lumpinfo);
free(fullname);
return NULL;
}
// Strip away file address and extension for the 8char name. // Strip away file address and extension for the 8char name.
if ((trimname = strrchr(fullname, '/')) != 0) if ((trimname = strrchr(fullname, '/')) != 0)
@ -681,10 +682,10 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
lump_p->longname = static_cast<char*>(Z_Calloc(dotpos - trimname + 1, PU_STATIC, NULL)); lump_p->longname = static_cast<char*>(Z_Calloc(dotpos - trimname + 1, PU_STATIC, NULL));
strlcpy(lump_p->longname, trimname, dotpos - trimname + 1); strlcpy(lump_p->longname, trimname, dotpos - trimname + 1);
lump_p->fullname = static_cast<char*>(Z_Calloc(SHORT(zentry.namelen) + 1, PU_STATIC, NULL)); lump_p->fullname = static_cast<char*>(Z_Calloc(SHORT(zentry->namelen) + 1, PU_STATIC, NULL));
strncpy(lump_p->fullname, fullname, SHORT(zentry.namelen)); strncpy(lump_p->fullname, fullname, SHORT(zentry->namelen));
switch(SHORT(zentry.compression)) switch(SHORT(zentry->compression))
{ {
case 0: case 0:
lump_p->compression = CM_NOCOMPRESSION; lump_p->compression = CM_NOCOMPRESSION;
@ -706,12 +707,7 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
free(fullname); free(fullname);
// skip and ignore comments/extra fields // skip and ignore comments/extra fields
if (fseek(handle, SHORT(zentry.xtralen) + SHORT(zentry.commlen), SEEK_CUR) != 0) offset += sizeof *zentry + SHORT(zentry->namelen) + SHORT(zentry->xtralen) + SHORT(zentry->commlen);
{
CONS_Alert(CONS_ERROR, "Central directory is corrupt\n");
Z_Free(lumpinfo);
return NULL;
}
} }
// Adjust lump position values properly // Adjust lump position values properly
@ -2124,14 +2120,11 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
int verified = true; int verified = true;
zend_t zend; zend_t zend;
zentry_t zentry;
zlentry_t zlentry; zlentry_t zlentry;
long file_size;/* size of zip file */ long file_size;/* size of zip file */
long data_size;/* size of data inside zip file */ long data_size;/* size of data inside zip file */
long old_position;
UINT16 numlumps; UINT16 numlumps;
size_t i; size_t i;
@ -2160,22 +2153,29 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
numlumps = SHORT(zend.entries); numlumps = SHORT(zend.entries);
fseek(fp, LONG(zend.cdiroffset), SEEK_SET); fseek(fp, LONG(zend.cdiroffset), SEEK_SET);
char *cdir = static_cast<char*>(malloc(LONG(zend.cdirsize)));
auto cdir_finally = srb2::finally([cdir] { free(cdir); });
if (fread(cdir, 1, LONG(zend.cdirsize), fp) < static_cast<UINT32>(LONG(zend.cdirsize)))
return true;
size_t offset = 0;
for (i = 0; i < numlumps; i++) for (i = 0; i < numlumps; i++)
{ {
zentry_t *zentry = reinterpret_cast<zentry_t*>(cdir + offset);
char* fullname; char* fullname;
char* trimname; char* trimname;
char* dotpos; char* dotpos;
if (fread(&zentry, 1, sizeof(zentry_t), fp) < sizeof(zentry_t)) if (memcmp(zentry->signature, pat_central, 4) != 0)
return true;
if (memcmp(zentry.signature, pat_central, 4))
return true; return true;
if (verified == true) if (verified == true)
{ {
fullname = static_cast<char*>(malloc(SHORT(zentry.namelen) + 1)); fullname = static_cast<char*>(malloc(SHORT(zentry->namelen) + 1));
if (fgets(fullname, SHORT(zentry.namelen) + 1, fp) != fullname) strlcpy(fullname, (char*)(zentry + 1), SHORT(zentry->namelen) + 1);
return true;
// Strip away file address and extension for the 8char name. // Strip away file address and extension for the 8char name.
if ((trimname = strrchr(fullname, '/')) != 0) if ((trimname = strrchr(fullname, '/')) != 0)
@ -2200,23 +2200,14 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
} }
free(fullname); free(fullname);
}
// skip and ignore comments/extra fields offset += sizeof *zentry + SHORT(zentry->namelen) + SHORT(zentry->xtralen) + SHORT(zentry->commlen);
if (fseek(fp, SHORT(zentry.xtralen) + SHORT(zentry.commlen), SEEK_CUR) != 0)
return true;
}
else
{
if (fseek(fp, SHORT(zentry.namelen) + SHORT(zentry.xtralen) + SHORT(zentry.commlen), SEEK_CUR) != 0)
return true;
}
data_size += data_size +=
sizeof zentry + SHORT(zentry.namelen) + SHORT(zentry.xtralen) + SHORT(zentry.commlen); sizeof *zentry + SHORT(zentry->namelen) + SHORT(zentry->xtralen) + SHORT(zentry->commlen);
old_position = ftell(fp); if (fseek(fp, LONG(zentry->offset), SEEK_SET) != 0)
if (fseek(fp, LONG(zentry.offset), SEEK_SET) != 0)
return true; return true;
if (fread(&zlentry, 1, sizeof(zlentry_t), fp) < sizeof (zlentry_t)) if (fread(&zlentry, 1, sizeof(zlentry_t), fp) < sizeof (zlentry_t))
@ -2224,8 +2215,6 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
data_size += data_size +=
sizeof zlentry + SHORT(zlentry.namelen) + SHORT(zlentry.xtralen) + LONG(zlentry.compsize); sizeof zlentry + SHORT(zlentry.namelen) + SHORT(zlentry.xtralen) + LONG(zlentry.compsize);
fseek(fp, old_position, SEEK_SET);
} }
if (data_size < file_size) if (data_size < file_size)