Module: wine Branch: master Commit: 30b878b3b6101e6da413263306e5158af52ac2a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b878b3b6101e6da413263306...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Nov 1 13:28:05 2006 +0100
server: Compute the removable device flag on the server side.
---
dlls/ntdll/server.c | 9 +---- include/wine/server_protocol.h | 3 +- server/fd.c | 70 ++++++++++++++++++++++++++++++++++----- server/protocol.def | 1 - server/trace.c | 3 +- 5 files changed, 64 insertions(+), 22 deletions(-)
diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 7df8e02..272a441 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -523,20 +523,13 @@ int wine_server_handle_to_fd( obj_handle } assert( fd_handle == handle );
- if (removable == -1) - { - FILE_FS_DEVICE_INFORMATION info; - if (FILE_GetDeviceInfo( fd, &info ) == STATUS_SUCCESS) - removable = (info.Characteristics & FILE_REMOVABLE_MEDIA) != 0; - } - else if (removable) goto done; /* don't cache it */ + if (removable) goto done; /* don't cache it */
/* and store it back into the cache */ SERVER_START_REQ( set_handle_fd ) { req->handle = fd_handle; req->fd = fd; - req->removable = removable; if (!(ret = wine_server_call( req ))) { if (reply->cur_fd != -1) /* it has been cached */ diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 894d5f3..a707d8f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -861,7 +861,6 @@ struct set_handle_fd_request struct request_header __header; obj_handle_t handle; int fd; - int removable; }; struct set_handle_fd_reply { @@ -4426,6 +4425,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; };
-#define SERVER_PROTOCOL_VERSION 255 +#define SERVER_PROTOCOL_VERSION 256
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/fd.c b/server/fd.c index e422eea..0334723 100644 --- a/server/fd.c +++ b/server/fd.c @@ -37,6 +37,21 @@ #endif #ifdef HAVE_SYS_POLL_H #include <sys/poll.h> #endif +#ifdef HAVE_LINUX_MAJOR_H +#include <linux/major.h> +#endif +#ifdef HAVE_SYS_STATVFS_H +#include <sys/statvfs.h> +#endif +#ifdef HAVE_SYS_VFS_H +#include <sys/vfs.h> +#endif +#ifdef HAVE_SYS_MOUNT_H +#include <sys/mount.h> +#endif +#ifdef HAVE_SYS_STATFS_H +#include <sys/statfs.h> +#endif #ifdef HAVE_SYS_EVENT_H #include <sys/event.h> #undef LIST_INIT @@ -722,8 +737,47 @@ void main_loop(void)
static struct list device_hash[DEVICE_HASH_SIZE];
+static int is_device_removable( dev_t dev, int unix_fd ) +{ +#if defined(linux) && defined(HAVE_FSTATFS) + struct statfs stfs; + + /* check for floppy disk */ + if (major(dev) == FLOPPY_MAJOR) return 1; + + if (fstatfs( unix_fd, &stfs ) == -1) return 0; + return (stfs.f_type == 0x9660 || /* iso9660 */ + stfs.f_type == 0x9fa1 || /* supermount */ + stfs.f_type == 0x15013346); /* udf */ +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) + struct statfs stfs; + + if (fstatfs( unix_fd, &stfs ) == -1) return 0; + return (!strncmp("cd9660", stfs.f_fstypename, sizeof(stfs.f_fstypename)) || + !strncmp("udf", stfs.f_fstypename, sizeof(stfs.f_fstypename))); +#elif defined(__NetBSD__) + struct statvfs stfs; + + if (fstatvfs( unix_fd, &stfs ) == -1) return 0; + return (!strncmp("cd9660", stfs.f_fstypename, sizeof(stfs.f_fstypename)) || + !strncmp("udf", stfs.f_fstypename, sizeof(stfs.f_fstypename))); +#elif defined(sun) +# include <sys/dkio.h> +# include <sys/vtoc.h> + struct dk_cinfo dkinf; + if (ioctl( unix_fd, DKIOCINFO, &dkinf ) == -1) return 0; + return (dkinf.dki_ctype == DKC_CDROM || + dkinf.dki_ctype == DKC_NCRFLOPPY || + dkinf.dki_ctype == DKC_SMSFLOPPY || + dkinf.dki_ctype == DKC_INTEL82072 || + dkinf.dki_ctype == DKC_INTEL82077); +#else + return 0; +#endif +} + /* retrieve the device object for a given fd, creating it if needed */ -static struct device *get_device( dev_t dev, int create ) +static struct device *get_device( dev_t dev, int unix_fd ) { struct device *device; unsigned int i, hash = dev % DEVICE_HASH_SIZE; @@ -737,11 +791,11 @@ static struct device *get_device( dev_t
/* not found, create it */
- if (!create) return NULL; + if (unix_fd == -1) return NULL; if ((device = alloc_object( &device_ops ))) { device->dev = dev; - device->removable = -1; + device->removable = is_device_removable( dev, unix_fd ); for (i = 0; i < INODE_HASH_SIZE; i++) list_init( &device->inode_hash[i] ); list_add_head( &device_hash[hash], &device->entry ); } @@ -834,13 +888,13 @@ static void inode_destroy( struct object }
/* retrieve the inode object for a given fd, creating it if needed */ -static struct inode *get_inode( dev_t dev, ino_t ino ) +static struct inode *get_inode( dev_t dev, ino_t ino, int unix_fd ) { struct device *device; struct inode *inode; unsigned int hash = ino % INODE_HASH_SIZE;
- if (!(device = get_device( dev, 1 ))) return NULL; + if (!(device = get_device( dev, unix_fd ))) return NULL;
LIST_FOR_EACH_ENTRY( inode, &device->inode_hash[hash], struct inode, entry ) { @@ -1508,7 +1562,7 @@ struct fd *open_fd( const char *name, in /* only bother with an inode for normal files and directories */ if (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)) { - struct inode *inode = get_inode( st.st_dev, st.st_ino ); + struct inode *inode = get_inode( st.st_dev, st.st_ino, fd->unix_fd );
if (!inode) { @@ -1808,7 +1862,7 @@ static void unmount_device( struct fd *d return; }
- if (!(device = get_device( st.st_rdev, 0 ))) return; + if (!(device = get_device( st.st_rdev, -1 ))) return;
for (i = 0; i < INODE_HASH_SIZE; i++) { @@ -1917,8 +1971,6 @@ DECL_HANDLER(set_handle_fd) { struct device *device = fd->inode ? fd->inode->device : NULL;
- if (device && device->removable == -1) device->removable = req->removable; - /* only cache the fd on non-removable devices */ if (!device || !device->removable) reply->cur_fd = set_handle_unix_fd( current->process, req->handle, req->fd ); diff --git a/server/protocol.def b/server/protocol.def index 3acf366..49c4c30 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -677,7 +677,6 @@ #define FD_FLAG_AVAILABLE 0x10 @REQ(set_handle_fd) obj_handle_t handle; /* handle we are interested in */ int fd; /* file descriptor */ - int removable; /* is device removable? (-1 if unknown) */ @REPLY int cur_fd; /* current file descriptor */ @END diff --git a/server/trace.c b/server/trace.c index be268d1..a16310f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1116,8 +1116,7 @@ static void dump_get_handle_fd_reply( co static void dump_set_handle_fd_request( const struct set_handle_fd_request *req ) { fprintf( stderr, " handle=%p,", req->handle ); - fprintf( stderr, " fd=%d,", req->fd ); - fprintf( stderr, " removable=%d", req->removable ); + fprintf( stderr, " fd=%d", req->fd ); }
static void dump_set_handle_fd_reply( const struct set_handle_fd_reply *req )