From ddf417e523d8971e10c43c68bcc291e66dc50532 Mon Sep 17 00:00:00 2001 From: jarupxx Date: Fri, 6 Oct 2017 19:32:30 +0900 Subject: [PATCH] Support inline functions plus added notes XnInit is for only XNETS library. XNET library is different one. Verified with Halo - Combat Evolved (3911) Tony Hawk's Pro Skater 3 (4039) --- src/CxbxKrnl/HLEDataBase.cpp | 2 +- src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl | 1 + src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase.cpp b/src/CxbxKrnl/HLEDataBase.cpp index 4d782da02..db398c5d0 100644 --- a/src/CxbxKrnl/HLEDataBase.cpp +++ b/src/CxbxKrnl/HLEDataBase.cpp @@ -212,7 +212,7 @@ const HLEDataV2 HLEDataBaseV2[] = { //{ Lib_XONLINES,{ Sec_XONLINE, Sec_XNET }, XONLINES_OOVPAV2, XONLINES_OOVPA_SIZEV2 }, // XNETS only has XNET, might be true. - { Lib_XNETS,{ Sec_XNET }, XNET_OOVPAV2, XNET_OOVPA_SIZEV2 }, + { Lib_XNETS,{ Sec_text, Sec_XNET }, XNET_OOVPAV2, XNET_OOVPA_SIZEV2 }, }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl index 218c073ab..1e1848115 100644 --- a/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/XNet.1.0.3911.inl @@ -87,6 +87,7 @@ OOVPA_END; // ****************************************************************** // * XnInit // ****************************************************************** +// For only XNETS library, XNET library is different OOVPA. OOVPA_XREF(XnInit, 3911, 11, XREF_XnInit, diff --git a/src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl index c0ff5c1d7..603c8bf49 100644 --- a/src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/XNet.OOVPA.inl @@ -32,6 +32,11 @@ // * // ****************************************************************** +// TODO: Known XNET OOVPA issue list +// * Verified each OOVPA only with 3911, 4039. +// * XnInit is for only XNETS library. XNET library is different one. +// * Following OOVPA revision are not verified +// * listen (4039) #ifndef XNET_OOVPA_INL #define XNET_OOVPA_INL @@ -46,7 +51,7 @@ // ****************************************************************** OOVPATable XNET_OOVPAV2[] = { - REGISTER_OOVPAS(XnInit, XREF, 3911, 4627), + REGISTER_OOVPAS(XnInit, XREF, 3911, 4627), // For only XNETS library, XNET library is different OOVPA. REGISTER_OOVPAS(WSAStartup, PATCH, 3911, 4627), // same as xonline 4361 (from 4627's comment) REGISTER_OOVPAS(XNetStartup, PATCH, 3911, 4627), // same as xonline 4361 (from 4627's comment) REGISTER_OOVPAS(XNetGetEthernetLinkStatus, PATCH, 3911),