react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/SysIconUtils.cpp

@@ -10,178 +10,121 @@
 
 #include "SysIconUtils.h"
 
-#if defined(__MINGW32__) || defined(__MINGW64__)
-#include <shlobj.h>
-#else
 #include <ShlObj.h>
-#endif
 
 #ifndef _UNICODE
 extern bool g_IsNT;
 #endif
 
-CExtToIconMap g_Ext_to_Icon_Map;
-
-int Shell_GetFileInfo_SysIconIndex_for_CSIDL(int csidl)
+int GetIconIndexForCSIDL(int csidl)
 {
-  LPITEMIDLIST pidl = NULL;
+  LPITEMIDLIST pidl = 0;
   SHGetSpecialFolderLocation(NULL, csidl, &pidl);
   if (pidl)
   {
-    SHFILEINFO shFileInfo;
-    shFileInfo.iIcon = -1;
-    const DWORD_PTR res = SHGetFileInfo((LPCTSTR)(const void *)(pidl),
-        FILE_ATTRIBUTE_DIRECTORY,
-        &shFileInfo, sizeof(shFileInfo),
-        SHGFI_PIDL | SHGFI_SYSICONINDEX);
-    /*
-    IMalloc *pMalloc;
+    SHFILEINFO shellInfo;
+    SHGetFileInfo(LPCTSTR(pidl), FILE_ATTRIBUTE_NORMAL,
+      &shellInfo, sizeof(shellInfo),
+      SHGFI_PIDL | SHGFI_SYSICONINDEX);
+    IMalloc  *pMalloc;
     SHGetMalloc(&pMalloc);
     if (pMalloc)
     {
       pMalloc->Free(pidl);
       pMalloc->Release();
     }
-    */
-    // we use OLE2.dll function here
-    CoTaskMemFree(pidl);
-    if (res)
-      return shFileInfo.iIcon;
+    return shellInfo.iIcon;
   }
-  return -1;
+  return 0;
 }
 
 #ifndef _UNICODE
-Z7_DIAGNOSTIC_IGNORE_CAST_FUNCTION
-typedef DWORD_PTR (WINAPI * Func_SHGetFileInfoW)(LPCWSTR pszPath, DWORD attrib, SHFILEINFOW *psfi, UINT cbFileInfo, UINT uFlags);
+typedef int (WINAPI * SHGetFileInfoWP)(LPCWSTR pszPath, DWORD attrib, SHFILEINFOW *psfi, UINT cbFileInfo, UINT uFlags);
 
-static struct C_SHGetFileInfo_Init
+struct CSHGetFileInfoInit
 {
-  Func_SHGetFileInfoW f_SHGetFileInfoW;
-  C_SHGetFileInfo_Init()
+  SHGetFileInfoWP shGetFileInfoW;
+  CSHGetFileInfoInit()
   {
-       f_SHGetFileInfoW = Z7_GET_PROC_ADDRESS(
-    Func_SHGetFileInfoW, ::GetModuleHandleW(L"shell32.dll"),
-        "SHGetFileInfoW");
-    // f_SHGetFileInfoW = NULL; // for debug
+    shGetFileInfoW = (SHGetFileInfoWP)
+    ::GetProcAddress(::GetModuleHandleW(L"shell32.dll"), "SHGetFileInfoW");
   }
-} g_SHGetFileInfo_Init;
+} g_SHGetFileInfoInit;
 #endif
 
-#ifdef _UNICODE
-#define My_SHGetFileInfoW SHGetFileInfoW
-#else
-static DWORD_PTR My_SHGetFileInfoW(LPCWSTR pszPath, DWORD attrib, SHFILEINFOW *psfi, UINT cbFileInfo, UINT uFlags)
+static DWORD_PTR MySHGetFileInfoW(LPCWSTR pszPath, DWORD attrib, SHFILEINFOW *psfi, UINT cbFileInfo, UINT uFlags)
 {
-  if (!g_SHGetFileInfo_Init.f_SHGetFileInfoW)
+  #ifdef _UNICODE
+  return SHGetFileInfo
+  #else
+  if (g_SHGetFileInfoInit.shGetFileInfoW == 0)
     return 0;
-  return g_SHGetFileInfo_Init.f_SHGetFileInfoW(pszPath, attrib, psfi, cbFileInfo, uFlags);
+  return g_SHGetFileInfoInit.shGetFileInfoW
+  #endif
+  (pszPath, attrib, psfi, cbFileInfo, uFlags);
 }
-#endif
 
-DWORD_PTR Shell_GetFileInfo_SysIconIndex_for_Path_attrib_iconIndexRef(
-    CFSTR path, DWORD attrib, int &iconIndex)
+DWORD_PTR GetRealIconIndex(CFSTR path, DWORD attrib, int &iconIndex)
 {
-#ifndef _UNICODE
-  if (!g_IsNT || !g_SHGetFileInfo_Init.f_SHGetFileInfoW)
+  #ifndef _UNICODE
+  if (!g_IsNT)
   {
-    SHFILEINFO shFileInfo;
-    // ZeroMemory(&shFileInfo, sizeof(shFileInfo));
-    shFileInfo.iIcon = -1;   // optional
-    const DWORD_PTR res = ::SHGetFileInfo(fs2fas(path),
-        attrib ? attrib : FILE_ATTRIBUTE_ARCHIVE,
-        &shFileInfo, sizeof(shFileInfo),
-        SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX);
-    iconIndex = shFileInfo.iIcon;
+    SHFILEINFO shellInfo;
+    DWORD_PTR res = ::SHGetFileInfo(fs2fas(path), FILE_ATTRIBUTE_NORMAL | attrib, &shellInfo,
+      sizeof(shellInfo), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX);
+    iconIndex = shellInfo.iIcon;
     return res;
   }
   else
-#endif
+  #endif
   {
-    SHFILEINFOW shFileInfo;
-    // ZeroMemory(&shFileInfo, sizeof(shFileInfo));
-    shFileInfo.iIcon = -1;   // optional
-    const DWORD_PTR res = ::My_SHGetFileInfoW(fs2us(path),
-        attrib ? attrib : FILE_ATTRIBUTE_ARCHIVE,
-        &shFileInfo, sizeof(shFileInfo),
-        SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX);
-    // (shFileInfo.iIcon == 0) returned for unknown extensions and files without extension
-    iconIndex = shFileInfo.iIcon;
-    // we use SHGFI_USEFILEATTRIBUTES, and
-    //   (res != 0) is expected for main cases, even if there are no such file.
-    //   (res == 0) for path with kSuperPrefix "\\?\"
-    // Also SHGFI_USEFILEATTRIBUTES still returns icon inside exe.
-    // So we can use SHGFI_USEFILEATTRIBUTES for any case.
-    // UString temp = fs2us(path); // for debug
-    // UString tempName = temp.Ptr(temp.ReverseFind_PathSepar() + 1); // for debug
-    // iconIndex = -1; // for debug
+    SHFILEINFOW shellInfo;
+    DWORD_PTR res = ::MySHGetFileInfoW(fs2us(path), FILE_ATTRIBUTE_NORMAL | attrib, &shellInfo,
+      sizeof(shellInfo), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX);
+    iconIndex = shellInfo.iIcon;
     return res;
   }
 }
 
