HL2: endianness pass and other improvements (#337)

Author: erysdren

plugins/hl2/fs_gma.c

@@ -321,7 +321,7 @@ static searchpathfuncs_t *QDECL FSGMA_LoadArchive(vfsfile_t *file, searchpathfun
 		VFS_READ(file, &len, sizeof(len));
 		VFS_READ(file, &crc, sizeof(crc));
 
-		pak->files[pak->num_files].len = len;
+		pak->files[pak->num_files].len = LittleI64(len);
 		pak->files[pak->num_files].ofs = ofs;
 		ofs += len;
 

plugins/hl2/fs_vpk_vtmb.c

@@ -254,13 +254,16 @@ searchpathfuncs_t *QDECL FSVVPK_LoadArchive(vfsfile_t *file, searchpathfuncs_t *
 	fsize = VFS_GETLEN(file);
 	if (fsize < 9)
 		return NULL;
-	VFS_SEEK(file, fsize - 9);
-	VFS_READ(file, &num_files, 4);
-	VFS_READ(file, &ofs_files, 4);
-	VFS_READ(file, &sentinel, 1);
+	VFS_SEEK(file, fsize - ((sizeof(uint32_t) * 2) + sizeof(uint8_t)));
+	VFS_READ(file, &num_files, sizeof(num_files));
+	VFS_READ(file, &ofs_files, sizeof(ofs_files));
+	VFS_READ(file, &sentinel, sizeof(sentinel));
 	if (sentinel != 0)
 		return NULL;
 
+	num_files = LittleLong(num_files);
+	ofs_files = LittleLong(ofs_files);
+
 	// alloc
 	pak = plugfuncs->Malloc(sizeof(*pak));
 	pak->files = plugfuncs->Malloc(sizeof(*pak->files) * num_files);
@@ -272,19 +275,20 @@ searchpathfuncs_t *QDECL FSVVPK_LoadArchive(vfsfile_t *file, searchpathfuncs_t *
 		uint32_t len_name;
 		uint32_t ofs_data;
 		uint32_t len_data;
-		VFS_READ(file, &len_name, 4);
+		VFS_READ(file, &len_name, sizeof(len_name));
+		len_name = LittleLong(len_name);
 		if (len_name > MAX_QPATH - 1)
 		{
-			Con_Printf("ERROR: filename in vpk is too long\n");
+			Con_Printf("%s: filename in vpk is too long\n", filename);
 			return NULL;
 		}
 
 		VFS_READ(file, pak->files[i].name, len_name);
-		VFS_READ(file, &ofs_data, 4);
-		VFS_READ(file, &len_data, 4);
+		VFS_READ(file, &ofs_data, sizeof(ofs_data));
+		VFS_READ(file, &len_data, sizeof(len_data));
 
-		pak->files[i].ofs = ofs_data;
-		pak->files[i].len = len_data;
+		pak->files[i].ofs = LittleLong(ofs_data);
+		pak->files[i].len = LittleLong(len_data);
 	}
 
 	// setup info

plugins/hl2/img_tth.c

@@ -40,9 +40,9 @@ qboolean COM_RequireExtension(char *path, const char *extension, int maxlen)
 static struct pendingtextureinfo *Image_ReadTTHFile(unsigned int flags, const char *fname, qbyte *filedata, size_t filesize)
 {
 	uint8_t num_mipmaps; // number of mipmaps in this texture
-	int32_t len_vtf_chunk; // size of uncompressed vtf chunk in header
-	int32_t len_vtf_file; // total size of uncompressed vtf file
-	int32_t len_ttz_tail; // compressed size of accompanying ttz file
+	uint32_t len_vtf_chunk; // size of uncompressed vtf chunk in header
+	uint32_t len_vtf_file; // total size of uncompressed vtf file
+	uint32_t len_ttz_tail; // compressed size of accompanying ttz file
 	qbyte *vtf;
 	qbyte *tail = NULL;
 	size_t tailsize = 0;
@@ -58,11 +58,11 @@ static struct pendingtextureinfo *Image_ReadTTHFile(unsigned int flags, const ch
 	// grab other data
 	num_mipmaps = filedata[6];
 	// aspect_flag skipped
-	len_vtf_chunk = *(int32_t *)&filedata[8];
+	len_vtf_chunk = LittleLong(*(uint32_t *)&filedata[8]);
 
 	// skip past mipmap flags to grab other other data
-	len_vtf_file = *(int32_t *)(filedata + 12 + (num_mipmaps * sizeof(uint64_t)));
-	len_ttz_tail = *(int32_t *)(filedata + 12 + (num_mipmaps * sizeof(uint64_t)) + 4);
+	len_vtf_file = LittleLong(*(uint32_t *)(filedata + 12 + (num_mipmaps * sizeof(uint64_t))));
+	len_ttz_tail = LittleLong(*(uint32_t *)(filedata + 12 + (num_mipmaps * sizeof(uint64_t)) + 4));
 
 	// load tail if it exists
 	if (len_ttz_tail > 0)

plugins/hl2/img_vtf.c

@@ -73,7 +73,6 @@ static uploadfmt_t ImageVTF_VtfToFTE(fmtfmt_t f)
 }
 struct pendingtextureinfo *Image_ReadVTFFile(unsigned int flags, const char *fname, qbyte *filedata, size_t filesize)
 {
-	//FIXME: cba with endian.
 	struct vtf_s
 	{
 		char magic[4];
@@ -116,15 +115,31 @@ struct pendingtextureinfo *Image_ReadVTFFile(unsigned int flags, const char *fna
 	if (memcmp(vtf->magic, "VTF\0", 4))
 		return NULL;
 
+	// erysdren: do endian swapping
+	vtf->major = LittleLong(vtf->major);
+	vtf->minor = LittleLong(vtf->minor);
+	vtf->headersize = LittleLong(vtf->headersize);
+	vtf->width = LittleShort(vtf->width);
+	vtf->height = LittleShort(vtf->height);
+	vtf->flags = LittleLong(vtf->flags);
+	vtf->numframes = LittleShort(vtf->numframes);
+	vtf->firstframe = LittleShort(vtf->firstframe);
+	vtf->pad1 = LittleLong(vtf->pad1);
+	vtf->reflectivity[0] = LittleFloat(vtf->reflectivity[0]);
+	vtf->reflectivity[1] = LittleFloat(vtf->reflectivity[1]);
+	vtf->reflectivity[2] = LittleFloat(vtf->reflectivity[2]);
+	vtf->pad2 = LittleFloat(vtf->pad2);
+	vtf->bumpmapscale = LittleFloat(vtf->bumpmapscale);
+
 	version = (vtf->major<<16)|vtf->minor;
 	if (version > 0x00070005)
 	{
 		Con_Printf("%s: VTF version %i.%i is not supported\n", fname, vtf->major, vtf->minor);
 		return NULL;
 	}
 
-	lrfmt = (vtf->lowresfmt_misaligned[0]<<0)|(vtf->lowresfmt_misaligned[1]<<16)|(vtf->lowresfmt_misaligned[2]<<16)|(vtf->lowresfmt_misaligned[3]<<24);
-	vmffmt = vtf->imgformat;
+	lrfmt = LittleLong((vtf->lowresfmt_misaligned[0]<<0)|(vtf->lowresfmt_misaligned[1]<<16)|(vtf->lowresfmt_misaligned[2]<<16)|(vtf->lowresfmt_misaligned[3]<<24));
+	vmffmt = LittleLong(vtf->imgformat);
 
 	mips = NULL;
 	if (version >= 0x00070003)
@@ -135,13 +150,13 @@ struct pendingtextureinfo *Image_ReadVTFFile(unsigned int flags, const char *fna
 			unsigned int rtype;
 			unsigned int rdata; //usually an offset.
 		} *restable = (void*)(filedata+sizeof(*vtf));
-		for (i = 0; i < vtf->numresources; i++, restable++)
+		for (i = 0; i < LittleLong(vtf->numresources); i++, restable++)
 		{
-			if ((restable->rtype & 0x00ffffff) == 0x30)
+			if ((LittleLong(restable->rtype) & 0x00ffffff) == 0x30)
 			{
 				mips = plugfuncs->Malloc(sizeof(*mips));
 				mips->extrafree = filedata;
-				filedata += restable->rdata;
+				filedata += LittleLong(restable->rdata);
 				break;
 			}
 			//other unknown resource types.