d3d8ltcg: fix D3DDevice_SetTextureState_ColorKeyColor variant signatures

changed esi1 to eax1 register

Updated:
- 2024 to 3911
- 2036 to 5233
- 2048 to 5788

Author: RadWolfie

src/OOVPADatabase/D3D8LTCG/3911.inl

@@ -193,22 +193,27 @@ OOVPA_SIG_MATCH(
 // ******************************************************************
 // * D3DDevice_SetTextureState_ColorKeyColor
 // ******************************************************************
-//83C008C1E707890689 ...C3
-OOVPA_SIG_HEADER_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor_0__LTCG_esi1_ebx2,
-                         2024)
+OOVPA_SIG_HEADER_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor_0__LTCG_eax1_ebx2,
+                         3911)
 OOVPA_SIG_MATCH(
 
-    { 0x01, 0x8B },
+    // push esi
+    OV_MATCH(0x00, 0x56),
+
+    // mov edi, param_1
+    // mov eax, [e??]
+    OV_MATCH(0x0B, 0x8B, 0xF8, 0x8B),
+    // cmp eax, ecx
+    // jne +0x07
+    OV_MATCH(0x0F, 0x3B, 0xC1, 0x72, 0x07),
 
-    { 0x26, 0x83 },
-    { 0x27, 0xC0 },
-    { 0x28, 0x08 },
-    { 0x29, 0xC1 },
-    { 0x2A, 0xE7 },
-    { 0x2B, 0x07 },
-    { 0x2C, 0x89 },
-    { 0x2D, 0x06 },
-    { 0x2E, 0x89 },
+    // lea e??, [e?? * 0x04 + 0x40AE0] // 0x40AE0 is a reliable hardcoded value across all builds.
+    OV_MATCH(0x1A, 0x8D),
+    OV_MATCH(0x1D, 0xE0, 0x0A, 0x04, 0x00),
+
+    // This is required OV pair to tell the difference from the (symbol)_4__LTCG_eax1 signature.
+    // ret
+    OV_MATCH(0x36, 0xC3),
     //
 );
 

src/OOVPADatabase/D3D8LTCG/5233.inl

@@ -115,22 +115,27 @@ OOVPA_SIG_MATCH(
 // ******************************************************************
 // * D3DDevice_SetTextureState_ColorKeyColor
 // ******************************************************************
-//8D0CB5E00A0400 ...C3
-OOVPA_SIG_HEADER_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor_0__LTCG_esi1_ebx2,
-                         2036)
+OOVPA_SIG_HEADER_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor_0__LTCG_eax1_ebx2,
+                         5233)
 OOVPA_SIG_MATCH(
 
-    { 0x00, 0x56 },
+    // push esi
+    OV_MATCH(0x00, 0x56),
 
-    { 0x21, 0x8D },
-    { 0x22, 0x0C },
-    { 0x23, 0xB5 },
-    { 0x24, 0xE0 },
-    { 0x25, 0x0A },
-    { 0x26, 0x04 },
-    { 0x27, 0x00 },
+    // mov esi, param_1
+    // mov eax, [e??]
+    OV_MATCH(0x0B, 0x8B, 0xF0, 0x8B),
+    // cmp eax, ecx
+    // jne +0x0E
+    OV_MATCH(0x0F, 0x3B, 0xC1, 0x72, 0x0E),
 
-    { 0x3D, 0xC3 },
+    // lea e??, [e?? * 0x4 + 0x40AE0] // 0x40AE0 is a reliable hardcoded value across all builds.
+    OV_MATCH(0x21, 0x8D),
+    OV_MATCH(0x24, 0xE0, 0x0A, 0x04, 0x00),
+
+    // This is required OV pair to tell the difference from the (symbol)_4__LTCG_eax1 signature.
+    // ret
+    OV_MATCH(0x3D, 0xC3),
     //
 );
 

src/OOVPADatabase/D3D8LTCG/5788.inl

