ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add some error checking

This commit is contained in:
Luke Usher 2017-11-14 12:40:27 +00:00 committed by PatrickvL
parent a2c8e1152d
commit 94b721fc96
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/CxbxKrnl/EmuFile.cpp
View File

@ -93,6 +93,10 @@ XboxPartitionTable BackupPartTbl =
void CxbxCreatePartitionHeaderFile(std::string filename, bool partition0 = false) void CxbxCreatePartitionHeaderFile(std::string filename, bool partition0 = false)
{ {
HANDLE hf = CreateFile(filename.c_str(), GENERIC_WRITE, 0, 0, CREATE_ALWAYS, 0, 0); HANDLE hf = CreateFile(filename.c_str(), GENERIC_WRITE, 0, 0, CREATE_ALWAYS, 0, 0);
if (!hf) {
CxbxKrnlCleanup("CxbxCreatePartitionHeaderFile Failed\nUnable to create file: %s (%s)", filename);
return;
}
// If this is partition 0, install the partiton table // If this is partition 0, install the partiton table
if (partition0) { if (partition0) {
@ -108,6 +112,10 @@ XboxPartitionTable CxbxGetPartitionTable()
{ {
XboxPartitionTable table; XboxPartitionTable table;
FILE* fp = fopen((CxbxBasePath + "Partition0.bin").c_str(), "rb"); FILE* fp = fopen((CxbxBasePath + "Partition0.bin").c_str(), "rb");
if (fp == nullptr) {
CxbxKrnlCleanup("CxbxGetPartitionTable Failed:\nUnable to open file: %s", (CxbxBasePath + "Partition0.bin").c_str());
}
fread(&table, sizeof(XboxPartitionTable), 1, fp); fread(&table, sizeof(XboxPartitionTable), 1, fp);
fclose(fp); fclose(fp);
@ -140,10 +148,15 @@ int CxbxGetPartitionNumberFromHandle(HANDLE hFile)
{ {
// Get which partition number is being accessed, by parsing the filename and extracting the last portion // Get which partition number is being accessed, by parsing the filename and extracting the last portion
char buffer[MAX_PATH] = {0}; char buffer[MAX_PATH] = {0};
GetFinalPathNameByHandle(hFile, buffer, MAX_PATH, VOLUME_NAME_DOS); if (!GetFinalPathNameByHandle(hFile, buffer, MAX_PATH, VOLUME_NAME_DOS)) {
CxbxKrnlCleanup("CxbxGetPartitionNumberFromHandle Failed:\nUnable to determine path for HANDLE 0x%08X", hFile);
}
std::string bufferString(buffer); std::string bufferString(buffer);
std::string partitionString = "\\Partition"; std::string partitionString = "\\Partition";
std::string partitionNumberString = bufferString.substr(bufferString.find(partitionString) + partitionString.length(), 1); std::string partitionNumberString = bufferString.substr(bufferString.find(partitionString) + partitionString.length(), 1);
// atoi returns 0 on non-numeric characters, so we don't need to error check here
return atoi(partitionNumberString.c_str()); return atoi(partitionNumberString.c_str());
} }
@ -151,7 +164,10 @@ std::string CxbxGetPartitionDataPathFromHandle(HANDLE hFile)
{ {
// Get which partition number is being accessed, by parsing the filename and extracting the last portion // Get which partition number is being accessed, by parsing the filename and extracting the last portion
char buffer[MAX_PATH] = {0}; char buffer[MAX_PATH] = {0};
GetFinalPathNameByHandle(hFile, buffer, MAX_PATH, VOLUME_NAME_DOS); if (!GetFinalPathNameByHandle(hFile, buffer, MAX_PATH, VOLUME_NAME_DOS)) {
CxbxKrnlCleanup("CxbxGetPartitionDataPathFromHandle Failed:\nUnable to determine path for HANDLE 0x%08X", hFile);
}
std::string bufferString(buffer); std::string bufferString(buffer);
std::string partitionString = "\\Partition"; std::string partitionString = "\\Partition";
std::string partitionPath = bufferString.substr(0, bufferString.find(partitionString) + partitionString.length() + 1); std::string partitionPath = bufferString.substr(0, bufferString.find(partitionString) + partitionString.length() + 1);