summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-23 16:32:47 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-23 16:32:47 +0000
commit2150b0df68977b6789ac1fdd304dc51ea3d119c9 (patch)
tree799620b97fe34fd9bd8ec8dcb61fb48dda174b47
parentb61f6d7adf426d1d5cdab44577e9385699800474 (diff)
downloadruby-2150b0df68977b6789ac1fdd304dc51ea3d119c9.tar.gz
ruby-2150b0df68977b6789ac1fdd304dc51ea3d119c9.tar.xz
ruby-2150b0df68977b6789ac1fdd304dc51ea3d119c9.zip
* file.c (w32_io_info): CreateFile failed on Win9x if file was already
opened. (FILE_SHARE_READ was needed, but actually I don't understand the flags of CreateFile well...) git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--file.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1812bc7e1..82017c6c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 24 01:31:44 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * file.c (w32_io_info): CreateFile failed on Win9x if file was already
+ opened. (FILE_SHARE_READ was needed, but actually I don't understand
+ the flags of CreateFile well...)
+
Wed Nov 23 23:52:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* numeric.c (num_div): use floor rather than rb_Integer().
diff --git a/file.c b/file.c
index ca8bdf2f9..92bbf8951 100644
--- a/file.c
+++ b/file.c
@@ -655,7 +655,8 @@ w32_io_info(VALUE *file, BY_HANDLE_FILE_INFORMATION *st)
}
else {
FilePathValue(*file);
- f = CreateFile(StringValueCStr(*file), 0, 0, NULL, OPEN_EXISTING,
+ f = CreateFile(StringValueCStr(*file), 0,
+ FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
rb_w32_iswin95() ? 0 : FILE_FLAG_BACKUP_SEMANTICS, NULL);
if (f == INVALID_HANDLE_VALUE) return FALSE;
}