1.14.8.62: fix inner path comparison case insensitivity

Soreepeong · Apr 16, 2024 · a97324b · a97324b
1 parent d679789
commit a97324b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/XivAlexander/XivAlexander.rc b/XivAlexander/XivAlexander.rc
@@ -1812,8 +1812,8 @@ IDI_TRAY_ICON           ICON                    "..\\Graphics\\Icon.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,14,8,61
- PRODUCTVERSION 1,14,8,61
+ FILEVERSION 1,14,8,62
+ PRODUCTVERSION 1,14,8,62
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1830,12 +1830,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Soreepeong"
             VALUE "FileDescription", "XivAlexander Main DLL"
-            VALUE "FileVersion", "1.14.8.61"
+            VALUE "FileVersion", "1.14.8.62"
             VALUE "InternalName", "XivAlexander.dll"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "XivAlexander.dll"
             VALUE "ProductName", "XivAlexander"
-            VALUE "ProductVersion", "1.14.8.61"
+            VALUE "ProductVersion", "1.14.8.62"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/XivAlexanderCommon/Sqex/Sqpack.h b/XivAlexanderCommon/Sqex/Sqpack.h
@@ -528,8 +528,12 @@ namespace Sqex::Sqpack {
 
 		struct FullComparator {
 			bool operator()(const EntryPathSpec& l, const EntryPathSpec& r) const {
-				if (l.FullPath != r.FullPath)
-					return l.FullPath < r.FullPath;
+				if (l.HasOriginal() && r.HasOriginal()) {
+					const auto cmp = lstrcmpiW(l.FullPath.c_str(), r.FullPath.c_str());
+					if (cmp != 0)
+						return cmp < 0;
+				}
+
 				if (l.FullPathHash != r.FullPathHash)
 					return l.FullPathHash < r.FullPathHash;
 				if (l.PathHash != r.PathHash)
@@ -569,7 +573,8 @@ namespace Sqex::Sqpack {
 
 		struct FullPathComparator {
 			bool operator()(const EntryPathSpec& l, const EntryPathSpec& r) const {
-				return l.FullPath < r.FullPath;
+				const auto cmp = lstrcmpiW(l.FullPath.c_str(), r.FullPath.c_str());
+				return cmp < 0;
 			}
 		};
 	};

diff --git a/XivAlexanderLoader/XivAlexanderLoader.rc b/XivAlexanderLoader/XivAlexanderLoader.rc
@@ -71,8 +71,8 @@ IDI_ICON1               ICON                    "..\\Graphics\\Icon.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,14,8,61
- PRODUCTVERSION 1,14,8,61
+ FILEVERSION 1,14,8,62
+ PRODUCTVERSION 1,14,8,62
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -89,12 +89,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Soreepeong"
             VALUE "FileDescription", "XivAlexander Loader"
-            VALUE "FileVersion", "1.14.8.61"
+            VALUE "FileVersion", "1.14.8.62"
             VALUE "InternalName", "XivAlexanderLoader.exe"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "XivAlexanderLoader.exe"
             VALUE "ProductName", "XivAlexander"
-            VALUE "ProductVersion", "1.14.8.61"
+            VALUE "ProductVersion", "1.14.8.62"
         END
     END
     BLOCK "VarFileInfo"