From 87cfe4aa34131b11ca18c252367bef55285198e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Ho=C5=A1ek?= Date: Sun, 28 Sep 2014 17:01:44 +0200 Subject: [PATCH] update HLLib to 2.4.5 revision 1 --- HLLib/Makefile | 4 ++-- HLLib/SGAFile.h | 26 +++++++++++++------------- HLLib/XZPFile.cpp | 12 +++++++----- lib/HLLib.h | 28 ++++++++++++++-------------- sln/vs10/HLExtract/HLExtract.vcxproj | 8 ++++---- sln/vs10/HLLib/HLLib.vcxproj | 24 ++++++++++++------------ sln/vs9/HLExtract/HLExtract.vcproj | 8 ++++---- sln/vs9/HLLib/HLLib.vcproj | 24 ++++++++++++------------ 8 files changed, 68 insertions(+), 66 deletions(-) diff --git a/HLLib/Makefile b/HLLib/Makefile index 1fbe074..c347926 100644 --- a/HLLib/Makefile +++ b/HLLib/Makefile @@ -8,8 +8,8 @@ sources = BSPFile.cpp Checksum.cpp DebugMemory.cpp DirectoryFile.cpp \ FileStream.cpp GCFFile.cpp GCFStream.cpp HLLib.cpp \ Mapping.cpp MappingStream.cpp MemoryMapping.cpp MemoryStream.cpp \ NCFFile.cpp NullStream.cpp PAKFile.cpp Package.cpp ProcStream.cpp \ - Stream.cpp StreamMapping.cpp Utility.cpp VBSPFile.cpp VPKFile.cpp \ - WADFile.cpp Wrapper.cpp XZPFile.cpp ZIPFile.cpp + SGAFile.cpp Stream.cpp StreamMapping.cpp Utility.cpp VBSPFile.cpp \ + VPKFile.cpp WADFile.cpp Wrapper.cpp XZPFile.cpp ZIPFile.cpp objs = $(sources:.cpp=.o) .cpp.o: diff --git a/HLLib/SGAFile.h b/HLLib/SGAFile.h index 9532dda..87fd8fa 100644 --- a/HLLib/SGAFile.h +++ b/HLLib/SGAFile.h @@ -163,11 +163,11 @@ namespace HLLib class CSGASpecializedDirectory : public ISGADirectory { public: - typedef TSGAHeader SGAHeader; - typedef TSGADirectoryHeader SGADirectoryHeader; - typedef TSGASection SGASection; - typedef TSGAFolder SGAFolder; - typedef TSGAFile SGAFile; + typedef typename TSGAHeader SGAHeader; + typedef typename TSGADirectoryHeader SGADirectoryHeader; + typedef typename TSGASection SGASection; + typedef typename TSGAFolder SGAFolder; + typedef typename TSGAFile SGAFile; CSGASpecializedDirectory(CSGAFile& File); @@ -192,10 +192,10 @@ namespace HLLib class CSGASpecializedDirectory : public ISGADirectory { public: - typedef TSGAHeader SGAHeader; - typedef TSGADirectoryHeader SGADirectoryHeader; - typedef TSGASection SGASection; - typedef TSGAFolder SGAFolder; + typedef typename TSGAHeader SGAHeader; + typedef typename TSGADirectoryHeader SGADirectoryHeader; + typedef typename TSGASection SGASection; + typedef typename TSGAFolder SGAFolder; typedef CSGAFile::SGAFile4 SGAFile; CSGASpecializedDirectory(CSGAFile& File); @@ -221,10 +221,10 @@ namespace HLLib class CSGASpecializedDirectory : public ISGADirectory { public: - typedef TSGAHeader SGAHeader; - typedef TSGADirectoryHeader SGADirectoryHeader; - typedef TSGASection SGASection; - typedef TSGAFolder SGAFolder; + typedef typename TSGAHeader SGAHeader; + typedef typename TSGADirectoryHeader SGADirectoryHeader; + typedef typename TSGASection SGASection; + typedef typename TSGAFolder SGAFolder; typedef CSGAFile::SGAFile6 SGAFile; CSGASpecializedDirectory(CSGAFile& File); diff --git a/HLLib/XZPFile.cpp b/HLLib/XZPFile.cpp index 9eda139..13296af 100644 --- a/HLLib/XZPFile.cpp +++ b/HLLib/XZPFile.cpp @@ -194,16 +194,18 @@ CDirectoryFolder *CXZPFile::CreateRoot() else { // No file name information, just file name CRCs. + const hlChar lpLookup[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; for(hlUInt i = 0; i < this->pHeader->uiDirectoryEntryCount; i++) { - hlChar lpTemp[16] = ""; - hlChar *lpLookup[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f" }; + hlChar lpTemp[16]; + + hlChar* lpName = lpTemp; for(hlByte *lpCRC = (hlByte *)&this->lpDirectoryEntries[i].uiFileNameCRC; lpCRC < (hlByte *)&this->lpDirectoryEntries[i].uiFileNameCRC + sizeof(hlUInt); lpCRC++) { - strcat(lpTemp, lpLookup[(hlByte)(*lpCRC >> 4)]); - strcat(lpTemp, lpLookup[(hlByte)(*lpCRC & 0x0F)]); - + *lpName++ = lpLookup[(hlByte)(*lpCRC >> 4)]; + *lpName++ = lpLookup[(hlByte)(*lpCRC & 0x0F)]; } + *lpName = '\0'; pRoot->AddFile(lpTemp, i); } diff --git a/lib/HLLib.h b/lib/HLLib.h index a706a8d..ce8c097 100644 --- a/lib/HLLib.h +++ b/lib/HLLib.h @@ -1885,7 +1885,7 @@ namespace HLLib // CSGAFile // -class HLLIB_API CSGAFile : public CPackage + class HLLIB_API CSGAFile : public CPackage { private: #pragma pack(1) @@ -2031,11 +2031,11 @@ class HLLIB_API CSGAFile : public CPackage class CSGASpecializedDirectory : public ISGADirectory { public: - typedef TSGAHeader SGAHeader; - typedef TSGADirectoryHeader SGADirectoryHeader; - typedef TSGASection SGASection; - typedef TSGAFolder SGAFolder; - typedef TSGAFile SGAFile; + typedef typename TSGAHeader SGAHeader; + typedef typename TSGADirectoryHeader SGADirectoryHeader; + typedef typename TSGASection SGASection; + typedef typename TSGAFolder SGAFolder; + typedef typename TSGAFile SGAFile; CSGASpecializedDirectory(CSGAFile& File); @@ -2060,10 +2060,10 @@ class HLLIB_API CSGAFile : public CPackage class CSGASpecializedDirectory : public ISGADirectory { public: - typedef TSGAHeader SGAHeader; - typedef TSGADirectoryHeader SGADirectoryHeader; - typedef TSGASection SGASection; - typedef TSGAFolder SGAFolder; + typedef typename TSGAHeader SGAHeader; + typedef typename TSGADirectoryHeader SGADirectoryHeader; + typedef typename TSGASection SGASection; + typedef typename TSGAFolder SGAFolder; typedef CSGAFile::SGAFile4 SGAFile; CSGASpecializedDirectory(CSGAFile& File); @@ -2089,10 +2089,10 @@ class HLLIB_API CSGAFile : public CPackage class CSGASpecializedDirectory : public ISGADirectory { public: - typedef TSGAHeader SGAHeader; - typedef TSGADirectoryHeader SGADirectoryHeader; - typedef TSGASection SGASection; - typedef TSGAFolder SGAFolder; + typedef typename TSGAHeader SGAHeader; + typedef typename TSGADirectoryHeader SGADirectoryHeader; + typedef typename TSGASection SGASection; + typedef typename TSGAFolder SGAFolder; typedef CSGAFile::SGAFile6 SGAFile; CSGASpecializedDirectory(CSGAFile& File); diff --git a/sln/vs10/HLExtract/HLExtract.vcxproj b/sln/vs10/HLExtract/HLExtract.vcxproj index da9c73c..73aa9a7 100644 --- a/sln/vs10/HLExtract/HLExtract.vcxproj +++ b/sln/vs10/HLExtract/HLExtract.vcxproj @@ -82,7 +82,7 @@ true Sync EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL false @@ -110,7 +110,7 @@ true Sync EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL false @@ -135,7 +135,7 @@ Speed WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION;%(PreprocessorDefinitions) Sync - MultiThreaded + MultiThreadedDLL Level3 @@ -165,7 +165,7 @@ Speed WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION;%(PreprocessorDefinitions) Sync - MultiThreaded + MultiThreadedDLL Level3 diff --git a/sln/vs10/HLLib/HLLib.vcxproj b/sln/vs10/HLLib/HLLib.vcxproj index b5a9d42..dfd3d3d 100644 --- a/sln/vs10/HLLib/HLLib.vcxproj +++ b/sln/vs10/HLLib/HLLib.vcxproj @@ -84,13 +84,13 @@ true Sync EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL false Level3 EditAndContinue - E:\Projects\Utilities\ZLib + ..\..\..\..\..\3rdParty\zlib\current $(OutDir)HLLib.dll @@ -102,7 +102,7 @@ $(OutDir)HLLib.lib MachineX86 - E:\Projects\Utilities\ZLib\contrib\vstudio\vc10\x86\ZlibStatDebug + ..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(Platform)\ZlibStat$(Configuration) zlibstat.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -116,13 +116,13 @@ true Sync EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL false Level3 ProgramDatabase - E:\Projects\Utilities\ZLib + ..\..\..\..\..\3rdParty\zlib\current $(OutDir)HLLib.dll @@ -135,7 +135,7 @@ $(OutDir)HLLib.lib MachineX64 zlibstat.lib;%(AdditionalDependencies) - E:\Projects\Utilities\ZLib\contrib\vstudio\vc10\x64\ZlibStatDebug;%(AdditionalLibraryDirectories) + ..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(Platform)\ZlibStat$(Configuration) @@ -147,13 +147,13 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1;%(PreprocessorDefinitions) Sync - MultiThreaded + MultiThreadedDLL false Level3 ProgramDatabase - E:\Projects\Utilities\ZLib + ..\..\..\..\..\3rdParty\zlib\current $(OutDir)HLLib.dll @@ -166,7 +166,7 @@ $(OutDir)HLLib.lib MachineX86 - E:\Projects\Utilities\ZLib\contrib\vstudio\vc10\x86\ZlibStatRelease + ..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(Platform)\ZlibStat$(Configuration) zlibstat.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -182,13 +182,13 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1;%(PreprocessorDefinitions) Sync - MultiThreaded + MultiThreadedDLL false Level3 ProgramDatabase - E:\Projects\Utilities\ZLib + ..\..\..\..\..\3rdParty\zlib\current $(OutDir)HLLib.dll @@ -201,7 +201,7 @@ $(OutDir)HLLib.lib MachineX64 - E:\Projects\Utilities\ZLib\contrib\vstudio\vc10\x64\ZlibStatRelease;%(AdditionalLibraryDirectories) + ..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(Platform)\ZlibStat$(Configuration) zlibstat.lib;%(AdditionalDependencies) diff --git a/sln/vs9/HLExtract/HLExtract.vcproj b/sln/vs9/HLExtract/HLExtract.vcproj index 301f27e..e2c33c7 100644 --- a/sln/vs9/HLExtract/HLExtract.vcproj +++ b/sln/vs9/HLExtract/HLExtract.vcproj @@ -49,7 +49,7 @@ MinimalRebuild="true" ExceptionHandling="1" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" RuntimeTypeInfo="false" UsePrecompiledHeader="0" WarningLevel="3" @@ -129,7 +129,7 @@ MinimalRebuild="true" ExceptionHandling="1" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" RuntimeTypeInfo="false" UsePrecompiledHeader="0" WarningLevel="3" @@ -208,7 +208,7 @@ FavorSizeOrSpeed="1" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION" ExceptionHandling="1" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -290,7 +290,7 @@ FavorSizeOrSpeed="1" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION" ExceptionHandling="1" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" diff --git a/sln/vs9/HLLib/HLLib.vcproj b/sln/vs9/HLLib/HLLib.vcproj index e03cc9f..46b97f8 100644 --- a/sln/vs9/HLLib/HLLib.vcproj +++ b/sln/vs9/HLLib/HLLib.vcproj @@ -45,12 +45,12 @@