Changeset 705 in dev for trunk/ab5.0/abdev/abdev/ProjectControl.cpp

Timestamp:

Jul 21, 2008, 5:42:40 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

ファイルハンドルが解放されず困ることがあるのでCHandleへ入れた。

File:

• trunk/ab5.0/abdev/abdev/ProjectControl.cpp (modified) (6 diffs)

trunk/ab5.0/abdev/abdev/ProjectControl.cpp

@@ -827 +827 @@
     //保存
     sprintf(temporary,"%s%s.pj",dir,NewProjectInfo.name);
-    if(hFind=FindFirstFile(temporary,&wfd)){
-        if(hFind!=INVALID_HANDLE_VALUE){
-            FindClose(hFind);
-
-            //"指定したディレクトリにはすでにプロジェクトが存在します。上書きしますか？"
-            if(MessageBox(hOwner,STRING_ERROR_PROJECT_OVERWRITE,APPLICATION_NAME,MB_YESNO|MB_ICONEXCLAMATION)==IDNO) return;
-        }
+    hFind=FindFirstFile(temporary,&wfd);
+    if(hFind!=INVALID_HANDLE_VALUE){
+        FindClose(hFind);
+
+        //"指定したディレクトリにはすでにプロジェクトが存在します。上書きしますか？"
+        if(MessageBox(hOwner,STRING_ERROR_PROJECT_OVERWRITE,APPLICATION_NAME,MB_YESNO|MB_ICONEXCLAMATION)==IDNO) return;
     }
     if(!WriteBuffer(temporary,buffer,i)) return;
@@ -1812 +1811 @@
     BOOST_FOREACH( const ActiveBasic::PM::FM::File &file, folder.files )
     {
-        HANDLE hFile=CreateFile(file.GetFullPath().c_str(),GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         FILETIME sourceTime;
-        GetFileTime(hFile,NULL,NULL,&sourceTime);
-        CloseHandle(hFile);
+        {
+            ATL::CHandle hFile(CreateFile(file.GetFullPath().c_str(),GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL));
+            GetFileTime(hFile,NULL,NULL,&sourceTime);
+        }
 
         if(sourceTime.dwHighDateTime>exeTime.dwHighDateTime||
@@ -1827 +1827 @@
 BOOL IsNeedCompileForProject(BOOL bDebug){
     char temporary[MAX_PATH];
-    HANDLE hFind,hFile;
+    HANDLE hFind;
     WIN32_FIND_DATA wfd;
     FILETIME SourceTime,ExeTime;
@@ -1839 +1839 @@
     FindClose(hFind);
 
-    hFile=CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
-    GetFileTime(hFile,NULL,NULL,&ExeTime);
-    CloseHandle(hFile);
+    {
+        ATL::CHandle hFile(CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL));
+        GetFileTime(hFile,NULL,NULL,&ExeTime);
+    }
 
     if( IsNeedCompileForProject( projectInfo.fileSystem.root, ExeTime ) )
@@ -1852 +1853 @@
         lstrcpy(temporary,"CallBack.wbp");
         lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
-        hFile=CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
-        GetFileTime(hFile,NULL,NULL,&SourceTime);
-        CloseHandle(hFile);
+        {
+            ATL::CHandle hFile(CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL));
+            GetFileTime(hFile,NULL,NULL,&SourceTime);
+        }
         if(SourceTime.dwHighDateTime>ExeTime.dwHighDateTime||
             SourceTime.dwHighDateTime==ExeTime.dwHighDateTime&&
@@ -1862 +1864 @@
         lstrcpy(temporary,"MakeWindow.wbp");
         lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
-        hFile=CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
-        GetFileTime(hFile,NULL,NULL,&SourceTime);
-        CloseHandle(hFile);
+        {
+            ATL::CHandle hFile(CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL));
+            GetFileTime(hFile,NULL,NULL,&SourceTime);
+        }
         if(SourceTime.dwHighDateTime>ExeTime.dwHighDateTime||
             SourceTime.dwHighDateTime==ExeTime.dwHighDateTime&&