WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-12-14 03:59:36 +00:00
Code Issues Projects Releases Wiki Activity

Remove logs

Browse Source
This commit is contained in:
elasota
2021-03-30 00:00:50 -04:00
parent b64c904558
commit 7951f579e0
4 changed files with 0 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
AerofoilWeb/GpFileSystem_Web.cpp
View File

@@ -120,10 +120,7 @@ bool GpFileStream_Web_StaticMemFile::SeekCurrent(GpFilePos_t loc)
bool GpFileStream_Web_StaticMemFile::SeekEnd(GpUFilePos_t loc) bool GpFileStream_Web_StaticMemFile::SeekEnd(GpUFilePos_t loc)
{ {
if (loc > m_size) if (loc > m_size)
{
fprintf(stderr, "SeekEnd failed: Loc %i size %i\n", static_cast<int>(loc), static_cast<int>(m_size));
return false; return false;
}
m_offset = m_size - loc; m_offset = m_size - loc;
return true; return true;
@@ -375,7 +372,6 @@ bool GpFileSystem_Web::FileExists(PortabilityLayer::VirtualDirectory_t virtualDi
bool GpFileSystem_Web::FileLocked(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &exists) bool GpFileSystem_Web::FileLocked(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &exists)
{ {
fprintf(stderr, "FileLocked %s\n", path);
if (const GpFileSystem_Web_Resources::FileCatalog *catalog = GetCatalogForVirtualDirectory(virtualDirectory)) if (const GpFileSystem_Web_Resources::FileCatalog *catalog = GetCatalogForVirtualDirectory(virtualDirectory))
{ {
for (size_t i = 0; i < catalog->m_numEntries; i++) for (size_t i = 0; i < catalog->m_numEntries; i++)
@@ -407,31 +403,21 @@ bool GpFileSystem_Web::FileLocked(PortabilityLayer::VirtualDirectory_t virtualDi
GpIOStream *GpFileSystem_Web::OpenFileNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* subPaths, size_t numSubPaths, bool writeAccess, GpFileCreationDisposition_t createDisposition) GpIOStream *GpFileSystem_Web::OpenFileNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, char const* const* subPaths, size_t numSubPaths, bool writeAccess, GpFileCreationDisposition_t createDisposition)
{ {
fprintf(stderr, "OpenFileNested %i %s subPaths %i\n", static_cast<int>(virtualDirectory), subPaths[0], static_cast<int>(numSubPaths));
if (numSubPaths == 1) if (numSubPaths == 1)
{ {
fprintf(stderr, "Only one subpath\n");
if (const GpFileSystem_Web_Resources::FileCatalog *catalog = GetCatalogForVirtualDirectory(virtualDirectory)) if (const GpFileSystem_Web_Resources::FileCatalog *catalog = GetCatalogForVirtualDirectory(virtualDirectory))
{ {
fprintf(stderr, "Catalog matched. %i entries. %i size %i size0\n", static_cast<int>(catalog->m_numEntries), static_cast<int>(catalog->m_size), static_cast<int>(catalog->m_size0));
for (size_t i = 0; i < catalog->m_numEntries; i++) for (size_t i = 0; i < catalog->m_numEntries; i++)
{ {
const GpFileSystem_Web_Resources::FileCatalogEntry &entry = catalog->m_entries[i]; const GpFileSystem_Web_Resources::FileCatalogEntry &entry = catalog->m_entries[i];
fprintf(stderr, "Comparing '%s' to '%s'\n", subPaths[0], entry.m_fileName);
if (!strcmp(subPaths[0], entry.m_fileName)) if (!strcmp(subPaths[0], entry.m_fileName))
{
fprintf(stderr, "File name matched\n");
return new GpFileStream_Web_StaticMemFile(entry.m_data, entry.m_size); return new GpFileStream_Web_StaticMemFile(entry.m_data, entry.m_size);
} }
}
fprintf(stderr, "Catalog had no match\n");
return nullptr; return nullptr;
} }
} }
fprintf(stderr, "More paths, falling through...\n");
const char *mode = nullptr; const char *mode = nullptr;
bool canWrite = false; bool canWrite = false;
bool needResetPosition = false; bool needResetPosition = false;
@@ -494,7 +480,6 @@ GpIOStream *GpFileSystem_Web::OpenFileNested(PortabilityLayer::VirtualDirectory_
bool GpFileSystem_Web::DeleteFile(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &existed) bool GpFileSystem_Web::DeleteFile(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &existed)
{ {
fprintf(stderr, "Delete file %s\n", path);
if (const GpFileSystem_Web_Resources::FileCatalog *catalog = GetCatalogForVirtualDirectory(virtualDirectory)) if (const GpFileSystem_Web_Resources::FileCatalog *catalog = GetCatalogForVirtualDirectory(virtualDirectory))
return false; return false;
@@ -620,20 +605,10 @@ IGpDirectoryCursor *GpFileSystem_Web::ScanDirectoryNested(PortabilityLayer::Virt
const GpFileSystem_Web_Resources::FileCatalog *GpFileSystem_Web::GetCatalogForVirtualDirectory(PortabilityLayer::VirtualDirectory_t virtualDirectory) const GpFileSystem_Web_Resources::FileCatalog *GpFileSystem_Web::GetCatalogForVirtualDirectory(PortabilityLayer::VirtualDirectory_t virtualDirectory)
{ {
if (virtualDirectory == PortabilityLayer::VirtualDirectories::kApplicationData) if (virtualDirectory == PortabilityLayer::VirtualDirectories::kApplicationData)
{
fprintf(stderr, "%i == %i\n", static_cast<int>(virtualDirectory), static_cast<int>(PortabilityLayer::VirtualDirectories::kApplicationData));
fprintf(stderr, "%i size\n", GpFileSystem_Web_Resources::ApplicationData::GetCatalog().m_size);
fprintf(stderr, "First name: %s\n", GpFileSystem_Web_Resources::ApplicationData::GetCatalog().m_entries[0].m_fileName);
return &GpFileSystem_Web_Resources::ApplicationData::GetCatalog(); return &GpFileSystem_Web_Resources::ApplicationData::GetCatalog();
}
fprintf(stderr, "%i != %i\n", static_cast<int>(virtualDirectory), static_cast<int>(PortabilityLayer::VirtualDirectories::kApplicationData));
if (virtualDirectory == PortabilityLayer::VirtualDirectories::kGameData) if (virtualDirectory == PortabilityLayer::VirtualDirectories::kGameData)
{
fprintf(stderr, "%i == %i\n", static_cast<int>(virtualDirectory), static_cast<int>(PortabilityLayer::VirtualDirectories::kGameData));
return &GpFileSystem_Web_Resources::GameData::GetCatalog(); return &GpFileSystem_Web_Resources::GameData::GetCatalog();
}
fprintf(stderr, "%i != %i\n", static_cast<int>(virtualDirectory), static_cast<int>(PortabilityLayer::VirtualDirectories::kGameData));
return nullptr; return nullptr;
} }

10
PortabilityLayer/FileManager.cpp
View File

@@ -100,8 +100,6 @@ namespace PortabilityLayer
if (!stream) if (!stream)
return nullptr; return nullptr;
fprintf(stderr, "Composite file opened\n");
ZipFileProxy *zipFile = ZipFileProxy::Create(stream); ZipFileProxy *zipFile = ZipFileProxy::Create(stream);
if (!zipFile) if (!zipFile)
{ {
@@ -109,8 +107,6 @@ namespace PortabilityLayer
return nullptr; return nullptr;
} }
fprintf(stderr, "Zip proxy created\n");
size_t metaIndex = 0; size_t metaIndex = 0;
if (!zipFile->IndexFile("!!meta", metaIndex)) if (!zipFile->IndexFile("!!meta", metaIndex))
{ {
@@ -118,8 +114,6 @@ namespace PortabilityLayer
return nullptr; return nullptr;
} }
fprintf(stderr, "Meta file indexed\n");
MacFilePropertiesSerialized mfps; MacFilePropertiesSerialized mfps;
GpIOStream *metaStream = zipFile->OpenFile(metaIndex); GpIOStream *metaStream = zipFile->OpenFile(metaIndex);
@@ -130,8 +124,6 @@ namespace PortabilityLayer
return nullptr; return nullptr;
} }
fprintf(stderr, "Meta data deserialized\n");
if (!metaStream->ReadExact(mfps.m_data, sizeof(mfps.m_data))) if (!metaStream->ReadExact(mfps.m_data, sizeof(mfps.m_data)))
{ {
metaStream->Close(); metaStream->Close();
@@ -160,8 +152,6 @@ namespace PortabilityLayer
stream = nullptr; stream = nullptr;
} }
fprintf(stderr, "Composite constructed\n");
CompositeFile *compositeFile = CompositeFileImpl::Create(dirID, filename, stream, zipFile, mfp, hasResources, hasData, hasData ? dataIndex : 0); CompositeFile *compositeFile = CompositeFileImpl::Create(dirID, filename, stream, zipFile, mfp, hasResources, hasData, hasData ? dataIndex : 0);
if (!compositeFile) if (!compositeFile)
{ {

2
PortabilityLayer/PLResourceManager.cpp
View File

@@ -185,11 +185,9 @@ namespace PortabilityLayer
ZipFileProxy *proxy = nullptr; ZipFileProxy *proxy = nullptr;
bool proxyIsShared = false; bool proxyIsShared = false;
fprintf(stderr, "Trying to open resource file\n");
if (file->OpenResources(fStream, proxy, proxyIsShared) != PLErrors::kNone) if (file->OpenResources(fStream, proxy, proxyIsShared) != PLErrors::kNone)
return nullptr; return nullptr;
fprintf(stderr, "Creating resource archive\n");
IResourceArchive *archive = ResourceArchiveZipFile::Create(proxy, proxyIsShared, fStream); IResourceArchive *archive = ResourceArchiveZipFile::Create(proxy, proxyIsShared, fStream);
if (!archive) if (!archive)
{ {

28
PortabilityLayer/ZipFileProxy.cpp
View File

@@ -285,29 +285,17 @@ namespace PortabilityLayer
MemoryManager *mm = MemoryManager::GetInstance(); MemoryManager *mm = MemoryManager::GetInstance();
if (!stream->SeekEnd(sizeof(ZipEndOfCentralDirectoryRecord))) if (!stream->SeekEnd(sizeof(ZipEndOfCentralDirectoryRecord)))
{
fprintf(stderr, "Seek end failed\n");
return nullptr; return nullptr;
}
ZipEndOfCentralDirectoryRecord eocd; ZipEndOfCentralDirectoryRecord eocd;
if (stream->Read(&eocd, sizeof(eocd)) != sizeof(eocd)) if (stream->Read(&eocd, sizeof(eocd)) != sizeof(eocd))
{
fprintf(stderr, "EOCD read failed\n");
return nullptr; return nullptr;
}
if (eocd.m_signature != ZipEndOfCentralDirectoryRecord::kSignature) if (eocd.m_signature != ZipEndOfCentralDirectoryRecord::kSignature)
{
fprintf(stderr, "EOCD sig check failed\n");
return nullptr; return nullptr;
}
if (!stream->SeekStart(eocd.m_centralDirStartOffset)) if (!stream->SeekStart(eocd.m_centralDirStartOffset))
{
fprintf(stderr, "CDir seek failed\n");
return nullptr; return nullptr;
}
const size_t centralDirSize = eocd.m_centralDirectorySizeBytes; const size_t centralDirSize = eocd.m_centralDirectorySizeBytes;
void *centralDirImage = nullptr; void *centralDirImage = nullptr;
@@ -330,8 +318,6 @@ namespace PortabilityLayer
if (stream->Read(centralDirImage, centralDirSize) != centralDirSize) if (stream->Read(centralDirImage, centralDirSize) != centralDirSize)
{ {
fprintf(stderr, "CDir image read failed\n");
mm->Release(centralDirFiles); mm->Release(centralDirFiles);
mm->Release(centralDirImage); mm->Release(centralDirImage);
return nullptr; return nullptr;
@@ -348,8 +334,6 @@ namespace PortabilityLayer
{ {
if (centralDirEnd - centralDirCursor < sizeof(ZipCentralDirectoryFileHeader)) if (centralDirEnd - centralDirCursor < sizeof(ZipCentralDirectoryFileHeader))
{ {
fprintf(stderr, "CDir read failed point 1\n");
failed = true; failed = true;
break; break;
} }
@@ -361,24 +345,18 @@ namespace PortabilityLayer
if (centralDirHeader.m_signature != ZipCentralDirectoryFileHeader::kSignature) if (centralDirHeader.m_signature != ZipCentralDirectoryFileHeader::kSignature)
{ {
fprintf(stderr, "CDir read failed point 2\n");
failed = true; failed = true;
break; break;
} }
if (centralDirEnd - centralDirCursor < centralDirHeader.m_fileNameLength) if (centralDirEnd - centralDirCursor < centralDirHeader.m_fileNameLength)
{ {
fprintf(stderr, "CDir read failed point 3\n");
failed = true; failed = true;
break; break;
} }
if (!CheckAndFixFileName(centralDirCursor, centralDirHeader.m_fileNameLength)) if (!CheckAndFixFileName(centralDirCursor, centralDirHeader.m_fileNameLength))
{ {
fprintf(stderr, "CDir read failed point 4\n");
failed = true; failed = true;
break; break;
} }
@@ -387,8 +365,6 @@ namespace PortabilityLayer
if (centralDirEnd - centralDirCursor < centralDirHeader.m_extraFieldLength) if (centralDirEnd - centralDirCursor < centralDirHeader.m_extraFieldLength)
{ {
fprintf(stderr, "CDir read failed point 5\n");
failed = true; failed = true;
break; break;
} }
@@ -397,8 +373,6 @@ namespace PortabilityLayer
if (centralDirEnd - centralDirCursor < centralDirHeader.m_commentLength) if (centralDirEnd - centralDirCursor < centralDirHeader.m_commentLength)
{ {
fprintf(stderr, "CDir read failed point 6\n");
failed = true; failed = true;
break; break;
} }
@@ -422,8 +396,6 @@ namespace PortabilityLayer
{ {
if (ZipDirectorySortPredicate(centralDirFiles + (i - 1), centralDirFiles + i) == 0) if (ZipDirectorySortPredicate(centralDirFiles + (i - 1), centralDirFiles + i) == 0)
{ {
fprintf(stderr, "File names were duplicated\n");
// Duplicate file names // Duplicate file names
mm->Release(centralDirFiles); mm->Release(centralDirFiles);
mm->Release(centralDirImage); mm->Release(centralDirImage);