Merge branch 'master' into Sync-weave

13 files changed, 0 insertions, 1982 deletions

diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractCallback.cpp b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractCallback.cpp
deleted file mode 100644
index 8a06ec138..000000000
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractCallback.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-// ExtractCallback.h

-

-#include "StdAfx.h"

-

-#include "ExtractCallback.h"

-

-#include "Common/Wildcard.h"

-#include "Common/StringConvert.h"

-

-#include "Windows/COM.h"

-#include "Windows/FileDir.h"

-#include "Windows/FileFind.h"

-#include "Windows/Time.h"

-#include "Windows/Defs.h"

-#include "Windows/PropVariant.h"

-

-#include "Windows/PropVariantConversions.h"

-

-using namespace NWindows;

-using namespace NFile;

-

-static LPCWSTR kErrorTitle = L"7-Zip";

-static LPCWSTR kCantDeleteFile = L"Can not delete output file";

-static LPCWSTR kCantOpenFile = L"Can not open output file";

-static LPCWSTR kUnsupportedMethod = L"Unsupported Method";

-// static LPCWSTR kCRCFailed = L"CRC Failed";

-// static LPCWSTR kDataError = L"Data Error";

-// static LPCWSTR kUnknownError = L""Unknown Error";

-

-void CExtractCallbackImp::Init(IInArchive *archiveHandler,

-    const UString &directoryPath,   

-    const UString &itemDefaultName,

-    const FILETIME &utcLastWriteTimeDefault,

-    UInt32 attributesDefault)

-{

-  _message.Empty();

-  _isCorrupt = false;

-  _itemDefaultName = itemDefaultName;

-  _utcLastWriteTimeDefault = utcLastWriteTimeDefault;

-  _attributesDefault = attributesDefault;

-  _archiveHandler = archiveHandler;

-  _directoryPath = directoryPath;

-  NName::NormalizeDirPathPrefix(_directoryPath);

-}

-

-STDMETHODIMP CExtractCallbackImp::SetTotal(UInt64 size)

-{

-  #ifndef _NO_PROGRESS

-  ProgressDialog.ProgressSynch.SetProgress(size, 0);

-  #endif

-  return S_OK;

-}

-

-STDMETHODIMP CExtractCallbackImp::SetCompleted(const UInt64 *completeValue)

-{

-  #ifndef _NO_PROGRESS

-  while(true)

-  {

-    if(ProgressDialog.ProgressSynch.GetStopped())

-      return E_ABORT;

-    if(!ProgressDialog.ProgressSynch.GetPaused())

-      break;

-    ::Sleep(100);

-  }

-  if (completeValue != NULL)

-    ProgressDialog.ProgressSynch.SetPos(*completeValue);

-  #endif

-  return S_OK;

-}

-

-void CExtractCallbackImp::CreateComplexDirectory(const UStringVector &dirPathParts)

-{

-  UString fullPath = _directoryPath;

-  for(int i = 0; i < dirPathParts.Size(); i++)

-  {

-    fullPath += dirPathParts[i];

-    NDirectory::MyCreateDirectory(fullPath);

-    fullPath += NName::kDirDelimiter;

-  }

-}

-

-STDMETHODIMP CExtractCallbackImp::GetStream(UInt32 index,

-    ISequentialOutStream **outStream, Int32 askExtractMode)

-{

-  #ifndef _NO_PROGRESS

-  if(ProgressDialog.ProgressSynch.GetStopped())

-    return E_ABORT;

-  #endif

-  _outFileStream.Release();

-  NCOM::CPropVariant propVariantName;

-  RINOK(_archiveHandler->GetProperty(index, kpidPath, &propVariantName));

-  UString fullPath;

-  if(propVariantName.vt == VT_EMPTY)

-    fullPath = _itemDefaultName;

-  else 

-  {

-    if(propVariantName.vt != VT_BSTR)

-      return E_FAIL;

-    fullPath = propVariantName.bstrVal;

-  }

-  _filePath = fullPath;

-

-  // m_CurrentFilePath = GetSystemString(fullPath, _codePage);

-  

-  if(askExtractMode == NArchive::NExtract::NAskMode::kExtract)

-  {

-    NCOM::CPropVariant propVariant;

-    RINOK(_archiveHandler->GetProperty(index, kpidAttributes, &propVariant));

-    if (propVariant.vt == VT_EMPTY)

-      _processedFileInfo.Attributes = _attributesDefault;

-    else

-    {

-      if (propVariant.vt != VT_UI4)

-        return E_FAIL;

-      _processedFileInfo.Attributes = propVariant.ulVal;

-    }

-

-    RINOK(_archiveHandler->GetProperty(index, kpidIsFolder, &propVariant));

-    _processedFileInfo.IsDirectory = VARIANT_BOOLToBool(propVariant.boolVal);

-

-    bool isAnti = false;

-    {

-      NCOM::CPropVariant propVariantTemp;

-      RINOK(_archiveHandler->GetProperty(index, kpidIsAnti, 

-          &propVariantTemp));

-      if (propVariantTemp.vt == VT_BOOL)

-        isAnti = VARIANT_BOOLToBool(propVariantTemp.boolVal);

-    }

-

-    RINOK(_archiveHandler->GetProperty(index, kpidLastWriteTime, &propVariant));

-    switch(propVariant.vt)

-    {

-      case VT_EMPTY:

-        _processedFileInfo.UTCLastWriteTime = _utcLastWriteTimeDefault;

-        break;

-      case VT_FILETIME:

-        _processedFileInfo.UTCLastWriteTime = propVariant.filetime;

-        break;

-      default:

-        return E_FAIL;

-    }

-

-    UStringVector pathParts; 

-    SplitPathToParts(fullPath, pathParts);

-    if(pathParts.IsEmpty())

-      return E_FAIL;

-

-    UString processedPath = fullPath;

-

-    if(!_processedFileInfo.IsDirectory)

-      pathParts.DeleteBack();

-    if (!pathParts.IsEmpty())

-    {

-      if (!isAnti)

-        CreateComplexDirectory(pathParts);

-    }

-

-    UString fullProcessedPath = _directoryPath + processedPath;

-

-    if(_processedFileInfo.IsDirectory)

-    {

-      _diskFilePath = fullProcessedPath;

-

-      if (isAnti)

-        NDirectory::MyRemoveDirectory(_diskFilePath);

-      return S_OK;

-    }

-

-    NFind::CFileInfoW fileInfo;

-    if(NFind::FindFile(fullProcessedPath, fileInfo))

-    {

-      if (!NDirectory::DeleteFileAlways(fullProcessedPath))

-      {

-        _message = kCantDeleteFile;

-        return E_FAIL;

-      }

-    }

-

-    if (!isAnti)

-    {

-      _outFileStreamSpec = new COutFileStream;

-      CMyComPtr<ISequentialOutStream> outStreamLoc(_outFileStreamSpec);

-      if (!_outFileStreamSpec->Create(fullProcessedPath, true))

-      {

-        _message = kCantOpenFile;

-        return E_FAIL;

-      }

-      _outFileStream = outStreamLoc;

-      *outStream = outStreamLoc.Detach();

-    }

-    _diskFilePath = fullProcessedPath;

-  }

-  else

-  {

-    *outStream = NULL;

-  }

-  return S_OK;

-}

