From 36a7306b1769626e9bd7fec85b3de7bb84c592b9 Mon Sep 17 00:00:00 2001 From: jarupxx Date: Wed, 20 Dec 2017 21:24:37 +0900 Subject: [PATCH] Replace TAB to 4 spaces --- src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl | 93 ++--- src/CxbxKrnl/HLEDataBase/D3D8.1.0.3948.inl | 6 +- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl | 188 +++++----- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl | 72 ++-- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl | 58 +-- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl | 206 +++++------ src/CxbxKrnl/HLEDataBase/D3D8.1.0.4831.inl | 62 ++-- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl | 104 +++--- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl | 76 ++-- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl | 128 +++---- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl | 6 +- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl | 114 +++--- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5659.inl | 54 +-- src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl | 48 +-- src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl | 20 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl | 45 +-- src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl | 2 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl | 2 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl | 28 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.4721.inl | 4 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.4831.inl | 2 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl | 2 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl | 2 +- src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl | 2 +- src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl | 64 ++-- src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl | 28 +- src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl | 336 +++++++++--------- src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl | 48 +-- 28 files changed, 901 insertions(+), 899 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl index ef5ecd771..b0b071dc3 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl @@ -71,7 +71,7 @@ OOVPA_XREF(D3DDevice_GetTexture2, 3911, 1+23, // Also for 3948, ?4361? XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x0E, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived + XREF_ENTRY( 0x0E, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived #endif { 0x00, 0x8B }, { 0x01, 0x44 }, @@ -112,7 +112,7 @@ OOVPA_XREF(D3DDevice_SetTexture, 3911, 1+28, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x11, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived + XREF_ENTRY( 0x11, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived #endif { 0x00, 0x51 }, { 0x01, 0x53 }, @@ -222,6 +222,7 @@ OOVPA_END; // ****************************************************************** // Based on Dxbx patterns for 3911, 4361, 4627, 5344, 5558, 5659, 5788, 5849, 5933 OOVPA_NO_XREF(D3DDevice_CreateVertexShader, 3911, 38) + // IDirect3DDevice8_CreateVertexShader+0x00 : push ecx; push ebx; push ebp { 0x00, 0x51 }, { 0x01, 0x53 }, @@ -330,10 +331,10 @@ OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface, 3911, 18) #else OOVPA_XREF(D3DDevice_GetDepthStencilSurface, 3911, 1 + 18, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x07, XREF_OFFSET_D3DDEVICE_M_DEPTHSTENCIL ), // Derived + XREF_ENTRY( 0x07, XREF_OFFSET_D3DDEVICE_M_DEPTHSTENCIL ), // Derived #endif { 0x00, 0xA1 }, @@ -410,8 +411,8 @@ OOVPA_XREF(D3DDevice_LightEnable, 3911, 2+24,// valid upto at least 4627, next k XRefNoSaveIndex, XRefTwo) - XREF_ENTRY( 0x0B, XREF_D3DDEVICE ), // Derived - XREF_ENTRY( 0x67, XREF_D3DDevice_SetLight ), + XREF_ENTRY( 0x0B, XREF_D3DDEVICE ), // Derived + XREF_ENTRY( 0x67, XREF_D3DDevice_SetLight ), { 0x00, 0x83 }, { 0x01, 0xEC }, @@ -1349,10 +1350,10 @@ OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 3911, 11) #else OOVPA_XREF(D3DDevice_SetRenderTarget, 3911, 1+11, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x17, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived + XREF_ENTRY( 0x17, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived #endif // D3DDevice_SetRenderTarget+0x00 : sub esp, 0x20 { 0x00, 0x83 }, @@ -1442,10 +1443,10 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(D3DDevice_SetStreamSource, 3911, 1+12, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x23, XREF_G_STREAM ), // Derived + XREF_ENTRY( 0x23, XREF_G_STREAM ), // Derived // D3DDevice_SetStreamSource+0x39 : add edx, 0xFFF80000 { 0x39, 0x81 }, @@ -1527,10 +1528,10 @@ OOVPA_NO_XREF(D3DDevice_SetPixelShader, 3911, 10) #else OOVPA_XREF(D3DDevice_SetPixelShader, 3911, 1+10, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x10, XREF_OFFSET_D3DDEVICE_M_PIXELSHADER ), // Derived + XREF_ENTRY( 0x10, XREF_OFFSET_D3DDEVICE_M_PIXELSHADER ), // Derived #endif // D3DDevice_SetPixelShader+0x0E : mov esi, [ebx+0x0414] { 0x0E, 0x8B }, @@ -1839,10 +1840,10 @@ OOVPA_NO_XREF(D3DDevice_SetPalette, 3911, 12) #else OOVPA_XREF(D3DDevice_SetPalette, 3911, 1+12, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x10, XREF_OFFSET_D3DDEVICE_M_PALETTES ), // Derived verified on 3911 + XREF_ENTRY( 0x10, XREF_OFFSET_D3DDEVICE_M_PALETTES ), // Derived verified on 3911 #endif // D3DDevice_SetPalette+0x0D : mov eax, [edi+esi*4+0x0BB0] { 0x0D, 0x8B }, @@ -2412,17 +2413,17 @@ OOVPA_END; #ifndef WIP_LessVertexPatching OOVPA_XREF(D3DDevice_GetRenderTarget, 3911, 1+19, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) #else OOVPA_XREF(D3DDevice_GetRenderTarget, 3911, 2+19, - XRefNoSaveIndex, - XRefTwo) + XRefNoSaveIndex, + XRefTwo) - XREF_ENTRY( 0x07, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived + XREF_ENTRY( 0x07, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived #endif - XREF_ENTRY( 0x17, XREF_D3DResource_AddRef ), + XREF_ENTRY( 0x17, XREF_D3DResource_AddRef ), // D3DDevice_GetRenderTarget+0x00 : mov eax, {ds:addr} { 0x00, 0xA1 }, @@ -2431,34 +2432,34 @@ OOVPA_XREF(D3DDevice_GetRenderTarget, 3911, 2+19, { 0x05, 0x8B }, { 0x06, 0x80 }, // { 0x07, 0x0C }, // disabled. part of an offset - // { 0x08, 0x04 }, - { 0x09, 0x00 }, - { 0x0A, 0x00 }, + // { 0x08, 0x04 }, + { 0x09, 0x00 }, + { 0x0A, 0x00 }, - // D3DDevice_GetRenderTarget+0x0b : test eax, eax - { 0x0B, 0x85 }, - { 0x0C, 0xC0 }, + // D3DDevice_GetRenderTarget+0x0b : test eax, eax + { 0x0B, 0x85 }, + { 0x0C, 0xC0 }, + + // D3DDevice_GetRenderTarget+0x0d : mov ecx, [esp+4] + { 0x0D, 0x8B }, + { 0x0E, 0x4C }, + { 0x0F, 0x24 }, + { 0x10, 0x04 }, - // D3DDevice_GetRenderTarget+0x0d : mov ecx, [esp+4] - { 0x0D, 0x8B }, - { 0x0E, 0x4C }, - { 0x0F, 0x24 }, - { 0x10, 0x04 }, - // D3DDevice_GetRenderTarget+0x11 : mov [ecx], eax { 0x11, 0x89 }, { 0x12, 0x01 }, - // D3DDevice_GetRenderTarget+0x13 : jz +0x06 - { 0x13, 0x74 }, - { 0x14, 0x06 }, + // D3DDevice_GetRenderTarget+0x13 : jz +0x06 + { 0x13, 0x74 }, + { 0x14, 0x06 }, - // D3DDevice_GetRenderTarget+0x15 : push eax - { 0x15, 0x50 }, + // D3DDevice_GetRenderTarget+0x15 : push eax + { 0x15, 0x50 }, + + // D3DDevice_GetRenderTarget+0x16 : call {addr} + { 0x16, 0xE8 }, - // D3DDevice_GetRenderTarget+0x16 : call {addr} - { 0x16, 0xE8 }, - // D3DDevice_GetRenderTarget+0x1D : retn 0x04 { 0x1D, 0xC2 }, { 0x1E, 0x04 }, @@ -4719,7 +4720,7 @@ OOVPA_XREF(D3DDevice_KickPushBuffer, 3911, 1+3, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x07, XREF_D3D_CDevice_KickOff ), + XREF_ENTRY( 0x07, XREF_D3D_CDevice_KickOff ), { 0x00, 0x8B }, { 0x01, 0x0D }, diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3948.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3948.inl index 1289d5eea..fe347bcbe 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3948.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3948.inl @@ -40,10 +40,10 @@ OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 3948, 8) #else OOVPA_XREF(D3DDevice_SetRenderTarget, 3948, 1+8, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x17, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived TODO : Verify offset + XREF_ENTRY( 0x17, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived TODO : Verify offset #endif // D3DDevice_SetRenderTarget+0x00 : sub esp, 0x30 { 0x00, 0x83 }, diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl index 4057bf410..3b350c3be 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl @@ -70,38 +70,38 @@ OOVPA_END; // ****************************************************************** OOVPA_NO_XREF(CMiniport_CreateCtxDmaObject, 4034, 32) // Also for 4361, 4627, 5344, 5558, 5659, 5788, 5849, 5933 - { 0x00, 0x55 }, - { 0x01, 0x8B }, - { 0x02, 0xEC }, - { 0x03, 0x51 }, - { 0x04, 0x51 }, - { 0x05, 0x53 }, - { 0x06, 0x56 }, - { 0x07, 0x57 }, - { 0x08, 0x33 }, - { 0x09, 0xC0 }, - { 0x0A, 0x50 }, - { 0x0B, 0x89 }, - { 0x0C, 0x45 }, - { 0x0D, 0xF8 }, - { 0x0E, 0x89 }, - { 0x0F, 0x45 }, - { 0x10, 0xFC }, - { 0x11, 0x8D }, - { 0x12, 0x45 }, - { 0x13, 0xFC }, - { 0x14, 0x50 }, - { 0x15, 0x8D }, - { 0x16, 0x45 }, - { 0x17, 0xF8 }, - { 0x18, 0x50 }, - { 0x19, 0xFF }, - { 0x1A, 0x75 }, - { 0x1B, 0x10 }, - { 0x1C, 0x8B }, - { 0x1D, 0xD1 }, - { 0x1E, 0x8B }, - { 0x1F, 0x3A }, + { 0x00, 0x55 }, + { 0x01, 0x8B }, + { 0x02, 0xEC }, + { 0x03, 0x51 }, + { 0x04, 0x51 }, + { 0x05, 0x53 }, + { 0x06, 0x56 }, + { 0x07, 0x57 }, + { 0x08, 0x33 }, + { 0x09, 0xC0 }, + { 0x0A, 0x50 }, + { 0x0B, 0x89 }, + { 0x0C, 0x45 }, + { 0x0D, 0xF8 }, + { 0x0E, 0x89 }, + { 0x0F, 0x45 }, + { 0x10, 0xFC }, + { 0x11, 0x8D }, + { 0x12, 0x45 }, + { 0x13, 0xFC }, + { 0x14, 0x50 }, + { 0x15, 0x8D }, + { 0x16, 0x45 }, + { 0x17, 0xF8 }, + { 0x18, 0x50 }, + { 0x19, 0xFF }, + { 0x1A, 0x75 }, + { 0x1B, 0x10 }, + { 0x1C, 0x8B }, + { 0x1D, 0xD1 }, + { 0x1E, 0x8B }, + { 0x1F, 0x3A }, OOVPA_END; // ****************************************************************** @@ -161,11 +161,11 @@ OOVPA_END; OOVPA_XREF(D3DDevice_SetRenderState_CullMode, 4034, 2+14, XREF_D3DDevice_SetRenderState_CullMode, - XRefTwo) + XRefTwo) - XREF_ENTRY( 0x03, XREF_D3DDEVICE ), // Derived + XREF_ENTRY( 0x03, XREF_D3DDEVICE ), // Derived - XREF_ENTRY( 0x2B, XREF_D3DRS_CULLMODE ), // Derived + XREF_ENTRY( 0x2B, XREF_D3DRS_CULLMODE ), // Derived // D3DDevice_SetRenderState_CullMode+0x00 : push esi { 0x00, 0x56 }, @@ -251,10 +251,10 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(D3DDevice_SetStreamSource, 4034, 1+14, // 1+28 - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x22, XREF_G_STREAM ), // Derived + XREF_ENTRY( 0x22, XREF_G_STREAM ), // Derived // D3DDevice_SetStreamSource+0x08 : mov edi, [esp+8+0x04] { 0x08, 0x8B }, @@ -735,10 +735,10 @@ OOVPA_NO_XREF(D3DDevice_SetTexture, 4034, 10) // TODO : Alias 3911 instead ? #else OOVPA_XREF(D3DDevice_SetTexture, 4034, 1+10, // TODO : Alias 3911 instead ? - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x13, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived - verified for 4432 DolphinClassic 0x00021D10(SetTexture)+0x10=00021D20 : 8B 84 B7 78 0A 00 00 mov eax,[edi+esi*4+$00000A78] + XREF_ENTRY( 0x13, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived - verified for 4432 DolphinClassic 0x00021D10(SetTexture)+0x10=00021D20 : 8B 84 B7 78 0A 00 00 mov eax,[edi+esi*4+$00000A78] #endif // D3DDevice_SetTexture+0x09 : push edi { 0x09, 0x57 }, @@ -769,10 +769,10 @@ OOVPA_NO_XREF(D3DDevice_SetPalette, 4034, 12) #else OOVPA_XREF(D3DDevice_SetPalette, 4034, 1+12, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x10, XREF_OFFSET_D3DDEVICE_M_PALETTES ), // Derived + XREF_ENTRY( 0x10, XREF_OFFSET_D3DDEVICE_M_PALETTES ), // Derived #endif { 0x00, 0x53 }, { 0x08, 0x57 }, @@ -793,11 +793,11 @@ OOVPA_END; // * D3DDevice_SetTextureState_TexCoordIndex // ****************************************************************** OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4034, 1+10, - - XRefNoSaveIndex, - XRefOne) - XREF_ENTRY( 0x18, XREF_D3DTSS_TEXCOORDINDEX ), // Derived + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x18, XREF_D3DTSS_TEXCOORDINDEX ), // Derived // D3DDevice_SetTextureState_TexCoordIndex+0x13 : shl eax, 0x07 { 0x13, 0xC1 }, @@ -1100,10 +1100,10 @@ OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 4039, 9) #else OOVPA_XREF(D3DDevice_SetRenderTarget, 4039, 1+9, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x17, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived TODO : Verify offset + XREF_ENTRY( 0x17, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived TODO : Verify offset #endif { 0x06, 0x35 }, { 0x12, 0x3B }, @@ -1124,10 +1124,10 @@ OOVPA_NO_XREF(D3DDevice_SetPixelShader, 4034, 12) #else OOVPA_XREF(D3DDevice_SetPixelShader, 4034, 1+12, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x10, XREF_OFFSET_D3DDEVICE_M_PIXELSHADER ), // Derived + XREF_ENTRY( 0x10, XREF_OFFSET_D3DDEVICE_M_PIXELSHADER ), // Derived #endif { 0x00, 0x8B }, { 0x01, 0x44 }, @@ -1266,13 +1266,13 @@ OOVPA_NO_XREF(D3DDevice_SetVertexData4f, 4039, 11) { 0x1F, 0x00 }, { 0x56, 0xC2 }, /* - { 0x0A, 0x46 }, - { 0x16, 0x08 }, - { 0x22, 0x09 }, - { 0x2E, 0x24 }, - { 0x3A, 0x24 }, - { 0x46, 0x8B }, - { 0x52, 0x14 },*/ + { 0x0A, 0x46 }, + { 0x16, 0x08 }, + { 0x22, 0x09 }, + { 0x2E, 0x24 }, + { 0x3A, 0x24 }, + { 0x46, 0x8B }, + { 0x52, 0x14 },*/ OOVPA_END; // ****************************************************************** @@ -1374,16 +1374,16 @@ OOVPA_END; // ****************************************************************** OOVPA_NO_XREF(D3DDevice_SetRenderState_PSTextureModes, 4034, 10) - { 0x0A, 0x89 }, - { 0x0B, 0x81 }, - { 0x0E, 0x00 }, - { 0x0F, 0x00 }, - { 0x10, 0x81 }, - { 0x11, 0x0D }, - { 0x16, 0x00 }, - { 0x17, 0x40 }, - { 0x1A, 0xA3 }, - { 0x1F, 0xC2 }, + { 0x0A, 0x89 }, + { 0x0B, 0x81 }, + { 0x0E, 0x00 }, + { 0x0F, 0x00 }, + { 0x10, 0x81 }, + { 0x11, 0x0D }, + { 0x16, 0x00 }, + { 0x17, 0x40 }, + { 0x1A, 0xA3 }, + { 0x1F, 0xC2 }, OOVPA_END; // ****************************************************************** @@ -1439,10 +1439,10 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMode, 4034, 12) #else OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleMode, 4034, 1+8, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x11, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived + XREF_ENTRY( 0x11, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived #endif // D3DDevice_SetRenderState_MultiSampleMode+0x0F : mov ecx, [eax+0x21F0] { 0x0F, 0x8B }, @@ -1475,18 +1475,18 @@ OOVPA_END; #ifndef WIP_LessVertexPatching OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4034, 1+8, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) #else OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4034, 2+8, - XRefNoSaveIndex, - XRefTwo) + XRefNoSaveIndex, + XRefTwo) #endif - XREF_ENTRY( 0x0B, XREF_D3DRS_MULTISAMPLERENDERTARGETMODE ), // Derived + XREF_ENTRY( 0x0B, XREF_D3DRS_MULTISAMPLERENDERTARGETMODE ), // Derived #ifdef WIP_LessVertexPatching - XREF_ENTRY( 0x11, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived + XREF_ENTRY( 0x11, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived #endif // D3DDevice_SetRenderState_MultiSampleRenderTargetMode+0x0F : mov ecx, [eax+0x21F0] @@ -1941,16 +1941,16 @@ OOVPA_END; // ****************************************************************** OOVPA_NO_XREF(D3DDevice_SetScreenSpaceOffset, 4034, 11) // Up to 5344 - { 0x06, 0x56 }, - { 0x07, 0xD8 }, - { 0x08, 0x44 }, - { 0x09, 0x24 }, - { 0x0A, 0x08 }, + { 0x06, 0x56 }, + { 0x07, 0xD8 }, + { 0x08, 0x44 }, + { 0x09, 0x24 }, + { 0x0A, 0x08 }, { 0x0B, 0x8B }, { 0x0C, 0x35 }, - { 0x2E, 0x8B }, - { 0x2F, 0x06 }, + { 0x2E, 0x8B }, + { 0x2F, 0x06 }, { 0x46, 0xC2 }, { 0x47, 0x08 }, OOVPA_END; @@ -1960,13 +1960,13 @@ OOVPA_END; // ****************************************************************** OOVPA_NO_XREF(D3D_LazySetPointParams, 4034, 7) - { 0x00, 0x83 }, - { 0x01, 0xEC }, - { 0x02, 0x14 }, - { 0x4E, 0xE0 }, - { 0x73, 0xF6 }, - { 0x74, 0xC4 }, - { 0x75, 0x41 }, + { 0x00, 0x83 }, + { 0x01, 0xEC }, + { 0x02, 0x14 }, + { 0x4E, 0xE0 }, + { 0x73, 0xF6 }, + { 0x74, 0xC4 }, + { 0x75, 0x41 }, OOVPA_END; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl index fb194994c..0bd758c7f 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl @@ -66,10 +66,10 @@ OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 4134, 9) #else OOVPA_XREF(D3DDevice_SetRenderTarget, 4134, 1+9, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x17, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived TODO : Verify offset + XREF_ENTRY( 0x17, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived TODO : Verify offset #endif // D3DDevice_SetRenderTarget+0x00 : sub esp, 0x3C { 0x00, 0x83 }, @@ -466,38 +466,38 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(D3D_MakeRequestedSpace, 4134, 28, // Also for 4361, 4627 - XREF_D3D_MakeRequestedSpace, - XRefZero) + XREF_D3D_MakeRequestedSpace, + XRefZero) - { 0x00, 0x83 }, - { 0x01, 0xEC }, - { 0x02, 0x08 }, - { 0x03, 0x56 }, - { 0x04, 0x8B }, - { 0x05, 0x35 }, + { 0x00, 0x83 }, + { 0x01, 0xEC }, + { 0x02, 0x08 }, + { 0x03, 0x56 }, + { 0x04, 0x8B }, + { 0x05, 0x35 }, - { 0x0A, 0xF6 }, - { 0x0B, 0x46 }, - { 0x0C, 0x08 }, - { 0x0D, 0x04 }, - { 0x0E, 0x8B }, - { 0x0F, 0x0E }, - { 0x10, 0x57 }, - { 0x11, 0x74 }, - { 0x12, 0x26 }, - { 0x13, 0x8B }, - { 0x14, 0x86 }, - { 0x15, 0x50 }, - { 0x16, 0x03 }, - { 0x17, 0x00 }, - { 0x18, 0x00 }, - { 0x19, 0x8B }, - { 0x1A, 0x78 }, - { 0x1B, 0x04 }, - { 0x1C, 0x8B }, - { 0x1D, 0x96 }, - { 0x1E, 0x54 }, - { 0x1F, 0x03 }, + { 0x0A, 0xF6 }, + { 0x0B, 0x46 }, + { 0x0C, 0x08 }, + { 0x0D, 0x04 }, + { 0x0E, 0x8B }, + { 0x0F, 0x0E }, + { 0x10, 0x57 }, + { 0x11, 0x74 }, + { 0x12, 0x26 }, + { 0x13, 0x8B }, + { 0x14, 0x86 }, + { 0x15, 0x50 }, + { 0x16, 0x03 }, + { 0x17, 0x00 }, + { 0x18, 0x00 }, + { 0x19, 0x8B }, + { 0x1A, 0x78 }, + { 0x1B, 0x04 }, + { 0x1C, 0x8B }, + { 0x1D, 0x96 }, + { 0x1E, 0x54 }, + { 0x1F, 0x03 }, OOVPA_END; // ****************************************************************** @@ -961,10 +961,10 @@ OOVPA_NO_XREF(D3DDevice_GetTexture2, 4134, 23) // Up to 4531 #else OOVPA_XREF(D3DDevice_GetTexture2, 4134, 1+23, // Up to 4531 - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x0E, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived + XREF_ENTRY( 0x0E, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived #endif { 0x00, 0x8B }, { 0x01, 0x44 }, diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl index 6be1574a5..273e9bb56 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl @@ -109,39 +109,39 @@ OOVPA_XREF(D3DDevice_SetTexture, 4361, 1+26, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x13, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived + XREF_ENTRY( 0x13, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived #endif - { 0x00, 0x83 }, - { 0x01, 0xEC }, - { 0x02, 0x08 }, - { 0x03, 0x53 }, - { 0x04, 0x56 }, - { 0x05, 0x8B }, - { 0x06, 0x74 }, - { 0x07, 0x24 }, - { 0x08, 0x14 }, - { 0x09, 0x57 }, - { 0x0A, 0x8B }, - { 0x0B, 0x3D }, + { 0x00, 0x83 }, + { 0x01, 0xEC }, + { 0x02, 0x08 }, + { 0x03, 0x53 }, + { 0x04, 0x56 }, + { 0x05, 0x8B }, + { 0x06, 0x74 }, + { 0x07, 0x24 }, + { 0x08, 0x14 }, + { 0x09, 0x57 }, + { 0x0A, 0x8B }, + { 0x0B, 0x3D }, - { 0x10, 0x8B }, - { 0x11, 0x84 }, - { 0x12, 0xB7 }, + { 0x10, 0x8B }, + { 0x11, 0x84 }, + { 0x12, 0xB7 }, #ifndef WIP_LessVertexPatching - { 0x13, 0x78 }, // disabled. part of an offset - { 0x14, 0x0A }, + { 0x13, 0x78 }, // disabled. part of an offset + { 0x14, 0x0A }, #endif - { 0x15, 0x00 }, - { 0x16, 0x00 }, - { 0x17, 0x85 }, - { 0x18, 0xC0 }, - { 0x19, 0x89 }, - { 0x1A, 0x7C }, - { 0x1B, 0x24 }, - { 0x1C, 0x0C }, - { 0x1D, 0x89 }, - { 0x1E, 0x44 }, - { 0x1F, 0x24 }, + { 0x15, 0x00 }, + { 0x16, 0x00 }, + { 0x17, 0x85 }, + { 0x18, 0xC0 }, + { 0x19, 0x89 }, + { 0x1A, 0x7C }, + { 0x1B, 0x24 }, + { 0x1C, 0x0C }, + { 0x1D, 0x89 }, + { 0x1E, 0x44 }, + { 0x1F, 0x24 }, OOVPA_END; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl index 100e49639..7eb86ee9d 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl @@ -181,9 +181,9 @@ OOVPA_NO_XREF(D3D_CommonSetRenderTarget, 4627, 12) OOVPA_XREF(D3D_CommonSetRenderTarget, 4627, 1+12, XREF_D3D_CommonSetRenderTarget, - XRefOne) + XRefOne) - XREF_ENTRY( 0x18, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived + XREF_ENTRY( 0x18, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived #endif // D3D_CommonSetRenderTarget+0x00 : sub esp, 0x20 { 0x00, 0x83 }, @@ -217,9 +217,9 @@ OOVPA_XREF(D3D_CommonSetRenderTargetB, 4627, 11, OOVPA_XREF(D3D_CommonSetRenderTargetB, 4627, 1+11, XREF_D3D_CommonSetRenderTarget, - XRefOne) + XRefOne) - XREF_ENTRY( 0x18, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived TODO : Verify offset + XREF_ENTRY( 0x18, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived TODO : Verify offset #endif // D3D_CommonSetRenderTargetB+0x00 : sub esp, 0x24 { 0x00, 0x83 }, @@ -403,25 +403,25 @@ OOVPA_XREF(D3DDevice_GetRenderTarget, 4627, 1+12, XREF_ENTRY( 0x01, XREF_D3DDevice_GetRenderTarget2 ), - // D3DDevice_GetRenderTarget+0x00 : call addr - { 0x00, 0xE8 }, + // D3DDevice_GetRenderTarget+0x00 : call addr + { 0x00, 0xE8 }, - // D3DDevice_GetRenderTarget+0x05 : mov ecx, [esp + 0x04] - { 0x05, 0x8B }, + // D3DDevice_GetRenderTarget+0x05 : mov ecx, [esp + 0x04] + { 0x05, 0x8B }, { 0x06, 0x4C }, { 0x07, 0x24 }, { 0x08, 0x04 }, - // D3DDevice_GetRenderTarget+0x09 : mov [ecx], eax - { 0x09, 0x89 }, + // D3DDevice_GetRenderTarget+0x09 : mov [ecx], eax + { 0x09, 0x89 }, { 0x0A, 0x01 }, - // D3DDevice_GetRenderTarget+0x0B : xor eax, eax - { 0x0B, 0x33 }, + // D3DDevice_GetRenderTarget+0x0B : xor eax, eax + { 0x0B, 0x33 }, { 0x0C, 0xC0 }, - // D3DDevice_GetRenderTarget+0x0D : ret 0x0004 - { 0x0D, 0xC2 }, + // D3DDevice_GetRenderTarget+0x0D : ret 0x0004 + { 0x0D, 0xC2 }, { 0x0E, 0x04 }, { 0x0F, 0x00 }, @@ -433,17 +433,17 @@ OOVPA_END; #ifndef WIP_LessVertexPatching OOVPA_XREF(D3DDevice_GetRenderTarget2, 4627, 2+8, - XREF_D3DDevice_GetRenderTarget2, - XRefTwo) + XREF_D3DDevice_GetRenderTarget2, + XRefTwo) #else OOVPA_XREF(D3DDevice_GetRenderTarget2, 4627, 3+8, - XREF_D3DDevice_GetRenderTarget2, - XRefThree) + XREF_D3DDevice_GetRenderTarget2, + XRefThree) #endif - XREF_ENTRY( 0x01, XREF_D3DDEVICE ), // Derived + XREF_ENTRY( 0x01, XREF_D3DDEVICE ), // Derived #ifdef WIP_LessVertexPatching - XREF_ENTRY( 0x08, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived + XREF_ENTRY( 0x08, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived #endif XREF_ENTRY( 0x12, XREF_D3DResource_AddRef ), @@ -501,10 +501,10 @@ OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface2, 4627, 20) #else OOVPA_XREF(D3DDevice_GetDepthStencilSurface2, 4627, 1+20, - XREF_D3DDevice_GetDepthStencilSurface2, - XRefOne) + XREF_D3DDevice_GetDepthStencilSurface2, + XRefOne) - XREF_ENTRY( 0x08, XREF_OFFSET_D3DDEVICE_M_DEPTHSTENCIL ), // Derived + XREF_ENTRY( 0x08, XREF_OFFSET_D3DDEVICE_M_DEPTHSTENCIL ), // Derived #endif { 0x00, 0xA1 }, @@ -784,10 +784,10 @@ OOVPA_NO_XREF(D3DDevice_SetPixelShader, 4627, 16) #else OOVPA_XREF(D3DDevice_SetPixelShader, 4627, 1+16, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x0A, XREF_OFFSET_D3DDEVICE_M_PIXELSHADER ), // Derived + XREF_ENTRY( 0x0A, XREF_OFFSET_D3DDEVICE_M_PIXELSHADER ), // Derived #endif { 0x03, 0x1D }, @@ -1017,10 +1017,10 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4627, 1+10, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x19, XREF_D3DTSS_TEXCOORDINDEX ), // Derived + XREF_ENTRY( 0x19, XREF_D3DTSS_TEXCOORDINDEX ), // Derived // D3DDevice_SetTextureState_TexCoordIndex+0x14 : shl eax, 0x07 { 0x14, 0xC1 }, @@ -1324,24 +1324,24 @@ OOVPA_END; // ****************************************************************** OOVPA_NO_XREF(CMiniport_IsFlipPending, 4627, 18) // Was D3DDevice_Reset - { 0x00, 0x8B }, - { 0x01, 0x81 }, - { 0x02, 0xBC }, - { 0x03, 0x01 }, - { 0x04, 0x00 }, - { 0x05, 0x00 }, - { 0x06, 0x83 }, - { 0x07, 0xE0 }, - { 0x08, 0x01 }, - { 0x09, 0x83 }, - { 0x0A, 0xC0 }, - { 0x0B, 0x1F }, - { 0x0C, 0x8D }, - { 0x0D, 0x04 }, - { 0x0E, 0x40 }, - { 0x0F, 0x8B }, - { 0x10, 0x04 }, - { 0x11, 0x81 }, + { 0x00, 0x8B }, + { 0x01, 0x81 }, + { 0x02, 0xBC }, + { 0x03, 0x01 }, + { 0x04, 0x00 }, + { 0x05, 0x00 }, + { 0x06, 0x83 }, + { 0x07, 0xE0 }, + { 0x08, 0x01 }, + { 0x09, 0x83 }, + { 0x0A, 0xC0 }, + { 0x0B, 0x1F }, + { 0x0C, 0x8D }, + { 0x0D, 0x04 }, + { 0x0E, 0x40 }, + { 0x0F, 0x8B }, + { 0x10, 0x04 }, + { 0x11, 0x81 }, OOVPA_END; // ****************************************************************** @@ -1392,38 +1392,38 @@ OOVPA_NO_XREF(D3DDevice_GetTexture2, 4627, 23) #else OOVPA_XREF(D3DDevice_GetTexture2, 4627, 1+23, // Up to 5233. Also for 5344, 5558, 5659, 5788, 5849, 5933 - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x0E, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived + XREF_ENTRY( 0x0E, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived #endif - { 0x00, 0x8B }, - { 0x01, 0x44 }, - { 0x02, 0x24 }, - { 0x03, 0x04 }, - { 0x04, 0x8B }, - { 0x05, 0x0D }, + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x04 }, + { 0x04, 0x8B }, + { 0x05, 0x0D }, - { 0x0A, 0x56 }, - { 0x0B, 0x8D }, - { 0x0C, 0xB4 }, - { 0x0D, 0x81 }, - { 0x0E, 0x38 }, // GetTexture2 380B vs GetPalette2 480B - { 0x0F, 0x0B }, + { 0x0A, 0x56 }, + { 0x0B, 0x8D }, + { 0x0C, 0xB4 }, + { 0x0D, 0x81 }, + { 0x0E, 0x38 }, // GetTexture2 380B vs GetPalette2 480B + { 0x0F, 0x0B }, - { 0x10, 0x00 }, - { 0x11, 0x00 }, - { 0x12, 0x8B }, - { 0x13, 0x06 }, - { 0x14, 0x85 }, - { 0x15, 0xC0 }, - { 0x16, 0x74 }, + { 0x10, 0x00 }, + { 0x11, 0x00 }, + { 0x12, 0x8B }, + { 0x13, 0x06 }, + { 0x14, 0x85 }, + { 0x15, 0xC0 }, + { 0x16, 0x74 }, - { 0x18, 0x50 }, - { 0x19, 0xE8 }, + { 0x18, 0x50 }, + { 0x19, 0xE8 }, - { 0x1E, 0x8B }, - { 0x1F, 0x06 }, + { 0x1E, 0x8B }, + { 0x1F, 0x06 }, // { 0x21, 0xC2 }, OOVPA_END; @@ -1432,23 +1432,23 @@ OOVPA_END; // ****************************************************************** OOVPA_NO_XREF(D3DDevice_SetStateVB, 4627, 12) - // D3DDevice_SetStateVB+0x00 : sub esp, 0xC - { 0x00, 0x83 }, - { 0x01, 0xEC }, - { 0x02, 0x0C }, + // D3DDevice_SetStateVB+0x00 : sub esp, 0xC + { 0x00, 0x83 }, + { 0x01, 0xEC }, + { 0x02, 0x0C }, - // D3DDevice_SetStateVB+0x0D : and eax, 0xFFFFFFAF - { 0x0D, 0x83 }, - { 0x0E, 0xE0 }, - { 0x0F, 0xAF }, + // D3DDevice_SetStateVB+0x0D : and eax, 0xFFFFFFAF + { 0x0D, 0x83 }, + { 0x0E, 0xE0 }, + { 0x0F, 0xAF }, - // D3DDevice_SetStateVB+0x10 : test ebx, 0x3FFFFF8F - { 0x10, 0xF7 }, - { 0x11, 0xC3 }, - { 0x12, 0x8F }, - { 0x13, 0xFF }, - { 0x14, 0xFF }, - { 0x15, 0x3F }, + // D3DDevice_SetStateVB+0x10 : test ebx, 0x3FFFFF8F + { 0x10, 0xF7 }, + { 0x11, 0xC3 }, + { 0x12, 0x8F }, + { 0x13, 0xFF }, + { 0x14, 0xFF }, + { 0x15, 0x3F }, OOVPA_END; // ****************************************************************** @@ -1456,22 +1456,22 @@ OOVPA_END; // ****************************************************************** OOVPA_NO_XREF(D3DDevice_SetStateUP, 4627, 11) - // D3DDevice_SetStateUP+0x05 : sub esp, 0x14 - { 0x05, 0x83 }, - { 0x06, 0xEC }, - { 0x07, 0x14 }, + // D3DDevice_SetStateUP+0x05 : sub esp, 0x14 + { 0x05, 0x83 }, + { 0x06, 0xEC }, + { 0x07, 0x14 }, - // D3DDevice_SetStateUP+0x08 : test eax, 0x3FFFFF8F - { 0x08, 0xA9 }, - { 0x09, 0x8F }, - { 0x0A, 0xFF }, - { 0x0B, 0xFF }, - { 0x0C, 0x3F }, + // D3DDevice_SetStateUP+0x08 : test eax, 0x3FFFFF8F + { 0x08, 0xA9 }, + { 0x09, 0x8F }, + { 0x0A, 0xFF }, + { 0x0B, 0xFF }, + { 0x0C, 0x3F }, - // D3DDevice_SetStateUP+0x27 : or eax, 0x50 - { 0x27, 0x83 }, - { 0x28, 0xC8 }, - { 0x29, 0x50 }, + // D3DDevice_SetStateUP+0x27 : or eax, 0x50 + { 0x27, 0x83 }, + { 0x28, 0xC8 }, + { 0x29, 0x50 }, OOVPA_END; // ****************************************************************** @@ -1709,7 +1709,7 @@ OOVPA_XREF(D3DDevice_CreatePalette, 4627, 1+10, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x06, XREF_D3DDevice_CreatePalette2 ), + XREF_ENTRY( 0x06, XREF_D3DDevice_CreatePalette2 ), { 0x00, 0x8B }, { 0x0A, 0x8B }, diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4831.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4831.inl index 216baf318..9480ddd33 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4831.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4831.inl @@ -64,40 +64,40 @@ OOVPA_XREF(D3DDevice_SetTexture, 4831, 1+15, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x13, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived + XREF_ENTRY( 0x13, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived #endif #if 0 // PatrickvL preparations // 1+31, - { 0x00, 0x83 }, - { 0x01, 0xEC }, - { 0x02, 0x08 }, - { 0x03, 0x53 }, - { 0x04, 0x56 }, - { 0x05, 0x8B }, - { 0x06, 0x74 }, - { 0x07, 0x24 }, - { 0x08, 0x14 }, - { 0x09, 0x57 }, - { 0x0A, 0x8B }, - { 0x0B, 0x3D }, // TODO : See if this should be value 0x56? + { 0x00, 0x83 }, + { 0x01, 0xEC }, + { 0x02, 0x08 }, + { 0x03, 0x53 }, + { 0x04, 0x56 }, + { 0x05, 0x8B }, + { 0x06, 0x74 }, + { 0x07, 0x24 }, + { 0x08, 0x14 }, + { 0x09, 0x57 }, + { 0x0A, 0x8B }, + { 0x0B, 0x3D }, // TODO : See if this should be value 0x56? - { 0x10, 0x8B }, - { 0x11, 0x84 }, - { 0x12, 0xB7 }, - // { 0x13, 0x38 }, // disabled. part of an offset - // { 0x14, 0x0B }, - { 0x15, 0x00 }, - { 0x16, 0x00 }, - { 0x17, 0x85 }, - { 0x18, 0xC0 }, - { 0x19, 0x89 }, - { 0x1A, 0x7C }, - { 0x1B, 0x24 }, - { 0x1C, 0x0C }, - { 0x1D, 0x89 }, - { 0x1E, 0x44 }, - { 0x1F, 0x24 }, + { 0x10, 0x8B }, + { 0x11, 0x84 }, + { 0x12, 0xB7 }, + // { 0x13, 0x38 }, // disabled. part of an offset + // { 0x14, 0x0B }, + { 0x15, 0x00 }, + { 0x16, 0x00 }, + { 0x17, 0x85 }, + { 0x18, 0xC0 }, + { 0x19, 0x89 }, + { 0x1A, 0x7C }, + { 0x1B, 0x24 }, + { 0x1C, 0x0C }, + { 0x1D, 0x89 }, + { 0x1E, 0x44 }, + { 0x1F, 0x24 }, #else - { 0x0B, 0x56 }, + { 0x0B, 0x56 }, { 0x21, 0x74 }, { 0x22, 0x20 }, @@ -112,7 +112,7 @@ OOVPA_XREF(D3DDevice_SetTexture, 4831, 1+15, { 0x50, 0x75 }, { 0x51, 0x47 }, #endif - { 0x52, 0x8B }, + { 0x52, 0x8B }, { 0x53, 0x45 }, { 0x54, 0x00 }, { 0x55, 0x3B }, diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl index eb2cb659e..fcd37b842 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl @@ -37,29 +37,29 @@ // ****************************************************************** OOVPA_NO_XREF(Direct3D_CreateDevice, 5028, 20) // Also for 5120, 5233, 5344 (5455 and later use generic 3911 version) - { 0x00, 0x55 }, - { 0x01, 0x8B }, - { 0x02, 0xEC }, - { 0x03, 0xA1 }, + { 0x00, 0x55 }, + { 0x01, 0x8B }, + { 0x02, 0xEC }, + { 0x03, 0xA1 }, - { 0x08, 0x85 }, - { 0x09, 0xC0 }, - { 0x0A, 0x75 }, - { 0x0B, 0x0A }, - { 0x0C, 0xC7 }, - { 0x0D, 0x05 }, + { 0x08, 0x85 }, + { 0x09, 0xC0 }, + { 0x0A, 0x75 }, + { 0x0B, 0x0A }, + { 0x0C, 0xC7 }, + { 0x0D, 0x05 }, - { 0x12, 0x00 }, - { 0x13, 0x00 }, - { 0x14, 0x08 }, - { 0x15, 0x00 }, - { 0x16, 0xA1 }, + { 0x12, 0x00 }, + { 0x13, 0x00 }, + { 0x14, 0x08 }, + { 0x15, 0x00 }, + { 0x16, 0xA1 }, - { 0x1B, 0x85 }, - { 0x1C, 0xC0 }, - { 0x1D, 0x75 }, - { 0x1E, 0x0A }, - { 0x1F, 0xC7 }, + { 0x1B, 0x85 }, + { 0x1C, 0xC0 }, + { 0x1D, 0x75 }, + { 0x1E, 0x0A }, + { 0x1F, 0xC7 }, OOVPA_END; // ****************************************************************** @@ -346,9 +346,9 @@ OOVPA_XREF(D3D_CommonSetRenderTarget, 5028, 12, OOVPA_XREF(D3D_CommonSetRenderTarget, 5028, 1+12, XREF_D3D_CommonSetRenderTarget, - XRefOne) + XRefOne) - XREF_ENTRY( 0x18, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived TODO : Verify offset + XREF_ENTRY( 0x18, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived TODO : Verify offset #endif { 0x02, 0x1C }, { 0x1A, 0x15 }, @@ -578,38 +578,38 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(D3D_MakeRequestedSpace, 5028, 28, // Also for 5344 - XREF_D3D_MakeRequestedSpace, - XRefZero) + XREF_D3D_MakeRequestedSpace, + XRefZero) - { 0x00, 0x83 }, - { 0x01, 0xEC }, - { 0x02, 0x08 }, - { 0x03, 0x56 }, - { 0x04, 0x8B }, - { 0x05, 0x35 }, + { 0x00, 0x83 }, + { 0x01, 0xEC }, + { 0x02, 0x08 }, + { 0x03, 0x56 }, + { 0x04, 0x8B }, + { 0x05, 0x35 }, - { 0x0A, 0xF6 }, - { 0x0B, 0x46 }, - { 0x0C, 0x08 }, - { 0x0D, 0x04 }, - { 0x0E, 0x8B }, - { 0x0F, 0x0E }, - { 0x10, 0x57 }, - { 0x11, 0x74 }, - { 0x12, 0x26 }, - { 0x13, 0x8B }, - { 0x14, 0x86 }, - { 0x15, 0x4C }, - { 0x16, 0x03 }, - { 0x17, 0x00 }, - { 0x18, 0x00 }, - { 0x19, 0x8B }, - { 0x1A, 0x78 }, - { 0x1B, 0x04 }, - { 0x1C, 0x8B }, - { 0x1D, 0x96 }, - { 0x1E, 0x50 }, - { 0x1F, 0x03 }, + { 0x0A, 0xF6 }, + { 0x0B, 0x46 }, + { 0x0C, 0x08 }, + { 0x0D, 0x04 }, + { 0x0E, 0x8B }, + { 0x0F, 0x0E }, + { 0x10, 0x57 }, + { 0x11, 0x74 }, + { 0x12, 0x26 }, + { 0x13, 0x8B }, + { 0x14, 0x86 }, + { 0x15, 0x4C }, + { 0x16, 0x03 }, + { 0x17, 0x00 }, + { 0x18, 0x00 }, + { 0x19, 0x8B }, + { 0x1A, 0x78 }, + { 0x1B, 0x04 }, + { 0x1C, 0x8B }, + { 0x1D, 0x96 }, + { 0x1E, 0x50 }, + { 0x1F, 0x03 }, OOVPA_END; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl index fb1f6349b..f4baab8ae 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl @@ -167,54 +167,54 @@ OOVPA_END; OOVPA_NO_XREF(D3DDevice_SetRenderTargetFast, 5233, 27) #else OOVPA_XREF(D3DDevice_SetRenderTargetFast, 5233, 1+27, - - XRefNoSaveIndex, - XRefOne) - XREF_ENTRY( 0x15, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x15, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived #endif - // D3DDevice_SetRenderTargetFast+0x00 : push ebp - { 0x00, 0x55 }, + // D3DDevice_SetRenderTargetFast+0x00 : push ebp + { 0x00, 0x55 }, - // D3DDevice_SetRenderTargetFast+0x01 : mov ebp, [esp+8] - { 0x01, 0x8B }, - { 0x02, 0x6C }, - { 0x03, 0x24 }, - { 0x04, 0x08 }, + // D3DDevice_SetRenderTargetFast+0x01 : mov ebp, [esp+8] + { 0x01, 0x8B }, + { 0x02, 0x6C }, + { 0x03, 0x24 }, + { 0x04, 0x08 }, - // D3DDevice_SetRenderTargetFast+0x05 : push esi - { 0x05, 0x56 }, + // D3DDevice_SetRenderTargetFast+0x05 : push esi + { 0x05, 0x56 }, - // D3DDevice_SetRenderTargetFast+0x06 : push edi - { 0x06, 0x57 }, + // D3DDevice_SetRenderTargetFast+0x06 : push edi + { 0x06, 0x57 }, - // D3DDevice_SetRenderTargetFast+0x07 : mov edi, [ds:{addr}] - { 0x07, 0x8B }, - { 0x08, 0x3D }, + // D3DDevice_SetRenderTargetFast+0x07 : mov edi, [ds:{addr}] + { 0x07, 0x8B }, + { 0x08, 0x3D }, - // D3DDevice_SetRenderTargetFast+0x0D : push ebp - { 0x0D, 0x55 }, + // D3DDevice_SetRenderTargetFast+0x0D : push ebp + { 0x0D, 0x55 }, - // D3DDevice_SetRenderTargetFast+0x0E : call {addr} - { 0x0E, 0xE8 }, + // D3DDevice_SetRenderTargetFast+0x0E : call {addr} + { 0x0E, 0xE8 }, - // D3DDevice_SetRenderTargetFast+0x13 : mov eax, [edi+{offset}] - { 0x13, 0x8B }, - { 0x14, 0x87 }, - - // D3DDevice_SetRenderTargetFast+0x19 : mov ecx, [eax+0x14] - { 0x19, 0x8B }, - { 0x1A, 0x48 }, - { 0x1B, 0x14 }, - - // D3DDevice_SetRenderTargetFast+0x1C : test ecx, ecx - { 0x1C, 0x85 }, - { 0x1D, 0xC9 }, + // D3DDevice_SetRenderTargetFast+0x13 : mov eax, [edi+{offset}] + { 0x13, 0x8B }, + { 0x14, 0x87 }, + + // D3DDevice_SetRenderTargetFast+0x19 : mov ecx, [eax+0x14] + { 0x19, 0x8B }, + { 0x1A, 0x48 }, + { 0x1B, 0x14 }, + + // D3DDevice_SetRenderTargetFast+0x1C : test ecx, ecx + { 0x1C, 0x85 }, + { 0x1D, 0xC9 }, + + // D3DDevice_SetRenderTargetFast+0x1E : jz + 0x02 + { 0x1E, 0x74 }, + { 0x1F, 0x02 }, - // D3DDevice_SetRenderTargetFast+0x1E : jz + 0x02 - { 0x1E, 0x74 }, - { 0x1F, 0x02 }, - { 0x3C, 0x89 }, { 0x5F, 0x8B }, { 0x7A, 0x04 }, diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl index e72285769..87b2307a2 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl @@ -120,46 +120,46 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(D3DDevice_LightEnable, 5344, 2+24, - XRefNoSaveIndex, - XRefTwo) // PatrickvL : Also for 5558, 5659, 5788, 5849, 5933 + XRefNoSaveIndex, + XRefTwo) // PatrickvL : Also for 5558, 5659, 5788, 5849, 5933 - XREF_ENTRY( 0x0B, XREF_D3DDEVICE ), // Derived - XREF_ENTRY( 0x67, XREF_D3DDevice_SetLight ), + XREF_ENTRY( 0x0B, XREF_D3DDEVICE ), // Derived + XREF_ENTRY( 0x67, XREF_D3DDevice_SetLight ), - { 0x00, 0x83 }, - { 0x01, 0xEC }, - { 0x02, 0x68 }, - { 0x03, 0x53 }, + { 0x00, 0x83 }, + { 0x01, 0xEC }, + { 0x02, 0x68 }, + { 0x03, 0x53 }, - { 0x04, 0x8B }, - { 0x05, 0x5C }, - { 0x06, 0x24 }, - { 0x07, 0x70 }, - { 0x08, 0x56 }, + { 0x04, 0x8B }, + { 0x05, 0x5C }, + { 0x06, 0x24 }, + { 0x07, 0x70 }, + { 0x08, 0x56 }, - { 0x09, 0x8B }, - { 0x0A, 0x35 }, + { 0x09, 0x8B }, + { 0x0A, 0x35 }, - { 0x0F, 0x3B }, - { 0x10, 0x9E }, + { 0x0F, 0x3B }, + { 0x10, 0x9E }, - // { 0x11, 0x90 }, // A4 // A8 - // { 0x12, 0x03 }, // 07 - { 0x13, 0x00 }, + // { 0x11, 0x90 }, // A4 // A8 + // { 0x12, 0x03 }, // 07 + { 0x13, 0x00 }, - { 0x14, 0x00 }, - { 0x15, 0x57 }, - { 0x16, 0x73 }, - { 0x17, 0x13 }, - { 0x18, 0x8B }, + { 0x14, 0x00 }, + { 0x15, 0x57 }, + { 0x16, 0x73 }, + { 0x17, 0x13 }, + { 0x18, 0x8B }, - { 0x19, 0x8E }, - // { 0x1A, 0x8C }, // A0 // A4 - // { 0x1B, 0x03 }, // 07 - { 0x1C, 0x00 }, - { 0x1D, 0x00 }, - { 0x1E, 0x8D }, - { 0x1F, 0x04 }, + { 0x19, 0x8E }, + // { 0x1A, 0x8C }, // A0 // A4 + // { 0x1B, 0x03 }, // 07 + { 0x1C, 0x00 }, + { 0x1D, 0x00 }, + { 0x1E, 0x8D }, + { 0x1F, 0x04 }, OOVPA_END; // ****************************************************************** @@ -167,8 +167,8 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(D3DDevice_GetLightEnable, 5344, 1+26, - XRefNoSaveIndex, - XRefOne) // PatrickvL : Also for 5558, 5659, 5788, 5849, 5933 + XRefNoSaveIndex, + XRefOne) // PatrickvL : Also for 5558, 5659, 5788, 5849, 5933 XREF_ENTRY( 0x06, XREF_D3DDEVICE ), // Derived @@ -322,10 +322,10 @@ OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 5344, 9) #else OOVPA_XREF(D3DDevice_SetRenderTarget, 5344, 1+9, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x18, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived + XREF_ENTRY( 0x18, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived #endif { 0x00, 0x83 }, { 0x08, 0x56 }, @@ -688,38 +688,38 @@ OOVPA_NO_XREF(D3DDevice_GetTexture2, 5344, 23) #else OOVPA_XREF(D3DDevice_GetTexture2, 5344, 1+23, // Up to 5455 - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x0E, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived + XREF_ENTRY( 0x0E, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived #endif - { 0x00, 0x8B }, - { 0x01, 0x44 }, - { 0x02, 0x24 }, - { 0x03, 0x04 }, - { 0x04, 0x8B }, - { 0x05, 0x0D }, - - { 0x0A, 0x56 }, - { 0x0B, 0x8D }, - { 0x0C, 0xB4 }, - { 0x0D, 0x81 }, - { 0x0E, 0x68 }, // GetTexture2 680B vs GetPalette2 780B - { 0x0F, 0x0B }, + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x04 }, + { 0x04, 0x8B }, + { 0x05, 0x0D }, - { 0x10, 0x00 }, - { 0x11, 0x00 }, - { 0x12, 0x8B }, - { 0x13, 0x06 }, - { 0x14, 0x85 }, - { 0x15, 0xC0 }, - { 0x16, 0x74 }, + { 0x0A, 0x56 }, + { 0x0B, 0x8D }, + { 0x0C, 0xB4 }, + { 0x0D, 0x81 }, + { 0x0E, 0x68 }, // GetTexture2 680B vs GetPalette2 780B + { 0x0F, 0x0B }, - { 0x18, 0x50 }, - { 0x19, 0xE8 }, + { 0x10, 0x00 }, + { 0x11, 0x00 }, + { 0x12, 0x8B }, + { 0x13, 0x06 }, + { 0x14, 0x85 }, + { 0x15, 0xC0 }, + { 0x16, 0x74 }, - { 0x1E, 0x8B }, - { 0x1F, 0x06 }, + { 0x18, 0x50 }, + { 0x19, 0xE8 }, + + { 0x1E, 0x8B }, + { 0x1F, 0x06 }, // { 0x21, 0xC2 }, OOVPA_END; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl index 122b4e44c..2ce6e4953 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl @@ -407,10 +407,10 @@ OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 5455, 9) #else OOVPA_XREF(D3DDevice_SetRenderTarget, 5455, 1+9, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x19, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived TODO : Verify offset + XREF_ENTRY( 0x19, XREF_OFFSET_D3DDEVICE_M_RENDERTARGET ), // Derived TODO : Verify offset #endif { 0x00, 0x83 }, { 0x1E, 0x44 }, diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl index e7c1dc675..29b1b6163 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl @@ -334,38 +334,38 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(D3D_MakeRequestedSpace, 5558, 26, // Also for 5659 - XREF_D3D_MakeRequestedSpace, - XRefZero) + XREF_D3D_MakeRequestedSpace, + XRefZero) - { 0x00, 0x51 }, - { 0x01, 0x56 }, - { 0x02, 0x8B }, - { 0x03, 0x35 }, + { 0x00, 0x51 }, + { 0x01, 0x56 }, + { 0x02, 0x8B }, + { 0x03, 0x35 }, - { 0x08, 0xF6 }, - { 0x09, 0x46 }, - { 0x0A, 0x08 }, - { 0x0B, 0x04 }, - { 0x0C, 0x57 }, - { 0x0D, 0x74 }, - { 0x0E, 0x26 }, - { 0x0F, 0x8B }, - { 0x10, 0x86 }, - // { 0x11, 0x60 }, // 0x64 for 5558.4 - { 0x12, 0x07 }, - { 0x13, 0x00 }, - { 0x14, 0x00 }, - { 0x15, 0x8B }, - { 0x16, 0x78 }, - { 0x17, 0x04 }, - { 0x18, 0x8B }, - { 0x19, 0x0E }, - { 0x1A, 0x8B }, - { 0x1B, 0x96 }, - // { 0x1C, 0x64 }, // 0x68 for 5558.4 - { 0x1D, 0x07 }, - { 0x1E, 0x00 }, - { 0x1F, 0x00 }, + { 0x08, 0xF6 }, + { 0x09, 0x46 }, + { 0x0A, 0x08 }, + { 0x0B, 0x04 }, + { 0x0C, 0x57 }, + { 0x0D, 0x74 }, + { 0x0E, 0x26 }, + { 0x0F, 0x8B }, + { 0x10, 0x86 }, +// { 0x11, 0x60 }, // 0x64 for 5558.4 + { 0x12, 0x07 }, + { 0x13, 0x00 }, + { 0x14, 0x00 }, + { 0x15, 0x8B }, + { 0x16, 0x78 }, + { 0x17, 0x04 }, + { 0x18, 0x8B }, + { 0x19, 0x0E }, + { 0x1A, 0x8B }, + { 0x1B, 0x96 }, +// { 0x1C, 0x64 }, // 0x68 for 5558.4 + { 0x1D, 0x07 }, + { 0x1E, 0x00 }, + { 0x1F, 0x00 }, OOVPA_END; // ****************************************************************** @@ -519,38 +519,38 @@ OOVPA_NO_XREF(D3DDevice_GetTexture2, 5558, 23) // Up to 5659 #else OOVPA_XREF(D3DDevice_GetTexture2, 5558, 1+23, // Up to 5659 - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x0E, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived + XREF_ENTRY( 0x0E, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived #endif - { 0x00, 0x8B }, - { 0x01, 0x44 }, - { 0x02, 0x24 }, - { 0x03, 0x04 }, - { 0x04, 0x8B }, - { 0x05, 0x0D }, - - { 0x0A, 0x56 }, - { 0x0B, 0x8D }, - { 0x0C, 0xB4 }, - { 0x0D, 0x81 }, - { 0x0E, 0x78 }, // GetTexture2 780F vs GetPalette2 880F - { 0x0F, 0x0F }, + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x04 }, + { 0x04, 0x8B }, + { 0x05, 0x0D }, - { 0x10, 0x00 }, - { 0x11, 0x00 }, - { 0x12, 0x8B }, - { 0x13, 0x06 }, - { 0x14, 0x85 }, - { 0x15, 0xC0 }, - { 0x16, 0x74 }, + { 0x0A, 0x56 }, + { 0x0B, 0x8D }, + { 0x0C, 0xB4 }, + { 0x0D, 0x81 }, + { 0x0E, 0x78 }, // GetTexture2 780F vs GetPalette2 880F + { 0x0F, 0x0F }, - { 0x18, 0x50 }, - { 0x19, 0xE8 }, + { 0x10, 0x00 }, + { 0x11, 0x00 }, + { 0x12, 0x8B }, + { 0x13, 0x06 }, + { 0x14, 0x85 }, + { 0x15, 0xC0 }, + { 0x16, 0x74 }, - { 0x1E, 0x8B }, - { 0x1F, 0x06 }, + { 0x18, 0x50 }, + { 0x19, 0xE8 }, + + { 0x1E, 0x8B }, + { 0x1F, 0x06 }, // { 0x21, 0xC2 }, OOVPA_END; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5659.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5659.inl index 9d3b4775e..434316872 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5659.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5659.inl @@ -292,37 +292,37 @@ OOVPA_NO_XREF(D3DDevice_GetTexture2, 5659, 23) // Up to 5849 #else OOVPA_XREF(D3DDevice_GetTexture2, 5659, 1+23, // Up to 5849 - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) - XREF_ENTRY( 0x0E, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived + XREF_ENTRY( 0x0E, XREF_OFFSET_D3DDEVICE_M_TEXTURES ), // Derived #endif - { 0x00, 0x8B }, - { 0x01, 0x44 }, - { 0x02, 0x24 }, - { 0x03, 0x04 }, - { 0x04, 0x8B }, - { 0x05, 0x0D }, - - { 0x0A, 0x56 }, - { 0x0B, 0x8D }, - { 0x0C, 0xB4 }, - { 0x0D, 0x81 }, - { 0x0E, 0x88 }, // GetTexture2 880F vs GetPalette2 980F - { 0x0F, 0x0F }, + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x04 }, + { 0x04, 0x8B }, + { 0x05, 0x0D }, - { 0x10, 0x00 }, - { 0x11, 0x00 }, - { 0x12, 0x8B }, - { 0x13, 0x06 }, - { 0x14, 0x85 }, - { 0x15, 0xC0 }, - { 0x16, 0x74 }, + { 0x0A, 0x56 }, + { 0x0B, 0x8D }, + { 0x0C, 0xB4 }, + { 0x0D, 0x81 }, + { 0x0E, 0x88 }, // GetTexture2 880F vs GetPalette2 980F + { 0x0F, 0x0F }, - { 0x18, 0x50 }, - { 0x19, 0xE8 }, + { 0x10, 0x00 }, + { 0x11, 0x00 }, + { 0x12, 0x8B }, + { 0x13, 0x06 }, + { 0x14, 0x85 }, + { 0x15, 0xC0 }, + { 0x16, 0x74 }, - { 0x1E, 0x8B }, - { 0x1F, 0x06 }, + { 0x18, 0x50 }, + { 0x19, 0xE8 }, + + { 0x1E, 0x8B }, + { 0x1F, 0x06 }, // { 0x21, 0xC2 }, OOVPA_END; diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl index 34450084c..a3188eec0 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl @@ -225,11 +225,11 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(DirectSoundCreateBuffer, 3911, 1+11, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) // DirectSoundCreateBuffer+0x27 : call [IDirectSound::CreateSoundBuffer] - XREF_ENTRY(0x28, XREF_IDirectSound_CreateSoundBuffer), + XREF_ENTRY(0x28, XREF_IDirectSound_CreateSoundBuffer), // DirectSoundCreateBuffer+0x04 : and [ebp-0x04], 0 { 0x04, 0x83 }, @@ -316,11 +316,11 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(DirectSoundCreateStream, 3911, 1+11, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) // DirectSoundCreateStream+0x27 : call [IDirectSound::CreateSoundStream] - XREF_ENTRY(0x28, XREF_IDirectSound_CreateSoundStream ), + XREF_ENTRY(0x28, XREF_IDirectSound_CreateSoundStream ), // DirectSoundCreateStream+0x04 : and [ebp-0x04], 0 { 0x04, 0x83 }, @@ -516,7 +516,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CMcpxBuffer_Stop, 3911, 10, - XREF_CMcpxBuffer_Stop, + XREF_CMcpxBuffer_Stop, XRefZero) // CMcpxBuffer_Stop+0x08 : or eax, dword ptr [esp+10h] @@ -917,7 +917,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CMcpxBuffer_GetStatus, 3911, 13, - XREF_CMcpxBuffer_GetStatus, + XREF_CMcpxBuffer_GetStatus, XRefZero) // CMcpxBuffer_GetStatus+0x10 : mov eax, [ebp+0x08] @@ -2718,19 +2718,19 @@ OOVPA_XREF(CMcpxVoiceClient_Commit3dSettings, 3911, 10, XREF_CMcpxVoiceClient_Commit3dSettings, XRefZero) - // CMcpxVoiceClient::Commit3dSettings+0x17 : or [eax+0x80], ecx - { 0x17, 0x09 }, - { 0x18, 0x88 }, - { 0x19, 0x80 }, - { 0x1A, 0x00 }, - // CMcpxVoiceClient::Commit3dSettings+0x2B : add eax, 0x80 - { 0x2B, 0x05 }, - { 0x2C, 0x80 }, - { 0x2D, 0x00 }, - // CMcpxVoiceClient::Commit3dSettings+0x3D : cmpxchg [ecx], edx - { 0x3D, 0x0F }, - { 0x3E, 0xB1 }, - { 0x3F, 0x11 }, + // CMcpxVoiceClient::Commit3dSettings+0x17 : or [eax+0x80], ecx + { 0x17, 0x09 }, + { 0x18, 0x88 }, + { 0x19, 0x80 }, + { 0x1A, 0x00 }, + // CMcpxVoiceClient::Commit3dSettings+0x2B : add eax, 0x80 + { 0x2B, 0x05 }, + { 0x2C, 0x80 }, + { 0x2D, 0x00 }, + // CMcpxVoiceClient::Commit3dSettings+0x3D : cmpxchg [ecx], edx + { 0x3D, 0x0F }, + { 0x3E, 0xB1 }, + { 0x3F, 0x11 }, OOVPA_END; // ****************************************************************** @@ -2992,11 +2992,11 @@ OOVPA_END; // Generic OOVPA as of 3911 and newer. OOVPA_XREF(IDirectSoundBuffer_SetConeOrientation, 3911, 1+8, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) // IDirectSoundBuffer_SetConeOrientation+0x2C : call [CDirectSoundBuffer::SetConeOrientation] - XREF_ENTRY(0x2D, XREF_CDirectSoundBuffer_SetConeOrientation), + XREF_ENTRY(0x2D, XREF_CDirectSoundBuffer_SetConeOrientation), // IDirectSoundBuffer_SetConeOrientation+0x06 : fld [ebp+arg_C] { 0x06, 0xD9 }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl index cec24d288..bf4a857da 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl @@ -61,11 +61,11 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(DirectSoundCreateBuffer, 4039, 1+10, - XRefNoSaveIndex, - XRefOne) + XRefNoSaveIndex, + XRefOne) // DirectSoundCreateBuffer+0x2B : call [CDirectSound::CreateSoundBuffer] - XREF_ENTRY(0x2C, XREF_CDirectSound_CreateSoundBuffer), + XREF_ENTRY(0x2C, XREF_CDirectSound_CreateSoundBuffer), // DirectSoundCreateBuffer+0x04 : and [ebp-0x04], 0 { 0x04, 0x83 }, @@ -91,8 +91,8 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSound_CreateSoundBuffer, 4039, 15, - XREF_CDirectSound_CreateSoundBuffer, - XRefZero) + XREF_CDirectSound_CreateSoundBuffer, + XRefZero) // CDirectSound_CreateSoundBuffer+0x00 : push ebp { 0x00, 0x55 }, @@ -456,8 +456,8 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 4039, 1+7, - XREF_CDirectSoundBuffer_SetHeadroom, - XRefOne) + XREF_CDirectSoundBuffer_SetHeadroom, + XRefOne) XREF_ENTRY( 0x31, XREF_CDirectSoundVoice_SetHeadroom ), // Was 4134 Offset -0x01h @@ -900,7 +900,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 4039, 1+10, - XREF_CDirectSoundBuffer_GetCurrentPosition, + XREF_CDirectSoundBuffer_GetCurrentPosition, XRefOne) // CDirectSoundBuffer_GetCurrentPosition+0x38 : call [CMcpxBuffer::GetCurrentPosition] @@ -1076,7 +1076,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CMcpxBuffer_SetCurrentPosition, 4039, 9, - XREF_CMcpxBuffer_SetCurrentPosition, + XREF_CMcpxBuffer_SetCurrentPosition, XRefZero) // CMcpxBuffer_SetCurrentPosition+0x11 : lea eax, [esi+90h] @@ -1100,7 +1100,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 4039, 1+10, - XREF_CDirectSoundBuffer_SetCurrentPosition, + XREF_CDirectSoundBuffer_SetCurrentPosition, XRefOne) // CDirectSoundBuffer_SetCurrentPosition+0x34 : call [CMcpxBuffer::SetCurrentPosition] diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl index fe8cc965a..fd3397423 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl @@ -36,24 +36,25 @@ // * DirectSoundCreate // ****************************************************************** OOVPA_NO_XREF(DirectSoundCreate, 4134, 9) - // DirectSoundCreate+0x0B : movzx esi, al - { 0x0B, 0x0F }, - { 0x0C, 0xB6 }, - { 0x0D, 0xF0 }, - // DirectSoundCreate+0x12 : call [addr] - { 0x12, 0xE8 }, + // DirectSoundCreate+0x0B : movzx esi, al + { 0x0B, 0x0F }, + { 0x0C, 0xB6 }, + { 0x0D, 0xF0 }, - // DirectSoundCreate+0x1B : jl +0x13 - { 0x1B, 0x7C }, - { 0x1C, 0x13 }, + // DirectSoundCreate+0x12 : call [addr] + { 0x12, 0xE8 }, - // DirectSoundCreate+0x27 : sbb ecx, ecx - { 0x27, 0x1B }, - { 0x28, 0xC9 }, + // DirectSoundCreate+0x1B : jl +0x13 + { 0x1B, 0x7C }, + { 0x1C, 0x13 }, - // DirectSoundCreate+0x43 : leave - { 0x43, 0xC9 }, + // DirectSoundCreate+0x27 : sbb ecx, ecx + { 0x27, 0x1B }, + { 0x28, 0xC9 }, + + // DirectSoundCreate+0x43 : leave + { 0x43, 0xC9 }, OOVPA_END; // ****************************************************************** @@ -207,8 +208,8 @@ OOVPA_END; // Generic OOVPA as of 4134 and newer OOVPA_XREF(CDirectSoundBuffer_SetHeadroom, 4134, 1+8, - XREF_CDirectSoundBuffer_SetHeadroom, - XRefOne) + XREF_CDirectSoundBuffer_SetHeadroom, + XRefOne) XREF_ENTRY( 0x32, XREF_CDirectSoundVoice_SetHeadroom ), @@ -581,7 +582,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CMcpxBuffer_GetStatus, 4134, 11, - XREF_CMcpxBuffer_GetStatus, + XREF_CMcpxBuffer_GetStatus, XRefZero) // CMcpxBuffer_GetStatus+0x0A : mov esi, ecx @@ -639,7 +640,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CMcpxBuffer_SetCurrentPosition, 4134, 9, - XREF_CMcpxBuffer_SetCurrentPosition, + XREF_CMcpxBuffer_SetCurrentPosition, XRefZero) // CMcpxBuffer_SetCurrentPosition+0x11 : mov al, [esi+12] @@ -663,7 +664,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetCurrentPosition, 4134, 1+10, - XREF_CDirectSoundBuffer_SetCurrentPosition, + XREF_CDirectSoundBuffer_SetCurrentPosition, XRefOne) // CDirectSoundBuffer_SetCurrentPosition+0x35 : call [CMcpxBuffer::SetCurrentPosition] @@ -739,7 +740,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_GetCurrentPosition, 4134, 1+10, - XREF_CDirectSoundBuffer_GetCurrentPosition, + XREF_CDirectSoundBuffer_GetCurrentPosition, XRefOne) // CDirectSoundBuffer_GetCurrentPosition+0x39 : call [CMcpxBuffer::GetCurrentPosition] @@ -1636,7 +1637,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDopplerFactor, 4134, 12, - XREF_CDirectSoundVoice_SetDopplerFactor, + XREF_CDirectSoundVoice_SetDopplerFactor, XRefZero) // CDirectSoundVoice_SetDopplerFactor+0x0D : mov edx, [esp+arg_4] @@ -2256,7 +2257,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CMcpxBuffer_Stop, 4134, 9, - XREF_CMcpxBuffer_Stop, + XREF_CMcpxBuffer_Stop, XRefZero) // CMcpxBuffer_Stop+0x0B : cmp al, 3 diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl index 2d3af442c..005f72fc9 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4242.inl @@ -90,7 +90,7 @@ OOVPA_END; //Generic OOVPA as of 4242 and newer. OOVPA_XREF(CMcpxBuffer_Stop, 4242, 9, - XREF_CMcpxBuffer_Stop, + XREF_CMcpxBuffer_Stop, XRefZero) // CMcpxBuffer_Stop+0x0E : cmp al, 3 diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index 8365991a5..cdfd093ed 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -322,7 +322,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDopplerFactor, 4361, 12, - XREF_CDirectSoundVoice_SetDopplerFactor, + XREF_CDirectSoundVoice_SetDopplerFactor, XRefZero) // CDirectSoundVoice_SetDopplerFactor+0x0D : mov edx, [esp+arg_4] diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index 54319a278..b55928751 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -244,19 +244,19 @@ OOVPA_END; // ****************************************************************** OOVPA_NO_XREF(CMemoryManager_MemAlloc, 4627, 10) - // DirectSound::CMemoryManager::PoolAlloc + 0x1B: cmp [esp+4+0xC], 0 - { 0x1B, 0x83 }, - { 0x1C, 0x7C }, - { 0x1D, 0x24 }, - { 0x1E, 0x10 }, - { 0x1F, 0x00 }, - // DirectSound::CMemoryManager::PoolAlloc + 0x33: and ecx, 3 - { 0x33, 0x83 }, - { 0x34, 0xE1 }, - { 0x35, 0x03 }, - // DirectSound::CMemoryManager::PoolAlloc + 0x65: retn 0xC - { 0x65, 0xC2 }, - { 0x66, 0x0C } + // DirectSound::CMemoryManager::PoolAlloc + 0x1B: cmp [esp+4+0xC], 0 + { 0x1B, 0x83 }, + { 0x1C, 0x7C }, + { 0x1D, 0x24 }, + { 0x1E, 0x10 }, + { 0x1F, 0x00 }, + // DirectSound::CMemoryManager::PoolAlloc + 0x33: and ecx, 3 + { 0x33, 0x83 }, + { 0x34, 0xE1 }, + { 0x35, 0x03 }, + // DirectSound::CMemoryManager::PoolAlloc + 0x65: retn 0xC + { 0x65, 0xC2 }, + { 0x66, 0x0C } OOVPA_END; // ****************************************************************** @@ -292,7 +292,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDopplerFactor, 4627, 12, - XREF_CDirectSoundVoice_SetDopplerFactor, + XREF_CDirectSoundVoice_SetDopplerFactor, XRefZero) // CDirectSoundVoice_SetDopplerFactor+0x0D : mov edx, [esp+arg_4] diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4721.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4721.inl index a438e76b2..c8ee85a92 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4721.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4721.inl @@ -63,7 +63,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CMcpxBuffer_GetStatus, 4721, 17, - XREF_CMcpxBuffer_GetStatus, + XREF_CMcpxBuffer_GetStatus, XRefZero) { 0x00, 0x0F }, @@ -92,7 +92,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CMcpxBuffer_Pause, 4721, 12, - XREF_CMcpxBuffer_Pause, + XREF_CMcpxBuffer_Pause, XRefZero) { 0x00, 0x55 }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4831.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4831.inl index 98ff65577..aa8dda603 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4831.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4831.inl @@ -113,7 +113,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CMcpxBuffer_GetStatus, 4831, 13, - XREF_CMcpxBuffer_GetStatus, + XREF_CMcpxBuffer_GetStatus, XRefZero) { 0x00, 0x0F }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl index 7a534e41e..2f264ca89 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl @@ -113,7 +113,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDopplerFactor, 5344, 12, - XREF_CDirectSoundVoice_SetDopplerFactor, + XREF_CDirectSoundVoice_SetDopplerFactor, XRefZero) // CDirectSoundVoice_SetDopplerFactor+0x0D : mov edx, [esp+arg_4] diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl index 1b2069608..edfe55618 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5455.inl @@ -240,7 +240,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CMcpxBuffer_SetBufferData, 5455, 9, - XREF_CMcpxBuffer_SetBufferData, + XREF_CMcpxBuffer_SetBufferData, XRefZero) // CMcpxBuffer_SetBufferData+0x1E : cmp eax, ebx diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index ec7066f10..8aeae3257 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -76,7 +76,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(IDirectSoundBuffer8_SetAllParameters, 5558, 1+8, - XREF_CDirectSoundVoice_SetAllParameters, + XREF_CDirectSoundVoice_SetAllParameters, XRefOne) XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetAllParameters ), diff --git a/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl index 07f6235e8..6dda8ff10 100644 --- a/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XNet.1.0.4627.inl @@ -62,41 +62,41 @@ OOVPA_NO_XREF(connect, 4627, 24) // connect+0x00 : push ebp { 0x00, 0x55 }, - // connect+0x0B : je short +09 + // connect+0x0B : je short +09 { 0x0B, 0x74 }, - { 0x0C, 0x09 }, + { 0x0C, 0x09 }, - // connect+0x16 : PUSH 276D + // connect+0x16 : PUSH 276D { 0x16, 0x68 }, - { 0x17, 0x6D }, + { 0x17, 0x6D }, { 0x18, 0x27 }, - { 0x19, 0x00 }, - { 0x1A, 0x00 }, + { 0x19, 0x00 }, + { 0x1A, 0x00 }, - // connect+0x42 : TEST DL,40 + // connect+0x42 : TEST DL,40 { 0x42, 0xF6 }, - { 0x43, 0xC2 }, + { 0x43, 0xC2 }, { 0x44, 0x40 }, - // connect+0x68 : PUSH DWORD PTR SS:[EBP+8] + // connect+0x68 : PUSH DWORD PTR SS:[EBP+8] { 0x68, 0xFF }, - { 0x69, 0x75 }, + { 0x69, 0x75 }, { 0x6A, 0x08 }, - // connect+0x8F : MOV ESI,80072733 + // connect+0x8F : MOV ESI,80072733 { 0x8F, 0xBE }, - { 0x90, 0x33 }, + { 0x90, 0x33 }, { 0x91, 0x27 }, - { 0x92, 0x07 }, - { 0x93, 0x80 }, + { 0x92, 0x07 }, + { 0x93, 0x80 }, - // connect+0xCD : PUSH -1 + // connect+0xCD : PUSH -1 { 0xCD, 0x6A }, - { 0xCE, 0xFF }, + { 0xCE, 0xFF }, - // connect+0xE6 : retn 0C + // connect+0xE6 : retn 0C { 0xE6, 0xC2 }, - { 0xE7, 0x0C }, + { 0xE7, 0x0C }, { 0xE8, 0x00 }, OOVPA_END; @@ -108,25 +108,25 @@ OOVPA_NO_XREF(send, 4627, 24) // send+0x00 : push ebp { 0x00, 0x55 }, - // send+0x17 : push 0x276D + // send+0x17 : push 0x276D { 0x17, 0x68 }, { 0x18, 0x6D }, { 0x19, 0x27 }, - // send+0x24 : jmp + // send+0x24 : jmp { 0x24, 0xEB }, { 0x25, 0x6A }, - // send+0x51 : LEA EAX,DWORD PTR SS:[EBP-20] + // send+0x51 : LEA EAX,DWORD PTR SS:[EBP-20] { 0x51, 0x8D }, { 0x52, 0x45 }, { 0x53, 0xE0 }, - // send+0x6C : JL SHORT +04 + // send+0x6C : JL SHORT +04 { 0x6C, 0x7C }, { 0x6D, 0x04 }, - // send+0x7B : MOV DWORD PTR DS:[ESI+8],2B434F53 + // send+0x7B : MOV DWORD PTR DS:[ESI+8],2B434F53 { 0x7B, 0xC7 }, { 0x7C, 0x46 }, { 0x7D, 0x08 }, @@ -135,12 +135,12 @@ OOVPA_NO_XREF(send, 4627, 24) { 0x80, 0x43 }, { 0x81, 0x2B }, - // send+0x8C : MOV EAX,DWORD PTR SS:[EBP-10] + // send+0x8C : MOV EAX,DWORD PTR SS:[EBP-10] { 0x8C, 0x8B }, { 0x8D, 0x45 }, { 0x8E, 0xF0 }, - // send+0x92 : retn 10h + // send+0x92 : retn 10h { 0x92, 0xC2 }, { 0x93, 0x10 }, { 0x94, 0x00 }, @@ -154,25 +154,25 @@ OOVPA_NO_XREF(recv, 4627, 24) // recv+0x00 : push ebp { 0x00, 0x55 }, - // recv+0x17 : push 0x276D + // recv+0x17 : push 0x276D { 0x17, 0x68 }, { 0x18, 0x6D }, { 0x19, 0x27 }, - // recv+0x24 : jmp + // recv+0x24 : jmp { 0x24, 0xEB }, { 0x25, 0x66 }, - // recv+0x51 : MOV DWORD PTR SS:[EBP-14],EAX + // recv+0x51 : MOV DWORD PTR SS:[EBP-14],EAX { 0x51, 0x89 }, { 0x52, 0x45 }, { 0x53, 0xEC }, - // recv+0x68 : JL SHORT +04 + // recv+0x68 : JL SHORT +04 { 0x68, 0x7C }, { 0x69, 0x04 }, - // recv+0x77 : MOV DWORD PTR DS:[ESI+8],2B434F53 + // recv+0x77 : MOV DWORD PTR DS:[ESI+8],2B434F53 { 0x77, 0xC7 }, { 0x78, 0x46 }, { 0x79, 0x08 }, @@ -181,12 +181,12 @@ OOVPA_NO_XREF(recv, 4627, 24) { 0x7C, 0x43 }, { 0x7D, 0x2B }, - // recv+0x88 : MOV EAX,DWORD PTR SS:[EBP+8] + // recv+0x88 : MOV EAX,DWORD PTR SS:[EBP+8] { 0x88, 0x8B }, { 0x89, 0x45 }, { 0x8A, 0x08 }, - // recv+0x8E : retn 10h + // recv+0x8E : retn 10h { 0x8E, 0xC2 }, { 0x8F, 0x10 }, { 0x90, 0x00 }, diff --git a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl index 1f0273347..88eeac7c6 100644 --- a/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/XactEng.1.0.4627.inl @@ -37,24 +37,24 @@ // ****************************************************************** OOVPA_NO_XREF(XACTEngineCreate, 4627, 11) - // XACTEngineCreate+0x0C : movzx ebx, al - { 0x0C, 0x0F }, - { 0x0D, 0xB6 }, - { 0x0E, 0xD8 }, + // XACTEngineCreate+0x0C : movzx ebx, al + { 0x0C, 0x0F }, + { 0x0D, 0xB6 }, + { 0x0E, 0xD8 }, // XACTEngineCreate+0x30 : push edi - { 0x30, 0x57 }, + { 0x30, 0x57 }, - // XACTEngineCreate+0x31 : push 0x108 - { 0x31, 0x68 }, - { 0x32, 0x08 }, - { 0x33, 0x01 }, - { 0x34, 0x00 }, - { 0x35, 0x00 }, + // XACTEngineCreate+0x31 : push 0x108 + { 0x31, 0x68 }, + { 0x32, 0x08 }, + { 0x33, 0x01 }, + { 0x34, 0x00 }, + { 0x35, 0x00 }, - // XACTEngineCreate+0x9A : retn 0x8 - { 0x9A, 0xC2 }, - { 0x9B, 0x08 }, + // XACTEngineCreate+0x9A : retn 0x8 + { 0x9A, 0xC2 }, + { 0x9B, 0x08 }, OOVPA_END; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl index d2dc34288..bbd92746c 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl @@ -168,38 +168,38 @@ OOVPA_END; // * OutputDebugStringA // ****************************************************************** OOVPA_NO_XREF(OutputDebugStringA, 3911, 32) - { 0x00, 0x55 }, - { 0x01, 0x8B }, - { 0x02, 0xEC }, - { 0x03, 0x51 }, - { 0x04, 0x51 }, - { 0x05, 0x8B }, - { 0x06, 0x45 }, - { 0x07, 0x08 }, - { 0x08, 0x89 }, - { 0x09, 0x45 }, - { 0x0A, 0xFC }, - { 0x0B, 0x8D }, - { 0x0C, 0x48 }, - { 0x0D, 0x01 }, - { 0x0E, 0x8A }, - { 0x0F, 0x10 }, - { 0x10, 0x40 }, - { 0x11, 0x84 }, - { 0x12, 0xD2 }, - { 0x13, 0x75 }, - { 0x14, 0xF9 }, - { 0x15, 0x2B }, - { 0x16, 0xC1 }, - { 0x17, 0x66 }, - { 0x18, 0x89 }, - { 0x19, 0x45 }, - { 0x1A, 0xF8 }, - { 0x1B, 0x8B }, - { 0x1C, 0x45 }, - { 0x1D, 0xF8 }, - { 0x1E, 0x40 }, - { 0x1F, 0x66 }, + { 0x00, 0x55 }, + { 0x01, 0x8B }, + { 0x02, 0xEC }, + { 0x03, 0x51 }, + { 0x04, 0x51 }, + { 0x05, 0x8B }, + { 0x06, 0x45 }, + { 0x07, 0x08 }, + { 0x08, 0x89 }, + { 0x09, 0x45 }, + { 0x0A, 0xFC }, + { 0x0B, 0x8D }, + { 0x0C, 0x48 }, + { 0x0D, 0x01 }, + { 0x0E, 0x8A }, + { 0x0F, 0x10 }, + { 0x10, 0x40 }, + { 0x11, 0x84 }, + { 0x12, 0xD2 }, + { 0x13, 0x75 }, + { 0x14, 0xF9 }, + { 0x15, 0x2B }, + { 0x16, 0xC1 }, + { 0x17, 0x66 }, + { 0x18, 0x89 }, + { 0x19, 0x45 }, + { 0x1A, 0xF8 }, + { 0x1B, 0x8B }, + { 0x1C, 0x45 }, + { 0x1D, 0xF8 }, + { 0x1E, 0x40 }, + { 0x1F, 0x66 }, OOVPA_END; // ****************************************************************** @@ -574,124 +574,124 @@ OOVPA_END; // * CreateFiber // ****************************************************************** OOVPA_NO_XREF(CreateFiber, 3911, 32) - { 0x00, 0x8B }, - { 0x01, 0x44 }, - { 0x02, 0x24 }, - { 0x03, 0x04 }, - { 0x04, 0x56 }, - { 0x05, 0x57 }, - { 0x06, 0x33 }, - { 0x07, 0xFF }, - { 0x08, 0x3B }, - { 0x09, 0xC7 }, - { 0x0A, 0x75 }, - { 0x0B, 0x05 }, - { 0x0C, 0xA1 }, - { 0x0D, 0x30 }, - { 0x0E, 0x01 }, - { 0x0F, 0x01 }, - { 0x10, 0x00 }, - { 0x11, 0xB9 }, - { 0x12, 0x00 }, - { 0x13, 0x30 }, - { 0x14, 0x00 }, - { 0x15, 0x00 }, - { 0x16, 0x3B }, - { 0x17, 0xC1 }, - { 0x18, 0x73 }, - { 0x19, 0x02 }, - { 0x1A, 0x8B }, - { 0x1B, 0xC1 }, - { 0x1C, 0x8D }, - { 0x1D, 0xB0 }, - { 0x1E, 0xFF }, - { 0x1F, 0x0F }, + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x04 }, + { 0x04, 0x56 }, + { 0x05, 0x57 }, + { 0x06, 0x33 }, + { 0x07, 0xFF }, + { 0x08, 0x3B }, + { 0x09, 0xC7 }, + { 0x0A, 0x75 }, + { 0x0B, 0x05 }, + { 0x0C, 0xA1 }, + { 0x0D, 0x30 }, + { 0x0E, 0x01 }, + { 0x0F, 0x01 }, + { 0x10, 0x00 }, + { 0x11, 0xB9 }, + { 0x12, 0x00 }, + { 0x13, 0x30 }, + { 0x14, 0x00 }, + { 0x15, 0x00 }, + { 0x16, 0x3B }, + { 0x17, 0xC1 }, + { 0x18, 0x73 }, + { 0x19, 0x02 }, + { 0x1A, 0x8B }, + { 0x1B, 0xC1 }, + { 0x1C, 0x8D }, + { 0x1D, 0xB0 }, + { 0x1E, 0xFF }, + { 0x1F, 0x0F }, OOVPA_END; // ****************************************************************** // * DeleteFiber // ****************************************************************** OOVPA_NO_XREF(DeleteFiber, 3911, 15) - { 0x00, 0x8B }, - { 0x01, 0x44 }, - { 0x02, 0x24 }, - { 0x03, 0x04 }, - { 0x04, 0xFF }, - { 0x05, 0x70 }, - { 0x06, 0x08 }, - { 0x07, 0xFF }, - { 0x08, 0x70 }, - { 0x09, 0x04 }, - { 0x0A, 0xFF }, - { 0x0B, 0x15 }, + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x04 }, + { 0x04, 0xFF }, + { 0x05, 0x70 }, + { 0x06, 0x08 }, + { 0x07, 0xFF }, + { 0x08, 0x70 }, + { 0x09, 0x04 }, + { 0x0A, 0xFF }, + { 0x0B, 0x15 }, - { 0x10, 0xC2 }, - { 0x11, 0x04 }, - { 0x12, 0x00 }, + { 0x10, 0xC2 }, + { 0x11, 0x04 }, + { 0x12, 0x00 }, OOVPA_END; // ****************************************************************** // * SwitchToFiber // ****************************************************************** OOVPA_NO_XREF(SwitchToFiber, 3911, 28) - { 0x00, 0x8B }, - { 0x01, 0x15 }, + { 0x00, 0x8B }, + { 0x01, 0x15 }, { 0x06, 0x64 }, - { 0x07, 0x8B }, - { 0x08, 0x0D }, - { 0x09, 0x04 }, - { 0x0A, 0x00 }, - { 0x0B, 0x00 }, - { 0x0C, 0x00 }, - { 0x0D, 0x8B }, - { 0x0E, 0x44 }, - { 0x0F, 0x24 }, - { 0x10, 0x04 }, - { 0x11, 0x55 }, - { 0x12, 0x56 }, - { 0x13, 0x57 }, - { 0x14, 0x53 }, - { 0x15, 0x64 }, - { 0x16, 0xFF }, - { 0x17, 0x35 }, - { 0x18, 0x00 }, - { 0x19, 0x00 }, - { 0x1A, 0x00 }, - { 0x1B, 0x00 }, - { 0x1C, 0x8B }, - { 0x1D, 0x14 }, - { 0x1E, 0x91 }, - { 0x1F, 0x8B }, + { 0x07, 0x8B }, + { 0x08, 0x0D }, + { 0x09, 0x04 }, + { 0x0A, 0x00 }, + { 0x0B, 0x00 }, + { 0x0C, 0x00 }, + { 0x0D, 0x8B }, + { 0x0E, 0x44 }, + { 0x0F, 0x24 }, + { 0x10, 0x04 }, + { 0x11, 0x55 }, + { 0x12, 0x56 }, + { 0x13, 0x57 }, + { 0x14, 0x53 }, + { 0x15, 0x64 }, + { 0x16, 0xFF }, + { 0x17, 0x35 }, + { 0x18, 0x00 }, + { 0x19, 0x00 }, + { 0x1A, 0x00 }, + { 0x1B, 0x00 }, + { 0x1C, 0x8B }, + { 0x1D, 0x14 }, + { 0x1E, 0x91 }, + { 0x1F, 0x8B }, OOVPA_END; // ****************************************************************** // * ConvertThreadToFiber // ****************************************************************** OOVPA_NO_XREF(ConvertThreadToFiber, 3911, 20) - { 0x00, 0xA1 }, + { 0x00, 0xA1 }, - { 0x05, 0x64 }, - { 0x06, 0x8B }, - { 0x07, 0x0D }, + { 0x05, 0x64 }, + { 0x06, 0x8B }, + { 0x07, 0x0D }, { 0x0C, 0x8B }, - { 0x0D, 0x14 }, - { 0x0E, 0x81 }, - { 0x0F, 0x8B }, - { 0x10, 0x44 }, - { 0x11, 0x24 }, - { 0x12, 0x04 }, - { 0x13, 0x8D }, - { 0x14, 0x8A }, + { 0x0D, 0x14 }, + { 0x0E, 0x81 }, + { 0x0F, 0x8B }, + { 0x10, 0x44 }, + { 0x11, 0x24 }, + { 0x12, 0x04 }, + { 0x13, 0x8D }, + { 0x14, 0x8A }, - { 0x19, 0x89 }, + { 0x19, 0x89 }, { 0x1A, 0x01 }, - { 0x1B, 0x64 }, - { 0x1C, 0xA1 }, - { 0x1D, 0x28 }, - { 0x1E, 0x00 }, - { 0x1F, 0x00 }, + { 0x1B, 0x64 }, + { 0x1C, 0xA1 }, + { 0x1D, 0x28 }, + { 0x1E, 0x00 }, + { 0x1F, 0x00 }, OOVPA_END; // ****************************************************************** @@ -823,23 +823,23 @@ OOVPA_END; // ****************************************************************** // * XGetSectionHandleA -// 558BEC83EC10538B1D........5657FF75088D45F050FFD38B351C0101008B3D +// 558BEC83EC10538B1D........5657FF75088D45F050FFD38B351C0101008B3D // ****************************************************************** OOVPA_NO_XREF(XGetSectionHandleA, 3911, 12) - { 0x00, 0x55 }, - { 0x01, 0x8B }, - { 0x02, 0xEC }, - { 0x03, 0x83 }, - { 0x04, 0xEC }, - { 0x05, 0x10 }, - { 0x06, 0x53 }, - { 0x07, 0x8B }, - { 0x08, 0x1D }, + { 0x00, 0x55 }, + { 0x01, 0x8B }, + { 0x02, 0xEC }, + { 0x03, 0x83 }, + { 0x04, 0xEC }, + { 0x05, 0x10 }, + { 0x06, 0x53 }, + { 0x07, 0x8B }, + { 0x08, 0x1D }, - { 0x0D, 0x56 }, - { 0x0E, 0x57 }, - { 0x0F, 0xFF } + { 0x0D, 0x56 }, + { 0x0E, 0x57 }, + { 0x0F, 0xFF } OOVPA_END; // ****************************************************************** @@ -848,24 +848,24 @@ OOVPA_END; // ****************************************************************** OOVPA_NO_XREF(XLoadSectionByHandle, 3911, 11) - // XLoadSectionByHandle+0x01 : mov esi, [esp+4+arg_0] - { 0x01, 0x8B }, - { 0x02, 0x74 }, - { 0x03, 0x24 }, - { 0x04, 0x08 }, + // XLoadSectionByHandle+0x01 : mov esi, [esp+4+arg_0] + { 0x01, 0x8B }, + { 0x02, 0x74 }, + { 0x03, 0x24 }, + { 0x04, 0x08 }, - // XLoadSectionByHandle+0x0C : test eax, eax - { 0x0C, 0x85 }, - { 0x0D, 0xC0 }, + // XLoadSectionByHandle+0x0C : test eax, eax + { 0x0C, 0x85 }, + { 0x0D, 0xC0 }, - // XLoadSectionByHandle+0x1A : mov eax, [esi+4] - { 0x1A, 0x8B }, - { 0x1B, 0x46 }, - { 0x1C, 0x04 }, + // XLoadSectionByHandle+0x1A : mov eax, [esi+4] + { 0x1A, 0x8B }, + { 0x1B, 0x46 }, + { 0x1C, 0x04 }, - // XLoadSectionByHandle+0x1E : retn 4 - { 0x1E, 0xC2 }, - { 0x1F, 0x04 } + // XLoadSectionByHandle+0x1E : retn 4 + { 0x1E, 0xC2 }, + { 0x1F, 0x04 } OOVPA_END; // ****************************************************************** @@ -874,26 +874,26 @@ OOVPA_END; // ****************************************************************** OOVPA_NO_XREF(XFreeSectionByHandle, 3911, 11) - // XFreeSectionByHandle+0x00 : push esp - { 0x00, 0xFF }, - { 0x01, 0x74 }, - { 0x02, 0x24 }, - { 0x03, 0x04 }, + // XFreeSectionByHandle+0x00 : push esp + { 0x00, 0xFF }, + { 0x01, 0x74 }, + { 0x02, 0x24 }, + { 0x03, 0x04 }, - // XFreeSectionByHandle+0x0A : test eax, eax - { 0x0A, 0x85 }, - { 0x0B, 0xC0 }, + // XFreeSectionByHandle+0x0A : test eax, eax + { 0x0A, 0x85 }, + { 0x0B, 0xC0 }, - // XFreeSectionByHandle+0x18 : xor eax, eax - { 0x18, 0x33 }, - { 0x19, 0xC0 }, + // XFreeSectionByHandle+0x18 : xor eax, eax + { 0x18, 0x33 }, + { 0x19, 0xC0 }, - // XFreeSectionByHandle+0x1A : inc eax - { 0x1A, 0x40 }, + // XFreeSectionByHandle+0x1A : inc eax + { 0x1A, 0x40 }, - // XFreeSectionByHandle+0x1B : retn 4 - { 0x1B, 0xC2 }, - { 0x1C, 0x04 } + // XFreeSectionByHandle+0x1B : retn 4 + { 0x1B, 0xC2 }, + { 0x1C, 0x04 } OOVPA_END; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl index 77a7dc8b6..19204e49c 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.4134.inl @@ -76,28 +76,28 @@ OOVPA_XREF(GetTypeInformation, 4134, 24, XREF_XAPI_GetTypeInformation, XRefZero) - { 0x00, 0xB8 }, - { 0x05, 0x56 }, - { 0x06, 0x8B }, - { 0x07, 0xD0 }, - { 0x08, 0xBE }, - { 0x0D, 0x3B }, - { 0x0E, 0xD6 }, - { 0x0F, 0x73 }, - { 0x10, 0x12 }, - { 0x11, 0x8B }, - { 0x12, 0x10 }, - { 0x13, 0x85 }, - { 0x14, 0xD2 }, - { 0x15, 0x74 }, - { 0x16, 0x05 }, - { 0x17, 0x39 }, - { 0x18, 0x4A }, - { 0x19, 0x04 }, - { 0x1A, 0x74 }, - { 0x1B, 0x0B }, - { 0x1C, 0x83 }, - { 0x1D, 0xC0 }, - { 0x1E, 0x04 }, - { 0x1F, 0x3B } + { 0x00, 0xB8 }, + { 0x05, 0x56 }, + { 0x06, 0x8B }, + { 0x07, 0xD0 }, + { 0x08, 0xBE }, + { 0x0D, 0x3B }, + { 0x0E, 0xD6 }, + { 0x0F, 0x73 }, + { 0x10, 0x12 }, + { 0x11, 0x8B }, + { 0x12, 0x10 }, + { 0x13, 0x85 }, + { 0x14, 0xD2 }, + { 0x15, 0x74 }, + { 0x16, 0x05 }, + { 0x17, 0x39 }, + { 0x18, 0x4A }, + { 0x19, 0x04 }, + { 0x1A, 0x74 }, + { 0x1B, 0x0B }, + { 0x1C, 0x83 }, + { 0x1D, 0xC0 }, + { 0x1E, 0x04 }, + { 0x1F, 0x3B } OOVPA_END;