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

4.28 beta

Browse Source
This commit is contained in:
Igor Pavlov
2005-09-26 00:00:00 +00:00
committed by Kornel Lesiński
parent d66cf2fcf3
commit 32c73adef4
35 changed files with 108 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
7zip/UI/Agent/AgentOut.cpp
View File

@@ -485,7 +485,7 @@ HRESULT CAgent::RenameItem(
UString oldFullPath;
RINOK(GetArchiveItemPath(GetArchive(), i, DefaultName, oldFullPath));
if (oldItemPath.CollateNoCase(oldFullPath.Left(oldItemPath.Length())) != 0)
if (oldItemPath.CompareNoCase(oldFullPath.Left(oldItemPath.Length())) != 0)
return E_INVALIDARG;
updatePair.NewName = newItemPath + oldFullPath.Mid(oldItemPath.Length());

2
7zip/UI/Agent/AgentProxy.cpp
View File

@@ -22,7 +22,7 @@ int CProxyFolder::FindDirSubItemIndex(const UString &name, int &insertPos) const
return -1;
}
int mid = (left + right) / 2;
int compare = name.CollateNoCase(Folders[mid].Name);
int compare = name.CompareNoCase(Folders[mid].Name);
if (compare == 0)
return mid;
if (compare < 0)

2
7zip/UI/Common/ArchiveCommandLine.cpp
View File

