mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-06 13:14:59 -06:00
15.05
This commit is contained in:
Igor Pavlov
committed by
Kornel Lesiński
Kornel Lesiński
parent
0713a3ab80
commit
54490d51d5
@@ -7,118 +7,164 @@
|
||||
#include "../../Common/ComTry.h"
|
||||
#include "../../Common/MyCom.h"
|
||||
|
||||
#include "../../Windows/Defs.h"
|
||||
#include "../../Windows/PropVariant.h"
|
||||
|
||||
#include "../ICoder.h"
|
||||
|
||||
#include "../Common/RegisterCodec.h"
|
||||
|
||||
extern unsigned int g_NumCodecs;
|
||||
extern unsigned g_NumCodecs;
|
||||
extern const CCodecInfo *g_Codecs[];
|
||||
|
||||
extern unsigned int g_NumHashers;
|
||||
extern unsigned g_NumHashers;
|
||||
extern const CHasherInfo *g_Hashers[];
|
||||
|
||||
static const UInt16 kDecodeId = 0x2790;
|
||||
static const UInt16 kEncodeId = 0x2791;
|
||||
static const UInt16 kHasherId = 0x2792;
|
||||
|
||||
DEFINE_GUID(CLSID_CCodec,
|
||||
0x23170F69, 0x40C1, kDecodeId, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
static inline HRESULT SetPropString(const char *s, unsigned int size, PROPVARIANT *value)
|
||||
static void SetPropFromAscii(const char *s, PROPVARIANT *prop) throw()
|
||||
{
|
||||
if ((value->bstrVal = ::SysAllocStringByteLen(s, size)) != 0)
|
||||
UINT len = (UINT)strlen(s);
|
||||
OLECHAR *dest = ::SysAllocStringLen(NULL, len);
|
||||
if (dest)
|
||||
{
|
||||
for (UINT i = 0; i <= len; i++)
|
||||
dest[i] = (Byte)s[i];
|
||||
prop->bstrVal = dest;
|
||||
prop->vt = VT_BSTR;
|
||||
}
|
||||
}
|
||||
|
||||
static inline HRESULT SetPropGUID(const GUID &guid, PROPVARIANT *value) throw()
|
||||
{
|
||||
if ((value->bstrVal = ::SysAllocStringByteLen((const char *)&guid, sizeof(guid))) != NULL)
|
||||
value->vt = VT_BSTR;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
static inline HRESULT SetPropGUID(const GUID &guid, PROPVARIANT *value)
|
||||
{
|
||||
return SetPropString((const char *)&guid, sizeof(GUID), value);
|
||||
}
|
||||
|
||||
static HRESULT SetClassID(CMethodId id, UInt16 typeId, PROPVARIANT *value)
|
||||
static HRESULT MethodToClassID(UInt16 typeId, CMethodId id, PROPVARIANT *value) throw()
|
||||
{
|
||||
GUID clsId;
|
||||
clsId.Data1 = CLSID_CCodec.Data1;
|
||||
clsId.Data2 = CLSID_CCodec.Data2;
|
||||
clsId.Data1 = k_7zip_GUID_Data1;
|
||||
clsId.Data2 = k_7zip_GUID_Data2;
|
||||
clsId.Data3 = typeId;
|
||||
SetUi64(clsId.Data4, id);
|
||||
return SetPropGUID(clsId, value);
|
||||
}
|
||||
|
||||
static HRESULT FindCodecClassId(const GUID *clsID, UInt32 isCoder2, bool isFilter, bool &encode, int &index)
|
||||
static HRESULT FindCodecClassId(const GUID *clsid, bool isCoder2, bool isFilter, bool &encode, int &index) throw()
|
||||
{
|
||||
index = -1;
|
||||
if (clsID->Data1 != CLSID_CCodec.Data1 ||
|
||||
clsID->Data2 != CLSID_CCodec.Data2)
|
||||
if (clsid->Data1 != k_7zip_GUID_Data1 ||
|
||||
clsid->Data2 != k_7zip_GUID_Data2)
|
||||
return S_OK;
|
||||
|
||||
encode = true;
|
||||
if (clsID->Data3 == kDecodeId)
|
||||
encode = false;
|
||||
else if (clsID->Data3 != kEncodeId)
|
||||
return S_OK;
|
||||
UInt64 id = GetUi64(clsID->Data4);
|
||||
|
||||
if (clsid->Data3 == k_7zip_GUID_Data3_Decoder) encode = false;
|
||||
else if (clsid->Data3 != k_7zip_GUID_Data3_Encoder) return S_OK;
|
||||
|
||||
UInt64 id = GetUi64(clsid->Data4);
|
||||
|
||||
for (unsigned i = 0; i < g_NumCodecs; i++)
|
||||
{
|
||||
const CCodecInfo &codec = *g_Codecs[i];
|
||||
if (id != codec.Id || encode && !codec.CreateEncoder || !encode && !codec.CreateDecoder)
|
||||
|
||||
if (id != codec.Id
|
||||
|| (encode ? !codec.CreateEncoder : !codec.CreateDecoder)
|
||||
|| (isFilter ? !codec.IsFilter : codec.IsFilter))
|
||||
continue;
|
||||
if (!isFilter && codec.IsFilter || isFilter && !codec.IsFilter ||
|
||||
codec.NumInStreams != 1 && !isCoder2 || codec.NumInStreams == 1 && isCoder2)
|
||||
|
||||
if (codec.NumStreams == 1 ? isCoder2 : !isCoder2)
|
||||
return E_NOINTERFACE;
|
||||
|
||||
index = i;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
STDAPI CreateCoder2(bool encode, int index, const GUID *iid, void **outObject)
|
||||
static HRESULT CreateCoderMain(unsigned index, bool encode, void **coder)
|
||||
{
|
||||
COM_TRY_BEGIN
|
||||
*outObject = 0;
|
||||
bool isCoder = (*iid == IID_ICompressCoder) != 0;
|
||||
bool isCoder2 = (*iid == IID_ICompressCoder2) != 0;
|
||||
bool isFilter = (*iid == IID_ICompressFilter) != 0;
|
||||
|
||||
const CCodecInfo &codec = *g_Codecs[index];
|
||||
if (!isFilter && codec.IsFilter || isFilter && !codec.IsFilter ||
|
||||
codec.NumInStreams != 1 && !isCoder2 || codec.NumInStreams == 1 && isCoder2)
|
||||
return E_NOINTERFACE;
|
||||
|
||||
void *c;
|
||||
if (encode)
|
||||
c = codec.CreateEncoder();
|
||||
else
|
||||
c = codec.CreateDecoder();
|
||||
|
||||
if (c)
|
||||
{
|
||||
if (!codec.CreateEncoder)
|
||||
return CLASS_E_CLASSNOTAVAILABLE;
|
||||
*outObject = codec.CreateEncoder();
|
||||
IUnknown *unk;
|
||||
if (codec.IsFilter)
|
||||
unk = (IUnknown *)(ICompressFilter *)c;
|
||||
else if (codec.NumStreams != 1)
|
||||
unk = (IUnknown *)(ICompressCoder2 *)c;
|
||||
else
|
||||
unk = (IUnknown *)(ICompressCoder *)c;
|
||||
unk->AddRef();
|
||||
*coder = c;
|
||||
}
|
||||
return S_OK;
|
||||
|
||||
COM_TRY_END
|
||||
}
|
||||
|
||||
static HRESULT CreateCoder2(bool encode, UInt32 index, const GUID *iid, void **outObject)
|
||||
{
|
||||
*outObject = NULL;
|
||||
|
||||
const CCodecInfo &codec = *g_Codecs[index];
|
||||
|
||||
if (encode ? !codec.CreateEncoder : !codec.CreateDecoder)
|
||||
return CLASS_E_CLASSNOTAVAILABLE;
|
||||
|
||||
if (codec.IsFilter)
|
||||
{
|
||||
if (*iid != IID_ICompressFilter) return E_NOINTERFACE;
|
||||
}
|
||||
else if (codec.NumStreams != 1)
|
||||
{
|
||||
if (*iid != IID_ICompressCoder2) return E_NOINTERFACE;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!codec.CreateDecoder)
|
||||
return CLASS_E_CLASSNOTAVAILABLE;
|
||||
*outObject = codec.CreateDecoder();
|
||||
if (*iid != IID_ICompressCoder) return E_NOINTERFACE;
|
||||
}
|
||||
if (*outObject)
|
||||
{
|
||||
if (isCoder)
|
||||
((ICompressCoder *)*outObject)->AddRef();
|
||||
else if (isCoder2)
|
||||
((ICompressCoder2 *)*outObject)->AddRef();
|
||||
else
|
||||
((ICompressFilter *)*outObject)->AddRef();
|
||||
}
|
||||
return S_OK;
|
||||
COM_TRY_END
|
||||
|
||||
return CreateCoderMain(index, encode, outObject);
|
||||
}
|
||||
|
||||
STDAPI CreateDecoder(UInt32 index, const GUID *iid, void **outObject)
|
||||
{
|
||||
return CreateCoder2(false, index, iid, outObject);
|
||||
}
|
||||
|
||||
STDAPI CreateEncoder(UInt32 index, const GUID *iid, void **outObject)
|
||||
{
|
||||
return CreateCoder2(true, index, iid, outObject);
|
||||
}
|
||||
|
||||
STDAPI CreateCoder(const GUID *clsid, const GUID *iid, void **outObject)
|
||||
{
|
||||
COM_TRY_BEGIN
|
||||
*outObject = 0;
|
||||
*outObject = NULL;
|
||||
|
||||
bool isFilter = false;
|
||||
bool isCoder2 = false;
|
||||
bool isCoder = (*iid == IID_ICompressCoder) != 0;
|
||||
bool isCoder2 = (*iid == IID_ICompressCoder2) != 0;
|
||||
bool isFilter = (*iid == IID_ICompressFilter) != 0;
|
||||
if (!isCoder && !isCoder2 && !isFilter)
|
||||
return E_NOINTERFACE;
|
||||
if (!isCoder)
|
||||
{
|
||||
isFilter = (*iid == IID_ICompressFilter) != 0;
|
||||
if (!isFilter)
|
||||
{
|
||||
isCoder2 = (*iid == IID_ICompressCoder2) != 0;
|
||||
if (!isCoder2)
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
}
|
||||
|
||||
bool encode;
|
||||
int codecIndex;
|
||||
HRESULT res = FindCodecClassId(clsid, isCoder2, isFilter, encode, codecIndex);
|
||||
@@ -127,24 +173,9 @@ STDAPI CreateCoder(const GUID *clsid, const GUID *iid, void **outObject)
|
||||
if (codecIndex < 0)
|
||||
return CLASS_E_CLASSNOTAVAILABLE;
|
||||
|
||||
const CCodecInfo &codec = *g_Codecs[codecIndex];
|
||||
if (encode)
|
||||
*outObject = codec.CreateEncoder();
|
||||
else
|
||||
*outObject = codec.CreateDecoder();
|
||||
if (*outObject)
|
||||
{
|
||||
if (isCoder)
|
||||
((ICompressCoder *)*outObject)->AddRef();
|
||||
else if (isCoder2)
|
||||
((ICompressCoder2 *)*outObject)->AddRef();
|
||||
else
|
||||
((ICompressFilter *)*outObject)->AddRef();
|
||||
}
|
||||
return S_OK;
|
||||
COM_TRY_END
|
||||
return CreateCoderMain(codecIndex, encode, outObject);
|
||||
}
|
||||
|
||||
|
||||
STDAPI GetMethodProperty(UInt32 codecIndex, PROPID propID, PROPVARIANT *value)
|
||||
{
|
||||
::VariantClear((VARIANTARG *)value);
|
||||
@@ -156,24 +187,54 @@ STDAPI GetMethodProperty(UInt32 codecIndex, PROPID propID, PROPVARIANT *value)
|
||||
value->vt = VT_UI8;
|
||||
break;
|
||||
case NMethodPropID::kName:
|
||||
if ((value->bstrVal = ::SysAllocString(codec.Name)) != 0)
|
||||
value->vt = VT_BSTR;
|
||||
SetPropFromAscii(codec.Name, value);
|
||||
break;
|
||||
case NMethodPropID::kDecoder:
|
||||
if (codec.CreateDecoder)
|
||||
return SetClassID(codec.Id, kDecodeId, value);
|
||||
return MethodToClassID(k_7zip_GUID_Data3_Decoder, codec.Id, value);
|
||||
break;
|
||||
case NMethodPropID::kEncoder:
|
||||
if (codec.CreateEncoder)
|
||||
return SetClassID(codec.Id, kEncodeId, value);
|
||||
return MethodToClassID(k_7zip_GUID_Data3_Encoder, codec.Id, value);
|
||||
break;
|
||||
case NMethodPropID::kInStreams:
|
||||
if (codec.NumInStreams != 1)
|
||||
case NMethodPropID::kDecoderIsAssigned:
|
||||
value->vt = VT_BOOL;
|
||||
value->boolVal = BoolToVARIANT_BOOL(codec.CreateDecoder != NULL);
|
||||
break;
|
||||
case NMethodPropID::kEncoderIsAssigned:
|
||||
value->vt = VT_BOOL;
|
||||
value->boolVal = BoolToVARIANT_BOOL(codec.CreateEncoder != NULL);
|
||||
break;
|
||||
case NMethodPropID::kPackStreams:
|
||||
if (codec.NumStreams != 1)
|
||||
{
|
||||
value->vt = VT_UI4;
|
||||
value->ulVal = (ULONG)codec.NumInStreams;
|
||||
value->ulVal = (ULONG)codec.NumStreams;
|
||||
}
|
||||
break;
|
||||
/*
|
||||
case NMethodPropID::kIsFilter:
|
||||
// if (codec.IsFilter)
|
||||
{
|
||||
value->vt = VT_BOOL;
|
||||
value->boolVal = BoolToVARIANT_BOOL(codec.IsFilter);
|
||||
}
|
||||
break;
|
||||
*/
|
||||
/*
|
||||
case NMethodPropID::kDecoderFlags:
|
||||
{
|
||||
value->vt = VT_UI4;
|
||||
value->ulVal = (ULONG)codec.DecoderFlags;
|
||||
}
|
||||
break;
|
||||
case NMethodPropID::kEncoderFlags:
|
||||
{
|
||||
value->vt = VT_UI4;
|
||||
value->ulVal = (ULONG)codec.EncoderFlags;
|
||||
}
|
||||
break;
|
||||
*/
|
||||
}
|
||||
return S_OK;
|
||||
}
|
||||
@@ -185,13 +246,15 @@ STDAPI GetNumberOfMethods(UINT32 *numCodecs)
|
||||
}
|
||||
|
||||
|
||||
static int FindHasherClassId(const GUID *clsID)
|
||||
// ---------- Hashers ----------
|
||||
|
||||
static int FindHasherClassId(const GUID *clsid) throw()
|
||||
{
|
||||
if (clsID->Data1 != CLSID_CCodec.Data1 ||
|
||||
clsID->Data2 != CLSID_CCodec.Data2 ||
|
||||
clsID->Data3 != kHasherId)
|
||||
if (clsid->Data1 != k_7zip_GUID_Data1 ||
|
||||
clsid->Data2 != k_7zip_GUID_Data2 ||
|
||||
clsid->Data3 != k_7zip_GUID_Data3_Hasher)
|
||||
return -1;
|
||||
UInt64 id = GetUi64(clsID->Data4);
|
||||
UInt64 id = GetUi64(clsid->Data4);
|
||||
for (unsigned i = 0; i < g_NumCodecs; i++)
|
||||
if (id == g_Hashers[i]->Id)
|
||||
return i;
|
||||
@@ -230,12 +293,11 @@ STDAPI GetHasherProp(UInt32 codecIndex, PROPID propID, PROPVARIANT *value)
|
||||
value->vt = VT_UI8;
|
||||
break;
|
||||
case NMethodPropID::kName:
|
||||
if ((value->bstrVal = ::SysAllocString(codec.Name)) != 0)
|
||||
value->vt = VT_BSTR;
|
||||
SetPropFromAscii(codec.Name, value);
|
||||
break;
|
||||
case NMethodPropID::kEncoder:
|
||||
if (codec.CreateHasher)
|
||||
return SetClassID(codec.Id, kHasherId, value);
|
||||
return MethodToClassID(k_7zip_GUID_Data3_Hasher, codec.Id, value);
|
||||
break;
|
||||
case NMethodPropID::kDigestSize:
|
||||
value->ulVal = (ULONG)codec.DigestSize;
|
||||
|
||||
Reference in New Issue
Block a user