Update the 7z installer stub source to 18.05.

Tag #1022

31 files changed, 0 insertions, 3855 deletions

diff --git a/other-licenses/7zstub/src/Windows/COM.cpp b/other-licenses/7zstub/src/Windows/COM.cpp
deleted file mode 100644
index f7ed066ae..000000000
--- a/other-licenses/7zstub/src/Windows/COM.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// Windows/COM.cpp

-

-#include "StdAfx.h"

-

-#include "Windows/COM.h"

-#include "Common/StringConvert.h"

-

-namespace NWindows {

-namespace NCOM {

-

-// CoInitialize (NULL); must be called!

-

-UString GUIDToStringW(REFGUID guid)

-{

-  UString string;

-  const int kStringSize = 48;

-  StringFromGUID2(guid, string.GetBuffer(kStringSize), kStringSize);

-  string.ReleaseBuffer();

-  return string;

-}

-

-AString GUIDToStringA(REFGUID guid)

-{

-  return UnicodeStringToMultiByte(GUIDToStringW(guid));

-}

-

-HRESULT StringToGUIDW(const wchar_t *string, GUID &classID)

-{

-  return CLSIDFromString((wchar_t *)string, &classID);

-}

-

-HRESULT StringToGUIDA(const char *string, GUID &classID)

-{

-  return StringToGUIDW(MultiByteToUnicodeString(string), classID);

-}

-

-}}
\ No newline at end of file
diff --git a/other-licenses/7zstub/src/Windows/COM.h b/other-licenses/7zstub/src/Windows/COM.h
deleted file mode 100644
index b0890c6c4..000000000
--- a/other-licenses/7zstub/src/Windows/COM.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Windows/COM.h

-

-#ifndef __WINDOWS_COM_H

-#define __WINDOWS_COM_H

-

-#include "Common/String.h"

-

-namespace NWindows {

-namespace NCOM {

-

-class CComInitializer

-{

-public:

-  CComInitializer() { CoInitialize(NULL);};

-  ~CComInitializer() { CoUninitialize(); };

-};

-

-class CStgMedium

-{

-  STGMEDIUM _object;

-public:

-  bool _mustBeReleased;

-  CStgMedium(): _mustBeReleased(false) {}

-  ~CStgMedium() { Free(); }

-  void Free() 

-  { 

-    if(_mustBeReleased) 

-      ReleaseStgMedium(&_object); 

-    _mustBeReleased = false;

-  }

-  const STGMEDIUM* operator->() const { return &_object;}

-  STGMEDIUM* operator->() { return &_object;}

-  STGMEDIUM* operator&() { return &_object; }

-};

-

-//////////////////////////////////

-// GUID <--> String Conversions

-UString GUIDToStringW(REFGUID guid);

-AString GUIDToStringA(REFGUID guid);

-#ifdef UNICODE

-  #define GUIDToString GUIDToStringW

-#else

-  #define GUIDToString GUIDToStringA

-#endif // !UNICODE

-

-HRESULT StringToGUIDW(const wchar_t *string, GUID &classID);

-HRESULT StringToGUIDA(const char *string, GUID &classID);

-#ifdef UNICODE

-  #define StringToGUID StringToGUIDW

-#else

-  #define StringToGUID StringToGUIDA

-#endif // !UNICODE

-

-  

-}}

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/Control/Dialog.cpp b/other-licenses/7zstub/src/Windows/Control/Dialog.cpp
deleted file mode 100644
index 9d9891f51..000000000
--- a/other-licenses/7zstub/src/Windows/Control/Dialog.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// Windows/Control/Dialog.cpp

-

-#include "StdAfx.h"

-

-#ifndef _UNICODE

-#include "Common/StringConvert.h"

-#endif

-#include "Windows/Control/Dialog.h"

-

-extern HINSTANCE g_hInstance;

-#ifndef _UNICODE

-extern bool g_IsNT;

-#endif

-

-namespace NWindows {

-namespace NControl {

-

-static INT_PTR APIENTRY DialogProcedure(HWND dialogHWND, UINT message, 

-    WPARAM wParam, LPARAM lParam)

-{

-  CWindow dialogTmp(dialogHWND);

-  if (message == WM_INITDIALOG)

-    dialogTmp.SetUserDataLongPtr(lParam);

-  CDialog *dialog = (CDialog *)(dialogTmp.GetUserDataLongPtr());

-  if (dialog == NULL)

-    return FALSE;

-  if (message == WM_INITDIALOG)

-    dialog->Attach(dialogHWND);

-

-  return BoolToBOOL(dialog->OnMessage(message, wParam, lParam));

-}

-

-bool CDialog::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)

-{

-  switch (message)

-  {

-    case WM_INITDIALOG:

-      return OnInit();

-    case WM_COMMAND:

-      return OnCommand(wParam, lParam);

-    case WM_NOTIFY:

-      return OnNotify(wParam, (LPNMHDR) lParam);

-    case WM_HELP:

-      {

-        OnHelp((LPHELPINFO)lParam);

-        return true;

-      }

-    case WM_TIMER:

-      {

-        return OnTimer(wParam, lParam);

-      }

-    default:

-      return false;

-  }

-}

-

-bool CDialog::OnCommand(WPARAM wParam, LPARAM lParam) 

-{ 

-  return OnCommand(HIWORD(wParam), LOWORD(wParam), lParam);

-}

-

-bool CDialog::OnCommand(int code, int itemID, LPARAM lParam)

-{

-  if (code == BN_CLICKED)

-    return OnButtonClicked(itemID, (HWND)lParam);

-  return false; 

-}

-

-bool CDialog::OnButtonClicked(int buttonID, HWND buttonHWND) 

-{ 

-  switch(buttonID)

-  {

-    case IDOK:

-      OnOK();

-      break;

-    case IDCANCEL:

-      OnCancel();

-      break;

-    case IDHELP:

-      OnHelp();

-      break;

-    default:

-      return false;

-  }

-  return true;

-}

-

-bool CModelessDialog::Create(LPCTSTR templateName, HWND parentWindow)

-{ 

-  HWND aHWND = CreateDialogParam(g_hInstance, templateName, parentWindow, DialogProcedure, (LPARAM)this);

-  if (aHWND == 0)

-    return false;

-  Attach(aHWND);

-  return true;

-}

-

-INT_PTR CModalDialog::Create(LPCTSTR templateName, HWND parentWindow)

-{ 

-  return DialogBoxParam(g_hInstance, templateName, parentWindow, DialogProcedure, (LPARAM)this);

-}

-

-#ifndef _UNICODE

-

-bool CModelessDialog::Create(LPCWSTR templateName, HWND parentWindow)

-{ 

-  HWND aHWND;

-  if (g_IsNT)

-    aHWND = CreateDialogParamW(g_hInstance, templateName, parentWindow, DialogProcedure, (LPARAM)this);

-  else

-  {

-    AString name;

-    LPCSTR templateNameA;

-    if (IS_INTRESOURCE(templateName))

-      templateNameA = (LPCSTR)templateName;

-    else

-    {

-      name = GetSystemString(templateName);

-      templateNameA = name;

-    }

-    aHWND = CreateDialogParamA(g_hInstance, templateNameA, parentWindow, DialogProcedure, (LPARAM)this);

-  }

-  if (aHWND == 0)

-    return false;

-  Attach(aHWND);

-  return true;

-}

-

-INT_PTR CModalDialog::Create(LPCWSTR templateName, HWND parentWindow)

-{ 

-  if (g_IsNT)

-    return DialogBoxParamW(g_hInstance, templateName, parentWindow, DialogProcedure, (LPARAM)this);

-  AString name;

-  LPCSTR templateNameA;

-  if (IS_INTRESOURCE(templateName))

-    templateNameA = (LPCSTR)templateName;

-  else

-  {

-    name = GetSystemString(templateName);

-    templateNameA = name;

-  }

-  return DialogBoxParamA(g_hInstance, templateNameA, parentWindow, DialogProcedure, (LPARAM)this);

-}

-#endif 

-

-}}

diff --git a/other-licenses/7zstub/src/Windows/Control/Dialog.h b/other-licenses/7zstub/src/Windows/Control/Dialog.h
deleted file mode 100644
index 2c78efcba..000000000
--- a/other-licenses/7zstub/src/Windows/Control/Dialog.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// Windows/Control/Dialog.h

-

-#ifndef __WINDOWS_CONTROL_DIALOG_H

-#define __WINDOWS_CONTROL_DIALOG_H

-

-#include "Windows/Window.h"

-#include "Windows/Defs.h"

-

-namespace NWindows {

-namespace NControl {

-

-class CDialog: public CWindow

-{

-public:

-  CDialog(HWND wndow = NULL): CWindow(wndow){};

-  virtual ~CDialog() {};

-

-  HWND GetItem(int itemID) const

-    { return GetDlgItem(_window, itemID); }

-

-  bool EnableItem(int itemID, bool enable) const

-    { return BOOLToBool(::EnableWindow(GetItem(itemID), BoolToBOOL(enable))); }

-

-  bool SetItemText(int itemID, LPCTSTR s)

-    { return BOOLToBool(SetDlgItemText(_window, itemID, s)); }

-

-  #ifndef _UNICODE

-  bool SetItemText(int itemID, LPCWSTR s)

-  { 

-    CWindow window(GetItem(itemID));

-    return window.SetText(s); 

-  }

-  #endif

-

-  UINT GetItemText(int itemID, LPTSTR string, int maxCount)

-    { return GetDlgItemText(_window, itemID, string, maxCount); }

-  #ifndef _UNICODE

-  /*

-  bool GetItemText(int itemID, LPWSTR string, int maxCount)

-  { 

-    CWindow window(GetItem(itemID));

-    return window.GetText(string, maxCount); 

-  }

-  */

-  #endif

-

-  bool SetItemInt(int itemID, UINT value, bool isSigned)

-    { return BOOLToBool(SetDlgItemInt(_window, itemID, value, BoolToBOOL(isSigned))); }

-  bool GetItemInt(int itemID, bool isSigned, UINT &value)

-    { 

-      BOOL result;

-      value = GetDlgItemInt(_window, itemID, &result, BoolToBOOL(isSigned));

-      return BOOLToBool(result);

-    }

-

-  HWND GetNextGroupItem(HWND control, bool previous)

-    { return GetNextDlgGroupItem(_window, control, BoolToBOOL(previous)); }

-  HWND GetNextTabItem(HWND control, bool previous)

-    { return GetNextDlgTabItem(_window, control, BoolToBOOL(previous)); }

-

-  bool MapRect(LPRECT rect)

-    { return BOOLToBool(MapDialogRect(_window, rect)); }

-

-  bool IsMessage(LPMSG message)

-    { return BOOLToBool(IsDialogMessage(_window, message)); }

-

-  LRESULT SendItemMessage(int itemID, UINT message, WPARAM wParam, LPARAM lParam)

-    { return SendDlgItemMessage(_window, itemID, message, wParam, lParam); }

-

-  bool CheckButton(int buttonID, UINT checkState)

-    { return BOOLToBool(CheckDlgButton(_window, buttonID, checkState)); }

-  bool CheckButton(int buttonID, bool checkState)

-    { return CheckButton(buttonID, UINT(checkState ? BST_CHECKED : BST_UNCHECKED)); }

-

-  UINT IsButtonChecked(int buttonID) const

-    { return IsDlgButtonChecked(_window, buttonID); }

-  bool IsButtonCheckedBool(int buttonID) const

-    { return (IsButtonChecked(buttonID) == BST_CHECKED); }

-

-  bool CheckRadioButton(int firstButtonID, int lastButtonID, int checkButtonID)

-    { return BOOLToBool(::CheckRadioButton(_window, firstButtonID, lastButtonID, checkButtonID)); }

-

-  virtual bool OnMessage(UINT message, WPARAM wParam, LPARAM lParam);

-  virtual bool OnInit() { return true; }

-  virtual bool OnCommand(WPARAM wParam, LPARAM lParam);

-  virtual bool OnCommand(int code, int itemID, LPARAM lParam);

-  virtual void OnHelp(LPHELPINFO helpInfo) { OnHelp(); };

-  virtual void OnHelp() {};

-  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);

-  virtual void OnOK() {};

-  virtual void OnCancel() {};

-  virtual bool OnNotify(UINT controlID, LPNMHDR lParam) { return false; }

-  virtual bool OnTimer(WPARAM timerID, LPARAM callback) { return false; }

-

-  LONG_PTR SetMsgResult(LONG_PTR newLongPtr )

-    { return SetLongPtr(DWLP_MSGRESULT, newLongPtr); }

-  LONG_PTR GetMsgResult() const

-    { return GetLongPtr(DWLP_MSGRESULT); }

-};

-

-class CModelessDialog: public CDialog

-{

-public:

-  bool Create(LPCTSTR templateName, HWND parentWindow);

-  #ifndef _UNICODE

-  bool Create(LPCWSTR templateName, HWND parentWindow);

-  #endif

-  virtual void OnOK() { Destroy(); }

-  virtual void OnCancel() { Destroy(); }

-};

-

-class CModalDialog: public CDialog

-{

-public:

-  INT_PTR Create(LPCTSTR templateName, HWND parentWindow);

-  INT_PTR Create(UINT resID, HWND parentWindow)

-    {  return Create(MAKEINTRESOURCEW(resID), parentWindow); }

-  #ifndef _UNICODE

-  INT_PTR Create(LPCWSTR templateName, HWND parentWindow);

-  #endif

-

-  bool End(INT_PTR result)

-    { return BOOLToBool(::EndDialog(_window, result)); }

-  virtual void OnOK() { End(IDOK); }

-  virtual void OnCancel() { End(IDCANCEL); }

-};

-

-class CDialogChildControl: public NWindows::CWindow

-{

-public:

-  int m_ID;

-  void Init(const NWindows::NControl::CDialog &parentDialog, int id)

-  {

-    m_ID = id;

-    Attach(parentDialog.GetItem(id));

-  }

-};

-

-}}

-

-#endif
\ No newline at end of file
diff --git a/other-licenses/7zstub/src/Windows/Control/ProgressBar.h b/other-licenses/7zstub/src/Windows/Control/ProgressBar.h
deleted file mode 100644
index 682bab704..000000000
--- a/other-licenses/7zstub/src/Windows/Control/ProgressBar.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Windows/Control/ProgressBar.h

-

-#ifndef __WINDOWS_CONTROL_PROGRESSBAR_H

-#define __WINDOWS_CONTROL_PROGRESSBAR_H

-

-#include "Windows/Window.h"

-#include "Windows/Defs.h"

-

-namespace NWindows {

-namespace NControl {

-

-class CProgressBar: public CWindow

-{

-public:

-  LRESULT SetPos(int pos)

-    { return SendMessage(PBM_SETPOS, pos, 0); }

-  LRESULT DeltaPos(int increment)

-    { return SendMessage(PBM_DELTAPOS, increment, 0); }

-  UINT GetPos()

-    { return SendMessage(PBM_GETPOS, 0, 0); }

-  LRESULT SetRange(unsigned short minValue, unsigned short maxValue)

-    { return SendMessage(PBM_SETRANGE, 0, MAKELPARAM(minValue, maxValue)); }

-  DWORD SetRange32(int minValue, int maxValue)

-    { return SendMessage(PBM_SETRANGE32, minValue, maxValue); }

-  int SetStep(int aStep)

-    { return SendMessage(PBM_SETSTEP, aStep, 0); }

-  int StepIt()

-    { return SendMessage(PBM_STEPIT, 0, 0); }

-

-  int GetRange(bool minValue, PPBRANGE range)

-    { return SendMessage(PBM_GETRANGE, BoolToBOOL(minValue), (LPARAM)range); }

-  

-  COLORREF SetBarColor(COLORREF color)

-    { return SendMessage(PBM_SETBARCOLOR, 0, color); }

-  COLORREF SetBackgroundColor(COLORREF color)

-    { return SendMessage(PBM_SETBKCOLOR, 0, color); }

-};

-

-}}

-

-#endif
\ No newline at end of file
diff --git a/other-licenses/7zstub/src/Windows/DLL.cpp b/other-licenses/7zstub/src/Windows/DLL.cpp
deleted file mode 100644
index b5aca7098..000000000
--- a/other-licenses/7zstub/src/Windows/DLL.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-// Windows/DLL.cpp

-

-#include "StdAfx.h"

-

-#include "DLL.h"

-#include "Defs.h"

-#ifndef _UNICODE

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

-#endif

-

-#ifndef _UNICODE

-extern bool g_IsNT;

-#endif

-

