From 59651431048aba8f0ff923087e773e12c338af00 Mon Sep 17 00:00:00 2001
From: PatrickvL <pvanlogchem@gmail.com>
Date: Fri, 13 Jan 2017 10:15:15 +0100
Subject: [PATCH] Removed MajorVersion and MinorVersion (always 1.0) from
 HLEData

Also casing fix to previous commit
---
 src/CxbxKrnl/HLEDataBase.cpp  |  4 ++--
 src/CxbxKrnl/HLEDataBase.h    |  3 ---
 src/CxbxKrnl/HLEIntercept.cpp | 11 ++++-------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/CxbxKrnl/HLEDataBase.cpp b/src/CxbxKrnl/HLEDataBase.cpp
index b4ae62434..89d309121 100644
--- a/src/CxbxKrnl/HLEDataBase.cpp
+++ b/src/CxbxKrnl/HLEDataBase.cpp
@@ -105,9 +105,9 @@ const char *Lib_XONLINES = "XONLINES";
 // * HLEDataBase
 // ******************************************************************
 #define HLE_ENTRY(Lib, DB, Version) \
-	{Lib, 1, 0, version, DB##_1_0_##Version, DB##_1_0_##Version##_SIZE }
+	{Lib, Version, DB##_1_0_##Version, DB##_1_0_##Version##_SIZE }
 //  For example, HLE_ENTRY(Lib_XAPILIB, XAPI, 3911) results in:
-//  {Lib_XAPILIB, 1, 0, 3911, XAPI_1_0_3911, XAPI_1_0_3911_SIZE }
+//  {Lib_XAPILIB, 3911, XAPI_1_0_3911, XAPI_1_0_3911_SIZE }
 
 HLEData HLEDataBase[] =
 {
diff --git a/src/CxbxKrnl/HLEDataBase.h b/src/CxbxKrnl/HLEDataBase.h
index 7cef79823..c60d45ed4 100644
--- a/src/CxbxKrnl/HLEDataBase.h
+++ b/src/CxbxKrnl/HLEDataBase.h
@@ -100,10 +100,7 @@ extern struct HLEData
 {
     const char *Library;
 
-    uint16      MajorVersion;
-    uint16      MinorVersion;
     uint16      BuildVersion;
-
     OOVPATable *OovpaTable;
     uint32      OovpaTableSize;
 }
diff --git a/src/CxbxKrnl/HLEIntercept.cpp b/src/CxbxKrnl/HLEIntercept.cpp
index bb28b8cdb..4ac9b6d7c 100644
--- a/src/CxbxKrnl/HLEIntercept.cpp
+++ b/src/CxbxKrnl/HLEIntercept.cpp
@@ -179,8 +179,6 @@ void EmuHLEIntercept(Xbe::LibraryVersion *pLibraryVersion, Xbe::Header *pXbeHead
 
             for(uint32 v=0;v<dwLibraryVersions;v++)
             {
-                uint16 MajorVersion = pLibraryVersion[v].wMajorVersion;
-                uint16 MinorVersion = pLibraryVersion[v].wMinorVersion;
                 uint16 BuildVersion = pLibraryVersion[v].wBuildVersion;
                 uint16 OrigBuildVersion = BuildVersion;
 
@@ -313,7 +311,7 @@ void EmuHLEIntercept(Xbe::LibraryVersion *pLibraryVersion, Xbe::Header *pXbeHead
 
 				if(bXRefFirstPass)
                 {
-                    if(strcmp(Lib_XAPILIB, szLibraryName) == 0 && MajorVersion == 1 && MinorVersion == 0 &&
+                    if(strcmp(Lib_XAPILIB, szLibraryName) == 0 && 
                         (BuildVersion == 3911 || BuildVersion == 4034 || BuildVersion == 4134 || BuildVersion == 4361
                       || BuildVersion == 4432 || BuildVersion == 4627 || BuildVersion == 5233 || BuildVersion == 5558
                       || BuildVersion == 5849))
@@ -322,7 +320,6 @@ void EmuHLEIntercept(Xbe::LibraryVersion *pLibraryVersion, Xbe::Header *pXbeHead
                         uint32 upper = pXbeHeader->dwBaseAddr + pXbeHeader->dwSizeofImage;
                     }
                     else if(strcmp(Lib_D3D8, szLibraryName) == 0 /*&& strcmp(Lib_D3D8LTCG, szOrigLibraryName)*/ && 
-						 MajorVersion == 1 && MinorVersion == 0 &&
                         (BuildVersion == 3925 || BuildVersion == 4134 || BuildVersion == 4361 || BuildVersion == 4432
                       || BuildVersion == 4627 || BuildVersion == 5233 || BuildVersion == 5558 || BuildVersion == 5849))
                     {
@@ -437,7 +434,7 @@ void EmuHLEIntercept(Xbe::LibraryVersion *pLibraryVersion, Xbe::Header *pXbeHead
                             }
                         }
                     }
-					//else if(strcmp(Lib_D3D8LTCG, szLibraryName) == 0 && MajorVersion == 1 && MinorVersion == 0 &&
+					//else if(strcmp(Lib_D3D8LTCG, szLibraryName) == 0 &&
      //                   (BuildVersion == 5849))	// 5849 only so far...
      //               {
 					//	// Save D3D8 build version
@@ -519,13 +516,13 @@ void EmuHLEIntercept(Xbe::LibraryVersion *pLibraryVersion, Xbe::Header *pXbeHead
      //               }
                 }
 
-                DbgPrintf("HLE: * Searching HLE database for %s %d.%d.%d...", szLibraryName, MajorVersion, MinorVersion, BuildVersion);
+                DbgPrintf("HLE: * Searching HLE database for %s 1.0.%d...", szLibraryName, BuildVersion);
 
                 bool found=false;
 
                 for(uint32 d=0;d<dwHLEEntries;d++)
                 {
-                    if(BuildVersion != HLEDataBase[d].BuildVersion || MinorVersion != HLEDataBase[d].MinorVersion || MajorVersion != HLEDataBase[d].MajorVersion || strcmp(szLibraryName, HLEDataBase[d].Library) != 0)
+                    if(BuildVersion != HLEDataBase[d].BuildVersion || strcmp(szLibraryName, HLEDataBase[d].Library) != 0)
                         continue;
 
                     found = true;