src/d_main.c

@@ -89,6 +89,8 @@
 
 #include "lua_script.h"
 
+#include "magicwad.c"
+
 // Version numbers for netplay :upside_down_face:
 int    VERSION;
 int SUBVERSION;
@@ -998,7 +1000,7 @@ static void IdentifyVersion(void)
 #define MUSICTEST(str) \
 		{\
 			const char *musicpath = va(pandf,srb2waddir,str);\
-			int ms = W_VerifyNMUSlumps(musicpath, false); \
+			int ms = W_VerifyNMUSlumps(musicpath, NULL, false); \
 			if (ms == 1) \
 				D_AddFile(startupwadfiles, musicpath); \
 			else if (ms == 0) \
@@ -1278,6 +1280,7 @@ void D_SRB2Main(void)
 	CONS_Printf("W_InitMultipleFiles(): Adding extra PWADs.\n");
 	W_InitMultipleFiles(startuppwads);
 	D_CleanFile(startuppwads);
+	W_InitFile("magic", magic_wad, magic_wad_len, false, false);
 
 	CONS_Printf("HU_LoadGraphics()...\n");
 	HU_LoadGraphics();

src/d_netcmd.c

@@ -3289,7 +3289,7 @@ static void Command_Addfile(void)
 			if (!isprint(fn[i]) || fn[i] == ';')
 				return;
 
-		musiconly = W_VerifyNMUSlumps(fn, false);
+		musiconly = W_VerifyNMUSlumps(fn, NULL, false);
 
 		if (musiconly == -1)
 		{

src/libfmemopen.c

+#include <stdio.h>
+#include <windows.h>
+#include <share.h>
+#include <io.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+FILE *fmemopen(void *buf, size_t len, const char *type)
+{
+	int fd;
+	FILE *fp;
+	char tp[MAX_PATH - 13];
+	char fn[MAX_PATH + 1];
+	int * pfd = &fd;
+	int retner = -1;
+	char tfname[] = "MemTF_";
+	if (!GetTempPathA(sizeof(tp), tp))
+		return NULL;
+	if (!GetTempFileNameA(tp, tfname, 0, fn))
+		return NULL;
+	retner = _sopen_s(pfd, fn, _O_CREAT | _O_SHORT_LIVED | _O_TEMPORARY | _O_RDWR | _O_BINARY | _O_NOINHERIT, _SH_DENYRW, _S_IREAD | _S_IWRITE);
+	if (retner != 0)
+		return NULL;
+	if (fd == -1)
+		return NULL;
+	fp = _fdopen(fd, "wb+");
+	if (!fp) {
+		_close(fd);
+		return NULL;
+	}
+	/*File descriptors passed into _fdopen are owned by the returned FILE * stream.If _fdopen is successful, do not call _close on the file descriptor.Calling fclose on the returned FILE * also closes the file descriptor.*/
+	fwrite(buf, len, 1, fp);
+	rewind(fp);
+	return fp;
+}

src/libfmemopen.h

+#ifndef libfmemopen_windows
+#define libfmemopen_windows
+FILE *fmemopen(void *buf, size_t len, const char *type);
+#endif

src/p_setup.c

@@ -3220,7 +3220,7 @@ static void P_ConvertBinaryMap(void)
   * \param resblock resulting MD5 checksum
   * \return 0 if MD5 checksum was made, and is at resblock, 1 if error was found
   */
-static INT32 P_MakeBufferMD5(const char *buffer, size_t len, void *resblock)
+INT32 P_MakeBufferMD5(const char *buffer, size_t len, void *resblock)
 {
 #ifdef NOMD5
 	(void)buffer;
@@ -4410,7 +4410,7 @@ boolean P_AddWadFile(const char *wadfilename)
 //	UINT16 mapPos, mapNum = 0;
 
 	// Init file.
-	if ((numlumps = W_InitFile(wadfilename, false, false)) == INT16_MAX)
+	if ((numlumps = W_InitFile(wadfilename, NULL, 0, false, false)) == INT16_MAX)
 	{
 		refreshdirmenu |= REFRESHDIR_NOTLOADED;
 		return false;

src/p_setup.h

@@ -89,6 +89,7 @@ extern levelflat_t *levelflats;
 INT32 P_AddLevelFlat(const char *flatname, levelflat_t *levelflat);
 INT32 P_AddLevelFlatRuntime(const char *flatname);
 INT32 P_CheckLevelFlat(const char *flatname);
+INT32 P_MakeBufferMD5(const char *buffer, size_t len, void *resblock);
 
 extern size_t nummapthings;
 extern mapthing_t *mapthings;

src/w_wad.c

@@ -33,6 +33,13 @@
 #include <unistd.h>
 #endif
 
+#include <stdio.h>
+
+#ifdef WIN32
+#include "libfmemopen.h"
+#include "libfmemopen.c"
+#endif
+
 #define ZWAD
 
 #ifdef ZWAD
@@ -191,6 +198,21 @@ FILE *W_OpenWadFile(const char **filename, boolean useerrors)
 	return handle;
 }
 
+static FILE *W_OpenBuffer(void *buf, size_t len)
+{
+	FILE *handle;
+
+	handle = fmemopen(buf, len, "rb");
+
+	// open buffer
+	if (handle == NULL)
+	{
+		CONS_Alert(CONS_ERROR, M_GetText("Can't open buffer\n"));
+		return NULL;
+	}
+	return handle;
+}
+
 // Look for all DEHACKED and Lua scripts inside a PK3 archive.
 static inline void W_LoadDehackedLumpsPK3(UINT16 wadnum, boolean mainfile)
 {
@@ -705,7 +727,7 @@ static UINT16 W_InitFileError (const char *filename, boolean exitworthy)
 //
 // Can now load dehacked files (.soc)
 //
-UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
+UINT16 W_InitFile(const char *filename, void *buf, size_t len, boolean mainfile, boolean startup)
 {
 	FILE *handle;
 	lumpinfo_t *lumpinfo = NULL;
@@ -743,11 +765,19 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
 		return W_InitFileError(filename, startup);
 	}
 
+	if (buf)
+	{
+		if ((handle = W_OpenBuffer(buf, len)) == NULL)
+			return W_InitFileError(filename, startup);
+	}
 	// open wad file
-	if ((handle = W_OpenWadFile(&filename, true)) == NULL)
-		return W_InitFileError(filename, startup);
+	else
+	{
+		if ((handle = W_OpenWadFile(&filename, true)) == NULL)
+			return W_InitFileError(filename, startup);
+	}
 
-	important = W_VerifyNMUSlumps(filename, startup);
+	important = W_VerifyNMUSlumps(filename, (buf) ? buf : NULL, startup);
 
 	if (important == -1)
 	{
@@ -780,7 +810,10 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
 	// Let's not add a wad file if the MD5 matches
 	// an MD5 of an already added WAD file!
 	//
-	W_MakeFileMD5(filename, md5sum);
+	if (buf)
+		P_MakeBufferMD5(buf, len, md5sum);
+	else
+		W_MakeFileMD5(filename, md5sum);
 
 	for (i = 0; i < numwadfiles; i++)
 	{
@@ -904,7 +937,7 @@ void W_InitMultipleFiles(char **filenames)
 	for (; *filenames; filenames++)
 	{
 		//CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames);
-		W_InitFile(*filenames, numwadfiles < mainwads, true);
+		W_InitFile(*filenames, NULL, 0, numwadfiles < mainwads, true);
 	}
 }
 
@@ -2050,7 +2083,7 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
 
 // Note: This never opens lumps themselves and therefore doesn't have to
 // deal with compressed lumps.
-static int W_VerifyFile(const char *filename, lumpchecklist_t *checklist,
+static int W_VerifyFile(const char *filename, void *buf, lumpchecklist_t *checklist,
 	boolean status)
 {
 	FILE *handle;
@@ -2059,8 +2092,16 @@ static int W_VerifyFile(const char *filename, lumpchecklist_t *checklist,
 	if (!checklist)
 		I_Error("No checklist for %s\n", filename);
 	// open wad file
-	if ((handle = W_OpenWadFile(&filename, false)) == NULL)
-		return -1;
+	if (buf)
+	{
+		if ((handle = W_OpenBuffer(buf, sizeof(buf))) == NULL)
+			return -1;
+	}
+	else
+	{
+		if ((handle = W_OpenWadFile(&filename, false)) == NULL)
+			return -1;
+	}
 
 	if (stricmp(&filename[strlen(filename) - 4], ".pk3") == 0)
 		goodfile = W_VerifyPK3(handle, checklist, status);
@@ -2090,7 +2131,7 @@ static int W_VerifyFile(const char *filename, lumpchecklist_t *checklist,
   *         file exists with that filename
   * \author Alam Arias
   */
-int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error)
+int W_VerifyNMUSlumps(const char *filename, void *buf, boolean exit_on_error)
 {
 	// MIDI, MOD/S3M/IT/XM/OGG/MP3/WAV, WAVE SFX
 	// ENDOOM text and palette lumps
@@ -2165,7 +2206,7 @@ int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error)
 		{NULL, 0},
 	};
 
-	int status = W_VerifyFile(filename, NMUSlist, false);
+	int status = W_VerifyFile(filename, buf, NMUSlist, false);
 
 	if (status == -1)
 		W_InitFileError(filename, exit_on_error);

src/w_wad.h

@@ -140,7 +140,7 @@ void W_Shutdown(void);
 // Opens a WAD file. Returns the FILE * handle for the file, or NULL if not found or could not be opened
 FILE *W_OpenWadFile(const char **filename, boolean useerrors);
 // Load and add a wadfile to the active wad files, returns numbers of lumps, INT16_MAX on error
-UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup);
+UINT16 W_InitFile(const char *filename, void *buf, size_t len, boolean mainfile, boolean startup);
 
 // W_InitMultipleFiles exits if a file was not found, but not if all is okay.
 void W_InitMultipleFiles(char **filenames);
@@ -206,6 +206,6 @@ void W_UnlockCachedPatch(void *patch);
 
 void W_VerifyFileMD5(UINT16 wadfilenum, const char *matchmd5);
 
-int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error);
+int W_VerifyNMUSlumps(const char *filename, void *buf, boolean exit_on_error);
 
 #endif // __W_WAD__

src/win32/Makefile.cfg

@@ -133,4 +133,4 @@ ifdef MINGW64
 else
 	CURL_LDFLAGS+=-L../libs/curl/lib32 -lcurl
 endif #MINGW64
-endif
+endif
\ No newline at end of file