wxFile::Close()はデストラクタで自動的に実行されるものを用いるよう変更。

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

diff --git a/src/common/library/library.cpp b/src/common/library/library.cpp
index 9df1164..03067aa 100644 (file)
--- a/src/common/library/library.cpp
+++ b/src/common/library/library.cpp
@@ -164,8 +164,6 @@ wxString MakeResponceFile(const wxArrayString & asFiles, bool bQuote, bool bUnic
                }\r
        }\r
        fListFile.Write(szBuffer, bUnicode ? (const wxMBConv&) wxMBConvUTF16LE() : (const wxMBConv&) wxMBConvUTF8());\r
-       fListFile.Close();\r
-\r
        return szFileName;\r
 }\r
 \r

diff --git a/src/plugin/spiLibrary/spiLibrary.cpp b/src/plugin/spiLibrary/spiLibrary.cpp
index e1c245f..8e088ea 100644 (file)
--- a/src/plugin/spiLibrary/spiLibrary.cpp
+++ b/src/plugin/spiLibrary/spiLibrary.cpp
@@ -124,21 +124,21 @@ int __stdcall LoadPlugin
 )\r
 {\r
        // ファイルを開く。\r
-       wxFile hFile;\r
-       if (! hFile.Exists(_szArcName) || ! hFile.Open(_szArcName, wxFile::read))\r
-       {\r
-               return TPI_ERROR_IO_ARC_OPEN;\r
-       }\r
-\r
-       // 最初の2KBを読み込み。\r
        char buffer[2050];\r
-       ::ZeroMemory(buffer, sizeof(buffer));\r
-       if (hFile.Read(buffer, sizeof(buffer)) == wxInvalidOffset)\r
        {\r
-               hFile.Close();\r
-               return TPI_ERROR_IO_ARC_READ;\r
+               wxFile hFile;\r
+               if (! hFile.Exists(_szArcName) || ! hFile.Open(_szArcName, wxFile::read))\r
+               {\r
+                       return TPI_ERROR_IO_ARC_OPEN;\r
+               }\r
+\r
+               // 最初の2KBを読み込み。\r
+               ::ZeroMemory(buffer, sizeof(buffer));\r
+               if (hFile.Read(buffer, sizeof(buffer)) == wxInvalidOffset)\r
+               {\r
+                       return TPI_ERROR_IO_ARC_READ;\r
+               }\r
        }\r
-       hFile.Close();\r
 \r
        wxString szSPIPath = wxPathOnly(wxStandardPaths::Get().GetExecutablePath()) + wxT("/lib/"), szSPIName;\r
        wxDir fs(szSPIPath);\r
@@ -392,17 +392,20 @@ int __stdcall Command
                        }\r
 \r
                        // 展開先に出力。\r
-                       wxFile hFile;\r
-                       if (! hFile.Create(piInfo.fnDestination.GetFullPath()))\r
+                       bool bErrorOccured;\r
                        {\r
-                               nErrorCode = TPI_ERROR_IO_FILE_OPEN;\r
-                               break;\r
+                               wxFile hFile;\r
+                               if (! hFile.Create(piInfo.fnDestination.GetFullPath()))\r
+                               {\r
+                                       nErrorCode = TPI_ERROR_IO_FILE_OPEN;\r
+                                       break;\r
+                               }\r
+\r
+                               bErrorOccured = hFile.Write(::LocalLock(hMemory), piInfo.fiInfo.nUnpackedSize) != piInfo.fiInfo.nUnpackedSize;\r
+                               ::LocalUnlock(hMemory);\r
+                               ::LocalFree(hMemory);\r
                        }\r
 \r
-                       bool bErrorOccured = hFile.Write(::LocalLock(hMemory), piInfo.fiInfo.nUnpackedSize) != piInfo.fiInfo.nUnpackedSize;\r
-                       ::LocalUnlock(hMemory);\r
-                       ::LocalFree(hMemory);\r
-                       hFile.Close();\r
                        if (bErrorOccured)\r
                        {\r
                                nErrorCode = TPI_ERROR_IO_FILE_WRITE;\r

diff --git a/src/plugin/xpiLibrary/xpiLibrary.cpp b/src/plugin/xpiLibrary/xpiLibrary.cpp
index aeefab9..7efc46f 100644 (file)
--- a/src/plugin/xpiLibrary/xpiLibrary.cpp
+++ b/src/plugin/xpiLibrary/xpiLibrary.cpp
@@ -129,21 +129,21 @@ int __stdcall LoadPlugin
 )\r
 {\r
        // ファイルを開く。\r
-       wxFile hFile;\r
-       if (! hFile.Exists(_szArcName) || ! hFile.Open(_szArcName, wxFile::read))\r
-       {\r
-               return TPI_ERROR_IO_ARC_OPEN;\r
-       }\r
-\r
-       // 最初の2KBを読み込み。\r
        char buffer[2050];\r
-       ::ZeroMemory(buffer, sizeof(buffer));\r
-       if (hFile.Read(buffer, sizeof(buffer)) == wxInvalidOffset)\r
        {\r
-               hFile.Close();\r
-               return TPI_ERROR_IO_ARC_READ;\r
+               wxFile hFile;\r
+               if (! hFile.Exists(_szArcName) || ! hFile.Open(_szArcName, wxFile::read))\r
+               {\r
+                       return TPI_ERROR_IO_ARC_OPEN;\r
+               }\r
+\r
+               // 最初の2KBを読み込み。\r
+               ::ZeroMemory(buffer, sizeof(buffer));\r
+               if (hFile.Read(buffer, sizeof(buffer)) == wxInvalidOffset)\r
+               {\r
+                       return TPI_ERROR_IO_ARC_READ;\r
+               }\r
        }\r
-       hFile.Close();\r
 \r
        wxString szSPIPath = wxPathOnly(wxStandardPaths::Get().GetExecutablePath()) + wxT("/lib/"), szSPIName;\r
        wxDir fs(szSPIPath);\r