TPI_ERROR_S_ENDOFDATAの追加による修正。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@83 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/src/plugin/calLibrary/calLibrary.cpp b/src/plugin/calLibrary/calLibrary.cpp
index f6221dd..f1b86b7 100644 (file)
--- a/src/plugin/calLibrary/calLibrary.cpp
+++ b/src/plugin/calLibrary/calLibrary.cpp
@@ -258,6 +258,7 @@ int CalErrorCodeConvert(int nCalErrorCode)
        switch (nCalErrorCode)\r
        {\r
        case 0:                     return TPI_ERROR_SUCCESS;\r
+       case -1:                                        return TPI_ERROR_S_ENDOFDATA;\r
        case ERROR_DISK_SPACE:      return TPI_ERROR_IO_ARC_WRITE;\r
        case ERROR_READ_ONLY:       return TPI_ERROR_IO_FILE_WRITE;\r
        case ERROR_USER_SKIP:       return TPI_ERROR_D_SKIPPED;\r
@@ -450,8 +451,8 @@ int __stdcall GetFormatInformation(TPI_FORMATINFO * _fiInfo, bool _bFirst)
 \r
        if (xmlLibrary == NULL || xmlLibrary->GetName() != wxT("library"))\r
        {\r
-               // xml\95¶\96@\83G\83\89\81[\81B\r
-               return TPI_ERROR_UNDEFINED;\r
+               // \83f\81[\83^\82Ì\8fI\92[\82É\92B\82µ\82½\8fê\8d\87\81B\r
+               return TPI_ERROR_S_ENDOFDATA;\r
        }\r
 \r
        MakeFormatInfo(wxT("calLibrary"), _fiInfo, xmlLibrary, s_uFileID++);\r

diff --git a/src/plugin/cuiWrapper/cuiWrapper.cpp b/src/plugin/cuiWrapper/cuiWrapper.cpp
index e628602..05cf6b3 100644 (file)
--- a/src/plugin/cuiWrapper/cuiWrapper.cpp
+++ b/src/plugin/cuiWrapper/cuiWrapper.cpp
@@ -231,8 +231,8 @@ int __stdcall GetFormatInformation(TPI_FORMATINFO * _fiInfo, bool _bFirst)
 \r
        if (xmlLibrary == NULL || xmlLibrary->GetName() != wxT("library"))\r
        {\r
-               // xml\95¶\96@\83G\83\89\81[\81B\r
-               return TPI_ERROR_UNDEFINED;\r
+               // \8fI\92[\82É\92B\82µ\82½\8fê\8d\87\81B\r
+               return TPI_ERROR_S_ENDOFDATA;\r
        }\r
 \r
        MakeFormatInfo(wxT("cuiWrapper"), _fiInfo, xmlLibrary, s_uFileID++);\r
@@ -432,7 +432,7 @@ int __stdcall GetFileInformation
        // \8dÅ\8fI\8ds\82©\82Ç\82¤\82©\8am\94F\81B\r
        if (asOutput[s_uCurrentLine] == szEndLine)\r
        {\r
-               return TPI_ERROR_UNDEFINED;\r
+               return TPI_ERROR_S_ENDOFDATA;\r
        }\r
 \r
        // \83t\83@\83C\83\8b\96¼\82ð\8eæ\93¾\81B\r

diff --git a/src/plugin/spiLibrary/spiLibrary.cpp b/src/plugin/spiLibrary/spiLibrary.cpp
index 3173f75..274491d 100644 (file)
--- a/src/plugin/spiLibrary/spiLibrary.cpp
+++ b/src/plugin/spiLibrary/spiLibrary.cpp
@@ -300,7 +300,7 @@ int __stdcall GetFileInformation
 \r
        if (uFilePointer > uFileCount)\r
        {\r
-               return TPI_ERROR_UNDEFINED;\r
+               return TPI_ERROR_S_ENDOFDATA;\r
        }\r
 \r
        fileInfo pfiInfo = ((fileInfo *) ::LocalLock(_hArchive))[uFilePointer];\r
@@ -308,7 +308,7 @@ int __stdcall GetFileInformation
        {\r
                // \92\9a\94J\82È\83v\83\89\83O\83C\83\93\82Ì\82½\82ß\82Ì\90\94\8d\87\82í\82¹ (^^;\r
                uFileCount = uFilePointer;\r
-               return TPI_ERROR_UNDEFINED;\r
+               return TPI_ERROR_S_ENDOFDATA;\r
        }\r
 \r
        _fiInfo->dwAttribute    = 0;\r
@@ -476,8 +476,8 @@ int __stdcall Command
                                break;\r
                        }\r
                }\r
-               while ((nResult = GetFileInformation(hArchive, & fiInfo, FALSE)) != TPI_ERROR_UNDEFINED);\r
-               if (nResult == TPI_ERROR_UNDEFINED)\r
+               while ((nResult = GetFileInformation(hArchive, & fiInfo, FALSE)) != TPI_ERROR_S_ENDOFDATA);\r
+               if (nResult == TPI_ERROR_S_ENDOFDATA)\r
                {\r
                        // \8fI\92[\82É\92B\82µ\82½\8fê\8d\87\81B\r
                        nResult = TPI_ERROR_SUCCESS;\r