More Moving and Additions

- Moved DirectSoundEnterCriticalSection to 3911
- Moved IDirectSoundBuffer_AddRef to 3911
- Moved IDirectSoundBuffer_Release to 3911
- Moved IDirectSoundBuffer_Unlock to 3911
- Moved IDirectSound_SetCooperativeLevel to 3911
- Moved IDirectSoundBuffer_StopEx to 3911
- Moved IDirectSoundBuffer_PlayEx to 3911
- Add CMcpxBuffer_Stop to 3911
- Add CDirectSoundBuffer_StopEx to 3911
- Add CDirectSoundBuffer_PlayEx to 3911

Generic OOVPA functions are...
- DirectSoundEnterCriticalSection
- IDirectSoundBuffer_AddRef
- IDirectSoundBuffer_Release
- IDirectSoundBuffer_Unlock
- IDirectSound_SetCooperativeLevel

Tested with
- [3925] Cel Damage
- [3936] Simpsons - Road Rage
- [4039] 007: Agent Under Fire
- [4134] Jet Set Radio Future
- [5558] Dino Crisis 3

src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl

@@ -33,6 +33,24 @@
 // ******************************************************************
 
 
+// ******************************************************************
+// * DirectSoundEnterCriticalSection
+// ******************************************************************
+//Generic OOVPA as of 3911 and newer.
+OOVPA_XREF(DirectSoundEnterCriticalSection, 3911, 7,
+
+    XREF_DirectSoundEnterCriticalSection,
+    XRefZero)
+
+        { 0x02, 0xB6 },
+        { 0x06, 0x00 },
+        { 0x0A, 0x74 },
+        { 0x0E, 0xC3 },
+        { 0x14, 0xFF },
+        { 0x1A, 0x33 },
+        { 0x1B, 0xC0 },
+OOVPA_END;
+
 // ******************************************************************
 // * IDirectSound_CreateSoundBuffer
 // ******************************************************************
