Changeset 700 in dev for trunk/ab5.0/abdev/abdev/abdev.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/abdev.cpp (modified) (3 diffs)

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

@@ -739 +739 @@
 {
     DWORD shortFilepathLen = GetShortPathName(path, buf, bufSize);
+    CharUpper(buf);
     std::replace(buf, buf + shortFilepathLen, '/', '\\');
 }
+
+BOOL GetFileInformationByHandleWrap(HANDLE hFile, BY_HANDLE_FILE_INFORMATION& fi);
+void SetFileIdentity(FILEIDENTITY &mi, BY_HANDLE_FILE_INFORMATION const &bhfi);
 
 HWND NewTextEditWindow(const char *filepath,_int8 DocumentType,COLORREF TabColor)
@@ -761 +765 @@
         DWORD length;
 
-        typedef BOOL WINAPI GFIBH(HANDLE, LPBY_HANDLE_FILE_INFORMATION);
         BY_HANDLE_FILE_INFORMATION fi;
-        GFIBH *const pgfibh = reinterpret_cast<GFIBH*>(
-            GetProcAddress(GetModuleHandle("kernel32"), "GetFileInformationByHandle"));
-        if(pgfibh && pgfibh(hFile, &fi)){
-            fileIdentity.VolumeSerialNumber = fi.dwVolumeSerialNumber;
-            fileIdentity.FileIndexHigh = fi.nFileIndexHigh;
-            fileIdentity.FileIndexLow = fi.nFileIndexLow;
+        if(GetFileInformationByHandleWrap(hFile, fi)){
+            SetFileIdentity(fileIdentity, fi);
             length=fi.nFileSizeLow;
         }
@@ -807 +806 @@
         //////////////////////////////////////////////////////
 
-        char *temp;
-        temp=(char *)HeapAlloc(hHeap,0,length+1);
+        char *temp=(char *)HeapAlloc(hHeap,0,length+1);
         DWORD dw;
         ReadFile(hFile,temp,length,&dw,NULL);