Skip to content

fix build & add callback #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix build & add callback #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions src/7ZipArchive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,26 @@ class CArchiveExtractCallback:
// ICryptoGetTextPassword
STDMETHOD(CryptoGetTextPassword)(BSTR *aPassword);

STDMETHOD(SetCallback)(const ProcessCallback& Callback) { m_Callback = Callback; return S_OK; }
STDMETHOD(SetUserData)(void * pUserData) { m_pUserData = pUserData; return S_OK; }
private:
C7ZipOutStreamWrap * _outFileStreamSpec;
CMyComPtr<ISequentialOutStream> _outFileStream;

C7ZipOutStream * m_pOutStream;
const C7ZipArchive * m_pArchive;
const C7ZipArchiveItem * m_pItem;
UInt64 m_nTotalSize;
ProcessCallback m_Callback;
void * m_pUserData;
public:
CArchiveExtractCallback(C7ZipOutStream * pOutStream,const C7ZipArchive * pArchive,const C7ZipArchiveItem * pItem) :
m_pOutStream(pOutStream),
m_pArchive(pArchive),
m_pItem(pItem)
m_pItem(pItem),
m_nTotalSize(0),
m_Callback(NULL),
m_pUserData(NULL)
{
}
};
Expand All @@ -108,6 +116,7 @@ class C7ZipArchiveImpl : public virtual C7ZipArchive
virtual bool Extract(unsigned int index, C7ZipOutStream * pOutStream);
virtual bool Extract(unsigned int index, C7ZipOutStream * pOutStream, const wstring & pwd);
virtual bool Extract(const C7ZipArchiveItem * pArchiveItem, C7ZipOutStream * pOutStream);
virtual bool Extract(const C7ZipArchiveItem * pArchiveItem, C7ZipOutStream * pOutStream, const ProcessCallback &callback, void * user);

virtual void Close();

Expand Down Expand Up @@ -203,6 +212,19 @@ bool C7ZipArchiveImpl::Extract(const C7ZipArchiveItem * pArchiveItem, C7ZipOutSt
return m_pInArchive->Extract(&nArchiveIndex, 1, false, extractCallbackSpec) == S_OK;
}

bool C7ZipArchiveImpl::Extract(const C7ZipArchiveItem * pArchiveItem, C7ZipOutStream * pOutStream, const ProcessCallback &callback, void * user)
{
CArchiveExtractCallback *extractCallbackSpec =
new CArchiveExtractCallback(pOutStream, this, pArchiveItem);
CMyComPtr<IArchiveExtractCallback> extractCallback(extractCallbackSpec);
extractCallbackSpec->SetCallback(callback);
extractCallbackSpec->SetUserData(user);

UInt32 nArchiveIndex = pArchiveItem->GetArchiveIndex();

return m_pInArchive->Extract(&nArchiveIndex, 1, false, extractCallbackSpec) == S_OK;
}

