4.60 beta

3 files changed, 5 insertions, 10 deletions

diff --git a/CPP/7zip/UI/Far/ExtractEngine.cpp b/CPP/7zip/UI/Far/ExtractEngine.cpp
index 89dacf59..55994ed6 100755
--- a/CPP/7zip/UI/Far/ExtractEngine.cpp
+++ b/CPP/7zip/UI/Far/ExtractEngine.cpp
@@ -170,8 +170,5 @@ STDMETHODIMP CExtractCallBackImp::CryptoGetTextPassword(BSTR *password)
     RINOK(GetPassword(m_Password));
     m_PasswordIsDefined = true;
   }
-  CMyComBSTR tempName = m_Password;
-  *password = tempName.Detach();
-
-  return S_OK;
+  return StringToBstr(m_Password, password);
 }
diff --git a/CPP/7zip/UI/Far/Main.cpp b/CPP/7zip/UI/Far/Main.cpp
index 39c84391..f042a785 100755
--- a/CPP/7zip/UI/Far/Main.cpp
+++ b/CPP/7zip/UI/Far/Main.cpp
@@ -359,9 +359,7 @@ STDMETHODIMP COpenArchiveCallback::CryptoGetTextPassword(BSTR *password)
     RINOK(GetPassword(Password));
     PasswordIsDefined = true;
   }
-  CMyComBSTR temp = Password;
-  *password = temp.Detach();
-  return S_OK;
+  return StringToBstr(Password, password);
 }
 
 /*
diff --git a/CPP/7zip/UI/Far/Plugin.cpp b/CPP/7zip/UI/Far/Plugin.cpp
index 65253f01..dc2a3ed1 100755
--- a/CPP/7zip/UI/Far/Plugin.cpp
+++ b/CPP/7zip/UI/Far/Plugin.cpp
@@ -208,7 +208,7 @@ void CPlugin::EnterToDirectory(const UString &dirName)
 int CPlugin::SetDirectory(const char *aszDir, int /* opMode */)
 {
   UString path = MultiByteToUnicodeString(aszDir, CP_OEMCP);
-  if (path == L"\\")
+  if (path == WSTRING_PATH_SEPARATOR)
   {
     _folder.Release();
     m_ArchiveHandler->BindToRootFolder(&_folder);
@@ -225,7 +225,7 @@ int CPlugin::SetDirectory(const char *aszDir, int /* opMode */)
     EnterToDirectory(path);
   else
   {
-    if (path[0] == L'\\')
+    if (path[0] == WCHAR_PATH_SEPARATOR)
     {
       _folder.Release();
       m_ArchiveHandler->BindToRootFolder(&_folder);
@@ -265,7 +265,7 @@ void CPlugin::GetCurrentDir()
   GetPathParts(pathParts);
   for (int i = 0; i < pathParts.Size(); i++)
   {
-    m_CurrentDir += L'\\';
+    m_CurrentDir += WCHAR_PATH_SEPARATOR;
     m_CurrentDir += pathParts[i];
   }
 }