X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcommon%2Fhandle%2FTPIHandle.cpp;h=977f081cdf81b2e56917748f70f0bdae11b2bdf2;hb=8ff324e9c3ba6f1820af06e4fbae5b375b848e12;hp=4ee34ad75021c20a28c6bf736c8eacfc288f1fef;hpb=a574bac43c4aa7a4298fec2fdd9e0ab92a0d6a5a;p=tpi%2Flychee.git diff --git a/src/common/handle/TPIHandle.cpp b/src/common/handle/TPIHandle.cpp index 4ee34ad..977f081 100644 --- a/src/common/handle/TPIHandle.cpp +++ b/src/common/handle/TPIHandle.cpp @@ -115,7 +115,7 @@ int TPIHandle::CheckArchive(const wxString & _szArcName, int * _nFileCount) return ((int (__stdcall *)(const wxString &, int *)) p)(_szArcName, _nFileCount); } -int TPIHandle::OpenArchive(const wxString & _szArcName, void * * _hArchive) +int TPIHandle::OpenArchive(const wxString & _szArcName) { if (! this->lib.HasSymbol(wxT("OpenArchive"))) { @@ -127,10 +127,10 @@ int TPIHandle::OpenArchive(const wxString & _szArcName, void * * _hArchive) return -1; } - return ((int (__stdcall *)(const wxString &, void * *)) p)(_szArcName, _hArchive); + return ((int (__stdcall *)(const wxString &, void * *)) p)(_szArcName, & this->archive); } -int TPIHandle::CloseArchive(void * _hArchive) +int TPIHandle::CloseArchive(void) { if (! this->lib.HasSymbol(wxT("CloseArchive"))) { @@ -142,10 +142,10 @@ int TPIHandle::CloseArchive(void * _hArchive) return -1; } - return ((int (__stdcall *)(void *)) p)(_hArchive); + return ((int (__stdcall *)(void *)) p)(this->archive); } -int TPIHandle::GetFileInformation(void * _hArchive, TPI_FILEINFO * _fiInfo, bool _bFirst) +int TPIHandle::GetFileInformation(TPI_FILEINFO * _fiInfo, bool _bFirst) { if (! this->lib.HasSymbol(wxT("GetFileInformation")) || ! _fiInfo) { @@ -173,10 +173,10 @@ int TPIHandle::GetFileInformation(void * _hArchive, TPI_FILEINFO * _fiInfo, bool _fiInfo->llFileID = 0; _fiInfo->pCustomInfo = NULL; - return ((int (__stdcall *)(void *, TPI_FILEINFO *, bool)) p)(_hArchive, _fiInfo, _bFirst); + return ((int (__stdcall *)(void *, TPI_FILEINFO *, bool)) p)(this->archive, _fiInfo, _bFirst); } -int TPIHandle::GetArchiveInformation(void * _hArchive, TPI_ARCHIVEINFO * _aiInfo) +int TPIHandle::GetArchiveInformation(TPI_ARCHIVEINFO * _aiInfo) { if (! this->lib.HasSymbol(wxT("GetArchiveInformation")) || ! _aiInfo) { @@ -209,7 +209,7 @@ int TPIHandle::GetArchiveInformation(void * _hArchive, TPI_ARCHIVEINFO * _aiInfo _aiInfo->wCompressRatio = 0; _aiInfo->pCustomInfo = NULL; - return ((int (__stdcall *)(void *, TPI_ARCHIVEINFO *)) p)(_hArchive, _aiInfo); + return ((int (__stdcall *)(void *, TPI_ARCHIVEINFO *)) p)(this->archive, _aiInfo); } int TPIHandle::Command(unsigned int _uCommand, TPI_SWITCHES * _swInfo, const wxString & _szArcName, const wxArrayString & _szFiles)