-

-STDMETHODIMP CExtractCallbackImp::PrepareOperation(Int32 askExtractMode)

-{

-  _extractMode = false;

-  switch (askExtractMode)

-  {

-    case NArchive::NExtract::NAskMode::kExtract:

-      _extractMode = true;

-      break;

-  }
-  return S_OK;

-}

-

-STDMETHODIMP CExtractCallbackImp::SetOperationResult(Int32 resultEOperationResult)

-{

-  switch(resultEOperationResult)

-  {

-    case NArchive::NExtract::NOperationResult::kOK:

-    {

-      break;

-    }

-    default:

-    {

-      _outFileStream.Release();

-      switch(resultEOperationResult)

-      {

-        case NArchive::NExtract::NOperationResult::kUnSupportedMethod:

-          _message = kUnsupportedMethod;

-          break;

-        case NArchive::NExtract::NOperationResult::kCRCError:

-          _isCorrupt = true;

-          // _message = kCRCFailed;

-          break;

-        case NArchive::NExtract::NOperationResult::kDataError:

-          _isCorrupt = true;

-          // _message = kDataError;

-          break;

-        default:

-          _isCorrupt = true;

-      }

-      return E_FAIL;

-    }

-  }

-  if(_outFileStream != NULL)

-    _outFileStreamSpec->File.SetLastWriteTime(&_processedFileInfo.UTCLastWriteTime);

-  _outFileStream.Release();

-  if (_extractMode)

-    NDirectory::MySetFileAttributes(_diskFilePath, _processedFileInfo.Attributes);

-  return S_OK;

-}

-

diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractCallback.h b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractCallback.h
deleted file mode 100644
index d77ffd74e..000000000
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractCallback.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// ExtractCallback.h

-

-#ifndef __EXTRACTCALLBACK_H

-#define __EXTRACTCALLBACK_H

-

-#include "resource.h"

-

-#include "Common/String.h"

-#include "Windows/ResourceString.h"

-

-#include "../../Archive/IArchive.h"

-

-#include "../../Common/FileStreams.h"

-#include "../../ICoder.h"

-

-#ifndef _NO_PROGRESS

-#include "../../FileManager/Resource/ProgressDialog/ProgressDialog.h"

-#endif

-

-class CExtractCallbackImp: 

-  public IArchiveExtractCallback,

-  public CMyUnknownImp

-{

-public:

-  

-  MY_UNKNOWN_IMP

-

-  // IProgress

-  STDMETHOD(SetTotal)(UInt64 size);

-  STDMETHOD(SetCompleted)(const UInt64 *completeValue);

-

-  // IExtractCallback

-  STDMETHOD(GetStream)(UInt32 index, ISequentialOutStream **outStream, 

-      Int32 askExtractMode);

-  STDMETHOD(PrepareOperation)(Int32 askExtractMode);

-  STDMETHOD(SetOperationResult)(Int32 resultEOperationResult);

-

-private:

-  CMyComPtr<IInArchive> _archiveHandler;

-  UString _directoryPath;

-

-  UString _filePath;

-

-  UString _diskFilePath;

-

-  bool _extractMode;

-  struct CProcessedFileInfo

-  {

-    FILETIME UTCLastWriteTime;

-    bool IsDirectory;

-    UInt32 Attributes;

-  } _processedFileInfo;

-

-  COutFileStream *_outFileStreamSpec;

-  CMyComPtr<ISequentialOutStream> _outFileStream;

-

-  UString _itemDefaultName;

-  FILETIME _utcLastWriteTimeDefault;

-  UInt32 _attributesDefault;

-

-  void CreateComplexDirectory(const UStringVector &dirPathParts);

-public:

-  #ifndef _NO_PROGRESS

-  CProgressDialog ProgressDialog;

-  #endif

-

-  bool _isCorrupt;

-  UString _message;

-

-  void Init(IInArchive *archiveHandler,     

-    const UString &directoryPath, 

-    const UString &itemDefaultName,

-    const FILETIME &utcLastWriteTimeDefault,

-    UInt32 attributesDefault);

-

-  #ifndef _NO_PROGRESS

-  HRESULT StartProgressDialog(const UString &title)

-  {

-    ProgressDialog.Create(title, 0);

-    {

-      #ifdef LANG        

-      ProgressDialog.SetText(LangLoadString(IDS_PROGRESS_EXTRACTING, 0x02000890));

-      #else

-      ProgressDialog.SetText(NWindows::MyLoadStringW(IDS_PROGRESS_EXTRACTING));

-      #endif

-    }

-

-    ProgressDialog.Show(SW_SHOWNORMAL);    

-    return S_OK;

-  }

-  virtual ~CExtractCallbackImp() { ProgressDialog.Destroy(); }

-  #endif

-

-};

-

-#endif

diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractEngine.cpp b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractEngine.cpp
deleted file mode 100644
index 855f7aea9..000000000
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractEngine.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// ExtractEngine.cpp

-

-#include "StdAfx.h"

-

-#include "ExtractEngine.h"

-

-#include "Common/StringConvert.h"

-

-#include "Windows/FileDir.h"

-#include "Windows/FileFind.h"

-#include "Windows/Thread.h"

-

-#include "../../UI/Common/OpenArchive.h"

-

-#include "../../UI/Explorer/MyMessages.h"

-#include "../../FileManager/FormatUtils.h"

-

-#include "ExtractCallback.h"

-

-using namespace NWindows;

-

-struct CThreadExtracting

-{

-  CArchiveLink ArchiveLink;

-

-  CExtractCallbackImp *ExtractCallbackSpec;

-  CMyComPtr<IArchiveExtractCallback> ExtractCallback;

-

-  #ifndef _NO_PROGRESS

-  HRESULT Result;

-

-  HRESULT Extract()

-  {

-    return ArchiveLink.GetArchive()->Extract(0, (UInt32)-1 , BoolToInt(false), ExtractCallback);

-  }

-  DWORD Process()

-  {

-    ExtractCallbackSpec->ProgressDialog.WaitCreating();

-    Result = Extract();

-    ExtractCallbackSpec->ProgressDialog.MyClose();

-    return 0;

-  }

-  static DWORD WINAPI MyThreadFunction(void *param)

-  {

-    return ((CThreadExtracting *)param)->Process();

-  }

-  #endif

-};

