diff --git a/CxbxKrnl.dsp b/CxbxKrnl.dsp index 7e1d9c20f..ac65aecb7 100644 --- a/CxbxKrnl.dsp +++ b/CxbxKrnl.dsp @@ -80,6 +80,7 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept # ADD LINK32 d3d8.lib dinput8.lib dxguid.lib ntdll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Bin\Debug/Cxbx.dll" /pdbtype:sept /libpath:"Lib" +# SUBTRACT LINK32 /pdb:none !ENDIF @@ -128,6 +129,10 @@ SOURCE=.\Doc\Todo.txt # PROP Default_Filter "" # Begin Source File +SOURCE=.\Include\Win32\CxbxKrnl\D3D8.1.0.3925.h +# End Source File +# Begin Source File + SOURCE=.\Include\Win32\CxbxKrnl\D3D8.1.0.4361.h # End Source File # Begin Source File @@ -176,6 +181,10 @@ SOURCE=.\Resource\ResCxbxKrnl.h # End Source File # Begin Source File +SOURCE=.\Include\Win32\CxbxKrnl\Xapi.1.0.3911.h +# End Source File +# Begin Source File + SOURCE=.\Include\Win32\CxbxKrnl\Xapi.1.0.4361.h # End Source File # Begin Source File @@ -204,6 +213,10 @@ SOURCE=.\Resource\CxbxDll.rc # PROP Default_Filter "" # Begin Source File +SOURCE=.\Source\Win32\CxbxKrnl\D3D8.1.0.3925.inl +# End Source File +# Begin Source File + SOURCE=.\Source\Win32\CxbxKrnl\D3D8.1.0.4361.inl # End Source File # Begin Source File @@ -248,6 +261,10 @@ SOURCE=.\Source\Win32\CxbxKrnl\KernelThunk.cpp # End Source File # Begin Source File +SOURCE=.\Source\Win32\CxbxKrnl\Xapi.1.0.3911.inl +# End Source File +# Begin Source File + SOURCE=.\Source\Win32\CxbxKrnl\Xapi.1.0.4361.inl # End Source File # Begin Source File diff --git a/Include/Win32/CxbxKrnl/D3D8.1.0.3925.h b/Include/Win32/CxbxKrnl/D3D8.1.0.3925.h new file mode 100644 index 000000000..be785698e --- /dev/null +++ b/Include/Win32/CxbxKrnl/D3D8.1.0.3925.h @@ -0,0 +1,40 @@ +// ****************************************************************** +// * +// * .,-::::: .,:: .::::::::. .,:: .: +// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; +// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' +// * $$$ Y$$$P $$""""Y$$ Y$$$P +// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, +// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, +// * +// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.3925.h +// * +// * This file is part of the Cxbx project. +// * +// * Cxbx and Cxbe are free software; you can redistribute them +// * and/or modify them under the terms of the GNU General Public +// * License as published by the Free Software Foundation; either +// * version 2 of the license, or (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have recieved a copy of the GNU General Public License +// * along with this program; see the file COPYING. +// * If not, write to the Free Software Foundation, Inc., +// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. +// * +// * (c) 2002-2003 Aaron Robinson +// * +// * All rights reserved +// * +// ****************************************************************** +#ifndef D3D8_1_0_3925_H +#define D3D8_1_0_3925_H + +extern OOVPATable D3D8_1_0_3925[]; +extern uint32 D3D8_1_0_3925_SIZE; + +#endif diff --git a/Include/Win32/CxbxKrnl/HLEDataBase.h b/Include/Win32/CxbxKrnl/HLEDataBase.h index a8a40b20b..cb7c9f2b5 100644 --- a/Include/Win32/CxbxKrnl/HLEDataBase.h +++ b/Include/Win32/CxbxKrnl/HLEDataBase.h @@ -34,9 +34,12 @@ #ifndef HLEDATABASE_H #define HLEDATABASE_H +#include "Xapi.1.0.3911.h" #include "Xapi.1.0.4361.h" #include "Xapi.1.0.4627.h" +#include "D3D8.1.0.3925.h" #include "D3D8.1.0.4361.h" +#include "D3D8.1.0.4627.h" // ****************************************************************** // * HLEDataBase diff --git a/Include/Win32/CxbxKrnl/Xapi.1.0.3911.h b/Include/Win32/CxbxKrnl/Xapi.1.0.3911.h new file mode 100644 index 000000000..a6e652eee --- /dev/null +++ b/Include/Win32/CxbxKrnl/Xapi.1.0.3911.h @@ -0,0 +1,40 @@ +// ****************************************************************** +// * +// * .,-::::: .,:: .::::::::. .,:: .: +// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; +// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' +// * $$$ Y$$$P $$""""Y$$ Y$$$P +// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, +// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, +// * +// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.3911.h +// * +// * This file is part of the Cxbx project. +// * +// * Cxbx and Cxbe are free software; you can redistribute them +// * and/or modify them under the terms of the GNU General Public +// * License as published by the Free Software Foundation; either +// * version 2 of the license, or (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have recieved a copy of the GNU General Public License +// * along with this program; see the file COPYING. +// * If not, write to the Free Software Foundation, Inc., +// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. +// * +// * (c) 2002-2003 Aaron Robinson +// * +// * All rights reserved +// * +// ****************************************************************** +#ifndef XAPI_1_0_3911_H +#define XAPI_1_0_3911_H + +extern OOVPATable XAPI_1_0_3911[]; +extern uint32 XAPI_1_0_3911_SIZE; + +#endif diff --git a/Include/Win32/CxbxKrnl/xntdll.h b/Include/Win32/CxbxKrnl/xntdll.h index 0277bc1a5..acd0bca14 100644 --- a/Include/Win32/CxbxKrnl/xntdll.h +++ b/Include/Win32/CxbxKrnl/xntdll.h @@ -195,6 +195,17 @@ typedef struct _LDT_ENTRY } LDT_ENTRY, *PLDT_ENTRY; +// ****************************************************************** +// * STRING +// ****************************************************************** +typedef struct _STRING +{ + USHORT Length; + USHORT MaximumLength; + PCHAR Buffer; +} +STRING, ANSI_STRING, *PSTRING, *PANSI_STRING; + // ****************************************************************** // * KeDelayExecutionThread // ****************************************************************** @@ -216,6 +227,15 @@ NTSYSAPI NTSTATUS NTAPI NtSetLdtEntries IN LDT_ENTRY Descriptor2 ); +// ****************************************************************** +// * 0x0121 - RtlInitAnsiString +// ****************************************************************** +typedef VOID (NTAPI *FPTR_RtlInitAnsiString) +( + IN OUT PANSI_STRING DestinationString, + IN PCSZ SourceString +); + // ****************************************************************** // * Valid values for the Attributes field // ****************************************************************** diff --git a/Source/Win32/Cxbx/WndMain.cpp b/Source/Win32/Cxbx/WndMain.cpp index 05ba0c027..8c0bf6196 100644 --- a/Source/Win32/Cxbx/WndMain.cpp +++ b/Source/Win32/Cxbx/WndMain.cpp @@ -230,9 +230,9 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP HGDIOBJ tmpObj = SelectObject(hDC, hFont); - SetBkColor(hDC, GetSysColor(COLOR_BTNFACE)); + SetBkColor(hDC, GetSysColor(COLOR_MENUBAR)); - SetTextColor(hDC, GetSysColor(COLOR_BTNTEXT)); + SetTextColor(hDC, GetSysColor(COLOR_MENUTEXT)); char buffer[255]; diff --git a/Source/Win32/CxbxKrnl/D3D8.1.0.3925.inl b/Source/Win32/CxbxKrnl/D3D8.1.0.3925.inl new file mode 100644 index 000000000..e1a3b8cc2 --- /dev/null +++ b/Source/Win32/CxbxKrnl/D3D8.1.0.3925.inl @@ -0,0 +1,84 @@ +// ****************************************************************** +// * +// * .,-::::: .,:: .::::::::. .,:: .: +// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; +// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' +// * $$$ Y$$$P $$""""Y$$ Y$$$P +// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, +// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, +// * +// * Cxbx->Win32->CxbxKrnl->D3D8.1.0.3925.cpp +// * +// * This file is part of the Cxbx project. +// * +// * Cxbx and Cxbe are free software; you can redistribute them +// * and/or modify them under the terms of the GNU General Public +// * License as published by the Free Software Foundation; either +// * version 2 of the license, or (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have recieved a copy of the GNU General Public License +// * along with this program; see the file COPYING. +// * If not, write to the Free Software Foundation, Inc., +// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. +// * +// * (c) 2002-2003 Aaron Robinson +// * +// * All rights reserved +// * +// ****************************************************************** +#include "Cxbx.h" +#include "EmuX.h" + +// ****************************************************************** +// * IDirect3D8_CreateDevice +// ****************************************************************** +SOOVPA<8> IDirect3D8_CreateDevice_1_0_3925 = +{ + 0, // Large == 0 + 8, // Count == 8 + + { + // IDirect3D8_CreateDevice+0x07 : jnz +0x0A + { 0x07, 0x75 }, // (Offset,Value)-Pair #1 + { 0x08, 0x0A }, // (Offset,Value)-Pair #2 + + // IDirect3D8_CreateDevice+0x79 : mov eax, esi + { 0x79, 0x8B }, // (Offset,Value)-Pair #3 + { 0x7A, 0xC6 }, // (Offset,Value)-Pair #4 + + // IDirect3D8_CreateDevice+0x7C : retn 0x18 + { 0x7C, 0xC2 }, // (Offset,Value)-Pair #5 + { 0x7D, 0x18 }, // (Offset,Value)-Pair #6 + + // IDirect3D8_CreateDevice+0x90 : retn 0x18 + { 0x90, 0xC2 }, // (Offset,Value)-Pair #7 + { 0x91, 0x18 }, // (Offset,Value)-Pair #8 + } +}; + +// ****************************************************************** +// * D3D8_1_0_3925 +// ****************************************************************** +OOVPATable D3D8_1_0_3925[] = +{ + // IDirect3D8_CreateDevice_1_0_3925 + { + (OOVPA*)&IDirect3D8_CreateDevice_1_0_3925, + + xboxkrnl::EmuXIDirect3D8_CreateDevice, + + #ifdef _DEBUG_TRACE + "EmuXIDirect3D8_CreateDevice" + #endif + }, +}; + +// ****************************************************************** +// * D3D8_1_0_3925_SIZE +// ****************************************************************** +uint32 D3D8_1_0_3925_SIZE = sizeof(D3D8_1_0_3925); diff --git a/Source/Win32/CxbxKrnl/EmuXD3D.cpp b/Source/Win32/CxbxKrnl/EmuXD3D.cpp index 54abbd652..7350d8013 100644 --- a/Source/Win32/CxbxKrnl/EmuXD3D.cpp +++ b/Source/Win32/CxbxKrnl/EmuXD3D.cpp @@ -281,6 +281,16 @@ HRESULT WINAPI xboxkrnl::EmuXIDirect3D8_CreateDevice // * make adjustments to parameters to make sense with windows d3d // ****************************************************************** { + /* + printf("BackBufferWidth : %d\n", pPresentationParameters->BackBufferWidth); + printf("BackBufferHeight : %d\n", pPresentationParameters->BackBufferHeight); + printf("BackBufferFormat : %d\n", pPresentationParameters->BackBufferFormat); + printf("BackBufferCount : %d\n", pPresentationParameters->BackBufferCount); + printf("EnableAutoDepthStencil : %d\n", pPresentationParameters->EnableAutoDepthStencil); + printf("AutoDepthStencilFormat : %d\n", pPresentationParameters->AutoDepthStencilFormat); + printf("SwapEffect : %d\n", pPresentationParameters->SwapEffect); + */ + Adapter = D3DADAPTER_DEFAULT; pPresentationParameters->Windowed = TRUE; @@ -295,6 +305,8 @@ HRESULT WINAPI xboxkrnl::EmuXIDirect3D8_CreateDevice // Tricky MS randomizing .h #defines :[ if(pPresentationParameters->BackBufferFormat == 0x07) pPresentationParameters->BackBufferFormat = D3DFMT_X8R8G8B8; + else if(pPresentationParameters->BackBufferFormat == 0x06) + pPresentationParameters->BackBufferFormat = D3DFMT_A8R8G8B8; // Tricky MS randomizing .h #defines :[ if(pPresentationParameters->AutoDepthStencilFormat == 0x2A) diff --git a/Source/Win32/CxbxKrnl/EmuXKrnl.cpp b/Source/Win32/CxbxKrnl/EmuXKrnl.cpp index 6644a41a2..8e9fc5c3d 100644 --- a/Source/Win32/CxbxKrnl/EmuXKrnl.cpp +++ b/Source/Win32/CxbxKrnl/EmuXKrnl.cpp @@ -47,6 +47,11 @@ namespace xntdll using namespace win32; +// ****************************************************************** +// * Loaded at run-time to avoid linker conflicts +// ****************************************************************** +xntdll::FPTR_RtlInitAnsiString NT_RtlInitAnsiString = (xntdll::FPTR_RtlInitAnsiString)GetProcAddress(GetModuleHandle("ntdll"), "RtlInitAnsiString"); + // ****************************************************************** // * (HELPER) PsCreateSystemThreadExProxyParam // ****************************************************************** @@ -603,6 +608,38 @@ XBSYSAPI EXPORTNUM(277) VOID NTAPI xboxkrnl::RtlEnterCriticalSection EmuXSwapFS(); // Xbox FS } +// ****************************************************************** +// * 0x0121 - RtlInitAnsiString +// ****************************************************************** +XBSYSAPI EXPORTNUM(289) VOID NTAPI xboxkrnl::RtlInitAnsiString +( + IN OUT PANSI_STRING DestinationString, + IN PCSZ SourceString +) +{ + EmuXSwapFS(); // Win2k/XP FS + + // ****************************************************************** + // * debug trace + // ****************************************************************** + #ifdef _DEBUG_TRACE + { + printf("EmuXKrnl (0x%.08X): RtlInitAnsiString\n" + "(\n" + " DestinationString : 0x%.08X\n" + " SourceString : 0x%.08X (\"%s\")\n" + ");\n", + GetCurrentThreadId(), DestinationString, SourceString, SourceString); + } + #endif + + NT_RtlInitAnsiString((xntdll::PANSI_STRING)DestinationString, (xntdll::PCSZ)SourceString); + + EmuXSwapFS(); // Xbox FS + + return; +} + // ****************************************************************** // * 0x0123 - RtlInitializeCriticalSection // ****************************************************************** diff --git a/Source/Win32/CxbxKrnl/HLEDataBase.cpp b/Source/Win32/CxbxKrnl/HLEDataBase.cpp index 6d0071765..874382e5a 100644 --- a/Source/Win32/CxbxKrnl/HLEDataBase.cpp +++ b/Source/Win32/CxbxKrnl/HLEDataBase.cpp @@ -34,8 +34,10 @@ #include "Cxbx.h" #include "EmuX.h" +#include "Xapi.1.0.3911.inl" #include "Xapi.1.0.4361.inl" #include "Xapi.1.0.4627.inl" +#include "D3D8.1.0.3925.inl" #include "D3D8.1.0.4361.inl" #include "D3D8.1.0.4627.inl" @@ -44,6 +46,13 @@ // ****************************************************************** HLEData HLEDataBase[] = { + // Xapilib Version 1.0.3911 + { + "XAPILIB", + 1, 0, 3911, + XAPI_1_0_3911, + XAPI_1_0_3911_SIZE + }, // Xapilib Version 1.0.4361 { "XAPILIB", @@ -58,6 +67,13 @@ HLEData HLEDataBase[] = XAPI_1_0_4627, XAPI_1_0_4627_SIZE }, + // D3D8 Version 1.0.3925 + { + "D3D8", + 1, 0, 3925, + D3D8_1_0_3925, + D3D8_1_0_3925_SIZE + }, // D3D8 Version 1.0.4361 { "D3D8", diff --git a/Source/Win32/CxbxKrnl/KernelThunk.cpp b/Source/Win32/CxbxKrnl/KernelThunk.cpp index 9eee2722f..2d8e12a7f 100644 --- a/Source/Win32/CxbxKrnl/KernelThunk.cpp +++ b/Source/Win32/CxbxKrnl/KernelThunk.cpp @@ -346,7 +346,7 @@ CXBXKRNL_API uint32 KernelThunkTable[367] = (uint32)PANIC(0x011E), // 0x011E (286) (uint32)PANIC(0x011F), // 0x011F (287) (uint32)PANIC(0x0120), // 0x0120 (288) - (uint32)PANIC(0x0121), // 0x0121 (289) + (uint32)xboxkrnl::RtlInitAnsiString, // 0x0121 (289) (uint32)PANIC(0x0122), // 0x0122 (290) (uint32)&xboxkrnl::RtlInitializeCriticalSection,// 0x0123 (291) (uint32)PANIC(0x0124), // 0x0124 (292) diff --git a/Source/Win32/CxbxKrnl/Xapi.1.0.3911.inl b/Source/Win32/CxbxKrnl/Xapi.1.0.3911.inl new file mode 100644 index 000000000..7e0ba0eab --- /dev/null +++ b/Source/Win32/CxbxKrnl/Xapi.1.0.3911.inl @@ -0,0 +1,235 @@ +// ****************************************************************** +// * +// * .,-::::: .,:: .::::::::. .,:: .: +// * ,;;;'````' `;;;, .,;; ;;;'';;' `;;;, .,;; +// * [[[ '[[,,[[' [[[__[[\. '[[,,[[' +// * $$$ Y$$$P $$""""Y$$ Y$$$P +// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo, +// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm, +// * +// * Cxbx->Win32->CxbxKrnl->Xapi.1.0.3911.cpp +// * +// * This file is part of the Cxbx project. +// * +// * Cxbx and Cxbe are free software; you can redistribute them +// * and/or modify them under the terms of the GNU General Public +// * License as published by the Free Software Foundation; either +// * version 2 of the license, or (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have recieved a copy of the GNU General Public License +// * along with this program; see the file COPYING. +// * If not, write to the Free Software Foundation, Inc., +// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. +// * +// * (c) 2002-2003 Aaron Robinson +// * +// * All rights reserved +// * +// ****************************************************************** + +// ****************************************************************** +// * CreateThread +// ****************************************************************** +SOOVPA<8> CreateThread_1_0_3911 = +{ + 0, // Large == 0 + 8, // Count == 8 + + { + // CreateThread+0x0A : mov eax, ds:10130h + { 0x0A, 0xA1 }, // (Offset,Value)-Pair #1 + { 0x0B, 0x30 }, // (Offset,Value)-Pair #2 + { 0x0C, 0x01 }, // (Offset,Value)-Pair #3 + + // CreateThread+0x1C : and ecx, 0xFFFFFF01 + { 0x1C, 0x81 }, // (Offset,Value)-Pair #4 + { 0x1D, 0xE1 }, // (Offset,Value)-Pair #5 + { 0x1E, 0x01 }, // (Offset,Value)-Pair #6 + + // CreateThread+0x51 : retn 0x18 + { 0x51, 0xC2 }, // (Offset,Value)-Pair #7 + { 0x52, 0x18 } // (Offset,Value)-Pair #8 + } +}; + +// ****************************************************************** +// * XapiInitProcess +// ****************************************************************** +SOOVPA<7> XapiInitProcess_1_0_3911 = +{ + 0, // Large == 0 + 7, // Count == 7 + + { + // XapiInitProcess+0x00 : sub esp, 30h + { 0x05, 0x30 }, // (Offset,Value)-Pair #1 + + // XapiInitProcess+0x0F : push 0x0C + { 0x0F, 0x6A }, // (Offset,Value)-Pair #2 + { 0x10, 0x0C }, // (Offset,Value)-Pair #3 + + // XapiInitProcess+0x17 : repe stosd + { 0x17, 0xF3 }, // (Offset,Value)-Pair #4 + { 0x18, 0xAB }, // (Offset,Value)-Pair #5 + + // XapiInitProcess+0x42 : jnz +0x0A + { 0x42, 0x75 }, // (Offset,Value)-Pair #6 + { 0x43, 0x0A }, // (Offset,Value)-Pair #7 + } +}; + +// ****************************************************************** +// * XapiBootDash +// ****************************************************************** +SOOVPA<11> XapiBootDash_1_0_3911 = +{ + 0, // Large == 0 + 11, // Count == 11 + + { + // XapiBootDash+0x03 : sub esp, 0x0C00 + { 0x03, 0x81 }, // (Offset,Value)-Pair #1 + { 0x04, 0xEC }, // (Offset,Value)-Pair #2 + { 0x06, 0x0C }, // (Offset,Value)-Pair #3 + + // XapiBootDash+0x09 : mov eax, ds:0x10118 + { 0x09, 0xA1 }, // (Offset,Value)-Pair #4 + { 0x0A, 0x18 }, // (Offset,Value)-Pair #5 + { 0x0B, 0x01 }, // (Offset,Value)-Pair #6 + { 0x0C, 0x01 }, // (Offset,Value)-Pair #7 + + // XapiBootDash+0x25 : repe stosd + { 0x25, 0xF3 }, // (Offset,Value)-Pair #8 + { 0x26, 0xAB }, // (Offset,Value)-Pair #9 + + // XapiBootDash+0x59 : retn 0x0C + { 0x59, 0xC2 }, // (Offset,Value)-Pair #10 + { 0x5A, 0x0C }, // (Offset,Value)-Pair #11 + } +}; + +// ****************************************************************** +// * __rtinit +// ****************************************************************** +SOOVPA<8> __rtinit_1_0_3911 = +{ + 0, // Large == 0 + 8, // Count == 8 + + { + // __rtinit+0x02 : mov eax, abs + { 0x02, 0xB8 }, // (Offset,Value)-Pair #1 + + // __rtinit+0x07 : mov edi, abs + { 0x07, 0xBF }, // (Offset,Value)-Pair #2 + + // __rtinit+0x18 : cmp eax, -1 + { 0x18, 0x83 }, // (Offset,Value)-Pair #3 + { 0x19, 0xF8 }, // (Offset,Value)-Pair #4 + { 0x1A, 0xFF }, // (Offset,Value)-Pair #5 + + // __rtinit+0x22 : cmp esi, edi + { 0x22, 0x3B }, // (Offset,Value)-Pair #6 + { 0x23, 0xF7 }, // (Offset,Value)-Pair #7 + + // __rtinit+0x28 : retn + { 0x28, 0xC3 }, // (Offset,Value)-Pair #8 + } +}; + +// ****************************************************************** +// * __cinit +// ****************************************************************** +SOOVPA<9> __cinit_1_0_3911 = +{ + 0, // Large == 0 + 9, // Count == 9 + + { + // __cinit+0x09 : call eax + { 0x09, 0xFF }, // (Offset,Value)-Pair #1 + { 0x0A, 0xD0 }, // (Offset,Value)-Pair #2 + + // __cinit+0x1B : jnb +0x14 + { 0x1B, 0x73 }, // (Offset,Value)-Pair #3 + { 0x1C, 0x14 }, // (Offset,Value)-Pair #4 + + // __cinit+0x4A : jz +0x02 + { 0x4A, 0x74 }, // (Offset,Value)-Pair #5 + { 0x4B, 0x02 }, // (Offset,Value)-Pair #6 + + // __cinit+0x4C : call eax + { 0x4C, 0xFF }, // (Offset,Value)-Pair #7 + { 0x4D, 0xD0 }, // (Offset,Value)-Pair #8 + + // __cinit+0x57 : retn + { 0x57, 0xC3 }, // (Offset,Value)-Pair #9 + } +}; + +// ****************************************************************** +// * XAPI_1_0_3911 +// ****************************************************************** +OOVPATable XAPI_1_0_3911[] = +{ + // CreateThread + { + (OOVPA*)&CreateThread_1_0_3911, + + xboxkrnl::EmuXCreateThread, + + #ifdef _DEBUG_TRACE + "EmuXCreateThread" + #endif + }, + // XapiInitProcess + { + (OOVPA*)&XapiInitProcess_1_0_3911, + + xboxkrnl::EmuXapiInitProcess, + + #ifdef _DEBUG_TRACE + "EmuXapiInitProcess" + #endif + }, + // XapiBootToDash + { + (OOVPA*)&XapiBootDash_1_0_3911, + + xboxkrnl::EmuXapiBootDash, + + #ifdef _DEBUG_TRACE + "EmuXapiBootDash" + #endif + }, + // __rtinit + { + (OOVPA*)&__rtinit_1_0_3911, + + xboxkrnl::EmuX__rtinit, + + #ifdef _DEBUG_TRACE + "EmuX__rtinit", + #endif + }, + // __cinit + { + (OOVPA*)&__cinit_1_0_3911, + + xboxkrnl::EmuX__cinit, + + #ifdef _DEBUG_TRACE + "EmuX__cinit", + #endif + }, +}; + +// ****************************************************************** +// * XAPI_1_0_3911_SIZE +// ****************************************************************** +uint32 XAPI_1_0_3911_SIZE = sizeof(XAPI_1_0_3911); diff --git a/Source/Win32/CxbxKrnl/Xapi.1.0.4361.inl b/Source/Win32/CxbxKrnl/Xapi.1.0.4361.inl index 3cb2be1c1..8696ffc5f 100644 --- a/Source/Win32/CxbxKrnl/Xapi.1.0.4361.inl +++ b/Source/Win32/CxbxKrnl/Xapi.1.0.4361.inl @@ -221,7 +221,7 @@ SOOVPA<8> CreateThread_1_0_4361 = { 0x1D, 0xE1 }, // (Offset,Value)-Pair #5 { 0x1E, 0x01 }, // (Offset,Value)-Pair #6 - // CreateThread+0x6B : retn 4 + // CreateThread+0x6B : retn 0x18 { 0x6B, 0xC2 }, // (Offset,Value)-Pair #7 { 0x6C, 0x18 } // (Offset,Value)-Pair #8 } @@ -273,97 +273,12 @@ SOOVPA<7> XapiInitProcess_1_0_4361 = { 0x10, 0x0C }, // (Offset,Value)-Pair #3 // XapiInitProcess+0x17 : repe stosd - { 0x17, 0xF3 }, // (Offset,Value)-Pair #2 - { 0x18, 0xAB }, // (Offset,Value)-Pair #3 + { 0x17, 0xF3 }, // (Offset,Value)-Pair #4 + { 0x18, 0xAB }, // (Offset,Value)-Pair #5 // XapiInitProcess+0x42 : jnz +0x0B - { 0x42, 0x75 }, // (Offset,Value)-Pair #2 - { 0x43, 0x0B }, // (Offset,Value)-Pair #3 - } -}; - -// ****************************************************************** -// * XapiBootDash -// ****************************************************************** -SOOVPA<9> XapiBootDash_1_0_4361 = -{ - 0, // Large == 0 - 9, // Count == 9 - - { - // XapiBootDash+0x03 : sub esp, 0x0C00 - { 0x03, 0x81 }, // (Offset,Value)-Pair #1 - { 0x04, 0xEC }, // (Offset,Value)-Pair #2 - { 0x06, 0x0C }, // (Offset,Value)-Pair #3 - - // XapiBootDash+0x09 : mov eax, ds:0x10118 - { 0x09, 0xA1 }, // (Offset,Value)-Pair #4 - { 0x0A, 0x18 }, // (Offset,Value)-Pair #5 - { 0x0B, 0x01 }, // (Offset,Value)-Pair #6 - { 0x0C, 0x01 }, // (Offset,Value)-Pair #7 - - // XapiBootDash+0x25 : repe stosd - { 0x25, 0xF3 }, // (Offset,Value)-Pair #8 - { 0x26, 0xAB }, // (Offset,Value)-Pair #9 - } -}; - -// ****************************************************************** -// * __rtinit -// ****************************************************************** -SOOVPA<8> __rtinit_1_0_4361 = -{ - 0, // Large == 0 - 8, // Count == 8 - - { - // __rtinit+0x02 : mov eax, abs - { 0x02, 0xB8 }, // (Offset,Value)-Pair #1 - - // __rtinit+0x07 : mov edi, abs - { 0x07, 0xBF }, // (Offset,Value)-Pair #2 - - // __rtinit+0x18 : cmp eax, -1 - { 0x18, 0x83 }, // (Offset,Value)-Pair #3 - { 0x19, 0xF8 }, // (Offset,Value)-Pair #4 - { 0x1A, 0xFF }, // (Offset,Value)-Pair #5 - - // __rtinit+0x22 : cmp esi, edi - { 0x22, 0x3B }, // (Offset,Value)-Pair #6 - { 0x23, 0xF7 }, // (Offset,Value)-Pair #7 - - // __rtinit+0x28 : retn - { 0x28, 0xC3 }, // (Offset,Value)-Pair #8 - } -}; - -// ****************************************************************** -// * __cinit -// ****************************************************************** -SOOVPA<9> __cinit_1_0_4361 = -{ - 0, // Large == 0 - 9, // Count == 9 - - { - // __cinit+0x09 : call eax - { 0x09, 0xFF }, // (Offset,Value)-Pair #1 - { 0x0A, 0xD0 }, // (Offset,Value)-Pair #2 - - // __cinit+0x1B : jnb +0x14 - { 0x1B, 0x73 }, // (Offset,Value)-Pair #3 - { 0x1C, 0x14 }, // (Offset,Value)-Pair #4 - - // __cinit+0x4A : jz +0x02 - { 0x4A, 0x74 }, // (Offset,Value)-Pair #5 - { 0x4B, 0x02 }, // (Offset,Value)-Pair #6 - - // __cinit+0x4C : call eax - { 0x4C, 0xFF }, // (Offset,Value)-Pair #7 - { 0x4D, 0xD0 }, // (Offset,Value)-Pair #8 - - // __cinit+0x57 : retn - { 0x57, 0xC3 }, // (Offset,Value)-Pair #9 + { 0x42, 0x75 }, // (Offset,Value)-Pair #6 + { 0x43, 0x0B }, // (Offset,Value)-Pair #7 } }; @@ -452,9 +367,9 @@ OOVPATable XAPI_1_0_4361[] = "EmuXapiInitProcess" #endif }, - // XapiBootToDash + // XapiBootToDash (* unchanged since 1.0.3911 *) { - (OOVPA*)&XapiBootDash_1_0_4361, + (OOVPA*)&XapiBootDash_1_0_3911, xboxkrnl::EmuXapiBootDash, @@ -462,9 +377,9 @@ OOVPATable XAPI_1_0_4361[] = "EmuXapiBootDash" #endif }, - // __rtinit + // __rtinit (* unchanged since 1.0.3911 *) { - (OOVPA*)&__rtinit_1_0_4361, + (OOVPA*)&__rtinit_1_0_3911, xboxkrnl::EmuX__rtinit, @@ -472,9 +387,9 @@ OOVPATable XAPI_1_0_4361[] = "EmuX__rtinit", #endif }, - // __cinit + // __cinit (* unchanged since 1.0.3911 *) { - (OOVPA*)&__cinit_1_0_4361, + (OOVPA*)&__cinit_1_0_3911, xboxkrnl::EmuX__cinit, diff --git a/Source/Win32/CxbxKrnl/Xapi.1.0.4627.inl b/Source/Win32/CxbxKrnl/Xapi.1.0.4627.inl index 5e2df6873..82cf42eea 100644 --- a/Source/Win32/CxbxKrnl/Xapi.1.0.4627.inl +++ b/Source/Win32/CxbxKrnl/Xapi.1.0.4627.inl @@ -77,7 +77,7 @@ OOVPATable XAPI_1_0_4627[] = "EmuXXInputGetCapabilities" #endif }, - // XInputGetState + // XInputGetState (* unchanged since 1.0.4361 *) { (OOVPA*)&XInputGetState_1_0_4361, @@ -117,9 +117,9 @@ OOVPATable XAPI_1_0_4627[] = "EmuXapiInitProcess" #endif }, - // XapiBootToDash (* unchanged since 1.0.4361 *) + // XapiBootToDash (* unchanged since 1.0.3911 *) { - (OOVPA*)&XapiBootDash_1_0_4361, + (OOVPA*)&XapiBootDash_1_0_3911, xboxkrnl::EmuXapiBootDash, @@ -127,9 +127,9 @@ OOVPATable XAPI_1_0_4627[] = "EmuXapiBootDash" #endif }, - // __rtinit (* unchanged since 1.0.4361 *) + // __rtinit (* unchanged since 1.0.3911 *) { - (OOVPA*)&__rtinit_1_0_4361, + (OOVPA*)&__rtinit_1_0_3911, xboxkrnl::EmuX__rtinit, @@ -137,9 +137,9 @@ OOVPATable XAPI_1_0_4627[] = "EmuX__rtinit", #endif }, - // __cinit (* unchanged since 1.0.4361 *) + // __cinit (* unchanged since 1.0.3911 *) { - (OOVPA*)&__cinit_1_0_4361, + (OOVPA*)&__cinit_1_0_3911, xboxkrnl::EmuX__cinit,