4.48 beta

25 files changed, 61 insertions, 46 deletions

diff --git a/CPP/7zip/FileManager/ExtractCallback.h b/CPP/7zip/FileManager/ExtractCallback.h
index 7bf8864e..5cf8d635 100755
--- a/CPP/7zip/FileManager/ExtractCallback.h
+++ b/CPP/7zip/FileManager/ExtractCallback.h
@@ -4,7 +4,7 @@
 #define __EXTRACTCALLBACK_H
 
 #include "../UI/Agent/IFolderArchive.h"
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 #ifdef _SFX
 #include "Resource/ProgressDialog/ProgressDialog.h"
diff --git a/CPP/7zip/FileManager/FM.dsp b/CPP/7zip/FileManager/FM.dsp
index 5265a961..e39ce3af 100755
--- a/CPP/7zip/FileManager/FM.dsp
+++ b/CPP/7zip/FileManager/FM.dsp
@@ -1027,6 +1027,22 @@ SOURCE=..\..\Common\MyCom.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Common\MyString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\MyString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\MyVector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\MyVector.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Common\NewHandler.cpp
 # End Source File
 # Begin Source File
@@ -1059,14 +1075,6 @@ SOURCE=..\..\Common\StdOutStream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Common\String.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Common\String.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Common\StringConvert.cpp
 # End Source File
 # Begin Source File
@@ -1103,14 +1111,6 @@ SOURCE=..\..\Common\UTFConvert.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Common\Vector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Common\Vector.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Common\Wildcard.cpp
 # End Source File
 # Begin Source File
diff --git a/CPP/7zip/FileManager/FSDrives.h b/CPP/7zip/FileManager/FSDrives.h
index 496e8fc1..47afa0cf 100755
--- a/CPP/7zip/FileManager/FSDrives.h
+++ b/CPP/7zip/FileManager/FSDrives.h
@@ -3,7 +3,7 @@
 #ifndef __FSDRIVES_H
 #define __FSDRIVES_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/Types.h"
 #include "Common/MyCom.h"
 #include "Windows/FileFind.h"
diff --git a/CPP/7zip/FileManager/FSFolder.h b/CPP/7zip/FileManager/FSFolder.h
index 4641c018..898aff2c 100755
--- a/CPP/7zip/FileManager/FSFolder.h
+++ b/CPP/7zip/FileManager/FSFolder.h
@@ -3,7 +3,7 @@
 #ifndef __FSFOLDER_H
 #define __FSFOLDER_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/MyCom.h"
 #include "Windows/FileFind.h"
 #include "Windows/PropVariant.h"
diff --git a/CPP/7zip/FileManager/FormatUtils.h b/CPP/7zip/FileManager/FormatUtils.h
index f7e9b193..35536871 100755
--- a/CPP/7zip/FileManager/FormatUtils.h
+++ b/CPP/7zip/FileManager/FormatUtils.h
@@ -4,7 +4,7 @@
 #define __FORMATUTILS_H
 
 #include "Common/Types.h"
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 UString NumberToString(UInt64 number);
 
diff --git a/CPP/7zip/FileManager/HelpUtils.h b/CPP/7zip/FileManager/HelpUtils.h
index b993f09b..2a7b85af 100755
--- a/CPP/7zip/FileManager/HelpUtils.h
+++ b/CPP/7zip/FileManager/HelpUtils.h
@@ -3,7 +3,7 @@
 #ifndef __HELPUTILS_H
 #define __HELPUTILS_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 void ShowHelpWindow(HWND hwnd, LPCWSTR topicFile);
 
diff --git a/CPP/7zip/FileManager/LangUtils.cpp b/CPP/7zip/FileManager/LangUtils.cpp
index decff306..f41e764e 100755
--- a/CPP/7zip/FileManager/LangUtils.cpp
+++ b/CPP/7zip/FileManager/LangUtils.cpp
@@ -134,10 +134,32 @@ bool SplidID(const UString &id, WORD &primID, WORD &subID)
   return (*end == 0);
 }
 