@@ -65,6 +83,90 @@ OOVPA_XREF(IDirectSound_CreateSoundBuffer, 3911, 12,
         { 0x22, 0x10 },
 OOVPA_END;
 
+// ******************************************************************
+// * IDirectSoundBuffer_AddRef
+// ******************************************************************
+//Generic OOVPA as of 3911 and newer.
+OOVPA_NO_XREF(IDirectSoundBuffer_AddRef, 3911, 11)
+
+        // IDirectSoundBuffer_AddRef+0x04 : lea ecx, [eax-0x1C]
+        { 0x04, 0x8D },
+        { 0x05, 0x48 },
+        { 0x06, 0xE4 },
+
+        // IDirectSoundBuffer_AddRef+0x07 : neg eax; sbb eax, eax
+        { 0x07, 0xF7 },
+        { 0x08, 0xD8 },
+        { 0x09, 0x1B },
+        { 0x0A, 0xC0 },
+
+        // IDirectSoundBuffer_AddRef+0x10 : call dword ptr [ecx+0x04]
+        { 0x10, 0xFF },
+        { 0x11, 0x51 },
+        { 0x12, 0x04 },
+    
+        // IDirectSoundBuffer_AddRef+0x13 : ret 4
+        { 0x13, 0xC2 },
+OOVPA_END;
+
+// ******************************************************************
+// * IDirectSoundBuffer_Release
+// ******************************************************************
+//Generic OOVPA as of 3911 and newer.
+OOVPA_NO_XREF(IDirectSoundBuffer_Release, 3911, 11)
+
+        // IDirectSoundBuffer_Release+0x04 : lea ecx, [eax-0x1C]
+        { 0x04, 0x8D },
+        { 0x05, 0x48 },
+        { 0x06, 0xE4 },
+
+        // IDirectSoundBuffer_Release+0x07 : neg eax; sbb eax, eax
+        { 0x07, 0xF7 },
+        { 0x08, 0xD8 },
+        { 0x09, 0x1B },
+        { 0x0A, 0xC0 },
+
+        // IDirectSoundBuffer_Release+0x10 : call dword ptr [ecx+0x08]
+        { 0x10, 0xFF },
+        { 0x11, 0x51 },
+        { 0x12, 0x08 },
+
+        // IDirectSoundBuffer_Release+0x13 : ret 4
+        { 0x13, 0xC2 },
+OOVPA_END;
+
+// ******************************************************************
+// * IDirectSoundBuffer_Unlock
+// ******************************************************************
+//Generic OOVPA as of 3911 and newer.
+OOVPA_NO_XREF(IDirectSoundBuffer_Unlock, 3911, 5)
+
+    // IDirectSoundBuffer_Unlock+0x00 : xor eax, eax
+    { 0x00, 0x33 },
+    { 0x01, 0xC0 },
+
+    // IDirectSoundBuffer_Unlock+0x02 : ret 14h
+    { 0x02, 0xC2 },
+    { 0x03, 0x14 },
+    { 0x04, 0x00 }
+OOVPA_END;
+#if 0 // Cannot be used since this OOVPA does produce false detection. Use it only for as a model understanding.
+// ******************************************************************
+// * IDirectSound_SetCooperativeLevel
+// ******************************************************************
+//Generic OOVPA as of 3911 and newer.
+OOVPA_NO_XREF(IDirectSound_SetCooperativeLevel, 3911, 5)
+
+    // IDirectSound_SetCooperativeLevel+0x00 : xor eax, eax
+    { 0x00, 0x33 },
+    { 0x01, 0xC0 },
+
+    // IDirectSound_SetCooperativeLevel+0x02 : ret 0Ch
+    { 0x02, 0xC2 },
+    { 0x03, 0x0C },
+    { 0x04, 0x00 }
+OOVPA_END;
+#endif
 // ******************************************************************
 // * CDirectSoundVoice_SetVolume
 // ******************************************************************
@@ -120,13 +222,94 @@ OOVPA_XREF(IDirectSoundBuffer_SetVolume, 3911, 10,
         { 0x1A, 0x08 },
 OOVPA_END;
 
+// ******************************************************************
+// * CMcpxBuffer_Stop
+// ******************************************************************
+OOVPA_XREF(CMcpxBuffer_Stop, 3911, 10,
+
+	XREF_CMcpxBuffer_Stop,
+    XRefZero)
+
+        // CMcpxBuffer_Stop+0x08 : or eax, dword ptr [esp+10h]
+        { 0x08, 0x0B },
+        { 0x09, 0x44 },
+        { 0x0A, 0x24 },
+        { 0x0B, 0x10 },
+
+        // CMcpxBuffer_Stop+0x19 : push 3
+        { 0x19, 0x6A },
+        { 0x1A, 0x03 },
+
+        // CMcpxBuffer_Stop+0x24 : test [esp+10h], 2
+        { 0x24, 0x8B },
+        { 0x25, 0xCE },
+
+        // CMcpxBuffer_Stop+0x31 : retn 0x08
+        { 0x31, 0xC2 },
+        { 0x32, 0x08 },
+OOVPA_END;
+
+// ******************************************************************
+// * CDirectSoundBuffer_StopEx
+// ******************************************************************
+OOVPA_XREF(CDirectSoundBuffer_StopEx, 3911, 11,
+
+    XREF_CDirectSoundBuffer_StopEx,
+    XRefOne)
+
+        XREF_ENTRY( 0x39, XREF_CMcpxBuffer_Stop ),
+
+        // CDirectSoundBuffer_StopEx+0x0F : test al, 3
+        { 0x0F, 0xA8 },
+        { 0x10, 0x03 },
+
+
+        // CDirectSoundBuffer_StopEx+0x15 : and eax, 1
+        { 0x15, 0x83 },
+        { 0x16, 0xE0 },
+        { 0x17, 0x01 },
+
+        // CDirectSoundBuffer_StopEx+0x32 : push dword ptr [ebp+0Ch]
+        { 0x32, 0xFF },
+        { 0x33, 0x75 },
+        { 0x34, 0x0C },
+
+        // CDirectSoundBuffer_StopEx+0x53 : retn 0x10
+        { 0x53, 0xC2 },
+        { 0x54, 0x10 },
+OOVPA_END;
+
+// ******************************************************************
+// * IDirectSoundBuffer_StopEx
+// ******************************************************************
+//Generic OOVPA as of 3911 and newer.
+OOVPA_XREF(IDirectSoundBuffer_StopEx, 3911, 9,
+
+    XRefNoSaveIndex,
+    XRefOne)
+
+        // IDirectSoundBuffer_StopEx+0x1D : call [CDirectSoundBuffer::StopEx]
+        XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_StopEx ), 
+
+        { 0x03, 0x10 },
+        { 0x08, 0xFF },
+        { 0x0D, 0xC8 },
+        { 0x12, 0x83 },
+        { 0x17, 0x1B },
+        { 0x1C, 0xE8 },
+        { 0x21, 0xC2 },
+        { 0x22, 0x10 },
+OOVPA_END;
+
 // ******************************************************************
 // * CDirectSoundBuffer_Stop
 // ******************************************************************
-OOVPA_XREF(CDirectSoundBuffer_Stop, 3911, 12,
+OOVPA_XREF(CDirectSoundBuffer_Stop, 3911, 13,
 
     XREF_CDirectSoundBuffer_Stop,
-    XRefZero)
+    XRefOne)
+
+        XREF_ENTRY( 0x14, XREF_CDirectSoundBuffer_StopEx ),
 
         // CDirectSoundBuffer_Stop+0x07 : mov eax, 0x80004005
         { 0x07, 0x6A },
@@ -220,16 +403,39 @@ OOVPA_XREF(CMcpxBuffer_Play, 3911, 9,
         { 0x36, 0xC2 },
 OOVPA_END;
 
+// ******************************************************************
+// * CDirectSoundBuffer_PlayEx
+// ******************************************************************
+OOVPA_XREF(CDirectSoundBuffer_PlayEx, 3911, 9,
+
+    XREF_CDirectSoundBuffer_PlayEx,
+    XRefOne)
+
+        XREF_ENTRY( 0x21, XREF_CMcpxBuffer_Play ),
+
+        { 0x08, 0xF0 },
+
+        { 0x13, 0x24 },
+        { 0x17, 0x24 },
+        { 0x1B, 0x24 },
+
+        { 0x25, 0x85 },
+        { 0x27, 0x8B },
+
+
+        { 0x3A, 0xC2 },
+        { 0x3B, 0x10 },
+OOVPA_END;
+
 // ******************************************************************
 // * CDirectSoundBuffer_Play
 // ******************************************************************
-//TODO: This OOVPA seem to be weak.
+OOVPA_XREF(CDirectSoundBuffer_Play, 3911, 8,
-OOVPA_XREF(CDirectSoundBuffer_Play, 3911, 7,
 
     XREF_CDirectSoundBuffer_Play,
-    XRefZero)
+    XRefOne)
 
-        //Offset 0x16, XREF caller is CDirectSoundBuffer_PlayEx
+        XREF_ENTRY( 0x16, XREF_CDirectSoundBuffer_PlayEx ),
 
         { 0x07, 0xFF },
         { 0x0C, 0xF0 },
@@ -277,6 +483,26 @@ OOVPA_XREF(IDirectSoundBuffer_Play, 3911, 16,
         { 0x22, 0x10 },
 OOVPA_END;
 
+// ******************************************************************
+// * IDirectSoundBuffer_PlayEx
+// ******************************************************************
+//Generic OOVPA as of 3911 and newer.
+OOVPA_XREF(IDirectSoundBuffer_PlayEx, 3911, 8,
+
+    XRefNoSaveIndex,
+    XRefOne)
+
+        XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_PlayEx ),
+
+        { 0x03, 0x10 },
+        { 0x08, 0xFF },
+        { 0x0D, 0xC8 },
+        { 0x12, 0x83 },
+        { 0x17, 0x1B },
+        { 0x1C, 0xE8 },
+        { 0x21, 0xC2 },
+OOVPA_END;
+
 // ******************************************************************
 // * CMcpxBuffer_GetCurrentPosition
 // ******************************************************************
@@ -397,7 +623,7 @@ OOVPA_XREF(CDirectSoundBuffer_GetStatus, 3911, 10,
     XREF_CDirectSoundBuffer_GetStatus,
     XRefOne)
 
-        // CDirectSoundBuffer_GetStatus+0x14 : call [CMcpxBuffer::GetStatus]
+        // CDirectSoundBuffer_GetStatus+0x15 : call [CMcpxBuffer::GetStatus]
         XREF_ENTRY( 0x15, XREF_CMcpxBuffer_GetStatus),
 
         // CDirectSoundBuffer_GetStatus+0x07 : push [esp+0x10]

src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl

@@ -262,7 +262,7 @@ OOVPA_XREF(IDirectSound_CreateSoundBuffer, 3936, 10,
         { 0x21, 0xC2 },
         { 0x22, 0x10 },
 OOVPA_END;
-
+#if 0 // Moved to 3911
 // ******************************************************************
 // * IDirectSoundBuffer_Release
 // ******************************************************************
@@ -284,7 +284,7 @@ OOVPA_NO_XREF(IDirectSoundBuffer_Release, 3936, 10)
         { 0x11, 0x51 },
         { 0x12, 0x08 },
 OOVPA_END;
-
+#endif
 // ******************************************************************
 // * CMcpxVoiceClient_SetPitch
 // ******************************************************************
@@ -3308,7 +3308,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetConeAngles, 3936, 8,
         { 0x1C, 0xE8 },
         { 0x21, 0xC2 },
 OOVPA_END;
-
+#if 0  // Moved to 3911
 // ******************************************************************
 // * DirectSoundEnterCriticalSection
 // ******************************************************************
@@ -3325,7 +3325,7 @@ OOVPA_XREF(DirectSoundEnterCriticalSection, 3936, 7,
         { 0x1A, 0x33 },
         { 0x1B, 0xC0 },
 OOVPA_END;
-
+#endif
 // ******************************************************************
 // * CDirectSoundBuffer::PlayEx
 // ******************************************************************
@@ -3345,7 +3345,7 @@ OOVPA_XREF(CDirectSoundBuffer_PlayEx, 3936, 9,
         { 0x30, 0xFF },
         { 0x36, 0x8B },
 OOVPA_END;
-
+#if 0 // Moved to 3911
 // ******************************************************************
 // * IDirectSoundBuffer_PlayEx
 // ******************************************************************
@@ -3364,7 +3364,7 @@ OOVPA_XREF(IDirectSoundBuffer_PlayEx, 3936, 8,
         { 0x1C, 0xE8 },
         { 0x21, 0xC2 },
 OOVPA_END;
-
+#endif
 // ******************************************************************
 // * IDirectSound_AddRef
 // ******************************************************************
@@ -3405,7 +3405,7 @@ OOVPA_NO_XREF(DirectSoundGetSampleTime, 3936, 6)
         { 0x04, 0xFE },
         { 0x05, 0xC3 },
 OOVPA_END;
-
+#if 0 // Moved to 3911
 // ******************************************************************
 // * IDirectSoundBuffer_AddRef
 // ******************************************************************
@@ -3427,7 +3427,7 @@ OOVPA_NO_XREF(IDirectSoundBuffer_AddRef, 3936, 10)
         { 0x11, 0x51 },
         { 0x12, 0x04 },
 OOVPA_END;
-
+#endif
 // ******************************************************************
 // * CDirectSoundBuffer::SetMinDistance
 // ******************************************************************
@@ -3948,21 +3948,6 @@ OOVPA_XREF(IDirectSoundBuffer_SetConeOutsideVolume, 3936, 9,
     { 0x1F, 0x00 }
 OOVPA_END;
 
-// ******************************************************************
-// * IDirectSoundBuffer_Unlock
-// ******************************************************************
-OOVPA_NO_XREF(IDirectSoundBuffer_Unlock, 3936, 5)
-
-    // IDirectSoundBuffer_Unlock+0x00 : xor eax, eax
-    { 0x00, 0x33 },
-    { 0x01, 0xC0 },
-
-    // IDirectSoundBuffer_Unlock+0x02 : ret 14h
-    { 0x02, 0xC2 },
-    { 0x03, 0x14 },
-    { 0x04, 0x00 }
-OOVPA_END;
-
 // ******************************************************************
 // * DSound_3936
 // ******************************************************************
@@ -3976,7 +3961,7 @@ OOVPATable DSound_3936[] = {
 	REGISTER_OOVPA(IDirectSound_CreateSoundStream, 3936, PATCH),
 	REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 3936, XREF),
 	REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3936, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH),
 	REGISTER_OOVPA(CMcpxVoiceClient_SetPitch, 3936, XREF),
 	REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 3936, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 3936, PATCH),
@@ -4084,12 +4069,12 @@ OOVPATable DSound_3936[] = {
 	REGISTER_OOVPA(IDirectSound_GetCaps, 3936, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetConeAngles, 3936, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetConeAngles, 3936, PATCH),
-	REGISTER_OOVPA(DirectSoundEnterCriticalSection, 3936, XREF),
+	REGISTER_OOVPA(DirectSoundEnterCriticalSection, 3911, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_PlayEx, 3936, XREF),
-	REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3911, PATCH),
 	REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH),
 	REGISTER_OOVPA(DirectSoundGetSampleTime, 3936, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetMinDistance, 3936, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetMinDistance, 3936, PATCH),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetMaxDistance, 3936, XREF),
@@ -4113,7 +4098,7 @@ OOVPATable DSound_3936[] = {
     REGISTER_OOVPA(IDirectSoundBuffer_SetConeOrientation, 3936, PATCH),
     REGISTER_OOVPA(CDirectSoundBuffer_SetConeOutsideVolume, 3936, XREF),
     REGISTER_OOVPA(IDirectSoundBuffer_SetConeOutsideVolume, 3936, PATCH),
-    REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3936, PATCH),
+    REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH),
     REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH), // TODO: Add CDirectSoundBuffer_SetLoopRegion before 3935-ish
 };
 

