Minor fixes

- fix Zstandard Sfx stuff -> SetNumberOfThreads()
- fix formatting of XXH32Reg.cpp and XXH64Reg.cpp
- add Blake2s hash to explorer context menu
This commit is contained in:
Tino Reichardt
2018-11-01 18:18:34 +01:00
parent 7252a465e5
commit 1048d4e133
5 changed files with 103 additions and 100 deletions

View File

@@ -173,11 +173,6 @@ STDMETHODIMP CDecoder::SetInStream(ISequentialInStream * inStream)
return S_OK; return S_OK;
} }
STDMETHODIMP CDecoder::SetNumberOfThreads(UInt32 /* numThreads */)
{
return S_OK;
}
STDMETHODIMP CDecoder::ReleaseInStream() STDMETHODIMP CDecoder::ReleaseInStream()
{ {
_inStream.Release(); _inStream.Release();
@@ -185,6 +180,11 @@ STDMETHODIMP CDecoder::ReleaseInStream()
} }
#endif #endif
STDMETHODIMP CDecoder::SetNumberOfThreads(UInt32 /* numThreads */)
{
return S_OK;
}
HRESULT CDecoder::CodeResume(ISequentialOutStream * outStream, const UInt64 * outSize, ICompressProgressInfo * progress) HRESULT CDecoder::CodeResume(ISequentialOutStream * outStream, const UInt64 * outSize, ICompressProgressInfo * progress)
{ {
RINOK(SetOutStreamSizeResume(outSize)); RINOK(SetOutStreamSizeResume(outSize));

View File

@@ -225,6 +225,7 @@ static const CHashCommand g_HashCommands[] =
{ CZipContextMenu::kHash_CRC64, "CRC-64", "CRC64" }, { CZipContextMenu::kHash_CRC64, "CRC-64", "CRC64" },
{ CZipContextMenu::kHash_SHA1, "SHA-1", "SHA1" }, { CZipContextMenu::kHash_SHA1, "SHA-1", "SHA1" },
{ CZipContextMenu::kHash_SHA256, "SHA-256", "SHA256" }, { CZipContextMenu::kHash_SHA256, "SHA-256", "SHA256" },
{ CZipContextMenu::kHash_BLAKE2s, "BLAKE2s", "BLAKE2s" },
{ CZipContextMenu::kHash_XXH32, "XXH-32", "XXH32" }, { CZipContextMenu::kHash_XXH32, "XXH-32", "XXH32" },
{ CZipContextMenu::kHash_XXH64, "XXH-64", "XXH64" }, { CZipContextMenu::kHash_XXH64, "XXH-64", "XXH64" },
{ CZipContextMenu::kHash_All, "*", "*" } { CZipContextMenu::kHash_All, "*", "*" }
@@ -930,6 +931,7 @@ STDMETHODIMP CZipContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO commandInfo)
case kHash_CRC64: case kHash_CRC64:
case kHash_SHA1: case kHash_SHA1:
case kHash_SHA256: case kHash_SHA256:
case kHash_BLAKE2s:
case kHash_XXH32: case kHash_XXH32:
case kHash_XXH64: case kHash_XXH64:
case kHash_All: case kHash_All:

View File

@@ -36,6 +36,7 @@ public:
kHash_CRC64, kHash_CRC64,
kHash_SHA1, kHash_SHA1,
kHash_SHA256, kHash_SHA256,
kHash_BLAKE2s,
kHash_XXH32, kHash_XXH32,
kHash_XXH64, kHash_XXH64,
kHash_All kHash_All

View File

@@ -41,4 +41,4 @@ STDMETHODIMP_(void) CXXH32Hasher::Final(Byte *digest) throw()
SetUi32(digest, val); SetUi32(digest, val);
} }
REGISTER_HASHER(CXXH32Hasher, 0x202, "XXH32", 4) REGISTER_HASHER(CXXH32Hasher, 0x203, "XXH32", 4)

View File

@@ -41,4 +41,4 @@ STDMETHODIMP_(void) CXXH64Hasher::Final(Byte *digest) throw()
SetUi64(digest, val); SetUi64(digest, val);
} }
REGISTER_HASHER(CXXH64Hasher, 0x203, "XXH64", 8) REGISTER_HASHER(CXXH64Hasher, 0x204, "XXH64", 8)