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

17.00

Browse Source
This commit is contained in:
Igor Pavlov
2017-04-30 00:00:00 +00:00
committed by Kornel
parent 603abd5528
commit 2efa10565a
442 changed files with 15479 additions and 8525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
CPP/7zip/UI/Far/Plugin.cpp
View File

@@ -30,7 +30,8 @@ int CompareFileNames_ForFolderList(const wchar_t *s1, const wchar_t *s2)
CPlugin::CPlugin(const FString &fileName, CAgent *agent, UString archiveTypeName):
_agent(agent),
m_FileName(fileName),
_archiveTypeName(archiveTypeName)
_archiveTypeName(archiveTypeName),
PasswordIsDefined(false)
{
m_ArchiveHandler = agent;
if (!m_FileInfo.Find(m_FileName))
@@ -82,7 +83,7 @@ void CPlugin::ReadPluginPanelItem(PluginPanelItem &panelItem, UInt32 itemIndex)
if (prop.vt != VT_BSTR)
throw 272340;
AString oemString = UnicodeStringToMultiByte(prop.bstrVal, CP_OEMCP);
AString oemString (UnicodeStringToMultiByte(prop.bstrVal, CP_OEMCP));
if (oemString == "..")
oemString = kDotsReplaceString;
@@ -193,7 +194,7 @@ void CPlugin::EnterToDirectory(const UString &dirName)
CMyComPtr<IFolderFolder> newFolder;
UString s = dirName;
if (dirName == kDotsReplaceStringU)
s = L"..";
s = "..";
_folder->BindToFolder(s, &newFolder);
if (!newFolder)
if (dirName.IsEmpty())
@@ -281,7 +282,7 @@ void CPlugin::SetCurrentDirVar()
}
}
static const char *kPluginFormatName = "7-ZIP";
static const char * const kPluginFormatName = "7-ZIP";
static int FindPropNameID(PROPID propID)
@@ -371,17 +372,17 @@ static AString GetNameOfProp(PROPID propID, const wchar_t *name)
{
int farID = FindPropNameID(propID);
if (farID >= 0)
return g_StartupInfo.GetMsgString(farID);
return (AString)g_StartupInfo.GetMsgString(farID);
if (name)
return UnicodeStringToMultiByte((const wchar_t *)name, CP_OEMCP);
return UnicodeStringToMultiByte(name, CP_OEMCP);
char s[16];
ConvertUInt32ToString(propID, s);
return s;
return (AString)s;
}
static AString GetNameOfProp2(PROPID propID, const wchar_t *name)
{
AString s = GetNameOfProp(propID, name);
AString s (GetNameOfProp(propID, name));
if (s.Len() > (kInfoPanelLineSize - 1))
s.DeleteFrom(kInfoPanelLineSize - 1);
return s;
@@ -403,14 +404,14 @@ static AString ConvertSizeToString(UInt64 value)
}
while (i > 0)
s[--pos] = s[--i];
return s + pos;
return (AString)(s + pos);
}
static AString PropToString(const NCOM::CPropVariant &prop, PROPID propID)
{
if (prop.vt == VT_BSTR)
{
AString s = UnicodeStringToMultiByte(prop.bstrVal, CP_OEMCP);
AString s (UnicodeStringToMultiByte(prop.bstrVal, CP_OEMCP));
s.Replace((char)0xA, ' ');
s.Replace((char)0xD, ' ');
return s;
@@ -419,7 +420,7 @@ static AString PropToString(const NCOM::CPropVariant &prop, PROPID propID)
{
int messageID = VARIANT_BOOLToBool(prop.boolVal) ?
NMessageID::kYes : NMessageID::kNo;
return g_StartupInfo.GetMsgString(messageID);
return (AString)g_StartupInfo.GetMsgString(messageID);
}
if (prop.vt != VT_EMPTY)
{
@@ -441,8 +442,8 @@ static AString PropToString(const NCOM::CPropVariant &prop, PROPID propID)
}
{
char sz[64];
ConvertPropertyToShortString(sz, prop, propID);
return sz;
ConvertPropertyToShortString2(sz, prop, propID);
return (AString)sz;
}
}
return AString();
@@ -450,7 +451,7 @@ static AString PropToString(const NCOM::CPropVariant &prop, PROPID propID)
static AString PropToString2(const NCOM::CPropVariant &prop, PROPID propID)
{
AString s = PropToString(prop, propID);
AString s (PropToString(prop, propID));
if (s.Len() > (kInfoPanelLineSize - 1))
s.DeleteFrom(kInfoPanelLineSize - 1);
return s;
@@ -461,7 +462,7 @@ static void AddPropertyString(InfoPanelLine *lines, int &numItems, PROPID propID
{
if (prop.vt != VT_EMPTY)
{
AString val = PropToString2(prop, propID);
AString val (PropToString2(prop, propID));
if (!val.IsEmpty())
{
InfoPanelLine &item = lines[numItems++];
@@ -504,9 +505,9 @@ void CPlugin::GetOpenPluginInfo(struct OpenPluginInfo *info)
name = fs2us(fileName);
}
m_PannelTitle = L' ';
m_PannelTitle = ' ';
m_PannelTitle += _archiveTypeName;
m_PannelTitle += L':';
m_PannelTitle += ':';
m_PannelTitle += name;
m_PannelTitle.Add_Space();
if (!m_CurrentDir.IsEmpty())
@@ -748,8 +749,7 @@ HRESULT CPlugin::ShowAttributesWindow()
NCOM::CPropVariant prop;
RINOK(_folder->GetProperty(itemIndex, property.ID, &prop));
AString s = PropToString(prop, property.ID);
values.Add(s);
values.Add(PropToString(prop, property.ID));
{
const CInitDialogItem idi =
@@ -803,10 +803,8 @@ HRESULT CPlugin::ShowAttributesWindow()
const UInt32 kMaxDataSize = 64;
if (dataSize > kMaxDataSize)
{
char temp[64];
s += "data:";
ConvertUInt32ToString(dataSize, temp);
s += temp;
s.Add_UInt32(dataSize);
}
else
{