-

-static const LPCWSTR kCantFindArchive = L"Can not find archive file";

-static const LPCWSTR kCantOpenArchive = L"File is not correct archive";

-

-HRESULT ExtractArchive(

-    const UString &fileName, 

-    const UString &folderName,

-    COpenCallbackGUI *openCallback,

-    bool showProgress,

-    bool &isCorrupt,

-    UString &errorMessage)

-{

-  isCorrupt = false;

-  NFile::NFind::CFileInfoW archiveFileInfo;

-  if (!NFile::NFind::FindFile(fileName, archiveFileInfo))

-  {

-    errorMessage = kCantFindArchive;

-    return E_FAIL;

-  }

-

-  CThreadExtracting extracter;

-

-  HRESULT result = MyOpenArchive(fileName, extracter.ArchiveLink, openCallback);

-

-  if (result != S_OK)

-  {

-    errorMessage = kCantOpenArchive;

-    return result;

-  }

-

-  UString directoryPath = folderName;

-  NFile::NName::NormalizeDirPathPrefix(directoryPath);

-

-  /*

-  UString directoryPath;

-  {

-    UString fullPath;

-    int fileNamePartStartIndex;

-    if (!NWindows::NFile::NDirectory::MyGetFullPathName(fileName, fullPath, fileNamePartStartIndex))

-    {

-      MessageBox(NULL, "Error 1329484", "7-Zip", 0);

-      return E_FAIL;

-    }

-    directoryPath = fullPath.Left(fileNamePartStartIndex);

-  }

-  */

-

-  if(!NFile::NDirectory::CreateComplexDirectory(directoryPath))

-  {

-    errorMessage = MyFormatNew(IDS_CANNOT_CREATE_FOLDER, 

-        #ifdef LANG        

-        0x02000603, 

-        #endif 

-        directoryPath);

-    return E_FAIL;

-  }

-  

-  extracter.ExtractCallbackSpec = new CExtractCallbackImp;

-  extracter.ExtractCallback = extracter.ExtractCallbackSpec;

-  

-  extracter.ExtractCallbackSpec->Init(

-      extracter.ArchiveLink.GetArchive(), 

-      directoryPath, L"Default", archiveFileInfo.LastWriteTime, 0);

-

-  #ifndef _NO_PROGRESS

-

-  if (showProgress)

-  {

-    CThread thread;

-    if (!thread.Create(CThreadExtracting::MyThreadFunction, &extracter))

-      throw 271824;

-    

-    UString title;

-    #ifdef LANG        

-    title = LangLoadString(IDS_PROGRESS_EXTRACTING, 0x02000890);

-    #else

-    title = NWindows::MyLoadStringW(IDS_PROGRESS_EXTRACTING);

-    #endif

-    extracter.ExtractCallbackSpec->StartProgressDialog(title);

-    result = extracter.Result;

-  }

-  else

-

-  #endif

-  {

-    result = extracter.Extract();

-  }

-  errorMessage = extracter.ExtractCallbackSpec->_message;

-  isCorrupt = extracter.ExtractCallbackSpec->_isCorrupt;

-  return result;

-}

diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractEngine.h b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractEngine.h
deleted file mode 100644
index 609cd7290..000000000
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractEngine.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// ExtractEngine.h

-

-#ifndef __EXTRACTENGINE_H

-#define __EXTRACTENGINE_H

-

-#include "Common/String.h"

-#include "../../UI/GUI/OpenCallbackGUI.h"

-

-HRESULT ExtractArchive(

-    const UString &fileName, 

-    const UString &folderName,

-    COpenCallbackGUI *openCallback,

-    bool showProgress,

-    bool &isCorrupt, 

-    UString &errorMessage);

-

-#endif

diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/Main.cpp b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/Main.cpp
deleted file mode 100644
index 1de7d6893..000000000
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/Main.cpp
+++ /dev/null
@@ -1,561 +0,0 @@
-// Main.cpp

-

-#include "StdAfx.h"

-

-#include <initguid.h>

-

-#include "Common/StringConvert.h"

-#include "Common/Random.h"

-#include "Common/TextConfig.h"

-#include "Common/CommandLineParser.h"

-

-#include "Windows/FileDir.h"

-#include "Windows/FileIO.h"

-#include "Windows/FileFind.h"

-#include "Windows/FileName.h"

-#include "Windows/DLL.h"

-#include "Windows/ResourceString.h"

-

-#include "../../IPassword.h"

-#include "../../ICoder.h"

-#include "../../Archive/IArchive.h"

-#include "../../UI/Explorer/MyMessages.h"

-

-// #include "../../UI/GUI/ExtractGUI.h"

-

-#include "ExtractEngine.h"

-

-#include "resource.h"

-

-using namespace NWindows;

-

-HINSTANCE g_hInstance;

-

-static LPCTSTR kTempDirPrefix = TEXT("7zS"); 

-

-#define _SHELL_EXECUTE

-

-/* BEGIN Mozilla customizations */

-

-static char const *

-FindStrInBuf(char const * buf, size_t bufLen, char const * str)

-{

-  size_t index = 0;

-  while (index < bufLen) {

-    char const * result = strstr(buf + index, str);

-    if (result) {

-      return result;

-    }

-    while ((buf[index] != '\0') && (index < bufLen)) {

-      index++;

-    }

-    index++;

-  }

-  return NULL;

-}

-

-static bool

-ReadPostSigningDataFromView(char const * view, DWORD size, AString& data)

-{

-  // Find the offset and length of the certificate table,

-  // so we know the valid range to look for the token.

-  if (size < (0x3c + sizeof(UInt32))) {

-    return false;

-  }

-  UInt32 PEHeaderOffset = *(UInt32*)(view + 0x3c);

-  UInt32 optionalHeaderOffset = PEHeaderOffset + 24;

-  UInt32 certDirEntryOffset = 0;

-  if (size < (optionalHeaderOffset + sizeof(UInt16))) {

-    return false;

-  }

-  UInt16 magic = *(UInt16*)(view + optionalHeaderOffset);

-  if (magic == 0x010b) {

-    // 32-bit executable

-    certDirEntryOffset = optionalHeaderOffset + 128;

-  } else if (magic == 0x020b) {

-    // 64-bit executable; certain header fields are wider

-    certDirEntryOffset = optionalHeaderOffset + 144;

-  } else {

-    // Unknown executable

-    return false;

-  }

-  if (size < certDirEntryOffset + 8) {

-    return false;

-  }

-  UInt32 certTableOffset = *(UInt32*)(view + certDirEntryOffset);

-  UInt32 certTableLen = *(UInt32*)(view + certDirEntryOffset + sizeof(UInt32));

-  if (certTableOffset == 0 || certTableLen == 0 ||

-      size < (certTableOffset + certTableLen)) {

-    return false;  

-  }

-

-  char const token[] = "__MOZCUSTOM__:";

-  // We're searching for a string inside a binary blob,

-  // so a normal strstr that bails on the first NUL won't work.

-  char const * tokenPos = FindStrInBuf(view + certTableOffset,

-                                       certTableLen, token);

-  if (tokenPos) {

-    size_t tokenLen = (sizeof(token) / sizeof(token[0])) - 1;

-    data = AString(tokenPos + tokenLen);

-    return true;

-  }

-  return false;

-}

-

-static bool

-ReadPostSigningData(UString exePath, AString& data)

-{

-  bool retval = false;

-  HANDLE exeFile = CreateFileW(exePath, GENERIC_READ, FILE_SHARE_READ, NULL,

-                               OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

-  if (exeFile != INVALID_HANDLE_VALUE) {

-    HANDLE mapping = CreateFileMapping(exeFile, NULL, PAGE_READONLY, 0, 0, NULL);

-    if (mapping != INVALID_HANDLE_VALUE) {

-      // MSDN claims the return value on failure is NULL,

-      // but I've also seen it returned on success, so double-check.

-      if (mapping || GetLastError() == ERROR_SUCCESS) {

-        char * view = (char*)MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0);

-        if (view) {

-          DWORD fileSize = GetFileSize(exeFile, NULL);

-          retval = ReadPostSigningDataFromView(view, fileSize, data);

-        }

-        CloseHandle(mapping);

-      }

-    }

-    CloseHandle(exeFile);

-  }

-  return retval;

-}

-

-/* END Mozilla customizations */

-

-

-static bool ReadDataString(LPCWSTR fileName, LPCSTR startID, 

-    LPCSTR endID, AString &stringResult)

-{

-  stringResult.Empty();

-  NFile::NIO::CInFile inFile;

-  if (!inFile.Open(fileName))

-    return false;

-  const int kBufferSize = (1 << 12);

-

-  Byte buffer[kBufferSize];

-  int signatureStartSize = lstrlenA(startID);

-  int signatureEndSize = lstrlenA(endID);

-  

-  UInt32 numBytesPrev = 0;

-  bool writeMode = false;

-  UInt64 posTotal = 0;

-  while(true)

-  {

-    if (posTotal > (1 << 20))

-      return (stringResult.IsEmpty());

-    UInt32 numReadBytes = kBufferSize - numBytesPrev;

-    UInt32 processedSize;

-    if (!inFile.Read(buffer + numBytesPrev, numReadBytes, processedSize))

-      return false;

-    if (processedSize == 0)

-      return true;

-    UInt32 numBytesInBuffer = numBytesPrev + processedSize;

-    UInt32 pos = 0;

-    while (true)

-    { 

-      if (writeMode)

-      {

-        if (pos > numBytesInBuffer - signatureEndSize)

-          break;

-        if (memcmp(buffer + pos, endID, signatureEndSize) == 0)

-          return true;

-        char b = buffer[pos];

-        if (b == 0)

-          return false;

-        stringResult += b;

-        pos++;

-      }

-      else

-      {

-        if (pos > numBytesInBuffer - signatureStartSize)

-          break;

-        if (memcmp(buffer + pos, startID, signatureStartSize) == 0)

-        {

-          writeMode = true;

-          pos += signatureStartSize;

-        }

-        else

-          pos++;

-      }

-    }

-    numBytesPrev = numBytesInBuffer - pos;

-    posTotal += pos;

-    memmove(buffer, buffer + pos, numBytesPrev);

-  }

-}

-

-static char kStartID[] = ",!@Install@!UTF-8!";

-static char kEndID[] = ",!@InstallEnd@!";

-

-class CInstallIDInit

-{

-public:

-  CInstallIDInit()

-  {

-    kStartID[0] = ';';

-    kEndID[0] = ';';

-  };

-} g_CInstallIDInit;

-

-

-class CCurrentDirRestorer

-{

-  CSysString m_CurrentDirectory;

-public:

-  CCurrentDirRestorer()

-    { NFile::NDirectory::MyGetCurrentDirectory(m_CurrentDirectory); }

-  ~CCurrentDirRestorer()

-    { RestoreDirectory();}

-  bool RestoreDirectory()

-    { return BOOLToBool(::SetCurrentDirectory(m_CurrentDirectory)); }

-};

-

-#ifndef _UNICODE

-bool g_IsNT = false;

-static inline bool IsItWindowsNT()

-{

-  OSVERSIONINFO versionInfo;

-  versionInfo.dwOSVersionInfoSize = sizeof(versionInfo);

-  if (!::GetVersionEx(&versionInfo)) 

-    return false;

-  return (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT);

-}

-#endif

-

-// Delayed load libraries are loaded when the first symbol is used.

-// The following ensures that we load the delayed loaded libraries from the

-// system directory.

-struct AutoLoadSystemDependencies

-{

-  AutoLoadSystemDependencies()

-  {

-    HMODULE module = ::GetModuleHandleW(L"kernel32.dll");

-    if (module) {

-      // SetDefaultDllDirectories is always available on Windows 8 and above. It

-      // is also available on Windows Vista, Windows Server 2008, and

-      // Windows 7 when MS KB2533623 has been applied.

-      typedef BOOL (WINAPI *SetDefaultDllDirectoriesType)(DWORD);

-      SetDefaultDllDirectoriesType setDefaultDllDirectories =

-        (SetDefaultDllDirectoriesType) GetProcAddress(module, "SetDefaultDllDirectories");

-      if (setDefaultDllDirectories) {

-        setDefaultDllDirectories(0x0800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );

-        return;

-      }

-    }

-

-    static LPCWSTR delayDLLs[] = { L"dwmapi.dll", L"cryptbase.dll",

-                                   L"SHCore.dll", L"uxtheme.dll",

-                                   L"oleacc.dll", L"apphelp.dll" };

-    WCHAR systemDirectory[MAX_PATH + 1] = { L'\0' };

-    // If GetSystemDirectory fails we accept that we'll load the DLLs from the

-    // normal search path.

-    GetSystemDirectoryW(systemDirectory, MAX_PATH + 1);

-    size_t systemDirLen = wcslen(systemDirectory);

-

-    // Make the system directory path terminate with a slash

-    if (systemDirectory[systemDirLen - 1] != L'\\' && systemDirLen) {

-      systemDirectory[systemDirLen] = L'\\';

-      ++systemDirLen;

-      // No need to re-NULL terminate

-    }

-

-    // For each known DLL ensure it is loaded from the system32 directory

-    for (size_t i = 0; i < sizeof(delayDLLs) / sizeof(delayDLLs[0]); ++i) {

-      size_t fileLen = wcslen(delayDLLs[i]);

-      wcsncpy(systemDirectory + systemDirLen, delayDLLs[i],

-      MAX_PATH - systemDirLen);

-      if (systemDirLen + fileLen <= MAX_PATH) {

-        systemDirectory[systemDirLen + fileLen] = L'\0';

-      } else {

-        systemDirectory[MAX_PATH] = L'\0';

-      }

-      LPCWSTR fullModulePath = systemDirectory; // just for code readability

-      LoadLibraryW(fullModulePath);

-    }

-  }

-} loadDLLs;

