From c7b2291c90cf6045c3d2def21becf61946273647 Mon Sep 17 00:00:00 2001
From: Barry Harris <44396066+barry65536@users.noreply.github.com>
Date: Mon, 13 Feb 2012 14:03:22 +0000
Subject: [PATCH] Tidy up zip handling a bit

---
 src/burn/burn.cpp                      | 1 -
 src/burn/drv/megadrive/d_megadrive.cpp | 1 -
 src/burn/drv/pre90s/d_pce.cpp          | 1 -
 src/burn/snd/samples.cpp               | 6 +++---
 src/burner/burner.h                    | 3 ++-
 src/burner/win32/burner_win32.h        | 1 -
 src/burner/zipfn.cpp                   | 6 ++++--
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/burn/burn.cpp b/src/burn/burn.cpp
index f491a3559..fde3238d9 100644
--- a/src/burn/burn.cpp
+++ b/src/burn/burn.cpp
@@ -137,7 +137,6 @@ INT32 BurnGetZipName(char** pszName, UINT32 i)
 	}
 
 	strcpy(szFilename, pszGameName);
-	strcat(szFilename, ".zip");
 
 	*pszName = szFilename;
 
diff --git a/src/burn/drv/megadrive/d_megadrive.cpp b/src/burn/drv/megadrive/d_megadrive.cpp
index fdbc0d3fa..7ef5df064 100644
--- a/src/burn/drv/megadrive/d_megadrive.cpp
+++ b/src/burn/drv/megadrive/d_megadrive.cpp
@@ -172,7 +172,6 @@ INT32 MegadriveGetZipName(char** pszName, UINT32 i)
 	for (UINT32 j = 0; j < strlen(pszGameName); j++) {
 		szFilename[j] = pszGameName[j + 3];
 	}
-	strcat(szFilename, ".zip");
 
 	*pszName = szFilename;
 
diff --git a/src/burn/drv/pre90s/d_pce.cpp b/src/burn/drv/pre90s/d_pce.cpp
index 861f82b16..ee6079ce1 100644
--- a/src/burn/drv/pre90s/d_pce.cpp
+++ b/src/burn/drv/pre90s/d_pce.cpp
@@ -190,7 +190,6 @@ static INT32 PceGetZipName(char** pszName, UINT32 i)
 	for (UINT32 j = 0; j < strlen(pszGameName); j++) {
 		szFilename[j] = pszGameName[j + 4];
 	}
-	strcat(szFilename, ".zip");
 
 	*pszName = szFilename;
 
diff --git a/src/burn/snd/samples.cpp b/src/burn/snd/samples.cpp
index e1bec4a09..661a2a341 100644
--- a/src/burn/snd/samples.cpp
+++ b/src/burn/snd/samples.cpp
@@ -220,7 +220,7 @@ void BurnSampleReset()
 	}
 }
 
-extern INT32 __cdecl ZipLoadOneFile(const char* arcName, const char* fileName, void** Dest, INT32* pnWrote);
+INT32 __cdecl ZipLoadOneFile(char* arcName, const char* fileName, void** Dest, INT32* pnWrote);
 char* TCHARToANSI(const TCHAR* pszInString, char* pszOutString, INT32 nOutSize);
 #define _TtoA(a)	TCHARToANSI(a, NULL, 0)
 
@@ -269,11 +269,11 @@ void BurnSampleInit(INT32 nGain /*volume percentage!*/, INT32 bAdd /*add sample
 
 		if (si.nFlags == 0) break;
 
-		sprintf (path, "%s%s.zip", szTempPath, setname);
+		sprintf (path, "%s%s", szTempPath, setname);
 
 		destination = NULL;
 		length = 0;
-		ZipLoadOneFile((const char*)path, (const char*)szSampleName, &destination, &length);
+		ZipLoadOneFile((char*)path, (const char*)szSampleName, &destination, &length);
 		
 		if (length) {
 			make_raw((UINT8*)destination, length);
diff --git a/src/burner/burner.h b/src/burner/burner.h
index 38d1fcfe6..c609642c5 100644
--- a/src/burner/burner.h
+++ b/src/burner/burner.h
@@ -157,10 +157,11 @@ INT32 BurnStateDecompress(UINT8* Def, INT32 nDefLen, INT32 bAll);
 // zipfn.cpp
 struct ZipEntry { char* szName;	UINT32 nLen; UINT32 nCrc; };
 
-INT32 ZipOpen(const char* szZip);
+INT32 ZipOpen(char* szZip);
 INT32 ZipClose();
 INT32 ZipGetList(struct ZipEntry** pList, INT32* pnListCount);
 INT32 ZipLoadFile(UINT8* Dest, INT32 nLen, INT32* pnWrote, INT32 nEntry);
+INT32 __cdecl ZipLoadOneFile(char* arcName, const char* fileName, void** Dest, INT32* pnWrote);
 
 // bzip.cpp
 
diff --git a/src/burner/win32/burner_win32.h b/src/burner/win32/burner_win32.h
index 10dd8639e..10e7c1546 100644
--- a/src/burner/win32/burner_win32.h
+++ b/src/burner/win32/burner_win32.h
@@ -444,7 +444,6 @@ void IpsPatchExit();
 // Misc
 #define _TtoA(a)	TCHARToANSI(a, NULL, 0)
 #define _AtoT(a)	ANSIToTCHAR(a, NULL, 0)
-int __cdecl ZipLoadOneFile(const char* arcName, const char* fileName, void** Dest, int* pnWrote);
 
 // numpluscommas.cpp
 TCHAR* FormatCommasNumber(__int64);
diff --git a/src/burner/zipfn.cpp b/src/burner/zipfn.cpp
index d96d9ff8b..5a9eb0537 100644
--- a/src/burner/zipfn.cpp
+++ b/src/burner/zipfn.cpp
@@ -5,9 +5,11 @@
 static unzFile Zip=NULL;
 static INT32 nCurrFile=0; // The current file we are pointing to
 
-INT32 ZipOpen(const char* szZip)
+INT32 ZipOpen(char* szZip)
 {
 	if (szZip == NULL) return 1;
+	
+	strcat(szZip, ".zip");
 
 	Zip = unzOpen(szZip);
 	if (Zip == NULL) return 1;
@@ -114,7 +116,7 @@ INT32 ZipLoadFile(UINT8* Dest, INT32 nLen, INT32* pnWrote, INT32 nEntry)
 }
 
 // Load one file directly, added by regret
-INT32 __cdecl ZipLoadOneFile(const char* arcName, const char* fileName, void** Dest, INT32* pnWrote)
+INT32 __cdecl ZipLoadOneFile(char* arcName, const char* fileName, void** Dest, INT32* pnWrote)
 {
 	if (ZipOpen(arcName)) {
 		return 1;