void C7ZipArchiveImpl::Close()
{
m_pInArchive->Close();
Expand Down Expand Up @@ -261,13 +283,18 @@ bool Create7ZipArchive(C7ZipLibrary * pLibrary,
return false;
}

STDMETHODIMP CArchiveExtractCallback::SetTotal(UInt64 /* size */)
STDMETHODIMP CArchiveExtractCallback::SetTotal(UInt64 size )
{
m_nTotalSize = size;
return S_OK;
}

STDMETHODIMP CArchiveExtractCallback::SetCompleted(const UInt64 * /* completeValue */)
STDMETHODIMP CArchiveExtractCallback::SetCompleted(const UInt64 * completeValue )
{
float percent = (*completeValue) * 100.0 / m_nTotalSize;
if (m_Callback) {
m_Callback(percent, m_pUserData);
}
return S_OK;
}

Expand Down
4 changes: 2 additions & 2 deletions src/7ZipArchiveOpenCallback.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include "CPP/Common/MyCom.h"
#include "CPP/7zip/ICoder.h"
#include "CPP/7zip/IPassword.h"
#include "Common/ComTry.h"
#include "Windows/PropVariant.h"
#include "CPP/Common/ComTry.h"
#include "CPP/Windows/PropVariant.h"
using namespace NWindows;

#include "stdlib.h"
Expand Down
4 changes: 2 additions & 2 deletions src/7ZipCodecInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include "CPP/Common/MyCom.h"
#include "CPP/7zip/ICoder.h"
#include "CPP/7zip/IPassword.h"
#include "Common/ComTry.h"
#include "Windows/PropVariant.h"
#include "CPP/Common/ComTry.h"
#include "CPP/Windows/PropVariant.h"
using namespace NWindows;

#include "stdlib.h"
Expand Down
4 changes: 2 additions & 2 deletions src/7ZipCompressCodecsInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include "CPP/Common/MyCom.h"
#include "CPP/7zip/ICoder.h"
#include "CPP/7zip/IPassword.h"
#include "Common/ComTry.h"
#include "Windows/PropVariant.h"
#include "CPP/Common/ComTry.h"
#include "CPP/Windows/PropVariant.h"
using namespace NWindows;

#include "stdlib.h"
Expand Down
4 changes: 2 additions & 2 deletions src/7ZipDllHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include "CPP/Common/MyCom.h"
#include "CPP/7zip/ICoder.h"
#include "CPP/7zip/IPassword.h"
#include "Common/ComTry.h"
#include "Windows/PropVariant.h"
#include "CPP/Common/ComTry.h"
#include "CPP/Windows/PropVariant.h"
#if MY_VER_MAJOR >= 15
#include "CPP/Common/MyBuffer.h"
#else
Expand Down
5 changes: 3 additions & 2 deletions src/7ZipFormatInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
#endif

#include "C/7zVersion.h"
#include "CPP/Common/Common.h"
#include "CPP/7zip/Archive/IArchive.h"
#include "CPP/Windows/PropVariant.h"
#include "CPP/Common/MyCom.h"
#include "CPP/7zip/ICoder.h"
#include "CPP/7zip/IPassword.h"
#include "Common/ComTry.h"
#include "Windows/PropVariant.h"
#include "CPP/Common/ComTry.h"
#include "CPP/Windows/PropVariant.h"

#if MY_VER_MAJOR >= 15
#include "CPP/Common/MyBuffer.h"
Expand Down
4 changes: 2 additions & 2 deletions src/7ZipInStreamWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include "CPP/Common/MyCom.h"
#include "CPP/7zip/ICoder.h"
#include "CPP/7zip/IPassword.h"
#include "Common/ComTry.h"
#include "Windows/PropVariant.h"
#include "CPP/Common/ComTry.h"
#include "CPP/Windows/PropVariant.h"
using namespace NWindows;

#include "lib7zip.h"
Expand Down
4 changes: 2 additions & 2 deletions src/7ZipOpenArchive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include "CPP/Common/MyCom.h"
#include "CPP/7zip/ICoder.h"
#include "CPP/7zip/IPassword.h"
#include "Common/ComTry.h"
#include "Windows/PropVariant.h"
#include "CPP/Common/ComTry.h"
#include "CPP/Windows/PropVariant.h"

#if MY_VER_MAJOR >= 15
#include "CPP/Common/MyBuffer.h"
Expand Down
4 changes: 2 additions & 2 deletions src/7zipLibrary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include "CPP/Common/MyCom.h"
#include "CPP/7zip/ICoder.h"
#include "CPP/7zip/IPassword.h"
#include "Common/ComTry.h"
#include "Windows/PropVariant.h"
#include "CPP/Common/ComTry.h"
#include "CPP/Windows/PropVariant.h"
using namespace NWindows;

#include "stdlib.h"
Expand Down
6 changes: 6 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,9 @@ TARGET_INCLUDE_DIRECTORIES(lib7zip_shared PRIVATE
"${P7ZIP_INCLUDE_PATH}"
)
ENDIF()


IF (MSVC)
add_definitions(-DUNICODE -D_UNICODE)
set(CMAKE_CXX_FLAGS "${MAKE_CXX_FLAGS} /WX-")
ENDIF ()
2 changes: 1 addition & 1 deletion src/HelperFuncs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

#include "C/7zVersion.h"
#include "CPP/7zip/Archive/IArchive.h"
#include "CPP/Windows/Defs.h"
#include "CPP/Windows/PropVariant.h"
#include "CPP/Common/MyCom.h"
#include "CPP/7zip/ICoder.h"
#include "CPP/7zip/IPassword.h"
#include "CPP/7zip/Common/FileStreams.h"

#include <stdlib.h>

Expand Down
4 changes: 2 additions & 2 deletions src/OSFunctions_Win32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "CPP/Common/MyCom.h"
#include "CPP/7zip/ICoder.h"
#include "CPP/7zip/IPassword.h"
#include "Common/ComTry.h"
#include "Windows/PropVariant.h"
#include "CPP/Common/ComTry.h"
#include "CPP/Windows/PropVariant.h"
using namespace NWindows;

#include "HelperFuncs.h"
Expand Down
3 changes: 3 additions & 0 deletions src/lib7zip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include <string>
#include <vector>
#include <functional>

#ifndef _WIN32
#ifndef __int64
Expand All @@ -33,6 +34,7 @@ typedef std::basic_string<wchar_t> wstring;
typedef std::basic_string<char> string;

typedef std::vector<wstring> WStringArray;
typedef std::function<void(float percent, void *user)> ProcessCallback;

class C7ZipObject
{
Expand Down Expand Up @@ -162,6 +164,7 @@ class C7ZipArchive : public virtual C7ZipObject
virtual bool Extract(unsigned int index, C7ZipOutStream * pOutStream) = 0;
virtual bool Extract(unsigned int index, C7ZipOutStream * pOutStream, const wstring & pwd) = 0;
virtual bool Extract(const C7ZipArchiveItem * pArchiveItem, C7ZipOutStream * pOutStream) = 0;
virtual bool Extract(const C7ZipArchiveItem * pArchiveItem, C7ZipOutStream * pOutStream, const ProcessCallback &callback, void * user) = 0;
virtual wstring GetArchivePassword() const = 0;
virtual void SetArchivePassword(const wstring & password) = 0;
virtual bool IsPasswordSet() const = 0;
Expand Down
5 changes: 5 additions & 0 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,8 @@ TARGET_LINK_LIBRARIES(${test_target_name}
)

ENDFOREACH()

IF (MSVC)
add_definitions(-DUNICODE -D_UNICODE)
set(CMAKE_CXX_FLAGS "${MAKE_CXX_FLAGS} /WX-")
ENDIF ()