src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl

@@ -2975,8 +2975,8 @@ OOVPATable DSound_4134[] = {
     REGISTER_OOVPA(CMcpxBuffer_Stop, 4134, XREF),
     REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), // +s
+	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 4134, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetAllParameters, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetAllParameters, 4134, PATCH), // Use that for now. Okay, it's your call pal...
@@ -3002,7 +3002,7 @@ OOVPATable DSound_4134[] = {
 	REGISTER_OOVPA(CDirectSoundStream_SetMixBinVolumes2, 4134, PATCH),
 	REGISTER_OOVPA(CDirectSound_SetEffectData, 4134, XREF),
 	REGISTER_OOVPA(IDirectSound_SetEffectData, 4134, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH),
 };
 
 // ******************************************************************

src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl

@@ -457,7 +457,7 @@ OOVPA_XREF(CDirectSoundBuffer_StopEx, 4361, 8,
         { 0x46, 0x0B },
         { 0x52, 0x8B },
 OOVPA_END;
-
+#if 0 // Moved to 3911
 // ******************************************************************
 // * IDirectSoundBuffer_StopEx
 // ******************************************************************
@@ -476,7 +476,7 @@ OOVPA_XREF(IDirectSoundBuffer_StopEx, 4361, 8,
         { 0x1C, 0xE8 },
         { 0x21, 0xC2 },
 OOVPA_END;
-
+#endif
 // ******************************************************************
 // * DirectSound::CDirectSoundVoice::SetFormat
 // ******************************************************************
@@ -781,10 +781,10 @@ OOVPATable DSound_4361[] = {
 	REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4134, XREF),
 	REGISTER_OOVPA(CMcpxBuffer_Play2, 4361, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_PlayEx, 4361, XREF),
-	REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSoundBuffer_StopEx, 4361, XREF),
-	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 4361, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH),
 	REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoiceSettings_SetMixBins, 4134, XREF),
 	REGISTER_OOVPA(CDirectSoundVoice_SetMixBins, 4134, XREF),
@@ -794,11 +794,12 @@ OOVPATable DSound_4361[] = {
 	REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 4242, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4242, PATCH),
 	REGISTER_OOVPA(CDirectSoundStream_SetFormat, 4242, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 3936, XREF),
 	REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF),
+	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH),
 };
 
 // ******************************************************************

src/CxbxKrnl/HLEDataBase/DSound.1.0.4432.inl

@@ -128,7 +128,7 @@ OOVPATable DSound_4432[] = {
 	REGISTER_OOVPA(IDirectSound_Release, 3936, PATCH),
 	REGISTER_OOVPA(CDirectSound_CreateSoundBuffer, 4134, XREF),
 	REGISTER_OOVPA(IDirectSound_CreateSoundBuffer, 3911, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetLoopRegion, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetLoopRegion, 3911, PATCH),
 	REGISTER_OOVPA(CMcpxBuffer_SetBufferData, 4134, XREF),
@@ -156,10 +156,10 @@ OOVPATable DSound_4432[] = {
 	REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 4134, XREF),
 	REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 4134, PATCH),
 	REGISTER_OOVPA(IDirectSound_DownloadEffectsImage, 3936, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetPlayRegion, 4361, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetPlayRegion, 4361, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF),
 	REGISTER_OOVPA(IDirectSound_GetCaps, 3936, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF),