-namespace NWindows {

-namespace NDLL {

-

-CLibrary::~CLibrary()

-{

-  Free();

-}

-

-bool CLibrary::Free()

-{

-  if (_module == 0)

-    return true;

-  // MessageBox(0, TEXT(""), TEXT("Free"), 0);

-  // Sleep(5000);

-  if (!::FreeLibrary(_module))

-    return false;

-  _module = 0;

-  return true;

-}

-

-bool CLibrary::LoadOperations(HMODULE newModule)

-{

-  if (newModule == NULL)

-    return false;

-  if(!Free())

-    return false;

-  _module = newModule;

-  return true;

-}

-

-bool CLibrary::LoadEx(LPCTSTR fileName, DWORD flags)

-{

-  // MessageBox(0, fileName, TEXT("LoadEx"), 0);

-  return LoadOperations(::LoadLibraryEx(fileName, NULL, flags));

-}

-

-bool CLibrary::Load(LPCTSTR fileName)

-{

-  // MessageBox(0, fileName, TEXT("Load"), 0);

-  // Sleep(5000);

-  // OutputDebugString(fileName);

-  // OutputDebugString(TEXT("\n"));

-  return LoadOperations(::LoadLibrary(fileName));

-}

-

-#ifndef _UNICODE

-static inline UINT GetCurrentCodePage() { return ::AreFileApisANSI() ? CP_ACP : CP_OEMCP; } 

-CSysString GetSysPath(LPCWSTR sysPath)

-  { return UnicodeStringToMultiByte(sysPath, GetCurrentCodePage()); }

-

-bool CLibrary::LoadEx(LPCWSTR fileName, DWORD flags)

-{

-  if (g_IsNT)

-    return LoadOperations(::LoadLibraryExW(fileName, NULL, flags));

-  return LoadEx(GetSysPath(fileName), flags);

-}

-bool CLibrary::Load(LPCWSTR fileName)

-{

-  if (g_IsNT)

-    return LoadOperations(::LoadLibraryW(fileName));

-  return Load(GetSysPath(fileName));

-}

-#endif

-

-bool MyGetModuleFileName(HMODULE hModule, CSysString &result)

-{

-  result.Empty();

-  TCHAR fullPath[MAX_PATH + 2];

-  DWORD size = ::GetModuleFileName(hModule, fullPath, MAX_PATH + 1);

-  if (size <= MAX_PATH && size != 0)

-  {

-    result = fullPath;

-    return true;

-  }

-  return false;

-}

-

-#ifndef _UNICODE

-bool MyGetModuleFileName(HMODULE hModule, UString &result)

-{

-  result.Empty();

-  if (g_IsNT)

-  {

-    wchar_t fullPath[MAX_PATH + 2];

-    DWORD size = ::GetModuleFileNameW(hModule, fullPath, MAX_PATH + 1);

-    if (size <= MAX_PATH && size != 0)

-    {

-      result = fullPath;

-      return true;

-    }

-    return false;

-  }

-  CSysString resultSys;

-  if (!MyGetModuleFileName(hModule, resultSys))

-    return false;

-  result = MultiByteToUnicodeString(resultSys, GetCurrentCodePage());

-  return true;

-}

-#endif

-

-}}

diff --git a/other-licenses/7zstub/src/Windows/DLL.h b/other-licenses/7zstub/src/Windows/DLL.h
deleted file mode 100644
index 6e6036966..000000000
--- a/other-licenses/7zstub/src/Windows/DLL.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Windows/DLL.h

-

-#ifndef __WINDOWS_DLL_H

-#define __WINDOWS_DLL_H

-

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

-

-namespace NWindows {

-namespace NDLL {

-

-class CLibrary

-{

-  bool LoadOperations(HMODULE newModule);

-protected:

-  HMODULE _module;

-public:

-  operator HMODULE() const { return _module; }

-  HMODULE* operator&() { return &_module; }

-

-  CLibrary():_module(NULL) {};

-  ~CLibrary();

-  void Attach(HMODULE m)

-  {

-    Free();

-    _module = m;

-  }

-  HMODULE Detach()

-  {

-    HMODULE m = _module;

-    _module = NULL;

-    return m;

-  }

-

-  // operator HMODULE() const { return _module; };

-  // bool IsLoaded() const { return (_module != NULL); };

-  bool Free();

-  bool LoadEx(LPCTSTR fileName, DWORD flags = LOAD_LIBRARY_AS_DATAFILE);

-  bool Load(LPCTSTR fileName);

-  #ifndef _UNICODE

-  bool LoadEx(LPCWSTR fileName, DWORD flags = LOAD_LIBRARY_AS_DATAFILE);

-  bool Load(LPCWSTR fileName);

-  #endif

-  FARPROC GetProcAddress(LPCSTR procName) const

-    { return ::GetProcAddress(_module, procName); }

-};

-

-bool MyGetModuleFileName(HMODULE hModule, CSysString &result);

-#ifndef _UNICODE

-bool MyGetModuleFileName(HMODULE hModule, UString &result);

-#endif

-

-}}

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/Defs.h b/other-licenses/7zstub/src/Windows/Defs.h
deleted file mode 100644
index 1b0c97a52..000000000
--- a/other-licenses/7zstub/src/Windows/Defs.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Windows/Defs.h

-

-#ifndef __WINDOWS_DEFS_H

-#define __WINDOWS_DEFS_H

-

-inline bool BOOLToBool(BOOL value)

-  { return (value != FALSE); }

-

-inline BOOL BoolToBOOL(bool value)

-  { return (value ? TRUE: FALSE); }

-

-inline VARIANT_BOOL BoolToVARIANT_BOOL(bool value)

-  { return (value ? VARIANT_TRUE: VARIANT_FALSE); }

-

-inline bool VARIANT_BOOLToBool(VARIANT_BOOL value)

-  { return (value != VARIANT_FALSE); }

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/Error.cpp b/other-licenses/7zstub/src/Windows/Error.cpp
deleted file mode 100644
index a361a4965..000000000
--- a/other-licenses/7zstub/src/Windows/Error.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// Windows/Error.h

-

-#include "StdAfx.h"

-

-#include "Windows/Error.h"

-#ifndef _UNICODE

-#include "Common/StringConvert.h"

-#endif

-

-#ifndef _UNICODE

-extern bool g_IsNT;

-#endif

-

-namespace NWindows {

-namespace NError {

-

-bool MyFormatMessage(DWORD messageID, CSysString &message)

-{

-  LPVOID msgBuf;

-  if(::FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | 

-      FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,

-      NULL,messageID, 0, (LPTSTR) &msgBuf,0, NULL) == 0)

-    return false;

-  message = (LPCTSTR)msgBuf;

-  ::LocalFree(msgBuf);

-  return true;

-}

-

-#ifndef _UNICODE

-bool MyFormatMessage(DWORD messageID, UString &message)

-{

-  if (g_IsNT)

-  {

-    LPVOID msgBuf;

-    if(::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | 

-        FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,

-        NULL, messageID, 0, (LPWSTR) &msgBuf, 0, NULL) == 0)

-      return false;

-    message = (LPCWSTR)msgBuf;

-    ::LocalFree(msgBuf);

-    return true;

-  }

-  CSysString messageSys;

-  bool result = MyFormatMessage(messageID, messageSys);

-  message = GetUnicodeString(messageSys);

-  return result;

-}

-#endif

-

-}}

diff --git a/other-licenses/7zstub/src/Windows/Error.h b/other-licenses/7zstub/src/Windows/Error.h
deleted file mode 100644
index de6ed2079..000000000
--- a/other-licenses/7zstub/src/Windows/Error.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Windows/Error.h

-

-#ifndef __WINDOWS_ERROR_H

-#define __WINDOWS_ERROR_H

-

-#include "Common/String.h"

-

-namespace NWindows {

-namespace NError {

-

-bool MyFormatMessage(DWORD messageID, CSysString &message);

-inline CSysString MyFormatMessage(DWORD messageID)

-{

-  CSysString message;

-  MyFormatMessage(messageID, message);

-  return message;

-}

-#ifdef _UNICODE

-inline UString MyFormatMessageW(DWORD messageID)

-  { return MyFormatMessage(messageID); }

-#else

-bool MyFormatMessage(DWORD messageID, UString &message);

-inline UString MyFormatMessageW(DWORD messageID)

-{

-  UString message;

-  MyFormatMessage(messageID, message);

-  return message;

-}

-#endif

-

-}}

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/FileDir.cpp b/other-licenses/7zstub/src/Windows/FileDir.cpp
deleted file mode 100644
index 5023172ab..000000000
--- a/other-licenses/7zstub/src/Windows/FileDir.cpp
+++ /dev/null
@@ -1,672 +0,0 @@
-// Windows/FileDir.cpp

-

-#include "StdAfx.h"

-

-#include "FileDir.h"

-#include "FileName.h"

-#include "FileFind.h"

-#include "Defs.h"

-#ifndef _UNICODE

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

-#endif

-

-#ifndef _UNICODE

-extern bool g_IsNT;

-#endif

-

-namespace NWindows {

-namespace NFile {

-namespace NDirectory {

-

-#ifndef _UNICODE

-static inline UINT GetCurrentCodePage() { return ::AreFileApisANSI() ? CP_ACP : CP_OEMCP; } 

-static UString GetUnicodePath(const CSysString &sysPath)

-  { return MultiByteToUnicodeString(sysPath, GetCurrentCodePage()); }

-static CSysString GetSysPath(LPCWSTR sysPath)

-  { return UnicodeStringToMultiByte(sysPath, GetCurrentCodePage()); }

-#endif

-

-bool MyGetWindowsDirectory(CSysString &path)

-{

-  UINT needLength = ::GetWindowsDirectory(path.GetBuffer(MAX_PATH + 1), MAX_PATH + 1);

-  path.ReleaseBuffer();

-  return (needLength > 0 && needLength <= MAX_PATH);

-}

-

-bool MyGetSystemDirectory(CSysString &path)

-{

-  UINT needLength = ::GetSystemDirectory(path.GetBuffer(MAX_PATH + 1), MAX_PATH + 1);

-  path.ReleaseBuffer();

-  return (needLength > 0 && needLength <= MAX_PATH);

-}

-

-#ifndef _UNICODE

-bool MyGetWindowsDirectory(UString &path)

-{

-  if (g_IsNT)

-  {

-    UINT needLength = ::GetWindowsDirectoryW(path.GetBuffer(MAX_PATH + 1), MAX_PATH + 1);

-    path.ReleaseBuffer();

-    return (needLength > 0 && needLength <= MAX_PATH);

-  }

-  CSysString sysPath;

-  if (!MyGetWindowsDirectory(sysPath))

-    return false;

-  path = GetUnicodePath(sysPath);

-  return true;

-}

-

-bool MyGetSystemDirectory(UString &path)

-{

-  if (g_IsNT)

-  {

-    UINT needLength = ::GetSystemDirectoryW(path.GetBuffer(MAX_PATH + 1), MAX_PATH + 1);

-    path.ReleaseBuffer();

-    return (needLength > 0 && needLength <= MAX_PATH);

-  }

-  CSysString sysPath;

-  if (!MyGetSystemDirectory(sysPath))

-    return false;

-  path = GetUnicodePath(sysPath);

-  return true;

-}

-#endif

-

-#ifndef _UNICODE

-bool MySetFileAttributes(LPCWSTR fileName, DWORD fileAttributes)

-{  

-  if (g_IsNT)

-    return BOOLToBool(::SetFileAttributesW(fileName, fileAttributes));

-  return MySetFileAttributes(GetSysPath(fileName), fileAttributes);

-}

-

-bool MyRemoveDirectory(LPCWSTR pathName)

-{  

-  if (g_IsNT)

-    return BOOLToBool(::RemoveDirectoryW(pathName));

-  return MyRemoveDirectory(GetSysPath(pathName));

-}

-

-bool MyMoveFile(LPCWSTR existFileName, LPCWSTR newFileName)

-{  

-  if (g_IsNT)

-    return BOOLToBool(::MoveFileW(existFileName, newFileName));

-  return MyMoveFile(GetSysPath(existFileName), GetSysPath(newFileName));

-}

-#endif

-

-bool MyCreateDirectory(LPCTSTR pathName) { return BOOLToBool(::CreateDirectory(pathName, NULL)); }

-

-#ifndef _UNICODE

-bool MyCreateDirectory(LPCWSTR pathName)

-{  

-  if (g_IsNT)

-    return BOOLToBool(::CreateDirectoryW(pathName, NULL));

-  return MyCreateDirectory(GetSysPath(pathName));

-}

-#endif

-

-/*

-bool CreateComplexDirectory(LPCTSTR pathName)

-{

-  NName::CParsedPath path;

-  path.ParsePath(pathName);

-  CSysString fullPath = path.Prefix;

-  DWORD errorCode = ERROR_SUCCESS;

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

-  {

-    const CSysString &string = path.PathParts[i];

-    if(string.IsEmpty())

-    {

-      if(i != path.PathParts.Size() - 1)

-        return false;

-      return true;

-    }

-    fullPath += path.PathParts[i];

-    if(!MyCreateDirectory(fullPath))

-    {

-      DWORD errorCode = GetLastError();

-      if(errorCode != ERROR_ALREADY_EXISTS)

-        return false;

-    }

-    fullPath += NName::kDirDelimiter;

-  }

-  return true;

-}

-*/

-

-bool CreateComplexDirectory(LPCTSTR _aPathName)

-{

-  CSysString pathName = _aPathName;

-  int pos = pathName.ReverseFind(TEXT(CHAR_PATH_SEPARATOR));

-  if (pos > 0 && pos == pathName.Length() - 1)

-  {

-    if (pathName.Length() == 3 && pathName[1] == ':')

-      return true; // Disk folder;

-    pathName.Delete(pos);

-  }

-  CSysString pathName2 = pathName;

-  pos = pathName.Length();

-  while(true)

-  {

-    if(MyCreateDirectory(pathName))

-      break;

-    if(::GetLastError() == ERROR_ALREADY_EXISTS)

-    {

-      NFind::CFileInfo fileInfo;

-      if (!NFind::FindFile(pathName, fileInfo)) // For network folders

-        return true;

-      if (!fileInfo.IsDirectory())

-        return false;

-      break;

-    }

-    pos = pathName.ReverseFind(TEXT(CHAR_PATH_SEPARATOR));

-    if (pos < 0 || pos == 0)

-      return false;

-    if (pathName[pos - 1] == ':')

-      return false;

-    pathName = pathName.Left(pos);

-  }

-  pathName = pathName2;

-  while(pos < pathName.Length())

-  {

-    pos = pathName.Find(TEXT(CHAR_PATH_SEPARATOR), pos + 1);

-    if (pos < 0)

-      pos = pathName.Length();

-    if(!MyCreateDirectory(pathName.Left(pos)))

-      return false;

-  }

-  return true;

-}

-

-#ifndef _UNICODE

-

-bool CreateComplexDirectory(LPCWSTR _aPathName)

-{

-  UString pathName = _aPathName;

-  int pos = pathName.ReverseFind(WCHAR_PATH_SEPARATOR);

-  if (pos > 0 && pos == pathName.Length() - 1)

-  {

-    if (pathName.Length() == 3 && pathName[1] == L':')

-      return true; // Disk folder;

-    pathName.Delete(pos);

-  }

-  UString pathName2 = pathName;

-  pos = pathName.Length();

-  while(true)

-  {

-    if(MyCreateDirectory(pathName))

-      break;

-    if(::GetLastError() == ERROR_ALREADY_EXISTS)

-    {

-      NFind::CFileInfoW fileInfo;

-      if (!NFind::FindFile(pathName, fileInfo)) // For network folders

-        return true;

-      if (!fileInfo.IsDirectory())

-        return false;

-      break;

-    }

-    pos = pathName.ReverseFind(WCHAR_PATH_SEPARATOR);

-    if (pos < 0 || pos == 0)

-      return false;

-    if (pathName[pos - 1] == L':')

-      return false;

-    pathName = pathName.Left(pos);

-  }

-  pathName = pathName2;

-  while(pos < pathName.Length())

-  {

-    pos = pathName.Find(WCHAR_PATH_SEPARATOR, pos + 1);

-    if (pos < 0)

-      pos = pathName.Length();

-    if(!MyCreateDirectory(pathName.Left(pos)))

-      return false;

-  }

-  return true;

-}

-

-#endif

-

-bool DeleteFileAlways(LPCTSTR name)

-{

-  if(!::SetFileAttributes(name, 0))

-    return false;

-  return BOOLToBool(::DeleteFile(name));

-}

-

-#ifndef _UNICODE

-bool DeleteFileAlways(LPCWSTR name)

-{  

-  if (g_IsNT)

-  {

-    if(!MySetFileAttributes(name, 0))

-      return false;

-    return BOOLToBool(::DeleteFileW(name));

-  }

-  return DeleteFileAlways(GetSysPath(name));

-}

-#endif

-

-static bool RemoveDirectorySubItems2(const CSysString pathPrefix, const NFind::CFileInfo &fileInfo)

-{

-  if(fileInfo.IsDirectory())

-    return RemoveDirectoryWithSubItems(pathPrefix + fileInfo.Name);

-  else

-    return DeleteFileAlways(pathPrefix + fileInfo.Name);

-}

-

-bool RemoveDirectoryWithSubItems(const CSysString &path)

-{

-  NFind::CFileInfo fileInfo;

-  CSysString pathPrefix = path + NName::kDirDelimiter;

-  {

-    NFind::CEnumerator enumerator(pathPrefix + TCHAR(NName::kAnyStringWildcard));

-    while(enumerator.Next(fileInfo))

-      if(!RemoveDirectorySubItems2(pathPrefix, fileInfo))

-        return false;

-  }

-  if(!BOOLToBool(::SetFileAttributes(path, 0)))

-    return false;

-  return BOOLToBool(::RemoveDirectory(path));

-}

-

-#ifndef _UNICODE

-static bool RemoveDirectorySubItems2(const UString pathPrefix, const NFind::CFileInfoW &fileInfo)

-{

-  if(fileInfo.IsDirectory())

-    return RemoveDirectoryWithSubItems(pathPrefix + fileInfo.Name);

-  else

-    return DeleteFileAlways(pathPrefix + fileInfo.Name);

-}

-bool RemoveDirectoryWithSubItems(const UString &path)

-{

-  NFind::CFileInfoW fileInfo;

-  UString pathPrefix = path + UString(NName::kDirDelimiter);

-  {

-    NFind::CEnumeratorW enumerator(pathPrefix + UString(NName::kAnyStringWildcard));

-    while(enumerator.Next(fileInfo))

-      if(!RemoveDirectorySubItems2(pathPrefix, fileInfo))

-        return false;

-  }

-  if(!MySetFileAttributes(path, 0))

-    return false;

-  return MyRemoveDirectory(path);

-}

-#endif

-

-#ifndef _WIN32_WCE

-

-bool MyGetShortPathName(LPCTSTR longPath, CSysString &shortPath)

-{

-  DWORD needLength = ::GetShortPathName(longPath, shortPath.GetBuffer(MAX_PATH + 1), MAX_PATH + 1);

-  shortPath.ReleaseBuffer();

-  return (needLength > 0 && needLength < MAX_PATH);

-}

-

-bool MyGetFullPathName(LPCTSTR fileName, CSysString &resultPath, int &fileNamePartStartIndex)

-{

-  resultPath.Empty();

-  LPTSTR fileNamePointer = 0;

-  LPTSTR buffer = resultPath.GetBuffer(MAX_PATH);

-  DWORD needLength = ::GetFullPathName(fileName, MAX_PATH + 1, buffer, &fileNamePointer);

-  resultPath.ReleaseBuffer();

-  if (needLength == 0 || needLength >= MAX_PATH)

-    return false;

-  if (fileNamePointer == 0)

-    fileNamePartStartIndex = lstrlen(fileName);

-  else

-    fileNamePartStartIndex = (int)(fileNamePointer - buffer);

-  return true;

-}

-

-#ifndef _UNICODE

-bool MyGetFullPathName(LPCWSTR fileName, UString &resultPath, int &fileNamePartStartIndex)

-{

-  resultPath.Empty();

-  if (g_IsNT)

-  {

-    LPWSTR fileNamePointer = 0;

-    LPWSTR buffer = resultPath.GetBuffer(MAX_PATH);

-    DWORD needLength = ::GetFullPathNameW(fileName, MAX_PATH + 1, buffer, &fileNamePointer);

-    resultPath.ReleaseBuffer();

-    if (needLength == 0 || needLength >= MAX_PATH)

-      return false;

-    if (fileNamePointer == 0)

-      fileNamePartStartIndex = MyStringLen(fileName);

-    else

-      fileNamePartStartIndex = (int)(fileNamePointer - buffer);

-  }

-  else

-  {

-    CSysString sysPath;

-    if (!MyGetFullPathName(GetSysPath(fileName), sysPath, fileNamePartStartIndex))

-      return false;

-    UString resultPath1 = GetUnicodePath(sysPath.Left(fileNamePartStartIndex));

-    UString resultPath2 = GetUnicodePath(sysPath.Mid(fileNamePartStartIndex));

-    fileNamePartStartIndex = resultPath1.Length();

-    resultPath = resultPath1 + resultPath2;

-  }

-  return true;

-}

-#endif

-

-

-bool MyGetFullPathName(LPCTSTR fileName, CSysString &path)

-{

-  int index;

-  return MyGetFullPathName(fileName, path, index);

-}

-

-#ifndef _UNICODE

-bool MyGetFullPathName(LPCWSTR fileName, UString &path)

-{

-  int index;

-  return MyGetFullPathName(fileName, path, index);

-}

-#endif

-

-bool GetOnlyName(LPCTSTR fileName, CSysString &resultName)

-{

-  int index;

-  if (!MyGetFullPathName(fileName, resultName, index))

-    return false;

-  resultName = resultName.Mid(index);

-  return true;

-}

-

-#ifndef _UNICODE

-bool GetOnlyName(LPCWSTR fileName, UString &resultName)

-{

-  int index;

-  if (!MyGetFullPathName(fileName, resultName, index))

-    return false;

-  resultName = resultName.Mid(index);

-  return true;

-}

-#endif

-

-bool GetOnlyDirPrefix(LPCTSTR fileName, CSysString &resultName)

-{

-  int index;

-  if (!MyGetFullPathName(fileName, resultName, index))

-    return false;

-  resultName = resultName.Left(index);

-  return true;

-}

-

-#ifndef _UNICODE

-bool GetOnlyDirPrefix(LPCWSTR fileName, UString &resultName)

-{

-  int index;

-  if (!MyGetFullPathName(fileName, resultName, index))

-    return false;

-  resultName = resultName.Left(index);

-  return true;

-}

-#endif

-

-bool MyGetCurrentDirectory(CSysString &path)

-{

-  DWORD needLength = ::GetCurrentDirectory(MAX_PATH + 1, path.GetBuffer(MAX_PATH + 1));

-  path.ReleaseBuffer();

-  return (needLength > 0 && needLength <= MAX_PATH);

-}

-

-#ifndef _UNICODE

-bool MySetCurrentDirectory(LPCWSTR path)

-{

-  if (g_IsNT)

-    return BOOLToBool(::SetCurrentDirectoryW(path));

-  return MySetCurrentDirectory(GetSysPath(path));

-}

-bool MyGetCurrentDirectory(UString &path)

-{

-  if (g_IsNT)

-  {

-    DWORD needLength = ::GetCurrentDirectoryW(MAX_PATH + 1, path.GetBuffer(MAX_PATH + 1));

-    path.ReleaseBuffer();

-    return (needLength > 0 && needLength <= MAX_PATH);

-  }

-  CSysString sysPath;

-  if (!MyGetCurrentDirectory(sysPath))

-    return false;

-  path = GetUnicodePath(sysPath);

-  return true;

-}

-#endif

-#endif

-

-bool MySearchPath(LPCTSTR path, LPCTSTR fileName, LPCTSTR extension, 

-  CSysString &resultPath, UINT32 &filePart)

-{

-  LPTSTR filePartPointer;

-  DWORD value = ::SearchPath(path, fileName, extension, 

-    MAX_PATH, resultPath.GetBuffer(MAX_PATH + 1), &filePartPointer);

-  filePart = (UINT32)(filePartPointer - (LPCTSTR)resultPath);

-  resultPath.ReleaseBuffer();

-  return (value > 0 && value <= MAX_PATH);

-}

-

-#ifndef _UNICODE

-bool MySearchPath(LPCWSTR path, LPCWSTR fileName, LPCWSTR extension, 

-  UString &resultPath, UINT32 &filePart)

-{

-  if (g_IsNT)

-  {

-    LPWSTR filePartPointer = 0;

-    DWORD value = ::SearchPathW(path, fileName, extension, 

-        MAX_PATH, resultPath.GetBuffer(MAX_PATH + 1), &filePartPointer);

-    filePart = (UINT32)(filePartPointer - (LPCWSTR)resultPath);

-    resultPath.ReleaseBuffer();

-    return (value > 0 && value <= MAX_PATH);

-  }

-  

-  CSysString sysPath;

-  if (!MySearchPath(

-      path != 0 ? (LPCTSTR)GetSysPath(path): 0,

-      fileName != 0 ? (LPCTSTR)GetSysPath(fileName): 0,

-      extension != 0 ? (LPCTSTR)GetSysPath(extension): 0,

-      sysPath, filePart))

-    return false;

-  UString resultPath1 = GetUnicodePath(sysPath.Left(filePart));

-  UString resultPath2 = GetUnicodePath(sysPath.Mid(filePart));

-  filePart = resultPath1.Length();

-  resultPath = resultPath1 + resultPath2;

-  return true;

-}

-#endif

-

-bool MyGetTempPath(CSysString &path)

-{

-  DWORD needLength = ::GetTempPath(MAX_PATH + 1, path.GetBuffer(MAX_PATH + 1));

-  path.ReleaseBuffer();

-  return (needLength > 0 && needLength <= MAX_PATH);

-}

-

-#ifndef _UNICODE

-bool MyGetTempPath(UString &path)

-{

-  path.Empty();

-  if (g_IsNT)

-  {

-    DWORD needLength = ::GetTempPathW(MAX_PATH + 1, path.GetBuffer(MAX_PATH + 1));

-    path.ReleaseBuffer();

-    return (needLength > 0 && needLength <= MAX_PATH);

-  }

-  CSysString sysPath;

-  if (!MyGetTempPath(sysPath))

-    return false;

-  path = GetUnicodePath(sysPath);

-  return true;

-}

-#endif

-

-UINT MyGetTempFileName(LPCTSTR dirPath, LPCTSTR prefix, CSysString &path)

-{

-  UINT number = ::GetTempFileName(dirPath, prefix, 0, path.GetBuffer(MAX_PATH + 1));

-  path.ReleaseBuffer();

-  return number;

-}

-

-#ifndef _UNICODE

-UINT MyGetTempFileName(LPCWSTR dirPath, LPCWSTR prefix, UString &path)

-{

-  if (g_IsNT)

-  {

-    UINT number = ::GetTempFileNameW(dirPath, prefix, 0, path.GetBuffer(MAX_PATH));

-    path.ReleaseBuffer();

-    return number;

-  }

-  CSysString sysPath;

-  UINT number = MyGetTempFileName(

-      dirPath ? (LPCTSTR)GetSysPath(dirPath): 0, 

-      prefix ? (LPCTSTR)GetSysPath(prefix): 0, 

-      sysPath);

-  path = GetUnicodePath(sysPath);

-  return number;

-}

-#endif

-

-UINT CTempFile::Create(LPCTSTR dirPath, LPCTSTR prefix, CSysString &resultPath)

-{

-  Remove();

-  UINT number = MyGetTempFileName(dirPath, prefix, resultPath);

-  if(number != 0)

-  {

-    _fileName = resultPath;

-    _mustBeDeleted = true;

-  }

-  return number;

-}

-

-bool CTempFile::Create(LPCTSTR prefix, CSysString &resultPath)

-{

-  CSysString tempPath;

-  if(!MyGetTempPath(tempPath))

-    return false;

-  if (Create(tempPath, prefix, resultPath) != 0)

-    return true;

-  if(!MyGetWindowsDirectory(tempPath))

-    return false;

-  return (Create(tempPath, prefix, resultPath) != 0);

-}

-

-bool CTempFile::Remove()

-{

-  if (!_mustBeDeleted)

-    return true;

-  _mustBeDeleted = !DeleteFileAlways(_fileName);

-  return !_mustBeDeleted;

-}

-

-#ifndef _UNICODE

-

-UINT CTempFileW::Create(LPCWSTR dirPath, LPCWSTR prefix, UString &resultPath)

-{

-  Remove();

-  UINT number = MyGetTempFileName(dirPath, prefix, resultPath);

-  if(number != 0)

-  {

-    _fileName = resultPath;

-    _mustBeDeleted = true;

-  }

-  return number;

-}

-

-bool CTempFileW::Create(LPCWSTR prefix, UString &resultPath)

-{

-  UString tempPath;

-  if(!MyGetTempPath(tempPath))

-    return false;

-  if (Create(tempPath, prefix, resultPath) != 0)

-    return true;

-  if(!MyGetWindowsDirectory(tempPath))

-    return false;

-  return (Create(tempPath, prefix, resultPath) != 0);

-}

-

-bool CTempFileW::Remove()

-{

-  if (!_mustBeDeleted)

-    return true;

-  _mustBeDeleted = !DeleteFileAlways(_fileName);

-  return !_mustBeDeleted;

-}

-

-#endif

-

-bool CreateTempDirectory(LPCTSTR prefix, CSysString &dirName)

-{

-  /*

-  CSysString prefix = tempPath + prefixChars;

-  CRandom random;

-  random.Init();

-  */

-  while(true)

-  {

-    CTempFile tempFile;

-    if (!tempFile.Create(prefix, dirName))

-      return false;

-    if (!::DeleteFile(dirName))

-      return false;

-    /*

-    UINT32 randomNumber = random.Generate();

-    TCHAR randomNumberString[32];

-    _stprintf(randomNumberString, _T("%04X"), randomNumber);

-    dirName = prefix + randomNumberString;

-    */

-    if(NFind::DoesFileExist(dirName))

-      continue;

-    if (MyCreateDirectory(dirName))

-      return true;

-    if (::GetLastError() != ERROR_ALREADY_EXISTS)

-      return false;

-  }

-}

-

-bool CTempDirectory::Create(LPCTSTR prefix)

-{ 

-  Remove();

-  return (_mustBeDeleted = CreateTempDirectory(prefix, _tempDir)); 

-}

-

-#ifndef _UNICODE

-

-bool CreateTempDirectory(LPCWSTR prefix, UString &dirName)

-{

-  /*

-  CSysString prefix = tempPath + prefixChars;

-  CRandom random;

-  random.Init();

-  */

-  while(true)

-  {

-    CTempFileW tempFile;

-    if (!tempFile.Create(prefix, dirName))

-      return false;

-    if (!DeleteFileAlways(dirName))

-      return false;

-    /*

-    UINT32 randomNumber = random.Generate();

-    TCHAR randomNumberString[32];

-    _stprintf(randomNumberString, _T("%04X"), randomNumber);

-    dirName = prefix + randomNumberString;

-    */

-    if(NFind::DoesFileExist(dirName))

-      continue;

-    if (MyCreateDirectory(dirName))

-      return true;

-    if (::GetLastError() != ERROR_ALREADY_EXISTS)

-      return false;

-  }

-}

-

-bool CTempDirectoryW::Create(LPCWSTR prefix)

-{ 

-  Remove();

-  return (_mustBeDeleted = CreateTempDirectory(prefix, _tempDir)); 

-}

-

-#endif

-

-}}}

diff --git a/other-licenses/7zstub/src/Windows/FileDir.h b/other-licenses/7zstub/src/Windows/FileDir.h
deleted file mode 100644
index da9a5bbcc..000000000
--- a/other-licenses/7zstub/src/Windows/FileDir.h
+++ /dev/null
@@ -1,189 +0,0 @@
-// Windows/FileDir.h

-

-#ifndef __WINDOWS_FILEDIR_H

-#define __WINDOWS_FILEDIR_H

-

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

-#include "Defs.h"

-

