Fixup an comment and OOVPA

Revert
- Comment-block in XAPI
- lstrcmpiW 3911
- ReadFileEx 3911
- WriteFileEx 3911
- D3DDevice_SetStreamSource 4034

Remove
- CDirectSound_EnableHeadphones 3911

src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl

@@ -256,12 +256,43 @@ OOVPA_XREF(D3DDevice_SetStreamSource, 4034, 1+14, // 1+28
 
         XREF_ENTRY( 0x22, XREF_G_STREAM ), // Derived
 
+#if 0
+        { 0x00, 0x8B },
+        { 0x01, 0x0D },
+
+        { 0x06, 0x56 },
+        { 0x07, 0x57 },
+#endif
+
         // D3DDevice_SetStreamSource+0x08 : mov edi, [esp+8+0x04]
         { 0x08, 0x8B },
         { 0x09, 0x7C },
         { 0x0A, 0x24 },
         { 0x0B, 0x10 },
 
+#if 0
+        { 0x0C, 0x85 },
+        { 0x0D, 0xFF },
+        { 0x0E, 0x74 },
+        { 0x0F, 0x06 },
+        { 0x10, 0x81 },
+        { 0x11, 0x07 },
+        { 0x12, 0x00 },
+        { 0x13, 0x00 },
+        { 0x14, 0x08 },
+        { 0x15, 0x00 },
+        { 0x16, 0x8B },
+        { 0x17, 0x44 },
+        { 0x18, 0x24 },
+        { 0x19, 0x0C },
+        { 0x1A, 0x8D },
+        { 0x1B, 0x34 },
+        { 0x1C, 0x40 },
+        { 0x1D, 0xC1 },
+        { 0x1E, 0xE6 },
+        { 0x1F, 0x02 },
+#endif
+
         // D3DDevice_SetStreamSource+0x28 : jz +0x26
         { 0x28, 0x74 },
         { 0x29, 0x26 },

src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl

@@ -4370,24 +4370,6 @@ OOVPA_XREF(CDirectSound_EnableHeadphones, 3911, 18,
         { 0xCC, 0x08 },
 OOVPA_END;
 
-#if 0 // Replaced with better OOVPA 3911 (See above)
-// ******************************************************************
-// * CDirectSound::EnableHeadphones
-// ******************************************************************
-OOVPA_XREF(CDirectSound_EnableHeadphones, 3911, 7,
-
-    XREF_CDirectSound_EnableHeadphones,
-    XRefZero)
-        { 0x18, 0x8B },
-        { 0x32, 0x0C },
-        { 0x4F, 0x8B },
-        { 0x66, 0x8B },
-        { 0x80, 0xFF },
-        { 0x9A, 0x76 },
-        { 0xB4, 0x5B },
-OOVPA_END;
-#endif
-
 // ******************************************************************
 // * IDirectSound_EnableHeadphones
 // ******************************************************************

src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl

@@ -728,6 +728,21 @@ OOVPA_NO_XREF(QueueUserAPC, 3911, 7) // generic version
         { 0x21, 0xC1 },
 OOVPA_END;
 
+// ******************************************************************
+// * lstrcmpiW
+// ******************************************************************
+OOVPA_NO_XREF(lstrcmpiW, 3911, 8)
+
+        { 0x07, 0x56 },
+        { 0x0F, 0x01 },
+        { 0x10, 0xE8 },
+        { 0x19, 0x39 },
+        { 0x22, 0x0E },
+        { 0x2D, 0x59 },
+        { 0x34, 0xEB },
+        { 0x3D, 0x03 },
+OOVPA_END;
+
 // ******************************************************************
 // * XMountAlternateTitleA
 // ******************************************************************
@@ -981,6 +996,36 @@ OOVPA_NO_XREF(XMountUtilityDrive, 3911, 26)
         { 0x57, 0xC4 },
 OOVPA_END;
 
+// ******************************************************************
+// * ReadFileEx@20
+// ******************************************************************
+OOVPA_NO_XREF(ReadFileEx, 3911, 8)
+
+        { 0x09, 0x48 },
+        { 0x14, 0x8D },
+        { 0x1F, 0xFF },
+        { 0x2A, 0xFF },
+        { 0x2F, 0x00 },
+        { 0x35, 0x00 },
+        { 0x40, 0x50 },
+        { 0x4B, 0xC0 },
+OOVPA_END;
+
+// ******************************************************************
+// * WriteFileEx
+// ******************************************************************
+OOVPA_NO_XREF(WriteFileEx, 3911, 8)
+
+        { 0x09, 0x48 },
+        { 0x14, 0x8D },
+        { 0x1F, 0xFF },
+        { 0x2A, 0xFF },
+        { 0x2F, 0xFC },
+        { 0x35, 0x00 },
+        { 0x40, 0x50 },
+        { 0x4B, 0xC0 },
+OOVPA_END;
+
 // ******************************************************************
 // * XInputPoll
 // ******************************************************************

src/CxbxKrnl/HLEDataBase/Xapi.OOVPA.inl

@@ -86,6 +86,21 @@
 //   * XapiFiberStartup (3950, 4034, 4039, 4134, 4531, 4721, 5028, 5455)
 //   * timeKillEvent (3950, 4034, 5028, 5233)
 //   * timeSetEvent (4034, 5233)
+// * Following OOVPA are invalid
+//   * ReadFileEx (3911) // Has exact asm codes _WriteFileEx@20
+//   * WriteFileEx (3911) // Has exact asm codes _ReadFileEx@20
+//   * lstrcmpiW (3911) // Necessary XREF _xCompareStringW@20
+// * Following OOVPA are missing (Obsolete?)
+//   * GetThreadPriorityBoost
+//   * RtlAllocateHeap
+//   * RtlCreateHeap
+//   * RtlDestroyHeap
+//   * RtlFreeHeap
+//   * RtlReAllocateHeap
+//   * RtlSizeHeap
+//   * XCalculateSignatureBeginEx
+//   * XCalculateSignatureEnd
+//   * XCalculateSignatureUpdate
 // NOTE: Known Xapi OOVPA not included in initial revision.
 //   * XFormatUtilityDrive (4242)
 //   * XSetProcessQuantumLength (4134)