src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl

@@ -1584,7 +1584,7 @@ OOVPATable DSound_4627[] = {
     REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF),
     REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), // +s
+	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 4242, XREF),
 	REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 4721, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 4242, XREF),
@@ -1593,7 +1593,7 @@ OOVPATable DSound_4627[] = {
 	REGISTER_OOVPA(CDirectSoundStream_SetMixBinVolumes2, 4134, PATCH),
 	REGISTER_OOVPA(CDirectSound_EnableHeadphones, 4627, XREF),
 	REGISTER_OOVPA(IDirectSound_EnableHeadphones, 4627, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_GetOutputLevels, 4627, XREF),
 	REGISTER_OOVPA(IDirectSound_GetOutputLevels, 4627, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 4134, XREF),
@@ -1622,10 +1622,10 @@ OOVPATable DSound_4627[] = {
 	REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4134, PATCH),
 	REGISTER_OOVPA(CMcpxBuffer_Play2, 4361, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_PlayEx, 4361, XREF),
-	REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3911, PATCH),
 	REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_StopEx, 4361, XREF),
-	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 4361, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_SetVelocity, 4134, XREF),
 	REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF),
@@ -1650,7 +1650,7 @@ OOVPATable DSound_4627[] = {
 	REGISTER_OOVPA(CDirectSoundBuffer_SetLFO, 4627, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 4627, PATCH),
 	REGISTER_OOVPA(CDirectSoundStream_SetLFO, 4627, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF),
 	REGISTER_OOVPA(IDirectSound_GetCaps, 3936, PATCH),
 };

src/CxbxKrnl/HLEDataBase/DSound.1.0.5028.inl

@@ -180,13 +180,13 @@ OOVPATable DSound_5028[] = {
     REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF),
     REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH), // +s
+	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 4721, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 4242, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4242, PATCH),
 	REGISTER_OOVPA(CDirectSound_EnableHeadphones, 4627, XREF),
 	REGISTER_OOVPA(IDirectSound_EnableHeadphones, 4627, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_GetOutputLevels, 4627, XREF),
 	REGISTER_OOVPA(IDirectSound_GetOutputLevels, 4627, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetAllParameters, 4134, XREF),
@@ -218,10 +218,10 @@ OOVPATable DSound_5028[] = {
 	REGISTER_OOVPA(IDirectSoundBuffer_SetFilter, 4134, PATCH),
 	REGISTER_OOVPA(CMcpxBuffer_Play2, 4361, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_PlayEx, 4361, XREF),
-	REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3911, PATCH),
 	REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_StopEx, 4361, XREF),
-	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 4361, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_SetVelocity, 4134, XREF),
 	REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF),
@@ -246,7 +246,7 @@ OOVPATable DSound_5028[] = {
 	REGISTER_OOVPA(CDirectSoundBuffer_SetLFO, 4627, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetLFO, 4627, PATCH),
 	REGISTER_OOVPA(CDirectSoundStream_SetLFO, 4627, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF),
 	REGISTER_OOVPA(IDirectSound_GetCaps, 3936, PATCH),
 };

src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl

@@ -452,7 +452,7 @@ OOVPATable DSound_5233[] = {
     REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF),
     REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4134, PATCH), // (This is actually the XREF we are using)
 	REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 4721, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 4242, XREF),
