Merge pull request #227 from RadWolfie/sigs-lower

Lower couple of OOVPA signatures

Author: RadWolfie

src/OOVPADatabase/D3D8/4039.inl

@@ -814,3 +814,23 @@ OOVPA_SIG_MATCH(
     { 0x2E, 0x0F },
     //
 );
+
+// ******************************************************************
+// * D3DDevice_FlushVertexCache
+// ******************************************************************
+OOVPA_SIG_HEADER_NO_XREF(D3DDevice_FlushVertexCache,
+                         4039)
+OOVPA_SIG_MATCH(
+
+    { 0x00, 0x56 },
+    { 0x07, 0x8B },
+    { 0x08, 0x06 },
+    { 0x0D, 0x05 },
+    { 0x13, 0xC7 },
+    { 0x15, 0x10 },
+    { 0x17, 0x04 },
+    { 0x1C, 0x00 },
+    { 0x21, 0xC0 },
+    { 0x26, 0xC3 },
+    //
+);

src/OOVPADatabase/D3D8/4134.inl

@@ -564,26 +564,6 @@ OOVPA_SIG_MATCH(
     //
 );
 
-// ******************************************************************
-// * D3DDevice_FlushVertexCache
-// ******************************************************************
-OOVPA_SIG_HEADER_NO_XREF(D3DDevice_FlushVertexCache,
-                         4134)
-OOVPA_SIG_MATCH(
-
-    { 0x00, 0x56 },
-    { 0x07, 0x8B },
-    { 0x08, 0x06 },
-    { 0x0D, 0x05 },
-    { 0x13, 0xC7 },
-    { 0x15, 0x10 },
-    { 0x17, 0x04 },
-    { 0x1C, 0x00 },
-    { 0x21, 0xC0 },
-    { 0x26, 0xC3 },
-    //
-);
-
 // ******************************************************************
 // * D3DDevice_MakeSpace
 // ******************************************************************

src/OOVPADatabase/D3D8_OOVPA.c

@@ -62,7 +62,7 @@
 //   * D3DDevice_End (4034)
 //   * D3DDevice_EndPushBuffer (3950, 4034, 4242, 4831, 5028)
 //   * D3DDevice_EndStateBlock (3950, 4034, 4039, 4721, 4831, 5028, 5120)
-//   * D3DDevice_FlushVertexCache (4034, 4039)
+//   * D3DDevice_FlushVertexCache (4034)
 //   * D3DDevice_GetBackBuffer (4721, 4831, 4928, 5028, 5120, 5233, 5455)
 //   * D3DDevice_GetBackMaterial (4034)
 //   * D3DDevice_GetDepthStencilSurface (4034)
@@ -308,7 +308,7 @@ static OOVPATable D3D8_OOVPA_Table[] = {
     REGISTER_OOVPAS(SYM_FUN(D3DDevice_EndVisibilityTest, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, Index))),
                     SYM_SIG(3911)),
     REGISTER_OOVPAS(SYM_FUN(D3DDevice_FlushVertexCache, CALL(std), STACK(/*default*/), PARAMS(PARAM1(void))),
-                    SYM_SIG(3911, 4134)),
+                    SYM_SIG(3911, 4039)),
     REGISTER_OOVPAS(SYM_FUN(D3DDevice_GetBackBuffer, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, BackBuffer), PARAM(psh, Type), PARAM(psh, ppBackBuffer))),
                     SYM_SIG(3911, 4034, 4134, 4627)),
     REGISTER_OOVPAS(SYM_FUN(D3DDevice_GetBackBuffer2, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, BackBuffer))),

src/OOVPADatabase/Xapi/5120.inl

@@ -19,3 +19,25 @@ OOVPA_SIG_MATCH(
     { 0x70, 0x5F },
     //
 );
+
+// ******************************************************************
+// * MU_Init
+// ******************************************************************
+// Generic OOVPA as of 5120 and newer.
+OOVPA_SIG_HEADER_NO_XREF(MU_Init,
+                         5120)
+OOVPA_SIG_MATCH(
+
+    // push ebp
+    // mov ebp, esp
+    // sub esp, 0x0C
+    OV_MATCH(0x00, 0x55, 0x8B, 0xEC, 0x83, 0xEC, 0x0C),
+
+    // push eax
+    // push 0x00
+    // push 0x3A
+    // lea eax, [ebp-0x0C]
+    OV_MATCH(0x8E, 0x50, 0x6A, 0x00, 0x6A, 0x3A, 0x8D, 0x45, 0xF4), // Was 5233 offset 0x8A
+
+    //
+);

src/OOVPADatabase/Xapi/5233.inl

@@ -371,7 +371,6 @@
 #include "Xapi/4831.inl"
 #include "Xapi/5028.inl"
 #include "Xapi/5120.inl"
-#include "Xapi/5233.inl"
 #include "Xapi/5344.inl"
 #include "Xapi/5455.inl"
 
@@ -490,7 +489,7 @@ static OOVPATable XAPILIB_OOVPA_Table[] = {
     REGISTER_OOVPAS_C(SYM_FUN(GetTypeInformation2, CALL(fas), STACK(/*default*/), PARAMS(PARAM(_cl, XidType), PARAM(edx, pTypeIndex))),
                       SYM_SIG(4242, 5455)), // Final generic OOVPA: 5455; Removed: 0
     REGISTER_OOVPAS_M(SYM_FUN(MU_Init, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, pThis))),
-                      SYM_SIG(3911, 4242, 5233)),
+                      SYM_SIG(3911, 4242, 5120)),
     REGISTER_OOVPAS(SYM_FUN(OpenEventA, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, dwDesiredAccess), PARAM(psh, bInheritHandle), PARAM(psh, lpName))),
                     SYM_SIG(3911)), // Final generic OOVPA: 3911; Removed: 0
     REGISTER_OOVPAS(SYM_FUN(OutputDebugStringA, CALL(std), STACK(/*default*/), PARAMS(PARAM(psh, lpOutputString))),