一部の書庫でファイル名を適切に表示できていなかったバグを修正。

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

diff --git a/doc/history.html b/doc/history.html
index 971c87a..250d680 100644 (file)
--- a/doc/history.html
+++ b/doc/history.html
@@ -17,6 +17,7 @@
    <li><a href="license.txt">License</a></li>\r
    <li><br /></li>\r
    <li>History:</li>\r
+   <li><a href="#0.01beta12">0.01&beta;12</a></li>\r
    <li><a href="#0.01beta11">0.01&beta;11</a></li>\r
    <li><a href="#0.01beta10">0.01&beta;10</a></li>\r
    <li><a href="#0.01beta9">0.01&beta;9</a></li>\r
@@ -36,6 +37,18 @@
 \r
   <h2>History</h2>\r
   <dl id="history">\r
+   <dt id="0.01beta12">2011/04/--</dt>\r
+   <dd>\r
+    Ver.0.01&beta;12\r
+    <dl>\r
+     <dt>calLibrary</dt>\r
+     <dd>\r
+      <ul>\r
+       <li class="fix">一部の書庫でファイル名を適切に表示できていなかったバグを修正。</li>\r
+      </ul>\r
+     </dd>\r
+    </dl>\r
+   </dd>\r
    <dt id="0.01beta11">2011/03/20</dt>\r
    <dd>\r
     Ver.0.01&beta;11\r

diff --git a/src/plugin/calLibrary/calLibrary.cpp b/src/plugin/calLibrary/calLibrary.cpp
index 0dde981..c8e1c6e 100644 (file)
--- a/src/plugin/calLibrary/calLibrary.cpp
+++ b/src/plugin/calLibrary/calLibrary.cpp
@@ -817,12 +817,20 @@ 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