@@ -482,20 +482,28 @@ OOVPA_SIG_MATCH(
 // ******************************************************************
 // * D3DDevice_SetTextureState_ColorKeyColor
 // ******************************************************************
-//E00A040089 ...C3
-OOVPA_SIG_HEADER_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor_0__LTCG_esi1_ebx2,
-                         2048)
+// Generic OOVPA as of 5788 and newer
+OOVPA_SIG_HEADER_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor_0__LTCG_eax1_ebx2,
+                         5788)
 OOVPA_SIG_MATCH(
 
-    { 0x01, 0x57 },
-    { 0x0B, 0x8B },
-    { 0x1D, 0xE8 },
-
-    { 0x25, 0xE0 },
-    { 0x26, 0x0A },
-    { 0x27, 0x04 },
-    { 0x28, 0x00 },
-    { 0x29, 0x89 },
+    // push esi
+    OV_MATCH(0x00, 0x56),
+
+    // mov esi, param_1
+    // mov eax, [e??]
+    OV_MATCH(0x0B, 0x8B, 0xF0, 0x8B),
+    // cmp eax, ecx
+    // jne +0x0F
+    OV_MATCH(0x0F, 0x3B, 0xC1, 0x72, 0x0F),
+
+    // lea e??, [e?? * 0x04 + 0x40AE0] // 0x40AE0 is a reliable hardcoded value across all builds.
+    OV_MATCH(0x22, 0x8D),
+    OV_MATCH(0x25, 0xE0, 0x0A, 0x04, 0x00),
+
+    // This is required OV pair to tell the difference from the (symbol)_4__LTCG_eax1 signature.
+    // ret
+    OV_MATCH(0x3E, 0xC3),
     //
 );
 

src/OOVPADatabase/D3D8LTCG_OOVPA.c

@@ -340,8 +340,8 @@ static OOVPATable D3D8LTCG_OOVPA_Table[] = {
                     SYM_SIG(2024)),
     REGISTER_OOVPAS(SYM_FUN(D3DDevice_SetTextureState_ColorKeyColor, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, Stage), PARAM(psh, Value))),
                     SYM_SIG(1024, 1036)),
-    REGISTER_OOVPAS(SYM_FUN_LTCG(D3DDevice_SetTextureState_ColorKeyColor, CALL(unk), STACK(0), PARAMS(PARAM(esi, Stage), PARAM(ebx, Value))),
-                    SYM_SIG(2024, 2036, 2048)),
+    REGISTER_OOVPAS(SYM_FUN_LTCG(D3DDevice_SetTextureState_ColorKeyColor, CALL(unk), STACK(0), PARAMS(PARAM(eax, Stage), PARAM(ebx, Value))),
+                    SYM_SIG(3911, 5233, 5788)),
     REGISTER_OOVPAS(SYM_FUN_LTCG(D3DDevice_SetTextureState_ColorKeyColor, CALL(unk), STACK(4), PARAMS(PARAM(eax, Stage), PARAM(psh, Value))),
                     SYM_SIG(2048, 2060)),
     REGISTER_OOVPAS_M(SYM_FUN(D3DDevice_SetTextureState_TexCoordIndex, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, Stage), PARAM(psh, Value))),

src/test/libverify/D3D8.cpp

@@ -327,7 +327,7 @@ static const library_list database_full = {
                      REGISTER_SYMBOL(D3DDevice_SetTextureState_BumpEnv_8__LTCG_eax1, VER_RANGE(3911))),
     REGISTER_SYMBOLS(D3DDevice_SetTextureState_ColorKeyColor,
                      REGISTER_SYMBOL(D3DDevice_SetTextureState_ColorKeyColor, VER_RANGE(3911)),
-                     REGISTER_SYMBOL(D3DDevice_SetTextureState_ColorKeyColor_0__LTCG_esi1_ebx2, VER_RANGE(3911)),
+                     REGISTER_SYMBOL(D3DDevice_SetTextureState_ColorKeyColor_0__LTCG_eax1_ebx2, VER_RANGE(3911)),
                      REGISTER_SYMBOL(D3DDevice_SetTextureState_ColorKeyColor_4__LTCG_eax1, VER_RANGE(3911))),
     REGISTER_SYMBOL_INLINE(D3DDevice_SetTextureState_Deferred, VER_RANGE(3911, 4034)),
     REGISTER_SYMBOLS(D3DDevice_SetTextureState_TexCoordIndex,