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

9.17

Browse Source
This commit is contained in:
Igor Pavlov
2010-10-04 00:00:00 +00:00
committed by Kornel Lesiński
parent 044e4bb741
commit 2eb60a0598
105 changed files with 868 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CPP/7zip/UI/Common/ArchiveCommandLine.cpp
View File

@@ -86,7 +86,7 @@ enum Enum
kTechMode,
kShareForWrite,
kCaseSensitive,
kCalcCrc,
kCalcCrc
};
}
@@ -191,12 +191,12 @@ static const char *kSameTerminalError = "I won't write data and program's messag
static void ThrowException(const char *errorMessage)
{
throw CArchiveCommandLineException(errorMessage);
};
}
static void ThrowUserErrorException()
{
ThrowException(kUserErrorMessage);
};
}
// ---------------------------

5
CPP/7zip/UI/Common/Update.cpp
View File

@@ -82,7 +82,7 @@ public:
STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition);
STDMETHOD(SetSize)(Int64 newSize);
STDMETHOD(SetSize)(UInt64 newSize);
};
// static NSynchronization::CCriticalSection g_TempPathsCS;
@@ -204,7 +204,7 @@ STDMETHODIMP COutMultiVolStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64 *n
return S_OK;
}
STDMETHODIMP COutMultiVolStream::SetSize(Int64 newSize)
STDMETHODIMP COutMultiVolStream::SetSize(UInt64 newSize)
{
if (newSize < 0)
return E_INVALIDARG;
@@ -905,4 +905,3 @@ HRESULT UpdateArchive(
#endif
return S_OK;
}

20
CPP/7zip/UI/Common/UpdateAction.cpp
View File

@@ -7,7 +7,7 @@
namespace NUpdateArchive {
const CActionSet kAddActionSet =
{
{{
NPairAction::kCopy,
NPairAction::kCopy,
NPairAction::kCompress,
@@ -15,10 +15,10 @@ const CActionSet kAddActionSet =
NPairAction::kCompress,
NPairAction::kCompress,
NPairAction::kCompress
};
}};
const CActionSet kUpdateActionSet =
{
{{
NPairAction::kCopy,
NPairAction::kCopy,
NPairAction::kCompress,
@@ -26,10 +26,10 @@ const CActionSet kUpdateActionSet =
NPairAction::kCompress,
NPairAction::kCopy,
NPairAction::kCompress
};
}};
const CActionSet kFreshActionSet =
{
{{
NPairAction::kCopy,
NPairAction::kCopy,
NPairAction::kIgnore,
@@ -37,10 +37,10 @@ const CActionSet kFreshActionSet =
NPairAction::kCompress,
NPairAction::kCopy,
NPairAction::kCompress
};
}};
const CActionSet kSynchronizeActionSet =
{
{{
NPairAction::kCopy,
NPairAction::kIgnore,
NPairAction::kCompress,
@@ -48,10 +48,10 @@ const CActionSet kSynchronizeActionSet =
NPairAction::kCompress,
NPairAction::kCopy,
NPairAction::kCompress,
};
}};
const CActionSet kDeleteActionSet =
{
{{
NPairAction::kCopy,
NPairAction::kIgnore,
NPairAction::kIgnore,
@@ -59,6 +59,6 @@ const CActionSet kDeleteActionSet =
NPairAction::kIgnore,
NPairAction::kIgnore,
NPairAction::kIgnore
};
}};
}

8
CPP/7zip/UI/Common/UpdateAction.h
View File

@@ -19,6 +19,7 @@ namespace NUpdateArchive {
kUnknowNewerFiles
};
}
namespace NPairAction
{
enum EEnum
@@ -29,6 +30,7 @@ namespace NUpdateArchive {
kCompressAsAnti
};
}
struct CActionSet
{
NPairAction::EEnum StateActions[NPairState::kNumValues];
@@ -44,14 +46,12 @@ namespace NUpdateArchive {
return false;
}
};
extern const CActionSet kAddActionSet;
extern const CActionSet kUpdateActionSet;
extern const CActionSet kFreshActionSet;
extern const CActionSet kSynchronizeActionSet;
extern const CActionSet kDeleteActionSet;
};
}
#endif

4
CPP/7zip/UI/Common/UpdateCallback.h
View File

@@ -24,8 +24,8 @@
virtual HRESULT SetOperationResult(Int32 operationResult) x; \
virtual HRESULT CryptoGetTextPassword2(Int32 *passwordIsDefined, BSTR *password) x; \
virtual HRESULT CryptoGetTextPassword(BSTR *password) x; \
// virtual HRESULT ShowDeleteFile(const wchar_t *name) x; \
// virtual HRESULT CloseProgress() { return S_OK; };
/* virtual HRESULT ShowDeleteFile(const wchar_t *name) x; */ \
/* virtual HRESULT CloseProgress() { return S_OK; }; */
struct IUpdateCallbackUI
{