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 #2102 from magumagu/ipchle-net-regression 

Fix crash in Wii games using IPCHLE networking.
This commit is contained in:
skidau 2015-02-24 13:14:48 +11:00
parent 69381580f3 b5020b1675
commit bd0d5c1a22
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp
View File

@ -1057,7 +1057,9 @@ IPCCommandResult CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress)
} }
Memory::Memset(BufferOut, 0, BufferOutSize); Memory::Memset(BufferOut, 0, BufferOutSize);
u32 wii_addr = BufferOut + 4 * 3 + 2 * 2;
// TODO: This is really hacky; is it actually what IOS does?
u32 wii_addr = 0x80000000 | (BufferOut + 4 * 3 + 2 * 2);
u32 name_length = (u32)strlen(remoteHost->h_name) + 1; u32 name_length = (u32)strlen(remoteHost->h_name) + 1;
Memory::CopyToEmu(wii_addr, remoteHost->h_name, name_length); Memory::CopyToEmu(wii_addr, remoteHost->h_name, name_length);