TPIHandle内に書庫のハンドルを保持するよう変更。

[tpi/lychee.git] / src / common / handle / TPIHandle.cpp

diff --git a/src/common/handle/TPIHandle.cpp b/src/common/handle/TPIHandle.cpp
index 4ee34ad..977f081 100644 (file)
--- 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);\r
 }\r
 \r
-int TPIHandle::OpenArchive(const wxString & _szArcName, void * * _hArchive)\r
+int TPIHandle::OpenArchive(const wxString & _szArcName)\r
 {\r
        if (! this->lib.HasSymbol(wxT("OpenArchive")))\r
        {\r
@@ -127,10 +127,10 @@ int TPIHandle::OpenArchive(const wxString & _szArcName, void * * _hArchive)
                return -1;\r
        }\r
 \r
-       return ((int (__stdcall *)(const wxString &, void * *)) p)(_szArcName, _hArchive);\r
+       return ((int (__stdcall *)(const wxString &, void * *)) p)(_szArcName, & this->archive);\r
 }\r
 \r
-int TPIHandle::CloseArchive(void * _hArchive)\r
+int TPIHandle::CloseArchive(void)\r
 {\r
        if (! this->lib.HasSymbol(wxT("CloseArchive")))\r
        {\r
@@ -142,10 +142,10 @@ int TPIHandle::CloseArchive(void * _hArchive)
                return -1;\r
        }\r
 \r
-       return ((int (__stdcall *)(void *)) p)(_hArchive);\r
+       return ((int (__stdcall *)(void *)) p)(this->archive);\r
 }\r
 \r
-int TPIHandle::GetFileInformation(void * _hArchive, TPI_FILEINFO * _fiInfo, bool _bFirst)\r
+int TPIHandle::GetFileInformation(TPI_FILEINFO * _fiInfo, bool _bFirst)\r
 {\r
        if (! this->lib.HasSymbol(wxT("GetFileInformation")) || ! _fiInfo)\r
        {\r
@@ -173,10 +173,10 @@ int TPIHandle::GetFileInformation(void * _hArchive, TPI_FILEINFO * _fiInfo, bool
        _fiInfo->llFileID       = 0;\r
        _fiInfo->pCustomInfo    = NULL;\r
 \r
-       return ((int (__stdcall *)(void *, TPI_FILEINFO *, bool)) p)(_hArchive, _fiInfo, _bFirst);\r
+       return ((int (__stdcall *)(void *, TPI_FILEINFO *, bool)) p)(this->archive, _fiInfo, _bFirst);\r
 }\r
 \r
-int TPIHandle::GetArchiveInformation(void * _hArchive, TPI_ARCHIVEINFO * _aiInfo)\r
+int TPIHandle::GetArchiveInformation(TPI_ARCHIVEINFO * _aiInfo)\r
 {\r
        if (! this->lib.HasSymbol(wxT("GetArchiveInformation")) || ! _aiInfo)\r
        {\r
@@ -209,7 +209,7 @@ int TPIHandle::GetArchiveInformation(void * _hArchive, TPI_ARCHIVEINFO * _aiInfo
        _aiInfo->wCompressRatio = 0;\r
        _aiInfo->pCustomInfo    = NULL;\r
 \r
-       return ((int (__stdcall *)(void *, TPI_ARCHIVEINFO *)) p)(_hArchive, _aiInfo);\r
+       return ((int (__stdcall *)(void *, TPI_ARCHIVEINFO *)) p)(this->archive, _aiInfo);\r
 }\r
 \r
 int TPIHandle::Command(unsigned int _uCommand, TPI_SWITCHES * _swInfo, const wxString & _szArcName, const wxArrayString & _szFiles)\r