From f2a978e97f5d418439055d85211efe52e1a8cee4 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sun, 29 Jan 2012 13:32:04 +1300 Subject: [PATCH] Reverted back to old user ID, added comment explaining groupID choice. Added back some debug prints to files... --- .../Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp | 2 +- .../Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp | 12 ++++++------ .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp index c69ee15919..88372f3303 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp @@ -348,7 +348,7 @@ s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _B _BufferOutSize); 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); u8 OwnerPerm = 0x3; // read/write u8 GroupPerm = 0x3; // read/write diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp index 8aeefb0c3e..96e52306a4 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -80,7 +80,7 @@ it failed) extern std::queue > g_ReplyQueueLater; const u8 default_address[] = { 0x00, 0x17, 0xAB, 0x99, 0x99, 0x99 }; -int status = 3; +int status = 5; // ********************************************************************************** // 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) @@ -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) INFO_LOG(WII_IPC_NET, "NET_KD_REQ: IOCTL_NWC24_REQUEST_GENERATED_USER_ID"); - Memory::Write_U32(0xFFFFFFDC, BufferOut); - Memory::Write_U32(0x00050495, BufferOut + 4); - Memory::Write_U32(0x90CFBF35, BufferOut + 8); - Memory::Write_U32(0x00000002, BufferOut + 0xC); - //Memory::WriteBigEData((u8*)m_UserID.c_str(), BufferOut, m_UserID.length() + 1); + //Memory::Write_U32(0xFFFFFFDC, BufferOut); + //Memory::Write_U32(0x00050495, BufferOut + 4); + //Memory::Write_U32(0x90CFBF35, BufferOut + 8); + //Memory::Write_U32(0x00000002, BufferOut + 0xC); + Memory::WriteBigEData((u8*)m_UserID.c_str(), BufferOut, m_UserID.length() + 1); break; case IOCTL_NWC24_GET_SCHEDULAR_STAT: diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp index 4b82ef9142..dda1c5c72c 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp @@ -459,11 +459,11 @@ u32 CWII_IPC_HLE_Device_net_ssl::ExecuteCommandV(u32 _Parameter, SIOCtlVBuffer C { 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); - fprintf(ssl_write, "----(%d)----\n", BufferOutSize2); + //fprintf(ssl_write, "----(%d)----\n", BufferOutSize2); fclose(ssl_write); - */ + returnValue = SSL_write(ssl, Memory::GetPointer(_BufferOut2), BufferOutSize2); if (returnValue == -1) 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); //returnValue = 0; } - /*memcpy(in2, (char*)Memory::GetPointer(_BufferIn2), BufferInSize2); + memcpy(in2, (char*)Memory::GetPointer(_BufferIn2), BufferInSize2); FILE *ssl_read = fopen("ssl_read.txt", "ab"); if((s32)returnValue >0) fwrite(in2, 1, returnValue, ssl_read); - fprintf(ssl_read, "%s", "--------\n"); +//fprintf(ssl_read, "%s", "--------\n"); fclose(ssl_read); - */ + INFO_LOG(WII_IPC_NET, "/dev/net/ssl::IOCtlV request IOCTLV_NET_SSL_READ(%d) %s " "BufferIn: (%08x, %i), BufferIn2: (%08x, %i), " "BufferIn3: (%08x, %i), BufferOut: (%08x, %i), "