diff --git a/.gitignore b/.gitignore
index 01588760..e3bc48af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,6 @@ VisualGDB/VisualGDB/Release/Amiberry-sdl2
 *.a
 *.npa00-f5145647
 VisualGDB/VisualGDB/Debug/Amiberry-sdl2
-*.npa00-25509379
\ No newline at end of file
+*.npa00-25509379
+*.npa00-01e2471b
+*.npa00-d8f9b35e
\ No newline at end of file
diff --git a/src/archivers/7z/Archive/7z/7zAlloc.cpp b/src/archivers/7z/Archive/7z/7zAlloc.cpp
index 0c9448fd..71131161 100644
--- a/src/archivers/7z/Archive/7z/7zAlloc.cpp
+++ b/src/archivers/7z/Archive/7z/7zAlloc.cpp
@@ -1,77 +1,77 @@
-/* 7zAlloc.c -- Allocation functions
-2008-10-04 : Igor Pavlov : Public domain */
-
-#include <stdlib.h>
-#include "7zAlloc.h"
-
-/* #define _SZ_ALLOC_DEBUG */
-/* use _SZ_ALLOC_DEBUG to debug alloc/free operations */
-
-#ifdef _SZ_ALLOC_DEBUG
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include <stdio.h>
-int g_allocCount = 0;
-int g_allocCountTemp = 0;
-
-#endif
-
-void *SzAlloc(void *p, size_t size)
-{
-    p = p;
-    if (size == 0)
-        return 0;
-#ifdef _SZ_ALLOC_DEBUG
-    fprintf(stderr, "\nAlloc %10d bytes; count = %10d", size, g_allocCount);
-    g_allocCount++;
-#endif
-    return malloc(size);
-}
-
-void SzFree(void *p, void *address)
-{
-    p = p;
-#ifdef _SZ_ALLOC_DEBUG
-    if (address != 0)
-    {
-        g_allocCount--;
-        fprintf(stderr, "\nFree; count = %10d", g_allocCount);
-    }
-#endif
-    free(address);
-}
-
-void *SzAllocTemp(void *p, size_t size)
-{
-    p = p;
-    if (size == 0)
-        return 0;
-#ifdef _SZ_ALLOC_DEBUG
-    fprintf(stderr, "\nAlloc_temp %10d bytes;  count = %10d", size, g_allocCountTemp);
-    g_allocCountTemp++;
-#ifdef _WIN32
-    return HeapAlloc(GetProcessHeap(), 0, size);
-#endif
-#endif
-    return malloc(size);
-}
-
-void SzFreeTemp(void *p, void *address)
-{
-    p = p;
-#ifdef _SZ_ALLOC_DEBUG
-    if (address != 0)
-    {
-        g_allocCountTemp--;
-        fprintf(stderr, "\nFree_temp; count = %10d", g_allocCountTemp);
-    }
-#ifdef _WIN32
-    HeapFree(GetProcessHeap(), 0, address);
-    return;
-#endif
-#endif
-    free(address);
-}
+/* 7zAlloc.c -- Allocation functions
+2008-10-04 : Igor Pavlov : Public domain */
+
+#include <stdlib.h>
+#include "7zAlloc.h"
+
+/* #define _SZ_ALLOC_DEBUG */
+/* use _SZ_ALLOC_DEBUG to debug alloc/free operations */
+
+#ifdef _SZ_ALLOC_DEBUG
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#include <stdio.h>
+int g_allocCount = 0;
+int g_allocCountTemp = 0;
+
+#endif
+
+void *SzAlloc(void *p, size_t size)
+{
+    p = p;
+    if (size == 0)
+        return 0;
+#ifdef _SZ_ALLOC_DEBUG
+    fprintf(stderr, "\nAlloc %10d bytes; count = %10d", size, g_allocCount);
+    g_allocCount++;
+#endif
+    return malloc(size);
+}
+
+void SzFree(void *p, void *address)
+{
+    p = p;
+#ifdef _SZ_ALLOC_DEBUG
+    if (address != 0)
+    {
+        g_allocCount--;
+        fprintf(stderr, "\nFree; count = %10d", g_allocCount);
+    }
+#endif
+    free(address);
+}
+
+void *SzAllocTemp(void *p, size_t size)
+{
+    p = p;
+    if (size == 0)
+        return 0;
+#ifdef _SZ_ALLOC_DEBUG
+    fprintf(stderr, "\nAlloc_temp %10d bytes;  count = %10d", size, g_allocCountTemp);
+    g_allocCountTemp++;
+#ifdef _WIN32
+    return HeapAlloc(GetProcessHeap(), 0, size);
+#endif
+#endif
+    return malloc(size);
+}
+
+void SzFreeTemp(void *p, void *address)
+{
+    p = p;
+#ifdef _SZ_ALLOC_DEBUG
+    if (address != 0)
+    {
+        g_allocCountTemp--;
+        fprintf(stderr, "\nFree_temp; count = %10d", g_allocCountTemp);
+    }
+#ifdef _WIN32
+    HeapFree(GetProcessHeap(), 0, address);
+    return;
+#endif
+#endif
+    free(address);
+}
diff --git a/src/archivers/7z/Archive/7z/7zAlloc.h b/src/archivers/7z/Archive/7z/7zAlloc.h
index 91505d00..e752ef18 100644
--- a/src/archivers/7z/Archive/7z/7zAlloc.h
+++ b/src/archivers/7z/Archive/7z/7zAlloc.h
@@ -1,15 +1,15 @@
-/* 7zAlloc.h -- Allocation functions
-2008-10-04 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_ALLOC_H
-#define __7Z_ALLOC_H
-
-#include <stddef.h>
-
-void *SzAlloc(void *p, size_t size);
-void SzFree(void *p, void *address);
-
-void *SzAllocTemp(void *p, size_t size);
-void SzFreeTemp(void *p, void *address);
-
-#endif
+/* 7zAlloc.h -- Allocation functions
+2008-10-04 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_ALLOC_H
+#define __7Z_ALLOC_H
+
+#include <stddef.h>
+
+void *SzAlloc(void *p, size_t size);
+void SzFree(void *p, void *address);
+
+void *SzAllocTemp(void *p, size_t size);
+void SzFreeTemp(void *p, void *address);
+
+#endif
diff --git a/src/archivers/7z/Archive/7z/7zDecode.cpp b/src/archivers/7z/Archive/7z/7zDecode.cpp
index 93673377..9ef7e8be 100644
--- a/src/archivers/7z/Archive/7z/7zDecode.cpp
+++ b/src/archivers/7z/Archive/7z/7zDecode.cpp
@@ -1,254 +1,254 @@
-/* 7zDecode.c -- Decoding from 7z folder
-2008-11-23 : Igor Pavlov : Public domain */
-
-#include <string.h>
-
-#include "../../Bcj2.h"
-#include "../../Bra.h"
-#include "../../LzmaDec.h"
-#include "7zDecode.h"
-
-#define k_Copy 0
-#define k_LZMA 0x30101
-#define k_BCJ 0x03030103
-#define k_BCJ2 0x0303011B
-
-static SRes SzDecodeLzma(CSzCoderInfo *coder, UInt64 inSize, ILookInStream *inStream,
-                         Byte *outBuffer, SizeT outSize, ISzAlloc *allocMain)
-{
-    CLzmaDec state;
-    SRes res = SZ_OK;
-
-    LzmaDec_Construct(&state);
-    RINOK(LzmaDec_AllocateProbs(&state, coder->Props.data, (unsigned)coder->Props.size, allocMain));
-    state.dic = outBuffer;
-    state.dicBufSize = outSize;
-    LzmaDec_Init(&state);
-
-    for (;;)
-    {
-        Byte *inBuf = NULL;
-        size_t lookahead = (1 << 18);
-        if (lookahead > inSize)
-            lookahead = (size_t)inSize;
-        res = inStream->Look((void *)inStream, (void **)&inBuf, &lookahead);
-        if (res != SZ_OK)
-            break;
-
-        {
-            SizeT inProcessed = (SizeT)lookahead, dicPos = state.dicPos;
-            ELzmaStatus status;
-            res = LzmaDec_DecodeToDic(&state, outSize, inBuf, &inProcessed, LZMA_FINISH_END, &status);
-            lookahead -= inProcessed;
-            inSize -= inProcessed;
-            if (res != SZ_OK)
-                break;
-            if (state.dicPos == state.dicBufSize || (inProcessed == 0 && dicPos == state.dicPos))
-            {
-                if (state.dicBufSize != outSize || lookahead != 0 ||
-                        (status != LZMA_STATUS_FINISHED_WITH_MARK &&
-                         status != LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK))
-                    res = SZ_ERROR_DATA;
-                break;
-            }
-            res = inStream->Skip((void *)inStream, inProcessed);
-            if (res != SZ_OK)
-                break;
-        }
-    }
-
-    LzmaDec_FreeProbs(&state, allocMain);
-    return res;
-}
-
-static SRes SzDecodeCopy(UInt64 inSize, ILookInStream *inStream, Byte *outBuffer)
-{
-    while (inSize > 0)
-    {
-        void *inBuf;
-        size_t curSize = (1 << 18);
-        if (curSize > inSize)
-            curSize = (size_t)inSize;
-        RINOK(inStream->Look((void *)inStream, (void **)&inBuf, &curSize));
-        if (curSize == 0)
-            return SZ_ERROR_INPUT_EOF;
-        memcpy(outBuffer, inBuf, curSize);
-        outBuffer += curSize;
-        inSize -= curSize;
-        RINOK(inStream->Skip((void *)inStream, curSize));
-    }
-    return SZ_OK;
-}
-
-#define IS_UNSUPPORTED_METHOD(m) ((m) != k_Copy && (m) != k_LZMA)
-#define IS_UNSUPPORTED_CODER(c) (IS_UNSUPPORTED_METHOD(c.MethodID) || c.NumInStreams != 1 || c.NumOutStreams != 1)
-#define IS_NO_BCJ(c) (c.MethodID != k_BCJ || c.NumInStreams != 1 || c.NumOutStreams != 1)
-#define IS_NO_BCJ2(c) (c.MethodID != k_BCJ2 || c.NumInStreams != 4 || c.NumOutStreams != 1)
-
-SRes CheckSupportedFolder(const CSzFolder *f)
-{
-    if (f->NumCoders < 1 || f->NumCoders > 4)
-        return SZ_ERROR_UNSUPPORTED;
-    if (IS_UNSUPPORTED_CODER(f->Coders[0]))
-        return SZ_ERROR_UNSUPPORTED;
-    if (f->NumCoders == 1)
-    {
-        if (f->NumPackStreams != 1 || f->PackStreams[0] != 0 || f->NumBindPairs != 0)
-            return SZ_ERROR_UNSUPPORTED;
-        return SZ_OK;
-    }
-    if (f->NumCoders == 2)
-    {
-        if (IS_NO_BCJ(f->Coders[1]) ||
-                f->NumPackStreams != 1 || f->PackStreams[0] != 0 ||
-                f->NumBindPairs != 1 ||
-                f->BindPairs[0].InIndex != 1 || f->BindPairs[0].OutIndex != 0)
-            return SZ_ERROR_UNSUPPORTED;
-        return SZ_OK;
-    }
-    if (f->NumCoders == 4)
-    {
-        if (IS_UNSUPPORTED_CODER(f->Coders[1]) ||
-                IS_UNSUPPORTED_CODER(f->Coders[2]) ||
-                IS_NO_BCJ2(f->Coders[3]))
-            return SZ_ERROR_UNSUPPORTED;
-        if (f->NumPackStreams != 4 ||
-                f->PackStreams[0] != 2 ||
-                f->PackStreams[1] != 6 ||
-                f->PackStreams[2] != 1 ||
-                f->PackStreams[3] != 0 ||
-                f->NumBindPairs != 3 ||
-                f->BindPairs[0].InIndex != 5 || f->BindPairs[0].OutIndex != 0 ||
-                f->BindPairs[1].InIndex != 4 || f->BindPairs[1].OutIndex != 1 ||
-                f->BindPairs[2].InIndex != 3 || f->BindPairs[2].OutIndex != 2)
-            return SZ_ERROR_UNSUPPORTED;
-        return SZ_OK;
-    }
-    return SZ_ERROR_UNSUPPORTED;
-}
-
-UInt64 GetSum(const UInt64 *values, UInt32 index)
-{
-    UInt64 sum = 0;
-    UInt32 i;
-    for (i = 0; i < index; i++)
-        sum += values[i];
-    return sum;
-}
-
-SRes SzDecode2(const UInt64 *packSizes, const CSzFolder *folder,
-               ILookInStream *inStream, UInt64 startPos,
-               Byte *outBuffer, SizeT outSize, ISzAlloc *allocMain,
-               Byte *tempBuf[])
-{
-    UInt32 ci;
-    SizeT tempSizes[3] = { 0, 0, 0};
-    SizeT tempSize3 = 0;
-    Byte *tempBuf3 = 0;
-
-    RINOK(CheckSupportedFolder(folder));
-
-    for (ci = 0; ci < folder->NumCoders; ci++)
-    {
-        CSzCoderInfo *coder = &folder->Coders[ci];
-
-        if (coder->MethodID == k_Copy || coder->MethodID == k_LZMA)
-        {
-            UInt32 si = 0;
-            UInt64 offset;
-            UInt64 inSize;
-            Byte *outBufCur = outBuffer;
-            SizeT outSizeCur = outSize;
-            if (folder->NumCoders == 4)
-            {
-                UInt32 indices[] = { 3, 2, 0 };
-                UInt64 unpackSize = folder->UnpackSizes[ci];
-                si = indices[ci];
-                if (ci < 2)
-                {
-                    Byte *temp;
-                    outSizeCur = (SizeT)unpackSize;
-                    if (outSizeCur != unpackSize)
-                        return SZ_ERROR_MEM;
-                    temp = (Byte *)IAlloc_Alloc(allocMain, outSizeCur);
-                    if (temp == 0 && outSizeCur != 0)
-                        return SZ_ERROR_MEM;
-                    outBufCur = tempBuf[1 - ci] = temp;
-                    tempSizes[1 - ci] = outSizeCur;
-                }
-                else if (ci == 2)
-                {
-                    if (unpackSize > outSize) /* check it */
-                        return SZ_ERROR_PARAM;
-                    tempBuf3 = outBufCur = outBuffer + (outSize - (size_t)unpackSize);
-                    tempSize3 = outSizeCur = (SizeT)unpackSize;
-                }
-                else
-                    return SZ_ERROR_UNSUPPORTED;
-            }
-            offset = GetSum(packSizes, si);
-            inSize = packSizes[si];
-            RINOK(LookInStream_SeekTo(inStream, startPos + offset));
-
-            if (coder->MethodID == k_Copy)
-            {
-                if (inSize != outSizeCur) /* check it */
-                    return SZ_ERROR_DATA;
-                RINOK(SzDecodeCopy(inSize, inStream, outBufCur));
-            }
-            else
-            {
-                RINOK(SzDecodeLzma(coder, inSize, inStream, outBufCur, outSizeCur, allocMain));
-            }
-        }
-        else if (coder->MethodID == k_BCJ)
-        {
-            UInt32 state;
-            if (ci != 1)
-                return SZ_ERROR_UNSUPPORTED;
-            x86_Convert_Init(state);
-            x86_Convert(outBuffer, outSize, 0, &state, 0);
-        }
-        else if (coder->MethodID == k_BCJ2)
-        {
-            UInt64 offset = GetSum(packSizes, 1);
-            UInt64 s3Size = packSizes[1];
-            SRes res;
-            if (ci != 3)
-                return SZ_ERROR_UNSUPPORTED;
-            RINOK(LookInStream_SeekTo(inStream, startPos + offset));
-            tempSizes[2] = (SizeT)s3Size;
-            if (tempSizes[2] != s3Size)
-                return SZ_ERROR_MEM;
-            tempBuf[2] = (Byte *)IAlloc_Alloc(allocMain, tempSizes[2]);
-            if (tempBuf[2] == 0 && tempSizes[2] != 0)
-                return SZ_ERROR_MEM;
-            res = SzDecodeCopy(s3Size, inStream, tempBuf[2]);
-            RINOK(res)
-
-            res = Bcj2_Decode(
-                      tempBuf3, tempSize3,
-                      tempBuf[0], tempSizes[0],
-                      tempBuf[1], tempSizes[1],
-                      tempBuf[2], tempSizes[2],
-                      outBuffer, outSize);
-            RINOK(res)
-        }
-        else
-            return SZ_ERROR_UNSUPPORTED;
-    }
-    return SZ_OK;
-}
-
-SRes SzDecode(const UInt64 *packSizes, const CSzFolder *folder,
-              ILookInStream *inStream, UInt64 startPos,
-              Byte *outBuffer, size_t outSize, ISzAlloc *allocMain)
-{
-    Byte *tempBuf[3] = { 0, 0, 0};
-    int i;
-    SRes res = SzDecode2(packSizes, folder, inStream, startPos,
-                         outBuffer, (SizeT)outSize, allocMain, tempBuf);
-    for (i = 0; i < 3; i++)
-        IAlloc_Free(allocMain, tempBuf[i]);
-    return res;
-}
+/* 7zDecode.c -- Decoding from 7z folder
+2008-11-23 : Igor Pavlov : Public domain */
+
+#include <string.h>
+
+#include "../../Bcj2.h"
+#include "../../Bra.h"
+#include "../../LzmaDec.h"
+#include "7zDecode.h"
+
+#define k_Copy 0
+#define k_LZMA 0x30101
+#define k_BCJ 0x03030103
+#define k_BCJ2 0x0303011B
+
+static SRes SzDecodeLzma(CSzCoderInfo *coder, UInt64 inSize, ILookInStream *inStream,
+                         Byte *outBuffer, SizeT outSize, ISzAlloc *allocMain)
+{
+    CLzmaDec state;
+    SRes res = SZ_OK;
+
+    LzmaDec_Construct(&state);
+    RINOK(LzmaDec_AllocateProbs(&state, coder->Props.data, (unsigned)coder->Props.size, allocMain));
+    state.dic = outBuffer;
+    state.dicBufSize = outSize;
+    LzmaDec_Init(&state);
+
+    for (;;)
+    {
+        Byte *inBuf = NULL;
+        size_t lookahead = (1 << 18);
+        if (lookahead > inSize)
+            lookahead = (size_t)inSize;
+        res = inStream->Look((void *)inStream, (void **)&inBuf, &lookahead);
+        if (res != SZ_OK)
+            break;
+
+        {
+            SizeT inProcessed = (SizeT)lookahead, dicPos = state.dicPos;
+            ELzmaStatus status;
+            res = LzmaDec_DecodeToDic(&state, outSize, inBuf, &inProcessed, LZMA_FINISH_END, &status);
+            lookahead -= inProcessed;
+            inSize -= inProcessed;
+            if (res != SZ_OK)
+                break;
+            if (state.dicPos == state.dicBufSize || (inProcessed == 0 && dicPos == state.dicPos))
+            {
+                if (state.dicBufSize != outSize || lookahead != 0 ||
+                        (status != LZMA_STATUS_FINISHED_WITH_MARK &&
+                         status != LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK))
+                    res = SZ_ERROR_DATA;
+                break;
+            }
+            res = inStream->Skip((void *)inStream, inProcessed);
+            if (res != SZ_OK)
+                break;
+        }
+    }
+
+    LzmaDec_FreeProbs(&state, allocMain);
+    return res;
+}
+
+static SRes SzDecodeCopy(UInt64 inSize, ILookInStream *inStream, Byte *outBuffer)
+{
+    while (inSize > 0)
+    {
+        void *inBuf;
+        size_t curSize = (1 << 18);
+        if (curSize > inSize)
+            curSize = (size_t)inSize;
+        RINOK(inStream->Look((void *)inStream, (void **)&inBuf, &curSize));
+        if (curSize == 0)
+            return SZ_ERROR_INPUT_EOF;
+        memcpy(outBuffer, inBuf, curSize);
+        outBuffer += curSize;
+        inSize -= curSize;
+        RINOK(inStream->Skip((void *)inStream, curSize));
+    }
+    return SZ_OK;
+}
+
+#define IS_UNSUPPORTED_METHOD(m) ((m) != k_Copy && (m) != k_LZMA)
+#define IS_UNSUPPORTED_CODER(c) (IS_UNSUPPORTED_METHOD(c.MethodID) || c.NumInStreams != 1 || c.NumOutStreams != 1)
+#define IS_NO_BCJ(c) (c.MethodID != k_BCJ || c.NumInStreams != 1 || c.NumOutStreams != 1)
+#define IS_NO_BCJ2(c) (c.MethodID != k_BCJ2 || c.NumInStreams != 4 || c.NumOutStreams != 1)
+
+SRes CheckSupportedFolder(const CSzFolder *f)
+{
+    if (f->NumCoders < 1 || f->NumCoders > 4)
+        return SZ_ERROR_UNSUPPORTED;
+    if (IS_UNSUPPORTED_CODER(f->Coders[0]))
+        return SZ_ERROR_UNSUPPORTED;
+    if (f->NumCoders == 1)
+    {
+        if (f->NumPackStreams != 1 || f->PackStreams[0] != 0 || f->NumBindPairs != 0)
+            return SZ_ERROR_UNSUPPORTED;
+        return SZ_OK;
+    }
+    if (f->NumCoders == 2)
+    {
+        if (IS_NO_BCJ(f->Coders[1]) ||
+                f->NumPackStreams != 1 || f->PackStreams[0] != 0 ||
+                f->NumBindPairs != 1 ||
+                f->BindPairs[0].InIndex != 1 || f->BindPairs[0].OutIndex != 0)
+            return SZ_ERROR_UNSUPPORTED;
+        return SZ_OK;
+    }
+    if (f->NumCoders == 4)
+    {
+        if (IS_UNSUPPORTED_CODER(f->Coders[1]) ||
+                IS_UNSUPPORTED_CODER(f->Coders[2]) ||
+                IS_NO_BCJ2(f->Coders[3]))
+            return SZ_ERROR_UNSUPPORTED;
+        if (f->NumPackStreams != 4 ||
+                f->PackStreams[0] != 2 ||
+                f->PackStreams[1] != 6 ||
+                f->PackStreams[2] != 1 ||
+                f->PackStreams[3] != 0 ||
+                f->NumBindPairs != 3 ||
+                f->BindPairs[0].InIndex != 5 || f->BindPairs[0].OutIndex != 0 ||
+                f->BindPairs[1].InIndex != 4 || f->BindPairs[1].OutIndex != 1 ||
+                f->BindPairs[2].InIndex != 3 || f->BindPairs[2].OutIndex != 2)
+            return SZ_ERROR_UNSUPPORTED;
+        return SZ_OK;
+    }
+    return SZ_ERROR_UNSUPPORTED;
+}
+
+UInt64 GetSum(const UInt64 *values, UInt32 index)
+{
+    UInt64 sum = 0;
+    UInt32 i;
+    for (i = 0; i < index; i++)
+        sum += values[i];
+    return sum;
+}
+
+SRes SzDecode2(const UInt64 *packSizes, const CSzFolder *folder,
+               ILookInStream *inStream, UInt64 startPos,
+               Byte *outBuffer, SizeT outSize, ISzAlloc *allocMain,
+               Byte *tempBuf[])
+{
+    UInt32 ci;
+    SizeT tempSizes[3] = { 0, 0, 0};
+    SizeT tempSize3 = 0;
+    Byte *tempBuf3 = 0;
+
+    RINOK(CheckSupportedFolder(folder));
+
+    for (ci = 0; ci < folder->NumCoders; ci++)
+    {
+        CSzCoderInfo *coder = &folder->Coders[ci];
+
+        if (coder->MethodID == k_Copy || coder->MethodID == k_LZMA)
+        {
+            UInt32 si = 0;
+            UInt64 offset;
+            UInt64 inSize;
+            Byte *outBufCur = outBuffer;
+            SizeT outSizeCur = outSize;
+            if (folder->NumCoders == 4)
+            {
+                UInt32 indices[] = { 3, 2, 0 };
+                UInt64 unpackSize = folder->UnpackSizes[ci];
+                si = indices[ci];
+                if (ci < 2)
+                {
+                    Byte *temp;
+                    outSizeCur = (SizeT)unpackSize;
+                    if (outSizeCur != unpackSize)
+                        return SZ_ERROR_MEM;
+                    temp = (Byte *)IAlloc_Alloc(allocMain, outSizeCur);
+                    if (temp == 0 && outSizeCur != 0)
+                        return SZ_ERROR_MEM;
+                    outBufCur = tempBuf[1 - ci] = temp;
+                    tempSizes[1 - ci] = outSizeCur;
+                }
+                else if (ci == 2)
+                {
+                    if (unpackSize > outSize) /* check it */
+                        return SZ_ERROR_PARAM;
+                    tempBuf3 = outBufCur = outBuffer + (outSize - (size_t)unpackSize);
+                    tempSize3 = outSizeCur = (SizeT)unpackSize;
+                }
+                else
+                    return SZ_ERROR_UNSUPPORTED;
+            }
+            offset = GetSum(packSizes, si);
+            inSize = packSizes[si];
+            RINOK(LookInStream_SeekTo(inStream, startPos + offset));
+
+            if (coder->MethodID == k_Copy)
+            {
+                if (inSize != outSizeCur) /* check it */
+                    return SZ_ERROR_DATA;
+                RINOK(SzDecodeCopy(inSize, inStream, outBufCur));
+            }
+            else
+            {
+                RINOK(SzDecodeLzma(coder, inSize, inStream, outBufCur, outSizeCur, allocMain));
+            }
+        }
+        else if (coder->MethodID == k_BCJ)
+        {
+            UInt32 state;
+            if (ci != 1)
+                return SZ_ERROR_UNSUPPORTED;
+            x86_Convert_Init(state);
+            x86_Convert(outBuffer, outSize, 0, &state, 0);
+        }
+        else if (coder->MethodID == k_BCJ2)
+        {
+            UInt64 offset = GetSum(packSizes, 1);
+            UInt64 s3Size = packSizes[1];
+            SRes res;
+            if (ci != 3)
+                return SZ_ERROR_UNSUPPORTED;
+            RINOK(LookInStream_SeekTo(inStream, startPos + offset));
+            tempSizes[2] = (SizeT)s3Size;
+            if (tempSizes[2] != s3Size)
+                return SZ_ERROR_MEM;
+            tempBuf[2] = (Byte *)IAlloc_Alloc(allocMain, tempSizes[2]);
+            if (tempBuf[2] == 0 && tempSizes[2] != 0)
+                return SZ_ERROR_MEM;
+            res = SzDecodeCopy(s3Size, inStream, tempBuf[2]);
+            RINOK(res)
+
+            res = Bcj2_Decode(
+                      tempBuf3, tempSize3,
+                      tempBuf[0], tempSizes[0],
+                      tempBuf[1], tempSizes[1],
+                      tempBuf[2], tempSizes[2],
+                      outBuffer, outSize);
+            RINOK(res)
+        }
+        else
+            return SZ_ERROR_UNSUPPORTED;
+    }
+    return SZ_OK;
+}
+
+SRes SzDecode(const UInt64 *packSizes, const CSzFolder *folder,
+              ILookInStream *inStream, UInt64 startPos,
+              Byte *outBuffer, size_t outSize, ISzAlloc *allocMain)
+{
+    Byte *tempBuf[3] = { 0, 0, 0};
+    int i;
+    SRes res = SzDecode2(packSizes, folder, inStream, startPos,
+                         outBuffer, (SizeT)outSize, allocMain, tempBuf);
+    for (i = 0; i < 3; i++)
+        IAlloc_Free(allocMain, tempBuf[i]);
+    return res;
+}
diff --git a/src/archivers/7z/Archive/7z/7zDecode.h b/src/archivers/7z/Archive/7z/7zDecode.h
index ce81f40f..ba0b2da9 100644
--- a/src/archivers/7z/Archive/7z/7zDecode.h
+++ b/src/archivers/7z/Archive/7z/7zDecode.h
@@ -1,13 +1,13 @@
-/* 7zDecode.h -- Decoding from 7z folder
-2008-11-23 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_DECODE_H
-#define __7Z_DECODE_H
-
-#include "7zItem.h"
-
-SRes SzDecode(const UInt64 *packSizes, const CSzFolder *folder,
-              ILookInStream *stream, UInt64 startPos,
-              Byte *outBuffer, size_t outSize, ISzAlloc *allocMain);
-
-#endif
+/* 7zDecode.h -- Decoding from 7z folder
+2008-11-23 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_DECODE_H
+#define __7Z_DECODE_H
+
+#include "7zItem.h"
+
+SRes SzDecode(const UInt64 *packSizes, const CSzFolder *folder,
+              ILookInStream *stream, UInt64 startPos,
+              Byte *outBuffer, size_t outSize, ISzAlloc *allocMain);
+
+#endif
diff --git a/src/archivers/7z/Archive/7z/7zExtract.cpp b/src/archivers/7z/Archive/7z/7zExtract.cpp
index 10fb57b5..eda4a0cc 100644
--- a/src/archivers/7z/Archive/7z/7zExtract.cpp
+++ b/src/archivers/7z/Archive/7z/7zExtract.cpp
@@ -1,93 +1,93 @@
-/* 7zExtract.c -- Extracting from 7z archive
-2008-11-23 : Igor Pavlov : Public domain */
-
-#include "../../7zCrc.h"
-#include "7zDecode.h"
-#include "7zExtract.h"
-
-SRes SzAr_Extract(
-    const CSzArEx *p,
-    ILookInStream *inStream,
-    UInt32 fileIndex,
-    UInt32 *blockIndex,
-    Byte **outBuffer,
-    size_t *outBufferSize,
-    size_t *offset,
-    size_t *outSizeProcessed,
-    ISzAlloc *allocMain,
-    ISzAlloc *allocTemp)
-{
-    UInt32 folderIndex = p->FileIndexToFolderIndexMap[fileIndex];
-    SRes res = SZ_OK;
-    *offset = 0;
-    *outSizeProcessed = 0;
-    if (folderIndex == (UInt32)-1)
-    {
-        IAlloc_Free(allocMain, *outBuffer);
-        *blockIndex = folderIndex;
-        *outBuffer = 0;
-        *outBufferSize = 0;
-        return SZ_OK;
-    }
-
-    if (*outBuffer == 0 || *blockIndex != folderIndex)
-    {
-        CSzFolder *folder = p->db.Folders + folderIndex;
-        UInt64 unpackSizeSpec = SzFolder_GetUnpackSize(folder);
-        size_t unpackSize = (size_t)unpackSizeSpec;
-        UInt64 startOffset = SzArEx_GetFolderStreamPos(p, folderIndex, 0);
-
-        if (unpackSize != unpackSizeSpec)
-            return SZ_ERROR_MEM;
-        *blockIndex = folderIndex;
-        IAlloc_Free(allocMain, *outBuffer);
-        *outBuffer = 0;
-
-        RINOK(LookInStream_SeekTo(inStream, startOffset));
-
-        if (res == SZ_OK)
-        {
-            *outBufferSize = unpackSize;
-            if (unpackSize != 0)
-            {
-                *outBuffer = (Byte *)IAlloc_Alloc(allocMain, unpackSize);
-                if (*outBuffer == 0)
-                    res = SZ_ERROR_MEM;
-            }
-            if (res == SZ_OK)
-            {
-                res = SzDecode(p->db.PackSizes +
-                               p->FolderStartPackStreamIndex[folderIndex], folder,
-                               inStream, startOffset,
-                               *outBuffer, unpackSize, allocTemp);
-                if (res == SZ_OK)
-                {
-                    if (folder->UnpackCRCDefined)
-                    {
-                        if (CrcCalc(*outBuffer, unpackSize) != folder->UnpackCRC)
-                            res = SZ_ERROR_CRC;
-                    }
-                }
-            }
-        }
-    }
-    if (res == SZ_OK)
-    {
-        UInt32 i;
-        CSzFileItem *fileItem = p->db.Files + fileIndex;
-        *offset = 0;
-        for (i = p->FolderStartFileIndex[folderIndex]; i < fileIndex; i++)
-            *offset += (UInt32)p->db.Files[i].Size;
-        *outSizeProcessed = (size_t)fileItem->Size;
-        if (*offset + *outSizeProcessed > *outBufferSize)
-            return SZ_ERROR_FAIL;
-        {
-            if (fileItem->FileCRCDefined)
-            {
-                if (CrcCalc(*outBuffer + *offset, *outSizeProcessed) != fileItem->FileCRC)
-                    res = SZ_ERROR_CRC;
-            }
-        }
-    }
-    return res;
-}
+/* 7zExtract.c -- Extracting from 7z archive
+2008-11-23 : Igor Pavlov : Public domain */
+
+#include "../../7zCrc.h"
+#include "7zDecode.h"
+#include "7zExtract.h"
+
+SRes SzAr_Extract(
+    const CSzArEx *p,
+    ILookInStream *inStream,
+    UInt32 fileIndex,
+    UInt32 *blockIndex,
+    Byte **outBuffer,
+    size_t *outBufferSize,
+    size_t *offset,
+    size_t *outSizeProcessed,
+    ISzAlloc *allocMain,
+    ISzAlloc *allocTemp)
+{
+    UInt32 folderIndex = p->FileIndexToFolderIndexMap[fileIndex];
+    SRes res = SZ_OK;
+    *offset = 0;
+    *outSizeProcessed = 0;
+    if (folderIndex == (UInt32)-1)
+    {
+        IAlloc_Free(allocMain, *outBuffer);
+        *blockIndex = folderIndex;
+        *outBuffer = 0;
+        *outBufferSize = 0;
+        return SZ_OK;
+    }
+
+    if (*outBuffer == 0 || *blockIndex != folderIndex)
+    {
+        CSzFolder *folder = p->db.Folders + folderIndex;
+        UInt64 unpackSizeSpec = SzFolder_GetUnpackSize(folder);
+        size_t unpackSize = (size_t)unpackSizeSpec;
+        UInt64 startOffset = SzArEx_GetFolderStreamPos(p, folderIndex, 0);
+
+        if (unpackSize != unpackSizeSpec)
+            return SZ_ERROR_MEM;
+        *blockIndex = folderIndex;
+        IAlloc_Free(allocMain, *outBuffer);
+        *outBuffer = 0;
+
+        RINOK(LookInStream_SeekTo(inStream, startOffset));
+
+        if (res == SZ_OK)
+        {
+            *outBufferSize = unpackSize;
+            if (unpackSize != 0)
+            {
+                *outBuffer = (Byte *)IAlloc_Alloc(allocMain, unpackSize);
+                if (*outBuffer == 0)
+                    res = SZ_ERROR_MEM;
+            }
+            if (res == SZ_OK)
+            {
+                res = SzDecode(p->db.PackSizes +
+                               p->FolderStartPackStreamIndex[folderIndex], folder,
+                               inStream, startOffset,
+                               *outBuffer, unpackSize, allocTemp);
+                if (res == SZ_OK)
+                {
+                    if (folder->UnpackCRCDefined)
+                    {
+                        if (CrcCalc(*outBuffer, unpackSize) != folder->UnpackCRC)
+                            res = SZ_ERROR_CRC;
+                    }
+                }
+            }
+        }
+    }
+    if (res == SZ_OK)
+    {
+        UInt32 i;
+        CSzFileItem *fileItem = p->db.Files + fileIndex;
+        *offset = 0;
+        for (i = p->FolderStartFileIndex[folderIndex]; i < fileIndex; i++)
+            *offset += (UInt32)p->db.Files[i].Size;
+        *outSizeProcessed = (size_t)fileItem->Size;
+        if (*offset + *outSizeProcessed > *outBufferSize)
+            return SZ_ERROR_FAIL;
+        {
+            if (fileItem->FileCRCDefined)
+            {
+                if (CrcCalc(*outBuffer + *offset, *outSizeProcessed) != fileItem->FileCRC)
+                    res = SZ_ERROR_CRC;
+            }
+        }
+    }
+    return res;
+}
diff --git a/src/archivers/7z/Archive/7z/7zExtract.h b/src/archivers/7z/Archive/7z/7zExtract.h
index e171f4ab..5f78415f 100644
--- a/src/archivers/7z/Archive/7z/7zExtract.h
+++ b/src/archivers/7z/Archive/7z/7zExtract.h
@@ -1,41 +1,41 @@
-/* 7zExtract.h -- Extracting from 7z archive
-2008-11-23 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_EXTRACT_H
-#define __7Z_EXTRACT_H
-
-#include "7zIn.h"
-
-/*
-  SzExtract extracts file from archive
-
-  *outBuffer must be 0 before first call for each new archive.
-
-  Extracting cache:
-    If you need to decompress more than one file, you can send
-    these values from previous call:
-      *blockIndex,
-      *outBuffer,
-      *outBufferSize
-    You can consider "*outBuffer" as cache of solid block. If your archive is solid,
-    it will increase decompression speed.
-  
-    If you use external function, you can declare these 3 cache variables
-    (blockIndex, outBuffer, outBufferSize) as static in that external function.
-    
-    Free *outBuffer and set *outBuffer to 0, if you want to flush cache.
-*/
-
-SRes SzAr_Extract(
-    const CSzArEx *db,
-    ILookInStream *inStream,
-    UInt32 fileIndex,         /* index of file */
-    UInt32 *blockIndex,       /* index of solid block */
-    Byte **outBuffer,         /* pointer to pointer to output buffer (allocated with allocMain) */
-    size_t *outBufferSize,    /* buffer size for output buffer */
-    size_t *offset,           /* offset of stream for required file in *outBuffer */
-    size_t *outSizeProcessed, /* size of file in *outBuffer */
-    ISzAlloc *allocMain,
-    ISzAlloc *allocTemp);
-
-#endif
+/* 7zExtract.h -- Extracting from 7z archive
+2008-11-23 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_EXTRACT_H
+#define __7Z_EXTRACT_H
+
+#include "7zIn.h"
+
+/*
+  SzExtract extracts file from archive
+
+  *outBuffer must be 0 before first call for each new archive.
+
+  Extracting cache:
+    If you need to decompress more than one file, you can send
+    these values from previous call:
+      *blockIndex,
+      *outBuffer,
+      *outBufferSize
+    You can consider "*outBuffer" as cache of solid block. If your archive is solid,
+    it will increase decompression speed.
+  
+    If you use external function, you can declare these 3 cache variables
+    (blockIndex, outBuffer, outBufferSize) as static in that external function.
+    
+    Free *outBuffer and set *outBuffer to 0, if you want to flush cache.
+*/
+
+SRes SzAr_Extract(
+    const CSzArEx *db,
+    ILookInStream *inStream,
+    UInt32 fileIndex,         /* index of file */
+    UInt32 *blockIndex,       /* index of solid block */
+    Byte **outBuffer,         /* pointer to pointer to output buffer (allocated with allocMain) */
+    size_t *outBufferSize,    /* buffer size for output buffer */
+    size_t *offset,           /* offset of stream for required file in *outBuffer */
+    size_t *outSizeProcessed, /* size of file in *outBuffer */
+    ISzAlloc *allocMain,
+    ISzAlloc *allocTemp);
+
+#endif
diff --git a/src/archivers/7z/Archive/7z/7zHeader.cpp b/src/archivers/7z/Archive/7z/7zHeader.cpp
index c44ff4a4..e48faa48 100644
--- a/src/archivers/7z/Archive/7z/7zHeader.cpp
+++ b/src/archivers/7z/Archive/7z/7zHeader.cpp
@@ -1,6 +1,6 @@
-/*  7zHeader.c -- 7z Headers
-2008-10-04 : Igor Pavlov : Public domain */
-
-#include "7zHeader.h"
-
-Byte k7zSignature[k7zSignatureSize] = {'7', 'z', 0xBC, 0xAF, 0x27, 0x1C};
+/*  7zHeader.c -- 7z Headers
+2008-10-04 : Igor Pavlov : Public domain */
+
+#include "7zHeader.h"
+
+Byte k7zSignature[k7zSignatureSize] = {'7', 'z', 0xBC, 0xAF, 0x27, 0x1C};
diff --git a/src/archivers/7z/Archive/7z/7zHeader.h b/src/archivers/7z/Archive/7z/7zHeader.h
index 91b9d0dd..fbef0ad8 100644
--- a/src/archivers/7z/Archive/7z/7zHeader.h
+++ b/src/archivers/7z/Archive/7z/7zHeader.h
@@ -1,57 +1,57 @@
-/* 7zHeader.h -- 7z Headers
-2008-10-04 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_HEADER_H
-#define __7Z_HEADER_H
-
-#include "../../Types.h"
-
-#define k7zSignatureSize 6
-extern Byte k7zSignature[k7zSignatureSize];
-
-#define k7zMajorVersion 0
-
-#define k7zStartHeaderSize 0x20
-
-enum EIdEnum
-{
-    k7zIdEnd,
-
-    k7zIdHeader,
-
-    k7zIdArchiveProperties,
-
-    k7zIdAdditionalStreamsInfo,
-    k7zIdMainStreamsInfo,
-    k7zIdFilesInfo,
-
-    k7zIdPackInfo,
-    k7zIdUnpackInfo,
-    k7zIdSubStreamsInfo,
-
-    k7zIdSize,
-    k7zIdCRC,
-
-    k7zIdFolder,
-
-    k7zIdCodersUnpackSize,
-    k7zIdNumUnpackStream,
-
-    k7zIdEmptyStream,
-    k7zIdEmptyFile,
-    k7zIdAnti,
-
-    k7zIdName,
-    k7zIdCTime,
-    k7zIdATime,
-    k7zIdMTime,
-    k7zIdWinAttributes,
-    k7zIdComment,
-
-    k7zIdEncodedHeader,
-
-    k7zIdStartPos,
-    k7zIdDummy
-};
-
-#endif
+/* 7zHeader.h -- 7z Headers
+2008-10-04 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_HEADER_H
+#define __7Z_HEADER_H
+
+#include "../../Types.h"
+
+#define k7zSignatureSize 6
+extern Byte k7zSignature[k7zSignatureSize];
+
+#define k7zMajorVersion 0
+
+#define k7zStartHeaderSize 0x20
+
+enum EIdEnum
+{
+    k7zIdEnd,
+
+    k7zIdHeader,
+
+    k7zIdArchiveProperties,
+
+    k7zIdAdditionalStreamsInfo,
+    k7zIdMainStreamsInfo,
+    k7zIdFilesInfo,
+
+    k7zIdPackInfo,
+    k7zIdUnpackInfo,
+    k7zIdSubStreamsInfo,
+
+    k7zIdSize,
+    k7zIdCRC,
+
+    k7zIdFolder,
+
+    k7zIdCodersUnpackSize,
+    k7zIdNumUnpackStream,
+
+    k7zIdEmptyStream,
+    k7zIdEmptyFile,
+    k7zIdAnti,
+
+    k7zIdName,
+    k7zIdCTime,
+    k7zIdATime,
+    k7zIdMTime,
+    k7zIdWinAttributes,
+    k7zIdComment,
+
+    k7zIdEncodedHeader,
+
+    k7zIdStartPos,
+    k7zIdDummy
+};
+
+#endif
diff --git a/src/archivers/7z/Archive/7z/7zIn.cpp b/src/archivers/7z/Archive/7z/7zIn.cpp
index e23e3fe0..6400fd61 100644
--- a/src/archivers/7z/Archive/7z/7zIn.cpp
+++ b/src/archivers/7z/Archive/7z/7zIn.cpp
@@ -1,1204 +1,1204 @@
-/* 7zIn.c -- 7z Input functions
-2008-12-31 : Igor Pavlov : Public domain */
-
-#include "../../7zCrc.h"
-#include "../../CpuArch.h"
-
-#include "7zDecode.h"
-#include "7zIn.h"
-
-#define RINOM(x) { if ((x) == 0) return SZ_ERROR_MEM; }
-
-#define NUM_FOLDER_CODERS_MAX 32
-#define NUM_CODER_STREAMS_MAX 32
-
-void SzArEx_Init(CSzArEx *p)
-{
-    SzAr_Init(&p->db);
-    p->FolderStartPackStreamIndex = 0;
-    p->PackStreamStartPositions = 0;
-    p->FolderStartFileIndex = 0;
-    p->FileIndexToFolderIndexMap = 0;
-}
-
-void SzArEx_Free(CSzArEx *p, ISzAlloc *alloc)
-{
-    IAlloc_Free(alloc, p->FolderStartPackStreamIndex);
-    IAlloc_Free(alloc, p->PackStreamStartPositions);
-    IAlloc_Free(alloc, p->FolderStartFileIndex);
-    IAlloc_Free(alloc, p->FileIndexToFolderIndexMap);
-    SzAr_Free(&p->db, alloc);
-    SzArEx_Init(p);
-}
-
-/*
-UInt64 GetFolderPackStreamSize(int folderIndex, int streamIndex) const
-{
-  return PackSizes[FolderStartPackStreamIndex[folderIndex] + streamIndex];
-}
-
-UInt64 GetFilePackSize(int fileIndex) const
-{
-  int folderIndex = FileIndexToFolderIndexMap[fileIndex];
-  if (folderIndex >= 0)
-  {
-    const CSzFolder &folderInfo = Folders[folderIndex];
-    if (FolderStartFileIndex[folderIndex] == fileIndex)
-    return GetFolderFullPackSize(folderIndex);
-  }
-  return 0;
-}
-*/
-
-#define MY_ALLOC(T, p, size, alloc) { if ((size) == 0) p = 0; else \
-  if ((p = (T *)IAlloc_Alloc(alloc, (size) * sizeof(T))) == 0) return SZ_ERROR_MEM; }
-
-static SRes SzArEx_Fill(CSzArEx *p, ISzAlloc *alloc)
-{
-    UInt32 startPos = 0;
-    UInt64 startPosSize = 0;
-    UInt32 i;
-    UInt32 folderIndex = 0;
-    UInt32 indexInFolder = 0;
-    MY_ALLOC(UInt32, p->FolderStartPackStreamIndex, p->db.NumFolders, alloc);
-    for (i = 0; i < p->db.NumFolders; i++)
-    {
-        p->FolderStartPackStreamIndex[i] = startPos;
-        startPos += p->db.Folders[i].NumPackStreams;
-    }
-
-    MY_ALLOC(UInt64, p->PackStreamStartPositions, p->db.NumPackStreams, alloc);
-
-    for (i = 0; i < p->db.NumPackStreams; i++)
-    {
-        p->PackStreamStartPositions[i] = startPosSize;
-        startPosSize += p->db.PackSizes[i];
-    }
-
-    MY_ALLOC(UInt32, p->FolderStartFileIndex, p->db.NumFolders, alloc);
-    MY_ALLOC(UInt32, p->FileIndexToFolderIndexMap, p->db.NumFiles, alloc);
-
-    for (i = 0; i < p->db.NumFiles; i++)
-    {
-        CSzFileItem *file = p->db.Files + i;
-        int emptyStream = !file->HasStream;
-        if (emptyStream && indexInFolder == 0)
-        {
-            p->FileIndexToFolderIndexMap[i] = (UInt32)-1;
-            continue;
-        }
-        if (indexInFolder == 0)
-        {
-            /*
-            v3.13 incorrectly worked with empty folders
-            v4.07: Loop for skipping empty folders
-            */
-            for (;;)
-            {
-                if (folderIndex >= p->db.NumFolders)
-                    return SZ_ERROR_ARCHIVE;
-                p->FolderStartFileIndex[folderIndex] = i;
-                if (p->db.Folders[folderIndex].NumUnpackStreams != 0)
-                    break;
-                folderIndex++;
-            }
-        }
-        p->FileIndexToFolderIndexMap[i] = folderIndex;
-        if (emptyStream)
-            continue;
-        indexInFolder++;
-        if (indexInFolder >= p->db.Folders[folderIndex].NumUnpackStreams)
-        {
-            folderIndex++;
-            indexInFolder = 0;
-        }
-    }
-    return SZ_OK;
-}
-
-
-UInt64 SzArEx_GetFolderStreamPos(const CSzArEx *p, UInt32 folderIndex, UInt32 indexInFolder)
-{
-    return p->dataPos +
-           p->PackStreamStartPositions[p->FolderStartPackStreamIndex[folderIndex] + indexInFolder];
-}
-
-int SzArEx_GetFolderFullPackSize(const CSzArEx *p, UInt32 folderIndex, UInt64 *resSize)
-{
-    UInt32 packStreamIndex = p->FolderStartPackStreamIndex[folderIndex];
-    CSzFolder *folder = p->db.Folders + folderIndex;
-    UInt64 size = 0;
-    UInt32 i;
-    for (i = 0; i < folder->NumPackStreams; i++)
-    {
-        UInt64 t = size + p->db.PackSizes[packStreamIndex + i];
-        if (t < size) /* check it */
-            return SZ_ERROR_FAIL;
-        size = t;
-    }
-    *resSize = size;
-    return SZ_OK;
-}
-
-
-/*
-SRes SzReadTime(const CObjectVector<CBuf> &dataVector,
-    CObjectVector<CSzFileItem> &files, UInt64 type)
-{
-  CBoolVector boolVector;
-  RINOK(ReadBoolVector2(files.Size(), boolVector))
-
-  CStreamSwitch streamSwitch;
-  RINOK(streamSwitch.Set(this, &dataVector));
-
-  for (int i = 0; i < files.Size(); i++)
-  {
-    CSzFileItem &file = files[i];
-    CArchiveFileTime fileTime;
-    bool defined = boolVector[i];
-    if (defined)
-    {
-      UInt32 low, high;
-      RINOK(SzReadUInt32(low));
-      RINOK(SzReadUInt32(high));
-      fileTime.dwLowDateTime = low;
-      fileTime.dwHighDateTime = high;
-    }
-    switch(type)
-    {
-      case k7zIdCTime: file.IsCTimeDefined = defined; if (defined) file.CTime = fileTime; break;
-      case k7zIdATime: file.IsATimeDefined = defined; if (defined) file.ATime = fileTime; break;
-      case k7zIdMTime: file.IsMTimeDefined = defined; if (defined) file.MTime = fileTime; break;
-    }
-  }
-  return SZ_OK;
-}
-*/
-
-static int TestSignatureCandidate(Byte *testBytes)
-{
-    size_t i;
-    for (i = 0; i < k7zSignatureSize; i++)
-        if (testBytes[i] != k7zSignature[i])
-            return 0;
-    return 1;
-}
-
-typedef struct _CSzState
-{
-    Byte *Data;
-    size_t Size;
-} CSzData;
-
-static SRes SzReadByte(CSzData *sd, Byte *b)
-{
-    if (sd->Size == 0)
-        return SZ_ERROR_ARCHIVE;
-    sd->Size--;
-    *b = *sd->Data++;
-    return SZ_OK;
-}
-
-static SRes SzReadBytes(CSzData *sd, Byte *data, size_t size)
-{
-    size_t i;
-    for (i = 0; i < size; i++)
-    {
-        RINOK(SzReadByte(sd, data + i));
-    }
-    return SZ_OK;
-}
-
-static SRes SzReadUInt32(CSzData *sd, UInt32 *value)
-{
-    int i;
-    *value = 0;
-    for (i = 0; i < 4; i++)
-    {
-        Byte b;
-        RINOK(SzReadByte(sd, &b));
-        *value |= ((UInt32)(b) << (8 * i));
-    }
-    return SZ_OK;
-}
-
-static SRes SzReadNumber(CSzData *sd, UInt64 *value)
-{
-    Byte firstByte;
-    Byte mask = 0x80;
-    int i;
-    RINOK(SzReadByte(sd, &firstByte));
-    *value = 0;
-    for (i = 0; i < 8; i++)
-    {
-        Byte b;
-        if ((firstByte & mask) == 0)
-        {
-            UInt64 highPart = firstByte & (mask - 1);
-            *value += (highPart << (8 * i));
-            return SZ_OK;
-        }
-        RINOK(SzReadByte(sd, &b));
-        *value |= ((UInt64)b << (8 * i));
-        mask >>= 1;
-    }
-    return SZ_OK;
-}
-
-static SRes SzReadNumber32(CSzData *sd, UInt32 *value)
-{
-    UInt64 value64;
-    RINOK(SzReadNumber(sd, &value64));
-    if (value64 >= 0x80000000)
-        return SZ_ERROR_UNSUPPORTED;
-    if (value64 >= ((UInt64)(1) << ((sizeof(size_t) - 1) * 8 + 2)))
-        return SZ_ERROR_UNSUPPORTED;
-    *value = (UInt32)value64;
-    return SZ_OK;
-}
-
-static SRes SzReadID(CSzData *sd, UInt64 *value)
-{
-    return SzReadNumber(sd, value);
-}
-
-static SRes SzSkeepDataSize(CSzData *sd, UInt64 size)
-{
-    if (size > sd->Size)
-        return SZ_ERROR_ARCHIVE;
-    sd->Size -= (size_t)size;
-    sd->Data += (size_t)size;
-    return SZ_OK;
-}
-
-static SRes SzSkeepData(CSzData *sd)
-{
-    UInt64 size;
-    RINOK(SzReadNumber(sd, &size));
-    return SzSkeepDataSize(sd, size);
-}
-
-static SRes SzReadArchiveProperties(CSzData *sd)
-{
-    for (;;)
-    {
-        UInt64 type;
-        RINOK(SzReadID(sd, &type));
-        if (type == k7zIdEnd)
-            break;
-        SzSkeepData(sd);
-    }
-    return SZ_OK;
-}
-
-static SRes SzWaitAttribute(CSzData *sd, UInt64 attribute)
-{
-    for (;;)
-    {
-        UInt64 type;
-        RINOK(SzReadID(sd, &type));
-        if (type == attribute)
-            return SZ_OK;
-        if (type == k7zIdEnd)
-            return SZ_ERROR_ARCHIVE;
-        RINOK(SzSkeepData(sd));
-    }
-}
-
-static SRes SzReadBoolVector(CSzData *sd, size_t numItems, Byte **v, ISzAlloc *alloc)
-{
-    Byte b = 0;
-    Byte mask = 0;
-    size_t i;
-    MY_ALLOC(Byte, *v, numItems, alloc);
-    for (i = 0; i < numItems; i++)
-    {
-        if (mask == 0)
-        {
-            RINOK(SzReadByte(sd, &b));
-            mask = 0x80;
-        }
-        (*v)[i] = (Byte)(((b & mask) != 0) ? 1 : 0);
-        mask >>= 1;
-    }
-    return SZ_OK;
-}
-
-static SRes SzReadBoolVector2(CSzData *sd, size_t numItems, Byte **v, ISzAlloc *alloc)
-{
-    Byte allAreDefined;
-    size_t i;
-    RINOK(SzReadByte(sd, &allAreDefined));
-    if (allAreDefined == 0)
-        return SzReadBoolVector(sd, numItems, v, alloc);
-    MY_ALLOC(Byte, *v, numItems, alloc);
-    for (i = 0; i < numItems; i++)
-        (*v)[i] = 1;
-    return SZ_OK;
-}
-
-static SRes SzReadHashDigests(
-    CSzData *sd,
-    size_t numItems,
-    Byte **digestsDefined,
-    UInt32 **digests,
-    ISzAlloc *alloc)
-{
-    size_t i;
-    RINOK(SzReadBoolVector2(sd, numItems, digestsDefined, alloc));
-    MY_ALLOC(UInt32, *digests, numItems, alloc);
-    for (i = 0; i < numItems; i++)
-        if ((*digestsDefined)[i])
-        {
-            RINOK(SzReadUInt32(sd, (*digests) + i));
-        }
-    return SZ_OK;
-}
-
-static SRes SzReadPackInfo(
-    CSzData *sd,
-    UInt64 *dataOffset,
-    UInt32 *numPackStreams,
-    UInt64 **packSizes,
-    Byte **packCRCsDefined,
-    UInt32 **packCRCs,
-    ISzAlloc *alloc)
-{
-    UInt32 i;
-    RINOK(SzReadNumber(sd, dataOffset));
-    RINOK(SzReadNumber32(sd, numPackStreams));
-
-    RINOK(SzWaitAttribute(sd, k7zIdSize));
-
-    MY_ALLOC(UInt64, *packSizes, (size_t)*numPackStreams, alloc);
-
-    for (i = 0; i < *numPackStreams; i++)
-    {
-        RINOK(SzReadNumber(sd, (*packSizes) + i));
-    }
-
-    for (;;)
-    {
-        UInt64 type;
-        RINOK(SzReadID(sd, &type));
-        if (type == k7zIdEnd)
-            break;
-        if (type == k7zIdCRC)
-        {
-            RINOK(SzReadHashDigests(sd, (size_t)*numPackStreams, packCRCsDefined, packCRCs, alloc));
-            continue;
-        }
-        RINOK(SzSkeepData(sd));
-    }
-    if (*packCRCsDefined == 0)
-    {
-        MY_ALLOC(Byte, *packCRCsDefined, (size_t)*numPackStreams, alloc);
-        MY_ALLOC(UInt32, *packCRCs, (size_t)*numPackStreams, alloc);
-        for (i = 0; i < *numPackStreams; i++)
-        {
-            (*packCRCsDefined)[i] = 0;
-            (*packCRCs)[i] = 0;
-        }
-    }
-    return SZ_OK;
-}
-
-static SRes SzReadSwitch(CSzData *sd)
-{
-    Byte external;
-    RINOK(SzReadByte(sd, &external));
-    return (external == 0) ? SZ_OK: SZ_ERROR_UNSUPPORTED;
-}
-
-static SRes SzGetNextFolderItem(CSzData *sd, CSzFolder *folder, ISzAlloc *alloc)
-{
-    UInt32 numCoders, numBindPairs, numPackStreams, i;
-    UInt32 numInStreams = 0, numOutStreams = 0;
-
-    RINOK(SzReadNumber32(sd, &numCoders));
-    if (numCoders > NUM_FOLDER_CODERS_MAX)
-        return SZ_ERROR_UNSUPPORTED;
-    folder->NumCoders = numCoders;
-
-    MY_ALLOC(CSzCoderInfo, folder->Coders, (size_t)numCoders, alloc);
-
-    for (i = 0; i < numCoders; i++)
-        SzCoderInfo_Init(folder->Coders + i);
-
-    for (i = 0; i < numCoders; i++)
-    {
-        Byte mainByte;
-        CSzCoderInfo *coder = folder->Coders + i;
-        {
-            unsigned idSize, j;
-            Byte longID[15];
-            RINOK(SzReadByte(sd, &mainByte));
-            idSize = (unsigned)(mainByte & 0xF);
-            RINOK(SzReadBytes(sd, longID, idSize));
-            if (idSize > sizeof(coder->MethodID))
-                return SZ_ERROR_UNSUPPORTED;
-            coder->MethodID = 0;
-            for (j = 0; j < idSize; j++)
-                coder->MethodID |= (UInt64)longID[idSize - 1 - j] << (8 * j);
-
-            if ((mainByte & 0x10) != 0)
-            {
-                RINOK(SzReadNumber32(sd, &coder->NumInStreams));
-                RINOK(SzReadNumber32(sd, &coder->NumOutStreams));
-                if (coder->NumInStreams > NUM_CODER_STREAMS_MAX ||
-                        coder->NumOutStreams > NUM_CODER_STREAMS_MAX)
-                    return SZ_ERROR_UNSUPPORTED;
-            }
-            else
-            {
-                coder->NumInStreams = 1;
-                coder->NumOutStreams = 1;
-            }
-            if ((mainByte & 0x20) != 0)
-            {
-                UInt64 propertiesSize = 0;
-                RINOK(SzReadNumber(sd, &propertiesSize));
-                if (!Buf_Create(&coder->Props, (size_t)propertiesSize, alloc))
-                    return SZ_ERROR_MEM;
-                RINOK(SzReadBytes(sd, coder->Props.data, (size_t)propertiesSize));
-            }
-        }
-        while ((mainByte & 0x80) != 0)
-        {
-            RINOK(SzReadByte(sd, &mainByte));
-            RINOK(SzSkeepDataSize(sd, (mainByte & 0xF)));
-            if ((mainByte & 0x10) != 0)
-            {
-                UInt32 n;
-                RINOK(SzReadNumber32(sd, &n));
-                RINOK(SzReadNumber32(sd, &n));
-            }
-            if ((mainByte & 0x20) != 0)
-            {
-                UInt64 propertiesSize = 0;
-                RINOK(SzReadNumber(sd, &propertiesSize));
-                RINOK(SzSkeepDataSize(sd, propertiesSize));
-            }
-        }
-        numInStreams += coder->NumInStreams;
-        numOutStreams += coder->NumOutStreams;
-    }
-
-    if (numOutStreams == 0)
-        return SZ_ERROR_UNSUPPORTED;
-
-    folder->NumBindPairs = numBindPairs = numOutStreams - 1;
-    MY_ALLOC(CBindPair, folder->BindPairs, (size_t)numBindPairs, alloc);
-
-    for (i = 0; i < numBindPairs; i++)
-    {
-        CBindPair *bp = folder->BindPairs + i;
-        RINOK(SzReadNumber32(sd, &bp->InIndex));
-        RINOK(SzReadNumber32(sd, &bp->OutIndex));
-    }
-
-    if (numInStreams < numBindPairs)
-        return SZ_ERROR_UNSUPPORTED;
-
-    folder->NumPackStreams = numPackStreams = numInStreams - numBindPairs;
-    MY_ALLOC(UInt32, folder->PackStreams, (size_t)numPackStreams, alloc);
-
-    if (numPackStreams == 1)
-    {
-        for (i = 0; i < numInStreams ; i++)
-            if (SzFolder_FindBindPairForInStream(folder, i) < 0)
-                break;
-        if (i == numInStreams)
-            return SZ_ERROR_UNSUPPORTED;
-        folder->PackStreams[0] = i;
-    }
-    else
-        for (i = 0; i < numPackStreams; i++)
-        {
-            RINOK(SzReadNumber32(sd, folder->PackStreams + i));
-        }
-    return SZ_OK;
-}
-
-static SRes SzReadUnpackInfo(
-    CSzData *sd,
-    UInt32 *numFolders,
-    CSzFolder **folders,  /* for alloc */
-    ISzAlloc *alloc,
-    ISzAlloc *allocTemp)
-{
-    UInt32 i;
-    RINOK(SzWaitAttribute(sd, k7zIdFolder));
-    RINOK(SzReadNumber32(sd, numFolders));
-    {
-        RINOK(SzReadSwitch(sd));
-
-        MY_ALLOC(CSzFolder, *folders, (size_t)*numFolders, alloc);
-
-        for (i = 0; i < *numFolders; i++)
-            SzFolder_Init((*folders) + i);
-
-        for (i = 0; i < *numFolders; i++)
-        {
-            RINOK(SzGetNextFolderItem(sd, (*folders) + i, alloc));
-        }
-    }
-
-    RINOK(SzWaitAttribute(sd, k7zIdCodersUnpackSize));
-
-    for (i = 0; i < *numFolders; i++)
-    {
-        UInt32 j;
-        CSzFolder *folder = (*folders) + i;
-        UInt32 numOutStreams = SzFolder_GetNumOutStreams(folder);
-
-        MY_ALLOC(UInt64, folder->UnpackSizes, (size_t)numOutStreams, alloc);
-
-        for (j = 0; j < numOutStreams; j++)
-        {
-            RINOK(SzReadNumber(sd, folder->UnpackSizes + j));
-        }
-    }
-
-    for (;;)
-    {
-        UInt64 type;
-        RINOK(SzReadID(sd, &type));
-        if (type == k7zIdEnd)
-            return SZ_OK;
-        if (type == k7zIdCRC)
-        {
-            SRes res;
-            Byte *crcsDefined = 0;
-            UInt32 *crcs = 0;
-            res = SzReadHashDigests(sd, *numFolders, &crcsDefined, &crcs, allocTemp);
-            if (res == SZ_OK)
-            {
-                for (i = 0; i < *numFolders; i++)
-                {
-                    CSzFolder *folder = (*folders) + i;
-                    folder->UnpackCRCDefined = crcsDefined[i];
-                    folder->UnpackCRC = crcs[i];
-                }
-            }
-            IAlloc_Free(allocTemp, crcs);
-            IAlloc_Free(allocTemp, crcsDefined);
-            RINOK(res);
-            continue;
-        }
-        RINOK(SzSkeepData(sd));
-    }
-}
-
-static SRes SzReadSubStreamsInfo(
-    CSzData *sd,
-    UInt32 numFolders,
-    CSzFolder *folders,
-    UInt32 *numUnpackStreams,
-    UInt64 **unpackSizes,
-    Byte **digestsDefined,
-    UInt32 **digests,
-    ISzAlloc *allocTemp)
-{
-    UInt64 type = 0;
-    UInt32 i;
-    UInt32 si = 0;
-    UInt32 numDigests = 0;
-
-    for (i = 0; i < numFolders; i++)
-        folders[i].NumUnpackStreams = 1;
-    *numUnpackStreams = numFolders;
-
-    for (;;)
-    {
-        RINOK(SzReadID(sd, &type));
-        if (type == k7zIdNumUnpackStream)
-        {
-            *numUnpackStreams = 0;
-            for (i = 0; i < numFolders; i++)
-            {
-                UInt32 numStreams;
-                RINOK(SzReadNumber32(sd, &numStreams));
-                folders[i].NumUnpackStreams = numStreams;
-                *numUnpackStreams += numStreams;
-            }
-            continue;
-        }
-        if (type == k7zIdCRC || type == k7zIdSize)
-            break;
-        if (type == k7zIdEnd)
-            break;
-        RINOK(SzSkeepData(sd));
-    }
-
-    if (*numUnpackStreams == 0)
-    {
-        *unpackSizes = 0;
-        *digestsDefined = 0;
-        *digests = 0;
-    }
-    else
-    {
-        *unpackSizes = (UInt64 *)IAlloc_Alloc(allocTemp, (size_t)*numUnpackStreams * sizeof(UInt64));
-        RINOM(*unpackSizes);
-        *digestsDefined = (Byte *)IAlloc_Alloc(allocTemp, (size_t)*numUnpackStreams * sizeof(Byte));
-        RINOM(*digestsDefined);
-        *digests = (UInt32 *)IAlloc_Alloc(allocTemp, (size_t)*numUnpackStreams * sizeof(UInt32));
-        RINOM(*digests);
-    }
-
-    for (i = 0; i < numFolders; i++)
-    {
-        /*
-        v3.13 incorrectly worked with empty folders
-        v4.07: we check that folder is empty
-        */
-        UInt64 sum = 0;
-        UInt32 j;
-        UInt32 numSubstreams = folders[i].NumUnpackStreams;
-        if (numSubstreams == 0)
-            continue;
-        if (type == k7zIdSize)
-            for (j = 1; j < numSubstreams; j++)
-            {
-                UInt64 size;
-                RINOK(SzReadNumber(sd, &size));
-                (*unpackSizes)[si++] = size;
-                sum += size;
-            }
-        (*unpackSizes)[si++] = SzFolder_GetUnpackSize(folders + i) - sum;
-    }
-    if (type == k7zIdSize)
-    {
-        RINOK(SzReadID(sd, &type));
-    }
-
-    for (i = 0; i < *numUnpackStreams; i++)
-    {
-        (*digestsDefined)[i] = 0;
-        (*digests)[i] = 0;
-    }
-
-
-    for (i = 0; i < numFolders; i++)
-    {
-        UInt32 numSubstreams = folders[i].NumUnpackStreams;
-        if (numSubstreams != 1 || !folders[i].UnpackCRCDefined)
-            numDigests += numSubstreams;
-    }
-
-
-    si = 0;
-    for (;;)
-    {
-        if (type == k7zIdCRC)
-        {
-            int digestIndex = 0;
-            Byte *digestsDefined2 = 0;
-            UInt32 *digests2 = 0;
-            SRes res = SzReadHashDigests(sd, numDigests, &digestsDefined2, &digests2, allocTemp);
-            if (res == SZ_OK)
-            {
-                for (i = 0; i < numFolders; i++)
-                {
-                    CSzFolder *folder = folders + i;
-                    UInt32 numSubstreams = folder->NumUnpackStreams;
-                    if (numSubstreams == 1 && folder->UnpackCRCDefined)
-                    {
-                        (*digestsDefined)[si] = 1;
-                        (*digests)[si] = folder->UnpackCRC;
-                        si++;
-                    }
-                    else
-                    {
-                        UInt32 j;
-                        for (j = 0; j < numSubstreams; j++, digestIndex++)
-                        {
-                            (*digestsDefined)[si] = digestsDefined2[digestIndex];
-                            (*digests)[si] = digests2[digestIndex];
-                            si++;
-                        }
-                    }
-                }
-            }
-            IAlloc_Free(allocTemp, digestsDefined2);
-            IAlloc_Free(allocTemp, digests2);
-            RINOK(res);
-        }
-        else if (type == k7zIdEnd)
-            return SZ_OK;
-        else
-        {
-            RINOK(SzSkeepData(sd));
-        }
-        RINOK(SzReadID(sd, &type));
-    }
-}
-
-
-static SRes SzReadStreamsInfo(
-    CSzData *sd,
-    UInt64 *dataOffset,
-    CSzAr *p,
-    UInt32 *numUnpackStreams,
-    UInt64 **unpackSizes, /* allocTemp */
-    Byte **digestsDefined,   /* allocTemp */
-    UInt32 **digests,        /* allocTemp */
-    ISzAlloc *alloc,
-    ISzAlloc *allocTemp)
-{
-    for (;;)
-    {
-        UInt64 type;
-        RINOK(SzReadID(sd, &type));
-        if ((UInt64)(int)type != type)
-            return SZ_ERROR_UNSUPPORTED;
-        switch((int)type)
-        {
-        case k7zIdEnd:
-            return SZ_OK;
-        case k7zIdPackInfo:
-        {
-            RINOK(SzReadPackInfo(sd, dataOffset, &p->NumPackStreams,
-                                 &p->PackSizes, &p->PackCRCsDefined, &p->PackCRCs, alloc));
-            break;
-        }
-        case k7zIdUnpackInfo:
-        {
-            RINOK(SzReadUnpackInfo(sd, &p->NumFolders, &p->Folders, alloc, allocTemp));
-            break;
-        }
-        case k7zIdSubStreamsInfo:
-        {
-            RINOK(SzReadSubStreamsInfo(sd, p->NumFolders, p->Folders,
-                                       numUnpackStreams, unpackSizes, digestsDefined, digests, allocTemp));
-            break;
-        }
-        default:
-            return SZ_ERROR_UNSUPPORTED;
-        }
-    }
-}
-
-Byte kUtf8Limits[5] = { 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-static SRes SzReadFileNames(CSzData *sd, UInt32 numFiles, CSzFileItem *files, ISzAlloc *alloc)
-{
-    UInt32 i;
-    for (i = 0; i < numFiles; i++)
-    {
-        UInt32 len = 0;
-        UInt32 pos = 0;
-        CSzFileItem *file = files + i;
-        while (pos + 2 <= sd->Size)
-        {
-            int numAdds;
-            UInt32 value = (UInt32)(sd->Data[pos] | (((UInt32)sd->Data[pos + 1]) << 8));
-            pos += 2;
-            len++;
-            if (value == 0)
-                break;
-            if (value < 0x80)
-                continue;
-            if (value >= 0xD800 && value < 0xE000)
-            {
-                UInt32 c2;
-                if (value >= 0xDC00)
-                    return SZ_ERROR_ARCHIVE;
-                if (pos + 2 > sd->Size)
-                    return SZ_ERROR_ARCHIVE;
-                c2 = (UInt32)(sd->Data[pos] | (((UInt32)sd->Data[pos + 1]) << 8));
-                pos += 2;
-                if (c2 < 0xDC00 || c2 >= 0xE000)
-                    return SZ_ERROR_ARCHIVE;
-                value = ((value - 0xD800) << 10) | (c2 - 0xDC00);
-            }
-            for (numAdds = 1; numAdds < 5; numAdds++)
-                if (value < (((UInt32)1) << (numAdds * 5 + 6)))
-                    break;
-            len += numAdds;
-        }
-
-        MY_ALLOC(char, file->Name, (size_t)len, alloc);
-
-        len = 0;
-        while (2 <= sd->Size)
-        {
-            int numAdds;
-            UInt32 value = (UInt32)(sd->Data[0] | (((UInt32)sd->Data[1]) << 8));
-            SzSkeepDataSize(sd, 2);
-            if (value < 0x80)
-            {
-                file->Name[len++] = (char)value;
-                if (value == 0)
-                    break;
-                continue;
-            }
-            if (value >= 0xD800 && value < 0xE000)
-            {
-                UInt32 c2 = (UInt32)(sd->Data[0] | (((UInt32)sd->Data[1]) << 8));
-                SzSkeepDataSize(sd, 2);
-                value = ((value - 0xD800) << 10) | (c2 - 0xDC00);
-            }
-            for (numAdds = 1; numAdds < 5; numAdds++)
-                if (value < (((UInt32)1) << (numAdds * 5 + 6)))
-                    break;
-            file->Name[len++] = (char)(kUtf8Limits[numAdds - 1] + (value >> (6 * numAdds)));
-            do
-            {
-                numAdds--;
-                file->Name[len++] = (char)(0x80 + ((value >> (6 * numAdds)) & 0x3F));
-            }
-            while (numAdds > 0);
-
-            len += numAdds;
-        }
-    }
-    return SZ_OK;
-}
-
-static SRes SzReadHeader2(
-    CSzArEx *p,   /* allocMain */
-    CSzData *sd,
-    UInt64 **unpackSizes,  /* allocTemp */
-    Byte **digestsDefined,    /* allocTemp */
-    UInt32 **digests,         /* allocTemp */
-    Byte **emptyStreamVector, /* allocTemp */
-    Byte **emptyFileVector,   /* allocTemp */
-    Byte **lwtVector,         /* allocTemp */
-    ISzAlloc *allocMain,
-    ISzAlloc *allocTemp)
-{
-    UInt64 type;
-    UInt32 numUnpackStreams = 0;
-    UInt32 numFiles = 0;
-    CSzFileItem *files = 0;
-    UInt32 numEmptyStreams = 0;
-    UInt32 i;
-
-    RINOK(SzReadID(sd, &type));
-
-    if (type == k7zIdArchiveProperties)
-    {
-        RINOK(SzReadArchiveProperties(sd));
-        RINOK(SzReadID(sd, &type));
-    }
-
-
-    if (type == k7zIdMainStreamsInfo)
-    {
-        RINOK(SzReadStreamsInfo(sd,
-                                &p->dataPos,
-                                &p->db,
-                                &numUnpackStreams,
-                                unpackSizes,
-                                digestsDefined,
-                                digests, allocMain, allocTemp));
-        p->dataPos += p->startPosAfterHeader;
-        RINOK(SzReadID(sd, &type));
-    }
-
-    if (type == k7zIdEnd)
-        return SZ_OK;
-    if (type != k7zIdFilesInfo)
-        return SZ_ERROR_ARCHIVE;
-
-    RINOK(SzReadNumber32(sd, &numFiles));
-    p->db.NumFiles = numFiles;
-
-    MY_ALLOC(CSzFileItem, files, (size_t)numFiles, allocMain);
-
-    p->db.Files = files;
-    for (i = 0; i < numFiles; i++)
-        SzFile_Init(files + i);
-
-    for (;;)
-    {
-        UInt64 type;
-        UInt64 size;
-        RINOK(SzReadID(sd, &type));
-        if (type == k7zIdEnd)
-            break;
-        RINOK(SzReadNumber(sd, &size));
-
-        if ((UInt64)(int)type != type)
-        {
-            RINOK(SzSkeepDataSize(sd, size));
-        }
-        else
-            switch((int)type)
-            {
-            case k7zIdName:
-            {
-                RINOK(SzReadSwitch(sd));
-                RINOK(SzReadFileNames(sd, numFiles, files, allocMain))
-                break;
-            }
-            case k7zIdEmptyStream:
-            {
-                RINOK(SzReadBoolVector(sd, numFiles, emptyStreamVector, allocTemp));
-                numEmptyStreams = 0;
-                for (i = 0; i < numFiles; i++)
-                    if ((*emptyStreamVector)[i])
-                        numEmptyStreams++;
-                break;
-            }
-            case k7zIdEmptyFile:
-            {
-                RINOK(SzReadBoolVector(sd, numEmptyStreams, emptyFileVector, allocTemp));
-                break;
-            }
-            case k7zIdMTime:
-            {
-                RINOK(SzReadBoolVector2(sd, numFiles, lwtVector, allocTemp));
-                RINOK(SzReadSwitch(sd));
-                for (i = 0; i < numFiles; i++)
-                {
-                    CSzFileItem *f = &files[i];
-                    Byte defined = (*lwtVector)[i];
-                    f->MTimeDefined = defined;
-                    f->MTime.Low = f->MTime.High = 0;
-                    if (defined)
-                    {
-                        RINOK(SzReadUInt32(sd, &f->MTime.Low));
-                        RINOK(SzReadUInt32(sd, &f->MTime.High));
-                    }
-                }
-                break;
-            }
-            default:
-            {
-                RINOK(SzSkeepDataSize(sd, size));
-            }
-            }
-    }
-
-    {
-        UInt32 emptyFileIndex = 0;
-        UInt32 sizeIndex = 0;
-        for (i = 0; i < numFiles; i++)
-        {
-            CSzFileItem *file = files + i;
-            file->IsAnti = 0;
-            if (*emptyStreamVector == 0)
-                file->HasStream = 1;
-            else
-                file->HasStream = (Byte)((*emptyStreamVector)[i] ? 0 : 1);
-            if (file->HasStream)
-            {
-                file->IsDir = 0;
-                file->Size = (*unpackSizes)[sizeIndex];
-                file->FileCRC = (*digests)[sizeIndex];
-                file->FileCRCDefined = (Byte)(*digestsDefined)[sizeIndex];
-                sizeIndex++;
-            }
-            else
-            {
-                if (*emptyFileVector == 0)
-                    file->IsDir = 1;
-                else
-                    file->IsDir = (Byte)((*emptyFileVector)[emptyFileIndex] ? 0 : 1);
-                emptyFileIndex++;
-                file->Size = 0;
-                file->FileCRCDefined = 0;
-            }
-        }
-    }
-    return SzArEx_Fill(p, allocMain);
-}
-
-static SRes SzReadHeader(
-    CSzArEx *p,
-    CSzData *sd,
-    ISzAlloc *allocMain,
-    ISzAlloc *allocTemp)
-{
-    UInt64 *unpackSizes = 0;
-    Byte *digestsDefined = 0;
-    UInt32 *digests = 0;
-    Byte *emptyStreamVector = 0;
-    Byte *emptyFileVector = 0;
-    Byte *lwtVector = 0;
-    SRes res = SzReadHeader2(p, sd,
-                             &unpackSizes, &digestsDefined, &digests,
-                             &emptyStreamVector, &emptyFileVector, &lwtVector,
-                             allocMain, allocTemp);
-    IAlloc_Free(allocTemp, unpackSizes);
-    IAlloc_Free(allocTemp, digestsDefined);
-    IAlloc_Free(allocTemp, digests);
-    IAlloc_Free(allocTemp, emptyStreamVector);
-    IAlloc_Free(allocTemp, emptyFileVector);
-    IAlloc_Free(allocTemp, lwtVector);
-    return res;
-}
-
-static SRes SzReadAndDecodePackedStreams2(
-    ILookInStream *inStream,
-    CSzData *sd,
-    CBuf *outBuffer,
-    UInt64 baseOffset,
-    CSzAr *p,
-    UInt64 **unpackSizes,
-    Byte **digestsDefined,
-    UInt32 **digests,
-    ISzAlloc *allocTemp)
-{
-
-    UInt32 numUnpackStreams = 0;
-    UInt64 dataStartPos;
-    CSzFolder *folder;
-    UInt64 unpackSize;
-    SRes res;
-
-    RINOK(SzReadStreamsInfo(sd, &dataStartPos, p,
-                            &numUnpackStreams,  unpackSizes, digestsDefined, digests,
-                            allocTemp, allocTemp));
-
-    dataStartPos += baseOffset;
-    if (p->NumFolders != 1)
-        return SZ_ERROR_ARCHIVE;
-
-    folder = p->Folders;
-    unpackSize = SzFolder_GetUnpackSize(folder);
-
-    RINOK(LookInStream_SeekTo(inStream, dataStartPos));
-
-    if (!Buf_Create(outBuffer, (size_t)unpackSize, allocTemp))
-        return SZ_ERROR_MEM;
-
-    res = SzDecode(p->PackSizes, folder,
-                   inStream, dataStartPos,
-                   outBuffer->data, (size_t)unpackSize, allocTemp);
-    RINOK(res);
-    if (folder->UnpackCRCDefined)
-        if (CrcCalc(outBuffer->data, (size_t)unpackSize) != folder->UnpackCRC)
-            return SZ_ERROR_CRC;
-    return SZ_OK;
-}
-
-static SRes SzReadAndDecodePackedStreams(
-    ILookInStream *inStream,
-    CSzData *sd,
-    CBuf *outBuffer,
-    UInt64 baseOffset,
-    ISzAlloc *allocTemp)
-{
-    CSzAr p;
-    UInt64 *unpackSizes = 0;
-    Byte *digestsDefined = 0;
-    UInt32 *digests = 0;
-    SRes res;
-    SzAr_Init(&p);
-    res = SzReadAndDecodePackedStreams2(inStream, sd, outBuffer, baseOffset,
-                                        &p, &unpackSizes, &digestsDefined, &digests,
-                                        allocTemp);
-    SzAr_Free(&p, allocTemp);
-    IAlloc_Free(allocTemp, unpackSizes);
-    IAlloc_Free(allocTemp, digestsDefined);
-    IAlloc_Free(allocTemp, digests);
-    return res;
-}
-
-static SRes SzArEx_Open2(
-    CSzArEx *p,
-    ILookInStream *inStream,
-    ISzAlloc *allocMain,
-    ISzAlloc *allocTemp)
-{
-    Byte header[k7zStartHeaderSize];
-    UInt64 nextHeaderOffset, nextHeaderSize;
-    size_t nextHeaderSizeT;
-    UInt32 nextHeaderCRC;
-    CBuf buffer;
-    SRes res;
-
-    RINOK(LookInStream_Read2(inStream, header, k7zStartHeaderSize, SZ_ERROR_NO_ARCHIVE));
-
-    if (!TestSignatureCandidate(header))
-        return SZ_ERROR_NO_ARCHIVE;
-    if (header[6] != k7zMajorVersion)
-        return SZ_ERROR_UNSUPPORTED;
-
-    nextHeaderOffset = GetUi64(header + 12);
-    nextHeaderSize = GetUi64(header + 20);
-    nextHeaderCRC = GetUi32(header + 28);
-
-    p->startPosAfterHeader = k7zStartHeaderSize;
-
-    if (CrcCalc(header + 12, 20) != GetUi32(header + 8))
-        return SZ_ERROR_CRC;
-
-    nextHeaderSizeT = (size_t)nextHeaderSize;
-    if (nextHeaderSizeT != nextHeaderSize)
-        return SZ_ERROR_MEM;
-    if (nextHeaderSizeT == 0)
-        return SZ_OK;
-    if (nextHeaderOffset > nextHeaderOffset + nextHeaderSize ||
-            nextHeaderOffset > nextHeaderOffset + nextHeaderSize + k7zStartHeaderSize)
-        return SZ_ERROR_NO_ARCHIVE;
-
-    {
-        Int64 pos = 0;
-        RINOK(inStream->Seek(inStream, &pos, SZ_SEEK_END));
-        if ((UInt64)pos < nextHeaderOffset ||
-                (UInt64)pos < k7zStartHeaderSize + nextHeaderOffset ||
-                (UInt64)pos < k7zStartHeaderSize + nextHeaderOffset + nextHeaderSize)
-            return SZ_ERROR_INPUT_EOF;
-    }
-
-    RINOK(LookInStream_SeekTo(inStream, k7zStartHeaderSize + nextHeaderOffset));
-
-    if (!Buf_Create(&buffer, nextHeaderSizeT, allocTemp))
-        return SZ_ERROR_MEM;
-
-    res = LookInStream_Read(inStream, buffer.data, nextHeaderSizeT);
-    if (res == SZ_OK)
-    {
-        res = SZ_ERROR_ARCHIVE;
-        if (CrcCalc(buffer.data, nextHeaderSizeT) == nextHeaderCRC)
-        {
-            CSzData sd;
-            UInt64 type;
-            sd.Data = buffer.data;
-            sd.Size = buffer.size;
-            res = SzReadID(&sd, &type);
-            if (res == SZ_OK)
-            {
-                if (type == k7zIdEncodedHeader)
-                {
-                    CBuf outBuffer;
-                    Buf_Init(&outBuffer);
-                    res = SzReadAndDecodePackedStreams(inStream, &sd, &outBuffer, p->startPosAfterHeader, allocTemp);
-                    if (res != SZ_OK)
-                        Buf_Free(&outBuffer, allocTemp);
-                    else
-                    {
-                        Buf_Free(&buffer, allocTemp);
-                        buffer.data = outBuffer.data;
-                        buffer.size = outBuffer.size;
-                        sd.Data = buffer.data;
-                        sd.Size = buffer.size;
-                        res = SzReadID(&sd, &type);
-                    }
-                }
-            }
-            if (res == SZ_OK)
-            {
-                if (type == k7zIdHeader)
-                    res = SzReadHeader(p, &sd, allocMain, allocTemp);
-                else
-                    res = SZ_ERROR_UNSUPPORTED;
-            }
-        }
-    }
-    Buf_Free(&buffer, allocTemp);
-    return res;
-}
-
-SRes SzArEx_Open(CSzArEx *p, ILookInStream *inStream, ISzAlloc *allocMain, ISzAlloc *allocTemp)
-{
-    SRes res = SzArEx_Open2(p, inStream, allocMain, allocTemp);
-    if (res != SZ_OK)
-        SzArEx_Free(p, allocMain);
-    return res;
-}
+/* 7zIn.c -- 7z Input functions
+2008-12-31 : Igor Pavlov : Public domain */
+
+#include "../../7zCrc.h"
+#include "../../CpuArch.h"
+
+#include "7zDecode.h"
+#include "7zIn.h"
+
+#define RINOM(x) { if ((x) == 0) return SZ_ERROR_MEM; }
+
+#define NUM_FOLDER_CODERS_MAX 32
+#define NUM_CODER_STREAMS_MAX 32
+
+void SzArEx_Init(CSzArEx *p)
+{
+    SzAr_Init(&p->db);
+    p->FolderStartPackStreamIndex = 0;
+    p->PackStreamStartPositions = 0;
+    p->FolderStartFileIndex = 0;
+    p->FileIndexToFolderIndexMap = 0;
+}
+
+void SzArEx_Free(CSzArEx *p, ISzAlloc *alloc)
+{
+    IAlloc_Free(alloc, p->FolderStartPackStreamIndex);
+    IAlloc_Free(alloc, p->PackStreamStartPositions);
+    IAlloc_Free(alloc, p->FolderStartFileIndex);
+    IAlloc_Free(alloc, p->FileIndexToFolderIndexMap);
+    SzAr_Free(&p->db, alloc);
+    SzArEx_Init(p);
+}
+
+/*
+UInt64 GetFolderPackStreamSize(int folderIndex, int streamIndex) const
+{
+  return PackSizes[FolderStartPackStreamIndex[folderIndex] + streamIndex];
+}
+
+UInt64 GetFilePackSize(int fileIndex) const
+{
+  int folderIndex = FileIndexToFolderIndexMap[fileIndex];
+  if (folderIndex >= 0)
+  {
+    const CSzFolder &folderInfo = Folders[folderIndex];
+    if (FolderStartFileIndex[folderIndex] == fileIndex)
+    return GetFolderFullPackSize(folderIndex);
+  }
+  return 0;
+}
+*/
+
+#define MY_ALLOC(T, p, size, alloc) { if ((size) == 0) p = 0; else \
+  if ((p = (T *)IAlloc_Alloc(alloc, (size) * sizeof(T))) == 0) return SZ_ERROR_MEM; }
+
+static SRes SzArEx_Fill(CSzArEx *p, ISzAlloc *alloc)
+{
+    UInt32 startPos = 0;
+    UInt64 startPosSize = 0;
+    UInt32 i;
+    UInt32 folderIndex = 0;
+    UInt32 indexInFolder = 0;
+    MY_ALLOC(UInt32, p->FolderStartPackStreamIndex, p->db.NumFolders, alloc);
+    for (i = 0; i < p->db.NumFolders; i++)
+    {
+        p->FolderStartPackStreamIndex[i] = startPos;
+        startPos += p->db.Folders[i].NumPackStreams;
+    }
+
+    MY_ALLOC(UInt64, p->PackStreamStartPositions, p->db.NumPackStreams, alloc);
+
+    for (i = 0; i < p->db.NumPackStreams; i++)
+    {
+        p->PackStreamStartPositions[i] = startPosSize;
+        startPosSize += p->db.PackSizes[i];
+    }
+
+    MY_ALLOC(UInt32, p->FolderStartFileIndex, p->db.NumFolders, alloc);
+    MY_ALLOC(UInt32, p->FileIndexToFolderIndexMap, p->db.NumFiles, alloc);
+
+    for (i = 0; i < p->db.NumFiles; i++)
+    {
+        CSzFileItem *file = p->db.Files + i;
+        int emptyStream = !file->HasStream;
+        if (emptyStream && indexInFolder == 0)
+        {
+            p->FileIndexToFolderIndexMap[i] = (UInt32)-1;
+            continue;
+        }
+        if (indexInFolder == 0)
+        {
+            /*
+            v3.13 incorrectly worked with empty folders
+            v4.07: Loop for skipping empty folders
+            */
+            for (;;)
+            {
+                if (folderIndex >= p->db.NumFolders)
+                    return SZ_ERROR_ARCHIVE;
+                p->FolderStartFileIndex[folderIndex] = i;
+                if (p->db.Folders[folderIndex].NumUnpackStreams != 0)
+                    break;
+                folderIndex++;
+            }
+        }
+        p->FileIndexToFolderIndexMap[i] = folderIndex;
+        if (emptyStream)
+            continue;
+        indexInFolder++;
+        if (indexInFolder >= p->db.Folders[folderIndex].NumUnpackStreams)
+        {
+            folderIndex++;
+            indexInFolder = 0;
+        }
+    }
+    return SZ_OK;
+}
+
+
+UInt64 SzArEx_GetFolderStreamPos(const CSzArEx *p, UInt32 folderIndex, UInt32 indexInFolder)
+{
+    return p->dataPos +
+           p->PackStreamStartPositions[p->FolderStartPackStreamIndex[folderIndex] + indexInFolder];
+}
+
+int SzArEx_GetFolderFullPackSize(const CSzArEx *p, UInt32 folderIndex, UInt64 *resSize)
+{
+    UInt32 packStreamIndex = p->FolderStartPackStreamIndex[folderIndex];
+    CSzFolder *folder = p->db.Folders + folderIndex;
+    UInt64 size = 0;
+    UInt32 i;
+    for (i = 0; i < folder->NumPackStreams; i++)
+    {
+        UInt64 t = size + p->db.PackSizes[packStreamIndex + i];
+        if (t < size) /* check it */
+            return SZ_ERROR_FAIL;
+        size = t;
+    }
+    *resSize = size;
+    return SZ_OK;
+}
+
+
+/*
+SRes SzReadTime(const CObjectVector<CBuf> &dataVector,
+    CObjectVector<CSzFileItem> &files, UInt64 type)
+{
+  CBoolVector boolVector;
+  RINOK(ReadBoolVector2(files.Size(), boolVector))
+
+  CStreamSwitch streamSwitch;
+  RINOK(streamSwitch.Set(this, &dataVector));
+
+  for (int i = 0; i < files.Size(); i++)
+  {
+    CSzFileItem &file = files[i];
+    CArchiveFileTime fileTime;
+    bool defined = boolVector[i];
+    if (defined)
+    {
+      UInt32 low, high;
+      RINOK(SzReadUInt32(low));
+      RINOK(SzReadUInt32(high));
+      fileTime.dwLowDateTime = low;
+      fileTime.dwHighDateTime = high;
+    }
+    switch(type)
+    {
+      case k7zIdCTime: file.IsCTimeDefined = defined; if (defined) file.CTime = fileTime; break;
+      case k7zIdATime: file.IsATimeDefined = defined; if (defined) file.ATime = fileTime; break;
+      case k7zIdMTime: file.IsMTimeDefined = defined; if (defined) file.MTime = fileTime; break;
+    }
+  }
+  return SZ_OK;
+}
+*/
+
+static int TestSignatureCandidate(Byte *testBytes)
+{
+    size_t i;
+    for (i = 0; i < k7zSignatureSize; i++)
+        if (testBytes[i] != k7zSignature[i])
+            return 0;
+    return 1;
+}
+
+typedef struct _CSzState
+{
+    Byte *Data;
+    size_t Size;
+} CSzData;
+
+static SRes SzReadByte(CSzData *sd, Byte *b)
+{
+    if (sd->Size == 0)
+        return SZ_ERROR_ARCHIVE;
+    sd->Size--;
+    *b = *sd->Data++;
+    return SZ_OK;
+}
+
+static SRes SzReadBytes(CSzData *sd, Byte *data, size_t size)
+{
+    size_t i;
+    for (i = 0; i < size; i++)
+    {
+        RINOK(SzReadByte(sd, data + i));
+    }
+    return SZ_OK;
+}
+
+static SRes SzReadUInt32(CSzData *sd, UInt32 *value)
+{
+    int i;
+    *value = 0;
+    for (i = 0; i < 4; i++)
+    {
+        Byte b;
+        RINOK(SzReadByte(sd, &b));
+        *value |= ((UInt32)(b) << (8 * i));
+    }
+    return SZ_OK;
+}
+
+static SRes SzReadNumber(CSzData *sd, UInt64 *value)
+{
+    Byte firstByte;
+    Byte mask = 0x80;
+    int i;
+    RINOK(SzReadByte(sd, &firstByte));
+    *value = 0;
+    for (i = 0; i < 8; i++)
+    {
+        Byte b;
+        if ((firstByte & mask) == 0)
+        {
+            UInt64 highPart = firstByte & (mask - 1);
+            *value += (highPart << (8 * i));
+            return SZ_OK;
+        }
+        RINOK(SzReadByte(sd, &b));
+        *value |= ((UInt64)b << (8 * i));
+        mask >>= 1;
+    }
+    return SZ_OK;
+}
+
+static SRes SzReadNumber32(CSzData *sd, UInt32 *value)
+{
+    UInt64 value64;
+    RINOK(SzReadNumber(sd, &value64));
+    if (value64 >= 0x80000000)
+        return SZ_ERROR_UNSUPPORTED;
+    if (value64 >= ((UInt64)(1) << ((sizeof(size_t) - 1) * 8 + 2)))
+        return SZ_ERROR_UNSUPPORTED;
+    *value = (UInt32)value64;
+    return SZ_OK;
+}
+
+static SRes SzReadID(CSzData *sd, UInt64 *value)
+{
+    return SzReadNumber(sd, value);
+}
+
+static SRes SzSkeepDataSize(CSzData *sd, UInt64 size)
+{
+    if (size > sd->Size)
+        return SZ_ERROR_ARCHIVE;
+    sd->Size -= (size_t)size;
+    sd->Data += (size_t)size;
+    return SZ_OK;
+}
+
+static SRes SzSkeepData(CSzData *sd)
+{
+    UInt64 size;
+    RINOK(SzReadNumber(sd, &size));
+    return SzSkeepDataSize(sd, size);
+}
+
+static SRes SzReadArchiveProperties(CSzData *sd)
+{
+    for (;;)
+    {
+        UInt64 type;
+        RINOK(SzReadID(sd, &type));
+        if (type == k7zIdEnd)
+            break;
+        SzSkeepData(sd);
+    }
+    return SZ_OK;
+}
+
+static SRes SzWaitAttribute(CSzData *sd, UInt64 attribute)
+{
+    for (;;)
+    {
+        UInt64 type;
+        RINOK(SzReadID(sd, &type));
+        if (type == attribute)
+            return SZ_OK;
+        if (type == k7zIdEnd)
+            return SZ_ERROR_ARCHIVE;
+        RINOK(SzSkeepData(sd));
+    }
+}
+
+static SRes SzReadBoolVector(CSzData *sd, size_t numItems, Byte **v, ISzAlloc *alloc)
+{
+    Byte b = 0;
+    Byte mask = 0;
+    size_t i;
+    MY_ALLOC(Byte, *v, numItems, alloc);
+    for (i = 0; i < numItems; i++)
+    {
+        if (mask == 0)
+        {
+            RINOK(SzReadByte(sd, &b));
+            mask = 0x80;
+        }
+        (*v)[i] = (Byte)(((b & mask) != 0) ? 1 : 0);
+        mask >>= 1;
+    }
+    return SZ_OK;
+}
+
+static SRes SzReadBoolVector2(CSzData *sd, size_t numItems, Byte **v, ISzAlloc *alloc)
+{
+    Byte allAreDefined;
+    size_t i;
+    RINOK(SzReadByte(sd, &allAreDefined));
+    if (allAreDefined == 0)
+        return SzReadBoolVector(sd, numItems, v, alloc);
+    MY_ALLOC(Byte, *v, numItems, alloc);
+    for (i = 0; i < numItems; i++)
+        (*v)[i] = 1;
+    return SZ_OK;
+}
+
+static SRes SzReadHashDigests(
+    CSzData *sd,
+    size_t numItems,
+    Byte **digestsDefined,
+    UInt32 **digests,
+    ISzAlloc *alloc)
+{
+    size_t i;
+    RINOK(SzReadBoolVector2(sd, numItems, digestsDefined, alloc));
+    MY_ALLOC(UInt32, *digests, numItems, alloc);
+    for (i = 0; i < numItems; i++)
+        if ((*digestsDefined)[i])
+        {
+            RINOK(SzReadUInt32(sd, (*digests) + i));
+        }
+    return SZ_OK;
+}
+
+static SRes SzReadPackInfo(
+    CSzData *sd,
+    UInt64 *dataOffset,
+    UInt32 *numPackStreams,
+    UInt64 **packSizes,
+    Byte **packCRCsDefined,
+    UInt32 **packCRCs,
+    ISzAlloc *alloc)
+{
+    UInt32 i;
+    RINOK(SzReadNumber(sd, dataOffset));
+    RINOK(SzReadNumber32(sd, numPackStreams));
+
+    RINOK(SzWaitAttribute(sd, k7zIdSize));
+
+    MY_ALLOC(UInt64, *packSizes, (size_t)*numPackStreams, alloc);
+
+    for (i = 0; i < *numPackStreams; i++)
+    {
+        RINOK(SzReadNumber(sd, (*packSizes) + i));
+    }
+
+    for (;;)
+    {
+        UInt64 type;
+        RINOK(SzReadID(sd, &type));
+        if (type == k7zIdEnd)
+            break;
+        if (type == k7zIdCRC)
+        {
+            RINOK(SzReadHashDigests(sd, (size_t)*numPackStreams, packCRCsDefined, packCRCs, alloc));
+            continue;
+        }
+        RINOK(SzSkeepData(sd));
+    }
+    if (*packCRCsDefined == 0)
+    {
+        MY_ALLOC(Byte, *packCRCsDefined, (size_t)*numPackStreams, alloc);
+        MY_ALLOC(UInt32, *packCRCs, (size_t)*numPackStreams, alloc);
+        for (i = 0; i < *numPackStreams; i++)
+        {
+            (*packCRCsDefined)[i] = 0;
+            (*packCRCs)[i] = 0;
+        }
+    }
+    return SZ_OK;
+}
+
+static SRes SzReadSwitch(CSzData *sd)
+{
+    Byte external;
+    RINOK(SzReadByte(sd, &external));
+    return (external == 0) ? SZ_OK: SZ_ERROR_UNSUPPORTED;
+}
+
+static SRes SzGetNextFolderItem(CSzData *sd, CSzFolder *folder, ISzAlloc *alloc)
+{
+    UInt32 numCoders, numBindPairs, numPackStreams, i;
+    UInt32 numInStreams = 0, numOutStreams = 0;
+
+    RINOK(SzReadNumber32(sd, &numCoders));
+    if (numCoders > NUM_FOLDER_CODERS_MAX)
+        return SZ_ERROR_UNSUPPORTED;
+    folder->NumCoders = numCoders;
+
+    MY_ALLOC(CSzCoderInfo, folder->Coders, (size_t)numCoders, alloc);
+
+    for (i = 0; i < numCoders; i++)
+        SzCoderInfo_Init(folder->Coders + i);
+
+    for (i = 0; i < numCoders; i++)
+    {
+        Byte mainByte;
+        CSzCoderInfo *coder = folder->Coders + i;
+        {
+            unsigned idSize, j;
+            Byte longID[15];
+            RINOK(SzReadByte(sd, &mainByte));
+            idSize = (unsigned)(mainByte & 0xF);
+            RINOK(SzReadBytes(sd, longID, idSize));
+            if (idSize > sizeof(coder->MethodID))
+                return SZ_ERROR_UNSUPPORTED;
+            coder->MethodID = 0;
+            for (j = 0; j < idSize; j++)
+                coder->MethodID |= (UInt64)longID[idSize - 1 - j] << (8 * j);
+
+            if ((mainByte & 0x10) != 0)
+            {
+                RINOK(SzReadNumber32(sd, &coder->NumInStreams));
+                RINOK(SzReadNumber32(sd, &coder->NumOutStreams));
+                if (coder->NumInStreams > NUM_CODER_STREAMS_MAX ||
+                        coder->NumOutStreams > NUM_CODER_STREAMS_MAX)
+                    return SZ_ERROR_UNSUPPORTED;
+            }
+            else
+            {
+                coder->NumInStreams = 1;
+                coder->NumOutStreams = 1;
+            }
+            if ((mainByte & 0x20) != 0)
+            {
+                UInt64 propertiesSize = 0;
+                RINOK(SzReadNumber(sd, &propertiesSize));
+                if (!Buf_Create(&coder->Props, (size_t)propertiesSize, alloc))
+                    return SZ_ERROR_MEM;
+                RINOK(SzReadBytes(sd, coder->Props.data, (size_t)propertiesSize));
+            }
+        }
+        while ((mainByte & 0x80) != 0)
+        {
+            RINOK(SzReadByte(sd, &mainByte));
+            RINOK(SzSkeepDataSize(sd, (mainByte & 0xF)));
+            if ((mainByte & 0x10) != 0)
+            {
+                UInt32 n;
+                RINOK(SzReadNumber32(sd, &n));
+                RINOK(SzReadNumber32(sd, &n));
+            }
+            if ((mainByte & 0x20) != 0)
+            {
+                UInt64 propertiesSize = 0;
+                RINOK(SzReadNumber(sd, &propertiesSize));
+                RINOK(SzSkeepDataSize(sd, propertiesSize));
+            }
+        }
+        numInStreams += coder->NumInStreams;
+        numOutStreams += coder->NumOutStreams;
+    }
+
+    if (numOutStreams == 0)
+        return SZ_ERROR_UNSUPPORTED;
+
+    folder->NumBindPairs = numBindPairs = numOutStreams - 1;
+    MY_ALLOC(CBindPair, folder->BindPairs, (size_t)numBindPairs, alloc);
+
+    for (i = 0; i < numBindPairs; i++)
+    {
+        CBindPair *bp = folder->BindPairs + i;
+        RINOK(SzReadNumber32(sd, &bp->InIndex));
+        RINOK(SzReadNumber32(sd, &bp->OutIndex));
+    }
+
+    if (numInStreams < numBindPairs)
+        return SZ_ERROR_UNSUPPORTED;
+
+    folder->NumPackStreams = numPackStreams = numInStreams - numBindPairs;
+    MY_ALLOC(UInt32, folder->PackStreams, (size_t)numPackStreams, alloc);
+
+    if (numPackStreams == 1)
+    {
+        for (i = 0; i < numInStreams ; i++)
+            if (SzFolder_FindBindPairForInStream(folder, i) < 0)
+                break;
+        if (i == numInStreams)
+            return SZ_ERROR_UNSUPPORTED;
+        folder->PackStreams[0] = i;
+    }
+    else
+        for (i = 0; i < numPackStreams; i++)
+        {
+            RINOK(SzReadNumber32(sd, folder->PackStreams + i));
+        }
+    return SZ_OK;
+}
+
+static SRes SzReadUnpackInfo(
+    CSzData *sd,
+    UInt32 *numFolders,
+    CSzFolder **folders,  /* for alloc */
+    ISzAlloc *alloc,
+    ISzAlloc *allocTemp)
+{
+    UInt32 i;
+    RINOK(SzWaitAttribute(sd, k7zIdFolder));
+    RINOK(SzReadNumber32(sd, numFolders));
+    {
+        RINOK(SzReadSwitch(sd));
+
+        MY_ALLOC(CSzFolder, *folders, (size_t)*numFolders, alloc);
+
+        for (i = 0; i < *numFolders; i++)
+            SzFolder_Init((*folders) + i);
+
+        for (i = 0; i < *numFolders; i++)
+        {
+            RINOK(SzGetNextFolderItem(sd, (*folders) + i, alloc));
+        }
+    }
+
+    RINOK(SzWaitAttribute(sd, k7zIdCodersUnpackSize));
+
+    for (i = 0; i < *numFolders; i++)
+    {
+        UInt32 j;
+        CSzFolder *folder = (*folders) + i;
+        UInt32 numOutStreams = SzFolder_GetNumOutStreams(folder);
+
+        MY_ALLOC(UInt64, folder->UnpackSizes, (size_t)numOutStreams, alloc);
+
+        for (j = 0; j < numOutStreams; j++)
+        {
+            RINOK(SzReadNumber(sd, folder->UnpackSizes + j));
+        }
+    }
+
+    for (;;)
+    {
+        UInt64 type;
+        RINOK(SzReadID(sd, &type));
+        if (type == k7zIdEnd)
+            return SZ_OK;
+        if (type == k7zIdCRC)
+        {
+            SRes res;
+            Byte *crcsDefined = 0;
+            UInt32 *crcs = 0;
+            res = SzReadHashDigests(sd, *numFolders, &crcsDefined, &crcs, allocTemp);
+            if (res == SZ_OK)
+            {
+                for (i = 0; i < *numFolders; i++)
+                {
+                    CSzFolder *folder = (*folders) + i;
+                    folder->UnpackCRCDefined = crcsDefined[i];
+                    folder->UnpackCRC = crcs[i];
+                }
+            }
+            IAlloc_Free(allocTemp, crcs);
+            IAlloc_Free(allocTemp, crcsDefined);
+            RINOK(res);
+            continue;
+        }
+        RINOK(SzSkeepData(sd));
+    }
+}
+
+static SRes SzReadSubStreamsInfo(
+    CSzData *sd,
+    UInt32 numFolders,
+    CSzFolder *folders,
+    UInt32 *numUnpackStreams,
+    UInt64 **unpackSizes,
+    Byte **digestsDefined,
+    UInt32 **digests,
+    ISzAlloc *allocTemp)
+{
+    UInt64 type = 0;
+    UInt32 i;
+    UInt32 si = 0;
+    UInt32 numDigests = 0;
+
+    for (i = 0; i < numFolders; i++)
+        folders[i].NumUnpackStreams = 1;
+    *numUnpackStreams = numFolders;
+
+    for (;;)
+    {
+        RINOK(SzReadID(sd, &type));
+        if (type == k7zIdNumUnpackStream)
+        {
+            *numUnpackStreams = 0;
+            for (i = 0; i < numFolders; i++)
+            {
+                UInt32 numStreams;
+                RINOK(SzReadNumber32(sd, &numStreams));
+                folders[i].NumUnpackStreams = numStreams;
+                *numUnpackStreams += numStreams;
+            }
+            continue;
+        }
+        if (type == k7zIdCRC || type == k7zIdSize)
+            break;
+        if (type == k7zIdEnd)
+            break;
+        RINOK(SzSkeepData(sd));
+    }
+
+    if (*numUnpackStreams == 0)
+    {
+        *unpackSizes = 0;
+        *digestsDefined = 0;
+        *digests = 0;
+    }
+    else
+    {
+        *unpackSizes = (UInt64 *)IAlloc_Alloc(allocTemp, (size_t)*numUnpackStreams * sizeof(UInt64));
+        RINOM(*unpackSizes);
+        *digestsDefined = (Byte *)IAlloc_Alloc(allocTemp, (size_t)*numUnpackStreams * sizeof(Byte));
+        RINOM(*digestsDefined);
+        *digests = (UInt32 *)IAlloc_Alloc(allocTemp, (size_t)*numUnpackStreams * sizeof(UInt32));
+        RINOM(*digests);
+    }
+
+    for (i = 0; i < numFolders; i++)
+    {
+        /*
+        v3.13 incorrectly worked with empty folders
+        v4.07: we check that folder is empty
+        */
+        UInt64 sum = 0;
+        UInt32 j;
+        UInt32 numSubstreams = folders[i].NumUnpackStreams;
+        if (numSubstreams == 0)
+            continue;
+        if (type == k7zIdSize)
+            for (j = 1; j < numSubstreams; j++)
+            {
+                UInt64 size;
+                RINOK(SzReadNumber(sd, &size));
+                (*unpackSizes)[si++] = size;
+                sum += size;
+            }
+        (*unpackSizes)[si++] = SzFolder_GetUnpackSize(folders + i) - sum;
+    }
+    if (type == k7zIdSize)
+    {
+        RINOK(SzReadID(sd, &type));
+    }
+
+    for (i = 0; i < *numUnpackStreams; i++)
+    {
+        (*digestsDefined)[i] = 0;
+        (*digests)[i] = 0;
+    }
+
+
+    for (i = 0; i < numFolders; i++)
+    {
+        UInt32 numSubstreams = folders[i].NumUnpackStreams;
+        if (numSubstreams != 1 || !folders[i].UnpackCRCDefined)
+            numDigests += numSubstreams;
+    }
+
+
+    si = 0;
+    for (;;)
+    {
+        if (type == k7zIdCRC)
+        {
+            int digestIndex = 0;
+            Byte *digestsDefined2 = 0;
+            UInt32 *digests2 = 0;
+            SRes res = SzReadHashDigests(sd, numDigests, &digestsDefined2, &digests2, allocTemp);
+            if (res == SZ_OK)
+            {
+                for (i = 0; i < numFolders; i++)
+                {
+                    CSzFolder *folder = folders + i;
+                    UInt32 numSubstreams = folder->NumUnpackStreams;
+                    if (numSubstreams == 1 && folder->UnpackCRCDefined)
+                    {
+                        (*digestsDefined)[si] = 1;
+                        (*digests)[si] = folder->UnpackCRC;
+                        si++;
+                    }
+                    else
+                    {
+                        UInt32 j;
+                        for (j = 0; j < numSubstreams; j++, digestIndex++)
+                        {
+                            (*digestsDefined)[si] = digestsDefined2[digestIndex];
+                            (*digests)[si] = digests2[digestIndex];
+                            si++;
+                        }
+                    }
+                }
+            }
+            IAlloc_Free(allocTemp, digestsDefined2);
+            IAlloc_Free(allocTemp, digests2);
+            RINOK(res);
+        }
+        else if (type == k7zIdEnd)
+            return SZ_OK;
+        else
+        {
+            RINOK(SzSkeepData(sd));
+        }
+        RINOK(SzReadID(sd, &type));
+    }
+}
+
+
+static SRes SzReadStreamsInfo(
+    CSzData *sd,
+    UInt64 *dataOffset,
+    CSzAr *p,
+    UInt32 *numUnpackStreams,
+    UInt64 **unpackSizes, /* allocTemp */
+    Byte **digestsDefined,   /* allocTemp */
+    UInt32 **digests,        /* allocTemp */
+    ISzAlloc *alloc,
+    ISzAlloc *allocTemp)
+{
+    for (;;)
+    {
+        UInt64 type;
+        RINOK(SzReadID(sd, &type));
+        if ((UInt64)(int)type != type)
+            return SZ_ERROR_UNSUPPORTED;
+        switch((int)type)
+        {
+        case k7zIdEnd:
+            return SZ_OK;
+        case k7zIdPackInfo:
+        {
+            RINOK(SzReadPackInfo(sd, dataOffset, &p->NumPackStreams,
+                                 &p->PackSizes, &p->PackCRCsDefined, &p->PackCRCs, alloc));
+            break;
+        }
+        case k7zIdUnpackInfo:
+        {
+            RINOK(SzReadUnpackInfo(sd, &p->NumFolders, &p->Folders, alloc, allocTemp));
+            break;
+        }
+        case k7zIdSubStreamsInfo:
+        {
+            RINOK(SzReadSubStreamsInfo(sd, p->NumFolders, p->Folders,
+                                       numUnpackStreams, unpackSizes, digestsDefined, digests, allocTemp));
+            break;
+        }
+        default:
+            return SZ_ERROR_UNSUPPORTED;
+        }
+    }
+}
+
+Byte kUtf8Limits[5] = { 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+
+static SRes SzReadFileNames(CSzData *sd, UInt32 numFiles, CSzFileItem *files, ISzAlloc *alloc)
+{
+    UInt32 i;
+    for (i = 0; i < numFiles; i++)
+    {
+        UInt32 len = 0;
+        UInt32 pos = 0;
+        CSzFileItem *file = files + i;
+        while (pos + 2 <= sd->Size)
+        {
+            int numAdds;
+            UInt32 value = (UInt32)(sd->Data[pos] | (((UInt32)sd->Data[pos + 1]) << 8));
+            pos += 2;
+            len++;
+            if (value == 0)
+                break;
+            if (value < 0x80)
+                continue;
+            if (value >= 0xD800 && value < 0xE000)
+            {
+                UInt32 c2;
+                if (value >= 0xDC00)
+                    return SZ_ERROR_ARCHIVE;
+                if (pos + 2 > sd->Size)
+                    return SZ_ERROR_ARCHIVE;
+                c2 = (UInt32)(sd->Data[pos] | (((UInt32)sd->Data[pos + 1]) << 8));
+                pos += 2;
+                if (c2 < 0xDC00 || c2 >= 0xE000)
+                    return SZ_ERROR_ARCHIVE;
+                value = ((value - 0xD800) << 10) | (c2 - 0xDC00);
+            }
+            for (numAdds = 1; numAdds < 5; numAdds++)
+                if (value < (((UInt32)1) << (numAdds * 5 + 6)))
+                    break;
+            len += numAdds;
+        }
+
+        MY_ALLOC(char, file->Name, (size_t)len, alloc);
+
+        len = 0;
+        while (2 <= sd->Size)
+        {
+            int numAdds;
+            UInt32 value = (UInt32)(sd->Data[0] | (((UInt32)sd->Data[1]) << 8));
+            SzSkeepDataSize(sd, 2);
+            if (value < 0x80)
+            {
+                file->Name[len++] = (char)value;
+                if (value == 0)
+                    break;
+                continue;
+            }
+            if (value >= 0xD800 && value < 0xE000)
+            {
+                UInt32 c2 = (UInt32)(sd->Data[0] | (((UInt32)sd->Data[1]) << 8));
+                SzSkeepDataSize(sd, 2);
+                value = ((value - 0xD800) << 10) | (c2 - 0xDC00);
+            }
+            for (numAdds = 1; numAdds < 5; numAdds++)
+                if (value < (((UInt32)1) << (numAdds * 5 + 6)))
+                    break;
+            file->Name[len++] = (char)(kUtf8Limits[numAdds - 1] + (value >> (6 * numAdds)));
+            do
+            {
+                numAdds--;
+                file->Name[len++] = (char)(0x80 + ((value >> (6 * numAdds)) & 0x3F));
+            }
+            while (numAdds > 0);
+
+            len += numAdds;
+        }
+    }
+    return SZ_OK;
+}
+
+static SRes SzReadHeader2(
+    CSzArEx *p,   /* allocMain */
+    CSzData *sd,
+    UInt64 **unpackSizes,  /* allocTemp */
+    Byte **digestsDefined,    /* allocTemp */
+    UInt32 **digests,         /* allocTemp */
+    Byte **emptyStreamVector, /* allocTemp */
+    Byte **emptyFileVector,   /* allocTemp */
+    Byte **lwtVector,         /* allocTemp */
+    ISzAlloc *allocMain,
+    ISzAlloc *allocTemp)
+{
+    UInt64 type;
+    UInt32 numUnpackStreams = 0;
+    UInt32 numFiles = 0;
+    CSzFileItem *files = 0;
+    UInt32 numEmptyStreams = 0;
+    UInt32 i;
+
+    RINOK(SzReadID(sd, &type));
+
+    if (type == k7zIdArchiveProperties)
+    {
+        RINOK(SzReadArchiveProperties(sd));
+        RINOK(SzReadID(sd, &type));
+    }
+
+
+    if (type == k7zIdMainStreamsInfo)
+    {
+        RINOK(SzReadStreamsInfo(sd,
+                                &p->dataPos,
+                                &p->db,
+                                &numUnpackStreams,
+                                unpackSizes,
+                                digestsDefined,
+                                digests, allocMain, allocTemp));
+        p->dataPos += p->startPosAfterHeader;
+        RINOK(SzReadID(sd, &type));
+    }
+
+    if (type == k7zIdEnd)
+        return SZ_OK;
+    if (type != k7zIdFilesInfo)
+        return SZ_ERROR_ARCHIVE;
+
+    RINOK(SzReadNumber32(sd, &numFiles));
+    p->db.NumFiles = numFiles;
+
+    MY_ALLOC(CSzFileItem, files, (size_t)numFiles, allocMain);
+
+    p->db.Files = files;
+    for (i = 0; i < numFiles; i++)
+        SzFile_Init(files + i);
+
+    for (;;)
+    {
+        UInt64 type;
+        UInt64 size;
+        RINOK(SzReadID(sd, &type));
+        if (type == k7zIdEnd)
+            break;
+        RINOK(SzReadNumber(sd, &size));
+
+        if ((UInt64)(int)type != type)
+        {
+            RINOK(SzSkeepDataSize(sd, size));
+        }
+        else
+            switch((int)type)
+            {
+            case k7zIdName:
+            {
+                RINOK(SzReadSwitch(sd));
+                RINOK(SzReadFileNames(sd, numFiles, files, allocMain))
+                break;
+            }
+            case k7zIdEmptyStream:
+            {
+                RINOK(SzReadBoolVector(sd, numFiles, emptyStreamVector, allocTemp));
+                numEmptyStreams = 0;
+                for (i = 0; i < numFiles; i++)
+                    if ((*emptyStreamVector)[i])
+                        numEmptyStreams++;
+                break;
+            }
+            case k7zIdEmptyFile:
+            {
+                RINOK(SzReadBoolVector(sd, numEmptyStreams, emptyFileVector, allocTemp));
+                break;
+            }
+            case k7zIdMTime:
+            {
+                RINOK(SzReadBoolVector2(sd, numFiles, lwtVector, allocTemp));
+                RINOK(SzReadSwitch(sd));
+                for (i = 0; i < numFiles; i++)
+                {
+                    CSzFileItem *f = &files[i];
+                    Byte defined = (*lwtVector)[i];
+                    f->MTimeDefined = defined;
+                    f->MTime.Low = f->MTime.High = 0;
+                    if (defined)
+                    {
+                        RINOK(SzReadUInt32(sd, &f->MTime.Low));
+                        RINOK(SzReadUInt32(sd, &f->MTime.High));
+                    }
+                }
+                break;
+            }
+            default:
+            {
+                RINOK(SzSkeepDataSize(sd, size));
+            }
+            }
+    }
+
+    {
+        UInt32 emptyFileIndex = 0;
+        UInt32 sizeIndex = 0;
+        for (i = 0; i < numFiles; i++)
+        {
+            CSzFileItem *file = files + i;
+            file->IsAnti = 0;
+            if (*emptyStreamVector == 0)
+                file->HasStream = 1;
+            else
+                file->HasStream = (Byte)((*emptyStreamVector)[i] ? 0 : 1);
+            if (file->HasStream)
+            {
+                file->IsDir = 0;
+                file->Size = (*unpackSizes)[sizeIndex];
+                file->FileCRC = (*digests)[sizeIndex];
+                file->FileCRCDefined = (Byte)(*digestsDefined)[sizeIndex];
+                sizeIndex++;
+            }
+            else
+            {
+                if (*emptyFileVector == 0)
+                    file->IsDir = 1;
+                else
+                    file->IsDir = (Byte)((*emptyFileVector)[emptyFileIndex] ? 0 : 1);
+                emptyFileIndex++;
+                file->Size = 0;
+                file->FileCRCDefined = 0;
+            }
+        }
+    }
+    return SzArEx_Fill(p, allocMain);
+}
+
+static SRes SzReadHeader(
+    CSzArEx *p,
+    CSzData *sd,
+    ISzAlloc *allocMain,
+    ISzAlloc *allocTemp)
+{
+    UInt64 *unpackSizes = 0;
+    Byte *digestsDefined = 0;
+    UInt32 *digests = 0;
+    Byte *emptyStreamVector = 0;
+    Byte *emptyFileVector = 0;
+    Byte *lwtVector = 0;
+    SRes res = SzReadHeader2(p, sd,
+                             &unpackSizes, &digestsDefined, &digests,
+                             &emptyStreamVector, &emptyFileVector, &lwtVector,
+                             allocMain, allocTemp);
+    IAlloc_Free(allocTemp, unpackSizes);
+    IAlloc_Free(allocTemp, digestsDefined);
+    IAlloc_Free(allocTemp, digests);
+    IAlloc_Free(allocTemp, emptyStreamVector);
+    IAlloc_Free(allocTemp, emptyFileVector);
+    IAlloc_Free(allocTemp, lwtVector);
+    return res;
+}
+
+static SRes SzReadAndDecodePackedStreams2(
+    ILookInStream *inStream,
+    CSzData *sd,
+    CBuf *outBuffer,
+    UInt64 baseOffset,
+    CSzAr *p,
+    UInt64 **unpackSizes,
+    Byte **digestsDefined,
+    UInt32 **digests,
+    ISzAlloc *allocTemp)
+{
+
+    UInt32 numUnpackStreams = 0;
+    UInt64 dataStartPos;
+    CSzFolder *folder;
+    UInt64 unpackSize;
+    SRes res;
+
+    RINOK(SzReadStreamsInfo(sd, &dataStartPos, p,
+                            &numUnpackStreams,  unpackSizes, digestsDefined, digests,
+                            allocTemp, allocTemp));
+
+    dataStartPos += baseOffset;
+    if (p->NumFolders != 1)
+        return SZ_ERROR_ARCHIVE;
+
+    folder = p->Folders;
+    unpackSize = SzFolder_GetUnpackSize(folder);
+
+    RINOK(LookInStream_SeekTo(inStream, dataStartPos));
+
+    if (!Buf_Create(outBuffer, (size_t)unpackSize, allocTemp))
+        return SZ_ERROR_MEM;
+
+    res = SzDecode(p->PackSizes, folder,
+                   inStream, dataStartPos,
+                   outBuffer->data, (size_t)unpackSize, allocTemp);
+    RINOK(res);
+    if (folder->UnpackCRCDefined)
+        if (CrcCalc(outBuffer->data, (size_t)unpackSize) != folder->UnpackCRC)
+            return SZ_ERROR_CRC;
+    return SZ_OK;
+}
+
+static SRes SzReadAndDecodePackedStreams(
+    ILookInStream *inStream,
+    CSzData *sd,
+    CBuf *outBuffer,
+    UInt64 baseOffset,
+    ISzAlloc *allocTemp)
+{
+    CSzAr p;
+    UInt64 *unpackSizes = 0;
+    Byte *digestsDefined = 0;
+    UInt32 *digests = 0;
+    SRes res;
+    SzAr_Init(&p);
+    res = SzReadAndDecodePackedStreams2(inStream, sd, outBuffer, baseOffset,
+                                        &p, &unpackSizes, &digestsDefined, &digests,
+                                        allocTemp);
+    SzAr_Free(&p, allocTemp);
+    IAlloc_Free(allocTemp, unpackSizes);
+    IAlloc_Free(allocTemp, digestsDefined);
+    IAlloc_Free(allocTemp, digests);
+    return res;
+}
+
+static SRes SzArEx_Open2(
+    CSzArEx *p,
+    ILookInStream *inStream,
+    ISzAlloc *allocMain,
+    ISzAlloc *allocTemp)
+{
+    Byte header[k7zStartHeaderSize];
+    UInt64 nextHeaderOffset, nextHeaderSize;
+    size_t nextHeaderSizeT;
+    UInt32 nextHeaderCRC;
+    CBuf buffer;
+    SRes res;
+
+    RINOK(LookInStream_Read2(inStream, header, k7zStartHeaderSize, SZ_ERROR_NO_ARCHIVE));
+
+    if (!TestSignatureCandidate(header))
+        return SZ_ERROR_NO_ARCHIVE;
+    if (header[6] != k7zMajorVersion)
+        return SZ_ERROR_UNSUPPORTED;
+
+    nextHeaderOffset = GetUi64(header + 12);
+    nextHeaderSize = GetUi64(header + 20);
+    nextHeaderCRC = GetUi32(header + 28);
+
+    p->startPosAfterHeader = k7zStartHeaderSize;
+
+    if (CrcCalc(header + 12, 20) != GetUi32(header + 8))
+        return SZ_ERROR_CRC;
+
+    nextHeaderSizeT = (size_t)nextHeaderSize;
+    if (nextHeaderSizeT != nextHeaderSize)
+        return SZ_ERROR_MEM;
+    if (nextHeaderSizeT == 0)
+        return SZ_OK;
+    if (nextHeaderOffset > nextHeaderOffset + nextHeaderSize ||
+            nextHeaderOffset > nextHeaderOffset + nextHeaderSize + k7zStartHeaderSize)
+        return SZ_ERROR_NO_ARCHIVE;
+
+    {
+        Int64 pos = 0;
+        RINOK(inStream->Seek(inStream, &pos, SZ_SEEK_END));
+        if ((UInt64)pos < nextHeaderOffset ||
+                (UInt64)pos < k7zStartHeaderSize + nextHeaderOffset ||
+                (UInt64)pos < k7zStartHeaderSize + nextHeaderOffset + nextHeaderSize)
+            return SZ_ERROR_INPUT_EOF;
+    }
+
+    RINOK(LookInStream_SeekTo(inStream, k7zStartHeaderSize + nextHeaderOffset));
+
+    if (!Buf_Create(&buffer, nextHeaderSizeT, allocTemp))
+        return SZ_ERROR_MEM;
+
+    res = LookInStream_Read(inStream, buffer.data, nextHeaderSizeT);
+    if (res == SZ_OK)
+    {
+        res = SZ_ERROR_ARCHIVE;
+        if (CrcCalc(buffer.data, nextHeaderSizeT) == nextHeaderCRC)
+        {
+            CSzData sd;
+            UInt64 type;
+            sd.Data = buffer.data;
+            sd.Size = buffer.size;
+            res = SzReadID(&sd, &type);
+            if (res == SZ_OK)
+            {
+                if (type == k7zIdEncodedHeader)
+                {
+                    CBuf outBuffer;
+                    Buf_Init(&outBuffer);
+                    res = SzReadAndDecodePackedStreams(inStream, &sd, &outBuffer, p->startPosAfterHeader, allocTemp);
+                    if (res != SZ_OK)
+                        Buf_Free(&outBuffer, allocTemp);
+                    else
+                    {
+                        Buf_Free(&buffer, allocTemp);
+                        buffer.data = outBuffer.data;
+                        buffer.size = outBuffer.size;
+                        sd.Data = buffer.data;
+                        sd.Size = buffer.size;
+                        res = SzReadID(&sd, &type);
+                    }
+                }
+            }
+            if (res == SZ_OK)
+            {
+                if (type == k7zIdHeader)
+                    res = SzReadHeader(p, &sd, allocMain, allocTemp);
+                else
+                    res = SZ_ERROR_UNSUPPORTED;
+            }
+        }
+    }
+    Buf_Free(&buffer, allocTemp);
+    return res;
+}
+
+SRes SzArEx_Open(CSzArEx *p, ILookInStream *inStream, ISzAlloc *allocMain, ISzAlloc *allocTemp)
+{
+    SRes res = SzArEx_Open2(p, inStream, allocMain, allocTemp);
+    if (res != SZ_OK)
+        SzArEx_Free(p, allocMain);
+    return res;
+}
diff --git a/src/archivers/7z/Archive/7z/7zIn.h b/src/archivers/7z/Archive/7z/7zIn.h
index 5cbbbf85..e9c635b4 100644
--- a/src/archivers/7z/Archive/7z/7zIn.h
+++ b/src/archivers/7z/Archive/7z/7zIn.h
@@ -1,41 +1,41 @@
-/* 7zIn.h -- 7z Input functions
-2008-11-23 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_IN_H
-#define __7Z_IN_H
-
-#include "7zHeader.h"
-#include "7zItem.h"
-
-typedef struct
-{
-    CSzAr db;
-
-    UInt64 startPosAfterHeader;
-    UInt64 dataPos;
-
-    UInt32 *FolderStartPackStreamIndex;
-    UInt64 *PackStreamStartPositions;
-    UInt32 *FolderStartFileIndex;
-    UInt32 *FileIndexToFolderIndexMap;
-} CSzArEx;
-
-void SzArEx_Init(CSzArEx *p);
-void SzArEx_Free(CSzArEx *p, ISzAlloc *alloc);
-UInt64 SzArEx_GetFolderStreamPos(const CSzArEx *p, UInt32 folderIndex, UInt32 indexInFolder);
-int SzArEx_GetFolderFullPackSize(const CSzArEx *p, UInt32 folderIndex, UInt64 *resSize);
-
-/*
-Errors:
-SZ_ERROR_NO_ARCHIVE
-SZ_ERROR_ARCHIVE
-SZ_ERROR_UNSUPPORTED
-SZ_ERROR_MEM
-SZ_ERROR_CRC
-SZ_ERROR_INPUT_EOF
-SZ_ERROR_FAIL
-*/
-
-SRes SzArEx_Open(CSzArEx *p, ILookInStream *inStream, ISzAlloc *allocMain, ISzAlloc *allocTemp);
-
-#endif
+/* 7zIn.h -- 7z Input functions
+2008-11-23 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_IN_H
+#define __7Z_IN_H
+
+#include "7zHeader.h"
+#include "7zItem.h"
+
+typedef struct
+{
+    CSzAr db;
+
+    UInt64 startPosAfterHeader;
+    UInt64 dataPos;
+
+    UInt32 *FolderStartPackStreamIndex;
+    UInt64 *PackStreamStartPositions;
+    UInt32 *FolderStartFileIndex;
+    UInt32 *FileIndexToFolderIndexMap;
+} CSzArEx;
+
+void SzArEx_Init(CSzArEx *p);
+void SzArEx_Free(CSzArEx *p, ISzAlloc *alloc);
+UInt64 SzArEx_GetFolderStreamPos(const CSzArEx *p, UInt32 folderIndex, UInt32 indexInFolder);
+int SzArEx_GetFolderFullPackSize(const CSzArEx *p, UInt32 folderIndex, UInt64 *resSize);
+
+/*
+Errors:
+SZ_ERROR_NO_ARCHIVE
+SZ_ERROR_ARCHIVE
+SZ_ERROR_UNSUPPORTED
+SZ_ERROR_MEM
+SZ_ERROR_CRC
+SZ_ERROR_INPUT_EOF
+SZ_ERROR_FAIL
+*/
+
+SRes SzArEx_Open(CSzArEx *p, ILookInStream *inStream, ISzAlloc *allocMain, ISzAlloc *allocTemp);
+
+#endif
diff --git a/src/archivers/7z/Archive/7z/7zItem.cpp b/src/archivers/7z/Archive/7z/7zItem.cpp
index 213f35f6..eadf57ec 100644
--- a/src/archivers/7z/Archive/7z/7zItem.cpp
+++ b/src/archivers/7z/Archive/7z/7zItem.cpp
@@ -1,127 +1,127 @@
-/* 7zItem.c -- 7z Items
-2008-10-04 : Igor Pavlov : Public domain */
-
-#include "7zItem.h"
-
-void SzCoderInfo_Init(CSzCoderInfo *p)
-{
-    Buf_Init(&p->Props);
-}
-
-void SzCoderInfo_Free(CSzCoderInfo *p, ISzAlloc *alloc)
-{
-    Buf_Free(&p->Props, alloc);
-    SzCoderInfo_Init(p);
-}
-
-void SzFolder_Init(CSzFolder *p)
-{
-    p->Coders = 0;
-    p->BindPairs = 0;
-    p->PackStreams = 0;
-    p->UnpackSizes = 0;
-    p->NumCoders = 0;
-    p->NumBindPairs = 0;
-    p->NumPackStreams = 0;
-    p->UnpackCRCDefined = 0;
-    p->UnpackCRC = 0;
-    p->NumUnpackStreams = 0;
-}
-
-void SzFolder_Free(CSzFolder *p, ISzAlloc *alloc)
-{
-    UInt32 i;
-    if (p->Coders)
-        for (i = 0; i < p->NumCoders; i++)
-            SzCoderInfo_Free(&p->Coders[i], alloc);
-    IAlloc_Free(alloc, p->Coders);
-    IAlloc_Free(alloc, p->BindPairs);
-    IAlloc_Free(alloc, p->PackStreams);
-    IAlloc_Free(alloc, p->UnpackSizes);
-    SzFolder_Init(p);
-}
-
-UInt32 SzFolder_GetNumOutStreams(CSzFolder *p)
-{
-    UInt32 result = 0;
-    UInt32 i;
-    for (i = 0; i < p->NumCoders; i++)
-        result += p->Coders[i].NumOutStreams;
-    return result;
-}
-
-int SzFolder_FindBindPairForInStream(CSzFolder *p, UInt32 inStreamIndex)
-{
-    UInt32 i;
-    for (i = 0; i < p->NumBindPairs; i++)
-        if (p->BindPairs[i].InIndex == inStreamIndex)
-            return i;
-    return -1;
-}
-
-
-int SzFolder_FindBindPairForOutStream(CSzFolder *p, UInt32 outStreamIndex)
-{
-    UInt32 i;
-    for (i = 0; i < p->NumBindPairs; i++)
-        if (p->BindPairs[i].OutIndex == outStreamIndex)
-            return i;
-    return -1;
-}
-
-UInt64 SzFolder_GetUnpackSize(CSzFolder *p)
-{
-    int i = (int)SzFolder_GetNumOutStreams(p);
-    if (i == 0)
-        return 0;
-    for (i--; i >= 0; i--)
-        if (SzFolder_FindBindPairForOutStream(p, i) < 0)
-            return p->UnpackSizes[i];
-    /* throw 1; */
-    return 0;
-}
-
-void SzFile_Init(CSzFileItem *p)
-{
-    p->HasStream = 1;
-    p->IsDir = 0;
-    p->IsAnti = 0;
-    p->FileCRCDefined = 0;
-    p->MTimeDefined = 0;
-    p->Name = 0;
-}
-
-static void SzFile_Free(CSzFileItem *p, ISzAlloc *alloc)
-{
-    IAlloc_Free(alloc, p->Name);
-    SzFile_Init(p);
-}
-
-void SzAr_Init(CSzAr *p)
-{
-    p->PackSizes = 0;
-    p->PackCRCsDefined = 0;
-    p->PackCRCs = 0;
-    p->Folders = 0;
-    p->Files = 0;
-    p->NumPackStreams = 0;
-    p->NumFolders = 0;
-    p->NumFiles = 0;
-}
-
-void SzAr_Free(CSzAr *p, ISzAlloc *alloc)
-{
-    UInt32 i;
-    if (p->Folders)
-        for (i = 0; i < p->NumFolders; i++)
-            SzFolder_Free(&p->Folders[i], alloc);
-    if (p->Files)
-        for (i = 0; i < p->NumFiles; i++)
-            SzFile_Free(&p->Files[i], alloc);
-    IAlloc_Free(alloc, p->PackSizes);
-    IAlloc_Free(alloc, p->PackCRCsDefined);
-    IAlloc_Free(alloc, p->PackCRCs);
-    IAlloc_Free(alloc, p->Folders);
-    IAlloc_Free(alloc, p->Files);
-    SzAr_Init(p);
-}
+/* 7zItem.c -- 7z Items
+2008-10-04 : Igor Pavlov : Public domain */
+
+#include "7zItem.h"
+
+void SzCoderInfo_Init(CSzCoderInfo *p)
+{
+    Buf_Init(&p->Props);
+}
+
+void SzCoderInfo_Free(CSzCoderInfo *p, ISzAlloc *alloc)
+{
+    Buf_Free(&p->Props, alloc);
+    SzCoderInfo_Init(p);
+}
+
+void SzFolder_Init(CSzFolder *p)
+{
+    p->Coders = 0;
+    p->BindPairs = 0;
+    p->PackStreams = 0;
+    p->UnpackSizes = 0;
+    p->NumCoders = 0;
+    p->NumBindPairs = 0;
+    p->NumPackStreams = 0;
+    p->UnpackCRCDefined = 0;
+    p->UnpackCRC = 0;
+    p->NumUnpackStreams = 0;
+}
+
+void SzFolder_Free(CSzFolder *p, ISzAlloc *alloc)
+{
+    UInt32 i;
+    if (p->Coders)
+        for (i = 0; i < p->NumCoders; i++)
+            SzCoderInfo_Free(&p->Coders[i], alloc);
+    IAlloc_Free(alloc, p->Coders);
+    IAlloc_Free(alloc, p->BindPairs);
+    IAlloc_Free(alloc, p->PackStreams);
+    IAlloc_Free(alloc, p->UnpackSizes);
+    SzFolder_Init(p);
+}
+
+UInt32 SzFolder_GetNumOutStreams(CSzFolder *p)
+{
+    UInt32 result = 0;
+    UInt32 i;
+    for (i = 0; i < p->NumCoders; i++)
+        result += p->Coders[i].NumOutStreams;
+    return result;
+}
+
+int SzFolder_FindBindPairForInStream(CSzFolder *p, UInt32 inStreamIndex)
+{
+    UInt32 i;
+    for (i = 0; i < p->NumBindPairs; i++)
+        if (p->BindPairs[i].InIndex == inStreamIndex)
+            return i;
+    return -1;
+}
+
+
+int SzFolder_FindBindPairForOutStream(CSzFolder *p, UInt32 outStreamIndex)
+{
+    UInt32 i;
+    for (i = 0; i < p->NumBindPairs; i++)
+        if (p->BindPairs[i].OutIndex == outStreamIndex)
+            return i;
+    return -1;
+}
+
+UInt64 SzFolder_GetUnpackSize(CSzFolder *p)
+{
+    int i = (int)SzFolder_GetNumOutStreams(p);
+    if (i == 0)
+        return 0;
+    for (i--; i >= 0; i--)
+        if (SzFolder_FindBindPairForOutStream(p, i) < 0)
+            return p->UnpackSizes[i];
+    /* throw 1; */
+    return 0;
+}
+
+void SzFile_Init(CSzFileItem *p)
+{
+    p->HasStream = 1;
+    p->IsDir = 0;
+    p->IsAnti = 0;
+    p->FileCRCDefined = 0;
+    p->MTimeDefined = 0;
+    p->Name = 0;
+}
+
+static void SzFile_Free(CSzFileItem *p, ISzAlloc *alloc)
+{
+    IAlloc_Free(alloc, p->Name);
+    SzFile_Init(p);
+}
+
+void SzAr_Init(CSzAr *p)
+{
+    p->PackSizes = 0;
+    p->PackCRCsDefined = 0;
+    p->PackCRCs = 0;
+    p->Folders = 0;
+    p->Files = 0;
+    p->NumPackStreams = 0;
+    p->NumFolders = 0;
+    p->NumFiles = 0;
+}
+
+void SzAr_Free(CSzAr *p, ISzAlloc *alloc)
+{
+    UInt32 i;
+    if (p->Folders)
+        for (i = 0; i < p->NumFolders; i++)
+            SzFolder_Free(&p->Folders[i], alloc);
+    if (p->Files)
+        for (i = 0; i < p->NumFiles; i++)
+            SzFile_Free(&p->Files[i], alloc);
+    IAlloc_Free(alloc, p->PackSizes);
+    IAlloc_Free(alloc, p->PackCRCsDefined);
+    IAlloc_Free(alloc, p->PackCRCs);
+    IAlloc_Free(alloc, p->Folders);
+    IAlloc_Free(alloc, p->Files);
+    SzAr_Init(p);
+}
diff --git a/src/archivers/7z/Archive/7z/7zItem.h b/src/archivers/7z/Archive/7z/7zItem.h
index 56abff8f..b8e820ba 100644
--- a/src/archivers/7z/Archive/7z/7zItem.h
+++ b/src/archivers/7z/Archive/7z/7zItem.h
@@ -1,84 +1,84 @@
-/* 7zItem.h -- 7z Items
-2008-10-04 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_ITEM_H
-#define __7Z_ITEM_H
-
-#include "../../7zBuf.h"
-
-typedef struct
-{
-    UInt32 NumInStreams;
-    UInt32 NumOutStreams;
-    UInt64 MethodID;
-    CBuf Props;
-} CSzCoderInfo;
-
-void SzCoderInfo_Init(CSzCoderInfo *p);
-void SzCoderInfo_Free(CSzCoderInfo *p, ISzAlloc *alloc);
-
-typedef struct
-{
-    UInt32 InIndex;
-    UInt32 OutIndex;
-} CBindPair;
-
-typedef struct
-{
-    CSzCoderInfo *Coders;
-    CBindPair *BindPairs;
-    UInt32 *PackStreams;
-    UInt64 *UnpackSizes;
-    UInt32 NumCoders;
-    UInt32 NumBindPairs;
-    UInt32 NumPackStreams;
-    int UnpackCRCDefined;
-    UInt32 UnpackCRC;
-
-    UInt32 NumUnpackStreams;
-} CSzFolder;
-
-void SzFolder_Init(CSzFolder *p);
-UInt64 SzFolder_GetUnpackSize(CSzFolder *p);
-int SzFolder_FindBindPairForInStream(CSzFolder *p, UInt32 inStreamIndex);
-UInt32 SzFolder_GetNumOutStreams(CSzFolder *p);
-UInt64 SzFolder_GetUnpackSize(CSzFolder *p);
-
-typedef struct
-{
-    UInt32 Low;
-    UInt32 High;
-} CNtfsFileTime;
-
-typedef struct
-{
-    CNtfsFileTime MTime;
-    UInt64 Size;
-    char *Name;
-    UInt32 FileCRC;
-
-    Byte HasStream;
-    Byte IsDir;
-    Byte IsAnti;
-    Byte FileCRCDefined;
-    Byte MTimeDefined;
-} CSzFileItem;
-
-void SzFile_Init(CSzFileItem *p);
-
-typedef struct
-{
-    UInt64 *PackSizes;
-    Byte *PackCRCsDefined;
-    UInt32 *PackCRCs;
-    CSzFolder *Folders;
-    CSzFileItem *Files;
-    UInt32 NumPackStreams;
-    UInt32 NumFolders;
-    UInt32 NumFiles;
-} CSzAr;
-
-void SzAr_Init(CSzAr *p);
-void SzAr_Free(CSzAr *p, ISzAlloc *alloc);
-
-#endif
+/* 7zItem.h -- 7z Items
+2008-10-04 : Igor Pavlov : Public domain */
+
+#ifndef __7Z_ITEM_H
+#define __7Z_ITEM_H
+
+#include "../../7zBuf.h"
+
+typedef struct
+{
+    UInt32 NumInStreams;
+    UInt32 NumOutStreams;
+    UInt64 MethodID;
+    CBuf Props;
+} CSzCoderInfo;
+
+void SzCoderInfo_Init(CSzCoderInfo *p);
+void SzCoderInfo_Free(CSzCoderInfo *p, ISzAlloc *alloc);
+
+typedef struct
+{
+    UInt32 InIndex;
+    UInt32 OutIndex;
+} CBindPair;
+
+typedef struct
+{
+    CSzCoderInfo *Coders;
+    CBindPair *BindPairs;
+    UInt32 *PackStreams;
+    UInt64 *UnpackSizes;
+    UInt32 NumCoders;
+    UInt32 NumBindPairs;
+    UInt32 NumPackStreams;
+    int UnpackCRCDefined;
+    UInt32 UnpackCRC;
+
+    UInt32 NumUnpackStreams;
+} CSzFolder;
+
+void SzFolder_Init(CSzFolder *p);
+UInt64 SzFolder_GetUnpackSize(CSzFolder *p);
+int SzFolder_FindBindPairForInStream(CSzFolder *p, UInt32 inStreamIndex);
+UInt32 SzFolder_GetNumOutStreams(CSzFolder *p);
+UInt64 SzFolder_GetUnpackSize(CSzFolder *p);
+
+typedef struct
+{
+    UInt32 Low;
+    UInt32 High;
+} CNtfsFileTime;
+
+typedef struct
+{
+    CNtfsFileTime MTime;
+    UInt64 Size;
+    char *Name;
+    UInt32 FileCRC;
+
+    Byte HasStream;
+    Byte IsDir;
+    Byte IsAnti;
+    Byte FileCRCDefined;
+    Byte MTimeDefined;
+} CSzFileItem;
+
+void SzFile_Init(CSzFileItem *p);
+
+typedef struct
+{
+    UInt64 *PackSizes;
+    Byte *PackCRCsDefined;
+    UInt32 *PackCRCs;
+    CSzFolder *Folders;
+    CSzFileItem *Files;
+    UInt32 NumPackStreams;
+    UInt32 NumFolders;
+    UInt32 NumFiles;
+} CSzAr;
+
+void SzAr_Init(CSzAr *p);
+void SzAr_Free(CSzAr *p, ISzAlloc *alloc);
+
+#endif
diff --git a/src/main.cpp b/src/main.cpp
index 3917b317..836d4fd2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -648,10 +648,12 @@ void check_error_sdl(bool check, const char* message) {
 
 static int real_main2 (int argc, TCHAR **argv)
 {
+	SDL_SetHint(SDL_HINT_GRAB_KEYBOARD, "1");
+	SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengles2");
 	printf("Amiberry-SDL2 by Dimitris (MiDWaN) Panokostas\n");
-	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK) < 0)
+	if (SDL_Init(SDL_INIT_EVERYTHING) != 0)
 	{
-		printf("SDL could not initialize! SDL_Error: %s\n", SDL_GetError());
+		SDL_Log("SDL could not initialize! SDL_Error: %s\n", SDL_GetError());
 		abort();
 	}
 
diff --git a/src/osdep/gui/gui_handling.h b/src/osdep/gui/gui_handling.h
index e6d3d683..47fc4064 100644
--- a/src/osdep/gui/gui_handling.h
+++ b/src/osdep/gui/gui_handling.h
@@ -1,7 +1,7 @@
 #ifndef _GUI_HANDLING_H
 #define _GUI_HANDLING_H
 
-#define GUI_WIDTH  640
+#define GUI_WIDTH  800
 #define GUI_HEIGHT 480
 #define MIN_GUI_WIDTH 320
 #define MIN_GUI_HEIGHT 240
diff --git a/src/osdep/keyboard.cpp b/src/osdep/keyboard.cpp
index d8f4c639..15c23996 100644
--- a/src/osdep/keyboard.cpp
+++ b/src/osdep/keyboard.cpp
@@ -16,256 +16,21 @@
 
 char keyboard_type = 0;
 
-static struct uae_input_device_kbr_default keytrans_amiga_x11[] = {
-
-	{ 9, INPUTEVENT_KEY_ESC },
-	{ 67, INPUTEVENT_KEY_F1 },
-	{ 68, INPUTEVENT_KEY_F2 },
-	{ 69, INPUTEVENT_KEY_F3 },
-	{ 70, INPUTEVENT_KEY_F4 },
-	{ 71, INPUTEVENT_KEY_F5 },
-	{ 72, INPUTEVENT_KEY_F6 },
-	{ 73, INPUTEVENT_KEY_F7 },
-	{ 74, INPUTEVENT_KEY_F8 },
-	{ 75, INPUTEVENT_KEY_F9 },
-	{ 76, INPUTEVENT_KEY_F10 },
-    //{ 95,   INPUTEVENT_KEY_F11},
-    //{ 96,   INPUTEVENT_KEY_F12},
-
-	{ 49, INPUTEVENT_KEY_BACKQUOTE },
-
-	{ 10, INPUTEVENT_KEY_1 },
-	{ 11, INPUTEVENT_KEY_2 },
-	{ 12, INPUTEVENT_KEY_3 },
-	{ 13, INPUTEVENT_KEY_4 },
-	{ 14, INPUTEVENT_KEY_5 },
-	{ 15, INPUTEVENT_KEY_6 },
-	{ 16, INPUTEVENT_KEY_7 },
-	{ 17, INPUTEVENT_KEY_8 },
-	{ 18, INPUTEVENT_KEY_9 },
-	{ 19, INPUTEVENT_KEY_0 },
-	{ 20, INPUTEVENT_KEY_SUB },
-	{ 21, INPUTEVENT_KEY_EQUALS },
-	{ 22, INPUTEVENT_KEY_BACKSPACE },
-
-	{ 23, INPUTEVENT_KEY_TAB },
-	{ 24, INPUTEVENT_KEY_Q },
-	{ 25, INPUTEVENT_KEY_W },
-	{ 26, INPUTEVENT_KEY_E },
-	{ 27, INPUTEVENT_KEY_R },
-	{ 28, INPUTEVENT_KEY_T },
-	{ 29, INPUTEVENT_KEY_Y },
-	{ 30, INPUTEVENT_KEY_U },
-	{ 31, INPUTEVENT_KEY_I },
-	{ 32, INPUTEVENT_KEY_O },
-	{ 33, INPUTEVENT_KEY_P },
-	{ 34, INPUTEVENT_KEY_LEFTBRACKET },
-	{ 35, INPUTEVENT_KEY_RIGHTBRACKET },
-	{ 36, INPUTEVENT_KEY_RETURN },
-
-	{ 66, INPUTEVENT_KEY_CAPS_LOCK },
-	{ 38, INPUTEVENT_KEY_A },
-	{ 39, INPUTEVENT_KEY_S },
-	{ 40, INPUTEVENT_KEY_D },
-	{ 41, INPUTEVENT_KEY_F },
-	{ 42, INPUTEVENT_KEY_G },
-	{ 43, INPUTEVENT_KEY_H },
-	{ 44, INPUTEVENT_KEY_J },
-	{ 45, INPUTEVENT_KEY_K },
-	{ 46, INPUTEVENT_KEY_L },
-	{ 47, INPUTEVENT_KEY_SEMICOLON },
-	{ 48, INPUTEVENT_KEY_SINGLEQUOTE },
-	{ 51, INPUTEVENT_KEY_BACKSLASH },
-
-	{ 50, INPUTEVENT_KEY_SHIFT_LEFT },
-	{ 94, INPUTEVENT_KEY_LTGT },
-	{ 52, INPUTEVENT_KEY_Z },
-	{ 53, INPUTEVENT_KEY_X },
-	{ 54, INPUTEVENT_KEY_C },
-	{ 55, INPUTEVENT_KEY_V },
-	{ 56, INPUTEVENT_KEY_B },
-	{ 57, INPUTEVENT_KEY_N },
-	{ 58, INPUTEVENT_KEY_M },
-	{ 59, INPUTEVENT_KEY_COMMA },
-	{ 60, INPUTEVENT_KEY_PERIOD },
-	{ 61, INPUTEVENT_KEY_DIV },
-	{ 62, INPUTEVENT_KEY_SHIFT_RIGHT },
-
-	{ 37, INPUTEVENT_KEY_CTRL },
-	{ 64, INPUTEVENT_KEY_ALT_LEFT },
-	{ 65, INPUTEVENT_KEY_SPACE },
-
-	{ 108, INPUTEVENT_KEY_ALT_RIGHT },
-
-    //{ 78,  INPUTEVENT_KEY_SCROLLOCK},
-
-    //{ 77,  INPUTEVENT_KEY_NUMLOCK},
-	{ 106, INPUTEVENT_KEY_NP_DIV },
-	{ 63, INPUTEVENT_KEY_NP_MUL },
-	{ 82, INPUTEVENT_KEY_NP_SUB },
-
-	{ 79, INPUTEVENT_KEY_NP_7 },
-	{ 80, INPUTEVENT_KEY_NP_8 },
-	{ 81, INPUTEVENT_KEY_NP_9 },
-	{ 86, INPUTEVENT_KEY_NP_ADD },
-
-	{ 83, INPUTEVENT_KEY_NP_4 },
-	{ 84, INPUTEVENT_KEY_NP_5 },
-	{ 85, INPUTEVENT_KEY_NP_6 },
-
-	{ 87, INPUTEVENT_KEY_NP_1 },
-	{ 88, INPUTEVENT_KEY_NP_2 },
-	{ 89, INPUTEVENT_KEY_NP_3 },
-	{ 104, INPUTEVENT_KEY_ENTER },         // The ENT from keypad..
-
-	{ 90, INPUTEVENT_KEY_NP_0 },
-	{ 91, INPUTEVENT_KEY_NP_PERIOD },
-
-	{ 111, INPUTEVENT_KEY_CURSOR_UP },
-	{ 113, INPUTEVENT_KEY_CURSOR_LEFT },
-	{ 116, INPUTEVENT_KEY_CURSOR_DOWN },
-	{ 114, INPUTEVENT_KEY_CURSOR_RIGHT },
-
-
-	{ 110, INPUTEVENT_KEY_NP_LPAREN },     // Map home   to left  parent (as fsuae)
-	{ 112, INPUTEVENT_KEY_NP_RPAREN },     // Map pageup to right parent (as fsuae)
-
-	{ 115, INPUTEVENT_KEY_HELP },          // Help mapped to End key (as fsuae)
-
-	{ 119, INPUTEVENT_KEY_DEL },
-
-	{ 133, INPUTEVENT_KEY_AMIGA_LEFT },   // Left amiga mapped to left Windows
-	{ 134, INPUTEVENT_KEY_AMIGA_RIGHT },  // Right amiga mapped to right windows key.
-	{ 135, INPUTEVENT_KEY_AMIGA_RIGHT },  // Right amiga mapped to Menu key.
-	{ -1, 0 }
-};
-
-static struct uae_input_device_kbr_default keytrans_amiga_fbcon[] = {
-
-	{ 9  - 8, INPUTEVENT_KEY_ESC },
-	{ 67 - 8, INPUTEVENT_KEY_F1 },
-	{ 68 - 8, INPUTEVENT_KEY_F2 },
-	{ 69 - 8, INPUTEVENT_KEY_F3 },
-	{ 70 - 8, INPUTEVENT_KEY_F4 },
-	{ 71 - 8, INPUTEVENT_KEY_F5 },
-	{ 72 - 8, INPUTEVENT_KEY_F6 },
-	{ 73 - 8, INPUTEVENT_KEY_F7 },
-	{ 74 - 8, INPUTEVENT_KEY_F8 },
-	{ 75 - 8, INPUTEVENT_KEY_F9 },
-	{ 76 - 8, INPUTEVENT_KEY_F10 },
-    // { 95 -8 ,   INPUTEVENT_KEY_F11},
-    // { 96 -8 ,   INPUTEVENT_KEY_F12},
-
-	{ 49 - 8, INPUTEVENT_KEY_BACKQUOTE },
-
-	{ 10 - 8, INPUTEVENT_KEY_1 },
-	{ 11 - 8, INPUTEVENT_KEY_2 },
-	{ 12 - 8, INPUTEVENT_KEY_3 },
-	{ 13 - 8, INPUTEVENT_KEY_4 },
-	{ 14 - 8, INPUTEVENT_KEY_5 },
-	{ 15 - 8, INPUTEVENT_KEY_6 },
-	{ 16 - 8, INPUTEVENT_KEY_7 },
-	{ 17 - 8, INPUTEVENT_KEY_8 },
-	{ 18 - 8, INPUTEVENT_KEY_9 },
-	{ 19 - 8, INPUTEVENT_KEY_0 },
-	{ 20 - 8, INPUTEVENT_KEY_SUB },
-	{ 21 - 8, INPUTEVENT_KEY_EQUALS },
-	{ 22 - 8, INPUTEVENT_KEY_BACKSPACE },
-
-	{ 23 - 8, INPUTEVENT_KEY_TAB },
-	{ 24 - 8, INPUTEVENT_KEY_Q },
-	{ 25 - 8, INPUTEVENT_KEY_W },
-	{ 26 - 8, INPUTEVENT_KEY_E },
-	{ 27 - 8, INPUTEVENT_KEY_R },
-	{ 28 - 8, INPUTEVENT_KEY_T },
-	{ 29 - 8, INPUTEVENT_KEY_Y },
-	{ 30 - 8, INPUTEVENT_KEY_U },
-	{ 31 - 8, INPUTEVENT_KEY_I },
-	{ 32 - 8, INPUTEVENT_KEY_O },
-	{ 33 - 8, INPUTEVENT_KEY_P },
-	{ 34 - 8, INPUTEVENT_KEY_LEFTBRACKET },
-	{ 35 - 8, INPUTEVENT_KEY_RIGHTBRACKET },
-	{ 36 - 8, INPUTEVENT_KEY_RETURN },
-
-	{ 66 - 8, INPUTEVENT_KEY_CAPS_LOCK },
-	{ 38 - 8, INPUTEVENT_KEY_A },
-	{ 39 - 8, INPUTEVENT_KEY_S },
-	{ 40 - 8, INPUTEVENT_KEY_D },
-	{ 41 - 8, INPUTEVENT_KEY_F },
-	{ 42 - 8, INPUTEVENT_KEY_G },
-	{ 43 - 8, INPUTEVENT_KEY_H },
-	{ 44 - 8, INPUTEVENT_KEY_J },
-	{ 45 - 8, INPUTEVENT_KEY_K },
-	{ 46 - 8, INPUTEVENT_KEY_L },
-	{ 47 - 8, INPUTEVENT_KEY_SEMICOLON },
-	{ 48 - 8, INPUTEVENT_KEY_SINGLEQUOTE },
-	{ 51 - 8, INPUTEVENT_KEY_BACKSLASH },
-
-	{ 50 - 8, INPUTEVENT_KEY_SHIFT_LEFT },
-	{ 94 - 8, INPUTEVENT_KEY_LTGT },
-	{ 52 - 8, INPUTEVENT_KEY_Z },
-	{ 53 - 8, INPUTEVENT_KEY_X },
-	{ 54 - 8, INPUTEVENT_KEY_C },
-	{ 55 - 8, INPUTEVENT_KEY_V },
-	{ 56 - 8, INPUTEVENT_KEY_B },
-	{ 57 - 8, INPUTEVENT_KEY_N },
-	{ 58 - 8, INPUTEVENT_KEY_M },
-	{ 59 - 8, INPUTEVENT_KEY_COMMA },
-	{ 60 - 8, INPUTEVENT_KEY_PERIOD },
-	{ 61 - 8, INPUTEVENT_KEY_DIV },
-	{ 62 - 8, INPUTEVENT_KEY_SHIFT_RIGHT },
-
-	{ 37 - 8, INPUTEVENT_KEY_CTRL },
-	{ 64 - 8, INPUTEVENT_KEY_ALT_LEFT },
-	{ 65 - 8, INPUTEVENT_KEY_SPACE },
-
-	{ 108 - 8, INPUTEVENT_KEY_ALT_RIGHT },
-
-    //{ 78 -8 ,  INPUTEVENT_KEY_SCROLLOCK},
-
-    //{ 77 -8 ,  INPUTEVENT_KEY_NUMLOCK},
-	{ 106 - 8, INPUTEVENT_KEY_NP_DIV },
-	{ 63 - 8, INPUTEVENT_KEY_NP_MUL },
-	{ 82 - 8, INPUTEVENT_KEY_NP_SUB },
-
-	{ 79 - 8, INPUTEVENT_KEY_NP_7 },
-	{ 80 - 8, INPUTEVENT_KEY_NP_8 },
-	{ 81 - 8, INPUTEVENT_KEY_NP_9 },
-	{ 86 - 8, INPUTEVENT_KEY_NP_ADD },
-
-	{ 83 - 8, INPUTEVENT_KEY_NP_4 },
-	{ 84 - 8, INPUTEVENT_KEY_NP_5 },
-	{ 85 - 8, INPUTEVENT_KEY_NP_6 },
-
-	{ 87 - 8, INPUTEVENT_KEY_NP_1 },
-	{ 88 - 8, INPUTEVENT_KEY_NP_2 },
-	{ 89 - 8, INPUTEVENT_KEY_NP_3 },
-	{ 104 - 8, INPUTEVENT_KEY_ENTER },         // The ENT from keypad..
-
-	{ 90 - 8, INPUTEVENT_KEY_NP_0 },
-	{ 91 - 8, INPUTEVENT_KEY_PERIOD },
-
-	{ 111 - 8, INPUTEVENT_KEY_CURSOR_UP },
-	{ 113 - 8, INPUTEVENT_KEY_CURSOR_LEFT },
-	{ 116 - 8, INPUTEVENT_KEY_CURSOR_DOWN },
-	{ 114 - 8, INPUTEVENT_KEY_CURSOR_RIGHT },
-
-
-	{ 110 - 8, INPUTEVENT_KEY_NP_LPAREN },     // Map home   to left  parent (as fsuae)
-	{ 112 - 8, INPUTEVENT_KEY_NP_RPAREN },     // Map pageup to right parent (as fsuae)
-
-	{ 115 - 8, INPUTEVENT_KEY_HELP },          // Help mapped to End key (as fsuae)
-
-	{ 119 - 8, INPUTEVENT_KEY_DEL },
-
-	{ 133 - 8, INPUTEVENT_KEY_AMIGA_LEFT },   // Left amiga mapped to left Windows
-	{ 134 - 8, INPUTEVENT_KEY_AMIGA_RIGHT },  // Right amiga mapped to right windows key.
-	{ 135 - 8, INPUTEVENT_KEY_AMIGA_RIGHT },  // Right amiga mapped to Menu key.
-	{ -1, 0 }
-};
-
 static struct uae_input_device_kbr_default keytrans_amiga[] = {
 
+	{ SDLK_F1, INPUTEVENT_KEY_F1 },
+	{ SDLK_F2, INPUTEVENT_KEY_F2 },
+	{ SDLK_F3, INPUTEVENT_KEY_F3 },
+	{ SDLK_F4, INPUTEVENT_KEY_F4 },
+	{ SDLK_F5, INPUTEVENT_KEY_F5 },
+	{ SDLK_F6, INPUTEVENT_KEY_F6 },
+	{ SDLK_F7, INPUTEVENT_KEY_F7 },
+	{ SDLK_F8, INPUTEVENT_KEY_F8 },
+	{ SDLK_F9, INPUTEVENT_KEY_F9 },
+	{ SDLK_F10, INPUTEVENT_KEY_F10 },
+    { SDLK_F11, INPUTEVENT_KEY_F11},
+    { SDLK_F12, INPUTEVENT_KEY_F12},
+	
 	{ SDLK_a, INPUTEVENT_KEY_A },
 	{ SDLK_b, INPUTEVENT_KEY_B },
 	{ SDLK_c, INPUTEVENT_KEY_C },
@@ -304,6 +69,7 @@ static struct uae_input_device_kbr_default keytrans_amiga[] = {
 	{ SDLK_8, INPUTEVENT_KEY_8 },
 	{ SDLK_9, INPUTEVENT_KEY_9 },
 
+	{ SDLK_CAPSLOCK, INPUTEVENT_KEY_CAPS_LOCK },
 	{ SDLK_BACKSPACE, INPUTEVENT_KEY_BACKSPACE },
 	{ SDLK_TAB, INPUTEVENT_KEY_TAB },
 	{ SDLK_RETURN, INPUTEVENT_KEY_RETURN },
@@ -323,10 +89,48 @@ static struct uae_input_device_kbr_default keytrans_amiga[] = {
 	{ SDLK_BACKQUOTE, INPUTEVENT_KEY_BACKQUOTE },
 	{ SDLK_DELETE, INPUTEVENT_KEY_DEL },
 
+	{SDLK_LSHIFT, INPUTEVENT_KEY_SHIFT_LEFT	},
+	{SDLK_RSHIFT, INPUTEVENT_KEY_SHIFT_RIGHT},
+	{SDLK_LCTRL, INPUTEVENT_KEY_CTRL},
+	{SDLK_RCTRL, INPUTEVENT_KEY_CTRL},
+	{SDLK_LALT, INPUTEVENT_KEY_ALT_LEFT},
+	{SDLK_RALT, INPUTEVENT_KEY_ALT_RIGHT},
+	
+//	{ 94 - 8, INPUTEVENT_KEY_LTGT },
+
+	{ SDLK_KP_DIVIDE, INPUTEVENT_KEY_NP_DIV },
+	{ SDLK_KP_MULTIPLY, INPUTEVENT_KEY_NP_MUL },
+	{ SDLK_KP_MINUS, INPUTEVENT_KEY_NP_SUB },
+	{ SDLK_KP_7, INPUTEVENT_KEY_NP_7 },
+	{ SDLK_KP_8, INPUTEVENT_KEY_NP_8 },
+	{ SDLK_KP_9, INPUTEVENT_KEY_NP_9 },
+	{ SDLK_KP_PLUS, INPUTEVENT_KEY_NP_ADD },
+	{ SDLK_KP_4, INPUTEVENT_KEY_NP_4 },
+	{ SDLK_KP_5, INPUTEVENT_KEY_NP_5 },
+	{ SDLK_KP_6, INPUTEVENT_KEY_NP_6 },
+	{ SDLK_KP_1, INPUTEVENT_KEY_NP_1 },
+	{ SDLK_KP_2, INPUTEVENT_KEY_NP_2 },
+	{ SDLK_KP_3, INPUTEVENT_KEY_NP_3 },
+	{ SDLK_KP_ENTER, INPUTEVENT_KEY_ENTER },         // The ENT from keypad..
+	{ SDLK_KP_0, INPUTEVENT_KEY_NP_0 },
+	{ SDLK_KP_PERIOD, INPUTEVENT_KEY_PERIOD },
+
+	{ SDLK_UP, INPUTEVENT_KEY_CURSOR_UP },
+	{ SDLK_LEFT, INPUTEVENT_KEY_CURSOR_LEFT },
+	{ SDLK_DOWN, INPUTEVENT_KEY_CURSOR_DOWN },
+	{ SDLK_RIGHT, INPUTEVENT_KEY_CURSOR_RIGHT },
+
+	{ SDLK_HOME, INPUTEVENT_KEY_NP_LPAREN },     // Map home   to left  parent (as fsuae)
+	{ SDLK_PAGEUP, INPUTEVENT_KEY_NP_RPAREN },     // Map pageup to right parent (as fsuae)
+	{ SDLK_END, INPUTEVENT_KEY_HELP },          // Help mapped to End key (as fsuae)
+	{ SDLK_DELETE, INPUTEVENT_KEY_DEL },
+
+	{ SDLK_LGUI, INPUTEVENT_KEY_AMIGA_LEFT },   // Left amiga mapped to left Windows
+	{ SDLK_RGUI, INPUTEVENT_KEY_AMIGA_RIGHT },  // Right amiga mapped to right windows key.
+	{ SDLK_MENU, INPUTEVENT_KEY_AMIGA_RIGHT },  // Right amiga mapped to Menu key.
 	{ -1, 0 }
 };
 
-
 static struct uae_input_device_kbr_default *keytrans[] =
 {
     keytrans_amiga,
@@ -334,20 +138,6 @@ static struct uae_input_device_kbr_default *keytrans[] =
     keytrans_amiga
 };
 
-static struct uae_input_device_kbr_default *keytrans_x11[] =
-{
-    keytrans_amiga_x11,
-    keytrans_amiga_x11,
-    keytrans_amiga_x11
-};
-
-static struct uae_input_device_kbr_default *keytrans_fbcon[] =
-{
-    keytrans_amiga_fbcon,
-    keytrans_amiga_fbcon,
-    keytrans_amiga_fbcon
-};
-
 static int kb_none[] = { -1 };
 static int *kbmaps[] = { kb_none, kb_none, kb_none, kb_none, kb_none,
                          kb_none, kb_none, kb_none, kb_none, kb_none
@@ -361,9 +151,6 @@ void keyboard_settrans ()
 
 int translate_pandora_keys(int symbol, int *modifier)
 {
-#ifndef PANDORA_SPECIFIC
-    return 0;
-#endif
     switch(symbol)
     {
     case VK_UP: