#endif\r
\r
#ifdef EFIAPI\r
-#include "UefiLzma.h"\r
+ #include "UefiLzma.h"\r
#else\r
-#include <stddef.h>\r
+ #include <stddef.h>\r
#endif\r
\r
#ifndef EXTERN_C_BEGIN\r
-#ifdef __cplusplus\r
-#define EXTERN_C_BEGIN extern "C" {\r
-#define EXTERN_C_END }\r
-#else\r
+ #ifdef __cplusplus\r
+#define EXTERN_C_BEGIN extern "C" {\r
+#define EXTERN_C_END }\r
+ #else\r
#define EXTERN_C_BEGIN\r
#define EXTERN_C_END\r
-#endif\r
+ #endif\r
#endif\r
\r
EXTERN_C_BEGIN\r
\r
-#define SZ_OK 0\r
+#define SZ_OK 0\r
\r
-#define SZ_ERROR_DATA 1\r
-#define SZ_ERROR_MEM 2\r
-#define SZ_ERROR_CRC 3\r
-#define SZ_ERROR_UNSUPPORTED 4\r
-#define SZ_ERROR_PARAM 5\r
-#define SZ_ERROR_INPUT_EOF 6\r
-#define SZ_ERROR_OUTPUT_EOF 7\r
-#define SZ_ERROR_READ 8\r
-#define SZ_ERROR_WRITE 9\r
-#define SZ_ERROR_PROGRESS 10\r
-#define SZ_ERROR_FAIL 11\r
-#define SZ_ERROR_THREAD 12\r
+#define SZ_ERROR_DATA 1\r
+#define SZ_ERROR_MEM 2\r
+#define SZ_ERROR_CRC 3\r
+#define SZ_ERROR_UNSUPPORTED 4\r
+#define SZ_ERROR_PARAM 5\r
+#define SZ_ERROR_INPUT_EOF 6\r
+#define SZ_ERROR_OUTPUT_EOF 7\r
+#define SZ_ERROR_READ 8\r
+#define SZ_ERROR_WRITE 9\r
+#define SZ_ERROR_PROGRESS 10\r
+#define SZ_ERROR_FAIL 11\r
+#define SZ_ERROR_THREAD 12\r
\r
-#define SZ_ERROR_ARCHIVE 16\r
-#define SZ_ERROR_NO_ARCHIVE 17\r
+#define SZ_ERROR_ARCHIVE 16\r
+#define SZ_ERROR_NO_ARCHIVE 17\r
\r
typedef int SRes;\r
\r
-\r
#ifdef _WIN32\r
\r
/* typedef DWORD WRes; */\r
typedef unsigned WRes;\r
-#define MY_SRes_HRESULT_FROM_WRes(x) HRESULT_FROM_WIN32(x)\r
+#define MY_SRes_HRESULT_FROM_WRes(x) HRESULT_FROM_WIN32(x)\r
\r
#else\r
\r
typedef int WRes;\r
-#define MY__FACILITY_WIN32 7\r
-#define MY__FACILITY__WRes MY__FACILITY_WIN32\r
-#define MY_SRes_HRESULT_FROM_WRes(x) ((HRESULT)(x) <= 0 ? ((HRESULT)(x)) : ((HRESULT) (((x) & 0x0000FFFF) | (MY__FACILITY__WRes << 16) | 0x80000000)))\r
+#define MY__FACILITY_WIN32 7\r
+#define MY__FACILITY__WRes MY__FACILITY_WIN32\r
+#define MY_SRes_HRESULT_FROM_WRes(x) ((HRESULT)(x) <= 0 ? ((HRESULT)(x)) : ((HRESULT) (((x) & 0x0000FFFF) | (MY__FACILITY__WRes << 16) | 0x80000000)))\r
\r
#endif\r
\r
-\r
#ifndef RINOK\r
-#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }\r
+#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }\r
#endif\r
\r
-typedef unsigned char Byte;\r
-typedef short Int16;\r
+typedef unsigned char Byte;\r
+typedef short Int16;\r
typedef unsigned short UInt16;\r
\r
#ifdef _LZMA_UINT32_IS_ULONG\r
-typedef long Int32;\r
+typedef long Int32;\r
typedef unsigned long UInt32;\r
#else\r
-typedef int Int32;\r
+typedef int Int32;\r
typedef unsigned int UInt32;\r
#endif\r
\r
/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.\r
NOTES: Some code will work incorrectly in that case! */\r
\r
-typedef long Int64;\r
+typedef long Int64;\r
typedef unsigned long UInt64;\r
\r
#else\r
\r
-#if defined(_MSC_VER) || defined(__BORLANDC__)\r
-typedef __int64 Int64;\r
+ #if defined (_MSC_VER) || defined (__BORLANDC__)\r
+typedef __int64 Int64;\r
typedef unsigned __int64 UInt64;\r
-#define UINT64_CONST(n) n\r
-#else\r
-typedef long long int Int64;\r
+#define UINT64_CONST(n) n\r
+ #else\r
+typedef long long int Int64;\r
typedef unsigned long long int UInt64;\r
-#define UINT64_CONST(n) n ## ULL\r
-#endif\r
+#define UINT64_CONST(n) n ## ULL\r
+ #endif\r
\r
#endif\r
\r
\r
typedef int BoolInt;\r
/* typedef BoolInt Bool; */\r
-#define True 1\r
-#define False 0\r
-\r
+#define True 1\r
+#define False 0\r
\r
#ifdef _WIN32\r
-#define MY_STD_CALL __stdcall\r
+#define MY_STD_CALL __stdcall\r
#else\r
#define MY_STD_CALL\r
#endif\r
\r
-#if defined(_MSC_VER) && !defined(__clang__)\r
+#if defined (_MSC_VER) && !defined (__clang__)\r
\r
-#if _MSC_VER >= 1300\r
-#define MY_NO_INLINE __declspec(noinline)\r
-#else\r
+ #if _MSC_VER >= 1300\r
+#define MY_NO_INLINE __declspec(noinline)\r
+ #else\r
#define MY_NO_INLINE\r
-#endif\r
+ #endif\r
\r
-#define MY_FORCE_INLINE __forceinline\r
+#define MY_FORCE_INLINE __forceinline\r
\r
-#define MY_CDECL __cdecl\r
-#define MY_FAST_CALL __fastcall\r
+#define MY_CDECL __cdecl\r
+#define MY_FAST_CALL __fastcall\r
\r
#else\r
\r
/* inline keyword : for C++ / C99 */\r
\r
/* GCC, clang: */\r
+\r
/*\r
#if defined (__GNUC__) && (__GNUC__ >= 4)\r
#define MY_FORCE_INLINE __attribute__((always_inline))\r
\r
#endif\r
\r
-\r
/* The following interfaces use first parameter as pointer to structure */\r
\r
typedef struct IByteIn IByteIn;\r
-struct IByteIn\r
-{\r
- Byte (*Read)(const IByteIn *p); /* reads one byte, returns 0 in case of EOF or error */\r
+struct IByteIn {\r
+ Byte (*Read)(\r
+ const IByteIn *p\r
+ ); /* reads one byte, returns 0 in case of EOF or error */\r
};\r
-#define IByteIn_Read(p) (p)->Read(p)\r
\r
+#define IByteIn_Read(p) (p)->Read(p)\r
\r
typedef struct IByteOut IByteOut;\r
-struct IByteOut\r
-{\r
- void (*Write)(const IByteOut *p, Byte b);\r
+struct IByteOut {\r
+ void (*Write)(\r
+ const IByteOut *p,\r
+ Byte b\r
+ );\r
};\r
-#define IByteOut_Write(p, b) (p)->Write(p, b)\r
\r
+#define IByteOut_Write(p, b) (p)->Write(p, b)\r
\r
typedef struct ISeqInStream ISeqInStream;\r
-struct ISeqInStream\r
-{\r
- SRes (*Read)(const ISeqInStream *p, void *buf, size_t *size);\r
- /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.\r
- (output(*size) < input(*size)) is allowed */\r
+struct ISeqInStream {\r
+ SRes (*Read)(\r
+ const ISeqInStream *p,\r
+ void *buf,\r
+ size_t *size\r
+ );\r
+\r
+ /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.\r
+ (output(*size) < input(*size)) is allowed */\r
};\r
-#define ISeqInStream_Read(p, buf, size) (p)->Read(p, buf, size)\r
\r
-/* it can return SZ_ERROR_INPUT_EOF */\r
-SRes SeqInStream_Read(const ISeqInStream *stream, void *buf, size_t size);\r
-SRes SeqInStream_Read2(const ISeqInStream *stream, void *buf, size_t size, SRes errorType);\r
-SRes SeqInStream_ReadByte(const ISeqInStream *stream, Byte *buf);\r
+#define ISeqInStream_Read(p, buf, size) (p)->Read(p, buf, size)\r
\r
+/* it can return SZ_ERROR_INPUT_EOF */\r
+SRes\r
+SeqInStream_Read (\r
+ const ISeqInStream *stream,\r
+ void *buf,\r
+ size_t size\r
+ );\r
+\r
+SRes\r
+SeqInStream_Read2 (\r
+ const ISeqInStream *stream,\r
+ void *buf,\r
+ size_t size,\r
+ SRes errorType\r
+ );\r
+\r
+SRes\r
+SeqInStream_ReadByte (\r
+ const ISeqInStream *stream,\r
+ Byte *buf\r
+ );\r
\r
typedef struct ISeqOutStream ISeqOutStream;\r
-struct ISeqOutStream\r
-{\r
- size_t (*Write)(const ISeqOutStream *p, const void *buf, size_t size);\r
- /* Returns: result - the number of actually written bytes.\r
- (result < size) means error */\r
+struct ISeqOutStream {\r
+ size_t (*Write)(\r
+ const ISeqOutStream *p,\r
+ const void *buf,\r
+ size_t size\r
+ );\r
+\r
+ /* Returns: result - the number of actually written bytes.\r
+ (result < size) means error */\r
};\r
-#define ISeqOutStream_Write(p, buf, size) (p)->Write(p, buf, size)\r
\r
-typedef enum\r
-{\r
+#define ISeqOutStream_Write(p, buf, size) (p)->Write(p, buf, size)\r
+\r
+typedef enum {\r
SZ_SEEK_SET = 0,\r
SZ_SEEK_CUR = 1,\r
SZ_SEEK_END = 2\r
} ESzSeek;\r
\r
-\r
typedef struct ISeekInStream ISeekInStream;\r
-struct ISeekInStream\r
-{\r
- SRes (*Read)(const ISeekInStream *p, void *buf, size_t *size); /* same as ISeqInStream::Read */\r
- SRes (*Seek)(const ISeekInStream *p, Int64 *pos, ESzSeek origin);\r
+struct ISeekInStream {\r
+ SRes (*Read)(\r
+ const ISeekInStream *p,\r
+ void *buf,\r
+ size_t *size\r
+ ); /* same as ISeqInStream::Read */\r
+ SRes (*Seek)(\r
+ const ISeekInStream *p,\r
+ Int64 *pos,\r
+ ESzSeek origin\r
+ );\r
};\r
-#define ISeekInStream_Read(p, buf, size) (p)->Read(p, buf, size)\r
-#define ISeekInStream_Seek(p, pos, origin) (p)->Seek(p, pos, origin)\r
\r
+#define ISeekInStream_Read(p, buf, size) (p)->Read(p, buf, size)\r
+#define ISeekInStream_Seek(p, pos, origin) (p)->Seek(p, pos, origin)\r
\r
typedef struct ILookInStream ILookInStream;\r
-struct ILookInStream\r
-{\r
- SRes (*Look)(const ILookInStream *p, const void **buf, size_t *size);\r
- /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.\r
- (output(*size) > input(*size)) is not allowed\r
- (output(*size) < input(*size)) is allowed */\r
- SRes (*Skip)(const ILookInStream *p, size_t offset);\r
- /* offset must be <= output(*size) of Look */\r
-\r
- SRes (*Read)(const ILookInStream *p, void *buf, size_t *size);\r
- /* reads directly (without buffer). It's same as ISeqInStream::Read */\r
- SRes (*Seek)(const ILookInStream *p, Int64 *pos, ESzSeek origin);\r
+struct ILookInStream {\r
+ SRes (*Look)(\r
+ const ILookInStream *p,\r
+ const void **buf,\r
+ size_t *size\r
+ );\r
+\r
+ /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.\r
+ (output(*size) > input(*size)) is not allowed\r
+ (output(*size) < input(*size)) is allowed */\r
+ SRes (*Skip)(\r
+ const ILookInStream *p,\r
+ size_t offset\r
+ );\r
+ /* offset must be <= output(*size) of Look */\r
+\r
+ SRes (*Read)(\r
+ const ILookInStream *p,\r
+ void *buf,\r
+ size_t *size\r
+ );\r
+ /* reads directly (without buffer). It's same as ISeqInStream::Read */\r
+ SRes (*Seek)(\r
+ const ILookInStream *p,\r
+ Int64 *pos,\r
+ ESzSeek origin\r
+ );\r
};\r
\r
-#define ILookInStream_Look(p, buf, size) (p)->Look(p, buf, size)\r
-#define ILookInStream_Skip(p, offset) (p)->Skip(p, offset)\r
-#define ILookInStream_Read(p, buf, size) (p)->Read(p, buf, size)\r
-#define ILookInStream_Seek(p, pos, origin) (p)->Seek(p, pos, origin)\r
+#define ILookInStream_Look(p, buf, size) (p)->Look(p, buf, size)\r
+#define ILookInStream_Skip(p, offset) (p)->Skip(p, offset)\r
+#define ILookInStream_Read(p, buf, size) (p)->Read(p, buf, size)\r
+#define ILookInStream_Seek(p, pos, origin) (p)->Seek(p, pos, origin)\r
\r
+SRes\r
+LookInStream_LookRead (\r
+ const ILookInStream *stream,\r
+ void *buf,\r
+ size_t *size\r
+ );\r
\r
-SRes LookInStream_LookRead(const ILookInStream *stream, void *buf, size_t *size);\r
-SRes LookInStream_SeekTo(const ILookInStream *stream, UInt64 offset);\r
+SRes\r
+LookInStream_SeekTo (\r
+ const ILookInStream *stream,\r
+ UInt64 offset\r
+ );\r
\r
/* reads via ILookInStream::Read */\r
-SRes LookInStream_Read2(const ILookInStream *stream, void *buf, size_t size, SRes errorType);\r
-SRes LookInStream_Read(const ILookInStream *stream, void *buf, size_t size);\r
-\r
-\r
-\r
-typedef struct\r
-{\r
- ILookInStream vt;\r
- const ISeekInStream *realStream;\r
-\r
- size_t pos;\r
- size_t size; /* it's data size */\r
+SRes\r
+LookInStream_Read2 (\r
+ const ILookInStream *stream,\r
+ void *buf,\r
+ size_t size,\r
+ SRes errorType\r
+ );\r
+\r
+SRes\r
+LookInStream_Read (\r
+ const ILookInStream *stream,\r
+ void *buf,\r
+ size_t size\r
+ );\r
+\r
+typedef struct {\r
+ ILookInStream vt;\r
+ const ISeekInStream *realStream;\r
+\r
+ size_t pos;\r
+ size_t size; /* it's data size */\r
\r
/* the following variables must be set outside */\r
- Byte *buf;\r
- size_t bufSize;\r
+ Byte *buf;\r
+ size_t bufSize;\r
} CLookToRead2;\r
\r
-void LookToRead2_CreateVTable(CLookToRead2 *p, int lookahead);\r
-\r
-#define LookToRead2_Init(p) { (p)->pos = (p)->size = 0; }\r
+void\r
+LookToRead2_CreateVTable (\r
+ CLookToRead2 *p,\r
+ int lookahead\r
+ );\r
\r
+#define LookToRead2_Init(p) { (p)->pos = (p)->size = 0; }\r
\r
-typedef struct\r
-{\r
- ISeqInStream vt;\r
- const ILookInStream *realStream;\r
+typedef struct {\r
+ ISeqInStream vt;\r
+ const ILookInStream *realStream;\r
} CSecToLook;\r
\r
-void SecToLook_CreateVTable(CSecToLook *p);\r
+void\r
+SecToLook_CreateVTable (\r
+ CSecToLook *p\r
+ );\r
\r
-\r
-\r
-typedef struct\r
-{\r
- ISeqInStream vt;\r
- const ILookInStream *realStream;\r
+typedef struct {\r
+ ISeqInStream vt;\r
+ const ILookInStream *realStream;\r
} CSecToRead;\r
\r
-void SecToRead_CreateVTable(CSecToRead *p);\r
-\r
+void\r
+SecToRead_CreateVTable (\r
+ CSecToRead *p\r
+ );\r
\r
typedef struct ICompressProgress ICompressProgress;\r
\r
-struct ICompressProgress\r
-{\r
- SRes (*Progress)(const ICompressProgress *p, UInt64 inSize, UInt64 outSize);\r
- /* Returns: result. (result != SZ_OK) means break.\r
- Value (UInt64)(Int64)-1 for size means unknown value. */\r
-};\r
-#define ICompressProgress_Progress(p, inSize, outSize) (p)->Progress(p, inSize, outSize)\r
+struct ICompressProgress {\r
+ SRes (*Progress)(\r
+ const ICompressProgress *p,\r
+ UInt64 inSize,\r
+ UInt64 outSize\r
+ );\r
\r
+ /* Returns: result. (result != SZ_OK) means break.\r
+ Value (UInt64)(Int64)-1 for size means unknown value. */\r
+};\r
\r
+#define ICompressProgress_Progress(p, inSize, outSize) (p)->Progress(p, inSize, outSize)\r
\r
typedef struct ISzAlloc ISzAlloc;\r
-typedef const ISzAlloc * ISzAllocPtr;\r
-\r
-struct ISzAlloc\r
-{\r
- void *(*Alloc)(ISzAllocPtr p, size_t size);\r
- void (*Free)(ISzAllocPtr p, void *address); /* address can be 0 */\r
+typedef const ISzAlloc *ISzAllocPtr;\r
+\r
+struct ISzAlloc {\r
+ void *(*Alloc)(\r
+ ISzAllocPtr p,\r
+ size_t size\r
+ );\r
+ void (*Free)(\r
+ ISzAllocPtr p,\r
+ void *address\r
+ ); /* address can be 0 */\r
};\r
\r
-#define ISzAlloc_Alloc(p, size) (p)->Alloc(p, size)\r
-#define ISzAlloc_Free(p, a) (p)->Free(p, a)\r
+#define ISzAlloc_Alloc(p, size) (p)->Alloc(p, size)\r
+#define ISzAlloc_Free(p, a) (p)->Free(p, a)\r
\r
/* deprecated */\r
-#define IAlloc_Alloc(p, size) ISzAlloc_Alloc(p, size)\r
-#define IAlloc_Free(p, a) ISzAlloc_Free(p, a)\r
-\r
-\r
-\r
-\r
+#define IAlloc_Alloc(p, size) ISzAlloc_Alloc(p, size)\r
+#define IAlloc_Free(p, a) ISzAlloc_Free(p, a)\r
\r
#ifndef MY_offsetof\r
#ifdef offsetof\r
- #define MY_offsetof(type, m) offsetof(type, m)\r
- /*\r
- #define MY_offsetof(type, m) FIELD_OFFSET(type, m)\r
- */\r
+#define MY_offsetof(type, m) offsetof(type, m)\r
+\r
+/*\r
+#define MY_offsetof(type, m) FIELD_OFFSET(type, m)\r
+*/\r
#else\r
- #define MY_offsetof(type, m) ((size_t)&(((type *)0)->m))\r
+#define MY_offsetof(type, m) ((size_t)&(((type *)0)->m))\r
#endif\r
#endif\r
\r
-\r
-\r
#ifndef MY_container_of\r
\r
/*\r
GCC 4.8.1 : classes with non-public variable members"\r
*/\r
\r
-#define MY_container_of(ptr, type, m) ((type *)((char *)(1 ? (ptr) : &((type *)0)->m) - MY_offsetof(type, m)))\r
-\r
+#define MY_container_of(ptr, type, m) ((type *)((char *)(1 ? (ptr) : &((type *)0)->m) - MY_offsetof(type, m)))\r
\r
#endif\r
\r
-#define CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m) ((type *)(ptr))\r
+#define CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m) ((type *)(ptr))\r
\r
/*\r
#define CONTAINER_FROM_VTBL(ptr, type, m) CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m)\r
*/\r
-#define CONTAINER_FROM_VTBL(ptr, type, m) MY_container_of(ptr, type, m)\r
+#define CONTAINER_FROM_VTBL(ptr, type, m) MY_container_of(ptr, type, m)\r
+\r
+#define CONTAINER_FROM_VTBL_CLS(ptr, type, m) CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m)\r
\r
-#define CONTAINER_FROM_VTBL_CLS(ptr, type, m) CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m)\r
/*\r
#define CONTAINER_FROM_VTBL_CLS(ptr, type, m) CONTAINER_FROM_VTBL(ptr, type, m)\r
*/\r
\r
-\r
-\r
#ifdef _WIN32\r
\r
-#define CHAR_PATH_SEPARATOR '\\'\r
-#define WCHAR_PATH_SEPARATOR L'\\'\r
-#define STRING_PATH_SEPARATOR "\\"\r
-#define WSTRING_PATH_SEPARATOR L"\\"\r
+#define CHAR_PATH_SEPARATOR '\\'\r
+#define WCHAR_PATH_SEPARATOR L'\\'\r
+#define STRING_PATH_SEPARATOR "\\"\r
+#define WSTRING_PATH_SEPARATOR L"\\"\r
\r
#else\r
\r
-#define CHAR_PATH_SEPARATOR '/'\r
-#define WCHAR_PATH_SEPARATOR L'/'\r
-#define STRING_PATH_SEPARATOR "/"\r
-#define WSTRING_PATH_SEPARATOR L"/"\r
+#define CHAR_PATH_SEPARATOR '/'\r
+#define WCHAR_PATH_SEPARATOR L'/'\r
+#define STRING_PATH_SEPARATOR "/"\r
+#define WSTRING_PATH_SEPARATOR L"/"\r
\r
#endif\r
\r