1 files changed, 57 insertions, 10 deletions

diff --git a/src/zenserver/frontend/zipfs.cpp b/src/zenserver/frontend/zipfs.cpp
index 42df0520f..c7c8687ca 100644
--- a/src/zenserver/frontend/zipfs.cpp
+++ b/src/zenserver/frontend/zipfs.cpp
@@ -2,6 +2,12 @@
 
 #include "zipfs.h"
 
+#include <zencore/logging.h>
+
+ZEN_THIRD_PARTY_INCLUDES_START
+#include <zlib.h>
+ZEN_THIRD_PARTY_INCLUDES_END
+
 namespace zen {
 
 //////////////////////////////////////////////////////////////////////////
@@ -126,15 +132,20 @@ ZipFs::ZipFs(IoBuffer&& Buffer)
 		const CentralDirectoryRecord& Cd = *CdCursor;
 
 		bool Acceptable = true;
-		Acceptable &= (Cd.OriginalSize > 0);		// has some content
-		Acceptable &= (Cd.CompressionMethod == 0);	// is stored uncomrpessed
+		Acceptable &= (Cd.OriginalSize > 0);									 // has some content
+		Acceptable &= (Cd.CompressionMethod == 0 || Cd.CompressionMethod == 8);	 // stored or deflate
 		if (Acceptable)
 		{
 			const uint8_t* Lfh = Cursor + Cd.Offset;
 			if (uintptr_t(Lfh - Cursor) < View.GetSize())
 			{
 				std::string_view FileName(Cd.FileName, Cd.FileNameLength);
-				m_Files.insert(std::make_pair(FileName, FileItem{Lfh, size_t(0)}));
+				FileItem		 Item;
+				Item.View			   = MemoryView{Lfh, size_t(0)};
+				Item.CompressionMethod = Cd.CompressionMethod;
+				Item.CompressedSize	   = Cd.CompressedSize;
+				Item.UncompressedSize  = Cd.OriginalSize;
+				m_Files.insert(std::make_pair(FileName, std::move(Item)));
 			}
 		}
 
@@ -159,23 +170,59 @@ ZipFs::GetFile(const std::string_view& FileName) const
 		}
 
 		const FileItem& Item = Iter->second;
-		if (Item.GetSize() > 0)
+		if (Item.View.GetSize() > 0)
 		{
-			return IoBuffer(IoBuffer::Wrap, Item.GetData(), Item.GetSize());
+			return IoBuffer(IoBuffer::Wrap, Item.View.GetData(), Item.View.GetSize());
 		}
 	}
 
 	RwLock::ExclusiveLockScope _(m_FilesLock);
 
 	FileItem& Item = m_Files.find(FileName)->second;
-	if (Item.GetSize() > 0)
+	if (Item.View.GetSize() > 0)
+	{
+		return IoBuffer(IoBuffer::Wrap, Item.View.GetData(), Item.View.GetSize());
+	}
+
+	const auto*	   Lfh		= (LocalFileHeader*)(Item.View.GetData());
+	const uint8_t* FileData = (const uint8_t*)(Lfh->FileName + Lfh->FileNameLength + Lfh->ExtraFieldLength);
+
+	if (Item.CompressionMethod == 0)
+	{
+		// Stored — point directly into the buffer
+		Item.View = MemoryView(FileData, Item.UncompressedSize);
+	}
+	else
 	{
-		return IoBuffer(IoBuffer::Wrap, Item.GetData(), Item.GetSize());
+		// Deflate — decompress using zlib
+		Item.DecompressedData = IoBuffer(Item.UncompressedSize);
+
+		z_stream Stream	 = {};
+		Stream.next_in	 = const_cast<Bytef*>(FileData);
+		Stream.avail_in	 = Item.CompressedSize;
+		Stream.next_out	 = (Bytef*)Item.DecompressedData.GetMutableView().GetData();
+		Stream.avail_out = Item.UncompressedSize;
+
+		// Use raw inflate (-MAX_WBITS) since zip stores raw deflate streams
+		if (inflateInit2(&Stream, -MAX_WBITS) != Z_OK)
+		{
+			ZEN_WARN("failed to initialize inflate for '{}'", FileName);
+			return {};
+		}
+
+		int Result = inflate(&Stream, Z_FINISH);
+		inflateEnd(&Stream);
+
+		if (Result != Z_STREAM_END)
+		{
+			ZEN_WARN("failed to decompress '{}' (zlib error {})", FileName, Result);
+			return {};
+		}
+
+		Item.View = Item.DecompressedData.GetView();
 	}
 
-	const auto* Lfh = (LocalFileHeader*)(Item.GetData());
-	Item			= MemoryView(Lfh->FileName + Lfh->FileNameLength + Lfh->ExtraFieldLength, Lfh->OriginalSize);
-	return IoBuffer(IoBuffer::Wrap, Item.GetData(), Item.GetSize());
+	return IoBuffer(IoBuffer::Wrap, Item.View.GetData(), Item.View.GetSize());
 }
 
 }  // namespace zen