From fabc87fc7024a3c40babb5bc5722fa674b7a2e21 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Mon, 23 Oct 2017 23:15:02 -0500 Subject: [PATCH] Removed XOnlines v1 Database --- build/win32/Cxbx.vcxproj | 8 ------ build/win32/Cxbx.vcxproj.filters | 24 ---------------- src/CxbxKrnl/HLEDataBase.cpp | 11 -------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl | 25 ----------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl | 26 ----------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.inl | 26 ----------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl | 26 ----------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl | 25 ----------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl | 28 ------------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl | 26 ----------------- src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl | 26 ----------------- 11 files changed, 251 deletions(-) diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj index c5dbb70f8..07c8431e2 100644 --- a/build/win32/Cxbx.vcxproj +++ b/build/win32/Cxbx.vcxproj @@ -231,14 +231,6 @@ $(SOLUTIONDIR)Export.bat - - - - - - - - diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters index c97391612..a8969c44c 100644 --- a/build/win32/Cxbx.vcxproj.filters +++ b/build/win32/Cxbx.vcxproj.filters @@ -399,30 +399,6 @@ Shared - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - - - HLEDatabase\XOnline - diff --git a/src/CxbxKrnl/HLEDataBase.cpp b/src/CxbxKrnl/HLEDataBase.cpp index 704bd2c2b..5e9a1b97d 100644 --- a/src/CxbxKrnl/HLEDataBase.cpp +++ b/src/CxbxKrnl/HLEDataBase.cpp @@ -89,17 +89,6 @@ const HLEData HLEDataBase[] = { HLE_ENTRY(Lib_XONLINE, XOnline, 4361), // TODO : Typo for XONLINES? - -#if ENABLE_LEGACY_XONLINES_DB - // TODO: Verify differences between XONLINE and XONLINES (if any) - HLE_ENTRY(Lib_XONLINES, XOnline, 4627), - HLE_ENTRY(Lib_XONLINES, XOnline, 5028), - HLE_ENTRY(Lib_XONLINES, XOnline, 5233), - HLE_ENTRY(Lib_XONLINES, XOnline, 5344), - HLE_ENTRY(Lib_XONLINES, XOnline, 5558), - HLE_ENTRY(Lib_XONLINES, XOnline, 5788), - HLE_ENTRY(Lib_XONLINES, XOnline, 5849), -#endif }; const HLEDataV2 HLEDataBaseV2[] = { diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl index 3ba8ac52b..6e6be42b4 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4361.inl @@ -273,28 +273,3 @@ OOVPA_NO_XREF(XNetGetEthernetLinkStatus, 4361, 13) { 0x2C, 0x15 }, OOVPA_END; #endif - -// ****************************************************************** -// * XOnline_4361 -// ****************************************************************** -OOVPATable XOnline_4361[] = { - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(CXo_XOnlineLogon, 4361, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 3911, PATCH), - REGISTER_OOVPA(socket, 3911, PATCH), - REGISTER_OOVPA(bind, 3911, PATCH), - REGISTER_OOVPA(listen, 3911, PATCH), - REGISTER_OOVPA(ioctlsocket, 3911, PATCH), - REGISTER_OOVPA(connect, 3911, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), -}; - -// ****************************************************************** -// * XOnline_4361_SIZE -// ****************************************************************** -uint32 XOnline_4361_SIZE = sizeof(XOnline_4361); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl index fe2ace301..89543d713 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.4627.inl @@ -144,29 +144,3 @@ OOVPA_XREF(CXo_XOnlineLogon, 4627, 13, { 0x43, 0x68 }, { 0x44, 0x68 }, OOVPA_END; - -// ****************************************************************** -// * XOnline_4627 -// ****************************************************************** -OOVPATable XOnline_4627[] ={ - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(socket, 4627, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 3911, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 4627, XREF), - REGISTER_OOVPA(CXo_XOnlineLogon, 4627, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_4627_SIZE -// ****************************************************************** -uint32 XOnline_4627_SIZE = sizeof(XOnline_4627); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.inl index 56fef6b74..5ecfa42f6 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5028.inl @@ -58,29 +58,3 @@ OOVPA_XREF(CXo_XOnlineLogon, 5028, 15, { 0x2B, 0x80 }, { 0x2C, 0xE9 }, OOVPA_END; - -// ****************************************************************** -// * XOnline_5028 -// ****************************************************************** -OOVPATable XOnline_5028[] ={ - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(socket, 4627, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 3911, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 4627, XREF), - REGISTER_OOVPA(CXo_XOnlineLogon, 4831, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_5028_SIZE -// ****************************************************************** -uint32 XOnline_5028_SIZE = sizeof(XOnline_5028); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl index 68b465b03..6680463fd 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5233.inl @@ -109,29 +109,3 @@ OOVPA_NO_XREF(connect, 5233, 12) // Up to 5849 { 0x61, 0xE8 }, OOVPA_END; #endif - -// ****************************************************************** -// * XOnline_5233 -// ****************************************************************** -OOVPATable XOnline_5233[] = { - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(socket, 4627, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 5120, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 4627, XREF), - REGISTER_OOVPA(CXo_XOnlineLogon, 5233, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_5233_SIZE -// ****************************************************************** -uint32 XOnline_5233_SIZE = sizeof(XOnline_5233); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl index dd8357d9a..224aae36a 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5344.inl @@ -32,28 +32,3 @@ // * // ****************************************************************** -// ****************************************************************** -// * XOnline_5344 -// ****************************************************************** -OOVPATable XOnline_5344[] = { - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(socket, 4627, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 5120, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 4627, XREF), - REGISTER_OOVPA(CXo_XOnlineLogon, 5233, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_5344_SIZE -// ****************************************************************** -uint32 XOnline_5344_SIZE = sizeof(XOnline_5344); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl index 7e41decfc..dac28b8de 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5558.inl @@ -113,31 +113,3 @@ OOVPA_XREF(XOnlineLogon, 5558, 8, { 0x0A, 0xE9 }, OOVPA_END; #endif - -// ****************************************************************** -// * XOnline_5558 -// ****************************************************************** -// * TODO: Verify all of these -// ****************************************************************** -OOVPATable XOnline_5558[] = { - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(socket, 5455, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 5120, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 4627, XREF), - REGISTER_OOVPA(CXo_XOnlineLogon, 5455, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_5558_SIZE -// ****************************************************************** -uint32 XOnline_5558_SIZE = sizeof(XOnline_5558); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl index af43a697c..07e72c236 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5788.inl @@ -78,29 +78,3 @@ OOVPA_XREF(XoUpdateLaunchNewImageInternal, 5788, 16, { 0x6E, 0xEB }, { 0x88, 0x3D }, OOVPA_END; - -// ****************************************************************** -// * XOnline_5788 -// ****************************************************************** -OOVPATable XOnline_5788[] = { - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(socket, 5455, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 5120, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 5788, XREF), - REGISTER_OOVPA(CXo_XOnlineLogon, 5455, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_5788_SIZE -// ****************************************************************** -uint32 XOnline_5788_SIZE = sizeof(XOnline_5788); diff --git a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl index e979acf4e..f9d1fb604 100644 --- a/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/XOnline.1.0.5849.inl @@ -58,29 +58,3 @@ OOVPA_XREF(CXo_XOnlineLogon, 5849, 15, { 0x41, 0x80 }, { 0x42, 0xE9 }, OOVPA_END; - -// ****************************************************************** -// * XOnline_5849 -// ****************************************************************** -OOVPATable XOnline_5849[] = { - - REGISTER_OOVPA(XnInit, 4361, XREF), - REGISTER_OOVPA(XNetStartup, 4361, PATCH), - REGISTER_OOVPA(WSAStartup, 4361, PATCH), - REGISTER_OOVPA(XNetGetEthernetLinkStatus, 4627, PATCH), - REGISTER_OOVPA(XoUpdateLaunchNewImageInternal, 5788, XREF), - REGISTER_OOVPA(socket, 5455, PATCH), - REGISTER_OOVPA(bind, 4627, PATCH), - REGISTER_OOVPA(listen, 4627, PATCH), - REGISTER_OOVPA(ioctlsocket, 4627, PATCH), - REGISTER_OOVPA(connect, 5120, PATCH), - REGISTER_OOVPA(send, 3911, PATCH), - REGISTER_OOVPA(recv, 3911, PATCH), - REGISTER_OOVPA(CXo_XOnlineLogon, 5849, XREF), - REGISTER_OOVPA(XOnlineLogon, 4361, PATCH), -}; - -// ****************************************************************** -// * XOnline_5849_SIZE -// ****************************************************************** -uint32 XOnline_5849_SIZE = sizeof(XOnline_5849);