-int Shell_GetFileInfo_SysIconIndex_for_Path(CFSTR path, DWORD attrib)
-{
-  int iconIndex = -1;
-  if (!Shell_GetFileInfo_SysIconIndex_for_Path_attrib_iconIndexRef(
-      path, attrib, iconIndex))
-    iconIndex = -1;
-  return iconIndex;
-}
-
-
-HRESULT Shell_GetFileInfo_SysIconIndex_for_Path_return_HRESULT(
-    CFSTR path, DWORD attrib, Int32 *iconIndex)
-{
-  *iconIndex = -1;
-  int iconIndexTemp;
-  if (Shell_GetFileInfo_SysIconIndex_for_Path_attrib_iconIndexRef(
-      path, attrib, iconIndexTemp))
-  {
-    *iconIndex = iconIndexTemp;
-    return S_OK;
-  }
-  return GetLastError_noZero_HRESULT();
-}
-
 /*
-DWORD_PTR Shell_GetFileInfo_SysIconIndex_for_Path(const UString &fileName, DWORD attrib, int &iconIndex, UString *typeName)
+DWORD_PTR GetRealIconIndex(const UString &fileName, DWORD attrib, int &iconIndex, UString *typeName)
 {
   #ifndef _UNICODE
   if (!g_IsNT)
   {
-    SHFILEINFO shFileInfo;
-    shFileInfo.szTypeName[0] = 0;
-    DWORD_PTR res = ::SHGetFileInfoA(GetSystemString(fileName), FILE_ATTRIBUTE_ARCHIVE | attrib, &shFileInfo,
-        sizeof(shFileInfo), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX | SHGFI_TYPENAME);
+    SHFILEINFO shellInfo;
+    shellInfo.szTypeName[0] = 0;
+    DWORD_PTR res = ::SHGetFileInfoA(GetSystemString(fileName), FILE_ATTRIBUTE_NORMAL | attrib, &shellInfo,
+        sizeof(shellInfo), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX | SHGFI_TYPENAME);
     if (typeName)
-      *typeName = GetUnicodeString(shFileInfo.szTypeName);
-    iconIndex = shFileInfo.iIcon;
+      *typeName = GetUnicodeString(shellInfo.szTypeName);
+    iconIndex = shellInfo.iIcon;
     return res;
   }
   else
   #endif
   {
-    SHFILEINFOW shFileInfo;
-    shFileInfo.szTypeName[0] = 0;
-    DWORD_PTR res = ::My_SHGetFileInfoW(fileName, FILE_ATTRIBUTE_ARCHIVE | attrib, &shFileInfo,
-        sizeof(shFileInfo), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX | SHGFI_TYPENAME);
+    SHFILEINFOW shellInfo;
+    shellInfo.szTypeName[0] = 0;
+    DWORD_PTR res = ::MySHGetFileInfoW(fileName, FILE_ATTRIBUTE_NORMAL | attrib, &shellInfo,
+        sizeof(shellInfo), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX | SHGFI_TYPENAME);
     if (typeName)
-      *typeName = shFileInfo.szTypeName;
-    iconIndex = shFileInfo.iIcon;
+      *typeName = shellInfo.szTypeName;
+    iconIndex = shellInfo.iIcon;
     return res;
   }
 }
 */
 
