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

Merge pull request #382 from jarupxx/oovpa-integration-xonline 

Integrated duplicate XOnline OOVPA
This commit is contained in:
Luke Usher 2017-04-19 12:02:46 +01:00 committed by GitHub
parent 9fe13d093f a309324645
commit d350cd4f54
5 changed files with 9 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl
View File

@ -101,7 +101,7 @@ OOVPATable XOnline_5233[] = {
REGISTER_OOVPA(bind, 4361, EMUTHIS),
// REGISTER_OOVPA(listen, 4361, EMUTHIS),
REGISTER_OOVPA(ioctlsocket, 4361, EMUTHIS),
REGISTER_OOVPA(XNetGetEthernetLinkStatus, 5233, PATCH),
REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH),
REGISTER_OOVPA(CXo_XOnlineLogon, 5233, XREF),
REGISTER_OOVPA(XOnlineLogon, 5233, PATCH),
};

2
src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl
View File

@ -44,7 +44,7 @@ OOVPATable XOnline_5344[] = {
REGISTER_OOVPA(bind, 4361, EMUTHIS),
// REGISTER_OOVPA(listen, 4361, EMUTHIS),
REGISTER_OOVPA(ioctlsocket, 4361, EMUTHIS),
REGISTER_OOVPA(XNetGetEthernetLinkStatus, 5233, PATCH),
REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH),
REGISTER_OOVPA(CXo_XOnlineLogon, 5233, XREF),
REGISTER_OOVPA(XOnlineLogon, 5233, PATCH),
};

71
src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl
View File

@ -32,75 +32,6 @@
// *
// ******************************************************************
#if 0
// ******************************************************************
// * XNetStartup
// ******************************************************************
OOVPA_NO_XREF(XNetStartup, 5233, 8)
{ 0x01, 0xC0 },
{ 0x04, 0x50 },
{ 0x07, 0x24 },
{ 0x0A, 0x68 },
{ 0x0F, 0xE8 },
{ 0x14, 0xC2 },
{ 0x15, 0x04 },
{ 0x16, 0x00 },
OOVPA_END;
// ******************************************************************
// * XNetGetEthernetLinkStatus
// ******************************************************************
OOVPA_NO_XREF(XNetGetEthernetLinkStatus, 5233, 8)
{ 0x08, 0x33 },
{ 0x10, 0x8A },
{ 0x19, 0x00 },
{ 0x22, 0x56 },
{ 0x2B, 0xFF },
{ 0x34, 0xF0 },
{ 0x3D, 0x24 },
{ 0x46, 0x5B },
OOVPA_END;
// ******************************************************************
// * CXo::XOnlineLogon
// ******************************************************************
OOVPA_XREF(CXo_XOnlineLogon, 5233, 8,
XREF_CXo_XOnlineLogon,
XRefZero)
{ 0x21, 0xA8 },
{ 0x3E, 0x80 },
{ 0x5E, 0x00 },
{ 0x7E, 0x04 },
{ 0xA2, 0x85 },
{ 0xBE, 0xEC },
{ 0xDE, 0xF9 },
{ 0xFE, 0x33 },
OOVPA_END;
// ******************************************************************
// * XOnlineLogon
// ******************************************************************
OOVPA_XREF(XOnlineLogon, 5233, 8,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY( 0x0B, XREF_CXo_XOnlineLogon ),
{ 0x00, 0x55 },
{ 0x01, 0x8B },
{ 0x02, 0xEC },
{ 0x03, 0x5D },
{ 0x04, 0x8B },
{ 0x05, 0x0D },
{ 0x0A, 0xE9 },
OOVPA_END;
#endif
// ******************************************************************
// * WSAStartup
// ******************************************************************
@ -129,7 +60,7 @@ OOVPATable XOnline_5558[] = {
REGISTER_OOVPA(bind, 4361, EMUTHIS),
// REGISTER_OOVPA(listen, 4361, EMUTHIS),
REGISTER_OOVPA(ioctlsocket, 4361, EMUTHIS),
REGISTER_OOVPA(XNetGetEthernetLinkStatus, 5233, PATCH),
REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH),
};
// ******************************************************************

50
src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl
View File

