ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code Refactoring: 7zip

This commit is contained in:
zilmar 2012-11-19 22:04:57 +11:00
parent 6067e5b0de
commit a59c7ee634
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/Project64/3rd Party/7zip.cpp
View File

@ -7,15 +7,15 @@ typedef const char * LPCSTR;
#include "7zip.h" #include "7zip.h"
C7zip::C7zip (LPCSTR FileName) : C7zip::C7zip (LPCSTR FileName) :
m_FileSize(0),
m_CurrentFile(-1),
m_blockIndex(0xFFFFFFFF), m_blockIndex(0xFFFFFFFF),
m_outBuffer(0), m_outBuffer(0),
m_outBufferSize(0), m_outBufferSize(0),
NotfyCallback(NotfyCallbackDefault), m_NotfyCallback(NotfyCallbackDefault),
NotfyCallbackInfo(NULL), m_NotfyCallbackInfo(NULL)
m_FileSize(0),
m_CurrentFile(-1)
{ {
memset(&m_FileName,0,sizeof(m_FileName));
memset(&m_db,0,sizeof(m_db)); memset(&m_db,0,sizeof(m_db));
m_archiveStream.InStream.Read = SzFileReadImp; m_archiveStream.InStream.Read = SzFileReadImp;
@ -44,7 +44,6 @@ C7zip::C7zip (LPCSTR FileName) :
SzArDbExInit(&m_db); SzArDbExInit(&m_db);
SZ_RESULT res = SzArchiveOpen(&m_archiveStream.InStream, &m_db, &m_allocImp, &m_allocTempImp); SZ_RESULT res = SzArchiveOpen(&m_archiveStream.InStream, &m_db, &m_allocImp, &m_allocTempImp);
res = res; res = res;
} }
C7zip::~C7zip (void) C7zip::~C7zip (void)
@ -64,8 +63,8 @@ C7zip::~C7zip (void)
void C7zip::SetNotificationCallback (LP7ZNOTIFICATION NotfyFnc, void * CBInfo) void C7zip::SetNotificationCallback (LP7ZNOTIFICATION NotfyFnc, void * CBInfo)
{ {
NotfyCallback = NotfyFnc ? NotfyFnc : NotfyCallbackDefault; m_NotfyCallback = NotfyFnc ? NotfyFnc : NotfyCallbackDefault;
NotfyCallbackInfo = CBInfo; m_NotfyCallbackInfo = CBInfo;
} }
void C7zip::StatusUpdate(_7Z_STATUS status, int Value1, int Value2, C7zip * _this ) void C7zip::StatusUpdate(_7Z_STATUS status, int Value1, int Value2, C7zip * _this )
@ -74,15 +73,15 @@ void C7zip::StatusUpdate(_7Z_STATUS status, int Value1, int Value2, C7zip * _thi
switch (status) switch (status)
{ {
case LZMADECODE_START: _this->NotfyCallback("Start decoding",_this->NotfyCallbackInfo); break; case LZMADECODE_START: _this->m_NotfyCallback("Start decoding",_this->m_NotfyCallbackInfo); break;
case LZMADECODE_UPDATE: case LZMADECODE_UPDATE:
{ {
char Msg[200]; char Msg[200];
sprintf(Msg,"decoding %s: %0.2f%%",File->Name, (Value1/(float)Value2) * 100); sprintf(Msg,"decoding %s: %0.2f%%",File->Name, (Value1/(float)Value2) * 100);
_this->NotfyCallback(Msg,_this->NotfyCallbackInfo); _this->m_NotfyCallback(Msg,_this->m_NotfyCallbackInfo);
} }
break; break;
case LZMADECODE_DONE: _this->NotfyCallback("Finished decoding",_this->NotfyCallbackInfo); break; case LZMADECODE_DONE: _this->m_NotfyCallback("Finished decoding",_this->m_NotfyCallbackInfo); break;
} }
} }
@ -106,7 +105,7 @@ bool C7zip::GetFile(int index, Byte * Data, size_t DataLen )
char Msg[200]; char Msg[200];
CFileItem * f = FileItem(index); CFileItem * f = FileItem(index);
sprintf(Msg,"Getting %s",f->Name); sprintf(Msg,"Getting %s",f->Name);
NotfyCallback(Msg,NotfyCallbackInfo); m_NotfyCallback(Msg,m_NotfyCallbackInfo);
res = SzExtract(&m_archiveStream.InStream, &m_db, index, res = SzExtract(&m_archiveStream.InStream, &m_db, index,
&m_blockIndex, &m_outBuffer, &m_outBufferSize, &m_blockIndex, &m_outBuffer, &m_outBufferSize,
@ -123,7 +122,7 @@ bool C7zip::GetFile(int index, Byte * Data, size_t DataLen )
outSizeProcessed = DataLen; outSizeProcessed = DataLen;
} }
memcpy(Data,m_outBuffer + offset,outSizeProcessed); memcpy(Data,m_outBuffer + offset,outSizeProcessed);
NotfyCallback("",NotfyCallbackInfo); m_NotfyCallback("",m_NotfyCallbackInfo);
m_CurrentFile = -1; m_CurrentFile = -1;
return true; return true;
} }
@ -146,7 +145,7 @@ SZ_RESULT C7zip::SzFileSeekImp(void *object, CFileSize pos)
return SZE_FAIL; return SZE_FAIL;
} }
char * C7zip::FileName ( char * FileName, int SizeOfFileName ) const const char * C7zip::FileName ( char * FileName, int SizeOfFileName ) const
{ {
if (FileName == NULL) if (FileName == NULL)
{ {

38
Source/Project64/3rd Party/7zip.h
View File

@ -1,5 +1,4 @@
#ifndef _7ZIP_H_ #pragma once
#define _7ZIP_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -17,9 +16,26 @@ extern "C" {
class C7zip class C7zip
{ {
public: public:
C7zip (LPCSTR FileName);
~C7zip ();
typedef void (__stdcall *LP7ZNOTIFICATION)( LPCSTR Status, void * CBInfo ); typedef void (__stdcall *LP7ZNOTIFICATION)( LPCSTR Status, void * CBInfo );
inline int NumFiles ( void ) const { return m_db.Database.NumFiles; }
inline CFileItem * FileItem ( int index ) const { return &m_db.Database.Files[index]; }
inline int FileSize ( void ) const { return m_FileSize; }
bool GetFile ( int index, Byte * Data, size_t DataLen );
const char * FileName ( char * FileName, int SizeOfFileName ) const;
void SetNotificationCallback (LP7ZNOTIFICATION NotfyFnc, void * CBInfo);
private: private:
C7zip(void); // Disable default constructor
C7zip(const C7zip&); // Disable copy constructor
C7zip& operator=(const C7zip&); // Disable assignment
typedef struct _CFileInStream typedef struct _CFileInStream
{ {
ISzInStream InStream; ISzInStream InStream;
@ -45,21 +61,7 @@ private:
static void __stdcall StatusUpdate(_7Z_STATUS status, int Value1, int Value2, C7zip * _this); static void __stdcall StatusUpdate(_7Z_STATUS status, int Value1, int Value2, C7zip * _this);
static void __stdcall NotfyCallbackDefault ( LPCSTR /*Status*/, void * /*CBInfo*/ ) { } static void __stdcall NotfyCallbackDefault ( LPCSTR /*Status*/, void * /*CBInfo*/ ) { }
LP7ZNOTIFICATION NotfyCallback;
void * NotfyCallbackInfo;
public: LP7ZNOTIFICATION m_NotfyCallback;
C7zip (LPCSTR FileName); void * m_NotfyCallbackInfo;
~C7zip ();
inline int NumFiles ( void ) const { return m_db.Database.NumFiles; }
inline CFileItem * FileItem ( int index ) const { return &m_db.Database.Files[index]; }
bool GetFile ( int index, Byte * Data, size_t DataLen );
char * FileName ( char * FileName, int SizeOfFileName ) const;
inline int FileSize ( void ) const { return m_FileSize; }
void SetNotificationCallback (LP7ZNOTIFICATION NotfyFnc, void * CBInfo);
}; };
#endif