-namespace NWindows {

-namespace NFile {

-namespace NDirectory {

-

-bool MyGetWindowsDirectory(CSysString &path);

-bool MyGetSystemDirectory(CSysString &path);

-#ifndef _UNICODE

-bool MyGetWindowsDirectory(UString &path);

-bool MyGetSystemDirectory(UString &path);

-#endif

-

-inline bool MySetFileAttributes(LPCTSTR fileName, DWORD fileAttributes)

-  { return BOOLToBool(::SetFileAttributes(fileName, fileAttributes)); }

-#ifndef _UNICODE

-bool MySetFileAttributes(LPCWSTR fileName, DWORD fileAttributes);

-#endif

-

-inline bool MyMoveFile(LPCTSTR existFileName, LPCTSTR newFileName)

-  { return BOOLToBool(::MoveFile(existFileName, newFileName)); }

-#ifndef _UNICODE

-bool MyMoveFile(LPCWSTR existFileName, LPCWSTR newFileName);

-#endif

-

-inline bool MyRemoveDirectory(LPCTSTR pathName)

-  { return BOOLToBool(::RemoveDirectory(pathName)); }

-#ifndef _UNICODE

-bool MyRemoveDirectory(LPCWSTR pathName);

-#endif

-

-bool MyCreateDirectory(LPCTSTR pathName);

-bool CreateComplexDirectory(LPCTSTR pathName);

-#ifndef _UNICODE

-bool MyCreateDirectory(LPCWSTR pathName);

-bool CreateComplexDirectory(LPCWSTR pathName);

-#endif

-

-bool DeleteFileAlways(LPCTSTR name);

-#ifndef _UNICODE

-bool DeleteFileAlways(LPCWSTR name);

-#endif

-

-bool RemoveDirectoryWithSubItems(const CSysString &path);

-#ifndef _UNICODE

-bool RemoveDirectoryWithSubItems(const UString &path);

-#endif

-

-#ifndef _WIN32_WCE

-bool MyGetShortPathName(LPCTSTR longPath, CSysString &shortPath);

-

-bool MyGetFullPathName(LPCTSTR fileName, CSysString &resultPath, 

-    int &fileNamePartStartIndex);

-bool MyGetFullPathName(LPCTSTR fileName, CSysString &resultPath);

-bool GetOnlyName(LPCTSTR fileName, CSysString &resultName);

-bool GetOnlyDirPrefix(LPCTSTR fileName, CSysString &resultName);

-#ifndef _UNICODE

-bool MyGetFullPathName(LPCWSTR fileName, UString &resultPath, 

-    int &fileNamePartStartIndex);

-bool MyGetFullPathName(LPCWSTR fileName, UString &resultPath);

-bool GetOnlyName(LPCWSTR fileName, UString &resultName);

-bool GetOnlyDirPrefix(LPCWSTR fileName, UString &resultName);

-#endif

-

-inline bool MySetCurrentDirectory(LPCTSTR path)

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

-bool MyGetCurrentDirectory(CSysString &resultPath);

-#ifndef _UNICODE

-bool MySetCurrentDirectory(LPCWSTR path);

-bool MyGetCurrentDirectory(UString &resultPath);

-#endif

-#endif

-

-bool MySearchPath(LPCTSTR path, LPCTSTR fileName, LPCTSTR extension, 

-  CSysString &resultPath, UINT32 &filePart);

-#ifndef _UNICODE

-bool MySearchPath(LPCWSTR path, LPCWSTR fileName, LPCWSTR extension, 

-  UString &resultPath, UINT32 &filePart);

-#endif

-

-inline bool MySearchPath(LPCTSTR path, LPCTSTR fileName, LPCTSTR extension, 

-  CSysString &resultPath)

-{

-  UINT32 value;

-  return MySearchPath(path, fileName, extension, resultPath, value);

-}

-

-#ifndef _UNICODE

-inline bool MySearchPath(LPCWSTR path, LPCWSTR fileName, LPCWSTR extension, 

-  UString &resultPath)

-{

-  UINT32 value;

-  return MySearchPath(path, fileName, extension, resultPath, value);

-}

-#endif

-

-bool MyGetTempPath(CSysString &resultPath);

-#ifndef _UNICODE

-bool MyGetTempPath(UString &resultPath);

-#endif

-

-UINT MyGetTempFileName(LPCTSTR dirPath, LPCTSTR prefix, CSysString &resultPath);

-#ifndef _UNICODE

-UINT MyGetTempFileName(LPCWSTR dirPath, LPCWSTR prefix, UString &resultPath);

-#endif

-

-class CTempFile

-{

-  bool _mustBeDeleted;

-  CSysString _fileName;

-public:

-  CTempFile(): _mustBeDeleted(false) {}

-  ~CTempFile() { Remove(); }

-  void DisableDeleting() { _mustBeDeleted = false; }

-  UINT Create(LPCTSTR dirPath, LPCTSTR prefix, CSysString &resultPath);

-  bool Create(LPCTSTR prefix, CSysString &resultPath);

-  bool Remove();

-};

-

-#ifdef _UNICODE

-typedef CTempFile CTempFileW;

-#else

-class CTempFileW

-{

-  bool _mustBeDeleted;

-  UString _fileName;

-public:

-  CTempFileW(): _mustBeDeleted(false) {}

-  ~CTempFileW() { Remove(); }

-  void DisableDeleting() { _mustBeDeleted = false; }

-  UINT Create(LPCWSTR dirPath, LPCWSTR prefix, UString &resultPath);

-  bool Create(LPCWSTR prefix, UString &resultPath);

-  bool Remove();

-};

-#endif

-

-bool CreateTempDirectory(LPCTSTR prefixChars, CSysString &dirName);

-

-class CTempDirectory

-{

-  bool _mustBeDeleted;

-  CSysString _tempDir;

-public:

-  const CSysString &GetPath() const { return _tempDir; }

-  CTempDirectory(): _mustBeDeleted(false) {}

-  ~CTempDirectory() { Remove();  }

-  bool Create(LPCTSTR prefix) ;

-  bool Remove()

-  {

-    if (!_mustBeDeleted)

-      return true;

-    _mustBeDeleted = !RemoveDirectoryWithSubItems(_tempDir);

-    return (!_mustBeDeleted);

-  }

-  void DisableDeleting() { _mustBeDeleted = false; }

-};

-

-#ifdef _UNICODE

-typedef CTempDirectory CTempDirectoryW;

-#else

-class CTempDirectoryW

-{

-  bool _mustBeDeleted;

-  UString _tempDir;

-public:

-  const UString &GetPath() const { return _tempDir; }

-  CTempDirectoryW(): _mustBeDeleted(false) {}

-  ~CTempDirectoryW() { Remove();  }

-  bool Create(LPCWSTR prefix) ;

-  bool Remove()

-  {

-    if (!_mustBeDeleted)

-      return true;

-    _mustBeDeleted = !RemoveDirectoryWithSubItems(_tempDir);

-    return (!_mustBeDeleted);

-  }

-  void DisableDeleting() { _mustBeDeleted = false; }

-};

-#endif

-

-}}}

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/FileFind.cpp b/other-licenses/7zstub/src/Windows/FileFind.cpp
deleted file mode 100644
index 298df4644..000000000
--- a/other-licenses/7zstub/src/Windows/FileFind.cpp
+++ /dev/null
@@ -1,365 +0,0 @@
-// Windows/FileFind.cpp

-

-#include "StdAfx.h"

-

-#include "FileFind.h"

-#ifndef _UNICODE

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

-#endif

-

-#ifndef _UNICODE

-extern bool g_IsNT;

-#endif

-

-namespace NWindows {

-namespace NFile {

-namespace NFind {

-

-static const TCHAR kDot = TEXT('.');

-

-bool CFileInfo::IsDots() const

-{ 

-  if (!IsDirectory() || Name.IsEmpty())

-    return false;

-  if (Name[0] != kDot)

-    return false;

-  return Name.Length() == 1 || (Name[1] == kDot && Name.Length() == 2);

-}

-

-#ifndef _UNICODE

-bool CFileInfoW::IsDots() const

-{ 

-  if (!IsDirectory() || Name.IsEmpty())

-    return false;

-  if (Name[0] != kDot)

-    return false;

-  return Name.Length() == 1 || (Name[1] == kDot && Name.Length() == 2);

-}

-#endif

-

-static void ConvertWIN32_FIND_DATA_To_FileInfo(

-    const WIN32_FIND_DATA &findData,

-    CFileInfo &fileInfo)

-{

-  fileInfo.Attributes = findData.dwFileAttributes; 

-  fileInfo.CreationTime = findData.ftCreationTime;  

-  fileInfo.LastAccessTime = findData.ftLastAccessTime; 

-  fileInfo.LastWriteTime = findData.ftLastWriteTime;

-  fileInfo.Size  = (((UInt64)findData.nFileSizeHigh) << 32) + findData.nFileSizeLow; 

-  fileInfo.Name = findData.cFileName;

-  #ifndef _WIN32_WCE

-  fileInfo.ReparseTag = findData.dwReserved0;

-  #else

-  fileInfo.ObjectID = findData.dwOID;

-  #endif

-}

-

-#ifndef _UNICODE

-

-static inline UINT GetCurrentCodePage() { return ::AreFileApisANSI() ? CP_ACP : CP_OEMCP; } 

-

-static void ConvertWIN32_FIND_DATA_To_FileInfo(

-    const WIN32_FIND_DATAW &findData,

-    CFileInfoW &fileInfo)

-{

-  fileInfo.Attributes = findData.dwFileAttributes; 

-  fileInfo.CreationTime = findData.ftCreationTime;  

-  fileInfo.LastAccessTime = findData.ftLastAccessTime; 

-  fileInfo.LastWriteTime = findData.ftLastWriteTime;

-  fileInfo.Size  = (((UInt64)findData.nFileSizeHigh) << 32) + findData.nFileSizeLow; 

-  fileInfo.Name = findData.cFileName;

-  #ifndef _WIN32_WCE

-  fileInfo.ReparseTag = findData.dwReserved0;

-  #else

-  fileInfo.ObjectID = findData.dwOID;

-  #endif

-}

-

-static void ConvertWIN32_FIND_DATA_To_FileInfo(

-    const WIN32_FIND_DATA &findData,

-    CFileInfoW &fileInfo)

-{

-  fileInfo.Attributes = findData.dwFileAttributes; 

-  fileInfo.CreationTime = findData.ftCreationTime;  

-  fileInfo.LastAccessTime = findData.ftLastAccessTime; 

-  fileInfo.LastWriteTime = findData.ftLastWriteTime;

-  fileInfo.Size  = (((UInt64)findData.nFileSizeHigh) << 32) + findData.nFileSizeLow; 

-  fileInfo.Name = GetUnicodeString(findData.cFileName, GetCurrentCodePage());

-  #ifndef _WIN32_WCE

-  fileInfo.ReparseTag = findData.dwReserved0;

-  #else

-  fileInfo.ObjectID = findData.dwOID;

-  #endif

-}

-#endif

-  

-////////////////////////////////

-// CFindFile

-

-bool CFindFile::Close()

-{

-  if(!_handleAllocated)

-    return true;

-  bool result = BOOLToBool(::FindClose(_handle));

-  _handleAllocated = !result;

-  return result;

-}

-           

-bool CFindFile::FindFirst(LPCTSTR wildcard, CFileInfo &fileInfo)

-{

-  Close();

-  WIN32_FIND_DATA findData;

-  _handle = ::FindFirstFile(wildcard, &findData);

-  if (_handleAllocated = (_handle != INVALID_HANDLE_VALUE))

-    ConvertWIN32_FIND_DATA_To_FileInfo(findData, fileInfo);

-  return _handleAllocated;

-}

-

-#ifndef _UNICODE

-bool CFindFile::FindFirst(LPCWSTR wildcard, CFileInfoW &fileInfo)

-{

-  Close();

-  if (g_IsNT)

-  {

-    WIN32_FIND_DATAW findData;

-    _handle = ::FindFirstFileW(wildcard, &findData);

-    if (_handleAllocated = (_handle != INVALID_HANDLE_VALUE))

-      ConvertWIN32_FIND_DATA_To_FileInfo(findData, fileInfo);

-  }

-  else

-  {

-    WIN32_FIND_DATAA findData;

-    _handle = ::FindFirstFileA(UnicodeStringToMultiByte(wildcard, 

-        GetCurrentCodePage()), &findData);

-    if (_handleAllocated = (_handle != INVALID_HANDLE_VALUE))

-      ConvertWIN32_FIND_DATA_To_FileInfo(findData, fileInfo);

-  }

-  return _handleAllocated;

-}

-#endif

-

-bool CFindFile::FindNext(CFileInfo &fileInfo)

-{

-  WIN32_FIND_DATA findData;

-  bool result = BOOLToBool(::FindNextFile(_handle, &findData));

-  if (result)

-    ConvertWIN32_FIND_DATA_To_FileInfo(findData, fileInfo);

-  return result;

-}

-

-#ifndef _UNICODE

-bool CFindFile::FindNext(CFileInfoW &fileInfo)

-{

-  if (g_IsNT)

-  {

-    WIN32_FIND_DATAW findData;

-    if (!::FindNextFileW(_handle, &findData))

-      return false;

-    ConvertWIN32_FIND_DATA_To_FileInfo(findData, fileInfo);

-  }

-  else

-  {

-    WIN32_FIND_DATAA findData;

-    if (!::FindNextFileA(_handle, &findData))

-      return false;

-    ConvertWIN32_FIND_DATA_To_FileInfo(findData, fileInfo);

-  }

-  return true;

-}

-#endif

-

-bool FindFile(LPCTSTR wildcard, CFileInfo &fileInfo)

-{

-  CFindFile finder;

-  return finder.FindFirst(wildcard, fileInfo);

-}

-

-#ifndef _UNICODE

-bool FindFile(LPCWSTR wildcard, CFileInfoW &fileInfo)

-{

-  CFindFile finder;

-  return finder.FindFirst(wildcard, fileInfo);

-}

-#endif

-

-bool DoesFileExist(LPCTSTR name)

-{

-  CFileInfo fileInfo;

-  return FindFile(name, fileInfo);

-}

-

-#ifndef _UNICODE

-bool DoesFileExist(LPCWSTR name)

-{

-  CFileInfoW fileInfo;

-  return FindFile(name, fileInfo);

-}

-#endif

-

-/////////////////////////////////////

-// CEnumerator

-

-bool CEnumerator::NextAny(CFileInfo &fileInfo)

-{

-  if(_findFile.IsHandleAllocated())

-    return _findFile.FindNext(fileInfo);

-  else

-    return _findFile.FindFirst(_wildcard, fileInfo);

-}

-

-bool CEnumerator::Next(CFileInfo &fileInfo)

-{

-  while(true)

-  {

-    if(!NextAny(fileInfo))

-      return false;

-    if(!fileInfo.IsDots())

-      return true;

-  }

-}

-

-bool CEnumerator::Next(CFileInfo &fileInfo, bool &found)

-{

-  if (Next(fileInfo))

-  {

-    found = true;

-    return true;

-  }

-  found = false;

-  return (::GetLastError() == ERROR_NO_MORE_FILES);

-}

-

-#ifndef _UNICODE

-bool CEnumeratorW::NextAny(CFileInfoW &fileInfo)

-{

-  if(_findFile.IsHandleAllocated())

-    return _findFile.FindNext(fileInfo);

-  else

-    return _findFile.FindFirst(_wildcard, fileInfo);

-}

-

-bool CEnumeratorW::Next(CFileInfoW &fileInfo)

-{

-  while(true)

-  {

-    if(!NextAny(fileInfo))

-      return false;

-    if(!fileInfo.IsDots())

-      return true;

-  }

-}

-

-bool CEnumeratorW::Next(CFileInfoW &fileInfo, bool &found)

-{

-  if (Next(fileInfo))

-  {

-    found = true;

-    return true;

-  }

-  found = false;

-  return (::GetLastError() == ERROR_NO_MORE_FILES);

-}

-

-#endif

-

-////////////////////////////////

-// CFindChangeNotification

-

-bool CFindChangeNotification::Close()

-{

-  if(_handle == INVALID_HANDLE_VALUE || _handle == 0)

-    return true;

-  bool result = BOOLToBool(::FindCloseChangeNotification(_handle));

-  if (result)

-    _handle = INVALID_HANDLE_VALUE;

-  return result;

-}

-           

-HANDLE CFindChangeNotification::FindFirst(LPCTSTR pathName, bool watchSubtree, 

-    DWORD notifyFilter)

-{

-  _handle = ::FindFirstChangeNotification(pathName, 

-      BoolToBOOL(watchSubtree), notifyFilter);

-  return _handle;

-}

-

-#ifndef _UNICODE

-HANDLE CFindChangeNotification::FindFirst(LPCWSTR pathName, bool watchSubtree, 

-    DWORD notifyFilter)

-{

-  if (g_IsNT)

-    return (_handle = ::FindFirstChangeNotificationW(pathName, BoolToBOOL(watchSubtree), notifyFilter));

-  return FindFirst(UnicodeStringToMultiByte(pathName, GetCurrentCodePage()), watchSubtree, notifyFilter);

-}

-#endif

-

-#ifndef _WIN32_WCE

-bool MyGetLogicalDriveStrings(CSysStringVector &driveStrings)

-{

-  driveStrings.Clear();

-  UINT32 size = GetLogicalDriveStrings(0, NULL); 

-  if(size == 0)

-    return false;

-  CSysString buffer;

-  UINT32 newSize = GetLogicalDriveStrings(size, buffer.GetBuffer(size)); 

-  if(newSize == 0)

-    return false;

-  if(newSize > size)

-    return false;

-  CSysString string;

-  for(UINT32 i = 0; i < newSize; i++)

-  {

-    TCHAR c = buffer[i];

-    if(c == TEXT('\0'))

-    {

-      driveStrings.Add(string);

-      string.Empty();

-    }

-    else

-      string += c;

-  }

-  if(!string.IsEmpty())

-    return false;

-  return true;

-}

-

-#ifndef _UNICODE

-bool MyGetLogicalDriveStrings(UStringVector &driveStrings)

-{

-  driveStrings.Clear();

-  if (g_IsNT)

-  {

-    UINT32 size = GetLogicalDriveStringsW(0, NULL); 

-    if (size == 0)

-      return false;

-    UString buffer;

-    UINT32 newSize = GetLogicalDriveStringsW(size, buffer.GetBuffer(size)); 

-    if(newSize == 0)

-      return false;

-    if(newSize > size)

-      return false;

-    UString string;

-    for(UINT32 i = 0; i < newSize; i++)

-    {

-      WCHAR c = buffer[i];

-      if(c == L'\0')

-      {

-        driveStrings.Add(string);

-        string.Empty();

-      }

-      else

-        string += c;

-    }

-    return string.IsEmpty();

-  }

-  CSysStringVector driveStringsA;

-  bool res = MyGetLogicalDriveStrings(driveStringsA);

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

-    driveStrings.Add(GetUnicodeString(driveStringsA[i]));

-  return res;

-}

-#endif

-

-#endif

-

-}}}

diff --git a/other-licenses/7zstub/src/Windows/FileFind.h b/other-licenses/7zstub/src/Windows/FileFind.h
deleted file mode 100644
index 19c8fe3ed..000000000
--- a/other-licenses/7zstub/src/Windows/FileFind.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// Windows/FileFind.h

-

-#ifndef __WINDOWS_FILEFIND_H

-#define __WINDOWS_FILEFIND_H

-

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

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

-#include "FileName.h"

-#include "Defs.h"

-