@ -50,58 +50,14 @@ OOVPA_XREF(XnInit, 5788, 8,
{ 0xFE, 0x48 },
OOVPA_END;
// ******************************************************************
// * XNetStartup
// ******************************************************************
OOVPA_NO_XREF(XNetStartup, 5788, 8)
{ 0x01, 0xC0 },
{ 0x04, 0x50 },
{ 0x07, 0x24 },
{ 0x0A, 0x68 },
{ 0x0F, 0xE8 },
{ 0x14, 0xC2 },
{ 0x15, 0x04 },
{ 0x16, 0x00 },
OOVPA_END;
// ******************************************************************
// * WSAStartup
// ******************************************************************
OOVPA_NO_XREF(WSAStartup, 5788, 7)
{ 0x02, 0x24 },
{ 0x06, 0x24 },
{ 0x0A, 0x6A },
{ 0x0E, 0x68 },
{ 0x13, 0xE8 },
{ 0x18, 0xC2 },
{ 0x1A, 0x00 },
OOVPA_END;
// ******************************************************************
// * XNetGetEthernetLinkStatus
// ******************************************************************
OOVPA_NO_XREF(XNetGetEthernetLinkStatus, 5788, 8)
{ 0x08, 0x33 },
{ 0x10, 0x8A },
{ 0x19, 0x00 },
{ 0x22, 0x56 },
{ 0x2B, 0xFF },
{ 0x34, 0xF0 },
{ 0x3D, 0x24 },
{ 0x46, 0x5B },
OOVPA_END;
// ******************************************************************
// * XOnline_5788
// ******************************************************************
OOVPATable XOnline_5788[] = {
REGISTER_OOVPA(XNetStartup, 5788, PATCH),
REGISTER_OOVPA(WSAStartup, 5788, PATCH),
REGISTER_OOVPA(XNetStartup, 5233, PATCH),
REGISTER_OOVPA(WSAStartup, 5558, PATCH),
REGISTER_OOVPA(XnInit, 5788, XREF),
REGISTER_OOVPA(XNetGetEthernetLinkStatus, 5788, PATCH),
REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH),
REGISTER_OOVPA(bind, 4361, EMUTHIS),
REGISTER_OOVPA(ioctlsocket, 4361, EMUTHIS),
};

53
src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl
View File

@ -32,53 +32,6 @@
// *
// ******************************************************************
// ******************************************************************
// * XnInit
// ******************************************************************
OOVPA_XREF(XnInit, 5849, 8,
XREF_XNINIT,
XRefZero)
{ 0x1E, 0x3B },
{ 0x3E, 0x45 },
{ 0x5E, 0x00 },
{ 0x81, 0x57 },
{ 0xA2, 0x57 },
{ 0xC0, 0x33 },
{ 0xDE, 0xFE },
{ 0xFE, 0x48 },
OOVPA_END;
// ******************************************************************
// * XNetStartup
// ******************************************************************
OOVPA_NO_XREF(XNetStartup, 5849, 8)
{ 0x01, 0xC0 },
{ 0x04, 0x50 },
{ 0x07, 0x24 },
{ 0x0A, 0x68 },
{ 0x0F, 0xE8 },
{ 0x14, 0xC2 },
{ 0x15, 0x04 },
{ 0x16, 0x00 },
OOVPA_END;
// ******************************************************************
// * WSAStartup
// ******************************************************************
OOVPA_NO_XREF(WSAStartup, 5849, 7)
{ 0x02, 0x24 },
{ 0x06, 0x24 },
{ 0x0A, 0x6A },
{ 0x0E, 0x68 },
{ 0x13, 0xE8 },
{ 0x18, 0xC2 },
{ 0x1A, 0x00 },
OOVPA_END;
// ******************************************************************
// * XNetGetEthernetLinkStatus
// ******************************************************************
@ -88,9 +41,9 @@ OOVPA_END;
// * XOnline_5849
// ******************************************************************
OOVPATable XOnline_5849[] = {
REGISTER_OOVPA(XNetStartup, 5849, PATCH),
REGISTER_OOVPA(WSAStartup, 5849, PATCH),
REGISTER_OOVPA(XnInit, 5849, XREF),
REGISTER_OOVPA(XNetStartup, 5233, PATCH),
REGISTER_OOVPA(WSAStartup, 5558, PATCH),
REGISTER_OOVPA(XnInit, 5788, XREF),
REGISTER_OOVPA(XNetGetEthernetLinkStatus, 5849, PATCH),
};