@@ -505,7 +505,7 @@ OOVPATable DSound_5233[] = {
 	REGISTER_OOVPA(CDirectSoundVoice_SetMixBinVolumes, 4134, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes2, 4134, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 4361, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_GetOutputLevels, 4627, XREF),
 	REGISTER_OOVPA(IDirectSound_GetOutputLevels, 4627, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetOutputBuffer, 4627, XREF),
@@ -528,13 +528,14 @@ OOVPATable DSound_5233[] = {
 	REGISTER_OOVPA(CDirectSoundStream_SetConeOrientation, 4134, PATCH),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4627, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 4627, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF),
 	REGISTER_OOVPA(IDirectSound_GetCaps, 3936, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetPitch, 4039, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 3936, XREF),
 	REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF),
+	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH),
 };
 
 // ******************************************************************

src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl

@@ -962,7 +962,7 @@ OOVPATable DSound_5344[] = {
     REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF),
     REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetFormat, 4721, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetFormat, 4242, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetFormat, 4242, PATCH),
@@ -1013,7 +1013,7 @@ OOVPATable DSound_5344[] = {
 	REGISTER_OOVPA(CDirectSoundBuffer_SetMixBinVolumes, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetMixBinVolumes2, 4134, PATCH),
 	REGISTER_OOVPA(CDirectSoundBuffer_StopEx, 4361, XREF),
-	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 4361, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_GetOutputLevels, 4627, XREF),
 	REGISTER_OOVPA(IDirectSound_GetOutputLevels, 4627, PATCH),
 	REGISTER_OOVPA(IDirectSound_SetEffectData, 5344, PATCH),
@@ -1042,9 +1042,10 @@ OOVPATable DSound_5344[] = {
 	REGISTER_OOVPA(CDirectSoundStream_SetConeOrientation, 4134, PATCH),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4627, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 4627, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF),
 	REGISTER_OOVPA(IDirectSound_GetCaps, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH),
 };
 
 // ******************************************************************

src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl

@@ -1680,7 +1680,7 @@ OOVPATable DSound_5558[] = {
 	REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_SetI3DL2Listener, 5558, XREF),
 	REGISTER_OOVPA(IDirectSound_SetI3DL2Listener, 3936, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH),
 	REGISTER_OOVPA(CFullHRTFSource_GetCenterVolume, 5558, XREF),
 	REGISTER_OOVPA(CHRTFSource_SetFullHRTF5Channel, 5558, XREF),
 	REGISTER_OOVPA(DirectSoundUseFullHRTF, 5558, PATCH),
@@ -1789,6 +1789,8 @@ OOVPATable DSound_5558[] = {
 	REGISTER_OOVPA(CDirectSoundBuffer_SetPitch, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetPitch, 3936, XREF),
 	REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF),
+	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH),
 };
 
 // ******************************************************************

src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl

@@ -592,11 +592,11 @@ OOVPATable DSound_5788[] = {
 	REGISTER_OOVPA(CMcpxBuffer_Play, 4361, XREF),
 	REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_StopEx, 4361, XREF),
-	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 4361, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH),
     REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF),
     REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH),
 	REGISTER_OOVPA(CFullHRTFSource_GetCenterVolume, 5558, XREF),
 	REGISTER_OOVPA(CHRTFSource_SetFullHRTF5Channel, 5558, XREF),
 	REGISTER_OOVPA(DirectSoundUseFullHRTF, 5558, PATCH),
@@ -655,7 +655,7 @@ OOVPATable DSound_5788[] = {
 	REGISTER_OOVPA(IDirectSoundBuffer_SetVolume, 4039, PATCH),
 	REGISTER_OOVPA(CDirectSoundStream_SetVolume, 4134, PATCH), // This is actually the XREF we are using
 	REGISTER_OOVPA(CDirectSoundBuffer_PlayEx, 5788, XREF),
-	REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetRolloffFactor, 5788, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffFactor, 5788, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 5788, PATCH),
@@ -721,9 +721,10 @@ OOVPATable DSound_5788[] = {
 	REGISTER_OOVPA(CDirectSoundStream_Use3DVoiceData, 5558, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4627, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 4627, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF),
 	REGISTER_OOVPA(IDirectSound_GetCaps, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH),
 };
 
 // ******************************************************************

src/CxbxKrnl/HLEDataBase/DSound.1.0.5849.inl

@@ -133,11 +133,11 @@ OOVPATable DSound_5849[] = {
 	REGISTER_OOVPA(CMcpxBuffer_Play, 4361, XREF),
 	REGISTER_OOVPA(CMcpxBuffer_Stop2, 4361, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_StopEx, 4361, XREF),
-	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 4361, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_StopEx, 3911, PATCH),
     REGISTER_OOVPA(CMcpxBuffer_Stop, 4242, XREF),
     REGISTER_OOVPA(CDirectSoundBuffer_Stop, 4134, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_Stop, 3911, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Release, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetHeadroom, 5558, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetHeadroom, 5558, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetHeadroom, 5558, PATCH),