-namespace NWindows {

-namespace NFile {

-namespace NFind {

-

-namespace NAttributes

-{

-  inline bool IsReadOnly(DWORD attributes) { return (attributes & FILE_ATTRIBUTE_READONLY) != 0; }

-  inline bool IsHidden(DWORD attributes) { return (attributes & FILE_ATTRIBUTE_HIDDEN) != 0; }

-  inline bool IsSystem(DWORD attributes) { return (attributes & FILE_ATTRIBUTE_SYSTEM) != 0; }

-  inline bool IsDirectory(DWORD attributes) { return (attributes & FILE_ATTRIBUTE_DIRECTORY) != 0; }

-  inline bool IsArchived(DWORD attributes) { return (attributes & FILE_ATTRIBUTE_ARCHIVE) != 0; }

-  inline bool IsCompressed(DWORD attributes) { return (attributes & FILE_ATTRIBUTE_COMPRESSED) != 0; }

-  inline bool IsEncrypted(DWORD attributes) { return (attributes & FILE_ATTRIBUTE_ENCRYPTED) != 0; }

-}

-

-class CFileInfoBase

-{ 

-  bool MatchesMask(UINT32 mask) const  { return ((Attributes & mask) != 0); }

-public:

-  DWORD Attributes;

-  FILETIME CreationTime;  

-  FILETIME LastAccessTime; 

-  FILETIME LastWriteTime;

-  UInt64 Size;

-  

-  #ifndef _WIN32_WCE

-  UINT32 ReparseTag;

-  #else

-  DWORD ObjectID; 

-  #endif

-

-  bool IsArchived() const { return MatchesMask(FILE_ATTRIBUTE_ARCHIVE); }

-  bool IsCompressed() const { return MatchesMask(FILE_ATTRIBUTE_COMPRESSED); }

-  bool IsDirectory() const { return MatchesMask(FILE_ATTRIBUTE_DIRECTORY); }

-  bool IsEncrypted() const { return MatchesMask(FILE_ATTRIBUTE_ENCRYPTED); }

-  bool IsHidden() const { return MatchesMask(FILE_ATTRIBUTE_HIDDEN); }

-  bool IsNormal() const { return MatchesMask(FILE_ATTRIBUTE_NORMAL); }

-  bool IsOffline() const { return MatchesMask(FILE_ATTRIBUTE_OFFLINE); }

-  bool IsReadOnly() const { return MatchesMask(FILE_ATTRIBUTE_READONLY); }

-  bool HasReparsePoint() const { return MatchesMask(FILE_ATTRIBUTE_REPARSE_POINT); }

-  bool IsSparse() const { return MatchesMask(FILE_ATTRIBUTE_SPARSE_FILE); }

-  bool IsSystem() const { return MatchesMask(FILE_ATTRIBUTE_SYSTEM); }

-  bool IsTemporary() const { return MatchesMask(FILE_ATTRIBUTE_TEMPORARY); }

-};

-

-class CFileInfo: public CFileInfoBase

-{ 

-public:

-  CSysString Name;

-  bool IsDots() const;

-};

-

-#ifdef _UNICODE

-typedef CFileInfo CFileInfoW;

-#else

-class CFileInfoW: public CFileInfoBase

-{ 

-public:

-  UString Name;

-  bool IsDots() const;

-};

-#endif

-

-class CFindFile

-{

-  friend class CEnumerator;

-  HANDLE _handle;

-  bool _handleAllocated;

-public:

-  bool IsHandleAllocated() const { return _handleAllocated; }

-  CFindFile(): _handleAllocated(false) {}

-  ~CFindFile() {  Close(); }

-  bool FindFirst(LPCTSTR wildcard, CFileInfo &fileInfo);

-  bool FindNext(CFileInfo &fileInfo);

-  #ifndef _UNICODE

-  bool FindFirst(LPCWSTR wildcard, CFileInfoW &fileInfo);

-  bool FindNext(CFileInfoW &fileInfo);

-  #endif

-  bool Close();

-};

-

-bool FindFile(LPCTSTR wildcard, CFileInfo &fileInfo);

-

-bool DoesFileExist(LPCTSTR name);

-#ifndef _UNICODE

-bool FindFile(LPCWSTR wildcard, CFileInfoW &fileInfo);

-bool DoesFileExist(LPCWSTR name);

-#endif

-

-class CEnumerator

-{

-  CFindFile _findFile;

-  CSysString _wildcard;

-  bool NextAny(CFileInfo &fileInfo);

-public:

-  CEnumerator(): _wildcard(NName::kAnyStringWildcard) {}

-  CEnumerator(const CSysString &wildcard): _wildcard(wildcard) {}

-  bool Next(CFileInfo &fileInfo);

-  bool Next(CFileInfo &fileInfo, bool &found);

-};

-

-#ifdef _UNICODE

-typedef CEnumerator CEnumeratorW;

-#else

-class CEnumeratorW

-{

-  CFindFile _findFile;

-  UString _wildcard;

-  bool NextAny(CFileInfoW &fileInfo);

-public:

-  CEnumeratorW(): _wildcard(NName::kAnyStringWildcard) {}

-  CEnumeratorW(const UString &wildcard): _wildcard(wildcard) {}

-  bool Next(CFileInfoW &fileInfo);

-  bool Next(CFileInfoW &fileInfo, bool &found);

-};

-#endif

-

-class CFindChangeNotification

-{

-  HANDLE _handle;

-public:

-  operator HANDLE () { return _handle; }

-  CFindChangeNotification(): _handle(INVALID_HANDLE_VALUE) {}

-  ~CFindChangeNotification() {  Close(); }

-  bool Close();

-  HANDLE FindFirst(LPCTSTR pathName, bool watchSubtree, DWORD notifyFilter);

-  #ifndef _UNICODE

-  HANDLE FindFirst(LPCWSTR pathName, bool watchSubtree, DWORD notifyFilter);

-  #endif

-  bool FindNext()

-    { return BOOLToBool(::FindNextChangeNotification(_handle)); }

-};

-

-#ifndef _WIN32_WCE

-bool MyGetLogicalDriveStrings(CSysStringVector &driveStrings);

-#ifndef _UNICODE

-bool MyGetLogicalDriveStrings(UStringVector &driveStrings);

-#endif

-#endif

-

-inline bool MyGetCompressedFileSize(LPCTSTR fileName, UInt64 &size)

-{

-  DWORD highPart;

-  DWORD lowPart = ::GetCompressedFileSize(fileName, &highPart);

-  if (lowPart == INVALID_FILE_SIZE)

-    if (::GetLastError() != NO_ERROR)

-      return false;

-  size = (UInt64(highPart) << 32) | lowPart;

-  return true;

-}

-

-inline bool MyGetCompressedFileSizeW(LPCWSTR fileName, UInt64 &size)

-{

-  DWORD highPart;

-  DWORD lowPart = ::GetCompressedFileSizeW(fileName, &highPart);

-  if (lowPart == INVALID_FILE_SIZE)

-    if (::GetLastError() != NO_ERROR)

-      return false;

-  size = (UInt64(highPart) << 32) | lowPart;

-  return true;

-}

-

-}}}

-

-#endif

-

diff --git a/other-licenses/7zstub/src/Windows/FileIO.cpp b/other-licenses/7zstub/src/Windows/FileIO.cpp
deleted file mode 100644
index 20b5fc159..000000000
--- a/other-licenses/7zstub/src/Windows/FileIO.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-// Windows/FileIO.cpp

-

-#include "StdAfx.h"

-

-#include "FileIO.h"

-#include "Defs.h"

-#ifndef _UNICODE

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

-#endif

-

-#ifndef _UNICODE

-extern bool g_IsNT;

-#endif

-

-namespace NWindows {

-namespace NFile {

-namespace NIO {

-

-CFileBase::~CFileBase() { Close(); }

-

-bool CFileBase::Create(LPCTSTR fileName, DWORD desiredAccess,

-    DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes)

-{

-  Close();

-  _handle = ::CreateFile(fileName, desiredAccess, shareMode, 

-      (LPSECURITY_ATTRIBUTES)NULL, creationDisposition, 

-      flagsAndAttributes, (HANDLE) NULL);

-  return (_fileIsOpen = (_handle != INVALID_HANDLE_VALUE));

-}

-

-#ifndef _UNICODE

-bool CFileBase::Create(LPCWSTR fileName, DWORD desiredAccess,

-    DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes)

-{

-  if (g_IsNT)

-  {

-    Close();

-    _handle = ::CreateFileW(fileName, desiredAccess, shareMode, 

-      (LPSECURITY_ATTRIBUTES)NULL, creationDisposition, 

-      flagsAndAttributes, (HANDLE) NULL);

-    return (_fileIsOpen = (_handle != INVALID_HANDLE_VALUE));

-  }

-  return Create(UnicodeStringToMultiByte(fileName, ::AreFileApisANSI() ? CP_ACP : CP_OEMCP), 

-    desiredAccess, shareMode, creationDisposition, flagsAndAttributes);

-}

-#endif

-

-bool CFileBase::Close()

-{

-  if(!_fileIsOpen)

-    return true;

-  bool result = BOOLToBool(::CloseHandle(_handle));

-  _fileIsOpen = !result;

-  return result;

-}

-

-bool CFileBase::GetPosition(UInt64 &position) const

-{

-  return Seek(0, FILE_CURRENT, position);

-}

-

-bool CFileBase::GetLength(UInt64 &length) const

-{

-  DWORD sizeHigh;

-  DWORD sizeLow = ::GetFileSize(_handle, &sizeHigh);

-  if(sizeLow == 0xFFFFFFFF)

-    if(::GetLastError() != NO_ERROR)

-      return false;

-  length = (((UInt64)sizeHigh) << 32) + sizeLow;

-  return true;

-}

-

-bool CFileBase::Seek(Int64 distanceToMove, DWORD moveMethod, UInt64 &newPosition) const

-{

-  LARGE_INTEGER value;

-  value.QuadPart = distanceToMove;

-  value.LowPart = ::SetFilePointer(_handle, value.LowPart, &value.HighPart, moveMethod);

-  if (value.LowPart == 0xFFFFFFFF)

-    if(::GetLastError() != NO_ERROR) 

-      return false;

-  newPosition = value.QuadPart;

-  return true;

-}

-

-bool CFileBase::Seek(UInt64 position, UInt64 &newPosition)

-{

-  return Seek(position, FILE_BEGIN, newPosition);

-}

-

-bool CFileBase::SeekToBegin()

-{

-  UInt64 newPosition;

-  return Seek(0, newPosition);

-}

-

-bool CFileBase::SeekToEnd(UInt64 &newPosition)

-{

-  return Seek(0, FILE_END, newPosition);

-}

-

-bool CFileBase::GetFileInformation(CByHandleFileInfo &fileInfo) const

-{

-  BY_HANDLE_FILE_INFORMATION winFileInfo;

-  if(!::GetFileInformationByHandle(_handle, &winFileInfo))

-    return false;

-  fileInfo.Attributes = winFileInfo.dwFileAttributes;

-  fileInfo.CreationTime = winFileInfo.ftCreationTime;

-  fileInfo.LastAccessTime = winFileInfo.ftLastAccessTime;

-  fileInfo.LastWriteTime = winFileInfo.ftLastWriteTime;

-  fileInfo.VolumeSerialNumber = winFileInfo.dwFileAttributes; 

-  fileInfo.Size = (((UInt64)winFileInfo.nFileSizeHigh) << 32) +  winFileInfo.nFileSizeLow;

-  fileInfo.NumberOfLinks = winFileInfo.nNumberOfLinks;

-  fileInfo.FileIndex = (((UInt64)winFileInfo.nFileIndexHigh) << 32) + winFileInfo.nFileIndexLow;

-  return true;

-}

-

-/////////////////////////

-// CInFile

-

-bool CInFile::Open(LPCTSTR fileName, DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes)

-  { return Create(fileName, GENERIC_READ, shareMode, creationDisposition, flagsAndAttributes); }

-

-bool CInFile::Open(LPCTSTR fileName)

-  { return Open(fileName, FILE_SHARE_READ, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL); }

-

-#ifndef _UNICODE

-bool CInFile::Open(LPCWSTR fileName, DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes)

-  { return Create(fileName, GENERIC_READ, shareMode, creationDisposition, flagsAndAttributes); }

-

-bool CInFile::Open(LPCWSTR fileName)

-  { return Open(fileName, FILE_SHARE_READ, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL); }

-#endif

-

-// ReadFile and WriteFile functions in Windows have BUG:

-// If you Read or Write 64MB or more (probably min_failure_size = 64MB - 32KB + 1) 

-// from/to Network file, it returns ERROR_NO_SYSTEM_RESOURCES 

-// (Insufficient system resources exist to complete the requested service).

-

-static UInt32 kChunkSizeMax = (1 << 24);

-

-bool CInFile::ReadPart(void *data, UInt32 size, UInt32 &processedSize)

-{

-  if (size > kChunkSizeMax)

-    size = kChunkSizeMax;

-  DWORD processedLoc = 0;

-  bool res = BOOLToBool(::ReadFile(_handle, data, size, &processedLoc, NULL));

-  processedSize = (UInt32)processedLoc;

-  return res;

-}

-

-bool CInFile::Read(void *data, UInt32 size, UInt32 &processedSize)

-{

-  processedSize = 0;

-  do

-  {

-    UInt32 processedLoc = 0;

-    bool res = ReadPart(data, size, processedLoc);

-    processedSize += processedLoc;

-    if (!res)

-      return false;

-    if (processedLoc == 0)

-      return true;

-    data = (void *)((unsigned char *)data + processedLoc);

-    size -= processedLoc;

-  }

-  while (size > 0);

-  return true;

-}

-

-/////////////////////////

-// COutFile

-

-bool COutFile::Open(LPCTSTR fileName, DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes)

-  { return CFileBase::Create(fileName, GENERIC_WRITE, shareMode, creationDisposition, flagsAndAttributes); }

-

-static inline DWORD GetCreationDisposition(bool createAlways)

-  { return createAlways? CREATE_ALWAYS: CREATE_NEW; }

-

-bool COutFile::Open(LPCTSTR fileName, DWORD creationDisposition)

-  { return Open(fileName, FILE_SHARE_READ, creationDisposition, FILE_ATTRIBUTE_NORMAL); }

-

-bool COutFile::Create(LPCTSTR fileName, bool createAlways)

-  { return Open(fileName, GetCreationDisposition(createAlways)); }

-

-#ifndef _UNICODE

-

-bool COutFile::Open(LPCWSTR fileName, DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes)

-  { return CFileBase::Create(fileName, GENERIC_WRITE, shareMode,      creationDisposition, flagsAndAttributes); }

-

-bool COutFile::Open(LPCWSTR fileName, DWORD creationDisposition)

-  { return Open(fileName, FILE_SHARE_READ,  creationDisposition, FILE_ATTRIBUTE_NORMAL); }

-

-bool COutFile::Create(LPCWSTR fileName, bool createAlways)

-  { return Open(fileName, GetCreationDisposition(createAlways)); }

-

-#endif

-

-bool COutFile::SetTime(const FILETIME *creationTime, const FILETIME *lastAccessTime, const FILETIME *lastWriteTime)

-  { return BOOLToBool(::SetFileTime(_handle, creationTime, lastAccessTime, lastWriteTime)); }

-

-bool COutFile::SetLastWriteTime(const FILETIME *lastWriteTime)

-  {  return SetTime(NULL, NULL, lastWriteTime); }

-

-bool COutFile::WritePart(const void *data, UInt32 size, UInt32 &processedSize)

-{

-  if (size > kChunkSizeMax)

-    size = kChunkSizeMax;

-  DWORD processedLoc = 0;

-  bool res = BOOLToBool(::WriteFile(_handle, data, size, &processedLoc, NULL));

-  processedSize = (UInt32)processedLoc;

-  return res;

-}

-

-bool COutFile::Write(const void *data, UInt32 size, UInt32 &processedSize)

-{

-  processedSize = 0;

-  do

-  {

-    UInt32 processedLoc = 0;

-    bool res = WritePart(data, size, processedLoc);

-    processedSize += processedLoc;

-    if (!res)

-      return false;

-    if (processedLoc == 0)

-      return true;

-    data = (const void *)((const unsigned char *)data + processedLoc);

-    size -= processedLoc;

-  }

-  while (size > 0);

-  return true;

-}

-

-bool COutFile::SetEndOfFile() { return BOOLToBool(::SetEndOfFile(_handle)); }

-

-bool COutFile::SetLength(UInt64 length)

-{

-  UInt64 newPosition;

-  if(!Seek(length, newPosition))

-    return false;

-  if(newPosition != length)

-    return false;

-  return SetEndOfFile();

-}

-

-}}}

diff --git a/other-licenses/7zstub/src/Windows/FileIO.h b/other-licenses/7zstub/src/Windows/FileIO.h
deleted file mode 100644
index de66d7f3a..000000000
--- a/other-licenses/7zstub/src/Windows/FileIO.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Windows/FileIO.h

-

-#ifndef __WINDOWS_FILEIO_H

-#define __WINDOWS_FILEIO_H

-

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

-

