mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged luisangelsm/yacreader into default

Browse Source
This commit is contained in:
Felix Kauselmann 2015-03-22 00:51:45 +01:00
parent 5ea27772cd
commit b0e40a9b94
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compressed_archive/compressed_archive.cpp
View File

@ -4,12 +4,11 @@
#include <QLibrary> #include <QLibrary>
#include <QFileInfo> #include <QFileInfo>
#include <QDebug> #include <QDebug>
#include <QApplication> #include <QCoreApplication>
#include "open_callbacks.h" #include "open_callbacks.h"
#include "extract_callbacks.h" #include "extract_callbacks.h"
#include "yacreader_global.h"
//DEFINE_GUID(CLSID_CFormat7z,0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x07, 0x00, 0x00); //DEFINE_GUID(CLSID_CFormat7z,0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x07, 0x00, 0x00);
//DEFINE_GUID(IArchiveKK,0x23170F69, 0x40C1, 0x278A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x60, 0x00, 0x00); //DEFINE_GUID(IArchiveKK,0x23170F69, 0x40C1, 0x278A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x60, 0x00, 0x00);
@ -178,16 +177,12 @@ CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent)
CompressedArchive::~CompressedArchive() CompressedArchive::~CompressedArchive()
{ {
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
if(isRar) //TODO: fix this!!! Possible memory leak. If AddRef is not used, a crash occurs in "delete szInterface" if(isRar) //TODO: fix this!!! Possible memory leak. If AddRef is not used, a crash occurs in "delete szInterface"
szInterface->archive->AddRef(); szInterface->archive->AddRef();
#endif #endif
if(valid) //TODO: fix this!!! Memory leak. if(valid) //TODO: fix this!!! Memory leak.
{
szInterface->archive->Close();
delete szInterface; delete szInterface;
}
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
delete rarLib; delete rarLib;
#endif #endif
@ -204,7 +199,7 @@ bool CompressedArchive::loadFunctions()
{ {
#if defined Q_OS_UNIX #if defined Q_OS_UNIX
#if defined Q_OS_MAC #if defined Q_OS_MAC
rarLib = new QLibrary(QApplication::applicationDirPath()+"/utils/Codecs/Rar29"); rarLib = new QLibrary(QCoreApplication::applicationDirPath()+"/utils/Codecs/Rar29");
#else #else
//check if a yacreader specific version of p7zip exists on the system //check if a yacreader specific version of p7zip exists on the system
QFileInfo rarCodec(QString(LIBDIR)+"/yacreader/Codecs/Rar29.so"); QFileInfo rarCodec(QString(LIBDIR)+"/yacreader/Codecs/Rar29.so");
@ -220,7 +215,7 @@ bool CompressedArchive::loadFunctions()
if(!rarLib->load()) if(!rarLib->load())
{ {
qDebug() << "Error Loading Rar29.so : " + rarLib->errorString() << endl; qDebug() << "Error Loading Rar29.so : " + rarLib->errorString() << endl;
QApplication::exit(YACReader::SevenZNotFound); QCoreApplication::exit(700); //TODO yacreader_global can't be used here, it is GUI dependant, YACReader::SevenZNotFound
return false; return false;
} }
#endif #endif
@ -235,13 +230,13 @@ bool CompressedArchive::loadFunctions()
sevenzLib = new QLibrary(QString(LIBDIR)+"/p7zip/7z.so"); sevenzLib = new QLibrary(QString(LIBDIR)+"/p7zip/7z.so");
} }
#else #else
sevenzLib = new QLibrary(QApplication::applicationDirPath()+"/utils/7z"); sevenzLib = new QLibrary(QCoreApplication::applicationDirPath()+"/utils/7z");
#endif #endif
} }
if(!sevenzLib->load()) if(!sevenzLib->load())
{ {
qDebug() << "Error Loading 7z.dll : " + sevenzLib->errorString() << endl; qDebug() << "Error Loading 7z.dll : " + sevenzLib->errorString() << endl;
QApplication::exit(YACReader::SevenZNotFound); QCoreApplication::exit(700); //TODO yacreader_global can't be used here, it is GUI dependant, YACReader::SevenZNotFound
return false; return false;
} }
else else