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

Reverted back to old user ID, added comment explaining groupID choice. Added back some debug prints to files...

This commit is contained in:
Matthew Parlane 2012-01-29 13:32:04 +13:00
parent 43ba6ce6e5
commit f2a978e97f
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
View File

@ -348,7 +348,7 @@ s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _B
_BufferOutSize); _BufferOutSize);
u32 OwnerID = 0; u32 OwnerID = 0;
u16 GroupID = 0x3031; u16 GroupID = 0x3031; // this is also known as makercd, 01 (0x3031) for nintendo and 08 (0x3038) for MH3 etc
std::string Filename = HLE_IPC_BuildFilename((const char*)Memory::GetPointer(_BufferIn), 64); std::string Filename = HLE_IPC_BuildFilename((const char*)Memory::GetPointer(_BufferIn), 64);
u8 OwnerPerm = 0x3; // read/write u8 OwnerPerm = 0x3; // read/write
u8 GroupPerm = 0x3; // read/write u8 GroupPerm = 0x3; // read/write

12
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
View File

@ -80,7 +80,7 @@ it failed)
extern std::queue<std::pair<u32,std::string> > g_ReplyQueueLater; extern std::queue<std::pair<u32,std::string> > g_ReplyQueueLater;
const u8 default_address[] = { 0x00, 0x17, 0xAB, 0x99, 0x99, 0x99 }; const u8 default_address[] = { 0x00, 0x17, 0xAB, 0x99, 0x99, 0x99 };
int status = 3; int status = 5;
// ********************************************************************************** // **********************************************************************************
// Handle /dev/net/kd/request requests // Handle /dev/net/kd/request requests
CWII_IPC_HLE_Device_net_kd_request::CWII_IPC_HLE_Device_net_kd_request(u32 _DeviceID, const std::string& _rDeviceName) CWII_IPC_HLE_Device_net_kd_request::CWII_IPC_HLE_Device_net_kd_request(u32 _DeviceID, const std::string& _rDeviceName)
@ -155,11 +155,11 @@ bool CWII_IPC_HLE_Device_net_kd_request::IOCtl(u32 _CommandAddress)
case IOCTL_NWC24_REQUEST_GENERATED_USER_ID: // (Input: none, Output: 32 bytes) case IOCTL_NWC24_REQUEST_GENERATED_USER_ID: // (Input: none, Output: 32 bytes)
INFO_LOG(WII_IPC_NET, "NET_KD_REQ: IOCTL_NWC24_REQUEST_GENERATED_USER_ID"); INFO_LOG(WII_IPC_NET, "NET_KD_REQ: IOCTL_NWC24_REQUEST_GENERATED_USER_ID");
Memory::Write_U32(0xFFFFFFDC, BufferOut); //Memory::Write_U32(0xFFFFFFDC, BufferOut);
Memory::Write_U32(0x00050495, BufferOut + 4); //Memory::Write_U32(0x00050495, BufferOut + 4);
Memory::Write_U32(0x90CFBF35, BufferOut + 8); //Memory::Write_U32(0x90CFBF35, BufferOut + 8);
Memory::Write_U32(0x00000002, BufferOut + 0xC); //Memory::Write_U32(0x00000002, BufferOut + 0xC);
//Memory::WriteBigEData((u8*)m_UserID.c_str(), BufferOut, m_UserID.length() + 1); Memory::WriteBigEData((u8*)m_UserID.c_str(), BufferOut, m_UserID.length() + 1);
break; break;
case IOCTL_NWC24_GET_SCHEDULAR_STAT: case IOCTL_NWC24_GET_SCHEDULAR_STAT:

12
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
View File

@ -459,11 +459,11 @@ u32 CWII_IPC_HLE_Device_net_ssl::ExecuteCommandV(u32 _Parameter, SIOCtlVBuffer C
{ {
SSL* ssl = sslfds[sslID]; SSL* ssl = sslfds[sslID];
/*FILE *ssl_write = fopen("ssl_write.txt", "ab"); FILE *ssl_write = fopen("ssl_write.txt", "ab");
fwrite(Memory::GetPointer(_BufferOut2), 1, BufferOutSize2, ssl_write); fwrite(Memory::GetPointer(_BufferOut2), 1, BufferOutSize2, ssl_write);
fprintf(ssl_write, "----(%d)----\n", BufferOutSize2); //fprintf(ssl_write, "----(%d)----\n", BufferOutSize2);
fclose(ssl_write); fclose(ssl_write);
*/
returnValue = SSL_write(ssl, Memory::GetPointer(_BufferOut2), BufferOutSize2); returnValue = SSL_write(ssl, Memory::GetPointer(_BufferOut2), BufferOutSize2);
if (returnValue == -1) if (returnValue == -1)
returnValue = -SSL_get_error(ssl, returnValue); returnValue = -SSL_get_error(ssl, returnValue);
@ -525,15 +525,15 @@ u32 CWII_IPC_HLE_Device_net_ssl::ExecuteCommandV(u32 _Parameter, SIOCtlVBuffer C
Memory::Write_U32(returnValue, _BufferIn); Memory::Write_U32(returnValue, _BufferIn);
//returnValue = 0; //returnValue = 0;
} }
/*memcpy(in2, (char*)Memory::GetPointer(_BufferIn2), BufferInSize2); memcpy(in2, (char*)Memory::GetPointer(_BufferIn2), BufferInSize2);
FILE *ssl_read = fopen("ssl_read.txt", "ab"); FILE *ssl_read = fopen("ssl_read.txt", "ab");
if((s32)returnValue >0) if((s32)returnValue >0)
fwrite(in2, 1, returnValue, ssl_read); fwrite(in2, 1, returnValue, ssl_read);
fprintf(ssl_read, "%s", "--------\n"); //fprintf(ssl_read, "%s", "--------\n");
fclose(ssl_read); fclose(ssl_read);
*/
INFO_LOG(WII_IPC_NET, "/dev/net/ssl::IOCtlV request IOCTLV_NET_SSL_READ(%d) %s " INFO_LOG(WII_IPC_NET, "/dev/net/ssl::IOCtlV request IOCTLV_NET_SSL_READ(%d) %s "
"BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), "
"BufferIn3: (%08x, %i), BufferOut: (%08x, %i), " "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "