izzy/xenia-edge
0
0
Fork 0
mirror of https://github.com/izzy2lost/xenia-edge.git synced 2026-07-06 00:20:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/canary_experimental' into edge

Browse Source
This commit is contained in:
Herman S.
2025-11-11 09:28:00 +09:00
parent 774d3e9565 44c2882e9e
commit e4acd7f9c3
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xenia/kernel/xam/xam_enum.cc
+1 -1
View File
@@ -114,7 +114,7 @@ dword_result_t XamGetPrivateEnumStructureFromHandle_entry(
return X_STATUS_SUCCESS;
}
DECLARE_XAM_EXPORT1(XamGetPrivateEnumStructureFromHandle, kNone, kStub);
DECLARE_XAM_EXPORT1(XamGetPrivateEnumStructureFromHandle, kNone, kImplemented);
dword_result_t XamProfileCreateEnumerator_entry(dword_t device_id,
lpdword_t handle_ptr) {
src/xenia/kernel/xam/xam_net.cc
+3 -13
View File
@@ -258,8 +258,8 @@ dword_result_t NetDll_WSAStartup_entry(dword_t caller, word_t version,
int ret = 0;
#ifdef XE_PLATFORM_WIN32
WSADATA wsaData;
ZeroMemory(&wsaData, sizeof(WSADATA));
WSADATA wsaData = {};
ret = WSAStartup(version, &wsaData);
#endif
@@ -269,19 +269,9 @@ dword_result_t NetDll_WSAStartup_entry(dword_t caller, word_t version,
#ifdef XE_PLATFORM_WIN32
data_ptr->version = wsaData.wVersion;
data_ptr->version_high = wsaData.wHighVersion;
data_ptr->max_sockets = wsaData.iMaxSockets;
data_ptr->max_udpdg = wsaData.iMaxUdpDg;
std::memcpy(&data_ptr->description, wsaData.szDescription, 0x100);
std::memcpy(&data_ptr->system_status, wsaData.szSystemStatus, 0x80);
#else
// Match Windows behavior with reasonable values
data_ptr->version = version.value();
data_ptr->version_high = version.value();
data_ptr->max_sockets = 100;
data_ptr->max_udpdg = 1024;
// WinSock 2.2 typically returns empty strings for these fields
std::memset(&data_ptr->description, 0, 0x100);
std::memset(&data_ptr->system_status, 0, 0x80);
data_ptr->version_high = 0x0202;
#endif
// Some games (5841099F) want this value round-tripped - they'll compare if