xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-08 02:07:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

4.60 beta

Browse Source
This commit is contained in:
Igor Pavlov
2008-08-19 00:00:00 +00:00
committed by Kornel Lesiński
parent 173c07e166
commit c10e6b16f6
107 changed files with 490 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CPP/7zip/UI/Console/ExtractCallbackConsole.cpp
View File

@@ -152,9 +152,7 @@ STDMETHODIMP CExtractCallbackConsole::CryptoGetTextPassword(BSTR *password)
Password = GetPassword(OutStream);
PasswordIsDefined = true;
}
CMyComBSTR tempName(Password);
*password = tempName.Detach();
return S_OK;
return StringToBstr(Password, password);
}
#endif

4
CPP/7zip/UI/Console/OpenCallbackConsole.cpp
View File

@@ -35,9 +35,7 @@ HRESULT COpenCallbackConsole::Open_CryptoGetTextPassword(BSTR *password)
Password = GetPassword(OutStream);
PasswordIsDefined = true;
}
CMyComBSTR temp(Password);
*password = temp.Detach();
return S_OK;
return StringToBstr(Password, password);
}
HRESULT COpenCallbackConsole::Open_GetPasswordIfAny(UString &password)

7
CPP/7zip/UI/Console/UpdateCallbackConsole.cpp
View File

@@ -199,8 +199,7 @@ HRESULT CUpdateCallbackConsole::CryptoGetTextPassword2(Int32 *passwordIsDefined,
#ifdef _NO_CRYPTO
*passwordIsDefined = false;
CMyComBSTR tempName(L"");
*password = tempName.Detach();
return StringToBstr(L"", password);
#else
@@ -213,10 +212,8 @@ HRESULT CUpdateCallbackConsole::CryptoGetTextPassword2(Int32 *passwordIsDefined,
}
}
*passwordIsDefined = BoolToInt(PasswordIsDefined);
CMyComBSTR tempName(Password);
*password = tempName.Detach();
return StringToBstr(Password, password);
#endif
return S_OK;
}