@@ -412,7 +412,7 @@ static void ConvertToLongNames(const UString &prefix, NWildcard::CCensorNode &no
for (int j = i + 1; j < node.SubNodes.Size();)
{
const NWildcard::CCensorNode &nextNode2 = node.SubNodes[j];
if (nextNode1.Name.CollateNoCase(nextNode2.Name) == 0)
if (nextNode1.Name.CompareNoCase(nextNode2.Name) == 0)
{
nextNode1.IncludeItems += nextNode2.IncludeItems;
nextNode1.ExcludeItems += nextNode2.ExcludeItems;

2
7zip/UI/Common/ArchiveExtractCallback.cpp
View File

@@ -191,7 +191,7 @@ STDMETHODIMP CArchiveExtractCallback::GetStream(UInt32 index,
if(pathParts.Size() <= numRemovePathParts)
return E_FAIL;
for(int i = 0; i < numRemovePathParts; i++)
if(_removePathParts[i].CollateNoCase(pathParts[i]) != 0)
if(_removePathParts[i].CompareNoCase(pathParts[i]) != 0)
return E_FAIL;
pathParts.Delete(0, numRemovePathParts);
processedPath = MakePathNameFromParts(pathParts);

2
7zip/UI/Common/ArchiverInfo.h
View File

@@ -32,7 +32,7 @@ struct CArchiverInfo
int FindExtension(const UString &ext) const
{
for (int i = 0; i < Extensions.Size(); i++)
if (ext.CollateNoCase(Extensions[i].Ext) == 0)
if (ext.CompareNoCase(Extensions[i].Ext) == 0)
return i;
return -1;
}

2
7zip/UI/Common/DefaultName.cpp
View File

@@ -15,7 +15,7 @@ UString GetDefaultName2(const UString &fileName,
{
int dotPos = fileNameLength - (extLength + 1);
if (fileName[dotPos] == '.')
if (extension.CollateNoCase(fileName.Mid(dotPos + 1)) == 0)
if (extension.CompareNoCase(fileName.Mid(dotPos + 1)) == 0)
return fileName.Left(dotPos) + addSubExtension;
}
return kEmptyFileAlias;

2
7zip/UI/Common/UpdatePair.cpp
View File

@@ -54,7 +54,7 @@ static inline int MyFileNameCompare(const UString &s1, const UString &s2)
{
return
#ifdef _WIN32
s1.CollateNoCase(s2);
s1.CompareNoCase(s2);
#else
s1.Compare(s2);
#endif

4
7zip/UI/Explorer/RegistryContextMenu.cpp
View File

@@ -45,7 +45,7 @@ static bool CheckContextMenuHandlerCommon(const CSysString &keyName)
CSysString value;
if (key.QueryValue(NULL, value) != ERROR_SUCCESS)
return false;
return (value.CollateNoCase(kExtensionCLSID) == 0);
return (value.CompareNoCase(kExtensionCLSID) == 0);
}
static bool CheckDragDropMenuHandlerCommon(const CSysString &keyName)
@@ -57,7 +57,7 @@ static bool CheckDragDropMenuHandlerCommon(const CSysString &keyName)
CSysString value;
if (key.QueryValue(NULL, value) != ERROR_SUCCESS)
return false;
return (value.CollateNoCase(kExtensionCLSID) == 0);
return (value.CompareNoCase(kExtensionCLSID) == 0);
}
bool CheckContextMenuHandler()

4
7zip/UI/Far/PluginWrite.cpp
View File

@@ -362,7 +362,7 @@ HRESULT CompressFiles(const CObjectVector<PluginPanelItem> &pluginPanelItems)
const CArchiverInfo &archiverInfo = fullArchiverInfoList[i];
if (archiverInfo.UpdateEnabled)
{
if (archiverInfo.Name.CollateNoCase(compressionInfo.ArchiveType) == 0)
if (archiverInfo.Name.CompareNoCase(compressionInfo.ArchiveType) == 0)
archiverIndex = archiverInfoList.Size();
archiverInfoList.Add(archiverInfo);
}
@@ -612,7 +612,7 @@ HRESULT CompressFiles(const CObjectVector<PluginPanelItem> &pluginPanelItems)
&archiveType,
NULL));
if (archiverInfoFinal.Name.CollateNoCase((const wchar_t *)archiveType) != 0)
if (archiverInfoFinal.Name.CompareNoCase((const wchar_t *)archiveType) != 0)
throw "Type of existing archive differs from specified type";
HRESULT result = archiveHandler.QueryInterface(
IID_IOutFolderArchive, &outArchive);

7
7zip/UI/GUI/CompressDialog.cpp
View File

@@ -265,8 +265,7 @@ bool CCompressDialog::OnInit()
{
const CArchiverInfo &ai = m_ArchiverInfoList[i];
m_Format.AddString(GetSystemString(ai.Name));
if (ai.Name.CollateNoCase(
m_RegistryInfo.ArchiveType) == 0)
if (ai.Name.CompareNoCase(m_RegistryInfo.ArchiveType) == 0)
Info.ArchiverInfoIndex = i;
}
m_Format.SetCurSel(Info.ArchiverInfoIndex);
@@ -879,7 +878,7 @@ void CCompressDialog::SetDictionary()
if (index >= 0)
{
const NCompression::CFormatOptions &fo = m_RegistryInfo.FormatOptionsVector[index];
if (fo.Method.CollateNoCase(GetMethodSpec()) == 0)
if (fo.Method.CompareNoCase(GetMethodSpec()) == 0)
defaultDictionary = fo.Dictionary;
}
int methodID = GetMethodID();
@@ -1006,7 +1005,7 @@ void CCompressDialog::SetOrder()
if (index >= 0)
{
const NCompression::CFormatOptions &fo = m_RegistryInfo.FormatOptionsVector[index];
if (fo.Method.CollateNoCase(GetMethodSpec()) == 0)
if (fo.Method.CompareNoCase(GetMethodSpec()) == 0)
defaultOrder = fo.Order;
}
int methodID = GetMethodID();

2
7zip/UI/GUI/ExtractDialog.cpp
View File

@@ -300,7 +300,7 @@ void CExtractDialog::OnButtonSetPath()
void AddUniqueString(CSysStringVector &list, const CSysString &s)
{
for(int i = 0; i < list.Size(); i++)
if (s.CollateNoCase(list[i]) == 0)
if (s.CompareNoCase(list[i]) == 0)
return;
list.Add(s);
}