fixed bug #1005296 - NSIS build error on Linux with g++ 3.4.0
- upgraded to the latest LZMA SDK git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3637 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
98caca8be1
commit
ec6957f356
52 changed files with 1715 additions and 2540 deletions
|
@ -1,7 +1,5 @@
|
|||
// ICoder.h
|
||||
|
||||
// #pragma once
|
||||
|
||||
#ifndef __ICODER_H
|
||||
#define __ICODER_H
|
||||
|
||||
|
@ -13,7 +11,7 @@ DEFINE_GUID(IID_ICompressProgressInfo,
|
|||
MIDL_INTERFACE("23170F69-40C1-278A-0000-000200040000")
|
||||
ICompressProgressInfo: public IUnknown
|
||||
{
|
||||
STDMETHOD(SetRatioInfo)(const UINT64 *inSize, const UINT64 *outSize) = 0;
|
||||
STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize) = 0;
|
||||
};
|
||||
|
||||
// {23170F69-40C1-278A-0000-000200050000}
|
||||
|
@ -24,8 +22,8 @@ ICompressCoder: public IUnknown
|
|||
{
|
||||
STDMETHOD(Code)(ISequentialInStream *inStream,
|
||||
ISequentialOutStream *outStream,
|
||||
const UINT64 *inSize,
|
||||
const UINT64 *outSize,
|
||||
const UInt64 *inSize,
|
||||
const UInt64 *outSize,
|
||||
ICompressProgressInfo *progress) = 0;
|
||||
};
|
||||
|
||||
|
@ -36,11 +34,11 @@ MIDL_INTERFACE("23170F69-40C1-278A-0000-000200180000")
|
|||
ICompressCoder2: public IUnknown
|
||||
{
|
||||
STDMETHOD(Code)(ISequentialInStream **inStreams,
|
||||
const UINT64 **inSizes,
|
||||
UINT32 numInStreams,
|
||||
const UInt64 **inSizes,
|
||||
UInt32 numInStreams,
|
||||
ISequentialOutStream **outStreams,
|
||||
const UINT64 **outSizes,
|
||||
UINT32 numOutStreams,
|
||||
const UInt64 **outSizes,
|
||||
UInt32 numOutStreams,
|
||||
ICompressProgressInfo *progress) PURE;
|
||||
};
|
||||
|
||||
|
@ -58,7 +56,8 @@ namespace NCoderPropID
|
|||
kMatchFinder,
|
||||
kNumPasses = 0x460,
|
||||
kAlgorithm = 0x470,
|
||||
kMultiThread = 0x480
|
||||
kMultiThread = 0x480,
|
||||
kEndMarker = 0x490
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -69,7 +68,7 @@ MIDL_INTERFACE("23170F69-40C1-278A-0000-000200200000")
|
|||
ICompressSetCoderProperties: public IUnknown
|
||||
{
|
||||
STDMETHOD(SetCoderProperties)(const PROPID *propIDs,
|
||||
const PROPVARIANT *properties, UINT32 numProperties) PURE;
|
||||
const PROPVARIANT *properties, UInt32 numProperties) PURE;
|
||||
};
|
||||
|
||||
// {23170F69-40C1-278A-0000-000200210000}
|
||||
|
@ -78,7 +77,7 @@ DEFINE_GUID(IID_ICompressSetDecoderProperties,
|
|||
MIDL_INTERFACE("23170F69-40C1-278A-0000-000200210000")
|
||||
ICompressSetDecoderProperties: public IUnknown
|
||||
{
|
||||
STDMETHOD(SetDecoderProperties)(ISequentialInStream *anInStream) PURE;
|
||||
STDMETHOD(SetDecoderProperties)(ISequentialInStream *inStream) PURE;
|
||||
};
|
||||
|
||||
// {23170F69-40C1-278A-0000-000200230000}
|
||||
|
@ -96,7 +95,7 @@ DEFINE_GUID(IID_ICompressGetInStreamProcessedSize,
|
|||
MIDL_INTERFACE("23170F69-40C1-278A-0000-000200240000")
|
||||
ICompressGetInStreamProcessedSize: public IUnknown
|
||||
{
|
||||
STDMETHOD(GetInStreamProcessedSize)(UINT64 *value) PURE;
|
||||
STDMETHOD(GetInStreamProcessedSize)(UInt64 *value) PURE;
|
||||
};
|
||||
|
||||
// {23170F69-40C1-278A-0000-000200250000}
|
||||
|
@ -105,7 +104,25 @@ DEFINE_GUID(IID_ICompressGetSubStreamSize,
|
|||
MIDL_INTERFACE("23170F69-40C1-278A-0000-000200250000")
|
||||
ICompressGetSubStreamSize: public IUnknown
|
||||
{
|
||||
STDMETHOD(GetSubStreamSize)(UINT64 subStream, UINT64 *value) PURE;
|
||||
STDMETHOD(GetSubStreamSize)(UInt64 subStream, UInt64 *value) PURE;
|
||||
};
|
||||
|
||||
// {23170F69-40C1-278A-0000-000200260000}
|
||||
DEFINE_GUID(IID_ICompressSetInStream,
|
||||
0x23170F69, 0x40C1, 0x278A, 0x00, 0x00, 0x00, 0x02, 0x00, 0x26, 0x00, 0x00);
|
||||
MIDL_INTERFACE("23170F69-40C1-278A-0000-000200260000")
|
||||
ICompressSetInStream: public IUnknown
|
||||
{
|
||||
STDMETHOD(SetInStream)(ISequentialInStream *inStream, const UInt64 *inSize) PURE;
|
||||
};
|
||||
|
||||
// {23170F69-40C1-278A-0000-000200270000}
|
||||
DEFINE_GUID(IID_ICompressSetOutStream,
|
||||
0x23170F69, 0x40C1, 0x278A, 0x00, 0x00, 0x00, 0x02, 0x00, 0x27, 0x00, 0x00);
|
||||
MIDL_INTERFACE("23170F69-40C1-278A-0000-000200270000")
|
||||
ICompressSetOutStream: public IUnknown
|
||||
{
|
||||
STDMETHOD(SetOutStream)(ISequentialOutStream *outStream, const UInt64 *outSize) PURE;
|
||||
};
|
||||
|
||||
//////////////////////
|
||||
|
@ -120,7 +137,7 @@ namespace NMethodPropID
|
|||
kEncoder,
|
||||
kInStreams,
|
||||
kOutStreams,
|
||||
kDescription,
|
||||
kDescription
|
||||
};
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue