Changeset 700 in dev for trunk/ab5.0/abdev/abdev/FileOperation.cpp

Timestamp:

Jul 21, 2008, 1:04:12 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

CRequireFilesの管理をhash_setベースへ。保存時にFileIndexの記録を行っていなかった問題を修正。rev.669でコミットし忘れのcompiler_x86/NumOpe.cppを追加。

File:

• trunk/ab5.0/abdev/abdev/FileOperation.cpp (modified) (10 diffs)

trunk/ab5.0/abdev/abdev/FileOperation.cpp

@@ -16 +16 @@
             return;
         }
+    }
+    else{
+        FindClose(hFind);
     }
 }
@@ -334 +337 @@
     return NewTextEditWindow(OpenFileName,DocumentType,TabColor);
 }
+
+BOOL GetFileInformationByHandleWrap(HANDLE hFile, BY_HANDLE_FILE_INFORMATION& fi){
+    typedef BOOL WINAPI GFIBH(HANDLE, LPBY_HANDLE_FILE_INFORMATION);
+    GFIBH *const pgfibh = reinterpret_cast<GFIBH*>(
+        GetProcAddress(GetModuleHandle("kernel32"), "GetFileInformationByHandle"));
+    if(pgfibh){
+        return pgfibh(hFile, &fi);
+    }
+    else{
+        SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+        return FALSE;
+    }
+}
+
+//重複チェック用のデータを設定
+void SetFileIdentity(FILEIDENTITY &fi, BY_HANDLE_FILE_INFORMATION const &bhfi){
+    fi.VolumeSerialNumber = bhfi.dwVolumeSerialNumber;
+    fi.FileIndexHigh = bhfi.nFileIndexHigh;
+    fi.FileIndexLow = bhfi.nFileIndexLow;
+}
+
+void SetFileIdentityFromFile(MDIINFO &mi, HANDLE hFile){
+    BY_HANDLE_FILE_INFORMATION fi;
+    if(GetFileInformationByHandleWrap(hFile, fi)){
+        SetFileIdentity(mi.FileIdentity, fi);
+    }
+}
+
 BOOL SaveDocument(HWND hChild,char *SaveFileName){  //ウィンドウからバッファを読み取り、ファイルに保存
+    //SaveFileNameがNULLのときは上書き保存を試みる。
     extern LPSTR IconFileFilter;
     extern HWND hClient,hDocCombo;
@@ -344 +376 @@
     WndNum=GetWndNum(hChild);
 
-    char szOldTitle[MAX_PATH];
-    lstrcpy(szOldTitle,MdiInfo[WndNum]->title.c_str());
+    std::string oldTitle = MdiInfo[WndNum]->title;
 
     if(MdiInfo[WndNum]->DocType==WNDTYPE_RAD||MdiInfo[WndNum]->DocType==WNDTYPE_MENU){
@@ -353 +384 @@
 
         if(projectInfo.ModifyOfMaterial){
-            sprintf(temporary,"%s%s.wnd",projectInfo.GetWorkDir().GetPath().c_str(),projectInfo.GetName().c_str());
-            SaveWindowFile( temporary, projectInfo.windowInfos );
+            std::string const& workDir = projectInfo.GetWorkDir().GetPath();
+            std::string const& projName = projectInfo.GetName();
+            std::string t;
+            t.reserve( workDir.size() + projName.size() + 4 );
+            t += workDir;
+            t += projName;
+            t += ".wnd";
+            SaveWindowFile( t.c_str(), projectInfo.windowInfos );
 
             //.wbpファイルを生成
@@ -370 +407 @@
                 sprintf(str,STRING_FILE_OVERWRIDE,temporary);
                 if(MessageBox(hOwner,str,APPLICATION_NAME,MB_YESNO|MB_ICONINFORMATION)==IDNO){
-                    CloseHandle(fh);
                     return 0;
                 }
@@ -377 +413 @@
 
             //ドキュメント セレクト コンボボックスから消去
-            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum]->title.c_str());
+            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(LONG_PTR)MdiInfo[WndNum]->title.c_str());
             SendMessage(hDocCombo,CB_DELETESTRING,i2,0);
 
@@ -387 +423 @@
             lstrcat(str,str2);
             MdiInfo[WndNum]->title = str;
-            SendMessage(hDocCombo,CB_ADDSTRING,0,(long)MdiInfo[WndNum]->title.c_str());
-            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum]->title.c_str());
+            SendMessage(hDocCombo,CB_ADDSTRING,0,(LONG_PTR)MdiInfo[WndNum]->title.c_str());
+            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(LONG_PTR)MdiInfo[WndNum]->title.c_str());
             SendMessage(hDocCombo,CB_SETCURSEL,i2,0);
 
@@ -448 +484 @@
             return 0;
         }
-        WriteFile(fh,pBuf,lstrlen(pBuf),&dummy,NULL);
+        WriteFile(fh,pBuf,strlen(pBuf),&dummy,NULL);
+        SetFileIdentityFromFile(*MdiInfo[WndNum], fh);
         CloseHandle(fh);
 
@@ -473 +510 @@
             CloseHandle(fh);
             MdiInfo[WndNum]->path = temporary;
-            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum]->title.c_str());
+            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(LONG_PTR)MdiInfo[WndNum]->title.c_str());
             SendMessage(hDocCombo,CB_DELETESTRING,i2,0);
             _splitpath(temporary,NULL,NULL,str,str2);
             lstrcat(str,str2);
             MdiInfo[WndNum]->title = str;
-            SendMessage(hDocCombo,CB_ADDSTRING,0,(long)MdiInfo[WndNum]->title.c_str());
-            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum]->title.c_str());
+            SendMessage(hDocCombo,CB_ADDSTRING,0,(LONG_PTR)MdiInfo[WndNum]->title.c_str());
+            i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(LONG_PTR)MdiInfo[WndNum]->title.c_str());
             SendMessage(hDocCombo,CB_SETCURSEL,i2,0);
             SetWindowText(hChild,MdiInfo[WndNum]->title.c_str());
@@ -501 +538 @@
     if(pobj_nv->bSaveTabToHead){
         COLORREF color;
-        color=pobj_MainTab->GetItemColor(szOldTitle);
-        pobj_MainTab->DeleteItem( szOldTitle, false );
+        color=pobj_MainTab->GetItemColor(oldTitle.c_str());
+        pobj_MainTab->DeleteItem( oldTitle.c_str(), false );
         pobj_MainTab->InsertItem( MdiInfo[WndNum]->title.c_str(), false, color );
     }
     else{
-        pobj_MainTab->RenameItem( szOldTitle, MdiInfo[WndNum]->title.c_str() );
+        pobj_MainTab->RenameItem( oldTitle.c_str(), MdiInfo[WndNum]->title.c_str() );
     }