1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32.c: fallback to old API

Browse Source 
* win32/win32.c (w32_io_info, rb_w32_file_identical_p): fallback
  to GetFileInformationByHandle if GetFileInformationByHandleEx
  failed.  it seems not working on network drives.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-12-07 04:03:44 +00:00
parent 803d1753b7
commit 185133fd43
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
win32/win32.c
View File

@ -7998,9 +7998,12 @@ typedef struct {
} FILE_ID_INFO; } FILE_ID_INFO;
#endif #endif
typedef union { typedef struct {
BY_HANDLE_FILE_INFORMATION bhfi; BOOL file_id_p;
FILE_ID_INFO fii; union {
BY_HANDLE_FILE_INFORMATION bhfi;
FILE_ID_INFO fii;
} info;
} w32_io_info_t; } w32_io_info_t;
static HANDLE static HANDLE
@ -8036,23 +8039,23 @@ w32_io_info(VALUE *file, w32_io_info_t *st)
ret = f; ret = f;
} }
if (GetFileType(f) == FILE_TYPE_DISK) { if (GetFileType(f) == FILE_TYPE_DISK) {
ZeroMemory(st, sizeof(*st)); typedef BOOL (WINAPI *gfibhe_t)(HANDLE, int, void *, DWORD);
if (osver.dwMajorVersion < 6 || static gfibhe_t pGetFileInformationByHandleEx = (gfibhe_t)-1;
(osver.dwMajorVersion == 6 && osver.dwMinorVersion < 2)) { if (pGetFileInformationByHandleEx == (gfibhe_t)-1)
if (GetFileInformationByHandle(f, &st->bhfi)) pGetFileInformationByHandleEx = (gfibhe_t)get_proc_address("kernel32", "GetFileInformationByHandleEx", NULL);
return ret;
}
else {
typedef BOOL (WINAPI *gfibhe_t)(HANDLE, int, void *, DWORD);
static gfibhe_t pGetFileInformationByHandleEx = (gfibhe_t)-1;
if (pGetFileInformationByHandleEx == (gfibhe_t)-1)
pGetFileInformationByHandleEx = (gfibhe_t)get_proc_address("kernel32", "GetFileInformationByHandleEx", NULL);
/* expect that this function is always available after Windows 8. */ ZeroMemory(st, sizeof(*st));
/* if not available, return with error... */ /* expect that this function is always available after Windows 8. */
if (pGetFileInformationByHandleEx && if (pGetFileInformationByHandleEx) {
pGetFileInformationByHandleEx(f, FileIdInfo, &st->fii, sizeof(st->fii))) if (pGetFileInformationByHandleEx(f, FileIdInfo, &st->info.fii, sizeof(st->info.fii))) {
st->file_id_p = TRUE;
return ret; return ret;
}
/* may not work at files on network drives, fallback to old API. */
}
if (GetFileInformationByHandle(f, &st->info.bhfi)) {
st->file_id_p = FALSE;
return ret;
} }
} }
if (ret) CloseHandle(ret); if (ret) CloseHandle(ret);
@ -8098,15 +8101,16 @@ rb_w32_file_identical_p(VALUE fname1, VALUE fname2)
if (f2 == INVALID_HANDLE_VALUE) return Qfalse; if (f2 == INVALID_HANDLE_VALUE) return Qfalse;
if (f2) CloseHandle(f2); if (f2) CloseHandle(f2);
if (osver.dwMajorVersion < 6 || (osver.dwMajorVersion == 6 && osver.dwMinorVersion < 2)) { if (st1.file_id_p != st2.file_id_p) return Qfalse;
if (st1.bhfi.dwVolumeSerialNumber == st2.bhfi.dwVolumeSerialNumber && if (!st1.file_id_p) {
st1.bhfi.nFileIndexHigh == st2.bhfi.nFileIndexHigh && if (st1.info.bhfi.dwVolumeSerialNumber == st2.info.bhfi.dwVolumeSerialNumber &&
st1.bhfi.nFileIndexLow == st2.bhfi.nFileIndexLow) st1.info.bhfi.nFileIndexHigh == st2.info.bhfi.nFileIndexHigh &&
st1.info.bhfi.nFileIndexLow == st2.info.bhfi.nFileIndexLow)
return Qtrue; return Qtrue;
} }
else { else {
if (st1.fii.VolumeSerialNumber == st2.fii.VolumeSerialNumber && if (st1.info.fii.VolumeSerialNumber == st2.info.fii.VolumeSerialNumber &&
memcmp(&st1.fii.FileId, &st2.fii.FileId, sizeof(FILE_ID_128)) == 0) memcmp(&st1.info.fii.FileId, &st2.info.fii.FileId, sizeof(FILE_ID_128)) == 0)
return Qtrue; return Qtrue;
} }
return Qfalse; return Qfalse;