-namespace NWindows {

-namespace NFile {

-namespace NIO {

-

-struct CByHandleFileInfo

-{ 

-  DWORD    Attributes; 

-  FILETIME CreationTime; 

-  FILETIME LastAccessTime; 

-  FILETIME LastWriteTime; 

-  DWORD    VolumeSerialNumber; 

-  UInt64   Size;

-  DWORD    NumberOfLinks; 

-  UInt64   FileIndex; 

-};

-

-class CFileBase

-{

-protected:

-  bool _fileIsOpen;

-  HANDLE _handle;

-  bool Create(LPCTSTR fileName, DWORD desiredAccess,

-      DWORD shareMode, DWORD creationDisposition,  DWORD flagsAndAttributes);

-  #ifndef _UNICODE

-  bool Create(LPCWSTR fileName, DWORD desiredAccess,

-      DWORD shareMode, DWORD creationDisposition,  DWORD flagsAndAttributes);

-  #endif

-

-public:

-  CFileBase(): _fileIsOpen(false){};

-  virtual ~CFileBase();

-

-  virtual bool Close();

-

-  bool GetPosition(UInt64 &position) const;

-  bool GetLength(UInt64 &length) const;

-

-  bool Seek(Int64 distanceToMove, DWORD moveMethod, UInt64 &newPosition) const;

-  bool Seek(UInt64 position, UInt64 &newPosition); 

-  bool SeekToBegin(); 

-  bool SeekToEnd(UInt64 &newPosition); 

-  

-  bool GetFileInformation(CByHandleFileInfo &fileInfo) const;

-};

-

-class CInFile: public CFileBase

-{

-public:

-  bool Open(LPCTSTR fileName, DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes);

-  bool Open(LPCTSTR fileName);

-  #ifndef _UNICODE

-  bool Open(LPCWSTR fileName, DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes);

-  bool Open(LPCWSTR fileName);

-  #endif

-  bool ReadPart(void *data, UInt32 size, UInt32 &processedSize);

-  bool Read(void *data, UInt32 size, UInt32 &processedSize);

-};

-

-class COutFile: public CFileBase

-{

-  // DWORD m_CreationDisposition;

-public:

-  // COutFile(): m_CreationDisposition(CREATE_NEW){};

-  bool Open(LPCTSTR fileName, DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes);

-  bool Open(LPCTSTR fileName, DWORD creationDisposition);

-  bool Create(LPCTSTR fileName, bool createAlways);

-

-  #ifndef _UNICODE

-  bool Open(LPCWSTR fileName, DWORD shareMode, DWORD creationDisposition, DWORD flagsAndAttributes);

-  bool Open(LPCWSTR fileName, DWORD creationDisposition);

-  bool Create(LPCWSTR fileName, bool createAlways);

-  #endif

-

-  /*

-  void SetOpenCreationDisposition(DWORD creationDisposition)

-    { m_CreationDisposition = creationDisposition; }

-  void SetOpenCreationDispositionCreateAlways()

-    { m_CreationDisposition = CREATE_ALWAYS; }

-  */

-

-  bool SetTime(const FILETIME *creationTime, const FILETIME *lastAccessTime, const FILETIME *lastWriteTime);

-  bool SetLastWriteTime(const FILETIME *lastWriteTime);

-  bool WritePart(const void *data, UInt32 size, UInt32 &processedSize);

-  bool Write(const void *data, UInt32 size, UInt32 &processedSize);

-  bool SetEndOfFile();

-  bool SetLength(UInt64 length);

-};

-

-}}}

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/FileName.cpp b/other-licenses/7zstub/src/Windows/FileName.cpp
deleted file mode 100644
index 4a8a504e3..000000000
--- a/other-licenses/7zstub/src/Windows/FileName.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// Windows/FileName.cpp

-

-#include "StdAfx.h"

-

-#include "Windows/FileName.h"

-#include "Common/Wildcard.h"

-

-namespace NWindows {

-namespace NFile {

-namespace NName {

-

-static const wchar_t kDiskDelimiter = L':';

-

-/*

-static bool IsCharAPrefixDelimiter(wchar_t c)

-  { return (c == kDirDelimiter || c == kDiskDelimiter); }

-*/

-

-void NormalizeDirPathPrefix(CSysString &dirPath)

-{

-  if (dirPath.IsEmpty())

-    return;

-  if (dirPath.ReverseFind(kDirDelimiter) != dirPath.Length() - 1)

-    dirPath += kDirDelimiter;

-}

-

-#ifndef _UNICODE

-void NormalizeDirPathPrefix(UString &dirPath)

-{

-  if (dirPath.IsEmpty())

-    return;

-  if (dirPath.ReverseFind(wchar_t(kDirDelimiter)) != dirPath.Length() - 1)

-    dirPath += wchar_t(kDirDelimiter);

-}

-#endif

-

-namespace NPathType

-{

-  EEnum GetPathType(const UString &path)

-  {

-    if (path.Length() <= 2)

-      return kLocal;

-    if (path[0] == kDirDelimiter && path[1] == kDirDelimiter)

-      return kUNC;

-    return kLocal;

-  }

-}

-

-void CParsedPath::ParsePath(const UString &path)

-{

-  int curPos = 0;

-  switch (NPathType::GetPathType(path))

-  {

-    case NPathType::kLocal:

-    {

-      int posDiskDelimiter = path.Find(kDiskDelimiter);

-      if(posDiskDelimiter >= 0)

-      {

-        curPos = posDiskDelimiter + 1;

-        if (path.Length() > curPos)

-          if(path[curPos] == kDirDelimiter)

-            curPos++;

-      }

-      break;

-    }

-    case NPathType::kUNC:

-    {

-      int curPos = path.Find(kDirDelimiter, 2);

-      if(curPos < 0)

-        curPos = path.Length();

-      else

-        curPos++;

-    }

-  }

-  Prefix = path.Left(curPos);

-  SplitPathToParts(path.Mid(curPos), PathParts);

-}

-

-UString CParsedPath::MergePath() const

-{

-  UString result = Prefix;

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

-  {

-    if (i != 0)

-      result += kDirDelimiter;

-    result += PathParts[i];

-  }

-  return result;

-}

-

-const wchar_t kExtensionDelimiter = L'.';

-

-void SplitNameToPureNameAndExtension(const UString &fullName, 

-    UString &pureName, UString &extensionDelimiter, UString &extension)

-{

-  int index = fullName.ReverseFind(kExtensionDelimiter);

-  if (index < 0)

-  {

-    pureName = fullName;

-    extensionDelimiter.Empty();

-    extension.Empty();

-  }

-  else

-  {

-    pureName = fullName.Left(index);

-    extensionDelimiter = kExtensionDelimiter;

-    extension = fullName.Mid(index + 1);

-  }

-}

-

-}}}

diff --git a/other-licenses/7zstub/src/Windows/FileName.h b/other-licenses/7zstub/src/Windows/FileName.h
deleted file mode 100644
index a4e9f36c3..000000000
--- a/other-licenses/7zstub/src/Windows/FileName.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Windows/FileName.h

-

-#ifndef __WINDOWS_FILENAME_H

-#define __WINDOWS_FILENAME_H

-

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

-

-namespace NWindows {

-namespace NFile {

-namespace NName {

-

-const TCHAR kDirDelimiter = CHAR_PATH_SEPARATOR;

-const TCHAR kAnyStringWildcard = '*';

-

-void NormalizeDirPathPrefix(CSysString &dirPath); // ensures that it ended with '\\'

-#ifndef _UNICODE

-void NormalizeDirPathPrefix(UString &dirPath); // ensures that it ended with '\\'

-#endif

-

-namespace NPathType

-{

-  enum EEnum

-  {

-    kLocal,

-    kUNC

-  };

-  EEnum GetPathType(const UString &path);

-}

-

-struct CParsedPath

-{

-  UString Prefix; // Disk or UNC with slash

-  UStringVector PathParts;

-  void ParsePath(const UString &path);

-  UString MergePath() const;

-};

-

-void SplitNameToPureNameAndExtension(const UString &fullName, 

-    UString &pureName, UString &extensionDelimiter, UString &extension); 

-

-}}}

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/Handle.h b/other-licenses/7zstub/src/Windows/Handle.h
deleted file mode 100644
index 9e559e89e..000000000
--- a/other-licenses/7zstub/src/Windows/Handle.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Windows/Handle.h

-

-#ifndef __WINDOWS_HANDLE_H

-#define __WINDOWS_HANDLE_H

-

-namespace NWindows {

-

-class CHandle

-{

-protected:

-  HANDLE _handle;

-public:

-  operator HANDLE() { return _handle; }

-  CHandle(): _handle(NULL) {}

-  ~CHandle() { Close(); }

-  bool Close()

-  {

-    if (_handle == NULL)

-      return true;

-    if (!::CloseHandle(_handle))

-      return false;

-    _handle = NULL;

-    return true;

-  }

-  void Attach(HANDLE handle) 

-    { _handle = handle; }

-  HANDLE Detach() 

-  { 

-    HANDLE handle = _handle;

-    _handle = NULL; 

-    return handle;

-  }

-};

-

-}

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/PropVariant.cpp b/other-licenses/7zstub/src/Windows/PropVariant.cpp
deleted file mode 100644
index a4bfdd35b..000000000
--- a/other-licenses/7zstub/src/Windows/PropVariant.cpp
+++ /dev/null
@@ -1,310 +0,0 @@
-// Windows/PropVariant.cpp

-

-#include "StdAfx.h"

-

-#include "PropVariant.h"

-

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

-

-namespace NWindows {

-namespace NCOM {

-

-CPropVariant::CPropVariant(const PROPVARIANT& varSrc)

-{

-  vt = VT_EMPTY;

-  InternalCopy(&varSrc);

-}

-

-CPropVariant::CPropVariant(const CPropVariant& varSrc)

-{

-  vt = VT_EMPTY;

-  InternalCopy(&varSrc);

-}

-

-CPropVariant::CPropVariant(BSTR bstrSrc)

-{

-  vt = VT_EMPTY;

-  *this = bstrSrc;

-}

-

-CPropVariant::CPropVariant(LPCOLESTR lpszSrc)

-{

-  vt = VT_EMPTY;

-  *this = lpszSrc;

-}

-

-CPropVariant& CPropVariant::operator=(const CPropVariant& varSrc)

-{

-  InternalCopy(&varSrc);

-  return *this;

-}

-CPropVariant& CPropVariant::operator=(const PROPVARIANT& varSrc)

-{

-  InternalCopy(&varSrc);

-  return *this;

-}

-

-CPropVariant& CPropVariant::operator=(BSTR bstrSrc)

-{

-  *this = (LPCOLESTR)bstrSrc;

-  return *this;

-}

-

-CPropVariant& CPropVariant::operator=(LPCOLESTR lpszSrc)

-{

-  InternalClear();

-  vt = VT_BSTR;

-  bstrVal = ::SysAllocString(lpszSrc);

-  if (bstrVal == NULL && lpszSrc != NULL)

-  {

-    vt = VT_ERROR;

-    scode = E_OUTOFMEMORY;

-  }

-  return *this;

-}

-

-

-CPropVariant& CPropVariant::operator=(bool bSrc)

-{

-  if (vt != VT_BOOL)

-  {

-    InternalClear();

-    vt = VT_BOOL;

-  }

-  boolVal = bSrc ? VARIANT_TRUE : VARIANT_FALSE;

-  return *this;

-}

-

-CPropVariant& CPropVariant::operator=(UInt32 value)

-{

-  if (vt != VT_UI4)

-  {

-    InternalClear();

-    vt = VT_UI4;

-  }

-  ulVal = value;

-  return *this;

-}

-

-CPropVariant& CPropVariant::operator=(UInt64 value)

-{

-  if (vt != VT_UI8)

-  {

-    InternalClear();

-    vt = VT_UI8;

-  }

-  uhVal.QuadPart = value;

-  return *this;

-}

-

-CPropVariant& CPropVariant::operator=(const FILETIME &value)

-{

-  if (vt != VT_FILETIME)

-  {

-    InternalClear();

-    vt = VT_FILETIME;

-  }

-  filetime = value;

-  return *this;

-}

-

-CPropVariant& CPropVariant::operator=(Int32 value)

-{

-  if (vt != VT_I4)

-  {

-    InternalClear();

-    vt = VT_I4;

-  }

-  lVal = value;

-  

-  return *this;

-}

-

-CPropVariant& CPropVariant::operator=(Byte value)

-{

-  if (vt != VT_UI1)

-  {

-    InternalClear();

-    vt = VT_UI1;

-  }

-  bVal = value;

-  return *this;

-}

-

-CPropVariant& CPropVariant::operator=(Int16 value)

-{

-  if (vt != VT_I2)

-  {

-    InternalClear();

-    vt = VT_I2;

-  }

-  iVal = value;

-  return *this;

-}

-

-/*

-CPropVariant& CPropVariant::operator=(LONG value)

-{

-  if (vt != VT_I4)

-  {

-    InternalClear();

-    vt = VT_I4;

-  }

-  lVal = value;

-  return *this;

-}

-*/

-

-static HRESULT MyPropVariantClear(PROPVARIANT *propVariant) 

-{ 

-  switch(propVariant->vt)

-  {

-    case VT_UI1:

-    case VT_I1:

-    case VT_I2:

-    case VT_UI2:

-    case VT_BOOL:

-    case VT_I4:

-    case VT_UI4:

-    case VT_R4:

-    case VT_INT:

-    case VT_UINT:

-    case VT_ERROR:

-    case VT_FILETIME:

-    case VT_UI8:

-    case VT_R8:

-    case VT_CY:

-    case VT_DATE:

-      propVariant->vt = VT_EMPTY;

-      return S_OK;

-  }

-  return ::VariantClear((VARIANTARG *)propVariant); 

-}

-

-HRESULT CPropVariant::Clear() 

-{ 

-  return MyPropVariantClear(this);

-}

-

-HRESULT CPropVariant::Copy(const PROPVARIANT* pSrc) 

-{ 

-  ::VariantClear((tagVARIANT *)this); 

-  switch(pSrc->vt)

-  {

-    case VT_UI1:

-    case VT_I1:

-    case VT_I2:

-    case VT_UI2:

-    case VT_BOOL:

-    case VT_I4:

-    case VT_UI4:

-    case VT_R4:

-    case VT_INT:

-    case VT_UINT:

-    case VT_ERROR:

-    case VT_FILETIME:

-    case VT_UI8:

-    case VT_R8:

-    case VT_CY:

-    case VT_DATE:

-      memmove((PROPVARIANT*)this, pSrc, sizeof(PROPVARIANT));

-      return S_OK;

-  }

-  return ::VariantCopy((tagVARIANT *)this, (tagVARIANT *)(pSrc)); 

-}

-

-

-HRESULT CPropVariant::Attach(PROPVARIANT* pSrc)

-{

-  HRESULT hr = Clear();

-  if (FAILED(hr))

-    return hr;

-  memcpy(this, pSrc, sizeof(PROPVARIANT));

-  pSrc->vt = VT_EMPTY;

-  return S_OK;

-}

-

-HRESULT CPropVariant::Detach(PROPVARIANT* pDest)

-{

-  HRESULT hr = MyPropVariantClear(pDest);

-  if (FAILED(hr))

-    return hr;

-  memcpy(pDest, this, sizeof(PROPVARIANT));

-  vt = VT_EMPTY;

-  return S_OK;

-}

-

-HRESULT CPropVariant::InternalClear()

-{

-  HRESULT hr = Clear();

-  if (FAILED(hr))

-  {

-    vt = VT_ERROR;

-    scode = hr;

-  }

-  return hr;

-}

-

-void CPropVariant::InternalCopy(const PROPVARIANT* pSrc)

-{

-  HRESULT hr = Copy(pSrc);

-  if (FAILED(hr))

-  {

-    vt = VT_ERROR;

-    scode = hr;

-  }

-}

-

-int CPropVariant::Compare(const CPropVariant &a)

-{

-  if(vt != a.vt)

-    return 0; // it's mean some bug

-  switch (vt)

-  {

-    case VT_EMPTY:

-      return 0;

-    

-    /*

-    case VT_I1:

-      return MyCompare(cVal, a.cVal);

-    */

-    case VT_UI1:

-      return MyCompare(bVal, a.bVal);

-

-    case VT_I2:

-      return MyCompare(iVal, a.iVal);

-    case VT_UI2:

-      return MyCompare(uiVal, a.uiVal);

-    

-    case VT_I4:

-      return MyCompare(lVal, a.lVal);

-    /*

-    case VT_INT:

-      return MyCompare(intVal, a.intVal);

-    */

-    case VT_UI4:

-      return MyCompare(ulVal, a.ulVal);

-    /*

-    case VT_UINT:

-      return MyCompare(uintVal, a.uintVal);

-    */

-    case VT_I8:

-      return MyCompare(hVal.QuadPart, a.hVal.QuadPart);

-    case VT_UI8:

-      return MyCompare(uhVal.QuadPart, a.uhVal.QuadPart);

-

-    case VT_BOOL:    

-      return -MyCompare(boolVal, a.boolVal);

-

-    case VT_FILETIME:

-      return ::CompareFileTime(&filetime, &a.filetime);

-    case VT_BSTR:

-      return 0; // Not implemented 

-      // return MyCompare(aPropVarint.cVal);

-

-    default:

-      return 0;

-  }

-}

-

-}}

diff --git a/other-licenses/7zstub/src/Windows/PropVariant.h b/other-licenses/7zstub/src/Windows/PropVariant.h
deleted file mode 100644
index 604a4b11b..000000000
--- a/other-licenses/7zstub/src/Windows/PropVariant.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Windows/PropVariant.h

-

-#ifndef __WINDOWS_PROPVARIANT_H

-#define __WINDOWS_PROPVARIANT_H

-

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

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

-

