Changeset 705 in dev for trunk/ab5.0/abdev/abdev/src

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

File:

• trunk/ab5.0/abdev/abdev/src/MainFrame.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/abdev/src/MainFrame.cpp

@@ -549 +549 @@
     //エラー部分を反転表示
     DWORD AccBytes;
-    HANDLE fh;
-    sprintf(temporary,"%spgm.tmp",pj_editor_Dir);
-    fh=CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
-    ReadFile(fh,temporary,MAX_PATH,&AccBytes,NULL);
-    CloseHandle(fh);
+    {
+        sprintf(temporary,"%spgm.tmp",pj_editor_Dir);
+        ATL::CHandle fh(CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL));
+        if(fh==INVALID_HANDLE_VALUE){
+            fh.Detach();
+            return 0;
+        }
+        ReadFile(fh,temporary,MAX_PATH,&AccBytes,NULL);
+    }
     temporary[AccBytes]=0;
     HWND hChild=::GetWindow(hClient,GW_CHILD);
@@ -1111 +1115 @@
 
     CreateProcess( NULL, args, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi );
+    CloseHandle( pi.hProcess );
+    CloseHandle( pi.hThread );
 }
 
@@ -1130 +1136 @@
         sprintf(temporary,"%s\r\n%s",projectInfo.szExePath,projectInfo.szCmdLine);
         sprintf(temp2,"%spgm.tmp",pj_editor_Dir);
-        HANDLE hFile=CreateFile(temp2,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL);
-        DWORD dwAccessBytes;
-        WriteFile(hFile,temporary,lstrlen(temporary),&dwAccessBytes,NULL);
-        CloseHandle(hFile);
+        {
+            ATL::CHandle hFile(CreateFile(temp2,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL));
+            if(hFile==INVALID_HANDLE_VALUE){
+                hFile.Detach();
+                MessageBox(TEXT("デバッグ用ファイルを開けませんでした。"));
+                return;
+            }
+            DWORD dwAccessBytes;
+            WriteFile(hFile,temporary,lstrlen(temporary),&dwAccessBytes,NULL);
+        }
 
         //ソースファイル名をtemp2へ