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

Merge pull request #3867 from phire/fix_wii_savestates_some_more 

IPC_HLE: Close file handles before savestating. Fixes DKCR crashing.
This commit is contained in:
Pierre Bourdon 2016-05-29 16:26:37 +02:00
parent 0fa9233c1a 7d80aaedc7
commit 6ef7414479
4 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
View File

@ -270,11 +270,11 @@ void DoState(PointerWrap &p)
p.Do(reply_queue);
p.Do(last_reply_time);
if (p.GetMode() == PointerWrap::MODE_READ)
// We need to make sure all file handles are closed so WII_IPC_Devices_fs::DoState can successfully save or re-create /tmp
for (auto& descriptor : g_FdMap)
{
// We need to make sure all file handles are closed so WII_IPC_Devices_fs::DoState can successfully re-create /tmp
for (u32 i = 0; i < IPC_MAX_FDS; i++)
g_FdMap[i].reset();
if (descriptor)
descriptor->PrepareForState(p.GetMode());
}
for (const auto& entry : g_DeviceMap)
@ -320,22 +320,22 @@ void DoState(PointerWrap &p)
}
else
{
for (auto& dev : g_FdMap)
for (auto& descriptor : g_FdMap)
{
u32 exists = dev ? 1 : 0;
u32 exists = descriptor ? 1 : 0;
p.Do(exists);
if (exists)
{
u32 isHw = dev->IsHardware() ? 1 : 0;
u32 isHw = descriptor->IsHardware() ? 1 : 0;
p.Do(isHw);
if (isHw)
{
u32 hwId = dev->GetDeviceID();
u32 hwId = descriptor->GetDeviceID();
p.Do(hwId);
}
else
{
dev->DoState(p);
descriptor->DoState(p);
}
}
}

5
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h
View File

@ -109,6 +109,11 @@ public:
{
}
// Release any resources which might interfere with savestating.
virtual void PrepareForState(PointerWrap::Mode mode)
{
}
virtual void DoState(PointerWrap& p)
{
DoStateShared(p);

15
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
View File

@ -356,6 +356,14 @@ IPCCommandResult CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress)
return GetDefaultReply();
}
void CWII_IPC_HLE_Device_FileIO::PrepareForState(PointerWrap::Mode mode)
{
// Temporally close the file, to prevent any issues with the savestating of /tmp
// it can be opened again with another call to OpenFile()
m_file.reset();
}
void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p)
{
DoStateShared(p);
@ -365,8 +373,7 @@ void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p)
m_filepath = HLE_IPC_BuildFilename(m_Name);
if (p.GetMode() == PointerWrap::MODE_READ)
{
OpenFile();
}
// The file was closed during state (and might now be pointing at another file)
// Open it again
OpenFile();
}

1
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h
View File

@ -26,6 +26,7 @@ public:
IPCCommandResult Read(u32 _CommandAddress) override;
IPCCommandResult Write(u32 _CommandAddress) override;
IPCCommandResult IOCtl(u32 _CommandAddress) override;
void PrepareForState(PointerWrap::Mode mode) override;
void DoState(PointerWrap &p) override;
void OpenFile();