文字列をUTF-8として変換できなかった場合にはマルチバイト文字として変換するよう変更。

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

diff --git a/src/common/library/library.cpp b/src/common/library/library.cpp
index bc048f6..b94d62e 100644 (file)
--- a/src/common/library/library.cpp
+++ b/src/common/library/library.cpp
@@ -176,7 +176,8 @@ wxString MB2String(const char * sz)
 \r
 wxString UTF82String(const char * sz)\r
 {\r
-       return wxString(sz, wxConvUTF8);\r
+       wxString s = wxString(sz, wxConvUTF8);\r
+       return s.IsEmpty() ? MB2String(sz) : s;\r
 }\r
 \r
 wxString WC2String(const wchar_t * sz)\r

diff --git a/src/plugin/calLibrary/calLibrary.cpp b/src/plugin/calLibrary/calLibrary.cpp
index c8e1c6e..0dde981 100644 (file)
--- a/src/plugin/calLibrary/calLibrary.cpp
+++ b/src/plugin/calLibrary/calLibrary.cpp
@@ -817,20 +817,12 @@ int __stdcall GetFileInformation
                        _fiInfo->nUnpackedSize  = iiInfo.dwOriginalSize;\r
                        _fiInfo->tmModify.SetFromDOS(MAKELONG(iiInfo.wTime, iiInfo.wDate));\r
                        _fiInfo->szStoredName   = UTF82String(iiInfo.szFileName);\r
-                       if (_fiInfo->szStoredName.IsEmpty())\r
-                       {\r
-                               _fiInfo->szStoredName = wxString(iiInfo.szFileName);\r
-                       }\r
                        if (strlen(iiInfo.szFileName) >= 510 && fpName)\r
                        {\r
                                char * sz = (char *) malloc(32769);\r
                                memset(sz, 0, 32769);\r
                                ((int (__stdcall *)(void *, char *, const int)) fpName)(_hArchive, sz, 32768);\r
                                _fiInfo->szStoredName = UTF82String(sz);\r
-                               if (_fiInfo->szStoredName.IsEmpty())\r
-                               {\r
-                                       _fiInfo->szStoredName = wxString(sz);\r
-                               }\r
                                free(sz);\r
                        }\r
                        _fiInfo->szMethod       = UTF82String(iiInfo.szMode);\r