LoadFile should use standard size - poked ape stuff a little bit.

Author: hogsy

engine/ape/ape.cpp

@@ -1,4 +1,74 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Copyright © 2020-2022 Mark E Sowden <[email protected]>
+/******************************************************************************
+	Copyright © 1997-2001 Id Software, Inc.
+	Copyright © 2020-2025 Mark E Sowden <[email protected]>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+******************************************************************************/
 
 #include "ape.h"
+
+//TODO: much of this is subject to change!!!!
+
+bool chr::ApeInstance::Load( const std::string &filename )
+{
+	void *ptr;
+
+	ssize_t size = FS_LoadFile( filename.c_str(), &ptr );
+	if ( size == -1 || ptr == nullptr )
+	{
+		Com_Printf( "Failed to load ape file (%s)!\n", filename.c_str() );
+		return false;
+	}
+
+	bool success = Parse( ptr, size );
+	if ( !success )
+	{
+		Com_Printf( "Failed to parse ape file (%s)!\n", filename.c_str() );
+	}
+
+	FS_FreeFile( ptr );
+
+	return success;
+}
+
+bool chr::ApeInstance::Parse( const void *ptr, size_t size )
+{
+	struct ApeFileHeader
+	{
+		uint32_t magic;
+		uint32_t unk0;
+	};
+
+	ApeFileHeader *header = ( ApeFileHeader * ) ptr;
+
+	uint32_t magic = LittleLong( header->magic );
+	if ( magic != 0x3D010000 )
+	{
+		Com_Printf( "Invalid magic for ape!\n" );
+		return false;
+	}
+
+	uint32_t unk0 = LittleLong( header->unk0 );
+	if ( unk0 != 0xFFFFFFFF )
+	{
+		Com_Printf( "Secondary key is invalid for ape!\n" );
+		return false;
+	}
+
+	//TODO: the rest of it :)
+
+	return true;
+}

engine/ape/ape.h

@@ -1,13 +1,30 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-// Copyright © 2020-2022 Mark E Sowden <[email protected]>
+/******************************************************************************
+	Copyright © 1997-2001 Id Software, Inc.
+	Copyright © 2020-2025 Mark E Sowden <[email protected]>
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+******************************************************************************/
 
 #pragma once
 
 #include "../client/client.h"
 
-namespace chr::ape
+namespace chr
 {
-	enum class OpCode
+	enum class ApeOpCode
 	{
 		OP_STARTSWITCH   = 49,
 		OP_THINKSWITCH   = 50,
@@ -23,5 +40,15 @@ namespace chr::ape
 		OP_STYLE         = 87,
 	};
 
-	static constexpr unsigned int MAGIC = 0x3D010000;
-}// namespace chr::ape
+	class ApeInstance
+	{
+	public:
+		ApeInstance();
+		~ApeInstance();
+
+		bool Load( const std::string &filename );
+
+	private:
+		bool Parse( const void *ptr, size_t size );
+	};
+}// namespace chr

game/game.h

@@ -175,7 +175,7 @@ typedef struct
 	void ( *DebugGraph )( float value, int color );
 
 	// File System
-	int ( *LoadFile )( const char *path, void **buffer );
+	ssize_t ( *LoadFile )( const char *path, void **buffer );
 	void ( *FreeFile )( void *buffer );
 } game_import_t;
 

qcommon/files.cpp

@@ -80,7 +80,7 @@ struct Package
 	/**
  	 * Load a file from the given package, and decompress the data.
  	 */
-	void *LoadFile( const char *fileName, uint32_t *fileLength ) const
+	void *LoadFile( const char *fileName, size_t *fileLength ) const
 	{
 		// first, ensure that it's actually in the package file table
 		const Index *fileIndex = GetFileIndex( fileName );
@@ -343,7 +343,7 @@ Used for streaming data out of either a pak file or
 a seperate file.
 ===========
 */
-void *FS_FOpenFile( const char *filename, uint32_t *length )
+void *FS_FOpenFile( const char *filename, size_t *length )
 {
 	// search through the path, one element at a time
 	for ( searchpath_t *search = fs_searchpaths; search; search = search->next )
@@ -464,20 +464,22 @@ Filename are reletive to the quake search path
 a null buffer will just return the file length without loading
 ============
 */
-int FS_LoadFile( const char *path, void **buffer )
+ssize_t FS_LoadFile( const char *path, void **buffer )
 {
 	char upath[ MAX_QPATH ];
 	snprintf( upath, sizeof( upath ), "%s", path );
 
 	FS_CanonicalisePath( upath );
 
 	// look for it in the filesystem or pack files
-	uint32_t length;
-	void    *buf = FS_FOpenFile( upath, &length );
+	size_t length;
+	void  *buf = FS_FOpenFile( upath, &length );
 	if ( buf == nullptr )
 	{
 		if ( buffer != nullptr )
+		{
 			*buffer = nullptr;
+		}
 
 		return -1;
 	}
@@ -830,8 +832,8 @@ static void ExtractCommand()
 			Com_Printf( "Extracting from %s\n", i.second.mappedDir.c_str() );
 			for ( const auto &j : i.second.indices )
 			{
-				unsigned int fileSize;
-				void        *p = i.second.LoadFile( j.name, &fileSize );
+				size_t fileSize;
+				void  *p = i.second.LoadFile( j.name, &fileSize );
 				if ( p == nullptr )
 				{
 					Com_Printf( "Failed to load %s\n", j.name );

qcommon/qcommon.h

@@ -680,9 +680,9 @@ void FS_InitFilesystem( void );
 void FS_SetGamedir( const char *dir );
 const char *FS_Gamedir( void );
 char *FS_NextPath( char *prevpath );
-void FS_ExecAutoexec( void );
+void        FS_ExecAutoexec( void );
 
-int FS_LoadFile( const char *path, void **buffer );
+ssize_t FS_LoadFile( const char *path, void **buffer );
 // a null buffer will just return the file length without loading
 // a -1 length is not present