eukara
/
HLLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream' 

update to 2.4.5 revision 1

Conflicts:
	HLLib/XZPFile.cpp
This commit is contained in:
Ondřej Hošek 2014-09-28 17:03:17 +02:00
parent 5b5d787de5 87cfe4aa34
commit e061e4f4ee
7 changed files with 66 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
HLLib/SGAFile.h
View File

@ -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<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile4> : 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<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile6> : 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);

12
HLLib/XZPFile.cpp
View File

@ -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] = "";
const 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);
}

28
lib/HLLib.h
View File

@ -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<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile4> : 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<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile6> : 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);

8
sln/vs10/HLExtract/HLExtract.vcxproj
View File

@ -82,7 +82,7 @@
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader>
</PrecompiledHeader>
@ -110,7 +110,7 @@
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader>
</PrecompiledHeader>
@ -135,7 +135,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
@ -165,7 +165,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>

24
sln/vs10/HLLib/HLLib.vcxproj
View File

@ -84,13 +84,13 @@
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>E:\Projects\Utilities\ZLib</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\3rdParty\zlib\current</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<OutputFile>$(OutDir)HLLib.dll</OutputFile>
@ -102,7 +102,7 @@
</DataExecutionPrevention>
<ImportLibrary>$(OutDir)HLLib.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>E:\Projects\Utilities\ZLib\contrib\vstudio\vc10\x86\ZlibStatDebug</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(Platform)\ZlibStat$(Configuration)</AdditionalLibraryDirectories>
<AdditionalDependencies>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)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@ -116,13 +116,13 @@
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>E:\Projects\Utilities\ZLib</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\3rdParty\zlib\current</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<OutputFile>$(OutDir)HLLib.dll</OutputFile>
@ -135,7 +135,7 @@
<ImportLibrary>$(OutDir)HLLib.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>E:\Projects\Utilities\ZLib\contrib\vstudio\vc10\x64\ZlibStatDebug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(Platform)\ZlibStat$(Configuration)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -147,13 +147,13 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>E:\Projects\Utilities\ZLib</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\3rdParty\zlib\current</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<OutputFile>$(OutDir)HLLib.dll</OutputFile>
@ -166,7 +166,7 @@
</DataExecutionPrevention>
<ImportLibrary>$(OutDir)HLLib.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>E:\Projects\Utilities\ZLib\contrib\vstudio\vc10\x86\ZlibStatRelease</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(Platform)\ZlibStat$(Configuration)</AdditionalLibraryDirectories>
<AdditionalDependencies>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)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@ -182,13 +182,13 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>E:\Projects\Utilities\ZLib</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\3rdParty\zlib\current</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<OutputFile>$(OutDir)HLLib.dll</OutputFile>
@ -201,7 +201,7 @@
</DataExecutionPrevention>
<ImportLibrary>$(OutDir)HLLib.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
<AdditionalLibraryDirectories>E:\Projects\Utilities\ZLib\contrib\vstudio\vc10\x64\ZlibStatRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(Platform)\ZlibStat$(Configuration)</AdditionalLibraryDirectories>
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>

8
sln/vs9/HLExtract/HLExtract.vcproj
View File

@ -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"

24
sln/vs9/HLLib/HLLib.vcproj
View File

@ -45,12 +45,12 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="E:\Projects\Utilities\ZLib"
AdditionalIncludeDirectories="..\..\..\..\..\3rdParty\zlib\current"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_USE_RTM_VERSION;HLLIB_EXPORTS;USE_ZLIB=1"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
@ -70,7 +70,7 @@
AdditionalDependencies="zlibstat.lib"
OutputFile="$(OutDir)/HLLib.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="E:\Projects\Utilities\ZLib\contrib\vstudio\vc9\x86\ZlibStatDebug"
AdditionalLibraryDirectories="..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(PlatformName)\ZlibStat$(ConfigurationName)"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/HLLib.pdb"
SubSystem="2"
@ -128,12 +128,12 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="E:\Projects\Utilities\ZLib"
AdditionalIncludeDirectories="..\..\..\..\..\3rdParty\zlib\current"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_USE_RTM_VERSION;HLLIB_EXPORTS;USE_ZLIB=1"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
@ -153,7 +153,7 @@
AdditionalDependencies="zlibstat.lib"
OutputFile="$(OutDir)/HLLib.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="E:\Projects\Utilities\ZLib\contrib\vstudio\vc9\x64\ZlibStatDebug"
AdditionalLibraryDirectories="..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(PlatformName)\ZlibStat$(ConfigurationName)"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/HLLib.pdb"
SubSystem="2"
@ -215,10 +215,10 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="E:\Projects\Utilities\ZLib"
AdditionalIncludeDirectories="..\..\..\..\..\3rdParty\zlib\current"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1"
ExceptionHandling="1"
RuntimeLibrary="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
@ -238,7 +238,7 @@
AdditionalDependencies="zlibstat.lib"
OutputFile="$(OutDir)/HLLib.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="E:\Projects\Utilities\ZLib\contrib\vstudio\vc9\x86\ZlibStatRelease"
AdditionalLibraryDirectories="..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(PlatformName)\ZlibStat$(ConfigurationName)"
GenerateDebugInformation="false"
SubSystem="2"
OptimizeReferences="2"
@ -302,10 +302,10 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="E:\Projects\Utilities\ZLib"
AdditionalIncludeDirectories="..\..\..\..\..\3rdParty\zlib\current"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1"
ExceptionHandling="1"
RuntimeLibrary="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
@ -325,7 +325,7 @@
AdditionalDependencies="zlibstat.lib"
OutputFile="$(OutDir)/HLLib.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="E:\Projects\Utilities\ZLib\contrib\vstudio\vc9\x64\ZlibStatRelease"
AdditionalLibraryDirectories="..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(PlatformName)\ZlibStat$(ConfigurationName)"
GenerateDebugInformation="false"
SubSystem="2"
OptimizeReferences="2"