+typedef LANGID (WINAPI *GetUserDefaultUILanguageP)();
+
 void FindMatchLang(UString &shortName)
 {
   shortName.Empty();
-  LANGID langID = GetUserDefaultLangID();
+
+  LANGID SystemDefaultLangID = GetSystemDefaultLangID(); // Lang for non-Unicode in XP64
+  LANGID UserDefaultLangID = GetUserDefaultLangID(); // Standarts and formats in XP64
+
+  if (SystemDefaultLangID != UserDefaultLangID)
+    return;
+  LANGID langID = UserDefaultLangID;
+  /*
+  LANGID SystemDefaultUILanguage; // english  in XP64
+  LANGID UserDefaultUILanguage; // english  in XP64
+
+  GetUserDefaultUILanguageP fn = (GetUserDefaultUILanguageP)GetProcAddress(
+      GetModuleHandle("kernel32"), "GetUserDefaultUILanguage");
+  if (fn != NULL)
+    UserDefaultUILanguage = fn();
+  fn = (GetUserDefaultUILanguageP)GetProcAddress(
+      GetModuleHandle("kernel32"), "GetSystemDefaultUILanguage");
+  if (fn != NULL)
+    SystemDefaultUILanguage = fn();
+  */
+
   WORD primLang = (WORD)(PRIMARYLANGID(langID));
   WORD subLang = (WORD)(SUBLANGID(langID));
   CObjectVector<CLangEx> langs;
diff --git a/CPP/7zip/FileManager/NetFolder.h b/CPP/7zip/FileManager/NetFolder.h
index f23c7e4e..acc7cad2 100755
--- a/CPP/7zip/FileManager/NetFolder.h
+++ b/CPP/7zip/FileManager/NetFolder.h
@@ -3,7 +3,7 @@
 #ifndef __NETFOLDER_H
 #define __NETFOLDER_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/Buffer.h"
 #include "Common/MyCom.h"
 #include "Windows/PropVariant.h"
diff --git a/CPP/7zip/FileManager/OpenCallback.h b/CPP/7zip/FileManager/OpenCallback.h
index 853c0e44..d7e9a5ed 100755
--- a/CPP/7zip/FileManager/OpenCallback.h
+++ b/CPP/7zip/FileManager/OpenCallback.h
@@ -3,7 +3,7 @@
 #ifndef __OPENCALLBACK_H
 #define __OPENCALLBACK_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/MyCom.h"
 #include "Windows/FileFind.h"
 
diff --git a/CPP/7zip/FileManager/PanelItems.cpp b/CPP/7zip/FileManager/PanelItems.cpp
index 16c8d29a..07d10a76 100755
--- a/CPP/7zip/FileManager/PanelItems.cpp
+++ b/CPP/7zip/FileManager/PanelItems.cpp
@@ -2,7 +2,6 @@
 
 #include "StdAfx.h"
 
-#include "Common/String.h"
 #include "Common/StringConvert.h"
 
 #include "Windows/PropVariant.h"
diff --git a/CPP/7zip/FileManager/PhysDriveFolder.h b/CPP/7zip/FileManager/PhysDriveFolder.h
index db339af4..550b76b4 100755
--- a/CPP/7zip/FileManager/PhysDriveFolder.h
+++ b/CPP/7zip/FileManager/PhysDriveFolder.h
@@ -3,7 +3,7 @@
 #ifndef __PHYSDRIVEFOLDER_H 
 #define __PHYSDRIVEFOLDER_H 
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/MyCom.h"
 
 #include "IFolder.h"
diff --git a/CPP/7zip/FileManager/PluginInterface.h b/CPP/7zip/FileManager/PluginInterface.h
index 249f5644..7bef6950 100755
--- a/CPP/7zip/FileManager/PluginInterface.h
+++ b/CPP/7zip/FileManager/PluginInterface.h
@@ -3,7 +3,7 @@
 #ifndef __PLUGININTERFACE_H
 #define __PLUGININTERFACE_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 // {23170F69-40C1-278D-0000-000100010000}
 DEFINE_GUID(IID_IInitContextMenu, 
diff --git a/CPP/7zip/FileManager/ProgramLocation.h b/CPP/7zip/FileManager/ProgramLocation.h
index 8a8dcf7d..38317b45 100755
--- a/CPP/7zip/FileManager/ProgramLocation.h
+++ b/CPP/7zip/FileManager/ProgramLocation.h
@@ -3,7 +3,7 @@
 #ifndef __PROGRAMLOCATION_H
 #define __PROGRAMLOCATION_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 bool GetProgramFolderPath(UString &folder); // normalized
 
diff --git a/CPP/7zip/FileManager/PropertyName.h b/CPP/7zip/FileManager/PropertyName.h
index c99fe933..413d2343 100755
--- a/CPP/7zip/FileManager/PropertyName.h
+++ b/CPP/7zip/FileManager/PropertyName.h
@@ -3,7 +3,7 @@
 #ifndef __PROPERTYNAME_H
 #define __PROPERTYNAME_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 UString GetNameOfProperty(PROPID propID);
 
diff --git a/CPP/7zip/FileManager/RegistryAssociations.h b/CPP/7zip/FileManager/RegistryAssociations.h
index 91613f79..c1a64c96 100755
--- a/CPP/7zip/FileManager/RegistryAssociations.h
+++ b/CPP/7zip/FileManager/RegistryAssociations.h
@@ -3,8 +3,7 @@
 #ifndef __REGISTRYASSOCIATIONS_H
 #define __REGISTRYASSOCIATIONS_H
 
-#include "Common/String.h"
-#include "Common/Vector.h"
+#include "Common/MyString.h"
 
 namespace NRegistryAssociations {
 
diff --git a/CPP/7zip/FileManager/RegistryPlugins.h b/CPP/7zip/FileManager/RegistryPlugins.h
index 4a30857c..55f9ebbc 100755
--- a/CPP/7zip/FileManager/RegistryPlugins.h
+++ b/CPP/7zip/FileManager/RegistryPlugins.h
@@ -3,8 +3,7 @@
 #ifndef __REGISTRYPLUGINS_H
 #define __REGISTRYPLUGINS_H
 
-#include "Common/Vector.h"
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 enum EPluginType 
 {
diff --git a/CPP/7zip/FileManager/Resource/ListViewDialog/ListViewDialog.cpp b/CPP/7zip/FileManager/Resource/ListViewDialog/ListViewDialog.cpp
index ca7b7935..e6a6779e 100755
--- a/CPP/7zip/FileManager/Resource/ListViewDialog/ListViewDialog.cpp
+++ b/CPP/7zip/FileManager/Resource/ListViewDialog/ListViewDialog.cpp
@@ -3,8 +3,6 @@
 #include "StdAfx.h"
 #include "ListViewDialog.h"
 
-#include "Common/Vector.h"
-
 #ifdef LANG        
 #include "../../LangUtils.h"
 static CIDLangPair kIDLangPairs[] = 
diff --git a/CPP/7zip/FileManager/RootFolder.h b/CPP/7zip/FileManager/RootFolder.h
index 16bac250..d49f4d12 100755
--- a/CPP/7zip/FileManager/RootFolder.h
+++ b/CPP/7zip/FileManager/RootFolder.h
@@ -3,7 +3,7 @@
 #ifndef __ROOTFOLDER_H
 #define __ROOTFOLDER_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 #include "Windows/PropVariant.h"
 
diff --git a/CPP/7zip/FileManager/SplitUtils.h b/CPP/7zip/FileManager/SplitUtils.h
index fe359f04..755c707c 100755
--- a/CPP/7zip/FileManager/SplitUtils.h
+++ b/CPP/7zip/FileManager/SplitUtils.h
@@ -3,7 +3,7 @@
 #ifndef __SPLITUTILS_H
 #define __SPLITUTILS_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 #include "Common/Types.h"
 #include "Windows/Control/ComboBox.h"
 
diff --git a/CPP/7zip/FileManager/StringUtils.h b/CPP/7zip/FileManager/StringUtils.h
index 376a3024..7f72b764 100755
--- a/CPP/7zip/FileManager/StringUtils.h
+++ b/CPP/7zip/FileManager/StringUtils.h
@@ -3,7 +3,7 @@
 #ifndef __STRINGUTILS_H
 #define __STRINGUTILS_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 void SplitStringToTwoStrings(const UString &src, UString &dest1, UString &dest2);
 
diff --git a/CPP/7zip/FileManager/SysIconUtils.h b/CPP/7zip/FileManager/SysIconUtils.h
index 51294751..3b6c6c2e 100755
--- a/CPP/7zip/FileManager/SysIconUtils.h
+++ b/CPP/7zip/FileManager/SysIconUtils.h
@@ -3,7 +3,7 @@
 #ifndef __SYSICONUTILS_H
 #define __SYSICONUTILS_H
 
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 struct CExtIconPair
 {
diff --git a/CPP/7zip/FileManager/TextPairs.h b/CPP/7zip/FileManager/TextPairs.h
index 247a92d9..b75d9c72 100755
--- a/CPP/7zip/FileManager/TextPairs.h
+++ b/CPP/7zip/FileManager/TextPairs.h
@@ -3,8 +3,7 @@
 #ifndef __COMMON_TEXTPAIRS_H
 #define __COMMON_TEXTPAIRS_H
 
-#include "Common/Vector.h"
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 struct CTextPair
 {
diff --git a/CPP/7zip/FileManager/UpdateCallback100.h b/CPP/7zip/FileManager/UpdateCallback100.h
index 4cce5b52..0163010b 100755
--- a/CPP/7zip/FileManager/UpdateCallback100.h
+++ b/CPP/7zip/FileManager/UpdateCallback100.h
@@ -4,7 +4,7 @@
 #define __UPDATE_CALLBACK100_H
 
 #include "Common/MyCom.h"
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 #include "../UI/Agent/IFolderArchive.h"
 #include "Resource/ProgressDialog2/ProgressDialog.h"
diff --git a/CPP/7zip/FileManager/ViewSettings.h b/CPP/7zip/FileManager/ViewSettings.h
index 4894a6f9..4af0b991 100755
--- a/CPP/7zip/FileManager/ViewSettings.h
+++ b/CPP/7zip/FileManager/ViewSettings.h
@@ -3,8 +3,7 @@
 #ifndef __VIEWSETTINGS_H
 #define __VIEWSETTINGS_H
 
-#include "Common/Vector.h"
-#include "Common/String.h"
+#include "Common/MyString.h"
 
 struct CColumnInfo
 {
diff --git a/CPP/7zip/FileManager/makefile b/CPP/7zip/FileManager/makefile
index 3a15cf2e..3a561121 100755
--- a/CPP/7zip/FileManager/makefile
+++ b/CPP/7zip/FileManager/makefile
@@ -59,12 +59,12 @@ COMMON_OBJS = \
   $O\Random.obj \
   $O\StdInStream.obj \
   $O\StdOutStream.obj \
-  $O\String.obj \
+  $O\MyString.obj \
   $O\StringConvert.obj \
   $O\StringToInt.obj \
   $O\TextConfig.obj \
   $O\UTFConvert.obj \
-  $O\Vector.obj \
+  $O\MyVector.obj \
   $O\Wildcard.obj \
 
 WIN_OBJS = \