9.349.34

1 files changed, 11 insertions, 11 deletions

diff --git a/CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp b/CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp
index d29ac44c..2d3b1d92 100755..100644
--- a/CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp
+++ b/CPP/7zip/UI/FileManager/FileFolderPluginOpen.cpp
@@ -4,8 +4,8 @@
 
 #include "resource.h"
 
-#include "Windows/FileName.h"
-#include "Windows/Thread.h"
+#include "../../../Windows/FileName.h"
+#include "../../../Windows/Thread.h"
 
 #include "../Agent/Agent.h"
 
@@ -69,9 +69,9 @@ static void SplitNameToPureNameAndExtension(const FString &fullName,
   }
   else
   {
-    pureName = fullName.Left(index);
+    pureName.SetFrom(fullName, index);
     extensionDelimiter = kExtensionDelimiter;
-    extension = fullName.Mid(index + 1);
+    extension = fullName.Ptr(index + 1);
   }
 }
 
@@ -94,8 +94,8 @@ HRESULT OpenFileFolderPlugin(
   FString fileName;
   if (slashPos >= 0)
   {
-    dirPrefix = path.Left(slashPos + 1);
-    fileName = path.Mid(slashPos + 1);
+    dirPrefix.SetFrom(path, slashPos + 1);
+    fileName = path.Ptr(slashPos + 1);
   }
   else
     fileName = path;
@@ -122,7 +122,7 @@ HRESULT OpenFileFolderPlugin(
   }
   */
 
-  for (int i = 0; i < plugins.Size(); i++)
+  FOR_VECTOR (i, plugins)
   {
     const CPluginInfo &plugin = plugins[i];
     if (!plugin.ClassIDDefined)
@@ -151,10 +151,10 @@ HRESULT OpenFileFolderPlugin(
     t.Path = fs2us(path);
     t.ArcFormat = arcFormat;
 
-    UString progressTitle = LangString(IDS_OPENNING, 0x03020283);
+    UString progressTitle = LangString(IDS_OPENNING);
     t.OpenCallbackSpec->ProgressDialog.MainWindow = parentWindow;
-    t.OpenCallbackSpec->ProgressDialog.MainTitle = LangString(IDS_APP_TITLE, 0x03000000);
-    t.OpenCallbackSpec->ProgressDialog.MainAddTitle = progressTitle + UString(L" ");
+    t.OpenCallbackSpec->ProgressDialog.MainTitle = L"7-Zip"; // LangString(IDS_APP_TITLE);
+    t.OpenCallbackSpec->ProgressDialog.MainAddTitle = progressTitle + L' ';
     t.OpenCallbackSpec->ProgressDialog.WaitMode = true;
 
     {
@@ -166,11 +166,11 @@ HRESULT OpenFileFolderPlugin(
     if (t.Result == E_ABORT)
       return t.Result;
 
+    encrypted = t.OpenCallbackSpec->PasswordIsDefined;
     if (t.Result == S_OK)
     {
       // if (openCallbackSpec->PasswordWasAsked)
       {
-        encrypted = t.OpenCallbackSpec->PasswordIsDefined;
         password = t.OpenCallbackSpec->Password;
       }
       *module = library.Detach();