-namespace NWindows {

-namespace NCOM {

-

-class CPropVariant : public tagPROPVARIANT

-{

-public:

-  CPropVariant() { vt = VT_EMPTY; }

-  ~CPropVariant() { Clear(); }

-  CPropVariant(const PROPVARIANT& varSrc);

-  CPropVariant(const CPropVariant& varSrc);

-  CPropVariant(BSTR bstrSrc);

-  CPropVariant(LPCOLESTR lpszSrc);

-  CPropVariant(bool bSrc) { vt = VT_BOOL; boolVal = (bSrc ? VARIANT_TRUE : VARIANT_FALSE); };

-  CPropVariant(UInt32 value) {  vt = VT_UI4; ulVal = value; }

-  CPropVariant(UInt64 value) {  vt = VT_UI8; uhVal = *(ULARGE_INTEGER*)&value; }

-  CPropVariant(const FILETIME &value) {  vt = VT_FILETIME; filetime = value; }

-  CPropVariant(Int32 value) { vt = VT_I4; lVal = value; }

-  CPropVariant(Byte value) { vt = VT_UI1; bVal = value; }

-  CPropVariant(Int16 value) { vt = VT_I2; iVal = value; }

-  // CPropVariant(LONG value, VARTYPE vtSrc = VT_I4) { vt = vtSrc; lVal = value; }

-

-  CPropVariant& operator=(const CPropVariant& varSrc);

-  CPropVariant& operator=(const PROPVARIANT& varSrc);

-  CPropVariant& operator=(BSTR bstrSrc);

-  CPropVariant& operator=(LPCOLESTR lpszSrc);

-  CPropVariant& operator=(bool bSrc);

-  CPropVariant& operator=(UInt32 value);

-  CPropVariant& operator=(UInt64 value);

-  CPropVariant& operator=(const FILETIME &value);

-

-  CPropVariant& operator=(Int32 value);

-  CPropVariant& operator=(Byte value);

-  CPropVariant& operator=(Int16 value);

-  // CPropVariant& operator=(LONG  value);

-

-  HRESULT Clear();

-  HRESULT Copy(const PROPVARIANT* pSrc);

-  HRESULT Attach(PROPVARIANT* pSrc);

-  HRESULT Detach(PROPVARIANT* pDest);

-

-  HRESULT InternalClear();

-  void InternalCopy(const PROPVARIANT* pSrc);

-

-  int Compare(const CPropVariant &a1);

-};

-

-}}

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/PropVariantConversions.cpp b/other-licenses/7zstub/src/Windows/PropVariantConversions.cpp
deleted file mode 100644
index acf7955cb..000000000
--- a/other-licenses/7zstub/src/Windows/PropVariantConversions.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// PropVariantConversions.cpp

-

-#include "StdAfx.h"

-

-#include <stdio.h>

-

-#include "PropVariantConversions.h"

-

-#include "Windows/Defs.h"

-

-#include "Common/StringConvert.h"

-#include "Common/IntToString.h"

-

-static UString ConvertUInt64ToString(UInt64 value)

-{

-  wchar_t buffer[32];

-  ConvertUInt64ToString(value, buffer);

-  return buffer;

-}

-

-static UString ConvertInt64ToString(Int64 value)

-{

-  wchar_t buffer[32];

-  ConvertInt64ToString(value, buffer);

-  return buffer;

-}

-

-/*

-static void UIntToStringSpec(UInt32 value, char *s, int numPos)

-{

-  char s2[32];

-  ConvertUInt64ToString(value, s2);

-  int len = strlen(s2);

-  int i;

-  for (i = 0; i < numPos - len; i++)

-    s[i] = '0';

-  for (int j = 0; j < len; j++, i++)

-    s[i] = s2[j];

-  s[i] = '\0';

-}

-*/

-

-bool ConvertFileTimeToString(const FILETIME &ft, char *s, bool includeTime, bool includeSeconds)

-{

-  s[0] = '\0';

-  SYSTEMTIME st;

-  if(!BOOLToBool(FileTimeToSystemTime(&ft, &st)))

-    return false;

-  /*

-  UIntToStringSpec(st.wYear, s, 4);

-  strcat(s, "-");

-  UIntToStringSpec(st.wMonth, s + strlen(s), 2);

-  strcat(s, "-");

-  UIntToStringSpec(st.wDay, s + strlen(s), 2);

-  if (includeTime)

-  {

-    strcat(s, " ");

-    UIntToStringSpec(st.wHour, s + strlen(s), 2);

-    strcat(s, ":");

-    UIntToStringSpec(st.wMinute, s + strlen(s), 2);

-    if (includeSeconds)

-    {

-      strcat(s, ":");

-      UIntToStringSpec(st.wSecond, s + strlen(s), 2);

-    }

-  }

-  */

-  sprintf(s, "%04d-%02d-%02d", st.wYear, st.wMonth, st.wDay);

-  if (includeTime)

-  {

-    sprintf(s + strlen(s), " %02d:%02d", st.wHour, st.wMinute);

-    if (includeSeconds)

-      sprintf(s + strlen(s), ":%02d", st.wSecond);

-  }

-  return true;

-}

-

-UString ConvertFileTimeToString(const FILETIME &fileTime, bool includeTime, bool includeSeconds)

-{

-  char s[32];

-  ConvertFileTimeToString(fileTime, s,  includeTime, includeSeconds);

-  return GetUnicodeString(s);

-}

- 

-

-UString ConvertPropVariantToString(const PROPVARIANT &propVariant)

-{

-  switch (propVariant.vt)

-  {

-    case VT_EMPTY:

-      return UString();

-    case VT_BSTR:

-      return propVariant.bstrVal;

-    case VT_UI1:

-      return ConvertUInt64ToString(propVariant.bVal);

-    case VT_UI2:

-      return ConvertUInt64ToString(propVariant.uiVal);

-    case VT_UI4:

-      return ConvertUInt64ToString(propVariant.ulVal);

-    case VT_UI8:

-      return ConvertUInt64ToString(propVariant.uhVal.QuadPart);

-    case VT_FILETIME:

-      return ConvertFileTimeToString(propVariant.filetime, true, true);

-    /*

-    case VT_I1:

-      return ConvertInt64ToString(propVariant.cVal);

-    */

-    case VT_I2:

-      return ConvertInt64ToString(propVariant.iVal);

-    case VT_I4:

-      return ConvertInt64ToString(propVariant.lVal);

-    case VT_I8:

-      return ConvertInt64ToString(propVariant.hVal.QuadPart);

-

-    case VT_BOOL:

-      return VARIANT_BOOLToBool(propVariant.boolVal) ? L"1" : L"0";

-    default:

-      #ifndef _WIN32_WCE

-      throw 150245;

-      #else

-      return UString();

-      #endif

-  }

-}

-

-UInt64 ConvertPropVariantToUInt64(const PROPVARIANT &propVariant)

-{

-  switch (propVariant.vt)

-  {

-    case VT_UI1:

-      return propVariant.bVal;

-    case VT_UI2:

-      return propVariant.uiVal;

-    case VT_UI4:

-      return propVariant.ulVal;

-    case VT_UI8:

-      return (UInt64)propVariant.uhVal.QuadPart;

-    default:

-      #ifndef _WIN32_WCE

-      throw 151199;

-      #else

-      return 0;

-      #endif

-  }

-}

diff --git a/other-licenses/7zstub/src/Windows/PropVariantConversions.h b/other-licenses/7zstub/src/Windows/PropVariantConversions.h
deleted file mode 100644
index ea7e72417..000000000
--- a/other-licenses/7zstub/src/Windows/PropVariantConversions.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Windows/PropVariantConversions.h

-

-#ifndef __PROPVARIANTCONVERSIONS_H

-#define __PROPVARIANTCONVERSIONS_H

-

-#include "Common/Types.h"

-#include "Common/String.h"

-

-bool ConvertFileTimeToString(const FILETIME &ft, char *s, bool includeTime = true, bool includeSeconds = true);

-UString ConvertFileTimeToString(const FILETIME &ft, bool includeTime = true, bool includeSeconds = true);

-UString ConvertPropVariantToString(const PROPVARIANT &propVariant);

-UInt64 ConvertPropVariantToUInt64(const PROPVARIANT &propVariant);

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/ResourceString.cpp b/other-licenses/7zstub/src/Windows/ResourceString.cpp
deleted file mode 100644
index 679d5ef0e..000000000
--- a/other-licenses/7zstub/src/Windows/ResourceString.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// Windows/ResourceString.cpp

-

-#include "StdAfx.h"

-

-#include "Windows/ResourceString.h"

-#ifndef _UNICODE

-#include "Common/StringConvert.h"

-#endif

-

-extern HINSTANCE g_hInstance;

-#ifndef _UNICODE

-extern bool g_IsNT;

-#endif

-

-namespace NWindows {

-

-CSysString MyLoadString(UINT resourceID)

-{

-  CSysString s;

-  int size = 256;

-  int len;

-  do

-  {

-    size += 256;

-    len = ::LoadString(g_hInstance, resourceID, s.GetBuffer(size - 1), size);

-  } 

-  while (size - len <= 1);

-  s.ReleaseBuffer();

-  return s;

-}

-

-#ifndef _UNICODE

-UString MyLoadStringW(UINT resourceID)

-{

-  if (g_IsNT)

-  {

-    UString s;

-    int size = 256;

-    int len;

-    do

-    {

-      size += 256;

-      len = ::LoadStringW(g_hInstance, resourceID, s.GetBuffer(size - 1), size);

-    } 

-    while (size - len <= 1);

-    s.ReleaseBuffer();

-    return s;

-  }

-  return GetUnicodeString(MyLoadString(resourceID));

-}

-#endif

-

-}

diff --git a/other-licenses/7zstub/src/Windows/ResourceString.h b/other-licenses/7zstub/src/Windows/ResourceString.h
deleted file mode 100644
index 3a447514f..000000000
--- a/other-licenses/7zstub/src/Windows/ResourceString.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Windows/ResourceString.h

-

-#ifndef __WINDOWS_RESOURCESTRING_H

-#define __WINDOWS_RESOURCESTRING_H

-

-#include "Common/String.h"

-

-namespace NWindows {

-

-CSysString MyLoadString(UINT resourceID);

-#ifdef _UNICODE

-inline UString MyLoadStringW(UINT resourceID)

-  { return MyLoadString(resourceID); }

-#else

-UString MyLoadStringW(UINT resourceID);

-#endif

-

-}

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/Synchronization.cpp b/other-licenses/7zstub/src/Windows/Synchronization.cpp
deleted file mode 100644
index 942d86860..000000000
--- a/other-licenses/7zstub/src/Windows/Synchronization.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Windows/Synchronization.cpp

-

-#include "StdAfx.h"

-

-#include "Synchronization.h"

-

-namespace NWindows {

-namespace NSynchronization {

-

-CEvent::CEvent(bool manualReset, bool initiallyOwn, LPCTSTR name,

-    LPSECURITY_ATTRIBUTES securityAttributes)

-{

-  if (!Create(manualReset, initiallyOwn, name, securityAttributes))

-    throw "CreateEvent error";

-}

-

-}}

diff --git a/other-licenses/7zstub/src/Windows/Synchronization.h b/other-licenses/7zstub/src/Windows/Synchronization.h
deleted file mode 100644
index aff3356be..000000000
--- a/other-licenses/7zstub/src/Windows/Synchronization.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// Windows/Synchronization.h

-

-#ifndef __WINDOWS_SYNCHRONIZATION_H

-#define __WINDOWS_SYNCHRONIZATION_H

-

-#include "Defs.h"

-#include "Handle.h"

-

-namespace NWindows {

-namespace NSynchronization {

-

-class CObject: public CHandle

-{

-public:

-  bool Lock(DWORD timeoutInterval = INFINITE)

-    { return (::WaitForSingleObject(_handle, timeoutInterval) == WAIT_OBJECT_0); }

-};

-

-class CBaseEvent: public CObject

-{

-public:

-  bool Create(bool manualReset, bool initiallyOwn, LPCTSTR name = NULL,

-      LPSECURITY_ATTRIBUTES securityAttributes = NULL)

-  {

-    _handle = ::CreateEvent(securityAttributes, BoolToBOOL(manualReset),

-        BoolToBOOL(initiallyOwn), name);

-    return (_handle != 0);

-  }

-

-  bool Open(DWORD desiredAccess, bool inheritHandle, LPCTSTR name)

-  {

-    _handle = ::OpenEvent(desiredAccess, BoolToBOOL(inheritHandle), name);

-    return (_handle != 0);

-  }

-

-  bool Set() { return BOOLToBool(::SetEvent(_handle)); }

-  bool Pulse() { return BOOLToBool(::PulseEvent(_handle)); }

-  bool Reset() { return BOOLToBool(::ResetEvent(_handle)); }

-};

-

-class CEvent: public CBaseEvent

-{

-public:

-  CEvent() {};

-  CEvent(bool manualReset, bool initiallyOwn, 

-      LPCTSTR name = NULL, LPSECURITY_ATTRIBUTES securityAttributes = NULL);

-};

-

-class CManualResetEvent: public CEvent

-{

-public:

-  CManualResetEvent(bool initiallyOwn = false, LPCTSTR name = NULL, 

-      LPSECURITY_ATTRIBUTES securityAttributes = NULL):

-    CEvent(true, initiallyOwn, name, securityAttributes) {};

-};

-

-class CAutoResetEvent: public CEvent

-{

-public:

-  CAutoResetEvent(bool initiallyOwn = false, LPCTSTR name = NULL, 

-      LPSECURITY_ATTRIBUTES securityAttributes = NULL):

-    CEvent(false, initiallyOwn, name, securityAttributes) {};

-};

-

-class CMutex: public CObject

-{

-public:

-  bool Create(bool initiallyOwn, LPCTSTR name = NULL,

-      LPSECURITY_ATTRIBUTES securityAttributes = NULL)

-  {

-    _handle = ::CreateMutex(securityAttributes, BoolToBOOL(initiallyOwn), name);

-    return (_handle != 0);

-  }

-  bool Open(DWORD desiredAccess, bool inheritHandle, LPCTSTR name)

-  {

-    _handle = ::OpenMutex(desiredAccess, BoolToBOOL(inheritHandle), name);

-    return (_handle != 0);

-  }

-  bool Release() { return BOOLToBool(::ReleaseMutex(_handle)); }

-};

-

-class CMutexLock

-{

-  CMutex &_object;

-public:

-  CMutexLock(CMutex &object): _object(object) { _object.Lock(); } 

-  ~CMutexLock() { _object.Release(); }

-};

-

-class CCriticalSection

-{

-  CRITICAL_SECTION _object;

-  // void Initialize() { ::InitializeCriticalSection(&_object); }

-  // void Delete() { ::DeleteCriticalSection(&_object); }

-public:

-  CCriticalSection() { ::InitializeCriticalSection(&_object); }

-  ~CCriticalSection() { ::DeleteCriticalSection(&_object); }

-  void Enter() { ::EnterCriticalSection(&_object); }

-  void Leave() { ::LeaveCriticalSection(&_object); }

-};

-

-class CCriticalSectionLock

-{

-  CCriticalSection &_object;

-  void Unlock()  { _object.Leave(); }

-public:

-  CCriticalSectionLock(CCriticalSection &object): _object(object) 

-    {_object.Enter(); } 

-  ~CCriticalSectionLock() { Unlock(); }

-};

-

-}}

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/Thread.h b/other-licenses/7zstub/src/Windows/Thread.h
deleted file mode 100644
index 76be6dfba..000000000
--- a/other-licenses/7zstub/src/Windows/Thread.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Windows/Thread.h

-

-#ifndef __WINDOWS_THREAD_H

-#define __WINDOWS_THREAD_H

-

-#include "Handle.h"

-#include "Defs.h"

-

-namespace NWindows {

-

-class CThread: public CHandle

-{

-  bool IsOpen() const { return _handle != 0; }

-public:

-  bool Create(LPSECURITY_ATTRIBUTES threadAttributes, 

-      SIZE_T stackSize, LPTHREAD_START_ROUTINE startAddress,

-      LPVOID parameter, DWORD creationFlags, LPDWORD threadId)

-  {

-    _handle = ::CreateThread(threadAttributes, stackSize, startAddress,

-        parameter, creationFlags, threadId);

-    return (_handle != NULL);

-  }

-  bool Create(LPTHREAD_START_ROUTINE startAddress, LPVOID parameter)

-  {

-    DWORD threadId;

-    return Create(NULL, 0, startAddress, parameter, 0, &threadId);

-  }

-  

-  DWORD Resume()

-    { return ::ResumeThread(_handle); }

-  DWORD Suspend()

-    { return ::SuspendThread(_handle); }

-  bool Terminate(DWORD exitCode)

-    { return BOOLToBool(::TerminateThread(_handle, exitCode)); }

-  

-  int GetPriority()

-    { return ::GetThreadPriority(_handle); }

-  bool SetPriority(int priority)

-    { return BOOLToBool(::SetThreadPriority(_handle, priority)); }

-

-  bool Wait() 

-  { 

-    if (!IsOpen())

-      return true;

-    return (::WaitForSingleObject(_handle, INFINITE) == WAIT_OBJECT_0); 

-  }

-

-};

-

-}

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/Time.h b/other-licenses/7zstub/src/Windows/Time.h
deleted file mode 100644
index b16602aa1..000000000
--- a/other-licenses/7zstub/src/Windows/Time.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Windows/Time.h

-

-#ifndef __WINDOWS_TIME_H

-#define __WINDOWS_TIME_H

-

-#include "Common/Types.h"

-#include "Windows/Defs.h"

-

