ERROR_HDR_NO_NAMEまでのエラーコードに対応。

TPI_ERROR_ARC_DANGERの追加に伴い、一部のエラーコードとの対応関係を修正。

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

diff --git a/src/plugin/calLibrary/calLibrary.cpp b/src/plugin/calLibrary/calLibrary.cpp
index e40c49d..6161231 100644 (file)
--- a/src/plugin/calLibrary/calLibrary.cpp
+++ b/src/plugin/calLibrary/calLibrary.cpp
@@ -328,10 +328,13 @@ int CalErrorCodeConvert(int nCalErrorCode)
        case ERROR_HDR_INVALID_SIZE:return TPI_ERROR_ARC_BROKEN_HEADER;\r
        case ERROR_UNKNOWN_LEVEL:   return TPI_ERROR_ARC_UNSUPPORTED;\r
        case ERROR_BROKEN_DATA:     return TPI_ERROR_ARC_BROKEN_MISC;\r
-       case ERROR_INVALID_PATH:    return TPI_ERROR_UNDEFINED;\r
+       case ERROR_INVALID_PATH:    return TPI_ERROR_ARC_DANGER;\r
        case ERROR_TOO_BIG:         return TPI_ERROR_IO_FILE_WRITE;\r
-       case ERROR_EXECUTABLE_FILE: return TPI_ERROR_UNDEFINED;\r
+       case ERROR_EXECUTABLE_FILE: return TPI_ERROR_ARC_DANGER;\r
        case ERROR_INVALID_VALUE:   return TPI_ERROR_UNDEFINED;\r
+       case ERROR_HDR_EXPLOIT:     return TPI_ERROR_ARC_DANGER;\r
+       case ERROR_HDR_NO_CRC:      return TPI_ERROR_ARC_BROKEN_HEADER;\r
+       case ERROR_HDR_NO_NAME:     return TPI_ERROR_ARC_BROKEN_HEADER;\r
        default:                    return TPI_ERROR_UNDEFINED;\r
        }\r
 }\r

diff --git a/src/plugin/calLibrary/calLibrary.h b/src/plugin/calLibrary/calLibrary.h
index 33cd53d..233928c 100644 (file)
--- a/src/plugin/calLibrary/calLibrary.h
+++ b/src/plugin/calLibrary/calLibrary.h
@@ -112,6 +112,9 @@
 #define ERROR_EXECUTABLE_FILE  0x804B\r
 #define ERROR_INVALID_VALUE            0x804C\r
 #define ERROR_END                              ERROR_INVALID_VALUE\r
+#define ERROR_HDR_EXPLOIT              0x804D\r
+#define ERROR_HDR_NO_CRC               0X804E\r
+#define ERROR_HDR_NO_NAME              0X804F\r
 #endif\r
 \r
 #pragma pack(1)\r