@@ -172,7 +172,7 @@ OOVPATable DSound_5849[] = {
 	REGISTER_OOVPA(CDirectSoundStream_SetPitch, 4134, XREF),
 	REGISTER_OOVPA(CMcpxBuffer_Play2, 4361, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_PlayEx, 5788, XREF),
-	REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_PlayEx, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSoundVoice_SetRolloffFactor, 5788, XREF),
 	REGISTER_OOVPA(CDirectSoundBuffer_SetRolloffFactor, 5788, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetRolloffFactor, 5788, PATCH),
@@ -208,7 +208,7 @@ OOVPATable DSound_5849[] = {
 	REGISTER_OOVPA(CDirectSoundBuffer_Play, 5788, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_Play, 5558, PATCH),
 	REGISTER_OOVPA(IDirectSound_AddRef, 3936, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_AddRef, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_SetDistanceFactor, 5558, XREF),
 	REGISTER_OOVPA(IDirectSound_SetDistanceFactor, 4134, PATCH),
 	REGISTER_OOVPA(CDirectSound_SetAllParameters, 5558, XREF),
@@ -239,7 +239,7 @@ OOVPATable DSound_5849[] = {
 	REGISTER_OOVPA(CDirectSoundBuffer_SetNotificationPositions, 4627, XREF),
 	REGISTER_OOVPA(IDirectSoundBuffer_SetNotificationPositions, 4627, PATCH),
 	REGISTER_OOVPA(CDirectSoundStream_SetFrequency, 5233, PATCH),
-	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3936, PATCH),
+	REGISTER_OOVPA(IDirectSoundBuffer_Unlock, 3911, PATCH),
 	REGISTER_OOVPA(CDirectSound_GetCaps, 4361, XREF),
 	REGISTER_OOVPA(IDirectSound_GetCaps, 3936, PATCH),
 };

src/CxbxKrnl/HLEDataBase/DSound.OOVPA.inl