-namespace NWindows {

-namespace NTime {

-

-inline bool DosTimeToFileTime(UInt32 dosTime, FILETIME &fileTime)

-{

-  return BOOLToBool(::DosDateTimeToFileTime(UInt16(dosTime >> 16), 

-      UInt16(dosTime & 0xFFFF), &fileTime));

-}

-

-const UInt32 kHighDosTime = 0xFF9FBF7D;

-const UInt32 kLowDosTime = 0x210000;

-

-inline bool FileTimeToDosTime(const FILETIME &fileTime, UInt32 &dosTime)

-{

-  WORD datePart, timePart;

-  if (!::FileTimeToDosDateTime(&fileTime, &datePart, &timePart))

-  {

-    if (fileTime.dwHighDateTime >= 0x01C00000) // 2000

-      dosTime = kHighDosTime;

-    else

-      dosTime = kLowDosTime;

-    return false;

-  }

-  dosTime = (((UInt32)datePart) << 16) + timePart;

-  return true;

-}

-

-const UInt32 kNumTimeQuantumsInSecond = 10000000;

-const UInt64 kUnixTimeStartValue = ((UInt64)kNumTimeQuantumsInSecond) * 60 * 60 * 24 * 134774;

-

-inline void UnixTimeToFileTime(UInt32 unixTime, FILETIME &fileTime)

-{

-  UInt64 v = kUnixTimeStartValue + ((UInt64)unixTime) * kNumTimeQuantumsInSecond;

-  fileTime.dwLowDateTime = (DWORD)v;

-  fileTime.dwHighDateTime = (DWORD)(v >> 32);

-}

-

-inline bool FileTimeToUnixTime(const FILETIME &fileTime, UInt32 &unixTime)

-{

-  UInt64 winTime = (((UInt64)fileTime.dwHighDateTime) << 32) + fileTime.dwLowDateTime;

-  if (winTime < kUnixTimeStartValue)

-  {

-    unixTime = 0;

-    return false;

-  }

-  winTime = (winTime - kUnixTimeStartValue) / kNumTimeQuantumsInSecond;

-  if (winTime > 0xFFFFFFFF)

-  {

-    unixTime = 0xFFFFFFFF;

-    return false;

-  }

-  unixTime = (UInt32)winTime;

-  return true;

-}

-

-}}

-

-#endif

diff --git a/other-licenses/7zstub/src/Windows/Window.cpp b/other-licenses/7zstub/src/Windows/Window.cpp
deleted file mode 100644
index da8768707..000000000
--- a/other-licenses/7zstub/src/Windows/Window.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-// Windows/Window.cpp

-

-#include "StdAfx.h"

-

-#ifndef _UNICODE

-#include "Common/StringConvert.h"

-#endif

-#include "Windows/Window.h"

-

-#ifndef _UNICODE

-extern bool g_IsNT;

-#endif

-

-namespace NWindows {

-

-#ifndef _UNICODE

-ATOM MyRegisterClass(CONST WNDCLASSW *wndClass)

-{

-  if (g_IsNT)

-    return RegisterClassW(wndClass);

-  WNDCLASSA wndClassA;

-  wndClassA.style = wndClass->style; 

-  wndClassA.lpfnWndProc = wndClass->lpfnWndProc; 

-  wndClassA.cbClsExtra = wndClass->cbClsExtra; 

-  wndClassA.cbWndExtra = wndClass->cbWndExtra; 

-  wndClassA.hInstance = wndClass->hInstance; 

-  wndClassA.hIcon = wndClass->hIcon; 

-  wndClassA.hCursor = wndClass->hCursor; 

-  wndClassA.hbrBackground = wndClass->hbrBackground; 

-  AString menuName;

-  AString className;

-  if (IS_INTRESOURCE(wndClass->lpszMenuName))

-    wndClassA.lpszMenuName = (LPCSTR)wndClass->lpszMenuName;

-  else

-  {

-    menuName = GetSystemString(wndClass->lpszMenuName);

-    wndClassA.lpszMenuName = menuName;

-  }

-  if (IS_INTRESOURCE(wndClass->lpszClassName))

-    wndClassA.lpszClassName = (LPCSTR)wndClass->lpszClassName;

-  else

-  {

-    className = GetSystemString(wndClass->lpszClassName);

-    wndClassA.lpszClassName = className;

-  }

-  return RegisterClassA(&wndClassA);

-}

-

-bool CWindow::Create(LPCWSTR className,

-      LPCWSTR windowName, DWORD style,

-      int x, int y, int width, int height,

-      HWND parentWindow, HMENU idOrHMenu, 

-      HINSTANCE instance, LPVOID createParam)

-{

-  if (g_IsNT)

-  {

-    _window = ::CreateWindowW(className, windowName,

-        style, x, y, width, height, parentWindow, 

-        idOrHMenu, instance, createParam);

-     return (_window != NULL);

-  }

-  return Create(GetSystemString(className), GetSystemString(windowName),

-        style, x, y, width, height, parentWindow, 

-        idOrHMenu, instance, createParam);

-}

-

-bool CWindow::CreateEx(DWORD exStyle, LPCWSTR className,

-      LPCWSTR windowName, DWORD style,

-      int x, int y, int width, int height,

-      HWND parentWindow, HMENU idOrHMenu, 

-      HINSTANCE instance, LPVOID createParam)

-{

-  if (g_IsNT)

-  {

-    _window = ::CreateWindowExW(exStyle, className, windowName,

-      style, x, y, width, height, parentWindow, 

-      idOrHMenu, instance, createParam);

-     return (_window != NULL);

-  }

-  AString classNameA;

-  LPCSTR classNameP;

-  if (IS_INTRESOURCE(className))

-    classNameP = (LPCSTR)className;

-  else

-  {

-    classNameA = GetSystemString(className);

-    classNameP = classNameA;

-  }

-  AString windowNameA;

-  LPCSTR windowNameP;

-  if (IS_INTRESOURCE(windowName))

-    windowNameP = (LPCSTR)windowName;

-  else

-  {

-    windowNameA = GetSystemString(windowName);

-    windowNameP = windowNameA;

-  }

-  return CreateEx(exStyle, classNameP, windowNameP,

-      style, x, y, width, height, parentWindow, 

-      idOrHMenu, instance, createParam);

-}

-

-#endif

-

-#ifndef _UNICODE

-bool MySetWindowText(HWND wnd, LPCWSTR s)

-{ 

-  if (g_IsNT)

-    return BOOLToBool(::SetWindowTextW(wnd, s));

-  return BOOLToBool(::SetWindowTextA(wnd, UnicodeStringToMultiByte(s)));

-}

-#endif 

-

-bool CWindow::GetText(CSysString &s)

-{

-  s.Empty();

-  int length = GetTextLength();

-  if (length == 0)

-    return (::GetLastError() == ERROR_SUCCESS);

-  length = GetText(s.GetBuffer(length), length + 1);

-  s.ReleaseBuffer();

-  if (length == 0)

-    return (::GetLastError() != ERROR_SUCCESS);

-  return true;

-}

-

-#ifndef _UNICODE

-bool CWindow::GetText(UString &s)

-{

-  if (g_IsNT)

-  {

-    s.Empty();

-    int length = GetWindowTextLengthW(_window);

-    if (length == 0)

-      return (::GetLastError() == ERROR_SUCCESS);

-    length = GetWindowTextW(_window, s.GetBuffer(length), length + 1);

-    s.ReleaseBuffer();

-    if (length == 0)

-      return (::GetLastError() == ERROR_SUCCESS);

-    return true;

-  }

-  CSysString sysString;

-  bool result = GetText(sysString);

-  s = GetUnicodeString(sysString);

-  return result;

-}

-#endif

-

- 

-/*

-bool CWindow::ModifyStyleBase(int styleOffset,

-  DWORD remove, DWORD add, UINT flags)

-{

-  DWORD style = GetWindowLong(styleOffset);

-  DWORD newStyle = (style & ~remove) | add;

-  if (style == newStyle)

-    return false; // it is not good 

-

-  SetWindowLong(styleOffset, newStyle);

-  if (flags != 0)

-  {

-    ::SetWindowPos(_window, NULL, 0, 0, 0, 0,

-      SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | flags);

-  }

-  return TRUE;

-}

-*/

-

-}

diff --git a/other-licenses/7zstub/src/Windows/Window.h b/other-licenses/7zstub/src/Windows/Window.h
deleted file mode 100644
index b7788a83d..000000000
--- a/other-licenses/7zstub/src/Windows/Window.h
+++ /dev/null
@@ -1,211 +0,0 @@
-// Windows/Window.h

-

-#ifndef __WINDOWS_WINDOW_H

-#define __WINDOWS_WINDOW_H

-

-#include "Windows/Defs.h"

-#include "Common/String.h"

-

-namespace NWindows {

-

-inline ATOM MyRegisterClass(CONST WNDCLASS *wndClass)

-  { return ::RegisterClass(wndClass); }

-

-#ifndef _UNICODE

-ATOM MyRegisterClass(CONST WNDCLASSW *wndClass);

-#endif

-

-#ifdef _UNICODE

-inline bool MySetWindowText(HWND wnd, LPCWSTR s) { return BOOLToBool(::SetWindowText(wnd, s)); }

-#else

-bool MySetWindowText(HWND wnd, LPCWSTR s);

-#endif

-

-

-

-class CWindow

-{

-private:

-   // bool ModifyStyleBase(int styleOffset, DWORD remove, DWORD add, UINT flags);

-protected:

-  HWND _window;

-public:

-  CWindow(HWND newWindow = NULL): _window(newWindow){};

-  CWindow& operator=(HWND newWindow)

-  {

-    _window = newWindow;

-    return *this;

-  }

-  operator HWND() const { return _window; }

-  void Attach(HWND newWindow) { _window = newWindow; }

-  HWND Detach()

-  {

-    HWND window = _window;

-    _window = NULL;

-    return window;

-  }

-

-  HWND GetParent() const { return ::GetParent(_window); }

-  bool GetWindowRect(LPRECT rect) const { return BOOLToBool(::GetWindowRect(_window,rect )); }

-  bool IsZoomed() const { return BOOLToBool(::IsZoomed(_window)); }

-  bool ClientToScreen(LPPOINT point) const { return BOOLToBool(::ClientToScreen(_window, point)); }

-  bool ScreenToClient(LPPOINT point) const { return BOOLToBool(::ScreenToClient(_window, point)); }

-

-  bool CreateEx(DWORD exStyle, LPCTSTR className,

-      LPCTSTR windowName, DWORD style,

-      int x, int y, int width, int height,

-      HWND parentWindow, HMENU idOrHMenu, 

-      HINSTANCE instance, LPVOID createParam)

-  {

-    _window = ::CreateWindowEx(exStyle, className, windowName,

-      style, x, y, width, height, parentWindow, 

-      idOrHMenu, instance, createParam);

-    return (_window != NULL);

-  }

-

-  bool Create(LPCTSTR className,

-      LPCTSTR windowName, DWORD style,

-      int x, int y, int width, int height,

-      HWND parentWindow, HMENU idOrHMenu, 

-      HINSTANCE instance, LPVOID createParam)

-  {

-    _window = ::CreateWindow(className, windowName,

-      style, x, y, width, height, parentWindow, 

-      idOrHMenu, instance, createParam);

-    return (_window != NULL);

-  }

-

-  #ifndef _UNICODE

-  bool Create(LPCWSTR className,

-      LPCWSTR windowName, DWORD style,

-      int x, int y, int width, int height,

-      HWND parentWindow, HMENU idOrHMenu, 

-      HINSTANCE instance, LPVOID createParam);

-  bool CreateEx(DWORD exStyle, LPCWSTR className,

-      LPCWSTR windowName, DWORD style,

-      int x, int y, int width, int height,

-      HWND parentWindow, HMENU idOrHMenu, 

-      HINSTANCE instance, LPVOID createParam);

-  #endif

-

-

-  bool Destroy()

-  {

-    if (_window == NULL)

-      return true;

-    bool result = BOOLToBool(::DestroyWindow(_window));

-    if(result)

-      _window = NULL;

-    return result;

-  }

-  bool IsWindow() {  return BOOLToBool(::IsWindow(_window)); }

-  bool Move(int x, int y, int width, int height, bool repaint = true)

-    { return BOOLToBool(::MoveWindow(_window, x, y, width, height, BoolToBOOL(repaint))); }

-  bool GetClientRect(LPRECT rect) { return BOOLToBool(::GetClientRect(_window, rect)); }

-  bool Show(int cmdShow) { return BOOLToBool(::ShowWindow(_window, cmdShow)); }

-  bool SetPlacement(CONST WINDOWPLACEMENT *placement) { return BOOLToBool(::SetWindowPlacement(_window, placement)); }

-  bool GetPlacement(WINDOWPLACEMENT *placement) { return BOOLToBool(::GetWindowPlacement(_window, placement)); }

-  bool Update() { return BOOLToBool(::UpdateWindow(_window)); }

-  bool InvalidateRect(LPCRECT rect, bool backgroundErase = true)

-    { return BOOLToBool(::InvalidateRect(_window, rect, BoolToBOOL(backgroundErase))); }

-  void SetRedraw(bool redraw = true) { SendMessage(WM_SETREDRAW, BoolToBOOL(redraw), 0); }

-

-  #ifndef _WIN32_WCE

-  LONG SetStyle(LONG_PTR style)

-    { return SetLongPtr(GWL_STYLE, style); }

-  DWORD GetStyle( ) const

-    { return GetLongPtr(GWL_STYLE); }

-  #else

-  LONG SetStyle(LONG_PTR style)

-    { return SetLong(GWL_STYLE, style); }

-  DWORD GetStyle( ) const

-    { return GetLong(GWL_STYLE); }

-  #endif

-

-  LONG_PTR SetLong(int index, LONG_PTR newLongPtr )

-    { return ::SetWindowLong(_window, index, newLongPtr); }

-  LONG_PTR GetLong(int index) const

-    { return ::GetWindowLong(_window, index ); }

-  LONG_PTR SetUserDataLong(LONG_PTR newLongPtr )

-    { return SetLong(GWLP_USERDATA, newLongPtr); } 

-  LONG_PTR GetUserDataLong() const

-    { return GetLong(GWLP_USERDATA); }

-

-  #ifndef _WIN32_WCE

-  LONG_PTR SetLongPtr(int index, LONG_PTR newLongPtr )

-    { return ::SetWindowLongPtr(_window, index, newLongPtr); }

-  #ifndef _UNICODE

-  LONG_PTR SetLongPtrW(int index, LONG_PTR newLongPtr )

-    { return ::SetWindowLongPtrW(_window, index, newLongPtr); }

-  #endif

-

-  LONG_PTR GetLongPtr(int index) const

-    { return ::GetWindowLongPtr(_window, index ); }

-  LONG_PTR SetUserDataLongPtr(LONG_PTR newLongPtr )

-    { return SetLongPtr(GWLP_USERDATA, newLongPtr); }

-  LONG_PTR GetUserDataLongPtr() const

-    { return GetLongPtr(GWLP_USERDATA); }

-  #endif

-  

-  /*

-  bool ModifyStyle(HWND hWnd, DWORD remove, DWORD add, UINT flags = 0)

-    {  return ModifyStyleBase(GWL_STYLE, remove, add, flags); }

-  bool ModifyStyleEx(HWND hWnd, DWORD remove, DWORD add, UINT flags = 0)

-    { return ModifyStyleBase(GWL_EXSTYLE, remove, add, flags); }

-  */

- 

-  HWND SetFocus() { return ::SetFocus(_window); }

-

-  LRESULT SendMessage(UINT message, WPARAM wParam = 0, LPARAM lParam = 0)

-    { return ::SendMessage(_window, message, wParam, lParam) ;}

-  #ifndef _UNICODE

-  LRESULT SendMessageW(UINT message, WPARAM wParam = 0, LPARAM lParam = 0)

-    { return ::SendMessageW(_window, message, wParam, lParam) ;}

-  #endif

-

-  bool PostMessage(UINT message, WPARAM wParam = 0, LPARAM lParam = 0)

-    {  return BOOLToBool(::PostMessage(_window, message, wParam, lParam)) ;}

-  #ifndef _UNICODE

-  LRESULT PostMessageW(UINT message, WPARAM wParam = 0, LPARAM lParam = 0)

-    { return ::PostMessageW(_window, message, wParam, lParam) ;}

-  #endif

-

-  bool SetText(LPCTSTR s) { return BOOLToBool(::SetWindowText(_window, s)); }

-  #ifndef _UNICODE

-  bool CWindow::SetText(LPCWSTR s) { return MySetWindowText(_window, s); }

-  #endif

-

-  int GetTextLength() const 

-    { return GetWindowTextLength(_window); }

-  UINT GetText(LPTSTR string, int maxCount) const

-    { return GetWindowText(_window, string, maxCount); }

-  bool GetText(CSysString &s);

-  #ifndef _UNICODE

-  /*

-  UINT GetText(LPWSTR string, int maxCount) const

-    { return GetWindowTextW(_window, string, maxCount); }

-  */

-  bool GetText(UString &s);

-  #endif

-

-  bool Enable(bool enable)

-    { return BOOLToBool(::EnableWindow(_window, BoolToBOOL(enable))); }

-  

-  bool IsEnabled()

-    { return BOOLToBool(::IsWindowEnabled(_window)); }

-  

-  #ifndef _WIN32_WCE

-  HMENU GetSystemMenu(bool revert)

-    { return ::GetSystemMenu(_window, BoolToBOOL(revert)); }

-  #endif

-

-  UINT_PTR SetTimer(UINT_PTR idEvent, UINT elapse, TIMERPROC timerFunc = 0)

-    { return ::SetTimer(_window, idEvent, elapse, timerFunc); }

-  bool KillTimer(UINT_PTR idEvent)

-    {return BOOLToBool(::KillTimer(_window, idEvent)); }

-};

-

-}

-

-#endif

-