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

fix: SoleFolderIndex: continue fixing method decl/impl

Browse Source
This commit is contained in:
shunf4
2024-05-10 19:40:20 +08:00
parent 5be705687e
commit e76e0f5d57
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CPP/7zip/UI/Agent/ArchiveFolder.cpp
View File

@@ -44,7 +44,7 @@ Z7_COM7F_IMF(CAgentFolder::CopyTo(Int32 moveMode, const UInt32 *indices, UInt32
NExtract::NPathMode::kNoPaths; NExtract::NPathMode::kNoPaths;
Int64 soleFolderIndex; Int64 soleFolderIndex;
extractCallback2->GetSoleFolderIndex(&soleFolderIndex); callback->GetSoleFolderIndex(&soleFolderIndex);
return Extract(indices, numItems, return Extract(indices, numItems,
includeAltStreams, replaceAltStreamCharsMode, includeAltStreams, replaceAltStreamCharsMode,

1
CPP/7zip/UI/Agent/IFolderArchive.h
View File

@@ -27,6 +27,7 @@ IArchiveFolder is used by:
x(Extract(const UInt32 *indices, UInt32 numItems, \ x(Extract(const UInt32 *indices, UInt32 numItems, \
Int32 includeAltStreams, \ Int32 includeAltStreams, \
Int32 replaceAltStreamCharsMode, \ Int32 replaceAltStreamCharsMode, \
Int64 soleFolderIndex, \
NExtract::NPathMode::EEnum pathMode, \ NExtract::NPathMode::EEnum pathMode, \
NExtract::NOverwriteMode::EEnum overwriteMode, \ NExtract::NOverwriteMode::EEnum overwriteMode, \
const wchar_t *path, Int32 testMode, \ const wchar_t *path, Int32 testMode, \

6
CPP/7zip/UI/FileManager/PanelCopy.cpp
View File

@@ -109,9 +109,9 @@ HRESULT CPanelCopyThread::ProcessVirt()
options->folder, BoolToInt(true), extractCallback2); options->folder, BoolToInt(true), extractCallback2);
} }
else else
CMyComPtr<IFolderArchiveExtractCallback> extractCallback2; // CMyComPtr<IFolderArchiveExtractCallback> extractCallback2;
RINOK(ExtractCallback.QueryInterface(IID_IFolderArchiveExtractCallback, &extractCallback2)) // RINOK(ExtractCallback.QueryInterface(IID_IFolderArchiveExtractCallback, &extractCallback2))
extractCallback2->SetSoleFolderIndex(options->soleFolderIndex); ExtractCallback->SetSoleFolderIndex(options->soleFolderIndex);
result2 = FolderOperations->CopyTo( result2 = FolderOperations->CopyTo(
BoolToInt(options->moveMode), BoolToInt(options->moveMode),
&Indices.Front(), Indices.Size(), &Indices.Front(), Indices.Size(),