Changeset 562

Timestamp:

Jul 21, 2008, 6:43:29 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

9xなどで実行できなくなるので、GetFileSizeExをコメントアウト

Location:

trunk/ab5.0/ablib/src

Files:

• Classes/System/IO/FileInfo.ab (modified) (1 diff)
• api_system.sbp (modified) (1 diff)

trunk/ab5.0/ablib/src/Classes/System/IO/FileInfo.ab

@@ -64 +64 @@
         End If
 
-        Dim length As QWord
-        If GetFileSizeEx(hFile, VarPtr(length)) Then
-            CloseHandle(hFile)
-            Return length
-        Else
-            CloseHandle(hFile)
-            Throw New IOException("FileInfo.Length: Failed to GetFileSize")
+        Dim pLength = VarPtr(Length) As *ULARGE_INTEGER
+        pLength->LowPart = GetFileSize(hFile, VarPtr(pLength->HighPart))
+        CloseHandle(hFile)
+
+        Dim error = GetLastError()
+        If pLength->LowPart = INVALID_FILE_SIZE And error <> NO_ERROR Then
+            Throw New IOException("FileInfo.Length: Failed to GetFileSize", HRESULT_FROM_WIN32(error))
         End If
     End Function

trunk/ab5.0/ablib/src/api_system.sbp

@@ -559 +559 @@
 ) As BOOL
 Declare Function GetFileSize Lib "kernel32" (hFile As HANDLE, pFileSizeHigh As *DWord) As DWord
-Declare Function GetFileSizeEx Lib "kernel32" (hFile As HANDLE, pFileSizeHigh As *QWord) As Boolean
+'Declare Function GetFileSizeEx Lib "kernel32" (hFile As HANDLE, pFileSizeHigh As *QWord) As Boolean
 Declare Function GetFileTime Lib "kernel32" (hFile As HANDLE, ByRef lpCreationTime As FILETIME, ByRef lpLastAccessTime As FILETIME, ByRef lpLastWriteTime As FILETIME) As BOOL