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

9.04 beta

Browse Source
This commit is contained in:
Igor Pavlov
2009-06-02 00:00:00 +00:00
committed by Kornel Lesiński
parent 8874e4fbc9
commit 829409452d
440 changed files with 19803 additions and 9941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
CPP/7zip/UI/FileManager/Panel.cpp
View File

@@ -5,28 +5,30 @@
#include <Windowsx.h>
#include "Common/Defs.h"
#include "Common/StringConvert.h"
#include "Common/IntToString.h"
#include "Common/StringConvert.h"
#include "Windows/Error.h"
#include "Windows/PropVariant.h"
#include "Windows/Thread.h"
#include "../../PropID.h"
#include "Panel.h"
#include "RootFolder.h"
#include "FSFolder.h"
#include "FormatUtils.h"
#include "App.h"
#include "ExtractCallback.h"
#include "resource.h"
#include "..\GUI\ExtractRes.h"
#include "../GUI/ExtractRes.h"
#include "../Common/ArchiveName.h"
#include "../Common/CompressCall.h"
#include "../Agent/IFolderArchive.h"
#include "../Common/CompressCall.h"
#include "../Common/ArchiveName.h"
#include "App.h"
#include "ExtractCallback.h"
#include "FSFolder.h"
#include "FormatUtils.h"
#include "Panel.h"
#include "RootFolder.h"
using namespace NWindows;
using namespace NControl;
@@ -707,7 +709,7 @@ bool CPanel::IsFSDrivesFolder() const
UString CPanel::GetFsPath() const
{
if (IsFSDrivesFolder())
if (IsFSDrivesFolder() && !IsDeviceDrivesPrefix())
return UString();
return _currentFolderPrefix;
}
@@ -773,7 +775,7 @@ void CPanel::AddToArchive()
{
CRecordVector<UInt32> indices;
GetOperatedItemIndices(indices);
if (!IsFSFolder())
if (!IsFsOrDrivesFolder())
{
MessageBoxErrorLang(IDS_OPERATION_IS_NOT_SUPPORTED, 0x03020208);
return;
@@ -784,14 +786,25 @@ void CPanel::AddToArchive()
return;
}
UStringVector names;
UString curPrefix = _currentFolderPrefix;
UString destCurDirPrefix = _currentFolderPrefix;
if (IsFSDrivesFolder())
{
destCurDirPrefix = L"C:\\";
if (!IsDeviceDrivesPrefix())
curPrefix.Empty();
}
for (int i = 0; i < indices.Size(); i++)
{
int index = indices[i];
names.Add(_currentFolderPrefix + GetItemRelPath(index));
names.Add(curPrefix + GetItemRelPath(index));
}
const UString archiveName = CreateArchiveName(
names.Front(), (names.Size() > 1), false);
HRESULT res = CompressFiles(_currentFolderPrefix, archiveName, L"", names, false, true, false);
HRESULT res = CompressFiles(destCurDirPrefix, archiveName, L"", names, false, true, false);
if (res != S_OK)
{
if (_currentFolderPrefix.Length() >= MAX_PATH)
@@ -823,7 +836,7 @@ void CPanel::GetFilePaths(const CRecordVector<UInt32> &indices, UStringVector &p
paths.Clear();
break;
}
paths.Add(_currentFolderPrefix + GetItemRelPath(index));
paths.Add(GetItemFullPath(index));
}
if (paths.Size() == 0)
{