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

Fixed path registration on write protected drives

This commit is contained in:
x1nixmzeng 2021-01-01 15:52:49 +00:00
parent 4ff30fff20
commit dfe9a19b0d
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/kernel/support/EmuFile.cpp
View File

@ -554,29 +554,39 @@ XboxDevice *CxbxDeviceByDevicePath(const std::string XboxDevicePath)
int CxbxRegisterDeviceHostPath(std::string XboxDevicePath, std::string HostDevicePath, bool IsFile) int CxbxRegisterDeviceHostPath(std::string XboxDevicePath, std::string HostDevicePath, bool IsFile)
{ {
int result = -1; int result = -1;
NTSTATUS status = (NTSTATUS)-1;
XboxDevice newDevice; XboxDevice newDevice;
newDevice.XboxDevicePath = XboxDevicePath; newDevice.XboxDevicePath = XboxDevicePath;
newDevice.HostDevicePath = HostDevicePath; newDevice.HostDevicePath = HostDevicePath;
bool succeeded{ false };
// All HDD partitions have a .bin file to allow direct file io on the partition info // All HDD partitions have a .bin file to allow direct file io on the partition info
if (_strnicmp(XboxDevicePath.c_str(), DeviceHarddisk0PartitionPrefix.c_str(), DeviceHarddisk0PartitionPrefix.length()) == 0) { if (_strnicmp(XboxDevicePath.c_str(), DeviceHarddisk0PartitionPrefix.c_str(), DeviceHarddisk0PartitionPrefix.length()) == 0) {
std::string partitionHeaderPath = (HostDevicePath + ".bin").c_str(); std::string partitionHeaderPath = HostDevicePath + ".bin";
if (!PathFileExists(partitionHeaderPath.c_str())) { if (!std::filesystem::exists(partitionHeaderPath)) {
CxbxCreatePartitionHeaderFile(partitionHeaderPath, XboxDevicePath == DeviceHarddisk0Partition0); CxbxCreatePartitionHeaderFile(partitionHeaderPath, XboxDevicePath == DeviceHarddisk0Partition0);
} }
status = xbox::status_success; succeeded = true;
} }
// If this path is not a raw file partition, create the directory for it // If this path is not a raw file partition, create the directory for it
if (!IsFile) { if (!IsFile) {
status = SHCreateDirectoryEx(NULL, HostDevicePath.c_str(), NULL);
if (std::filesystem::exists(HostDevicePath))
{
succeeded = true;
}
else
{
succeeded = std::filesystem::create_directory(HostDevicePath);
}
} }
if (status == xbox::status_success || status == ERROR_ALREADY_EXISTS) { if (succeeded)
Devices.push_back(newDevice); {
Devices.emplace_back(newDevice);
result = Devices.size() - 1; result = Devices.size() - 1;
} }