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

Merge branch 'master' of https://github.com/DHrpcs3/rpcs3

This commit is contained in:
Nekotekina 2014-03-17 13:16:43 +04:00
parent 1a1bed2258 39a717b239
commit 4cbe3a2a46
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/SysCalls/Modules/sceNp.cpp
View File

@ -32,8 +32,8 @@ int sceNpDrmIsAvailable(u32 k_licensee_addr, u32 drm_path_addr)
k_licensee_str += wxString::Format("%02x", k_licensee[i]); k_licensee_str += wxString::Format("%02x", k_licensee[i]);
} }
sceNp.Warning("sceNpDrmIsAvailable: Found DRM license file at %s", drm_path.c_str()); sceNp.Warning("sceNpDrmIsAvailable: Found DRM license file at %s", drm_path.wx_str());
sceNp.Warning("sceNpDrmIsAvailable: Using k_licensee 0x%s", k_licensee_str); sceNp.Warning("sceNpDrmIsAvailable: Using k_licensee 0x%s", k_licensee_str.wx_str());
return CELL_OK; return CELL_OK;
} }

10
rpcs3/Emu/SysCalls/Modules/sys_net.cpp
View File

@ -6,7 +6,7 @@
#ifdef _WIN32 #ifdef _WIN32
#include <winsock.h> #include <winsock.h>
#elif #else
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
@ -296,7 +296,11 @@ int sys_net_socket(s32 family, s32 type, s32 protocol)
int sys_net_socketclose(s32 s) int sys_net_socketclose(s32 s)
{ {
sys_net.Warning("socket(s=%d)", s); sys_net.Warning("socket(s=%d)", s);
#ifdef _WIN32
int ret = closesocket(s); int ret = closesocket(s);
#else
int ret = close(s);
#endif
g_lastError = getLastError(); g_lastError = getLastError();
return ret; return ret;
} }
@ -321,8 +325,6 @@ int sys_net_initialize_network_ex(mem_ptr_t<sys_net_initialize_parameter> param)
WSADATA wsaData; WSADATA wsaData;
WORD wVersionRequested = MAKEWORD(1,1); WORD wVersionRequested = MAKEWORD(1,1);
WSAStartup(wVersionRequested, &wsaData); WSAStartup(wVersionRequested, &wsaData);
#elif
// TODO ?
#endif #endif
return CELL_OK; return CELL_OK;
} }
@ -454,8 +456,6 @@ int sys_net_finalize_network()
g_lastError.SetAddr(NULL); g_lastError.SetAddr(NULL);
#ifdef _WIN32 #ifdef _WIN32
WSACleanup(); WSACleanup();
#else
// TODO ?
#endif #endif
return CELL_OK; return CELL_OK;
} }