4.60 beta

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

View File

@@ -151,9 +151,7 @@ STDMETHODIMP CArchiveOpenCallback::CryptoGetTextPassword(BSTR *password)
PrintError("Password is not defined");
return E_ABORT;
}
CMyComBSTR tempName(Password);
*password = tempName.Detach();
return S_OK;
return StringToBstr(Password, password);
}
@@ -420,9 +418,7 @@ STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password)
PrintError("Password is not defined");
return E_ABORT;
}
CMyComBSTR tempName(Password);
*password = tempName.Detach();
return S_OK;
return StringToBstr(Password, password);
}
@@ -654,9 +650,7 @@ STDMETHODIMP CArchiveUpdateCallback::CryptoGetTextPassword2(Int32 *passwordIsDef
}
}
*passwordIsDefined = BoolToInt(PasswordIsDefined);
CMyComBSTR tempName(Password);
*password = tempName.Detach();
return S_OK;
return StringToBstr(Password, password);
}