@@ -57,7 +57,7 @@
 OOVPATable DSound_OOVPAV2[] = {
 
     REGISTER_OOVPAS(XAudioCalculatePitch, XREF, 3936),
-    REGISTER_OOVPAS(DirectSoundEnterCriticalSection, XREF, 3936),
+    REGISTER_OOVPAS(DirectSoundEnterCriticalSection, XREF, 3911),
     REGISTER_OOVPAS(CMcpxAPU_Commit3dSettings, XREF, 3936),
     REGISTER_OOVPAS(CMcpxAPU_ServiceDeferredCommandsLow, XREF, 3936),
     REGISTER_OOVPAS(CMcpxAPU_Set3dDistanceFactor, XREF, 3936),
@@ -75,7 +75,7 @@ OOVPATable DSound_OOVPAV2[] = {
     REGISTER_OOVPAS(CMcpxBuffer_Play2, XREF, 4361, 5558), // NOTE: ?Play@CMcpxBuffer@DirectSound@@QAEJ_JK@Z
     REGISTER_OOVPAS(CMcpxBuffer_SetBufferData, XREF, 4134, 5788),
     REGISTER_OOVPAS(CMcpxBuffer_SetCurrentPosition, XREF, 3936, 4134, 5558, 5788),
-    REGISTER_OOVPAS(CMcpxBuffer_Stop, XREF, 4134, 4242),
+    REGISTER_OOVPAS(CMcpxBuffer_Stop, XREF, 3911, 4134, 4242),
     REGISTER_OOVPAS(CMcpxBuffer_Stop2, XREF, 4361),
     REGISTER_OOVPAS(CMcpxStream_Pause, XREF, 4361, 4831, 5788),
     REGISTER_OOVPAS(CSensaura3d_GetFullHRTFFilterPair, XREF, 3925, 3936),
@@ -129,7 +129,7 @@ OOVPATable DSound_OOVPAV2[] = {
     REGISTER_OOVPAS(CDirectSoundBuffer_Lock, XREF, 3936, 4134),
     REGISTER_OOVPAS(CDirectSoundBuffer_Pause, XREF, 4928),
     REGISTER_OOVPAS(CDirectSoundBuffer_Play, XREF, 3911, 4039, 4134, 4361, 5558, 5788),
-    REGISTER_OOVPAS(CDirectSoundBuffer_PlayEx, XREF, 3936, 4361, 5788),
+    REGISTER_OOVPAS(CDirectSoundBuffer_PlayEx, XREF, 3911, 3936, 4361, 5788),
     REGISTER_OOVPAS(CDirectSoundBuffer_SetAllParameters, XREF, 4134),
     REGISTER_OOVPAS(CDirectSoundBuffer_SetBufferData, XREF, 3936, 4039, 4134, 5558, 5788),
     REGISTER_OOVPAS(CDirectSoundBuffer_SetConeAngles, XREF, 4134, 5558),
@@ -161,7 +161,7 @@ OOVPATable DSound_OOVPAV2[] = {
     REGISTER_OOVPAS(CDirectSoundBuffer_SetVelocity, XREF, 3936, 4134, 5558),
     REGISTER_OOVPAS(CDirectSoundBuffer_SetVolume, XREF, 4039, 4134, 5233),
     REGISTER_OOVPAS(CDirectSoundBuffer_Stop, XREF, 3911, 4039, 4134),
-    REGISTER_OOVPAS(CDirectSoundBuffer_StopEx, XREF, 4361),
+    REGISTER_OOVPAS(CDirectSoundBuffer_StopEx, XREF, 3911, 4361),
     REGISTER_OOVPAS(CDirectSoundBuffer_Use3DVoiceData, XREF, 5558),
     REGISTER_OOVPAS(CDirectSoundStream_FlushEx, XREF, 4627, 5233, 5788),
     REGISTER_OOVPAS(CDirectSoundStream_Pause, PATCH, 3936, 4361, 5558),
@@ -209,14 +209,14 @@ OOVPATable DSound_OOVPAV2[] = {
     REGISTER_OOVPAS(CDirectSound_SetRolloffFactor, XREF, 3936, 4039, 4134, 5344, 5558, 5788, 5849),
     REGISTER_OOVPAS(CDirectSound_SetVelocity, XREF, 3936, 4134, 4627, 5344, 5558),
     REGISTER_OOVPAS(CDirectSound_SynchPlayback, XREF, 5233, 5344, 5558),
-    REGISTER_OOVPAS(IDirectSoundBuffer_AddRef, PATCH, 3936),
+    REGISTER_OOVPAS(IDirectSoundBuffer_AddRef, PATCH, 3911),
     REGISTER_OOVPAS(IDirectSoundBuffer_GetCurrentPosition, PATCH, 3911),
     REGISTER_OOVPAS(IDirectSoundBuffer_GetStatus, PATCH, 3911),
     REGISTER_OOVPAS(IDirectSoundBuffer_Lock, PATCH, 3936, 5558),
     REGISTER_OOVPAS(IDirectSoundBuffer_Pause, PATCH, 4928),
     REGISTER_OOVPAS(IDirectSoundBuffer_Play, PATCH, 3911, 4361, 5558),
-    REGISTER_OOVPAS(IDirectSoundBuffer_PlayEx, PATCH, 3936),
+    REGISTER_OOVPAS(IDirectSoundBuffer_PlayEx, PATCH, 3911),
-    REGISTER_OOVPAS(IDirectSoundBuffer_Release, PATCH, 3936), // +s (from 4134's comment)
+    REGISTER_OOVPAS(IDirectSoundBuffer_Release, PATCH, 3911),
     REGISTER_OOVPAS(IDirectSoundBuffer_SetAllParameters, PATCH, 4134), // Use that for now. Okay, it's your call pal... (from 4134's comment)
     REGISTER_OOVPAS(IDirectSoundBuffer_SetBufferData, PATCH, 3936, 4134, 5558, 5788),
     REGISTER_OOVPAS(IDirectSoundBuffer_SetConeAngles, PATCH, 3936, 4134, 5558),
@@ -249,8 +249,8 @@ OOVPATable DSound_OOVPAV2[] = {
     REGISTER_OOVPAS(IDirectSoundBuffer_SetVelocity, PATCH, 3936, 5558),
     REGISTER_OOVPAS(IDirectSoundBuffer_SetVolume, PATCH, 3911, 3936, 4039),
     REGISTER_OOVPAS(IDirectSoundBuffer_Stop, PATCH, 3911),
-    REGISTER_OOVPAS(IDirectSoundBuffer_StopEx, PATCH, 4361),
+    REGISTER_OOVPAS(IDirectSoundBuffer_StopEx, PATCH, 3911),
-    REGISTER_OOVPAS(IDirectSoundBuffer_Unlock, PATCH, 3936),
+    REGISTER_OOVPAS(IDirectSoundBuffer_Unlock, PATCH, 3911),
     REGISTER_OOVPAS(IDirectSoundBuffer_Use3DVoiceData, PATCH, 5558),
     REGISTER_OOVPAS(IDirectSoundStream_FlushEx, PATCH, 4627),
     REGISTER_OOVPAS(IDirectSoundStream_SetConeOrientation, PATCH, 3936),
@@ -268,6 +268,7 @@ OOVPATable DSound_OOVPAV2[] = {
     REGISTER_OOVPAS(IDirectSound_GetOutputLevels, PATCH, 4627, 5558),
     REGISTER_OOVPAS(IDirectSound_Release, PATCH, 3936),
     REGISTER_OOVPAS(IDirectSound_SetAllParameters, PATCH, 3936),
+    //REGISTER_OOVPAS(IDirectSound_SetAllParameters, XREF, 3911), //Cannot be used since this OOVPA does produce false detection.
     REGISTER_OOVPAS(IDirectSound_SetDistanceFactor, PATCH, 3936, 4134),
     REGISTER_OOVPAS(IDirectSound_SetDopplerFactor, PATCH, 3936, 4134),
     REGISTER_OOVPAS(IDirectSound_SetEffectData, PATCH, 4134, 5344),