-

-BOOL

-RemoveCurrentDirFromSearchPath()

-{

-  // kernel32.dll is in the knownDLL list so it is safe to load without a full path

-  HMODULE kernel32 = LoadLibraryW(L"kernel32.dll");

-  if (!kernel32) {

-    return FALSE;

-  }

-

-  typedef BOOL (WINAPI *SetDllDirectoryType)(LPCWSTR);

-  SetDllDirectoryType SetDllDirectoryFn =

-    (SetDllDirectoryType)GetProcAddress(kernel32, "SetDllDirectoryW");

-  if (!SetDllDirectoryFn) {

-    FreeLibrary(kernel32);

-    return FALSE;

-  }

-

-  // If this call fails we can't do much about it, so ignore it.

-  // It is unlikely to fail and this is just a precaution anyway.

-  SetDllDirectoryFn(L"");

-  FreeLibrary(kernel32);

-  return TRUE;

-}

-

-int APIENTRY WinMain(

-  HINSTANCE hInstance,

-  HINSTANCE hPrevInstance,

-  LPSTR lpCmdLine,

-  int nCmdShow)

-{

-  // Disable current directory from being in the search path.

-  // This call does not help with implicitly loaded DLLs.

-  if (!RemoveCurrentDirFromSearchPath()) {

-    WCHAR minOSTitle[512] = { '\0' };

-    WCHAR minOSText[512] = { '\0' };

-    LoadStringW(NULL, IDS_MIN_OS_TITLE, minOSTitle,

-                sizeof(minOSTitle) / sizeof(minOSTitle[0]));

-    LoadStringW(NULL, IDS_MIN_OS_TEXT, minOSText,

-                sizeof(minOSText) / sizeof(minOSText[0]));

-    MessageBoxW(NULL, minOSText, minOSTitle, MB_OK | MB_ICONERROR);

-    return 1;

-  }

-

-  g_hInstance = (HINSTANCE)hInstance;

-  #ifndef _UNICODE

-  g_IsNT = IsItWindowsNT();

-  #endif

-  InitCommonControls();

-

-  UString archiveName, switches;

-  #ifdef _SHELL_EXECUTE

-  UString executeFile, executeParameters;

-  #endif

-  NCommandLineParser::SplitCommandLine(GetCommandLineW(), archiveName, switches);

-

-  UString fullPath;

-  NDLL::MyGetModuleFileName(g_hInstance, fullPath);

-

-  switches.Trim();

-  bool assumeYes = false;

-  if (switches.Left(2).CompareNoCase(UString(L"-y")) == 0)

-  {

-    assumeYes = true;

-    switches = switches.Mid(2);

-    switches.Trim();

-  }

-

-  /* BEGIN Mozilla customizations */

-  bool showProgress = true;

-  bool extractOnly = false;

-  if (switches.Left(3).CompareNoCase(UString(L"-ms")) == 0 ||

-      switches.Left(4).CompareNoCase(UString(L"/ini")) == 0 ||

-      switches.Left(2).CompareNoCase(UString(L"/s")) == 0) {

-    showProgress = false;

-  } else if (switches.Left(12).CompareNoCase(UString(L"/extractdir=")) == 0) {

-    assumeYes = true;

-    showProgress = false;

-    extractOnly = true;

-  }

-  /* END Mozilla customizations */

-

-  AString config;

-  if (!ReadDataString(fullPath, kStartID, kEndID, config))

-  {

-    if (!assumeYes)

-      MyMessageBox(L"Can't load config info");

-    return 1;

-  }

-

-  UString dirPrefix = L".\\";

-  UString appLaunched;

-  if (!config.IsEmpty())

-  {

-    CObjectVector<CTextConfigPair> pairs;

-    if (!GetTextConfig(config, pairs))

-    {

-      if (!assumeYes)

-        MyMessageBox(L"Config failed");

-      return 1;

-    }

-    UString friendlyName = GetTextConfigValue(pairs, L"Title");

-    UString installPrompt = GetTextConfigValue(pairs, L"BeginPrompt");

-    UString progress = GetTextConfigValue(pairs, L"Progress");

-    if (progress.CompareNoCase(L"no") == 0)

-      showProgress = false;

-    int index = FindTextConfigItem(pairs, L"Directory");

-    if (index >= 0)

-      dirPrefix = pairs[index].String;

-    if (!installPrompt.IsEmpty() && !assumeYes)

-    {

-      if (MessageBoxW(0, installPrompt, friendlyName, MB_YESNO | 

-          MB_ICONQUESTION) != IDYES)

-        return 0;

-    }

-    appLaunched = GetTextConfigValue(pairs, L"RunProgram");

-    

-    #ifdef _SHELL_EXECUTE

-    executeFile = GetTextConfigValue(pairs, L"ExecuteFile");

-    executeParameters = GetTextConfigValue(pairs, L"ExecuteParameters") + switches;

-    #endif

-  }

-

-  NFile::NDirectory::CTempDirectory tempDir;

-  /* Mozilla customizations - Added !extractOnly */

-  if (!extractOnly && !tempDir.Create(kTempDirPrefix))

-  {

-    if (!assumeYes)

-      MyMessageBox(L"Can not create temp folder archive");

-    return 1;

-  }

-

-  /* BEGIN Mozilla customizations */

-  UString tempDirPath = (extractOnly ? switches.Mid(12) : GetUnicodeString(tempDir.GetPath()));

-  /* END Mozilla customizations */

-

-  COpenCallbackGUI openCallback;

-

-  bool isCorrupt = false;

-  UString errorMessage;

-  HRESULT result = ExtractArchive(fullPath, tempDirPath, &openCallback, showProgress, 

-      isCorrupt, errorMessage);

-

-  if (result != S_OK)

-  {

-    if (!assumeYes)

-    {

-      if (result == S_FALSE || isCorrupt)

-      {

-        errorMessage = NWindows::MyLoadStringW(IDS_EXTRACTION_ERROR_MESSAGE);

-        result = E_FAIL;

-      }

-      if (result != E_ABORT && !errorMessage.IsEmpty())

-        ::MessageBoxW(0, errorMessage, NWindows::MyLoadStringW(IDS_EXTRACTION_ERROR_TITLE), MB_ICONERROR);

-    }

-    return 1;

-  }

-

-  /* BEGIN Mozilla customizations */

-  // Retrieve and store any data added to this file after signing.

-  {

-    AString postSigningData;

-    if (ReadPostSigningData(fullPath, postSigningData)) {

-      NFile::NName::CParsedPath postSigningDataFilePath;

-      postSigningDataFilePath.ParsePath(tempDirPath);

-      postSigningDataFilePath.PathParts.Add(L"postSigningData");

-

-      NFile::NIO::COutFile postSigningDataFile;

-      postSigningDataFile.Create(postSigningDataFilePath.MergePath(), true);

-

-      UInt32 written = 0;

-      postSigningDataFile.Write(postSigningData, postSigningData.Length(), written);

-    }

-  }

-

-  if (extractOnly) {

-    return 0;

-  }

-  /* END Mozilla customizations */

-

-  CCurrentDirRestorer currentDirRestorer;

-

-  if (!SetCurrentDirectory(tempDir.GetPath()))

-    return 1;

-  

-  HANDLE hProcess = 0;

-#ifdef _SHELL_EXECUTE

-  if (!executeFile.IsEmpty())

-  {

-    CSysString filePath = GetSystemString(executeFile);

-    SHELLEXECUTEINFO execInfo;

-    execInfo.cbSize = sizeof(execInfo);

-    execInfo.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_DDEWAIT;

-    execInfo.hwnd = NULL;

-    execInfo.lpVerb = NULL;

-    execInfo.lpFile = filePath;

-

-    if (!switches.IsEmpty())

-      executeParameters += switches;

-

-    CSysString parametersSys = GetSystemString(executeParameters);

-    if (parametersSys.IsEmpty())

-      execInfo.lpParameters = NULL;

-    else

-      execInfo.lpParameters = parametersSys;

-

-    execInfo.lpDirectory = NULL;

-    execInfo.nShow = SW_SHOWNORMAL;

-    execInfo.hProcess = 0;

-    bool success = BOOLToBool(::ShellExecuteEx(&execInfo));

-    result = (UINT32)execInfo.hInstApp;

-    if(result <= 32)

-    {

-      if (!assumeYes)

-        MyMessageBox(L"Can not open file");

-      return 1;

-    }

-    hProcess = execInfo.hProcess;

-  }

-  else

-#endif

-  {

-    if (appLaunched.IsEmpty())

-    {

-      appLaunched = L"setup.exe";

-      if (!NFile::NFind::DoesFileExist(GetSystemString(appLaunched)))

-      {

-        if (!assumeYes)

-          MyMessageBox(L"Can not find setup.exe");

-        return 1;

-      }

-    }

-    

-    {

-      UString s2 = tempDirPath;

-      NFile::NName::NormalizeDirPathPrefix(s2);

-      appLaunched.Replace(L"%%T\\", s2);

-    }

-    

-    appLaunched.Replace(L"%%T", tempDirPath);

-

-    if (!switches.IsEmpty())

-    {

-      appLaunched += L' ';

-      appLaunched += switches;

-    }

-    STARTUPINFO startupInfo;

-    startupInfo.cb = sizeof(startupInfo);

-    startupInfo.lpReserved = 0;

-    startupInfo.lpDesktop = 0;

-    startupInfo.lpTitle = 0;

-    startupInfo.dwFlags = 0;

-    startupInfo.cbReserved2 = 0;

-    startupInfo.lpReserved2 = 0;

-    

-    PROCESS_INFORMATION processInformation;

-    

-    CSysString appLaunchedSys = GetSystemString(dirPrefix + appLaunched);

-    

-    BOOL createResult = CreateProcess(NULL, (LPTSTR)(LPCTSTR)appLaunchedSys, 

-      NULL, NULL, FALSE, 0, NULL, NULL /*tempDir.GetPath() */, 

-      &startupInfo, &processInformation);

-    if (createResult == 0)

-    {

-      if (!assumeYes)

-        ShowLastErrorMessage();

-      return 1;

-    }

-    ::CloseHandle(processInformation.hThread);

-    hProcess = processInformation.hProcess;

-  }

-  if (hProcess != 0)

-  {

-    WaitForSingleObject(hProcess, INFINITE);

-    ::CloseHandle(hProcess);

-  }

-  return 0;

-}

diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/SFXSetup-moz.dsp b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/SFXSetup-moz.dsp
deleted file mode 100644
index e9ff6ad48..000000000
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/SFXSetup-moz.dsp
+++ /dev/null
@@ -1,696 +0,0 @@
-# Microsoft Developer Studio Project File - Name="SFXSetup-moz" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Application" 0x0101

-

-CFG=SFXSetup-moz - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "SFXSetup-moz.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "SFXSetup-moz.mak" CFG="SFXSetup-moz - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "SFXSetup-moz - Win32 Release" (based on "Win32 (x86) Application")

-!MESSAGE "SFXSetup-moz - Win32 Debug" (based on "Win32 (x86) Application")

-!MESSAGE "SFXSetup-moz - Win32 ReleaseD" (based on "Win32 (x86) Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "SFXSetup-moz - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "_SFX" /D "_NO_CRYPTO" /Yu"StdAfx.h" /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x419 /d "NDEBUG"

-# ADD RSC /l 0x419 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386

-# ADD LINK32 comctl32.lib kernel32.lib user32.lib shell32.lib oleaut32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /out:"C:\Util\7zS.sfx" /delayload:comctl32.dll /delayload:user32.dll /delayload:shell32.dll /delayload:oleaut32.dll /opt:NOWIN98

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "SFXSetup-moz - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /Gz /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "_SFX" /D "_NO_CRYPTO" /Yu"StdAfx.h" /FD /GZ /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x419 /d "_DEBUG"

-# ADD RSC /l 0x419 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 comctl32.lib kernel32.lib user32.lib shell32.lib oleaut32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /out:"C:\UTIL\7zSfxS.exe" /pdbtype:sept /delayload:comctl32.dll /delayload:user32.dll /delayload:shell32.dll /delayload:oleaut32.dll

-

-!ELSEIF  "$(CFG)" == "SFXSetup-moz - Win32 ReleaseD"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "ReleaseD"

-# PROP BASE Intermediate_Dir "ReleaseD"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "ReleaseD"

-# PROP Intermediate_Dir "ReleaseD"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "_SFX" /Yu"StdAfx.h" /FD /c

-# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "_SFX" /D "_NO_CRYPTO" /Yu"StdAfx.h" /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x419 /d "NDEBUG"

-# ADD RSC /l 0x419 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /out:"C:\UTIL\7zWinSR.exe"

-# SUBTRACT BASE LINK32 /debug /nodefaultlib

-# ADD LINK32 comctl32.lib kernel32.lib user32.lib shell32.lib oleaut32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /out:"ReleaseD\7zSD.sfx" /delayload:comctl32.dll /delayload:user32.dll /delayload:shell32.dll /delayload:oleaut32.dll /opt:NOWIN98

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "SFXSetup-moz - Win32 Release"

-# Name "SFXSetup-moz - Win32 Debug"

-# Name "SFXSetup-moz - Win32 ReleaseD"

-# Begin Group "Spec"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\resource.rc

-# End Source File

-# Begin Source File

-

-SOURCE=.\StdAfx.cpp

-# ADD CPP /Yc"StdAfx.h"

-# End Source File

-# Begin Source File

-

-SOURCE=.\StdAfx.h

-# End Source File

-# End Group

-# Begin Group "Interface"

-

-# PROP Default_Filter ""

-# End Group

-# Begin Group "7z"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zDecode.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zDecode.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zExtract.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zFolderOutStream.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zFolderOutStream.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zHandler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zHandler.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zHeader.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zHeader.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zIn.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zIn.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zItem.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zMethodID.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\7z\7zMethodID.h

-# End Source File

-# End Group

-# Begin Group "Archive Common"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\Archive\Common\CoderMixer2.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\Common\CoderMixer2.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\Common\CoderMixer2MT.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\Common\CoderMixer2MT.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\Common\CrossThreadProgress.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\Common\CrossThreadProgress.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\Common\FilterCoder.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\Common\FilterCoder.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\Common\ItemNameUtils.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\Common\ItemNameUtils.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\Common\OutStreamWithCRC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Archive\Common\OutStreamWithCRC.h

-# End Source File

-# End Group

-# Begin Group "Compress"

-

-# PROP Default_Filter ""

-# Begin Group "LZMA"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\Compress\LZMA\LZMADecoder.cpp

-# End Source File

-# End Group

-# Begin Group "Branch"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\Compress\Branch\BranchCoder.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Compress\Branch\BranchCoder.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Compress\Branch\x86.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Compress\Branch\x86_2.cpp

-# End Source File

-# End Group

-# Begin Group "Copy"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\Compress\Copy\CopyCoder.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Compress\Copy\CopyCoder.h

-# End Source File

-# End Group

-# Begin Group "LZ"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\Compress\LZ\LZOutWindow.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Compress\LZ\LZOutWindow.h

-# End Source File

-# End Group

-# End Group

-# Begin Group "SDK"

-

-# PROP Default_Filter ""

-# End Group

-# Begin Group "Common"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\..\Common\Alloc.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\Alloc.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\CommandLineParser.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\CommandLineParser.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\CRC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\CRC.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\IntToString.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\IntToString.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\NewHandler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\NewHandler.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\String.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\String.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\StringConvert.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\StringConvert.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\TextConfig.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\TextConfig.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\UTFConvert.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\UTFConvert.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\Vector.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\Vector.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\Wildcard.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Common\Wildcard.h

-# End Source File

-# End Group

-# Begin Group "Windows"

-

-# PROP Default_Filter ""

-# Begin Group "Control"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\..\Windows\Control\Dialog.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\Control\Dialog.h

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=..\..\..\Windows\DLL.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\DLL.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\Error.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\Error.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\FileDir.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\FileDir.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\FileFind.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\FileFind.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\FileIO.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\FileIO.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\FileName.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\FileName.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\PropVariant.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\PropVariant.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\ResourceString.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\ResourceString.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\Synchronization.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\Synchronization.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\Window.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\..\Windows\Window.h

-# End Source File

-# End Group

-# Begin Group "7z Common"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\Common\FileStreams.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\FileStreams.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\InBuffer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\InBuffer.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\LimitedStreams.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\LimitedStreams.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\LockedStream.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\LockedStream.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\OutBuffer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\OutBuffer.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\ProgressUtils.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\ProgressUtils.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\StreamBinder.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\StreamBinder.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\StreamObjects.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\StreamObjects.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\StreamUtils.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\Common\StreamUtils.h

-# End Source File

-# End Group

-# Begin Group "UI"

-

-# PROP Default_Filter ""

-# Begin Group "Explorer"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\UI\Explorer\MyMessages.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\UI\Explorer\MyMessages.h

-# End Source File

-# End Group

-# Begin Group "UI Common"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\UI\Common\ArchiveOpenCallback.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\UI\Common\ArchiveOpenCallback.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\UI\Common\ArchiverInfo.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\UI\Common\ArchiverInfo.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\UI\Common\DefaultName.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\UI\Common\DefaultName.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\UI\Common\ExtractMode.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\UI\Common\OpenArchive.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\UI\Common\OpenArchive.h

-# End Source File

-# End Group

-# Begin Group "GUI"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\UI\GUI\OpenCallbackGUI.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\UI\GUI\OpenCallbackGUI.h

-# End Source File

-# End Group

-# End Group

-# Begin Group "File Manager"

-

-# PROP Default_Filter ""

-# Begin Group "Dialog"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\..\FileManager\Resource\ProgressDialog\ProgressDialog.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\FileManager\Resource\ProgressDialog\ProgressDialog.h

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=..\..\FileManager\FormatUtils.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\FileManager\FormatUtils.h

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=.\ExtractCallback.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ExtractCallback.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ExtractEngine.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ExtractEngine.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Main.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\setup.ico

-# End Source File

-# End Target

-# End Project

diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/SFXSetup-moz.dsw b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/SFXSetup-moz.dsw
deleted file mode 100644
index 2b6b8243c..000000000
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/SFXSetup-moz.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "SFXSetup-moz"=.\SFXSetup-moz.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/StdAfx.cpp b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/StdAfx.cpp
deleted file mode 100644
index c6d3b1fa6..000000000
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/StdAfx.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// StdAfx.cpp

-

-#include "StdAfx.h"

diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/StdAfx.h b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/StdAfx.h
deleted file mode 100644
index 85536206d..000000000
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/StdAfx.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// StdAfx.h

-

-#ifndef __STDAFX_H

-#define __STDAFX_H

-

-#include "../../../Common/MyWindows.h"

-#include "../../../Common/NewHandler.h"

-#include <commctrl.h>

-

-#endif

diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/makefile b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/makefile
deleted file mode 100644
index 89cae1d5b..000000000
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/makefile
+++ /dev/null
@@ -1,156 +0,0 @@
-PROG = 7zS.sfx

-LIBS = $(LIBS) user32.lib oleaut32.lib shell32.lib ole32.lib comctl32.lib

-CFLAGS = $(CFLAGS) -I ../../../ \

-  -DEXCLUDE_COM \

-  -DNO_REGISTRY \

-  -DEXTRACT_ONLY \

-  -D_SFX \

-  -DFORMAT_7Z \

-  -DCOMPRESS_BCJ_X86 \

-  -DCOMPRESS_BCJ2 \

-  -DCOMPRESS_COPY \

-  -DCOMPRESS_LZMA \

-  -D_NO_CRYPTO

-

-SFX_WIN_OBJS = \

-  $O\Main.obj \

-  $O\ExtractCallback.obj \

-  $O\ExtractEngine.obj \

-

-GUI_OBJS = \

-  $O\OpenCallbackGUI.obj \

-

-COMMON_OBJS = \

-  $O\Alloc.obj \

-  $O\CommandLineParser.obj \

-  $O\CRC.obj \

-  $O\IntToString.obj \

-  $O\NewHandler.obj \

-  $O\String.obj \

-  $O\StringConvert.obj \

-  $O\TextConfig.obj \

-  $O\UTFConvert.obj \

-  $O\Vector.obj \

-  $O\Wildcard.obj \

-

-WIN_OBJS = \

-  $O\DLL.obj \

-  $O\Error.obj \

-  $O\FileDir.obj \

-  $O\FileFind.obj \

-  $O\FileIO.obj \

-  $O\FileName.obj \

-  $O\PropVariant.obj \

-  $O\ResourceString.obj \

-  $O\Synchronization.obj \

-  $O\Window.obj \

-

-WIN_CTRL_OBJS = \

-  $O\Dialog.obj \

-

-7ZIP_COMMON_OBJS = \

-  $O\FileStreams.obj \

-  $O\InBuffer.obj \

-  $O\LimitedStreams.obj \

-  $O\LockedStream.obj \

-  $O\OutBuffer.obj \

-  $O\ProgressUtils.obj \

-  $O\StreamBinder.obj \

-  $O\StreamObjects.obj \

-  $O\StreamUtils.obj \

-

-UI_COMMON_OBJS = \

-  $O\ArchiveOpenCallback.obj \

-  $O\ArchiverInfo.obj \

-  $O\DefaultName.obj \

-  $O\OpenArchive.obj \

-

-FM_OBJS = \

-  $O\FormatUtils.obj \

-

-AR_COMMON_OBJS = \

-  $O\CoderMixer2.obj \

-  $O\CoderMixer2MT.obj \

-  $O\CrossThreadProgress.obj \

-  $O\FilterCoder.obj \

-  $O\ItemNameUtils.obj \

-  $O\OutStreamWithCRC.obj \

-

-7Z_OBJS = \

-  $O\7zDecode.obj \

-  $O\7zExtract.obj \

-  $O\7zFolderOutStream.obj \

-  $O\7zHandler.obj \

-  $O\7zHeader.obj \

-  $O\7zIn.obj \

-  $O\7zMethodID.obj \

-

-BRANCH_OPT_OBJS = \

-  $O\BranchCoder.obj \

-  $O\x86.obj \

-  $O\x86_2.obj \

-

-LZ_OBJS = \

-  $O\LZOutWindow.obj \

-

-LZMA_OPT_OBJS = \

-  $O\LZMADecoder.obj \

-

-OBJS = \

-  $O\StdAfx.obj \

-  $(SFX_WIN_OBJS) \

-  $(GUI_OBJS) \

-  $(COMMON_OBJS) \

-  $(WIN_OBJS) \

-  $(WIN_CTRL_OBJS) \

-  $(7ZIP_COMMON_OBJS) \

-  $(UI_COMMON_OBJS) \

-  $(FM_OBJS)\

-  $(AR_COMMON_OBJS) \

-  $(7Z_OBJS) \

-  $(BRANCH_OPT_OBJS) \

-  $(LZ_OBJS) \

-  $(LZMA_OPT_OBJS) \

-  $O\CopyCoder.obj \

-  $O\MyMessages.obj \

-  $O\ProgressDialog.obj \

-  $O\resource.res

-

-

-!include "../../../Build.mak"

-

-$(SFX_WIN_OBJS): $(*B).cpp

-	$(COMPL)

-

-$(GUI_OBJS): ../../UI/GUI/$(*B).cpp

-	$(COMPL)

-$(COMMON_OBJS): ../../../Common/$(*B).cpp

-	$(COMPL)

-$(WIN_OBJS): ../../../Windows/$(*B).cpp

-	$(COMPL)

-$(WIN_CTRL_OBJS): ../../../Windows/Control/$(*B).cpp

-	$(COMPL)

-$(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp

-	$(COMPL)

-$(UI_COMMON_OBJS): ../../UI/Common/$(*B).cpp

-	$(COMPL)

-$(FM_OBJS): ../../FileManager/$(*B).cpp

-	$(COMPL)

-$(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp

-	$(COMPL)

-

-$(7Z_OBJS): ../../Archive/7z/$(*B).cpp

-	$(COMPL)

-$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp

-	$(COMPL)

-$(LZ_OBJS): ../../Compress/LZ/$(*B).cpp

-	$(COMPL)

-$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp

-	$(COMPL)

-

-$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp

-	$(COMPL)

-$O\MyMessages.obj: ../../UI/Explorer/MyMessages.cpp

-	$(COMPL)

-$O\ProgressDialog.obj: ../../FileManager/Resource/ProgressDialog/$(*B).cpp

-	$(COMPL)

diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/resource.h b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/resource.h
deleted file mode 100644
index 9d58c410d..000000000
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/resource.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#define IDI_ICON3                       159

-

-#define IDS_EXTRACTION_ERROR_TITLE      7

-#define IDS_EXTRACTION_ERROR_MESSAGE    8

-#define IDS_CANNOT_CREATE_FOLDER        9

-#define IDS_PROGRESS_EXTRACTING         69

-#define IDS_MIN_OS_TITLE               70

-#define IDS_MIN_OS_TEXT                71

diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/resource.rc b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/resource.rc
deleted file mode 100644
index ff1e2347c..000000000
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/resource.rc
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "../../MyVersionInfo.rc"

-#include "resource.h"

-

-MY_VERSION_INFO_APP("7z Setup SFX", "7zS.sfx")

-

-IDI_ICON3  ICON "setup.ico"

-

-STRINGTABLE

-BEGIN

-  IDS_EXTRACTION_ERROR_TITLE "Extraction Failed"

-  IDS_EXTRACTION_ERROR_MESSAGE "File is corrupt"

-  IDS_CANNOT_CREATE_FOLDER "Cannot create folder '{0}'"

-  IDS_PROGRESS_EXTRACTING "Extracting"

-  IDS_MIN_OS_TITLE "Setup Error"

-  IDS_MIN_OS_TEXT "Microsoft Windows XP SP2 or newer is required."

-END

-

-#include "../../FileManager/Resource/ProgressDialog/resource.rc"

diff --git a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/setup.ico b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/setup.ico
deleted file mode 100644
index 9801fed54..000000000
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/setup.ico
+++ /dev/null