-static int FindInSorted_Attrib(const CRecordVector<CAttribIconPair> &vect, DWORD attrib, unsigned &insertPos)
+static int FindInSorted_Attrib(const CRecordVector<CAttribIconPair> &vect, DWORD attrib, int &insertPos)
 {
   unsigned left = 0, right = vect.Size();
   while (left != right)
   {
-    const unsigned mid = (left + right) / 2;
-    const DWORD midAttrib = vect[mid].Attrib;
+    unsigned mid = (left + right) / 2;
+    DWORD midAttrib = vect[mid].Attrib;
     if (attrib == midAttrib)
-      return (int)mid;
+      return mid;
     if (attrib < midAttrib)
       right = mid;
     else
@@ -191,15 +134,15 @@ static int FindInSorted_Attrib(const CRecordVector<CAttribIconPair> &vect, DWORD
   return -1;
 }
 
-static int FindInSorted_Ext(const CObjectVector<CExtIconPair> &vect, const wchar_t *ext, unsigned &insertPos)
+static int FindInSorted_Ext(const CObjectVector<CExtIconPair> &vect, const wchar_t *ext, int &insertPos)
 {
   unsigned left = 0, right = vect.Size();
   while (left != right)
   {
-    const unsigned mid = (left + right) / 2;
-    const int compare = MyStringCompareNoCase(ext, vect[mid].Ext);
+    unsigned mid = (left + right) / 2;
+    int compare = MyStringCompareNoCase(ext, vect[mid].Ext);
     if (compare == 0)
-      return (int)mid;
+      return mid;
     if (compare < 0)
       right = mid;
     else
@@ -209,22 +152,17 @@ static int FindInSorted_Ext(const CObjectVector<CExtIconPair> &vect, const wchar
   return -1;
 }
 
-
-// bool DoItemAlwaysStart(const UString &name);
-
 int CExtToIconMap::GetIconIndex(DWORD attrib, const wchar_t *fileName /*, UString *typeName */)
 {
   int dotPos = -1;
   unsigned i;
   for (i = 0;; i++)
   {
-    const wchar_t c = fileName[i];
+    wchar_t c = fileName[i];
     if (c == 0)
       break;
     if (c == '.')
-      dotPos = (int)i;
-    // we don't need IS_PATH_SEPAR check, because (fileName) doesn't include path prefix.
-    // if (IS_PATH_SEPAR(c) || c == ':') dotPos = -1;
+      dotPos = i;
   }
 
   /*
@@ -237,63 +175,50 @@ int CExtToIconMap::GetIconIndex(DWORD attrib, const wchar_t *fileName /*, UStrin
   }
   */
 
-  if ((attrib & FILE_ATTRIBUTE_DIRECTORY) || dotPos < 0)
-  for (unsigned k = 0;; k++)
+  if ((attrib & FILE_ATTRIBUTE_DIRECTORY) != 0 || dotPos < 0)
   {
-    if (k >= 2)
-      return -1;
-    unsigned insertPos = 0;
-    const int index = FindInSorted_Attrib(_attribMap, attrib, insertPos);
+    int insertPos = 0;
+    int index = FindInSorted_Attrib(_attribMap, attrib, insertPos);
     if (index >= 0)
     {
       // if (typeName) *typeName = _attribMap[index].TypeName;
-      return _attribMap[(unsigned)index].IconIndex;
+      return _attribMap[index].IconIndex;
     }
     CAttribIconPair pair;
-    pair.IconIndex = Shell_GetFileInfo_SysIconIndex_for_Path(
+    GetRealIconIndex(
         #ifdef UNDER_CE
         FTEXT("\\")
         #endif
         FTEXT("__DIR__")
-        , attrib
+        , attrib, pair.IconIndex
         // , pair.TypeName
         );
-    if (_attribMap.Size() < (1u << 16) // we limit cache size
-       || attrib < (1u << 15)) // we want to put all items with basic attribs to cache
-    {
-      /*
-      char s[256];
-      sprintf(s, "i = %3d, attr = %7x", _attribMap.Size(), attrib);
-      OutputDebugStringA(s);
-      */
-      pair.Attrib = attrib;
-      _attribMap.Insert(insertPos, pair);
-      // if (typeName) *typeName = pair.TypeName;
-      return pair.IconIndex;
-    }
-    if (pair.IconIndex >= 0)
-      return pair.IconIndex;
-    attrib = (attrib & FILE_ATTRIBUTE_DIRECTORY) ?
-        FILE_ATTRIBUTE_DIRECTORY :
-        FILE_ATTRIBUTE_ARCHIVE;
+
+    /*
+    char s[256];
+    sprintf(s, "i = %3d, attr = %7x", _attribMap.Size(), attrib);
+    OutputDebugStringA(s);
+    */
+
+    pair.Attrib = attrib;
+    _attribMap.Insert(insertPos, pair);
+    // if (typeName) *typeName = pair.TypeName;
+    return pair.IconIndex;
   }
 
-  CObjectVector<CExtIconPair> &map =
-      (attrib & FILE_ATTRIBUTE_COMPRESSED) ?
-          _extMap_Compressed : _extMap_Normal;
   const wchar_t *ext = fileName + dotPos + 1;
-  unsigned insertPos = 0;
-  const int index = FindInSorted_Ext(map, ext, insertPos);
+  int insertPos = 0;
+  int index = FindInSorted_Ext(_extMap, ext, insertPos);
   if (index >= 0)
   {
-    const CExtIconPair &pa = map[index];
+    const CExtIconPair &pa = _extMap[index];
     // if (typeName) *typeName = pa.TypeName;
     return pa.IconIndex;
   }
 
   for (i = 0;; i++)
   {
-    const wchar_t c = ext[i];
+    wchar_t c = ext[i];
     if (c == 0)
       break;
     if (c < L'0' || c > L'9')
@@ -301,14 +226,14 @@ int CExtToIconMap::GetIconIndex(DWORD attrib, const wchar_t *fileName /*, UStrin
   }
   if (i != 0 && ext[i] == 0)
   {
-    // Shell_GetFileInfo_SysIconIndex_for_Path is too slow for big number of split extensions: .001, .002, .003
+    // GetRealIconIndex is too slow for big number of split extensions: .001, .002, .003
     if (!SplitIconIndex_Defined)
     {
-      Shell_GetFileInfo_SysIconIndex_for_Path_attrib_iconIndexRef(
+      GetRealIconIndex(
           #ifdef UNDER_CE
           FTEXT("\\")
           #endif
-          FTEXT("__FILE__.001"), FILE_ATTRIBUTE_ARCHIVE, SplitIconIndex);
+          FTEXT("__FILE__.001"), 0, SplitIconIndex);
       SplitIconIndex_Defined = true;
     }
     return SplitIconIndex;
@@ -316,36 +241,15 @@ int CExtToIconMap::GetIconIndex(DWORD attrib, const wchar_t *fileName /*, UStrin
 
   CExtIconPair pair;
   pair.Ext = ext;
-  pair.IconIndex = Shell_GetFileInfo_SysIconIndex_for_Path(
-      us2fs(fileName + dotPos),
-      attrib & FILE_ATTRIBUTE_COMPRESSED ?
-          FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_COMPRESSED:
-          FILE_ATTRIBUTE_ARCHIVE);
-  if (map.Size() < (1u << 16)  // we limit cache size
-      // || DoItemAlwaysStart(fileName + dotPos) // we want some popular extensions in cache
-      )
-    map.Insert(insertPos, pair);
+  GetRealIconIndex(us2fs(fileName + dotPos), attrib, pair.IconIndex);
+  _extMap.Insert(insertPos, pair);
   // if (typeName) *typeName = pair.TypeName;
   return pair.IconIndex;
 }
 
-
-HIMAGELIST Shell_Get_SysImageList_smallIcons(bool smallIcons)
+/*
+int CExtToIconMap::GetIconIndex(DWORD attrib, const UString &fileName)
 {
-  SHFILEINFO shFileInfo;
-  // shFileInfo.hIcon = NULL; // optional
-  const DWORD_PTR res = SHGetFileInfo(TEXT(""),
-      /* FILE_ATTRIBUTE_ARCHIVE | */
-      FILE_ATTRIBUTE_DIRECTORY,
-      &shFileInfo, sizeof(shFileInfo),
-      SHGFI_USEFILEATTRIBUTES |
-      SHGFI_SYSICONINDEX |
-      (smallIcons ? SHGFI_SMALLICON : SHGFI_LARGEICON));
-#if 0
-  // (shFileInfo.hIcon == NULL), because we don't use SHGFI_ICON.
-  // so DestroyIcon() is not required
-  if (res && shFileInfo.hIcon) // unexpected
-    DestroyIcon(shFileInfo.hIcon);
-#endif
-  return (HIMAGELIST)res;
+  return GetIconIndex(attrib, fileName, NULL);
 }
+*/

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/SysIconUtils.h

@@ -1,11 +1,11 @@
 // SysIconUtils.h
 
-#ifndef ZIP7_INC_SYS_ICON_UTILS_H
-#define ZIP7_INC_SYS_ICON_UTILS_H
+#ifndef __SYS_ICON_UTILS_H
+#define __SYS_ICON_UTILS_H
 
 #include "../../../Common/MyWindows.h"
 
-#include <CommCtrl.h>
+#include <commctrl.h>
 
 #include "../../../Common/MyString.h"
 
@@ -14,6 +14,7 @@ struct CExtIconPair
   UString Ext;
   int IconIndex;
   // UString TypeName;
+
   // int Compare(const CExtIconPair &a) const { return MyStringCompareNoCase(Ext, a.Ext); }
 };
 
@@ -22,15 +23,15 @@ struct CAttribIconPair
   DWORD Attrib;
   int IconIndex;
   // UString TypeName;
+
   // int Compare(const CAttribIconPair &a) const { return Ext.Compare(a.Ext); }
 };
 
-
-struct CExtToIconMap
+class CExtToIconMap
 {
+public:
   CRecordVector<CAttribIconPair> _attribMap;
-  CObjectVector<CExtIconPair> _extMap_Normal;
-  CObjectVector<CExtIconPair> _extMap_Compressed;
+  CObjectVector<CExtIconPair> _extMap;
   int SplitIconIndex;
   int SplitIconIndex_Defined;
   
@@ -39,27 +40,23 @@ struct CExtToIconMap
   void Clear()
   {
     SplitIconIndex_Defined = false;
-    _extMap_Normal.Clear();
-    _extMap_Compressed.Clear();
+    _extMap.Clear();
     _attribMap.Clear();
   }
-  int GetIconIndex_DIR(DWORD attrib = FILE_ATTRIBUTE_DIRECTORY)
-  {
-    return GetIconIndex(attrib, L"__DIR__");
-  }
   int GetIconIndex(DWORD attrib, const wchar_t *fileName /* , UString *typeName */);
+  // int GetIconIndex(DWORD attrib, const UString &fileName);
 };
 
-extern CExtToIconMap g_Ext_to_Icon_Map;
-
-DWORD_PTR Shell_GetFileInfo_SysIconIndex_for_Path_attrib_iconIndexRef(
-    CFSTR path, DWORD attrib, int &iconIndex);
-HRESULT Shell_GetFileInfo_SysIconIndex_for_Path_return_HRESULT(
-    CFSTR path, DWORD attrib, Int32 *iconIndex);
-int Shell_GetFileInfo_SysIconIndex_for_Path(CFSTR path, DWORD attrib);
+DWORD_PTR GetRealIconIndex(CFSTR path, DWORD attrib, int &iconIndex);
+int GetIconIndexForCSIDL(int csidl);
 
-int Shell_GetFileInfo_SysIconIndex_for_CSIDL(int csidl);
-
-HIMAGELIST Shell_Get_SysImageList_smallIcons(bool smallIcons);
+inline HIMAGELIST GetSysImageList(bool smallIcons)
+{
+  SHFILEINFO shellInfo;
+  return (HIMAGELIST)SHGetFileInfo(TEXT(""),
+      FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_DIRECTORY,
+      &shellInfo, sizeof(shellInfo),
+      SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX | (smallIcons ? SHGFI_SMALLICON : SHGFI_ICON));
+}
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/resource.h

@@ -25,19 +25,6 @@
 #define IDM_CRC64                103
 #define IDM_SHA1                 104
 #define IDM_SHA256               105
-#define IDM_SHA384               106
-#define IDM_SHA512               107
-#define IDM_SHA3_256             108
-#define IDM_XXH64                120
-#define IDM_BLAKE2SP             121
-#define IDM_MD5                  122
-
-#define IDM_FILE                 500
-#define IDM_EDIT                 501
-#define IDM_VIEW                 502
-#define IDM_FAVORITES            503
-#define IDM_TOOLS                504
-#define IDM_HELP                 505
 
 #define IDM_OPEN                 540
 #define IDM_OPEN_INSIDE          541
@@ -60,11 +47,6 @@
 #define IDM_LINK                 558
 #define IDM_ALT_STREAMS          559
 
-#define IDM_VER_EDIT             580
-#define IDM_VER_COMMIT           581
-#define IDM_VER_REVERT           582
-#define IDM_VER_DIFF             583
-
 #define IDM_OPEN_INSIDE_ONE      590
 #define IDM_OPEN_INSIDE_PARSER   591
 
@@ -103,17 +85,13 @@
 #define IDM_VIEW_TOOLBARS_LARGE_BUTTONS     752
 #define IDM_VIEW_TOOLBARS_SHOW_BUTTONS_TEXT 753
 
-#define IDM_VIEW_TIME_POPUP      760
 #define IDM_VIEW_TIME            761
-#define IDM_VIEW_TIME_UTC        799
 
-#define IDM_ADD_TO_FAVORITES     800
 #define IDS_BOOKMARK             801
 
 #define IDM_OPTIONS              900
 #define IDM_BENCHMARK            901
 #define IDM_BENCHMARK2           902
-#define IDM_TEMP_DIR             910
 
 #define IDM_HELP_CONTENTS        960
 #define IDM_ABOUT                961
@@ -137,7 +115,7 @@
 #define IDS_COPY_TO                     6002
 #define IDS_MOVE_TO                     6003
 #define IDS_COPYING                     6004
-// #define IDS_MOVING                      6005
+#define IDS_MOVING                      6005
 #define IDS_RENAMING                    6006
 
 #define IDS_OPERATION_IS_NOT_SUPPORTED  6008

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/resourceGui.h

@@ -6,8 +6,6 @@
 #define IDS_OPENNING                    3303
 #define IDS_SCANNING                    3304
 
-#define IDS_MOVING                      6005
-
 #define IDS_CHECKSUM_CALCULATING        7500
 #define IDS_CHECKSUM_INFORMATION        7501
 #define IDS_CHECKSUM_CRC_DATA           7502
@@ -15,11 +13,3 @@
 #define IDS_CHECKSUM_CRC_STREAMS_NAMES  7504
 
 #define IDS_INCORRECT_VOLUME_SIZE       7307
-
-#define IDS_MEM_REQUIRES_BIG_MEM        7811
-#define IDS_MEM_REQUIRED_MEM_SIZE       7812
-#define IDS_MEM_CURRENT_MEM_LIMIT       7813
-#define IDS_MEM_USAGE_LIMIT_SET_BY_7ZIP 7814
-#define IDS_MEM_RAM_SIZE                7815
-
-#define IDS_MSG_ARC_UNPACKING_WAS_SKIPPED 7822

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/GUI/Extract.rc

@@ -7,11 +7,11 @@ BEGIN
   IDS_MEM_ERROR  "The system cannot allocate the required amount of memory"
   IDS_CANNOT_CREATE_FOLDER  "Cannot create folder '{0}'"
   IDS_UPDATE_NOT_SUPPORTED  "Update operations are not supported for this archive."
-  IDS_CANT_OPEN_ARCHIVE  "Cannot open file '{0}' as archive"
-  IDS_CANT_OPEN_ENCRYPTED_ARCHIVE  "Cannot open encrypted archive '{0}'. Wrong password?"
+  IDS_CANT_OPEN_ARCHIVE  "Can not open file '{0}' as archive"
+  IDS_CANT_OPEN_ENCRYPTED_ARCHIVE  "Can not open encrypted archive '{0}'. Wrong password?"
   IDS_UNSUPPORTED_ARCHIVE_TYPE  "Unsupported archive type"
 
-  IDS_CANT_OPEN_AS_TYPE   "Cannot open the file as {0} archive"
+  IDS_CANT_OPEN_AS_TYPE   "Can not open the file as {0} archive"
   IDS_IS_OPEN_AS_TYPE     "The file is open as {0} archive"
   IDS_IS_OPEN_WITH_OFFSET "The archive is open with offset"
 
@@ -45,7 +45,7 @@ BEGIN
   IDS_EXTRACT_MSG_DATA_ERROR           "Data error"
   IDS_EXTRACT_MSG_CRC_ERROR            "CRC failed"
   IDS_EXTRACT_MSG_UNAVAILABLE_DATA     "Unavailable data"
-  IDS_EXTRACT_MSG_UEXPECTED_END        "Unexpected end of data"
+  IDS_EXTRACT_MSG_UEXPECTED_END        "Unexpected end of data";
   IDS_EXTRACT_MSG_DATA_AFTER_END       "There are some data after the end of the payload data"  
   IDS_EXTRACT_MSG_IS_NOT_ARC           "Is not archive"  
   IDS_EXTRACT_MSG_HEADERS_ERROR        "Headers Error"